diff --git a/src/QueryEngine.ts b/src/QueryEngine.ts
index c9d67d382..c91c01f14 100644
--- a/src/QueryEngine.ts
+++ b/src/QueryEngine.ts
@@ -41,7 +41,11 @@ import { type Tools, type ToolUseContext, toolMatchesName } from './Tool.js'
 import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
 import { SYNTHETIC_OUTPUT_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/SyntheticOutputTool/SyntheticOutputTool.js'
 import type { APIError } from '@anthropic-ai/sdk'
-import type { CompactMetadata, Message, SystemCompactBoundaryMessage } from './types/message.js'
+import type {
+  CompactMetadata,
+  Message,
+  SystemCompactBoundaryMessage,
+} from './types/message.js'
 import type { OrphanedPermission } from './types/textInputTypes.js'
 import { createAbortController } from './utils/abortController.js'
 import type { AttributionState } from './utils/commitAttribution.js'
@@ -708,7 +712,8 @@ export class QueryEngine {
           message.subtype === 'compact_boundary'
         ) {
           const compactMsg = message as SystemCompactBoundaryMessage
-          const tailUuid = compactMsg.compactMetadata?.preservedSegment?.tailUuid
+          const tailUuid =
+            compactMsg.compactMetadata?.preservedSegment?.tailUuid
           if (tailUuid) {
             const tailIdx = this.mutableMessages.findLastIndex(
               m => m.uuid === tailUuid,
@@ -768,7 +773,10 @@ export class QueryEngine {
           // streamed responses, this is null at content_block_stop time;
           // the real value arrives via message_delta (handled below).
           const msg = message as Message
-          const stopReason = msg.message?.stop_reason as string | null | undefined
+          const stopReason = msg.message?.stop_reason as
+            | string
+            | null
+            | undefined
           if (stopReason != null) {
             lastStopReason = stopReason
           }
@@ -798,11 +806,15 @@ export class QueryEngine {
           break
         }
         case 'stream_event': {
-          const event = (message as unknown as { event: Record<string, unknown> }).event
+          const event = (
+            message as unknown as { event: Record<string, unknown> }
+          ).event
           if (event.type === 'message_start') {
             // Reset current message usage for new message
             currentMessageUsage = EMPTY_USAGE
-            const eventMessage = event.message as { usage: BetaMessageDeltaUsage }
+            const eventMessage = event.message as {
+              usage: BetaMessageDeltaUsage
+            }
             currentMessageUsage = updateUsage(
               currentMessageUsage,
               eventMessage.usage,
@@ -851,7 +863,15 @@ export class QueryEngine {
             void recordTranscript(messages)
           }
 
-          const attachment = msg.attachment as { type: string; data?: unknown; turnCount?: number; maxTurns?: number; prompt?: string; source_uuid?: string; [key: string]: unknown }
+          const attachment = msg.attachment as {
+            type: string
+            data?: unknown
+            turnCount?: number
+            maxTurns?: number
+            prompt?: string
+            source_uuid?: string
+            [key: string]: unknown
+          }
 
           // Extract structured output from StructuredOutput tool calls
           if (attachment.type === 'structured_output') {
@@ -892,10 +912,7 @@ export class QueryEngine {
             return
           }
           // Yield queued_command attachments as SDK user message replays
-          else if (
-            replayUserMessages &&
-            attachment.type === 'queued_command'
-          ) {
+          else if (replayUserMessages && attachment.type === 'queued_command') {
             yield {
               type: 'user',
               message: {
@@ -923,10 +940,7 @@ export class QueryEngine {
           // never shrinks (memory leak in long SDK sessions). The subtype
           // check lives inside the injected callback so feature-gated strings
           // stay out of this file (excluded-strings check).
-          const snipResult = this.config.snipReplay?.(
-            msg,
-            this.mutableMessages,
-          )
+          const snipResult = this.config.snipReplay?.(msg, this.mutableMessages)
           if (snipResult !== undefined) {
             if (snipResult.executed) {
               this.mutableMessages.length = 0
@@ -936,10 +950,7 @@ export class QueryEngine {
           }
           this.mutableMessages.push(msg)
           // Yield compact boundary messages to SDK
-          if (
-            msg.subtype === 'compact_boundary' &&
-            msg.compactMetadata
-          ) {
+          if (msg.subtype === 'compact_boundary' && msg.compactMetadata) {
             const compactMsg = msg as SystemCompactBoundaryMessage
             // Release pre-compaction messages for GC. The boundary was just
             // pushed so it's the last element. query.ts already uses
@@ -959,11 +970,18 @@ export class QueryEngine {
               subtype: 'compact_boundary' as const,
               session_id: getSessionId(),
               uuid: msg.uuid,
-              compact_metadata: toSDKCompactMetadata(compactMsg.compactMetadata),
+              compact_metadata: toSDKCompactMetadata(
+                compactMsg.compactMetadata,
+              ),
             }
           }
           if (msg.subtype === 'api_error') {
-            const apiErrorMsg = msg as Message & { retryAttempt: number; maxRetries: number; retryInMs: number; error: APIError }
+            const apiErrorMsg = msg as Message & {
+              retryAttempt: number
+              maxRetries: number
+              retryInMs: number
+              error: APIError
+            }
             yield {
               type: 'system',
               subtype: 'api_retry' as const,
@@ -980,7 +998,10 @@ export class QueryEngine {
           break
         }
         case 'tool_use_summary': {
-          const msg = message as Message & { summary: unknown; precedingToolUseIds: unknown }
+          const msg = message as Message & {
+            summary: unknown
+            precedingToolUseIds: unknown
+          }
           // Yield tool use summary messages to SDK
           yield {
             type: 'tool_use_summary' as const,
@@ -1089,7 +1110,10 @@ export class QueryEngine {
     const edeResultType = result?.type ?? 'undefined'
     const edeLastContentType =
       result?.type === 'assistant'
-        ? (last(result.message!.content as import('@anthropic-ai/sdk/resources/beta/messages/messages.js').BetaContentBlock[])?.type ?? 'none')
+        ? (last(
+            result.message!
+              .content as import('@anthropic-ai/sdk/resources/beta/messages/messages.js').BetaContentBlock[],
+          )?.type ?? 'none')
         : 'n/a'
 
     // Flush buffered transcript writes before yielding result.
@@ -1147,7 +1171,10 @@ export class QueryEngine {
     let isApiError = false
 
     if (result.type === 'assistant') {
-      const lastContent = last(result.message!.content as import('@anthropic-ai/sdk/resources/beta/messages/messages.js').BetaContentBlock[])
+      const lastContent = last(
+        result.message!
+          .content as import('@anthropic-ai/sdk/resources/beta/messages/messages.js').BetaContentBlock[],
+      )
       if (
         lastContent?.type === 'text' &&
         !SYNTHETIC_MESSAGES.has(lastContent.text)
diff --git a/src/__tests__/context.baseline.test.ts b/src/__tests__/context.baseline.test.ts
index c40632cbc..6f24ade24 100644
--- a/src/__tests__/context.baseline.test.ts
+++ b/src/__tests__/context.baseline.test.ts
@@ -10,7 +10,11 @@ import {
   setSystemPromptInjection,
 } from '../context'
 import { clearMemoryFileCaches } from '../utils/claudemd'
-import { cleanupTempDir, createTempDir, writeTempFile } from '../../tests/mocks/file-system'
+import {
+  cleanupTempDir,
+  createTempDir,
+  writeTempFile,
+} from '../../tests/mocks/file-system'
 
 let tempDir = ''
 let projectClaudeMdContent = ''
diff --git a/src/bootstrap/src/entrypoints/agentSdkTypes.ts b/src/bootstrap/src/entrypoints/agentSdkTypes.ts
index 8491988f8..dee28fdbe 100644
--- a/src/bootstrap/src/entrypoints/agentSdkTypes.ts
+++ b/src/bootstrap/src/entrypoints/agentSdkTypes.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type HookEvent = any;
-export type ModelUsage = any;
+export type HookEvent = any
+export type ModelUsage = any
diff --git a/src/bootstrap/src/tools/AgentTool/agentColorManager.ts b/src/bootstrap/src/tools/AgentTool/agentColorManager.ts
index b1a565c12..7c86a3adc 100644
--- a/src/bootstrap/src/tools/AgentTool/agentColorManager.ts
+++ b/src/bootstrap/src/tools/AgentTool/agentColorManager.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type AgentColorName = any;
+export type AgentColorName = any
diff --git a/src/bootstrap/src/types/hooks.ts b/src/bootstrap/src/types/hooks.ts
index ee7a626db..41408a820 100644
--- a/src/bootstrap/src/types/hooks.ts
+++ b/src/bootstrap/src/types/hooks.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type HookCallbackMatcher = any;
+export type HookCallbackMatcher = any
diff --git a/src/bootstrap/src/types/ids.ts b/src/bootstrap/src/types/ids.ts
index 34291796d..a30f93950 100644
--- a/src/bootstrap/src/types/ids.ts
+++ b/src/bootstrap/src/types/ids.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type SessionId = any;
+export type SessionId = any
diff --git a/src/bootstrap/src/utils/crypto.ts b/src/bootstrap/src/utils/crypto.ts
index 61e51b7c0..269d7c171 100644
--- a/src/bootstrap/src/utils/crypto.ts
+++ b/src/bootstrap/src/utils/crypto.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type randomUUID = any;
+export type randomUUID = any
diff --git a/src/bootstrap/src/utils/model/model.ts b/src/bootstrap/src/utils/model/model.ts
index 982102634..7be12d147 100644
--- a/src/bootstrap/src/utils/model/model.ts
+++ b/src/bootstrap/src/utils/model/model.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type ModelSetting = any;
+export type ModelSetting = any
diff --git a/src/bootstrap/src/utils/model/modelStrings.ts b/src/bootstrap/src/utils/model/modelStrings.ts
index d632b76bf..6a98f6f19 100644
--- a/src/bootstrap/src/utils/model/modelStrings.ts
+++ b/src/bootstrap/src/utils/model/modelStrings.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type ModelStrings = any;
+export type ModelStrings = any
diff --git a/src/bootstrap/src/utils/settings/constants.ts b/src/bootstrap/src/utils/settings/constants.ts
index b82138d6a..24eb36c76 100644
--- a/src/bootstrap/src/utils/settings/constants.ts
+++ b/src/bootstrap/src/utils/settings/constants.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type SettingSource = any;
+export type SettingSource = any
diff --git a/src/bootstrap/src/utils/settings/settingsCache.ts b/src/bootstrap/src/utils/settings/settingsCache.ts
index 818a7b15c..5a0a77205 100644
--- a/src/bootstrap/src/utils/settings/settingsCache.ts
+++ b/src/bootstrap/src/utils/settings/settingsCache.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type resetSettingsCache = any;
+export type resetSettingsCache = any
diff --git a/src/bootstrap/src/utils/settings/types.ts b/src/bootstrap/src/utils/settings/types.ts
index dfe971ff5..dfb762ce0 100644
--- a/src/bootstrap/src/utils/settings/types.ts
+++ b/src/bootstrap/src/utils/settings/types.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type PluginHookMatcher = any;
+export type PluginHookMatcher = any
diff --git a/src/bootstrap/src/utils/signal.ts b/src/bootstrap/src/utils/signal.ts
index 7c6732c50..f689745dc 100644
--- a/src/bootstrap/src/utils/signal.ts
+++ b/src/bootstrap/src/utils/signal.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type createSignal = any;
+export type createSignal = any
diff --git a/src/bootstrap/state.ts b/src/bootstrap/state.ts
index 66702cadf..d9d687bf9 100644
--- a/src/bootstrap/state.ts
+++ b/src/bootstrap/state.ts
@@ -1755,4 +1755,6 @@ export function getPromptId(): string | null {
 export function setPromptId(id: string | null): void {
   STATE.promptId = id
 }
-export function isReplBridgeActive(): boolean { return false; }
+export function isReplBridgeActive(): boolean {
+  return false
+}
diff --git a/src/bridge/bridgeApi.ts b/src/bridge/bridgeApi.ts
index e6792eb43..1e0490ce9 100644
--- a/src/bridge/bridgeApi.ts
+++ b/src/bridge/bridgeApi.ts
@@ -225,7 +225,9 @@ export function createBridgeApiClient(deps: BridgeApiDeps): BridgeApiClient {
       )
 
       handleErrorStatus(response.status, response.data, 'Poll')
-      rcLog(`poll response: status=${response.status} hasData=${!!response.data} url=${deps.baseUrl}`)
+      rcLog(
+        `poll response: status=${response.status} hasData=${!!response.data} url=${deps.baseUrl}`,
+      )
 
       // Empty body or null = no work available
       if (!response.data) {
diff --git a/src/bridge/bridgeMain.ts b/src/bridge/bridgeMain.ts
index c0b172386..f7dbe4d03 100644
--- a/src/bridge/bridgeMain.ts
+++ b/src/bridge/bridgeMain.ts
@@ -448,9 +448,11 @@ export async function runBridgeLoop(
   ): (status: SessionDoneStatus) => void {
     return (rawStatus: SessionDoneStatus): void => {
       const workId = sessionWorkIds.get(sessionId)
-      rcLog(`session done: sessionId=${sessionId} workId=${workId ?? 'none'} status=${rawStatus}` +
-        ` wasTimedOut=${timedOutSessions.has(sessionId)} duration=${Math.round((Date.now() - startTime) / 1000)}s` +
-        ` stderr=${handle.lastStderr.length > 0 ? handle.lastStderr.join('\\n').slice(0, 500) : '(none)'}`)
+      rcLog(
+        `session done: sessionId=${sessionId} workId=${workId ?? 'none'} status=${rawStatus}` +
+          ` wasTimedOut=${timedOutSessions.has(sessionId)} duration=${Math.round((Date.now() - startTime) / 1000)}s` +
+          ` stderr=${handle.lastStderr.length > 0 ? handle.lastStderr.join('\\n').slice(0, 500) : '(none)'}`,
+      )
       activeSessions.delete(sessionId)
       sessionStartTimes.delete(sessionId)
       sessionWorkIds.delete(sessionId)
@@ -609,7 +611,9 @@ export async function runBridgeLoop(
     const pollConfig = getPollIntervalConfig()
 
     try {
-      rcLog(`poll: envId=${environmentId} activeSessions=${activeSessions.size}`)
+      rcLog(
+        `poll: envId=${environmentId} activeSessions=${activeSessions.size}`,
+      )
       const work = await api.pollForWork(
         environmentId,
         environmentSecret,
@@ -864,7 +868,9 @@ export async function runBridgeLoop(
           break
         case 'session': {
           const sessionId = work.data.id
-          rcLog(`work received: type=session sessionId=${sessionId} workId=${work.id}`)
+          rcLog(
+            `work received: type=session sessionId=${sessionId} workId=${work.id}`,
+          )
           try {
             validateBridgeId(sessionId, 'session_id')
           } catch {
@@ -1032,9 +1038,9 @@ export async function runBridgeLoop(
 
           rcLog(
             `spawning session: sessionId=${sessionId} sdkUrl=${sdkUrl}` +
-            ` useCcrV2=${useCcrV2} workerEpoch=${workerEpoch}` +
-            ` dir=${sessionDir}` +
-            ` accessToken=${secret.session_ingress_token ? secret.session_ingress_token.slice(0, 8) + '...' : 'NONE'}`,
+              ` useCcrV2=${useCcrV2} workerEpoch=${workerEpoch}` +
+              ` dir=${sessionDir}` +
+              ` accessToken=${secret.session_ingress_token ? secret.session_ingress_token.slice(0, 8) + '...' : 'NONE'}`,
           )
           const spawnResult = safeSpawn(
             spawner,
@@ -1281,8 +1287,8 @@ export async function runBridgeLoop(
       const errMsg = describeAxiosError(err)
       rcLog(
         `poll error: ${errMsg}` +
-        ` isConn=${isConnectionError(err)} isServer=${isServerError(err)}` +
-        ` activeSessions=${activeSessions.size}`,
+          ` isConn=${isConnectionError(err)} isServer=${isServerError(err)}` +
+          ` activeSessions=${activeSessions.size}`,
       )
 
       if (isConnectionError(err) || isServerError(err)) {
@@ -1676,7 +1682,7 @@ async function stopWorkWithRetry(
       }
       const errMsg = errorMessage(err)
       if (attempt < MAX_ATTEMPTS) {
-        const delay = addJitter(baseDelayMs * Math.pow(2, attempt - 1))
+        const delay = addJitter(baseDelayMs * 2 ** (attempt - 1))
         logger.logVerbose(
           `Failed to stop work ${workId} (attempt ${attempt}/${MAX_ATTEMPTS}), retrying in ${formatDelay(delay)}: ${errMsg}`,
         )
@@ -1964,7 +1970,6 @@ NOTES
   - You must be logged in with a Claude account that has a subscription
   - Run \`claude\` first in the directory to accept the workspace trust dialog
 ${serverNote}`
-  // biome-ignore lint/suspicious/noConsole: intentional help output
   console.log(help)
 }
 
@@ -2003,7 +2008,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
     return
   }
   if (parsed.error) {
-    // biome-ignore lint/suspicious/noConsole: intentional error output
     console.error(`Error: ${parsed.error}`)
     // eslint-disable-next-line custom-rules/no-process-exit
     process.exit(1)
@@ -2042,7 +2046,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
     const { PERMISSION_MODES } = await import('../types/permissions.js')
     const valid: readonly string[] = PERMISSION_MODES
     if (!valid.includes(permissionMode)) {
-      // biome-ignore lint/suspicious/noConsole: intentional error output
       console.error(
         `Error: Invalid permission mode '${permissionMode}'. Valid modes: ${valid.join(', ')}`,
       )
@@ -2085,7 +2088,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
       Promise.all([shutdown1PEventLogging(), shutdownDatadog()]),
       sleep(500, undefined, { unref: true }),
     ]).catch(() => {})
-    // biome-ignore lint/suspicious/noConsole: intentional error output
     console.error(
       'Error: Multi-session Remote Control is not enabled for your account yet.',
     )
@@ -2102,7 +2104,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
   // The bridge bypasses main.tsx (which renders the interactive TrustDialog via showSetupScreens),
   // so we must verify trust was previously established by a normal `claude` session.
   if (!checkHasTrustDialogAccepted()) {
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.error(
       `Error: Workspace not trusted. Please run \`claude\` in ${dir} first to review and accept the workspace trust dialog.`,
     )
@@ -2119,7 +2120,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
 
   const bridgeToken = getBridgeAccessToken()
   if (!bridgeToken) {
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.error(BRIDGE_LOGIN_ERROR)
     // eslint-disable-next-line custom-rules/no-process-exit
     process.exit(1)
@@ -2138,7 +2138,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
       input: process.stdin,
       output: process.stdout,
     })
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.log(
       '\nRemote Control lets you access this CLI session from the web (claude.ai/code)\nor the Claude app, so you can pick up where you left off on any device.\n\nYou can disconnect remote access anytime by running /remote-control again.\n',
     )
@@ -2170,7 +2169,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
     )
     const found = await readBridgePointerAcrossWorktrees(dir)
     if (!found) {
-      // biome-ignore lint/suspicious/noConsole: intentional error output
       console.error(
         `Error: No recent session found in this directory or its worktrees. Run \`claude remote-control\` to start a new one.`,
       )
@@ -2181,7 +2179,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
     const ageMin = Math.round(pointer.ageMs / 60_000)
     const ageStr = ageMin < 60 ? `${ageMin}m` : `${Math.round(ageMin / 60)}h`
     const fromWt = pointerDir !== dir ? ` from worktree ${pointerDir}` : ''
-    // biome-ignore lint/suspicious/noConsole: intentional info output
     console.error(
       `Resuming session ${pointer.sessionId} (${ageStr} ago)${fromWt}\u2026`,
     )
@@ -2202,7 +2199,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
     !baseUrl.includes('localhost') &&
     !baseUrl.includes('127.0.0.1')
   ) {
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.error(
       'Error: Remote Control base URL uses HTTP. Only HTTPS or localhost HTTP is allowed.',
     )
@@ -2238,7 +2234,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
     ? getCurrentProjectConfig().remoteControlSpawnMode
     : undefined
   if (savedSpawnMode === 'worktree' && !worktreeAvailable) {
-    // biome-ignore lint/suspicious/noConsole: intentional warning output
     console.error(
       'Warning: Saved spawn mode is worktree but this directory is not a git repository. Falling back to same-dir.',
     )
@@ -2265,7 +2260,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
       input: process.stdin,
       output: process.stdout,
     })
-    // biome-ignore lint/suspicious/noConsole: intentional dialog output
     console.log(
       `\nClaude Remote Control is launching in spawn mode which lets you create new sessions in this project from Claude Code on Web or your Mobile app. Learn more here: https://code.claude.com/docs/en/remote-control\n\n` +
         `Spawn mode for this project:\n` +
@@ -2344,7 +2338,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
   // Only reachable via explicit --spawn=worktree (default is same-dir);
   // saved worktree pref was already guarded above.
   if (spawnMode === 'worktree' && !worktreeAvailable) {
-    // biome-ignore lint/suspicious/noConsole: intentional error output
     console.error(
       `Error: Worktree mode requires a git repository or WorktreeCreate hooks configured. Use --spawn=session for single-session mode.`,
     )
@@ -2379,7 +2372,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
     try {
       validateBridgeId(resumeSessionId, 'sessionId')
     } catch {
-      // biome-ignore lint/suspicious/noConsole: intentional error output
       console.error(
         `Error: Invalid session ID "${resumeSessionId}". Session IDs must not contain unsafe characters.`,
       )
@@ -2405,7 +2397,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
         const { clearBridgePointer } = await import('./bridgePointer.js')
         await clearBridgePointer(resumePointerDir)
       }
-      // biome-ignore lint/suspicious/noConsole: intentional error output
       console.error(
         `Error: Session ${resumeSessionId} not found. It may have been archived or expired, or your login may have lapsed (run \`claude /login\`).`,
       )
@@ -2417,7 +2408,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
         const { clearBridgePointer } = await import('./bridgePointer.js')
         await clearBridgePointer(resumePointerDir)
       }
-      // biome-ignore lint/suspicious/noConsole: intentional error output
       console.error(
         `Error: Session ${resumeSessionId} has no environment_id. It may never have been attached to a bridge.`,
       )
@@ -2471,7 +2461,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
       status: err instanceof BridgeFatalError ? err.status : undefined,
     })
     // Registration failures are fatal — print a clean message instead of a stack trace.
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.error(
       err instanceof BridgeFatalError && err.status === 404
         ? 'Remote Control environments are not available for your account.'
@@ -2496,7 +2485,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
           `Bridge resume env mismatch: requested ${reuseEnvironmentId}, backend returned ${environmentId}. Falling back to fresh session.`,
         ),
       )
-      // biome-ignore lint/suspicious/noConsole: intentional warning output
       console.warn(
         `Warning: Could not resume session ${resumeSessionId} — its environment has expired. Creating a fresh session instead.`,
       )
@@ -2547,7 +2535,6 @@ export async function bridgeMain(args: string[]): Promise<void> {
           const { clearBridgePointer } = await import('./bridgePointer.js')
           await clearBridgePointer(resumePointerDir)
         }
-        // biome-ignore lint/suspicious/noConsole: intentional error output
         console.error(
           isFatal
             ? `Error: ${errorMessage(err)}`
diff --git a/src/bridge/bridgeMessaging.ts b/src/bridge/bridgeMessaging.ts
index eab387fb8..b07ca8dd5 100644
--- a/src/bridge/bridgeMessaging.ts
+++ b/src/bridge/bridgeMessaging.ts
@@ -104,7 +104,8 @@ export function isEligibleBridgeMessage(m: Message): boolean {
 export function extractTitleText(m: Message): string | undefined {
   if (m.type !== 'user' || m.isMeta || m.toolUseResult || m.isCompactSummary)
     return undefined
-  if (m.origin && (m.origin as { kind?: string }).kind !== 'human') return undefined
+  if (m.origin && (m.origin as { kind?: string }).kind !== 'human')
+    return undefined
   const content = m.message!.content
   let raw: string | undefined
   if (typeof content === 'string') {
@@ -266,7 +267,13 @@ export function handleServerControlRequest(
   // Outbound-only: reply error for mutable requests so claude.ai doesn't show
   // false success. initialize must still succeed (server kills the connection
   // if it doesn't — see comment above).
-  const req = request.request as { subtype: string; model?: string; max_thinking_tokens?: number | null; mode?: string; [key: string]: unknown }
+  const req = request.request as {
+    subtype: string
+    model?: string
+    max_thinking_tokens?: number | null
+    mode?: string
+    [key: string]: unknown
+  }
   if (outboundOnly && req.subtype !== 'initialize') {
     response = {
       type: 'control_response',
@@ -389,8 +396,8 @@ export function handleServerControlRequest(
   void transport.write(event)
   rcLog(
     `control_response: subtype=${req.subtype}` +
-    ` request_id=${request.request_id}` +
-    ` result=${(response.response as { subtype?: string }).subtype}`,
+      ` request_id=${request.request_id}` +
+      ` result=${(response.response as { subtype?: string }).subtype}`,
   )
   logForDebugging(
     `[bridge:repl] Sent control_response for ${req.subtype} request_id=${request.request_id} result=${(response.response as { subtype?: string }).subtype}`,
diff --git a/src/bridge/inboundMessages.ts b/src/bridge/inboundMessages.ts
index 0f93a3f38..83d614e94 100644
--- a/src/bridge/inboundMessages.ts
+++ b/src/bridge/inboundMessages.ts
@@ -24,7 +24,9 @@ export function extractInboundMessageFields(
   | { content: string | Array<ContentBlockParam>; uuid: UUID | undefined }
   | undefined {
   if (msg.type !== 'user') return undefined
-  const content = (msg.message as { content?: string | Array<ContentBlockParam> } | undefined)?.content
+  const content = (
+    msg.message as { content?: string | Array<ContentBlockParam> } | undefined
+  )?.content
   if (!content) return undefined
   if (Array.isArray(content) && content.length === 0) return undefined
 
diff --git a/src/bridge/initReplBridge.ts b/src/bridge/initReplBridge.ts
index 6d012b93b..fb29ec191 100644
--- a/src/bridge/initReplBridge.ts
+++ b/src/bridge/initReplBridge.ts
@@ -290,7 +290,9 @@ export async function initReplBridge(
           isSyntheticMessage(msg)
         )
           continue
-        const rawContent = getContentText(msg.message!.content as string | ContentBlockParam[])
+        const rawContent = getContentText(
+          msg.message!.content as string | ContentBlockParam[],
+        )
         if (!rawContent) continue
         const derived = deriveTitle(rawContent)
         if (!derived) continue
diff --git a/src/bridge/rcDebugLog.ts b/src/bridge/rcDebugLog.ts
index 90ecf6bca..1573fbdc1 100644
--- a/src/bridge/rcDebugLog.ts
+++ b/src/bridge/rcDebugLog.ts
@@ -20,7 +20,10 @@ export function rcLog(msg: string): void {
   try {
     if (!headerWritten) {
       ensureLogDir()
-      appendFileSync(LOG_PATH, `\n===== RC-DEBUG session ${new Date().toISOString()} =====\n`)
+      appendFileSync(
+        LOG_PATH,
+        `\n===== RC-DEBUG session ${new Date().toISOString()} =====\n`,
+      )
       headerWritten = true
     }
     const ts = new Date().toISOString().slice(11, 23) // HH:mm:ss.SSS
diff --git a/src/bridge/remoteBridgeCore.ts b/src/bridge/remoteBridgeCore.ts
index c3b0547e4..fcefaacde 100644
--- a/src/bridge/remoteBridgeCore.ts
+++ b/src/bridge/remoteBridgeCore.ts
@@ -834,7 +834,10 @@ export async function initEnvLessBridgeCore(
       for (const msg of filtered) {
         if (msg.uuid) recentPostedUUIDs.add(msg.uuid as string)
       }
-      const events = filtered.map(m => ({ ...m, session_id: sessionId })) as StdoutMessage[]
+      const events = filtered.map(m => ({
+        ...m,
+        session_id: sessionId,
+      })) as StdoutMessage[]
       void transport.writeBatch(events)
     },
     sendControlRequest(request: SDKControlRequest) {
@@ -844,8 +847,14 @@ export async function initEnvLessBridgeCore(
         )
         return
       }
-      const event: TransportMessage = { ...request, session_id: sessionId } as TransportMessage
-      if ((request as { request?: { subtype?: string } }).request?.subtype === 'can_use_tool') {
+      const event: TransportMessage = {
+        ...request,
+        session_id: sessionId,
+      } as TransportMessage
+      if (
+        (request as { request?: { subtype?: string } }).request?.subtype ===
+        'can_use_tool'
+      ) {
         transport.reportState('requires_action')
       }
       void transport.write(event as StdoutMessage)
@@ -860,7 +869,10 @@ export async function initEnvLessBridgeCore(
         )
         return
       }
-      const event: TransportMessage = { ...response, session_id: sessionId } as TransportMessage
+      const event: TransportMessage = {
+        ...response,
+        session_id: sessionId,
+      } as TransportMessage
       transport.reportState('running')
       void transport.write(event as StdoutMessage)
       logForDebugging('[remote-bridge] Sent control_response')
diff --git a/src/bridge/replBridge.ts b/src/bridge/replBridge.ts
index 1d91c9990..1c3107222 100644
--- a/src/bridge/replBridge.ts
+++ b/src/bridge/replBridge.ts
@@ -452,7 +452,6 @@ export async function initBridgeCore(
   // re-created after a connection loss.
   let currentSessionId: string
 
-
   if (reusedPriorSession && prior) {
     currentSessionId = prior.sessionId
     logForDebugging(
@@ -632,9 +631,9 @@ export async function initBridgeCore(
     environmentRecreations++
     rcLog(
       `doReconnect: attempt=${environmentRecreations}/${MAX_ENVIRONMENT_RECREATIONS}` +
-      ` envId=${environmentId}` +
-      ` sessionId=${currentSessionId}` +
-      ` workId=${currentWorkId}`,
+        ` envId=${environmentId}` +
+        ` sessionId=${currentSessionId}` +
+        ` workId=${currentWorkId}`,
     )
     // Invalidate any in-flight v2 handshake — the environment is being
     // recreated, so a stale transport arriving post-reconnect would be
@@ -846,7 +845,6 @@ export async function initBridgeCore(
     // UUIDs are scoped per-session on the server, so re-flushing is safe.
     previouslyFlushedUUIDs?.clear()
 
-
     // Reset the counter so independent reconnections hours apart don't
     // exhaust the limit — it guards against rapid consecutive failures,
     // not lifetime total.
@@ -907,8 +905,8 @@ export async function initBridgeCore(
   function handleTransportPermanentClose(closeCode: number | undefined): void {
     rcLog(
       `handleTransportPermanentClose: code=${closeCode}` +
-      ` transport=${transport ? 'exists' : 'null'}` +
-      ` pollAborted=${pollController.signal.aborted}`,
+        ` transport=${transport ? 'exists' : 'null'}` +
+        ` pollAborted=${pollController.signal.aborted}`,
     )
     logForDebugging(
       `[bridge:repl] Transport permanently closed: code=${closeCode}`,
@@ -1303,7 +1301,9 @@ export async function initBridgeCore(
                 session_id: currentSessionId,
               })) as TransportMessage[]
               const dropsBefore = newTransport.droppedBatchCount
-              void newTransport.writeBatch(events as StdoutMessage[]).then(() => {
+              void newTransport
+                .writeBatch(events as StdoutMessage[])
+                .then(() => {
                   // If any batch was dropped during this flush (SI down for
                   // maxConsecutiveFailures attempts), flush() still resolved
                   // normally but the events were NOT delivered. Don't mark
@@ -1357,10 +1357,10 @@ export async function initBridgeCore(
             const parsed = JSON.parse(data)
             rcLog(
               `ingress: type=${parsed.type}` +
-              `${parsed.type === 'control_request' ? ` subtype=${(parsed.request as Record<string, unknown>)?.subtype} request_id=${parsed.request_id}` : ''}` +
-              `${parsed.type === 'control_response' ? ` subtype=${(parsed.response as Record<string, unknown>)?.subtype} request_id=${(parsed.response as Record<string, unknown>)?.request_id}` : ''}` +
-              `${parsed.type === 'user' ? ` uuid=${parsed.uuid}` : ''}` +
-              `${parsed.type === 'keep_alive' ? '' : ` len=${data.length}`}`,
+                `${parsed.type === 'control_request' ? ` subtype=${(parsed.request as Record<string, unknown>)?.subtype} request_id=${parsed.request_id}` : ''}` +
+                `${parsed.type === 'control_response' ? ` subtype=${(parsed.response as Record<string, unknown>)?.subtype} request_id=${(parsed.response as Record<string, unknown>)?.request_id}` : ''}` +
+                `${parsed.type === 'user' ? ` uuid=${parsed.uuid}` : ''}` +
+                `${parsed.type === 'keep_alive' ? '' : ` len=${data.length}`}`,
             )
           } catch {
             rcLog(`ingress (non-JSON): ${String(data).slice(0, 200)}`)
@@ -1387,9 +1387,9 @@ export async function initBridgeCore(
           if (transport !== newTransport) return
           rcLog(
             `transport onClose: code=${closeCode}` +
-            ` connected=${newTransport.isConnectedStatus()}` +
-            ` state=${newTransport.getStateLabel()}` +
-            ` seq=${newTransport.getLastSequenceNum()}`,
+              ` connected=${newTransport.isConnectedStatus()}` +
+              ` state=${newTransport.getStateLabel()}` +
+              ` seq=${newTransport.getLastSequenceNum()}`,
           )
           handleTransportPermanentClose(closeCode)
         })
@@ -1818,7 +1818,10 @@ export async function initBridgeCore(
       for (const msg of filtered) {
         if (msg.uuid) recentPostedUUIDs.add(msg.uuid as string)
       }
-      const events: TransportMessage[] = filtered.map(m => ({ ...m, session_id: currentSessionId })) as TransportMessage[]
+      const events: TransportMessage[] = filtered.map(m => ({
+        ...m,
+        session_id: currentSessionId,
+      })) as TransportMessage[]
       void transport.writeBatch(events as StdoutMessage[])
     },
     sendControlRequest(request: SDKControlRequest) {
@@ -1828,7 +1831,10 @@ export async function initBridgeCore(
         )
         return
       }
-      const event: TransportMessage = { ...request, session_id: currentSessionId } as TransportMessage
+      const event: TransportMessage = {
+        ...request,
+        session_id: currentSessionId,
+      } as TransportMessage
       void transport.write(event as StdoutMessage)
       logForDebugging(
         `[bridge:repl] Sent control_request request_id=${request.request_id}`,
@@ -1841,7 +1847,10 @@ export async function initBridgeCore(
         )
         return
       }
-      const event: TransportMessage = { ...response, session_id: currentSessionId } as TransportMessage
+      const event: TransportMessage = {
+        ...response,
+        session_id: currentSessionId,
+      } as TransportMessage
       void transport.write(event as StdoutMessage)
       logForDebugging('[bridge:repl] Sent control_response')
     },
diff --git a/src/bridge/src/entrypoints/sdk/controlTypes.ts b/src/bridge/src/entrypoints/sdk/controlTypes.ts
index bd1b0590d..0558ada22 100644
--- a/src/bridge/src/entrypoints/sdk/controlTypes.ts
+++ b/src/bridge/src/entrypoints/sdk/controlTypes.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type StdoutMessage = any;
+export type StdoutMessage = any
diff --git a/src/bridge/webhookSanitizer.ts b/src/bridge/webhookSanitizer.ts
index a2999b07c..d8927ae9e 100644
--- a/src/bridge/webhookSanitizer.ts
+++ b/src/bridge/webhookSanitizer.ts
@@ -11,21 +11,44 @@
 /** Patterns that match known secret/token formats. */
 const SECRET_PATTERNS: Array<{ pattern: RegExp; replacement: string }> = [
   // GitHub tokens (PAT, OAuth, App, Server-to-server)
-  { pattern: /\b(ghp|gho|ghs|ghu|github_pat)_[A-Za-z0-9_]{10,}\b/g, replacement: '[REDACTED_GITHUB_TOKEN]' },
+  {
+    pattern: /\b(ghp|gho|ghs|ghu|github_pat)_[A-Za-z0-9_]{10,}\b/g,
+    replacement: '[REDACTED_GITHUB_TOKEN]',
+  },
   // Anthropic API keys
-  { pattern: /\bsk-ant-[A-Za-z0-9_-]{10,}\b/g, replacement: '[REDACTED_ANTHROPIC_KEY]' },
+  {
+    pattern: /\bsk-ant-[A-Za-z0-9_-]{10,}\b/g,
+    replacement: '[REDACTED_ANTHROPIC_KEY]',
+  },
   // Generic Bearer tokens in headers
-  { pattern: /(Bearer\s+)[A-Za-z0-9._\-/+=]{20,}/gi, replacement: '$1[REDACTED_TOKEN]' },
+  {
+    pattern: /(Bearer\s+)[A-Za-z0-9._\-/+=]{20,}/gi,
+    replacement: '$1[REDACTED_TOKEN]',
+  },
   // AWS access keys
-  { pattern: /\b(AKIA|ASIA)[A-Z0-9]{16}\b/g, replacement: '[REDACTED_AWS_KEY]' },
+  {
+    pattern: /\b(AKIA|ASIA)[A-Z0-9]{16}\b/g,
+    replacement: '[REDACTED_AWS_KEY]',
+  },
   // AWS secret keys (40-char base64-like strings after common labels)
-  { pattern: /(aws_secret_access_key|secret_key|SecretAccessKey)['":\s=]+[A-Za-z0-9/+=]{30,}/gi, replacement: '$1=[REDACTED_AWS_SECRET]' },
+  {
+    pattern:
+      /(aws_secret_access_key|secret_key|SecretAccessKey)['":\s=]+[A-Za-z0-9/+=]{30,}/gi,
+    replacement: '$1=[REDACTED_AWS_SECRET]',
+  },
   // Generic API key patterns (key=value or "key": "value")
-  { pattern: /(api[_-]?key|apikey|secret|password|token|credential)['":\s=]+["']?[A-Za-z0-9._\-/+=]{16,}["']?/gi, replacement: '$1=[REDACTED]' },
+  {
+    pattern:
+      /(api[_-]?key|apikey|secret|password|token|credential)['":\s=]+["']?[A-Za-z0-9._\-/+=]{16,}["']?/gi,
+    replacement: '$1=[REDACTED]',
+  },
   // npm tokens
   { pattern: /\bnpm_[A-Za-z0-9]{36}\b/g, replacement: '[REDACTED_NPM_TOKEN]' },
   // Slack tokens
-  { pattern: /\bxox[bporas]-[A-Za-z0-9-]{10,}\b/g, replacement: '[REDACTED_SLACK_TOKEN]' },
+  {
+    pattern: /\bxox[bporas]-[A-Za-z0-9-]{10,}\b/g,
+    replacement: '[REDACTED_SLACK_TOKEN]',
+  },
 ]
 
 /** Maximum content length before truncation (100KB). */
diff --git a/src/buddy/CompanionSprite.tsx b/src/buddy/CompanionSprite.tsx
index 22dbeb643..85ab36a0c 100644
--- a/src/buddy/CompanionSprite.tsx
+++ b/src/buddy/CompanionSprite.tsx
@@ -1,50 +1,50 @@
-import { feature } from 'bun:bundle'
-import figures from 'figures'
-import React, { useEffect, useRef, useState } from 'react'
-import { useTerminalSize } from '../hooks/useTerminalSize.js'
-import { Box, Text, stringWidth } from '@anthropic/ink'
-import { useAppState, useSetAppState } from '../state/AppState.js'
-import type { AppState } from '../state/AppStateStore.js'
-import { getGlobalConfig } from '../utils/config.js'
-import { isFullscreenActive } from '../utils/fullscreen.js'
-import type { Theme } from '../utils/theme.js'
-import { getCompanion } from './companion.js'
-import { renderFace, renderSprite, spriteFrameCount } from './sprites.js'
-import { RARITY_COLORS } from './types.js'
+import { feature } from 'bun:bundle';
+import figures from 'figures';
+import React, { useEffect, useRef, useState } from 'react';
+import { useTerminalSize } from '../hooks/useTerminalSize.js';
+import { Box, Text, stringWidth } from '@anthropic/ink';
+import { useAppState, useSetAppState } from '../state/AppState.js';
+import type { AppState } from '../state/AppStateStore.js';
+import { getGlobalConfig } from '../utils/config.js';
+import { isFullscreenActive } from '../utils/fullscreen.js';
+import type { Theme } from '../utils/theme.js';
+import { getCompanion } from './companion.js';
+import { renderFace, renderSprite, spriteFrameCount } from './sprites.js';
+import { RARITY_COLORS } from './types.js';
 
-const TICK_MS = 500
-const BUBBLE_SHOW = 20 // ticks → ~10s at 500ms
-const FADE_WINDOW = 6 // last ~3s the bubble dims so you know it's about to go
-const PET_BURST_MS = 2500 // how long hearts float after /buddy pet
+const TICK_MS = 500;
+const BUBBLE_SHOW = 20; // ticks → ~10s at 500ms
+const FADE_WINDOW = 6; // last ~3s the bubble dims so you know it's about to go
+const PET_BURST_MS = 2500; // how long hearts float after /buddy pet
 
 // Idle sequence: mostly rest (frame 0), occasional fidget (frames 1-2), rare blink.
 // Sequence indices map to sprite frames; -1 means "blink on frame 0".
-const IDLE_SEQUENCE = [0, 0, 0, 0, 1, 0, 0, 0, -1, 0, 0, 2, 0, 0, 0]
+const IDLE_SEQUENCE = [0, 0, 0, 0, 1, 0, 0, 0, -1, 0, 0, 2, 0, 0, 0];
 
 // Hearts float up-and-out over 5 ticks (~2.5s). Prepended above the sprite.
-const H = figures.heart
+const H = figures.heart;
 const PET_HEARTS = [
   `   ${H}    ${H}   `,
   `  ${H}  ${H}   ${H}  `,
   ` ${H}   ${H}  ${H}   `,
   `${H}  ${H}      ${H} `,
   '·    ·   ·  ',
-]
+];
 
 function wrap(text: string, width: number): string[] {
-  const words = text.split(' ')
-  const lines: string[] = []
-  let cur = ''
+  const words = text.split(' ');
+  const lines: string[] = [];
+  let cur = '';
   for (const w of words) {
     if (cur.length + w.length + 1 > width && cur) {
-      lines.push(cur)
-      cur = w
+      lines.push(cur);
+      cur = w;
     } else {
-      cur = cur ? `${cur} ${w}` : w
+      cur = cur ? `${cur} ${w}` : w;
     }
   }
-  if (cur) lines.push(cur)
-  return lines
+  if (cur) lines.push(cur);
+  return lines;
 }
 
 function SpeechBubble({
@@ -53,40 +53,29 @@ function SpeechBubble({
   fading,
   tail,
 }: {
-  text: string
-  color: keyof Theme
-  fading: boolean
-  tail: 'down' | 'right'
+  text: string;
+  color: keyof Theme;
+  fading: boolean;
+  tail: 'down' | 'right';
 }): React.ReactNode {
-  const lines = wrap(text, 30)
-  const borderColor = fading ? 'inactive' : color
+  const lines = wrap(text, 30);
+  const borderColor = fading ? 'inactive' : color;
   const bubble = (
-    <Box
-      flexDirection="column"
-      borderStyle="round"
-      borderColor={borderColor}
-      paddingX={1}
-      width={34}
-    >
+    <Box flexDirection="column" borderStyle="round" borderColor={borderColor} paddingX={1} width={34}>
       {lines.map((l, i) => (
-        <Text
-          key={i}
-          italic
-          dimColor={!fading}
-          color={fading ? 'inactive' : undefined}
-        >
+        <Text key={i} italic dimColor={!fading} color={fading ? 'inactive' : undefined}>
           {l}
         </Text>
       ))}
     </Box>
-  )
+  );
   if (tail === 'right') {
     return (
       <Box flexDirection="row" alignItems="center">
         {bubble}
         <Text color={borderColor}>─</Text>
       </Box>
-    )
+    );
   }
   return (
     <Box flexDirection="column" alignItems="flex-end" marginRight={1}>
@@ -96,18 +85,18 @@ function SpeechBubble({
         <Text color={borderColor}>╲</Text>
       </Box>
     </Box>
-  )
+  );
 }
 
-export const MIN_COLS_FOR_FULL_SPRITE = 100
-const SPRITE_BODY_WIDTH = 12
-const NAME_ROW_PAD = 2 // focused state wraps name in spaces: ` name `
-const SPRITE_PADDING_X = 2
-const BUBBLE_WIDTH = 36 // SpeechBubble box (34) + tail column
-const NARROW_QUIP_CAP = 24
+export const MIN_COLS_FOR_FULL_SPRITE = 100;
+const SPRITE_BODY_WIDTH = 12;
+const NAME_ROW_PAD = 2; // focused state wraps name in spaces: ` name `
+const SPRITE_PADDING_X = 2;
+const BUBBLE_WIDTH = 36; // SpeechBubble box (34) + tail column
+const NARROW_QUIP_CAP = 24;
 
 function spriteColWidth(nameWidth: number): number {
-  return Math.max(SPRITE_BODY_WIDTH, nameWidth + NAME_ROW_PAD)
+  return Math.max(SPRITE_BODY_WIDTH, nameWidth + NAME_ROW_PAD);
 }
 
 // Width the sprite area consumes. PromptInput subtracts this so text wraps
@@ -115,89 +104,73 @@ function spriteColWidth(nameWidth: number): number {
 // width); in non-fullscreen it sits inline and needs BUBBLE_WIDTH more.
 // Narrow terminals: 0 — REPL.tsx stacks the one-liner on its own row
 // (above input in fullscreen, below in scrollback), so no reservation.
-export function companionReservedColumns(
-  terminalColumns: number,
-  speaking: boolean,
-): number {
-  if (!feature('BUDDY')) return 0
-  const companion = getCompanion()
-  if (!companion || getGlobalConfig().companionMuted) return 0
-  if (terminalColumns < MIN_COLS_FOR_FULL_SPRITE) return 0
-  const nameWidth = stringWidth(companion.name)
-  const bubble = speaking && !isFullscreenActive() ? BUBBLE_WIDTH : 0
-  return spriteColWidth(nameWidth) + SPRITE_PADDING_X + bubble
+export function companionReservedColumns(terminalColumns: number, speaking: boolean): number {
+  if (!feature('BUDDY')) return 0;
+  const companion = getCompanion();
+  if (!companion || getGlobalConfig().companionMuted) return 0;
+  if (terminalColumns < MIN_COLS_FOR_FULL_SPRITE) return 0;
+  const nameWidth = stringWidth(companion.name);
+  const bubble = speaking && !isFullscreenActive() ? BUBBLE_WIDTH : 0;
+  return spriteColWidth(nameWidth) + SPRITE_PADDING_X + bubble;
 }
 
 export function CompanionSprite(): React.ReactNode {
-  const reaction = useAppState(s => s.companionReaction)
-  const petAt = useAppState(s => s.companionPetAt)
-  const focused = useAppState(s => s.footerSelection === 'companion')
-  const setAppState = useSetAppState()
-  const { columns } = useTerminalSize()
-  const [tick, setTick] = useState(0)
-  const lastSpokeTick = useRef(0)
+  const reaction = useAppState(s => s.companionReaction);
+  const petAt = useAppState(s => s.companionPetAt);
+  const focused = useAppState(s => s.footerSelection === 'companion');
+  const setAppState = useSetAppState();
+  const { columns } = useTerminalSize();
+  const [tick, setTick] = useState(0);
+  const lastSpokeTick = useRef(0);
   // Sync-during-render (not useEffect) so the first post-pet render already
   // has petStartTick=tick and petAge=0 — otherwise frame 0 is skipped.
   const [{ petStartTick, forPetAt }, setPetStart] = useState({
     petStartTick: 0,
     forPetAt: petAt,
-  })
+  });
   if (petAt !== forPetAt) {
-    setPetStart({ petStartTick: tick, forPetAt: petAt })
+    setPetStart({ petStartTick: tick, forPetAt: petAt });
   }
 
   useEffect(() => {
-    const timer = setInterval(
-      setT => setT((t: number) => t + 1),
-      TICK_MS,
-      setTick,
-    )
-    return () => clearInterval(timer)
-  }, [])
+    const timer = setInterval(setT => setT((t: number) => t + 1), TICK_MS, setTick);
+    return () => clearInterval(timer);
+  }, []);
 
   useEffect(() => {
-    if (!reaction) return
-    lastSpokeTick.current = tick
+    if (!reaction) return;
+    lastSpokeTick.current = tick;
     const timer = setTimeout(
       setA =>
         setA((prev: AppState) =>
-          prev.companionReaction === undefined
-            ? prev
-            : { ...prev, companionReaction: undefined },
+          prev.companionReaction === undefined ? prev : { ...prev, companionReaction: undefined },
         ),
       BUBBLE_SHOW * TICK_MS,
       setAppState,
-    )
-    return () => clearTimeout(timer)
+    );
+    return () => clearTimeout(timer);
     // eslint-disable-next-line react-hooks/exhaustive-deps -- tick intentionally captured at reaction-change, not tracked
-  }, [reaction, setAppState])
+  }, [reaction, setAppState]);
 
-  if (!feature('BUDDY')) return null
-  const companion = getCompanion()
-  if (!companion || getGlobalConfig().companionMuted) return null
+  if (!feature('BUDDY')) return null;
+  const companion = getCompanion();
+  if (!companion || getGlobalConfig().companionMuted) return null;
 
-  const color = RARITY_COLORS[companion.rarity]
-  const colWidth = spriteColWidth(stringWidth(companion.name))
+  const color = RARITY_COLORS[companion.rarity];
+  const colWidth = spriteColWidth(stringWidth(companion.name));
 
-  const bubbleAge = reaction ? tick - lastSpokeTick.current : 0
-  const fading =
-    reaction !== undefined && bubbleAge >= BUBBLE_SHOW - FADE_WINDOW
+  const bubbleAge = reaction ? tick - lastSpokeTick.current : 0;
+  const fading = reaction !== undefined && bubbleAge >= BUBBLE_SHOW - FADE_WINDOW;
 
-  const petAge = petAt ? tick - petStartTick : Infinity
-  const petting = petAge * TICK_MS < PET_BURST_MS
+  const petAge = petAt ? tick - petStartTick : Infinity;
+  const petting = petAge * TICK_MS < PET_BURST_MS;
 
   // Narrow terminals: collapse to one-line face. When speaking, the quip
   // replaces the name beside the face (no room for a bubble).
   if (columns < MIN_COLS_FOR_FULL_SPRITE) {
     const quip =
-      reaction && reaction.length > NARROW_QUIP_CAP
-        ? reaction.slice(0, NARROW_QUIP_CAP - 1) + '…'
-        : reaction
-    const label = quip
-      ? `"${quip}"`
-      : focused
-        ? ` ${companion.name} `
-        : companion.name
+      reaction && reaction.length > NARROW_QUIP_CAP ? reaction.slice(0, NARROW_QUIP_CAP - 1) + '…' : reaction;
+    const label = quip ? `"${quip}"` : focused ? ` ${companion.name} ` : companion.name;
     return (
       <Box paddingX={1} alignSelf="flex-end">
         <Text>
@@ -210,44 +183,34 @@ export function CompanionSprite(): React.ReactNode {
             dimColor={!focused && !reaction}
             bold={focused}
             inverse={focused && !reaction}
-            color={
-              reaction
-                ? fading
-                  ? 'inactive'
-                  : color
-                : focused
-                  ? color
-                  : undefined
-            }
+            color={reaction ? (fading ? 'inactive' : color) : focused ? color : undefined}
           >
             {label}
           </Text>
         </Text>
       </Box>
-    )
+    );
   }
-  const frameCount = spriteFrameCount(companion.species)
-  const heartFrame = petting ? PET_HEARTS[petAge % PET_HEARTS.length] : null
+  const frameCount = spriteFrameCount(companion.species);
+  const heartFrame = petting ? PET_HEARTS[petAge % PET_HEARTS.length] : null;
 
-  let spriteFrame: number
-  let blink = false
+  let spriteFrame: number;
+  let blink = false;
   if (reaction || petting) {
     // Excited: cycle all fidget frames fast
-    spriteFrame = tick % frameCount
+    spriteFrame = tick % frameCount;
   } else {
-    const step = IDLE_SEQUENCE[tick % IDLE_SEQUENCE.length]!
+    const step = IDLE_SEQUENCE[tick % IDLE_SEQUENCE.length]!;
     if (step === -1) {
-      spriteFrame = 0
-      blink = true
+      spriteFrame = 0;
+      blink = true;
     } else {
-      spriteFrame = step % frameCount
+      spriteFrame = step % frameCount;
     }
   }
 
-  const body = renderSprite(companion, spriteFrame).map(line =>
-    blink ? line.replaceAll(companion.eye, '-') : line,
-  )
-  const sprite = heartFrame ? [heartFrame, ...body] : body
+  const body = renderSprite(companion, spriteFrame).map(line => (blink ? line.replaceAll(companion.eye, '-') : line));
+  const sprite = heartFrame ? [heartFrame, ...body] : body;
 
   // Name row doubles as hint row — unfocused shows dim name + ↓ discovery,
   // focused shows inverse name. The enter-to-open hint lives in
@@ -255,31 +218,20 @@ export function CompanionSprite(): React.ReactNode {
   // sprite doesn't jump up when selected. flexShrink=0 stops the
   // inline-bubble row wrapper from squeezing the sprite to fit.
   const spriteColumn = (
-    <Box
-      flexDirection="column"
-      flexShrink={0}
-      alignItems="center"
-      width={colWidth}
-    >
+    <Box flexDirection="column" flexShrink={0} alignItems="center" width={colWidth}>
       {sprite.map((line, i) => (
         <Text key={i} color={i === 0 && heartFrame ? 'autoAccept' : color}>
           {line}
         </Text>
       ))}
-      <Text
-        italic
-        bold={focused}
-        dimColor={!focused}
-        color={focused ? color : undefined}
-        inverse={focused}
-      >
+      <Text italic bold={focused} dimColor={!focused} color={focused ? color : undefined} inverse={focused}>
         {focused ? ` ${companion.name} ` : companion.name}
       </Text>
     </Box>
-  )
+  );
 
   if (!reaction) {
-    return <Box paddingX={1}>{spriteColumn}</Box>
+    return <Box paddingX={1}>{spriteColumn}</Box>;
   }
 
   // Fullscreen: bubble renders separately via CompanionFloatingBubble in
@@ -288,19 +240,14 @@ export function CompanionSprite(): React.ReactNode {
   // Non-fullscreen: bubble sits inline beside the sprite (input shrinks)
   // because floating into Static scrollback can't be cleared.
   if (isFullscreenActive()) {
-    return <Box paddingX={1}>{spriteColumn}</Box>
+    return <Box paddingX={1}>{spriteColumn}</Box>;
   }
   return (
     <Box flexDirection="row" alignItems="flex-end" paddingX={1} flexShrink={0}>
-      <SpeechBubble
-        text={reaction}
-        color={color}
-        fading={fading}
-        tail="right"
-      />
+      <SpeechBubble text={reaction} color={color} fading={fading} tail="right" />
       {spriteColumn}
     </Box>
-  )
+  );
 }
 
 // Floating bubble overlay for fullscreen mode. Mounted in FullscreenLayout's
@@ -308,33 +255,29 @@ export function CompanionSprite(): React.ReactNode {
 // the ScrollBox region. CompanionSprite owns the clear-after-10s timer; this
 // just reads companionReaction and renders the fade.
 export function CompanionFloatingBubble(): React.ReactNode {
-  const reaction = useAppState(s => s.companionReaction)
+  const reaction = useAppState(s => s.companionReaction);
   const [{ tick, forReaction }, setTick] = useState({
     tick: 0,
     forReaction: reaction,
-  })
+  });
 
   // Reset tick synchronously when reaction changes (not in useEffect, which
   // runs post-render and would show one stale-faded frame). Storing the
   // reaction the tick is counting FOR alongside the tick itself means the
   // fade computation never sees a tick from a previous reaction.
   if (reaction !== forReaction) {
-    setTick({ tick: 0, forReaction: reaction })
+    setTick({ tick: 0, forReaction: reaction });
   }
 
   useEffect(() => {
-    if (!reaction) return
-    const timer = setInterval(
-      set => set(s => ({ ...s, tick: s.tick + 1 })),
-      TICK_MS,
-      setTick,
-    )
-    return () => clearInterval(timer)
-  }, [reaction])
+    if (!reaction) return;
+    const timer = setInterval(set => set(s => ({ ...s, tick: s.tick + 1 })), TICK_MS, setTick);
+    return () => clearInterval(timer);
+  }, [reaction]);
 
-  if (!feature('BUDDY') || !reaction) return null
-  const companion = getCompanion()
-  if (!companion || getGlobalConfig().companionMuted) return null
+  if (!feature('BUDDY') || !reaction) return null;
+  const companion = getCompanion();
+  if (!companion || getGlobalConfig().companionMuted) return null;
 
   return (
     <SpeechBubble
@@ -343,5 +286,5 @@ export function CompanionFloatingBubble(): React.ReactNode {
       fading={tick >= BUBBLE_SHOW - FADE_WINDOW}
       tail="down"
     />
-  )
+  );
 }
diff --git a/src/buddy/useBuddyNotification.tsx b/src/buddy/useBuddyNotification.tsx
index 2df078e79..99492a1f1 100644
--- a/src/buddy/useBuddyNotification.tsx
+++ b/src/buddy/useBuddyNotification.tsx
@@ -1,25 +1,23 @@
-import { feature } from 'bun:bundle'
-import React, { useEffect } from 'react'
-import { useNotifications } from '../context/notifications.js'
-import { Text } from '@anthropic/ink'
-import { getGlobalConfig } from '../utils/config.js'
-import { getRainbowColor } from '../utils/thinking.js'
+import { feature } from 'bun:bundle';
+import React, { useEffect } from 'react';
+import { useNotifications } from '../context/notifications.js';
+import { Text } from '@anthropic/ink';
+import { getGlobalConfig } from '../utils/config.js';
+import { getRainbowColor } from '../utils/thinking.js';
 
 // Local date, not UTC — 24h rolling wave across timezones. Sustained Twitter
 // buzz instead of a single UTC-midnight spike, gentler on soul-gen load.
 // Teaser window: April 1-7, 2026 only. Command stays live forever after.
 export function isBuddyTeaserWindow(): boolean {
-  if (process.env.USER_TYPE === 'ant') return true
-  const d = new Date()
-  return d.getFullYear() === 2026 && d.getMonth() === 3 && d.getDate() <= 7
+  if (process.env.USER_TYPE === 'ant') return true;
+  const d = new Date();
+  return d.getFullYear() === 2026 && d.getMonth() === 3 && d.getDate() <= 7;
 }
 
 export function isBuddyLive(): boolean {
-  if (process.env.USER_TYPE === 'ant') return true
-  const d = new Date()
-  return (
-    d.getFullYear() > 2026 || (d.getFullYear() === 2026 && d.getMonth() >= 3)
-  )
+  if (process.env.USER_TYPE === 'ant') return true;
+  const d = new Date();
+  return d.getFullYear() > 2026 || (d.getFullYear() === 2026 && d.getMonth() >= 3);
 }
 
 function RainbowText({ text }: { text: string }): React.ReactNode {
@@ -31,37 +29,35 @@ function RainbowText({ text }: { text: string }): React.ReactNode {
         </Text>
       ))}
     </>
-  )
+  );
 }
 
 // Rainbow /buddy teaser shown on startup when no companion hatched yet.
 // Idle presence and reactions are handled by CompanionSprite directly.
 export function useBuddyNotification(): void {
-  const { addNotification, removeNotification } = useNotifications()
+  const { addNotification, removeNotification } = useNotifications();
 
   useEffect(() => {
-    if (!feature('BUDDY')) return
-    const config = getGlobalConfig()
-    if (config.companion || !isBuddyTeaserWindow()) return
+    if (!feature('BUDDY')) return;
+    const config = getGlobalConfig();
+    if (config.companion || !isBuddyTeaserWindow()) return;
     addNotification({
       key: 'buddy-teaser',
       jsx: <RainbowText text="/buddy" />,
       priority: 'immediate',
       timeoutMs: 15_000,
-    })
-    return () => removeNotification('buddy-teaser')
-  }, [addNotification, removeNotification])
+    });
+    return () => removeNotification('buddy-teaser');
+  }, [addNotification, removeNotification]);
 }
 
-export function findBuddyTriggerPositions(
-  text: string,
-): Array<{ start: number; end: number }> {
-  if (!feature('BUDDY')) return []
-  const triggers: Array<{ start: number; end: number }> = []
-  const re = /\/buddy\b/g
-  let m: RegExpExecArray | null
+export function findBuddyTriggerPositions(text: string): Array<{ start: number; end: number }> {
+  if (!feature('BUDDY')) return [];
+  const triggers: Array<{ start: number; end: number }> = [];
+  const re = /\/buddy\b/g;
+  let m: RegExpExecArray | null;
   while ((m = re.exec(text)) !== null) {
-    triggers.push({ start: m.index, end: m.index + m[0].length })
+    triggers.push({ start: m.index, end: m.index + m[0].length });
   }
-  return triggers
+  return triggers;
 }
diff --git a/src/cli/bg.ts b/src/cli/bg.ts
index 3bc18e39f..ee2fbbdc1 100644
--- a/src/cli/bg.ts
+++ b/src/cli/bg.ts
@@ -200,7 +200,9 @@ export async function attachHandler(target: string | undefined): Promise<void> {
       const { TmuxEngine } = await import('./bg/engines/tmux.js')
       const tmux = new TmuxEngine()
       if (!(await tmux.available())) {
-        console.error('tmux is no longer available. Cannot attach to tmux session.')
+        console.error(
+          'tmux is no longer available. Cannot attach to tmux session.',
+        )
         process.exitCode = 1
         return
       }
@@ -301,7 +303,9 @@ export async function handleBgStart(args: string[]): Promise<void> {
     console.log(`  Engine: ${result.engineUsed}`)
     console.log(`  Log: ${result.logPath}`)
     console.log()
-    console.log(`Use \`claude daemon attach ${result.sessionName}\` to reconnect.`)
+    console.log(
+      `Use \`claude daemon attach ${result.sessionName}\` to reconnect.`,
+    )
     console.log(`Use \`claude daemon status\` to check status.`)
     console.log(`Use \`claude daemon kill ${result.sessionName}\` to stop.`)
   } catch (e) {
diff --git a/src/cli/bg/engines/detached.ts b/src/cli/bg/engines/detached.ts
index 3e168e4fd..d3eeeb22d 100644
--- a/src/cli/bg/engines/detached.ts
+++ b/src/cli/bg/engines/detached.ts
@@ -1,7 +1,12 @@
 import { spawn } from 'child_process'
 import { openSync, closeSync, mkdirSync } from 'fs'
 import { dirname } from 'path'
-import type { BgEngine, BgStartOptions, BgStartResult, SessionEntry } from '../engine.js'
+import type {
+  BgEngine,
+  BgStartOptions,
+  BgStartResult,
+  SessionEntry,
+} from '../engine.js'
 import { tailLog } from '../tail.js'
 
 export class DetachedEngine implements BgEngine {
diff --git a/src/cli/bg/engines/index.ts b/src/cli/bg/engines/index.ts
index cee304c54..b05bedd72 100644
--- a/src/cli/bg/engines/index.ts
+++ b/src/cli/bg/engines/index.ts
@@ -1,4 +1,9 @@
-export type { BgEngine, BgStartOptions, BgStartResult, SessionEntry } from '../engine.js'
+export type {
+  BgEngine,
+  BgStartOptions,
+  BgStartResult,
+  SessionEntry,
+} from '../engine.js'
 
 export async function selectEngine(): Promise<import('../engine.js').BgEngine> {
   if (process.platform === 'win32') {
diff --git a/src/cli/bg/engines/tmux.ts b/src/cli/bg/engines/tmux.ts
index bf978b621..2d5486ef3 100644
--- a/src/cli/bg/engines/tmux.ts
+++ b/src/cli/bg/engines/tmux.ts
@@ -1,7 +1,12 @@
 import { spawnSync } from 'child_process'
 import { execFileNoThrow } from '../../../utils/execFileNoThrow.js'
 import { quote } from '../../../utils/bash/shellQuote.js'
-import type { BgEngine, BgStartOptions, BgStartResult, SessionEntry } from '../engine.js'
+import type {
+  BgEngine,
+  BgStartOptions,
+  BgStartResult,
+  SessionEntry,
+} from '../engine.js'
 
 export class TmuxEngine implements BgEngine {
   readonly name = 'tmux' as const
diff --git a/src/cli/exit.ts b/src/cli/exit.ts
index 99e56f97b..b31fcf904 100644
--- a/src/cli/exit.ts
+++ b/src/cli/exit.ts
@@ -17,7 +17,6 @@
 
 /** Write an error message to stderr (if given) and exit with code 1. */
 export function cliError(msg?: string): never {
-  // biome-ignore lint/suspicious/noConsole: centralized CLI error output
   if (msg) console.error(msg)
   process.exit(1)
   return undefined as never
diff --git a/src/cli/handlers/agents.ts b/src/cli/handlers/agents.ts
index f02ce8e1d..5f2a40493 100644
--- a/src/cli/handlers/agents.ts
+++ b/src/cli/handlers/agents.ts
@@ -59,12 +59,9 @@ export async function agentsHandler(): Promise<void> {
   }
 
   if (lines.length === 0) {
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.log('No agents found.')
   } else {
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.log(`${totalActive} active agents\n`)
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.log(lines.join('\n').trimEnd())
   }
 }
diff --git a/src/cli/handlers/auth.ts b/src/cli/handlers/auth.ts
index 8b92c7dde..b17f9be57 100644
--- a/src/cli/handlers/auth.ts
+++ b/src/cli/handlers/auth.ts
@@ -159,7 +159,9 @@ export async function authLogin({
 
       const orgResult = await validateForceLoginOrg()
       if (!orgResult.valid) {
-        process.stderr.write((orgResult as { valid: false; message: string }).message + '\n')
+        process.stderr.write(
+          (orgResult as { valid: false; message: string }).message + '\n',
+        )
         process.exit(1)
       }
 
@@ -209,7 +211,9 @@ export async function authLogin({
 
     const orgResult = await validateForceLoginOrg()
     if (!orgResult.valid) {
-      process.stderr.write((orgResult as { valid: false; message: string }).message + '\n')
+      process.stderr.write(
+        (orgResult as { valid: false; message: string }).message + '\n',
+      )
       process.exit(1)
     }
 
diff --git a/src/cli/handlers/mcp.tsx b/src/cli/handlers/mcp.tsx
index ab543af11..95fb15de9 100644
--- a/src/cli/handlers/mcp.tsx
+++ b/src/cli/handlers/mcp.tsx
@@ -3,203 +3,163 @@
  * These are dynamically imported only when the corresponding `claude mcp *` command runs.
  */
 
-import { stat } from 'fs/promises'
-import pMap from 'p-map'
-import { cwd } from 'process'
-import React from 'react'
-import { MCPServerDesktopImportDialog } from '../../components/MCPServerDesktopImportDialog.js'
-import { wrappedRender as render } from '@anthropic/ink'
-import { KeybindingSetup } from '../../keybindings/KeybindingProviderSetup.js'
+import { stat } from 'fs/promises';
+import pMap from 'p-map';
+import { cwd } from 'process';
+import React from 'react';
+import { MCPServerDesktopImportDialog } from '../../components/MCPServerDesktopImportDialog.js';
+import { wrappedRender as render } from '@anthropic/ink';
+import { KeybindingSetup } from '../../keybindings/KeybindingProviderSetup.js';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from '../../services/analytics/index.js'
+} from '../../services/analytics/index.js';
 import {
   clearMcpClientConfig,
   clearServerTokensFromLocalStorage,
   getMcpClientConfig,
   readClientSecret,
   saveMcpClientSecret,
-} from '../../services/mcp/auth.js'
-import {
-  connectToServer,
-  getMcpServerConnectionBatchSize,
-} from '../../services/mcp/client.js'
+} from '../../services/mcp/auth.js';
+import { connectToServer, getMcpServerConnectionBatchSize } from '../../services/mcp/client.js';
 import {
   addMcpConfig,
   getAllMcpConfigs,
   getMcpConfigByName,
   getMcpConfigsByScope,
   removeMcpConfig,
-} from '../../services/mcp/config.js'
-import type {
-  ConfigScope,
-  ScopedMcpServerConfig,
-} from '../../services/mcp/types.js'
-import {
-  describeMcpConfigFilePath,
-  ensureConfigScope,
-  getScopeLabel,
-} from '../../services/mcp/utils.js'
-import { AppStateProvider } from '../../state/AppState.js'
-import {
-  getCurrentProjectConfig,
-  getGlobalConfig,
-  saveCurrentProjectConfig,
-} from '../../utils/config.js'
-import { isFsInaccessible } from '../../utils/errors.js'
-import { gracefulShutdown } from '../../utils/gracefulShutdown.js'
-import { safeParseJSON } from '../../utils/json.js'
-import { getPlatform } from '../../utils/platform.js'
-import { cliError, cliOk } from '../exit.js'
+} from '../../services/mcp/config.js';
+import type { ConfigScope, ScopedMcpServerConfig } from '../../services/mcp/types.js';
+import { describeMcpConfigFilePath, ensureConfigScope, getScopeLabel } from '../../services/mcp/utils.js';
+import { AppStateProvider } from '../../state/AppState.js';
+import { getCurrentProjectConfig, getGlobalConfig, saveCurrentProjectConfig } from '../../utils/config.js';
+import { isFsInaccessible } from '../../utils/errors.js';
+import { gracefulShutdown } from '../../utils/gracefulShutdown.js';
+import { safeParseJSON } from '../../utils/json.js';
+import { getPlatform } from '../../utils/platform.js';
+import { cliError, cliOk } from '../exit.js';
 
-async function checkMcpServerHealth(
-  name: string,
-  server: ScopedMcpServerConfig,
-): Promise<string> {
+async function checkMcpServerHealth(name: string, server: ScopedMcpServerConfig): Promise<string> {
   try {
-    const result = await connectToServer(name, server)
+    const result = await connectToServer(name, server);
     if (result.type === 'connected') {
-      return '✓ Connected'
+      return '✓ Connected';
     } else if (result.type === 'needs-auth') {
-      return '! Needs authentication'
+      return '! Needs authentication';
     } else {
-      return '✗ Failed to connect'
+      return '✗ Failed to connect';
     }
   } catch (_error) {
-    return '✗ Connection error'
+    return '✗ Connection error';
   }
 }
 
 // mcp serve (lines 4512–4532)
-export async function mcpServeHandler({
-  debug,
-  verbose,
-}: {
-  debug?: boolean
-  verbose?: boolean
-}): Promise<void> {
-  const providedCwd = cwd()
-  logEvent('tengu_mcp_start', {})
+export async function mcpServeHandler({ debug, verbose }: { debug?: boolean; verbose?: boolean }): Promise<void> {
+  const providedCwd = cwd();
+  logEvent('tengu_mcp_start', {});
 
   try {
-    await stat(providedCwd)
+    await stat(providedCwd);
   } catch (error) {
     if (isFsInaccessible(error)) {
-      cliError(`Error: Directory ${providedCwd} does not exist`)
+      cliError(`Error: Directory ${providedCwd} does not exist`);
     }
-    throw error
+    throw error;
   }
 
   try {
-    const { setup } = await import('../../setup.js')
-    await setup(providedCwd, 'default', false, false, undefined, false)
-    const { startMCPServer } = await import('../../entrypoints/mcp.js')
-    await startMCPServer(providedCwd, debug ?? false, verbose ?? false)
+    const { setup } = await import('../../setup.js');
+    await setup(providedCwd, 'default', false, false, undefined, false);
+    const { startMCPServer } = await import('../../entrypoints/mcp.js');
+    await startMCPServer(providedCwd, debug ?? false, verbose ?? false);
   } catch (error) {
-    cliError(`Error: Failed to start MCP server: ${error}`)
+    cliError(`Error: Failed to start MCP server: ${error}`);
   }
 }
 
 // mcp remove (lines 4545–4635)
-export async function mcpRemoveHandler(
-  name: string,
-  options: { scope?: string },
-): Promise<void> {
+export async function mcpRemoveHandler(name: string, options: { scope?: string }): Promise<void> {
   // Look up config before removing so we can clean up secure storage
-  const serverBeforeRemoval = getMcpConfigByName(name)
+  const serverBeforeRemoval = getMcpConfigByName(name);
 
   const cleanupSecureStorage = () => {
-    if (
-      serverBeforeRemoval &&
-      (serverBeforeRemoval.type === 'sse' ||
-        serverBeforeRemoval.type === 'http')
-    ) {
-      clearServerTokensFromLocalStorage(name, serverBeforeRemoval)
-      clearMcpClientConfig(name, serverBeforeRemoval)
+    if (serverBeforeRemoval && (serverBeforeRemoval.type === 'sse' || serverBeforeRemoval.type === 'http')) {
+      clearServerTokensFromLocalStorage(name, serverBeforeRemoval);
+      clearMcpClientConfig(name, serverBeforeRemoval);
     }
-  }
+  };
 
   try {
     if (options.scope) {
-      const scope = ensureConfigScope(options.scope)
+      const scope = ensureConfigScope(options.scope);
       logEvent('tengu_mcp_delete', {
         name: name as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        scope:
-          scope as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
+        scope: scope as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
 
-      await removeMcpConfig(name, scope)
-      cleanupSecureStorage()
-      process.stdout.write(`Removed MCP server ${name} from ${scope} config\n`)
-      cliOk(`File modified: ${describeMcpConfigFilePath(scope)}`)
+      await removeMcpConfig(name, scope);
+      cleanupSecureStorage();
+      process.stdout.write(`Removed MCP server ${name} from ${scope} config\n`);
+      cliOk(`File modified: ${describeMcpConfigFilePath(scope)}`);
     }
 
     // If no scope specified, check where the server exists
-    const projectConfig = getCurrentProjectConfig()
-    const globalConfig = getGlobalConfig()
+    const projectConfig = getCurrentProjectConfig();
+    const globalConfig = getGlobalConfig();
 
     // Check if server exists in project scope (.mcp.json)
-    const { servers: projectServers } = getMcpConfigsByScope('project')
-    const mcpJsonExists = !!projectServers[name]
+    const { servers: projectServers } = getMcpConfigsByScope('project');
+    const mcpJsonExists = !!projectServers[name];
 
     // Count how many scopes contain this server
-    const scopes: Array<Exclude<ConfigScope, 'dynamic'>> = []
-    if (projectConfig.mcpServers?.[name]) scopes.push('local')
-    if (mcpJsonExists) scopes.push('project')
-    if (globalConfig.mcpServers?.[name]) scopes.push('user')
+    const scopes: Array<Exclude<ConfigScope, 'dynamic'>> = [];
+    if (projectConfig.mcpServers?.[name]) scopes.push('local');
+    if (mcpJsonExists) scopes.push('project');
+    if (globalConfig.mcpServers?.[name]) scopes.push('user');
 
     if (scopes.length === 0) {
-      cliError(`No MCP server found with name: "${name}"`)
+      cliError(`No MCP server found with name: "${name}"`);
     } else if (scopes.length === 1) {
       // Server exists in only one scope, remove it
-      const scope = scopes[0]!
+      const scope = scopes[0]!;
       logEvent('tengu_mcp_delete', {
         name: name as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        scope:
-          scope as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
+        scope: scope as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
 
-      await removeMcpConfig(name, scope)
-      cleanupSecureStorage()
-      process.stdout.write(
-        `Removed MCP server "${name}" from ${scope} config\n`,
-      )
-      cliOk(`File modified: ${describeMcpConfigFilePath(scope)}`)
+      await removeMcpConfig(name, scope);
+      cleanupSecureStorage();
+      process.stdout.write(`Removed MCP server "${name}" from ${scope} config\n`);
+      cliOk(`File modified: ${describeMcpConfigFilePath(scope)}`);
     } else {
       // Server exists in multiple scopes
-      process.stderr.write(`MCP server "${name}" exists in multiple scopes:\n`)
+      process.stderr.write(`MCP server "${name}" exists in multiple scopes:\n`);
       scopes.forEach(scope => {
-        process.stderr.write(
-          `  - ${getScopeLabel(scope)} (${describeMcpConfigFilePath(scope)})\n`,
-        )
-      })
-      process.stderr.write('\nTo remove from a specific scope, use:\n')
+        process.stderr.write(`  - ${getScopeLabel(scope)} (${describeMcpConfigFilePath(scope)})\n`);
+      });
+      process.stderr.write('\nTo remove from a specific scope, use:\n');
       scopes.forEach(scope => {
-        process.stderr.write(`  claude mcp remove "${name}" -s ${scope}\n`)
-      })
-      cliError()
+        process.stderr.write(`  claude mcp remove "${name}" -s ${scope}\n`);
+      });
+      cliError();
     }
   } catch (error) {
-    cliError((error as Error).message)
+    cliError((error as Error).message);
   }
 }
 
 // mcp list (lines 4641–4688)
 export async function mcpListHandler(): Promise<void> {
-  logEvent('tengu_mcp_list', {})
-  const { servers: configs } = await getAllMcpConfigs()
+  logEvent('tengu_mcp_list', {});
+  const { servers: configs } = await getAllMcpConfigs();
   if (Object.keys(configs).length === 0) {
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
-    console.log(
-      'No MCP servers configured. Use `claude mcp add` to add a server.',
-    )
+    console.log('No MCP servers configured. Use `claude mcp add` to add a server.');
   } else {
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
-    console.log('Checking MCP server health...\n')
+    console.log('Checking MCP server health...\n');
 
     // Check servers concurrently
-    const entries = Object.entries(configs)
+    const entries = Object.entries(configs);
     const results = await pMap(
       entries,
       async ([name, server]) => ({
@@ -208,127 +168,100 @@ export async function mcpListHandler(): Promise<void> {
         status: await checkMcpServerHealth(name, server),
       }),
       { concurrency: getMcpServerConnectionBatchSize() },
-    )
+    );
 
     for (const { name, server, status } of results) {
       // Intentionally excluding sse-ide servers here since they're internal
       if (server.type === 'sse') {
-        // biome-ignore lint/suspicious/noConsole:: intentional console output
-        console.log(`${name}: ${server.url} (SSE) - ${status}`)
+        console.log(`${name}: ${server.url} (SSE) - ${status}`);
       } else if (server.type === 'http') {
-        // biome-ignore lint/suspicious/noConsole:: intentional console output
-        console.log(`${name}: ${server.url} (HTTP) - ${status}`)
+        console.log(`${name}: ${server.url} (HTTP) - ${status}`);
       } else if (server.type === 'claudeai-proxy') {
-        // biome-ignore lint/suspicious/noConsole:: intentional console output
-        console.log(`${name}: ${server.url} - ${status}`)
+        console.log(`${name}: ${server.url} - ${status}`);
       } else if (!server.type || server.type === 'stdio') {
-        const stdioServer = server as { command: string; args: string[]; type?: string }
-        const args = Array.isArray(stdioServer.args) ? stdioServer.args : []
-        // biome-ignore lint/suspicious/noConsole:: intentional console output
-        console.log(`${name}: ${stdioServer.command} ${args.join(' ')} - ${status}`)
+        const stdioServer = server as { command: string; args: string[]; type?: string };
+        const args = Array.isArray(stdioServer.args) ? stdioServer.args : [];
+        console.log(`${name}: ${stdioServer.command} ${args.join(' ')} - ${status}`);
       }
     }
   }
   // Use gracefulShutdown to properly clean up MCP server connections
   // (process.exit bypasses cleanup handlers, leaving child processes orphaned)
-  await gracefulShutdown(0)
+  await gracefulShutdown(0);
 }
 
 // mcp get (lines 4694–4786)
 export async function mcpGetHandler(name: string): Promise<void> {
   logEvent('tengu_mcp_get', {
     name: name as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-  })
-  const server = getMcpConfigByName(name)
+  });
+  const server = getMcpConfigByName(name);
   if (!server) {
-    cliError(`No MCP server found with name: ${name}`)
+    cliError(`No MCP server found with name: ${name}`);
   }
 
-  // biome-ignore lint/suspicious/noConsole:: intentional console output
-  console.log(`${name}:`)
-  // biome-ignore lint/suspicious/noConsole:: intentional console output
-  console.log(`  Scope: ${getScopeLabel(server.scope)}`)
+  console.log(`${name}:`);
+  console.log(`  Scope: ${getScopeLabel(server.scope)}`);
 
   // Check server health
-  const status = await checkMcpServerHealth(name, server)
-  // biome-ignore lint/suspicious/noConsole:: intentional console output
-  console.log(`  Status: ${status}`)
+  const status = await checkMcpServerHealth(name, server);
+  console.log(`  Status: ${status}`);
 
   // Intentionally excluding sse-ide servers here since they're internal
   if (server.type === 'sse') {
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
-    console.log(`  Type: sse`)
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
-    console.log(`  URL: ${server.url}`)
+    console.log(`  Type: sse`);
+    console.log(`  URL: ${server.url}`);
     if (server.headers) {
-      // biome-ignore lint/suspicious/noConsole:: intentional console output
-      console.log('  Headers:')
+      console.log('  Headers:');
       for (const [key, value] of Object.entries(server.headers)) {
-        // biome-ignore lint/suspicious/noConsole:: intentional console output
-        console.log(`    ${key}: ${value}`)
+        console.log(`    ${key}: ${value}`);
       }
     }
     if (server.oauth?.clientId || server.oauth?.callbackPort) {
-      const parts: string[] = []
+      const parts: string[] = [];
       if (server.oauth.clientId) {
-        parts.push('client_id configured')
-        const clientConfig = getMcpClientConfig(name, server)
-        if (clientConfig?.clientSecret) parts.push('client_secret configured')
+        parts.push('client_id configured');
+        const clientConfig = getMcpClientConfig(name, server);
+        if (clientConfig?.clientSecret) parts.push('client_secret configured');
       }
-      if (server.oauth.callbackPort)
-        parts.push(`callback_port ${server.oauth.callbackPort}`)
-      // biome-ignore lint/suspicious/noConsole:: intentional console output
-      console.log(`  OAuth: ${parts.join(', ')}`)
+      if (server.oauth.callbackPort) parts.push(`callback_port ${server.oauth.callbackPort}`);
+      console.log(`  OAuth: ${parts.join(', ')}`);
     }
   } else if (server.type === 'http') {
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
-    console.log(`  Type: http`)
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
-    console.log(`  URL: ${server.url}`)
+    console.log(`  Type: http`);
+    console.log(`  URL: ${server.url}`);
     if (server.headers) {
-      // biome-ignore lint/suspicious/noConsole:: intentional console output
-      console.log('  Headers:')
+      console.log('  Headers:');
       for (const [key, value] of Object.entries(server.headers)) {
-        // biome-ignore lint/suspicious/noConsole:: intentional console output
-        console.log(`    ${key}: ${value}`)
+        console.log(`    ${key}: ${value}`);
       }
     }
     if (server.oauth?.clientId || server.oauth?.callbackPort) {
-      const parts: string[] = []
+      const parts: string[] = [];
       if (server.oauth.clientId) {
-        parts.push('client_id configured')
-        const clientConfig = getMcpClientConfig(name, server)
-        if (clientConfig?.clientSecret) parts.push('client_secret configured')
+        parts.push('client_id configured');
+        const clientConfig = getMcpClientConfig(name, server);
+        if (clientConfig?.clientSecret) parts.push('client_secret configured');
       }
-      if (server.oauth.callbackPort)
-        parts.push(`callback_port ${server.oauth.callbackPort}`)
-      // biome-ignore lint/suspicious/noConsole:: intentional console output
-      console.log(`  OAuth: ${parts.join(', ')}`)
+      if (server.oauth.callbackPort) parts.push(`callback_port ${server.oauth.callbackPort}`);
+      console.log(`  OAuth: ${parts.join(', ')}`);
     }
   } else if (server.type === 'stdio') {
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
-    console.log(`  Type: stdio`)
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
-    console.log(`  Command: ${server.command}`)
-    const args = Array.isArray(server.args) ? server.args : []
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
-    console.log(`  Args: ${args.join(' ')}`)
+    console.log(`  Type: stdio`);
+    console.log(`  Command: ${server.command}`);
+    const args = Array.isArray(server.args) ? server.args : [];
+    console.log(`  Args: ${args.join(' ')}`);
     if (server.env) {
-      // biome-ignore lint/suspicious/noConsole:: intentional console output
-      console.log('  Environment:')
+      console.log('  Environment:');
       for (const [key, value] of Object.entries(server.env)) {
-        // biome-ignore lint/suspicious/noConsole:: intentional console output
-        console.log(`    ${key}=${value}`)
+        console.log(`    ${key}=${value}`);
       }
     }
   }
-  // biome-ignore lint/suspicious/noConsole:: intentional console output
-  console.log(
-    `\nTo remove this server, run: claude mcp remove "${name}" -s ${server.scope}`,
-  )
+  console.log(`\nTo remove this server, run: claude mcp remove "${name}" -s ${server.scope}`);
   // Use gracefulShutdown to properly clean up MCP server connections
   // (process.exit bypasses cleanup handlers, leaving child processes orphaned)
-  await gracefulShutdown(0)
+  await gracefulShutdown(0);
 }
 
 // mcp add-json (lines 4801–4870)
@@ -338,8 +271,8 @@ export async function mcpAddJsonHandler(
   options: { scope?: string; clientSecret?: true },
 ): Promise<void> {
   try {
-    const scope = ensureConfigScope(options.scope)
-    const parsedJson = safeParseJSON(json)
+    const scope = ensureConfigScope(options.scope);
+    const parsedJson = safeParseJSON(json);
 
     // Read secret before writing config so cancellation doesn't leave partial state
     const needsSecret =
@@ -353,15 +286,15 @@ export async function mcpAddJsonHandler(
       'oauth' in parsedJson &&
       parsedJson.oauth &&
       typeof parsedJson.oauth === 'object' &&
-      'clientId' in parsedJson.oauth
-    const clientSecret = needsSecret ? await readClientSecret() : undefined
+      'clientId' in parsedJson.oauth;
+    const clientSecret = needsSecret ? await readClientSecret() : undefined;
 
-    await addMcpConfig(name, parsedJson, scope)
+    await addMcpConfig(name, parsedJson, scope);
 
     const transportType =
       parsedJson && typeof parsedJson === 'object' && 'type' in parsedJson
         ? String(parsedJson.type || 'stdio')
-        : 'stdio'
+        : 'stdio';
 
     if (
       clientSecret &&
@@ -372,53 +305,38 @@ export async function mcpAddJsonHandler(
       'url' in parsedJson &&
       typeof parsedJson.url === 'string'
     ) {
-      saveMcpClientSecret(
-        name,
-        { type: parsedJson.type, url: parsedJson.url },
-        clientSecret,
-      )
+      saveMcpClientSecret(name, { type: parsedJson.type, url: parsedJson.url }, clientSecret);
     }
 
     logEvent('tengu_mcp_add', {
-      scope:
-        scope as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      source:
-        'json' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      scope: scope as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      source: 'json' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
       type: transportType as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-    })
+    });
 
-    cliOk(`Added ${transportType} MCP server ${name} to ${scope} config`)
+    cliOk(`Added ${transportType} MCP server ${name} to ${scope} config`);
   } catch (error) {
-    cliError((error as Error).message)
+    cliError((error as Error).message);
   }
 }
 
 // mcp add-from-claude-desktop (lines 4881–4927)
-export async function mcpAddFromDesktopHandler(options: {
-  scope?: string
-}): Promise<void> {
+export async function mcpAddFromDesktopHandler(options: { scope?: string }): Promise<void> {
   try {
-    const scope = ensureConfigScope(options.scope)
-    const platform = getPlatform()
+    const scope = ensureConfigScope(options.scope);
+    const platform = getPlatform();
 
     logEvent('tengu_mcp_add', {
-      scope:
-        scope as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      platform:
-        platform as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      source:
-        'desktop' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-    })
+      scope: scope as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      platform: platform as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      source: 'desktop' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+    });
 
-    const { readClaudeDesktopMcpServers } = await import(
-      '../../utils/claudeDesktop.js'
-    )
-    const servers = await readClaudeDesktopMcpServers()
+    const { readClaudeDesktopMcpServers } = await import('../../utils/claudeDesktop.js');
+    const servers = await readClaudeDesktopMcpServers();
 
     if (Object.keys(servers).length === 0) {
-      cliOk(
-        'No MCP servers found in Claude Desktop configuration or configuration file does not exist.',
-      )
+      cliOk('No MCP servers found in Claude Desktop configuration or configuration file does not exist.');
     }
 
     const { unmount } = await render(
@@ -428,29 +346,29 @@ export async function mcpAddFromDesktopHandler(options: {
             servers={servers}
             scope={scope}
             onDone={() => {
-              unmount()
+              unmount();
             }}
           />
         </KeybindingSetup>
       </AppStateProvider>,
       { exitOnCtrlC: true },
-    )
+    );
   } catch (error) {
-    cliError((error as Error).message)
+    cliError((error as Error).message);
   }
 }
 
 // mcp reset-project-choices (lines 4935–4952)
 export async function mcpResetChoicesHandler(): Promise<void> {
-  logEvent('tengu_mcp_reset_mcpjson_choices', {})
+  logEvent('tengu_mcp_reset_mcpjson_choices', {});
   saveCurrentProjectConfig(current => ({
     ...current,
     enabledMcpjsonServers: [],
     disabledMcpjsonServers: [],
     enableAllProjectMcpServers: false,
-  }))
+  }));
   cliOk(
     'All project-scoped (.mcp.json) server approvals and rejections have been reset.\n' +
       'You will be prompted for approval next time you start Claude Code.',
-  )
+  );
 }
diff --git a/src/cli/handlers/plugins.ts b/src/cli/handlers/plugins.ts
index 9236abe0a..8a3c48a30 100644
--- a/src/cli/handlers/plugins.ts
+++ b/src/cli/handlers/plugins.ts
@@ -72,27 +72,21 @@ export function handleMarketplaceError(error: unknown, action: string): never {
 
 function printValidationResult(result: ValidationResult): void {
   if (result.errors.length > 0) {
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.log(
       `${figures.cross} Found ${result.errors.length} ${plural(result.errors.length, 'error')}:\n`,
     )
     result.errors.forEach(error => {
-      // biome-ignore lint/suspicious/noConsole:: intentional console output
       console.log(`  ${figures.pointer} ${error.path}: ${error.message}`)
     })
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.log('')
   }
   if (result.warnings.length > 0) {
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.log(
       `${figures.warning} Found ${result.warnings.length} ${plural(result.warnings.length, 'warning')}:\n`,
     )
     result.warnings.forEach(warning => {
-      // biome-ignore lint/suspicious/noConsole:: intentional console output
       console.log(`  ${figures.pointer} ${warning.path}: ${warning.message}`)
     })
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.log('')
   }
 }
@@ -106,7 +100,6 @@ export async function pluginValidateHandler(
   try {
     const result = await validateManifest(manifestPath)
 
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.log(`Validating ${result.fileType} manifest: ${result.filePath}\n`)
     printValidationResult(result)
 
@@ -120,7 +113,6 @@ export async function pluginValidateHandler(
       if (basename(manifestDir) === '.claude-plugin') {
         contentResults = await validatePluginContents(dirname(manifestDir))
         for (const r of contentResults) {
-          // biome-ignore lint/suspicious/noConsole:: intentional console output
           console.log(`Validating ${r.fileType}: ${r.filePath}\n`)
           printValidationResult(r)
         }
@@ -139,13 +131,11 @@ export async function pluginValidateHandler(
           : `${figures.tick} Validation passed`,
       )
     } else {
-      // biome-ignore lint/suspicious/noConsole:: intentional console output
       console.log(`${figures.cross} Validation failed`)
       process.exit(1)
     }
   } catch (error) {
     logError(error)
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.error(
       `${figures.cross} Unexpected error during validation: ${errorMessage(error)}`,
     )
@@ -358,7 +348,6 @@ export async function pluginListHandler(options: {
   }
 
   if (pluginIds.length > 0) {
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.log('Installed plugins:\n')
   }
 
@@ -383,25 +372,18 @@ export async function pluginListHandler(options: {
       const version = installation.version || 'unknown'
       const scope = installation.scope
 
-      // biome-ignore lint/suspicious/noConsole:: intentional console output
       console.log(`  ${figures.pointer} ${pluginId}`)
-      // biome-ignore lint/suspicious/noConsole:: intentional console output
       console.log(`    Version: ${version}`)
-      // biome-ignore lint/suspicious/noConsole:: intentional console output
       console.log(`    Scope: ${scope}`)
-      // biome-ignore lint/suspicious/noConsole:: intentional console output
       console.log(`    Status: ${status}`)
       for (const error of pluginErrors) {
-        // biome-ignore lint/suspicious/noConsole:: intentional console output
         console.log(`    Error: ${getPluginErrorMessage(error)}`)
       }
-      // biome-ignore lint/suspicious/noConsole:: intentional console output
       console.log('')
     }
   }
 
   if (inlinePlugins.length > 0 || inlineLoadErrors.length > 0) {
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.log('Session-only plugins (--plugin-dir):\n')
     for (const p of inlinePlugins) {
       // Same dirName≠manifestName fallback as the JSON path above — error
@@ -413,19 +395,13 @@ export async function pluginListHandler(options: {
         pErrors.length > 0
           ? `${figures.cross} loaded with errors`
           : `${figures.tick} loaded`
-      // biome-ignore lint/suspicious/noConsole:: intentional console output
       console.log(`  ${figures.pointer} ${p.source}`)
-      // biome-ignore lint/suspicious/noConsole:: intentional console output
       console.log(`    Version: ${p.manifest.version ?? 'unknown'}`)
-      // biome-ignore lint/suspicious/noConsole:: intentional console output
       console.log(`    Path: ${p.path}`)
-      // biome-ignore lint/suspicious/noConsole:: intentional console output
       console.log(`    Status: ${status}`)
       for (const e of pErrors) {
-        // biome-ignore lint/suspicious/noConsole:: intentional console output
         console.log(`    Error: ${getPluginErrorMessage(e)}`)
       }
-      // biome-ignore lint/suspicious/noConsole:: intentional console output
       console.log('')
     }
     // Path-level failures: no LoadedPlugin object exists. Show them so
@@ -433,7 +409,6 @@ export async function pluginListHandler(options: {
     for (const e of inlineLoadErrors.filter(e =>
       e.source.startsWith('inline['),
     )) {
-      // biome-ignore lint/suspicious/noConsole:: intentional console output
       console.log(
         `  ${figures.pointer} ${e.source}: ${figures.cross} ${getPluginErrorMessage(e)}\n`,
       )
@@ -489,12 +464,10 @@ export async function marketplaceAddHandler(
       }
     }
 
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.log('Adding marketplace...')
 
     const { name, alreadyMaterialized, resolvedSource } =
       await addMarketplaceSource(marketplaceSource, message => {
-        // biome-ignore lint/suspicious/noConsole:: intentional console output
         console.log(message)
       })
 
@@ -555,33 +528,25 @@ export async function marketplaceListHandler(options: {
       cliOk('No marketplaces configured')
     }
 
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.log('Configured marketplaces:\n')
     names.forEach(name => {
       const marketplace = config[name]
-      // biome-ignore lint/suspicious/noConsole:: intentional console output
       console.log(`  ${figures.pointer} ${name}`)
 
       if (marketplace?.source) {
         const src = marketplace.source
         if (src.source === 'github') {
-          // biome-ignore lint/suspicious/noConsole:: intentional console output
           console.log(`    Source: GitHub (${src.repo})`)
         } else if (src.source === 'git') {
-          // biome-ignore lint/suspicious/noConsole:: intentional console output
           console.log(`    Source: Git (${src.url})`)
         } else if (src.source === 'url') {
-          // biome-ignore lint/suspicious/noConsole:: intentional console output
           console.log(`    Source: URL (${src.url})`)
         } else if (src.source === 'directory') {
-          // biome-ignore lint/suspicious/noConsole:: intentional console output
           console.log(`    Source: Directory (${src.path})`)
         } else if (src.source === 'file') {
-          // biome-ignore lint/suspicious/noConsole:: intentional console output
           console.log(`    Source: File (${src.path})`)
         }
       }
-      // biome-ignore lint/suspicious/noConsole:: intentional console output
       console.log('')
     })
 
@@ -620,11 +585,9 @@ export async function marketplaceUpdateHandler(
   if (options.cowork) setUseCoworkPlugins(true)
   try {
     if (name) {
-      // biome-ignore lint/suspicious/noConsole:: intentional console output
       console.log(`Updating marketplace: ${name}...`)
 
       await refreshMarketplace(name, message => {
-        // biome-ignore lint/suspicious/noConsole:: intentional console output
         console.log(message)
       })
 
@@ -644,7 +607,6 @@ export async function marketplaceUpdateHandler(
         cliOk('No marketplaces configured')
       }
 
-      // biome-ignore lint/suspicious/noConsole:: intentional console output
       console.log(`Updating ${marketplaceNames.length} marketplace(s)...`)
 
       await refreshAllMarketplaces()
diff --git a/src/cli/handlers/util.tsx b/src/cli/handlers/util.tsx
index b1a8cc0b9..a793c0a92 100644
--- a/src/cli/handlers/util.tsx
+++ b/src/cli/handlers/util.tsx
@@ -4,26 +4,24 @@
  */
 /* eslint-disable custom-rules/no-process-exit -- CLI subcommand handlers intentionally exit */
 
-import { cwd } from 'process'
-import React from 'react'
-import { WelcomeV2 } from '../../components/LogoV2/WelcomeV2.js'
-import { useManagePlugins } from '../../hooks/useManagePlugins.js'
-import type { Root } from '@anthropic/ink'
-import { Box, Text } from '@anthropic/ink'
-import { KeybindingSetup } from '../../keybindings/KeybindingProviderSetup.js'
-import { logEvent } from '../../services/analytics/index.js'
-import { MCPConnectionManager } from '../../services/mcp/MCPConnectionManager.js'
-import { AppStateProvider } from '../../state/AppState.js'
-import { onChangeAppState } from '../../state/onChangeAppState.js'
-import { isAnthropicAuthEnabled } from '../../utils/auth.js'
+import { cwd } from 'process';
+import React from 'react';
+import { WelcomeV2 } from '../../components/LogoV2/WelcomeV2.js';
+import { useManagePlugins } from '../../hooks/useManagePlugins.js';
+import type { Root } from '@anthropic/ink';
+import { Box, Text } from '@anthropic/ink';
+import { KeybindingSetup } from '../../keybindings/KeybindingProviderSetup.js';
+import { logEvent } from '../../services/analytics/index.js';
+import { MCPConnectionManager } from '../../services/mcp/MCPConnectionManager.js';
+import { AppStateProvider } from '../../state/AppState.js';
+import { onChangeAppState } from '../../state/onChangeAppState.js';
+import { isAnthropicAuthEnabled } from '../../utils/auth.js';
 
 export async function setupTokenHandler(root: Root): Promise<void> {
-  logEvent('tengu_setup_token_command', {})
+  logEvent('tengu_setup_token_command', {});
 
-  const showAuthWarning = !isAnthropicAuthEnabled()
-  const { ConsoleOAuthFlow } = await import(
-    '../../components/ConsoleOAuthFlow.js'
-  )
+  const showAuthWarning = !isAnthropicAuthEnabled();
+  const { ConsoleOAuthFlow } = await import('../../components/ConsoleOAuthFlow.js');
   await new Promise<void>(resolve => {
     root.render(
       <AppStateProvider onChangeAppState={onChangeAppState}>
@@ -33,18 +31,16 @@ export async function setupTokenHandler(root: Root): Promise<void> {
             {showAuthWarning && (
               <Box flexDirection="column">
                 <Text color="warning">
-                  Warning: You already have authentication configured via
-                  environment variable or API key helper.
+                  Warning: You already have authentication configured via environment variable or API key helper.
                 </Text>
                 <Text color="warning">
-                  The setup-token command will create a new OAuth token which
-                  you can use instead.
+                  The setup-token command will create a new OAuth token which you can use instead.
                 </Text>
               </Box>
             )}
             <ConsoleOAuthFlow
               onDone={() => {
-                void resolve()
+                void resolve();
               }}
               mode="setup-token"
               startingMessage="This will guide you through long-lived (1-year) auth token setup for your Claude account. Claude subscription required."
@@ -52,75 +48,63 @@ export async function setupTokenHandler(root: Root): Promise<void> {
           </Box>
         </KeybindingSetup>
       </AppStateProvider>,
-    )
-  })
-  root.unmount()
-  process.exit(0)
+    );
+  });
+  root.unmount();
+  process.exit(0);
 }
 
 // DoctorWithPlugins wrapper + doctor handler
-const DoctorLazy = React.lazy(() =>
-  import('../../screens/Doctor.js').then(m => ({ default: m.Doctor })),
-)
+const DoctorLazy = React.lazy(() => import('../../screens/Doctor.js').then(m => ({ default: m.Doctor })));
 
-function DoctorWithPlugins({
-  onDone,
-}: {
-  onDone: () => void
-}): React.ReactNode {
-  useManagePlugins()
+function DoctorWithPlugins({ onDone }: { onDone: () => void }): React.ReactNode {
+  useManagePlugins();
   return (
     <React.Suspense fallback={null}>
       <DoctorLazy onDone={onDone} />
     </React.Suspense>
-  )
+  );
 }
 
 export async function doctorHandler(root: Root): Promise<void> {
-  logEvent('tengu_doctor_command', {})
+  logEvent('tengu_doctor_command', {});
 
   await new Promise<void>(resolve => {
     root.render(
       <AppStateProvider>
         <KeybindingSetup>
-          <MCPConnectionManager
-            dynamicMcpConfig={undefined}
-            isStrictMcpConfig={false}
-          >
+          <MCPConnectionManager dynamicMcpConfig={undefined} isStrictMcpConfig={false}>
             <DoctorWithPlugins
               onDone={() => {
-                void resolve()
+                void resolve();
               }}
             />
           </MCPConnectionManager>
         </KeybindingSetup>
       </AppStateProvider>,
-    )
-  })
-  root.unmount()
-  process.exit(0)
+    );
+  });
+  root.unmount();
+  process.exit(0);
 }
 
 // install handler
-export async function installHandler(
-  target: string | undefined,
-  options: { force?: boolean },
-): Promise<void> {
-  const { setup } = await import('../../setup.js')
-  await setup(cwd(), 'default', false, false, undefined, false)
-  const { install } = await import('../../commands/install.js')
+export async function installHandler(target: string | undefined, options: { force?: boolean }): Promise<void> {
+  const { setup } = await import('../../setup.js');
+  await setup(cwd(), 'default', false, false, undefined, false);
+  const { install } = await import('../../commands/install.js');
   await new Promise<void>(resolve => {
-    const args: string[] = []
-    if (target) args.push(target)
-    if (options.force) args.push('--force')
+    const args: string[] = [];
+    if (target) args.push(target);
+    if (options.force) args.push('--force');
 
     void install.call(
       result => {
-        void resolve()
-        process.exit(result.includes('failed') ? 1 : 0)
+        void resolve();
+        process.exit(result.includes('failed') ? 1 : 0);
       },
       {},
       args,
-    )
-  })
+    );
+  });
 }
diff --git a/src/cli/src/QueryEngine.ts b/src/cli/src/QueryEngine.ts
index 4771549b4..85d66db12 100644
--- a/src/cli/src/QueryEngine.ts
+++ b/src/cli/src/QueryEngine.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type ask = any;
+export type ask = any
diff --git a/src/cli/src/cli/handlers/auth.ts b/src/cli/src/cli/handlers/auth.ts
index c420d9446..241a6edee 100644
--- a/src/cli/src/cli/handlers/auth.ts
+++ b/src/cli/src/cli/handlers/auth.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type installOAuthTokens = any;
+export type installOAuthTokens = any
diff --git a/src/cli/src/cli/remoteIO.ts b/src/cli/src/cli/remoteIO.ts
index 0fc9133a5..1ae827871 100644
--- a/src/cli/src/cli/remoteIO.ts
+++ b/src/cli/src/cli/remoteIO.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type RemoteIO = any;
+export type RemoteIO = any
diff --git a/src/cli/src/cli/structuredIO.ts b/src/cli/src/cli/structuredIO.ts
index 00c29d618..abfaf2656 100644
--- a/src/cli/src/cli/structuredIO.ts
+++ b/src/cli/src/cli/structuredIO.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type StructuredIO = any;
+export type StructuredIO = any
diff --git a/src/cli/src/commands/context/context-noninteractive.ts b/src/cli/src/commands/context/context-noninteractive.ts
index 08e0c07c7..d79234af0 100644
--- a/src/cli/src/commands/context/context-noninteractive.ts
+++ b/src/cli/src/commands/context/context-noninteractive.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type collectContextData = any;
+export type collectContextData = any
diff --git a/src/cli/src/entrypoints/agentSdkTypes.ts b/src/cli/src/entrypoints/agentSdkTypes.ts
index 4ac970c6e..71a2c250d 100644
--- a/src/cli/src/entrypoints/agentSdkTypes.ts
+++ b/src/cli/src/entrypoints/agentSdkTypes.ts
@@ -1,14 +1,14 @@
 // Auto-generated type stub — replace with real implementation
-export type SDKStatus = any;
-export type ModelInfo = any;
-export type SDKMessage = any;
-export type SDKUserMessage = any;
-export type SDKUserMessageReplay = any;
-export type PermissionResult = any;
-export type McpServerConfigForProcessTransport = any;
-export type McpServerStatus = any;
-export type RewindFilesResult = any;
-export type HookEvent = any;
-export type HookInput = any;
-export type HookJSONOutput = any;
-export type PermissionUpdate = any;
+export type SDKStatus = any
+export type ModelInfo = any
+export type SDKMessage = any
+export type SDKUserMessage = any
+export type SDKUserMessageReplay = any
+export type PermissionResult = any
+export type McpServerConfigForProcessTransport = any
+export type McpServerStatus = any
+export type RewindFilesResult = any
+export type HookEvent = any
+export type HookInput = any
+export type HookJSONOutput = any
+export type PermissionUpdate = any
diff --git a/src/cli/src/entrypoints/sdk/controlSchemas.ts b/src/cli/src/entrypoints/sdk/controlSchemas.ts
index 886758286..8df23da8d 100644
--- a/src/cli/src/entrypoints/sdk/controlSchemas.ts
+++ b/src/cli/src/entrypoints/sdk/controlSchemas.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type SDKControlElicitationResponseSchema = any;
+export type SDKControlElicitationResponseSchema = any
diff --git a/src/cli/src/entrypoints/sdk/controlTypes.ts b/src/cli/src/entrypoints/sdk/controlTypes.ts
index e78800ea8..1febbc56b 100644
--- a/src/cli/src/entrypoints/sdk/controlTypes.ts
+++ b/src/cli/src/entrypoints/sdk/controlTypes.ts
@@ -1,9 +1,9 @@
 // Auto-generated type stub — replace with real implementation
-export type StdoutMessage = any;
-export type SDKControlInitializeRequest = any;
-export type SDKControlInitializeResponse = any;
-export type SDKControlRequest = any;
-export type SDKControlResponse = any;
-export type SDKControlMcpSetServersResponse = any;
-export type SDKControlReloadPluginsResponse = any;
-export type StdinMessage = any;
+export type StdoutMessage = any
+export type SDKControlInitializeRequest = any
+export type SDKControlInitializeResponse = any
+export type SDKControlRequest = any
+export type SDKControlResponse = any
+export type SDKControlMcpSetServersResponse = any
+export type SDKControlReloadPluginsResponse = any
+export type StdinMessage = any
diff --git a/src/cli/src/hooks/useCanUseTool.ts b/src/cli/src/hooks/useCanUseTool.ts
index 056468f12..9e1aa12a5 100644
--- a/src/cli/src/hooks/useCanUseTool.ts
+++ b/src/cli/src/hooks/useCanUseTool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type CanUseToolFn = any;
+export type CanUseToolFn = any
diff --git a/src/cli/src/services/PromptSuggestion/promptSuggestion.ts b/src/cli/src/services/PromptSuggestion/promptSuggestion.ts
index 29070743b..39379f7e2 100644
--- a/src/cli/src/services/PromptSuggestion/promptSuggestion.ts
+++ b/src/cli/src/services/PromptSuggestion/promptSuggestion.ts
@@ -1,5 +1,5 @@
 // Auto-generated type stub — replace with real implementation
-export type tryGenerateSuggestion = any;
-export type logSuggestionOutcome = any;
-export type logSuggestionSuppressed = any;
-export type PromptVariant = any;
+export type tryGenerateSuggestion = any
+export type logSuggestionOutcome = any
+export type logSuggestionSuppressed = any
+export type PromptVariant = any
diff --git a/src/cli/src/services/analytics/growthbook.ts b/src/cli/src/services/analytics/growthbook.ts
index e380906ea..7967fd3ee 100644
--- a/src/cli/src/services/analytics/growthbook.ts
+++ b/src/cli/src/services/analytics/growthbook.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getFeatureValue_CACHED_MAY_BE_STALE = any;
+export type getFeatureValue_CACHED_MAY_BE_STALE = any
diff --git a/src/cli/src/services/analytics/index.ts b/src/cli/src/services/analytics/index.ts
index ce0a9a827..eca4493cf 100644
--- a/src/cli/src/services/analytics/index.ts
+++ b/src/cli/src/services/analytics/index.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type logEvent = any;
-export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any;
+export type logEvent = any
+export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any
diff --git a/src/cli/src/services/api/grove.ts b/src/cli/src/services/api/grove.ts
index 5a12d8ce5..4d19c3c93 100644
--- a/src/cli/src/services/api/grove.ts
+++ b/src/cli/src/services/api/grove.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type isQualifiedForGrove = any;
-export type checkGroveForNonInteractive = any;
+export type isQualifiedForGrove = any
+export type checkGroveForNonInteractive = any
diff --git a/src/cli/src/services/api/logging.ts b/src/cli/src/services/api/logging.ts
index 2676d9ab3..d44453e57 100644
--- a/src/cli/src/services/api/logging.ts
+++ b/src/cli/src/services/api/logging.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type EMPTY_USAGE = any;
+export type EMPTY_USAGE = any
diff --git a/src/cli/src/services/claudeAiLimits.ts b/src/cli/src/services/claudeAiLimits.ts
index 5d55387cb..b354a4815 100644
--- a/src/cli/src/services/claudeAiLimits.ts
+++ b/src/cli/src/services/claudeAiLimits.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type statusListeners = any;
-export type ClaudeAILimits = any;
+export type statusListeners = any
+export type ClaudeAILimits = any
diff --git a/src/cli/src/services/mcp/auth.ts b/src/cli/src/services/mcp/auth.ts
index dd96658d0..dde315b26 100644
--- a/src/cli/src/services/mcp/auth.ts
+++ b/src/cli/src/services/mcp/auth.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type performMCPOAuthFlow = any;
-export type revokeServerTokens = any;
+export type performMCPOAuthFlow = any
+export type revokeServerTokens = any
diff --git a/src/cli/src/services/mcp/channelAllowlist.ts b/src/cli/src/services/mcp/channelAllowlist.ts
index 3bae533e2..88c7c126d 100644
--- a/src/cli/src/services/mcp/channelAllowlist.ts
+++ b/src/cli/src/services/mcp/channelAllowlist.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type isChannelAllowlisted = any;
-export type isChannelsEnabled = any;
+export type isChannelAllowlisted = any
+export type isChannelsEnabled = any
diff --git a/src/cli/src/services/mcp/channelNotification.ts b/src/cli/src/services/mcp/channelNotification.ts
index 2068b3ea8..38716dc9a 100644
--- a/src/cli/src/services/mcp/channelNotification.ts
+++ b/src/cli/src/services/mcp/channelNotification.ts
@@ -1,5 +1,5 @@
 // Auto-generated type stub — replace with real implementation
-export type ChannelMessageNotificationSchema = any;
-export type gateChannelServer = any;
-export type wrapChannelMessage = any;
-export type findChannelEntry = any;
+export type ChannelMessageNotificationSchema = any
+export type gateChannelServer = any
+export type wrapChannelMessage = any
+export type findChannelEntry = any
diff --git a/src/cli/src/services/mcp/client.ts b/src/cli/src/services/mcp/client.ts
index 845c793d7..7c12a4f6c 100644
--- a/src/cli/src/services/mcp/client.ts
+++ b/src/cli/src/services/mcp/client.ts
@@ -1,7 +1,7 @@
 // Auto-generated type stub — replace with real implementation
-export type setupSdkMcpClients = any;
-export type connectToServer = any;
-export type clearServerCache = any;
-export type fetchToolsForClient = any;
-export type areMcpConfigsEqual = any;
-export type reconnectMcpServerImpl = any;
+export type setupSdkMcpClients = any
+export type connectToServer = any
+export type clearServerCache = any
+export type fetchToolsForClient = any
+export type areMcpConfigsEqual = any
+export type reconnectMcpServerImpl = any
diff --git a/src/cli/src/services/mcp/config.ts b/src/cli/src/services/mcp/config.ts
index edc224ea5..44ebff18a 100644
--- a/src/cli/src/services/mcp/config.ts
+++ b/src/cli/src/services/mcp/config.ts
@@ -1,6 +1,6 @@
 // Auto-generated type stub — replace with real implementation
-export type filterMcpServersByPolicy = any;
-export type getMcpConfigByName = any;
-export type isMcpServerDisabled = any;
-export type setMcpServerEnabled = any;
-export type getAllMcpConfigs = any;
+export type filterMcpServersByPolicy = any
+export type getMcpConfigByName = any
+export type isMcpServerDisabled = any
+export type setMcpServerEnabled = any
+export type getAllMcpConfigs = any
diff --git a/src/cli/src/services/mcp/elicitationHandler.ts b/src/cli/src/services/mcp/elicitationHandler.ts
index 2b791775c..584f065dd 100644
--- a/src/cli/src/services/mcp/elicitationHandler.ts
+++ b/src/cli/src/services/mcp/elicitationHandler.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type runElicitationHooks = any;
-export type runElicitationResultHooks = any;
+export type runElicitationHooks = any
+export type runElicitationResultHooks = any
diff --git a/src/cli/src/services/mcp/mcpStringUtils.ts b/src/cli/src/services/mcp/mcpStringUtils.ts
index 9391a1b8a..e6113ecf5 100644
--- a/src/cli/src/services/mcp/mcpStringUtils.ts
+++ b/src/cli/src/services/mcp/mcpStringUtils.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getMcpPrefix = any;
+export type getMcpPrefix = any
diff --git a/src/cli/src/services/mcp/types.ts b/src/cli/src/services/mcp/types.ts
index 9e3199967..2a867ced2 100644
--- a/src/cli/src/services/mcp/types.ts
+++ b/src/cli/src/services/mcp/types.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type MCPServerConnection = any;
-export type McpSdkServerConfig = any;
-export type ScopedMcpServerConfig = any;
+export type MCPServerConnection = any
+export type McpSdkServerConfig = any
+export type ScopedMcpServerConfig = any
diff --git a/src/cli/src/services/mcp/utils.ts b/src/cli/src/services/mcp/utils.ts
index d77aad08e..4d299725a 100644
--- a/src/cli/src/services/mcp/utils.ts
+++ b/src/cli/src/services/mcp/utils.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type commandBelongsToServer = any;
-export type filterToolsByServer = any;
+export type commandBelongsToServer = any
+export type filterToolsByServer = any
diff --git a/src/cli/src/services/mcp/vscodeSdkMcp.ts b/src/cli/src/services/mcp/vscodeSdkMcp.ts
index acf5f2d9d..68573399d 100644
--- a/src/cli/src/services/mcp/vscodeSdkMcp.ts
+++ b/src/cli/src/services/mcp/vscodeSdkMcp.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type setupVscodeSdkMcp = any;
+export type setupVscodeSdkMcp = any
diff --git a/src/cli/src/services/oauth/index.ts b/src/cli/src/services/oauth/index.ts
index 81adfa1dc..e93bb2e2e 100644
--- a/src/cli/src/services/oauth/index.ts
+++ b/src/cli/src/services/oauth/index.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type OAuthService = any;
+export type OAuthService = any
diff --git a/src/cli/src/services/policyLimits/index.ts b/src/cli/src/services/policyLimits/index.ts
index 887817d1a..d46f0fab1 100644
--- a/src/cli/src/services/policyLimits/index.ts
+++ b/src/cli/src/services/policyLimits/index.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type isPolicyAllowed = any;
+export type isPolicyAllowed = any
diff --git a/src/cli/src/services/remoteManagedSettings/index.ts b/src/cli/src/services/remoteManagedSettings/index.ts
index c062fff71..cb354cb21 100644
--- a/src/cli/src/services/remoteManagedSettings/index.ts
+++ b/src/cli/src/services/remoteManagedSettings/index.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type waitForRemoteManagedSettingsToLoad = any;
+export type waitForRemoteManagedSettingsToLoad = any
diff --git a/src/cli/src/services/settingsSync/index.ts b/src/cli/src/services/settingsSync/index.ts
index 2974be7d5..596aa1b7e 100644
--- a/src/cli/src/services/settingsSync/index.ts
+++ b/src/cli/src/services/settingsSync/index.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type downloadUserSettings = any;
-export type redownloadUserSettings = any;
+export type downloadUserSettings = any
+export type redownloadUserSettings = any
diff --git a/src/cli/src/state/AppStateStore.ts b/src/cli/src/state/AppStateStore.ts
index caf2928ae..fec2e89be 100644
--- a/src/cli/src/state/AppStateStore.ts
+++ b/src/cli/src/state/AppStateStore.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type AppState = any;
+export type AppState = any
diff --git a/src/cli/src/state/onChangeAppState.ts b/src/cli/src/state/onChangeAppState.ts
index 676171dd6..9cd87de9d 100644
--- a/src/cli/src/state/onChangeAppState.ts
+++ b/src/cli/src/state/onChangeAppState.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type externalMetadataToAppState = any;
+export type externalMetadataToAppState = any
diff --git a/src/cli/src/tools.ts b/src/cli/src/tools.ts
index ce74ff75d..3e35e5e68 100644
--- a/src/cli/src/tools.ts
+++ b/src/cli/src/tools.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type assembleToolPool = any;
-export type filterToolsByDenyRules = any;
+export type assembleToolPool = any
+export type filterToolsByDenyRules = any
diff --git a/src/cli/src/utils/abortController.ts b/src/cli/src/utils/abortController.ts
index 50ffcbc73..cc188ec2b 100644
--- a/src/cli/src/utils/abortController.ts
+++ b/src/cli/src/utils/abortController.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type createAbortController = any;
+export type createAbortController = any
diff --git a/src/cli/src/utils/array.ts b/src/cli/src/utils/array.ts
index 6ca22d907..b1b296fc1 100644
--- a/src/cli/src/utils/array.ts
+++ b/src/cli/src/utils/array.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type uniq = any;
+export type uniq = any
diff --git a/src/cli/src/utils/auth.ts b/src/cli/src/utils/auth.ts
index 3322df66f..9f4b693ac 100644
--- a/src/cli/src/utils/auth.ts
+++ b/src/cli/src/utils/auth.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getAccountInformation = any;
+export type getAccountInformation = any
diff --git a/src/cli/src/utils/autoUpdater.ts b/src/cli/src/utils/autoUpdater.ts
index 5241e3992..3973f7955 100644
--- a/src/cli/src/utils/autoUpdater.ts
+++ b/src/cli/src/utils/autoUpdater.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type getLatestVersion = any;
-export type InstallStatus = any;
-export type installGlobalPackage = any;
+export type getLatestVersion = any
+export type InstallStatus = any
+export type installGlobalPackage = any
diff --git a/src/cli/src/utils/awsAuthStatusManager.ts b/src/cli/src/utils/awsAuthStatusManager.ts
index d0ba68cc8..d7bbc67c0 100644
--- a/src/cli/src/utils/awsAuthStatusManager.ts
+++ b/src/cli/src/utils/awsAuthStatusManager.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type AwsAuthStatusManager = any;
+export type AwsAuthStatusManager = any
diff --git a/src/cli/src/utils/betas.ts b/src/cli/src/utils/betas.ts
index 3e452b4d5..1767972ea 100644
--- a/src/cli/src/utils/betas.ts
+++ b/src/cli/src/utils/betas.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type modelSupportsAutoMode = any;
+export type modelSupportsAutoMode = any
diff --git a/src/cli/src/utils/cleanupRegistry.ts b/src/cli/src/utils/cleanupRegistry.ts
index 4cbbdec8f..5f3a8d18d 100644
--- a/src/cli/src/utils/cleanupRegistry.ts
+++ b/src/cli/src/utils/cleanupRegistry.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type registerCleanup = any;
+export type registerCleanup = any
diff --git a/src/cli/src/utils/combinedAbortSignal.ts b/src/cli/src/utils/combinedAbortSignal.ts
index 603e78f81..f21839e65 100644
--- a/src/cli/src/utils/combinedAbortSignal.ts
+++ b/src/cli/src/utils/combinedAbortSignal.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type createCombinedAbortSignal = any;
+export type createCombinedAbortSignal = any
diff --git a/src/cli/src/utils/commandLifecycle.ts b/src/cli/src/utils/commandLifecycle.ts
index d2f254135..d7f53df09 100644
--- a/src/cli/src/utils/commandLifecycle.ts
+++ b/src/cli/src/utils/commandLifecycle.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type notifyCommandLifecycle = any;
+export type notifyCommandLifecycle = any
diff --git a/src/cli/src/utils/commitAttribution.ts b/src/cli/src/utils/commitAttribution.ts
index 4ee7a474d..64f8f1d08 100644
--- a/src/cli/src/utils/commitAttribution.ts
+++ b/src/cli/src/utils/commitAttribution.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type incrementPromptCount = any;
+export type incrementPromptCount = any
diff --git a/src/cli/src/utils/completionCache.ts b/src/cli/src/utils/completionCache.ts
index 1989a7093..184bdd437 100644
--- a/src/cli/src/utils/completionCache.ts
+++ b/src/cli/src/utils/completionCache.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type regenerateCompletionCache = any;
+export type regenerateCompletionCache = any
diff --git a/src/cli/src/utils/config.ts b/src/cli/src/utils/config.ts
index 12caa8ef9..e629a857a 100644
--- a/src/cli/src/utils/config.ts
+++ b/src/cli/src/utils/config.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type getGlobalConfig = any;
-export type InstallMethod = any;
-export type saveGlobalConfig = any;
+export type getGlobalConfig = any
+export type InstallMethod = any
+export type saveGlobalConfig = any
diff --git a/src/cli/src/utils/conversationRecovery.ts b/src/cli/src/utils/conversationRecovery.ts
index 76a469ddc..6c24cb886 100644
--- a/src/cli/src/utils/conversationRecovery.ts
+++ b/src/cli/src/utils/conversationRecovery.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type loadConversationForResume = any;
-export type TurnInterruptionState = any;
+export type loadConversationForResume = any
+export type TurnInterruptionState = any
diff --git a/src/cli/src/utils/cwd.ts b/src/cli/src/utils/cwd.ts
index 76c192ed8..4bd56a824 100644
--- a/src/cli/src/utils/cwd.ts
+++ b/src/cli/src/utils/cwd.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getCwd = any;
+export type getCwd = any
diff --git a/src/cli/src/utils/debug.ts b/src/cli/src/utils/debug.ts
index c64d5960c..5a0f1d515 100644
--- a/src/cli/src/utils/debug.ts
+++ b/src/cli/src/utils/debug.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type logForDebugging = any;
+export type logForDebugging = any
diff --git a/src/cli/src/utils/diagLogs.ts b/src/cli/src/utils/diagLogs.ts
index 35f6099b5..9fd909fb4 100644
--- a/src/cli/src/utils/diagLogs.ts
+++ b/src/cli/src/utils/diagLogs.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type logForDiagnosticsNoPII = any;
-export type withDiagnosticsTiming = any;
+export type logForDiagnosticsNoPII = any
+export type withDiagnosticsTiming = any
diff --git a/src/cli/src/utils/doctorDiagnostic.ts b/src/cli/src/utils/doctorDiagnostic.ts
index 02bff9d33..e6cb3f1bd 100644
--- a/src/cli/src/utils/doctorDiagnostic.ts
+++ b/src/cli/src/utils/doctorDiagnostic.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getDoctorDiagnostic = any;
+export type getDoctorDiagnostic = any
diff --git a/src/cli/src/utils/effort.ts b/src/cli/src/utils/effort.ts
index 323def36c..2f6852fdb 100644
--- a/src/cli/src/utils/effort.ts
+++ b/src/cli/src/utils/effort.ts
@@ -1,5 +1,5 @@
 // Auto-generated type stub — replace with real implementation
-export type modelSupportsEffort = any;
-export type modelSupportsMaxEffort = any;
-export type EFFORT_LEVELS = any;
-export type resolveAppliedEffort = any;
+export type modelSupportsEffort = any
+export type modelSupportsMaxEffort = any
+export type EFFORT_LEVELS = any
+export type resolveAppliedEffort = any
diff --git a/src/cli/src/utils/errors.ts b/src/cli/src/utils/errors.ts
index 6dd7f879d..aed78827c 100644
--- a/src/cli/src/utils/errors.ts
+++ b/src/cli/src/utils/errors.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type AbortError = any;
+export type AbortError = any
diff --git a/src/cli/src/utils/fastMode.ts b/src/cli/src/utils/fastMode.ts
index e67ddafc1..7d66ce16a 100644
--- a/src/cli/src/utils/fastMode.ts
+++ b/src/cli/src/utils/fastMode.ts
@@ -1,5 +1,5 @@
 // Auto-generated type stub — replace with real implementation
-export type isFastModeAvailable = any;
-export type isFastModeEnabled = any;
-export type isFastModeSupportedByModel = any;
-export type getFastModeState = any;
+export type isFastModeAvailable = any
+export type isFastModeEnabled = any
+export type isFastModeSupportedByModel = any
+export type getFastModeState = any
diff --git a/src/cli/src/utils/fileHistory.ts b/src/cli/src/utils/fileHistory.ts
index d925e9f9e..795a2744d 100644
--- a/src/cli/src/utils/fileHistory.ts
+++ b/src/cli/src/utils/fileHistory.ts
@@ -1,5 +1,5 @@
 // Auto-generated type stub — replace with real implementation
-export type fileHistoryRewind = any;
-export type fileHistoryCanRestore = any;
-export type fileHistoryEnabled = any;
-export type fileHistoryGetDiffStats = any;
+export type fileHistoryRewind = any
+export type fileHistoryCanRestore = any
+export type fileHistoryEnabled = any
+export type fileHistoryGetDiffStats = any
diff --git a/src/cli/src/utils/filePersistence/filePersistence.ts b/src/cli/src/utils/filePersistence/filePersistence.ts
index 57d7cf708..7b4584b26 100644
--- a/src/cli/src/utils/filePersistence/filePersistence.ts
+++ b/src/cli/src/utils/filePersistence/filePersistence.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type executeFilePersistence = any;
+export type executeFilePersistence = any
diff --git a/src/cli/src/utils/fileStateCache.ts b/src/cli/src/utils/fileStateCache.ts
index eca7afcd2..17c655394 100644
--- a/src/cli/src/utils/fileStateCache.ts
+++ b/src/cli/src/utils/fileStateCache.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type createFileStateCacheWithSizeLimit = any;
-export type mergeFileStateCaches = any;
-export type READ_FILE_STATE_CACHE_SIZE = any;
+export type createFileStateCacheWithSizeLimit = any
+export type mergeFileStateCaches = any
+export type READ_FILE_STATE_CACHE_SIZE = any
diff --git a/src/cli/src/utils/forkedAgent.ts b/src/cli/src/utils/forkedAgent.ts
index fa626eedd..704c60729 100644
--- a/src/cli/src/utils/forkedAgent.ts
+++ b/src/cli/src/utils/forkedAgent.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getLastCacheSafeParams = any;
+export type getLastCacheSafeParams = any
diff --git a/src/cli/src/utils/generators.ts b/src/cli/src/utils/generators.ts
index c9f2bd6e0..47382765a 100644
--- a/src/cli/src/utils/generators.ts
+++ b/src/cli/src/utils/generators.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type fromArray = any;
+export type fromArray = any
diff --git a/src/cli/src/utils/gracefulShutdown.ts b/src/cli/src/utils/gracefulShutdown.ts
index c7e6f98bb..a02ac3bb8 100644
--- a/src/cli/src/utils/gracefulShutdown.ts
+++ b/src/cli/src/utils/gracefulShutdown.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type gracefulShutdown = any;
-export type gracefulShutdownSync = any;
-export type isShuttingDown = any;
+export type gracefulShutdown = any
+export type gracefulShutdownSync = any
+export type isShuttingDown = any
diff --git a/src/cli/src/utils/headlessProfiler.ts b/src/cli/src/utils/headlessProfiler.ts
index 3028607aa..1ac76632d 100644
--- a/src/cli/src/utils/headlessProfiler.ts
+++ b/src/cli/src/utils/headlessProfiler.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type headlessProfilerStartTurn = any;
-export type headlessProfilerCheckpoint = any;
-export type logHeadlessProfilerTurn = any;
+export type headlessProfilerStartTurn = any
+export type headlessProfilerCheckpoint = any
+export type logHeadlessProfilerTurn = any
diff --git a/src/cli/src/utils/hooks.ts b/src/cli/src/utils/hooks.ts
index 28c15cff6..658c89f07 100644
--- a/src/cli/src/utils/hooks.ts
+++ b/src/cli/src/utils/hooks.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type executeNotificationHooks = any;
+export type executeNotificationHooks = any
diff --git a/src/cli/src/utils/hooks/AsyncHookRegistry.ts b/src/cli/src/utils/hooks/AsyncHookRegistry.ts
index eca6e2fbc..3224f9da7 100644
--- a/src/cli/src/utils/hooks/AsyncHookRegistry.ts
+++ b/src/cli/src/utils/hooks/AsyncHookRegistry.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type finalizePendingAsyncHooks = any;
+export type finalizePendingAsyncHooks = any
diff --git a/src/cli/src/utils/hooks/hookEvents.ts b/src/cli/src/utils/hooks/hookEvents.ts
index 88419b696..4d27d49ce 100644
--- a/src/cli/src/utils/hooks/hookEvents.ts
+++ b/src/cli/src/utils/hooks/hookEvents.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type registerHookEventHandler = any;
+export type registerHookEventHandler = any
diff --git a/src/cli/src/utils/idleTimeout.ts b/src/cli/src/utils/idleTimeout.ts
index 0b3bf81e9..edf78e489 100644
--- a/src/cli/src/utils/idleTimeout.ts
+++ b/src/cli/src/utils/idleTimeout.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type createIdleTimeoutManager = any;
+export type createIdleTimeoutManager = any
diff --git a/src/cli/src/utils/json.ts b/src/cli/src/utils/json.ts
index d9646ab1f..19c609dba 100644
--- a/src/cli/src/utils/json.ts
+++ b/src/cli/src/utils/json.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type safeParseJSON = any;
+export type safeParseJSON = any
diff --git a/src/cli/src/utils/localInstaller.ts b/src/cli/src/utils/localInstaller.ts
index e51976252..3ff547fc1 100644
--- a/src/cli/src/utils/localInstaller.ts
+++ b/src/cli/src/utils/localInstaller.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type installOrUpdateClaudePackage = any;
-export type localInstallationExists = any;
+export type installOrUpdateClaudePackage = any
+export type localInstallationExists = any
diff --git a/src/cli/src/utils/log.ts b/src/cli/src/utils/log.ts
index 989e1cdb7..ef78fa508 100644
--- a/src/cli/src/utils/log.ts
+++ b/src/cli/src/utils/log.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type getInMemoryErrors = any;
-export type logError = any;
-export type logMCPDebug = any;
+export type getInMemoryErrors = any
+export type logError = any
+export type logMCPDebug = any
diff --git a/src/cli/src/utils/messageQueueManager.ts b/src/cli/src/utils/messageQueueManager.ts
index bf258e11d..3dfb83b9b 100644
--- a/src/cli/src/utils/messageQueueManager.ts
+++ b/src/cli/src/utils/messageQueueManager.ts
@@ -1,8 +1,8 @@
 // Auto-generated type stub — replace with real implementation
-export type dequeue = any;
-export type dequeueAllMatching = any;
-export type enqueue = any;
-export type hasCommandsInQueue = any;
-export type peek = any;
-export type subscribeToCommandQueue = any;
-export type getCommandsByMaxPriority = any;
+export type dequeue = any
+export type dequeueAllMatching = any
+export type enqueue = any
+export type hasCommandsInQueue = any
+export type peek = any
+export type subscribeToCommandQueue = any
+export type getCommandsByMaxPriority = any
diff --git a/src/cli/src/utils/messages.ts b/src/cli/src/utils/messages.ts
index 7a268a925..16bd84c82 100644
--- a/src/cli/src/utils/messages.ts
+++ b/src/cli/src/utils/messages.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type createModelSwitchBreadcrumbs = any;
+export type createModelSwitchBreadcrumbs = any
diff --git a/src/cli/src/utils/messages/mappers.ts b/src/cli/src/utils/messages/mappers.ts
index 94ac2ac78..8215b7eb9 100644
--- a/src/cli/src/utils/messages/mappers.ts
+++ b/src/cli/src/utils/messages/mappers.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type toInternalMessages = any;
-export type toSDKRateLimitInfo = any;
+export type toInternalMessages = any
+export type toSDKRateLimitInfo = any
diff --git a/src/cli/src/utils/model/model.ts b/src/cli/src/utils/model/model.ts
index 7986ad040..eba70c343 100644
--- a/src/cli/src/utils/model/model.ts
+++ b/src/cli/src/utils/model/model.ts
@@ -1,5 +1,5 @@
 // Auto-generated type stub — replace with real implementation
-export type getDefaultMainLoopModel = any;
-export type getMainLoopModel = any;
-export type modelDisplayString = any;
-export type parseUserSpecifiedModel = any;
+export type getDefaultMainLoopModel = any
+export type getMainLoopModel = any
+export type modelDisplayString = any
+export type parseUserSpecifiedModel = any
diff --git a/src/cli/src/utils/model/modelOptions.ts b/src/cli/src/utils/model/modelOptions.ts
index b95242f35..77847cf16 100644
--- a/src/cli/src/utils/model/modelOptions.ts
+++ b/src/cli/src/utils/model/modelOptions.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getModelOptions = any;
+export type getModelOptions = any
diff --git a/src/cli/src/utils/model/modelStrings.ts b/src/cli/src/utils/model/modelStrings.ts
index ad029ac9b..094a814f0 100644
--- a/src/cli/src/utils/model/modelStrings.ts
+++ b/src/cli/src/utils/model/modelStrings.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type ensureModelStringsInitialized = any;
+export type ensureModelStringsInitialized = any
diff --git a/src/cli/src/utils/model/providers.ts b/src/cli/src/utils/model/providers.ts
index df87a41b4..1379140e8 100644
--- a/src/cli/src/utils/model/providers.ts
+++ b/src/cli/src/utils/model/providers.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getAPIProvider = any;
+export type getAPIProvider = any
diff --git a/src/cli/src/utils/nativeInstaller/index.ts b/src/cli/src/utils/nativeInstaller/index.ts
index 397e06654..7d7f27fc1 100644
--- a/src/cli/src/utils/nativeInstaller/index.ts
+++ b/src/cli/src/utils/nativeInstaller/index.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type installLatest = any;
-export type removeInstalledSymlink = any;
+export type installLatest = any
+export type removeInstalledSymlink = any
diff --git a/src/cli/src/utils/nativeInstaller/packageManagers.ts b/src/cli/src/utils/nativeInstaller/packageManagers.ts
index e73db3d9b..900858726 100644
--- a/src/cli/src/utils/nativeInstaller/packageManagers.ts
+++ b/src/cli/src/utils/nativeInstaller/packageManagers.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getPackageManager = any;
+export type getPackageManager = any
diff --git a/src/cli/src/utils/path.ts b/src/cli/src/utils/path.ts
index a965844dd..2d783dc63 100644
--- a/src/cli/src/utils/path.ts
+++ b/src/cli/src/utils/path.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type expandPath = any;
+export type expandPath = any
diff --git a/src/cli/src/utils/permissions/PermissionPromptToolResultSchema.ts b/src/cli/src/utils/permissions/PermissionPromptToolResultSchema.ts
index ab281b487..30294c62e 100644
--- a/src/cli/src/utils/permissions/PermissionPromptToolResultSchema.ts
+++ b/src/cli/src/utils/permissions/PermissionPromptToolResultSchema.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type outputSchema = any;
-export type permissionPromptToolResultToPermissionDecision = any;
-export type Output = any;
+export type outputSchema = any
+export type permissionPromptToolResultToPermissionDecision = any
+export type Output = any
diff --git a/src/cli/src/utils/permissions/PermissionResult.ts b/src/cli/src/utils/permissions/PermissionResult.ts
index e09cead08..67106d1f2 100644
--- a/src/cli/src/utils/permissions/PermissionResult.ts
+++ b/src/cli/src/utils/permissions/PermissionResult.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type PermissionDecision = any;
-export type PermissionDecisionReason = any;
+export type PermissionDecision = any
+export type PermissionDecisionReason = any
diff --git a/src/cli/src/utils/permissions/permissionSetup.ts b/src/cli/src/utils/permissions/permissionSetup.ts
index b669de315..1f21464d3 100644
--- a/src/cli/src/utils/permissions/permissionSetup.ts
+++ b/src/cli/src/utils/permissions/permissionSetup.ts
@@ -1,6 +1,6 @@
 // Auto-generated type stub — replace with real implementation
-export type isAutoModeGateEnabled = any;
-export type getAutoModeUnavailableNotification = any;
-export type getAutoModeUnavailableReason = any;
-export type isBypassPermissionsModeDisabled = any;
-export type transitionPermissionMode = any;
+export type isAutoModeGateEnabled = any
+export type getAutoModeUnavailableNotification = any
+export type getAutoModeUnavailableReason = any
+export type isBypassPermissionsModeDisabled = any
+export type transitionPermissionMode = any
diff --git a/src/cli/src/utils/permissions/permissions.ts b/src/cli/src/utils/permissions/permissions.ts
index e8f8477e9..4c18d0fdb 100644
--- a/src/cli/src/utils/permissions/permissions.ts
+++ b/src/cli/src/utils/permissions/permissions.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type hasPermissionsToUseTool = any;
+export type hasPermissionsToUseTool = any
diff --git a/src/cli/src/utils/plugins/pluginIdentifier.ts b/src/cli/src/utils/plugins/pluginIdentifier.ts
index a6ca96949..bf7a16dfe 100644
--- a/src/cli/src/utils/plugins/pluginIdentifier.ts
+++ b/src/cli/src/utils/plugins/pluginIdentifier.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type parsePluginIdentifier = any;
+export type parsePluginIdentifier = any
diff --git a/src/cli/src/utils/process.ts b/src/cli/src/utils/process.ts
index f3fc51827..14d228e36 100644
--- a/src/cli/src/utils/process.ts
+++ b/src/cli/src/utils/process.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type writeToStdout = any;
-export type registerProcessOutputErrorHandlers = any;
+export type writeToStdout = any
+export type registerProcessOutputErrorHandlers = any
diff --git a/src/cli/src/utils/queryContext.ts b/src/cli/src/utils/queryContext.ts
index 258dfa1b8..9ce88b84d 100644
--- a/src/cli/src/utils/queryContext.ts
+++ b/src/cli/src/utils/queryContext.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type buildSideQuestionFallbackParams = any;
+export type buildSideQuestionFallbackParams = any
diff --git a/src/cli/src/utils/queryHelpers.ts b/src/cli/src/utils/queryHelpers.ts
index 39a3af855..2c1527ec1 100644
--- a/src/cli/src/utils/queryHelpers.ts
+++ b/src/cli/src/utils/queryHelpers.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type PermissionPromptTool = any;
-export type extractReadFilesFromMessages = any;
+export type PermissionPromptTool = any
+export type extractReadFilesFromMessages = any
diff --git a/src/cli/src/utils/queryProfiler.ts b/src/cli/src/utils/queryProfiler.ts
index dd554afb0..06f798fbe 100644
--- a/src/cli/src/utils/queryProfiler.ts
+++ b/src/cli/src/utils/queryProfiler.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type startQueryProfile = any;
-export type logQueryProfileReport = any;
+export type startQueryProfile = any
+export type logQueryProfileReport = any
diff --git a/src/cli/src/utils/sandbox/sandbox-adapter.ts b/src/cli/src/utils/sandbox/sandbox-adapter.ts
index edebe2640..e9f663b72 100644
--- a/src/cli/src/utils/sandbox/sandbox-adapter.ts
+++ b/src/cli/src/utils/sandbox/sandbox-adapter.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type SandboxManager = any;
+export type SandboxManager = any
diff --git a/src/cli/src/utils/semver.ts b/src/cli/src/utils/semver.ts
index a786c8772..e2152fed8 100644
--- a/src/cli/src/utils/semver.ts
+++ b/src/cli/src/utils/semver.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type gte = any;
+export type gte = any
diff --git a/src/cli/src/utils/sessionRestore.ts b/src/cli/src/utils/sessionRestore.ts
index 8b6aebfd1..182d3c17a 100644
--- a/src/cli/src/utils/sessionRestore.ts
+++ b/src/cli/src/utils/sessionRestore.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type restoreAgentFromSession = any;
-export type restoreSessionStateFromLog = any;
+export type restoreAgentFromSession = any
+export type restoreSessionStateFromLog = any
diff --git a/src/cli/src/utils/sessionStart.ts b/src/cli/src/utils/sessionStart.ts
index 3bd206870..ba19147f2 100644
--- a/src/cli/src/utils/sessionStart.ts
+++ b/src/cli/src/utils/sessionStart.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type processSessionStartHooks = any;
-export type processSetupHooks = any;
-export type takeInitialUserMessage = any;
+export type processSessionStartHooks = any
+export type processSetupHooks = any
+export type takeInitialUserMessage = any
diff --git a/src/cli/src/utils/sessionState.ts b/src/cli/src/utils/sessionState.ts
index 48d9aa34e..24cdbcc51 100644
--- a/src/cli/src/utils/sessionState.ts
+++ b/src/cli/src/utils/sessionState.ts
@@ -1,7 +1,7 @@
 // Auto-generated type stub — replace with real implementation
-export type getSessionState = any;
-export type notifySessionStateChanged = any;
-export type notifySessionMetadataChanged = any;
-export type setPermissionModeChangedListener = any;
-export type RequiresActionDetails = any;
-export type SessionExternalMetadata = any;
+export type getSessionState = any
+export type notifySessionStateChanged = any
+export type notifySessionMetadataChanged = any
+export type setPermissionModeChangedListener = any
+export type RequiresActionDetails = any
+export type SessionExternalMetadata = any
diff --git a/src/cli/src/utils/sessionStorage.ts b/src/cli/src/utils/sessionStorage.ts
index 52b0f4d80..03514fa54 100644
--- a/src/cli/src/utils/sessionStorage.ts
+++ b/src/cli/src/utils/sessionStorage.ts
@@ -1,11 +1,11 @@
 // Auto-generated type stub — replace with real implementation
-export type hydrateRemoteSession = any;
-export type hydrateFromCCRv2InternalEvents = any;
-export type resetSessionFilePointer = any;
-export type doesMessageExistInSession = any;
-export type findUnresolvedToolUse = any;
-export type recordAttributionSnapshot = any;
-export type saveAgentSetting = any;
-export type saveMode = any;
-export type saveAiGeneratedTitle = any;
-export type restoreSessionMetadata = any;
+export type hydrateRemoteSession = any
+export type hydrateFromCCRv2InternalEvents = any
+export type resetSessionFilePointer = any
+export type doesMessageExistInSession = any
+export type findUnresolvedToolUse = any
+export type recordAttributionSnapshot = any
+export type saveAgentSetting = any
+export type saveMode = any
+export type saveAiGeneratedTitle = any
+export type restoreSessionMetadata = any
diff --git a/src/cli/src/utils/sessionTitle.ts b/src/cli/src/utils/sessionTitle.ts
index 3675a2811..b87c63b9d 100644
--- a/src/cli/src/utils/sessionTitle.ts
+++ b/src/cli/src/utils/sessionTitle.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type generateSessionTitle = any;
+export type generateSessionTitle = any
diff --git a/src/cli/src/utils/sessionUrl.ts b/src/cli/src/utils/sessionUrl.ts
index a416c74b9..847e20488 100644
--- a/src/cli/src/utils/sessionUrl.ts
+++ b/src/cli/src/utils/sessionUrl.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type parseSessionIdentifier = any;
+export type parseSessionIdentifier = any
diff --git a/src/cli/src/utils/sideQuestion.ts b/src/cli/src/utils/sideQuestion.ts
index 1282d133e..c4674c72e 100644
--- a/src/cli/src/utils/sideQuestion.ts
+++ b/src/cli/src/utils/sideQuestion.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type runSideQuestion = any;
+export type runSideQuestion = any
diff --git a/src/cli/src/utils/stream.ts b/src/cli/src/utils/stream.ts
index 60b9b2220..be6d90db1 100644
--- a/src/cli/src/utils/stream.ts
+++ b/src/cli/src/utils/stream.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type Stream = any;
+export type Stream = any
diff --git a/src/cli/src/utils/streamJsonStdoutGuard.ts b/src/cli/src/utils/streamJsonStdoutGuard.ts
index 05236b55e..78d9fb414 100644
--- a/src/cli/src/utils/streamJsonStdoutGuard.ts
+++ b/src/cli/src/utils/streamJsonStdoutGuard.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type installStreamJsonStdoutGuard = any;
+export type installStreamJsonStdoutGuard = any
diff --git a/src/cli/src/utils/streamlinedTransform.ts b/src/cli/src/utils/streamlinedTransform.ts
index 439c126e0..4c0db3526 100644
--- a/src/cli/src/utils/streamlinedTransform.ts
+++ b/src/cli/src/utils/streamlinedTransform.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type createStreamlinedTransformer = any;
+export type createStreamlinedTransformer = any
diff --git a/src/cli/src/utils/thinking.ts b/src/cli/src/utils/thinking.ts
index 451decd5e..f6451cc93 100644
--- a/src/cli/src/utils/thinking.ts
+++ b/src/cli/src/utils/thinking.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type ThinkingConfig = any;
-export type modelSupportsAdaptiveThinking = any;
+export type ThinkingConfig = any
+export type modelSupportsAdaptiveThinking = any
diff --git a/src/cli/src/utils/toolPool.ts b/src/cli/src/utils/toolPool.ts
index 66c7603a6..e62964709 100644
--- a/src/cli/src/utils/toolPool.ts
+++ b/src/cli/src/utils/toolPool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type mergeAndFilterTools = any;
+export type mergeAndFilterTools = any
diff --git a/src/cli/src/utils/uuid.ts b/src/cli/src/utils/uuid.ts
index a95ef5217..7070934e2 100644
--- a/src/cli/src/utils/uuid.ts
+++ b/src/cli/src/utils/uuid.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type validateUuid = any;
+export type validateUuid = any
diff --git a/src/cli/src/utils/workloadContext.ts b/src/cli/src/utils/workloadContext.ts
index c80322f82..97c9c4c1d 100644
--- a/src/cli/src/utils/workloadContext.ts
+++ b/src/cli/src/utils/workloadContext.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type runWithWorkload = any;
-export type WORKLOAD_CRON = any;
+export type runWithWorkload = any
+export type WORKLOAD_CRON = any
diff --git a/src/cli/structuredIO.ts b/src/cli/structuredIO.ts
index fba44e61b..dcff000e4 100644
--- a/src/cli/structuredIO.ts
+++ b/src/cli/structuredIO.ts
@@ -267,7 +267,9 @@ export class StructuredIO {
   getPendingPermissionRequests() {
     return Array.from(this.pendingRequests.values())
       .map(entry => entry.request)
-      .filter(pr => (pr.request as { subtype?: string }).subtype === 'can_use_tool')
+      .filter(
+        pr => (pr.request as { subtype?: string }).subtype === 'can_use_tool',
+      )
   }
 
   setUnexpectedResponseCallback(
@@ -285,7 +287,14 @@ export class StructuredIO {
    * callback is aborted via the signal — otherwise the callback hangs.
    */
   injectControlResponse(response: SDKControlResponse): void {
-    const responseInner = response.response as { request_id?: string; subtype?: string; error?: string; response?: unknown } | undefined
+    const responseInner = response.response as
+      | {
+          request_id?: string
+          subtype?: string
+          error?: string
+          response?: unknown
+        }
+      | undefined
     const requestId = responseInner?.request_id
     if (!requestId) return
     const request = this.pendingRequests.get(requestId as string)
@@ -377,7 +386,12 @@ export class StructuredIO {
         if (uuid) {
           notifyCommandLifecycle(uuid, 'completed')
         }
-        const resp = message.response as { request_id: string; subtype: string; response?: Record<string, unknown>; error?: string }
+        const resp = message.response as {
+          request_id: string
+          subtype: string
+          response?: Record<string, unknown>
+          error?: string
+        }
         const request = this.pendingRequests.get(resp.request_id)
         if (!request) {
           // Check if this tool_use was already resolved through the normal
@@ -386,9 +400,7 @@ export class StructuredIO {
           // re-processing them would push duplicate assistant messages into
           // the conversation, causing API 400 errors.
           const responsePayload =
-            resp.subtype === 'success'
-              ? resp.response
-              : undefined
+            resp.subtype === 'success' ? resp.response : undefined
           const toolUseID = responsePayload?.toolUseID
           if (
             typeof toolUseID === 'string' &&
@@ -400,7 +412,9 @@ export class StructuredIO {
             return undefined
           }
           if (this.unexpectedResponseCallback) {
-            await this.unexpectedResponseCallback(message as SDKControlResponse & { uuid?: string })
+            await this.unexpectedResponseCallback(
+              message as SDKControlResponse & { uuid?: string },
+            )
           }
           return undefined // Ignore responses for requests we don't know about
         }
@@ -409,7 +423,8 @@ export class StructuredIO {
         // Notify the bridge when the SDK consumer resolves a can_use_tool
         // request, so it can cancel the stale permission prompt on claude.ai.
         if (
-          (request.request.request as { subtype?: string }).subtype === 'can_use_tool' &&
+          (request.request.request as { subtype?: string }).subtype ===
+            'can_use_tool' &&
           this.onControlRequestResolved
         ) {
           this.onControlRequestResolved(resp.request_id)
@@ -455,14 +470,15 @@ export class StructuredIO {
       if (message.type === 'assistant' || message.type === 'system') {
         return message
       }
-      if ((message as { message?: { role?: string } }).message?.role !== 'user') {
+      if (
+        (message as { message?: { role?: string } }).message?.role !== 'user'
+      ) {
         exitWithMessage(
           `Error: Expected message role 'user', got '${(message as { message?: { role?: string } }).message?.role}'`,
         )
       }
       return message
     } catch (error) {
-      // biome-ignore lint/suspicious/noConsole:: intentional console output
       console.error(`Error parsing streaming input line: ${line}: ${error}`)
       // eslint-disable-next-line custom-rules/no-process-exit
       process.exit(1)
@@ -491,7 +507,10 @@ export class StructuredIO {
       throw new Error('Request aborted')
     }
     this.outbound.enqueue(message)
-    if ((request as { subtype?: string }).subtype === 'can_use_tool' && this.onControlRequestSent) {
+    if (
+      (request as { subtype?: string }).subtype === 'can_use_tool' &&
+      this.onControlRequestSent
+    ) {
       this.onControlRequestSent(message)
     }
     const aborted = () => {
@@ -687,7 +706,6 @@ export class StructuredIO {
           )
           return result
         } catch (error) {
-          // biome-ignore lint/suspicious/noConsole:: intentional console output
           console.error(`Error in hook callback ${callbackId}:`, error)
           return {}
         }
@@ -781,7 +799,6 @@ export class StructuredIO {
 }
 
 function exitWithMessage(message: string): never {
-  // biome-ignore lint/suspicious/noConsole:: intentional console output
   console.error(message)
   // eslint-disable-next-line custom-rules/no-process-exit
   process.exit(1)
@@ -823,7 +840,8 @@ async function executePermissionRequestHooksForSDK(
         const finalInput = decision.updatedInput || input
 
         // Apply permission updates if provided by hook ("always allow")
-        const permissionUpdates = (decision.updatedPermissions ?? []) as unknown as InternalPermissionUpdate[]
+        const permissionUpdates = (decision.updatedPermissions ??
+          []) as unknown as InternalPermissionUpdate[]
         if (permissionUpdates.length > 0) {
           persistPermissionUpdates(permissionUpdates)
           const currentAppState = toolUseContext.getAppState()
diff --git a/src/cli/transports/HybridTransport.ts b/src/cli/transports/HybridTransport.ts
index 0f0c924b6..6ef8e511b 100644
--- a/src/cli/transports/HybridTransport.ts
+++ b/src/cli/transports/HybridTransport.ts
@@ -244,7 +244,7 @@ export class HybridTransport extends WebSocketTransport {
     ) {
       rcLog(
         `Hybrid POST ${response.status}: url=${this.postUrl.replace(/token=[^&]+/, 'token=***')}` +
-        ` events=${events.length} body=${JSON.stringify(response.data).slice(0, 200)}`,
+          ` events=${events.length} body=${JSON.stringify(response.data).slice(0, 200)}`,
       )
       logForDebugging(
         `HybridTransport: POST returned ${response.status} (permanent), dropping`,
diff --git a/src/cli/transports/SSETransport.ts b/src/cli/transports/SSETransport.ts
index ca9c396da..42b90afbd 100644
--- a/src/cli/transports/SSETransport.ts
+++ b/src/cli/transports/SSETransport.ts
@@ -82,9 +82,7 @@ export function parseSSEFrames(buffer: string): {
     for (const rawLine of rawFrame.split('\n')) {
       // Normalize CRLF lines in mixed-line-ending streams.
       const line =
-        rawLine[rawLine.length - 1] === '\r'
-          ? rawLine.slice(0, -1)
-          : rawLine
+        rawLine[rawLine.length - 1] === '\r' ? rawLine.slice(0, -1) : rawLine
 
       if (line.startsWith(':')) {
         // SSE comment (e.g., `:keepalive`)
@@ -482,9 +480,9 @@ export class SSETransport implements Transport {
   private handleConnectionError(): void {
     rcLog(
       `SSE handleConnectionError: state=${this.state}` +
-      ` lastSeqNum=${this.getLastSequenceNum()}` +
-      ` reconnectAttempts=${this.reconnectAttempts}` +
-      ` msSinceLastActivity=${this.lastActivityTime > 0 ? Date.now() - this.lastActivityTime : -1}`,
+        ` lastSeqNum=${this.getLastSequenceNum()}` +
+        ` reconnectAttempts=${this.reconnectAttempts}` +
+        ` msSinceLastActivity=${this.lastActivityTime > 0 ? Date.now() - this.lastActivityTime : -1}`,
     )
     this.clearLivenessTimer()
 
@@ -518,7 +516,7 @@ export class SSETransport implements Transport {
       this.reconnectAttempts++
 
       const baseDelay = Math.min(
-        RECONNECT_BASE_DELAY_MS * Math.pow(2, this.reconnectAttempts - 1),
+        RECONNECT_BASE_DELAY_MS * 2 ** (this.reconnectAttempts - 1),
         RECONNECT_MAX_DELAY_MS,
       )
       // Add ±25% jitter
@@ -561,8 +559,8 @@ export class SSETransport implements Transport {
     this.livenessTimer = null
     rcLog(
       `SSE liveness timeout (${LIVENESS_TIMEOUT_MS}ms)` +
-      ` lastSeqNum=${this.getLastSequenceNum()}` +
-      ` state=${this.state}`,
+        ` lastSeqNum=${this.getLastSequenceNum()}` +
+        ` state=${this.state}`,
     )
     logForDebugging('SSETransport: Liveness timeout, reconnecting', {
       level: 'error',
@@ -668,7 +666,7 @@ export class SSETransport implements Transport {
       }
 
       const delayMs = Math.min(
-        POST_BASE_DELAY_MS * Math.pow(2, attempt - 1),
+        POST_BASE_DELAY_MS * 2 ** (attempt - 1),
         POST_MAX_DELAY_MS,
       )
       await sleep(delayMs)
diff --git a/src/cli/transports/Transport.ts b/src/cli/transports/Transport.ts
index d63bcb00e..de0e6703f 100644
--- a/src/cli/transports/Transport.ts
+++ b/src/cli/transports/Transport.ts
@@ -1,2 +1,2 @@
 // Auto-generated stub — replace with real implementation
-export type Transport = any;
+export type Transport = any
diff --git a/src/cli/transports/WebSocketTransport.ts b/src/cli/transports/WebSocketTransport.ts
index 5d5d8fd75..d4af1de03 100644
--- a/src/cli/transports/WebSocketTransport.ts
+++ b/src/cli/transports/WebSocketTransport.ts
@@ -398,10 +398,10 @@ export class WebSocketTransport implements Transport {
   private handleConnectionError(closeCode?: number): void {
     rcLog(
       `WS handleConnectionError: code=${closeCode}` +
-      ` state=${this.state}` +
-      ` url=${this.url.href.replace(/token=[^&]+/, 'token=***')}` +
-      ` msSinceLastActivity=${this.lastActivityTime > 0 ? Date.now() - this.lastActivityTime : -1}` +
-      ` reconnectAttempts=${this.reconnectAttempts}`,
+        ` state=${this.state}` +
+        ` url=${this.url.href.replace(/token=[^&]+/, 'token=***')}` +
+        ` msSinceLastActivity=${this.lastActivityTime > 0 ? Date.now() - this.lastActivityTime : -1}` +
+        ` reconnectAttempts=${this.reconnectAttempts}`,
     )
     logForDebugging(
       `WebSocketTransport: Disconnected from ${this.url.href}` +
@@ -516,7 +516,7 @@ export class WebSocketTransport implements Transport {
       this.reconnectAttempts++
 
       const baseDelay = Math.min(
-        DEFAULT_BASE_RECONNECT_DELAY * Math.pow(2, this.reconnectAttempts - 1),
+        DEFAULT_BASE_RECONNECT_DELAY * 2 ** (this.reconnectAttempts - 1),
         DEFAULT_MAX_RECONNECT_DELAY,
       )
       // Add ±25% jitter to avoid thundering herd
diff --git a/src/cli/transports/__tests__/SSETransport.test.ts b/src/cli/transports/__tests__/SSETransport.test.ts
index 40c27ca36..10ec6f01a 100644
--- a/src/cli/transports/__tests__/SSETransport.test.ts
+++ b/src/cli/transports/__tests__/SSETransport.test.ts
@@ -35,7 +35,8 @@ describe('parseSSEFrames', () => {
   })
 
   test('keeps incomplete trailing frame in remaining buffer for CRLF streams', () => {
-    const input = 'event: client_event\r\ndata: {"ok":true}\r\n\r\ndata: {"tail":1}\r\n'
+    const input =
+      'event: client_event\r\ndata: {"ok":true}\r\n\r\ndata: {"tail":1}\r\n'
     const { frames, remaining } = parseSSEFrames(input)
 
     expect(frames).toEqual([
diff --git a/src/cli/transports/ccrClient.ts b/src/cli/transports/ccrClient.ts
index b24256089..f0f487dfa 100644
--- a/src/cli/transports/ccrClient.ts
+++ b/src/cli/transports/ccrClient.ts
@@ -180,7 +180,10 @@ export function accumulateStreamEvents(
         chunks.push(delta.text as string)
         const existing = touched.get(chunks)
         if (existing) {
-          ;(existing.event as Record<string, unknown>).delta = { type: 'text_delta', text: chunks.join('') }
+          ;(existing.event as Record<string, unknown>).delta = {
+            type: 'text_delta',
+            text: chunks.join(''),
+          }
           break
         }
         const snapshot: CoalescedStreamEvent = {
@@ -430,7 +433,10 @@ export class CCRClient {
           'delivery batch',
         )
         if (!result.ok) {
-          throw new RetryableError('delivery POST failed', (result as any).retryAfterMs)
+          throw new RetryableError(
+            'delivery POST failed',
+            (result as any).retryAfterMs,
+          )
         }
       },
       baseDelayMs: 500,
@@ -748,7 +754,14 @@ export class CCRClient {
     }
     await this.flushStreamEventBuffer()
     if (message.type === 'assistant') {
-      clearStreamAccumulatorForMessage(this.streamTextAccumulator, message as { session_id: string; parent_tool_use_id: string | null; message: { id: string } })
+      clearStreamAccumulatorForMessage(
+        this.streamTextAccumulator,
+        message as {
+          session_id: string
+          parent_tool_use_id: string | null
+          message: { id: string }
+        },
+      )
     }
     await this.eventUploader.enqueue(this.toClientEvent(message))
   }
diff --git a/src/cli/transports/src/entrypoints/sdk/controlTypes.ts b/src/cli/transports/src/entrypoints/sdk/controlTypes.ts
index 513ee706d..1cda2df03 100644
--- a/src/cli/transports/src/entrypoints/sdk/controlTypes.ts
+++ b/src/cli/transports/src/entrypoints/sdk/controlTypes.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type StdoutMessage = any;
-export type SDKPartialAssistantMessage = any;
+export type StdoutMessage = any
+export type SDKPartialAssistantMessage = any
diff --git a/src/commands/add-dir/add-dir.tsx b/src/commands/add-dir/add-dir.tsx
index 91180cd73..bfe51afaf 100644
--- a/src/commands/add-dir/add-dir.tsx
+++ b/src/commands/add-dir/add-dir.tsx
@@ -1,42 +1,33 @@
-import chalk from 'chalk'
-import figures from 'figures'
-import React, { useEffect } from 'react'
-import {
-  getAdditionalDirectoriesForClaudeMd,
-  setAdditionalDirectoriesForClaudeMd,
-} from '../../bootstrap/state.js'
-import type { LocalJSXCommandContext } from '../../commands.js'
-import { MessageResponse } from '../../components/MessageResponse.js'
-import { AddWorkspaceDirectory } from '../../components/permissions/rules/AddWorkspaceDirectory.js'
-import { Box, Text } from '@anthropic/ink'
-import type { LocalJSXCommandOnDone } from '../../types/command.js'
-import {
-  applyPermissionUpdate,
-  persistPermissionUpdate,
-} from '../../utils/permissions/PermissionUpdate.js'
-import type { PermissionUpdateDestination } from '../../utils/permissions/PermissionUpdateSchema.js'
-import { SandboxManager } from '../../utils/sandbox/sandbox-adapter.js'
-import {
-  addDirHelpMessage,
-  validateDirectoryForWorkspace,
-} from './validation.js'
+import chalk from 'chalk';
+import figures from 'figures';
+import React, { useEffect } from 'react';
+import { getAdditionalDirectoriesForClaudeMd, setAdditionalDirectoriesForClaudeMd } from '../../bootstrap/state.js';
+import type { LocalJSXCommandContext } from '../../commands.js';
+import { MessageResponse } from '../../components/MessageResponse.js';
+import { AddWorkspaceDirectory } from '../../components/permissions/rules/AddWorkspaceDirectory.js';
+import { Box, Text } from '@anthropic/ink';
+import type { LocalJSXCommandOnDone } from '../../types/command.js';
+import { applyPermissionUpdate, persistPermissionUpdate } from '../../utils/permissions/PermissionUpdate.js';
+import type { PermissionUpdateDestination } from '../../utils/permissions/PermissionUpdateSchema.js';
+import { SandboxManager } from '../../utils/sandbox/sandbox-adapter.js';
+import { addDirHelpMessage, validateDirectoryForWorkspace } from './validation.js';
 
 function AddDirError({
   message,
   args,
   onDone,
 }: {
-  message: string
-  args: string
-  onDone: () => void
+  message: string;
+  args: string;
+  onDone: () => void;
 }): React.ReactNode {
   useEffect(() => {
     // We need to defer calling onDone to avoid the "return null" bug where
     // the component unmounts before React can render the error message.
     // Using setTimeout ensures the error displays before the command exits.
-    const timer = setTimeout(onDone, 0)
-    return () => clearTimeout(timer)
-  }, [onDone])
+    const timer = setTimeout(onDone, 0);
+    return () => clearTimeout(timer);
+  }, [onDone]);
 
   return (
     <Box flexDirection="column">
@@ -47,7 +38,7 @@ function AddDirError({
         <Text>{message}</Text>
       </MessageResponse>
     </Box>
-  )
+  );
 }
 
 export async function call(
@@ -55,58 +46,53 @@ export async function call(
   context: LocalJSXCommandContext,
   args?: string,
 ): Promise<React.ReactNode> {
-  const directoryPath = (args ?? '').trim()
-  const appState = context.getAppState()
+  const directoryPath = (args ?? '').trim();
+  const appState = context.getAppState();
 
   // Helper to handle adding a directory (shared by both with-path and no-path cases)
   const handleAddDirectory = async (path: string, remember = false) => {
-    const destination: PermissionUpdateDestination = remember
-      ? 'localSettings'
-      : 'session'
+    const destination: PermissionUpdateDestination = remember ? 'localSettings' : 'session';
 
     const permissionUpdate = {
       type: 'addDirectories' as const,
       directories: [path],
       destination,
-    }
+    };
 
     // Apply to session context
-    const latestAppState = context.getAppState()
-    const updatedContext = applyPermissionUpdate(
-      latestAppState.toolPermissionContext,
-      permissionUpdate,
-    )
+    const latestAppState = context.getAppState();
+    const updatedContext = applyPermissionUpdate(latestAppState.toolPermissionContext, permissionUpdate);
     context.setAppState(prev => ({
       ...prev,
       toolPermissionContext: updatedContext,
-    }))
+    }));
 
     // Update sandbox config so Bash commands can access the new directory.
     // Bootstrap state is the source of truth for session-only dirs; persisted
     // dirs are picked up via the settings subscription, but we refresh
     // eagerly here to avoid a race when the user acts immediately.
-    const currentDirs = getAdditionalDirectoriesForClaudeMd()
+    const currentDirs = getAdditionalDirectoriesForClaudeMd();
     if (!currentDirs.includes(path)) {
-      setAdditionalDirectoriesForClaudeMd([...currentDirs, path])
+      setAdditionalDirectoriesForClaudeMd([...currentDirs, path]);
     }
-    SandboxManager.refreshConfig()
+    SandboxManager.refreshConfig();
 
-    let message: string
+    let message: string;
 
     if (remember) {
       try {
-        persistPermissionUpdate(permissionUpdate)
-        message = `Added ${chalk.bold(path)} as a working directory and saved to local settings`
+        persistPermissionUpdate(permissionUpdate);
+        message = `Added ${chalk.bold(path)} as a working directory and saved to local settings`;
       } catch (error) {
-        message = `Added ${chalk.bold(path)} as a working directory. Failed to save to local settings: ${error instanceof Error ? error.message : 'Unknown error'}`
+        message = `Added ${chalk.bold(path)} as a working directory. Failed to save to local settings: ${error instanceof Error ? error.message : 'Unknown error'}`;
       }
     } else {
-      message = `Added ${chalk.bold(path)} as a working directory for this session`
+      message = `Added ${chalk.bold(path)} as a working directory for this session`;
     }
 
-    const messageWithHint = `${message} ${chalk.dim('· /permissions to manage')}`
-    onDone(messageWithHint)
-  }
+    const messageWithHint = `${message} ${chalk.dim('· /permissions to manage')}`;
+    onDone(messageWithHint);
+  };
 
   // When no path is provided, show AddWorkspaceDirectory input form directly
   // and return to REPL after confirmation
@@ -116,27 +102,18 @@ export async function call(
         permissionContext={appState.toolPermissionContext}
         onAddDirectory={handleAddDirectory}
         onCancel={() => {
-          onDone('Did not add a working directory.')
+          onDone('Did not add a working directory.');
         }}
       />
-    )
+    );
   }
 
-  const result = await validateDirectoryForWorkspace(
-    directoryPath,
-    appState.toolPermissionContext,
-  )
+  const result = await validateDirectoryForWorkspace(directoryPath, appState.toolPermissionContext);
 
   if (result.resultType !== 'success') {
-    const message = addDirHelpMessage(result)
+    const message = addDirHelpMessage(result);
 
-    return (
-      <AddDirError
-        message={message}
-        args={args ?? ''}
-        onDone={() => onDone(message)}
-      />
-    )
+    return <AddDirError message={message} args={args ?? ''} onDone={() => onDone(message)} />;
   }
 
   return (
@@ -145,10 +122,8 @@ export async function call(
       permissionContext={appState.toolPermissionContext}
       onAddDirectory={handleAddDirectory}
       onCancel={() => {
-        onDone(
-          `Did not add ${chalk.bold(result.absolutePath)} as a working directory.`,
-        )
+        onDone(`Did not add ${chalk.bold(result.absolutePath)} as a working directory.`);
       }}
     />
-  )
+  );
 }
diff --git a/src/commands/agents/agents.tsx b/src/commands/agents/agents.tsx
index 6a5931756..eb242452a 100644
--- a/src/commands/agents/agents.tsx
+++ b/src/commands/agents/agents.tsx
@@ -1,16 +1,13 @@
-import * as React from 'react'
-import { AgentsMenu } from '../../components/agents/AgentsMenu.js'
-import type { ToolUseContext } from '../../Tool.js'
-import { getTools } from '../../tools.js'
-import type { LocalJSXCommandOnDone } from '../../types/command.js'
+import * as React from 'react';
+import { AgentsMenu } from '../../components/agents/AgentsMenu.js';
+import type { ToolUseContext } from '../../Tool.js';
+import { getTools } from '../../tools.js';
+import type { LocalJSXCommandOnDone } from '../../types/command.js';
 
-export async function call(
-  onDone: LocalJSXCommandOnDone,
-  context: ToolUseContext,
-): Promise<React.ReactNode> {
-  const appState = context.getAppState()
-  const permissionContext = appState.toolPermissionContext
-  const tools = getTools(permissionContext)
+export async function call(onDone: LocalJSXCommandOnDone, context: ToolUseContext): Promise<React.ReactNode> {
+  const appState = context.getAppState();
+  const permissionContext = appState.toolPermissionContext;
+  const tools = getTools(permissionContext);
 
-  return <AgentsMenu tools={tools} onExit={onDone} />
+  return <AgentsMenu tools={tools} onExit={onDone} />;
 }
diff --git a/src/commands/autonomy.ts b/src/commands/autonomy.ts
index c387fb850..0b780070d 100644
--- a/src/commands/autonomy.ts
+++ b/src/commands/autonomy.ts
@@ -109,7 +109,10 @@ const call: LocalCommandCall = async (args: string) => {
 
   return {
     type: 'text',
-    value: [formatAutonomyRunsStatus(runs), formatAutonomyFlowsStatus(flows)].join('\n'),
+    value: [
+      formatAutonomyRunsStatus(runs),
+      formatAutonomyFlowsStatus(flows),
+    ].join('\n'),
   }
 }
 
diff --git a/src/commands/branch/branch.ts b/src/commands/branch/branch.ts
index 50eeb8e78..c9b377495 100644
--- a/src/commands/branch/branch.ts
+++ b/src/commands/branch/branch.ts
@@ -44,8 +44,10 @@ export function deriveFirstPrompt(
     typeof content === 'string'
       ? content
       : content.find(
-          (block: { type: string; text?: string }): block is { type: 'text'; text: string } =>
-            block.type === 'text',
+          (block: {
+            type: string
+            text?: string
+          }): block is { type: 'text'; text: string } => block.type === 'text',
         )?.text
   if (!raw) return 'Branched conversation'
   return (
@@ -240,7 +242,9 @@ export async function call(
     // Build LogOption for resume
     const now = new Date()
     const firstPrompt = deriveFirstPrompt(
-      serializedMessages.find(m => m.type === 'user') as Extract<SerializedMessage, { type: 'user' }> | undefined,
+      serializedMessages.find(m => m.type === 'user') as
+        | Extract<SerializedMessage, { type: 'user' }>
+        | undefined,
     )
 
     // Save custom title - use provided title or firstPrompt as default
diff --git a/src/commands/bridge/bridge.tsx b/src/commands/bridge/bridge.tsx
index a9d9bc5ac..784d89b83 100644
--- a/src/commands/bridge/bridge.tsx
+++ b/src/commands/bridge/bridge.tsx
@@ -1,39 +1,29 @@
-import { feature } from 'bun:bundle'
-import { toString as qrToString } from 'qrcode'
-import * as React from 'react'
-import { useEffect, useState } from 'react'
-import { getBridgeAccessToken } from '../../bridge/bridgeConfig.js'
-import {
-  checkBridgeMinVersion,
-  getBridgeDisabledReason,
-  isEnvLessBridgeEnabled,
-} from '../../bridge/bridgeEnabled.js'
-import { checkEnvLessBridgeMinVersion } from '../../bridge/envLessBridgeConfig.js'
-import {
-  BRIDGE_LOGIN_INSTRUCTION,
-  REMOTE_CONTROL_DISCONNECTED_MSG,
-} from '../../bridge/types.js'
-import { Dialog, ListItem } from '@anthropic/ink'
-import { shouldShowRemoteCallout } from '../../components/RemoteCallout.js'
-import { useRegisterOverlay } from '../../context/overlayContext.js'
-import { Box, Text } from '@anthropic/ink'
-import { useKeybindings } from '../../keybindings/useKeybinding.js'
+import { feature } from 'bun:bundle';
+import { toString as qrToString } from 'qrcode';
+import * as React from 'react';
+import { useEffect, useState } from 'react';
+import { getBridgeAccessToken } from '../../bridge/bridgeConfig.js';
+import { checkBridgeMinVersion, getBridgeDisabledReason, isEnvLessBridgeEnabled } from '../../bridge/bridgeEnabled.js';
+import { checkEnvLessBridgeMinVersion } from '../../bridge/envLessBridgeConfig.js';
+import { BRIDGE_LOGIN_INSTRUCTION, REMOTE_CONTROL_DISCONNECTED_MSG } from '../../bridge/types.js';
+import { Dialog, ListItem } from '@anthropic/ink';
+import { shouldShowRemoteCallout } from '../../components/RemoteCallout.js';
+import { useRegisterOverlay } from '../../context/overlayContext.js';
+import { Box, Text } from '@anthropic/ink';
+import { useKeybindings } from '../../keybindings/useKeybinding.js';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from '../../services/analytics/index.js'
-import { useAppState, useSetAppState } from '../../state/AppState.js'
-import type { ToolUseContext } from '../../Tool.js'
-import type {
-  LocalJSXCommandContext,
-  LocalJSXCommandOnDone,
-} from '../../types/command.js'
-import { logForDebugging } from '../../utils/debug.js'
+} from '../../services/analytics/index.js';
+import { useAppState, useSetAppState } from '../../state/AppState.js';
+import type { ToolUseContext } from '../../Tool.js';
+import type { LocalJSXCommandContext, LocalJSXCommandOnDone } from '../../types/command.js';
+import { logForDebugging } from '../../utils/debug.js';
 
 type Props = {
-  onDone: LocalJSXCommandOnDone
-  name?: string
-}
+  onDone: LocalJSXCommandOnDone;
+  name?: string;
+};
 
 /**
  * /remote-control command — manages the bidirectional bridge connection.
@@ -48,35 +38,33 @@ type Props = {
  * URL and options to disconnect or continue.
  */
 function BridgeToggle({ onDone, name }: Props): React.ReactNode {
-  const setAppState = useSetAppState()
-  const replBridgeConnected = useAppState(s => s.replBridgeConnected)
-  const replBridgeEnabled = useAppState(s => s.replBridgeEnabled)
-  const replBridgeOutboundOnly = useAppState(s => s.replBridgeOutboundOnly)
-  const [showDisconnectDialog, setShowDisconnectDialog] = useState(false)
+  const setAppState = useSetAppState();
+  const replBridgeConnected = useAppState(s => s.replBridgeConnected);
+  const replBridgeEnabled = useAppState(s => s.replBridgeEnabled);
+  const replBridgeOutboundOnly = useAppState(s => s.replBridgeOutboundOnly);
+  const [showDisconnectDialog, setShowDisconnectDialog] = useState(false);
 
-  // biome-ignore lint/correctness/useExhaustiveDependencies: bridge starts once, should not restart on state changes
   useEffect(() => {
     // If already connected or enabled in full bidirectional mode, show
     // disconnect confirmation. Outbound-only (CCR mirror) doesn't count —
     // /remote-control upgrades it to full RC instead.
     if ((replBridgeConnected || replBridgeEnabled) && !replBridgeOutboundOnly) {
-      setShowDisconnectDialog(true)
-      return
+      setShowDisconnectDialog(true);
+      return;
     }
 
-    let cancelled = false
+    let cancelled = false;
     void (async () => {
       // Pre-flight checks before enabling (awaits GrowthBook init if disk
       // cache is stale — so Max users don't get a false "not enabled" error)
-      const error = await checkBridgePrerequisites()
-      if (cancelled) return
+      const error = await checkBridgePrerequisites();
+      if (cancelled) return;
       if (error) {
         logEvent('tengu_bridge_command', {
-          action:
-            'preflight_failed' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        })
-        onDone(error, { display: 'system' })
-        return
+          action: 'preflight_failed' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        });
+        onDone(error, { display: 'system' });
+        return;
       }
 
       // Show first-time remote dialog if not yet seen.
@@ -84,48 +72,47 @@ function BridgeToggle({ onDone, name }: Props): React.ReactNode {
       // enables the bridge (the handler only sets replBridgeEnabled, not the name).
       if (shouldShowRemoteCallout()) {
         setAppState(prev => {
-          if (prev.showRemoteCallout) return prev
+          if (prev.showRemoteCallout) return prev;
           return {
             ...prev,
             showRemoteCallout: true,
             replBridgeInitialName: name,
-          }
-        })
-        onDone('', { display: 'system' })
-        return
+          };
+        });
+        onDone('', { display: 'system' });
+        return;
       }
 
       // Enable the bridge — useReplBridge in REPL.tsx handles the rest:
       // registers environment, creates session with conversation, connects WebSocket
       logEvent('tengu_bridge_command', {
-        action:
-          'connect' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
+        action: 'connect' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
       setAppState(prev => {
-        if (prev.replBridgeEnabled && !prev.replBridgeOutboundOnly) return prev
+        if (prev.replBridgeEnabled && !prev.replBridgeOutboundOnly) return prev;
         return {
           ...prev,
           replBridgeEnabled: true,
           replBridgeExplicit: true,
           replBridgeOutboundOnly: false,
           replBridgeInitialName: name,
-        }
-      })
+        };
+      });
       onDone('Remote Control connecting\u2026', {
         display: 'system',
-      })
-    })()
+      });
+    })();
 
     return () => {
-      cancelled = true
-    }
-  }, []) // eslint-disable-line react-hooks/exhaustive-deps -- run once on mount
+      cancelled = true;
+    };
+  }, []); // eslint-disable-line react-hooks/exhaustive-deps -- run once on mount
 
   if (showDisconnectDialog) {
-    return <BridgeDisconnectDialog onDone={onDone} />
+    return <BridgeDisconnectDialog onDone={onDone} />;
   }
 
-  return null
+  return null;
 }
 
 /**
@@ -133,22 +120,22 @@ function BridgeToggle({ onDone, name }: Props): React.ReactNode {
  * Shows the session URL and lets the user disconnect or continue.
  */
 function BridgeDisconnectDialog({ onDone }: Props): React.ReactNode {
-  useRegisterOverlay('bridge-disconnect-dialog')
-  const setAppState = useSetAppState()
-  const sessionUrl = useAppState(s => s.replBridgeSessionUrl)
-  const connectUrl = useAppState(s => s.replBridgeConnectUrl)
-  const sessionActive = useAppState(s => s.replBridgeSessionActive)
-  const [focusIndex, setFocusIndex] = useState(2)
-  const [showQR, setShowQR] = useState(false)
-  const [qrText, setQrText] = useState('')
+  useRegisterOverlay('bridge-disconnect-dialog');
+  const setAppState = useSetAppState();
+  const sessionUrl = useAppState(s => s.replBridgeSessionUrl);
+  const connectUrl = useAppState(s => s.replBridgeConnectUrl);
+  const sessionActive = useAppState(s => s.replBridgeSessionActive);
+  const [focusIndex, setFocusIndex] = useState(2);
+  const [showQR, setShowQR] = useState(false);
+  const [qrText, setQrText] = useState('');
 
-  const displayUrl = sessionActive ? sessionUrl : connectUrl
+  const displayUrl = sessionActive ? sessionUrl : connectUrl;
 
   // Generate QR code when URL changes or QR is toggled on
   useEffect(() => {
     if (!showQR || !displayUrl) {
-      setQrText('')
-      return
+      setQrText('');
+      return;
     }
     qrToString(displayUrl, {
       type: 'utf8',
@@ -156,55 +143,53 @@ function BridgeDisconnectDialog({ onDone }: Props): React.ReactNode {
       small: true,
     } as Parameters<typeof qrToString>[1])
       .then(setQrText)
-      .catch(() => setQrText(''))
-  }, [showQR, displayUrl])
+      .catch(() => setQrText(''));
+  }, [showQR, displayUrl]);
 
   function handleDisconnect(): void {
     setAppState(prev => {
-      if (!prev.replBridgeEnabled) return prev
+      if (!prev.replBridgeEnabled) return prev;
       return {
         ...prev,
         replBridgeEnabled: false,
         replBridgeExplicit: false,
         replBridgeOutboundOnly: false,
-      }
-    })
+      };
+    });
     logEvent('tengu_bridge_command', {
-      action:
-        'disconnect' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-    })
-    onDone(REMOTE_CONTROL_DISCONNECTED_MSG, { display: 'system' })
+      action: 'disconnect' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+    });
+    onDone(REMOTE_CONTROL_DISCONNECTED_MSG, { display: 'system' });
   }
 
   function handleShowQR(): void {
-    setShowQR(prev => !prev)
+    setShowQR(prev => !prev);
   }
 
   function handleContinue(): void {
-    onDone(undefined, { display: 'skip' })
+    onDone(undefined, { display: 'skip' });
   }
 
-  const ITEM_COUNT = 3
+  const ITEM_COUNT = 3;
 
   useKeybindings(
     {
       'select:next': () => setFocusIndex(i => (i + 1) % ITEM_COUNT),
-      'select:previous': () =>
-        setFocusIndex(i => (i - 1 + ITEM_COUNT) % ITEM_COUNT),
+      'select:previous': () => setFocusIndex(i => (i - 1 + ITEM_COUNT) % ITEM_COUNT),
       'select:accept': () => {
         if (focusIndex === 0) {
-          handleDisconnect()
+          handleDisconnect();
         } else if (focusIndex === 1) {
-          handleShowQR()
+          handleShowQR();
         } else {
-          handleContinue()
+          handleContinue();
         }
       },
     },
     { context: 'Select' },
-  )
+  );
 
-  const qrLines = qrText ? qrText.split('\n').filter(l => l.length > 0) : []
+  const qrLines = qrText ? qrText.split('\n').filter(l => l.length > 0) : [];
 
   return (
     <Dialog title="Remote Control" onCancel={handleContinue} hideInputGuide>
@@ -234,7 +219,7 @@ function BridgeDisconnectDialog({ onDone }: Props): React.ReactNode {
         <Text dimColor>Enter to select · Esc to continue</Text>
       </Box>
     </Dialog>
-  )
+  );
 }
 
 /**
@@ -245,43 +230,39 @@ function BridgeDisconnectDialog({ onDone }: Props): React.ReactNode {
  */
 async function checkBridgePrerequisites(): Promise<string | null> {
   // Check organization policy — remote control may be disabled
-  const { waitForPolicyLimitsToLoad, isPolicyAllowed } = await import(
-    '../../services/policyLimits/index.js'
-  )
-  await waitForPolicyLimitsToLoad()
+  const { waitForPolicyLimitsToLoad, isPolicyAllowed } = await import('../../services/policyLimits/index.js');
+  await waitForPolicyLimitsToLoad();
   if (!isPolicyAllowed('allow_remote_control')) {
-    return "Remote Control is disabled by your organization's policy."
+    return "Remote Control is disabled by your organization's policy.";
   }
 
-  const disabledReason = await getBridgeDisabledReason()
+  const disabledReason = await getBridgeDisabledReason();
   if (disabledReason) {
-    return disabledReason
+    return disabledReason;
   }
 
   // Mirror the v1/v2 branching logic in initReplBridge: env-less (v2) is used
   // only when the flag is on AND the session is not perpetual.  In assistant
   // mode (KAIROS) useReplBridge sets perpetual=true, which forces
   // initReplBridge onto the v1 path — so the prerequisite check must match.
-  let useV2 = isEnvLessBridgeEnabled()
+  let useV2 = isEnvLessBridgeEnabled();
   if (feature('KAIROS') && useV2) {
-    const { isAssistantMode } = await import('../../assistant/index.js')
+    const { isAssistantMode } = await import('../../assistant/index.js');
     if (isAssistantMode()) {
-      useV2 = false
+      useV2 = false;
     }
   }
-  const versionError = useV2
-    ? await checkEnvLessBridgeMinVersion()
-    : checkBridgeMinVersion()
+  const versionError = useV2 ? await checkEnvLessBridgeMinVersion() : checkBridgeMinVersion();
   if (versionError) {
-    return versionError
+    return versionError;
   }
 
   if (!getBridgeAccessToken()) {
-    return BRIDGE_LOGIN_INSTRUCTION
+    return BRIDGE_LOGIN_INSTRUCTION;
   }
 
-  logForDebugging('[bridge] Prerequisites passed, enabling bridge')
-  return null
+  logForDebugging('[bridge] Prerequisites passed, enabling bridge');
+  return null;
 }
 
 export async function call(
@@ -289,6 +270,6 @@ export async function call(
   _context: ToolUseContext & LocalJSXCommandContext,
   args: string,
 ): Promise<React.ReactNode> {
-  const name = args.trim() || undefined
-  return <BridgeToggle onDone={onDone} name={name} />
+  const name = args.trim() || undefined;
+  return <BridgeToggle onDone={onDone} name={name} />;
 }
diff --git a/src/commands/btw/btw.tsx b/src/commands/btw/btw.tsx
index 7da3141b9..27d1d8a45 100644
--- a/src/commands/btw/btw.tsx
+++ b/src/commands/btw/btw.tsx
@@ -1,118 +1,96 @@
-import * as React from 'react'
-import { useEffect, useRef, useState } from 'react'
-import { useInterval } from 'usehooks-ts'
-import type { CommandResultDisplay } from '../../commands.js'
-import { Markdown } from '../../components/Markdown.js'
-import { SpinnerGlyph } from '../../components/Spinner/SpinnerGlyph.js'
-import { DOWN_ARROW, UP_ARROW } from '../../constants/figures.js'
-import { getSystemPrompt } from '../../constants/prompts.js'
-import { useModalOrTerminalSize } from '../../context/modalContext.js'
-import { getSystemContext, getUserContext } from '../../context.js'
-import { useTerminalSize } from '../../hooks/useTerminalSize.js'
-import { type KeyboardEvent, type ScrollBoxHandle, ScrollBox } from '@anthropic/ink'
-import { Box, Text } from '@anthropic/ink'
-import type { LocalJSXCommandOnDone } from '../../types/command.js'
-import type { Message } from '../../types/message.js'
-import { createAbortController } from '../../utils/abortController.js'
-import { saveGlobalConfig } from '../../utils/config.js'
-import { errorMessage } from '../../utils/errors.js'
-import {
-  type CacheSafeParams,
-  getLastCacheSafeParams,
-} from '../../utils/forkedAgent.js'
-import { getMessagesAfterCompactBoundary } from '../../utils/messages.js'
-import type { ProcessUserInputContext } from '../../utils/processUserInput/processUserInput.js'
-import { runSideQuestion } from '../../utils/sideQuestion.js'
-import { asSystemPrompt } from '../../utils/systemPromptType.js'
+import * as React from 'react';
+import { useEffect, useRef, useState } from 'react';
+import { useInterval } from 'usehooks-ts';
+import type { CommandResultDisplay } from '../../commands.js';
+import { Markdown } from '../../components/Markdown.js';
+import { SpinnerGlyph } from '../../components/Spinner/SpinnerGlyph.js';
+import { DOWN_ARROW, UP_ARROW } from '../../constants/figures.js';
+import { getSystemPrompt } from '../../constants/prompts.js';
+import { useModalOrTerminalSize } from '../../context/modalContext.js';
+import { getSystemContext, getUserContext } from '../../context.js';
+import { useTerminalSize } from '../../hooks/useTerminalSize.js';
+import { type KeyboardEvent, type ScrollBoxHandle, ScrollBox } from '@anthropic/ink';
+import { Box, Text } from '@anthropic/ink';
+import type { LocalJSXCommandOnDone } from '../../types/command.js';
+import type { Message } from '../../types/message.js';
+import { createAbortController } from '../../utils/abortController.js';
+import { saveGlobalConfig } from '../../utils/config.js';
+import { errorMessage } from '../../utils/errors.js';
+import { type CacheSafeParams, getLastCacheSafeParams } from '../../utils/forkedAgent.js';
+import { getMessagesAfterCompactBoundary } from '../../utils/messages.js';
+import type { ProcessUserInputContext } from '../../utils/processUserInput/processUserInput.js';
+import { runSideQuestion } from '../../utils/sideQuestion.js';
+import { asSystemPrompt } from '../../utils/systemPromptType.js';
 
 type BtwComponentProps = {
-  question: string
-  context: ProcessUserInputContext
-  onDone: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-}
+  question: string;
+  context: ProcessUserInputContext;
+  onDone: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+};
 
-const CHROME_ROWS = 5
-const OUTER_CHROME_ROWS = 6
-const SCROLL_LINES = 3
+const CHROME_ROWS = 5;
+const OUTER_CHROME_ROWS = 6;
+const SCROLL_LINES = 3;
 
-function BtwSideQuestion({
-  question,
-  context,
-  onDone,
-}: BtwComponentProps): React.ReactNode {
-  const [response, setResponse] = useState<string | null>(null)
-  const [error, setError] = useState<string | null>(null)
-  const [frame, setFrame] = useState(0)
-  const scrollRef = useRef<ScrollBoxHandle>(null)
-  const { rows } = useModalOrTerminalSize(useTerminalSize())
+function BtwSideQuestion({ question, context, onDone }: BtwComponentProps): React.ReactNode {
+  const [response, setResponse] = useState<string | null>(null);
+  const [error, setError] = useState<string | null>(null);
+  const [frame, setFrame] = useState(0);
+  const scrollRef = useRef<ScrollBoxHandle>(null);
+  const { rows } = useModalOrTerminalSize(useTerminalSize());
 
   // Animate spinner while loading
-  useInterval(() => setFrame(f => f + 1), response || error ? null : 80)
+  useInterval(() => setFrame(f => f + 1), response || error ? null : 80);
 
   function handleKeyDown(e: KeyboardEvent): void {
-    if (
-      e.key === 'escape' ||
-      e.key === 'return' ||
-      e.key === ' ' ||
-      (e.ctrl && (e.key === 'c' || e.key === 'd'))
-    ) {
-      e.preventDefault()
-      onDone(undefined, { display: 'skip' })
-      return
+    if (e.key === 'escape' || e.key === 'return' || e.key === ' ' || (e.ctrl && (e.key === 'c' || e.key === 'd'))) {
+      e.preventDefault();
+      onDone(undefined, { display: 'skip' });
+      return;
     }
     if (e.key === 'up' || (e.ctrl && e.key === 'p')) {
-      e.preventDefault()
-      scrollRef.current?.scrollBy(-SCROLL_LINES)
+      e.preventDefault();
+      scrollRef.current?.scrollBy(-SCROLL_LINES);
     }
     if (e.key === 'down' || (e.ctrl && e.key === 'n')) {
-      e.preventDefault()
-      scrollRef.current?.scrollBy(SCROLL_LINES)
+      e.preventDefault();
+      scrollRef.current?.scrollBy(SCROLL_LINES);
     }
   }
 
   useEffect(() => {
-    const abortController = createAbortController()
+    const abortController = createAbortController();
 
     async function fetchResponse(): Promise<void> {
       try {
-        const cacheSafeParams = await buildCacheSafeParams(context)
-        const result = await runSideQuestion({ question, cacheSafeParams })
+        const cacheSafeParams = await buildCacheSafeParams(context);
+        const result = await runSideQuestion({ question, cacheSafeParams });
 
         if (!abortController.signal.aborted) {
           if (result.response) {
-            setResponse(result.response)
+            setResponse(result.response);
           } else {
-            setError('No response received')
+            setError('No response received');
           }
         }
       } catch (err) {
         if (!abortController.signal.aborted) {
-          setError(errorMessage(err) || 'Failed to get response')
+          setError(errorMessage(err) || 'Failed to get response');
         }
       }
     }
 
-    void fetchResponse()
+    void fetchResponse();
 
     return () => {
-      abortController.abort()
-    }
-  }, [question, context])
+      abortController.abort();
+    };
+  }, [question, context]);
 
-  const maxContentHeight = Math.max(5, rows - CHROME_ROWS - OUTER_CHROME_ROWS)
+  const maxContentHeight = Math.max(5, rows - CHROME_ROWS - OUTER_CHROME_ROWS);
 
   return (
-    <Box
-      flexDirection="column"
-      paddingLeft={2}
-      marginTop={1}
-      tabIndex={0}
-      autoFocus
-      onKeyDown={handleKeyDown}
-    >
+    <Box flexDirection="column" paddingLeft={2} marginTop={1} tabIndex={0} autoFocus onKeyDown={handleKeyDown}>
       <Box>
         <Text color="warning" bold>
           /btw{' '}
@@ -136,13 +114,12 @@ function BtwSideQuestion({
       {(response || error) && (
         <Box marginTop={1}>
           <Text dimColor>
-            {UP_ARROW}/{DOWN_ARROW} to scroll · Space, Enter, or Escape to
-            dismiss
+            {UP_ARROW}/{DOWN_ARROW} to scroll · Space, Enter, or Escape to dismiss
           </Text>
         </Box>
       )}
     </Box>
-  )
+  );
 }
 
 /**
@@ -161,20 +138,16 @@ function BtwSideQuestion({
  * --append-system-prompt, coordinator mode).
  */
 function stripInProgressAssistantMessage(messages: Message[]): Message[] {
-  const last = messages.at(-1)
+  const last = messages.at(-1);
   if (last?.type === 'assistant' && last.message!.stop_reason === null) {
-    return messages.slice(0, -1)
+    return messages.slice(0, -1);
   }
-  return messages
+  return messages;
 }
 
-async function buildCacheSafeParams(
-  context: ProcessUserInputContext,
-): Promise<CacheSafeParams> {
-  const forkContextMessages = getMessagesAfterCompactBoundary(
-    stripInProgressAssistantMessage(context.messages),
-  )
-  const saved = getLastCacheSafeParams()
+async function buildCacheSafeParams(context: ProcessUserInputContext): Promise<CacheSafeParams> {
+  const forkContextMessages = getMessagesAfterCompactBoundary(stripInProgressAssistantMessage(context.messages));
+  const saved = getLastCacheSafeParams();
   if (saved) {
     return {
       systemPrompt: saved.systemPrompt,
@@ -182,25 +155,20 @@ async function buildCacheSafeParams(
       systemContext: saved.systemContext,
       toolUseContext: context,
       forkContextMessages,
-    }
+    };
   }
   const [rawSystemPrompt, userContext, systemContext] = await Promise.all([
-    getSystemPrompt(
-      context.options.tools,
-      context.options.mainLoopModel,
-      [],
-      context.options.mcpClients,
-    ),
+    getSystemPrompt(context.options.tools, context.options.mainLoopModel, [], context.options.mcpClients),
     getUserContext(),
     getSystemContext(),
-  ])
+  ]);
   return {
     systemPrompt: asSystemPrompt(rawSystemPrompt),
     userContext,
     systemContext,
     toolUseContext: context,
     forkContextMessages,
-  }
+  };
 }
 
 export async function call(
@@ -208,19 +176,17 @@ export async function call(
   context: ProcessUserInputContext,
   args: string,
 ): Promise<React.ReactNode> {
-  const question = args?.trim()
+  const question = args?.trim();
 
   if (!question) {
-    onDone('Usage: /btw <your question>', { display: 'system' })
-    return null
+    onDone('Usage: /btw <your question>', { display: 'system' });
+    return null;
   }
 
   saveGlobalConfig(current => ({
     ...current,
     btwUseCount: current.btwUseCount + 1,
-  }))
+  }));
 
-  return (
-    <BtwSideQuestion question={question} context={context} onDone={onDone} />
-  )
+  return <BtwSideQuestion question={question} context={context} onDone={onDone} />;
 }
diff --git a/src/commands/buddy/buddy.ts b/src/commands/buddy/buddy.ts
index d54a92d93..2553891f3 100644
--- a/src/commands/buddy/buddy.ts
+++ b/src/commands/buddy/buddy.ts
@@ -128,7 +128,9 @@ export async function call(
     return React.createElement(CompanionCard, {
       companion,
       lastReaction,
-      onDone: onDone as unknown as Parameters<typeof CompanionCard>[0]['onDone'],
+      onDone: onDone as unknown as Parameters<
+        typeof CompanionCard
+      >[0]['onDone'],
     })
   }
 
diff --git a/src/commands/chrome/chrome.tsx b/src/commands/chrome/chrome.tsx
index 83f34c33d..c3c370be1 100644
--- a/src/commands/chrome/chrome.tsx
+++ b/src/commands/chrome/chrome.tsx
@@ -1,39 +1,29 @@
-import React, { useState } from 'react'
-import {
-  type OptionWithDescription,
-  Select,
-} from '../../components/CustomSelect/select.js'
-import { Dialog } from '@anthropic/ink'
-import { Box, Text } from '@anthropic/ink'
-import { useAppState } from '../../state/AppState.js'
-import { isClaudeAISubscriber } from '../../utils/auth.js'
-import { openBrowser } from '../../utils/browser.js'
-import {
-  CLAUDE_IN_CHROME_MCP_SERVER_NAME,
-  openInChrome,
-} from '../../utils/claudeInChrome/common.js'
-import { isChromeExtensionInstalled } from '../../utils/claudeInChrome/setup.js'
-import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js'
-import { env } from '../../utils/env.js'
-import { isRunningOnHomespace } from '../../utils/envUtils.js'
+import React, { useState } from 'react';
+import { type OptionWithDescription, Select } from '../../components/CustomSelect/select.js';
+import { Dialog } from '@anthropic/ink';
+import { Box, Text } from '@anthropic/ink';
+import { useAppState } from '../../state/AppState.js';
+import { isClaudeAISubscriber } from '../../utils/auth.js';
+import { openBrowser } from '../../utils/browser.js';
+import { CLAUDE_IN_CHROME_MCP_SERVER_NAME, openInChrome } from '../../utils/claudeInChrome/common.js';
+import { isChromeExtensionInstalled } from '../../utils/claudeInChrome/setup.js';
+import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js';
+import { env } from '../../utils/env.js';
+import { isRunningOnHomespace } from '../../utils/envUtils.js';
 
-const CHROME_EXTENSION_URL = 'https://claude.ai/chrome'
-const CHROME_PERMISSIONS_URL = 'https://clau.de/chrome/permissions'
-const CHROME_RECONNECT_URL = 'https://clau.de/chrome/reconnect'
+const CHROME_EXTENSION_URL = 'https://claude.ai/chrome';
+const CHROME_PERMISSIONS_URL = 'https://clau.de/chrome/permissions';
+const CHROME_RECONNECT_URL = 'https://clau.de/chrome/reconnect';
 
-type MenuAction =
-  | 'install-extension'
-  | 'reconnect'
-  | 'manage-permissions'
-  | 'toggle-default'
+type MenuAction = 'install-extension' | 'reconnect' | 'manage-permissions' | 'toggle-default';
 
 type Props = {
-  onDone: (result?: string) => void
-  isExtensionInstalled: boolean
-  configEnabled: boolean | undefined
-  isClaudeAISubscriber: boolean
-  isWSL: boolean
-}
+  onDone: (result?: string) => void;
+  isExtensionInstalled: boolean;
+  configEnabled: boolean | undefined;
+  isClaudeAISubscriber: boolean;
+  isWSL: boolean;
+};
 
 function ClaudeInChromeMenu({
   onDone,
@@ -42,72 +32,66 @@ function ClaudeInChromeMenu({
   isClaudeAISubscriber,
   isWSL,
 }: Props): React.ReactNode {
-  const mcpClients = useAppState(s => s.mcp.clients)
-  const [selectKey, setSelectKey] = useState(0)
-  const [enabledByDefault, setEnabledByDefault] = useState(
-    configEnabled ?? false,
-  )
-  const [showInstallHint, setShowInstallHint] = useState(false)
-  const [isExtensionInstalled, setIsExtensionInstalled] = useState(installed)
+  const mcpClients = useAppState(s => s.mcp.clients);
+  const [selectKey, setSelectKey] = useState(0);
+  const [enabledByDefault, setEnabledByDefault] = useState(configEnabled ?? false);
+  const [showInstallHint, setShowInstallHint] = useState(false);
+  const [isExtensionInstalled, setIsExtensionInstalled] = useState(installed);
 
-  const isHomespace = process.env.USER_TYPE === 'ant' && isRunningOnHomespace()
+  const isHomespace = process.env.USER_TYPE === 'ant' && isRunningOnHomespace();
 
-  const chromeClient = mcpClients.find(
-    c => c.name === CLAUDE_IN_CHROME_MCP_SERVER_NAME,
-  )
-  const isConnected = chromeClient?.type === 'connected'
+  const chromeClient = mcpClients.find(c => c.name === CLAUDE_IN_CHROME_MCP_SERVER_NAME);
+  const isConnected = chromeClient?.type === 'connected';
 
   function openUrl(url: string): void {
     if (isHomespace) {
-      void openBrowser(url)
+      void openBrowser(url);
     } else {
-      void openInChrome(url)
+      void openInChrome(url);
     }
   }
 
   function handleAction(action: MenuAction): void {
     switch (action) {
       case 'install-extension':
-        setSelectKey(k => k + 1)
-        setShowInstallHint(true)
-        openUrl(CHROME_EXTENSION_URL)
-        break
+        setSelectKey(k => k + 1);
+        setShowInstallHint(true);
+        openUrl(CHROME_EXTENSION_URL);
+        break;
       case 'reconnect':
-        setSelectKey(k => k + 1)
+        setSelectKey(k => k + 1);
         void isChromeExtensionInstalled().then(installed => {
-          setIsExtensionInstalled(installed)
+          setIsExtensionInstalled(installed);
           if (installed) {
-            setShowInstallHint(false)
+            setShowInstallHint(false);
           }
-        })
-        openUrl(CHROME_RECONNECT_URL)
-        break
+        });
+        openUrl(CHROME_RECONNECT_URL);
+        break;
       case 'manage-permissions':
-        setSelectKey(k => k + 1)
-        openUrl(CHROME_PERMISSIONS_URL)
-        break
+        setSelectKey(k => k + 1);
+        openUrl(CHROME_PERMISSIONS_URL);
+        break;
       case 'toggle-default': {
-        const newValue = !enabledByDefault
+        const newValue = !enabledByDefault;
         saveGlobalConfig(current => ({
           ...current,
           claudeInChromeDefaultEnabled: newValue,
-        }))
-        setEnabledByDefault(newValue)
-        break
+        }));
+        setEnabledByDefault(newValue);
+        break;
       }
     }
   }
 
-  const options: OptionWithDescription<MenuAction>[] = []
-  const requiresExtensionSuffix = isExtensionInstalled
-    ? ''
-    : ' (requires extension)'
+  const options: OptionWithDescription<MenuAction>[] = [];
+  const requiresExtensionSuffix = isExtensionInstalled ? '' : ' (requires extension)';
 
   if (!isExtensionInstalled && !isHomespace) {
     options.push({
       label: 'Install Chrome extension',
       value: 'install-extension',
-    })
+    });
   }
 
   options.push(
@@ -133,36 +117,23 @@ function ClaudeInChromeMenu({
       label: `Enabled by default: ${enabledByDefault ? 'Yes' : 'No'}`,
       value: 'toggle-default',
     },
-  )
+  );
 
-  const isDisabled =
-    isWSL || ((process.env.USER_TYPE as string) !== 'ant' && !isClaudeAISubscriber)
+  const isDisabled = isWSL || ((process.env.USER_TYPE as string) !== 'ant' && !isClaudeAISubscriber);
 
   return (
-    <Dialog
-      title="Claude in Chrome (Beta)"
-      onCancel={() => onDone()}
-      color="chromeYellow"
-    >
+    <Dialog title="Claude in Chrome (Beta)" onCancel={() => onDone()} color="chromeYellow">
       <Box flexDirection="column" gap={1}>
         <Text>
-          Claude in Chrome works with the Chrome extension to let you control
-          your browser directly from Claude Code. Navigate websites, fill forms,
-          capture screenshots, record GIFs, and debug with console logs and
-          network requests.
+          Claude in Chrome works with the Chrome extension to let you control your browser directly from Claude Code.
+          Navigate websites, fill forms, capture screenshots, record GIFs, and debug with console logs and network
+          requests.
         </Text>
 
-        {isWSL && (
-          <Text color="error">
-            Claude in Chrome is not supported in WSL at this time.
-          </Text>
-        )}
-
+        {isWSL && <Text color="error">Claude in Chrome is not supported in WSL at this time.</Text>}
 
         {(process.env.USER_TYPE as string) !== 'ant' && !isClaudeAISubscriber && (
-          <Text color="error">
-            Claude in Chrome requires a claude.ai subscription.
-          </Text>
+          <Text color="error">Claude in Chrome requires a claude.ai subscription.</Text>
         )}
 
         {!isDisabled && (
@@ -170,12 +141,7 @@ function ClaudeInChromeMenu({
             {!isHomespace && (
               <Box flexDirection="column">
                 <Text>
-                  Status:{' '}
-                  {isConnected ? (
-                    <Text color="success">Enabled</Text>
-                  ) : (
-                    <Text color="inactive">Disabled</Text>
-                  )}
+                  Status: {isConnected ? <Text color="success">Enabled</Text> : <Text color="inactive">Disabled</Text>}
                 </Text>
                 <Text>
                   Extension:{' '}
@@ -187,17 +153,10 @@ function ClaudeInChromeMenu({
                 </Text>
               </Box>
             )}
-            <Select
-              key={selectKey}
-              options={options}
-              onChange={handleAction}
-              hideIndexes
-            />
+            <Select key={selectKey} options={options} onChange={handleAction} hideIndexes />
 
             {showInstallHint && (
-              <Text color="warning">
-                Once installed, select {'"Reconnect extension"'} to connect.
-              </Text>
+              <Text color="warning">Once installed, select {'"Reconnect extension"'} to connect.</Text>
             )}
 
             <Text>
@@ -208,25 +167,22 @@ function ClaudeInChromeMenu({
             </Text>
 
             <Text dimColor>
-              Site-level permissions are inherited from the Chrome extension.
-              Manage permissions in the Chrome extension settings to control
-              which sites Claude can browse, click, and type on.
+              Site-level permissions are inherited from the Chrome extension. Manage permissions in the Chrome extension
+              settings to control which sites Claude can browse, click, and type on.
             </Text>
           </>
         )}
         <Text dimColor>Learn more: https://code.claude.com/docs/en/chrome</Text>
       </Box>
     </Dialog>
-  )
+  );
 }
 
-export const call = async function (
-  onDone: (result?: string) => void,
-): Promise<React.ReactNode> {
-  const isExtensionInstalled = await isChromeExtensionInstalled()
-  const config = getGlobalConfig()
-  const isSubscriber = isClaudeAISubscriber()
-  const isWSL = env.isWslEnvironment()
+export const call = async function (onDone: (result?: string) => void): Promise<React.ReactNode> {
+  const isExtensionInstalled = await isChromeExtensionInstalled();
+  const config = getGlobalConfig();
+  const isSubscriber = isClaudeAISubscriber();
+  const isWSL = env.isWslEnvironment();
 
   return (
     <ClaudeInChromeMenu
@@ -236,5 +192,5 @@ export const call = async function (
       isClaudeAISubscriber={isSubscriber}
       isWSL={isWSL}
     />
-  )
-}
+  );
+};
diff --git a/src/commands/clear/caches.ts b/src/commands/clear/caches.ts
index 8eacc0d6f..578b9297f 100644
--- a/src/commands/clear/caches.ts
+++ b/src/commands/clear/caches.ts
@@ -93,12 +93,12 @@ export function clearSessionCaches(
 
   // Clear tungsten session usage tracking
   if (process.env.USER_TYPE === 'ant') {
-    void import('@claude-code-best/builtin-tools/tools/TungstenTool/TungstenTool.js').then(
-      ({ clearSessionsWithTungstenUsage, resetInitializationState }) => {
-        clearSessionsWithTungstenUsage()
-        resetInitializationState()
-      },
-    )
+    void import(
+      '@claude-code-best/builtin-tools/tools/TungstenTool/TungstenTool.js'
+    ).then(({ clearSessionsWithTungstenUsage, resetInitializationState }) => {
+      clearSessionsWithTungstenUsage()
+      resetInitializationState()
+    })
   }
   // Clear attribution caches (file content cache, pending bash states)
   // Dynamic import to preserve dead code elimination for COMMIT_ATTRIBUTION feature flag
@@ -126,19 +126,21 @@ export function clearSessionCaches(
   // Clear session environment variables
   clearSessionEnvVars()
   // Clear WebFetch URL cache (up to 50MB of cached page content)
-  void import('@claude-code-best/builtin-tools/tools/WebFetchTool/utils.js').then(
-    ({ clearWebFetchCache }) => clearWebFetchCache(),
-  )
+  void import(
+    '@claude-code-best/builtin-tools/tools/WebFetchTool/utils.js'
+  ).then(({ clearWebFetchCache }) => clearWebFetchCache())
   // Clear ToolSearch description cache (full tool prompts, ~500KB for 50 MCP tools)
-  void import('@claude-code-best/builtin-tools/tools/ToolSearchTool/ToolSearchTool.js').then(
-    ({ clearToolSearchDescriptionCache }) => clearToolSearchDescriptionCache(),
+  void import(
+    '@claude-code-best/builtin-tools/tools/ToolSearchTool/ToolSearchTool.js'
+  ).then(({ clearToolSearchDescriptionCache }) =>
+    clearToolSearchDescriptionCache(),
   )
   // Clear agent definitions cache (accumulates per-cwd via EnterWorktreeTool)
-  void import('@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js').then(
-    ({ clearAgentDefinitionsCache }) => clearAgentDefinitionsCache(),
-  )
+  void import(
+    '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
+  ).then(({ clearAgentDefinitionsCache }) => clearAgentDefinitionsCache())
   // Clear SkillTool prompt cache (accumulates per project root)
-  void import('@claude-code-best/builtin-tools/tools/SkillTool/prompt.js').then(({ clearPromptCache }) =>
-    clearPromptCache(),
+  void import('@claude-code-best/builtin-tools/tools/SkillTool/prompt.js').then(
+    ({ clearPromptCache }) => clearPromptCache(),
   )
 }
diff --git a/src/commands/compact/compact.ts b/src/commands/compact/compact.ts
index 16a8b586d..b12f62a2a 100644
--- a/src/commands/compact/compact.ts
+++ b/src/commands/compact/compact.ts
@@ -224,7 +224,7 @@ async function compactViaReactive(
     context.setStreamMode?.('requesting')
     context.setResponseLength?.(() => 0)
     context.onCompactProgress?.({ type: 'compact_end' })
-    context.setSDKStatus?.("" as SDKStatus)
+    context.setSDKStatus?.('' as SDKStatus)
   }
 }
 
diff --git a/src/commands/compact/src/bootstrap/state.ts b/src/commands/compact/src/bootstrap/state.ts
index a860c549e..9d8e08961 100644
--- a/src/commands/compact/src/bootstrap/state.ts
+++ b/src/commands/compact/src/bootstrap/state.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type markPostCompaction = any;
+export type markPostCompaction = any
diff --git a/src/commands/config/config.tsx b/src/commands/config/config.tsx
index d4e216c38..95796286c 100644
--- a/src/commands/config/config.tsx
+++ b/src/commands/config/config.tsx
@@ -1,7 +1,7 @@
-import * as React from 'react'
-import { Settings } from '../../components/Settings/Settings.js'
-import type { LocalJSXCommandCall } from '../../types/command.js'
+import * as React from 'react';
+import { Settings } from '../../components/Settings/Settings.js';
+import type { LocalJSXCommandCall } from '../../types/command.js';
 
 export const call: LocalJSXCommandCall = async (onDone, context) => {
-  return <Settings onClose={onDone} context={context} defaultTab="Config" />
-}
+  return <Settings onClose={onDone} context={context} defaultTab="Config" />;
+};
diff --git a/src/commands/context/context.tsx b/src/commands/context/context.tsx
index 747c5a9de..ab1cb6e93 100644
--- a/src/commands/context/context.tsx
+++ b/src/commands/context/context.tsx
@@ -1,13 +1,13 @@
-import { feature } from 'bun:bundle'
-import * as React from 'react'
-import type { LocalJSXCommandContext } from '../../commands.js'
-import { ContextVisualization } from '../../components/ContextVisualization.js'
-import { microcompactMessages } from '../../services/compact/microCompact.js'
-import type { LocalJSXCommandOnDone } from '../../types/command.js'
-import type { Message } from '../../types/message.js'
-import { analyzeContextUsage } from '../../utils/analyzeContext.js'
-import { getMessagesAfterCompactBoundary } from '../../utils/messages.js'
-import { renderToAnsiString } from '../../utils/staticRender.js'
+import { feature } from 'bun:bundle';
+import * as React from 'react';
+import type { LocalJSXCommandContext } from '../../commands.js';
+import { ContextVisualization } from '../../components/ContextVisualization.js';
+import { microcompactMessages } from '../../services/compact/microCompact.js';
+import type { LocalJSXCommandOnDone } from '../../types/command.js';
+import type { Message } from '../../types/message.js';
+import { analyzeContextUsage } from '../../utils/analyzeContext.js';
+import { getMessagesAfterCompactBoundary } from '../../utils/messages.js';
+import { renderToAnsiString } from '../../utils/staticRender.js';
 
 /**
  * Apply the same context transforms query.ts does before the API call, so
@@ -16,36 +16,33 @@ import { renderToAnsiString } from '../../utils/staticRender.js'
  * was collapsed — user sees "180k, 3 spans collapsed" when the API sees 120k.
  */
 function toApiView(messages: Message[]): Message[] {
-  let view = getMessagesAfterCompactBoundary(messages)
+  let view = getMessagesAfterCompactBoundary(messages);
   if (feature('CONTEXT_COLLAPSE')) {
     /* eslint-disable @typescript-eslint/no-require-imports */
     const { projectView } =
-      require('../../services/contextCollapse/operations.js') as typeof import('../../services/contextCollapse/operations.js')
+      require('../../services/contextCollapse/operations.js') as typeof import('../../services/contextCollapse/operations.js');
     /* eslint-enable @typescript-eslint/no-require-imports */
-    view = projectView(view)
+    view = projectView(view);
   }
-  return view
+  return view;
 }
 
-export async function call(
-  onDone: LocalJSXCommandOnDone,
-  context: LocalJSXCommandContext,
-): Promise<React.ReactNode> {
+export async function call(onDone: LocalJSXCommandOnDone, context: LocalJSXCommandContext): Promise<React.ReactNode> {
   const {
     messages,
     getAppState,
     options: { mainLoopModel, tools },
-  } = context
+  } = context;
 
-  const apiView = toApiView(messages)
+  const apiView = toApiView(messages);
 
   // Apply microcompact to get accurate representation of messages sent to API
-  const { messages: compactedMessages } = await microcompactMessages(apiView)
+  const { messages: compactedMessages } = await microcompactMessages(apiView);
 
   // Get terminal width for responsive sizing
-  const terminalWidth = process.stdout.columns || 80
+  const terminalWidth = process.stdout.columns || 80;
 
-  const appState = getAppState()
+  const appState = getAppState();
 
   // Analyze context with compacted messages
   // Pass original messages as last parameter for accurate API usage extraction
@@ -59,10 +56,10 @@ export async function call(
     context, // Pass full context for system prompt calculation
     undefined, // mainThreadAgentDefinition
     apiView, // Original messages for API usage extraction
-  )
+  );
 
   // Render to ANSI string to preserve colors and pass to onDone like local commands do
-  const output = await renderToAnsiString(<ContextVisualization data={data} />)
-  onDone(output)
-  return null
+  const output = await renderToAnsiString(<ContextVisualization data={data} />);
+  onDone(output);
+  return null;
 }
diff --git a/src/commands/copy/copy.tsx b/src/commands/copy/copy.tsx
index e54171a63..2bab38f0d 100644
--- a/src/commands/copy/copy.tsx
+++ b/src/commands/copy/copy.tsx
@@ -1,39 +1,39 @@
-import { mkdir, writeFile } from 'fs/promises'
-import { marked, type Tokens } from 'marked'
-import { tmpdir } from 'os'
-import { join } from 'path'
-import React, { useRef } from 'react'
-import type { CommandResultDisplay } from '../../commands.js'
-import type { OptionWithDescription } from '../../components/CustomSelect/select.js'
-import { Select } from '../../components/CustomSelect/select.js'
-import { Byline, KeyboardShortcutHint, Pane } from '@anthropic/ink'
-import { Box, setClipboard, Text, stringWidth, type KeyboardEvent } from '@anthropic/ink'
-import { logEvent } from '../../services/analytics/index.js'
-import type { LocalJSXCommandCall } from '../../types/command.js'
-import type { AssistantMessage, Message } from '../../types/message.js'
-import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js'
-import { extractTextContent, stripPromptXMLTags } from '../../utils/messages.js'
-import { countCharInString } from '../../utils/stringUtils.js'
+import { mkdir, writeFile } from 'fs/promises';
+import { marked, type Tokens } from 'marked';
+import { tmpdir } from 'os';
+import { join } from 'path';
+import React, { useRef } from 'react';
+import type { CommandResultDisplay } from '../../commands.js';
+import type { OptionWithDescription } from '../../components/CustomSelect/select.js';
+import { Select } from '../../components/CustomSelect/select.js';
+import { Byline, KeyboardShortcutHint, Pane } from '@anthropic/ink';
+import { Box, setClipboard, Text, stringWidth, type KeyboardEvent } from '@anthropic/ink';
+import { logEvent } from '../../services/analytics/index.js';
+import type { LocalJSXCommandCall } from '../../types/command.js';
+import type { AssistantMessage, Message } from '../../types/message.js';
+import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js';
+import { extractTextContent, stripPromptXMLTags } from '../../utils/messages.js';
+import { countCharInString } from '../../utils/stringUtils.js';
 
-const COPY_DIR = join(tmpdir(), 'claude')
-const RESPONSE_FILENAME = 'response.md'
-const MAX_LOOKBACK = 20
+const COPY_DIR = join(tmpdir(), 'claude');
+const RESPONSE_FILENAME = 'response.md';
+const MAX_LOOKBACK = 20;
 
 type CodeBlock = {
-  code: string
-  lang: string | undefined
-}
+  code: string;
+  lang: string | undefined;
+};
 
 function extractCodeBlocks(markdown: string): CodeBlock[] {
-  const tokens = marked.lexer(stripPromptXMLTags(markdown))
-  const blocks: CodeBlock[] = []
+  const tokens = marked.lexer(stripPromptXMLTags(markdown));
+  const blocks: CodeBlock[] = [];
   for (const token of tokens) {
     if (token.type === 'code') {
-      const codeToken = token as Tokens.Code
-      blocks.push({ code: codeToken.text, lang: codeToken.lang })
+      const codeToken = token as Tokens.Code;
+      blocks.push({ code: codeToken.text, lang: codeToken.lang });
     }
   }
-  return blocks
+  return blocks;
 }
 
 /**
@@ -42,95 +42,80 @@ function extractCodeBlocks(markdown: string): CodeBlock[] {
  * Index 0 = latest, 1 = second-to-latest, etc. Caps at MAX_LOOKBACK.
  */
 export function collectRecentAssistantTexts(messages: Message[]): string[] {
-  const texts: string[] = []
-  for (
-    let i = messages.length - 1;
-    i >= 0 && texts.length < MAX_LOOKBACK;
-    i--
-  ) {
-    const msg = messages[i]
-    if (msg?.type !== 'assistant' || msg.isApiErrorMessage) continue
-    const content = (msg as AssistantMessage).message.content
-    if (!Array.isArray(content)) continue
-    const text = extractTextContent(content, '\n\n')
-    if (text) texts.push(text)
+  const texts: string[] = [];
+  for (let i = messages.length - 1; i >= 0 && texts.length < MAX_LOOKBACK; i--) {
+    const msg = messages[i];
+    if (msg?.type !== 'assistant' || msg.isApiErrorMessage) continue;
+    const content = (msg as AssistantMessage).message.content;
+    if (!Array.isArray(content)) continue;
+    const text = extractTextContent(content, '\n\n');
+    if (text) texts.push(text);
   }
-  return texts
+  return texts;
 }
 
 export function fileExtension(lang: string | undefined): string {
   if (lang) {
     // Sanitize to prevent path traversal (e.g. ```../../etc/passwd)
     // Language identifiers are alphanumeric: python, tsx, jsonc, etc.
-    const sanitized = lang.replace(/[^a-zA-Z0-9]/g, '')
+    const sanitized = lang.replace(/[^a-zA-Z0-9]/g, '');
     if (sanitized && sanitized !== 'plaintext') {
-      return `.${sanitized}`
+      return `.${sanitized}`;
     }
   }
-  return '.txt'
+  return '.txt';
 }
 
 async function writeToFile(text: string, filename: string): Promise<string> {
-  const filePath = join(COPY_DIR, filename)
-  await mkdir(COPY_DIR, { recursive: true })
-  await writeFile(filePath, text, 'utf-8')
-  return filePath
+  const filePath = join(COPY_DIR, filename);
+  await mkdir(COPY_DIR, { recursive: true });
+  await writeFile(filePath, text, 'utf-8');
+  return filePath;
 }
 
-async function copyOrWriteToFile(
-  text: string,
-  filename: string,
-): Promise<string> {
-  const raw = await setClipboard(text)
-  if (raw) process.stdout.write(raw)
-  const lineCount = countCharInString(text, '\n') + 1
-  const charCount = text.length
+async function copyOrWriteToFile(text: string, filename: string): Promise<string> {
+  const raw = await setClipboard(text);
+  if (raw) process.stdout.write(raw);
+  const lineCount = countCharInString(text, '\n') + 1;
+  const charCount = text.length;
   // Also write to a temp file — clipboard paths are best-effort (OSC 52 needs
   // terminal support), so the file provides a reliable fallback.
   try {
-    const filePath = await writeToFile(text, filename)
-    return `Copied to clipboard (${charCount} characters, ${lineCount} lines)\nAlso written to ${filePath}`
+    const filePath = await writeToFile(text, filename);
+    return `Copied to clipboard (${charCount} characters, ${lineCount} lines)\nAlso written to ${filePath}`;
   } catch {
-    return `Copied to clipboard (${charCount} characters, ${lineCount} lines)`
+    return `Copied to clipboard (${charCount} characters, ${lineCount} lines)`;
   }
 }
 
 function truncateLine(text: string, maxLen: number): string {
-  const firstLine = text.split('\n')[0] ?? ''
+  const firstLine = text.split('\n')[0] ?? '';
   if (stringWidth(firstLine) <= maxLen) {
-    return firstLine
+    return firstLine;
   }
-  let result = ''
-  let width = 0
-  const targetWidth = maxLen - 1
+  let result = '';
+  let width = 0;
+  const targetWidth = maxLen - 1;
   for (const char of firstLine) {
-    const charWidth = stringWidth(char)
-    if (width + charWidth > targetWidth) break
-    result += char
-    width += charWidth
+    const charWidth = stringWidth(char);
+    if (width + charWidth > targetWidth) break;
+    result += char;
+    width += charWidth;
   }
-  return result + '\u2026'
+  return result + '\u2026';
 }
 
 type PickerProps = {
-  fullText: string
-  codeBlocks: CodeBlock[]
-  messageAge: number
-  onDone: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-}
+  fullText: string;
+  codeBlocks: CodeBlock[];
+  messageAge: number;
+  onDone: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+};
 
-type PickerSelection = number | 'full' | 'always'
+type PickerSelection = number | 'full' | 'always';
 
-function CopyPicker({
-  fullText,
-  codeBlocks,
-  messageAge,
-  onDone,
-}: PickerProps): React.ReactNode {
-  const focusedRef = useRef<PickerSelection>('full')
+function CopyPicker({ fullText, codeBlocks, messageAge, onDone }: PickerProps): React.ReactNode {
+  const focusedRef = useRef<PickerSelection>('full');
 
   const options: OptionWithDescription<PickerSelection>[] = [
     {
@@ -139,109 +124,99 @@ function CopyPicker({
       description: `${fullText.length} chars, ${countCharInString(fullText, '\n') + 1} lines`,
     },
     ...codeBlocks.map((block, index) => {
-      const blockLines = countCharInString(block.code, '\n') + 1
+      const blockLines = countCharInString(block.code, '\n') + 1;
       return {
         label: truncateLine(block.code, 60),
         value: index,
         description:
-          [block.lang, blockLines > 1 ? `${blockLines} lines` : undefined]
-            .filter(Boolean)
-            .join(', ') || undefined,
-      }
+          [block.lang, blockLines > 1 ? `${blockLines} lines` : undefined].filter(Boolean).join(', ') || undefined,
+      };
     }),
     {
       label: 'Always copy full response',
       value: 'always' as const,
       description: 'Skip this picker in the future (revert via /config)',
     },
-  ]
+  ];
 
   function getSelectionContent(selected: PickerSelection): {
-    text: string
-    filename: string
-    blockIndex?: number
+    text: string;
+    filename: string;
+    blockIndex?: number;
   } {
     if (selected === 'full' || selected === 'always') {
-      return { text: fullText, filename: RESPONSE_FILENAME }
+      return { text: fullText, filename: RESPONSE_FILENAME };
     }
-    const block = codeBlocks[selected]!
+    const block = codeBlocks[selected]!;
     return {
       text: block.code,
       filename: `copy${fileExtension(block.lang)}`,
       blockIndex: selected,
-    }
+    };
   }
 
   async function handleSelect(selected: PickerSelection): Promise<void> {
-    const content = getSelectionContent(selected)
+    const content = getSelectionContent(selected);
     if (selected === 'always') {
       if (!getGlobalConfig().copyFullResponse) {
-        saveGlobalConfig(c => ({ ...c, copyFullResponse: true }))
+        saveGlobalConfig(c => ({ ...c, copyFullResponse: true }));
       }
       logEvent('tengu_copy', {
         block_count: codeBlocks.length,
         always: true,
         message_age: messageAge,
-      })
-      const result = await copyOrWriteToFile(content.text, content.filename)
-      onDone(
-        `${result}\nPreference saved. Use /config to change copyFullResponse`,
-      )
-      return
+      });
+      const result = await copyOrWriteToFile(content.text, content.filename);
+      onDone(`${result}\nPreference saved. Use /config to change copyFullResponse`);
+      return;
     }
     logEvent('tengu_copy', {
       selected_block: content.blockIndex,
       block_count: codeBlocks.length,
       message_age: messageAge,
-    })
-    const result = await copyOrWriteToFile(content.text, content.filename)
-    onDone(result)
+    });
+    const result = await copyOrWriteToFile(content.text, content.filename);
+    onDone(result);
   }
 
   async function handleWrite(selected: PickerSelection): Promise<void> {
-    const content = getSelectionContent(selected)
+    const content = getSelectionContent(selected);
     logEvent('tengu_copy', {
       selected_block: content.blockIndex,
       block_count: codeBlocks.length,
       message_age: messageAge,
       write_shortcut: true,
-    })
+    });
     try {
-      const filePath = await writeToFile(content.text, content.filename)
-      onDone(`Written to ${filePath}`)
+      const filePath = await writeToFile(content.text, content.filename);
+      onDone(`Written to ${filePath}`);
     } catch (e) {
-      onDone(`Failed to write file: ${e instanceof Error ? e.message : e}`)
+      onDone(`Failed to write file: ${e instanceof Error ? e.message : e}`);
     }
   }
 
   function handleKeyDown(e: KeyboardEvent): void {
     if (e.key === 'w') {
-      e.preventDefault()
-      void handleWrite(focusedRef.current)
+      e.preventDefault();
+      void handleWrite(focusedRef.current);
     }
   }
 
   return (
     <Pane>
-      <Box
-        flexDirection="column"
-        gap={1}
-        tabIndex={0}
-        autoFocus
-        onKeyDown={handleKeyDown}
-      >
+      <Box flexDirection="column" gap={1} tabIndex={0} autoFocus onKeyDown={handleKeyDown}>
         <Text dimColor>Select content to copy:</Text>
         <Select<PickerSelection>
           options={options}
           hideIndexes={false}
           onFocus={value => {
-            focusedRef.current = value
+            focusedRef.current = value;
           }}
           onChange={selected => {
-            void handleSelect(selected)
+            void handleSelect(selected);
           }}
           onCancel={() => {
-            onDone('Copy cancelled', { display: 'system' })
+            onDone('Copy cancelled', { display: 'system' });
           }}
         />
         <Text dimColor>
@@ -253,56 +228,47 @@ function CopyPicker({
         </Text>
       </Box>
     </Pane>
-  )
+  );
 }
 
 export const call: LocalJSXCommandCall = async (onDone, context, args) => {
-  const texts = collectRecentAssistantTexts(context.messages)
+  const texts = collectRecentAssistantTexts(context.messages);
 
   if (texts.length === 0) {
-    onDone('No assistant message to copy')
-    return null
+    onDone('No assistant message to copy');
+    return null;
   }
 
   // /copy N reaches back N-1 messages (1 = latest, 2 = second-to-latest, ...)
-  let age = 0
-  const arg = args?.trim()
+  let age = 0;
+  const arg = args?.trim();
   if (arg) {
-    const n = Number(arg)
+    const n = Number(arg);
     if (!Number.isInteger(n) || n < 1) {
-      onDone(`Usage: /copy [N] where N is 1 (latest), 2, 3, \u2026 Got: ${arg}`)
-      return null
+      onDone(`Usage: /copy [N] where N is 1 (latest), 2, 3, \u2026 Got: ${arg}`);
+      return null;
     }
     if (n > texts.length) {
-      onDone(
-        `Only ${texts.length} assistant ${texts.length === 1 ? 'message' : 'messages'} available to copy`,
-      )
-      return null
+      onDone(`Only ${texts.length} assistant ${texts.length === 1 ? 'message' : 'messages'} available to copy`);
+      return null;
     }
-    age = n - 1
+    age = n - 1;
   }
 
-  const text = texts[age]!
-  const codeBlocks = extractCodeBlocks(text)
-  const config = getGlobalConfig()
+  const text = texts[age]!;
+  const codeBlocks = extractCodeBlocks(text);
+  const config = getGlobalConfig();
 
   if (codeBlocks.length === 0 || config.copyFullResponse) {
     logEvent('tengu_copy', {
       always: config.copyFullResponse,
       block_count: codeBlocks.length,
       message_age: age,
-    })
-    const result = await copyOrWriteToFile(text, RESPONSE_FILENAME)
-    onDone(result)
-    return null
+    });
+    const result = await copyOrWriteToFile(text, RESPONSE_FILENAME);
+    onDone(result);
+    return null;
   }
 
-  return (
-    <CopyPicker
-      fullText={text}
-      codeBlocks={codeBlocks}
-      messageAge={age}
-      onDone={onDone}
-    />
-  )
-}
+  return <CopyPicker fullText={text} codeBlocks={codeBlocks} messageAge={age} onDone={onDone} />;
+};
diff --git a/src/commands/daemon/daemon.tsx b/src/commands/daemon/daemon.tsx
index b72cc3c7a..f4bd14759 100644
--- a/src/commands/daemon/daemon.tsx
+++ b/src/commands/daemon/daemon.tsx
@@ -1,7 +1,4 @@
-import type {
-  LocalJSXCommandOnDone,
-  LocalJSXCommandContext,
-} from '../../types/command.js'
+import type { LocalJSXCommandOnDone, LocalJSXCommandContext } from '../../types/command.js';
 
 /**
  * /daemon slash command — manages daemon and background sessions from the REPL.
@@ -14,44 +11,41 @@ export async function call(
   _context: LocalJSXCommandContext,
   args: string,
 ): Promise<React.ReactNode> {
-  const parts = args ? args.trim().split(/\s+/) : []
-  const sub = parts[0] || 'status'
+  const parts = args ? args.trim().split(/\s+/) : [];
+  const sub = parts[0] || 'status';
 
   // attach is interactive/blocking — not available inside the REPL
   if (sub === 'attach') {
-    onDone(
-      'Use `claude daemon attach` from the CLI. Attach is not available inside the REPL.',
-      { display: 'system' },
-    )
-    return null
+    onDone('Use `claude daemon attach` from the CLI. Attach is not available inside the REPL.', { display: 'system' });
+    return null;
   }
 
   // For all other subcommands, capture console output and return via onDone
   const lines = await captureConsole(async () => {
     if (sub === 'bg') {
-      const bg = await import('../../cli/bg.js')
-      await bg.handleBgStart(parts.slice(1))
+      const bg = await import('../../cli/bg.js');
+      await bg.handleBgStart(parts.slice(1));
     } else {
-      const { daemonMain } = await import('../../daemon/main.js')
-      await daemonMain([sub, ...parts.slice(1)])
+      const { daemonMain } = await import('../../daemon/main.js');
+      await daemonMain([sub, ...parts.slice(1)]);
     }
-  })
+  });
 
-  onDone(lines.join('\n') || 'Done.', { display: 'system' })
-  return null
+  onDone(lines.join('\n') || 'Done.', { display: 'system' });
+  return null;
 }
 
 async function captureConsole(fn: () => Promise<void>): Promise<string[]> {
-  const lines: string[] = []
-  const origLog = console.log
-  const origError = console.error
-  console.log = (...a: unknown[]) => lines.push(a.map(String).join(' '))
-  console.error = (...a: unknown[]) => lines.push(a.map(String).join(' '))
+  const lines: string[] = [];
+  const origLog = console.log;
+  const origError = console.error;
+  console.log = (...a: unknown[]) => lines.push(a.map(String).join(' '));
+  console.error = (...a: unknown[]) => lines.push(a.map(String).join(' '));
   try {
-    await fn()
+    await fn();
   } finally {
-    console.log = origLog
-    console.error = origError
+    console.log = origLog;
+    console.error = origError;
   }
-  return lines
+  return lines;
 }
diff --git a/src/commands/desktop/desktop.tsx b/src/commands/desktop/desktop.tsx
index b601be32d..6e45ea47f 100644
--- a/src/commands/desktop/desktop.tsx
+++ b/src/commands/desktop/desktop.tsx
@@ -1,12 +1,9 @@
-import React from 'react'
-import type { CommandResultDisplay } from '../../commands.js'
-import { DesktopHandoff } from '../../components/DesktopHandoff.js'
+import React from 'react';
+import type { CommandResultDisplay } from '../../commands.js';
+import { DesktopHandoff } from '../../components/DesktopHandoff.js';
 
 export async function call(
-  onDone: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void,
+  onDone: (result?: string, options?: { display?: CommandResultDisplay }) => void,
 ): Promise<React.ReactNode> {
-  return <DesktopHandoff onDone={onDone} />
+  return <DesktopHandoff onDone={onDone} />;
 }
diff --git a/src/commands/diff/diff.tsx b/src/commands/diff/diff.tsx
index cc3a41dbb..b86764648 100644
--- a/src/commands/diff/diff.tsx
+++ b/src/commands/diff/diff.tsx
@@ -1,7 +1,7 @@
-import * as React from 'react'
-import type { LocalJSXCommandCall } from '../../types/command.js'
+import * as React from 'react';
+import type { LocalJSXCommandCall } from '../../types/command.js';
 
 export const call: LocalJSXCommandCall = async (onDone, context) => {
-  const { DiffDialog } = await import('../../components/diff/DiffDialog.js')
-  return <DiffDialog messages={context.messages} onDone={onDone} />
-}
+  const { DiffDialog } = await import('../../components/diff/DiffDialog.js');
+  return <DiffDialog messages={context.messages} onDone={onDone} />;
+};
diff --git a/src/commands/doctor/doctor.tsx b/src/commands/doctor/doctor.tsx
index e696f0955..aedbc407d 100644
--- a/src/commands/doctor/doctor.tsx
+++ b/src/commands/doctor/doctor.tsx
@@ -1,7 +1,7 @@
-import React from 'react'
-import { Doctor } from '../../screens/Doctor.js'
-import type { LocalJSXCommandCall } from '../../types/command.js'
+import React from 'react';
+import { Doctor } from '../../screens/Doctor.js';
+import type { LocalJSXCommandCall } from '../../types/command.js';
 
 export const call: LocalJSXCommandCall = (onDone, _context, _args) => {
-  return Promise.resolve(<Doctor onDone={onDone} />)
-}
+  return Promise.resolve(<Doctor onDone={onDone} />);
+};
diff --git a/src/commands/effort/effort.tsx b/src/commands/effort/effort.tsx
index 2804233d0..96bb66d27 100644
--- a/src/commands/effort/effort.tsx
+++ b/src/commands/effort/effort.tsx
@@ -1,11 +1,11 @@
-import * as React from 'react'
-import { useMainLoopModel } from '../../hooks/useMainLoopModel.js'
+import * as React from 'react';
+import { useMainLoopModel } from '../../hooks/useMainLoopModel.js';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from '../../services/analytics/index.js'
-import { useAppState, useSetAppState } from '../../state/AppState.js'
-import type { LocalJSXCommandOnDone } from '../../types/command.js'
+} from '../../services/analytics/index.js';
+import { useAppState, useSetAppState } from '../../state/AppState.js';
+import type { LocalJSXCommandOnDone } from '../../types/command.js';
 import {
   type EffortValue,
   getDisplayedEffortLevel,
@@ -13,171 +13,157 @@ import {
   getEffortValueDescription,
   isEffortLevel,
   toPersistableEffort,
-} from '../../utils/effort.js'
-import { updateSettingsForSource } from '../../utils/settings/settings.js'
+} from '../../utils/effort.js';
+import { updateSettingsForSource } from '../../utils/settings/settings.js';
 
-const COMMON_HELP_ARGS = ['help', '-h', '--help']
+const COMMON_HELP_ARGS = ['help', '-h', '--help'];
 
 type EffortCommandResult = {
-  message: string
-  effortUpdate?: { value: EffortValue | undefined }
-}
+  message: string;
+  effortUpdate?: { value: EffortValue | undefined };
+};
 
 function setEffortValue(effortValue: EffortValue): EffortCommandResult {
-  const persistable = toPersistableEffort(effortValue)
+  const persistable = toPersistableEffort(effortValue);
   if (persistable !== undefined) {
     const result = updateSettingsForSource('userSettings', {
       effortLevel: persistable,
-    })
+    });
     if (result.error) {
       return {
         message: `Failed to set effort level: ${result.error.message}`,
-      }
+      };
     }
   }
   logEvent('tengu_effort_command', {
-    effort:
-      effortValue as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-  })
+    effort: effortValue as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+  });
 
   // Env var wins at resolveAppliedEffort time. Only flag it when it actually
   // conflicts — if env matches what the user just asked for, the outcome is
   // the same, so "Set effort to X" is true and the note is noise.
-  const envOverride = getEffortEnvOverride()
+  const envOverride = getEffortEnvOverride();
   if (envOverride !== undefined && envOverride !== effortValue) {
-    const envRaw = process.env.CLAUDE_CODE_EFFORT_LEVEL
+    const envRaw = process.env.CLAUDE_CODE_EFFORT_LEVEL;
     if (persistable === undefined) {
       return {
         message: `Not applied: CLAUDE_CODE_EFFORT_LEVEL=${envRaw} overrides effort this session, and ${effortValue} is session-only (nothing saved)`,
         effortUpdate: { value: effortValue },
-      }
+      };
     }
     return {
       message: `CLAUDE_CODE_EFFORT_LEVEL=${envRaw} overrides this session — clear it and ${effortValue} takes over`,
       effortUpdate: { value: effortValue },
-    }
+    };
   }
 
-  const description = getEffortValueDescription(effortValue)
-  const suffix = persistable !== undefined ? '' : ' (this session only)'
+  const description = getEffortValueDescription(effortValue);
+  const suffix = persistable !== undefined ? '' : ' (this session only)';
   return {
     message: `Set effort level to ${effortValue}${suffix}: ${description}`,
     effortUpdate: { value: effortValue },
-  }
+  };
 }
 
-export function showCurrentEffort(
-  appStateEffort: EffortValue | undefined,
-  model: string,
-): EffortCommandResult {
-  const envOverride = getEffortEnvOverride()
-  const effectiveValue =
-    envOverride === null ? undefined : (envOverride ?? appStateEffort)
+export function showCurrentEffort(appStateEffort: EffortValue | undefined, model: string): EffortCommandResult {
+  const envOverride = getEffortEnvOverride();
+  const effectiveValue = envOverride === null ? undefined : (envOverride ?? appStateEffort);
   if (effectiveValue === undefined) {
-    const level = getDisplayedEffortLevel(model, appStateEffort)
-    return { message: `Effort level: auto (currently ${level})` }
+    const level = getDisplayedEffortLevel(model, appStateEffort);
+    return { message: `Effort level: auto (currently ${level})` };
   }
-  const description = getEffortValueDescription(effectiveValue)
+  const description = getEffortValueDescription(effectiveValue);
   return {
     message: `Current effort level: ${effectiveValue} (${description})`,
-  }
+  };
 }
 
 function unsetEffortLevel(): EffortCommandResult {
   const result = updateSettingsForSource('userSettings', {
     effortLevel: undefined,
-  })
+  });
   if (result.error) {
     return {
       message: `Failed to set effort level: ${result.error.message}`,
-    }
+    };
   }
   logEvent('tengu_effort_command', {
-    effort:
-      'auto' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-  })
+    effort: 'auto' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+  });
   // env=auto/unset (null) matches what /effort auto asks for, so only warn
   // when env is pinning a specific level that will keep overriding.
-  const envOverride = getEffortEnvOverride()
+  const envOverride = getEffortEnvOverride();
   if (envOverride !== undefined && envOverride !== null) {
-    const envRaw = process.env.CLAUDE_CODE_EFFORT_LEVEL
+    const envRaw = process.env.CLAUDE_CODE_EFFORT_LEVEL;
     return {
       message: `Cleared effort from settings, but CLAUDE_CODE_EFFORT_LEVEL=${envRaw} still controls this session`,
       effortUpdate: { value: undefined },
-    }
+    };
   }
   return {
     message: 'Effort level set to auto',
     effortUpdate: { value: undefined },
-  }
+  };
 }
 
 export function executeEffort(args: string): EffortCommandResult {
-  const normalized = args.toLowerCase()
+  const normalized = args.toLowerCase();
   if (normalized === 'auto' || normalized === 'unset') {
-    return unsetEffortLevel()
+    return unsetEffortLevel();
   }
 
   if (!isEffortLevel(normalized)) {
     return {
       message: `Invalid argument: ${args}. Valid options are: low, medium, high, max, auto`,
-    }
+    };
   }
 
-  return setEffortValue(normalized)
+  return setEffortValue(normalized);
 }
 
-function ShowCurrentEffort({
-  onDone,
-}: {
-  onDone: (result: string) => void
-}): React.ReactNode {
-  const effortValue = useAppState(s => s.effortValue)
-  const model = useMainLoopModel()
-  const { message } = showCurrentEffort(effortValue, model)
-  onDone(message)
-  return null
+function ShowCurrentEffort({ onDone }: { onDone: (result: string) => void }): React.ReactNode {
+  const effortValue = useAppState(s => s.effortValue);
+  const model = useMainLoopModel();
+  const { message } = showCurrentEffort(effortValue, model);
+  onDone(message);
+  return null;
 }
 
 function ApplyEffortAndClose({
   result,
   onDone,
 }: {
-  result: EffortCommandResult
-  onDone: (result: string) => void
+  result: EffortCommandResult;
+  onDone: (result: string) => void;
 }): React.ReactNode {
-  const setAppState = useSetAppState()
-  const { effortUpdate, message } = result
+  const setAppState = useSetAppState();
+  const { effortUpdate, message } = result;
   React.useEffect(() => {
     if (effortUpdate) {
       setAppState(prev => ({
         ...prev,
         effortValue: effortUpdate.value,
-      }))
+      }));
     }
-    onDone(message)
-  }, [setAppState, effortUpdate, message, onDone])
-  return null
+    onDone(message);
+  }, [setAppState, effortUpdate, message, onDone]);
+  return null;
 }
 
-export async function call(
-  onDone: LocalJSXCommandOnDone,
-  _context: unknown,
-  args?: string,
-): Promise<React.ReactNode> {
-  args = args?.trim() || ''
+export async function call(onDone: LocalJSXCommandOnDone, _context: unknown, args?: string): Promise<React.ReactNode> {
+  args = args?.trim() || '';
 
   if (COMMON_HELP_ARGS.includes(args)) {
     onDone(
       'Usage: /effort [low|medium|high|max|auto]\n\nEffort levels:\n- low: Quick, straightforward implementation\n- medium: Balanced approach with standard testing\n- high: Comprehensive implementation with extensive testing\n- max: Maximum capability with deepest reasoning (Opus 4.6 only)\n- auto: Use the default effort level for your model',
-    )
-    return
+    );
+    return;
   }
 
   if (!args || args === 'current' || args === 'status') {
-    return <ShowCurrentEffort onDone={onDone} />
+    return <ShowCurrentEffort onDone={onDone} />;
   }
 
-  const result = executeEffort(args)
-  return <ApplyEffortAndClose result={result} onDone={onDone} />
+  const result = executeEffort(args);
+  return <ApplyEffortAndClose result={result} onDone={onDone} />;
 }
diff --git a/src/commands/exit/exit.tsx b/src/commands/exit/exit.tsx
index 64e9ed77c..1af3dd796 100644
--- a/src/commands/exit/exit.tsx
+++ b/src/commands/exit/exit.tsx
@@ -1,44 +1,36 @@
-import { feature } from 'bun:bundle'
-import { spawnSync } from 'child_process'
-import sample from 'lodash-es/sample.js'
-import * as React from 'react'
-import { ExitFlow } from '../../components/ExitFlow.js'
-import type { LocalJSXCommandOnDone } from '../../types/command.js'
-import { isBgSession } from '../../utils/concurrentSessions.js'
-import { gracefulShutdown } from '../../utils/gracefulShutdown.js'
-import { getCurrentWorktreeSession } from '../../utils/worktree.js'
+import { feature } from 'bun:bundle';
+import { spawnSync } from 'child_process';
+import sample from 'lodash-es/sample.js';
+import * as React from 'react';
+import { ExitFlow } from '../../components/ExitFlow.js';
+import type { LocalJSXCommandOnDone } from '../../types/command.js';
+import { isBgSession } from '../../utils/concurrentSessions.js';
+import { gracefulShutdown } from '../../utils/gracefulShutdown.js';
+import { getCurrentWorktreeSession } from '../../utils/worktree.js';
 
-const GOODBYE_MESSAGES = ['Goodbye!', 'See ya!', 'Bye!', 'Catch you later!']
+const GOODBYE_MESSAGES = ['Goodbye!', 'See ya!', 'Bye!', 'Catch you later!'];
 
 function getRandomGoodbyeMessage(): string {
-  return sample(GOODBYE_MESSAGES) ?? 'Goodbye!'
+  return sample(GOODBYE_MESSAGES) ?? 'Goodbye!';
 }
 
-export async function call(
-  onDone: LocalJSXCommandOnDone,
-): Promise<React.ReactNode> {
+export async function call(onDone: LocalJSXCommandOnDone): Promise<React.ReactNode> {
   // Inside a `claude --bg` tmux session: detach instead of kill. The REPL
   // keeps running; `claude attach` can reconnect. Covers /exit, /quit,
   // ctrl+c, ctrl+d — all funnel through here via REPL's handleExit.
   if (feature('BG_SESSIONS') && isBgSession()) {
-    onDone()
-    spawnSync('tmux', ['detach-client'], { stdio: 'ignore' })
-    return null
+    onDone();
+    spawnSync('tmux', ['detach-client'], { stdio: 'ignore' });
+    return null;
   }
 
-  const showWorktree = getCurrentWorktreeSession() !== null
+  const showWorktree = getCurrentWorktreeSession() !== null;
 
   if (showWorktree) {
-    return (
-      <ExitFlow
-        showWorktree={showWorktree}
-        onDone={onDone}
-        onCancel={() => onDone()}
-      />
-    )
+    return <ExitFlow showWorktree={showWorktree} onDone={onDone} onCancel={() => onDone()} />;
   }
 
-  onDone(getRandomGoodbyeMessage())
-  await gracefulShutdown(0, 'prompt_input_exit')
-  return null
+  onDone(getRandomGoodbyeMessage());
+  await gracefulShutdown(0, 'prompt_input_exit');
+  return null;
 }
diff --git a/src/commands/export/export.tsx b/src/commands/export/export.tsx
index d13436b02..2b9e24f7f 100644
--- a/src/commands/export/export.tsx
+++ b/src/commands/export/export.tsx
@@ -1,49 +1,49 @@
-import { join } from 'path'
-import React from 'react'
-import { ExportDialog } from '../../components/ExportDialog.js'
-import type { ToolUseContext } from '../../Tool.js'
-import type { LocalJSXCommandOnDone } from '../../types/command.js'
-import type { Message } from '../../types/message.js'
-import { getCwd } from '../../utils/cwd.js'
-import { renderMessagesToPlainText } from '../../utils/exportRenderer.js'
-import { writeFileSync_DEPRECATED } from '../../utils/slowOperations.js'
+import { join } from 'path';
+import React from 'react';
+import { ExportDialog } from '../../components/ExportDialog.js';
+import type { ToolUseContext } from '../../Tool.js';
+import type { LocalJSXCommandOnDone } from '../../types/command.js';
+import type { Message } from '../../types/message.js';
+import { getCwd } from '../../utils/cwd.js';
+import { renderMessagesToPlainText } from '../../utils/exportRenderer.js';
+import { writeFileSync_DEPRECATED } from '../../utils/slowOperations.js';
 
 function formatTimestamp(date: Date): string {
-  const year = date.getFullYear()
-  const month = String(date.getMonth() + 1).padStart(2, '0')
-  const day = String(date.getDate()).padStart(2, '0')
-  const hours = String(date.getHours()).padStart(2, '0')
-  const minutes = String(date.getMinutes()).padStart(2, '0')
-  const seconds = String(date.getSeconds()).padStart(2, '0')
-  return `${year}-${month}-${day}-${hours}${minutes}${seconds}`
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, '0');
+  const day = String(date.getDate()).padStart(2, '0');
+  const hours = String(date.getHours()).padStart(2, '0');
+  const minutes = String(date.getMinutes()).padStart(2, '0');
+  const seconds = String(date.getSeconds()).padStart(2, '0');
+  return `${year}-${month}-${day}-${hours}${minutes}${seconds}`;
 }
 
 export function extractFirstPrompt(messages: Message[]): string {
-  const firstUserMessage = messages.find(msg => msg.type === 'user')
+  const firstUserMessage = messages.find(msg => msg.type === 'user');
 
   if (!firstUserMessage || firstUserMessage.type !== 'user') {
-    return ''
+    return '';
   }
 
-  const content = firstUserMessage.message?.content
-  let result = ''
+  const content = firstUserMessage.message?.content;
+  let result = '';
 
   if (typeof content === 'string') {
-    result = content.trim()
+    result = content.trim();
   } else if (Array.isArray(content)) {
-    const textContent = content.find(item => item.type === 'text')
+    const textContent = content.find(item => item.type === 'text');
     if (textContent && 'text' in textContent) {
-      result = textContent.text.trim()
+      result = textContent.text.trim();
     }
   }
 
   // Take first line only and limit length
-  result = result.split('\n')[0] || ''
+  result = result.split('\n')[0] || '';
   if (result.length > 50) {
-    result = result.substring(0, 49) + '…'
+    result = result.substring(0, 49) + '…';
   }
 
-  return result
+  return result;
 }
 
 export function sanitizeFilename(text: string): string {
@@ -53,14 +53,12 @@ export function sanitizeFilename(text: string): string {
     .replace(/[^a-z0-9\s-]/g, '') // Remove special chars
     .replace(/\s+/g, '-') // Replace spaces with hyphens
     .replace(/-+/g, '-') // Replace multiple hyphens with single
-    .replace(/^-|-$/g, '') // Remove leading/trailing hyphens
+    .replace(/^-|-$/g, ''); // Remove leading/trailing hyphens
 }
 
-async function exportWithReactRenderer(
-  context: ToolUseContext,
-): Promise<string> {
-  const tools = context.options.tools || []
-  return renderMessagesToPlainText(context.messages, tools)
+async function exportWithReactRenderer(context: ToolUseContext): Promise<string> {
+  const tools = context.options.tools || [];
+  return renderMessagesToPlainText(context.messages, tools);
 }
 
 export async function call(
@@ -69,43 +67,37 @@ export async function call(
   args: string,
 ): Promise<React.ReactNode> {
   // Render the conversation content
-  const content = await exportWithReactRenderer(context)
+  const content = await exportWithReactRenderer(context);
 
   // If args are provided, write directly to file and skip dialog
-  const filename = args.trim()
+  const filename = args.trim();
   if (filename) {
-    const finalFilename = filename.endsWith('.txt')
-      ? filename
-      : filename.replace(/\.[^.]+$/, '') + '.txt'
-    const filepath = join(getCwd(), finalFilename)
+    const finalFilename = filename.endsWith('.txt') ? filename : filename.replace(/\.[^.]+$/, '') + '.txt';
+    const filepath = join(getCwd(), finalFilename);
 
     try {
       writeFileSync_DEPRECATED(filepath, content, {
         encoding: 'utf-8',
         flush: true,
-      })
-      onDone(`Conversation exported to: ${filepath}`)
-      return null
+      });
+      onDone(`Conversation exported to: ${filepath}`);
+      return null;
     } catch (error) {
-      onDone(
-        `Failed to export conversation: ${error instanceof Error ? error.message : 'Unknown error'}`,
-      )
-      return null
+      onDone(`Failed to export conversation: ${error instanceof Error ? error.message : 'Unknown error'}`);
+      return null;
     }
   }
 
   // Generate default filename from first prompt or timestamp
-  const firstPrompt = extractFirstPrompt(context.messages)
-  const timestamp = formatTimestamp(new Date())
+  const firstPrompt = extractFirstPrompt(context.messages);
+  const timestamp = formatTimestamp(new Date());
 
-  let defaultFilename: string
+  let defaultFilename: string;
   if (firstPrompt) {
-    const sanitized = sanitizeFilename(firstPrompt)
-    defaultFilename = sanitized
-      ? `${timestamp}-${sanitized}.txt`
-      : `conversation-${timestamp}.txt`
+    const sanitized = sanitizeFilename(firstPrompt);
+    defaultFilename = sanitized ? `${timestamp}-${sanitized}.txt` : `conversation-${timestamp}.txt`;
   } else {
-    defaultFilename = `conversation-${timestamp}.txt`
+    defaultFilename = `conversation-${timestamp}.txt`;
   }
 
   // Return the dialog component when no args provided
@@ -114,8 +106,8 @@ export async function call(
       content={content}
       defaultFilename={defaultFilename}
       onDone={result => {
-        onDone(result.message)
+        onDone(result.message);
       }}
     />
-  )
+  );
 }
diff --git a/src/commands/extra-usage/extra-usage.tsx b/src/commands/extra-usage/extra-usage.tsx
index 4bdb6284b..174b943a1 100644
--- a/src/commands/extra-usage/extra-usage.tsx
+++ b/src/commands/extra-usage/extra-usage.tsx
@@ -1,29 +1,27 @@
-import React from 'react'
-import type { LocalJSXCommandContext } from '../../commands.js'
-import type { LocalJSXCommandOnDone } from '../../types/command.js'
-import { Login } from '../login/login.js'
-import { runExtraUsage } from './extra-usage-core.js'
+import React from 'react';
+import type { LocalJSXCommandContext } from '../../commands.js';
+import type { LocalJSXCommandOnDone } from '../../types/command.js';
+import { Login } from '../login/login.js';
+import { runExtraUsage } from './extra-usage-core.js';
 
 export async function call(
   onDone: LocalJSXCommandOnDone,
   context: LocalJSXCommandContext,
 ): Promise<React.ReactNode | null> {
-  const result = await runExtraUsage()
+  const result = await runExtraUsage();
 
   if (result.type === 'message') {
-    onDone(result.value)
-    return null
+    onDone(result.value);
+    return null;
   }
 
   return (
     <Login
-      startingMessage={
-        'Starting new login following /extra-usage. Exit with Ctrl-C to use existing account.'
-      }
+      startingMessage={'Starting new login following /extra-usage. Exit with Ctrl-C to use existing account.'}
       onDone={success => {
-        context.onChangeAPIKey()
-        onDone(success ? 'Login successful' : 'Login interrupted')
+        context.onChangeAPIKey();
+        onDone(success ? 'Login successful' : 'Login interrupted');
       }}
     />
-  )
+  );
 }
diff --git a/src/commands/fast/fast.tsx b/src/commands/fast/fast.tsx
index 2ab17db78..8d4343db9 100644
--- a/src/commands/fast/fast.tsx
+++ b/src/commands/fast/fast.tsx
@@ -1,23 +1,16 @@
-import * as React from 'react'
-import { useState } from 'react'
-import type {
-  CommandResultDisplay,
-  LocalJSXCommandContext,
-} from '../../commands.js'
-import { Dialog } from '@anthropic/ink'
-import { FastIcon, getFastIconString } from '../../components/FastIcon.js'
-import { Box, Link, Text } from '@anthropic/ink'
-import { useKeybindings } from '../../keybindings/useKeybinding.js'
+import * as React from 'react';
+import { useState } from 'react';
+import type { CommandResultDisplay, LocalJSXCommandContext } from '../../commands.js';
+import { Dialog } from '@anthropic/ink';
+import { FastIcon, getFastIconString } from '../../components/FastIcon.js';
+import { Box, Link, Text } from '@anthropic/ink';
+import { useKeybindings } from '../../keybindings/useKeybinding.js';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from '../../services/analytics/index.js'
-import {
-  type AppState,
-  useAppState,
-  useSetAppState,
-} from '../../state/AppState.js'
-import type { LocalJSXCommandOnDone } from '../../types/command.js'
+} from '../../services/analytics/index.js';
+import { type AppState, useAppState, useSetAppState } from '../../state/AppState.js';
+import type { LocalJSXCommandOnDone } from '../../types/command.js';
 import {
   clearFastModeCooldown,
   FAST_MODE_MODEL_DISPLAY,
@@ -27,33 +20,28 @@ import {
   isFastModeEnabled,
   isFastModeSupportedByModel,
   prefetchFastModeStatus,
-} from '../../utils/fastMode.js'
-import { formatDuration } from '../../utils/format.js'
-import { formatModelPricing, getOpus46CostTier } from '../../utils/modelCost.js'
-import { updateSettingsForSource } from '../../utils/settings/settings.js'
+} from '../../utils/fastMode.js';
+import { formatDuration } from '../../utils/format.js';
+import { formatModelPricing, getOpus46CostTier } from '../../utils/modelCost.js';
+import { updateSettingsForSource } from '../../utils/settings/settings.js';
 
-function applyFastMode(
-  enable: boolean,
-  setAppState: (f: (prev: AppState) => AppState) => void,
-): void {
-  clearFastModeCooldown()
+function applyFastMode(enable: boolean, setAppState: (f: (prev: AppState) => AppState) => void): void {
+  clearFastModeCooldown();
   updateSettingsForSource('userSettings', {
     fastMode: enable ? true : undefined,
-  })
+  });
   if (enable) {
     setAppState(prev => {
       // Only switch model if current model doesn't support fast mode
-      const needsModelSwitch = !isFastModeSupportedByModel(prev.mainLoopModel)
+      const needsModelSwitch = !isFastModeSupportedByModel(prev.mainLoopModel);
       return {
         ...prev,
-        ...(needsModelSwitch
-          ? { mainLoopModel: getFastModeModel(), mainLoopModelForSession: null }
-          : {}),
+        ...(needsModelSwitch ? { mainLoopModel: getFastModeModel(), mainLoopModelForSession: null } : {}),
         fastMode: true,
-      }
-    })
+      };
+    });
   } else {
-    setAppState(prev => ({ ...prev, fastMode: false }))
+    setAppState(prev => ({ ...prev, fastMode: false }));
   }
 }
 
@@ -61,38 +49,32 @@ export function FastModePicker({
   onDone,
   unavailableReason,
 }: {
-  onDone: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-  unavailableReason: string | null
+  onDone: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+  unavailableReason: string | null;
 }): React.ReactNode {
-  const model = useAppState(s => s.mainLoopModel)
-  const initialFastMode = useAppState(s => s.fastMode)
-  const setAppState = useSetAppState()
-  const [enableFastMode, setEnableFastMode] = useState(initialFastMode ?? false)
-  const runtimeState = getFastModeRuntimeState()
-  const isCooldown = runtimeState.status === 'cooldown'
-  const isUnavailable = unavailableReason !== null
-  const pricing = formatModelPricing(getOpus46CostTier(true))
+  const model = useAppState(s => s.mainLoopModel);
+  const initialFastMode = useAppState(s => s.fastMode);
+  const setAppState = useSetAppState();
+  const [enableFastMode, setEnableFastMode] = useState(initialFastMode ?? false);
+  const runtimeState = getFastModeRuntimeState();
+  const isCooldown = runtimeState.status === 'cooldown';
+  const isUnavailable = unavailableReason !== null;
+  const pricing = formatModelPricing(getOpus46CostTier(true));
 
   function handleConfirm(): void {
-    if (isUnavailable) return
-    applyFastMode(enableFastMode, setAppState)
+    if (isUnavailable) return;
+    applyFastMode(enableFastMode, setAppState);
     logEvent('tengu_fast_mode_toggled', {
       enabled: enableFastMode,
-      source:
-        'picker' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-    })
+      source: 'picker' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+    });
     if (enableFastMode) {
-      const fastIcon = getFastIconString(enableFastMode)
-      const modelUpdated = !isFastModeSupportedByModel(model)
-        ? ` · model set to ${FAST_MODE_MODEL_DISPLAY}`
-        : ''
-      onDone(`${fastIcon} Fast mode ON${modelUpdated} · ${pricing}`)
+      const fastIcon = getFastIconString(enableFastMode);
+      const modelUpdated = !isFastModeSupportedByModel(model) ? ` · model set to ${FAST_MODE_MODEL_DISPLAY}` : '';
+      onDone(`${fastIcon} Fast mode ON${modelUpdated} · ${pricing}`);
     } else {
-      setAppState(prev => ({ ...prev, fastMode: false }))
-      onDone(`Fast mode OFF`)
+      setAppState(prev => ({ ...prev, fastMode: false }));
+      onDone(`Fast mode OFF`);
     }
   }
 
@@ -100,20 +82,18 @@ export function FastModePicker({
     if (isUnavailable) {
       // Ensure fast mode is off if the org has disabled it
       if (initialFastMode) {
-        applyFastMode(false, setAppState)
+        applyFastMode(false, setAppState);
       }
-      onDone('Fast mode OFF', { display: 'system' })
-      return
+      onDone('Fast mode OFF', { display: 'system' });
+      return;
     }
-    const message = initialFastMode
-      ? `${getFastIconString()} Kept Fast mode ON`
-      : `Kept Fast mode OFF`
-    onDone(message, { display: 'system' })
+    const message = initialFastMode ? `${getFastIconString()} Kept Fast mode ON` : `Kept Fast mode OFF`;
+    onDone(message, { display: 'system' });
   }
 
   function handleToggle(): void {
-    if (isUnavailable) return
-    setEnableFastMode(prev => !prev)
+    if (isUnavailable) return;
+    setEnableFastMode(prev => !prev);
   }
 
   useKeybindings(
@@ -126,13 +106,13 @@ export function FastModePicker({
       'confirm:toggle': handleToggle,
     },
     { context: 'Confirmation' },
-  )
+  );
 
   const title = (
     <Text>
       <FastIcon cooldown={isCooldown} /> Fast mode (research preview)
     </Text>
-  )
+  );
 
   return (
     <Dialog
@@ -159,10 +139,7 @@ export function FastModePicker({
           <Box flexDirection="column" gap={0} marginLeft={2}>
             <Box flexDirection="row" gap={2}>
               <Text bold>Fast mode</Text>
-              <Text
-                color={enableFastMode ? 'fastMode' : undefined}
-                bold={enableFastMode}
-              >
+              <Text color={enableFastMode ? 'fastMode' : undefined} bold={enableFastMode}>
                 {enableFastMode ? 'ON ' : 'OFF'}
               </Text>
               <Text dimColor>{pricing}</Text>
@@ -186,12 +163,10 @@ export function FastModePicker({
       )}
       <Text dimColor>
         Learn more:{' '}
-        <Link url="https://code.claude.com/docs/en/fast-mode">
-          https://code.claude.com/docs/en/fast-mode
-        </Link>
+        <Link url="https://code.claude.com/docs/en/fast-mode">https://code.claude.com/docs/en/fast-mode</Link>
       </Text>
     </Dialog>
-  )
+  );
 }
 
 async function handleFastModeShortcut(
@@ -199,28 +174,25 @@ async function handleFastModeShortcut(
   getAppState: () => AppState,
   setAppState: (f: (prev: AppState) => AppState) => void,
 ): Promise<string> {
-  const unavailableReason = getFastModeUnavailableReason()
+  const unavailableReason = getFastModeUnavailableReason();
   if (unavailableReason) {
-    return `Fast mode unavailable: ${unavailableReason}`
+    return `Fast mode unavailable: ${unavailableReason}`;
   }
 
-  const { mainLoopModel } = getAppState()
-  applyFastMode(enable, setAppState)
+  const { mainLoopModel } = getAppState();
+  applyFastMode(enable, setAppState);
   logEvent('tengu_fast_mode_toggled', {
     enabled: enable,
-    source:
-      'shortcut' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-  })
+    source: 'shortcut' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+  });
 
   if (enable) {
-    const fastIcon = getFastIconString(true)
-    const modelUpdated = !isFastModeSupportedByModel(mainLoopModel)
-      ? ` · model set to ${FAST_MODE_MODEL_DISPLAY}`
-      : ''
-    const pricing = formatModelPricing(getOpus46CostTier(true))
-    return `${fastIcon} Fast mode ON${modelUpdated} · ${pricing}`
+    const fastIcon = getFastIconString(true);
+    const modelUpdated = !isFastModeSupportedByModel(mainLoopModel) ? ` · model set to ${FAST_MODE_MODEL_DISPLAY}` : '';
+    const pricing = formatModelPricing(getOpus46CostTier(true));
+    return `${fastIcon} Fast mode ON${modelUpdated} · ${pricing}`;
   } else {
-    return `Fast mode OFF`
+    return `Fast mode OFF`;
   }
 }
 
@@ -230,31 +202,24 @@ export async function call(
   args?: string,
 ): Promise<React.ReactNode | null> {
   if (!isFastModeEnabled()) {
-    return null
+    return null;
   }
 
   // Fetch org fast mode status before showing the picker. We must know
   // whether the org has disabled fast mode before allowing any toggle.
   // If a startup prefetch is already in flight, this awaits it.
-  await prefetchFastModeStatus()
+  await prefetchFastModeStatus();
 
-  const arg = args?.trim().toLowerCase()
+  const arg = args?.trim().toLowerCase();
   if (arg === 'on' || arg === 'off') {
-    const result = await handleFastModeShortcut(
-      arg === 'on',
-      context.getAppState,
-      context.setAppState,
-    )
-    onDone(result)
-    return null
+    const result = await handleFastModeShortcut(arg === 'on', context.getAppState, context.setAppState);
+    onDone(result);
+    return null;
   }
 
-  const unavailableReason = getFastModeUnavailableReason()
+  const unavailableReason = getFastModeUnavailableReason();
   logEvent('tengu_fast_mode_picker_shown', {
-    unavailable_reason: (unavailableReason ??
-      '') as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-  })
-  return (
-    <FastModePicker onDone={onDone} unavailableReason={unavailableReason} />
-  )
+    unavailable_reason: (unavailableReason ?? '') as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+  });
+  return <FastModePicker onDone={onDone} unavailableReason={unavailableReason} />;
 }
diff --git a/src/commands/feedback/feedback.tsx b/src/commands/feedback/feedback.tsx
index 1c3fda4bd..aa29f333b 100644
--- a/src/commands/feedback/feedback.tsx
+++ b/src/commands/feedback/feedback.tsx
@@ -1,27 +1,21 @@
-import * as React from 'react'
-import type {
-  CommandResultDisplay,
-  LocalJSXCommandContext,
-} from '../../commands.js'
-import { Feedback } from '../../components/Feedback.js'
-import type { LocalJSXCommandOnDone } from '../../types/command.js'
-import type { Message } from '../../types/message.js'
+import * as React from 'react';
+import type { CommandResultDisplay, LocalJSXCommandContext } from '../../commands.js';
+import { Feedback } from '../../components/Feedback.js';
+import type { LocalJSXCommandOnDone } from '../../types/command.js';
+import type { Message } from '../../types/message.js';
 
 // Shared function to render the Feedback component
 export function renderFeedbackComponent(
-  onDone: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void,
+  onDone: (result?: string, options?: { display?: CommandResultDisplay }) => void,
   abortSignal: AbortSignal,
   messages: Message[],
   initialDescription: string = '',
   backgroundTasks: {
     [taskId: string]: {
-      type: string
-      identity?: { agentId: string }
-      messages?: Message[]
-    }
+      type: string;
+      identity?: { agentId: string };
+      messages?: Message[];
+    };
   } = {},
 ): React.ReactNode {
   return (
@@ -32,7 +26,7 @@ export function renderFeedbackComponent(
       onDone={onDone}
       backgroundTasks={backgroundTasks}
     />
-  )
+  );
 }
 
 export async function call(
@@ -40,11 +34,6 @@ export async function call(
   context: LocalJSXCommandContext,
   args?: string,
 ): Promise<React.ReactNode> {
-  const initialDescription = args || ''
-  return renderFeedbackComponent(
-    onDone,
-    context.abortController.signal,
-    context.messages,
-    initialDescription,
-  )
+  const initialDescription = args || '';
+  return renderFeedbackComponent(onDone, context.abortController.signal, context.messages, initialDescription);
 }
diff --git a/src/commands/force-snip.ts b/src/commands/force-snip.ts
index 6d1a355af..7702d35e8 100644
--- a/src/commands/force-snip.ts
+++ b/src/commands/force-snip.ts
@@ -25,7 +25,7 @@ const call: LocalCommandCall = async (_args, context) => {
   // Collect UUIDs of every message that will be snipped (everything currently
   // in the conversation). The next call to `snipCompactIfNeeded` will honour
   // the boundary and strip these from the model-facing view.
-  const removedUuids = messages.map((m) => m.uuid)
+  const removedUuids = messages.map(m => m.uuid)
 
   const boundaryMessage: Message = {
     type: 'system',
@@ -39,7 +39,7 @@ const call: LocalCommandCall = async (_args, context) => {
     },
   } as Message // subtype is feature-gated; cast through Message
 
-  setMessages((prev) => [...prev, boundaryMessage])
+  setMessages(prev => [...prev, boundaryMessage])
 
   return {
     type: 'text',
diff --git a/src/commands/fork/fork.tsx b/src/commands/fork/fork.tsx
index b9e416a01..cd2f8d701 100644
--- a/src/commands/fork/fork.tsx
+++ b/src/commands/fork/fork.tsx
@@ -1,9 +1,9 @@
-import { feature } from 'bun:bundle'
-import React from 'react'
-import { AgentTool } from '@claude-code-best/builtin-tools/tools/AgentTool/AgentTool.js'
-import { isInForkChild } from '@claude-code-best/builtin-tools/tools/AgentTool/forkSubagent.js'
-import { logForDebugging } from '../../utils/debug.js'
-import type { LocalJSXCommandOnDone, LocalJSXCommandContext } from '../../types/command.js'
+import { feature } from 'bun:bundle';
+import React from 'react';
+import { AgentTool } from '@claude-code-best/builtin-tools/tools/AgentTool/AgentTool.js';
+import { isInForkChild } from '@claude-code-best/builtin-tools/tools/AgentTool/forkSubagent.js';
+import { logForDebugging } from '../../utils/debug.js';
+import type { LocalJSXCommandOnDone, LocalJSXCommandContext } from '../../types/command.js';
 
 export async function call(
   onDone: LocalJSXCommandOnDone,
@@ -12,30 +12,30 @@ export async function call(
 ): Promise<React.ReactNode> {
   // Check feature flag
   if (!feature('FORK_SUBAGENT')) {
-    onDone('Fork subagent feature is not enabled. Set FEATURE_FORK_SUBAGENT=1 to enable.', { display: 'system' })
-    return null
+    onDone('Fork subagent feature is not enabled. Set FEATURE_FORK_SUBAGENT=1 to enable.', { display: 'system' });
+    return null;
   }
 
   // Recursive fork guard
   if (isInForkChild(context.messages)) {
-    onDone('Fork is not available inside a forked worker. Complete your task directly using your tools.', { display: 'system' })
-    return null
+    onDone('Fork is not available inside a forked worker. Complete your task directly using your tools.', {
+      display: 'system',
+    });
+    return null;
   }
 
-  const directive = args.trim()
+  const directive = args.trim();
   if (!directive) {
-    onDone('Usage: /fork <directive>\nExample: /fork Fix the null check in validate.ts', { display: 'system' })
-    return null
+    onDone('Usage: /fork <directive>\nExample: /fork Fix the null check in validate.ts', { display: 'system' });
+    return null;
   }
 
   // Find the last assistant message to fork from
-  const lastAssistantMessage = [...context.messages].reverse().find(
-    m => m.type === 'assistant'
-  ) as any // Type assertion to avoid complex type import
+  const lastAssistantMessage = [...context.messages].reverse().find(m => m.type === 'assistant') as any; // Type assertion to avoid complex type import
 
   if (!lastAssistantMessage) {
-    onDone('Cannot fork: no assistant response in conversation history.', { display: 'system' })
-    return null
+    onDone('Cannot fork: no assistant response in conversation history.', { display: 'system' });
+    return null;
   }
 
   try {
@@ -45,29 +45,24 @@ export async function call(
       prompt: directive,
       run_in_background: true, // fork always runs async
       description: `Fork: ${directive.slice(0, 30)}${directive.length > 30 ? '...' : ''}`,
-    }
+    };
 
     // Call AgentTool with proper parameters:
     // - input: the agent parameters (no subagent_type => fork path)
     // - toolUseContext: the current context (ToolUseContext)
     // - canUseTool: permission-check function from context
     // - assistantMessage: the last assistant message to fork from
-    AgentTool.call(
-      input,
-      context,
-      context.canUseTool!,
-      lastAssistantMessage
-    ).catch(error => {
-      logForDebugging(`Fork subagent async error: ${error}`, { level: 'error' })
-    })
+    AgentTool.call(input, context, context.canUseTool!, lastAssistantMessage).catch(error => {
+      logForDebugging(`Fork subagent async error: ${error}`, { level: 'error' });
+    });
 
     // Notify user that fork has been started
-    onDone(`Forked subagent started with directive: "${directive}"`, { display: 'system' })
-    return null
+    onDone(`Forked subagent started with directive: "${directive}"`, { display: 'system' });
+    return null;
   } catch (error) {
     // Catches synchronous setup errors only
-    logForDebugging(`Fork command setup error: ${error}`, { level: 'error' })
-    onDone(`Fork failed: ${error instanceof Error ? error.message : String(error)}`, { display: 'system' })
-    return null
+    logForDebugging(`Fork command setup error: ${error}`, { level: 'error' });
+    onDone(`Fork failed: ${error instanceof Error ? error.message : String(error)}`, { display: 'system' });
+    return null;
   }
 }
diff --git a/src/commands/help/help.tsx b/src/commands/help/help.tsx
index f4e066b5d..b2310c13f 100644
--- a/src/commands/help/help.tsx
+++ b/src/commands/help/help.tsx
@@ -1,10 +1,7 @@
-import * as React from 'react'
-import { HelpV2 } from '../../components/HelpV2/HelpV2.js'
-import type { LocalJSXCommandCall } from '../../types/command.js'
+import * as React from 'react';
+import { HelpV2 } from '../../components/HelpV2/HelpV2.js';
+import type { LocalJSXCommandCall } from '../../types/command.js';
 
-export const call: LocalJSXCommandCall = async (
-  onDone,
-  { options: { commands } },
-) => {
-  return <HelpV2 commands={commands} onClose={onDone} />
-}
+export const call: LocalJSXCommandCall = async (onDone, { options: { commands } }) => {
+  return <HelpV2 commands={commands} onClose={onDone} />;
+};
diff --git a/src/commands/hooks/hooks.tsx b/src/commands/hooks/hooks.tsx
index 80d27e3ac..cabdea254 100644
--- a/src/commands/hooks/hooks.tsx
+++ b/src/commands/hooks/hooks.tsx
@@ -1,13 +1,13 @@
-import * as React from 'react'
-import { HooksConfigMenu } from '../../components/hooks/HooksConfigMenu.js'
-import { logEvent } from '../../services/analytics/index.js'
-import { getTools } from '../../tools.js'
-import type { LocalJSXCommandCall } from '../../types/command.js'
+import * as React from 'react';
+import { HooksConfigMenu } from '../../components/hooks/HooksConfigMenu.js';
+import { logEvent } from '../../services/analytics/index.js';
+import { getTools } from '../../tools.js';
+import type { LocalJSXCommandCall } from '../../types/command.js';
 
 export const call: LocalJSXCommandCall = async (onDone, context) => {
-  logEvent('tengu_hooks_command', {})
-  const appState = context.getAppState()
-  const permissionContext = appState.toolPermissionContext
-  const toolNames = getTools(permissionContext).map(tool => tool.name)
-  return <HooksConfigMenu toolNames={toolNames} onExit={onDone} />
-}
+  logEvent('tengu_hooks_command', {});
+  const appState = context.getAppState();
+  const permissionContext = appState.toolPermissionContext;
+  const toolNames = getTools(permissionContext).map(tool => tool.name);
+  return <HooksConfigMenu toolNames={toolNames} onExit={onDone} />;
+};
diff --git a/src/commands/ide/ide.tsx b/src/commands/ide/ide.tsx
index d5944636d..6fe36d995 100644
--- a/src/commands/ide/ide.tsx
+++ b/src/commands/ide/ide.tsx
@@ -1,25 +1,22 @@
-import chalk from 'chalk'
-import * as path from 'path'
-import React, { useCallback, useEffect, useRef, useState } from 'react'
-import { logEvent } from 'src/services/analytics/index.js'
-import type {
-  CommandResultDisplay,
-  LocalJSXCommandContext,
-} from '../../commands.js'
-import { Select } from '../../components/CustomSelect/index.js'
-import { Dialog } from '@anthropic/ink'
+import chalk from 'chalk';
+import * as path from 'path';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import { logEvent } from 'src/services/analytics/index.js';
+import type { CommandResultDisplay, LocalJSXCommandContext } from '../../commands.js';
+import { Select } from '../../components/CustomSelect/index.js';
+import { Dialog } from '@anthropic/ink';
 import {
   IdeAutoConnectDialog,
   IdeDisableAutoConnectDialog,
   shouldShowAutoConnectDialog,
   shouldShowDisableAutoConnectDialog,
-} from '../../components/IdeAutoConnectDialog.js'
-import { Box, Text } from '@anthropic/ink'
-import { clearServerCache } from '../../services/mcp/client.js'
-import type { ScopedMcpServerConfig } from '../../services/mcp/types.js'
-import { useAppState, useSetAppState } from '../../state/AppState.js'
-import { getCwd } from '../../utils/cwd.js'
-import { execFileNoThrow } from '../../utils/execFileNoThrow.js'
+} from '../../components/IdeAutoConnectDialog.js';
+import { Box, Text } from '@anthropic/ink';
+import { clearServerCache } from '../../services/mcp/client.js';
+import type { ScopedMcpServerConfig } from '../../services/mcp/types.js';
+import { useAppState, useSetAppState } from '../../state/AppState.js';
+import { getCwd } from '../../utils/cwd.js';
+import { execFileNoThrow } from '../../utils/execFileNoThrow.js';
 import {
   type DetectedIDEInfo,
   detectIDEs,
@@ -29,16 +26,16 @@ import {
   isSupportedJetBrainsTerminal,
   isSupportedTerminal,
   toIDEDisplayName,
-} from '../../utils/ide.js'
-import { getCurrentWorktreeSession } from '../../utils/worktree.js'
+} from '../../utils/ide.js';
+import { getCurrentWorktreeSession } from '../../utils/worktree.js';
 
 type IDEScreenProps = {
-  availableIDEs: DetectedIDEInfo[]
-  unavailableIDEs: DetectedIDEInfo[]
-  selectedIDE?: DetectedIDEInfo | null
-  onClose: () => void
-  onSelect: (ide?: DetectedIDEInfo) => void
-}
+  availableIDEs: DetectedIDEInfo[];
+  unavailableIDEs: DetectedIDEInfo[];
+  selectedIDE?: DetectedIDEInfo | null;
+  onClose: () => void;
+  onSelect: (ide?: DetectedIDEInfo) => void;
+};
 
 function IDEScreen({
   availableIDEs,
@@ -47,51 +44,43 @@ function IDEScreen({
   onClose,
   onSelect,
 }: IDEScreenProps): React.ReactNode {
-  const [selectedValue, setSelectedValue] = useState(
-    selectedIDE?.port?.toString() ?? 'None',
-  )
-  const [showAutoConnectDialog, setShowAutoConnectDialog] = useState(false)
-  const [showDisableAutoConnectDialog, setShowDisableAutoConnectDialog] =
-    useState(false)
+  const [selectedValue, setSelectedValue] = useState(selectedIDE?.port?.toString() ?? 'None');
+  const [showAutoConnectDialog, setShowAutoConnectDialog] = useState(false);
+  const [showDisableAutoConnectDialog, setShowDisableAutoConnectDialog] = useState(false);
 
   const handleSelectIDE = useCallback(
     (value: string) => {
       if (value !== 'None' && shouldShowAutoConnectDialog()) {
-        setShowAutoConnectDialog(true)
+        setShowAutoConnectDialog(true);
       } else if (value === 'None' && shouldShowDisableAutoConnectDialog()) {
-        setShowDisableAutoConnectDialog(true)
+        setShowDisableAutoConnectDialog(true);
       } else {
-        onSelect(availableIDEs.find(ide => ide.port === parseInt(value)))
+        onSelect(availableIDEs.find(ide => ide.port === parseInt(value, 10)));
       }
     },
     [availableIDEs, onSelect],
-  )
+  );
 
   const ideCounts = availableIDEs.reduce<Record<string, number>>((acc, ide) => {
-    acc[ide.name] = (acc[ide.name] || 0) + 1
-    return acc
-  }, {})
+    acc[ide.name] = (acc[ide.name] || 0) + 1;
+    return acc;
+  }, {});
 
   const options = availableIDEs
     .map(ide => {
-      const hasMultipleInstances = (ideCounts[ide.name] || 0) > 1
-      const showWorkspace =
-        hasMultipleInstances && ide.workspaceFolders.length > 0
+      const hasMultipleInstances = (ideCounts[ide.name] || 0) > 1;
+      const showWorkspace = hasMultipleInstances && ide.workspaceFolders.length > 0;
 
       return {
         label: ide.name,
         value: ide.port.toString(),
-        description: showWorkspace
-          ? formatWorkspaceFolders(ide.workspaceFolders)
-          : undefined,
-      }
+        description: showWorkspace ? formatWorkspaceFolders(ide.workspaceFolders) : undefined,
+      };
     })
-    .concat([{ label: 'None', value: 'None', description: undefined }])
+    .concat([{ label: 'None', value: 'None', description: undefined }]);
 
   if (showAutoConnectDialog) {
-    return (
-      <IdeAutoConnectDialog onComplete={() => handleSelectIDE(selectedValue)} />
-    )
+    return <IdeAutoConnectDialog onComplete={() => handleSelectIDE(selectedValue)} />;
   }
 
   if (showDisableAutoConnectDialog) {
@@ -100,10 +89,10 @@ function IDEScreen({
         onComplete={() => {
           // Always disconnect when user selects "None", regardless of their
           // choice about disabling auto-connect
-          onSelect(undefined)
+          onSelect(undefined);
         }}
       />
-    )
+    );
   }
 
   return (
@@ -129,36 +118,28 @@ function IDEScreen({
             defaultFocusValue={selectedValue}
             options={options}
             onChange={value => {
-              setSelectedValue(value)
-              handleSelectIDE(value)
+              setSelectedValue(value);
+              handleSelectIDE(value);
             }}
           />
         )}
         {availableIDEs.length !== 0 &&
-          availableIDEs.some(
-            ide => ide.name === 'VS Code' || ide.name === 'Visual Studio Code',
-          ) && (
+          availableIDEs.some(ide => ide.name === 'VS Code' || ide.name === 'Visual Studio Code') && (
             <Box marginTop={1}>
-              <Text color="warning">
-                Note: Only one Claude Code instance can be connected to VS Code
-                at a time.
-              </Text>
+              <Text color="warning">Note: Only one Claude Code instance can be connected to VS Code at a time.</Text>
             </Box>
           )}
         {availableIDEs.length !== 0 && !isSupportedTerminal() && (
           <Box marginTop={1}>
-            <Text dimColor>
-              Tip: You can enable auto-connect to IDE in /config or with the
-              --ide flag
-            </Text>
+            <Text dimColor>Tip: You can enable auto-connect to IDE in /config or with the --ide flag</Text>
           </Box>
         )}
 
         {unavailableIDEs.length > 0 && (
           <Box marginTop={1} flexDirection="column">
             <Text dimColor>
-              Found {unavailableIDEs.length} other running IDE(s). However,
-              their workspace/project directories do not match the current cwd.
+              Found {unavailableIDEs.length} other running IDE(s). However, their workspace/project directories do not
+              match the current cwd.
             </Text>
             <Box marginTop={1} flexDirection="column">
               {unavailableIDEs.map((ide, index) => (
@@ -173,82 +154,64 @@ function IDEScreen({
         )}
       </Box>
     </Dialog>
-  )
+  );
 }
 
 async function findCurrentIDE(
   availableIDEs: DetectedIDEInfo[],
   dynamicMcpConfig?: Record<string, ScopedMcpServerConfig>,
 ): Promise<DetectedIDEInfo | null> {
-  const currentConfig = dynamicMcpConfig?.ide
-  if (
-    !currentConfig ||
-    (currentConfig.type !== 'sse-ide' && currentConfig.type !== 'ws-ide')
-  ) {
-    return null
+  const currentConfig = dynamicMcpConfig?.ide;
+  if (!currentConfig || (currentConfig.type !== 'sse-ide' && currentConfig.type !== 'ws-ide')) {
+    return null;
   }
   for (const ide of availableIDEs) {
     if (ide.url === currentConfig.url) {
-      return ide
+      return ide;
     }
   }
-  return null
+  return null;
 }
 
 type IDEOpenSelectionProps = {
-  availableIDEs: DetectedIDEInfo[]
-  onSelectIDE: (ide?: DetectedIDEInfo) => void
-  onDone: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-}
+  availableIDEs: DetectedIDEInfo[];
+  onSelectIDE: (ide?: DetectedIDEInfo) => void;
+  onDone: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+};
 
-function IDEOpenSelection({
-  availableIDEs,
-  onSelectIDE,
-  onDone,
-}: IDEOpenSelectionProps): React.ReactNode {
-  const [selectedValue, setSelectedValue] = useState(
-    availableIDEs[0]?.port?.toString() ?? '',
-  )
+function IDEOpenSelection({ availableIDEs, onSelectIDE, onDone }: IDEOpenSelectionProps): React.ReactNode {
+  const [selectedValue, setSelectedValue] = useState(availableIDEs[0]?.port?.toString() ?? '');
 
   const handleSelectIDE = useCallback(
     (value: string) => {
-      const selectedIDE = availableIDEs.find(
-        ide => ide.port === parseInt(value),
-      )
-      onSelectIDE(selectedIDE)
+      const selectedIDE = availableIDEs.find(ide => ide.port === parseInt(value, 10));
+      onSelectIDE(selectedIDE);
     },
     [availableIDEs, onSelectIDE],
-  )
+  );
 
   const options = availableIDEs.map(ide => ({
     label: ide.name,
     value: ide.port.toString(),
-  }))
+  }));
 
   function handleCancel(): void {
-    onDone('IDE selection cancelled', { display: 'system' })
+    onDone('IDE selection cancelled', { display: 'system' });
   }
 
   return (
-    <Dialog
-      title="Select an IDE to open the project"
-      onCancel={handleCancel}
-      color="ide"
-    >
+    <Dialog title="Select an IDE to open the project" onCancel={handleCancel} color="ide">
       <Select
         defaultValue={selectedValue}
         defaultFocusValue={selectedValue}
         options={options}
         onChange={value => {
-          setSelectedValue(value)
-          handleSelectIDE(value)
+          setSelectedValue(value);
+          handleSelectIDE(value);
         }}
       />
     </Dialog>
-  )
+  );
 }
 
 function RunningIDESelector({
@@ -256,88 +219,72 @@ function RunningIDESelector({
   onSelectIDE,
   onDone,
 }: {
-  runningIDEs: IdeType[]
-  onSelectIDE: (ide: IdeType) => void
-  onDone: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
+  runningIDEs: IdeType[];
+  onSelectIDE: (ide: IdeType) => void;
+  onDone: (result?: string, options?: { display?: CommandResultDisplay }) => void;
 }): React.ReactNode {
-  const [selectedValue, setSelectedValue] = useState(runningIDEs[0] ?? '')
+  const [selectedValue, setSelectedValue] = useState(runningIDEs[0] ?? '');
 
   const handleSelectIDE = useCallback(
     (value: string) => {
-      onSelectIDE(value as IdeType)
+      onSelectIDE(value as IdeType);
     },
     [onSelectIDE],
-  )
+  );
 
   const options = runningIDEs.map(ide => ({
     label: toIDEDisplayName(ide),
     value: ide,
-  }))
+  }));
 
   function handleCancel(): void {
-    onDone('IDE selection cancelled', { display: 'system' })
+    onDone('IDE selection cancelled', { display: 'system' });
   }
 
   return (
-    <Dialog
-      title="Select IDE to install extension"
-      onCancel={handleCancel}
-      color="ide"
-    >
+    <Dialog title="Select IDE to install extension" onCancel={handleCancel} color="ide">
       <Select
         defaultFocusValue={selectedValue}
         options={options}
         onChange={value => {
-          setSelectedValue(value)
-          handleSelectIDE(value)
+          setSelectedValue(value);
+          handleSelectIDE(value);
         }}
       />
     </Dialog>
-  )
+  );
 }
 
-function InstallOnMount({
-  ide,
-  onInstall,
-}: {
-  ide: IdeType
-  onInstall: (ide: IdeType) => void
-}): React.ReactNode {
+function InstallOnMount({ ide, onInstall }: { ide: IdeType; onInstall: (ide: IdeType) => void }): React.ReactNode {
   useEffect(() => {
-    onInstall(ide)
-  }, [ide, onInstall])
-  return null
+    onInstall(ide);
+  }, [ide, onInstall]);
+  return null;
 }
 
 export async function call(
-  onDone: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void,
+  onDone: (result?: string, options?: { display?: CommandResultDisplay }) => void,
   context: LocalJSXCommandContext,
   args: string,
 ): Promise<React.ReactNode | null> {
-  logEvent('tengu_ext_ide_command', {})
+  logEvent('tengu_ext_ide_command', {});
   const {
     options: { dynamicMcpConfig },
     onChangeDynamicMcpConfig,
-  } = context
+  } = context;
 
   // Handle 'open' argument
   if (args?.trim() === 'open') {
-    const worktreeSession = getCurrentWorktreeSession()
-    const targetPath = worktreeSession ? worktreeSession.worktreePath : getCwd()
+    const worktreeSession = getCurrentWorktreeSession();
+    const targetPath = worktreeSession ? worktreeSession.worktreePath : getCwd();
 
     // Detect available IDEs
-    const detectedIDEs = await detectIDEs(true)
-    const availableIDEs = detectedIDEs.filter(ide => ide.isValid)
+    const detectedIDEs = await detectIDEs(true);
+    const availableIDEs = detectedIDEs.filter(ide => ide.isValid);
 
     if (availableIDEs.length === 0) {
-      onDone('No IDEs with Claude Code extension detected.')
-      return null
+      onDone('No IDEs with Claude Code extension detected.');
+      return null;
     }
 
     // Return IDE selection component
@@ -346,8 +293,8 @@ export async function call(
         availableIDEs={availableIDEs}
         onSelectIDE={async (selectedIDE?: DetectedIDEInfo) => {
           if (!selectedIDE) {
-            onDone('No IDE selected.')
-            return
+            onDone('No IDE selected.');
+            return;
           }
 
           // Try to open the project in the selected IDE
@@ -357,58 +304,50 @@ export async function call(
             selectedIDE.name.toLowerCase().includes('windsurf')
           ) {
             // VS Code-based IDEs
-            const { code } = await execFileNoThrow('code', [targetPath])
+            const { code } = await execFileNoThrow('code', [targetPath]);
             if (code === 0) {
-              onDone(
-                `Opened ${worktreeSession ? 'worktree' : 'project'} in ${chalk.bold(selectedIDE.name)}`,
-              )
+              onDone(`Opened ${worktreeSession ? 'worktree' : 'project'} in ${chalk.bold(selectedIDE.name)}`);
             } else {
-              onDone(
-                `Failed to open in ${selectedIDE.name}. Try opening manually: ${targetPath}`,
-              )
+              onDone(`Failed to open in ${selectedIDE.name}. Try opening manually: ${targetPath}`);
             }
           } else if (isSupportedJetBrainsTerminal()) {
             // JetBrains IDEs - they usually open via their CLI tools
             onDone(
               `Please open the ${worktreeSession ? 'worktree' : 'project'} manually in ${chalk.bold(selectedIDE.name)}: ${targetPath}`,
-            )
+            );
           } else {
             onDone(
               `Please open the ${worktreeSession ? 'worktree' : 'project'} manually in ${chalk.bold(selectedIDE.name)}: ${targetPath}`,
-            )
+            );
           }
         }}
         onDone={() => {
-          onDone('Exited without opening IDE', { display: 'system' })
+          onDone('Exited without opening IDE', { display: 'system' });
         }}
       />
-    )
+    );
   }
 
-  const detectedIDEs = await detectIDEs(true)
+  const detectedIDEs = await detectIDEs(true);
 
   // If no IDEs with extensions detected, check for running IDEs and offer to install
-  if (
-    detectedIDEs.length === 0 &&
-    context.onInstallIDEExtension &&
-    !isSupportedTerminal()
-  ) {
-    const runningIDEs = await detectRunningIDEs()
+  if (detectedIDEs.length === 0 && context.onInstallIDEExtension && !isSupportedTerminal()) {
+    const runningIDEs = await detectRunningIDEs();
 
     const onInstall = (ide: IdeType) => {
       if (context.onInstallIDEExtension) {
-        context.onInstallIDEExtension(ide)
+        context.onInstallIDEExtension(ide);
         // The completion message will be shown after installation
         if (isJetBrainsIde(ide)) {
           onDone(
             `Installed plugin to ${chalk.bold(toIDEDisplayName(ide))}\n` +
               `Please ${chalk.bold('restart your IDE')} completely for it to take effect`,
-          )
+          );
         } else {
-          onDone(`Installed extension to ${chalk.bold(toIDEDisplayName(ide))}`)
+          onDone(`Installed extension to ${chalk.bold(toIDEDisplayName(ide))}`);
         }
       }
-    }
+    };
 
     if (runningIDEs.length > 1) {
       // Show selector when multiple IDEs are running
@@ -417,19 +356,19 @@ export async function call(
           runningIDEs={runningIDEs}
           onSelectIDE={onInstall}
           onDone={() => {
-            onDone('No IDE selected.', { display: 'system' })
+            onDone('No IDE selected.', { display: 'system' });
           }}
         />
-      )
+      );
     } else if (runningIDEs.length === 1) {
-      return <InstallOnMount ide={runningIDEs[0]!} onInstall={onInstall} />
+      return <InstallOnMount ide={runningIDEs[0]!} onInstall={onInstall} />;
     }
   }
 
-  const availableIDEs = detectedIDEs.filter(ide => ide.isValid)
-  const unavailableIDEs = detectedIDEs.filter(ide => !ide.isValid)
+  const availableIDEs = detectedIDEs.filter(ide => ide.isValid);
+  const unavailableIDEs = detectedIDEs.filter(ide => !ide.isValid);
 
-  const currentIDE = await findCurrentIDE(availableIDEs, dynamicMcpConfig)
+  const currentIDE = await findCurrentIDE(availableIDEs, dynamicMcpConfig);
 
   return (
     <IDECommandFlow
@@ -440,25 +379,20 @@ export async function call(
       onChangeDynamicMcpConfig={onChangeDynamicMcpConfig}
       onDone={onDone}
     />
-  )
+  );
 }
 
 // Connection timeout slightly longer than the 30s MCP connection timeout
-const IDE_CONNECTION_TIMEOUT_MS = 35000
+const IDE_CONNECTION_TIMEOUT_MS = 35000;
 
 type IDECommandFlowProps = {
-  availableIDEs: DetectedIDEInfo[]
-  unavailableIDEs: DetectedIDEInfo[]
-  currentIDE: DetectedIDEInfo | null
-  dynamicMcpConfig?: Record<string, ScopedMcpServerConfig>
-  onChangeDynamicMcpConfig?: (
-    config: Record<string, ScopedMcpServerConfig>,
-  ) => void
-  onDone: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-}
+  availableIDEs: DetectedIDEInfo[];
+  unavailableIDEs: DetectedIDEInfo[];
+  currentIDE: DetectedIDEInfo | null;
+  dynamicMcpConfig?: Record<string, ScopedMcpServerConfig>;
+  onChangeDynamicMcpConfig?: (config: Record<string, ScopedMcpServerConfig>) => void;
+  onDone: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+};
 
 function IDECommandFlow({
   availableIDEs,
@@ -468,80 +402,66 @@ function IDECommandFlow({
   onChangeDynamicMcpConfig,
   onDone,
 }: IDECommandFlowProps): React.ReactNode {
-  const [connectingIDE, setConnectingIDE] = useState<DetectedIDEInfo | null>(
-    null,
-  )
-  const ideClient = useAppState(s => s.mcp.clients.find(c => c.name === 'ide'))
-  const setAppState = useSetAppState()
-  const isFirstCheckRef = useRef(true)
+  const [connectingIDE, setConnectingIDE] = useState<DetectedIDEInfo | null>(null);
+  const ideClient = useAppState(s => s.mcp.clients.find(c => c.name === 'ide'));
+  const setAppState = useSetAppState();
+  const isFirstCheckRef = useRef(true);
 
   // Watch for connection result
   useEffect(() => {
-    if (!connectingIDE) return
+    if (!connectingIDE) return;
     // Skip the first check — it reflects stale state from before the
     // config change was dispatched
     if (isFirstCheckRef.current) {
-      isFirstCheckRef.current = false
-      return
+      isFirstCheckRef.current = false;
+      return;
     }
-    if (!ideClient || ideClient.type === 'pending') return
+    if (!ideClient || ideClient.type === 'pending') return;
     if (ideClient.type === 'connected') {
-      onDone(`Connected to ${connectingIDE.name}.`)
+      onDone(`Connected to ${connectingIDE.name}.`);
     } else if (ideClient.type === 'failed') {
-      onDone(`Failed to connect to ${connectingIDE.name}.`)
+      onDone(`Failed to connect to ${connectingIDE.name}.`);
     }
-  }, [ideClient, connectingIDE, onDone])
+  }, [ideClient, connectingIDE, onDone]);
 
   // Timeout fallback
   useEffect(() => {
-    if (!connectingIDE) return
-    const timer = setTimeout(
-      onDone,
-      IDE_CONNECTION_TIMEOUT_MS,
-      `Connection to ${connectingIDE.name} timed out.`,
-    )
-    return () => clearTimeout(timer)
-  }, [connectingIDE, onDone])
+    if (!connectingIDE) return;
+    const timer = setTimeout(onDone, IDE_CONNECTION_TIMEOUT_MS, `Connection to ${connectingIDE.name} timed out.`);
+    return () => clearTimeout(timer);
+  }, [connectingIDE, onDone]);
 
   const handleSelectIDE = useCallback(
     (selectedIDE?: DetectedIDEInfo) => {
       if (!onChangeDynamicMcpConfig) {
-        onDone('Error connecting to IDE.')
-        return
+        onDone('Error connecting to IDE.');
+        return;
       }
-      const newConfig = { ...(dynamicMcpConfig || {}) }
+      const newConfig = { ...(dynamicMcpConfig || {}) };
       if (currentIDE) {
-        delete newConfig.ide
+        delete newConfig.ide;
       }
       if (!selectedIDE) {
         // Close the MCP transport and remove the client from state
         if (ideClient && ideClient.type === 'connected' && currentIDE) {
           // Null out onclose to prevent auto-reconnection
-          ideClient.client.onclose = () => {}
-          void clearServerCache('ide', ideClient.config)
+          ideClient.client.onclose = () => {};
+          void clearServerCache('ide', ideClient.config);
           setAppState(prev => ({
             ...prev,
             mcp: {
               ...prev.mcp,
               clients: prev.mcp.clients.filter(c => c.name !== 'ide'),
-              tools: prev.mcp.tools.filter(
-                t => !t.name?.startsWith('mcp__ide__'),
-              ),
-              commands: prev.mcp.commands.filter(
-                c => !c.name?.startsWith('mcp__ide__'),
-              ),
+              tools: prev.mcp.tools.filter(t => !t.name?.startsWith('mcp__ide__')),
+              commands: prev.mcp.commands.filter(c => !c.name?.startsWith('mcp__ide__')),
             },
-          }))
+          }));
         }
-        onChangeDynamicMcpConfig(newConfig)
-        onDone(
-          currentIDE
-            ? `Disconnected from ${currentIDE.name}.`
-            : 'No IDE selected.',
-        )
-        return
+        onChangeDynamicMcpConfig(newConfig);
+        onDone(currentIDE ? `Disconnected from ${currentIDE.name}.` : 'No IDE selected.');
+        return;
       }
-      const url = selectedIDE.url
+      const url = selectedIDE.url;
       newConfig.ide = {
         type: url.startsWith('ws:') ? 'ws-ide' : 'sse-ide',
         url: url,
@@ -549,23 +469,16 @@ function IDECommandFlow({
         authToken: selectedIDE.authToken,
         ideRunningInWindows: selectedIDE.ideRunningInWindows,
         scope: 'dynamic' as const,
-      } as ScopedMcpServerConfig
-      isFirstCheckRef.current = true
-      setConnectingIDE(selectedIDE)
-      onChangeDynamicMcpConfig(newConfig)
+      } as ScopedMcpServerConfig;
+      isFirstCheckRef.current = true;
+      setConnectingIDE(selectedIDE);
+      onChangeDynamicMcpConfig(newConfig);
     },
-    [
-      dynamicMcpConfig,
-      currentIDE,
-      ideClient,
-      setAppState,
-      onChangeDynamicMcpConfig,
-      onDone,
-    ],
-  )
+    [dynamicMcpConfig, currentIDE, ideClient, setAppState, onChangeDynamicMcpConfig, onDone],
+  );
 
   if (connectingIDE) {
-    return <Text dimColor>Connecting to {connectingIDE.name}…</Text>
+    return <Text dimColor>Connecting to {connectingIDE.name}…</Text>;
   }
 
   return (
@@ -576,7 +489,7 @@ function IDECommandFlow({
       onClose={() => onDone('IDE selection cancelled', { display: 'system' })}
       onSelect={handleSelectIDE}
     />
-  )
+  );
 }
 
 /**
@@ -585,46 +498,43 @@ function IDECommandFlow({
  * @param maxLength Maximum total length of the formatted string
  * @returns Formatted string with folder paths
  */
-export function formatWorkspaceFolders(
-  folders: string[],
-  maxLength: number = 100,
-): string {
-  if (folders.length === 0) return ''
+export function formatWorkspaceFolders(folders: string[], maxLength: number = 100): string {
+  if (folders.length === 0) return '';
 
-  const cwd = getCwd()
+  const cwd = getCwd();
 
   // Only show first 2 workspaces
-  const foldersToShow = folders.slice(0, 2)
-  const hasMore = folders.length > 2
+  const foldersToShow = folders.slice(0, 2);
+  const hasMore = folders.length > 2;
 
   // Account for ", …" if there are more folders
-  const ellipsisOverhead = hasMore ? 3 : 0 // ", …"
+  const ellipsisOverhead = hasMore ? 3 : 0; // ", …"
 
   // Account for commas and spaces between paths (", " = 2 chars per separator)
-  const separatorOverhead = (foldersToShow.length - 1) * 2
-  const availableLength = maxLength - separatorOverhead - ellipsisOverhead
+  const separatorOverhead = (foldersToShow.length - 1) * 2;
+  const availableLength = maxLength - separatorOverhead - ellipsisOverhead;
 
-  const maxLengthPerPath = Math.floor(availableLength / foldersToShow.length)
+  const maxLengthPerPath = Math.floor(availableLength / foldersToShow.length);
 
-  const cwdNFC = cwd.normalize('NFC')
+  const cwdNFC = cwd.normalize('NFC');
   const formattedFolders = foldersToShow.map(folder => {
     // Strip cwd from the beginning if present
     // Normalize both to NFC for consistent comparison (macOS uses NFD paths)
-    const folderNFC = folder.normalize('NFC')
+    const folderNFC = folder.normalize('NFC');
     if (folderNFC.startsWith(cwdNFC + path.sep)) {
-      folder = folderNFC.slice(cwdNFC.length + 1)
+      folder = folderNFC.slice(cwdNFC.length + 1);
     }
 
     if (folder.length <= maxLengthPerPath) {
-      return folder
+      return folder;
     }
-    return '…' + folder.slice(-(maxLengthPerPath - 1))
-  })
+    return '…' + folder.slice(-(maxLengthPerPath - 1));
+  });
 
-  let result = formattedFolders.join(', ')
+  let result = formattedFolders.join(', ');
   if (hasMore) {
-    result += ', …'
+    result += ', …';
   }
 
-  return result
+  return result;
 }
diff --git a/src/commands/ide/src/services/analytics/index.ts b/src/commands/ide/src/services/analytics/index.ts
index 60402f927..c095b5a65 100644
--- a/src/commands/ide/src/services/analytics/index.ts
+++ b/src/commands/ide/src/services/analytics/index.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type logEvent = any;
+export type logEvent = any
diff --git a/src/commands/insights.ts b/src/commands/insights.ts
index 1e5e40dd5..27c7c8c9d 100644
--- a/src/commands/insights.ts
+++ b/src/commands/insights.ts
@@ -895,7 +895,9 @@ async function summarizeTranscriptChunk(chunk: string): Promise<string> {
       },
     })
 
-    const text = extractTextContent(result.message.content as readonly { readonly type: string }[])
+    const text = extractTextContent(
+      result.message.content as readonly { readonly type: string }[],
+    )
     return text || chunk.slice(0, 2000)
   } catch {
     // On error, just return truncated chunk
@@ -1038,7 +1040,9 @@ RESPOND WITH ONLY A VALID JSON OBJECT matching this schema:
       },
     })
 
-    const text = extractTextContent(result.message.content as readonly { readonly type: string }[])
+    const text = extractTextContent(
+      result.message.content as readonly { readonly type: string }[],
+    )
 
     // Parse JSON from response
     const jsonMatch = text.match(/\{[\s\S]*\}/)
@@ -1589,7 +1593,9 @@ async function generateSectionInsight(
       },
     })
 
-    const text = extractTextContent(result.message.content as readonly { readonly type: string }[])
+    const text = extractTextContent(
+      result.message.content as readonly { readonly type: string }[],
+    )
 
     if (text) {
       // Parse JSON from response
@@ -3058,7 +3064,6 @@ const usageReport: Command = {
 
       // Show collection message if collecting
       if (collectRemote && hasRemoteHosts) {
-        // biome-ignore lint/suspicious/noConsole: intentional
         console.error(
           `Collecting sessions from ${remoteHosts.length} homespace(s): ${remoteHosts.join(', ')}...`,
         )
diff --git a/src/commands/install-github-app/ApiKeyStep.tsx b/src/commands/install-github-app/ApiKeyStep.tsx
index 942bc662a..66055677f 100644
--- a/src/commands/install-github-app/ApiKeyStep.tsx
+++ b/src/commands/install-github-app/ApiKeyStep.tsx
@@ -1,19 +1,19 @@
-import React, { useCallback, useState } from 'react'
-import TextInput from '../../components/TextInput.js'
-import { useTerminalSize } from '../../hooks/useTerminalSize.js'
-import { Box, color, Text, useTheme } from '@anthropic/ink'
-import { useKeybindings } from '../../keybindings/useKeybinding.js'
+import React, { useCallback, useState } from 'react';
+import TextInput from '../../components/TextInput.js';
+import { useTerminalSize } from '../../hooks/useTerminalSize.js';
+import { Box, color, Text, useTheme } from '@anthropic/ink';
+import { useKeybindings } from '../../keybindings/useKeybinding.js';
 
 interface ApiKeyStepProps {
-  existingApiKey: string | null
-  useExistingKey: boolean
-  apiKeyOrOAuthToken: string
-  onApiKeyChange: (value: string) => void
-  onToggleUseExistingKey: (useExisting: boolean) => void
-  onSubmit: () => void
-  onCreateOAuthToken?: () => void
-  selectedOption?: 'existing' | 'new' | 'oauth'
-  onSelectOption?: (option: 'existing' | 'new' | 'oauth') => void
+  existingApiKey: string | null;
+  useExistingKey: boolean;
+  apiKeyOrOAuthToken: string;
+  onApiKeyChange: (value: string) => void;
+  onToggleUseExistingKey: (useExisting: boolean) => void;
+  onSubmit: () => void;
+  onCreateOAuthToken?: () => void;
+  selectedOption?: 'existing' | 'new' | 'oauth';
+  onSelectOption?: (option: 'existing' | 'new' | 'oauth') => void;
 }
 
 export function ApiKeyStep({
@@ -23,62 +23,47 @@ export function ApiKeyStep({
   onSubmit,
   onToggleUseExistingKey,
   onCreateOAuthToken,
-  selectedOption = existingApiKey
-    ? 'existing'
-    : onCreateOAuthToken
-      ? 'oauth'
-      : 'new',
+  selectedOption = existingApiKey ? 'existing' : onCreateOAuthToken ? 'oauth' : 'new',
   onSelectOption,
 }: ApiKeyStepProps) {
-  const [cursorOffset, setCursorOffset] = useState(0)
-  const terminalSize = useTerminalSize()
-  const [theme] = useTheme()
+  const [cursorOffset, setCursorOffset] = useState(0);
+  const terminalSize = useTerminalSize();
+  const [theme] = useTheme();
 
   const handlePrevious = useCallback(() => {
     if (selectedOption === 'new' && onCreateOAuthToken) {
       // From 'new' go up to 'oauth'
-      onSelectOption?.('oauth')
+      onSelectOption?.('oauth');
     } else if (selectedOption === 'oauth' && existingApiKey) {
       // From 'oauth' go up to 'existing' (only if it exists)
-      onSelectOption?.('existing')
-      onToggleUseExistingKey(true)
+      onSelectOption?.('existing');
+      onToggleUseExistingKey(true);
     }
-  }, [
-    selectedOption,
-    onCreateOAuthToken,
-    existingApiKey,
-    onSelectOption,
-    onToggleUseExistingKey,
-  ])
+  }, [selectedOption, onCreateOAuthToken, existingApiKey, onSelectOption, onToggleUseExistingKey]);
 
   const handleNext = useCallback(() => {
     if (selectedOption === 'existing') {
       // From 'existing' go down to 'oauth' (if available) or 'new'
-      onSelectOption?.(onCreateOAuthToken ? 'oauth' : 'new')
-      onToggleUseExistingKey(false)
+      onSelectOption?.(onCreateOAuthToken ? 'oauth' : 'new');
+      onToggleUseExistingKey(false);
     } else if (selectedOption === 'oauth') {
       // From 'oauth' go down to 'new'
-      onSelectOption?.('new')
+      onSelectOption?.('new');
     }
-  }, [
-    selectedOption,
-    onCreateOAuthToken,
-    onSelectOption,
-    onToggleUseExistingKey,
-  ])
+  }, [selectedOption, onCreateOAuthToken, onSelectOption, onToggleUseExistingKey]);
 
   const handleConfirm = useCallback(() => {
     if (selectedOption === 'oauth' && onCreateOAuthToken) {
-      onCreateOAuthToken()
+      onCreateOAuthToken();
     } else {
-      onSubmit()
+      onSubmit();
     }
-  }, [selectedOption, onCreateOAuthToken, onSubmit])
+  }, [selectedOption, onCreateOAuthToken, onSubmit]);
 
   // When the text input is visible, omit confirm:yes so bare 'y' passes
   // through to the input instead of submitting. TextInput's onSubmit handles
   // Enter. Keep the Confirmation context (not Settings) to avoid j/k bindings.
-  const isTextInputVisible = selectedOption === 'new'
+  const isTextInputVisible = selectedOption === 'new';
   useKeybindings(
     {
       'confirm:previous': handlePrevious,
@@ -86,14 +71,14 @@ export function ApiKeyStep({
       'confirm:yes': handleConfirm,
     },
     { context: 'Confirmation', isActive: !isTextInputVisible },
-  )
+  );
   useKeybindings(
     {
       'confirm:previous': handlePrevious,
       'confirm:next': handleNext,
     },
     { context: 'Confirmation', isActive: isTextInputVisible },
-  )
+  );
 
   return (
     <>
@@ -105,9 +90,7 @@ export function ApiKeyStep({
         {existingApiKey && (
           <Box marginBottom={1}>
             <Text>
-              {selectedOption === 'existing'
-                ? color('success', theme)('> ')
-                : '  '}
+              {selectedOption === 'existing' ? color('success', theme)('> ') : '  '}
               Use your existing Claude Code API key
             </Text>
           </Box>
@@ -115,9 +98,7 @@ export function ApiKeyStep({
         {onCreateOAuthToken && (
           <Box marginBottom={1}>
             <Text>
-              {selectedOption === 'oauth'
-                ? color('success', theme)('> ')
-                : '  '}
+              {selectedOption === 'oauth' ? color('success', theme)('> ') : '  '}
               Create a long-lived token with your Claude subscription
             </Text>
           </Box>
@@ -148,5 +129,5 @@ export function ApiKeyStep({
         <Text dimColor>↑/↓ to select · Enter to continue</Text>
       </Box>
     </>
-  )
+  );
 }
diff --git a/src/commands/install-github-app/CheckExistingSecretStep.tsx b/src/commands/install-github-app/CheckExistingSecretStep.tsx
index de7f4b9a7..9fb66320b 100644
--- a/src/commands/install-github-app/CheckExistingSecretStep.tsx
+++ b/src/commands/install-github-app/CheckExistingSecretStep.tsx
@@ -1,15 +1,15 @@
-import React, { useCallback, useState } from 'react'
-import TextInput from '../../components/TextInput.js'
-import { useTerminalSize } from '../../hooks/useTerminalSize.js'
-import { Box, color, Text, useTheme } from '@anthropic/ink'
-import { useKeybindings } from '../../keybindings/useKeybinding.js'
+import React, { useCallback, useState } from 'react';
+import TextInput from '../../components/TextInput.js';
+import { useTerminalSize } from '../../hooks/useTerminalSize.js';
+import { Box, color, Text, useTheme } from '@anthropic/ink';
+import { useKeybindings } from '../../keybindings/useKeybinding.js';
 
 interface CheckExistingSecretStepProps {
-  useExistingSecret: boolean
-  secretName: string
-  onToggleUseExistingSecret: (useExisting: boolean) => void
-  onSecretNameChange: (value: string) => void
-  onSubmit: () => void
+  useExistingSecret: boolean;
+  secretName: string;
+  onToggleUseExistingSecret: (useExisting: boolean) => void;
+  onSecretNameChange: (value: string) => void;
+  onSubmit: () => void;
 }
 
 export function CheckExistingSecretStep({
@@ -19,21 +19,15 @@ export function CheckExistingSecretStep({
   onSecretNameChange,
   onSubmit,
 }: CheckExistingSecretStepProps) {
-  const [cursorOffset, setCursorOffset] = useState(0)
-  const terminalSize = useTerminalSize()
-  const [theme] = useTheme()
+  const [cursorOffset, setCursorOffset] = useState(0);
+  const terminalSize = useTerminalSize();
+  const [theme] = useTheme();
 
   // When the text input is visible, omit confirm:yes so bare 'y' passes
   // through to the input instead of submitting. TextInput's onSubmit handles
   // Enter. Keep the Confirmation context (not Settings) to avoid j/k bindings.
-  const handlePrevious = useCallback(
-    () => onToggleUseExistingSecret(true),
-    [onToggleUseExistingSecret],
-  )
-  const handleNext = useCallback(
-    () => onToggleUseExistingSecret(false),
-    [onToggleUseExistingSecret],
-  )
+  const handlePrevious = useCallback(() => onToggleUseExistingSecret(true), [onToggleUseExistingSecret]);
+  const handleNext = useCallback(() => onToggleUseExistingSecret(false), [onToggleUseExistingSecret]);
   useKeybindings(
     {
       'confirm:previous': handlePrevious,
@@ -41,14 +35,14 @@ export function CheckExistingSecretStep({
       'confirm:yes': onSubmit,
     },
     { context: 'Confirmation', isActive: useExistingSecret },
-  )
+  );
   useKeybindings(
     {
       'confirm:previous': handlePrevious,
       'confirm:next': handleNext,
     },
     { context: 'Confirmation', isActive: !useExistingSecret },
-  )
+  );
 
   return (
     <>
@@ -58,9 +52,7 @@ export function CheckExistingSecretStep({
           <Text dimColor>Setup API key secret</Text>
         </Box>
         <Box marginBottom={1}>
-          <Text color="warning">
-            ANTHROPIC_API_KEY already exists in repository secrets!
-          </Text>
+          <Text color="warning">ANTHROPIC_API_KEY already exists in repository secrets!</Text>
         </Box>
         <Box marginBottom={1}>
           <Text>Would you like to:</Text>
@@ -80,9 +72,7 @@ export function CheckExistingSecretStep({
         {!useExistingSecret && (
           <>
             <Box marginBottom={1}>
-              <Text>
-                Enter new secret name (alphanumeric with underscores):
-              </Text>
+              <Text>Enter new secret name (alphanumeric with underscores):</Text>
             </Box>
             <TextInput
               value={secretName}
@@ -102,5 +92,5 @@ export function CheckExistingSecretStep({
         <Text dimColor>↑/↓ to select · Enter to continue</Text>
       </Box>
     </>
-  )
+  );
 }
diff --git a/src/commands/install-github-app/CheckGitHubStep.tsx b/src/commands/install-github-app/CheckGitHubStep.tsx
index a43be6c6c..1f4fc9521 100644
--- a/src/commands/install-github-app/CheckGitHubStep.tsx
+++ b/src/commands/install-github-app/CheckGitHubStep.tsx
@@ -1,6 +1,6 @@
-import React from 'react'
-import { Text } from '@anthropic/ink'
+import React from 'react';
+import { Text } from '@anthropic/ink';
 
 export function CheckGitHubStep() {
-  return <Text>Checking GitHub CLI installation…</Text>
+  return <Text>Checking GitHub CLI installation…</Text>;
 }
diff --git a/src/commands/install-github-app/ChooseRepoStep.tsx b/src/commands/install-github-app/ChooseRepoStep.tsx
index 67e921834..634b539ae 100644
--- a/src/commands/install-github-app/ChooseRepoStep.tsx
+++ b/src/commands/install-github-app/ChooseRepoStep.tsx
@@ -1,16 +1,16 @@
-import React, { useCallback, useState } from 'react'
-import TextInput from '../../components/TextInput.js'
-import { useTerminalSize } from '../../hooks/useTerminalSize.js'
-import { Box, Text } from '@anthropic/ink'
-import { useKeybindings } from '../../keybindings/useKeybinding.js'
+import React, { useCallback, useState } from 'react';
+import TextInput from '../../components/TextInput.js';
+import { useTerminalSize } from '../../hooks/useTerminalSize.js';
+import { Box, Text } from '@anthropic/ink';
+import { useKeybindings } from '../../keybindings/useKeybinding.js';
 
 interface ChooseRepoStepProps {
-  currentRepo: string | null
-  useCurrentRepo: boolean
-  repoUrl: string
-  onRepoUrlChange: (value: string) => void
-  onToggleUseCurrentRepo: (useCurrentRepo: boolean) => void
-  onSubmit: () => void
+  currentRepo: string | null;
+  useCurrentRepo: boolean;
+  repoUrl: string;
+  onRepoUrlChange: (value: string) => void;
+  onToggleUseCurrentRepo: (useCurrentRepo: boolean) => void;
+  onSubmit: () => void;
 }
 
 export function ChooseRepoStep({
@@ -21,32 +21,32 @@ export function ChooseRepoStep({
   onSubmit,
   onToggleUseCurrentRepo,
 }: ChooseRepoStepProps) {
-  const [cursorOffset, setCursorOffset] = useState(0)
-  const [showEmptyError, setShowEmptyError] = useState(false)
-  const terminalSize = useTerminalSize()
-  const textInputColumns = terminalSize.columns
+  const [cursorOffset, setCursorOffset] = useState(0);
+  const [showEmptyError, setShowEmptyError] = useState(false);
+  const terminalSize = useTerminalSize();
+  const textInputColumns = terminalSize.columns;
 
   const handleSubmit = useCallback(() => {
-    const repoName = useCurrentRepo ? currentRepo : repoUrl
+    const repoName = useCurrentRepo ? currentRepo : repoUrl;
     if (!repoName?.trim()) {
-      setShowEmptyError(true)
-      return
+      setShowEmptyError(true);
+      return;
     }
-    onSubmit()
-  }, [useCurrentRepo, currentRepo, repoUrl, onSubmit])
+    onSubmit();
+  }, [useCurrentRepo, currentRepo, repoUrl, onSubmit]);
 
   // When the text input is visible, omit confirm:yes so bare 'y' passes
   // through to the input instead of submitting. TextInput's onSubmit handles
   // Enter. Keep the Confirmation context (not Settings) to avoid j/k bindings.
-  const isTextInputVisible = !useCurrentRepo || !currentRepo
+  const isTextInputVisible = !useCurrentRepo || !currentRepo;
   const handlePrevious = useCallback(() => {
-    onToggleUseCurrentRepo(true)
-    setShowEmptyError(false)
-  }, [onToggleUseCurrentRepo])
+    onToggleUseCurrentRepo(true);
+    setShowEmptyError(false);
+  }, [onToggleUseCurrentRepo]);
   const handleNext = useCallback(() => {
-    onToggleUseCurrentRepo(false)
-    setShowEmptyError(false)
-  }, [onToggleUseCurrentRepo])
+    onToggleUseCurrentRepo(false);
+    setShowEmptyError(false);
+  }, [onToggleUseCurrentRepo]);
 
   useKeybindings(
     {
@@ -55,14 +55,14 @@ export function ChooseRepoStep({
       'confirm:yes': handleSubmit,
     },
     { context: 'Confirmation', isActive: !isTextInputVisible },
-  )
+  );
   useKeybindings(
     {
       'confirm:previous': handlePrevious,
       'confirm:next': handleNext,
     },
     { context: 'Confirmation', isActive: isTextInputVisible },
-  )
+  );
 
   return (
     <>
@@ -73,10 +73,7 @@ export function ChooseRepoStep({
         </Box>
         {currentRepo && (
           <Box marginBottom={1}>
-            <Text
-              bold={useCurrentRepo}
-              color={useCurrentRepo ? 'permission' : undefined}
-            >
+            <Text bold={useCurrentRepo} color={useCurrentRepo ? 'permission' : undefined}>
               {useCurrentRepo ? '> ' : '  '}
               Use current repository: {currentRepo}
             </Text>
@@ -96,8 +93,8 @@ export function ChooseRepoStep({
             <TextInput
               value={repoUrl}
               onChange={value => {
-                onRepoUrlChange(value)
-                setShowEmptyError(false)
+                onRepoUrlChange(value);
+                setShowEmptyError(false);
               }}
               onSubmit={handleSubmit}
               focus={true}
@@ -116,10 +113,8 @@ export function ChooseRepoStep({
         </Box>
       )}
       <Box marginLeft={3}>
-        <Text dimColor>
-          {currentRepo ? '↑/↓ to select · ' : ''}Enter to continue
-        </Text>
+        <Text dimColor>{currentRepo ? '↑/↓ to select · ' : ''}Enter to continue</Text>
       </Box>
     </>
-  )
+  );
 }
diff --git a/src/commands/install-github-app/CreatingStep.tsx b/src/commands/install-github-app/CreatingStep.tsx
index c021d0bcb..48f2eac08 100644
--- a/src/commands/install-github-app/CreatingStep.tsx
+++ b/src/commands/install-github-app/CreatingStep.tsx
@@ -1,14 +1,14 @@
-import React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import type { Workflow } from './types.js'
+import React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import type { Workflow } from './types.js';
 
 interface CreatingStepProps {
-  currentWorkflowInstallStep: number
-  secretExists: boolean
-  useExistingSecret: boolean
-  secretName: string
-  skipWorkflow?: boolean
-  selectedWorkflows: Workflow[]
+  currentWorkflowInstallStep: number;
+  secretExists: boolean;
+  useExistingSecret: boolean;
+  secretName: string;
+  skipWorkflow?: boolean;
+  selectedWorkflows: Workflow[];
 }
 
 export function CreatingStep({
@@ -22,21 +22,15 @@ export function CreatingStep({
   const progressSteps = skipWorkflow
     ? [
         'Getting repository information',
-        secretExists && useExistingSecret
-          ? 'Using existing API key secret'
-          : `Setting up ${secretName} secret`,
+        secretExists && useExistingSecret ? 'Using existing API key secret' : `Setting up ${secretName} secret`,
       ]
     : [
         'Getting repository information',
         'Creating branch',
-        selectedWorkflows.length > 1
-          ? 'Creating workflow files'
-          : 'Creating workflow file',
-        secretExists && useExistingSecret
-          ? 'Using existing API key secret'
-          : `Setting up ${secretName} secret`,
+        selectedWorkflows.length > 1 ? 'Creating workflow files' : 'Creating workflow file',
+        secretExists && useExistingSecret ? 'Using existing API key secret' : `Setting up ${secretName} secret`,
         'Opening pull request page',
-      ]
+      ];
 
   return (
     <>
@@ -46,33 +40,25 @@ export function CreatingStep({
           <Text dimColor>Create GitHub Actions workflow</Text>
         </Box>
         {progressSteps.map((stepText, index) => {
-          let status: 'completed' | 'in-progress' | 'pending' = 'pending'
+          let status: 'completed' | 'in-progress' | 'pending' = 'pending';
 
           if (index < currentWorkflowInstallStep) {
-            status = 'completed'
+            status = 'completed';
           } else if (index === currentWorkflowInstallStep) {
-            status = 'in-progress'
+            status = 'in-progress';
           }
 
           return (
             <Box key={index}>
-              <Text
-                color={
-                  status === 'completed'
-                    ? 'success'
-                    : status === 'in-progress'
-                      ? 'warning'
-                      : undefined
-                }
-              >
+              <Text color={status === 'completed' ? 'success' : status === 'in-progress' ? 'warning' : undefined}>
                 {status === 'completed' ? '✓ ' : ''}
                 {stepText}
                 {status === 'in-progress' ? '…' : ''}
               </Text>
             </Box>
-          )
+          );
         })}
       </Box>
     </>
-  )
+  );
 }
diff --git a/src/commands/install-github-app/ErrorStep.tsx b/src/commands/install-github-app/ErrorStep.tsx
index 5864a0659..19f9a30e2 100644
--- a/src/commands/install-github-app/ErrorStep.tsx
+++ b/src/commands/install-github-app/ErrorStep.tsx
@@ -1,18 +1,14 @@
-import React from 'react'
-import { GITHUB_ACTION_SETUP_DOCS_URL } from '../../constants/github-app.js'
-import { Box, Text } from '@anthropic/ink'
+import React from 'react';
+import { GITHUB_ACTION_SETUP_DOCS_URL } from '../../constants/github-app.js';
+import { Box, Text } from '@anthropic/ink';
 
 interface ErrorStepProps {
-  error: string | undefined
-  errorReason?: string
-  errorInstructions?: string[]
+  error: string | undefined;
+  errorReason?: string;
+  errorInstructions?: string[];
 }
 
-export function ErrorStep({
-  error,
-  errorReason,
-  errorInstructions,
-}: ErrorStepProps) {
+export function ErrorStep({ error, errorReason, errorInstructions }: ErrorStepProps) {
   return (
     <>
       <Box flexDirection="column" borderStyle="round" paddingX={1}>
@@ -38,8 +34,7 @@ export function ErrorStep({
         )}
         <Box marginTop={1}>
           <Text dimColor>
-            For manual setup instructions, see:{' '}
-            <Text color="claude">{GITHUB_ACTION_SETUP_DOCS_URL}</Text>
+            For manual setup instructions, see: <Text color="claude">{GITHUB_ACTION_SETUP_DOCS_URL}</Text>
           </Text>
         </Box>
       </Box>
@@ -47,5 +42,5 @@ export function ErrorStep({
         <Text dimColor>Press any key to exit</Text>
       </Box>
     </>
-  )
+  );
 }
diff --git a/src/commands/install-github-app/ExistingWorkflowStep.tsx b/src/commands/install-github-app/ExistingWorkflowStep.tsx
index 11b0a1bb2..2a11e6adf 100644
--- a/src/commands/install-github-app/ExistingWorkflowStep.tsx
+++ b/src/commands/install-github-app/ExistingWorkflowStep.tsx
@@ -1,16 +1,13 @@
-import React from 'react'
-import { Select } from 'src/components/CustomSelect/index.js'
-import { Box, Text } from '@anthropic/ink'
+import React from 'react';
+import { Select } from 'src/components/CustomSelect/index.js';
+import { Box, Text } from '@anthropic/ink';
 
 interface ExistingWorkflowStepProps {
-  repoName: string
-  onSelectAction: (action: 'update' | 'skip' | 'exit') => void
+  repoName: string;
+  onSelectAction: (action: 'update' | 'skip' | 'exit') => void;
 }
 
-export function ExistingWorkflowStep({
-  repoName,
-  onSelectAction,
-}: ExistingWorkflowStepProps) {
+export function ExistingWorkflowStep({ repoName, onSelectAction }: ExistingWorkflowStepProps) {
   const options = [
     {
       label: 'Update workflow file with latest version',
@@ -24,15 +21,15 @@ export function ExistingWorkflowStep({
       label: 'Exit without making changes',
       value: 'exit',
     },
-  ]
+  ];
 
   const handleSelect = (value: string) => {
-    onSelectAction(value as 'update' | 'skip' | 'exit')
-  }
+    onSelectAction(value as 'update' | 'skip' | 'exit');
+  };
 
   const handleCancel = () => {
-    onSelectAction('exit')
-  }
+    onSelectAction('exit');
+  };
 
   return (
     <Box flexDirection="column" borderStyle="round" borderDimColor paddingX={1}>
@@ -43,28 +40,21 @@ export function ExistingWorkflowStep({
 
       <Box flexDirection="column" marginBottom={1}>
         <Text>
-          A Claude workflow file already exists at{' '}
-          <Text color="claude">.github/workflows/claude.yml</Text>
+          A Claude workflow file already exists at <Text color="claude">.github/workflows/claude.yml</Text>
         </Text>
         <Text dimColor>What would you like to do?</Text>
       </Box>
 
       <Box flexDirection="column">
-        <Select
-          options={options}
-          onChange={handleSelect}
-          onCancel={handleCancel}
-        />
+        <Select options={options} onChange={handleSelect} onCancel={handleCancel} />
       </Box>
 
       <Box marginTop={1}>
         <Text dimColor>
           View the latest workflow template at:{' '}
-          <Text color="claude">
-            https://github.com/anthropics/claude-code-action/blob/main/examples/claude.yml
-          </Text>
+          <Text color="claude">https://github.com/anthropics/claude-code-action/blob/main/examples/claude.yml</Text>
         </Text>
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/commands/install-github-app/InstallAppStep.tsx b/src/commands/install-github-app/InstallAppStep.tsx
index e966578c1..2ba78cc3c 100644
--- a/src/commands/install-github-app/InstallAppStep.tsx
+++ b/src/commands/install-github-app/InstallAppStep.tsx
@@ -1,17 +1,17 @@
-import figures from 'figures'
-import React from 'react'
-import { GITHUB_ACTION_SETUP_DOCS_URL } from '../../constants/github-app.js'
-import { Box, Text } from '@anthropic/ink'
-import { useKeybinding } from '../../keybindings/useKeybinding.js'
+import figures from 'figures';
+import React from 'react';
+import { GITHUB_ACTION_SETUP_DOCS_URL } from '../../constants/github-app.js';
+import { Box, Text } from '@anthropic/ink';
+import { useKeybinding } from '../../keybindings/useKeybinding.js';
 
 interface InstallAppStepProps {
-  repoUrl: string
-  onSubmit: () => void
+  repoUrl: string;
+  onSubmit: () => void;
 }
 
 export function InstallAppStep({ repoUrl, onSubmit }: InstallAppStepProps) {
   // Enter to submit
-  useKeybinding('confirm:yes', onSubmit, { context: 'Confirmation' })
+  useKeybinding('confirm:yes', onSubmit, { context: 'Confirmation' });
 
   return (
     <Box flexDirection="column" borderStyle="round" borderDimColor paddingX={1}>
@@ -33,9 +33,7 @@ export function InstallAppStep({ repoUrl, onSubmit }: InstallAppStepProps) {
         </Text>
       </Box>
       <Box marginBottom={1}>
-        <Text dimColor>
-          Important: Make sure to grant access to this specific repository
-        </Text>
+        <Text dimColor>Important: Make sure to grant access to this specific repository</Text>
       </Box>
       <Box>
         <Text bold color="permission">
@@ -44,10 +42,9 @@ export function InstallAppStep({ repoUrl, onSubmit }: InstallAppStepProps) {
       </Box>
       <Box marginTop={1}>
         <Text dimColor>
-          Having trouble? See manual setup instructions at:{' '}
-          <Text color="claude">{GITHUB_ACTION_SETUP_DOCS_URL}</Text>
+          Having trouble? See manual setup instructions at: <Text color="claude">{GITHUB_ACTION_SETUP_DOCS_URL}</Text>
         </Text>
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/commands/install-github-app/OAuthFlowStep.tsx b/src/commands/install-github-app/OAuthFlowStep.tsx
index f207b00ea..621fbc43d 100644
--- a/src/commands/install-github-app/OAuthFlowStep.tsx
+++ b/src/commands/install-github-app/OAuthFlowStep.tsx
@@ -1,20 +1,20 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react'
+import React, { useCallback, useEffect, useRef, useState } from 'react';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from 'src/services/analytics/index.js'
-import { KeyboardShortcutHint } from '@anthropic/ink'
-import { Spinner } from '../../components/Spinner.js'
-import TextInput from '../../components/TextInput.js'
-import { useTerminalSize } from '../../hooks/useTerminalSize.js'
-import { type KeyboardEvent, setClipboard, Box, Link, Text } from '@anthropic/ink'
-import { OAuthService } from '../../services/oauth/index.js'
-import { saveOAuthTokensIfNeeded } from '../../utils/auth.js'
-import { logError } from '../../utils/log.js'
+} from 'src/services/analytics/index.js';
+import { KeyboardShortcutHint } from '@anthropic/ink';
+import { Spinner } from '../../components/Spinner.js';
+import TextInput from '../../components/TextInput.js';
+import { useTerminalSize } from '../../hooks/useTerminalSize.js';
+import { type KeyboardEvent, setClipboard, Box, Link, Text } from '@anthropic/ink';
+import { OAuthService } from '../../services/oauth/index.js';
+import { saveOAuthTokensIfNeeded } from '../../utils/auth.js';
+import { logError } from '../../utils/log.js';
 
 interface OAuthFlowStepProps {
-  onSuccess: (token: string) => void
-  onCancel: () => void
+  onSuccess: (token: string) => void;
+  onCancel: () => void;
 }
 
 type OAuthStatus =
@@ -23,139 +23,132 @@ type OAuthStatus =
   | { state: 'processing' }
   | { state: 'success'; token: string }
   | { state: 'error'; message: string; toRetry?: OAuthStatus }
-  | { state: 'about_to_retry'; nextState: OAuthStatus }
+  | { state: 'about_to_retry'; nextState: OAuthStatus };
 
-const PASTE_HERE_MSG = 'Paste code here if prompted > '
+const PASTE_HERE_MSG = 'Paste code here if prompted > ';
 
-export function OAuthFlowStep({
-  onSuccess,
-  onCancel,
-}: OAuthFlowStepProps): React.ReactNode {
+export function OAuthFlowStep({ onSuccess, onCancel }: OAuthFlowStepProps): React.ReactNode {
   const [oauthStatus, setOAuthStatus] = useState<OAuthStatus>({
     state: 'starting',
-  })
-  const [oauthService] = useState(() => new OAuthService())
-  const [pastedCode, setPastedCode] = useState('')
-  const [cursorOffset, setCursorOffset] = useState(0)
-  const [showPastePrompt, setShowPastePrompt] = useState(false)
-  const [urlCopied, setUrlCopied] = useState(false)
-  const timersRef = useRef<Set<NodeJS.Timeout>>(new Set())
+  });
+  const [oauthService] = useState(() => new OAuthService());
+  const [pastedCode, setPastedCode] = useState('');
+  const [cursorOffset, setCursorOffset] = useState(0);
+  const [showPastePrompt, setShowPastePrompt] = useState(false);
+  const [urlCopied, setUrlCopied] = useState(false);
+  const timersRef = useRef<Set<NodeJS.Timeout>>(new Set());
   // Separate ref so startOAuth's timer clear doesn't cancel the urlCopied reset
-  const urlCopiedTimerRef = useRef<NodeJS.Timeout | undefined>(undefined)
+  const urlCopiedTimerRef = useRef<NodeJS.Timeout | undefined>(undefined);
 
-  const terminalSize = useTerminalSize()
-  const textInputColumns = Math.max(
-    50,
-    terminalSize.columns - PASTE_HERE_MSG.length - 4,
-  )
+  const terminalSize = useTerminalSize();
+  const textInputColumns = Math.max(50, terminalSize.columns - PASTE_HERE_MSG.length - 4);
 
   function handleKeyDown(e: KeyboardEvent): void {
-    if (oauthStatus.state !== 'error') return
-    e.preventDefault()
+    if (oauthStatus.state !== 'error') return;
+    e.preventDefault();
     if (e.key === 'return' && oauthStatus.toRetry) {
-      setPastedCode('')
-      setCursorOffset(0)
+      setPastedCode('');
+      setCursorOffset(0);
       setOAuthStatus({
         state: 'about_to_retry',
         nextState: oauthStatus.toRetry,
-      })
+      });
     } else {
-      onCancel()
+      onCancel();
     }
   }
 
   async function handleSubmitCode(value: string, url: string) {
     try {
       // Expecting format "authorizationCode#state" from the authorization callback URL
-      const [authorizationCode, state] = value.split('#')
+      const [authorizationCode, state] = value.split('#');
 
       if (!authorizationCode || !state) {
         setOAuthStatus({
           state: 'error',
           message: 'Invalid code. Please make sure the full code was copied',
           toRetry: { state: 'waiting_for_login', url },
-        })
-        return
+        });
+        return;
       }
 
       // Track which path the user is taking (manual code entry)
-      logEvent('tengu_oauth_manual_entry', {})
+      logEvent('tengu_oauth_manual_entry', {});
       oauthService.handleManualAuthCodeInput({
         authorizationCode,
         state,
-      })
+      });
     } catch (err: unknown) {
-      logError(err)
+      logError(err);
       setOAuthStatus({
         state: 'error',
         message: (err as Error).message,
         toRetry: { state: 'waiting_for_login', url },
-      })
+      });
     }
   }
 
   const startOAuth = useCallback(async () => {
     // Clear any existing timers when starting new OAuth flow
-    timersRef.current.forEach(timer => clearTimeout(timer))
-    timersRef.current.clear()
+    timersRef.current.forEach(timer => clearTimeout(timer));
+    timersRef.current.clear();
 
     try {
       const result = await oauthService.startOAuthFlow(
         async url => {
-          setOAuthStatus({ state: 'waiting_for_login', url })
-          const timer = setTimeout(setShowPastePrompt, 3000, true)
-          timersRef.current.add(timer)
+          setOAuthStatus({ state: 'waiting_for_login', url });
+          const timer = setTimeout(setShowPastePrompt, 3000, true);
+          timersRef.current.add(timer);
         },
         {
           loginWithClaudeAi: true, // Always use Claude AI for subscription tokens
           inferenceOnly: true,
           expiresIn: 365 * 24 * 60 * 60, // 1 year
         },
-      )
+      );
 
       // Show processing state
-      setOAuthStatus({ state: 'processing' })
+      setOAuthStatus({ state: 'processing' });
 
       // OAuthFlowStep creates inference-only tokens for GitHub Actions, not a
       // replacement login. Use saveOAuthTokensIfNeeded directly to avoid
       // performLogout which would destroy the user's existing auth session.
-      saveOAuthTokensIfNeeded(result)
+      saveOAuthTokensIfNeeded(result);
 
       // For OAuth flow, the access token can be used as an API key
       const timer1 = setTimeout(
         (setOAuthStatus, accessToken, onSuccess, timersRef) => {
-          setOAuthStatus({ state: 'success', token: accessToken })
+          setOAuthStatus({ state: 'success', token: accessToken });
           // Auto-continue after brief delay to show success
-          const timer2 = setTimeout(onSuccess, 1000, accessToken)
-          timersRef.current.add(timer2 as unknown as NodeJS.Timeout)
+          const timer2 = setTimeout(onSuccess, 1000, accessToken);
+          timersRef.current.add(timer2 as unknown as NodeJS.Timeout);
         },
         100,
         setOAuthStatus,
         result.accessToken,
         onSuccess,
         timersRef,
-      )
-      timersRef.current.add(timer1)
+      );
+      timersRef.current.add(timer1);
     } catch (err) {
-      const errorMessage = (err as Error).message
+      const errorMessage = (err as Error).message;
       setOAuthStatus({
         state: 'error',
         message: errorMessage,
         toRetry: { state: 'starting' }, // Allow retry by starting fresh OAuth flow
-      })
-      logError(err)
+      });
+      logError(err);
       logEvent('tengu_oauth_error', {
-        error:
-          errorMessage as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
+        error: errorMessage as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
     }
-  }, [oauthService, onSuccess])
+  }, [oauthService, onSuccess]);
 
   useEffect(() => {
     if (oauthStatus.state === 'starting') {
-      void startOAuth()
+      void startOAuth();
     }
-  }, [oauthStatus.state, startOAuth])
+  }, [oauthStatus.state, startOAuth]);
 
   // Retry logic
   useEffect(() => {
@@ -163,46 +156,41 @@ export function OAuthFlowStep({
       const timer = setTimeout(
         (nextState, setShowPastePrompt, setOAuthStatus) => {
           // Only show paste prompt when retrying to waiting_for_login
-          setShowPastePrompt(nextState.state === 'waiting_for_login')
-          setOAuthStatus(nextState)
+          setShowPastePrompt(nextState.state === 'waiting_for_login');
+          setOAuthStatus(nextState);
         },
         500,
         oauthStatus.nextState,
         setShowPastePrompt,
         setOAuthStatus,
-      )
-      timersRef.current.add(timer)
+      );
+      timersRef.current.add(timer);
     }
-  }, [oauthStatus])
+  }, [oauthStatus]);
 
   useEffect(() => {
-    if (
-      pastedCode === 'c' &&
-      oauthStatus.state === 'waiting_for_login' &&
-      showPastePrompt &&
-      !urlCopied
-    ) {
+    if (pastedCode === 'c' && oauthStatus.state === 'waiting_for_login' && showPastePrompt && !urlCopied) {
       void setClipboard(oauthStatus.url).then(raw => {
-        if (raw) process.stdout.write(raw)
-        setUrlCopied(true)
-        clearTimeout(urlCopiedTimerRef.current)
-        urlCopiedTimerRef.current = setTimeout(setUrlCopied, 2000, false)
-      })
-      setPastedCode('')
+        if (raw) process.stdout.write(raw);
+        setUrlCopied(true);
+        clearTimeout(urlCopiedTimerRef.current);
+        urlCopiedTimerRef.current = setTimeout(setUrlCopied, 2000, false);
+      });
+      setPastedCode('');
     }
-  }, [pastedCode, oauthStatus, showPastePrompt, urlCopied])
+  }, [pastedCode, oauthStatus, showPastePrompt, urlCopied]);
 
   // Cleanup OAuth service and timers when component unmounts
   useEffect(() => {
-    const timers = timersRef.current
+    const timers = timersRef.current;
     return () => {
-      oauthService.cleanup()
+      oauthService.cleanup();
       // Clear all timers
-      timers.forEach(timer => clearTimeout(timer))
-      timers.clear()
-      clearTimeout(urlCopiedTimerRef.current)
-    }
-  }, [oauthService])
+      timers.forEach(timer => clearTimeout(timer));
+      timers.clear();
+      clearTimeout(urlCopiedTimerRef.current);
+    };
+  }, [oauthService]);
 
   // Helper function to render the appropriate status message
   function renderStatusMessage(): React.ReactNode {
@@ -213,7 +201,7 @@ export function OAuthFlowStep({
             <Spinner />
             <Text>Starting authentication…</Text>
           </Box>
-        )
+        );
 
       case 'waiting_for_login':
         return (
@@ -221,9 +209,7 @@ export function OAuthFlowStep({
             {!showPastePrompt && (
               <Box>
                 <Spinner />
-                <Text>
-                  Opening browser to sign in with your Claude account…
-                </Text>
+                <Text>Opening browser to sign in with your Claude account…</Text>
               </Box>
             )}
 
@@ -233,9 +219,7 @@ export function OAuthFlowStep({
                 <TextInput
                   value={pastedCode}
                   onChange={setPastedCode}
-                  onSubmit={(value: string) =>
-                    handleSubmitCode(value, oauthStatus.url)
-                  }
+                  onSubmit={(value: string) => handleSubmitCode(value, oauthStatus.url)}
                   cursorOffset={cursorOffset}
                   onChangeCursorOffset={setCursorOffset}
                   columns={textInputColumns}
@@ -243,7 +227,7 @@ export function OAuthFlowStep({
               </Box>
             )}
           </Box>
-        )
+        );
 
       case 'processing':
         return (
@@ -251,52 +235,42 @@ export function OAuthFlowStep({
             <Spinner />
             <Text>Processing authentication…</Text>
           </Box>
-        )
+        );
 
       case 'success':
         return (
           <Box flexDirection="column" gap={1}>
-            <Text color="success">
-              ✓ Authentication token created successfully!
-            </Text>
+            <Text color="success">✓ Authentication token created successfully!</Text>
             <Text dimColor>Using token for GitHub Actions setup…</Text>
           </Box>
-        )
+        );
 
       case 'error':
         return (
           <Box flexDirection="column" gap={1}>
             <Text color="error">OAuth error: {oauthStatus.message}</Text>
             {oauthStatus.toRetry ? (
-              <Text dimColor>
-                Press Enter to try again, or any other key to cancel
-              </Text>
+              <Text dimColor>Press Enter to try again, or any other key to cancel</Text>
             ) : (
               <Text dimColor>Press any key to return to API key selection</Text>
             )}
           </Box>
-        )
+        );
 
       case 'about_to_retry':
         return (
           <Box flexDirection="column" gap={1}>
             <Text color="permission">Retrying…</Text>
           </Box>
-        )
+        );
 
       default:
-        return null
+        return null;
     }
   }
 
   return (
-    <Box
-      flexDirection="column"
-      gap={1}
-      tabIndex={0}
-      autoFocus
-      onKeyDown={handleKeyDown}
-    >
+    <Box flexDirection="column" gap={1} tabIndex={0} autoFocus onKeyDown={handleKeyDown}>
       {/* Show header inline only for initial starting state */}
       {oauthStatus.state === 'starting' && (
         <Box flexDirection="column" gap={1} paddingBottom={1}>
@@ -305,21 +279,17 @@ export function OAuthFlowStep({
         </Box>
       )}
       {/* Show header for non-starting states (to avoid duplicate with inline header)*/}
-      {oauthStatus.state !== 'success' &&
-        oauthStatus.state !== 'starting' &&
-        oauthStatus.state !== 'processing' && (
-          <Box key="header" flexDirection="column" gap={1} paddingBottom={1}>
-            <Text bold>Create Authentication Token</Text>
-            <Text dimColor>Creating a long-lived token for GitHub Actions</Text>
-          </Box>
-        )}
+      {oauthStatus.state !== 'success' && oauthStatus.state !== 'starting' && oauthStatus.state !== 'processing' && (
+        <Box key="header" flexDirection="column" gap={1} paddingBottom={1}>
+          <Text bold>Create Authentication Token</Text>
+          <Text dimColor>Creating a long-lived token for GitHub Actions</Text>
+        </Box>
+      )}
       {/* Show URL when paste prompt is visible */}
       {oauthStatus.state === 'waiting_for_login' && showPastePrompt && (
         <Box flexDirection="column" key="urlToCopy" gap={1} paddingBottom={1}>
           <Box paddingX={1}>
-            <Text dimColor>
-              Browser didn&apos;t open? Use the url below to sign in{' '}
-            </Text>
+            <Text dimColor>Browser didn&apos;t open? Use the url below to sign in </Text>
             {urlCopied ? (
               <Text color="success">(Copied!)</Text>
             ) : (
@@ -337,5 +307,5 @@ export function OAuthFlowStep({
         {renderStatusMessage()}
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/commands/install-github-app/SuccessStep.tsx b/src/commands/install-github-app/SuccessStep.tsx
index 2080f3dc7..a7be52f16 100644
--- a/src/commands/install-github-app/SuccessStep.tsx
+++ b/src/commands/install-github-app/SuccessStep.tsx
@@ -1,12 +1,12 @@
-import React from 'react'
-import { Box, Text } from '@anthropic/ink'
+import React from 'react';
+import { Box, Text } from '@anthropic/ink';
 
 type SuccessStepProps = {
-  secretExists: boolean
-  useExistingSecret: boolean
-  secretName: string
-  skipWorkflow?: boolean
-}
+  secretExists: boolean;
+  useExistingSecret: boolean;
+  secretName: string;
+  skipWorkflow?: boolean;
+};
 
 export function SuccessStep({
   secretExists,
@@ -21,14 +21,10 @@ export function SuccessStep({
           <Text bold>Install GitHub App</Text>
           <Text dimColor>Success</Text>
         </Box>
-        {!skipWorkflow && (
-          <Text color="success">✓ GitHub Actions workflow created!</Text>
-        )}
+        {!skipWorkflow && <Text color="success">✓ GitHub Actions workflow created!</Text>}
         {secretExists && useExistingSecret && (
           <Box marginTop={1}>
-            <Text color="success">
-              ✓ Using existing ANTHROPIC_API_KEY secret
-            </Text>
+            <Text color="success">✓ Using existing ANTHROPIC_API_KEY secret</Text>
           </Box>
         )}
         {(!secretExists || !useExistingSecret) && (
@@ -41,18 +37,14 @@ export function SuccessStep({
         </Box>
         {skipWorkflow ? (
           <>
-            <Text>
-              1. Install the Claude GitHub App if you haven&apos;t already
-            </Text>
+            <Text>1. Install the Claude GitHub App if you haven&apos;t already</Text>
             <Text>2. Your workflow file was kept unchanged</Text>
             <Text>3. API key is configured and ready to use</Text>
           </>
         ) : (
           <>
             <Text>1. A pre-filled PR page has been created</Text>
-            <Text>
-              2. Install the Claude GitHub App if you haven&apos;t already
-            </Text>
+            <Text>2. Install the Claude GitHub App if you haven&apos;t already</Text>
             <Text>3. Merge the PR to enable Claude PR assistance</Text>
           </>
         )}
@@ -61,5 +53,5 @@ export function SuccessStep({
         <Text dimColor>Press any key to exit</Text>
       </Box>
     </>
-  )
+  );
 }
diff --git a/src/commands/install-github-app/WarningsStep.tsx b/src/commands/install-github-app/WarningsStep.tsx
index c3d347798..3d9bc6242 100644
--- a/src/commands/install-github-app/WarningsStep.tsx
+++ b/src/commands/install-github-app/WarningsStep.tsx
@@ -1,27 +1,25 @@
-import figures from 'figures'
-import React from 'react'
-import { GITHUB_ACTION_SETUP_DOCS_URL } from '../../constants/github-app.js'
-import { Box, Text } from '@anthropic/ink'
-import { useKeybinding } from '../../keybindings/useKeybinding.js'
-import type { Warning } from './types.js'
+import figures from 'figures';
+import React from 'react';
+import { GITHUB_ACTION_SETUP_DOCS_URL } from '../../constants/github-app.js';
+import { Box, Text } from '@anthropic/ink';
+import { useKeybinding } from '../../keybindings/useKeybinding.js';
+import type { Warning } from './types.js';
 
 interface WarningsStepProps {
-  warnings: Warning[]
-  onContinue: () => void
+  warnings: Warning[];
+  onContinue: () => void;
 }
 
 export function WarningsStep({ warnings, onContinue }: WarningsStepProps) {
   // Enter to continue
-  useKeybinding('confirm:yes', onContinue, { context: 'Confirmation' })
+  useKeybinding('confirm:yes', onContinue, { context: 'Confirmation' });
 
   return (
     <>
       <Box flexDirection="column" borderStyle="round" paddingX={1}>
         <Box flexDirection="column" marginBottom={1}>
           <Text bold>{figures.warning} Setup Warnings</Text>
-          <Text dimColor>
-            We found some potential issues, but you can continue anyway
-          </Text>
+          <Text dimColor>We found some potential issues, but you can continue anyway</Text>
         </Box>
 
         {warnings.map((warning, index) => (
@@ -55,5 +53,5 @@ export function WarningsStep({ warnings, onContinue }: WarningsStepProps) {
         </Box>
       </Box>
     </>
-  )
+  );
 }
diff --git a/src/commands/install-github-app/install-github-app.tsx b/src/commands/install-github-app/install-github-app.tsx
index c57be920c..4595b4da3 100644
--- a/src/commands/install-github-app/install-github-app.tsx
+++ b/src/commands/install-github-app/install-github-app.tsx
@@ -1,32 +1,32 @@
-import { execa } from 'execa'
-import React, { useCallback, useState } from 'react'
+import { execa } from 'execa';
+import React, { useCallback, useState } from 'react';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from 'src/services/analytics/index.js'
-import { WorkflowMultiselectDialog } from '../../components/WorkflowMultiselectDialog.js'
-import { GITHUB_ACTION_SETUP_DOCS_URL } from '../../constants/github-app.js'
-import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js'
-import { type KeyboardEvent, Box } from '@anthropic/ink'
-import type { LocalJSXCommandOnDone } from '../../types/command.js'
-import { getAnthropicApiKey, isAnthropicAuthEnabled } from '../../utils/auth.js'
-import { openBrowser } from '../../utils/browser.js'
-import { execFileNoThrow } from '../../utils/execFileNoThrow.js'
-import { getGithubRepo } from '../../utils/git.js'
-import { plural } from '../../utils/stringUtils.js'
-import { ApiKeyStep } from './ApiKeyStep.js'
-import { CheckExistingSecretStep } from './CheckExistingSecretStep.js'
-import { CheckGitHubStep } from './CheckGitHubStep.js'
-import { ChooseRepoStep } from './ChooseRepoStep.js'
-import { CreatingStep } from './CreatingStep.js'
-import { ErrorStep } from './ErrorStep.js'
-import { ExistingWorkflowStep } from './ExistingWorkflowStep.js'
-import { InstallAppStep } from './InstallAppStep.js'
-import { OAuthFlowStep } from './OAuthFlowStep.js'
-import { SuccessStep } from './SuccessStep.js'
-import { setupGitHubActions } from './setupGitHubActions.js'
-import type { State, Warning, Workflow } from './types.js'
-import { WarningsStep } from './WarningsStep.js'
+} from 'src/services/analytics/index.js';
+import { WorkflowMultiselectDialog } from '../../components/WorkflowMultiselectDialog.js';
+import { GITHUB_ACTION_SETUP_DOCS_URL } from '../../constants/github-app.js';
+import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js';
+import { type KeyboardEvent, Box } from '@anthropic/ink';
+import type { LocalJSXCommandOnDone } from '../../types/command.js';
+import { getAnthropicApiKey, isAnthropicAuthEnabled } from '../../utils/auth.js';
+import { openBrowser } from '../../utils/browser.js';
+import { execFileNoThrow } from '../../utils/execFileNoThrow.js';
+import { getGithubRepo } from '../../utils/git.js';
+import { plural } from '../../utils/stringUtils.js';
+import { ApiKeyStep } from './ApiKeyStep.js';
+import { CheckExistingSecretStep } from './CheckExistingSecretStep.js';
+import { CheckGitHubStep } from './CheckGitHubStep.js';
+import { ChooseRepoStep } from './ChooseRepoStep.js';
+import { CreatingStep } from './CreatingStep.js';
+import { ErrorStep } from './ErrorStep.js';
+import { ExistingWorkflowStep } from './ExistingWorkflowStep.js';
+import { InstallAppStep } from './InstallAppStep.js';
+import { OAuthFlowStep } from './OAuthFlowStep.js';
+import { SuccessStep } from './SuccessStep.js';
+import { setupGitHubActions } from './setupGitHubActions.js';
+import type { State, Warning, Workflow } from './types.js';
+import { WarningsStep } from './WarningsStep.js';
 
 const INITIAL_STATE: State = {
   step: 'check-gh',
@@ -44,54 +44,50 @@ const INITIAL_STATE: State = {
   selectedWorkflows: ['claude', 'claude-review'] as Workflow[],
   selectedApiKeyOption: 'new' as 'existing' | 'new' | 'oauth',
   authType: 'api_key',
-}
+};
 
-function InstallGitHubApp(props: {
-  onDone: (message: string) => void
-}): React.ReactNode {
-  const [existingApiKey] = useState(() => getAnthropicApiKey())
+function InstallGitHubApp(props: { onDone: (message: string) => void }): React.ReactNode {
+  const [existingApiKey] = useState(() => getAnthropicApiKey());
   const [state, setState] = useState({
     ...INITIAL_STATE,
     useExistingKey: !!existingApiKey,
-    selectedApiKeyOption: (existingApiKey
-      ? 'existing'
-      : isAnthropicAuthEnabled()
-        ? 'oauth'
-        : 'new') as 'existing' | 'new' | 'oauth',
-  })
-  useExitOnCtrlCDWithKeybindings()
+    selectedApiKeyOption: (existingApiKey ? 'existing' : isAnthropicAuthEnabled() ? 'oauth' : 'new') as
+      | 'existing'
+      | 'new'
+      | 'oauth',
+  });
+  useExitOnCtrlCDWithKeybindings();
 
   React.useEffect(() => {
-    logEvent('tengu_install_github_app_started', {})
-  }, [])
+    logEvent('tengu_install_github_app_started', {});
+  }, []);
 
   const checkGitHubCLI = useCallback(async () => {
-    const warnings: Warning[] = []
+    const warnings: Warning[] = [];
 
     // Check if gh is installed
     const ghVersionResult = await execa('gh --version', {
       shell: true,
       reject: false,
-    })
+    });
     if (ghVersionResult.exitCode !== 0) {
       warnings.push({
         title: 'GitHub CLI not found',
-        message:
-          'GitHub CLI (gh) does not appear to be installed or accessible.',
+        message: 'GitHub CLI (gh) does not appear to be installed or accessible.',
         instructions: [
           'Install GitHub CLI from https://cli.github.com/',
           'macOS: brew install gh',
           'Windows: winget install --id GitHub.cli',
           'Linux: See installation instructions at https://github.com/cli/cli#installation',
         ],
-      })
+      });
     }
 
     // Check auth status
     const authResult = await execa('gh auth status -a', {
       shell: true,
       reject: false,
-    })
+    });
     if (authResult.exitCode !== 0) {
       warnings.push({
         title: 'GitHub CLI not authenticated',
@@ -101,19 +97,19 @@ function InstallGitHubApp(props: {
           'Follow the prompts to authenticate with GitHub',
           'Or set up authentication using environment variables or other methods',
         ],
-      })
+      });
     } else {
       // Check if required scopes are present in the Token scopes line
-      const tokenScopesMatch = authResult.stdout.match(/Token scopes:.*$/m)
+      const tokenScopesMatch = authResult.stdout.match(/Token scopes:.*$/m);
       if (tokenScopesMatch) {
-        const scopes = tokenScopesMatch[0]
-        const missingScopes: string[] = []
+        const scopes = tokenScopesMatch[0];
+        const missingScopes: string[] = [];
 
         if (!scopes.includes('repo')) {
-          missingScopes.push('repo')
+          missingScopes.push('repo');
         }
         if (!scopes.includes('workflow')) {
-          missingScopes.push('workflow')
+          missingScopes.push('workflow');
         }
 
         if (missingScopes.length > 0) {
@@ -131,18 +127,18 @@ function InstallGitHubApp(props: {
               '',
               'This will add the necessary permissions to manage workflows and secrets.',
             ],
-          }))
-          return
+          }));
+          return;
         }
       }
     }
 
     // Check if in a git repo and get remote URL
-    const currentRepo = (await getGithubRepo()) ?? ''
+    const currentRepo = (await getGithubRepo()) ?? '';
 
     logEvent('tengu_install_github_app_step_completed', {
       step: 'check-gh' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-    })
+    });
 
     setState(prev => ({
       ...prev,
@@ -151,14 +147,14 @@ function InstallGitHubApp(props: {
       selectedRepoName: currentRepo,
       useCurrentRepo: !!currentRepo, // Set to false if no repo detected
       step: warnings.length > 0 ? 'warnings' : 'choose-repo',
-    }))
-  }, [])
+    }));
+  }, []);
 
   React.useEffect(() => {
     if (state.step === 'check-gh') {
-      void checkGitHubCLI()
+      void checkGitHubCLI();
     }
-  }, [state.step, checkGitHubCLI])
+  }, [state.step, checkGitHubCLI]);
 
   const runSetupGitHubActions = useCallback(
     async (apiKeyOrOAuthToken: string | null, secretName: string) => {
@@ -166,7 +162,7 @@ function InstallGitHubApp(props: {
         ...prev,
         step: 'creating',
         currentWorkflowInstallStep: 0,
-      }))
+      }));
 
       try {
         await setupGitHubActions(
@@ -177,7 +173,7 @@ function InstallGitHubApp(props: {
             setState(prev => ({
               ...prev,
               currentWorkflowInstallStep: prev.currentWorkflowInstallStep + 1,
-            }))
+            }));
           },
           state.workflowAction === 'skip',
           state.selectedWorkflows,
@@ -187,22 +183,18 @@ function InstallGitHubApp(props: {
             workflowExists: state.workflowExists,
             secretExists: state.secretExists,
           },
-        )
+        );
         logEvent('tengu_install_github_app_step_completed', {
           step: 'creating' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        })
-        setState(prev => ({ ...prev, step: 'success' }))
+        });
+        setState(prev => ({ ...prev, step: 'success' }));
       } catch (error) {
-        const errorMessage =
-          error instanceof Error
-            ? error.message
-            : 'Failed to set up GitHub Actions'
+        const errorMessage = error instanceof Error ? error.message : 'Failed to set up GitHub Actions';
 
         if (errorMessage.includes('workflow file already exists')) {
           logEvent('tengu_install_github_app_error', {
-            reason:
-              'workflow_file_exists' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-          })
+            reason: 'workflow_file_exists' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          });
           setState(prev => ({
             ...prev,
             step: 'error',
@@ -215,12 +207,11 @@ function InstallGitHubApp(props: {
               '  2. Update the existing file manually using the template from:',
               `     ${GITHUB_ACTION_SETUP_DOCS_URL}`,
             ],
-          }))
+          }));
         } else {
           logEvent('tengu_install_github_app_error', {
-            reason:
-              'setup_github_actions_failed' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-          })
+            reason: 'setup_github_actions_failed' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          });
 
           setState(prev => ({
             ...prev,
@@ -228,7 +219,7 @@ function InstallGitHubApp(props: {
             error: errorMessage,
             errorReason: 'GitHub Actions setup failed',
             errorInstructions: [],
-          }))
+          }));
         }
       }
     },
@@ -241,42 +232,32 @@ function InstallGitHubApp(props: {
       state.secretExists,
       state.authType,
     ],
-  )
+  );
 
   async function openGitHubAppInstallation() {
-    const installUrl = 'https://github.com/apps/claude'
-    await openBrowser(installUrl)
+    const installUrl = 'https://github.com/apps/claude';
+    await openBrowser(installUrl);
   }
 
-  async function checkRepositoryPermissions(
-    repoName: string,
-  ): Promise<{ hasAccess: boolean; error?: string }> {
+  async function checkRepositoryPermissions(repoName: string): Promise<{ hasAccess: boolean; error?: string }> {
     try {
-      const result = await execFileNoThrow('gh', [
-        'api',
-        `repos/${repoName}`,
-        '--jq',
-        '.permissions.admin',
-      ])
+      const result = await execFileNoThrow('gh', ['api', `repos/${repoName}`, '--jq', '.permissions.admin']);
 
       if (result.code === 0) {
-        const hasAdmin = result.stdout.trim() === 'true'
-        return { hasAccess: hasAdmin }
+        const hasAdmin = result.stdout.trim() === 'true';
+        return { hasAccess: hasAdmin };
       }
 
-      if (
-        result.stderr.includes('404') ||
-        result.stderr.includes('Not Found')
-      ) {
+      if (result.stderr.includes('404') || result.stderr.includes('Not Found')) {
         return {
           hasAccess: false,
           error: 'repository_not_found',
-        }
+        };
       }
 
-      return { hasAccess: false }
+      return { hasAccess: false };
     } catch {
-      return { hasAccess: false }
+      return { hasAccess: false };
     }
   }
 
@@ -286,9 +267,9 @@ function InstallGitHubApp(props: {
       `repos/${repoName}/contents/.github/workflows/claude.yml`,
       '--jq',
       '.sha',
-    ])
+    ]);
 
-    return checkFileResult.code === 0
+    return checkFileResult.code === 0;
   }
 
   async function checkExistingSecret() {
@@ -299,20 +280,20 @@ function InstallGitHubApp(props: {
       'actions',
       '--repo',
       state.selectedRepoName,
-    ])
+    ]);
 
     if (checkSecretsResult.code === 0) {
-      const lines = checkSecretsResult.stdout.split('\n')
+      const lines = checkSecretsResult.stdout.split('\n');
       const hasAnthropicKey = lines.some((line: string) => {
-        return /^ANTHROPIC_API_KEY\s+/.test(line)
-      })
+        return /^ANTHROPIC_API_KEY\s+/.test(line);
+      });
 
       if (hasAnthropicKey) {
         setState(prev => ({
           ...prev,
           secretExists: true,
           step: 'check-existing-secret',
-        }))
+        }));
       } else {
         // No existing secret found
         if (existingApiKey) {
@@ -321,11 +302,11 @@ function InstallGitHubApp(props: {
             ...prev,
             apiKeyOrOAuthToken: existingApiKey,
             useExistingKey: true,
-          }))
-          await runSetupGitHubActions(existingApiKey, state.secretName)
+          }));
+          await runSetupGitHubActions(existingApiKey, state.secretName);
         } else {
           // No local key, go to API key step
-          setState(prev => ({ ...prev, step: 'api-key' }))
+          setState(prev => ({ ...prev, step: 'api-key' }));
         }
       }
     } else {
@@ -336,11 +317,11 @@ function InstallGitHubApp(props: {
           ...prev,
           apiKeyOrOAuthToken: existingApiKey,
           useExistingKey: true,
-        }))
-        await runSetupGitHubActions(existingApiKey, state.secretName)
+        }));
+        await runSetupGitHubActions(existingApiKey, state.secretName);
       } else {
         // No local key, go to API key step
-        setState(prev => ({ ...prev, step: 'api-key' }))
+        setState(prev => ({ ...prev, step: 'api-key' }));
       }
     }
   }
@@ -349,33 +330,28 @@ function InstallGitHubApp(props: {
     if (state.step === 'warnings') {
       logEvent('tengu_install_github_app_step_completed', {
         step: 'warnings' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
-      setState(prev => ({ ...prev, step: 'install-app' }))
-      setTimeout(openGitHubAppInstallation, 0)
+      });
+      setState(prev => ({ ...prev, step: 'install-app' }));
+      setTimeout(openGitHubAppInstallation, 0);
     } else if (state.step === 'choose-repo') {
-      let repoName = state.useCurrentRepo
-        ? state.currentRepo
-        : state.selectedRepoName
+      let repoName = state.useCurrentRepo ? state.currentRepo : state.selectedRepoName;
 
       if (!repoName.trim()) {
-        return
+        return;
       }
 
-      const repoWarnings: Warning[] = []
+      const repoWarnings: Warning[] = [];
 
       if (repoName.includes('github.com')) {
-        const match = repoName.match(/github\.com[:/]([^/]+\/[^/]+)(\.git)?$/)
+        const match = repoName.match(/github\.com[:/]([^/]+\/[^/]+)(\.git)?$/);
         if (!match) {
           repoWarnings.push({
             title: 'Invalid GitHub URL format',
             message: 'The repository URL format appears to be invalid.',
-            instructions: [
-              'Use format: owner/repo or https://github.com/owner/repo',
-              'Example: anthropics/claude-cli',
-            ],
-          })
+            instructions: ['Use format: owner/repo or https://github.com/owner/repo', 'Example: anthropics/claude-cli'],
+          });
         } else {
-          repoName = match[1]?.replace(/\.git$/, '') || ''
+          repoName = match[1]?.replace(/\.git$/, '') || '';
         }
       }
 
@@ -383,14 +359,11 @@ function InstallGitHubApp(props: {
         repoWarnings.push({
           title: 'Repository format warning',
           message: 'Repository should be in format "owner/repo"',
-          instructions: [
-            'Use format: owner/repo',
-            'Example: anthropics/claude-cli',
-          ],
-        })
+          instructions: ['Use format: owner/repo', 'Example: anthropics/claude-cli'],
+        });
       }
 
-      const permissionCheck = await checkRepositoryPermissions(repoName)
+      const permissionCheck = await checkRepositoryPermissions(repoName);
 
       if (permissionCheck.error === 'repository_not_found') {
         repoWarnings.push({
@@ -402,7 +375,7 @@ function InstallGitHubApp(props: {
             'For private repositories, make sure your GitHub token has the "repo" scope',
             'You can add the repo scope with: gh auth refresh -h github.com -s repo,workflow',
           ],
-        })
+        });
       } else if (!permissionCheck.hasAccess) {
         repoWarnings.push({
           title: 'Admin permissions required',
@@ -412,81 +385,77 @@ function InstallGitHubApp(props: {
             'Ask a repository admin to run this command if setup fails',
             'Alternatively, you can use the manual setup instructions',
           ],
-        })
+        });
       }
 
-      const workflowExists = await checkExistingWorkflowFile(repoName)
+      const workflowExists = await checkExistingWorkflowFile(repoName);
 
       if (repoWarnings.length > 0) {
-        const allWarnings = [...state.warnings, ...repoWarnings]
+        const allWarnings = [...state.warnings, ...repoWarnings];
         setState(prev => ({
           ...prev,
           selectedRepoName: repoName,
           workflowExists,
           warnings: allWarnings,
           step: 'warnings',
-        }))
+        }));
       } else {
         logEvent('tengu_install_github_app_step_completed', {
           step: 'choose-repo' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        })
+        });
         setState(prev => ({
           ...prev,
           selectedRepoName: repoName,
           workflowExists,
           step: 'install-app',
-        }))
-        setTimeout(openGitHubAppInstallation, 0)
+        }));
+        setTimeout(openGitHubAppInstallation, 0);
       }
     } else if (state.step === 'install-app') {
       logEvent('tengu_install_github_app_step_completed', {
         step: 'install-app' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
+      });
       if (state.workflowExists) {
-        setState(prev => ({ ...prev, step: 'check-existing-workflow' }))
+        setState(prev => ({ ...prev, step: 'check-existing-workflow' }));
       } else {
-        setState(prev => ({ ...prev, step: 'select-workflows' }))
+        setState(prev => ({ ...prev, step: 'select-workflows' }));
       }
     } else if (state.step === 'check-existing-workflow') {
-      return
+      return;
     } else if (state.step === 'select-workflows') {
       // Handled by the WorkflowMultiselectDialog component
-      return
+      return;
     } else if (state.step === 'check-existing-secret') {
       logEvent('tengu_install_github_app_step_completed', {
         step: 'check-existing-secret' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
+      });
       if (state.useExistingSecret) {
-        await runSetupGitHubActions(null, state.secretName)
+        await runSetupGitHubActions(null, state.secretName);
       } else {
         // User wants to use a new secret name with their API key
-        await runSetupGitHubActions(state.apiKeyOrOAuthToken, state.secretName)
+        await runSetupGitHubActions(state.apiKeyOrOAuthToken, state.secretName);
       }
     } else if (state.step === 'api-key') {
       // In the new flow, api-key step only appears when user has no existing key
       // They either entered a new key or will create OAuth token
       if (state.selectedApiKeyOption === 'oauth') {
         // OAuth flow already handled by handleCreateOAuthToken
-        return
+        return;
       }
 
       // If user selected 'existing' option, use the existing API key
-      const apiKeyToUse =
-        state.selectedApiKeyOption === 'existing'
-          ? existingApiKey
-          : state.apiKeyOrOAuthToken
+      const apiKeyToUse = state.selectedApiKeyOption === 'existing' ? existingApiKey : state.apiKeyOrOAuthToken;
 
       if (!apiKeyToUse) {
         logEvent('tengu_install_github_app_error', {
-          reason:
-            'api_key_missing' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        })
+          reason: 'api_key_missing' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        });
         setState(prev => ({
           ...prev,
           step: 'error',
           error: 'API key is required',
-        }))
-        return
+        }));
+        return;
       }
 
       // Store the API key being used (either existing or newly entered)
@@ -494,7 +463,7 @@ function InstallGitHubApp(props: {
         ...prev,
         apiKeyOrOAuthToken: apiKeyToUse,
         useExistingKey: state.selectedApiKeyOption === 'existing',
-      }))
+      }));
 
       // Check if ANTHROPIC_API_KEY secret already exists
       const checkSecretsResult = await execFileNoThrow('gh', [
@@ -504,132 +473,132 @@ function InstallGitHubApp(props: {
         'actions',
         '--repo',
         state.selectedRepoName,
-      ])
+      ]);
 
       if (checkSecretsResult.code === 0) {
-        const lines = checkSecretsResult.stdout.split('\n')
+        const lines = checkSecretsResult.stdout.split('\n');
         const hasAnthropicKey = lines.some((line: string) => {
-          return /^ANTHROPIC_API_KEY\s+/.test(line)
-        })
+          return /^ANTHROPIC_API_KEY\s+/.test(line);
+        });
 
         if (hasAnthropicKey) {
           logEvent('tengu_install_github_app_step_completed', {
             step: 'api-key' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-          })
+          });
           setState(prev => ({
             ...prev,
             secretExists: true,
             step: 'check-existing-secret',
-          }))
+          }));
         } else {
           logEvent('tengu_install_github_app_step_completed', {
             step: 'api-key' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-          })
+          });
           // No existing secret, proceed to creating
-          await runSetupGitHubActions(apiKeyToUse, state.secretName)
+          await runSetupGitHubActions(apiKeyToUse, state.secretName);
         }
       } else {
         logEvent('tengu_install_github_app_step_completed', {
           step: 'api-key' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        })
+        });
         // Error checking secrets, proceed anyway
-        await runSetupGitHubActions(apiKeyToUse, state.secretName)
+        await runSetupGitHubActions(apiKeyToUse, state.secretName);
       }
     }
-  }
+  };
 
   const handleRepoUrlChange = (value: string) => {
-    setState(prev => ({ ...prev, selectedRepoName: value }))
-  }
+    setState(prev => ({ ...prev, selectedRepoName: value }));
+  };
 
   const handleApiKeyChange = (value: string) => {
-    setState(prev => ({ ...prev, apiKeyOrOAuthToken: value }))
-  }
+    setState(prev => ({ ...prev, apiKeyOrOAuthToken: value }));
+  };
 
   const handleApiKeyOptionChange = (option: 'existing' | 'new' | 'oauth') => {
-    setState(prev => ({ ...prev, selectedApiKeyOption: option }))
-  }
+    setState(prev => ({ ...prev, selectedApiKeyOption: option }));
+  };
 
   const handleCreateOAuthToken = useCallback(() => {
     logEvent('tengu_install_github_app_step_completed', {
       step: 'api-key' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-    })
-    setState(prev => ({ ...prev, step: 'oauth-flow' }))
-  }, [])
+    });
+    setState(prev => ({ ...prev, step: 'oauth-flow' }));
+  }, []);
 
   const handleOAuthSuccess = useCallback(
     (token: string) => {
       logEvent('tengu_install_github_app_step_completed', {
         step: 'oauth-flow' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
+      });
       setState(prev => ({
         ...prev,
         apiKeyOrOAuthToken: token,
         useExistingKey: false,
         secretName: 'CLAUDE_CODE_OAUTH_TOKEN',
         authType: 'oauth_token',
-      }))
-      void runSetupGitHubActions(token, 'CLAUDE_CODE_OAUTH_TOKEN')
+      }));
+      void runSetupGitHubActions(token, 'CLAUDE_CODE_OAUTH_TOKEN');
     },
     [runSetupGitHubActions],
-  )
+  );
 
   const handleOAuthCancel = useCallback(() => {
-    setState(prev => ({ ...prev, step: 'api-key' }))
-  }, [])
+    setState(prev => ({ ...prev, step: 'api-key' }));
+  }, []);
 
   const handleSecretNameChange = (value: string) => {
-    if (value && !/^[a-zA-Z0-9_]+$/.test(value)) return
-    setState(prev => ({ ...prev, secretName: value }))
-  }
+    if (value && !/^[a-zA-Z0-9_]+$/.test(value)) return;
+    setState(prev => ({ ...prev, secretName: value }));
+  };
 
   const handleToggleUseCurrentRepo = (useCurrentRepo: boolean) => {
     setState(prev => ({
       ...prev,
       useCurrentRepo,
       selectedRepoName: useCurrentRepo ? prev.currentRepo : '',
-    }))
-  }
+    }));
+  };
 
   const handleToggleUseExistingKey = (useExistingKey: boolean) => {
-    setState(prev => ({ ...prev, useExistingKey }))
-  }
+    setState(prev => ({ ...prev, useExistingKey }));
+  };
 
   const handleToggleUseExistingSecret = (useExistingSecret: boolean) => {
     setState(prev => ({
       ...prev,
       useExistingSecret,
       secretName: useExistingSecret ? 'ANTHROPIC_API_KEY' : '',
-    }))
-  }
+    }));
+  };
 
   const handleWorkflowAction = async (action: 'update' | 'skip' | 'exit') => {
     if (action === 'exit') {
-      props.onDone('Installation cancelled by user')
-      return
+      props.onDone('Installation cancelled by user');
+      return;
     }
 
     logEvent('tengu_install_github_app_step_completed', {
       step: 'check-existing-workflow' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-    })
+    });
 
-    setState(prev => ({ ...prev, workflowAction: action }))
+    setState(prev => ({ ...prev, workflowAction: action }));
 
     if (action === 'skip' || action === 'update') {
       // Check if user has existing local API key
       if (existingApiKey) {
-        await checkExistingSecret()
+        await checkExistingSecret();
       } else {
         // No local key, go straight to API key step
-        setState(prev => ({ ...prev, step: 'api-key' }))
+        setState(prev => ({ ...prev, step: 'api-key' }));
       }
     }
-  }
+  };
 
   function handleDismissKeyDown(e: KeyboardEvent): void {
-    e.preventDefault()
+    e.preventDefault();
     if (state.step === 'success') {
-      logEvent('tengu_install_github_app_completed', {})
+      logEvent('tengu_install_github_app_completed', {});
     }
     props.onDone(
       state.step === 'success'
@@ -637,16 +606,14 @@ function InstallGitHubApp(props: {
         : state.error
           ? `Couldn't install GitHub App: ${state.error}\nFor manual setup instructions, see: ${GITHUB_ACTION_SETUP_DOCS_URL}`
           : `GitHub App installation failed\nFor manual setup instructions, see: ${GITHUB_ACTION_SETUP_DOCS_URL}`,
-    )
+    );
   }
 
   switch (state.step) {
     case 'check-gh':
-      return <CheckGitHubStep />
+      return <CheckGitHubStep />;
     case 'warnings':
-      return (
-        <WarningsStep warnings={state.warnings} onContinue={handleSubmit} />
-      )
+      return <WarningsStep warnings={state.warnings} onContinue={handleSubmit} />;
     case 'choose-repo':
       return (
         <ChooseRepoStep
@@ -657,21 +624,11 @@ function InstallGitHubApp(props: {
           onToggleUseCurrentRepo={handleToggleUseCurrentRepo}
           onSubmit={handleSubmit}
         />
-      )
+      );
     case 'install-app':
-      return (
-        <InstallAppStep
-          repoUrl={state.selectedRepoName}
-          onSubmit={handleSubmit}
-        />
-      )
+      return <InstallAppStep repoUrl={state.selectedRepoName} onSubmit={handleSubmit} />;
     case 'check-existing-workflow':
-      return (
-        <ExistingWorkflowStep
-          repoName={state.selectedRepoName}
-          onSelectAction={handleWorkflowAction}
-        />
-      )
+      return <ExistingWorkflowStep repoName={state.selectedRepoName} onSelectAction={handleWorkflowAction} />;
     case 'check-existing-secret':
       return (
         <CheckExistingSecretStep
@@ -681,7 +638,7 @@ function InstallGitHubApp(props: {
           onSecretNameChange={handleSecretNameChange}
           onSubmit={handleSubmit}
         />
-      )
+      );
     case 'api-key':
       return (
         <ApiKeyStep
@@ -691,13 +648,11 @@ function InstallGitHubApp(props: {
           onApiKeyChange={handleApiKeyChange}
           onToggleUseExistingKey={handleToggleUseExistingKey}
           onSubmit={handleSubmit}
-          onCreateOAuthToken={
-            isAnthropicAuthEnabled() ? handleCreateOAuthToken : undefined
-          }
+          onCreateOAuthToken={isAnthropicAuthEnabled() ? handleCreateOAuthToken : undefined}
           selectedOption={state.selectedApiKeyOption}
           onSelectOption={handleApiKeyOptionChange}
         />
-      )
+      );
     case 'creating':
       return (
         <CreatingStep
@@ -708,7 +663,7 @@ function InstallGitHubApp(props: {
           skipWorkflow={state.workflowAction === 'skip'}
           selectedWorkflows={state.selectedWorkflows}
         />
-      )
+      );
     case 'success':
       return (
         <Box tabIndex={0} autoFocus onKeyDown={handleDismissKeyDown}>
@@ -719,17 +674,13 @@ function InstallGitHubApp(props: {
             skipWorkflow={state.workflowAction === 'skip'}
           />
         </Box>
-      )
+      );
     case 'error':
       return (
         <Box tabIndex={0} autoFocus onKeyDown={handleDismissKeyDown}>
-          <ErrorStep
-            error={state.error}
-            errorReason={state.errorReason}
-            errorInstructions={state.errorInstructions}
-          />
+          <ErrorStep error={state.error} errorReason={state.errorReason} errorInstructions={state.errorInstructions} />
         </Box>
-      )
+      );
     case 'select-workflows':
       return (
         <WorkflowMultiselectDialog
@@ -737,33 +688,26 @@ function InstallGitHubApp(props: {
           onSubmit={selectedWorkflows => {
             logEvent('tengu_install_github_app_step_completed', {
               step: 'select-workflows' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-            })
+            });
             setState(prev => ({
               ...prev,
               selectedWorkflows,
-            }))
+            }));
             // Check if user has existing local API key
             if (existingApiKey) {
-              void checkExistingSecret()
+              void checkExistingSecret();
             } else {
               // No local key, go straight to API key step
-              setState(prev => ({ ...prev, step: 'api-key' }))
+              setState(prev => ({ ...prev, step: 'api-key' }));
             }
           }}
         />
-      )
+      );
     case 'oauth-flow':
-      return (
-        <OAuthFlowStep
-          onSuccess={handleOAuthSuccess}
-          onCancel={handleOAuthCancel}
-        />
-      )
+      return <OAuthFlowStep onSuccess={handleOAuthSuccess} onCancel={handleOAuthCancel} />;
   }
 }
 
-export async function call(
-  onDone: LocalJSXCommandOnDone,
-): Promise<React.ReactNode> {
-  return <InstallGitHubApp onDone={onDone} />
+export async function call(onDone: LocalJSXCommandOnDone): Promise<React.ReactNode> {
+  return <InstallGitHubApp onDone={onDone} />;
 }
diff --git a/src/commands/install-github-app/src/components/CustomSelect/index.ts b/src/commands/install-github-app/src/components/CustomSelect/index.ts
index d95b49c7a..4947147f2 100644
--- a/src/commands/install-github-app/src/components/CustomSelect/index.ts
+++ b/src/commands/install-github-app/src/components/CustomSelect/index.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type Select = any;
+export type Select = any
diff --git a/src/commands/install-github-app/src/services/analytics/index.ts b/src/commands/install-github-app/src/services/analytics/index.ts
index 142e7b6f5..2e0f796da 100644
--- a/src/commands/install-github-app/src/services/analytics/index.ts
+++ b/src/commands/install-github-app/src/services/analytics/index.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any;
-export type logEvent = any;
+export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any
+export type logEvent = any
diff --git a/src/commands/install-github-app/src/utils/config.ts b/src/commands/install-github-app/src/utils/config.ts
index 507e64a40..6ed23f24d 100644
--- a/src/commands/install-github-app/src/utils/config.ts
+++ b/src/commands/install-github-app/src/utils/config.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type saveGlobalConfig = any;
+export type saveGlobalConfig = any
diff --git a/src/commands/install.tsx b/src/commands/install.tsx
index bb72ad4a8..5d2b0c2bd 100644
--- a/src/commands/install.tsx
+++ b/src/commands/install.tsx
@@ -1,28 +1,25 @@
-import { homedir } from 'node:os'
-import { join } from 'node:path'
-import React, { useEffect, useState } from 'react'
-import type { CommandResultDisplay } from 'src/commands.js'
-import { logEvent } from 'src/services/analytics/index.js'
-import { StatusIcon } from '@anthropic/ink'
-import { Box, wrappedRender as render, Text } from '@anthropic/ink'
-import { logForDebugging } from '../utils/debug.js'
-import { env } from '../utils/env.js'
-import { errorMessage } from '../utils/errors.js'
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+import React, { useEffect, useState } from 'react';
+import type { CommandResultDisplay } from 'src/commands.js';
+import { logEvent } from 'src/services/analytics/index.js';
+import { StatusIcon } from '@anthropic/ink';
+import { Box, wrappedRender as render, Text } from '@anthropic/ink';
+import { logForDebugging } from '../utils/debug.js';
+import { env } from '../utils/env.js';
+import { errorMessage } from '../utils/errors.js';
 import {
   checkInstall,
   cleanupNpmInstallations,
   cleanupShellAliases,
   installLatest,
-} from '../utils/nativeInstaller/index.js'
-import {
-  getInitialSettings,
-  updateSettingsForSource,
-} from '../utils/settings/settings.js'
+} from '../utils/nativeInstaller/index.js';
+import { getInitialSettings, updateSettingsForSource } from '../utils/settings/settings.js';
 
 interface InstallProps {
-  onDone: (result: string, options?: { display?: CommandResultDisplay }) => void
-  force?: boolean
-  target?: string // 'latest', 'stable', or version like '1.0.34'
+  onDone: (result: string, options?: { display?: CommandResultDisplay }) => void;
+  force?: boolean;
+  target?: string; // 'latest', 'stable', or version like '1.0.34'
 }
 
 type InstallState =
@@ -32,24 +29,24 @@ type InstallState =
   | { type: 'setting-up' }
   | { type: 'set-up'; messages: string[] }
   | { type: 'success'; version: string; setupMessages?: string[] }
-  | { type: 'error'; message: string; warnings?: string[] }
+  | { type: 'error'; message: string; warnings?: string[] };
 
 function getInstallationPath(): string {
-  const isWindows = env.platform === 'win32'
-  const homeDir = homedir()
+  const isWindows = env.platform === 'win32';
+  const homeDir = homedir();
 
   if (isWindows) {
     // Convert to Windows-style path
-    const windowsPath = join(homeDir, '.local', 'bin', 'claude.exe')
+    const windowsPath = join(homeDir, '.local', 'bin', 'claude.exe');
     // Replace forward slashes with backslashes for Windows display
-    return windowsPath.replace(/\//g, '\\')
+    return windowsPath.replace(/\//g, '\\');
   }
 
-  return '~/.local/bin/claude'
+  return '~/.local/bin/claude';
 }
 
 function SetupNotes({ messages }: { messages: string[] }): React.ReactNode {
-  if (messages.length === 0) return null
+  if (messages.length === 0) return null;
 
   return (
     <Box flexDirection="column" gap={0} marginBottom={1}>
@@ -65,183 +62,151 @@ function SetupNotes({ messages }: { messages: string[] }): React.ReactNode {
         </Box>
       ))}
     </Box>
-  )
+  );
 }
 
 function Install({ onDone, force, target }: InstallProps): React.ReactNode {
-  const [state, setState] = useState<InstallState>({ type: 'checking' })
+  const [state, setState] = useState<InstallState>({ type: 'checking' });
 
   useEffect(() => {
     async function run() {
       try {
-        logForDebugging(
-          `Install: Starting installation process (force=${force}, target=${target})`,
-        )
+        logForDebugging(`Install: Starting installation process (force=${force}, target=${target})`);
 
         // Install native build first
-        const channelOrVersion =
-          target || getInitialSettings()?.autoUpdatesChannel || 'latest'
-        setState({ type: 'installing', version: channelOrVersion })
+        const channelOrVersion = target || getInitialSettings()?.autoUpdatesChannel || 'latest';
+        setState({ type: 'installing', version: channelOrVersion });
 
         // Pass force flag to trigger reinstall even if up to date
         logForDebugging(
           `Install: Calling installLatest(channelOrVersion=${channelOrVersion}, forceReinstall=${force})`,
-        )
-        const result = await installLatest(channelOrVersion, force)
+        );
+        const result = await installLatest(channelOrVersion, force);
         logForDebugging(
           `Install: installLatest returned version=${result.latestVersion}, wasUpdated=${result.wasUpdated}, lockFailed=${result.lockFailed}`,
-        )
+        );
 
         // Check specifically for lock failure
         if (result.lockFailed) {
           throw new Error(
             'Could not install - another process is currently installing Claude. Please try again in a moment.',
-          )
+          );
         }
 
         // If we couldn't get the version, there might be an issue
         if (!result.latestVersion) {
-          logForDebugging(
-            'Install: Failed to retrieve version information during install',
-            { level: 'error' },
-          )
+          logForDebugging('Install: Failed to retrieve version information during install', { level: 'error' });
         }
 
         if (!result.wasUpdated) {
-          logForDebugging('Install: Already up to date')
+          logForDebugging('Install: Already up to date');
         }
 
         // Set up launcher and shell integration
-        setState({ type: 'setting-up' })
-        const setupMessages = await checkInstall(true)
+        setState({ type: 'setting-up' });
+        const setupMessages = await checkInstall(true);
 
-        logForDebugging(
-          `Install: Setup launcher completed with ${setupMessages.length} messages`,
-        )
+        logForDebugging(`Install: Setup launcher completed with ${setupMessages.length} messages`);
         if (setupMessages.length > 0) {
-          setupMessages.forEach(msg =>
-            logForDebugging(`Install: Setup message: ${msg.message}`),
-          )
+          setupMessages.forEach(msg => logForDebugging(`Install: Setup message: ${msg.message}`));
         }
 
         // Now that native installation succeeded, clean up old npm installations
-        logForDebugging(
-          'Install: Cleaning up npm installations after successful install',
-        )
-        const { removed, errors, warnings } = await cleanupNpmInstallations()
+        logForDebugging('Install: Cleaning up npm installations after successful install');
+        const { removed, errors, warnings } = await cleanupNpmInstallations();
 
         if (removed > 0) {
-          logForDebugging(`Cleaned up ${removed} npm installation(s)`)
+          logForDebugging(`Cleaned up ${removed} npm installation(s)`);
         }
 
         if (errors.length > 0) {
-          logForDebugging(`Cleanup errors: ${errors.join(', ')}`)
+          logForDebugging(`Cleanup errors: ${errors.join(', ')}`);
           // Continue despite cleanup errors - native install already succeeded
         }
 
         // Clean up old shell aliases
-        const aliasMessages = await cleanupShellAliases()
+        const aliasMessages = await cleanupShellAliases();
         if (aliasMessages.length > 0) {
-          logForDebugging(
-            `Shell alias cleanup: ${aliasMessages.map(m => m.message).join('; ')}`,
-          )
+          logForDebugging(`Shell alias cleanup: ${aliasMessages.map(m => m.message).join('; ')}`);
         }
 
         // Log success event
         logEvent('tengu_claude_install_command', {
           has_version: result.latestVersion ? 1 : 0,
           forced: force ? 1 : 0,
-        })
+        });
 
         // If user explicitly specified a channel, save it to settings
         if (target === 'latest' || target === 'stable') {
           updateSettingsForSource('userSettings', {
             autoUpdatesChannel: target,
-          })
-          logForDebugging(
-            `Install: Saved autoUpdatesChannel=${target} to user settings`,
-          )
+          });
+          logForDebugging(`Install: Saved autoUpdatesChannel=${target} to user settings`);
         }
 
         // Combine all warning/info messages (convert SetupMessage to string)
-        const allWarnings = [...warnings, ...aliasMessages.map(m => m.message)]
+        const allWarnings = [...warnings, ...aliasMessages.map(m => m.message)];
 
         // Check if there were any setup errors or notes
         if (setupMessages.length > 0) {
           setState({
             type: 'set-up',
             messages: setupMessages.map(m => m.message),
-          })
+          });
           // Still mark as success but show both setup messages and cleanup warnings
           setTimeout(setState, 2000, {
             type: 'success' as const,
             version: result.latestVersion || 'current',
-            setupMessages: [
-              ...setupMessages.map(m => m.message),
-              ...allWarnings,
-            ],
-          })
+            setupMessages: [...setupMessages.map(m => m.message), ...allWarnings],
+          });
         } else {
           // No setup messages, go straight to success (but still show cleanup warnings if any)
-          logForDebugging('Install: Shell PATH already configured')
+          logForDebugging('Install: Shell PATH already configured');
           setState({
             type: 'success',
             version: result.latestVersion || 'current',
             setupMessages: allWarnings.length > 0 ? allWarnings : undefined,
-          })
+          });
         }
       } catch (error) {
         logForDebugging(`Install command failed: ${error}`, {
           level: 'error',
-        })
+        });
         setState({
           type: 'error',
           message: errorMessage(error),
-        })
+        });
       }
     }
 
-    void run()
-  }, [force, target])
+    void run();
+  }, [force, target]);
 
   useEffect(() => {
     if (state.type === 'success') {
       // Give success message time to render before exiting
-      setTimeout(
-        onDone,
-        2000,
-        'Claude Code installation completed successfully',
-        {
-          display: 'system' as const,
-        },
-      )
+      setTimeout(onDone, 2000, 'Claude Code installation completed successfully', {
+        display: 'system' as const,
+      });
     } else if (state.type === 'error') {
       // Give error message time to render before exiting
       setTimeout(onDone, 3000, 'Claude Code installation failed', {
         display: 'system' as const,
-      })
+      });
     }
-  }, [state, onDone])
+  }, [state, onDone]);
 
   return (
     <Box flexDirection="column" marginTop={1}>
-      {state.type === 'checking' && (
-        <Text color="claude">Checking installation status...</Text>
-      )}
+      {state.type === 'checking' && <Text color="claude">Checking installation status...</Text>}
 
-      {state.type === 'cleaning-npm' && (
-        <Text color="warning">Cleaning up old npm installations...</Text>
-      )}
+      {state.type === 'cleaning-npm' && <Text color="warning">Cleaning up old npm installations...</Text>}
 
       {state.type === 'installing' && (
-        <Text color="claude">
-          Installing Claude Code native build {state.version}...
-        </Text>
+        <Text color="claude">Installing Claude Code native build {state.version}...</Text>
       )}
 
-      {state.type === 'setting-up' && (
-        <Text color="claude">Setting up launcher and shell integration...</Text>
-      )}
+      {state.type === 'setting-up' && <Text color="claude">Setting up launcher and shell integration...</Text>}
 
       {state.type === 'set-up' && <SetupNotes messages={state.messages} />}
 
@@ -291,7 +256,7 @@ function Install({ onDone, force, target }: InstallProps): React.ReactNode {
         </Box>
       )}
     </Box>
-  )
+  );
 }
 
 // This is only used from cli.tsx, not as a slash command
@@ -301,27 +266,24 @@ export const install = {
   description: 'Install Claude Code native build',
   argumentHint: '[options]',
   async call(
-    onDone: (
-      result: string,
-      options?: { display?: CommandResultDisplay },
-    ) => void,
+    onDone: (result: string, options?: { display?: CommandResultDisplay }) => void,
     _context: unknown,
     args: string[],
   ) {
     // Parse arguments
-    const force = args.includes('--force')
-    const nonFlagArgs = args.filter(arg => !arg.startsWith('--'))
-    const target = nonFlagArgs[0] // 'latest', 'stable', or version like '1.0.34'
+    const force = args.includes('--force');
+    const nonFlagArgs = args.filter(arg => !arg.startsWith('--'));
+    const target = nonFlagArgs[0]; // 'latest', 'stable', or version like '1.0.34'
 
     const { unmount } = await render(
       <Install
         onDone={(result, options) => {
-          unmount()
-          onDone(result, options)
+          unmount();
+          onDone(result, options);
         }}
         force={force}
         target={target}
       />,
-    )
+    );
   },
-}
+};
diff --git a/src/commands/job/job.tsx b/src/commands/job/job.tsx
index 2942db182..539b8dfd1 100644
--- a/src/commands/job/job.tsx
+++ b/src/commands/job/job.tsx
@@ -1,4 +1,4 @@
-import type { LocalJSXCommandOnDone, LocalJSXCommandContext } from '../../types/command.js'
+import type { LocalJSXCommandOnDone, LocalJSXCommandContext } from '../../types/command.js';
 
 /**
  * /job slash command — manages template jobs from inside the REPL.
@@ -11,24 +11,24 @@ export async function call(
   _context: LocalJSXCommandContext,
   args: string,
 ): Promise<React.ReactNode> {
-  const parts = args ? args.trim().split(/\s+/) : []
-  const sub = parts[0] || 'list'
+  const parts = args ? args.trim().split(/\s+/) : [];
+  const sub = parts[0] || 'list';
 
   // Capture console output so we can return it as onDone text
-  const lines: string[] = []
-  const origLog = console.log
-  const origError = console.error
-  console.log = (...a: unknown[]) => lines.push(a.map(String).join(' '))
-  console.error = (...a: unknown[]) => lines.push(a.map(String).join(' '))
+  const lines: string[] = [];
+  const origLog = console.log;
+  const origError = console.error;
+  console.log = (...a: unknown[]) => lines.push(a.map(String).join(' '));
+  console.error = (...a: unknown[]) => lines.push(a.map(String).join(' '));
 
   try {
-    const { templatesMain } = await import('../../cli/handlers/templateJobs.js')
-    await templatesMain([sub, ...parts.slice(1)])
+    const { templatesMain } = await import('../../cli/handlers/templateJobs.js');
+    await templatesMain([sub, ...parts.slice(1)]);
   } finally {
-    console.log = origLog
-    console.error = origError
+    console.log = origLog;
+    console.error = origError;
   }
 
-  onDone(lines.join('\n') || 'Done.', { display: 'system' })
-  return null
+  onDone(lines.join('\n') || 'Done.', { display: 'system' });
+  return null;
 }
diff --git a/src/commands/login/login.tsx b/src/commands/login/login.tsx
index b4329fe62..cbe148357 100644
--- a/src/commands/login/login.tsx
+++ b/src/commands/login/login.tsx
@@ -1,90 +1,81 @@
-import { feature } from 'bun:bundle'
-import * as React from 'react'
-import { resetCostState } from '../../bootstrap/state.js'
-import {
-  clearTrustedDeviceToken,
-  enrollTrustedDevice,
-} from '../../bridge/trustedDevice.js'
-import type { LocalJSXCommandContext } from '../../commands.js'
-import { ConfigurableShortcutHint } from '../../components/ConfigurableShortcutHint.js'
-import { ConsoleOAuthFlow } from '../../components/ConsoleOAuthFlow.js'
-import { Dialog } from '@anthropic/ink'
-import { useMainLoopModel } from '../../hooks/useMainLoopModel.js'
-import { Text } from '@anthropic/ink'
-import { refreshGrowthBookAfterAuthChange } from '../../services/analytics/growthbook.js'
-import { refreshPolicyLimits } from '../../services/policyLimits/index.js'
-import { refreshRemoteManagedSettings } from '../../services/remoteManagedSettings/index.js'
-import type { LocalJSXCommandOnDone } from '../../types/command.js'
-import { stripSignatureBlocks } from '../../utils/messages.js'
+import { feature } from 'bun:bundle';
+import * as React from 'react';
+import { resetCostState } from '../../bootstrap/state.js';
+import { clearTrustedDeviceToken, enrollTrustedDevice } from '../../bridge/trustedDevice.js';
+import type { LocalJSXCommandContext } from '../../commands.js';
+import { ConfigurableShortcutHint } from '../../components/ConfigurableShortcutHint.js';
+import { ConsoleOAuthFlow } from '../../components/ConsoleOAuthFlow.js';
+import { Dialog } from '@anthropic/ink';
+import { useMainLoopModel } from '../../hooks/useMainLoopModel.js';
+import { Text } from '@anthropic/ink';
+import { refreshGrowthBookAfterAuthChange } from '../../services/analytics/growthbook.js';
+import { refreshPolicyLimits } from '../../services/policyLimits/index.js';
+import { refreshRemoteManagedSettings } from '../../services/remoteManagedSettings/index.js';
+import type { LocalJSXCommandOnDone } from '../../types/command.js';
+import { stripSignatureBlocks } from '../../utils/messages.js';
 import {
   checkAndDisableAutoModeIfNeeded,
   checkAndDisableBypassPermissionsIfNeeded,
   resetAutoModeGateCheck,
   resetBypassPermissionsCheck,
-} from '../../utils/permissions/bypassPermissionsKillswitch.js'
-import { resetUserCache } from '../../utils/user.js'
+} from '../../utils/permissions/bypassPermissionsKillswitch.js';
+import { resetUserCache } from '../../utils/user.js';
 
-export async function call(
-  onDone: LocalJSXCommandOnDone,
-  context: LocalJSXCommandContext,
-): Promise<React.ReactNode> {
+export async function call(onDone: LocalJSXCommandOnDone, context: LocalJSXCommandContext): Promise<React.ReactNode> {
   return (
     <Login
       onDone={async success => {
-        context.onChangeAPIKey()
+        context.onChangeAPIKey();
         // Signature-bearing blocks (thinking, connector_text) are bound to the API key —
         // strip them so the new key doesn't reject stale signatures.
-        context.setMessages(stripSignatureBlocks)
+        context.setMessages(stripSignatureBlocks);
         if (success) {
           // Post-login refresh logic. Keep in sync with onboarding in src/interactiveHelpers.tsx
           // Reset cost state when switching accounts
-          resetCostState()
+          resetCostState();
           // Refresh remotely managed settings after login (non-blocking)
-          void refreshRemoteManagedSettings()
+          void refreshRemoteManagedSettings();
           // Refresh policy limits after login (non-blocking)
-          void refreshPolicyLimits()
+          void refreshPolicyLimits();
           // Clear user data cache BEFORE GrowthBook refresh so it picks up fresh credentials
-          resetUserCache()
+          resetUserCache();
           // Refresh GrowthBook after login to get updated feature flags (e.g., for claude.ai MCPs)
-          refreshGrowthBookAfterAuthChange()
+          refreshGrowthBookAfterAuthChange();
           // Clear any stale trusted device token from a previous account before
           // re-enrolling — prevents sending the old token on bridge calls while
           // the async enrollTrustedDevice() is in-flight.
-          clearTrustedDeviceToken()
+          clearTrustedDeviceToken();
           // Enroll as a trusted device for Remote Control (10-min fresh-session window)
-          void enrollTrustedDevice()
+          void enrollTrustedDevice();
           // Reset killswitch gate checks and re-run with new org
-          resetBypassPermissionsCheck()
-          const appState = context.getAppState()
-          void checkAndDisableBypassPermissionsIfNeeded(
-            appState.toolPermissionContext,
-            context.setAppState,
-          )
+          resetBypassPermissionsCheck();
+          const appState = context.getAppState();
+          void checkAndDisableBypassPermissionsIfNeeded(appState.toolPermissionContext, context.setAppState);
           if (feature('TRANSCRIPT_CLASSIFIER')) {
-            resetAutoModeGateCheck()
+            resetAutoModeGateCheck();
             void checkAndDisableAutoModeIfNeeded(
               appState.toolPermissionContext,
               context.setAppState,
               appState.fastMode,
-            )
+            );
           }
           // Increment authVersion to trigger re-fetching of auth-dependent data in hooks (e.g., MCP servers)
           context.setAppState(prev => ({
             ...prev,
             authVersion: prev.authVersion + 1,
-          }))
+          }));
         }
-        onDone(success ? 'Login successful' : 'Login interrupted')
+        onDone(success ? 'Login successful' : 'Login interrupted');
       }}
     />
-  )
+  );
 }
 
 export function Login(props: {
-  onDone: (success: boolean, mainLoopModel: string) => void
-  startingMessage?: string
+  onDone: (success: boolean, mainLoopModel: string) => void;
+  startingMessage?: string;
 }): React.ReactNode {
-  const mainLoopModel = useMainLoopModel()
+  const mainLoopModel = useMainLoopModel();
 
   return (
     <Dialog
@@ -95,19 +86,11 @@ export function Login(props: {
         exitState.pending ? (
           <Text>Press {exitState.keyName} again to exit</Text>
         ) : (
-          <ConfigurableShortcutHint
-            action="confirm:no"
-            context="Confirmation"
-            fallback="Esc"
-            description="cancel"
-          />
+          <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="cancel" />
         )
       }
     >
-      <ConsoleOAuthFlow
-        onDone={() => props.onDone(true, mainLoopModel)}
-        startingMessage={props.startingMessage}
-      />
+      <ConsoleOAuthFlow onDone={() => props.onDone(true, mainLoopModel)} startingMessage={props.startingMessage} />
     </Dialog>
-  )
+  );
 }
diff --git a/src/commands/logout/logout.tsx b/src/commands/logout/logout.tsx
index 4223feff4..ea9a23f02 100644
--- a/src/commands/logout/logout.tsx
+++ b/src/commands/logout/logout.tsx
@@ -1,89 +1,80 @@
-import * as React from 'react'
-import { clearTrustedDeviceTokenCache } from '../../bridge/trustedDevice.js'
-import { Text } from '@anthropic/ink'
-import { refreshGrowthBookAfterAuthChange } from '../../services/analytics/growthbook.js'
-import {
-  getGroveNoticeConfig,
-  getGroveSettings,
-} from '../../services/api/grove.js'
-import { clearPolicyLimitsCache } from '../../services/policyLimits/index.js'
+import * as React from 'react';
+import { clearTrustedDeviceTokenCache } from '../../bridge/trustedDevice.js';
+import { Text } from '@anthropic/ink';
+import { refreshGrowthBookAfterAuthChange } from '../../services/analytics/growthbook.js';
+import { getGroveNoticeConfig, getGroveSettings } from '../../services/api/grove.js';
+import { clearPolicyLimitsCache } from '../../services/policyLimits/index.js';
 // flushTelemetry is loaded lazily to avoid pulling in ~1.1MB of OpenTelemetry at startup
-import { clearRemoteManagedSettingsCache } from '../../services/remoteManagedSettings/index.js'
-import { getClaudeAIOAuthTokens, removeApiKey } from '../../utils/auth.js'
-import { clearBetasCaches } from '../../utils/betas.js'
-import { saveGlobalConfig } from '../../utils/config.js'
-import { gracefulShutdownSync } from '../../utils/gracefulShutdown.js'
-import { getSecureStorage } from '../../utils/secureStorage/index.js'
-import { clearToolSchemaCache } from '../../utils/toolSchemaCache.js'
-import { resetUserCache } from '../../utils/user.js'
+import { clearRemoteManagedSettingsCache } from '../../services/remoteManagedSettings/index.js';
+import { getClaudeAIOAuthTokens, removeApiKey } from '../../utils/auth.js';
+import { clearBetasCaches } from '../../utils/betas.js';
+import { saveGlobalConfig } from '../../utils/config.js';
+import { gracefulShutdownSync } from '../../utils/gracefulShutdown.js';
+import { getSecureStorage } from '../../utils/secureStorage/index.js';
+import { clearToolSchemaCache } from '../../utils/toolSchemaCache.js';
+import { resetUserCache } from '../../utils/user.js';
 
-export async function performLogout({
-  clearOnboarding = false,
-}): Promise<void> {
+export async function performLogout({ clearOnboarding = false }): Promise<void> {
   // Flush telemetry BEFORE clearing credentials to prevent org data leakage
-  const { flushTelemetry } = await import(
-    '../../utils/telemetry/instrumentation.js'
-  )
-  await flushTelemetry()
+  const { flushTelemetry } = await import('../../utils/telemetry/instrumentation.js');
+  await flushTelemetry();
 
-  await removeApiKey()
+  await removeApiKey();
 
   // Wipe all secure storage data on logout
-  const secureStorage = getSecureStorage()
-  secureStorage.delete()
+  const secureStorage = getSecureStorage();
+  secureStorage.delete();
 
-  await clearAuthRelatedCaches()
+  await clearAuthRelatedCaches();
   saveGlobalConfig(current => {
-    const updated = { ...current }
+    const updated = { ...current };
     if (clearOnboarding) {
-      updated.hasCompletedOnboarding = false
-      updated.subscriptionNoticeCount = 0
-      updated.hasAvailableSubscription = false
+      updated.hasCompletedOnboarding = false;
+      updated.subscriptionNoticeCount = 0;
+      updated.hasAvailableSubscription = false;
       if (updated.customApiKeyResponses?.approved) {
         updated.customApiKeyResponses = {
           ...updated.customApiKeyResponses,
           approved: [],
-        }
+        };
       }
     }
-    updated.oauthAccount = undefined
-    return updated
-  })
+    updated.oauthAccount = undefined;
+    return updated;
+  });
 }
 
 // clearing anything memoized that must be invalidated when user/session/auth changes
 export async function clearAuthRelatedCaches(): Promise<void> {
   // Clear the OAuth token cache
-  getClaudeAIOAuthTokens.cache?.clear?.()
-  clearTrustedDeviceTokenCache()
-  clearBetasCaches()
-  clearToolSchemaCache()
+  getClaudeAIOAuthTokens.cache?.clear?.();
+  clearTrustedDeviceTokenCache();
+  clearBetasCaches();
+  clearToolSchemaCache();
 
   // Clear user data cache BEFORE GrowthBook refresh so it picks up fresh credentials
-  resetUserCache()
-  refreshGrowthBookAfterAuthChange()
+  resetUserCache();
+  refreshGrowthBookAfterAuthChange();
 
   // Clear Grove config cache
-  getGroveNoticeConfig.cache?.clear?.()
-  getGroveSettings.cache?.clear?.()
+  getGroveNoticeConfig.cache?.clear?.();
+  getGroveSettings.cache?.clear?.();
 
   // Clear remotely managed settings cache
-  await clearRemoteManagedSettingsCache()
+  await clearRemoteManagedSettingsCache();
 
   // Clear policy limits cache
-  await clearPolicyLimitsCache()
+  await clearPolicyLimitsCache();
 }
 
 export async function call(): Promise<React.ReactNode> {
-  await performLogout({ clearOnboarding: true })
+  await performLogout({ clearOnboarding: true });
 
-  const message = (
-    <Text>Successfully logged out from your Anthropic account.</Text>
-  )
+  const message = <Text>Successfully logged out from your Anthropic account.</Text>;
 
   setTimeout(() => {
-    gracefulShutdownSync(0, 'logout')
-  }, 200)
+    gracefulShutdownSync(0, 'logout');
+  }, 200);
 
-  return message
+  return message;
 }
diff --git a/src/commands/mcp/mcp.tsx b/src/commands/mcp/mcp.tsx
index 4f32927e9..40838a822 100644
--- a/src/commands/mcp/mcp.tsx
+++ b/src/commands/mcp/mcp.tsx
@@ -1,10 +1,10 @@
-import React, { useEffect, useRef } from 'react'
-import { MCPSettings } from '../../components/mcp/index.js'
-import { MCPReconnect } from '../../components/mcp/MCPReconnect.js'
-import { useMcpToggleEnabled } from '../../services/mcp/MCPConnectionManager.js'
-import { useAppState } from '../../state/AppState.js'
-import type { LocalJSXCommandOnDone } from '../../types/command.js'
-import { PluginSettings } from '../plugin/PluginSettings.js'
+import React, { useEffect, useRef } from 'react';
+import { MCPSettings } from '../../components/mcp/index.js';
+import { MCPReconnect } from '../../components/mcp/MCPReconnect.js';
+import { useMcpToggleEnabled } from '../../services/mcp/MCPConnectionManager.js';
+import { useAppState } from '../../state/AppState.js';
+import type { LocalJSXCommandOnDone } from '../../types/command.js';
+import { PluginSettings } from '../plugin/PluginSettings.js';
 
 // TODO: This is a hack to get the context value from toggleMcpServer (useContext only works in a component)
 // Ideally, all MCP state and functions would be in global state.
@@ -13,93 +13,72 @@ function MCPToggle({
   target,
   onComplete,
 }: {
-  action: 'enable' | 'disable'
-  target: string
-  onComplete: (result: string) => void
+  action: 'enable' | 'disable';
+  target: string;
+  onComplete: (result: string) => void;
 }): null {
-  const mcpClients = useAppState(s => s.mcp.clients)
-  const toggleMcpServer = useMcpToggleEnabled()
-  const didRun = useRef(false)
+  const mcpClients = useAppState(s => s.mcp.clients);
+  const toggleMcpServer = useMcpToggleEnabled();
+  const didRun = useRef(false);
 
   useEffect(() => {
-    if (didRun.current) return
-    didRun.current = true
+    if (didRun.current) return;
+    didRun.current = true;
 
-    const isEnabling = action === 'enable'
-    const clients = mcpClients.filter(c => c.name !== 'ide')
+    const isEnabling = action === 'enable';
+    const clients = mcpClients.filter(c => c.name !== 'ide');
     const toToggle =
       target === 'all'
-        ? clients.filter(c =>
-            isEnabling ? c.type === 'disabled' : c.type !== 'disabled',
-          )
-        : clients.filter(c => c.name === target)
+        ? clients.filter(c => (isEnabling ? c.type === 'disabled' : c.type !== 'disabled'))
+        : clients.filter(c => c.name === target);
 
     if (toToggle.length === 0) {
       onComplete(
         target === 'all'
           ? `All MCP servers are already ${isEnabling ? 'enabled' : 'disabled'}`
           : `MCP server "${target}" not found`,
-      )
-      return
+      );
+      return;
     }
 
     for (const s of toToggle) {
-      void toggleMcpServer(s.name)
+      void toggleMcpServer(s.name);
     }
 
     onComplete(
       target === 'all'
         ? `${isEnabling ? 'Enabled' : 'Disabled'} ${toToggle.length} MCP server(s)`
         : `MCP server "${target}" ${isEnabling ? 'enabled' : 'disabled'}`,
-    )
-  }, [action, target, mcpClients, toggleMcpServer, onComplete])
+    );
+  }, [action, target, mcpClients, toggleMcpServer, onComplete]);
 
-  return null
+  return null;
 }
 
-export async function call(
-  onDone: LocalJSXCommandOnDone,
-  _context: unknown,
-  args?: string,
-): Promise<React.ReactNode> {
+export async function call(onDone: LocalJSXCommandOnDone, _context: unknown, args?: string): Promise<React.ReactNode> {
   if (args) {
-    const parts = args.trim().split(/\s+/)
+    const parts = args.trim().split(/\s+/);
 
     // Allow /mcp no-redirect to bypass the redirect for testing
     if (parts[0] === 'no-redirect') {
-      return <MCPSettings onComplete={onDone} />
+      return <MCPSettings onComplete={onDone} />;
     }
 
     if (parts[0] === 'reconnect' && parts[1]) {
-      return (
-        <MCPReconnect
-          serverName={parts.slice(1).join(' ')}
-          onComplete={onDone}
-        />
-      )
+      return <MCPReconnect serverName={parts.slice(1).join(' ')} onComplete={onDone} />;
     }
 
     if (parts[0] === 'enable' || parts[0] === 'disable') {
       return (
-        <MCPToggle
-          action={parts[0]}
-          target={parts.length > 1 ? parts.slice(1).join(' ') : 'all'}
-          onComplete={onDone}
-        />
-      )
+        <MCPToggle action={parts[0]} target={parts.length > 1 ? parts.slice(1).join(' ') : 'all'} onComplete={onDone} />
+      );
     }
   }
 
   // Redirect base /mcp command to /plugins installed tab for ant users
   if (process.env.USER_TYPE === 'ant') {
-    return (
-      <PluginSettings
-        onComplete={onDone}
-        args="manage"
-        showMcpRedirectMessage
-      />
-    )
+    return <PluginSettings onComplete={onDone} args="manage" showMcpRedirectMessage />;
   }
 
-  return <MCPSettings onComplete={onDone} />
+  return <MCPSettings onComplete={onDone} />;
 }
diff --git a/src/commands/memory/memory.tsx b/src/commands/memory/memory.tsx
index 885ab57dd..3bc4c07b4 100644
--- a/src/commands/memory/memory.tsx
+++ b/src/commands/memory/memory.tsx
@@ -1,86 +1,74 @@
-import { mkdir, writeFile } from 'fs/promises'
-import * as React from 'react'
-import type { CommandResultDisplay } from '../../commands.js'
-import { Dialog } from '@anthropic/ink'
-import { MemoryFileSelector } from '../../components/memory/MemoryFileSelector.js'
-import { getRelativeMemoryPath } from '../../components/memory/MemoryUpdateNotification.js'
-import { Box, Link, Text } from '@anthropic/ink'
-import type { LocalJSXCommandCall } from '../../types/command.js'
-import { clearMemoryFileCaches, getMemoryFiles } from '../../utils/claudemd.js'
-import { getClaudeConfigHomeDir } from '../../utils/envUtils.js'
-import { getErrnoCode } from '../../utils/errors.js'
-import { logError } from '../../utils/log.js'
-import { editFileInEditor } from '../../utils/promptEditor.js'
+import { mkdir, writeFile } from 'fs/promises';
+import * as React from 'react';
+import type { CommandResultDisplay } from '../../commands.js';
+import { Dialog } from '@anthropic/ink';
+import { MemoryFileSelector } from '../../components/memory/MemoryFileSelector.js';
+import { getRelativeMemoryPath } from '../../components/memory/MemoryUpdateNotification.js';
+import { Box, Link, Text } from '@anthropic/ink';
+import type { LocalJSXCommandCall } from '../../types/command.js';
+import { clearMemoryFileCaches, getMemoryFiles } from '../../utils/claudemd.js';
+import { getClaudeConfigHomeDir } from '../../utils/envUtils.js';
+import { getErrnoCode } from '../../utils/errors.js';
+import { logError } from '../../utils/log.js';
+import { editFileInEditor } from '../../utils/promptEditor.js';
 
 function MemoryCommand({
   onDone,
 }: {
-  onDone: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
+  onDone: (result?: string, options?: { display?: CommandResultDisplay }) => void;
 }): React.ReactNode {
   const handleSelectMemoryFile = async (memoryPath: string) => {
     try {
       // Create claude directory if it doesn't exist (idempotent with recursive)
       if (memoryPath.includes(getClaudeConfigHomeDir())) {
-        await mkdir(getClaudeConfigHomeDir(), { recursive: true })
+        await mkdir(getClaudeConfigHomeDir(), { recursive: true });
       }
 
       // Create file if it doesn't exist (wx flag fails if file exists,
       // which we catch to preserve existing content)
       try {
-        await writeFile(memoryPath, '', { encoding: 'utf8', flag: 'wx' })
+        await writeFile(memoryPath, '', { encoding: 'utf8', flag: 'wx' });
       } catch (e: unknown) {
         if (getErrnoCode(e) !== 'EEXIST') {
-          throw e
+          throw e;
         }
       }
 
-      await editFileInEditor(memoryPath)
+      await editFileInEditor(memoryPath);
 
       // Determine which environment variable controls the editor
-      let editorSource = 'default'
-      let editorValue = ''
+      let editorSource = 'default';
+      let editorValue = '';
       if (process.env.VISUAL) {
-        editorSource = '$VISUAL'
-        editorValue = process.env.VISUAL
+        editorSource = '$VISUAL';
+        editorValue = process.env.VISUAL;
       } else if (process.env.EDITOR) {
-        editorSource = '$EDITOR'
-        editorValue = process.env.EDITOR
+        editorSource = '$EDITOR';
+        editorValue = process.env.EDITOR;
       }
 
-      const editorInfo =
-        editorSource !== 'default'
-          ? `Using ${editorSource}="${editorValue}".`
-          : ''
+      const editorInfo = editorSource !== 'default' ? `Using ${editorSource}="${editorValue}".` : '';
 
       const editorHint = editorInfo
         ? `> ${editorInfo} To change editor, set $EDITOR or $VISUAL environment variable.`
-        : `> To use a different editor, set the $EDITOR or $VISUAL environment variable.`
+        : `> To use a different editor, set the $EDITOR or $VISUAL environment variable.`;
 
-      onDone(
-        `Opened memory file at ${getRelativeMemoryPath(memoryPath)}\n\n${editorHint}`,
-        { display: 'system' },
-      )
+      onDone(`Opened memory file at ${getRelativeMemoryPath(memoryPath)}\n\n${editorHint}`, { display: 'system' });
     } catch (error) {
-      logError(error)
-      onDone(`Error opening memory file: ${error}`)
+      logError(error);
+      onDone(`Error opening memory file: ${error}`);
     }
-  }
+  };
 
   const handleCancel = () => {
-    onDone('Cancelled memory editing', { display: 'system' })
-  }
+    onDone('Cancelled memory editing', { display: 'system' });
+  };
 
   return (
     <Dialog title="Memory" onCancel={handleCancel} color="remember">
       <Box flexDirection="column">
         <React.Suspense fallback={null}>
-          <MemoryFileSelector
-            onSelect={handleSelectMemoryFile}
-            onCancel={handleCancel}
-          />
+          <MemoryFileSelector onSelect={handleSelectMemoryFile} onCancel={handleCancel} />
         </React.Suspense>
 
         <Box marginTop={1}>
@@ -90,13 +78,13 @@ function MemoryCommand({
         </Box>
       </Box>
     </Dialog>
-  )
+  );
 }
 
 export const call: LocalJSXCommandCall = async onDone => {
   // Clear + prime before rendering — Suspense handles the unprimed case,
   // but awaiting here avoids a fallback flash on initial open.
-  clearMemoryFileCaches()
-  await getMemoryFiles()
-  return <MemoryCommand onDone={onDone} />
-}
+  clearMemoryFileCaches();
+  await getMemoryFiles();
+  return <MemoryCommand onDone={onDone} />;
+};
diff --git a/src/commands/mobile/mobile.tsx b/src/commands/mobile/mobile.tsx
index 6c1d8f828..bbc588c7a 100644
--- a/src/commands/mobile/mobile.tsx
+++ b/src/commands/mobile/mobile.tsx
@@ -1,16 +1,16 @@
-import { toString as qrToString } from 'qrcode'
-import * as React from 'react'
-import { useCallback, useEffect, useState } from 'react'
-import { Pane } from '@anthropic/ink'
-import { type KeyboardEvent, Box, Text } from '@anthropic/ink'
-import { useKeybinding } from '../../keybindings/useKeybinding.js'
-import type { LocalJSXCommandOnDone } from '../../types/command.js'
+import { toString as qrToString } from 'qrcode';
+import * as React from 'react';
+import { useCallback, useEffect, useState } from 'react';
+import { Pane } from '@anthropic/ink';
+import { type KeyboardEvent, Box, Text } from '@anthropic/ink';
+import { useKeybinding } from '../../keybindings/useKeybinding.js';
+import type { LocalJSXCommandOnDone } from '../../types/command.js';
 
-type Platform = 'ios' | 'android'
+type Platform = 'ios' | 'android';
 
 type Props = {
-  onDone: () => void
-}
+  onDone: () => void;
+};
 
 const PLATFORMS: Record<Platform, { url: string }> = {
   ios: {
@@ -19,17 +19,17 @@ const PLATFORMS: Record<Platform, { url: string }> = {
   android: {
     url: 'https://play.google.com/store/apps/details?id=com.anthropic.claude',
   },
-}
+};
 
 function MobileQRCode({ onDone }: Props): React.ReactNode {
-  const [platform, setPlatform] = useState<Platform>('ios')
+  const [platform, setPlatform] = useState<Platform>('ios');
   const [qrCodes, setQrCodes] = useState<Record<Platform, string>>({
     ios: '',
     android: '',
-  })
+  });
 
-  const { url } = PLATFORMS[platform]
-  const qrCode = qrCodes[platform]
+  const { url } = PLATFORMS[platform];
+  const qrCode = qrCodes[platform];
 
   // Generate both QR codes upfront to avoid flicker when switching
   useEffect(() => {
@@ -43,42 +43,37 @@ function MobileQRCode({ onDone }: Props): React.ReactNode {
           type: 'utf8',
           errorCorrectionLevel: 'L',
         }),
-      ])
-      setQrCodes({ ios, android })
+      ]);
+      setQrCodes({ ios, android });
     }
     generateQRCodes().catch(() => {
       // QR generation failed, leave empty
-    })
-  }, [])
+    });
+  }, []);
 
   const handleClose = useCallback(() => {
-    onDone()
-  }, [onDone])
+    onDone();
+  }, [onDone]);
 
-  useKeybinding('confirm:no', handleClose, { context: 'Confirmation' })
+  useKeybinding('confirm:no', handleClose, { context: 'Confirmation' });
 
   function handleKeyDown(e: KeyboardEvent): void {
     if (e.key === 'q' || (e.ctrl && e.key === 'c')) {
-      e.preventDefault()
-      onDone()
-      return
+      e.preventDefault();
+      onDone();
+      return;
     }
     if (e.key === 'tab' || e.key === 'left' || e.key === 'right') {
-      e.preventDefault()
-      setPlatform(prev => (prev === 'ios' ? 'android' : 'ios'))
+      e.preventDefault();
+      setPlatform(prev => (prev === 'ios' ? 'android' : 'ios'));
     }
   }
 
-  const lines = qrCode.split('\n').filter(line => line.length > 0)
+  const lines = qrCode.split('\n').filter(line => line.length > 0);
 
   return (
     <Pane>
-      <Box
-        flexDirection="column"
-        tabIndex={0}
-        autoFocus
-        onKeyDown={handleKeyDown}
-      >
+      <Box flexDirection="column" tabIndex={0} autoFocus onKeyDown={handleKeyDown}>
         <Text> </Text>
         <Text> </Text>
         {lines.map((line, i) => (
@@ -94,10 +89,7 @@ function MobileQRCode({ onDone }: Props): React.ReactNode {
               iOS
             </Text>
             <Text dimColor>{' / '}</Text>
-            <Text
-              bold={platform === 'android'}
-              underline={platform === 'android'}
-            >
+            <Text bold={platform === 'android'} underline={platform === 'android'}>
               Android
             </Text>
           </Text>
@@ -106,11 +98,9 @@ function MobileQRCode({ onDone }: Props): React.ReactNode {
         <Text dimColor>{url}</Text>
       </Box>
     </Pane>
-  )
+  );
 }
 
-export async function call(
-  onDone: LocalJSXCommandOnDone,
-): Promise<React.ReactNode> {
-  return <MobileQRCode onDone={onDone} />
+export async function call(onDone: LocalJSXCommandOnDone): Promise<React.ReactNode> {
+  return <MobileQRCode onDone={onDone} />;
 }
diff --git a/src/commands/model/model.tsx b/src/commands/model/model.tsx
index f3523305c..5aa2be4c6 100644
--- a/src/commands/model/model.tsx
+++ b/src/commands/model/model.tsx
@@ -1,119 +1,96 @@
-import chalk from 'chalk'
-import * as React from 'react'
-import type { CommandResultDisplay } from '../../commands.js'
-import { ModelPicker } from '../../components/ModelPicker.js'
-import { COMMON_HELP_ARGS, COMMON_INFO_ARGS } from '../../constants/xml.js'
+import chalk from 'chalk';
+import * as React from 'react';
+import type { CommandResultDisplay } from '../../commands.js';
+import { ModelPicker } from '../../components/ModelPicker.js';
+import { COMMON_HELP_ARGS, COMMON_INFO_ARGS } from '../../constants/xml.js';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from '../../services/analytics/index.js'
-import { useAppState, useSetAppState } from '../../state/AppState.js'
-import type { LocalJSXCommandCall } from '../../types/command.js'
-import type { EffortLevel } from '../../utils/effort.js'
-import { isBilledAsExtraUsage } from '../../utils/extraUsage.js'
+} from '../../services/analytics/index.js';
+import { useAppState, useSetAppState } from '../../state/AppState.js';
+import type { LocalJSXCommandCall } from '../../types/command.js';
+import type { EffortLevel } from '../../utils/effort.js';
+import { isBilledAsExtraUsage } from '../../utils/extraUsage.js';
 import {
   clearFastModeCooldown,
   isFastModeAvailable,
   isFastModeEnabled,
   isFastModeSupportedByModel,
-} from '../../utils/fastMode.js'
-import { MODEL_ALIASES } from '../../utils/model/aliases.js'
-import {
-  checkOpus1mAccess,
-  checkSonnet1mAccess,
-} from '../../utils/model/check1mAccess.js'
+} from '../../utils/fastMode.js';
+import { MODEL_ALIASES } from '../../utils/model/aliases.js';
+import { checkOpus1mAccess, checkSonnet1mAccess } from '../../utils/model/check1mAccess.js';
 import {
   getDefaultMainLoopModelSetting,
   isOpus1mMergeEnabled,
   renderDefaultModelSetting,
-} from '../../utils/model/model.js'
-import { isModelAllowed } from '../../utils/model/modelAllowlist.js'
-import { validateModel } from '../../utils/model/validateModel.js'
+} from '../../utils/model/model.js';
+import { isModelAllowed } from '../../utils/model/modelAllowlist.js';
+import { validateModel } from '../../utils/model/validateModel.js';
 
 function ModelPickerWrapper({
   onDone,
 }: {
-  onDone: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
+  onDone: (result?: string, options?: { display?: CommandResultDisplay }) => void;
 }): React.ReactNode {
-  const mainLoopModel = useAppState(s => s.mainLoopModel)
-  const mainLoopModelForSession = useAppState(s => s.mainLoopModelForSession)
-  const isFastMode = useAppState(s => s.fastMode)
-  const setAppState = useSetAppState()
+  const mainLoopModel = useAppState(s => s.mainLoopModel);
+  const mainLoopModelForSession = useAppState(s => s.mainLoopModelForSession);
+  const isFastMode = useAppState(s => s.fastMode);
+  const setAppState = useSetAppState();
 
   function handleCancel(): void {
     logEvent('tengu_model_command_menu', {
-      action:
-        'cancel' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-    })
-    const displayModel = renderModelLabel(mainLoopModel)
+      action: 'cancel' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+    });
+    const displayModel = renderModelLabel(mainLoopModel);
     onDone(`Kept model as ${chalk.bold(displayModel)}`, {
       display: 'system',
-    })
+    });
   }
 
-  function handleSelect(
-    model: string | null,
-    effort: EffortLevel | undefined,
-  ): void {
+  function handleSelect(model: string | null, effort: EffortLevel | undefined): void {
     logEvent('tengu_model_command_menu', {
-      action:
-        model as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      from_model:
-        mainLoopModel as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      to_model:
-        model as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-    })
+      action: model as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      from_model: mainLoopModel as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      to_model: model as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+    });
     setAppState(prev => ({
       ...prev,
       mainLoopModel: model,
       mainLoopModelForSession: null,
-    }))
+    }));
 
-    let message = `Set model to ${chalk.bold(renderModelLabel(model))}`
+    let message = `Set model to ${chalk.bold(renderModelLabel(model))}`;
     if (effort !== undefined) {
-      message += ` with ${chalk.bold(effort)} effort`
+      message += ` with ${chalk.bold(effort)} effort`;
     }
 
     // Turn off fast mode if switching to unsupported model
-    let wasFastModeToggledOn = undefined
+    let wasFastModeToggledOn;
     if (isFastModeEnabled()) {
-      clearFastModeCooldown()
+      clearFastModeCooldown();
       if (!isFastModeSupportedByModel(model) && isFastMode) {
         setAppState(prev => ({
           ...prev,
           fastMode: false,
-        }))
-        wasFastModeToggledOn = false
+        }));
+        wasFastModeToggledOn = false;
         // Do not update fast mode in settings since this is an automatic downgrade
-      } else if (
-        isFastModeSupportedByModel(model) &&
-        isFastModeAvailable() &&
-        isFastMode
-      ) {
-        message += ` · Fast mode ON`
-        wasFastModeToggledOn = true
+      } else if (isFastModeSupportedByModel(model) && isFastModeAvailable() && isFastMode) {
+        message += ` · Fast mode ON`;
+        wasFastModeToggledOn = true;
       }
     }
 
-    if (
-      isBilledAsExtraUsage(
-        model,
-        wasFastModeToggledOn === true,
-        isOpus1mMergeEnabled(),
-      )
-    ) {
-      message += ` · Billed as extra usage`
+    if (isBilledAsExtraUsage(model, wasFastModeToggledOn === true, isOpus1mMergeEnabled())) {
+      message += ` · Billed as extra usage`;
     }
 
     if (wasFastModeToggledOn === false) {
       // Fast mode was toggled off, show suffix after extra usage billing
-      message += ` · Fast mode OFF`
+      message += ` · Fast mode OFF`;
     }
 
-    onDone(message)
+    onDone(message);
   }
 
   return (
@@ -124,37 +101,30 @@ function ModelPickerWrapper({
       onCancel={handleCancel}
       isStandaloneCommand
       showFastModeNotice={
-        isFastModeEnabled() &&
-        isFastMode &&
-        isFastModeSupportedByModel(mainLoopModel) &&
-        isFastModeAvailable()
+        isFastModeEnabled() && isFastMode && isFastModeSupportedByModel(mainLoopModel) && isFastModeAvailable()
       }
     />
-  )
+  );
 }
 
 function SetModelAndClose({
   args,
   onDone,
 }: {
-  args: string
-  onDone: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
+  args: string;
+  onDone: (result?: string, options?: { display?: CommandResultDisplay }) => void;
 }): React.ReactNode {
-  const isFastMode = useAppState(s => s.fastMode)
-  const setAppState = useSetAppState()
-  const model = args === 'default' ? null : args
+  const isFastMode = useAppState(s => s.fastMode);
+  const setAppState = useSetAppState();
+  const model = args === 'default' ? null : args;
 
   React.useEffect(() => {
     async function handleModelChange(): Promise<void> {
       if (model && !isModelAllowed(model)) {
-        onDone(
-          `Model '${model}' is not available. Your organization restricts model selection.`,
-          { display: 'system' },
-        )
-        return
+        onDone(`Model '${model}' is not available. Your organization restricts model selection.`, {
+          display: 'system',
+        });
+        return;
       }
 
       // @[MODEL LAUNCH]: Update check for 1M access.
@@ -162,47 +132,47 @@ function SetModelAndClose({
         onDone(
           `Opus 4.6 with 1M context is not available for your account. Learn more: https://code.claude.com/docs/en/model-config#extended-context-with-1m`,
           { display: 'system' },
-        )
-        return
+        );
+        return;
       }
 
       if (model && isSonnet1mUnavailable(model)) {
         onDone(
           `Sonnet 4.6 with 1M context is not available for your account. Learn more: https://code.claude.com/docs/en/model-config#extended-context-with-1m`,
           { display: 'system' },
-        )
-        return
+        );
+        return;
       }
 
       // Skip validation for default model
       if (!model) {
-        setModel(null)
-        return
+        setModel(null);
+        return;
       }
 
       // Skip validation for known aliases - they're predefined and should work
       if (isKnownAlias(model)) {
-        setModel(model)
-        return
+        setModel(model);
+        return;
       }
 
       // Validate and set custom model
       try {
         // Don't use parseUserSpecifiedModel for non-aliases since it lowercases the input
         // and model names are case-sensitive
-        const { valid, error } = await validateModel(model)
+        const { valid, error } = await validateModel(model);
 
         if (valid) {
-          setModel(model)
+          setModel(model);
         } else {
           onDone(error || `Model '${model}' not found`, {
             display: 'system',
-          })
+          });
         }
       } catch (error) {
         onDone(`Failed to validate model: ${(error as Error).message}`, {
           display: 'system',
-        })
+        });
       }
     }
 
@@ -211,127 +181,103 @@ function SetModelAndClose({
         ...prev,
         mainLoopModel: modelValue,
         mainLoopModelForSession: null,
-      }))
-      let message = `Set model to ${chalk.bold(renderModelLabel(modelValue))}`
+      }));
+      let message = `Set model to ${chalk.bold(renderModelLabel(modelValue))}`;
 
-      let wasFastModeToggledOn = undefined
+      let wasFastModeToggledOn;
       if (isFastModeEnabled()) {
-        clearFastModeCooldown()
+        clearFastModeCooldown();
         if (!isFastModeSupportedByModel(modelValue) && isFastMode) {
           setAppState(prev => ({
             ...prev,
             fastMode: false,
-          }))
-          wasFastModeToggledOn = false
+          }));
+          wasFastModeToggledOn = false;
           // Do not update fast mode in settings since this is an automatic downgrade
         } else if (isFastModeSupportedByModel(modelValue) && isFastMode) {
-          message += ` · Fast mode ON`
-          wasFastModeToggledOn = true
+          message += ` · Fast mode ON`;
+          wasFastModeToggledOn = true;
         }
       }
 
-      if (
-        isBilledAsExtraUsage(
-          modelValue,
-          wasFastModeToggledOn === true,
-          isOpus1mMergeEnabled(),
-        )
-      ) {
-        message += ` · Billed as extra usage`
+      if (isBilledAsExtraUsage(modelValue, wasFastModeToggledOn === true, isOpus1mMergeEnabled())) {
+        message += ` · Billed as extra usage`;
       }
 
       if (wasFastModeToggledOn === false) {
         // Fast mode was toggled off, show suffix after extra usage billing
-        message += ` · Fast mode OFF`
+        message += ` · Fast mode OFF`;
       }
 
-      onDone(message)
+      onDone(message);
     }
 
-    void handleModelChange()
-  }, [model, onDone, setAppState])
+    void handleModelChange();
+  }, [model, onDone, setAppState]);
 
-  return null
+  return null;
 }
 
 function isKnownAlias(model: string): boolean {
-  return (MODEL_ALIASES as readonly string[]).includes(
-    model.toLowerCase().trim(),
-  )
+  return (MODEL_ALIASES as readonly string[]).includes(model.toLowerCase().trim());
 }
 
 function isOpus1mUnavailable(model: string): boolean {
-  const m = model.toLowerCase()
-  return (
-    !checkOpus1mAccess() &&
-    !isOpus1mMergeEnabled() &&
-    m.includes('opus') &&
-    m.includes('[1m]')
-  )
+  const m = model.toLowerCase();
+  return !checkOpus1mAccess() && !isOpus1mMergeEnabled() && m.includes('opus') && m.includes('[1m]');
 }
 
 function isSonnet1mUnavailable(model: string): boolean {
-  const m = model.toLowerCase()
+  const m = model.toLowerCase();
   // Warn about Sonnet and Sonnet 4.6, but not Sonnet 4.5 since that had
   // a different access criteria.
-  return (
-    !checkSonnet1mAccess() &&
-    (m.includes('sonnet[1m]') || m.includes('sonnet-4-6[1m]'))
-  )
+  return !checkSonnet1mAccess() && (m.includes('sonnet[1m]') || m.includes('sonnet-4-6[1m]'));
 }
 
-function ShowModelAndClose({
-  onDone,
-}: {
-  onDone: (result?: string) => void
-}): React.ReactNode {
-  const mainLoopModel = useAppState(s => s.mainLoopModel)
-  const mainLoopModelForSession = useAppState(s => s.mainLoopModelForSession)
-  const effortValue = useAppState(s => s.effortValue)
-  const displayModel = renderModelLabel(mainLoopModel)
-  const effortInfo =
-    effortValue !== undefined ? ` (effort: ${effortValue})` : ''
+function ShowModelAndClose({ onDone }: { onDone: (result?: string) => void }): React.ReactNode {
+  const mainLoopModel = useAppState(s => s.mainLoopModel);
+  const mainLoopModelForSession = useAppState(s => s.mainLoopModelForSession);
+  const effortValue = useAppState(s => s.effortValue);
+  const displayModel = renderModelLabel(mainLoopModel);
+  const effortInfo = effortValue !== undefined ? ` (effort: ${effortValue})` : '';
 
   if (mainLoopModelForSession) {
     onDone(
       `Current model: ${chalk.bold(renderModelLabel(mainLoopModelForSession))} (session override from plan mode)\nBase model: ${displayModel}${effortInfo}`,
-    )
+    );
   } else {
-    onDone(`Current model: ${displayModel}${effortInfo}`)
+    onDone(`Current model: ${displayModel}${effortInfo}`);
   }
 
-  return null
+  return null;
 }
 
 export const call: LocalJSXCommandCall = async (onDone, _context, args) => {
-  args = args?.trim() || ''
+  args = args?.trim() || '';
   if (COMMON_INFO_ARGS.includes(args)) {
     logEvent('tengu_model_command_inline_help', {
       args: args as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-    })
-    return <ShowModelAndClose onDone={onDone} />
+    });
+    return <ShowModelAndClose onDone={onDone} />;
   }
   if (COMMON_HELP_ARGS.includes(args)) {
-    onDone(
-      'Run /model to open the model selection menu, or /model [modelName] to set the model.',
-      { display: 'system' },
-    )
-    return
+    onDone('Run /model to open the model selection menu, or /model [modelName] to set the model.', {
+      display: 'system',
+    });
+    return;
   }
 
   if (args) {
     logEvent('tengu_model_command_inline', {
       args: args as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-    })
-    return <SetModelAndClose args={args} onDone={onDone} />
+    });
+    return <SetModelAndClose args={args} onDone={onDone} />;
   }
 
-  return <ModelPickerWrapper onDone={onDone} />
-}
+  return <ModelPickerWrapper onDone={onDone} />;
+};
 
 function renderModelLabel(model: string | null): string {
-  const rendered = renderDefaultModelSetting(
-    model ?? getDefaultMainLoopModelSetting(),
-  )
-  return model === null ? `${rendered} (default)` : rendered
+  const rendered = renderDefaultModelSetting(model ?? getDefaultMainLoopModelSetting());
+  return model === null ? `${rendered} (default)` : rendered;
 }
diff --git a/src/commands/output-style/output-style.tsx b/src/commands/output-style/output-style.tsx
index c445658a4..13062ea95 100644
--- a/src/commands/output-style/output-style.tsx
+++ b/src/commands/output-style/output-style.tsx
@@ -1,8 +1,8 @@
-import type { LocalJSXCommandOnDone } from '../../types/command.js'
+import type { LocalJSXCommandOnDone } from '../../types/command.js';
 
 export async function call(onDone: LocalJSXCommandOnDone): Promise<undefined> {
   onDone(
     '/output-style has been deprecated. Use /config to change your output style, or set it in your settings file. Changes take effect on the next session.',
     { display: 'system' },
-  )
+  );
 }
diff --git a/src/commands/passes/passes.tsx b/src/commands/passes/passes.tsx
index bf0363560..360ebe68d 100644
--- a/src/commands/passes/passes.tsx
+++ b/src/commands/passes/passes.tsx
@@ -1,24 +1,22 @@
-import * as React from 'react'
-import { Passes } from '../../components/Passes/Passes.js'
-import { logEvent } from '../../services/analytics/index.js'
-import { getCachedRemainingPasses } from '../../services/api/referral.js'
-import type { LocalJSXCommandOnDone } from '../../types/command.js'
-import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js'
+import * as React from 'react';
+import { Passes } from '../../components/Passes/Passes.js';
+import { logEvent } from '../../services/analytics/index.js';
+import { getCachedRemainingPasses } from '../../services/api/referral.js';
+import type { LocalJSXCommandOnDone } from '../../types/command.js';
+import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js';
 
-export async function call(
-  onDone: LocalJSXCommandOnDone,
-): Promise<React.ReactNode> {
+export async function call(onDone: LocalJSXCommandOnDone): Promise<React.ReactNode> {
   // Mark that user has visited /passes so we stop showing the upsell
-  const config = getGlobalConfig()
-  const isFirstVisit = !config.hasVisitedPasses
+  const config = getGlobalConfig();
+  const isFirstVisit = !config.hasVisitedPasses;
   if (isFirstVisit) {
-    const remaining = getCachedRemainingPasses()
+    const remaining = getCachedRemainingPasses();
     saveGlobalConfig(current => ({
       ...current,
       hasVisitedPasses: true,
       passesLastSeenRemaining: remaining ?? current.passesLastSeenRemaining,
-    }))
+    }));
   }
-  logEvent('tengu_guest_passes_visited', { is_first_visit: isFirstVisit })
-  return <Passes onDone={onDone} />
+  logEvent('tengu_guest_passes_visited', { is_first_visit: isFirstVisit });
+  return <Passes onDone={onDone} />;
 }
diff --git a/src/commands/peers/peers.ts b/src/commands/peers/peers.ts
index aed37d327..40ac86c5c 100644
--- a/src/commands/peers/peers.ts
+++ b/src/commands/peers/peers.ts
@@ -29,9 +29,7 @@ export const call: LocalCommandCall = async (_args, _context) => {
         ? `  started: ${formatAge(peer.startedAt)}`
         : ''
 
-      lines.push(
-        `  [${status}] PID ${peer.pid} (${label})${cwd}${age}`,
-      )
+      lines.push(`  [${status}] PID ${peer.pid} (${label})${cwd}${age}`)
       if (peer.messagingSocketPath) {
         lines.push(`           socket: ${peer.messagingSocketPath}`)
       }
@@ -42,9 +40,7 @@ export const call: LocalCommandCall = async (_args, _context) => {
   }
 
   lines.push('')
-  lines.push(
-    'To message a peer: use SendMessage with to="uds:<socket-path>"',
-  )
+  lines.push('To message a peer: use SendMessage with to="uds:<socket-path>"')
 
   return { type: 'text', value: lines.join('\n') }
 }
diff --git a/src/commands/permissions/permissions.tsx b/src/commands/permissions/permissions.tsx
index f88dcd93c..83676488a 100644
--- a/src/commands/permissions/permissions.tsx
+++ b/src/commands/permissions/permissions.tsx
@@ -1,18 +1,15 @@
-import * as React from 'react'
-import { PermissionRuleList } from '../../components/permissions/rules/PermissionRuleList.js'
-import type { LocalJSXCommandCall } from '../../types/command.js'
-import { createPermissionRetryMessage } from '../../utils/messages.js'
+import * as React from 'react';
+import { PermissionRuleList } from '../../components/permissions/rules/PermissionRuleList.js';
+import type { LocalJSXCommandCall } from '../../types/command.js';
+import { createPermissionRetryMessage } from '../../utils/messages.js';
 
 export const call: LocalJSXCommandCall = async (onDone, context) => {
   return (
     <PermissionRuleList
       onExit={onDone}
       onRetryDenials={commands => {
-        context.setMessages(prev => [
-          ...prev,
-          createPermissionRetryMessage(commands),
-        ])
+        context.setMessages(prev => [...prev, createPermissionRetryMessage(commands)]);
       }}
     />
-  )
-}
+  );
+};
diff --git a/src/commands/plan/plan.tsx b/src/commands/plan/plan.tsx
index d7694182c..475cb4ef6 100644
--- a/src/commands/plan/plan.tsx
+++ b/src/commands/plan/plan.tsx
@@ -1,24 +1,24 @@
-import * as React from 'react'
-import { handlePlanModeTransition } from '../../bootstrap/state.js'
-import type { LocalJSXCommandContext } from '../../commands.js'
-import { Box, Text } from '@anthropic/ink'
-import type { LocalJSXCommandOnDone } from '../../types/command.js'
-import { getExternalEditor } from '../../utils/editor.js'
-import { toIDEDisplayName } from '../../utils/ide.js'
-import { applyPermissionUpdate } from '../../utils/permissions/PermissionUpdate.js'
-import { prepareContextForPlanMode } from '../../utils/permissions/permissionSetup.js'
-import { getPlan, getPlanFilePath } from '../../utils/plans.js'
-import { editFileInEditor } from '../../utils/promptEditor.js'
-import { renderToString } from '../../utils/staticRender.js'
+import * as React from 'react';
+import { handlePlanModeTransition } from '../../bootstrap/state.js';
+import type { LocalJSXCommandContext } from '../../commands.js';
+import { Box, Text } from '@anthropic/ink';
+import type { LocalJSXCommandOnDone } from '../../types/command.js';
+import { getExternalEditor } from '../../utils/editor.js';
+import { toIDEDisplayName } from '../../utils/ide.js';
+import { applyPermissionUpdate } from '../../utils/permissions/PermissionUpdate.js';
+import { prepareContextForPlanMode } from '../../utils/permissions/permissionSetup.js';
+import { getPlan, getPlanFilePath } from '../../utils/plans.js';
+import { editFileInEditor } from '../../utils/promptEditor.js';
+import { renderToString } from '../../utils/staticRender.js';
 
 function PlanDisplay({
   planContent,
   planPath,
   editorName,
 }: {
-  planContent: string
-  planPath: string
-  editorName: string | undefined
+  planContent: string;
+  planPath: string;
+  editorName: string | undefined;
 }): React.ReactNode {
   return (
     <Box flexDirection="column">
@@ -37,7 +37,7 @@ function PlanDisplay({
         </Box>
       )}
     </Box>
-  )
+  );
 }
 
 export async function call(
@@ -45,63 +45,58 @@ export async function call(
   context: LocalJSXCommandContext,
   args: string,
 ): Promise<React.ReactNode> {
-  const { getAppState, setAppState } = context
-  const appState = getAppState()
-  const currentMode = appState.toolPermissionContext.mode
+  const { getAppState, setAppState } = context;
+  const appState = getAppState();
+  const currentMode = appState.toolPermissionContext.mode;
 
   // If not in plan mode, enable it
   if (currentMode !== 'plan') {
-    handlePlanModeTransition(currentMode, 'plan')
+    handlePlanModeTransition(currentMode, 'plan');
     setAppState(prev => ({
       ...prev,
-      toolPermissionContext: applyPermissionUpdate(
-        prepareContextForPlanMode(prev.toolPermissionContext),
-        { type: 'setMode', mode: 'plan', destination: 'session' },
-      ),
-    }))
-    const description = args.trim()
+      toolPermissionContext: applyPermissionUpdate(prepareContextForPlanMode(prev.toolPermissionContext), {
+        type: 'setMode',
+        mode: 'plan',
+        destination: 'session',
+      }),
+    }));
+    const description = args.trim();
     if (description && description !== 'open') {
-      onDone('Enabled plan mode', { shouldQuery: true })
+      onDone('Enabled plan mode', { shouldQuery: true });
     } else {
-      onDone('Enabled plan mode')
+      onDone('Enabled plan mode');
     }
-    return null
+    return null;
   }
 
   // Already in plan mode - show the current plan
-  const planContent = getPlan()
-  const planPath = getPlanFilePath()
+  const planContent = getPlan();
+  const planPath = getPlanFilePath();
 
   if (!planContent) {
-    onDone('Already in plan mode. No plan written yet.')
-    return null
+    onDone('Already in plan mode. No plan written yet.');
+    return null;
   }
 
   // If user typed "/plan open", open in editor
-  const argList = args.trim().split(/\s+/)
+  const argList = args.trim().split(/\s+/);
   if (argList[0] === 'open') {
-    const result = await editFileInEditor(planPath)
+    const result = await editFileInEditor(planPath);
     if (result.error) {
-      onDone(`Failed to open plan in editor: ${result.error}`)
+      onDone(`Failed to open plan in editor: ${result.error}`);
     } else {
-      onDone(`Opened plan in editor: ${planPath}`)
+      onDone(`Opened plan in editor: ${planPath}`);
     }
-    return null
+    return null;
   }
 
-  const editor = getExternalEditor()
-  const editorName = editor ? toIDEDisplayName(editor) : undefined
+  const editor = getExternalEditor();
+  const editorName = editor ? toIDEDisplayName(editor) : undefined;
 
-  const display = (
-    <PlanDisplay
-      planContent={planContent}
-      planPath={planPath}
-      editorName={editorName}
-    />
-  )
+  const display = <PlanDisplay planContent={planContent} planPath={planPath} editorName={editorName} />;
 
   // Render to string and pass to onDone like local commands do
-  const output = await renderToString(display)
-  onDone(output)
-  return null
+  const output = await renderToString(display);
+  onDone(output);
+  return null;
 }
diff --git a/src/commands/plugin/AddMarketplace.tsx b/src/commands/plugin/AddMarketplace.tsx
index 7a9138333..35964f5a4 100644
--- a/src/commands/plugin/AddMarketplace.tsx
+++ b/src/commands/plugin/AddMarketplace.tsx
@@ -1,37 +1,34 @@
-import * as React from 'react'
-import { useEffect, useRef, useState } from 'react'
+import * as React from 'react';
+import { useEffect, useRef, useState } from 'react';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from 'src/services/analytics/index.js'
-import { ConfigurableShortcutHint } from '../../components/ConfigurableShortcutHint.js'
-import { Byline, KeyboardShortcutHint } from '@anthropic/ink'
-import { Spinner } from '../../components/Spinner.js'
-import TextInput from '../../components/TextInput.js'
-import { Box, Text } from '@anthropic/ink'
-import { toError } from '../../utils/errors.js'
-import { logError } from '../../utils/log.js'
-import { clearAllCaches } from '../../utils/plugins/cacheUtils.js'
-import {
-  addMarketplaceSource,
-  saveMarketplaceToSettings,
-} from '../../utils/plugins/marketplaceManager.js'
-import { parseMarketplaceInput } from '../../utils/plugins/parseMarketplaceInput.js'
-import type { ViewState } from './types.js'
+} from 'src/services/analytics/index.js';
+import { ConfigurableShortcutHint } from '../../components/ConfigurableShortcutHint.js';
+import { Byline, KeyboardShortcutHint } from '@anthropic/ink';
+import { Spinner } from '../../components/Spinner.js';
+import TextInput from '../../components/TextInput.js';
+import { Box, Text } from '@anthropic/ink';
+import { toError } from '../../utils/errors.js';
+import { logError } from '../../utils/log.js';
+import { clearAllCaches } from '../../utils/plugins/cacheUtils.js';
+import { addMarketplaceSource, saveMarketplaceToSettings } from '../../utils/plugins/marketplaceManager.js';
+import { parseMarketplaceInput } from '../../utils/plugins/parseMarketplaceInput.js';
+import type { ViewState } from './types.js';
 
 type Props = {
-  inputValue: string
-  setInputValue: (value: string) => void
-  cursorOffset: number
-  setCursorOffset: (offset: number) => void
-  error: string | null
-  setError: (error: string | null) => void
-  result: string | null
-  setResult: (result: string | null) => void
-  setViewState: (state: ViewState) => void
-  onAddComplete?: () => void | Promise<void>
-  cliMode?: boolean
-}
+  inputValue: string;
+  setInputValue: (value: string) => void;
+  cursorOffset: number;
+  setCursorOffset: (offset: number) => void;
+  error: string | null;
+  setError: (error: string | null) => void;
+  result: string | null;
+  setResult: (result: string | null) => void;
+  setViewState: (state: ViewState) => void;
+  onAddComplete?: () => void | Promise<void>;
+  cliMode?: boolean;
+};
 
 export function AddMarketplace({
   inputValue,
@@ -46,95 +43,87 @@ export function AddMarketplace({
   onAddComplete,
   cliMode = false,
 }: Props): React.ReactNode {
-  const hasAttemptedAutoAdd = useRef(false)
-  const [isLoading, setLoading] = useState(false)
-  const [progressMessage, setProgressMessage] = useState<string>('')
+  const hasAttemptedAutoAdd = useRef(false);
+  const [isLoading, setLoading] = useState(false);
+  const [progressMessage, setProgressMessage] = useState<string>('');
 
   const handleAdd = async () => {
-    const input = inputValue.trim()
+    const input = inputValue.trim();
     if (!input) {
-      setError('Please enter a marketplace source')
-      return
+      setError('Please enter a marketplace source');
+      return;
     }
 
-    const parsed = await parseMarketplaceInput(input)
+    const parsed = await parseMarketplaceInput(input);
     if (!parsed) {
-      setError(
-        'Invalid marketplace source format. Try: owner/repo, https://..., or ./path',
-      )
-      return
+      setError('Invalid marketplace source format. Try: owner/repo, https://..., or ./path');
+      return;
     }
 
     // Check if parseMarketplaceInput returned an error
     if ('error' in parsed) {
-      setError(parsed.error)
-      return
+      setError(parsed.error);
+      return;
     }
 
-    setError(null)
+    setError(null);
 
     try {
-      setLoading(true)
-      setProgressMessage('')
-      const { name, resolvedSource } = await addMarketplaceSource(
-        parsed,
-        message => {
-          setProgressMessage(message)
-        },
-      )
-      saveMarketplaceToSettings(name, { source: resolvedSource })
-      clearAllCaches()
+      setLoading(true);
+      setProgressMessage('');
+      const { name, resolvedSource } = await addMarketplaceSource(parsed, message => {
+        setProgressMessage(message);
+      });
+      saveMarketplaceToSettings(name, { source: resolvedSource });
+      clearAllCaches();
 
-      let sourceType = parsed.source
+      let sourceType = parsed.source;
       if (parsed.source === 'github') {
-        sourceType =
-          parsed.repo as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS
+        sourceType = parsed.repo as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS;
       }
 
       logEvent('tengu_marketplace_added', {
-        source_type:
-          sourceType as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
+        source_type: sourceType as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
 
       if (onAddComplete) {
-        await onAddComplete()
+        await onAddComplete();
       }
 
-      setProgressMessage('')
-      setLoading(false)
+      setProgressMessage('');
+      setLoading(false);
 
       if (cliMode) {
         // In CLI mode, set result to trigger completion
-        setResult(`Successfully added marketplace: ${name}`)
+        setResult(`Successfully added marketplace: ${name}`);
       } else {
         // In interactive mode, switch to browse view
-        setViewState({ type: 'browse-marketplace', targetMarketplace: name })
+        setViewState({ type: 'browse-marketplace', targetMarketplace: name });
       }
     } catch (err) {
-      const error = toError(err)
-      logError(error)
-      setError(error.message)
-      setProgressMessage('')
-      setLoading(false)
+      const error = toError(err);
+      logError(error);
+      setError(error.message);
+      setProgressMessage('');
+      setLoading(false);
 
       if (cliMode) {
         // In CLI mode, set result with error to trigger completion
-        setResult(`Error: ${error.message}`)
+        setResult(`Error: ${error.message}`);
       } else {
-        setResult(null)
+        setResult(null);
       }
     }
-  }
+  };
 
   // Auto-add if inputValue is provided
   useEffect(() => {
     if (inputValue && !hasAttemptedAutoAdd.current && !error && !result) {
-      hasAttemptedAutoAdd.current = true
-      void handleAdd()
+      hasAttemptedAutoAdd.current = true;
+      void handleAdd();
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    // biome-ignore lint/correctness/useExhaustiveDependencies: intentional
-  }, []) // Only run once on mount
+  }, []); // Only run once on mount
 
   return (
     <Box flexDirection="column">
@@ -165,9 +154,7 @@ export function AddMarketplace({
         {isLoading && (
           <Box marginTop={1}>
             <Spinner />
-            <Text>
-              {progressMessage || 'Adding marketplace to configuration…'}
-            </Text>
+            <Text>{progressMessage || 'Adding marketplace to configuration…'}</Text>
           </Box>
         )}
         {error && (
@@ -185,15 +172,10 @@ export function AddMarketplace({
         <Text dimColor italic>
           <Byline>
             <KeyboardShortcutHint shortcut="Enter" action="add" />
-            <ConfigurableShortcutHint
-              action="confirm:no"
-              context="Settings"
-              fallback="Esc"
-              description="cancel"
-            />
+            <ConfigurableShortcutHint action="confirm:no" context="Settings" fallback="Esc" description="cancel" />
           </Byline>
         </Text>
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/commands/plugin/BrowseMarketplace.tsx b/src/commands/plugin/BrowseMarketplace.tsx
index 0f1653538..1aaf84e39 100644
--- a/src/commands/plugin/BrowseMarketplace.tsx
+++ b/src/commands/plugin/BrowseMarketplace.tsx
@@ -1,79 +1,64 @@
-import figures from 'figures'
-import * as React from 'react'
-import { useEffect, useState } from 'react'
-import { ConfigurableShortcutHint } from '../../components/ConfigurableShortcutHint.js'
-import { Box, Byline, Text } from '@anthropic/ink'
-import {
-  useKeybinding,
-  useKeybindings,
-} from '../../keybindings/useKeybinding.js'
-import type { LoadedPlugin } from '../../types/plugin.js'
-import { count } from '../../utils/array.js'
-import { openBrowser } from '../../utils/browser.js'
-import { logForDebugging } from '../../utils/debug.js'
-import { errorMessage } from '../../utils/errors.js'
-import { clearAllCaches } from '../../utils/plugins/cacheUtils.js'
-import {
-  formatInstallCount,
-  getInstallCounts,
-} from '../../utils/plugins/installCounts.js'
-import {
-  isPluginGloballyInstalled,
-  isPluginInstalled,
-} from '../../utils/plugins/installedPluginsManager.js'
+import figures from 'figures';
+import * as React from 'react';
+import { useEffect, useState } from 'react';
+import { ConfigurableShortcutHint } from '../../components/ConfigurableShortcutHint.js';
+import { Box, Byline, Text } from '@anthropic/ink';
+import { useKeybinding, useKeybindings } from '../../keybindings/useKeybinding.js';
+import type { LoadedPlugin } from '../../types/plugin.js';
+import { count } from '../../utils/array.js';
+import { openBrowser } from '../../utils/browser.js';
+import { logForDebugging } from '../../utils/debug.js';
+import { errorMessage } from '../../utils/errors.js';
+import { clearAllCaches } from '../../utils/plugins/cacheUtils.js';
+import { formatInstallCount, getInstallCounts } from '../../utils/plugins/installCounts.js';
+import { isPluginGloballyInstalled, isPluginInstalled } from '../../utils/plugins/installedPluginsManager.js';
 import {
   createPluginId,
   formatFailureDetails,
   formatMarketplaceLoadingErrors,
   getMarketplaceSourceDisplay,
   loadMarketplacesWithGracefulDegradation,
-} from '../../utils/plugins/marketplaceHelpers.js'
-import {
-  getMarketplace,
-  loadKnownMarketplacesConfig,
-} from '../../utils/plugins/marketplaceManager.js'
-import { OFFICIAL_MARKETPLACE_NAME } from '../../utils/plugins/officialMarketplace.js'
-import { installPluginFromMarketplace } from '../../utils/plugins/pluginInstallationHelpers.js'
-import { isPluginBlockedByPolicy } from '../../utils/plugins/pluginPolicy.js'
-import { plural } from '../../utils/stringUtils.js'
-import { truncateToWidth } from '../../utils/truncate.js'
-import {
-  findPluginOptionsTarget,
-  PluginOptionsFlow,
-} from './PluginOptionsFlow.js'
-import { PluginTrustWarning } from './PluginTrustWarning.js'
+} from '../../utils/plugins/marketplaceHelpers.js';
+import { getMarketplace, loadKnownMarketplacesConfig } from '../../utils/plugins/marketplaceManager.js';
+import { OFFICIAL_MARKETPLACE_NAME } from '../../utils/plugins/officialMarketplace.js';
+import { installPluginFromMarketplace } from '../../utils/plugins/pluginInstallationHelpers.js';
+import { isPluginBlockedByPolicy } from '../../utils/plugins/pluginPolicy.js';
+import { plural } from '../../utils/stringUtils.js';
+import { truncateToWidth } from '../../utils/truncate.js';
+import { findPluginOptionsTarget, PluginOptionsFlow } from './PluginOptionsFlow.js';
+import { PluginTrustWarning } from './PluginTrustWarning.js';
 import {
   buildPluginDetailsMenuOptions,
   extractGitHubRepo,
   type InstallablePlugin,
   PluginSelectionKeyHint,
-} from './pluginDetailsHelpers.js'
-import type { ViewState as ParentViewState } from './types.js'
-import { usePagination } from './usePagination.js'
+} from './pluginDetailsHelpers.js';
+import type { ViewState as ParentViewState } from './types.js';
+import { usePagination } from './usePagination.js';
 
 type Props = {
-  error: string | null
-  setError: (error: string | null) => void
-  result: string | null
-  setResult: (result: string | null) => void
-  setViewState: (state: ParentViewState) => void
-  onInstallComplete?: () => void | Promise<void>
-  targetMarketplace?: string
-  targetPlugin?: string
-}
+  error: string | null;
+  setError: (error: string | null) => void;
+  result: string | null;
+  setResult: (result: string | null) => void;
+  setViewState: (state: ParentViewState) => void;
+  onInstallComplete?: () => void | Promise<void>;
+  targetMarketplace?: string;
+  targetPlugin?: string;
+};
 
 type ViewState =
   | 'marketplace-list'
   | 'plugin-list'
   | 'plugin-details'
-  | { type: 'plugin-options'; plugin: LoadedPlugin; pluginId: string }
+  | { type: 'plugin-options'; plugin: LoadedPlugin; pluginId: string };
 
 type MarketplaceInfo = {
-  name: string
-  totalPlugins: number
-  installedCount: number
-  source?: string
-}
+  name: string;
+  totalPlugins: number;
+  installedCount: number;
+  source?: string;
+};
 
 export function BrowseMarketplace({
   error,
@@ -86,46 +71,34 @@ export function BrowseMarketplace({
   targetPlugin,
 }: Props): React.ReactNode {
   // View state
-  const [viewState, setViewState] = useState<ViewState>('marketplace-list')
-  const [selectedMarketplace, setSelectedMarketplace] = useState<string | null>(
-    null,
-  )
-  const [selectedPlugin, setSelectedPlugin] =
-    useState<InstallablePlugin | null>(null)
+  const [viewState, setViewState] = useState<ViewState>('marketplace-list');
+  const [selectedMarketplace, setSelectedMarketplace] = useState<string | null>(null);
+  const [selectedPlugin, setSelectedPlugin] = useState<InstallablePlugin | null>(null);
 
   // Data state
-  const [marketplaces, setMarketplaces] = useState<MarketplaceInfo[]>([])
-  const [availablePlugins, setAvailablePlugins] = useState<InstallablePlugin[]>(
-    [],
-  )
-  const [loading, setLoading] = useState(true)
-  const [installCounts, setInstallCounts] = useState<Map<
-    string,
-    number
-  > | null>(null)
+  const [marketplaces, setMarketplaces] = useState<MarketplaceInfo[]>([]);
+  const [availablePlugins, setAvailablePlugins] = useState<InstallablePlugin[]>([]);
+  const [loading, setLoading] = useState(true);
+  const [installCounts, setInstallCounts] = useState<Map<string, number> | null>(null);
 
   // Selection state
-  const [selectedIndex, setSelectedIndex] = useState(0)
-  const [selectedForInstall, setSelectedForInstall] = useState<Set<string>>(
-    new Set(),
-  )
-  const [installingPlugins, setInstallingPlugins] = useState<Set<string>>(
-    new Set(),
-  )
+  const [selectedIndex, setSelectedIndex] = useState(0);
+  const [selectedForInstall, setSelectedForInstall] = useState<Set<string>>(new Set());
+  const [installingPlugins, setInstallingPlugins] = useState<Set<string>>(new Set());
 
   // Pagination for plugin list (continuous scrolling)
   const pagination = usePagination<InstallablePlugin>({
     totalItems: availablePlugins.length,
     selectedIndex,
-  })
+  });
 
   // Details view state
-  const [detailsMenuIndex, setDetailsMenuIndex] = useState(0)
-  const [isInstalling, setIsInstalling] = useState(false)
-  const [installError, setInstallError] = useState<string | null>(null)
+  const [detailsMenuIndex, setDetailsMenuIndex] = useState(0);
+  const [isInstalling, setIsInstalling] = useState(false);
+  const [installError, setInstallError] = useState<string | null>(null);
 
   // Warning state for non-critical errors (e.g., some marketplaces failed to load)
-  const [warning, setWarning] = useState<string | null>(null)
+  const [warning, setWarning] = useState<string | null>(null);
 
   // Handle escape to go back - viewState-dependent navigation
   const handleBack = React.useCallback(() => {
@@ -136,111 +109,94 @@ export function BrowseMarketplace({
         setParentViewState({
           type: 'manage-marketplaces',
           targetMarketplace,
-        })
+        });
       } else if (marketplaces.length === 1) {
         // If there's only one marketplace, skip the marketplace-list view
         // since we auto-navigated past it on load
-        setParentViewState({ type: 'menu' })
+        setParentViewState({ type: 'menu' });
       } else {
-        setViewState('marketplace-list')
-        setSelectedMarketplace(null)
-        setSelectedForInstall(new Set())
+        setViewState('marketplace-list');
+        setSelectedMarketplace(null);
+        setSelectedForInstall(new Set());
       }
     } else if (viewState === 'plugin-details') {
-      setViewState('plugin-list')
-      setSelectedPlugin(null)
+      setViewState('plugin-list');
+      setSelectedPlugin(null);
     } else {
       // At root level (marketplace-list), exit the plugin menu
-      setParentViewState({ type: 'menu' })
+      setParentViewState({ type: 'menu' });
     }
-  }, [viewState, targetMarketplace, setParentViewState, marketplaces.length])
+  }, [viewState, targetMarketplace, setParentViewState, marketplaces.length]);
 
-  useKeybinding('confirm:no', handleBack, { context: 'Confirmation' })
+  useKeybinding('confirm:no', handleBack, { context: 'Confirmation' });
 
   // Load marketplaces and count installed plugins
   useEffect(() => {
     async function loadMarketplaceData() {
       try {
-        const config = await loadKnownMarketplacesConfig()
+        const config = await loadKnownMarketplacesConfig();
 
         // Load marketplaces with graceful degradation
-        const { marketplaces, failures } =
-          await loadMarketplacesWithGracefulDegradation(config)
+        const { marketplaces, failures } = await loadMarketplacesWithGracefulDegradation(config);
 
-        const marketplaceInfos: MarketplaceInfo[] = []
-        for (const {
-          name,
-          config: marketplaceConfig,
-          data: marketplace,
-        } of marketplaces) {
+        const marketplaceInfos: MarketplaceInfo[] = [];
+        for (const { name, config: marketplaceConfig, data: marketplace } of marketplaces) {
           if (marketplace) {
             // Count how many plugins from this marketplace are installed
-            const installedFromThisMarketplace = count(
-              marketplace.plugins,
-              plugin => isPluginInstalled(createPluginId((plugin as { name: string }).name, name)),
-            )
+            const installedFromThisMarketplace = count(marketplace.plugins, plugin =>
+              isPluginInstalled(createPluginId((plugin as { name: string }).name, name)),
+            );
 
             marketplaceInfos.push({
               name,
               totalPlugins: marketplace.plugins.length,
               installedCount: installedFromThisMarketplace,
               source: getMarketplaceSourceDisplay(marketplaceConfig.source),
-            })
+            });
           }
         }
 
         // Sort so claude-plugin-directory is always first
         marketplaceInfos.sort((a, b) => {
-          if (a.name === 'claude-plugin-directory') return -1
-          if (b.name === 'claude-plugin-directory') return 1
-          return 0
-        })
+          if (a.name === 'claude-plugin-directory') return -1;
+          if (b.name === 'claude-plugin-directory') return 1;
+          return 0;
+        });
 
-        setMarketplaces(marketplaceInfos)
+        setMarketplaces(marketplaceInfos);
 
         // Handle marketplace loading errors/warnings
-        const successCount = count(marketplaces, m => m.data !== null)
-        const errorResult = formatMarketplaceLoadingErrors(
-          failures,
-          successCount,
-        )
+        const successCount = count(marketplaces, m => m.data !== null);
+        const errorResult = formatMarketplaceLoadingErrors(failures, successCount);
         if (errorResult) {
           if (errorResult.type === 'warning') {
-            setWarning(
-              errorResult.message + '. Showing available marketplaces.',
-            )
+            setWarning(errorResult.message + '. Showing available marketplaces.');
           } else {
-            throw new Error(errorResult.message)
+            throw new Error(errorResult.message);
           }
         }
 
         // Skip marketplace selection if there's only one marketplace
-        if (
-          marketplaceInfos.length === 1 &&
-          !targetMarketplace &&
-          !targetPlugin
-        ) {
-          const singleMarketplace = marketplaceInfos[0]
+        if (marketplaceInfos.length === 1 && !targetMarketplace && !targetPlugin) {
+          const singleMarketplace = marketplaceInfos[0];
           if (singleMarketplace) {
-            setSelectedMarketplace(singleMarketplace.name)
-            setViewState('plugin-list')
+            setSelectedMarketplace(singleMarketplace.name);
+            setViewState('plugin-list');
           }
         }
 
         // Handle targetMarketplace and targetPlugin after marketplaces are loaded
         if (targetPlugin) {
           // Search for the plugin across all marketplaces
-          let foundPlugin: InstallablePlugin | null = null
-          let foundMarketplace: string | null = null
+          let foundPlugin: InstallablePlugin | null = null;
+          let foundMarketplace: string | null = null;
 
           for (const [name] of Object.entries(config)) {
-            const marketplace = await getMarketplace(name)
+            const marketplace = await getMarketplace(name);
             if (marketplace) {
-              const plugin = marketplace.plugins.find(
-                p => p.name === targetPlugin,
-              )
+              const plugin = marketplace.plugins.find(p => p.name === targetPlugin);
               if (plugin) {
-                const pluginId = createPluginId(plugin.name, name)
+                const pluginId = createPluginId(plugin.name, name);
                 foundPlugin = {
                   entry: plugin,
                   marketplaceName: name,
@@ -249,9 +205,9 @@ export function BrowseMarketplace({
                   // exists (nothing to add). Project/local-scope installs don't
                   // block — user may want to promote to user scope (gh-29997).
                   isInstalled: isPluginGloballyInstalled(pluginId),
-                }
-                foundMarketplace = name
-                break
+                };
+                foundMarketplace = name;
+                break;
               }
             }
           }
@@ -263,65 +219,59 @@ export function BrowseMarketplace({
             // The plugin-details view offers all three scope options; the backend
             // (installPluginOp → addInstalledPlugin) already supports multiple
             // scope entries per plugin.
-            const pluginId = foundPlugin.pluginId
-            const globallyInstalled = isPluginGloballyInstalled(pluginId)
+            const pluginId = foundPlugin.pluginId;
+            const globallyInstalled = isPluginGloballyInstalled(pluginId);
 
             if (globallyInstalled) {
-              setError(
-                `Plugin '${pluginId}' is already installed globally. Use '/plugin' to manage existing plugins.`,
-              )
+              setError(`Plugin '${pluginId}' is already installed globally. Use '/plugin' to manage existing plugins.`);
             } else {
               // Navigate to the plugin details view
-              setSelectedMarketplace(foundMarketplace)
-              setSelectedPlugin(foundPlugin)
-              setViewState('plugin-details')
+              setSelectedMarketplace(foundMarketplace);
+              setSelectedPlugin(foundPlugin);
+              setViewState('plugin-details');
             }
           } else {
-            setError(`Plugin "${targetPlugin}" not found in any marketplace`)
+            setError(`Plugin "${targetPlugin}" not found in any marketplace`);
           }
         } else if (targetMarketplace) {
           // Navigate directly to the specified marketplace
-          const marketplaceExists = marketplaceInfos.some(
-            m => m.name === targetMarketplace,
-          )
+          const marketplaceExists = marketplaceInfos.some(m => m.name === targetMarketplace);
           if (marketplaceExists) {
-            setSelectedMarketplace(targetMarketplace)
-            setViewState('plugin-list')
+            setSelectedMarketplace(targetMarketplace);
+            setViewState('plugin-list');
           } else {
-            setError(`Marketplace "${targetMarketplace}" not found`)
+            setError(`Marketplace "${targetMarketplace}" not found`);
           }
         }
       } catch (err) {
-        setError(
-          err instanceof Error ? err.message : 'Failed to load marketplaces',
-        )
+        setError(err instanceof Error ? err.message : 'Failed to load marketplaces');
       } finally {
-        setLoading(false)
+        setLoading(false);
       }
     }
-    void loadMarketplaceData()
-  }, [setError, targetMarketplace, targetPlugin])
+    void loadMarketplaceData();
+  }, [setError, targetMarketplace, targetPlugin]);
 
   // Load plugins when a marketplace is selected
   useEffect(() => {
-    if (!selectedMarketplace) return
+    if (!selectedMarketplace) return;
 
-    let cancelled = false
+    let cancelled = false;
 
     async function loadPluginsForMarketplace(marketplaceName: string) {
-      setLoading(true)
+      setLoading(true);
       try {
-        const marketplace = await getMarketplace(marketplaceName)
-        if (cancelled) return
+        const marketplace = await getMarketplace(marketplaceName);
+        if (cancelled) return;
         if (!marketplace) {
-          throw new Error(`Failed to load marketplace: ${marketplaceName}`)
+          throw new Error(`Failed to load marketplace: ${marketplaceName}`);
         }
 
         // Filter out already installed plugins
-        const installablePlugins: InstallablePlugin[] = []
+        const installablePlugins: InstallablePlugin[] = [];
         for (const entry of marketplace.plugins) {
-          const pluginId = createPluginId(entry.name, marketplaceName)
-          if (isPluginBlockedByPolicy(pluginId)) continue
+          const pluginId = createPluginId(entry.name, marketplaceName);
+          if (isPluginBlockedByPolicy(pluginId)) continue;
           installablePlugins.push({
             entry,
             marketplaceName: marketplaceName,
@@ -330,70 +280,62 @@ export function BrowseMarketplace({
             // Project/local installs don't block — user can add user scope
             // via the plugin-details view (gh-29997).
             isInstalled: isPluginGloballyInstalled(pluginId),
-          })
+          });
         }
 
         // Fetch install counts and sort by popularity
         try {
-          const counts = await getInstallCounts()
-          if (cancelled) return
-          setInstallCounts(counts)
+          const counts = await getInstallCounts();
+          if (cancelled) return;
+          setInstallCounts(counts);
 
           if (counts) {
             // Sort by install count (descending), then alphabetically
             installablePlugins.sort((a, b) => {
-              const countA = counts.get(a.pluginId) ?? 0
-              const countB = counts.get(b.pluginId) ?? 0
-              if (countA !== countB) return countB - countA
-              return a.entry.name.localeCompare(b.entry.name)
-            })
+              const countA = counts.get(a.pluginId) ?? 0;
+              const countB = counts.get(b.pluginId) ?? 0;
+              if (countA !== countB) return countB - countA;
+              return a.entry.name.localeCompare(b.entry.name);
+            });
           } else {
             // No counts available - sort alphabetically
-            installablePlugins.sort((a, b) =>
-              a.entry.name.localeCompare(b.entry.name),
-            )
+            installablePlugins.sort((a, b) => a.entry.name.localeCompare(b.entry.name));
           }
         } catch (error) {
-          if (cancelled) return
+          if (cancelled) return;
           // Log the error, then gracefully degrade to alphabetical sort
-          logForDebugging(
-            `Failed to fetch install counts: ${errorMessage(error)}`,
-          )
-          installablePlugins.sort((a, b) =>
-            a.entry.name.localeCompare(b.entry.name),
-          )
+          logForDebugging(`Failed to fetch install counts: ${errorMessage(error)}`);
+          installablePlugins.sort((a, b) => a.entry.name.localeCompare(b.entry.name));
         }
 
-        setAvailablePlugins(installablePlugins)
-        setSelectedIndex(0)
-        setSelectedForInstall(new Set())
+        setAvailablePlugins(installablePlugins);
+        setSelectedIndex(0);
+        setSelectedForInstall(new Set());
       } catch (err) {
-        if (cancelled) return
-        setError(err instanceof Error ? err.message : 'Failed to load plugins')
+        if (cancelled) return;
+        setError(err instanceof Error ? err.message : 'Failed to load plugins');
       } finally {
-        setLoading(false)
+        setLoading(false);
       }
     }
 
-    void loadPluginsForMarketplace(selectedMarketplace)
+    void loadPluginsForMarketplace(selectedMarketplace);
     return () => {
-      cancelled = true
-    }
-  }, [selectedMarketplace, setError])
+      cancelled = true;
+    };
+  }, [selectedMarketplace, setError]);
 
   // Install selected plugins
   const installSelectedPlugins = async () => {
-    if (selectedForInstall.size === 0) return
+    if (selectedForInstall.size === 0) return;
 
-    const pluginsToInstall = availablePlugins.filter(p =>
-      selectedForInstall.has(p.pluginId),
-    )
+    const pluginsToInstall = availablePlugins.filter(p => selectedForInstall.has(p.pluginId));
 
-    setInstallingPlugins(new Set(pluginsToInstall.map(p => p.pluginId)))
+    setInstallingPlugins(new Set(pluginsToInstall.map(p => p.pluginId)));
 
-    let successCount = 0
-    let failureCount = 0
-    const newFailedPlugins: Array<{ name: string; reason: string }> = []
+    let successCount = 0;
+    let failureCount = 0;
+    const newFailedPlugins: Array<{ name: string; reason: string }> = [];
 
     for (const plugin of pluginsToInstall) {
       const result = await installPluginFromMarketplace({
@@ -401,228 +343,219 @@ export function BrowseMarketplace({
         entry: plugin.entry,
         marketplaceName: plugin.marketplaceName,
         scope: 'user',
-      })
+      });
 
       if (result.success) {
-        successCount++
+        successCount++;
       } else {
-        failureCount++
+        failureCount++;
         newFailedPlugins.push({
           name: plugin.entry.name,
           reason: (result as { success: false; error: string }).error,
-        })
+        });
       }
     }
 
-    setInstallingPlugins(new Set())
-    setSelectedForInstall(new Set())
-    clearAllCaches()
+    setInstallingPlugins(new Set());
+    setSelectedForInstall(new Set());
+    clearAllCaches();
 
     // Handle installation results
     if (failureCount === 0) {
       // All succeeded
       const message =
-        `✓ Installed ${successCount} ${plural(successCount, 'plugin')}. ` +
-        `Run /reload-plugins to activate.`
+        `✓ Installed ${successCount} ${plural(successCount, 'plugin')}. ` + `Run /reload-plugins to activate.`;
 
-      setResult(message)
+      setResult(message);
     } else if (successCount === 0) {
       // All failed - show error with reasons
-      setError(
-        `Failed to install: ${formatFailureDetails(newFailedPlugins, true)}`,
-      )
+      setError(`Failed to install: ${formatFailureDetails(newFailedPlugins, true)}`);
     } else {
       // Mixed results - show partial success
       const message =
         `✓ Installed ${successCount} of ${successCount + failureCount} plugins. ` +
         `Failed: ${formatFailureDetails(newFailedPlugins, false)}. ` +
-        `Run /reload-plugins to activate successfully installed plugins.`
+        `Run /reload-plugins to activate successfully installed plugins.`;
 
-      setResult(message)
+      setResult(message);
     }
 
     // Handle completion callback and navigation
     if (successCount > 0) {
       if (onInstallComplete) {
-        await onInstallComplete()
+        await onInstallComplete();
       }
     }
 
-    setParentViewState({ type: 'menu' })
-  }
+    setParentViewState({ type: 'menu' });
+  };
 
   // Install single plugin from details view
-  const handleSinglePluginInstall = async (
-    plugin: InstallablePlugin,
-    scope: 'user' | 'project' | 'local' = 'user',
-  ) => {
-    setIsInstalling(true)
-    setInstallError(null)
+  const handleSinglePluginInstall = async (plugin: InstallablePlugin, scope: 'user' | 'project' | 'local' = 'user') => {
+    setIsInstalling(true);
+    setInstallError(null);
 
     const result = await installPluginFromMarketplace({
       pluginId: plugin.pluginId,
       entry: plugin.entry,
       marketplaceName: plugin.marketplaceName,
       scope,
-    })
+    });
 
     if (result.success) {
-      const loaded = await findPluginOptionsTarget(plugin.pluginId)
+      const loaded = await findPluginOptionsTarget(plugin.pluginId);
       if (loaded) {
-        setIsInstalling(false)
+        setIsInstalling(false);
         setViewState({
           type: 'plugin-options',
           plugin: loaded,
           pluginId: plugin.pluginId,
-        })
-        return
+        });
+        return;
       }
-      setResult(result.message)
+      setResult(result.message);
       if (onInstallComplete) {
-        await onInstallComplete()
+        await onInstallComplete();
       }
-      setParentViewState({ type: 'menu' })
+      setParentViewState({ type: 'menu' });
     } else {
-      setIsInstalling(false)
-      setInstallError((result as { success: false; error: string }).error)
+      setIsInstalling(false);
+      setInstallError((result as { success: false; error: string }).error);
     }
-  }
+  };
 
   // Handle error state
   useEffect(() => {
     if (error) {
-      setResult(error)
+      setResult(error);
     }
-  }, [error, setResult])
+  }, [error, setResult]);
 
   // Marketplace-list navigation
   useKeybindings(
     {
       'select:previous': () => {
         if (selectedIndex > 0) {
-          setSelectedIndex(selectedIndex - 1)
+          setSelectedIndex(selectedIndex - 1);
         }
       },
       'select:next': () => {
         if (selectedIndex < marketplaces.length - 1) {
-          setSelectedIndex(selectedIndex + 1)
+          setSelectedIndex(selectedIndex + 1);
         }
       },
       'select:accept': () => {
-        const marketplace = marketplaces[selectedIndex]
+        const marketplace = marketplaces[selectedIndex];
         if (marketplace) {
-          setSelectedMarketplace(marketplace.name)
-          setViewState('plugin-list')
+          setSelectedMarketplace(marketplace.name);
+          setViewState('plugin-list');
         }
       },
     },
     { context: 'Select', isActive: viewState === 'marketplace-list' },
-  )
+  );
 
   // Plugin-list navigation
   useKeybindings(
     {
       'select:previous': () => {
         if (selectedIndex > 0) {
-          pagination.handleSelectionChange(selectedIndex - 1, setSelectedIndex)
+          pagination.handleSelectionChange(selectedIndex - 1, setSelectedIndex);
         }
       },
       'select:next': () => {
         if (selectedIndex < availablePlugins.length - 1) {
-          pagination.handleSelectionChange(selectedIndex + 1, setSelectedIndex)
+          pagination.handleSelectionChange(selectedIndex + 1, setSelectedIndex);
         }
       },
       'select:accept': () => {
-        if (
-          selectedIndex === availablePlugins.length &&
-          selectedForInstall.size > 0
-        ) {
-          void installSelectedPlugins()
+        if (selectedIndex === availablePlugins.length && selectedForInstall.size > 0) {
+          void installSelectedPlugins();
         } else if (selectedIndex < availablePlugins.length) {
-          const plugin = availablePlugins[selectedIndex]
+          const plugin = availablePlugins[selectedIndex];
           if (plugin) {
             if (plugin.isInstalled) {
               setParentViewState({
                 type: 'manage-plugins',
                 targetPlugin: plugin.entry.name,
                 targetMarketplace: plugin.marketplaceName,
-              })
+              });
             } else {
-              setSelectedPlugin(plugin)
-              setViewState('plugin-details')
-              setDetailsMenuIndex(0)
-              setInstallError(null)
+              setSelectedPlugin(plugin);
+              setViewState('plugin-details');
+              setDetailsMenuIndex(0);
+              setInstallError(null);
             }
           }
         }
       },
     },
     { context: 'Select', isActive: viewState === 'plugin-list' },
-  )
+  );
 
   useKeybindings(
     {
       'plugin:toggle': () => {
         if (selectedIndex < availablePlugins.length) {
-          const plugin = availablePlugins[selectedIndex]
+          const plugin = availablePlugins[selectedIndex];
           if (plugin && !plugin.isInstalled) {
-            const newSelection = new Set(selectedForInstall)
+            const newSelection = new Set(selectedForInstall);
             if (newSelection.has(plugin.pluginId)) {
-              newSelection.delete(plugin.pluginId)
+              newSelection.delete(plugin.pluginId);
             } else {
-              newSelection.add(plugin.pluginId)
+              newSelection.add(plugin.pluginId);
             }
-            setSelectedForInstall(newSelection)
+            setSelectedForInstall(newSelection);
           }
         }
       },
       'plugin:install': () => {
         if (selectedForInstall.size > 0) {
-          void installSelectedPlugins()
+          void installSelectedPlugins();
         }
       },
     },
     { context: 'Plugin', isActive: viewState === 'plugin-list' },
-  )
+  );
 
   // Plugin-details navigation
   const detailsMenuOptions = React.useMemo(() => {
-    if (!selectedPlugin) return []
-    const hasHomepage = selectedPlugin.entry.homepage
-    const githubRepo = extractGitHubRepo(selectedPlugin)
-    return buildPluginDetailsMenuOptions(hasHomepage, githubRepo)
-  }, [selectedPlugin])
+    if (!selectedPlugin) return [];
+    const hasHomepage = selectedPlugin.entry.homepage;
+    const githubRepo = extractGitHubRepo(selectedPlugin);
+    return buildPluginDetailsMenuOptions(hasHomepage, githubRepo);
+  }, [selectedPlugin]);
 
   useKeybindings(
     {
       'select:previous': () => {
         if (detailsMenuIndex > 0) {
-          setDetailsMenuIndex(detailsMenuIndex - 1)
+          setDetailsMenuIndex(detailsMenuIndex - 1);
         }
       },
       'select:next': () => {
         if (detailsMenuIndex < detailsMenuOptions.length - 1) {
-          setDetailsMenuIndex(detailsMenuIndex + 1)
+          setDetailsMenuIndex(detailsMenuIndex + 1);
         }
       },
       'select:accept': () => {
-        if (!selectedPlugin) return
-        const action = detailsMenuOptions[detailsMenuIndex]?.action
-        const hasHomepage = selectedPlugin.entry.homepage
-        const githubRepo = extractGitHubRepo(selectedPlugin)
+        if (!selectedPlugin) return;
+        const action = detailsMenuOptions[detailsMenuIndex]?.action;
+        const hasHomepage = selectedPlugin.entry.homepage;
+        const githubRepo = extractGitHubRepo(selectedPlugin);
         if (action === 'install-user') {
-          void handleSinglePluginInstall(selectedPlugin, 'user')
+          void handleSinglePluginInstall(selectedPlugin, 'user');
         } else if (action === 'install-project') {
-          void handleSinglePluginInstall(selectedPlugin, 'project')
+          void handleSinglePluginInstall(selectedPlugin, 'project');
         } else if (action === 'install-local') {
-          void handleSinglePluginInstall(selectedPlugin, 'local')
+          void handleSinglePluginInstall(selectedPlugin, 'local');
         } else if (action === 'homepage' && hasHomepage) {
-          void openBrowser(hasHomepage)
+          void openBrowser(hasHomepage);
         } else if (action === 'github' && githubRepo) {
-          void openBrowser(`https://github.com/${githubRepo}`)
+          void openBrowser(`https://github.com/${githubRepo}`);
         } else if (action === 'back') {
-          setViewState('plugin-list')
-          setSelectedPlugin(null)
+          setViewState('plugin-list');
+          setSelectedPlugin(null);
         }
       },
     },
@@ -630,16 +563,16 @@ export function BrowseMarketplace({
       context: 'Select',
       isActive: viewState === 'plugin-details' && !!selectedPlugin,
     },
-  )
+  );
 
   if (typeof viewState === 'object' && viewState.type === 'plugin-options') {
-    const { plugin, pluginId } = viewState
+    const { plugin, pluginId } = viewState;
     function finish(msg: string): void {
-      setResult(msg)
+      setResult(msg);
       if (onInstallComplete) {
-        void onInstallComplete()
+        void onInstallComplete();
       }
-      setParentViewState({ type: 'menu' })
+      setParentViewState({ type: 'menu' });
     }
     return (
       <PluginOptionsFlow
@@ -648,32 +581,28 @@ export function BrowseMarketplace({
         onDone={(outcome, detail) => {
           switch (outcome) {
             case 'configured':
-              finish(
-                `✓ Installed and configured ${plugin.name}. Run /reload-plugins to apply.`,
-              )
-              break
+              finish(`✓ Installed and configured ${plugin.name}. Run /reload-plugins to apply.`);
+              break;
             case 'skipped':
-              finish(
-                `✓ Installed ${plugin.name}. Run /reload-plugins to apply.`,
-              )
-              break
+              finish(`✓ Installed ${plugin.name}. Run /reload-plugins to apply.`);
+              break;
             case 'error':
-              finish(`Installed but failed to save config: ${detail}`)
-              break
+              finish(`Installed but failed to save config: ${detail}`);
+              break;
           }
         }}
       />
-    )
+    );
   }
 
   // Loading state
   if (loading) {
-    return <Text>Loading…</Text>
+    return <Text>Loading…</Text>;
   }
 
   // Error state
   if (error) {
-    return <Text color="error">{error}</Text>
+    return <Text color="error">{error}</Text>;
   }
 
   // Marketplace selection view
@@ -685,9 +614,7 @@ export function BrowseMarketplace({
             <Text bold>Select marketplace</Text>
           </Box>
           <Text>No marketplaces configured.</Text>
-          <Text dimColor>
-            Add a marketplace first using {"'Add marketplace'"}.
-          </Text>
+          <Text dimColor>Add a marketplace first using {"'Add marketplace'"}.</Text>
           <Box marginTop={1} paddingLeft={1}>
             <Text dimColor>
               <ConfigurableShortcutHint
@@ -699,7 +626,7 @@ export function BrowseMarketplace({
             </Text>
           </Box>
         </Box>
-      )
+      );
     }
 
     return (
@@ -717,23 +644,16 @@ export function BrowseMarketplace({
           </Box>
         )}
         {marketplaces.map((marketplace, index) => (
-          <Box
-            key={marketplace.name}
-            flexDirection="column"
-            marginBottom={index < marketplaces.length - 1 ? 1 : 0}
-          >
+          <Box key={marketplace.name} flexDirection="column" marginBottom={index < marketplaces.length - 1 ? 1 : 0}>
             <Box>
               <Text color={selectedIndex === index ? 'suggestion' : undefined}>
-                {selectedIndex === index ? figures.pointer : ' '}{' '}
-                {marketplace.name}
+                {selectedIndex === index ? figures.pointer : ' '} {marketplace.name}
               </Text>
             </Box>
             <Box marginLeft={2}>
               <Text dimColor>
-                {marketplace.totalPlugins}{' '}
-                {plural(marketplace.totalPlugins, 'plugin')} available
-                {marketplace.installedCount > 0 &&
-                  ` · ${marketplace.installedCount} already installed`}
+                {marketplace.totalPlugins} {plural(marketplace.totalPlugins, 'plugin')} available
+                {marketplace.installedCount > 0 && ` · ${marketplace.installedCount} already installed`}
                 {marketplace.source && ` · ${marketplace.source}`}
               </Text>
             </Box>
@@ -743,12 +663,7 @@ export function BrowseMarketplace({
         <Box marginTop={1}>
           <Text dimColor italic>
             <Byline>
-              <ConfigurableShortcutHint
-                action="select:accept"
-                context="Select"
-                fallback="Enter"
-                description="select"
-              />
+              <ConfigurableShortcutHint action="select:accept" context="Select" fallback="Enter" description="select" />
               <ConfigurableShortcutHint
                 action="confirm:no"
                 context="Confirmation"
@@ -759,15 +674,15 @@ export function BrowseMarketplace({
           </Text>
         </Box>
       </Box>
-    )
+    );
   }
 
   // Plugin details view
   if (viewState === 'plugin-details' && selectedPlugin) {
-    const hasHomepage = selectedPlugin.entry.homepage
-    const githubRepo = extractGitHubRepo(selectedPlugin)
+    const hasHomepage = selectedPlugin.entry.homepage;
+    const githubRepo = extractGitHubRepo(selectedPlugin);
 
-    const menuOptions = buildPluginDetailsMenuOptions(hasHomepage, githubRepo)
+    const menuOptions = buildPluginDetailsMenuOptions(hasHomepage, githubRepo);
 
     return (
       <Box flexDirection="column">
@@ -778,9 +693,7 @@ export function BrowseMarketplace({
         {/* Plugin metadata */}
         <Box flexDirection="column" marginBottom={1}>
           <Text bold>{selectedPlugin.entry.name}</Text>
-          {selectedPlugin.entry.version && (
-            <Text dimColor>Version: {selectedPlugin.entry.version}</Text>
-          )}
+          {selectedPlugin.entry.version && <Text dimColor>Version: {selectedPlugin.entry.version}</Text>}
           {selectedPlugin.entry.description && (
             <Box marginTop={1}>
               <Text>{selectedPlugin.entry.description}</Text>
@@ -818,9 +731,7 @@ export function BrowseMarketplace({
             </Text>
           )}
           {selectedPlugin.entry.hooks && (
-            <Text dimColor>
-              · Hooks: {Object.keys(selectedPlugin.entry.hooks).join(', ')}
-            </Text>
+            <Text dimColor>· Hooks: {Object.keys(selectedPlugin.entry.hooks).join(', ')}</Text>
           )}
           {selectedPlugin.entry.mcpServers && (
             <Text dimColor>
@@ -843,9 +754,7 @@ export function BrowseMarketplace({
                   selectedPlugin.entry.source.source === 'url' ||
                   selectedPlugin.entry.source.source === 'npm' ||
                   selectedPlugin.entry.source.source === 'pip') ? (
-                  <Text dimColor>
-                    · Component summary not available for remote plugin
-                  </Text>
+                  <Text dimColor>· Component summary not available for remote plugin</Text>
                 ) : (
                   // TODO: Actually scan local plugin directories to show real components
                   // This would require accessing the filesystem to check for:
@@ -853,9 +762,7 @@ export function BrowseMarketplace({
                   // - agents/ directory and list files
                   // - hooks/ directory and list files
                   // - .mcp.json or mcp-servers.json files
-                  <Text dimColor>
-                    · Components will be discovered at installation
-                  </Text>
+                  <Text dimColor>· Components will be discovered at installation</Text>
                 )}
               </>
             )}
@@ -877,9 +784,7 @@ export function BrowseMarketplace({
               {detailsMenuIndex === index && <Text>{'> '}</Text>}
               {detailsMenuIndex !== index && <Text>{'  '}</Text>}
               <Text bold={detailsMenuIndex === index}>
-                {isInstalling && option.action === 'install'
-                  ? 'Installing…'
-                  : option.label}
+                {isInstalling && option.action === 'install' ? 'Installing…' : option.label}
               </Text>
             </Box>
           ))}
@@ -888,23 +793,13 @@ export function BrowseMarketplace({
         <Box marginTop={1} paddingLeft={1}>
           <Text dimColor>
             <Byline>
-              <ConfigurableShortcutHint
-                action="select:accept"
-                context="Select"
-                fallback="Enter"
-                description="select"
-              />
-              <ConfigurableShortcutHint
-                action="confirm:no"
-                context="Confirmation"
-                fallback="Esc"
-                description="back"
-              />
+              <ConfigurableShortcutHint action="select:accept" context="Select" fallback="Enter" description="select" />
+              <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="back" />
             </Byline>
           </Text>
         </Box>
       </Box>
-    )
+    );
   }
 
   // Plugin installation view
@@ -915,25 +810,18 @@ export function BrowseMarketplace({
           <Text bold>Install plugins</Text>
         </Box>
         <Text dimColor>No new plugins available to install.</Text>
-        <Text dimColor>
-          All plugins from this marketplace are already installed.
-        </Text>
+        <Text dimColor>All plugins from this marketplace are already installed.</Text>
         <Box marginLeft={3}>
           <Text dimColor italic>
-            <ConfigurableShortcutHint
-              action="confirm:no"
-              context="Confirmation"
-              fallback="Esc"
-              description="go back"
-            />
+            <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="go back" />
           </Text>
         </Box>
       </Box>
-    )
+    );
   }
 
   // Get visible plugins from pagination
-  const visiblePlugins = pagination.getVisibleItems(availablePlugins)
+  const visiblePlugins = pagination.getVisibleItems(availablePlugins);
 
   return (
     <Box flexDirection="column">
@@ -950,22 +838,16 @@ export function BrowseMarketplace({
 
       {/* Plugin list */}
       {visiblePlugins.map((plugin, visibleIndex) => {
-        const actualIndex = pagination.toActualIndex(visibleIndex)
-        const isSelected = selectedIndex === actualIndex
-        const isSelectedForInstall = selectedForInstall.has(plugin.pluginId)
-        const isInstalling = installingPlugins.has(plugin.pluginId)
-        const isLast = visibleIndex === visiblePlugins.length - 1
+        const actualIndex = pagination.toActualIndex(visibleIndex);
+        const isSelected = selectedIndex === actualIndex;
+        const isSelectedForInstall = selectedForInstall.has(plugin.pluginId);
+        const isInstalling = installingPlugins.has(plugin.pluginId);
+        const isLast = visibleIndex === visiblePlugins.length - 1;
 
         return (
-          <Box
-            key={plugin.pluginId}
-            flexDirection="column"
-            marginBottom={isLast && !error ? 0 : 1}
-          >
+          <Box key={plugin.pluginId} flexDirection="column" marginBottom={isLast && !error ? 0 : 1}>
             <Box>
-              <Text color={isSelected ? 'suggestion' : undefined}>
-                {isSelected ? figures.pointer : ' '}{' '}
-              </Text>
+              <Text color={isSelected ? 'suggestion' : undefined}>{isSelected ? figures.pointer : ' '} </Text>
               <Text color={plugin.isInstalled ? 'success' : undefined}>
                 {plugin.isInstalled
                   ? figures.tick
@@ -975,37 +857,25 @@ export function BrowseMarketplace({
                       ? figures.radioOn
                       : figures.radioOff}{' '}
                 {plugin.entry.name}
-                {plugin.entry.category && (
-                  <Text dimColor> [{plugin.entry.category}]</Text>
-                )}
-                {plugin.entry.tags?.includes('community-managed') && (
-                  <Text dimColor> [Community Managed]</Text>
-                )}
+                {plugin.entry.category && <Text dimColor> [{plugin.entry.category}]</Text>}
+                {plugin.entry.tags?.includes('community-managed') && <Text dimColor> [Community Managed]</Text>}
                 {plugin.isInstalled && <Text dimColor> (installed)</Text>}
-                {installCounts &&
-                  selectedMarketplace === OFFICIAL_MARKETPLACE_NAME && (
-                    <Text dimColor>
-                      {' · '}
-                      {formatInstallCount(
-                        installCounts.get(plugin.pluginId) ?? 0,
-                      )}{' '}
-                      installs
-                    </Text>
-                  )}
+                {installCounts && selectedMarketplace === OFFICIAL_MARKETPLACE_NAME && (
+                  <Text dimColor>
+                    {' · '}
+                    {formatInstallCount(installCounts.get(plugin.pluginId) ?? 0)} installs
+                  </Text>
+                )}
               </Text>
             </Box>
             {plugin.entry.description && (
               <Box marginLeft={4}>
-                <Text dimColor>
-                  {truncateToWidth(plugin.entry.description, 60)}
-                </Text>
-                {plugin.entry.version && (
-                  <Text dimColor> · v{plugin.entry.version}</Text>
-                )}
+                <Text dimColor>{truncateToWidth(plugin.entry.description, 60)}</Text>
+                {plugin.entry.version && <Text dimColor> · v{plugin.entry.version}</Text>}
               </Box>
             )}
           </Box>
-        )
+        );
       })}
 
       {/* Scroll down indicator */}
@@ -1026,5 +896,5 @@ export function BrowseMarketplace({
 
       <PluginSelectionKeyHint hasSelection={selectedForInstall.size > 0} />
     </Box>
-  )
+  );
 }
diff --git a/src/commands/plugin/DiscoverPlugins.tsx b/src/commands/plugin/DiscoverPlugins.tsx
index 53cb0466f..c18b637a3 100644
--- a/src/commands/plugin/DiscoverPlugins.tsx
+++ b/src/commands/plugin/DiscoverPlugins.tsx
@@ -1,28 +1,22 @@
-import figures from 'figures'
-import * as React from 'react'
-import { useCallback, useEffect, useMemo, useState } from 'react'
-import { ConfigurableShortcutHint } from '../../components/ConfigurableShortcutHint.js'
-import { SearchBox } from '../../components/SearchBox.js'
-import { Byline } from '@anthropic/ink'
-import { useSearchInput } from '../../hooks/useSearchInput.js'
-import { useTerminalSize } from '../../hooks/useTerminalSize.js'
+import figures from 'figures';
+import * as React from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
+import { ConfigurableShortcutHint } from '../../components/ConfigurableShortcutHint.js';
+import { SearchBox } from '../../components/SearchBox.js';
+import { Byline } from '@anthropic/ink';
+import { useSearchInput } from '../../hooks/useSearchInput.js';
+import { useTerminalSize } from '../../hooks/useTerminalSize.js';
 // eslint-disable-next-line custom-rules/prefer-use-keybindings -- useInput needed for raw search mode text input
-import { Box, Text, useInput, useTerminalFocus } from '@anthropic/ink'
-import {
-  useKeybinding,
-  useKeybindings,
-} from '../../keybindings/useKeybinding.js'
-import type { LoadedPlugin } from '../../types/plugin.js'
-import { count } from '../../utils/array.js'
-import { openBrowser } from '../../utils/browser.js'
-import { logForDebugging } from '../../utils/debug.js'
-import { errorMessage } from '../../utils/errors.js'
-import { clearAllCaches } from '../../utils/plugins/cacheUtils.js'
-import {
-  formatInstallCount,
-  getInstallCounts,
-} from '../../utils/plugins/installCounts.js'
-import { isPluginGloballyInstalled } from '../../utils/plugins/installedPluginsManager.js'
+import { Box, Text, useInput, useTerminalFocus } from '@anthropic/ink';
+import { useKeybinding, useKeybindings } from '../../keybindings/useKeybinding.js';
+import type { LoadedPlugin } from '../../types/plugin.js';
+import { count } from '../../utils/array.js';
+import { openBrowser } from '../../utils/browser.js';
+import { logForDebugging } from '../../utils/debug.js';
+import { errorMessage } from '../../utils/errors.js';
+import { clearAllCaches } from '../../utils/plugins/cacheUtils.js';
+import { formatInstallCount, getInstallCounts } from '../../utils/plugins/installCounts.js';
+import { isPluginGloballyInstalled } from '../../utils/plugins/installedPluginsManager.js';
 import {
   createPluginId,
   detectEmptyMarketplaceReason,
@@ -30,41 +24,31 @@ import {
   formatFailureDetails,
   formatMarketplaceLoadingErrors,
   loadMarketplacesWithGracefulDegradation,
-} from '../../utils/plugins/marketplaceHelpers.js'
-import { loadKnownMarketplacesConfig } from '../../utils/plugins/marketplaceManager.js'
-import { OFFICIAL_MARKETPLACE_NAME } from '../../utils/plugins/officialMarketplace.js'
-import { installPluginFromMarketplace } from '../../utils/plugins/pluginInstallationHelpers.js'
-import { isPluginBlockedByPolicy } from '../../utils/plugins/pluginPolicy.js'
-import { plural } from '../../utils/stringUtils.js'
-import { truncateToWidth } from '../../utils/truncate.js'
-import {
-  findPluginOptionsTarget,
-  PluginOptionsFlow,
-} from './PluginOptionsFlow.js'
-import { PluginTrustWarning } from './PluginTrustWarning.js'
-import {
-  buildPluginDetailsMenuOptions,
-  extractGitHubRepo,
-  type InstallablePlugin,
-} from './pluginDetailsHelpers.js'
-import type { ViewState as ParentViewState } from './types.js'
-import { usePagination } from './usePagination.js'
+} from '../../utils/plugins/marketplaceHelpers.js';
+import { loadKnownMarketplacesConfig } from '../../utils/plugins/marketplaceManager.js';
+import { OFFICIAL_MARKETPLACE_NAME } from '../../utils/plugins/officialMarketplace.js';
+import { installPluginFromMarketplace } from '../../utils/plugins/pluginInstallationHelpers.js';
+import { isPluginBlockedByPolicy } from '../../utils/plugins/pluginPolicy.js';
+import { plural } from '../../utils/stringUtils.js';
+import { truncateToWidth } from '../../utils/truncate.js';
+import { findPluginOptionsTarget, PluginOptionsFlow } from './PluginOptionsFlow.js';
+import { PluginTrustWarning } from './PluginTrustWarning.js';
+import { buildPluginDetailsMenuOptions, extractGitHubRepo, type InstallablePlugin } from './pluginDetailsHelpers.js';
+import type { ViewState as ParentViewState } from './types.js';
+import { usePagination } from './usePagination.js';
 
 type Props = {
-  error: string | null
-  setError: (error: string | null) => void
-  result: string | null
-  setResult: (result: string | null) => void
-  setViewState: (state: ParentViewState) => void
-  onInstallComplete?: () => void | Promise<void>
-  onSearchModeChange?: (isActive: boolean) => void
-  targetPlugin?: string
-}
+  error: string | null;
+  setError: (error: string | null) => void;
+  result: string | null;
+  setResult: (result: string | null) => void;
+  setViewState: (state: ParentViewState) => void;
+  onInstallComplete?: () => void | Promise<void>;
+  onSearchModeChange?: (isActive: boolean) => void;
+  targetPlugin?: string;
+};
 
-type ViewState =
-  | 'plugin-list'
-  | 'plugin-details'
-  | { type: 'plugin-options'; plugin: LoadedPlugin; pluginId: string }
+type ViewState = 'plugin-list' | 'plugin-details' | { type: 'plugin-options'; plugin: LoadedPlugin; pluginId: string };
 
 export function DiscoverPlugins({
   error,
@@ -77,29 +61,23 @@ export function DiscoverPlugins({
   targetPlugin,
 }: Props): React.ReactNode {
   // View state
-  const [viewState, setViewState] = useState<ViewState>('plugin-list')
-  const [selectedPlugin, setSelectedPlugin] =
-    useState<InstallablePlugin | null>(null)
+  const [viewState, setViewState] = useState<ViewState>('plugin-list');
+  const [selectedPlugin, setSelectedPlugin] = useState<InstallablePlugin | null>(null);
 
   // Data state
-  const [availablePlugins, setAvailablePlugins] = useState<InstallablePlugin[]>(
-    [],
-  )
-  const [loading, setLoading] = useState(true)
-  const [installCounts, setInstallCounts] = useState<Map<
-    string,
-    number
-  > | null>(null)
+  const [availablePlugins, setAvailablePlugins] = useState<InstallablePlugin[]>([]);
+  const [loading, setLoading] = useState(true);
+  const [installCounts, setInstallCounts] = useState<Map<string, number> | null>(null);
 
   // Search state
-  const [isSearchMode, setIsSearchModeRaw] = useState(false)
+  const [isSearchMode, setIsSearchModeRaw] = useState(false);
   const setIsSearchMode = useCallback(
     (active: boolean) => {
-      setIsSearchModeRaw(active)
-      onSearchModeChange?.(active)
+      setIsSearchModeRaw(active);
+      onSearchModeChange?.(active);
     },
     [onSearchModeChange],
-  )
+  );
   const {
     query: searchQuery,
     setQuery: setSearchQuery,
@@ -107,74 +85,67 @@ export function DiscoverPlugins({
   } = useSearchInput({
     isActive: viewState === 'plugin-list' && isSearchMode && !loading,
     onExit: () => {
-      setIsSearchMode(false)
+      setIsSearchMode(false);
     },
-  })
-  const isTerminalFocused = useTerminalFocus()
-  const { columns: terminalWidth } = useTerminalSize()
+  });
+  const isTerminalFocused = useTerminalFocus();
+  const { columns: terminalWidth } = useTerminalSize();
 
   // Filter plugins based on search query
   const filteredPlugins = useMemo(() => {
-    if (!searchQuery) return availablePlugins
-    const lowerQuery = searchQuery.toLowerCase()
+    if (!searchQuery) return availablePlugins;
+    const lowerQuery = searchQuery.toLowerCase();
     return availablePlugins.filter(
       plugin =>
         plugin.entry.name.toLowerCase().includes(lowerQuery) ||
         plugin.entry.description?.toLowerCase().includes(lowerQuery) ||
         plugin.marketplaceName.toLowerCase().includes(lowerQuery),
-    )
-  }, [availablePlugins, searchQuery])
+    );
+  }, [availablePlugins, searchQuery]);
 
   // Selection state
-  const [selectedIndex, setSelectedIndex] = useState(0)
-  const [selectedForInstall, setSelectedForInstall] = useState<Set<string>>(
-    new Set(),
-  )
-  const [installingPlugins, setInstallingPlugins] = useState<Set<string>>(
-    new Set(),
-  )
+  const [selectedIndex, setSelectedIndex] = useState(0);
+  const [selectedForInstall, setSelectedForInstall] = useState<Set<string>>(new Set());
+  const [installingPlugins, setInstallingPlugins] = useState<Set<string>>(new Set());
 
   // Pagination for plugin list (continuous scrolling)
   const pagination = usePagination<InstallablePlugin>({
     totalItems: filteredPlugins.length,
     selectedIndex,
-  })
+  });
 
   // Reset selection when search query changes
   useEffect(() => {
-    setSelectedIndex(0)
-  }, [searchQuery])
+    setSelectedIndex(0);
+  }, [searchQuery]);
 
   // Details view state
-  const [detailsMenuIndex, setDetailsMenuIndex] = useState(0)
-  const [isInstalling, setIsInstalling] = useState(false)
-  const [installError, setInstallError] = useState<string | null>(null)
+  const [detailsMenuIndex, setDetailsMenuIndex] = useState(0);
+  const [isInstalling, setIsInstalling] = useState(false);
+  const [installError, setInstallError] = useState<string | null>(null);
 
   // Warning state for non-critical errors
-  const [warning, setWarning] = useState<string | null>(null)
+  const [warning, setWarning] = useState<string | null>(null);
 
   // Empty state reason
-  const [emptyReason, setEmptyReason] = useState<EmptyMarketplaceReason | null>(
-    null,
-  )
+  const [emptyReason, setEmptyReason] = useState<EmptyMarketplaceReason | null>(null);
 
   // Load all plugins from all marketplaces
   useEffect(() => {
     async function loadAllPlugins() {
       try {
-        const config = await loadKnownMarketplacesConfig()
+        const config = await loadKnownMarketplacesConfig();
 
         // Load marketplaces with graceful degradation
-        const { marketplaces, failures } =
-          await loadMarketplacesWithGracefulDegradation(config)
+        const { marketplaces, failures } = await loadMarketplacesWithGracefulDegradation(config);
 
         // Collect all plugins from all marketplaces
-        const allPlugins: InstallablePlugin[] = []
+        const allPlugins: InstallablePlugin[] = [];
 
         for (const { name, data: marketplace } of marketplaces) {
           if (marketplace) {
             for (const entry of marketplace.plugins) {
-              const pluginId = createPluginId(entry.name, name)
+              const pluginId = createPluginId(entry.name, name);
               allPlugins.push({
                 entry,
                 marketplaceName: name,
@@ -183,113 +154,98 @@ export function DiscoverPlugins({
                 // Project/local-scope installs don't block — user may want to
                 // promote to user scope so it's available everywhere (gh-29997).
                 isInstalled: isPluginGloballyInstalled(pluginId),
-              })
+              });
             }
           }
         }
 
         // Filter out installed and policy-blocked plugins
-        const uninstalledPlugins = allPlugins.filter(
-          p => !p.isInstalled && !isPluginBlockedByPolicy(p.pluginId),
-        )
+        const uninstalledPlugins = allPlugins.filter(p => !p.isInstalled && !isPluginBlockedByPolicy(p.pluginId));
 
         // Fetch install counts and sort by popularity
         try {
-          const counts = await getInstallCounts()
-          setInstallCounts(counts)
+          const counts = await getInstallCounts();
+          setInstallCounts(counts);
 
           if (counts) {
             // Sort by install count (descending), then alphabetically
             uninstalledPlugins.sort((a, b) => {
-              const countA = counts.get(a.pluginId) ?? 0
-              const countB = counts.get(b.pluginId) ?? 0
-              if (countA !== countB) return countB - countA
-              return a.entry.name.localeCompare(b.entry.name)
-            })
+              const countA = counts.get(a.pluginId) ?? 0;
+              const countB = counts.get(b.pluginId) ?? 0;
+              if (countA !== countB) return countB - countA;
+              return a.entry.name.localeCompare(b.entry.name);
+            });
           } else {
             // No counts available - sort alphabetically
-            uninstalledPlugins.sort((a, b) =>
-              a.entry.name.localeCompare(b.entry.name),
-            )
+            uninstalledPlugins.sort((a, b) => a.entry.name.localeCompare(b.entry.name));
           }
         } catch (error) {
           // Log the error, then gracefully degrade to alphabetical sort
-          logForDebugging(
-            `Failed to fetch install counts: ${errorMessage(error)}`,
-          )
-          uninstalledPlugins.sort((a, b) =>
-            a.entry.name.localeCompare(b.entry.name),
-          )
+          logForDebugging(`Failed to fetch install counts: ${errorMessage(error)}`);
+          uninstalledPlugins.sort((a, b) => a.entry.name.localeCompare(b.entry.name));
         }
 
-        setAvailablePlugins(uninstalledPlugins)
+        setAvailablePlugins(uninstalledPlugins);
 
         // Detect empty reason if no plugins available
-        const configuredCount = Object.keys(config).length
+        const configuredCount = Object.keys(config).length;
         if (uninstalledPlugins.length === 0) {
           const reason = await detectEmptyMarketplaceReason({
             configuredMarketplaceCount: configuredCount,
             failedMarketplaceCount: failures.length,
-          })
-          setEmptyReason(reason)
+          });
+          setEmptyReason(reason);
         }
 
         // Handle marketplace loading errors/warnings
-        const successCount = count(marketplaces, m => m.data !== null)
-        const errorResult = formatMarketplaceLoadingErrors(
-          failures,
-          successCount,
-        )
+        const successCount = count(marketplaces, m => m.data !== null);
+        const errorResult = formatMarketplaceLoadingErrors(failures, successCount);
         if (errorResult) {
           if (errorResult.type === 'warning') {
-            setWarning(errorResult.message + '. Showing available plugins.')
+            setWarning(errorResult.message + '. Showing available plugins.');
           } else {
-            throw new Error(errorResult.message)
+            throw new Error(errorResult.message);
           }
         }
 
         // Handle targetPlugin - navigate directly to plugin details
         // Search in allPlugins (before filtering) to handle installed plugins gracefully
         if (targetPlugin) {
-          const foundPlugin = allPlugins.find(
-            p => p.entry.name === targetPlugin,
-          )
+          const foundPlugin = allPlugins.find(p => p.entry.name === targetPlugin);
 
           if (foundPlugin) {
             if (foundPlugin.isInstalled) {
               setError(
                 `Plugin '${foundPlugin.pluginId}' is already installed. Use '/plugin' to manage existing plugins.`,
-              )
+              );
             } else {
-              setSelectedPlugin(foundPlugin)
-              setViewState('plugin-details')
+              setSelectedPlugin(foundPlugin);
+              setViewState('plugin-details');
             }
           } else {
-            setError(`Plugin "${targetPlugin}" not found in any marketplace`)
+            setError(`Plugin "${targetPlugin}" not found in any marketplace`);
           }
         }
       } catch (err) {
-        setError(err instanceof Error ? err.message : 'Failed to load plugins')
+        setError(err instanceof Error ? err.message : 'Failed to load plugins');
       } finally {
-        setLoading(false)
+        setLoading(false);
       }
     }
-    void loadAllPlugins()
-  }, [setError, targetPlugin])
+    void loadAllPlugins();
+  }, [setError, targetPlugin]);
 
   // Install selected plugins
   const installSelectedPlugins = async () => {
-    if (selectedForInstall.size === 0) return
+    if (selectedForInstall.size === 0) return;
 
-    const pluginsToInstall = availablePlugins.filter(p =>
-      selectedForInstall.has(p.pluginId),
-    )
+    const pluginsToInstall = availablePlugins.filter(p => selectedForInstall.has(p.pluginId));
 
-    setInstallingPlugins(new Set(pluginsToInstall.map(p => p.pluginId)))
+    setInstallingPlugins(new Set(pluginsToInstall.map(p => p.pluginId)));
 
-    let successCount = 0
-    let failureCount = 0
-    const newFailedPlugins: Array<{ name: string; reason: string }> = []
+    let successCount = 0;
+    let failureCount = 0;
+    const newFailedPlugins: Array<{ name: string; reason: string }> = [];
 
     for (const plugin of pluginsToInstall) {
       const result = await installPluginFromMarketplace({
@@ -297,128 +253,122 @@ export function DiscoverPlugins({
         entry: plugin.entry,
         marketplaceName: plugin.marketplaceName,
         scope: 'user',
-      })
+      });
 
       if (result.success) {
-        successCount++
+        successCount++;
       } else {
-        failureCount++
+        failureCount++;
         newFailedPlugins.push({
           name: plugin.entry.name,
           reason: (result as { success: false; error: string }).error,
-        })
+        });
       }
     }
 
-    setInstallingPlugins(new Set())
-    setSelectedForInstall(new Set())
-    clearAllCaches()
+    setInstallingPlugins(new Set());
+    setSelectedForInstall(new Set());
+    clearAllCaches();
 
     // Handle installation results
     if (failureCount === 0) {
       const message =
-        `✓ Installed ${successCount} ${plural(successCount, 'plugin')}. ` +
-        `Run /reload-plugins to activate.`
-      setResult(message)
+        `✓ Installed ${successCount} ${plural(successCount, 'plugin')}. ` + `Run /reload-plugins to activate.`;
+      setResult(message);
     } else if (successCount === 0) {
-      setError(
-        `Failed to install: ${formatFailureDetails(newFailedPlugins, true)}`,
-      )
+      setError(`Failed to install: ${formatFailureDetails(newFailedPlugins, true)}`);
     } else {
       const message =
         `✓ Installed ${successCount} of ${successCount + failureCount} plugins. ` +
         `Failed: ${formatFailureDetails(newFailedPlugins, false)}. ` +
-        `Run /reload-plugins to activate successfully installed plugins.`
-      setResult(message)
+        `Run /reload-plugins to activate successfully installed plugins.`;
+      setResult(message);
     }
 
     if (successCount > 0) {
       if (onInstallComplete) {
-        await onInstallComplete()
+        await onInstallComplete();
       }
     }
 
-    setParentViewState({ type: 'menu' })
-  }
+    setParentViewState({ type: 'menu' });
+  };
 
   // Install single plugin from details view
-  const handleSinglePluginInstall = async (
-    plugin: InstallablePlugin,
-    scope: 'user' | 'project' | 'local' = 'user',
-  ) => {
-    setIsInstalling(true)
-    setInstallError(null)
+  const handleSinglePluginInstall = async (plugin: InstallablePlugin, scope: 'user' | 'project' | 'local' = 'user') => {
+    setIsInstalling(true);
+    setInstallError(null);
 
     const result = await installPluginFromMarketplace({
       pluginId: plugin.pluginId,
       entry: plugin.entry,
       marketplaceName: plugin.marketplaceName,
       scope,
-    })
+    });
 
     if (result.success) {
-      const loaded = await findPluginOptionsTarget(plugin.pluginId)
+      const loaded = await findPluginOptionsTarget(plugin.pluginId);
       if (loaded) {
-        setIsInstalling(false)
+        setIsInstalling(false);
         setViewState({
           type: 'plugin-options',
           plugin: loaded,
           pluginId: plugin.pluginId,
-        })
-        return
+        });
+        return;
       }
-      setResult(result.message)
+      setResult(result.message);
       if (onInstallComplete) {
-        await onInstallComplete()
+        await onInstallComplete();
       }
-      setParentViewState({ type: 'menu' })
+      setParentViewState({ type: 'menu' });
     } else {
-      setIsInstalling(false)
-      setInstallError((result as { success: false; error: string }).error)
+      setIsInstalling(false);
+      setInstallError((result as { success: false; error: string }).error);
     }
-  }
+  };
 
   // Handle error state
   useEffect(() => {
     if (error) {
-      setResult(error)
+      setResult(error);
     }
-  }, [error, setResult])
+  }, [error, setResult]);
 
   // Escape in plugin-details view - go back to plugin-list
   useKeybinding(
     'confirm:no',
     () => {
-      setViewState('plugin-list')
-      setSelectedPlugin(null)
+      setViewState('plugin-list');
+      setSelectedPlugin(null);
     },
     {
       context: 'Confirmation',
       isActive: viewState === 'plugin-details',
     },
-  )
+  );
 
   // Escape in plugin-list view (not search mode) - exit to parent menu
   useKeybinding(
     'confirm:no',
     () => {
-      setParentViewState({ type: 'menu' })
+      setParentViewState({ type: 'menu' });
     },
     {
       context: 'Confirmation',
       isActive: viewState === 'plugin-list' && !isSearchMode,
     },
-  )
+  );
 
   // Handle entering search mode (non-escape keys)
   useInput(
     (input, _key) => {
-      const keyIsNotCtrlOrMeta = !_key.ctrl && !_key.meta
+      const keyIsNotCtrlOrMeta = !_key.ctrl && !_key.meta;
       if (!isSearchMode) {
         // Enter search mode with '/' or any printable character
         if (input === '/' && keyIsNotCtrlOrMeta) {
-          setIsSearchMode(true)
-          setSearchQuery('')
+          setIsSearchMode(true);
+          setSearchQuery('');
         } else if (
           keyIsNotCtrlOrMeta &&
           input.length > 0 &&
@@ -428,49 +378,46 @@ export function DiscoverPlugins({
           input !== 'k' &&
           input !== 'i'
         ) {
-          setIsSearchMode(true)
-          setSearchQuery(input)
+          setIsSearchMode(true);
+          setSearchQuery(input);
         }
       }
     },
     { isActive: viewState === 'plugin-list' && !loading },
-  )
+  );
 
   // Plugin-list navigation (non-search mode)
   useKeybindings(
     {
       'select:previous': () => {
         if (selectedIndex === 0) {
-          setIsSearchMode(true)
+          setIsSearchMode(true);
         } else {
-          pagination.handleSelectionChange(selectedIndex - 1, setSelectedIndex)
+          pagination.handleSelectionChange(selectedIndex - 1, setSelectedIndex);
         }
       },
       'select:next': () => {
         if (selectedIndex < filteredPlugins.length - 1) {
-          pagination.handleSelectionChange(selectedIndex + 1, setSelectedIndex)
+          pagination.handleSelectionChange(selectedIndex + 1, setSelectedIndex);
         }
       },
       'select:accept': () => {
-        if (
-          selectedIndex === filteredPlugins.length &&
-          selectedForInstall.size > 0
-        ) {
-          void installSelectedPlugins()
+        if (selectedIndex === filteredPlugins.length && selectedForInstall.size > 0) {
+          void installSelectedPlugins();
         } else if (selectedIndex < filteredPlugins.length) {
-          const plugin = filteredPlugins[selectedIndex]
+          const plugin = filteredPlugins[selectedIndex];
           if (plugin) {
             if (plugin.isInstalled) {
               setParentViewState({
                 type: 'manage-plugins',
                 targetPlugin: plugin.entry.name,
                 targetMarketplace: plugin.marketplaceName,
-              })
+              });
             } else {
-              setSelectedPlugin(plugin)
-              setViewState('plugin-details')
-              setDetailsMenuIndex(0)
-              setInstallError(null)
+              setSelectedPlugin(plugin);
+              setViewState('plugin-details');
+              setDetailsMenuIndex(0);
+              setInstallError(null);
             }
           }
         }
@@ -480,27 +427,27 @@ export function DiscoverPlugins({
       context: 'Select',
       isActive: viewState === 'plugin-list' && !isSearchMode,
     },
-  )
+  );
 
   useKeybindings(
     {
       'plugin:toggle': () => {
         if (selectedIndex < filteredPlugins.length) {
-          const plugin = filteredPlugins[selectedIndex]
+          const plugin = filteredPlugins[selectedIndex];
           if (plugin && !plugin.isInstalled) {
-            const newSelection = new Set(selectedForInstall)
+            const newSelection = new Set(selectedForInstall);
             if (newSelection.has(plugin.pluginId)) {
-              newSelection.delete(plugin.pluginId)
+              newSelection.delete(plugin.pluginId);
             } else {
-              newSelection.add(plugin.pluginId)
+              newSelection.add(plugin.pluginId);
             }
-            setSelectedForInstall(newSelection)
+            setSelectedForInstall(newSelection);
           }
         }
       },
       'plugin:install': () => {
         if (selectedForInstall.size > 0) {
-          void installSelectedPlugins()
+          void installSelectedPlugins();
         }
       },
     },
@@ -508,46 +455,46 @@ export function DiscoverPlugins({
       context: 'Plugin',
       isActive: viewState === 'plugin-list' && !isSearchMode,
     },
-  )
+  );
 
   // Plugin-details navigation
   const detailsMenuOptions = React.useMemo(() => {
-    if (!selectedPlugin) return []
-    const hasHomepage = selectedPlugin.entry.homepage
-    const githubRepo = extractGitHubRepo(selectedPlugin)
-    return buildPluginDetailsMenuOptions(hasHomepage, githubRepo)
-  }, [selectedPlugin])
+    if (!selectedPlugin) return [];
+    const hasHomepage = selectedPlugin.entry.homepage;
+    const githubRepo = extractGitHubRepo(selectedPlugin);
+    return buildPluginDetailsMenuOptions(hasHomepage, githubRepo);
+  }, [selectedPlugin]);
 
   useKeybindings(
     {
       'select:previous': () => {
         if (detailsMenuIndex > 0) {
-          setDetailsMenuIndex(detailsMenuIndex - 1)
+          setDetailsMenuIndex(detailsMenuIndex - 1);
         }
       },
       'select:next': () => {
         if (detailsMenuIndex < detailsMenuOptions.length - 1) {
-          setDetailsMenuIndex(detailsMenuIndex + 1)
+          setDetailsMenuIndex(detailsMenuIndex + 1);
         }
       },
       'select:accept': () => {
-        if (!selectedPlugin) return
-        const action = detailsMenuOptions[detailsMenuIndex]?.action
-        const hasHomepage = selectedPlugin.entry.homepage
-        const githubRepo = extractGitHubRepo(selectedPlugin)
+        if (!selectedPlugin) return;
+        const action = detailsMenuOptions[detailsMenuIndex]?.action;
+        const hasHomepage = selectedPlugin.entry.homepage;
+        const githubRepo = extractGitHubRepo(selectedPlugin);
         if (action === 'install-user') {
-          void handleSinglePluginInstall(selectedPlugin, 'user')
+          void handleSinglePluginInstall(selectedPlugin, 'user');
         } else if (action === 'install-project') {
-          void handleSinglePluginInstall(selectedPlugin, 'project')
+          void handleSinglePluginInstall(selectedPlugin, 'project');
         } else if (action === 'install-local') {
-          void handleSinglePluginInstall(selectedPlugin, 'local')
+          void handleSinglePluginInstall(selectedPlugin, 'local');
         } else if (action === 'homepage' && hasHomepage) {
-          void openBrowser(hasHomepage)
+          void openBrowser(hasHomepage);
         } else if (action === 'github' && githubRepo) {
-          void openBrowser(`https://github.com/${githubRepo}`)
+          void openBrowser(`https://github.com/${githubRepo}`);
         } else if (action === 'back') {
-          setViewState('plugin-list')
-          setSelectedPlugin(null)
+          setViewState('plugin-list');
+          setSelectedPlugin(null);
         }
       },
     },
@@ -555,16 +502,16 @@ export function DiscoverPlugins({
       context: 'Select',
       isActive: viewState === 'plugin-details' && !!selectedPlugin,
     },
-  )
+  );
 
   if (typeof viewState === 'object' && viewState.type === 'plugin-options') {
-    const { plugin, pluginId } = viewState
+    const { plugin, pluginId } = viewState;
     function finish(msg: string): void {
-      setResult(msg)
+      setResult(msg);
       if (onInstallComplete) {
-        void onInstallComplete()
+        void onInstallComplete();
       }
-      setParentViewState({ type: 'menu' })
+      setParentViewState({ type: 'menu' });
     }
     return (
       <PluginOptionsFlow
@@ -573,40 +520,36 @@ export function DiscoverPlugins({
         onDone={(outcome, detail) => {
           switch (outcome) {
             case 'configured':
-              finish(
-                `✓ Installed and configured ${plugin.name}. Run /reload-plugins to apply.`,
-              )
-              break
+              finish(`✓ Installed and configured ${plugin.name}. Run /reload-plugins to apply.`);
+              break;
             case 'skipped':
-              finish(
-                `✓ Installed ${plugin.name}. Run /reload-plugins to apply.`,
-              )
-              break
+              finish(`✓ Installed ${plugin.name}. Run /reload-plugins to apply.`);
+              break;
             case 'error':
-              finish(`Installed but failed to save config: ${detail}`)
-              break
+              finish(`Installed but failed to save config: ${detail}`);
+              break;
           }
         }}
       />
-    )
+    );
   }
 
   // Loading state
   if (loading) {
-    return <Text>Loading…</Text>
+    return <Text>Loading…</Text>;
   }
 
   // Error state
   if (error) {
-    return <Text color="error">{error}</Text>
+    return <Text color="error">{error}</Text>;
   }
 
   // Plugin details view
   if (viewState === 'plugin-details' && selectedPlugin) {
-    const hasHomepage = selectedPlugin.entry.homepage
-    const githubRepo = extractGitHubRepo(selectedPlugin)
+    const hasHomepage = selectedPlugin.entry.homepage;
+    const githubRepo = extractGitHubRepo(selectedPlugin);
 
-    const menuOptions = buildPluginDetailsMenuOptions(hasHomepage, githubRepo)
+    const menuOptions = buildPluginDetailsMenuOptions(hasHomepage, githubRepo);
 
     return (
       <Box flexDirection="column">
@@ -617,9 +560,7 @@ export function DiscoverPlugins({
         <Box flexDirection="column" marginBottom={1}>
           <Text bold>{selectedPlugin.entry.name}</Text>
           <Text dimColor>from {selectedPlugin.marketplaceName}</Text>
-          {selectedPlugin.entry.version && (
-            <Text dimColor>Version: {selectedPlugin.entry.version}</Text>
-          )}
+          {selectedPlugin.entry.version && <Text dimColor>Version: {selectedPlugin.entry.version}</Text>}
           {selectedPlugin.entry.description && (
             <Box marginTop={1}>
               <Text>{selectedPlugin.entry.description}</Text>
@@ -651,9 +592,7 @@ export function DiscoverPlugins({
               {detailsMenuIndex === index && <Text>{'> '}</Text>}
               {detailsMenuIndex !== index && <Text>{'  '}</Text>}
               <Text bold={detailsMenuIndex === index}>
-                {isInstalling && option.action.startsWith('install-')
-                  ? 'Installing…'
-                  : option.label}
+                {isInstalling && option.action.startsWith('install-') ? 'Installing…' : option.label}
               </Text>
             </Box>
           ))}
@@ -662,23 +601,13 @@ export function DiscoverPlugins({
         <Box marginTop={1}>
           <Text dimColor>
             <Byline>
-              <ConfigurableShortcutHint
-                action="select:accept"
-                context="Select"
-                fallback="Enter"
-                description="select"
-              />
-              <ConfigurableShortcutHint
-                action="confirm:no"
-                context="Confirmation"
-                fallback="Esc"
-                description="back"
-              />
+              <ConfigurableShortcutHint action="select:accept" context="Select" fallback="Enter" description="select" />
+              <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="back" />
             </Byline>
           </Text>
         </Box>
       </Box>
-    )
+    );
   }
 
   // Empty state
@@ -695,11 +624,11 @@ export function DiscoverPlugins({
           </Text>
         </Box>
       </Box>
-    )
+    );
   }
 
   // Get visible plugins from pagination
-  const visiblePlugins = pagination.getVisibleItems(filteredPlugins)
+  const visiblePlugins = pagination.getVisibleItems(filteredPlugins);
 
   return (
     <Box flexDirection="column">
@@ -708,8 +637,7 @@ export function DiscoverPlugins({
         {pagination.needsPagination && (
           <Text dimColor>
             {' '}
-            ({pagination.scrollPosition.current}/
-            {pagination.scrollPosition.total})
+            ({pagination.scrollPosition.current}/{pagination.scrollPosition.total})
           </Text>
         )}
       </Box>
@@ -750,11 +678,11 @@ export function DiscoverPlugins({
 
       {/* Plugin list - use startIndex in key to force re-render on scroll */}
       {visiblePlugins.map((plugin, visibleIndex) => {
-        const actualIndex = pagination.toActualIndex(visibleIndex)
-        const isSelected = selectedIndex === actualIndex
-        const isSelectedForInstall = selectedForInstall.has(plugin.pluginId)
-        const isInstallingThis = installingPlugins.has(plugin.pluginId)
-        const isLast = visibleIndex === visiblePlugins.length - 1
+        const actualIndex = pagination.toActualIndex(visibleIndex);
+        const isSelected = selectedIndex === actualIndex;
+        const isSelectedForInstall = selectedForInstall.has(plugin.pluginId);
+        const isInstallingThis = installingPlugins.has(plugin.pluginId);
+        const isLast = visibleIndex === visiblePlugins.length - 1;
 
         return (
           <Box
@@ -763,43 +691,29 @@ export function DiscoverPlugins({
             marginBottom={isLast && !error ? 0 : 1}
           >
             <Box>
-              <Text
-                color={isSelected && !isSearchMode ? 'suggestion' : undefined}
-              >
+              <Text color={isSelected && !isSearchMode ? 'suggestion' : undefined}>
                 {isSelected && !isSearchMode ? figures.pointer : ' '}{' '}
               </Text>
               <Text>
-                {isInstallingThis
-                  ? figures.ellipsis
-                  : isSelectedForInstall
-                    ? figures.radioOn
-                    : figures.radioOff}{' '}
+                {isInstallingThis ? figures.ellipsis : isSelectedForInstall ? figures.radioOn : figures.radioOff}{' '}
                 {plugin.entry.name}
                 <Text dimColor> · {plugin.marketplaceName}</Text>
-                {plugin.entry.tags?.includes('community-managed') && (
-                  <Text dimColor> [Community Managed]</Text>
+                {plugin.entry.tags?.includes('community-managed') && <Text dimColor> [Community Managed]</Text>}
+                {installCounts && plugin.marketplaceName === OFFICIAL_MARKETPLACE_NAME && (
+                  <Text dimColor>
+                    {' · '}
+                    {formatInstallCount(installCounts.get(plugin.pluginId) ?? 0)} installs
+                  </Text>
                 )}
-                {installCounts &&
-                  plugin.marketplaceName === OFFICIAL_MARKETPLACE_NAME && (
-                    <Text dimColor>
-                      {' · '}
-                      {formatInstallCount(
-                        installCounts.get(plugin.pluginId) ?? 0,
-                      )}{' '}
-                      installs
-                    </Text>
-                  )}
               </Text>
             </Box>
             {plugin.entry.description && (
               <Box marginLeft={4}>
-                <Text dimColor>
-                  {truncateToWidth(plugin.entry.description, 60)}
-                </Text>
+                <Text dimColor>{truncateToWidth(plugin.entry.description, 60)}</Text>
               </Box>
             )}
           </Box>
-        )
+        );
       })}
 
       {/* Scroll down indicator */}
@@ -820,21 +734,18 @@ export function DiscoverPlugins({
 
       <DiscoverPluginsKeyHint
         hasSelection={selectedForInstall.size > 0}
-        canToggle={
-          selectedIndex < filteredPlugins.length &&
-          !filteredPlugins[selectedIndex]?.isInstalled
-        }
+        canToggle={selectedIndex < filteredPlugins.length && !filteredPlugins[selectedIndex]?.isInstalled}
       />
     </Box>
-  )
+  );
 }
 
 function DiscoverPluginsKeyHint({
   hasSelection,
   canToggle,
 }: {
-  hasSelection: boolean
-  canToggle: boolean
+  hasSelection: boolean;
+  canToggle: boolean;
 }): React.ReactNode {
   return (
     <Box marginTop={1}>
@@ -851,39 +762,20 @@ function DiscoverPluginsKeyHint({
           )}
           <Text>type to search</Text>
           {canToggle && (
-            <ConfigurableShortcutHint
-              action="plugin:toggle"
-              context="Plugin"
-              fallback="Space"
-              description="toggle"
-            />
+            <ConfigurableShortcutHint action="plugin:toggle" context="Plugin" fallback="Space" description="toggle" />
           )}
-          <ConfigurableShortcutHint
-            action="select:accept"
-            context="Select"
-            fallback="Enter"
-            description="details"
-          />
-          <ConfigurableShortcutHint
-            action="confirm:no"
-            context="Confirmation"
-            fallback="Esc"
-            description="back"
-          />
+          <ConfigurableShortcutHint action="select:accept" context="Select" fallback="Enter" description="details" />
+          <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="back" />
         </Byline>
       </Text>
     </Box>
-  )
+  );
 }
 
 /**
  * Context-aware empty state message for the Discover screen
  */
-function EmptyStateMessage({
-  reason,
-}: {
-  reason: EmptyMarketplaceReason | null
-}): React.ReactNode {
+function EmptyStateMessage({ reason }: { reason: EmptyMarketplaceReason | null }): React.ReactNode {
   switch (reason) {
     case 'git-not-installed':
       return (
@@ -891,52 +783,42 @@ function EmptyStateMessage({
           <Text dimColor>Git is required to install marketplaces.</Text>
           <Text dimColor>Please install git and restart Claude Code.</Text>
         </>
-      )
+      );
     case 'all-blocked-by-policy':
       return (
         <>
-          <Text dimColor>
-            Your organization policy does not allow any external marketplaces.
-          </Text>
+          <Text dimColor>Your organization policy does not allow any external marketplaces.</Text>
           <Text dimColor>Contact your administrator.</Text>
         </>
-      )
+      );
     case 'policy-restricts-sources':
       return (
         <>
-          <Text dimColor>
-            Your organization restricts which marketplaces can be added.
-          </Text>
-          <Text dimColor>
-            Switch to the Marketplaces tab to view allowed sources.
-          </Text>
+          <Text dimColor>Your organization restricts which marketplaces can be added.</Text>
+          <Text dimColor>Switch to the Marketplaces tab to view allowed sources.</Text>
         </>
-      )
+      );
     case 'all-marketplaces-failed':
       return (
         <>
           <Text dimColor>Failed to load marketplace data.</Text>
           <Text dimColor>Check your network connection.</Text>
         </>
-      )
+      );
     case 'all-plugins-installed':
       return (
         <>
           <Text dimColor>All available plugins are already installed.</Text>
-          <Text dimColor>
-            Check for new plugins later or add more marketplaces.
-          </Text>
+          <Text dimColor>Check for new plugins later or add more marketplaces.</Text>
         </>
-      )
+      );
     case 'no-marketplaces-configured':
     default:
       return (
         <>
           <Text dimColor>No plugins available.</Text>
-          <Text dimColor>
-            Add a marketplace first using the Marketplaces tab.
-          </Text>
+          <Text dimColor>Add a marketplace first using the Marketplaces tab.</Text>
         </>
-      )
+      );
   }
 }
diff --git a/src/commands/plugin/ManageMarketplaces.tsx b/src/commands/plugin/ManageMarketplaces.tsx
index 5ec3dbe80..2e2493d95 100644
--- a/src/commands/plugin/ManageMarketplaces.tsx
+++ b/src/commands/plugin/ManageMarketplaces.tsx
@@ -1,71 +1,65 @@
-import figures from 'figures'
-import * as React from 'react'
-import { useEffect, useRef, useState } from 'react'
+import figures from 'figures';
+import * as React from 'react';
+import { useEffect, useRef, useState } from 'react';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from 'src/services/analytics/index.js'
-import { ConfigurableShortcutHint } from '../../components/ConfigurableShortcutHint.js'
-import { Byline, KeyboardShortcutHint } from '@anthropic/ink'
+} from 'src/services/analytics/index.js';
+import { ConfigurableShortcutHint } from '../../components/ConfigurableShortcutHint.js';
+import { Byline, KeyboardShortcutHint } from '@anthropic/ink';
 // eslint-disable-next-line custom-rules/prefer-use-keybindings -- useInput needed for marketplace-specific u/r shortcuts and y/n confirmation not in keybinding schema
-import { Box, Text, useInput } from '@anthropic/ink'
-import {
-  useKeybinding,
-  useKeybindings,
-} from '../../keybindings/useKeybinding.js'
-import type { LoadedPlugin } from '../../types/plugin.js'
-import { count } from '../../utils/array.js'
-import { shouldSkipPluginAutoupdate } from '../../utils/config.js'
-import { errorMessage } from '../../utils/errors.js'
-import { clearAllCaches } from '../../utils/plugins/cacheUtils.js'
+import { Box, Text, useInput } from '@anthropic/ink';
+import { useKeybinding, useKeybindings } from '../../keybindings/useKeybinding.js';
+import type { LoadedPlugin } from '../../types/plugin.js';
+import { count } from '../../utils/array.js';
+import { shouldSkipPluginAutoupdate } from '../../utils/config.js';
+import { errorMessage } from '../../utils/errors.js';
+import { clearAllCaches } from '../../utils/plugins/cacheUtils.js';
 import {
   createPluginId,
   formatMarketplaceLoadingErrors,
   getMarketplaceSourceDisplay,
   loadMarketplacesWithGracefulDegradation,
-} from '../../utils/plugins/marketplaceHelpers.js'
+} from '../../utils/plugins/marketplaceHelpers.js';
 import {
   loadKnownMarketplacesConfig,
   refreshMarketplace,
   removeMarketplaceSource,
   setMarketplaceAutoUpdate,
-} from '../../utils/plugins/marketplaceManager.js'
-import { updatePluginsForMarketplaces } from '../../utils/plugins/pluginAutoupdate.js'
-import { loadAllPlugins } from '../../utils/plugins/pluginLoader.js'
-import { isMarketplaceAutoUpdate } from '../../utils/plugins/schemas.js'
-import {
-  getSettingsForSource,
-  updateSettingsForSource,
-} from '../../utils/settings/settings.js'
-import { plural } from '../../utils/stringUtils.js'
-import type { ViewState } from './types.js'
+} from '../../utils/plugins/marketplaceManager.js';
+import { updatePluginsForMarketplaces } from '../../utils/plugins/pluginAutoupdate.js';
+import { loadAllPlugins } from '../../utils/plugins/pluginLoader.js';
+import { isMarketplaceAutoUpdate } from '../../utils/plugins/schemas.js';
+import { getSettingsForSource, updateSettingsForSource } from '../../utils/settings/settings.js';
+import { plural } from '../../utils/stringUtils.js';
+import type { ViewState } from './types.js';
 
 type Props = {
-  setViewState: (state: ViewState) => void
-  error?: string | null
-  setError?: (error: string | null) => void
-  setResult: (result: string | null) => void
+  setViewState: (state: ViewState) => void;
+  error?: string | null;
+  setError?: (error: string | null) => void;
+  setResult: (result: string | null) => void;
   exitState: {
-    pending: boolean
-    keyName: 'Ctrl-C' | 'Ctrl-D' | null
-  }
-  onManageComplete?: () => void | Promise<void>
-  targetMarketplace?: string
-  action?: 'update' | 'remove'
-}
+    pending: boolean;
+    keyName: 'Ctrl-C' | 'Ctrl-D' | null;
+  };
+  onManageComplete?: () => void | Promise<void>;
+  targetMarketplace?: string;
+  action?: 'update' | 'remove';
+};
 
 type MarketplaceState = {
-  name: string
-  source: string
-  lastUpdated?: string
-  pluginCount?: number
-  installedPlugins?: LoadedPlugin[]
-  pendingUpdate?: boolean
-  pendingRemove?: boolean
-  autoUpdate?: boolean
-}
+  name: string;
+  source: string;
+  lastUpdated?: string;
+  pluginCount?: number;
+  installedPlugins?: LoadedPlugin[];
+  pendingUpdate?: boolean;
+  pendingRemove?: boolean;
+  autoUpdate?: boolean;
+};
 
-type InternalViewState = 'list' | 'details' | 'confirm-remove'
+type InternalViewState = 'list' | 'details' | 'confirm-remove';
 
 export function ManageMarketplaces({
   setViewState,
@@ -77,39 +71,33 @@ export function ManageMarketplaces({
   targetMarketplace,
   action,
 }: Props): React.ReactNode {
-  const [marketplaceStates, setMarketplaceStates] = useState<
-    MarketplaceState[]
-  >([])
-  const [loading, setLoading] = useState(true)
-  const [selectedIndex, setSelectedIndex] = useState(0)
-  const [isProcessing, setIsProcessing] = useState(false)
-  const [processError, setProcessError] = useState<string | null>(null)
-  const [successMessage, setSuccessMessage] = useState<string | null>(null)
-  const [progressMessage, setProgressMessage] = useState<string | null>(null)
-  const [internalView, setInternalView] = useState<InternalViewState>('list')
-  const [selectedMarketplace, setSelectedMarketplace] =
-    useState<MarketplaceState | null>(null)
-  const [detailsMenuIndex, setDetailsMenuIndex] = useState(0)
-  const hasAttemptedAutoAction = useRef(false)
+  const [marketplaceStates, setMarketplaceStates] = useState<MarketplaceState[]>([]);
+  const [loading, setLoading] = useState(true);
+  const [selectedIndex, setSelectedIndex] = useState(0);
+  const [isProcessing, setIsProcessing] = useState(false);
+  const [processError, setProcessError] = useState<string | null>(null);
+  const [successMessage, setSuccessMessage] = useState<string | null>(null);
+  const [progressMessage, setProgressMessage] = useState<string | null>(null);
+  const [internalView, setInternalView] = useState<InternalViewState>('list');
+  const [selectedMarketplace, setSelectedMarketplace] = useState<MarketplaceState | null>(null);
+  const [detailsMenuIndex, setDetailsMenuIndex] = useState(0);
+  const hasAttemptedAutoAction = useRef(false);
 
   // Load marketplaces and their installed plugins
   useEffect(() => {
     async function loadMarketplaces() {
       try {
-        const config = await loadKnownMarketplacesConfig()
-        const { enabled, disabled } = await loadAllPlugins()
-        const allPlugins = [...enabled, ...disabled]
+        const config = await loadKnownMarketplacesConfig();
+        const { enabled, disabled } = await loadAllPlugins();
+        const allPlugins = [...enabled, ...disabled];
 
         // Load marketplaces with graceful degradation
-        const { marketplaces, failures } =
-          await loadMarketplacesWithGracefulDegradation(config)
+        const { marketplaces, failures } = await loadMarketplacesWithGracefulDegradation(config);
 
-        const states: MarketplaceState[] = []
+        const states: MarketplaceState[] = [];
         for (const { name, config: entry, data: marketplace } of marketplaces) {
           // Get all plugins installed from this marketplace
-          const installedFromMarketplace = allPlugins.filter(plugin =>
-            plugin.source.endsWith(`@${name}`),
-          )
+          const installedFromMarketplace = allPlugins.filter(plugin => plugin.source.endsWith(`@${name}`));
 
           states.push({
             name,
@@ -120,149 +108,135 @@ export function ManageMarketplaces({
             pendingUpdate: false,
             pendingRemove: false,
             autoUpdate: isMarketplaceAutoUpdate(name, entry),
-          })
+          });
         }
 
         // Sort: claude-plugin-directory first, then alphabetically
         states.sort((a, b) => {
-          if (a.name === 'claude-plugin-directory') return -1
-          if (b.name === 'claude-plugin-directory') return 1
-          return a.name.localeCompare(b.name)
-        })
-        setMarketplaceStates(states)
+          if (a.name === 'claude-plugin-directory') return -1;
+          if (b.name === 'claude-plugin-directory') return 1;
+          return a.name.localeCompare(b.name);
+        });
+        setMarketplaceStates(states);
 
         // Handle marketplace loading errors/warnings
-        const successCount = count(marketplaces, m => m.data !== null)
-        const errorResult = formatMarketplaceLoadingErrors(
-          failures,
-          successCount,
-        )
+        const successCount = count(marketplaces, m => m.data !== null);
+        const errorResult = formatMarketplaceLoadingErrors(failures, successCount);
         if (errorResult) {
           if (errorResult.type === 'warning') {
-            setProcessError(errorResult.message)
+            setProcessError(errorResult.message);
           } else {
-            throw new Error(errorResult.message)
+            throw new Error(errorResult.message);
           }
         }
 
         // Auto-execute if target and action provided
         if (targetMarketplace && !hasAttemptedAutoAction.current && !error) {
-          hasAttemptedAutoAction.current = true
-          const targetIndex = states.findIndex(
-            s => s.name === targetMarketplace,
-          )
+          hasAttemptedAutoAction.current = true;
+          const targetIndex = states.findIndex(s => s.name === targetMarketplace);
           if (targetIndex >= 0) {
-            const targetState = states[targetIndex]
+            const targetState = states[targetIndex];
             if (action) {
               // Mark the action as pending and execute
-              setSelectedIndex(targetIndex + 1) // +1 because "Add Marketplace" is at index 0
-              const newStates = [...states]
+              setSelectedIndex(targetIndex + 1); // +1 because "Add Marketplace" is at index 0
+              const newStates = [...states];
               if (action === 'update') {
-                newStates[targetIndex]!.pendingUpdate = true
+                newStates[targetIndex]!.pendingUpdate = true;
               } else if (action === 'remove') {
-                newStates[targetIndex]!.pendingRemove = true
+                newStates[targetIndex]!.pendingRemove = true;
               }
-              setMarketplaceStates(newStates)
+              setMarketplaceStates(newStates);
               // Apply the change immediately
-              setTimeout(applyChanges, 100, newStates)
+              setTimeout(applyChanges, 100, newStates);
             } else if (targetState) {
               // No action - just show the details view for this marketplace
-              setSelectedIndex(targetIndex + 1) // +1 because "Add Marketplace" is at index 0
-              setSelectedMarketplace(targetState)
-              setInternalView('details')
+              setSelectedIndex(targetIndex + 1); // +1 because "Add Marketplace" is at index 0
+              setSelectedMarketplace(targetState);
+              setInternalView('details');
             }
           } else if (setError) {
-            setError(`Marketplace not found: ${targetMarketplace}`)
+            setError(`Marketplace not found: ${targetMarketplace}`);
           }
         }
       } catch (err) {
         if (setError) {
-          setError(
-            err instanceof Error ? err.message : 'Failed to load marketplaces',
-          )
+          setError(err instanceof Error ? err.message : 'Failed to load marketplaces');
         }
-        setProcessError(
-          err instanceof Error ? err.message : 'Failed to load marketplaces',
-        )
+        setProcessError(err instanceof Error ? err.message : 'Failed to load marketplaces');
       } finally {
-        setLoading(false)
+        setLoading(false);
       }
     }
-    void loadMarketplaces()
+    void loadMarketplaces();
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    // biome-ignore lint/correctness/useExhaustiveDependencies: intentional
-  }, [targetMarketplace, action, error])
+  }, [targetMarketplace, action, error]);
 
   // Check if there are any pending changes
   const hasPendingChanges = () => {
-    return marketplaceStates.some(
-      state => state.pendingUpdate || state.pendingRemove,
-    )
-  }
+    return marketplaceStates.some(state => state.pendingUpdate || state.pendingRemove);
+  };
 
   // Get count of pending operations
   const getPendingCounts = () => {
-    const updateCount = count(marketplaceStates, s => s.pendingUpdate)
-    const removeCount = count(marketplaceStates, s => s.pendingRemove)
-    return { updateCount, removeCount }
-  }
+    const updateCount = count(marketplaceStates, s => s.pendingUpdate);
+    const removeCount = count(marketplaceStates, s => s.pendingRemove);
+    return { updateCount, removeCount };
+  };
 
   // Apply all pending changes
   const applyChanges = async (states?: MarketplaceState[]) => {
-    const statesToProcess = states || marketplaceStates
-    const wasInDetailsView = internalView === 'details'
-    setIsProcessing(true)
-    setProcessError(null)
-    setSuccessMessage(null)
-    setProgressMessage(null)
+    const statesToProcess = states || marketplaceStates;
+    const wasInDetailsView = internalView === 'details';
+    setIsProcessing(true);
+    setProcessError(null);
+    setSuccessMessage(null);
+    setProgressMessage(null);
 
     try {
-      const settings = getSettingsForSource('userSettings')
-      let updatedCount = 0
-      let removedCount = 0
-      const refreshedMarketplaces = new Set<string>()
+      const settings = getSettingsForSource('userSettings');
+      let updatedCount = 0;
+      let removedCount = 0;
+      const refreshedMarketplaces = new Set<string>();
 
       for (const state of statesToProcess) {
         // Handle remove
         if (state.pendingRemove) {
           // First uninstall all plugins from this marketplace
           if (state.installedPlugins && state.installedPlugins.length > 0) {
-            const newEnabledPlugins = { ...settings?.enabledPlugins }
+            const newEnabledPlugins = { ...settings?.enabledPlugins };
             for (const plugin of state.installedPlugins) {
-              const pluginId = createPluginId(plugin.name, state.name)
+              const pluginId = createPluginId(plugin.name, state.name);
               // Mark as disabled/uninstalled
-              newEnabledPlugins[pluginId] = false
+              newEnabledPlugins[pluginId] = false;
             }
             updateSettingsForSource('userSettings', {
               enabledPlugins: newEnabledPlugins,
-            })
+            });
           }
 
           // Then remove the marketplace
-          await removeMarketplaceSource(state.name)
-          removedCount++
+          await removeMarketplaceSource(state.name);
+          removedCount++;
 
           logEvent('tengu_marketplace_removed', {
-            marketplace_name:
-              state.name as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+            marketplace_name: state.name as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
             plugins_uninstalled: state.installedPlugins?.length || 0,
-          })
-          continue
+          });
+          continue;
         }
 
         // Handle update
         if (state.pendingUpdate) {
           // Refresh individual marketplace for efficiency with progress reporting
           await refreshMarketplace(state.name, (message: string) => {
-            setProgressMessage(message)
-          })
-          updatedCount++
-          refreshedMarketplaces.add(state.name.toLowerCase())
+            setProgressMessage(message);
+          });
+          updatedCount++;
+          refreshedMarketplaces.add(state.name.toLowerCase());
 
           logEvent('tengu_marketplace_updated', {
-            marketplace_name:
-              state.name as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-          })
+            marketplace_name: state.name as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          });
         }
       }
 
@@ -274,35 +248,30 @@ export function ManageMarketplaces({
       // stamps the NEW dir with .orphaned_at on the next startup. See #29512.
       // updatePluginOp (called inside the helper) is what actually writes
       // installed_plugins.json via updateInstallationPathOnDisk.
-      let updatedPluginCount = 0
+      let updatedPluginCount = 0;
       if (refreshedMarketplaces.size > 0) {
-        const updatedPluginIds = await updatePluginsForMarketplaces(
-          refreshedMarketplaces,
-        )
-        updatedPluginCount = updatedPluginIds.length
+        const updatedPluginIds = await updatePluginsForMarketplaces(refreshedMarketplaces);
+        updatedPluginCount = updatedPluginIds.length;
       }
 
       // Clear caches after changes
-      clearAllCaches()
+      clearAllCaches();
 
       // Call completion callback
       if (onManageComplete) {
-        await onManageComplete()
+        await onManageComplete();
       }
 
       // Reload marketplace data to show updated timestamps
-      const config = await loadKnownMarketplacesConfig()
-      const { enabled, disabled } = await loadAllPlugins()
-      const allPlugins = [...enabled, ...disabled]
+      const config = await loadKnownMarketplacesConfig();
+      const { enabled, disabled } = await loadAllPlugins();
+      const allPlugins = [...enabled, ...disabled];
 
-      const { marketplaces } =
-        await loadMarketplacesWithGracefulDegradation(config)
+      const { marketplaces } = await loadMarketplacesWithGracefulDegradation(config);
 
-      const newStates: MarketplaceState[] = []
+      const newStates: MarketplaceState[] = [];
       for (const { name, config: entry, data: marketplace } of marketplaces) {
-        const installedFromMarketplace = allPlugins.filter(plugin =>
-          plugin.source.endsWith(`@${name}`),
-        )
+        const installedFromMarketplace = allPlugins.filter(plugin => plugin.source.endsWith(`@${name}`));
 
         newStates.push({
           name,
@@ -313,93 +282,83 @@ export function ManageMarketplaces({
           pendingUpdate: false,
           pendingRemove: false,
           autoUpdate: isMarketplaceAutoUpdate(name, entry),
-        })
+        });
       }
 
       // Sort: claude-plugin-directory first, then alphabetically
       newStates.sort((a, b) => {
-        if (a.name === 'claude-plugin-directory') return -1
-        if (b.name === 'claude-plugin-directory') return 1
-        return a.name.localeCompare(b.name)
-      })
-      setMarketplaceStates(newStates)
+        if (a.name === 'claude-plugin-directory') return -1;
+        if (b.name === 'claude-plugin-directory') return 1;
+        return a.name.localeCompare(b.name);
+      });
+      setMarketplaceStates(newStates);
 
       // Update selected marketplace reference with fresh data
       if (wasInDetailsView && selectedMarketplace) {
-        const updatedMarketplace = newStates.find(
-          s => s.name === selectedMarketplace.name,
-        )
+        const updatedMarketplace = newStates.find(s => s.name === selectedMarketplace.name);
         if (updatedMarketplace) {
-          setSelectedMarketplace(updatedMarketplace)
+          setSelectedMarketplace(updatedMarketplace);
         }
       }
 
       // Build success message
-      const actions: string[] = []
+      const actions: string[] = [];
       if (updatedCount > 0) {
         const pluginPart =
-          updatedPluginCount > 0
-            ? ` (${updatedPluginCount} ${plural(updatedPluginCount, 'plugin')} bumped)`
-            : ''
-        actions.push(
-          `Updated ${updatedCount} ${plural(updatedCount, 'marketplace')}${pluginPart}`,
-        )
+          updatedPluginCount > 0 ? ` (${updatedPluginCount} ${plural(updatedPluginCount, 'plugin')} bumped)` : '';
+        actions.push(`Updated ${updatedCount} ${plural(updatedCount, 'marketplace')}${pluginPart}`);
       }
       if (removedCount > 0) {
-        actions.push(
-          `Removed ${removedCount} ${plural(removedCount, 'marketplace')}`,
-        )
+        actions.push(`Removed ${removedCount} ${plural(removedCount, 'marketplace')}`);
       }
 
       if (actions.length > 0) {
-        const successMsg = `${figures.tick} ${actions.join(', ')}`
+        const successMsg = `${figures.tick} ${actions.join(', ')}`;
         // If we were in details view, stay there and show success
         if (wasInDetailsView) {
-          setSuccessMessage(successMsg)
+          setSuccessMessage(successMsg);
         } else {
           // Otherwise show result and exit to menu
-          setResult(successMsg)
-          setTimeout(setViewState, 2000, { type: 'menu' as const })
+          setResult(successMsg);
+          setTimeout(setViewState, 2000, { type: 'menu' as const });
         }
       } else if (!wasInDetailsView) {
-        setViewState({ type: 'menu' })
+        setViewState({ type: 'menu' });
       }
     } catch (err) {
-      const errorMsg = errorMessage(err)
-      setProcessError(errorMsg)
+      const errorMsg = errorMessage(err);
+      setProcessError(errorMsg);
       if (setError) {
-        setError(errorMsg)
+        setError(errorMsg);
       }
     } finally {
-      setIsProcessing(false)
-      setProgressMessage(null)
+      setIsProcessing(false);
+      setProgressMessage(null);
     }
-  }
+  };
 
   // Handle confirming marketplace removal
   const confirmRemove = async () => {
-    if (!selectedMarketplace) return
+    if (!selectedMarketplace) return;
 
     // Mark for removal and apply
     const newStates = marketplaceStates.map(state =>
-      state.name === selectedMarketplace.name
-        ? { ...state, pendingRemove: true }
-        : state,
-    )
-    setMarketplaceStates(newStates)
-    await applyChanges(newStates)
-  }
+      state.name === selectedMarketplace.name ? { ...state, pendingRemove: true } : state,
+    );
+    setMarketplaceStates(newStates);
+    await applyChanges(newStates);
+  };
 
   // Build menu options for details view
   const buildDetailsMenuOptions = (
     marketplace: MarketplaceState | null,
   ): Array<{ label: string; secondaryLabel?: string; value: string }> => {
-    if (!marketplace) return []
+    if (!marketplace) return [];
 
     const options: Array<{
-      label: string
-      secondaryLabel?: string
-      value: string
+      label: string;
+      secondaryLabel?: string;
+      value: string;
     }> = [
       {
         label: `Browse plugins (${marketplace.pluginCount ?? 0})`,
@@ -412,63 +371,51 @@ export function ManageMarketplaces({
           : undefined,
         value: 'update',
       },
-    ]
+    ];
 
     // Only show auto-update toggle if auto-updater is not globally disabled
     if (!shouldSkipPluginAutoupdate()) {
       options.push({
-        label: marketplace.autoUpdate
-          ? 'Disable auto-update'
-          : 'Enable auto-update',
+        label: marketplace.autoUpdate ? 'Disable auto-update' : 'Enable auto-update',
         value: 'toggle-auto-update',
-      })
+      });
     }
 
-    options.push({ label: 'Remove marketplace', value: 'remove' })
+    options.push({ label: 'Remove marketplace', value: 'remove' });
 
-    return options
-  }
+    return options;
+  };
 
   // Handle toggling auto-update for a marketplace
   const handleToggleAutoUpdate = async (marketplace: MarketplaceState) => {
-    const newAutoUpdate = !marketplace.autoUpdate
+    const newAutoUpdate = !marketplace.autoUpdate;
     try {
-      await setMarketplaceAutoUpdate(marketplace.name, newAutoUpdate)
+      await setMarketplaceAutoUpdate(marketplace.name, newAutoUpdate);
 
       // Update local state
       setMarketplaceStates(prev =>
-        prev.map(state =>
-          state.name === marketplace.name
-            ? { ...state, autoUpdate: newAutoUpdate }
-            : state,
-        ),
-      )
+        prev.map(state => (state.name === marketplace.name ? { ...state, autoUpdate: newAutoUpdate } : state)),
+      );
 
       // Update selected marketplace reference
-      setSelectedMarketplace(prev =>
-        prev ? { ...prev, autoUpdate: newAutoUpdate } : prev,
-      )
+      setSelectedMarketplace(prev => (prev ? { ...prev, autoUpdate: newAutoUpdate } : prev));
     } catch (err) {
-      setProcessError(
-        err instanceof Error ? err.message : 'Failed to update setting',
-      )
+      setProcessError(err instanceof Error ? err.message : 'Failed to update setting');
     }
-  }
+  };
 
   // Escape in details or confirm-remove view - go back to list
   useKeybinding(
     'confirm:no',
     () => {
-      setInternalView('list')
-      setDetailsMenuIndex(0)
+      setInternalView('list');
+      setDetailsMenuIndex(0);
     },
     {
       context: 'Confirmation',
-      isActive:
-        !isProcessing &&
-        (internalView === 'details' || internalView === 'confirm-remove'),
+      isActive: !isProcessing && (internalView === 'details' || internalView === 'confirm-remove'),
     },
-  )
+  );
 
   // Escape in list view with pending changes - clear pending changes
   useKeybinding(
@@ -480,59 +427,58 @@ export function ManageMarketplaces({
           pendingUpdate: false,
           pendingRemove: false,
         })),
-      )
-      setSelectedIndex(0)
+      );
+      setSelectedIndex(0);
     },
     {
       context: 'Confirmation',
       isActive: !isProcessing && internalView === 'list' && hasPendingChanges(),
     },
-  )
+  );
 
   // Escape in list view without pending changes - exit to parent menu
   useKeybinding(
     'confirm:no',
     () => {
-      setViewState({ type: 'menu' })
+      setViewState({ type: 'menu' });
     },
     {
       context: 'Confirmation',
-      isActive:
-        !isProcessing && internalView === 'list' && !hasPendingChanges(),
+      isActive: !isProcessing && internalView === 'list' && !hasPendingChanges(),
     },
-  )
+  );
 
   // List view — navigation (up/down/enter via configurable keybindings)
   useKeybindings(
     {
       'select:previous': () => setSelectedIndex(prev => Math.max(0, prev - 1)),
       'select:next': () => {
-        const totalItems = marketplaceStates.length + 1
-        setSelectedIndex(prev => Math.min(totalItems - 1, prev + 1))
+        const totalItems = marketplaceStates.length + 1;
+        setSelectedIndex(prev => Math.min(totalItems - 1, prev + 1));
       },
       'select:accept': () => {
-        const marketplaceIndex = selectedIndex - 1
+        const marketplaceIndex = selectedIndex - 1;
         if (selectedIndex === 0) {
-          setViewState({ type: 'add-marketplace' })
+          setViewState({ type: 'add-marketplace' });
         } else if (hasPendingChanges()) {
-          void applyChanges()
+          void applyChanges();
         } else {
-          const marketplace = marketplaceStates[marketplaceIndex]
+          const marketplace = marketplaceStates[marketplaceIndex];
           if (marketplace) {
-            setSelectedMarketplace(marketplace)
-            setInternalView('details')
-            setDetailsMenuIndex(0)
+            setSelectedMarketplace(marketplace);
+            setInternalView('details');
+            setDetailsMenuIndex(0);
           }
         }
       },
     },
     { context: 'Select', isActive: !isProcessing && internalView === 'list' },
-  )
+  );
 
   // List view — marketplace-specific actions (u/r shortcuts)
   useInput(
     input => {
-      const marketplaceIndex = selectedIndex - 1
+      const marketplaceIndex = selectedIndex - 1;
       if ((input === 'u' || input === 'U') && marketplaceIndex >= 0) {
         setMarketplaceStates(prev =>
           prev.map((state, idx) =>
@@ -540,54 +486,49 @@ export function ManageMarketplaces({
               ? {
                   ...state,
                   pendingUpdate: !state.pendingUpdate,
-                  pendingRemove: state.pendingUpdate
-                    ? state.pendingRemove
-                    : false,
+                  pendingRemove: state.pendingUpdate ? state.pendingRemove : false,
                 }
               : state,
           ),
-        )
+        );
       } else if ((input === 'r' || input === 'R') && marketplaceIndex >= 0) {
-        const marketplace = marketplaceStates[marketplaceIndex]
+        const marketplace = marketplaceStates[marketplaceIndex];
         if (marketplace) {
-          setSelectedMarketplace(marketplace)
-          setInternalView('confirm-remove')
+          setSelectedMarketplace(marketplace);
+          setInternalView('confirm-remove');
         }
       }
     },
     { isActive: !isProcessing && internalView === 'list' },
-  )
+  );
 
   // Details view — navigation
   useKeybindings(
     {
-      'select:previous': () =>
-        setDetailsMenuIndex(prev => Math.max(0, prev - 1)),
+      'select:previous': () => setDetailsMenuIndex(prev => Math.max(0, prev - 1)),
       'select:next': () => {
-        const menuOptions = buildDetailsMenuOptions(selectedMarketplace)
-        setDetailsMenuIndex(prev => Math.min(menuOptions.length - 1, prev + 1))
+        const menuOptions = buildDetailsMenuOptions(selectedMarketplace);
+        setDetailsMenuIndex(prev => Math.min(menuOptions.length - 1, prev + 1));
       },
       'select:accept': () => {
-        if (!selectedMarketplace) return
-        const menuOptions = buildDetailsMenuOptions(selectedMarketplace)
-        const selectedOption = menuOptions[detailsMenuIndex]
+        if (!selectedMarketplace) return;
+        const menuOptions = buildDetailsMenuOptions(selectedMarketplace);
+        const selectedOption = menuOptions[detailsMenuIndex];
         if (selectedOption?.value === 'browse') {
           setViewState({
             type: 'browse-marketplace',
             targetMarketplace: selectedMarketplace.name,
-          })
+          });
         } else if (selectedOption?.value === 'update') {
           const newStates = marketplaceStates.map(state =>
-            state.name === selectedMarketplace.name
-              ? { ...state, pendingUpdate: true }
-              : state,
-          )
-          setMarketplaceStates(newStates)
-          void applyChanges(newStates)
+            state.name === selectedMarketplace.name ? { ...state, pendingUpdate: true } : state,
+          );
+          setMarketplaceStates(newStates);
+          void applyChanges(newStates);
         } else if (selectedOption?.value === 'toggle-auto-update') {
-          void handleToggleAutoUpdate(selectedMarketplace)
+          void handleToggleAutoUpdate(selectedMarketplace);
         } else if (selectedOption?.value === 'remove') {
-          setInternalView('confirm-remove')
+          setInternalView('confirm-remove');
         }
       },
     },
@@ -595,23 +536,23 @@ export function ManageMarketplaces({
       context: 'Select',
       isActive: !isProcessing && internalView === 'details',
     },
-  )
+  );
 
   // Confirm-remove view — y/n input
   useInput(
     input => {
       if (input === 'y' || input === 'Y') {
-        void confirmRemove()
+        void confirmRemove();
       } else if (input === 'n' || input === 'N') {
-        setInternalView('list')
-        setSelectedMarketplace(null)
+        setInternalView('list');
+        setSelectedMarketplace(null);
       }
     },
     { isActive: !isProcessing && internalView === 'confirm-remove' },
-  )
+  );
 
   if (loading) {
-    return <Text>Loading marketplaces…</Text>
+    return <Text>Loading marketplaces…</Text>;
   }
 
   if (marketplaceStates.length === 0) {
@@ -652,12 +593,12 @@ export function ManageMarketplaces({
           </Text>
         </Box>
       </Box>
-    )
+    );
   }
 
   // Show confirmation dialog
   if (internalView === 'confirm-remove' && selectedMarketplace) {
-    const pluginCount = selectedMarketplace.installedPlugins?.length || 0
+    const pluginCount = selectedMarketplace.installedPlugins?.length || 0;
     return (
       <Box flexDirection="column">
         <Text bold color="warning">
@@ -667,39 +608,36 @@ export function ManageMarketplaces({
           {pluginCount > 0 && (
             <Box marginTop={1}>
               <Text color="warning">
-                This will also uninstall {pluginCount}{' '}
-                {plural(pluginCount, 'plugin')} from this marketplace:
+                This will also uninstall {pluginCount} {plural(pluginCount, 'plugin')} from this marketplace:
               </Text>
             </Box>
           )}
-          {selectedMarketplace.installedPlugins &&
-            selectedMarketplace.installedPlugins.length > 0 && (
-              <Box flexDirection="column" marginTop={1} marginLeft={2}>
-                {selectedMarketplace.installedPlugins.map(plugin => (
-                  <Text key={plugin.name} dimColor>
-                    • {plugin.name}
-                  </Text>
-                ))}
-              </Box>
-            )}
+          {selectedMarketplace.installedPlugins && selectedMarketplace.installedPlugins.length > 0 && (
+            <Box flexDirection="column" marginTop={1} marginLeft={2}>
+              {selectedMarketplace.installedPlugins.map(plugin => (
+                <Text key={plugin.name} dimColor>
+                  • {plugin.name}
+                </Text>
+              ))}
+            </Box>
+          )}
           <Box marginTop={1}>
             <Text>
-              Press <Text bold>y</Text> to confirm or <Text bold>n</Text> to
-              cancel
+              Press <Text bold>y</Text> to confirm or <Text bold>n</Text> to cancel
             </Text>
           </Box>
         </Box>
       </Box>
-    )
+    );
   }
 
   // Show marketplace details
   if (internalView === 'details' && selectedMarketplace) {
     // Check if this marketplace is currently being processed
     // Check pendingUpdate first so we show updating state immediately when user presses Enter
-    const isUpdating = selectedMarketplace.pendingUpdate || isProcessing
+    const isUpdating = selectedMarketplace.pendingUpdate || isProcessing;
 
-    const menuOptions = buildDetailsMenuOptions(selectedMarketplace)
+    const menuOptions = buildDetailsMenuOptions(selectedMarketplace);
 
     return (
       <Box flexDirection="column">
@@ -707,32 +645,30 @@ export function ManageMarketplaces({
         <Text dimColor>{selectedMarketplace.source}</Text>
         <Box marginTop={1}>
           <Text>
-            {selectedMarketplace.pluginCount || 0} available{' '}
-            {plural(selectedMarketplace.pluginCount || 0, 'plugin')}
+            {selectedMarketplace.pluginCount || 0} available {plural(selectedMarketplace.pluginCount || 0, 'plugin')}
           </Text>
         </Box>
 
         {/* Installed plugins section */}
-        {selectedMarketplace.installedPlugins &&
-          selectedMarketplace.installedPlugins.length > 0 && (
-            <Box flexDirection="column" marginTop={1}>
-              <Text bold>
-                Installed plugins ({selectedMarketplace.installedPlugins.length}
-                ):
-              </Text>
-              <Box flexDirection="column" marginLeft={1}>
-                {selectedMarketplace.installedPlugins.map(plugin => (
-                  <Box key={plugin.name} flexDirection="row" gap={1}>
-                    <Text>{figures.bullet}</Text>
-                    <Box flexDirection="column">
-                      <Text>{plugin.name}</Text>
-                      <Text dimColor>{plugin.manifest.description}</Text>
-                    </Box>
+        {selectedMarketplace.installedPlugins && selectedMarketplace.installedPlugins.length > 0 && (
+          <Box flexDirection="column" marginTop={1}>
+            <Text bold>
+              Installed plugins ({selectedMarketplace.installedPlugins.length}
+              ):
+            </Text>
+            <Box flexDirection="column" marginLeft={1}>
+              {selectedMarketplace.installedPlugins.map(plugin => (
+                <Box key={plugin.name} flexDirection="row" gap={1}>
+                  <Text>{figures.bullet}</Text>
+                  <Box flexDirection="column">
+                    <Text>{plugin.name}</Text>
+                    <Text dimColor>{plugin.manifest.description}</Text>
                   </Box>
-                ))}
-              </Box>
+                </Box>
+              ))}
             </Box>
-          )}
+          </Box>
+        )}
 
         {/* Processing indicator */}
         {isUpdating && (
@@ -760,33 +696,28 @@ export function ManageMarketplaces({
         {!isUpdating && (
           <Box flexDirection="column" marginTop={1}>
             {menuOptions.map((option, idx) => {
-              if (!option) return null
-              const isSelected = idx === detailsMenuIndex
+              if (!option) return null;
+              const isSelected = idx === detailsMenuIndex;
               return (
                 <Box key={option.value}>
                   <Text color={isSelected ? 'suggestion' : undefined}>
                     {isSelected ? figures.pointer : ' '} {option.label}
                   </Text>
-                  {option.secondaryLabel && (
-                    <Text dimColor> {option.secondaryLabel}</Text>
-                  )}
+                  {option.secondaryLabel && <Text dimColor> {option.secondaryLabel}</Text>}
                 </Box>
-              )
+              );
             })}
           </Box>
         )}
 
         {/* Show explanatory text at the bottom when auto-update is enabled */}
-        {!isUpdating &&
-          !shouldSkipPluginAutoupdate() &&
-          selectedMarketplace.autoUpdate && (
-            <Box marginTop={1}>
-              <Text dimColor>
-                Auto-update enabled. Claude Code will automatically update this
-                marketplace and its installed plugins.
-              </Text>
-            </Box>
-          )}
+        {!isUpdating && !shouldSkipPluginAutoupdate() && selectedMarketplace.autoUpdate && (
+          <Box marginTop={1}>
+            <Text dimColor>
+              Auto-update enabled. Claude Code will automatically update this marketplace and its installed plugins.
+            </Text>
+          </Box>
+        )}
 
         <Box marginLeft={3}>
           <Text dimColor italic>
@@ -811,11 +742,11 @@ export function ManageMarketplaces({
           </Text>
         </Box>
       </Box>
-    )
+    );
   }
 
   // Show marketplace list
-  const { updateCount, removeCount } = getPendingCounts()
+  const { updateCount, removeCount } = getPendingCounts();
 
   return (
     <Box flexDirection="column">
@@ -836,58 +767,38 @@ export function ManageMarketplaces({
       {/* Marketplace list */}
       <Box flexDirection="column">
         {marketplaceStates.map((state, idx) => {
-          const isSelected = idx + 1 === selectedIndex // +1 because Add Marketplace is at index 0
+          const isSelected = idx + 1 === selectedIndex; // +1 because Add Marketplace is at index 0
 
           // Build status indicators
-          const indicators: string[] = []
-          if (state.pendingUpdate) indicators.push('UPDATE')
-          if (state.pendingRemove) indicators.push('REMOVE')
+          const indicators: string[] = [];
+          if (state.pendingUpdate) indicators.push('UPDATE');
+          if (state.pendingRemove) indicators.push('REMOVE');
 
           return (
             <Box key={state.name} flexDirection="row" gap={1} marginBottom={1}>
               <Text color={isSelected ? 'suggestion' : undefined}>
-                {isSelected ? figures.pointer : ' '}{' '}
-                {state.pendingRemove ? figures.cross : figures.bullet}
+                {isSelected ? figures.pointer : ' '} {state.pendingRemove ? figures.cross : figures.bullet}
               </Text>
               <Box flexDirection="column" flexGrow={1}>
                 <Box flexDirection="row" gap={1}>
-                  <Text
-                    bold
-                    strikethrough={state.pendingRemove}
-                    dimColor={state.pendingRemove}
-                  >
-                    {state.name === 'claude-plugins-official' && (
-                      <Text color="claude">✻ </Text>
-                    )}
+                  <Text bold strikethrough={state.pendingRemove} dimColor={state.pendingRemove}>
+                    {state.name === 'claude-plugins-official' && <Text color="claude">✻ </Text>}
                     {state.name}
-                    {state.name === 'claude-plugins-official' && (
-                      <Text color="claude"> ✻</Text>
-                    )}
+                    {state.name === 'claude-plugins-official' && <Text color="claude"> ✻</Text>}
                   </Text>
-                  {indicators.length > 0 && (
-                    <Text color="warning">[{indicators.join(', ')}]</Text>
-                  )}
+                  {indicators.length > 0 && <Text color="warning">[{indicators.join(', ')}]</Text>}
                 </Box>
                 <Text dimColor>{state.source}</Text>
                 <Text dimColor>
-                  {state.pluginCount !== undefined && (
-                    <>{state.pluginCount} available</>
-                  )}
-                  {state.installedPlugins &&
-                    state.installedPlugins.length > 0 && (
-                      <> • {state.installedPlugins.length} installed</>
-                    )}
-                  {state.lastUpdated && (
-                    <>
-                      {' '}
-                      • Updated{' '}
-                      {new Date(state.lastUpdated).toLocaleDateString()}
-                    </>
+                  {state.pluginCount !== undefined && <>{state.pluginCount} available</>}
+                  {state.installedPlugins && state.installedPlugins.length > 0 && (
+                    <> • {state.installedPlugins.length} installed</>
                   )}
+                  {state.lastUpdated && <> • Updated {new Date(state.lastUpdated).toLocaleDateString()}</>}
                 </Text>
               </Box>
             </Box>
-          )
+          );
         })}
       </Box>
 
@@ -895,8 +806,7 @@ export function ManageMarketplaces({
       {hasPendingChanges() && (
         <Box marginTop={1} flexDirection="column">
           <Text>
-            <Text bold>Pending changes:</Text>{' '}
-            <Text dimColor>Enter to apply</Text>
+            <Text bold>Pending changes:</Text> <Text dimColor>Enter to apply</Text>
           </Text>
           {updateCount > 0 && (
             <Text>
@@ -925,18 +835,15 @@ export function ManageMarketplaces({
         </Box>
       )}
 
-      <ManageMarketplacesKeyHints
-        exitState={exitState}
-        hasPendingActions={hasPendingChanges()}
-      />
+      <ManageMarketplacesKeyHints exitState={exitState} hasPendingActions={hasPendingChanges()} />
     </Box>
-  )
+  );
 }
 
 type ManageMarketplacesKeyHintsProps = {
-  exitState: Props['exitState']
-  hasPendingActions: boolean
-}
+  exitState: Props['exitState'];
+  hasPendingActions: boolean;
+};
 
 function ManageMarketplacesKeyHints({
   exitState,
@@ -949,7 +856,7 @@ function ManageMarketplacesKeyHints({
           Press {exitState.keyName} again to go back
         </Text>
       </Box>
-    )
+    );
   }
 
   return (
@@ -965,19 +872,10 @@ function ManageMarketplacesKeyHints({
             />
           )}
           {!hasPendingActions && (
-            <ConfigurableShortcutHint
-              action="select:accept"
-              context="Select"
-              fallback="Enter"
-              description="select"
-            />
-          )}
-          {!hasPendingActions && (
-            <KeyboardShortcutHint shortcut="u" action="update" />
-          )}
-          {!hasPendingActions && (
-            <KeyboardShortcutHint shortcut="r" action="remove" />
+            <ConfigurableShortcutHint action="select:accept" context="Select" fallback="Enter" description="select" />
           )}
+          {!hasPendingActions && <KeyboardShortcutHint shortcut="u" action="update" />}
+          {!hasPendingActions && <KeyboardShortcutHint shortcut="r" action="remove" />}
           <ConfigurableShortcutHint
             action="confirm:no"
             context="Confirmation"
@@ -987,5 +885,5 @@ function ManageMarketplacesKeyHints({
         </Byline>
       </Text>
     </Box>
-  )
+  );
 }
diff --git a/src/commands/plugin/ManagePlugins.tsx b/src/commands/plugin/ManagePlugins.tsx
index a3524724c..b47bd44b2 100644
--- a/src/commands/plugin/ManagePlugins.tsx
+++ b/src/commands/plugin/ManagePlugins.tsx
@@ -1,40 +1,32 @@
-import figures from 'figures'
-import type { Dirent } from 'fs'
-import * as fs from 'fs/promises'
-import * as path from 'path'
-import * as React from 'react'
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { ConfigurableShortcutHint } from '../../components/ConfigurableShortcutHint.js'
-import { Byline } from '@anthropic/ink'
-import { MCPRemoteServerMenu } from '../../components/mcp/MCPRemoteServerMenu.js'
-import { MCPStdioServerMenu } from '../../components/mcp/MCPStdioServerMenu.js'
-import { MCPToolDetailView } from '../../components/mcp/MCPToolDetailView.js'
-import { MCPToolListView } from '../../components/mcp/MCPToolListView.js'
-import type {
-  ClaudeAIServerInfo,
-  HTTPServerInfo,
-  SSEServerInfo,
-  StdioServerInfo,
-} from '../../components/mcp/types.js'
-import { SearchBox } from '../../components/SearchBox.js'
-import { useSearchInput } from '../../hooks/useSearchInput.js'
-import { useTerminalSize } from '../../hooks/useTerminalSize.js'
+import figures from 'figures';
+import type { Dirent } from 'fs';
+import * as fs from 'fs/promises';
+import * as path from 'path';
+import * as React from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { ConfigurableShortcutHint } from '../../components/ConfigurableShortcutHint.js';
+import { Byline } from '@anthropic/ink';
+import { MCPRemoteServerMenu } from '../../components/mcp/MCPRemoteServerMenu.js';
+import { MCPStdioServerMenu } from '../../components/mcp/MCPStdioServerMenu.js';
+import { MCPToolDetailView } from '../../components/mcp/MCPToolDetailView.js';
+import { MCPToolListView } from '../../components/mcp/MCPToolListView.js';
+import type { ClaudeAIServerInfo, HTTPServerInfo, SSEServerInfo, StdioServerInfo } from '../../components/mcp/types.js';
+import { SearchBox } from '../../components/SearchBox.js';
+import { useSearchInput } from '../../hooks/useSearchInput.js';
+import { useTerminalSize } from '../../hooks/useTerminalSize.js';
 // eslint-disable-next-line custom-rules/prefer-use-keybindings -- useInput needed for raw search mode text input
-import { Box, Text, useInput, useTerminalFocus } from '@anthropic/ink'
-import {
-  useKeybinding,
-  useKeybindings,
-} from '../../keybindings/useKeybinding.js'
-import { getBuiltinPluginDefinition } from '../../plugins/builtinPlugins.js'
-import { useMcpToggleEnabled } from '../../services/mcp/MCPConnectionManager.js'
+import { Box, Text, useInput, useTerminalFocus } from '@anthropic/ink';
+import { useKeybinding, useKeybindings } from '../../keybindings/useKeybinding.js';
+import { getBuiltinPluginDefinition } from '../../plugins/builtinPlugins.js';
+import { useMcpToggleEnabled } from '../../services/mcp/MCPConnectionManager.js';
 import type {
   MCPServerConnection,
   McpClaudeAIProxyServerConfig,
   McpHTTPServerConfig,
   McpSSEServerConfig,
   McpStdioServerConfig,
-} from '../../services/mcp/types.js'
-import { filterToolsByServer } from '../../services/mcp/utils.js'
+} from '../../services/mcp/types.js';
+import { filterToolsByServer } from '../../services/mcp/utils.js';
 import {
   disablePluginOp,
   enablePluginOp,
@@ -43,86 +35,76 @@ import {
   isPluginEnabledAtProjectScope,
   uninstallPluginOp,
   updatePluginOp,
-} from '../../services/plugins/pluginOperations.js'
-import { useAppState } from '../../state/AppState.js'
-import type { Tool } from '../../Tool.js'
-import type { LoadedPlugin, PluginError } from '../../types/plugin.js'
-import { count } from '../../utils/array.js'
-import { openBrowser } from '../../utils/browser.js'
-import { logForDebugging } from '../../utils/debug.js'
-import { errorMessage, toError } from '../../utils/errors.js'
-import { logError } from '../../utils/log.js'
-import { clearAllCaches } from '../../utils/plugins/cacheUtils.js'
-import { loadInstalledPluginsV2 } from '../../utils/plugins/installedPluginsManager.js'
-import { getMarketplace } from '../../utils/plugins/marketplaceManager.js'
+} from '../../services/plugins/pluginOperations.js';
+import { useAppState } from '../../state/AppState.js';
+import type { Tool } from '../../Tool.js';
+import type { LoadedPlugin, PluginError } from '../../types/plugin.js';
+import { count } from '../../utils/array.js';
+import { openBrowser } from '../../utils/browser.js';
+import { logForDebugging } from '../../utils/debug.js';
+import { errorMessage, toError } from '../../utils/errors.js';
+import { logError } from '../../utils/log.js';
+import { clearAllCaches } from '../../utils/plugins/cacheUtils.js';
+import { loadInstalledPluginsV2 } from '../../utils/plugins/installedPluginsManager.js';
+import { getMarketplace } from '../../utils/plugins/marketplaceManager.js';
 import {
   isMcpbSource,
   loadMcpbFile,
   type McpbNeedsConfigResult,
   type UserConfigValues,
-} from '../../utils/plugins/mcpbHandler.js'
-import {
-  getPluginDataDirSize,
-  pluginDataDirPath,
-} from '../../utils/plugins/pluginDirectories.js'
-import {
-  getFlaggedPlugins,
-  markFlaggedPluginsSeen,
-  removeFlaggedPlugin,
-} from '../../utils/plugins/pluginFlagging.js'
-import {
-  type PersistablePluginScope,
-  parsePluginIdentifier,
-} from '../../utils/plugins/pluginIdentifier.js'
-import { loadAllPlugins } from '../../utils/plugins/pluginLoader.js'
+} from '../../utils/plugins/mcpbHandler.js';
+import { getPluginDataDirSize, pluginDataDirPath } from '../../utils/plugins/pluginDirectories.js';
+import { getFlaggedPlugins, markFlaggedPluginsSeen, removeFlaggedPlugin } from '../../utils/plugins/pluginFlagging.js';
+import { type PersistablePluginScope, parsePluginIdentifier } from '../../utils/plugins/pluginIdentifier.js';
+import { loadAllPlugins } from '../../utils/plugins/pluginLoader.js';
 import {
   loadPluginOptions,
   type PluginOptionSchema,
   savePluginOptions,
-} from '../../utils/plugins/pluginOptionsStorage.js'
-import { isPluginBlockedByPolicy } from '../../utils/plugins/pluginPolicy.js'
-import { getPluginEditableScopes } from '../../utils/plugins/pluginStartupCheck.js'
+} from '../../utils/plugins/pluginOptionsStorage.js';
+import { isPluginBlockedByPolicy } from '../../utils/plugins/pluginPolicy.js';
+import { getPluginEditableScopes } from '../../utils/plugins/pluginStartupCheck.js';
 import {
   getSettings_DEPRECATED,
   getSettingsForSource,
   updateSettingsForSource,
-} from '../../utils/settings/settings.js'
-import { jsonParse } from '../../utils/slowOperations.js'
-import { plural } from '../../utils/stringUtils.js'
-import { formatErrorMessage, getErrorGuidance } from './PluginErrors.js'
-import { PluginOptionsDialog } from './PluginOptionsDialog.js'
-import { PluginOptionsFlow } from './PluginOptionsFlow.js'
-import type { ViewState as ParentViewState } from './types.js'
-import { UnifiedInstalledCell } from './UnifiedInstalledCell.js'
-import type { UnifiedInstalledItem } from './unifiedTypes.js'
-import { usePagination } from './usePagination.js'
+} from '../../utils/settings/settings.js';
+import { jsonParse } from '../../utils/slowOperations.js';
+import { plural } from '../../utils/stringUtils.js';
+import { formatErrorMessage, getErrorGuidance } from './PluginErrors.js';
+import { PluginOptionsDialog } from './PluginOptionsDialog.js';
+import { PluginOptionsFlow } from './PluginOptionsFlow.js';
+import type { ViewState as ParentViewState } from './types.js';
+import { UnifiedInstalledCell } from './UnifiedInstalledCell.js';
+import type { UnifiedInstalledItem } from './unifiedTypes.js';
+import { usePagination } from './usePagination.js';
 
 type Props = {
-  setViewState: (state: ParentViewState) => void
-  setResult: (result: string | null) => void
-  onManageComplete?: () => void | Promise<void>
-  onSearchModeChange?: (isActive: boolean) => void
-  targetPlugin?: string
-  targetMarketplace?: string
-  action?: 'enable' | 'disable' | 'uninstall'
-}
+  setViewState: (state: ParentViewState) => void;
+  setResult: (result: string | null) => void;
+  onManageComplete?: () => void | Promise<void>;
+  onSearchModeChange?: (isActive: boolean) => void;
+  targetPlugin?: string;
+  targetMarketplace?: string;
+  action?: 'enable' | 'disable' | 'uninstall';
+};
 
 type FlaggedPluginInfo = {
-  id: string
-  name: string
-  marketplace: string
-  reason: string
-  text: string
-  flaggedAt: string
-}
+  id: string;
+  name: string;
+  marketplace: string;
+  reason: string;
+  text: string;
+  flaggedAt: string;
+};
 
 type FailedPluginInfo = {
-  id: string
-  name: string
-  marketplace: string
-  errors: PluginError[]
-  scope: PersistablePluginScope
-}
+  id: string;
+  name: string;
+  marketplace: string;
+  errors: PluginError[];
+  scope: PersistablePluginScope;
+};
 
 type ViewState =
   | 'plugin-list'
@@ -136,22 +118,22 @@ type ViewState =
   | { type: 'failed-plugin-details'; plugin: FailedPluginInfo }
   | { type: 'mcp-detail'; client: MCPServerConnection }
   | { type: 'mcp-tools'; client: MCPServerConnection }
-  | { type: 'mcp-tool-detail'; client: MCPServerConnection; tool: Tool }
+  | { type: 'mcp-tool-detail'; client: MCPServerConnection; tool: Tool };
 
 type MarketplaceInfo = {
-  name: string
-  installedPlugins: LoadedPlugin[]
-  enabledCount?: number
-  disabledCount?: number
-}
+  name: string;
+  installedPlugins: LoadedPlugin[];
+  enabledCount?: number;
+  disabledCount?: number;
+};
 
 type PluginState = {
-  plugin: LoadedPlugin
-  marketplace: string
-  scope?: 'user' | 'project' | 'local' | 'managed' | 'builtin'
-  pendingEnable?: boolean // Toggle enable/disable
-  pendingUpdate?: boolean // Marked for update
-}
+  plugin: LoadedPlugin;
+  marketplace: string;
+  scope?: 'user' | 'project' | 'local' | 'managed' | 'builtin';
+  pendingEnable?: boolean; // Toggle enable/disable
+  pendingUpdate?: boolean; // Marked for update
+};
 
 /**
  * Get list of base file names (without .md extension) from a directory
@@ -164,23 +146,20 @@ type PluginState = {
  */
 async function getBaseFileNames(dirPath: string): Promise<string[]> {
   try {
-    const entries = await fs.readdir(dirPath, { withFileTypes: true })
+    const entries = await fs.readdir(dirPath, { withFileTypes: true });
     return entries
       .filter((entry: Dirent) => entry.isFile() && entry.name.endsWith('.md'))
       .map((entry: Dirent) => {
         // Remove .md extension specifically
-        const baseName = path.basename(entry.name, '.md')
-        return baseName
-      })
+        const baseName = path.basename(entry.name, '.md');
+        return baseName;
+      });
   } catch (error) {
-    const errorMsg = errorMessage(error)
-    logForDebugging(
-      `Failed to read plugin components from ${dirPath}: ${errorMsg}`,
-      { level: 'error' },
-    )
-    logError(toError(error))
+    const errorMsg = errorMessage(error);
+    logForDebugging(`Failed to read plugin components from ${dirPath}: ${errorMsg}`, { level: 'error' });
+    logError(toError(error));
     // Return empty array to allow graceful degradation - plugin details can still be shown
-    return []
+    return [];
   }
 }
 
@@ -196,18 +175,18 @@ async function getBaseFileNames(dirPath: string): Promise<string[]> {
  */
 async function getSkillDirNames(dirPath: string): Promise<string[]> {
   try {
-    const entries = await fs.readdir(dirPath, { withFileTypes: true })
-    const skillNames: string[] = []
+    const entries = await fs.readdir(dirPath, { withFileTypes: true });
+    const skillNames: string[] = [];
 
     for (const entry of entries) {
       // Check if it's a directory or symlink (symlinks may point to skill directories)
       if (entry.isDirectory() || entry.isSymbolicLink()) {
         // Check if this directory contains a SKILL.md file
-        const skillFilePath = path.join(dirPath, entry.name, 'SKILL.md')
+        const skillFilePath = path.join(dirPath, entry.name, 'SKILL.md');
         try {
-          const st = await fs.stat(skillFilePath)
+          const st = await fs.stat(skillFilePath);
           if (st.isFile()) {
-            skillNames.push(entry.name)
+            skillNames.push(entry.name);
           }
         } catch {
           // No SKILL.md file in this directory, skip it
@@ -215,16 +194,13 @@ async function getSkillDirNames(dirPath: string): Promise<string[]> {
       }
     }
 
-    return skillNames
+    return skillNames;
   } catch (error) {
-    const errorMsg = errorMessage(error)
-    logForDebugging(
-      `Failed to read skill directories from ${dirPath}: ${errorMsg}`,
-      { level: 'error' },
-    )
-    logError(toError(error))
+    const errorMsg = errorMessage(error);
+    logForDebugging(`Failed to read skill directories from ${dirPath}: ${errorMsg}`, { level: 'error' });
+    logError(toError(error));
     // Return empty array to allow graceful degradation - plugin details can still be shown
-    return []
+    return [];
   }
 }
 
@@ -233,18 +209,18 @@ function PluginComponentsDisplay({
   plugin,
   marketplace,
 }: {
-  plugin: LoadedPlugin
-  marketplace: string
+  plugin: LoadedPlugin;
+  marketplace: string;
 }): React.ReactNode {
   const [components, setComponents] = useState<{
-    commands?: string | string[] | Record<string, unknown> | null
-    agents?: string | string[] | Record<string, unknown> | null
-    skills?: string | string[] | Record<string, unknown> | null
-    hooks?: unknown
-    mcpServers?: unknown
-  } | null>(null)
-  const [loading, setLoading] = useState(true)
-  const [error, setError] = useState<string | null>(null)
+    commands?: string | string[] | Record<string, unknown> | null;
+    agents?: string | string[] | Record<string, unknown> | null;
+    skills?: string | string[] | Record<string, unknown> | null;
+    hooks?: unknown;
+    mcpServers?: unknown;
+  } | null>(null);
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
 
   useEffect(() => {
     async function loadComponents() {
@@ -252,109 +228,103 @@ function PluginComponentsDisplay({
         // Built-in plugins don't have a marketplace entry — read from the
         // registered definition directly.
         if (marketplace === 'builtin') {
-          const builtinDef = getBuiltinPluginDefinition(plugin.name)
+          const builtinDef = getBuiltinPluginDefinition(plugin.name);
           if (builtinDef) {
-            const skillNames = builtinDef.skills?.map(s => s.name) ?? []
-            const hookEvents = builtinDef.hooks
-              ? Object.keys(builtinDef.hooks)
-              : []
-            const mcpServerNames = builtinDef.mcpServers
-              ? Object.keys(builtinDef.mcpServers)
-              : []
+            const skillNames = builtinDef.skills?.map(s => s.name) ?? [];
+            const hookEvents = builtinDef.hooks ? Object.keys(builtinDef.hooks) : [];
+            const mcpServerNames = builtinDef.mcpServers ? Object.keys(builtinDef.mcpServers) : [];
             setComponents({
               commands: null,
               agents: null,
               skills: skillNames.length > 0 ? skillNames : null,
               hooks: hookEvents.length > 0 ? hookEvents : null,
               mcpServers: mcpServerNames.length > 0 ? mcpServerNames : null,
-            })
+            });
           } else {
-            setError(`Built-in plugin ${plugin.name} not found`)
+            setError(`Built-in plugin ${plugin.name} not found`);
           }
-          setLoading(false)
-          return
+          setLoading(false);
+          return;
         }
 
-        const marketplaceData = await getMarketplace(marketplace)
+        const marketplaceData = await getMarketplace(marketplace);
         // Find the plugin entry in the array
-        const pluginEntry = marketplaceData.plugins.find(
-          p => p.name === plugin.name,
-        )
+        const pluginEntry = marketplaceData.plugins.find(p => p.name === plugin.name);
         if (pluginEntry) {
           // Combine commands from both sources
-          const commandPathList = []
+          const commandPathList = [];
           if (plugin.commandsPath) {
-            commandPathList.push(plugin.commandsPath)
+            commandPathList.push(plugin.commandsPath);
           }
           if (plugin.commandsPaths) {
-            commandPathList.push(...plugin.commandsPaths)
+            commandPathList.push(...plugin.commandsPaths);
           }
 
           // Get base file names from all command paths
-          const commandList: string[] = []
+          const commandList: string[] = [];
           for (const commandPath of commandPathList) {
             if (typeof commandPath === 'string') {
               // commandPath is already a full path
-              const baseNames = await getBaseFileNames(commandPath)
-              commandList.push(...baseNames)
+              const baseNames = await getBaseFileNames(commandPath);
+              commandList.push(...baseNames);
             }
           }
 
           // Combine agents from both sources
-          const agentPathList = []
+          const agentPathList = [];
           if (plugin.agentsPath) {
-            agentPathList.push(plugin.agentsPath)
+            agentPathList.push(plugin.agentsPath);
           }
           if (plugin.agentsPaths) {
-            agentPathList.push(...plugin.agentsPaths)
+            agentPathList.push(...plugin.agentsPaths);
           }
 
           // Get base file names from all agent paths
-          const agentList: string[] = []
+          const agentList: string[] = [];
           for (const agentPath of agentPathList) {
             if (typeof agentPath === 'string') {
               // agentPath is already a full path
-              const baseNames = await getBaseFileNames(agentPath)
-              agentList.push(...baseNames)
+              const baseNames = await getBaseFileNames(agentPath);
+              agentList.push(...baseNames);
             }
           }
 
           // Combine skills from both sources
-          const skillPathList = []
+          const skillPathList = [];
           if (plugin.skillsPath) {
-            skillPathList.push(plugin.skillsPath)
+            skillPathList.push(plugin.skillsPath);
           }
           if (plugin.skillsPaths) {
-            skillPathList.push(...plugin.skillsPaths)
+            skillPathList.push(...plugin.skillsPaths);
           }
 
           // Get skill directory names from all skill paths
           // Skills are directories containing SKILL.md files
-          const skillList: string[] = []
+          const skillList: string[] = [];
           for (const skillPath of skillPathList) {
             if (typeof skillPath === 'string') {
               // skillPath is already a full path to a skills directory
-              const skillDirNames = await getSkillDirNames(skillPath)
-              skillList.push(...skillDirNames)
+              const skillDirNames = await getSkillDirNames(skillPath);
+              skillList.push(...skillDirNames);
             }
           }
 
           // Combine hooks from both sources
-          const hooksList = []
+          const hooksList = [];
           if (plugin.hooksConfig) {
-            hooksList.push(Object.keys(plugin.hooksConfig))
+            hooksList.push(Object.keys(plugin.hooksConfig));
           }
           if (pluginEntry.hooks) {
-            hooksList.push(pluginEntry.hooks)
+            hooksList.push(pluginEntry.hooks);
           }
 
           // Combine MCP servers from both sources
-          const mcpServersList = []
+          const mcpServersList = [];
           if (plugin.mcpServers) {
-            mcpServersList.push(Object.keys(plugin.mcpServers))
+            mcpServersList.push(Object.keys(plugin.mcpServers));
           }
           if (pluginEntry.mcpServers) {
-            mcpServersList.push(pluginEntry.mcpServers)
+            mcpServersList.push(pluginEntry.mcpServers);
           }
 
           setComponents({
@@ -363,19 +333,17 @@ function PluginComponentsDisplay({
             skills: skillList.length > 0 ? skillList : null,
             hooks: hooksList.length > 0 ? hooksList : null,
             mcpServers: mcpServersList.length > 0 ? mcpServersList : null,
-          })
+          });
         } else {
-          setError(`Plugin ${plugin.name} not found in marketplace`)
+          setError(`Plugin ${plugin.name} not found in marketplace`);
         }
       } catch (err) {
-        setError(
-          err instanceof Error ? err.message : 'Failed to load components',
-        )
+        setError(err instanceof Error ? err.message : 'Failed to load components');
       } finally {
-        setLoading(false)
+        setLoading(false);
       }
     }
-    void loadComponents()
+    void loadComponents();
   }, [
     plugin.name,
     plugin.commandsPath,
@@ -387,10 +355,10 @@ function PluginComponentsDisplay({
     plugin.hooksConfig,
     plugin.mcpServers,
     marketplace,
-  ])
+  ]);
 
   if (loading) {
-    return null // Don't show loading state for cleaner UI
+    return null; // Don't show loading state for cleaner UI
   }
 
   if (error) {
@@ -399,22 +367,18 @@ function PluginComponentsDisplay({
         <Text bold>Components:</Text>
         <Text dimColor>Error: {error}</Text>
       </Box>
-    )
+    );
   }
 
   if (!components) {
-    return null // No components info available
+    return null; // No components info available
   }
 
   const hasComponents =
-    components.commands ||
-    components.agents ||
-    components.skills ||
-    components.hooks ||
-    components.mcpServers
+    components.commands || components.agents || components.skills || components.hooks || components.mcpServers;
 
   if (!hasComponents) {
-    return null // No components defined
+    return null; // No components defined
   }
 
   return (
@@ -457,8 +421,7 @@ function PluginComponentsDisplay({
             ? components.hooks
             : Array.isArray(components.hooks)
               ? components.hooks.map(String).join(', ')
-              : typeof components.hooks === 'object' &&
-                  components.hooks !== null
+              : typeof components.hooks === 'object' && components.hooks !== null
                 ? Object.keys(components.hooks).join(', ')
                 : String(components.hooks)}
         </Text>
@@ -470,32 +433,28 @@ function PluginComponentsDisplay({
             ? components.mcpServers
             : Array.isArray(components.mcpServers)
               ? components.mcpServers.map(String).join(', ')
-              : typeof components.mcpServers === 'object' &&
-                  components.mcpServers !== null
+              : typeof components.mcpServers === 'object' && components.mcpServers !== null
                 ? Object.keys(components.mcpServers).join(', ')
                 : String(components.mcpServers)}
         </Text>
       ) : null}
     </Box>
-  )
+  );
 }
 
 /**
  * Check if a plugin is from a local source and cannot be remotely updated
  * @returns Error message if local, null if remote/updatable
  */
-async function checkIfLocalPlugin(
-  pluginName: string,
-  marketplaceName: string,
-): Promise<string | null> {
-  const marketplace = await getMarketplace(marketplaceName)
-  const entry = marketplace?.plugins.find(p => p.name === pluginName)
+async function checkIfLocalPlugin(pluginName: string, marketplaceName: string): Promise<string | null> {
+  const marketplace = await getMarketplace(marketplaceName);
+  const entry = marketplace?.plugins.find(p => p.name === pluginName);
 
   if (entry && typeof entry.source === 'string') {
-    return `Local plugins cannot be updated remotely. To update, modify the source at: ${entry.source}`
+    return `Local plugins cannot be updated remotely. To update, modify the source at: ${entry.source}`;
   }
 
-  return null
+  return null;
 }
 
 /**
@@ -504,13 +463,11 @@ async function checkIfLocalPlugin(
  * Checks policySettings directly rather than installation scope, since managed
  * settings don't create installation records with scope 'managed'.
  */
-export function filterManagedDisabledPlugins(
-  plugins: LoadedPlugin[],
-): LoadedPlugin[] {
+export function filterManagedDisabledPlugins(plugins: LoadedPlugin[]): LoadedPlugin[] {
   return plugins.filter(plugin => {
-    const marketplace = plugin.source.split('@')[1] || 'local'
-    return !isPluginBlockedByPolicy(`${plugin.name}@${marketplace}`)
-  })
+    const marketplace = plugin.source.split('@')[1] || 'local';
+    return !isPluginBlockedByPolicy(`${plugin.name}@${marketplace}`);
+  });
 }
 
 export function ManagePlugins({
@@ -523,25 +480,25 @@ export function ManagePlugins({
   action,
 }: Props): React.ReactNode {
   // App state for MCP access
-  const mcpClients = useAppState(s => s.mcp.clients)
-  const mcpTools = useAppState(s => s.mcp.tools)
-  const pluginErrors = useAppState(s => s.plugins.errors)
-  const flaggedPlugins = getFlaggedPlugins()
+  const mcpClients = useAppState(s => s.mcp.clients);
+  const mcpTools = useAppState(s => s.mcp.tools);
+  const pluginErrors = useAppState(s => s.plugins.errors);
+  const flaggedPlugins = getFlaggedPlugins();
 
   // Search state
-  const [isSearchMode, setIsSearchModeRaw] = useState(false)
+  const [isSearchMode, setIsSearchModeRaw] = useState(false);
   const setIsSearchMode = useCallback(
     (active: boolean) => {
-      setIsSearchModeRaw(active)
-      onSearchModeChange?.(active)
+      setIsSearchModeRaw(active);
+      onSearchModeChange?.(active);
     },
     [onSearchModeChange],
-  )
-  const isTerminalFocused = useTerminalFocus()
-  const { columns: terminalWidth } = useTerminalSize()
+  );
+  const isTerminalFocused = useTerminalFocus();
+  const { columns: terminalWidth } = useTerminalSize();
 
   // View state
-  const [viewState, setViewState] = useState<ViewState>('plugin-list')
+  const [viewState, setViewState] = useState<ViewState>('plugin-list');
 
   const {
     query: searchQuery,
@@ -550,92 +507,70 @@ export function ManagePlugins({
   } = useSearchInput({
     isActive: viewState === 'plugin-list' && isSearchMode,
     onExit: () => {
-      setIsSearchMode(false)
+      setIsSearchMode(false);
     },
-  })
-  const [selectedPlugin, setSelectedPlugin] = useState<PluginState | null>(null)
+  });
+  const [selectedPlugin, setSelectedPlugin] = useState<PluginState | null>(null);
 
   // Data state
-  const [marketplaces, setMarketplaces] = useState<MarketplaceInfo[]>([])
-  const [pluginStates, setPluginStates] = useState<PluginState[]>([])
-  const [loading, setLoading] = useState(true)
-  const [pendingToggles, setPendingToggles] = useState<
-    Map<string, 'will-enable' | 'will-disable'>
-  >(new Map())
+  const [marketplaces, setMarketplaces] = useState<MarketplaceInfo[]>([]);
+  const [pluginStates, setPluginStates] = useState<PluginState[]>([]);
+  const [loading, setLoading] = useState(true);
+  const [pendingToggles, setPendingToggles] = useState<Map<string, 'will-enable' | 'will-disable'>>(new Map());
 
   // Guard to prevent auto-navigation from re-triggering after the user
   // navigates away (targetPlugin is never cleared by the parent).
-  const hasAutoNavigated = useRef(false)
+  const hasAutoNavigated = useRef(false);
   // Auto-action (enable/disable/uninstall) to fire after auto-navigation lands.
   // Ref, not state: it's consumed by a one-shot effect that already re-runs on
   // viewState/selectedPlugin, so a render-triggering state var would be redundant.
-  const pendingAutoActionRef = useRef<
-    'enable' | 'disable' | 'uninstall' | undefined
-  >(undefined)
+  const pendingAutoActionRef = useRef<'enable' | 'disable' | 'uninstall' | undefined>(undefined);
 
   // MCP toggle hook
-  const toggleMcpServer = useMcpToggleEnabled()
+  const toggleMcpServer = useMcpToggleEnabled();
 
   // Handle escape to go back - viewState-dependent navigation
   const handleBack = React.useCallback(() => {
     if (viewState === 'plugin-details') {
-      setViewState('plugin-list')
-      setSelectedPlugin(null)
-      setProcessError(null)
-    } else if (
-      typeof viewState === 'object' &&
-      viewState.type === 'failed-plugin-details'
-    ) {
-      setViewState('plugin-list')
-      setProcessError(null)
+      setViewState('plugin-list');
+      setSelectedPlugin(null);
+      setProcessError(null);
+    } else if (typeof viewState === 'object' && viewState.type === 'failed-plugin-details') {
+      setViewState('plugin-list');
+      setProcessError(null);
     } else if (viewState === 'configuring') {
-      setViewState('plugin-details')
-      setConfigNeeded(null)
+      setViewState('plugin-details');
+      setConfigNeeded(null);
     } else if (
       typeof viewState === 'object' &&
-      (viewState.type === 'plugin-options' ||
-        viewState.type === 'configuring-options')
+      (viewState.type === 'plugin-options' || viewState.type === 'configuring-options')
     ) {
       // Cancel mid-sequence — plugin is already enabled, just bail to list.
       // User can configure later via the Configure options menu if they want.
-      setViewState('plugin-list')
-      setSelectedPlugin(null)
-      setResult(
-        'Plugin enabled. Configuration skipped — run /reload-plugins to apply.',
-      )
+      setViewState('plugin-list');
+      setSelectedPlugin(null);
+      setResult('Plugin enabled. Configuration skipped — run /reload-plugins to apply.');
       if (onManageComplete) {
-        void onManageComplete()
+        void onManageComplete();
       }
-    } else if (
-      typeof viewState === 'object' &&
-      viewState.type === 'flagged-detail'
-    ) {
-      setViewState('plugin-list')
-      setProcessError(null)
-    } else if (
-      typeof viewState === 'object' &&
-      viewState.type === 'mcp-detail'
-    ) {
-      setViewState('plugin-list')
-      setProcessError(null)
-    } else if (
-      typeof viewState === 'object' &&
-      viewState.type === 'mcp-tools'
-    ) {
-      setViewState({ type: 'mcp-detail', client: viewState.client })
-    } else if (
-      typeof viewState === 'object' &&
-      viewState.type === 'mcp-tool-detail'
-    ) {
-      setViewState({ type: 'mcp-tools', client: viewState.client })
+    } else if (typeof viewState === 'object' && viewState.type === 'flagged-detail') {
+      setViewState('plugin-list');
+      setProcessError(null);
+    } else if (typeof viewState === 'object' && viewState.type === 'mcp-detail') {
+      setViewState('plugin-list');
+      setProcessError(null);
+    } else if (typeof viewState === 'object' && viewState.type === 'mcp-tools') {
+      setViewState({ type: 'mcp-detail', client: viewState.client });
+    } else if (typeof viewState === 'object' && viewState.type === 'mcp-tool-detail') {
+      setViewState({ type: 'mcp-tools', client: viewState.client });
     } else {
       if (pendingToggles.size > 0) {
-        setResult('Run /reload-plugins to apply plugin changes.')
-        return
+        setResult('Run /reload-plugins to apply plugin changes.');
+        return;
       }
-      setParentViewState({ type: 'menu' })
+      setParentViewState({ type: 'menu' });
     }
-  }, [viewState, setParentViewState, pendingToggles, setResult])
+  }, [viewState, setParentViewState, pendingToggles, setResult]);
 
   // Escape when not in search mode - go back.
   // Excludes confirm-project-uninstall (has its own confirm:no handler in
@@ -647,68 +582,60 @@ export function ManagePlugins({
     isActive:
       (viewState !== 'plugin-list' || !isSearchMode) &&
       viewState !== 'confirm-project-uninstall' &&
-      !(
-        typeof viewState === 'object' &&
-        viewState.type === 'confirm-data-cleanup'
-      ),
-  })
+      !(typeof viewState === 'object' && viewState.type === 'confirm-data-cleanup'),
+  });
 
   // Helper to get MCP status
   const getMcpStatus = (
     client: MCPServerConnection,
   ): 'connected' | 'disabled' | 'pending' | 'needs-auth' | 'failed' => {
-    if (client.type === 'connected') return 'connected'
-    if (client.type === 'disabled') return 'disabled'
-    if (client.type === 'pending') return 'pending'
-    if (client.type === 'needs-auth') return 'needs-auth'
-    return 'failed'
-  }
+    if (client.type === 'connected') return 'connected';
+    if (client.type === 'disabled') return 'disabled';
+    if (client.type === 'pending') return 'pending';
+    if (client.type === 'needs-auth') return 'needs-auth';
+    return 'failed';
+  };
 
   // Derive unified items from plugins and MCP servers
   const unifiedItems = useMemo(() => {
-    const mergedSettings = getSettings_DEPRECATED()
+    const mergedSettings = getSettings_DEPRECATED();
 
     // Build map of plugin name -> child MCPs
     // Plugin MCPs have names like "plugin:pluginName:serverName"
-    const pluginMcpMap = new Map<
-      string,
-      Array<{ displayName: string; client: MCPServerConnection }>
-    >()
+    const pluginMcpMap = new Map<string, Array<{ displayName: string; client: MCPServerConnection }>>();
     for (const client of mcpClients) {
       if (client.name.startsWith('plugin:')) {
-        const parts = client.name.split(':')
+        const parts = client.name.split(':');
         if (parts.length >= 3) {
-          const pluginName = parts[1]!
-          const serverName = parts.slice(2).join(':')
-          const existing = pluginMcpMap.get(pluginName) || []
-          existing.push({ displayName: serverName, client })
-          pluginMcpMap.set(pluginName, existing)
+          const pluginName = parts[1]!;
+          const serverName = parts.slice(2).join(':');
+          const existing = pluginMcpMap.get(pluginName) || [];
+          existing.push({ displayName: serverName, client });
+          pluginMcpMap.set(pluginName, existing);
         }
       }
     }
 
     // Build plugin items (unsorted for now)
     type PluginWithChildren = {
-      item: UnifiedInstalledItem & { type: 'plugin' }
-      originalScope: 'user' | 'project' | 'local' | 'managed' | 'builtin'
-      childMcps: Array<{ displayName: string; client: MCPServerConnection }>
-    }
-    const pluginsWithChildren: PluginWithChildren[] = []
+      item: UnifiedInstalledItem & { type: 'plugin' };
+      originalScope: 'user' | 'project' | 'local' | 'managed' | 'builtin';
+      childMcps: Array<{ displayName: string; client: MCPServerConnection }>;
+    };
+    const pluginsWithChildren: PluginWithChildren[] = [];
 
     for (const state of pluginStates) {
-      const pluginId = `${state.plugin.name}@${state.marketplace}`
-      const isEnabled = mergedSettings?.enabledPlugins?.[pluginId] !== false
+      const pluginId = `${state.plugin.name}@${state.marketplace}`;
+      const isEnabled = mergedSettings?.enabledPlugins?.[pluginId] !== false;
       const errors = pluginErrors.filter(
         e =>
           ('plugin' in e && e.plugin === state.plugin.name) ||
           e.source === pluginId ||
           e.source.startsWith(`${state.plugin.name}@`),
-      )
+      );
 
       // Built-in plugins use 'builtin' scope; others look up from V2 data.
-      const originalScope = state.plugin.isBuiltin
-        ? 'builtin'
-        : state.scope || 'user'
+      const originalScope = state.plugin.isBuiltin ? 'builtin' : state.scope || 'user';
 
       pluginsWithChildren.push({
         item: {
@@ -728,44 +655,37 @@ export function ManagePlugins({
         },
         originalScope,
         childMcps: pluginMcpMap.get(state.plugin.name) || [],
-      })
+      });
     }
 
     // Find orphan errors (errors for plugins that failed to load entirely)
-    const matchedPluginIds = new Set(
-      pluginsWithChildren.map(({ item }) => item.id),
-    )
-    const matchedPluginNames = new Set(
-      pluginsWithChildren.map(({ item }) => item.name),
-    )
-    const orphanErrorsBySource = new Map<string, typeof pluginErrors>()
+    const matchedPluginIds = new Set(pluginsWithChildren.map(({ item }) => item.id));
+    const matchedPluginNames = new Set(pluginsWithChildren.map(({ item }) => item.name));
+    const orphanErrorsBySource = new Map<string, typeof pluginErrors>();
     for (const error of pluginErrors) {
       if (
         matchedPluginIds.has(error.source) ||
-        ('plugin' in error &&
-          typeof error.plugin === 'string' &&
-          matchedPluginNames.has(error.plugin))
+        ('plugin' in error && typeof error.plugin === 'string' && matchedPluginNames.has(error.plugin))
       ) {
-        continue
+        continue;
       }
-      const existing = orphanErrorsBySource.get(error.source) || []
-      existing.push(error)
-      orphanErrorsBySource.set(error.source, existing)
+      const existing = orphanErrorsBySource.get(error.source) || [];
+      existing.push(error);
+      orphanErrorsBySource.set(error.source, existing);
     }
-    const pluginScopes = getPluginEditableScopes()
-    const failedPluginItems: UnifiedInstalledItem[] = []
+    const pluginScopes = getPluginEditableScopes();
+    const failedPluginItems: UnifiedInstalledItem[] = [];
     for (const [pluginId, errors] of orphanErrorsBySource) {
       // Skip plugins that are already shown in the flagged section
-      if (pluginId in flaggedPlugins) continue
-      const parsed = parsePluginIdentifier(pluginId)
-      const pluginName = parsed.name || pluginId
-      const marketplace = parsed.marketplace || 'unknown'
-      const rawScope = pluginScopes.get(pluginId)
+      if (pluginId in flaggedPlugins) continue;
+      const parsed = parsePluginIdentifier(pluginId);
+      const pluginName = parsed.name || pluginId;
+      const marketplace = parsed.marketplace || 'unknown';
+      const rawScope = pluginScopes.get(pluginId);
       // 'flag' is session-only (from --plugin-dir / flagSettings) and undefined
       // means the plugin isn't in any settings source. Default both to 'user'
       // since UnifiedInstalledItem doesn't have a 'flag' scope variant.
-      const scope =
-        rawScope === 'flag' || rawScope === undefined ? 'user' : rawScope
+      const scope = rawScope === 'flag' || rawScope === undefined ? 'user' : rawScope;
       failedPluginItems.push({
         type: 'failed-plugin',
         id: pluginId,
@@ -774,14 +694,14 @@ export function ManagePlugins({
         scope,
         errorCount: errors.length,
         errors,
-      })
+      });
     }
 
     // Build standalone MCP items
-    const standaloneMcps: UnifiedInstalledItem[] = []
+    const standaloneMcps: UnifiedInstalledItem[] = [];
     for (const client of mcpClients) {
-      if (client.name === 'ide') continue
-      if (client.name.startsWith('plugin:')) continue
+      if (client.name === 'ide') continue;
+      if (client.name.startsWith('plugin:')) continue;
 
       standaloneMcps.push({
         type: 'mcp',
@@ -791,7 +711,7 @@ export function ManagePlugins({
         scope: client.config.scope,
         status: getMcpStatus(client),
         client,
-      })
+      });
     }
 
     // Define scope order for display
@@ -804,29 +724,28 @@ export function ManagePlugins({
       managed: 4,
       dynamic: 5,
       builtin: 6,
-    }
+    };
 
     // Build final list by merging plugins (with their child MCPs) and standalone MCPs
     // Group by scope to avoid duplicate scope headers
-    const unified: UnifiedInstalledItem[] = []
+    const unified: UnifiedInstalledItem[] = [];
 
     // Create a map of scope -> items for proper merging
-    const itemsByScope = new Map<string, UnifiedInstalledItem[]>()
+    const itemsByScope = new Map<string, UnifiedInstalledItem[]>();
 
     // Add plugins with their child MCPs
     for (const { item, originalScope, childMcps } of pluginsWithChildren) {
-      const scope = item.scope
+      const scope = item.scope;
       if (!itemsByScope.has(scope)) {
-        itemsByScope.set(scope, [])
+        itemsByScope.set(scope, []);
       }
-      itemsByScope.get(scope)!.push(item)
+      itemsByScope.get(scope)!.push(item);
       // Add child MCPs right after the plugin, indented (use original scope, not 'flagged').
       // Built-in plugins map to 'user' for display since MCP ConfigScope doesn't include 'builtin'.
       for (const { displayName, client } of childMcps) {
-        const displayScope =
-          originalScope === 'builtin' ? 'user' : originalScope
+        const displayScope = originalScope === 'builtin' ? 'user' : originalScope;
         if (!itemsByScope.has(displayScope)) {
-          itemsByScope.set(displayScope, [])
+          itemsByScope.set(displayScope, []);
         }
         itemsByScope.get(displayScope)!.push({
           type: 'mcp',
@@ -837,36 +756,36 @@ export function ManagePlugins({
           status: getMcpStatus(client),
           client,
           indented: true,
-        })
+        });
       }
     }
 
     // Add standalone MCPs to their respective scope groups
     for (const mcp of standaloneMcps) {
-      const scope = mcp.scope
+      const scope = mcp.scope;
       if (!itemsByScope.has(scope)) {
-        itemsByScope.set(scope, [])
+        itemsByScope.set(scope, []);
       }
-      itemsByScope.get(scope)!.push(mcp)
+      itemsByScope.get(scope)!.push(mcp);
     }
 
     // Add failed plugins to their respective scope groups
     for (const failedPlugin of failedPluginItems) {
-      const scope = failedPlugin.scope
+      const scope = failedPlugin.scope;
       if (!itemsByScope.has(scope)) {
-        itemsByScope.set(scope, [])
+        itemsByScope.set(scope, []);
       }
-      itemsByScope.get(scope)!.push(failedPlugin)
+      itemsByScope.get(scope)!.push(failedPlugin);
     }
 
     // Add flagged (delisted) plugins from user settings.
     // Reason/text are looked up from the cached security messages file.
     for (const [pluginId, entry] of Object.entries(flaggedPlugins)) {
-      const parsed = parsePluginIdentifier(pluginId)
-      const pluginName = parsed.name || pluginId
-      const marketplace = parsed.marketplace || 'unknown'
+      const parsed = parsePluginIdentifier(pluginId);
+      const pluginName = parsed.name || pluginId;
+      const marketplace = parsed.marketplace || 'unknown';
       if (!itemsByScope.has('flagged')) {
-        itemsByScope.set('flagged', [])
+        itemsByScope.set('flagged', []);
       }
       itemsByScope.get('flagged')!.push({
         type: 'flagged-plugin',
@@ -877,232 +796,205 @@ export function ManagePlugins({
         reason: 'delisted',
         text: 'Removed from marketplace',
         flaggedAt: entry.flaggedAt,
-      })
+      });
     }
 
     // Sort scopes and build final list
-    const sortedScopes = [...itemsByScope.keys()].sort(
-      (a, b) => (scopeOrder[a] ?? 99) - (scopeOrder[b] ?? 99),
-    )
+    const sortedScopes = [...itemsByScope.keys()].sort((a, b) => (scopeOrder[a] ?? 99) - (scopeOrder[b] ?? 99));
 
     for (const scope of sortedScopes) {
-      const items = itemsByScope.get(scope)!
+      const items = itemsByScope.get(scope)!;
 
       // Separate items into plugin groups (with their child MCPs) and standalone MCPs
       // This preserves parent-child relationships that would be broken by naive sorting
-      const pluginGroups: UnifiedInstalledItem[][] = []
-      const standaloneMcpsInScope: UnifiedInstalledItem[] = []
+      const pluginGroups: UnifiedInstalledItem[][] = [];
+      const standaloneMcpsInScope: UnifiedInstalledItem[] = [];
 
-      let i = 0
+      let i = 0;
       while (i < items.length) {
-        const item = items[i]!
-        if (
-          item.type === 'plugin' ||
-          item.type === 'failed-plugin' ||
-          item.type === 'flagged-plugin'
-        ) {
+        const item = items[i]!;
+        if (item.type === 'plugin' || item.type === 'failed-plugin' || item.type === 'flagged-plugin') {
           // Collect the plugin and its child MCPs as a group
-          const group: UnifiedInstalledItem[] = [item]
-          i++
+          const group: UnifiedInstalledItem[] = [item];
+          i++;
           // Look ahead for indented child MCPs
-          let nextItem = items[i]
+          let nextItem = items[i];
           while (nextItem?.type === 'mcp' && nextItem.indented) {
-            group.push(nextItem)
-            i++
-            nextItem = items[i]
+            group.push(nextItem);
+            i++;
+            nextItem = items[i];
           }
-          pluginGroups.push(group)
+          pluginGroups.push(group);
         } else if (item.type === 'mcp' && !item.indented) {
           // Standalone MCP (not a child of a plugin)
-          standaloneMcpsInScope.push(item)
-          i++
+          standaloneMcpsInScope.push(item);
+          i++;
         } else {
           // Skip orphaned indented MCPs (shouldn't happen)
-          i++
+          i++;
         }
       }
 
       // Sort plugin groups by the plugin name (first item in each group)
-      pluginGroups.sort((a, b) => a[0]!.name.localeCompare(b[0]!.name))
+      pluginGroups.sort((a, b) => a[0]!.name.localeCompare(b[0]!.name));
 
       // Sort standalone MCPs by name
-      standaloneMcpsInScope.sort((a, b) => a.name.localeCompare(b.name))
+      standaloneMcpsInScope.sort((a, b) => a.name.localeCompare(b.name));
 
       // Build final list: plugins (with their children) first, then standalone MCPs
       for (const group of pluginGroups) {
-        unified.push(...group)
+        unified.push(...group);
       }
-      unified.push(...standaloneMcpsInScope)
+      unified.push(...standaloneMcpsInScope);
     }
 
-    return unified
-  }, [pluginStates, mcpClients, pluginErrors, pendingToggles, flaggedPlugins])
+    return unified;
+  }, [pluginStates, mcpClients, pluginErrors, pendingToggles, flaggedPlugins]);
 
   // Mark flagged plugins as seen when the Installed view renders them.
   // After 48 hours from seenAt, they auto-clear on next load.
   const flaggedIds = useMemo(
-    () =>
-      unifiedItems
-        .filter(item => item.type === 'flagged-plugin')
-        .map(item => item.id),
+    () => unifiedItems.filter(item => item.type === 'flagged-plugin').map(item => item.id),
     [unifiedItems],
-  )
+  );
   useEffect(() => {
     if (flaggedIds.length > 0) {
-      void markFlaggedPluginsSeen(flaggedIds)
+      void markFlaggedPluginsSeen(flaggedIds);
     }
-  }, [flaggedIds])
+  }, [flaggedIds]);
 
   // Filter items based on search query (matches name or description)
   const filteredItems = useMemo(() => {
-    if (!searchQuery) return unifiedItems
-    const lowerQuery = searchQuery.toLowerCase()
+    if (!searchQuery) return unifiedItems;
+    const lowerQuery = searchQuery.toLowerCase();
     return unifiedItems.filter(
       item =>
         item.name.toLowerCase().includes(lowerQuery) ||
-        ('description' in item &&
-          item.description?.toLowerCase().includes(lowerQuery)),
-    )
-  }, [unifiedItems, searchQuery])
+        ('description' in item && item.description?.toLowerCase().includes(lowerQuery)),
+    );
+  }, [unifiedItems, searchQuery]);
 
   // Selection state
-  const [selectedIndex, setSelectedIndex] = useState(0)
+  const [selectedIndex, setSelectedIndex] = useState(0);
 
   // Pagination for unified list (continuous scrolling)
   const pagination = usePagination<UnifiedInstalledItem>({
     totalItems: filteredItems.length,
     selectedIndex,
     maxVisible: 8,
-  })
+  });
 
   // Details view state
-  const [detailsMenuIndex, setDetailsMenuIndex] = useState(0)
-  const [isProcessing, setIsProcessing] = useState(false)
-  const [processError, setProcessError] = useState<string | null>(null)
+  const [detailsMenuIndex, setDetailsMenuIndex] = useState(0);
+  const [isProcessing, setIsProcessing] = useState(false);
+  const [processError, setProcessError] = useState<string | null>(null);
 
   // Configuration state
-  const [configNeeded, setConfigNeeded] =
-    useState<McpbNeedsConfigResult | null>(null)
-  const [_isLoadingConfig, setIsLoadingConfig] = useState(false)
-  const [selectedPluginHasMcpb, setSelectedPluginHasMcpb] = useState(false)
+  const [configNeeded, setConfigNeeded] = useState<McpbNeedsConfigResult | null>(null);
+  const [_isLoadingConfig, setIsLoadingConfig] = useState(false);
+  const [selectedPluginHasMcpb, setSelectedPluginHasMcpb] = useState(false);
 
   // Detect if selected plugin has MCPB
   // Reads raw marketplace.json to work with old cached marketplaces
   useEffect(() => {
     if (!selectedPlugin) {
-      setSelectedPluginHasMcpb(false)
-      return
+      setSelectedPluginHasMcpb(false);
+      return;
     }
 
     async function detectMcpb() {
       // Check plugin manifest first
-      const mcpServersSpec = selectedPlugin!.plugin.manifest.mcpServers
-      let hasMcpb = false
+      const mcpServersSpec = selectedPlugin!.plugin.manifest.mcpServers;
+      let hasMcpb = false;
 
       if (mcpServersSpec) {
         hasMcpb =
-          (typeof mcpServersSpec === 'string' &&
-            isMcpbSource(mcpServersSpec)) ||
-          (Array.isArray(mcpServersSpec) &&
-            mcpServersSpec.some(s => typeof s === 'string' && isMcpbSource(s)))
+          (typeof mcpServersSpec === 'string' && isMcpbSource(mcpServersSpec)) ||
+          (Array.isArray(mcpServersSpec) && mcpServersSpec.some(s => typeof s === 'string' && isMcpbSource(s)));
       }
 
       // If not in manifest, read raw marketplace.json directly (bypassing schema validation)
       // This works even with old cached marketplaces from before MCPB support
       if (!hasMcpb) {
         try {
-          const marketplaceDir = path.join(selectedPlugin!.plugin.path, '..')
-          const marketplaceJsonPath = path.join(
-            marketplaceDir,
-            '.claude-plugin',
-            'marketplace.json',
-          )
+          const marketplaceDir = path.join(selectedPlugin!.plugin.path, '..');
+          const marketplaceJsonPath = path.join(marketplaceDir, '.claude-plugin', 'marketplace.json');
 
-          const content = await fs.readFile(marketplaceJsonPath, 'utf-8')
-          const marketplace = jsonParse(content)
+          const content = await fs.readFile(marketplaceJsonPath, 'utf-8');
+          const marketplace = jsonParse(content);
 
-          const entry = marketplace.plugins?.find(
-            (p: { name: string }) => p.name === selectedPlugin!.plugin.name,
-          )
+          const entry = marketplace.plugins?.find((p: { name: string }) => p.name === selectedPlugin!.plugin.name);
 
           if (entry?.mcpServers) {
-            const spec = entry.mcpServers
+            const spec = entry.mcpServers;
             hasMcpb =
               (typeof spec === 'string' && isMcpbSource(spec)) ||
-              (Array.isArray(spec) &&
-                spec.some(
-                  (s: unknown) => typeof s === 'string' && isMcpbSource(s),
-                ))
+              (Array.isArray(spec) && spec.some((s: unknown) => typeof s === 'string' && isMcpbSource(s)));
           }
         } catch (err) {
-          logForDebugging(`Failed to read raw marketplace.json: ${err}`)
+          logForDebugging(`Failed to read raw marketplace.json: ${err}`);
         }
       }
 
-      setSelectedPluginHasMcpb(hasMcpb)
+      setSelectedPluginHasMcpb(hasMcpb);
     }
 
-    void detectMcpb()
-  }, [selectedPlugin])
+    void detectMcpb();
+  }, [selectedPlugin]);
 
   // Load installed plugins grouped by marketplace
   useEffect(() => {
     async function loadInstalledPlugins() {
-      setLoading(true)
+      setLoading(true);
       try {
-        const { enabled, disabled } = await loadAllPlugins()
-        const mergedSettings = getSettings_DEPRECATED() // Use merged settings to respect all layers
+        const { enabled, disabled } = await loadAllPlugins();
+        const mergedSettings = getSettings_DEPRECATED(); // Use merged settings to respect all layers
 
-        const allPlugins = filterManagedDisabledPlugins([
-          ...enabled,
-          ...disabled,
-        ])
+        const allPlugins = filterManagedDisabledPlugins([...enabled, ...disabled]);
 
         // Group plugins by marketplace
-        const pluginsByMarketplace: Record<string, LoadedPlugin[]> = {}
+        const pluginsByMarketplace: Record<string, LoadedPlugin[]> = {};
         for (const plugin of allPlugins) {
-          const marketplace = plugin.source.split('@')[1] || 'local'
+          const marketplace = plugin.source.split('@')[1] || 'local';
           if (!pluginsByMarketplace[marketplace]) {
-            pluginsByMarketplace[marketplace] = []
+            pluginsByMarketplace[marketplace] = [];
           }
-          pluginsByMarketplace[marketplace]!.push(plugin)
+          pluginsByMarketplace[marketplace]!.push(plugin);
         }
 
         // Create marketplace info array with enabled/disabled counts
-        const marketplaceInfos: MarketplaceInfo[] = []
+        const marketplaceInfos: MarketplaceInfo[] = [];
         for (const [name, plugins] of Object.entries(pluginsByMarketplace)) {
           const enabledCount = count(plugins, p => {
-            const pluginId = `${p.name}@${name}`
-            return mergedSettings?.enabledPlugins?.[pluginId] !== false
-          })
-          const disabledCount = plugins.length - enabledCount
+            const pluginId = `${p.name}@${name}`;
+            return mergedSettings?.enabledPlugins?.[pluginId] !== false;
+          });
+          const disabledCount = plugins.length - enabledCount;
 
           marketplaceInfos.push({
             name,
             installedPlugins: plugins,
             enabledCount,
             disabledCount,
-          })
+          });
         }
 
         // Sort marketplaces: claude-plugin-directory first, then alphabetically
         marketplaceInfos.sort((a, b) => {
-          if (a.name === 'claude-plugin-directory') return -1
-          if (b.name === 'claude-plugin-directory') return 1
-          return a.name.localeCompare(b.name)
-        })
+          if (a.name === 'claude-plugin-directory') return -1;
+          if (b.name === 'claude-plugin-directory') return 1;
+          return a.name.localeCompare(b.name);
+        });
 
-        setMarketplaces(marketplaceInfos)
+        setMarketplaces(marketplaceInfos);
 
         // Build flat list of all plugin states
-        const allStates: PluginState[] = []
+        const allStates: PluginState[] = [];
         for (const marketplace of marketplaceInfos) {
           for (const plugin of marketplace.installedPlugins) {
-            const pluginId = `${plugin.name}@${marketplace.name}`
+            const pluginId = `${plugin.name}@${marketplace.name}`;
             // Built-in plugins don't have V2 install entries — skip the lookup.
-            const scope = plugin.isBuiltin
-              ? 'builtin'
-              : getPluginInstallationFromV2(pluginId).scope
+            const scope = plugin.isBuiltin ? 'builtin' : getPluginInstallationFromV2(pluginId).scope;
 
             allStates.push({
               plugin,
@@ -1110,43 +1002,40 @@ export function ManagePlugins({
               scope,
               pendingEnable: undefined,
               pendingUpdate: false,
-            })
+            });
           }
         }
-        setPluginStates(allStates)
-        setSelectedIndex(0)
+        setPluginStates(allStates);
+        setSelectedIndex(0);
       } finally {
-        setLoading(false)
+        setLoading(false);
       }
     }
 
-    void loadInstalledPlugins()
-  }, [])
+    void loadInstalledPlugins();
+  }, []);
 
   // Auto-navigate to target plugin if specified (once only)
   useEffect(() => {
-    if (hasAutoNavigated.current) return
+    if (hasAutoNavigated.current) return;
     if (targetPlugin && marketplaces.length > 0 && !loading) {
       // targetPlugin may be `name` or `name@marketplace` (parseArgs passes the
       // raw arg through). Parse it so p.name matching works either way.
-      const { name: targetName, marketplace: targetMktFromId } =
-        parsePluginIdentifier(targetPlugin)
-      const effectiveTargetMarketplace = targetMarketplace ?? targetMktFromId
+      const { name: targetName, marketplace: targetMktFromId } = parsePluginIdentifier(targetPlugin);
+      const effectiveTargetMarketplace = targetMarketplace ?? targetMktFromId;
 
       // Use targetMarketplace if provided, otherwise search all
       const marketplacesToSearch = effectiveTargetMarketplace
         ? marketplaces.filter(m => m.name === effectiveTargetMarketplace)
-        : marketplaces
+        : marketplaces;
 
       // First check successfully loaded plugins
       for (const marketplace of marketplacesToSearch) {
-        const plugin = marketplace.installedPlugins.find(
-          p => p.name === targetName,
-        )
+        const plugin = marketplace.installedPlugins.find(p => p.name === targetName);
         if (plugin) {
           // Get scope from V2 data for proper operation handling
-          const pluginId = `${plugin.name}@${marketplace.name}`
-          const { scope } = getPluginInstallationFromV2(pluginId)
+          const pluginId = `${plugin.name}@${marketplace.name}`;
+          const { scope } = getPluginInstallationFromV2(pluginId);
 
           const pluginState: PluginState = {
             plugin,
@@ -1154,19 +1043,17 @@ export function ManagePlugins({
             scope,
             pendingEnable: undefined,
             pendingUpdate: false,
-          }
-          setSelectedPlugin(pluginState)
-          setViewState('plugin-details')
-          pendingAutoActionRef.current = action
-          hasAutoNavigated.current = true
-          return
+          };
+          setSelectedPlugin(pluginState);
+          setViewState('plugin-details');
+          pendingAutoActionRef.current = action;
+          hasAutoNavigated.current = true;
+          return;
         }
       }
 
       // Fall back to failed plugins (those with errors but not loaded)
-      const failedItem = unifiedItems.find(
-        item => item.type === 'failed-plugin' && item.name === targetName,
-      )
+      const failedItem = unifiedItems.find(item => item.type === 'failed-plugin' && item.name === targetName);
       if (failedItem && failedItem.type === 'failed-plugin') {
         setViewState({
           type: 'failed-plugin-details',
@@ -1177,8 +1064,8 @@ export function ManagePlugins({
             errors: failedItem.errors,
             scope: failedItem.scope,
           },
-        })
-        hasAutoNavigated.current = true
+        });
+        hasAutoNavigated.current = true;
       }
 
       // No match in loaded OR failed plugins — close the dialog with a
@@ -1186,53 +1073,37 @@ export function ManagePlugins({
       // this when an action was requested (e.g. /plugin uninstall X);
       // plain navigation (/plugin manage) should still just show the list.
       if (!hasAutoNavigated.current && action) {
-        hasAutoNavigated.current = true
-        setResult(`Plugin "${targetPlugin}" is not installed in this project`)
+        hasAutoNavigated.current = true;
+        setResult(`Plugin "${targetPlugin}" is not installed in this project`);
       }
     }
-  }, [
-    targetPlugin,
-    targetMarketplace,
-    marketplaces,
-    loading,
-    unifiedItems,
-    action,
-    setResult,
-  ])
+  }, [targetPlugin, targetMarketplace, marketplaces, loading, unifiedItems, action, setResult]);
 
   // Handle single plugin operations from details view
-  const handleSingleOperation = async (
-    operation: 'enable' | 'disable' | 'update' | 'uninstall',
-  ) => {
-    if (!selectedPlugin) return
+  const handleSingleOperation = async (operation: 'enable' | 'disable' | 'update' | 'uninstall') => {
+    if (!selectedPlugin) return;
 
-    const pluginScope = selectedPlugin.scope || 'user'
-    const isBuiltin = pluginScope === 'builtin'
+    const pluginScope = selectedPlugin.scope || 'user';
+    const isBuiltin = pluginScope === 'builtin';
 
     // Built-in plugins can only be enabled/disabled, not updated/uninstalled.
     if (isBuiltin && (operation === 'update' || operation === 'uninstall')) {
-      setProcessError('Built-in plugins cannot be updated or uninstalled.')
-      return
+      setProcessError('Built-in plugins cannot be updated or uninstalled.');
+      return;
     }
 
     // Managed scope plugins can only be updated, not enabled/disabled/uninstalled
-    if (
-      !isBuiltin &&
-      !isInstallableScope(pluginScope) &&
-      operation !== 'update'
-    ) {
-      setProcessError(
-        'This plugin is managed by your organization. Contact your admin to disable it.',
-      )
-      return
+    if (!isBuiltin && !isInstallableScope(pluginScope) && operation !== 'update') {
+      setProcessError('This plugin is managed by your organization. Contact your admin to disable it.');
+      return;
     }
 
-    setIsProcessing(true)
-    setProcessError(null)
+    setIsProcessing(true);
+    setProcessError(null);
 
     try {
-      const pluginId = `${selectedPlugin.plugin.name}@${selectedPlugin.marketplace}`
-      let reverseDependents: string[] | undefined
+      const pluginId = `${selectedPlugin.plugin.name}@${selectedPlugin.marketplace}`;
+      let reverseDependents: string[] | undefined;
 
       // enable/disable omit scope — pluginScope is the install scope from
       // installed_plugins.json (where files are cached), which can diverge
@@ -1240,23 +1111,23 @@ export function ManagePlugins({
       // the cross-scope guard. Auto-detect finds the right scope. #38084
       switch (operation) {
         case 'enable': {
-          const enableResult = await enablePluginOp(pluginId)
+          const enableResult = await enablePluginOp(pluginId);
           if (!enableResult.success) {
-            throw new Error(enableResult.message)
+            throw new Error(enableResult.message);
           }
-          break
+          break;
         }
         case 'disable': {
-          const disableResult = await disablePluginOp(pluginId)
+          const disableResult = await disablePluginOp(pluginId);
           if (!disableResult.success) {
-            throw new Error(disableResult.message)
+            throw new Error(disableResult.message);
           }
-          reverseDependents = disableResult.reverseDependents
-          break
+          reverseDependents = disableResult.reverseDependents;
+          break;
         }
         case 'uninstall': {
-          if (isBuiltin) break // guarded above; narrows pluginScope
-          if (!isInstallableScope(pluginScope)) break
+          if (isBuiltin) break; // guarded above; narrows pluginScope
+          if (!isInstallableScope(pluginScope)) break;
           // If the plugin is enabled in .claude/settings.json (shared with the
           // team), divert to a confirmation dialog that offers to disable in
           // settings.local.json instead. Check the settings file directly —
@@ -1264,71 +1135,66 @@ export function ManagePlugins({
           // the plugin is ALSO project-enabled, and uninstalling the user-scope
           // install would leave the project enablement active.
           if (isPluginEnabledAtProjectScope(pluginId)) {
-            setIsProcessing(false)
-            setViewState('confirm-project-uninstall')
-            return
+            setIsProcessing(false);
+            setViewState('confirm-project-uninstall');
+            return;
           }
           // If the plugin has persistent data (${CLAUDE_PLUGIN_DATA}) AND this
           // is the last scope, prompt before deleting it. For multi-scope
           // installs, the op's isLastScope check won't delete regardless of
           // the user's y/n — showing the dialog would mislead ("y" → nothing
           // happens). Length check mirrors pluginOperations.ts:513.
-          const installs = loadInstalledPluginsV2().plugins[pluginId]
-          const isLastScope = !installs || installs.length <= 1
-          const dataSize = isLastScope
-            ? await getPluginDataDirSize(pluginId)
-            : null
+          const installs = loadInstalledPluginsV2().plugins[pluginId];
+          const isLastScope = !installs || installs.length <= 1;
+          const dataSize = isLastScope ? await getPluginDataDirSize(pluginId) : null;
           if (dataSize) {
-            setIsProcessing(false)
-            setViewState({ type: 'confirm-data-cleanup', size: dataSize })
-            return
+            setIsProcessing(false);
+            setViewState({ type: 'confirm-data-cleanup', size: dataSize });
+            return;
           }
-          const result = await uninstallPluginOp(pluginId, pluginScope)
+          const result = await uninstallPluginOp(pluginId, pluginScope);
           if (!result.success) {
-            throw new Error(result.message)
+            throw new Error(result.message);
           }
-          reverseDependents = result.reverseDependents
-          break
+          reverseDependents = result.reverseDependents;
+          break;
         }
         case 'update': {
-          if (isBuiltin) break // guarded above; narrows pluginScope
-          const result = await updatePluginOp(pluginId, pluginScope)
+          if (isBuiltin) break; // guarded above; narrows pluginScope
+          const result = await updatePluginOp(pluginId, pluginScope);
           if (!result.success) {
-            throw new Error(result.message)
+            throw new Error(result.message);
           }
           // If already up to date, show message and exit
           if (result.alreadyUpToDate) {
-            setResult(
-              `${selectedPlugin.plugin.name} is already at the latest version (${result.newVersion}).`,
-            )
+            setResult(`${selectedPlugin.plugin.name} is already at the latest version (${result.newVersion}).`);
             if (onManageComplete) {
-              await onManageComplete()
+              await onManageComplete();
             }
-            setParentViewState({ type: 'menu' })
-            return
+            setParentViewState({ type: 'menu' });
+            return;
           }
           // Success - will show standard message below
-          break
+          break;
         }
       }
 
       // Operations (enable, disable, uninstall, update) now use centralized functions
       // that handle their own settings updates, so we only need to clear caches here
-      clearAllCaches()
+      clearAllCaches();
 
       // Prompt for manifest.userConfig + channel userConfig if the plugin ends
       // up enabled. Re-read settings rather than keying on `operation ===
       // 'enable'`: install enables on install, so the menu shows "Disable"
       // first. PluginOptionsFlow itself checks getUnconfiguredOptions — if
       // nothing needs filling, it calls onDone('skipped') immediately.
-      const pluginIdNow = `${selectedPlugin.plugin.name}@${selectedPlugin.marketplace}`
-      const settingsAfter = getSettings_DEPRECATED()
-      const enabledAfter =
-        settingsAfter?.enabledPlugins?.[pluginIdNow] !== false
+      const pluginIdNow = `${selectedPlugin.plugin.name}@${selectedPlugin.marketplace}`;
+      const settingsAfter = getSettings_DEPRECATED();
+      const enabledAfter = settingsAfter?.enabledPlugins?.[pluginIdNow] !== false;
       if (enabledAfter) {
-        setIsProcessing(false)
-        setViewState({ type: 'plugin-options' })
-        return
+        setIsProcessing(false);
+        setViewState({ type: 'plugin-options' });
+        return;
       }
 
       const operationName =
@@ -1338,123 +1204,106 @@ export function ManagePlugins({
             ? 'Disabled'
             : operation === 'update'
               ? 'Updated'
-              : 'Uninstalled'
+              : 'Uninstalled';
 
       // Single-line warning — notification timeout is ~8s, multi-line would scroll off.
       // The persistent record is in the Errors tab (dependency-unsatisfied after reload).
       const depWarn =
-        reverseDependents && reverseDependents.length > 0
-          ? ` · required by ${reverseDependents.join(', ')}`
-          : ''
-      const message = `✓ ${operationName} ${selectedPlugin.plugin.name}${depWarn}. Run /reload-plugins to apply.`
-      setResult(message)
+        reverseDependents && reverseDependents.length > 0 ? ` · required by ${reverseDependents.join(', ')}` : '';
+      const message = `✓ ${operationName} ${selectedPlugin.plugin.name}${depWarn}. Run /reload-plugins to apply.`;
+      setResult(message);
 
       if (onManageComplete) {
-        await onManageComplete()
+        await onManageComplete();
       }
 
-      setParentViewState({ type: 'menu' })
+      setParentViewState({ type: 'menu' });
     } catch (error) {
-      setIsProcessing(false)
-      const errorMessage =
-        error instanceof Error ? error.message : String(error)
-      setProcessError(`Failed to ${operation}: ${errorMessage}`)
-      logError(toError(error))
+      setIsProcessing(false);
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      setProcessError(`Failed to ${operation}: ${errorMessage}`);
+      logError(toError(error));
     }
-  }
+  };
 
   // Latest-ref: lets the auto-action effect call the current closure without
   // adding handleSingleOperation (recreated every render) to its deps.
-  const handleSingleOperationRef = useRef(handleSingleOperation)
-  handleSingleOperationRef.current = handleSingleOperation
+  const handleSingleOperationRef = useRef(handleSingleOperation);
+  handleSingleOperationRef.current = handleSingleOperation;
 
   // Auto-execute the action prop (/plugin uninstall X, /plugin enable X, etc.)
   // once auto-navigation has landed on plugin-details.
   useEffect(() => {
-    if (
-      viewState === 'plugin-details' &&
-      selectedPlugin &&
-      pendingAutoActionRef.current
-    ) {
-      const pending = pendingAutoActionRef.current
-      pendingAutoActionRef.current = undefined
-      void handleSingleOperationRef.current(pending)
+    if (viewState === 'plugin-details' && selectedPlugin && pendingAutoActionRef.current) {
+      const pending = pendingAutoActionRef.current;
+      pendingAutoActionRef.current = undefined;
+      void handleSingleOperationRef.current(pending);
     }
-  }, [viewState, selectedPlugin])
+  }, [viewState, selectedPlugin]);
 
   // Handle toggle enable/disable
   const handleToggle = React.useCallback(() => {
-    if (selectedIndex >= filteredItems.length) return
-    const item = filteredItems[selectedIndex]
-    if (item?.type === 'flagged-plugin') return
+    if (selectedIndex >= filteredItems.length) return;
+    const item = filteredItems[selectedIndex];
+    if (item?.type === 'flagged-plugin') return;
     if (item?.type === 'plugin') {
-      const pluginId = `${item.plugin.name}@${item.marketplace}`
-      const mergedSettings = getSettings_DEPRECATED()
-      const currentPending = pendingToggles.get(pluginId)
-      const isEnabled = mergedSettings?.enabledPlugins?.[pluginId] !== false
-      const pluginScope = item.scope
-      const isBuiltin = pluginScope === 'builtin'
+      const pluginId = `${item.plugin.name}@${item.marketplace}`;
+      const mergedSettings = getSettings_DEPRECATED();
+      const currentPending = pendingToggles.get(pluginId);
+      const isEnabled = mergedSettings?.enabledPlugins?.[pluginId] !== false;
+      const pluginScope = item.scope;
+      const isBuiltin = pluginScope === 'builtin';
       if (isBuiltin || isInstallableScope(pluginScope)) {
-        const newPending = new Map(pendingToggles)
+        const newPending = new Map(pendingToggles);
         // Omit scope — see handleSingleOperation's enable/disable comment.
         if (currentPending) {
           // Cancel: reverse the operation back to the original state
-          newPending.delete(pluginId)
+          newPending.delete(pluginId);
           void (async () => {
             try {
               if (currentPending === 'will-disable') {
-                await enablePluginOp(pluginId)
+                await enablePluginOp(pluginId);
               } else {
-                await disablePluginOp(pluginId)
+                await disablePluginOp(pluginId);
               }
-              clearAllCaches()
+              clearAllCaches();
             } catch (err) {
-              logError(err)
+              logError(err);
             }
-          })()
+          })();
         } else {
-          newPending.set(pluginId, isEnabled ? 'will-disable' : 'will-enable')
+          newPending.set(pluginId, isEnabled ? 'will-disable' : 'will-enable');
           void (async () => {
             try {
               if (isEnabled) {
-                await disablePluginOp(pluginId)
+                await disablePluginOp(pluginId);
               } else {
-                await enablePluginOp(pluginId)
+                await enablePluginOp(pluginId);
               }
-              clearAllCaches()
+              clearAllCaches();
             } catch (err) {
-              logError(err)
+              logError(err);
             }
-          })()
+          })();
         }
-        setPendingToggles(newPending)
+        setPendingToggles(newPending);
       }
     } else if (item?.type === 'mcp') {
-      void toggleMcpServer(item.client.name)
+      void toggleMcpServer(item.client.name);
     }
-  }, [
-    selectedIndex,
-    filteredItems,
-    pendingToggles,
-    pluginStates,
-    toggleMcpServer,
-  ])
+  }, [selectedIndex, filteredItems, pendingToggles, pluginStates, toggleMcpServer]);
 
   // Handle accept (Enter) in plugin-list
   const handleAccept = React.useCallback(() => {
-    if (selectedIndex >= filteredItems.length) return
-    const item = filteredItems[selectedIndex]
+    if (selectedIndex >= filteredItems.length) return;
+    const item = filteredItems[selectedIndex];
     if (item?.type === 'plugin') {
-      const state = pluginStates.find(
-        s =>
-          s.plugin.name === item.plugin.name &&
-          s.marketplace === item.marketplace,
-      )
+      const state = pluginStates.find(s => s.plugin.name === item.plugin.name && s.marketplace === item.marketplace);
       if (state) {
-        setSelectedPlugin(state)
-        setViewState('plugin-details')
-        setDetailsMenuIndex(0)
-        setProcessError(null)
+        setSelectedPlugin(state);
+        setViewState('plugin-details');
+        setDetailsMenuIndex(0);
+        setProcessError(null);
       }
     } else if (item?.type === 'flagged-plugin') {
       setViewState({
@@ -1467,8 +1316,8 @@ export function ManagePlugins({
           text: item.text,
           flaggedAt: item.flaggedAt,
         },
-      })
-      setProcessError(null)
+      });
+      setProcessError(null);
     } else if (item?.type === 'failed-plugin') {
       setViewState({
         type: 'failed-plugin-details',
@@ -1479,28 +1328,28 @@ export function ManagePlugins({
           errors: item.errors,
           scope: item.scope,
         },
-      })
-      setDetailsMenuIndex(0)
-      setProcessError(null)
+      });
+      setDetailsMenuIndex(0);
+      setProcessError(null);
     } else if (item?.type === 'mcp') {
-      setViewState({ type: 'mcp-detail', client: item.client })
-      setProcessError(null)
+      setViewState({ type: 'mcp-detail', client: item.client });
+      setProcessError(null);
     }
-  }, [selectedIndex, filteredItems, pluginStates])
+  }, [selectedIndex, filteredItems, pluginStates]);
 
   // Plugin-list navigation (non-search mode)
   useKeybindings(
     {
       'select:previous': () => {
         if (selectedIndex === 0) {
-          setIsSearchMode(true)
+          setIsSearchMode(true);
         } else {
-          pagination.handleSelectionChange(selectedIndex - 1, setSelectedIndex)
+          pagination.handleSelectionChange(selectedIndex - 1, setSelectedIndex);
         }
       },
       'select:next': () => {
         if (selectedIndex < filteredItems.length - 1) {
-          pagination.handleSelectionChange(selectedIndex + 1, setSelectedIndex)
+          pagination.handleSelectionChange(selectedIndex + 1, setSelectedIndex);
         }
       },
       'select:accept': handleAccept,
@@ -1509,7 +1358,7 @@ export function ManagePlugins({
       context: 'Select',
       isActive: viewState === 'plugin-list' && !isSearchMode,
     },
-  )
+  );
 
   useKeybindings(
     { 'plugin:toggle': handleToggle },
@@ -1517,114 +1366,97 @@ export function ManagePlugins({
       context: 'Plugin',
       isActive: viewState === 'plugin-list' && !isSearchMode,
     },
-  )
+  );
 
   // Handle dismiss action in flagged-detail view
   const handleFlaggedDismiss = React.useCallback(() => {
-    if (typeof viewState !== 'object' || viewState.type !== 'flagged-detail')
-      return
-    void removeFlaggedPlugin(viewState.plugin.id)
-    setViewState('plugin-list')
-  }, [viewState])
+    if (typeof viewState !== 'object' || viewState.type !== 'flagged-detail') return;
+    void removeFlaggedPlugin(viewState.plugin.id);
+    setViewState('plugin-list');
+  }, [viewState]);
 
   useKeybindings(
     { 'select:accept': handleFlaggedDismiss },
     {
       context: 'Select',
-      isActive:
-        typeof viewState === 'object' && viewState.type === 'flagged-detail',
+      isActive: typeof viewState === 'object' && viewState.type === 'flagged-detail',
     },
-  )
+  );
 
   // Build details menu items (needed for navigation)
   const detailsMenuItems = React.useMemo(() => {
-    if (viewState !== 'plugin-details' || !selectedPlugin) return []
+    if (viewState !== 'plugin-details' || !selectedPlugin) return [];
 
-    const mergedSettings = getSettings_DEPRECATED()
-    const pluginId = `${selectedPlugin.plugin.name}@${selectedPlugin.marketplace}`
-    const isEnabled = mergedSettings?.enabledPlugins?.[pluginId] !== false
-    const isBuiltin = selectedPlugin.marketplace === 'builtin'
+    const mergedSettings = getSettings_DEPRECATED();
+    const pluginId = `${selectedPlugin.plugin.name}@${selectedPlugin.marketplace}`;
+    const isEnabled = mergedSettings?.enabledPlugins?.[pluginId] !== false;
+    const isBuiltin = selectedPlugin.marketplace === 'builtin';
 
-    const menuItems: Array<{ label: string; action: () => void }> = []
+    const menuItems: Array<{ label: string; action: () => void }> = [];
 
     menuItems.push({
       label: isEnabled ? 'Disable plugin' : 'Enable plugin',
-      action: () =>
-        void handleSingleOperation(isEnabled ? 'disable' : 'enable'),
-    })
+      action: () => void handleSingleOperation(isEnabled ? 'disable' : 'enable'),
+    });
 
     // Update/Uninstall options — not available for built-in plugins
     if (!isBuiltin) {
       menuItems.push({
-        label: selectedPlugin.pendingUpdate
-          ? 'Unmark for update'
-          : 'Mark for update',
+        label: selectedPlugin.pendingUpdate ? 'Unmark for update' : 'Mark for update',
         action: async () => {
           try {
-            const localError = await checkIfLocalPlugin(
-              selectedPlugin.plugin.name,
-              selectedPlugin.marketplace,
-            )
+            const localError = await checkIfLocalPlugin(selectedPlugin.plugin.name, selectedPlugin.marketplace);
 
             if (localError) {
-              setProcessError(localError)
-              return
+              setProcessError(localError);
+              return;
             }
 
-            const newStates = [...pluginStates]
+            const newStates = [...pluginStates];
             const index = newStates.findIndex(
-              s =>
-                s.plugin.name === selectedPlugin.plugin.name &&
-                s.marketplace === selectedPlugin.marketplace,
-            )
+              s => s.plugin.name === selectedPlugin.plugin.name && s.marketplace === selectedPlugin.marketplace,
+            );
             if (index !== -1) {
-              newStates[index]!.pendingUpdate = !selectedPlugin.pendingUpdate
-              setPluginStates(newStates)
+              newStates[index]!.pendingUpdate = !selectedPlugin.pendingUpdate;
+              setPluginStates(newStates);
               setSelectedPlugin({
                 ...selectedPlugin,
                 pendingUpdate: !selectedPlugin.pendingUpdate,
-              })
+              });
             }
           } catch (error) {
-            setProcessError(
-              error instanceof Error
-                ? error.message
-                : 'Failed to check plugin update availability',
-            )
+            setProcessError(error instanceof Error ? error.message : 'Failed to check plugin update availability');
           }
         },
-      })
+      });
 
       if (selectedPluginHasMcpb) {
         menuItems.push({
           label: 'Configure',
           action: async () => {
-            setIsLoadingConfig(true)
+            setIsLoadingConfig(true);
             try {
-              const mcpServersSpec = selectedPlugin.plugin.manifest.mcpServers
+              const mcpServersSpec = selectedPlugin.plugin.manifest.mcpServers;
 
-              let mcpbPath: string | null = null
-              if (
-                typeof mcpServersSpec === 'string' &&
-                isMcpbSource(mcpServersSpec)
-              ) {
-                mcpbPath = mcpServersSpec
+              let mcpbPath: string | null = null;
+              if (typeof mcpServersSpec === 'string' && isMcpbSource(mcpServersSpec)) {
+                mcpbPath = mcpServersSpec;
               } else if (Array.isArray(mcpServersSpec)) {
                 for (const spec of mcpServersSpec) {
                   if (typeof spec === 'string' && isMcpbSource(spec)) {
-                    mcpbPath = spec
-                    break
+                    mcpbPath = spec;
+                    break;
                   }
                 }
               }
 
               if (!mcpbPath) {
-                setProcessError('No MCPB file found in plugin')
-                setIsLoadingConfig(false)
-                return
+                setProcessError('No MCPB file found in plugin');
+                setIsLoadingConfig(false);
+                return;
               }
 
-              const pluginId = `${selectedPlugin.plugin.name}@${selectedPlugin.marketplace}`
+              const pluginId = `${selectedPlugin.plugin.name}@${selectedPlugin.marketplace}`;
               const result = await loadMcpbFile(
                 mcpbPath,
                 selectedPlugin.plugin.path,
@@ -1632,22 +1464,22 @@ export function ManagePlugins({
                 undefined,
                 undefined,
                 true,
-              )
+              );
 
               if ('status' in result && result.status === 'needs-config') {
-                setConfigNeeded(result)
-                setViewState('configuring')
+                setConfigNeeded(result);
+                setViewState('configuring');
               } else {
-                setProcessError('Failed to load MCPB for configuration')
+                setProcessError('Failed to load MCPB for configuration');
               }
             } catch (err) {
-              const errorMsg = errorMessage(err)
-              setProcessError(`Failed to load configuration: ${errorMsg}`)
+              const errorMsg = errorMessage(err);
+              setProcessError(`Failed to load configuration: ${errorMsg}`);
             } finally {
-              setIsLoadingConfig(false)
+              setIsLoadingConfig(false);
             }
           },
-        })
+        });
       }
 
       if (
@@ -1660,28 +1492,27 @@ export function ManagePlugins({
             setViewState({
               type: 'configuring-options',
               schema: selectedPlugin.plugin.manifest.userConfig!,
-            })
+            });
           },
-        })
+        });
       }
 
       menuItems.push({
         label: 'Update now',
         action: () => void handleSingleOperation('update'),
-      })
+      });
 
       menuItems.push({
         label: 'Uninstall',
         action: () => void handleSingleOperation('uninstall'),
-      })
+      });
     }
 
     if (selectedPlugin.plugin.manifest.homepage) {
       menuItems.push({
         label: 'Open homepage',
-        action: () =>
-          void openBrowser(selectedPlugin.plugin.manifest.homepage!),
-      })
+        action: () => void openBrowser(selectedPlugin.plugin.manifest.homepage!),
+      });
     }
 
     if (selectedPlugin.plugin.manifest.repository) {
@@ -1690,39 +1521,38 @@ export function ManagePlugins({
         // Azure DevOps, etc. (gh-31598). pluginDetailsHelpers.tsx:74 keeps
         // 'View on GitHub' because that path has an explicit isGitHub check.
         label: 'View repository',
-        action: () =>
-          void openBrowser(selectedPlugin.plugin.manifest.repository!),
-      })
+        action: () => void openBrowser(selectedPlugin.plugin.manifest.repository!),
+      });
     }
 
     menuItems.push({
       label: 'Back to plugin list',
       action: () => {
-        setViewState('plugin-list')
-        setSelectedPlugin(null)
-        setProcessError(null)
+        setViewState('plugin-list');
+        setSelectedPlugin(null);
+        setProcessError(null);
       },
-    })
+    });
 
-    return menuItems
-  }, [viewState, selectedPlugin, selectedPluginHasMcpb, pluginStates])
+    return menuItems;
+  }, [viewState, selectedPlugin, selectedPluginHasMcpb, pluginStates]);
 
   // Plugin-details navigation
   useKeybindings(
     {
       'select:previous': () => {
         if (detailsMenuIndex > 0) {
-          setDetailsMenuIndex(detailsMenuIndex - 1)
+          setDetailsMenuIndex(detailsMenuIndex - 1);
         }
       },
       'select:next': () => {
         if (detailsMenuIndex < detailsMenuItems.length - 1) {
-          setDetailsMenuIndex(detailsMenuIndex + 1)
+          setDetailsMenuIndex(detailsMenuIndex + 1);
         }
       },
       'select:accept': () => {
         if (detailsMenuItems[detailsMenuIndex]) {
-          detailsMenuItems[detailsMenuIndex]!.action()
+          detailsMenuItems[detailsMenuIndex]!.action();
         }
       },
     },
@@ -1730,21 +1560,18 @@ export function ManagePlugins({
       context: 'Select',
       isActive: viewState === 'plugin-details' && !!selectedPlugin,
     },
-  )
+  );
 
   // Failed-plugin-details: only "Uninstall" option, handle Enter
   useKeybindings(
     {
       'select:accept': () => {
-        if (
-          typeof viewState === 'object' &&
-          viewState.type === 'failed-plugin-details'
-        ) {
+        if (typeof viewState === 'object' && viewState.type === 'failed-plugin-details') {
           void (async () => {
-            setIsProcessing(true)
-            setProcessError(null)
-            const pluginId = viewState.plugin.id
-            const pluginScope = viewState.plugin.scope
+            setIsProcessing(true);
+            setProcessError(null);
+            const pluginId = viewState.plugin.id;
+            const pluginScope = viewState.plugin.scope;
             // Pass scope to uninstallPluginOp so it can find the correct V2
             // installation record and clean up on-disk files. Fall back to
             // default scope if not installable (e.g. 'managed', though that
@@ -1754,43 +1581,39 @@ export function ManagePlugins({
             // The normal uninstall path prompts; this one preserves.
             const result = isInstallableScope(pluginScope)
               ? await uninstallPluginOp(pluginId, pluginScope, false)
-              : await uninstallPluginOp(pluginId, 'user', false)
-            let success = result.success
+              : await uninstallPluginOp(pluginId, 'user', false);
+            let success = result.success;
             if (!success) {
               // Plugin was never installed (only in enabledPlugins settings).
               // Remove directly from all editable settings sources.
-              const editableSources = [
-                'userSettings' as const,
-                'projectSettings' as const,
-                'localSettings' as const,
-              ]
+              const editableSources = ['userSettings' as const, 'projectSettings' as const, 'localSettings' as const];
               for (const source of editableSources) {
-                const settings = getSettingsForSource(source)
+                const settings = getSettingsForSource(source);
                 if (settings?.enabledPlugins?.[pluginId] !== undefined) {
                   updateSettingsForSource(source, {
                     enabledPlugins: {
                       ...settings.enabledPlugins,
                       [pluginId]: undefined,
                     },
-                  })
-                  success = true
+                  });
+                  success = true;
                 }
               }
               // Clear memoized caches so next loadAllPlugins() picks up settings changes
-              clearAllCaches()
+              clearAllCaches();
             }
             if (success) {
               if (onManageComplete) {
-                await onManageComplete()
+                await onManageComplete();
               }
-              setIsProcessing(false)
+              setIsProcessing(false);
               // Return to list (don't setResult — that closes the whole dialog)
-              setViewState('plugin-list')
+              setViewState('plugin-list');
             } else {
-              setIsProcessing(false)
-              setProcessError(result.message)
+              setIsProcessing(false);
+              setProcessError(result.message);
             }
-          })()
+          })();
         }
       },
     },
@@ -1801,16 +1624,16 @@ export function ManagePlugins({
         viewState.type === 'failed-plugin-details' &&
         viewState.plugin.scope !== 'managed',
     },
-  )
+  );
 
   // Confirm-project-uninstall: y/enter disables in settings.local.json, n/escape cancels
   useKeybindings(
     {
       'confirm:yes': () => {
-        if (!selectedPlugin) return
-        setIsProcessing(true)
-        setProcessError(null)
-        const pluginId = `${selectedPlugin.plugin.name}@${selectedPlugin.marketplace}`
+        if (!selectedPlugin) return;
+        setIsProcessing(true);
+        setProcessError(null);
+        const pluginId = `${selectedPlugin.plugin.name}@${selectedPlugin.marketplace}`;
         // Write `false` directly — disablePluginOp's cross-scope guard would
         // reject this (plugin isn't in localSettings yet; the override IS the
         // point).
@@ -1819,32 +1642,29 @@ export function ManagePlugins({
             ...getSettingsForSource('localSettings')?.enabledPlugins,
             [pluginId]: false,
           },
-        })
+        });
         if (error) {
-          setIsProcessing(false)
-          setProcessError(`Failed to write settings: ${error.message}`)
-          return
+          setIsProcessing(false);
+          setProcessError(`Failed to write settings: ${error.message}`);
+          return;
         }
-        clearAllCaches()
+        clearAllCaches();
         setResult(
           `✓ Disabled ${selectedPlugin.plugin.name} in .claude/settings.local.json. Run /reload-plugins to apply.`,
-        )
-        if (onManageComplete) void onManageComplete()
-        setParentViewState({ type: 'menu' })
+        );
+        if (onManageComplete) void onManageComplete();
+        setParentViewState({ type: 'menu' });
       },
       'confirm:no': () => {
-        setViewState('plugin-details')
-        setProcessError(null)
+        setViewState('plugin-details');
+        setProcessError(null);
       },
     },
     {
       context: 'Confirmation',
-      isActive:
-        viewState === 'confirm-project-uninstall' &&
-        !!selectedPlugin &&
-        !isProcessing,
+      isActive: viewState === 'confirm-project-uninstall' && !!selectedPlugin && !isProcessing,
     },
-  )
+  );
 
   // Confirm-data-cleanup: y uninstalls + deletes data dir, n uninstalls + keeps,
   // esc cancels. Raw useInput because: (1) the Confirmation context maps
@@ -1856,75 +1676,63 @@ export function ManagePlugins({
   // eslint-disable-next-line custom-rules/prefer-use-keybindings -- raw y/n/esc; Enter must not trigger destructive delete
   useInput(
     (input, key) => {
-      if (!selectedPlugin) return
-      const pluginId = `${selectedPlugin.plugin.name}@${selectedPlugin.marketplace}`
-      const pluginScope = selectedPlugin.scope
+      if (!selectedPlugin) return;
+      const pluginId = `${selectedPlugin.plugin.name}@${selectedPlugin.marketplace}`;
+      const pluginScope = selectedPlugin.scope;
       // Dialog is only reachable from the uninstall case (which guards on
       // isBuiltin), but TS can't track that across viewState transitions.
-      if (
-        !pluginScope ||
-        pluginScope === 'builtin' ||
-        !isInstallableScope(pluginScope)
-      )
-        return
+      if (!pluginScope || pluginScope === 'builtin' || !isInstallableScope(pluginScope)) return;
       const doUninstall = async (deleteDataDir: boolean) => {
-        setIsProcessing(true)
-        setProcessError(null)
+        setIsProcessing(true);
+        setProcessError(null);
         try {
-          const result = await uninstallPluginOp(
-            pluginId,
-            pluginScope,
-            deleteDataDir,
-          )
-          if (!result.success) throw new Error(result.message)
-          clearAllCaches()
-          const suffix = deleteDataDir ? '' : ' · data preserved'
-          setResult(`${figures.tick} ${result.message}${suffix}`)
-          if (onManageComplete) void onManageComplete()
-          setParentViewState({ type: 'menu' })
+          const result = await uninstallPluginOp(pluginId, pluginScope, deleteDataDir);
+          if (!result.success) throw new Error(result.message);
+          clearAllCaches();
+          const suffix = deleteDataDir ? '' : ' · data preserved';
+          setResult(`${figures.tick} ${result.message}${suffix}`);
+          if (onManageComplete) void onManageComplete();
+          setParentViewState({ type: 'menu' });
         } catch (e) {
-          setIsProcessing(false)
-          setProcessError(e instanceof Error ? e.message : String(e))
+          setIsProcessing(false);
+          setProcessError(e instanceof Error ? e.message : String(e));
         }
-      }
+      };
       if (input === 'y' || input === 'Y') {
-        void doUninstall(true)
+        void doUninstall(true);
       } else if (input === 'n' || input === 'N') {
-        void doUninstall(false)
+        void doUninstall(false);
       } else if (key.escape) {
-        setViewState('plugin-details')
-        setProcessError(null)
+        setViewState('plugin-details');
+        setProcessError(null);
       }
     },
     {
       isActive:
-        typeof viewState === 'object' &&
-        viewState.type === 'confirm-data-cleanup' &&
-        !!selectedPlugin &&
-        !isProcessing,
+        typeof viewState === 'object' && viewState.type === 'confirm-data-cleanup' && !!selectedPlugin && !isProcessing,
     },
-  )
+  );
 
   // Reset selection when search query changes
   React.useEffect(() => {
-    setSelectedIndex(0)
-  }, [searchQuery])
+    setSelectedIndex(0);
+  }, [searchQuery]);
 
   // Handle input for entering search mode (text input handled by useSearchInput hook)
   // eslint-disable-next-line custom-rules/prefer-use-keybindings -- useInput needed for raw search mode text input
   useInput(
     (input, key) => {
-      const keyIsNotCtrlOrMeta = !key.ctrl && !key.meta
+      const keyIsNotCtrlOrMeta = !key.ctrl && !key.meta;
       if (isSearchMode) {
         // Text input is handled by useSearchInput hook
-        return
+        return;
       }
 
       // Enter search mode with '/' or any printable character (except navigation keys)
       if (input === '/' && keyIsNotCtrlOrMeta) {
-        setIsSearchMode(true)
-        setSearchQuery('')
-        setSelectedIndex(0)
+        setIsSearchMode(true);
+        setSearchQuery('');
+        setSelectedIndex(0);
       } else if (
         keyIsNotCtrlOrMeta &&
         input.length > 0 &&
@@ -1933,17 +1741,17 @@ export function ManagePlugins({
         input !== 'k' &&
         input !== ' '
       ) {
-        setIsSearchMode(true)
-        setSearchQuery(input)
-        setSelectedIndex(0)
+        setIsSearchMode(true);
+        setSearchQuery(input);
+        setSelectedIndex(0);
       }
     },
     { isActive: viewState === 'plugin-list' },
-  )
+  );
 
   // Loading state
   if (loading) {
-    return <Text>Loading installed plugins…</Text>
+    return <Text>Loading installed plugins…</Text>;
   }
 
   // No plugins or MCPs installed
@@ -1958,24 +1766,20 @@ export function ManagePlugins({
           <Text dimColor>Esc to go back</Text>
         </Box>
       </Box>
-    )
+    );
   }
 
-  if (
-    typeof viewState === 'object' &&
-    viewState.type === 'plugin-options' &&
-    selectedPlugin
-  ) {
-    const pluginId = `${selectedPlugin.plugin.name}@${selectedPlugin.marketplace}`
+  if (typeof viewState === 'object' && viewState.type === 'plugin-options' && selectedPlugin) {
+    const pluginId = `${selectedPlugin.plugin.name}@${selectedPlugin.marketplace}`;
     function finish(msg: string): void {
-      setResult(msg)
+      setResult(msg);
       // Plugin is enabled regardless of whether config was saved or
       // skipped — onManageComplete → markPluginsChanged → the
       // persistent "run /reload-plugins" notice.
       if (onManageComplete) {
-        void onManageComplete()
+        void onManageComplete();
       }
-      setParentViewState({ type: 'menu' })
+      setParentViewState({ type: 'menu' });
     }
     return (
       <PluginOptionsFlow
@@ -1984,31 +1788,23 @@ export function ManagePlugins({
         onDone={(outcome, detail) => {
           switch (outcome) {
             case 'configured':
-              finish(
-                `✓ Enabled and configured ${selectedPlugin.plugin.name}. Run /reload-plugins to apply.`,
-              )
-              break
+              finish(`✓ Enabled and configured ${selectedPlugin.plugin.name}. Run /reload-plugins to apply.`);
+              break;
             case 'skipped':
-              finish(
-                `✓ Enabled ${selectedPlugin.plugin.name}. Run /reload-plugins to apply.`,
-              )
-              break
+              finish(`✓ Enabled ${selectedPlugin.plugin.name}. Run /reload-plugins to apply.`);
+              break;
             case 'error':
-              finish(`Failed to save configuration: ${detail}`)
-              break
+              finish(`Failed to save configuration: ${detail}`);
+              break;
           }
         }}
       />
-    )
+    );
   }
 
   // Configure options (from the Manage menu)
-  if (
-    typeof viewState === 'object' &&
-    viewState.type === 'configuring-options' &&
-    selectedPlugin
-  ) {
-    const pluginId = `${selectedPlugin.plugin.name}@${selectedPlugin.marketplace}`
+  if (typeof viewState === 'object' && viewState.type === 'configuring-options' && selectedPlugin) {
+    const pluginId = `${selectedPlugin.plugin.name}@${selectedPlugin.marketplace}`;
     return (
       <PluginOptionsDialog
         title={`Configure ${selectedPlugin.plugin.name}`}
@@ -2017,81 +1813,66 @@ export function ManagePlugins({
         initialValues={loadPluginOptions(pluginId)}
         onSave={values => {
           try {
-            savePluginOptions(pluginId, values, viewState.schema)
-            clearAllCaches()
-            setResult(
-              'Configuration saved. Run /reload-plugins for changes to take effect.',
-            )
+            savePluginOptions(pluginId, values, viewState.schema);
+            clearAllCaches();
+            setResult('Configuration saved. Run /reload-plugins for changes to take effect.');
           } catch (err) {
-            setProcessError(
-              `Failed to save configuration: ${errorMessage(err)}`,
-            )
+            setProcessError(`Failed to save configuration: ${errorMessage(err)}`);
           }
-          setViewState('plugin-details')
+          setViewState('plugin-details');
         }}
         onCancel={() => setViewState('plugin-details')}
       />
-    )
+    );
   }
 
   // Configuration view
   if (viewState === 'configuring' && configNeeded && selectedPlugin) {
-    const pluginId = `${selectedPlugin.plugin.name}@${selectedPlugin.marketplace}`
+    const pluginId = `${selectedPlugin.plugin.name}@${selectedPlugin.marketplace}`;
 
     async function handleSave(config: UserConfigValues) {
-      if (!configNeeded || !selectedPlugin) return
+      if (!configNeeded || !selectedPlugin) return;
 
       try {
         // Find MCPB path again
-        const mcpServersSpec = selectedPlugin.plugin.manifest.mcpServers
-        let mcpbPath: string | null = null
+        const mcpServersSpec = selectedPlugin.plugin.manifest.mcpServers;
+        let mcpbPath: string | null = null;
 
-        if (
-          typeof mcpServersSpec === 'string' &&
-          isMcpbSource(mcpServersSpec)
-        ) {
-          mcpbPath = mcpServersSpec
+        if (typeof mcpServersSpec === 'string' && isMcpbSource(mcpServersSpec)) {
+          mcpbPath = mcpServersSpec;
         } else if (Array.isArray(mcpServersSpec)) {
           for (const spec of mcpServersSpec) {
             if (typeof spec === 'string' && isMcpbSource(spec)) {
-              mcpbPath = spec
-              break
+              mcpbPath = spec;
+              break;
             }
           }
         }
 
         if (!mcpbPath) {
-          setProcessError('No MCPB file found')
-          setViewState('plugin-details')
-          return
+          setProcessError('No MCPB file found');
+          setViewState('plugin-details');
+          return;
         }
 
         // Reload with provided config
-        await loadMcpbFile(
-          mcpbPath,
-          selectedPlugin.plugin.path,
-          pluginId,
-          undefined,
-          config,
-        )
+        await loadMcpbFile(mcpbPath, selectedPlugin.plugin.path, pluginId, undefined, config);
 
         // Success - go back to details
-        setProcessError(null)
-        setConfigNeeded(null)
-        setViewState('plugin-details')
-        setResult(
-          'Configuration saved. Run /reload-plugins for changes to take effect.',
-        )
+        setProcessError(null);
+        setConfigNeeded(null);
+        setViewState('plugin-details');
+        setResult('Configuration saved. Run /reload-plugins for changes to take effect.');
       } catch (err) {
-        const errorMsg = errorMessage(err)
-        setProcessError(`Failed to save configuration: ${errorMsg}`)
-        setViewState('plugin-details')
+        const errorMsg = errorMessage(err);
+        setProcessError(`Failed to save configuration: ${errorMsg}`);
+        setViewState('plugin-details');
       }
     }
 
     function handleCancel() {
-      setConfigNeeded(null)
-      setViewState('plugin-details')
+      setConfigNeeded(null);
+      setViewState('plugin-details');
     }
 
     return (
@@ -2103,12 +1884,12 @@ export function ManagePlugins({
         onSave={handleSave}
         onCancel={handleCancel}
       />
-    )
+    );
   }
 
   // Flagged plugin detail view
   if (typeof viewState === 'object' && viewState.type === 'flagged-detail') {
-    const fp = viewState.plugin
+    const fp = viewState.plugin;
     return (
       <Box flexDirection="column">
         <Box>
@@ -2123,13 +1904,9 @@ export function ManagePlugins({
         </Box>
 
         <Box marginBottom={1} flexDirection="column">
-          <Text color="error">
-            Removed from marketplace · reason: {fp.reason}
-          </Text>
+          <Text color="error">Removed from marketplace · reason: {fp.reason}</Text>
           <Text>{fp.text}</Text>
-          <Text dimColor>
-            Flagged on {new Date(fp.flaggedAt).toLocaleDateString()}
-          </Text>
+          <Text dimColor>Flagged on {new Date(fp.flaggedAt).toLocaleDateString()}</Text>
         </Box>
 
         <Box marginTop={1} flexDirection="column">
@@ -2140,21 +1917,11 @@ export function ManagePlugins({
         </Box>
 
         <Byline>
-          <ConfigurableShortcutHint
-            action="select:accept"
-            context="Select"
-            fallback="Enter"
-            description="dismiss"
-          />
-          <ConfigurableShortcutHint
-            action="confirm:no"
-            context="Confirmation"
-            fallback="Esc"
-            description="back"
-          />
+          <ConfigurableShortcutHint action="select:accept" context="Select" fallback="Enter" description="dismiss" />
+          <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="back" />
         </Byline>
       </Box>
-    )
+    );
   }
 
   // Confirm-project-uninstall: warn about shared .claude/settings.json,
@@ -2163,15 +1930,11 @@ export function ManagePlugins({
     return (
       <Box flexDirection="column">
         <Text bold color="warning">
-          {selectedPlugin.plugin.name} is enabled in .claude/settings.json
-          (shared with your team)
+          {selectedPlugin.plugin.name} is enabled in .claude/settings.json (shared with your team)
         </Text>
         <Box marginTop={1} flexDirection="column">
           <Text>Disable it just for you in .claude/settings.local.json?</Text>
-          <Text dimColor>
-            This has the same effect as uninstalling, without affecting other
-            contributors.
-          </Text>
+          <Text dimColor>This has the same effect as uninstalling, without affecting other contributors.</Text>
         </Box>
         {processError && (
           <Box marginTop={1}>
@@ -2199,28 +1962,19 @@ export function ManagePlugins({
           )}
         </Box>
       </Box>
-    )
+    );
   }
 
   // Confirm-data-cleanup: prompt before deleting ${CLAUDE_PLUGIN_DATA} dir
-  if (
-    typeof viewState === 'object' &&
-    viewState.type === 'confirm-data-cleanup' &&
-    selectedPlugin
-  ) {
+  if (typeof viewState === 'object' && viewState.type === 'confirm-data-cleanup' && selectedPlugin) {
     return (
       <Box flexDirection="column">
         <Text bold>
-          {selectedPlugin.plugin.name} has {viewState.size.human} of persistent
-          data
+          {selectedPlugin.plugin.name} has {viewState.size.human} of persistent data
         </Text>
         <Box marginTop={1} flexDirection="column">
           <Text>Delete it along with the plugin?</Text>
-          <Text dimColor>
-            {pluginDataDirPath(
-              `${selectedPlugin.plugin.name}@${selectedPlugin.marketplace}`,
-            )}
-          </Text>
+          <Text dimColor>{pluginDataDirPath(`${selectedPlugin.plugin.name}@${selectedPlugin.marketplace}`)}</Text>
         </Box>
         {processError && (
           <Box marginTop={1}>
@@ -2232,20 +1986,19 @@ export function ManagePlugins({
             <Text dimColor>Uninstalling…</Text>
           ) : (
             <Text>
-              <Text bold>y</Text> to delete · <Text bold>n</Text> to keep ·{' '}
-              <Text bold>esc</Text> to cancel
+              <Text bold>y</Text> to delete · <Text bold>n</Text> to keep · <Text bold>esc</Text> to cancel
             </Text>
           )}
         </Box>
       </Box>
-    )
+    );
   }
 
   // Plugin details view
   if (viewState === 'plugin-details' && selectedPlugin) {
-    const mergedSettings = getSettings_DEPRECATED() // Use merged settings to respect all layers
-    const pluginId = `${selectedPlugin.plugin.name}@${selectedPlugin.marketplace}`
-    const isEnabled = mergedSettings?.enabledPlugins?.[pluginId] !== false
+    const mergedSettings = getSettings_DEPRECATED(); // Use merged settings to respect all layers
+    const pluginId = `${selectedPlugin.plugin.name}@${selectedPlugin.marketplace}`;
+    const isEnabled = mergedSettings?.enabledPlugins?.[pluginId] !== false;
 
     // Compute plugin errors section
     const filteredPluginErrors = pluginErrors.filter(
@@ -2253,16 +2006,15 @@ export function ManagePlugins({
         ('plugin' in e && e.plugin === selectedPlugin.plugin.name) ||
         e.source === pluginId ||
         e.source.startsWith(`${selectedPlugin.plugin.name}@`),
-    )
+    );
     const pluginErrorsSection =
       filteredPluginErrors.length === 0 ? null : (
         <Box flexDirection="column" marginBottom={1}>
           <Text bold color="error">
-            {filteredPluginErrors.length}{' '}
-            {plural(filteredPluginErrors.length, 'error')}:
+            {filteredPluginErrors.length} {plural(filteredPluginErrors.length, 'error')}:
           </Text>
           {filteredPluginErrors.map((error, i) => {
-            const guidance = getErrorGuidance(error)
+            const guidance = getErrorGuidance(error);
             return (
               <Box key={i} flexDirection="column" marginLeft={2}>
                 <Text color="error">{formatErrorMessage(error)}</Text>
@@ -2272,10 +2024,10 @@ export function ManagePlugins({
                   </Text>
                 )}
               </Box>
-            )
+            );
           })}
         </Box>
-      )
+      );
 
     return (
       <Box flexDirection="column">
@@ -2315,19 +2067,12 @@ export function ManagePlugins({
         {/* Current status */}
         <Box marginBottom={1}>
           <Text dimColor>Status: </Text>
-          <Text color={isEnabled ? 'success' : 'warning'}>
-            {isEnabled ? 'Enabled' : 'Disabled'}
-          </Text>
-          {selectedPlugin.pendingUpdate && (
-            <Text color="suggestion"> · Marked for update</Text>
-          )}
+          <Text color={isEnabled ? 'success' : 'warning'}>{isEnabled ? 'Enabled' : 'Disabled'}</Text>
+          {selectedPlugin.pendingUpdate && <Text color="suggestion"> · Marked for update</Text>}
         </Box>
 
         {/* Installed components */}
-        <PluginComponentsDisplay
-          plugin={selectedPlugin.plugin}
-          marketplace={selectedPlugin.marketplace}
-        />
+        <PluginComponentsDisplay plugin={selectedPlugin.plugin} marketplace={selectedPlugin.marketplace} />
 
         {/* Plugin errors */}
         {pluginErrorsSection}
@@ -2335,7 +2080,7 @@ export function ManagePlugins({
         {/* Menu */}
         <Box marginTop={1} flexDirection="column">
           {detailsMenuItems.map((item, index) => {
-            const isSelected = index === detailsMenuIndex
+            const isSelected = index === detailsMenuIndex;
 
             return (
               <Box key={index}>
@@ -2354,7 +2099,7 @@ export function ManagePlugins({
                   {item.label}
                 </Text>
               </Box>
-            )
+            );
           })}
         </Box>
 
@@ -2375,42 +2120,22 @@ export function ManagePlugins({
         <Box marginTop={1}>
           <Text dimColor italic>
             <Byline>
-              <ConfigurableShortcutHint
-                action="select:previous"
-                context="Select"
-                fallback="↑"
-                description="navigate"
-              />
-              <ConfigurableShortcutHint
-                action="select:accept"
-                context="Select"
-                fallback="Enter"
-                description="select"
-              />
-              <ConfigurableShortcutHint
-                action="confirm:no"
-                context="Confirmation"
-                fallback="Esc"
-                description="back"
-              />
+              <ConfigurableShortcutHint action="select:previous" context="Select" fallback="↑" description="navigate" />
+              <ConfigurableShortcutHint action="select:accept" context="Select" fallback="Enter" description="select" />
+              <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="back" />
             </Byline>
           </Text>
         </Box>
       </Box>
-    )
+    );
   }
 
   // Failed plugin detail view
-  if (
-    typeof viewState === 'object' &&
-    viewState.type === 'failed-plugin-details'
-  ) {
-    const failedPlugin = viewState.plugin
+  if (typeof viewState === 'object' && viewState.type === 'failed-plugin-details') {
+    const failedPlugin = viewState.plugin;
 
-    const firstError = failedPlugin.errors[0]
-    const errorMessage = firstError
-      ? formatErrorMessage(firstError)
-      : 'Failed to load'
+    const firstError = failedPlugin.errors[0];
+    const errorMessage = firstError ? formatErrorMessage(firstError) : 'Failed to load';
 
     return (
       <Box flexDirection="column">
@@ -2423,9 +2148,7 @@ export function ManagePlugins({
 
         {failedPlugin.scope === 'managed' ? (
           <Box marginTop={1}>
-            <Text dimColor>
-              Managed by your organization — contact your admin
-            </Text>
+            <Text dimColor>Managed by your organization — contact your admin</Text>
           </Box>
         ) : (
           <Box marginTop={1}>
@@ -2448,43 +2171,38 @@ export function ManagePlugins({
                   description="remove"
                 />
               )}
-              <ConfigurableShortcutHint
-                action="confirm:no"
-                context="Confirmation"
-                fallback="Esc"
-                description="back"
-              />
+              <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="back" />
             </Byline>
           </Text>
         </Box>
       </Box>
-    )
+    );
   }
 
   // MCP detail view
   if (typeof viewState === 'object' && viewState.type === 'mcp-detail') {
-    const client = viewState.client
-    const serverToolsCount = filterToolsByServer(mcpTools, client.name).length
+    const client = viewState.client;
+    const serverToolsCount = filterToolsByServer(mcpTools, client.name).length;
 
     // Common handlers for MCP menus
     const handleMcpViewTools = () => {
-      setViewState({ type: 'mcp-tools', client })
-    }
+      setViewState({ type: 'mcp-tools', client });
+    };
 
     const handleMcpCancel = () => {
-      setViewState('plugin-list')
-    }
+      setViewState('plugin-list');
+    };
 
     const handleMcpComplete = (result?: string) => {
       if (result) {
-        setResult(result)
+        setResult(result);
       }
-      setViewState('plugin-list')
-    }
+      setViewState('plugin-list');
+    };
 
     // Transform MCPServerConnection to appropriate ServerInfo type
-    const scope = client.config.scope
-    const configType = client.config.type
+    const scope = client.config.scope;
+    const configType = client.config.type;
 
     if (configType === 'stdio') {
       const server: StdioServerInfo = {
@@ -2493,7 +2211,7 @@ export function ManagePlugins({
         scope,
         transport: 'stdio',
         config: client.config as McpStdioServerConfig,
-      }
+      };
       return (
         <MCPStdioServerMenu
           server={server}
@@ -2503,7 +2221,7 @@ export function ManagePlugins({
           onComplete={handleMcpComplete}
           borderless
         />
-      )
+      );
     } else if (configType === 'sse') {
       const server: SSEServerInfo = {
         name: client.name,
@@ -2512,7 +2230,7 @@ export function ManagePlugins({
         transport: 'sse',
         isAuthenticated: undefined,
         config: client.config as McpSSEServerConfig,
-      }
+      };
       return (
         <MCPRemoteServerMenu
           server={server}
@@ -2522,7 +2240,7 @@ export function ManagePlugins({
           onComplete={handleMcpComplete}
           borderless
         />
-      )
+      );
     } else if (configType === 'http') {
       const server: HTTPServerInfo = {
         name: client.name,
@@ -2531,7 +2249,7 @@ export function ManagePlugins({
         transport: 'http',
         isAuthenticated: undefined,
         config: client.config as McpHTTPServerConfig,
-      }
+      };
       return (
         <MCPRemoteServerMenu
           server={server}
@@ -2541,7 +2259,7 @@ export function ManagePlugins({
           onComplete={handleMcpComplete}
           borderless
         />
-      )
+      );
     } else if (configType === 'claudeai-proxy') {
       const server: ClaudeAIServerInfo = {
         name: client.name,
@@ -2550,7 +2268,7 @@ export function ManagePlugins({
         transport: 'claudeai-proxy',
         isAuthenticated: undefined,
         config: client.config as McpClaudeAIProxyServerConfig,
-      }
+      };
       return (
         <MCPRemoteServerMenu
           server={server}
@@ -2560,26 +2278,22 @@ export function ManagePlugins({
           onComplete={handleMcpComplete}
           borderless
         />
-      )
+      );
     }
 
     // Fallback - shouldn't happen but handle gracefully
-    setViewState('plugin-list')
-    return null
+    setViewState('plugin-list');
+    return null;
   }
 
   // MCP tools view
   if (typeof viewState === 'object' && viewState.type === 'mcp-tools') {
-    const client = viewState.client
-    const scope = client.config.scope
-    const configType = client.config.type
+    const client = viewState.client;
+    const scope = client.config.scope;
+    const configType = client.config.type;
 
     // Build ServerInfo for MCPToolListView
-    let server:
-      | StdioServerInfo
-      | SSEServerInfo
-      | HTTPServerInfo
-      | ClaudeAIServerInfo
+    let server: StdioServerInfo | SSEServerInfo | HTTPServerInfo | ClaudeAIServerInfo;
     if (configType === 'stdio') {
       server = {
         name: client.name,
@@ -2587,7 +2301,7 @@ export function ManagePlugins({
         scope,
         transport: 'stdio',
         config: client.config as McpStdioServerConfig,
-      }
+      };
     } else if (configType === 'sse') {
       server = {
         name: client.name,
@@ -2596,7 +2310,7 @@ export function ManagePlugins({
         transport: 'sse',
         isAuthenticated: undefined,
         config: client.config as McpSSEServerConfig,
-      }
+      };
     } else if (configType === 'http') {
       server = {
         name: client.name,
@@ -2605,7 +2319,7 @@ export function ManagePlugins({
         transport: 'http',
         isAuthenticated: undefined,
         config: client.config as McpHTTPServerConfig,
-      }
+      };
     } else {
       server = {
         name: client.name,
@@ -2614,32 +2328,28 @@ export function ManagePlugins({
         transport: 'claudeai-proxy',
         isAuthenticated: undefined,
         config: client.config as McpClaudeAIProxyServerConfig,
-      }
+      };
     }
 
     return (
       <MCPToolListView
         server={server}
         onSelectTool={(tool: Tool) => {
-          setViewState({ type: 'mcp-tool-detail', client, tool })
+          setViewState({ type: 'mcp-tool-detail', client, tool });
         }}
         onBack={() => setViewState({ type: 'mcp-detail', client })}
       />
-    )
+    );
   }
 
   // MCP tool detail view
   if (typeof viewState === 'object' && viewState.type === 'mcp-tool-detail') {
-    const { client, tool } = viewState
-    const scope = client.config.scope
-    const configType = client.config.type
+    const { client, tool } = viewState;
+    const scope = client.config.scope;
+    const configType = client.config.type;
 
     // Build ServerInfo for MCPToolDetailView
-    let server:
-      | StdioServerInfo
-      | SSEServerInfo
-      | HTTPServerInfo
-      | ClaudeAIServerInfo
+    let server: StdioServerInfo | SSEServerInfo | HTTPServerInfo | ClaudeAIServerInfo;
     if (configType === 'stdio') {
       server = {
         name: client.name,
@@ -2647,7 +2357,7 @@ export function ManagePlugins({
         scope,
         transport: 'stdio',
         config: client.config as McpStdioServerConfig,
-      }
+      };
     } else if (configType === 'sse') {
       server = {
         name: client.name,
@@ -2656,7 +2366,7 @@ export function ManagePlugins({
         transport: 'sse',
         isAuthenticated: undefined,
         config: client.config as McpSSEServerConfig,
-      }
+      };
     } else if (configType === 'http') {
       server = {
         name: client.name,
@@ -2665,7 +2375,7 @@ export function ManagePlugins({
         transport: 'http',
         isAuthenticated: undefined,
         config: client.config as McpHTTPServerConfig,
-      }
+      };
     } else {
       server = {
         name: client.name,
@@ -2674,20 +2384,14 @@ export function ManagePlugins({
         transport: 'claudeai-proxy',
         isAuthenticated: undefined,
         config: client.config as McpClaudeAIProxyServerConfig,
-      }
+      };
     }
 
-    return (
-      <MCPToolDetailView
-        tool={tool}
-        server={server}
-        onBack={() => setViewState({ type: 'mcp-tools', client })}
-      />
-    )
+    return <MCPToolDetailView tool={tool} server={server} onBack={() => setViewState({ type: 'mcp-tools', client })} />;
   }
 
   // Plugin list view (main management interface)
-  const visibleItems = pagination.getVisibleItems(filteredItems)
+  const visibleItems = pagination.getVisibleItems(filteredItems);
 
   return (
     <Box flexDirection="column">
@@ -2718,37 +2422,36 @@ export function ManagePlugins({
 
       {/* Unified list of plugins and MCPs grouped by scope */}
       {visibleItems.map((item, visibleIndex) => {
-        const actualIndex = pagination.toActualIndex(visibleIndex)
-        const isSelected = actualIndex === selectedIndex && !isSearchMode
+        const actualIndex = pagination.toActualIndex(visibleIndex);
+        const isSelected = actualIndex === selectedIndex && !isSearchMode;
 
         // Check if we need to show a scope header
-        const prevItem =
-          visibleIndex > 0 ? visibleItems[visibleIndex - 1] : null
-        const showScopeHeader = !prevItem || prevItem.scope !== item.scope
+        const prevItem = visibleIndex > 0 ? visibleItems[visibleIndex - 1] : null;
+        const showScopeHeader = !prevItem || prevItem.scope !== item.scope;
 
         // Get scope label
         const getScopeLabel = (scope: string): string => {
           switch (scope) {
             case 'flagged':
-              return 'Flagged'
+              return 'Flagged';
             case 'project':
-              return 'Project'
+              return 'Project';
             case 'local':
-              return 'Local'
+              return 'Local';
             case 'user':
-              return 'User'
+              return 'User';
             case 'enterprise':
-              return 'Enterprise'
+              return 'Enterprise';
             case 'managed':
-              return 'Managed'
+              return 'Managed';
             case 'builtin':
-              return 'Built-in'
+              return 'Built-in';
             case 'dynamic':
-              return 'Built-in'
+              return 'Built-in';
             default:
-              return scope
+              return scope;
           }
-        }
+        };
 
         return (
           <React.Fragment key={item.id}>
@@ -2765,7 +2468,7 @@ export function ManagePlugins({
             )}
             <UnifiedInstalledCell item={item} isSelected={isSelected} />
           </React.Fragment>
-        )
+        );
       })}
 
       {/* Scroll down indicator */}
@@ -2780,24 +2483,9 @@ export function ManagePlugins({
         <Text dimColor italic>
           <Byline>
             <Text>type to search</Text>
-            <ConfigurableShortcutHint
-              action="plugin:toggle"
-              context="Plugin"
-              fallback="Space"
-              description="toggle"
-            />
-            <ConfigurableShortcutHint
-              action="select:accept"
-              context="Select"
-              fallback="Enter"
-              description="details"
-            />
-            <ConfigurableShortcutHint
-              action="confirm:no"
-              context="Confirmation"
-              fallback="Esc"
-              description="back"
-            />
+            <ConfigurableShortcutHint action="plugin:toggle" context="Plugin" fallback="Space" description="toggle" />
+            <ConfigurableShortcutHint action="select:accept" context="Select" fallback="Enter" description="details" />
+            <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="back" />
           </Byline>
         </Text>
       </Box>
@@ -2811,5 +2499,5 @@ export function ManagePlugins({
         </Box>
       )}
     </Box>
-  )
+  );
 }
diff --git a/src/commands/plugin/PluginErrors.tsx b/src/commands/plugin/PluginErrors.tsx
index 1a81fa2a1..532771147 100644
--- a/src/commands/plugin/PluginErrors.tsx
+++ b/src/commands/plugin/PluginErrors.tsx
@@ -1,140 +1,139 @@
-import { getPluginErrorMessage, type PluginError } from '../../types/plugin.js'
+import { getPluginErrorMessage, type PluginError } from '../../types/plugin.js';
 
 export function formatErrorMessage(error: PluginError): string {
   switch (error.type) {
     case 'path-not-found':
-      return `${error.component} path not found: ${error.path}`
+      return `${error.component} path not found: ${error.path}`;
     case 'git-auth-failed':
-      return `Git ${error.authType.toUpperCase()} authentication failed for ${error.gitUrl}`
+      return `Git ${error.authType.toUpperCase()} authentication failed for ${error.gitUrl}`;
     case 'git-timeout':
-      return `Git ${error.operation} timed out for ${error.gitUrl}`
+      return `Git ${error.operation} timed out for ${error.gitUrl}`;
     case 'network-error':
-      return `Network error accessing ${error.url}${error.details ? `: ${error.details}` : ''}`
+      return `Network error accessing ${error.url}${error.details ? `: ${error.details}` : ''}`;
     case 'manifest-parse-error':
-      return `Failed to parse manifest at ${error.manifestPath}: ${error.parseError}`
+      return `Failed to parse manifest at ${error.manifestPath}: ${error.parseError}`;
     case 'manifest-validation-error':
-      return `Invalid manifest at ${error.manifestPath}: ${error.validationErrors.join(', ')}`
+      return `Invalid manifest at ${error.manifestPath}: ${error.validationErrors.join(', ')}`;
     case 'plugin-not-found':
-      return `Plugin "${error.pluginId}" not found in marketplace "${error.marketplace}"`
+      return `Plugin "${error.pluginId}" not found in marketplace "${error.marketplace}"`;
     case 'marketplace-not-found':
-      return `Marketplace "${error.marketplace}" not found`
+      return `Marketplace "${error.marketplace}" not found`;
     case 'marketplace-load-failed':
-      return `Failed to load marketplace "${error.marketplace}": ${error.reason}`
+      return `Failed to load marketplace "${error.marketplace}": ${error.reason}`;
     case 'mcp-config-invalid':
-      return `Invalid MCP server config for "${error.serverName}": ${error.validationError}`
+      return `Invalid MCP server config for "${error.serverName}": ${error.validationError}`;
     case 'mcp-server-suppressed-duplicate': {
       const dup = error.duplicateOf.startsWith('plugin:')
         ? `server provided by plugin "${error.duplicateOf.split(':')[1] ?? '?'}"`
-        : `already-configured "${error.duplicateOf}"`
-      return `MCP server "${error.serverName}" skipped — same command/URL as ${dup}`
+        : `already-configured "${error.duplicateOf}"`;
+      return `MCP server "${error.serverName}" skipped — same command/URL as ${dup}`;
     }
     case 'hook-load-failed':
-      return `Failed to load hooks from ${error.hookPath}: ${error.reason}`
+      return `Failed to load hooks from ${error.hookPath}: ${error.reason}`;
     case 'component-load-failed':
-      return `Failed to load ${error.component} from ${error.path}: ${error.reason}`
+      return `Failed to load ${error.component} from ${error.path}: ${error.reason}`;
     case 'mcpb-download-failed':
-      return `Failed to download MCPB from ${error.url}: ${error.reason}`
+      return `Failed to download MCPB from ${error.url}: ${error.reason}`;
     case 'mcpb-extract-failed':
-      return `Failed to extract MCPB ${error.mcpbPath}: ${error.reason}`
+      return `Failed to extract MCPB ${error.mcpbPath}: ${error.reason}`;
     case 'mcpb-invalid-manifest':
-      return `MCPB manifest invalid at ${error.mcpbPath}: ${error.validationError}`
+      return `MCPB manifest invalid at ${error.mcpbPath}: ${error.validationError}`;
     case 'marketplace-blocked-by-policy':
       return error.blockedByBlocklist
         ? `Marketplace "${error.marketplace}" is blocked by enterprise policy`
-        : `Marketplace "${error.marketplace}" is not in the allowed marketplace list`
+        : `Marketplace "${error.marketplace}" is not in the allowed marketplace list`;
     case 'dependency-unsatisfied':
       return error.reason === 'not-enabled'
         ? `Dependency "${error.dependency}" is disabled`
-        : `Dependency "${error.dependency}" is not installed`
+        : `Dependency "${error.dependency}" is not installed`;
     case 'lsp-config-invalid':
-      return `Invalid LSP server config for "${error.serverName}": ${error.validationError}`
+      return `Invalid LSP server config for "${error.serverName}": ${error.validationError}`;
     case 'lsp-server-start-failed':
-      return `LSP server "${error.serverName}" failed to start: ${error.reason}`
+      return `LSP server "${error.serverName}" failed to start: ${error.reason}`;
     case 'lsp-server-crashed':
       return error.signal
         ? `LSP server "${error.serverName}" crashed with signal ${error.signal}`
-        : `LSP server "${error.serverName}" crashed with exit code ${error.exitCode ?? 'unknown'}`
+        : `LSP server "${error.serverName}" crashed with exit code ${error.exitCode ?? 'unknown'}`;
     case 'lsp-request-timeout':
-      return `LSP server "${error.serverName}" timed out on ${error.method} after ${error.timeoutMs}ms`
+      return `LSP server "${error.serverName}" timed out on ${error.method} after ${error.timeoutMs}ms`;
     case 'lsp-request-failed':
-      return `LSP server "${error.serverName}" ${error.method} failed: ${error.error}`
+      return `LSP server "${error.serverName}" ${error.method} failed: ${error.error}`;
     case 'plugin-cache-miss':
-      return `Plugin "${error.plugin}" not cached at ${error.installPath}`
+      return `Plugin "${error.plugin}" not cached at ${error.installPath}`;
     case 'generic-error':
-      return error.error
+      return error.error;
   }
-  const _exhaustive: never = error
-  return getPluginErrorMessage(_exhaustive)
+  const _exhaustive: never = error;
+  return getPluginErrorMessage(_exhaustive);
 }
 
 export function getErrorGuidance(error: PluginError): string | null {
   switch (error.type) {
     case 'path-not-found':
-      return 'Check that the path in your manifest or marketplace config is correct'
+      return 'Check that the path in your manifest or marketplace config is correct';
     case 'git-auth-failed':
       return error.authType === 'ssh'
         ? 'Configure SSH keys or use HTTPS URL instead'
-        : 'Configure credentials or use SSH URL instead'
+        : 'Configure credentials or use SSH URL instead';
     case 'git-timeout':
     case 'network-error':
-      return 'Check your internet connection and try again'
+      return 'Check your internet connection and try again';
     case 'manifest-parse-error':
-      return 'Check manifest file syntax in the plugin directory'
+      return 'Check manifest file syntax in the plugin directory';
     case 'manifest-validation-error':
-      return 'Check manifest file follows the required schema'
+      return 'Check manifest file follows the required schema';
     case 'plugin-not-found':
-      return `Plugin may not exist in marketplace "${error.marketplace}"`
+      return `Plugin may not exist in marketplace "${error.marketplace}"`;
     case 'marketplace-not-found':
       return error.availableMarketplaces.length > 0
         ? `Available marketplaces: ${error.availableMarketplaces.join(', ')}`
-        : 'Add the marketplace first using /plugin marketplace add'
+        : 'Add the marketplace first using /plugin marketplace add';
     case 'mcp-config-invalid':
-      return 'Check MCP server configuration in .mcp.json or manifest'
+      return 'Check MCP server configuration in .mcp.json or manifest';
     case 'mcp-server-suppressed-duplicate': {
       // duplicateOf is "plugin:name:srv" when another plugin won dedup —
       // users can't remove plugin-provided servers from their MCP config,
       // so point them at the winning plugin instead.
       if (error.duplicateOf.startsWith('plugin:')) {
-        const winningPlugin =
-          error.duplicateOf.split(':')[1] ?? 'the other plugin'
-        return `Disable plugin "${winningPlugin}" if you want this plugin's version instead`
+        const winningPlugin = error.duplicateOf.split(':')[1] ?? 'the other plugin';
+        return `Disable plugin "${winningPlugin}" if you want this plugin's version instead`;
       }
-      return `Remove "${error.duplicateOf}" from your MCP config if you want the plugin's version instead`
+      return `Remove "${error.duplicateOf}" from your MCP config if you want the plugin's version instead`;
     }
     case 'hook-load-failed':
-      return 'Check hooks.json file syntax and structure'
+      return 'Check hooks.json file syntax and structure';
     case 'component-load-failed':
-      return `Check ${error.component} directory structure and file permissions`
+      return `Check ${error.component} directory structure and file permissions`;
     case 'mcpb-download-failed':
-      return 'Check your internet connection and URL accessibility'
+      return 'Check your internet connection and URL accessibility';
     case 'mcpb-extract-failed':
-      return 'Verify the MCPB file is valid and not corrupted'
+      return 'Verify the MCPB file is valid and not corrupted';
     case 'mcpb-invalid-manifest':
-      return 'Contact the plugin author about the invalid manifest'
+      return 'Contact the plugin author about the invalid manifest';
     case 'marketplace-blocked-by-policy':
       if (error.blockedByBlocklist) {
-        return 'This marketplace source is explicitly blocked by your administrator'
+        return 'This marketplace source is explicitly blocked by your administrator';
       }
       return error.allowedSources.length > 0
         ? `Allowed sources: ${error.allowedSources.join(', ')}`
-        : 'Contact your administrator to configure allowed marketplace sources'
+        : 'Contact your administrator to configure allowed marketplace sources';
     case 'dependency-unsatisfied':
       return error.reason === 'not-enabled'
         ? `Enable "${error.dependency}" or uninstall "${error.plugin}"`
-        : `Install "${error.dependency}" or uninstall "${error.plugin}"`
+        : `Install "${error.dependency}" or uninstall "${error.plugin}"`;
     case 'lsp-config-invalid':
-      return 'Check LSP server configuration in the plugin manifest'
+      return 'Check LSP server configuration in the plugin manifest';
     case 'lsp-server-start-failed':
     case 'lsp-server-crashed':
     case 'lsp-request-timeout':
     case 'lsp-request-failed':
-      return 'Check LSP server logs with --debug for details'
+      return 'Check LSP server logs with --debug for details';
     case 'plugin-cache-miss':
-      return 'Run /plugins to refresh the plugin cache'
+      return 'Run /plugins to refresh the plugin cache';
     case 'marketplace-load-failed':
     case 'generic-error':
-      return null
+      return null;
   }
-  const _exhaustive: never = error
-  return null
+  const _exhaustive: never = error;
+  return null;
 }
diff --git a/src/commands/plugin/PluginOptionsDialog.tsx b/src/commands/plugin/PluginOptionsDialog.tsx
index cb09352d3..2a9565c04 100644
--- a/src/commands/plugin/PluginOptionsDialog.tsx
+++ b/src/commands/plugin/PluginOptionsDialog.tsx
@@ -1,17 +1,11 @@
-import figures from 'figures'
-import React, { useCallback, useState } from 'react'
-import { Dialog } from '@anthropic/ink'
+import figures from 'figures';
+import React, { useCallback, useState } from 'react';
+import { Dialog } from '@anthropic/ink';
 // eslint-disable-next-line custom-rules/prefer-use-keybindings -- raw text input for config dialog
-import { Box, Text, useInput, stringWidth } from '@anthropic/ink'
-import {
-  useKeybinding,
-  useKeybindings,
-} from '../../keybindings/useKeybinding.js'
-import { isEnvTruthy } from '../../utils/envUtils.js'
-import type {
-  PluginOptionSchema,
-  PluginOptionValues,
-} from '../../utils/plugins/pluginOptionsStorage.js'
+import { Box, Text, useInput, stringWidth } from '@anthropic/ink';
+import { useKeybinding, useKeybindings } from '../../keybindings/useKeybinding.js';
+import { isEnvTruthy } from '../../utils/envUtils.js';
+import type { PluginOptionSchema, PluginOptionValues } from '../../utils/plugins/pluginOptionsStorage.js';
 
 /**
  * Build the onSave payload from collected string inputs.
@@ -31,43 +25,39 @@ export function buildFinalValues(
   configSchema: PluginOptionSchema,
   initialValues: PluginOptionValues | undefined,
 ): PluginOptionValues {
-  const finalValues: PluginOptionValues = {}
+  const finalValues: PluginOptionValues = {};
   for (const fieldKey of fields) {
-    const schema = configSchema[fieldKey]
-    const value = collected[fieldKey] ?? ''
+    const schema = configSchema[fieldKey];
+    const value = collected[fieldKey] ?? '';
 
-    if (
-      schema?.sensitive === true &&
-      value === '' &&
-      initialValues?.[fieldKey] !== undefined
-    ) {
-      continue
+    if (schema?.sensitive === true && value === '' && initialValues?.[fieldKey] !== undefined) {
+      continue;
     }
 
     if (schema?.type === 'number') {
       // Number('') returns 0, not NaN — omit blank number inputs so
       // validateUserConfig's required check actually catches them.
-      if (value.trim() === '') continue
-      const num = Number(value)
-      finalValues[fieldKey] = Number.isNaN(num) ? value : num
+      if (value.trim() === '') continue;
+      const num = Number(value);
+      finalValues[fieldKey] = Number.isNaN(num) ? value : num;
     } else if (schema?.type === 'boolean') {
-      finalValues[fieldKey] = isEnvTruthy(value)
+      finalValues[fieldKey] = isEnvTruthy(value);
     } else {
-      finalValues[fieldKey] = value
+      finalValues[fieldKey] = value;
     }
   }
-  return finalValues
+  return finalValues;
 }
 
 type Props = {
-  title: string
-  subtitle: string
-  configSchema: PluginOptionSchema
+  title: string;
+  subtitle: string;
+  configSchema: PluginOptionSchema;
   /** Pre-fill fields when reconfiguring. Sensitive fields are not prepopulated. */
-  initialValues?: PluginOptionValues
-  onSave: (config: PluginOptionValues) => void
-  onCancel: () => void
-}
+  initialValues?: PluginOptionValues;
+  onSave: (config: PluginOptionValues) => void;
+  onCancel: () => void;
+};
 
 export function PluginOptionsDialog({
   title,
@@ -77,68 +67,56 @@ export function PluginOptionsDialog({
   onSave,
   onCancel,
 }: Props): React.ReactNode {
-  const fields = Object.keys(configSchema)
+  const fields = Object.keys(configSchema);
 
   // Prepopulate from initialValues but skip sensitive fields — we don't
   // want to echo secrets back into the text buffer.
   const initialFor = useCallback(
     (key: string): string => {
-      if (configSchema[key]?.sensitive === true) return ''
-      const v = initialValues?.[key]
-      return v === undefined ? '' : String(v)
+      if (configSchema[key]?.sensitive === true) return '';
+      const v = initialValues?.[key];
+      return v === undefined ? '' : String(v);
     },
     [configSchema, initialValues],
-  )
+  );
 
-  const [currentFieldIndex, setCurrentFieldIndex] = useState(0)
-  const [values, setValues] = useState<Record<string, string>>({})
-  const [currentInput, setCurrentInput] = useState(() =>
-    fields[0] ? initialFor(fields[0]) : '',
-  )
+  const [currentFieldIndex, setCurrentFieldIndex] = useState(0);
+  const [values, setValues] = useState<Record<string, string>>({});
+  const [currentInput, setCurrentInput] = useState(() => (fields[0] ? initialFor(fields[0]) : ''));
 
-  const currentField = fields[currentFieldIndex]
-  const fieldSchema = currentField ? configSchema[currentField] : null
+  const currentField = fields[currentFieldIndex];
+  const fieldSchema = currentField ? configSchema[currentField] : null;
 
   // Use Settings context so 'n' key doesn't cancel (allows typing 'n' in input).
   // isCancelActive={false} on Dialog keeps its own confirm:no out of the way.
-  useKeybinding('confirm:no', onCancel, { context: 'Settings' })
+  useKeybinding('confirm:no', onCancel, { context: 'Settings' });
 
   // Tab to next field
   const handleNextField = useCallback(() => {
     if (currentFieldIndex < fields.length - 1 && currentField) {
-      setValues(prev => ({ ...prev, [currentField]: currentInput }))
-      setCurrentFieldIndex(prev => prev + 1)
-      const nextKey = fields[currentFieldIndex + 1]
-      setCurrentInput(nextKey ? initialFor(nextKey) : '')
+      setValues(prev => ({ ...prev, [currentField]: currentInput }));
+      setCurrentFieldIndex(prev => prev + 1);
+      const nextKey = fields[currentFieldIndex + 1];
+      setCurrentInput(nextKey ? initialFor(nextKey) : '');
     }
-  }, [currentFieldIndex, fields, currentField, currentInput, initialFor])
+  }, [currentFieldIndex, fields, currentField, currentInput, initialFor]);
 
   // Enter to save current field and move to next, or save all if last
   const handleConfirm = useCallback(() => {
-    if (!currentField) return
+    if (!currentField) return;
 
-    const newValues = { ...values, [currentField]: currentInput }
+    const newValues = { ...values, [currentField]: currentInput };
 
     if (currentFieldIndex === fields.length - 1) {
-      onSave(buildFinalValues(fields, newValues, configSchema, initialValues))
+      onSave(buildFinalValues(fields, newValues, configSchema, initialValues));
     } else {
       // Move to next field
-      setValues(newValues)
-      setCurrentFieldIndex(prev => prev + 1)
-      const nextKey = fields[currentFieldIndex + 1]
-      setCurrentInput(nextKey ? initialFor(nextKey) : '')
+      setValues(newValues);
+      setCurrentFieldIndex(prev => prev + 1);
+      const nextKey = fields[currentFieldIndex + 1];
+      setCurrentInput(nextKey ? initialFor(nextKey) : '');
     }
-  }, [
-    currentField,
-    values,
-    currentInput,
-    currentFieldIndex,
-    fields,
-    configSchema,
-    onSave,
-    initialFor,
-    initialValues,
-  ])
+  }, [currentField, values, currentInput, currentFieldIndex, fields, configSchema, onSave, initialFor, initialValues]);
 
   useKeybindings(
     {
@@ -146,47 +124,38 @@ export function PluginOptionsDialog({
       'confirm:yes': handleConfirm,
     },
     { context: 'Confirmation' },
-  )
+  );
 
   // Character input handling (backspace, typing)
   useInput((char, key) => {
     // Backspace
     if (key.backspace || key.delete) {
-      setCurrentInput(prev => prev.slice(0, -1))
-      return
+      setCurrentInput(prev => prev.slice(0, -1));
+      return;
     }
 
     // Regular character input
     if (char && !key.ctrl && !key.meta && !key.tab && !key.return) {
-      setCurrentInput(prev => prev + char)
+      setCurrentInput(prev => prev + char);
     }
-  })
+  });
 
   if (!fieldSchema || !currentField) {
-    return null
+    return null;
   }
 
-  const isSensitive = fieldSchema.sensitive === true
-  const isRequired = fieldSchema.required === true
-  const displayValue = isSensitive
-    ? '*'.repeat(stringWidth(currentInput))
-    : currentInput
+  const isSensitive = fieldSchema.sensitive === true;
+  const isRequired = fieldSchema.required === true;
+  const displayValue = isSensitive ? '*'.repeat(stringWidth(currentInput)) : currentInput;
 
   return (
-    <Dialog
-      title={title}
-      subtitle={subtitle}
-      onCancel={onCancel}
-      isCancelActive={false}
-    >
+    <Dialog title={title} subtitle={subtitle} onCancel={onCancel} isCancelActive={false}>
       <Box flexDirection="column">
         <Text bold={true}>
           {fieldSchema.title || currentField}
           {isRequired && <Text color="error"> *</Text>}
         </Text>
-        {fieldSchema.description && (
-          <Text dimColor={true}>{fieldSchema.description}</Text>
-        )}
+        {fieldSchema.description && <Text dimColor={true}>{fieldSchema.description}</Text>}
 
         <Box marginTop={1}>
           <Text>{figures.pointerSmall} </Text>
@@ -200,14 +169,10 @@ export function PluginOptionsDialog({
           Field {currentFieldIndex + 1} of {fields.length}
         </Text>
         {currentFieldIndex < fields.length - 1 && (
-          <Text dimColor={true}>
-            Tab: Next field · Enter: Save and continue
-          </Text>
-        )}
-        {currentFieldIndex === fields.length - 1 && (
-          <Text dimColor={true}>Enter: Save configuration</Text>
+          <Text dimColor={true}>Tab: Next field · Enter: Save and continue</Text>
         )}
+        {currentFieldIndex === fields.length - 1 && <Text dimColor={true}>Enter: Save configuration</Text>}
       </Box>
     </Dialog>
-  )
+  );
 }
diff --git a/src/commands/plugin/PluginOptionsFlow.tsx b/src/commands/plugin/PluginOptionsFlow.tsx
index 916639a22..6246b21e4 100644
--- a/src/commands/plugin/PluginOptionsFlow.tsx
+++ b/src/commands/plugin/PluginOptionsFlow.tsx
@@ -7,26 +7,20 @@
  * onDone('skipped') immediately if nothing needs filling.
  */
 
-import * as React from 'react'
-import type { LoadedPlugin } from '../../types/plugin.js'
-import { errorMessage } from '../../utils/errors.js'
-import {
-  loadMcpServerUserConfig,
-  saveMcpServerUserConfig,
-} from '../../utils/plugins/mcpbHandler.js'
-import {
-  getUnconfiguredChannels,
-  type UnconfiguredChannel,
-} from '../../utils/plugins/mcpPluginIntegration.js'
-import { loadAllPlugins } from '../../utils/plugins/pluginLoader.js'
+import * as React from 'react';
+import type { LoadedPlugin } from '../../types/plugin.js';
+import { errorMessage } from '../../utils/errors.js';
+import { loadMcpServerUserConfig, saveMcpServerUserConfig } from '../../utils/plugins/mcpbHandler.js';
+import { getUnconfiguredChannels, type UnconfiguredChannel } from '../../utils/plugins/mcpPluginIntegration.js';
+import { loadAllPlugins } from '../../utils/plugins/pluginLoader.js';
 import {
   getUnconfiguredOptions,
   loadPluginOptions,
   type PluginOptionSchema,
   type PluginOptionValues,
   savePluginOptions,
-} from '../../utils/plugins/pluginOptionsStorage.js'
-import { PluginOptionsDialog } from './PluginOptionsDialog.js'
+} from '../../utils/plugins/pluginOptionsStorage.js';
+import { PluginOptionsDialog } from './PluginOptionsDialog.js';
 
 /**
  * Post-install lookup: return the LoadedPlugin for the just-installed
@@ -36,13 +30,9 @@ import { PluginOptionsDialog } from './PluginOptionsDialog.js'
  *
  * Install should have cleared caches already; loadAllPlugins reads fresh.
  */
-export async function findPluginOptionsTarget(
-  pluginId: string,
-): Promise<LoadedPlugin | undefined> {
-  const { enabled, disabled } = await loadAllPlugins()
-  return [...enabled, ...disabled].find(
-    p => p.repository === pluginId || p.source === pluginId,
-  )
+export async function findPluginOptionsTarget(pluginId: string): Promise<LoadedPlugin | undefined> {
+  const { enabled, disabled } = await loadAllPlugins();
+  return [...enabled, ...disabled].find(p => p.repository === pluginId || p.source === pluginId);
 }
 
 /**
@@ -50,39 +40,35 @@ export async function findPluginOptionsTarget(
  * collapse to this shape — the only difference is which save function runs.
  */
 type ConfigStep = {
-  key: string
-  title: string
-  subtitle: string
-  schema: PluginOptionSchema
+  key: string;
+  title: string;
+  subtitle: string;
+  schema: PluginOptionSchema;
   /** Returns any already-saved values so PluginOptionsDialog can pre-fill and
    *  skip unchanged sensitive fields on reconfigure. */
-  load: () => PluginOptionValues | undefined
-  save: (values: PluginOptionValues) => void
-}
+  load: () => PluginOptionValues | undefined;
+  save: (values: PluginOptionValues) => void;
+};
 
 type Props = {
-  plugin: LoadedPlugin
+  plugin: LoadedPlugin;
   /** `name@marketplace` — the savePluginOptions / saveMcpServerUserConfig key. */
-  pluginId: string
+  pluginId: string;
   /**
    * `configured` = user filled all fields. `skipped` = nothing needed
    * configuring, or user hit cancel. `error` = save threw.
    */
-  onDone: (outcome: 'configured' | 'skipped' | 'error', detail?: string) => void
-}
+  onDone: (outcome: 'configured' | 'skipped' | 'error', detail?: string) => void;
+};
 
-export function PluginOptionsFlow({
-  plugin,
-  pluginId,
-  onDone,
-}: Props): React.ReactNode {
+export function PluginOptionsFlow({ plugin, pluginId, onDone }: Props): React.ReactNode {
   // Build the step list once at mount. Re-calling after a save would drop the
   // item we just configured.
   const [steps] = React.useState<ConfigStep[]>(() => {
-    const result: ConfigStep[] = []
+    const result: ConfigStep[] = [];
 
     // Top-level manifest.userConfig
-    const unconfigured = getUnconfiguredOptions(plugin)
+    const unconfigured = getUnconfiguredOptions(plugin);
     if (Object.keys(unconfigured).length > 0) {
       result.push({
         key: 'top-level',
@@ -90,68 +76,60 @@ export function PluginOptionsFlow({
         subtitle: 'Plugin options',
         schema: unconfigured,
         load: () => loadPluginOptions(pluginId),
-        save: values =>
-          savePluginOptions(pluginId, values, plugin.manifest.userConfig!),
-      })
+        save: values => savePluginOptions(pluginId, values, plugin.manifest.userConfig!),
+      });
     }
 
     // Per-channel userConfig (assistant-mode channels)
-    const channels: UnconfiguredChannel[] = getUnconfiguredChannels(plugin)
+    const channels: UnconfiguredChannel[] = getUnconfiguredChannels(plugin);
     for (const channel of channels) {
       result.push({
         key: `channel:${channel.server}`,
         title: `Configure ${channel.displayName}`,
         subtitle: `Plugin: ${plugin.name}`,
         schema: channel.configSchema,
-        load: () =>
-          loadMcpServerUserConfig(pluginId, channel.server) ?? undefined,
-        save: values =>
-          saveMcpServerUserConfig(
-            pluginId,
-            channel.server,
-            values,
-            channel.configSchema,
-          ),
-      })
+        load: () => loadMcpServerUserConfig(pluginId, channel.server) ?? undefined,
+        save: values => saveMcpServerUserConfig(pluginId, channel.server, values, channel.configSchema),
+      });
     }
 
-    return result
-  })
+    return result;
+  });
 
-  const [index, setIndex] = React.useState(0)
+  const [index, setIndex] = React.useState(0);
 
   // Latest-ref: lets the effect close over the current onDone without
   // re-running when the parent re-renders.
-  const onDoneRef = React.useRef(onDone)
-  onDoneRef.current = onDone
+  const onDoneRef = React.useRef(onDone);
+  onDoneRef.current = onDone;
 
   // Nothing to configure → tell the caller and render nothing. Effect,
   // not inline call: calling setState in the parent during our render
   // is a React rules-of-hooks violation.
   React.useEffect(() => {
     if (steps.length === 0) {
-      onDoneRef.current('skipped')
+      onDoneRef.current('skipped');
     }
-  }, [steps.length])
+  }, [steps.length]);
 
   if (steps.length === 0) {
-    return null
+    return null;
   }
 
-  const current = steps[index]!
+  const current = steps[index]!;
 
   function handleSave(values: PluginOptionValues): void {
     try {
-      current.save(values)
+      current.save(values);
     } catch (err) {
-      onDone('error', errorMessage(err))
-      return
+      onDone('error', errorMessage(err));
+      return;
     }
-    const next = index + 1
+    const next = index + 1;
     if (next < steps.length) {
-      setIndex(next)
+      setIndex(next);
     } else {
-      onDone('configured')
+      onDone('configured');
     }
   }
 
@@ -168,5 +146,5 @@ export function PluginOptionsFlow({
       onSave={handleSave}
       onCancel={() => onDone('skipped')}
     />
-  )
+  );
 }
diff --git a/src/commands/plugin/PluginSettings.tsx b/src/commands/plugin/PluginSettings.tsx
index e3a798e8a..d6bcfe088 100644
--- a/src/commands/plugin/PluginSettings.tsx
+++ b/src/commands/plugin/PluginSettings.tsx
@@ -1,73 +1,58 @@
-import figures from 'figures'
-import * as React from 'react'
-import { useCallback, useEffect, useState } from 'react'
-import { ConfigurableShortcutHint } from '../../components/ConfigurableShortcutHint.js'
-import { Byline, Pane, Tab, Tabs } from '@anthropic/ink'
-import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js'
-import { Box, Text } from '@anthropic/ink'
-import {
-  useKeybinding,
-  useKeybindings,
-} from '../../keybindings/useKeybinding.js'
-import { useAppState, useSetAppState } from '../../state/AppState.js'
-import type { PluginError } from '../../types/plugin.js'
-import { errorMessage } from '../../utils/errors.js'
-import { clearAllCaches } from '../../utils/plugins/cacheUtils.js'
-import { loadMarketplacesWithGracefulDegradation } from '../../utils/plugins/marketplaceHelpers.js'
-import {
-  loadKnownMarketplacesConfig,
-  removeMarketplaceSource,
-} from '../../utils/plugins/marketplaceManager.js'
-import { getPluginEditableScopes } from '../../utils/plugins/pluginStartupCheck.js'
-import type { EditableSettingSource } from '../../utils/settings/constants.js'
-import {
-  getSettingsForSource,
-  updateSettingsForSource,
-} from '../../utils/settings/settings.js'
-import { AddMarketplace } from './AddMarketplace.js'
-import { BrowseMarketplace } from './BrowseMarketplace.js'
-import { DiscoverPlugins } from './DiscoverPlugins.js'
-import { ManageMarketplaces } from './ManageMarketplaces.js'
-import { ManagePlugins } from './ManagePlugins.js'
-import { formatErrorMessage, getErrorGuidance } from './PluginErrors.js'
-import { type ParsedCommand, parsePluginArgs } from './parseArgs.js'
-import type { PluginSettingsProps, ViewState } from './types.js'
-import { ValidatePlugin } from './ValidatePlugin.js'
+import figures from 'figures';
+import * as React from 'react';
+import { useCallback, useEffect, useState } from 'react';
+import { ConfigurableShortcutHint } from '../../components/ConfigurableShortcutHint.js';
+import { Byline, Pane, Tab, Tabs } from '@anthropic/ink';
+import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js';
+import { Box, Text } from '@anthropic/ink';
+import { useKeybinding, useKeybindings } from '../../keybindings/useKeybinding.js';
+import { useAppState, useSetAppState } from '../../state/AppState.js';
+import type { PluginError } from '../../types/plugin.js';
+import { errorMessage } from '../../utils/errors.js';
+import { clearAllCaches } from '../../utils/plugins/cacheUtils.js';
+import { loadMarketplacesWithGracefulDegradation } from '../../utils/plugins/marketplaceHelpers.js';
+import { loadKnownMarketplacesConfig, removeMarketplaceSource } from '../../utils/plugins/marketplaceManager.js';
+import { getPluginEditableScopes } from '../../utils/plugins/pluginStartupCheck.js';
+import type { EditableSettingSource } from '../../utils/settings/constants.js';
+import { getSettingsForSource, updateSettingsForSource } from '../../utils/settings/settings.js';
+import { AddMarketplace } from './AddMarketplace.js';
+import { BrowseMarketplace } from './BrowseMarketplace.js';
+import { DiscoverPlugins } from './DiscoverPlugins.js';
+import { ManageMarketplaces } from './ManageMarketplaces.js';
+import { ManagePlugins } from './ManagePlugins.js';
+import { formatErrorMessage, getErrorGuidance } from './PluginErrors.js';
+import { type ParsedCommand, parsePluginArgs } from './parseArgs.js';
+import type { PluginSettingsProps, ViewState } from './types.js';
+import { ValidatePlugin } from './ValidatePlugin.js';
 
-type TabId = 'discover' | 'installed' | 'marketplaces' | 'errors'
+type TabId = 'discover' | 'installed' | 'marketplaces' | 'errors';
 
-function MarketplaceList({
-  onComplete,
-}: {
-  onComplete: (result?: string) => void
-}): React.ReactNode {
+function MarketplaceList({ onComplete }: { onComplete: (result?: string) => void }): React.ReactNode {
   useEffect(() => {
     async function loadList() {
       try {
-        const config = await loadKnownMarketplacesConfig()
-        const names = Object.keys(config)
+        const config = await loadKnownMarketplacesConfig();
+        const names = Object.keys(config);
 
         if (names.length === 0) {
-          onComplete('No marketplaces configured')
+          onComplete('No marketplaces configured');
         } else {
-          onComplete(
-            `Configured marketplaces:\n${names.map(n => `  • ${n}`).join('\n')}`,
-          )
+          onComplete(`Configured marketplaces:\n${names.map(n => `  • ${n}`).join('\n')}`);
         }
       } catch (err) {
-        onComplete(`Error loading marketplaces: ${errorMessage(err)}`)
+        onComplete(`Error loading marketplaces: ${errorMessage(err)}`);
       }
     }
 
-    void loadList()
-  }, [onComplete])
+    void loadList();
+  }, [onComplete]);
 
-  return <Text>Loading marketplaces...</Text>
+  return <Text>Loading marketplaces...</Text>;
 }
 
 function McpRedirectBanner(): React.ReactNode {
   if ((process.env.USER_TYPE as string) !== 'ant') {
-    return null
+    return null;
   }
 
   return (
@@ -88,78 +73,75 @@ function McpRedirectBanner(): React.ReactNode {
           i{' '}
         </Text>
       </Box>
-      <Text>
-        [ANT-ONLY] MCP servers are now managed in /plugins. Use /mcp no-redirect
-        to test old UI
-      </Text>
+      <Text>[ANT-ONLY] MCP servers are now managed in /plugins. Use /mcp no-redirect to test old UI</Text>
     </Box>
-  )
+  );
 }
 
 type ErrorRowAction =
   | { kind: 'navigate'; tab: TabId; viewState: ViewState }
   | {
-      kind: 'remove-extra-marketplace'
-      name: string
-      sources: Array<{ source: EditableSettingSource; scope: string }>
+      kind: 'remove-extra-marketplace';
+      name: string;
+      sources: Array<{ source: EditableSettingSource; scope: string }>;
     }
   | { kind: 'remove-installed-marketplace'; name: string }
   | { kind: 'managed-only'; name: string }
-  | { kind: 'none' }
+  | { kind: 'none' };
 
 type ErrorRow = {
-  label: string
-  message: string
-  guidance?: string | null
-  action: ErrorRowAction
-  scope?: string
-}
+  label: string;
+  message: string;
+  guidance?: string | null;
+  action: ErrorRowAction;
+  scope?: string;
+};
 
 /**
  * Determine which settings sources define an extraKnownMarketplace entry.
  * Returns the editable sources (user/project/local) and whether policy also has it.
  */
 function getExtraMarketplaceSourceInfo(name: string): {
-  editableSources: Array<{ source: EditableSettingSource; scope: string }>
-  isInPolicy: boolean
+  editableSources: Array<{ source: EditableSettingSource; scope: string }>;
+  isInPolicy: boolean;
 } {
   const editableSources: Array<{
-    source: EditableSettingSource
-    scope: string
-  }> = []
+    source: EditableSettingSource;
+    scope: string;
+  }> = [];
 
   const sourcesToCheck = [
     { source: 'userSettings' as const, scope: 'user' },
     { source: 'projectSettings' as const, scope: 'project' },
     { source: 'localSettings' as const, scope: 'local' },
-  ]
+  ];
 
   for (const { source, scope } of sourcesToCheck) {
-    const settings = getSettingsForSource(source)
+    const settings = getSettingsForSource(source);
     if (settings?.extraKnownMarketplaces?.[name]) {
-      editableSources.push({ source, scope })
+      editableSources.push({ source, scope });
     }
   }
 
-  const policySettings = getSettingsForSource('policySettings')
-  const isInPolicy = Boolean(policySettings?.extraKnownMarketplaces?.[name])
+  const policySettings = getSettingsForSource('policySettings');
+  const isInPolicy = Boolean(policySettings?.extraKnownMarketplaces?.[name]);
 
-  return { editableSources, isInPolicy }
+  return { editableSources, isInPolicy };
 }
 
 function buildMarketplaceAction(name: string): ErrorRowAction {
-  const { editableSources, isInPolicy } = getExtraMarketplaceSourceInfo(name)
+  const { editableSources, isInPolicy } = getExtraMarketplaceSourceInfo(name);
 
   if (editableSources.length > 0) {
     return {
       kind: 'remove-extra-marketplace',
       name,
       sources: editableSources,
-    }
+    };
   }
 
   if (isInPolicy) {
-    return { kind: 'managed-only', name }
+    return { kind: 'managed-only', name };
   }
 
   // Marketplace is in known_marketplaces.json but not in extraKnownMarketplaces
@@ -172,7 +154,7 @@ function buildMarketplaceAction(name: string): ErrorRowAction {
       targetMarketplace: name,
       action: 'remove',
     },
-  }
+  };
 }
 
 function buildPluginAction(pluginName: string): ErrorRowAction {
@@ -184,17 +166,13 @@ function buildPluginAction(pluginName: string): ErrorRowAction {
       targetPlugin: pluginName,
       action: 'uninstall',
     },
-  }
+  };
 }
 
-const TRANSIENT_ERROR_TYPES = new Set([
-  'git-auth-failed',
-  'git-timeout',
-  'network-error',
-])
+const TRANSIENT_ERROR_TYPES = new Set(['git-auth-failed', 'git-timeout', 'network-error']);
 
 function isTransientError(error: PluginError): boolean {
-  return TRANSIENT_ERROR_TYPES.has(error.type)
+  return TRANSIENT_ERROR_TYPES.has(error.type);
 }
 
 /**
@@ -202,11 +180,11 @@ function isTransientError(error: PluginError): boolean {
  * then falling back to the source field (format: "pluginName@marketplace").
  */
 function getPluginNameFromError(error: PluginError): string | undefined {
-  if ('pluginId' in error && error.pluginId) return error.pluginId
-  if ('plugin' in error && error.plugin) return error.plugin
+  if ('pluginId' in error && error.pluginId) return error.pluginId;
+  if ('plugin' in error && error.plugin) return error.plugin;
   // Fallback: source often contains "pluginName@marketplace"
-  if (error.source.includes('@')) return error.source.split('@')[0]
-  return undefined
+  if (error.source.includes('@')) return error.source.split('@')[0];
+  return undefined;
 }
 
 function buildErrorRows(
@@ -218,102 +196,82 @@ function buildErrorRows(
   transientErrors: PluginError[],
   pluginScopes: Map<string, string>,
 ): ErrorRow[] {
-  const rows: ErrorRow[] = []
+  const rows: ErrorRow[] = [];
 
   // --- Transient errors at the top (restart to retry) ---
   for (const error of transientErrors) {
-    const pluginName =
-      'pluginId' in error
-        ? error.pluginId
-        : 'plugin' in error
-          ? error.plugin
-          : undefined
+    const pluginName = 'pluginId' in error ? error.pluginId : 'plugin' in error ? error.plugin : undefined;
     rows.push({
       label: pluginName ?? error.source,
       message: formatErrorMessage(error),
       guidance: 'Restart to retry loading plugins',
       action: { kind: 'none' },
-    })
+    });
   }
 
   // --- Marketplace errors ---
   // Track shown marketplace names to avoid duplicates across sources
-  const shownMarketplaceNames = new Set<string>()
+  const shownMarketplaceNames = new Set<string>();
 
   for (const m of failedMarketplaces) {
-    shownMarketplaceNames.add(m.name)
-    const action = buildMarketplaceAction(m.name)
-    const sourceInfo = getExtraMarketplaceSourceInfo(m.name)
-    const scope = sourceInfo.isInPolicy
-      ? 'managed'
-      : sourceInfo.editableSources[0]?.scope
+    shownMarketplaceNames.add(m.name);
+    const action = buildMarketplaceAction(m.name);
+    const sourceInfo = getExtraMarketplaceSourceInfo(m.name);
+    const scope = sourceInfo.isInPolicy ? 'managed' : sourceInfo.editableSources[0]?.scope;
     rows.push({
       label: m.name,
       message: m.error ?? 'Installation failed',
-      guidance:
-        action.kind === 'managed-only'
-          ? 'Managed by your organization — contact your admin'
-          : undefined,
+      guidance: action.kind === 'managed-only' ? 'Managed by your organization — contact your admin' : undefined,
       action,
       scope,
-    })
+    });
   }
 
   for (const e of extraMarketplaceErrors) {
-    const marketplace = 'marketplace' in e ? e.marketplace : e.source
-    if (shownMarketplaceNames.has(marketplace)) continue
-    shownMarketplaceNames.add(marketplace)
-    const action = buildMarketplaceAction(marketplace)
-    const sourceInfo = getExtraMarketplaceSourceInfo(marketplace)
-    const scope = sourceInfo.isInPolicy
-      ? 'managed'
-      : sourceInfo.editableSources[0]?.scope
+    const marketplace = 'marketplace' in e ? e.marketplace : e.source;
+    if (shownMarketplaceNames.has(marketplace)) continue;
+    shownMarketplaceNames.add(marketplace);
+    const action = buildMarketplaceAction(marketplace);
+    const sourceInfo = getExtraMarketplaceSourceInfo(marketplace);
+    const scope = sourceInfo.isInPolicy ? 'managed' : sourceInfo.editableSources[0]?.scope;
     rows.push({
       label: marketplace,
       message: formatErrorMessage(e),
       guidance:
-        action.kind === 'managed-only'
-          ? 'Managed by your organization — contact your admin'
-          : getErrorGuidance(e),
+        action.kind === 'managed-only' ? 'Managed by your organization — contact your admin' : getErrorGuidance(e),
       action,
       scope,
-    })
+    });
   }
 
   // Installed marketplaces that fail to load data (from known_marketplaces.json)
   for (const m of brokenInstalledMarketplaces) {
-    if (shownMarketplaceNames.has(m.name)) continue
-    shownMarketplaceNames.add(m.name)
+    if (shownMarketplaceNames.has(m.name)) continue;
+    shownMarketplaceNames.add(m.name);
     rows.push({
       label: m.name,
       message: m.error,
       action: { kind: 'remove-installed-marketplace', name: m.name },
-    })
+    });
   }
 
   // --- Plugin errors ---
-  const shownPluginNames = new Set<string>()
+  const shownPluginNames = new Set<string>();
   for (const error of pluginLoadingErrors) {
-    const pluginName = getPluginNameFromError(error)
-    if (pluginName && shownPluginNames.has(pluginName)) continue
-    if (pluginName) shownPluginNames.add(pluginName)
+    const pluginName = getPluginNameFromError(error);
+    if (pluginName && shownPluginNames.has(pluginName)) continue;
+    if (pluginName) shownPluginNames.add(pluginName);
 
-    const marketplace = 'marketplace' in error ? error.marketplace : undefined
+    const marketplace = 'marketplace' in error ? error.marketplace : undefined;
     // Try pluginId@marketplace format first, then just pluginName
-    const scope = pluginName
-      ? (pluginScopes.get(error.source) ?? pluginScopes.get(pluginName))
-      : undefined
+    const scope = pluginName ? (pluginScopes.get(error.source) ?? pluginScopes.get(pluginName)) : undefined;
     rows.push({
-      label: pluginName
-        ? marketplace
-          ? `${pluginName} @ ${marketplace}`
-          : pluginName
-        : error.source,
+      label: pluginName ? (marketplace ? `${pluginName} @ ${marketplace}` : pluginName) : error.source,
       message: formatErrorMessage(error),
       guidance: getErrorGuidance(error),
       action: pluginName ? buildPluginAction(pluginName) : { kind: 'none' },
       scope,
-    })
+    });
   }
 
   // --- Other errors (non-marketplace, non-plugin-specific) ---
@@ -323,52 +281,49 @@ function buildErrorRows(
       message: formatErrorMessage(error),
       guidance: getErrorGuidance(error),
       action: { kind: 'none' },
-    })
+    });
   }
 
-  return rows
+  return rows;
 }
 
 /**
  * Remove a marketplace from extraKnownMarketplaces in the given settings sources,
  * and also remove any associated enabled plugins.
  */
-function removeExtraMarketplace(
-  name: string,
-  sources: Array<{ source: EditableSettingSource }>,
-): void {
+function removeExtraMarketplace(name: string, sources: Array<{ source: EditableSettingSource }>): void {
   for (const { source } of sources) {
-    const settings = getSettingsForSource(source)
-    if (!settings) continue
+    const settings = getSettingsForSource(source);
+    if (!settings) continue;
 
-    const updates: Record<string, unknown> = {}
+    const updates: Record<string, unknown> = {};
 
     // Remove from extraKnownMarketplaces
     if (settings.extraKnownMarketplaces?.[name]) {
       updates.extraKnownMarketplaces = {
         ...settings.extraKnownMarketplaces,
         [name]: undefined,
-      }
+      };
     }
 
     // Remove associated enabled plugins (format: "plugin@marketplace")
     if (settings.enabledPlugins) {
-      const suffix = `@${name}`
-      let removedPlugins = false
-      const updatedPlugins = { ...settings.enabledPlugins }
+      const suffix = `@${name}`;
+      let removedPlugins = false;
+      const updatedPlugins = { ...settings.enabledPlugins };
       for (const pluginId in updatedPlugins) {
         if (pluginId.endsWith(suffix)) {
-          updatedPlugins[pluginId] = undefined
-          removedPlugins = true
+          updatedPlugins[pluginId] = undefined;
+          removedPlugins = true;
         }
       }
       if (removedPlugins) {
-        updates.enabledPlugins = updatedPlugins
+        updates.enabledPlugins = updatedPlugins;
       }
     }
 
     if (Object.keys(updates).length > 0) {
-      updateSettingsForSource(source, updates)
+      updateSettingsForSource(source, updates);
     }
   }
 }
@@ -378,40 +333,35 @@ function ErrorsTabContent({
   setActiveTab,
   markPluginsChanged,
 }: {
-  setViewState: (state: ViewState) => void
-  setActiveTab: (tab: TabId) => void
-  markPluginsChanged: () => void
+  setViewState: (state: ViewState) => void;
+  setActiveTab: (tab: TabId) => void;
+  markPluginsChanged: () => void;
 }): React.ReactNode {
-  const errors = useAppState(s => s.plugins.errors)
-  const installationStatus = useAppState(s => s.plugins.installationStatus)
-  const setAppState = useSetAppState()
-  const [selectedIndex, setSelectedIndex] = useState(0)
-  const [actionMessage, setActionMessage] = useState<string | null>(null)
-  const [marketplaceLoadFailures, setMarketplaceLoadFailures] = useState<
-    Array<{ name: string; error: string }>
-  >([])
+  const errors = useAppState(s => s.plugins.errors);
+  const installationStatus = useAppState(s => s.plugins.installationStatus);
+  const setAppState = useSetAppState();
+  const [selectedIndex, setSelectedIndex] = useState(0);
+  const [actionMessage, setActionMessage] = useState<string | null>(null);
+  const [marketplaceLoadFailures, setMarketplaceLoadFailures] = useState<Array<{ name: string; error: string }>>([]);
 
   // Detect marketplaces that are installed but fail to load their data
   useEffect(() => {
     void (async () => {
       try {
-        const config = await loadKnownMarketplacesConfig()
-        const { failures } =
-          await loadMarketplacesWithGracefulDegradation(config)
-        setMarketplaceLoadFailures(failures)
+        const config = await loadKnownMarketplacesConfig();
+        const { failures } = await loadMarketplacesWithGracefulDegradation(config);
+        setMarketplaceLoadFailures(failures);
       } catch {
         // Ignore — if we can't load config, other tabs handle it
       }
-    })()
-  }, [])
+    })();
+  }, []);
 
-  const failedMarketplaces = installationStatus.marketplaces.filter(
-    m => m.status === 'failed',
-  )
-  const failedMarketplaceNames = new Set(failedMarketplaces.map(m => m.name))
+  const failedMarketplaces = installationStatus.marketplaces.filter(m => m.status === 'failed');
+  const failedMarketplaceNames = new Set(failedMarketplaces.map(m => m.name));
 
   // Transient errors (git/network) — show at top with "restart to retry"
-  const transientErrors = errors.filter(isTransientError)
+  const transientErrors = errors.filter(isTransientError);
 
   // Marketplace-related loading errors not already covered by install failures
   const extraMarketplaceErrors = errors.filter(
@@ -420,35 +370,35 @@ function ErrorsTabContent({
         e.type === 'marketplace-load-failed' ||
         e.type === 'marketplace-blocked-by-policy') &&
       !failedMarketplaceNames.has(e.marketplace),
-  )
+  );
 
   // Plugin-specific loading errors
   const pluginLoadingErrors = errors.filter(e => {
-    if (isTransientError(e)) return false
+    if (isTransientError(e)) return false;
     if (
       e.type === 'marketplace-not-found' ||
       e.type === 'marketplace-load-failed' ||
       e.type === 'marketplace-blocked-by-policy'
     ) {
-      return false
+      return false;
     }
-    return getPluginNameFromError(e) !== undefined
-  })
+    return getPluginNameFromError(e) !== undefined;
+  });
 
   // Remaining errors with no plugin association
   const otherErrors = errors.filter(e => {
-    if (isTransientError(e)) return false
+    if (isTransientError(e)) return false;
     if (
       e.type === 'marketplace-not-found' ||
       e.type === 'marketplace-load-failed' ||
       e.type === 'marketplace-blocked-by-policy'
     ) {
-      return false
+      return false;
     }
-    return getPluginNameFromError(e) === undefined
-  })
+    return getPluginNameFromError(e) === undefined;
+  });
 
-  const pluginScopes = getPluginEditableScopes()
+  const pluginScopes = getPluginEditableScopes();
   const rows = buildErrorRows(
     failedMarketplaces,
     extraMarketplaceErrors,
@@ -457,30 +407,30 @@ function ErrorsTabContent({
     marketplaceLoadFailures,
     transientErrors,
     pluginScopes,
-  )
+  );
 
   // Handle escape to exit the plugin menu
   useKeybinding(
     'confirm:no',
     () => {
-      setViewState({ type: 'menu' })
+      setViewState({ type: 'menu' });
     },
     { context: 'Confirmation' },
-  )
+  );
 
   const handleSelect = () => {
-    const row = rows[selectedIndex]
-    if (!row) return
-    const { action } = row
+    const row = rows[selectedIndex];
+    if (!row) return;
+    const { action } = row;
     switch (action.kind) {
       case 'navigate':
-        setActiveTab(action.tab)
-        setViewState(action.viewState)
-        break
+        setActiveTab(action.tab);
+        setViewState(action.viewState);
+        break;
       case 'remove-extra-marketplace': {
-        const scopes = action.sources.map(s => s.scope).join(', ')
-        removeExtraMarketplace(action.name, action.sources)
-        clearAllCaches()
+        const scopes = action.sources.map(s => s.scope).join(', ');
+        removeExtraMarketplace(action.name, action.sources);
+        clearAllCaches();
         // Synchronously clear all stale state for this marketplace so the UI
         // updates glitch-free. markPluginsChanged only sets needsRefresh —
         // it does not refresh plugins.errors, so this is the authoritative
@@ -489,72 +439,56 @@ function ErrorsTabContent({
           ...prev,
           plugins: {
             ...prev.plugins,
-            errors: prev.plugins.errors.filter(
-              e => !('marketplace' in e && e.marketplace === action.name),
-            ),
+            errors: prev.plugins.errors.filter(e => !('marketplace' in e && e.marketplace === action.name)),
             installationStatus: {
               ...prev.plugins.installationStatus,
-              marketplaces: prev.plugins.installationStatus.marketplaces.filter(
-                m => m.name !== action.name,
-              ),
+              marketplaces: prev.plugins.installationStatus.marketplaces.filter(m => m.name !== action.name),
             },
           },
-        }))
-        setActionMessage(
-          `${figures.tick} Removed "${action.name}" from ${scopes} settings`,
-        )
-        markPluginsChanged()
-        break
+        }));
+        setActionMessage(`${figures.tick} Removed "${action.name}" from ${scopes} settings`);
+        markPluginsChanged();
+        break;
       }
       case 'remove-installed-marketplace': {
         void (async () => {
           try {
-            await removeMarketplaceSource(action.name)
-            clearAllCaches()
-            setMarketplaceLoadFailures(prev =>
-              prev.filter(f => f.name !== action.name),
-            )
-            setActionMessage(
-              `${figures.tick} Removed marketplace "${action.name}"`,
-            )
-            markPluginsChanged()
+            await removeMarketplaceSource(action.name);
+            clearAllCaches();
+            setMarketplaceLoadFailures(prev => prev.filter(f => f.name !== action.name));
+            setActionMessage(`${figures.tick} Removed marketplace "${action.name}"`);
+            markPluginsChanged();
           } catch (err) {
-            setActionMessage(
-              `Failed to remove "${action.name}": ${err instanceof Error ? err.message : String(err)}`,
-            )
+            setActionMessage(`Failed to remove "${action.name}": ${err instanceof Error ? err.message : String(err)}`);
           }
-        })()
-        break
+        })();
+        break;
       }
       case 'managed-only':
         // No action available — guidance text already shown
-        break
+        break;
       case 'none':
-        break
+        break;
     }
-  }
+  };
 
   useKeybindings(
     {
       'select:previous': () => setSelectedIndex(prev => Math.max(0, prev - 1)),
-      'select:next': () =>
-        setSelectedIndex(prev => Math.min(rows.length - 1, prev + 1)),
+      'select:next': () => setSelectedIndex(prev => Math.min(rows.length - 1, prev + 1)),
       'select:accept': handleSelect,
     },
     { context: 'Select', isActive: rows.length > 0 },
-  )
+  );
 
   // Clamp selectedIndex when rows shrink (e.g. after removal)
-  const clampedIndex = Math.min(selectedIndex, Math.max(0, rows.length - 1))
+  const clampedIndex = Math.min(selectedIndex, Math.max(0, rows.length - 1));
   if (clampedIndex !== selectedIndex) {
-    setSelectedIndex(clampedIndex)
+    setSelectedIndex(clampedIndex);
   }
 
-  const selectedAction = rows[clampedIndex]?.action
-  const hasAction =
-    selectedAction &&
-    selectedAction.kind !== 'none' &&
-    selectedAction.kind !== 'managed-only'
+  const selectedAction = rows[clampedIndex]?.action;
+  const hasAction = selectedAction && selectedAction.kind !== 'none' && selectedAction.kind !== 'managed-only';
 
   if (rows.length === 0) {
     return (
@@ -564,28 +498,21 @@ function ErrorsTabContent({
         </Box>
         <Box marginTop={1}>
           <Text dimColor italic>
-            <ConfigurableShortcutHint
-              action="confirm:no"
-              context="Confirmation"
-              fallback="Esc"
-              description="back"
-            />
+            <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="back" />
           </Text>
         </Box>
       </Box>
-    )
+    );
   }
 
   return (
     <Box flexDirection="column">
       {rows.map((row, idx) => {
-        const isSelected = idx === clampedIndex
+        const isSelected = idx === clampedIndex;
         return (
           <Box key={idx} marginLeft={1} flexDirection="column" marginBottom={1}>
             <Text>
-              <Text color={isSelected ? 'suggestion' : 'error'}>
-                {isSelected ? figures.pointer : figures.cross}{' '}
-              </Text>
+              <Text color={isSelected ? 'suggestion' : 'error'}>{isSelected ? figures.pointer : figures.cross} </Text>
               <Text bold={isSelected}>{row.label}</Text>
               {row.scope && <Text dimColor> ({row.scope})</Text>}
             </Text>
@@ -600,7 +527,7 @@ function ErrorsTabContent({
               </Box>
             )}
           </Box>
-        )
+        );
       })}
 
       {actionMessage && (
@@ -612,12 +539,7 @@ function ErrorsTabContent({
       <Box marginTop={1}>
         <Text dimColor italic>
           <Byline>
-            <ConfigurableShortcutHint
-              action="select:previous"
-              context="Select"
-              fallback="↑"
-              description="navigate"
-            />
+            <ConfigurableShortcutHint action="select:previous" context="Select" fallback="↑" description="navigate" />
             {hasAction && (
               <ConfigurableShortcutHint
                 action="select:accept"
@@ -626,117 +548,106 @@ function ErrorsTabContent({
                 description="resolve"
               />
             )}
-            <ConfigurableShortcutHint
-              action="confirm:no"
-              context="Confirmation"
-              fallback="Esc"
-              description="back"
-            />
+            <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="back" />
           </Byline>
         </Text>
       </Box>
     </Box>
-  )
+  );
 }
 
 function getInitialViewState(parsedCommand: ParsedCommand): ViewState {
   switch (parsedCommand.type) {
     case 'help':
-      return { type: 'help' }
+      return { type: 'help' };
     case 'validate':
-      return { type: 'validate', path: parsedCommand.path }
+      return { type: 'validate', path: parsedCommand.path };
     case 'install':
       if (parsedCommand.marketplace) {
         return {
           type: 'browse-marketplace',
           targetMarketplace: parsedCommand.marketplace,
           targetPlugin: parsedCommand.plugin,
-        }
+        };
       }
       if (parsedCommand.plugin) {
         return {
           type: 'discover-plugins',
           targetPlugin: parsedCommand.plugin,
-        }
+        };
       }
-      return { type: 'discover-plugins' }
+      return { type: 'discover-plugins' };
     case 'manage':
-      return { type: 'manage-plugins' }
+      return { type: 'manage-plugins' };
     case 'uninstall':
       return {
         type: 'manage-plugins',
         targetPlugin: parsedCommand.plugin,
         action: 'uninstall',
-      }
+      };
     case 'enable':
       return {
         type: 'manage-plugins',
         targetPlugin: parsedCommand.plugin,
         action: 'enable',
-      }
+      };
     case 'disable':
       return {
         type: 'manage-plugins',
         targetPlugin: parsedCommand.plugin,
         action: 'disable',
-      }
+      };
     case 'marketplace':
       if (parsedCommand.action === 'list') {
-        return { type: 'marketplace-list' }
+        return { type: 'marketplace-list' };
       }
       if (parsedCommand.action === 'add') {
         return {
           type: 'add-marketplace',
           initialValue: parsedCommand.target,
-        }
+        };
       }
       if (parsedCommand.action === 'remove') {
         return {
           type: 'manage-marketplaces',
           targetMarketplace: parsedCommand.target,
           action: 'remove',
-        }
+        };
       }
       if (parsedCommand.action === 'update') {
         return {
           type: 'manage-marketplaces',
           targetMarketplace: parsedCommand.target,
           action: 'update',
-        }
+        };
       }
-      return { type: 'marketplace-menu' }
+      return { type: 'marketplace-menu' };
     case 'menu':
     default:
       // Default to discover view showing all plugins
-      return { type: 'discover-plugins' }
+      return { type: 'discover-plugins' };
   }
 }
 
 function getInitialTab(viewState: ViewState): TabId {
-  if (viewState.type === 'manage-plugins') return 'installed'
-  if (viewState.type === 'manage-marketplaces') return 'marketplaces'
-  return 'discover'
+  if (viewState.type === 'manage-plugins') return 'installed';
+  if (viewState.type === 'manage-marketplaces') return 'marketplaces';
+  return 'discover';
 }
 
-export function PluginSettings({
-  onComplete,
-  args,
-  showMcpRedirectMessage,
-}: PluginSettingsProps): React.ReactNode {
-  const parsedCommand = parsePluginArgs(args)
-  const initialViewState = getInitialViewState(parsedCommand)
-  const [viewState, setViewState] = useState<ViewState>(initialViewState)
-  const [activeTab, setActiveTab] = useState<TabId>(
-    getInitialTab(initialViewState),
-  )
+export function PluginSettings({ onComplete, args, showMcpRedirectMessage }: PluginSettingsProps): React.ReactNode {
+  const parsedCommand = parsePluginArgs(args);
+  const initialViewState = getInitialViewState(parsedCommand);
+  const [viewState, setViewState] = useState<ViewState>(initialViewState);
+  const [activeTab, setActiveTab] = useState<TabId>(getInitialTab(initialViewState));
   const [inputValue, setInputValue] = useState(
     viewState.type === 'add-marketplace' ? viewState.initialValue || '' : '',
-  )
-  const [cursorOffset, setCursorOffset] = useState(0)
-  const [error, setError] = useState<string | null>(null)
-  const [result, setResult] = useState<string | null>(null)
-  const [childSearchActive, setChildSearchActive] = useState(false)
-  const setAppState = useSetAppState()
+  );
+  const [cursorOffset, setCursorOffset] = useState(0);
+  const [error, setError] = useState<string | null>(null);
+  const [result, setResult] = useState<string | null>(null);
+  const [childSearchActive, setChildSearchActive] = useState(false);
+  const setAppState = useSetAppState();
 
   // Error count for the Errors tab badge — counts loader errors + background
   // marketplace install failures. Does NOT count marketplace-on-disk load
@@ -744,16 +655,15 @@ export function PluginSettings({
   // May slightly overcount vs. displayed rows when a marketplace has both a
   // loader error and a failed install status (buildErrorRows deduplicates).
   const pluginErrorCount = useAppState(s => {
-    let count = s.plugins.errors.length
+    let count = s.plugins.errors.length;
     for (const m of s.plugins.installationStatus.marketplaces) {
-      if (m.status === 'failed') count++
+      if (m.status === 'failed') count++;
     }
-    return count
-  })
-  const errorsTabTitle =
-    pluginErrorCount > 0 ? `Errors (${pluginErrorCount})` : 'Errors'
+    return count;
+  });
+  const errorsTabTitle = pluginErrorCount > 0 ? `Errors (${pluginErrorCount})` : 'Errors';
 
-  const exitState = useExitOnCtrlCDWithKeybindings()
+  const exitState = useExitOnCtrlCDWithKeybindings();
 
   /**
    * CLI mode is active when the user provides a complete command with all required arguments.
@@ -761,9 +671,7 @@ export function PluginSettings({
    * Interactive mode is used when arguments are missing, allowing the user to input them.
    */
   const cliMode =
-    parsedCommand.type === 'marketplace' &&
-    parsedCommand.action === 'add' &&
-    parsedCommand.target !== undefined
+    parsedCommand.type === 'marketplace' && parsedCommand.action === 'add' && parsedCommand.target !== undefined;
 
   // Signal that plugin state has changed on disk (Layer 2) and active
   // components (Layer 3) are stale. User runs /reload-plugins to apply.
@@ -774,32 +682,30 @@ export function PluginSettings({
   // plugin changes require /reload-plugins.
   const markPluginsChanged = useCallback(() => {
     setAppState(prev =>
-      prev.plugins.needsRefresh
-        ? prev
-        : { ...prev, plugins: { ...prev.plugins, needsRefresh: true } },
-    )
-  }, [setAppState])
+      prev.plugins.needsRefresh ? prev : { ...prev, plugins: { ...prev.plugins, needsRefresh: true } },
+    );
+  }, [setAppState]);
 
   // Handle tab switching (called by Tabs component)
   const handleTabChange = useCallback((tabId: string) => {
-    const tab = tabId as TabId
-    setActiveTab(tab)
-    setError(null)
+    const tab = tabId as TabId;
+    setActiveTab(tab);
+    setError(null);
     switch (tab) {
       case 'discover':
-        setViewState({ type: 'discover-plugins' })
-        break
+        setViewState({ type: 'discover-plugins' });
+        break;
       case 'installed':
-        setViewState({ type: 'manage-plugins' })
-        break
+        setViewState({ type: 'manage-plugins' });
+        break;
       case 'marketplaces':
-        setViewState({ type: 'manage-marketplaces' })
-        break
+        setViewState({ type: 'manage-marketplaces' });
+        break;
       case 'errors':
         // No viewState change needed — ErrorsTabContent renders inside <Tab id="errors">
-        break
+        break;
     }
-  }, [])
+  }, []);
 
   // Handle exiting when child components set viewState to 'menu'.
   // Child components typically set BOTH setResult(msg) and setParentViewState
@@ -808,44 +714,44 @@ export function PluginSettings({
   // the close AND delivers the message to the transcript.
   useEffect(() => {
     if (viewState.type === 'menu' && !result) {
-      onComplete()
+      onComplete();
     }
-  }, [viewState.type, result, onComplete])
+  }, [viewState.type, result, onComplete]);
 
   // Sync activeTab when viewState changes to a different tab's content
   // This handles cases like AddMarketplace navigating to browse-marketplace
   useEffect(() => {
     if (viewState.type === 'browse-marketplace' && activeTab !== 'discover') {
-      setActiveTab('discover')
+      setActiveTab('discover');
     }
-  }, [viewState.type, activeTab])
+  }, [viewState.type, activeTab]);
 
   // Handle escape key for add-marketplace mode only
   // Other tabbed views handle escape in their own components
   const handleAddMarketplaceEscape = useCallback(() => {
-    setActiveTab('marketplaces')
-    setViewState({ type: 'manage-marketplaces' })
-    setInputValue('')
-    setError(null)
-  }, [])
+    setActiveTab('marketplaces');
+    setViewState({ type: 'manage-marketplaces' });
+    setInputValue('');
+    setError(null);
+  }, []);
 
   useKeybinding('confirm:no', handleAddMarketplaceEscape, {
     context: 'Settings',
     isActive: viewState.type === 'add-marketplace',
-  })
+  });
 
   useEffect(() => {
     if (result) {
-      onComplete(result)
+      onComplete(result);
     }
-  }, [result, onComplete])
+  }, [result, onComplete]);
 
   // Handle help view completion
   useEffect(() => {
     if (viewState.type === 'help') {
-      onComplete()
+      onComplete();
     }
-  }, [viewState.type, onComplete])
+  }, [viewState.type, onComplete]);
 
   // Render different views based on state
   if (viewState.type === 'help') {
@@ -855,17 +761,9 @@ export function PluginSettings({
         <Text> </Text>
         <Text dimColor>Installation:</Text>
         <Text> /plugin install - Browse and install plugins</Text>
-        <Text>
-          {' '}
-          /plugin install &lt;marketplace&gt; - Install from specific
-          marketplace
-        </Text>
+        <Text> /plugin install &lt;marketplace&gt; - Install from specific marketplace</Text>
         <Text> /plugin install &lt;plugin&gt; - Install specific plugin</Text>
-        <Text>
-          {' '}
-          /plugin install &lt;plugin&gt;@&lt;market&gt; - Install plugin from
-          marketplace
-        </Text>
+        <Text> /plugin install &lt;plugin&gt;@&lt;market&gt; - Install plugin from marketplace</Text>
         <Text> </Text>
         <Text dimColor>Management:</Text>
         <Text> /plugin manage - Manage installed plugins</Text>
@@ -876,48 +774,36 @@ export function PluginSettings({
         <Text dimColor>Marketplaces:</Text>
         <Text> /plugin marketplace - Marketplace management menu</Text>
         <Text> /plugin marketplace add - Add a marketplace</Text>
-        <Text>
-          {' '}
-          /plugin marketplace add &lt;path/url&gt; - Add marketplace directly
-        </Text>
+        <Text> /plugin marketplace add &lt;path/url&gt; - Add marketplace directly</Text>
         <Text> /plugin marketplace update - Update marketplaces</Text>
-        <Text>
-          {' '}
-          /plugin marketplace update &lt;name&gt; - Update specific marketplace
-        </Text>
+        <Text> /plugin marketplace update &lt;name&gt; - Update specific marketplace</Text>
         <Text> /plugin marketplace remove - Remove a marketplace</Text>
-        <Text>
-          {' '}
-          /plugin marketplace remove &lt;name&gt; - Remove specific marketplace
-        </Text>
+        <Text> /plugin marketplace remove &lt;name&gt; - Remove specific marketplace</Text>
         <Text> /plugin marketplace list - List all marketplaces</Text>
         <Text> </Text>
         <Text dimColor>Validation:</Text>
-        <Text>
-          {' '}
-          /plugin validate &lt;path&gt; - Validate a manifest file or directory
-        </Text>
+        <Text> /plugin validate &lt;path&gt; - Validate a manifest file or directory</Text>
         <Text> </Text>
         <Text dimColor>Other:</Text>
         <Text> /plugin - Main plugin menu</Text>
         <Text> /plugin help - Show this help</Text>
         <Text> /plugins - Alias for /plugin</Text>
       </Box>
-    )
+    );
   }
 
   if (viewState.type === 'validate') {
-    return <ValidatePlugin onComplete={onComplete} path={viewState.path} />
+    return <ValidatePlugin onComplete={onComplete} path={viewState.path} />;
   }
 
   if (viewState.type === 'marketplace-menu') {
     // Show a simple menu for marketplace operations
-    setViewState({ type: 'menu' })
-    return null
+    setViewState({ type: 'menu' });
+    return null;
   }
 
   if (viewState.type === 'marketplace-list') {
-    return <MarketplaceList onComplete={onComplete} />
+    return <MarketplaceList onComplete={onComplete} />;
   }
 
   if (viewState.type === 'add-marketplace') {
@@ -935,7 +821,7 @@ export function PluginSettings({
         onAddComplete={markPluginsChanged}
         cliMode={cliMode}
       />
-    )
+    );
   }
   // Render tabbed interface using the design system Tabs component
   return (
@@ -946,11 +832,7 @@ export function PluginSettings({
         onTabChange={handleTabChange}
         color="suggestion"
         disableNavigation={childSearchActive}
-        banner={
-          showMcpRedirectMessage && activeTab === 'installed' ? (
-            <McpRedirectBanner />
-          ) : undefined
-        }
+        banner={showMcpRedirectMessage && activeTab === 'installed' ? <McpRedirectBanner /> : undefined}
       >
         <Tab id="discover" title="Discover">
           {viewState.type === 'browse-marketplace' ? (
@@ -973,11 +855,7 @@ export function PluginSettings({
               setViewState={setViewState}
               onInstallComplete={markPluginsChanged}
               onSearchModeChange={setChildSearchActive}
-              targetPlugin={
-                viewState.type === 'discover-plugins'
-                  ? viewState.targetPlugin
-                  : undefined
-              }
+              targetPlugin={viewState.type === 'discover-plugins' ? viewState.targetPlugin : undefined}
             />
           )}
         </Tab>
@@ -987,19 +865,9 @@ export function PluginSettings({
             setResult={setResult}
             onManageComplete={markPluginsChanged}
             onSearchModeChange={setChildSearchActive}
-            targetPlugin={
-              viewState.type === 'manage-plugins'
-                ? viewState.targetPlugin
-                : undefined
-            }
-            targetMarketplace={
-              viewState.type === 'manage-plugins'
-                ? viewState.targetMarketplace
-                : undefined
-            }
-            action={
-              viewState.type === 'manage-plugins' ? viewState.action : undefined
-            }
+            targetPlugin={viewState.type === 'manage-plugins' ? viewState.targetPlugin : undefined}
+            targetMarketplace={viewState.type === 'manage-plugins' ? viewState.targetMarketplace : undefined}
+            action={viewState.type === 'manage-plugins' ? viewState.action : undefined}
           />
         </Tab>
         <Tab id="marketplaces" title="Marketplaces">
@@ -1010,16 +878,8 @@ export function PluginSettings({
             setResult={setResult}
             exitState={exitState}
             onManageComplete={markPluginsChanged}
-            targetMarketplace={
-              viewState.type === 'manage-marketplaces'
-                ? viewState.targetMarketplace
-                : undefined
-            }
-            action={
-              viewState.type === 'manage-marketplaces'
-                ? viewState.action
-                : undefined
-            }
+            targetMarketplace={viewState.type === 'manage-marketplaces' ? viewState.targetMarketplace : undefined}
+            action={viewState.type === 'manage-marketplaces' ? viewState.action : undefined}
           />
         </Tab>
         <Tab id="errors" title={errorsTabTitle}>
@@ -1031,5 +891,5 @@ export function PluginSettings({
         </Tab>
       </Tabs>
     </Pane>
-  )
+  );
 }
diff --git a/src/commands/plugin/PluginTrustWarning.tsx b/src/commands/plugin/PluginTrustWarning.tsx
index 3be3dd79f..a22b6a893 100644
--- a/src/commands/plugin/PluginTrustWarning.tsx
+++ b/src/commands/plugin/PluginTrustWarning.tsx
@@ -1,20 +1,19 @@
-import figures from 'figures'
-import * as React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { getPluginTrustMessage } from '../../utils/plugins/marketplaceHelpers.js'
+import figures from 'figures';
+import * as React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { getPluginTrustMessage } from '../../utils/plugins/marketplaceHelpers.js';
 
 export function PluginTrustWarning(): React.ReactNode {
-  const customMessage = getPluginTrustMessage()
+  const customMessage = getPluginTrustMessage();
   return (
     <Box marginBottom={1}>
       <Text color="claude">{figures.warning} </Text>
       <Text dimColor italic>
-        Make sure you trust a plugin before installing, updating, or using it.
-        Anthropic does not control what MCP servers, files, or other software
-        are included in plugins and cannot verify that they will work as
-        intended or that they won&apos;t change. See each plugin&apos;s homepage
-        for more information.{customMessage ? ` ${customMessage}` : ''}
+        Make sure you trust a plugin before installing, updating, or using it. Anthropic does not control what MCP
+        servers, files, or other software are included in plugins and cannot verify that they will work as intended or
+        that they won&apos;t change. See each plugin&apos;s homepage for more information.
+        {customMessage ? ` ${customMessage}` : ''}
       </Text>
     </Box>
-  )
+  );
 }
diff --git a/src/commands/plugin/UnifiedInstalledCell.tsx b/src/commands/plugin/UnifiedInstalledCell.tsx
index 05e44821f..1032b3eb7 100644
--- a/src/commands/plugin/UnifiedInstalledCell.tsx
+++ b/src/commands/plugin/UnifiedInstalledCell.tsx
@@ -1,46 +1,40 @@
-import figures from 'figures'
-import * as React from 'react'
-import { Box, color, Text, useTheme } from '@anthropic/ink'
-import { plural } from '../../utils/stringUtils.js'
-import type { UnifiedInstalledItem } from './unifiedTypes.js'
+import figures from 'figures';
+import * as React from 'react';
+import { Box, color, Text, useTheme } from '@anthropic/ink';
+import { plural } from '../../utils/stringUtils.js';
+import type { UnifiedInstalledItem } from './unifiedTypes.js';
 
 type Props = {
-  item: UnifiedInstalledItem
-  isSelected: boolean
-}
+  item: UnifiedInstalledItem;
+  isSelected: boolean;
+};
 
-export function UnifiedInstalledCell({
-  item,
-  isSelected,
-}: Props): React.ReactNode {
-  const [theme] = useTheme()
+export function UnifiedInstalledCell({ item, isSelected }: Props): React.ReactNode {
+  const [theme] = useTheme();
 
   if (item.type === 'plugin') {
     // Status icon and text
-    let statusIcon: string
-    let statusText: string
+    let statusIcon: string;
+    let statusText: string;
 
     // Show pending toggle status if set, otherwise show current status
     if (item.pendingToggle) {
-      statusIcon = color('suggestion', theme)(figures.arrowRight)
-      statusText =
-        item.pendingToggle === 'will-enable' ? 'will enable' : 'will disable'
+      statusIcon = color('suggestion', theme)(figures.arrowRight);
+      statusText = item.pendingToggle === 'will-enable' ? 'will enable' : 'will disable';
     } else if (item.errorCount > 0) {
-      statusIcon = color('error', theme)(figures.cross)
-      statusText = `${item.errorCount} ${plural(item.errorCount, 'error')}`
+      statusIcon = color('error', theme)(figures.cross);
+      statusText = `${item.errorCount} ${plural(item.errorCount, 'error')}`;
     } else if (!item.isEnabled) {
-      statusIcon = color('inactive', theme)(figures.radioOff)
-      statusText = 'disabled'
+      statusIcon = color('inactive', theme)(figures.radioOff);
+      statusText = 'disabled';
     } else {
-      statusIcon = color('success', theme)(figures.tick)
-      statusText = 'enabled'
+      statusIcon = color('success', theme)(figures.tick);
+      statusText = 'enabled';
     }
 
     return (
       <Box>
-        <Text color={isSelected ? 'suggestion' : undefined}>
-          {isSelected ? `${figures.pointer} ` : '  '}
-        </Text>
+        <Text color={isSelected ? 'suggestion' : undefined}>{isSelected ? `${figures.pointer} ` : '  '}</Text>
         <Text color={isSelected ? 'suggestion' : undefined}>{item.name}</Text>
         <Text dimColor={!isSelected}>
           {' '}
@@ -50,17 +44,15 @@ export function UnifiedInstalledCell({
         <Text dimColor={!isSelected}> · {statusIcon} </Text>
         <Text dimColor={!isSelected}>{statusText}</Text>
       </Box>
-    )
+    );
   }
 
   if (item.type === 'flagged-plugin') {
-    const statusIcon = color('warning', theme)(figures.warning)
+    const statusIcon = color('warning', theme)(figures.warning);
 
     return (
       <Box>
-        <Text color={isSelected ? 'suggestion' : undefined}>
-          {isSelected ? `${figures.pointer} ` : '  '}
-        </Text>
+        <Text color={isSelected ? 'suggestion' : undefined}>{isSelected ? `${figures.pointer} ` : '  '}</Text>
         <Text color={isSelected ? 'suggestion' : undefined}>{item.name}</Text>
         <Text dimColor={!isSelected}>
           {' '}
@@ -70,18 +62,16 @@ export function UnifiedInstalledCell({
         <Text dimColor={!isSelected}> · {statusIcon} </Text>
         <Text dimColor={!isSelected}>removed</Text>
       </Box>
-    )
+    );
   }
 
   if (item.type === 'failed-plugin') {
-    const statusIcon = color('error', theme)(figures.cross)
-    const statusText = `failed to load · ${item.errorCount} ${plural(item.errorCount, 'error')}`
+    const statusIcon = color('error', theme)(figures.cross);
+    const statusText = `failed to load · ${item.errorCount} ${plural(item.errorCount, 'error')}`;
 
     return (
       <Box>
-        <Text color={isSelected ? 'suggestion' : undefined}>
-          {isSelected ? `${figures.pointer} ` : '  '}
-        </Text>
+        <Text color={isSelected ? 'suggestion' : undefined}>{isSelected ? `${figures.pointer} ` : '  '}</Text>
         <Text color={isSelected ? 'suggestion' : undefined}>{item.name}</Text>
         <Text dimColor={!isSelected}>
           {' '}
@@ -91,37 +81,35 @@ export function UnifiedInstalledCell({
         <Text dimColor={!isSelected}> · {statusIcon} </Text>
         <Text dimColor={!isSelected}>{statusText}</Text>
       </Box>
-    )
+    );
   }
 
   // MCP server
-  let statusIcon: string
-  let statusText: string
+  let statusIcon: string;
+  let statusText: string;
 
   if (item.status === 'connected') {
-    statusIcon = color('success', theme)(figures.tick)
-    statusText = 'connected'
+    statusIcon = color('success', theme)(figures.tick);
+    statusText = 'connected';
   } else if (item.status === 'disabled') {
-    statusIcon = color('inactive', theme)(figures.radioOff)
-    statusText = 'disabled'
+    statusIcon = color('inactive', theme)(figures.radioOff);
+    statusText = 'disabled';
   } else if (item.status === 'pending') {
-    statusIcon = color('inactive', theme)(figures.radioOff)
-    statusText = 'connecting…'
+    statusIcon = color('inactive', theme)(figures.radioOff);
+    statusText = 'connecting…';
   } else if (item.status === 'needs-auth') {
-    statusIcon = color('warning', theme)(figures.triangleUpOutline)
-    statusText = 'Enter to auth'
+    statusIcon = color('warning', theme)(figures.triangleUpOutline);
+    statusText = 'Enter to auth';
   } else {
-    statusIcon = color('error', theme)(figures.cross)
-    statusText = 'failed'
+    statusIcon = color('error', theme)(figures.cross);
+    statusText = 'failed';
   }
 
   // Indented MCPs (child of a plugin)
   if (item.indented) {
     return (
       <Box>
-        <Text color={isSelected ? 'suggestion' : undefined}>
-          {isSelected ? `${figures.pointer} ` : '  '}
-        </Text>
+        <Text color={isSelected ? 'suggestion' : undefined}>{isSelected ? `${figures.pointer} ` : '  '}</Text>
         <Text dimColor={!isSelected}>└ </Text>
         <Text color={isSelected ? 'suggestion' : undefined}>{item.name}</Text>
         <Text dimColor={!isSelected}>
@@ -131,14 +119,12 @@ export function UnifiedInstalledCell({
         <Text dimColor={!isSelected}> · {statusIcon} </Text>
         <Text dimColor={!isSelected}>{statusText}</Text>
       </Box>
-    )
+    );
   }
 
   return (
     <Box>
-      <Text color={isSelected ? 'suggestion' : undefined}>
-        {isSelected ? `${figures.pointer} ` : '  '}
-      </Text>
+      <Text color={isSelected ? 'suggestion' : undefined}>{isSelected ? `${figures.pointer} ` : '  '}</Text>
       <Text color={isSelected ? 'suggestion' : undefined}>{item.name}</Text>
       <Text dimColor={!isSelected}>
         {' '}
@@ -147,5 +133,5 @@ export function UnifiedInstalledCell({
       <Text dimColor={!isSelected}> · {statusIcon} </Text>
       <Text dimColor={!isSelected}>{statusText}</Text>
     </Box>
-  )
+  );
 }
diff --git a/src/commands/plugin/ValidatePlugin.tsx b/src/commands/plugin/ValidatePlugin.tsx
index 9eb52d4b6..f2a7932f5 100644
--- a/src/commands/plugin/ValidatePlugin.tsx
+++ b/src/commands/plugin/ValidatePlugin.tsx
@@ -1,16 +1,16 @@
-import figures from 'figures'
-import * as React from 'react'
-import { useEffect } from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { errorMessage } from '../../utils/errors.js'
-import { logError } from '../../utils/log.js'
-import { validateManifest } from '../../utils/plugins/validatePlugin.js'
-import { plural } from '../../utils/stringUtils.js'
+import figures from 'figures';
+import * as React from 'react';
+import { useEffect } from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { errorMessage } from '../../utils/errors.js';
+import { logError } from '../../utils/log.js';
+import { validateManifest } from '../../utils/plugins/validatePlugin.js';
+import { plural } from '../../utils/stringUtils.js';
 
 type Props = {
-  onComplete: (result?: string) => void
-  path?: string
-}
+  onComplete: (result?: string) => void;
+  path?: string;
+};
 
 export function ValidatePlugin({ onComplete, path }: Props): React.ReactNode {
   useEffect(() => {
@@ -28,76 +28,74 @@ export function ValidatePlugin({ onComplete, path }: Props): React.ReactNode {
             'or .claude-plugin/plugin.json (prefers marketplace if both exist).\n\n' +
             'Or from the command line:\n' +
             '  claude plugin validate <path>',
-        )
-        return
+        );
+        return;
       }
 
       try {
-        const result = await validateManifest(path)
+        const result = await validateManifest(path);
 
-        let output = ''
+        let output = '';
 
         // Add header
-        output += `Validating ${result.fileType} manifest: ${result.filePath}\n\n`
+        output += `Validating ${result.fileType} manifest: ${result.filePath}\n\n`;
 
         // Show errors
         if (result.errors.length > 0) {
-          output += `${figures.cross} Found ${result.errors.length} ${plural(result.errors.length, 'error')}:\n\n`
+          output += `${figures.cross} Found ${result.errors.length} ${plural(result.errors.length, 'error')}:\n\n`;
 
           result.errors.forEach(error => {
-            output += `  ${figures.pointer} ${error.path}: ${error.message}\n`
-          })
+            output += `  ${figures.pointer} ${error.path}: ${error.message}\n`;
+          });
 
-          output += '\n'
+          output += '\n';
         }
 
         // Show warnings
         if (result.warnings.length > 0) {
-          output += `${figures.warning} Found ${result.warnings.length} ${plural(result.warnings.length, 'warning')}:\n\n`
+          output += `${figures.warning} Found ${result.warnings.length} ${plural(result.warnings.length, 'warning')}:\n\n`;
 
           result.warnings.forEach(warning => {
-            output += `  ${figures.pointer} ${warning.path}: ${warning.message}\n`
-          })
+            output += `  ${figures.pointer} ${warning.path}: ${warning.message}\n`;
+          });
 
-          output += '\n'
+          output += '\n';
         }
 
         // Show success or failure
         if (result.success) {
           if (result.warnings.length > 0) {
-            output += `${figures.tick} Validation passed with warnings\n`
+            output += `${figures.tick} Validation passed with warnings\n`;
           } else {
-            output += `${figures.tick} Validation passed\n`
+            output += `${figures.tick} Validation passed\n`;
           }
 
           // Exit with code 0 (success)
-          process.exitCode = 0
+          process.exitCode = 0;
         } else {
-          output += `${figures.cross} Validation failed\n`
+          output += `${figures.cross} Validation failed\n`;
 
           // Exit with code 1 (validation failure)
-          process.exitCode = 1
+          process.exitCode = 1;
         }
 
-        onComplete(output)
+        onComplete(output);
       } catch (error) {
         // Exit with code 2 (unexpected error)
-        process.exitCode = 2
+        process.exitCode = 2;
 
-        logError(error)
+        logError(error);
 
-        onComplete(
-          `${figures.cross} Unexpected error during validation: ${errorMessage(error)}`,
-        )
+        onComplete(`${figures.cross} Unexpected error during validation: ${errorMessage(error)}`);
       }
     }
 
-    void runValidation()
-  }, [onComplete, path])
+    void runValidation();
+  }, [onComplete, path]);
 
   return (
     <Box flexDirection="column">
       <Text>Running validation...</Text>
     </Box>
-  )
+  );
 }
diff --git a/src/commands/plugin/__tests__/parseArgs.test.ts b/src/commands/plugin/__tests__/parseArgs.test.ts
index 7a08fd758..31eba8c41 100644
--- a/src/commands/plugin/__tests__/parseArgs.test.ts
+++ b/src/commands/plugin/__tests__/parseArgs.test.ts
@@ -1,147 +1,149 @@
-import { describe, expect, test } from "bun:test";
-import { parsePluginArgs } from "../parseArgs";
+import { describe, expect, test } from 'bun:test'
+import { parsePluginArgs } from '../parseArgs'
 
-describe("parsePluginArgs", () => {
+describe('parsePluginArgs', () => {
   // No args
   test("returns { type: 'menu' } for undefined", () => {
-    expect(parsePluginArgs(undefined)).toEqual({ type: "menu" });
-  });
+    expect(parsePluginArgs(undefined)).toEqual({ type: 'menu' })
+  })
 
   test("returns { type: 'menu' } for empty string", () => {
-    expect(parsePluginArgs("")).toEqual({ type: "menu" });
-  });
+    expect(parsePluginArgs('')).toEqual({ type: 'menu' })
+  })
 
   test("returns { type: 'menu' } for whitespace only", () => {
-    expect(parsePluginArgs("   ")).toEqual({ type: "menu" });
-  });
+    expect(parsePluginArgs('   ')).toEqual({ type: 'menu' })
+  })
 
   // Help
   test("returns { type: 'help' } for 'help'", () => {
-    expect(parsePluginArgs("help")).toEqual({ type: "help" });
-  });
+    expect(parsePluginArgs('help')).toEqual({ type: 'help' })
+  })
 
   test("returns { type: 'help' } for '--help'", () => {
-    expect(parsePluginArgs("--help")).toEqual({ type: "help" });
-  });
+    expect(parsePluginArgs('--help')).toEqual({ type: 'help' })
+  })
 
   test("returns { type: 'help' } for '-h'", () => {
-    expect(parsePluginArgs("-h")).toEqual({ type: "help" });
-  });
+    expect(parsePluginArgs('-h')).toEqual({ type: 'help' })
+  })
 
   // Install
   test("parses 'install my-plugin' -> { type: 'install', plugin: 'my-plugin' }", () => {
-    expect(parsePluginArgs("install my-plugin")).toEqual({
-      type: "install",
-      plugin: "my-plugin",
-    });
-  });
+    expect(parsePluginArgs('install my-plugin')).toEqual({
+      type: 'install',
+      plugin: 'my-plugin',
+    })
+  })
 
   test("parses 'install my-plugin@github' with marketplace", () => {
-    expect(parsePluginArgs("install my-plugin@github")).toEqual({
-      type: "install",
-      plugin: "my-plugin",
-      marketplace: "github",
-    });
-  });
+    expect(parsePluginArgs('install my-plugin@github')).toEqual({
+      type: 'install',
+      plugin: 'my-plugin',
+      marketplace: 'github',
+    })
+  })
 
   test("parses 'install https://github.com/...' as URL marketplace", () => {
-    expect(parsePluginArgs("install https://github.com/plugins/my-plugin")).toEqual({
-      type: "install",
-      marketplace: "https://github.com/plugins/my-plugin",
-    });
-  });
+    expect(
+      parsePluginArgs('install https://github.com/plugins/my-plugin'),
+    ).toEqual({
+      type: 'install',
+      marketplace: 'https://github.com/plugins/my-plugin',
+    })
+  })
 
   test("parses 'i plugin' as install shorthand", () => {
-    expect(parsePluginArgs("i plugin")).toEqual({
-      type: "install",
-      plugin: "plugin",
-    });
-  });
+    expect(parsePluginArgs('i plugin')).toEqual({
+      type: 'install',
+      plugin: 'plugin',
+    })
+  })
 
-  test("install without target returns type only", () => {
-    expect(parsePluginArgs("install")).toEqual({ type: "install" });
-  });
+  test('install without target returns type only', () => {
+    expect(parsePluginArgs('install')).toEqual({ type: 'install' })
+  })
 
   // Uninstall
   test("returns { type: 'uninstall', plugin: '...' }", () => {
-    expect(parsePluginArgs("uninstall my-plugin")).toEqual({
-      type: "uninstall",
-      plugin: "my-plugin",
-    });
-  });
+    expect(parsePluginArgs('uninstall my-plugin')).toEqual({
+      type: 'uninstall',
+      plugin: 'my-plugin',
+    })
+  })
 
   // Enable/disable
   test("returns { type: 'enable', plugin: '...' }", () => {
-    expect(parsePluginArgs("enable my-plugin")).toEqual({
-      type: "enable",
-      plugin: "my-plugin",
-    });
-  });
+    expect(parsePluginArgs('enable my-plugin')).toEqual({
+      type: 'enable',
+      plugin: 'my-plugin',
+    })
+  })
 
   test("returns { type: 'disable', plugin: '...' }", () => {
-    expect(parsePluginArgs("disable my-plugin")).toEqual({
-      type: "disable",
-      plugin: "my-plugin",
-    });
-  });
+    expect(parsePluginArgs('disable my-plugin')).toEqual({
+      type: 'disable',
+      plugin: 'my-plugin',
+    })
+  })
 
   // Validate
   test("returns { type: 'validate', path: '...' }", () => {
-    expect(parsePluginArgs("validate /path/to/plugin")).toEqual({
-      type: "validate",
-      path: "/path/to/plugin",
-    });
-  });
+    expect(parsePluginArgs('validate /path/to/plugin')).toEqual({
+      type: 'validate',
+      path: '/path/to/plugin',
+    })
+  })
 
   // Manage
   test("returns { type: 'manage' }", () => {
-    expect(parsePluginArgs("manage")).toEqual({ type: "manage" });
-  });
+    expect(parsePluginArgs('manage')).toEqual({ type: 'manage' })
+  })
 
   // Marketplace
   test("parses 'marketplace add ...'", () => {
-    expect(parsePluginArgs("marketplace add https://example.com")).toEqual({
-      type: "marketplace",
-      action: "add",
-      target: "https://example.com",
-    });
-  });
+    expect(parsePluginArgs('marketplace add https://example.com')).toEqual({
+      type: 'marketplace',
+      action: 'add',
+      target: 'https://example.com',
+    })
+  })
 
   test("parses 'marketplace remove ...'", () => {
-    expect(parsePluginArgs("marketplace remove my-source")).toEqual({
-      type: "marketplace",
-      action: "remove",
-      target: "my-source",
-    });
-  });
+    expect(parsePluginArgs('marketplace remove my-source')).toEqual({
+      type: 'marketplace',
+      action: 'remove',
+      target: 'my-source',
+    })
+  })
 
   test("parses 'marketplace list'", () => {
-    expect(parsePluginArgs("marketplace list")).toEqual({
-      type: "marketplace",
-      action: "list",
-    });
-  });
+    expect(parsePluginArgs('marketplace list')).toEqual({
+      type: 'marketplace',
+      action: 'list',
+    })
+  })
 
   test("parses 'market' as alias for 'marketplace'", () => {
-    expect(parsePluginArgs("market list")).toEqual({
-      type: "marketplace",
-      action: "list",
-    });
-  });
+    expect(parsePluginArgs('market list')).toEqual({
+      type: 'marketplace',
+      action: 'list',
+    })
+  })
 
   // Boundary
-  test("handles extra whitespace", () => {
-    expect(parsePluginArgs("  install   my-plugin  ")).toEqual({
-      type: "install",
-      plugin: "my-plugin",
-    });
-  });
+  test('handles extra whitespace', () => {
+    expect(parsePluginArgs('  install   my-plugin  ')).toEqual({
+      type: 'install',
+      plugin: 'my-plugin',
+    })
+  })
 
-  test("handles unknown subcommand gracefully", () => {
-    expect(parsePluginArgs("foobar")).toEqual({ type: "menu" });
-  });
+  test('handles unknown subcommand gracefully', () => {
+    expect(parsePluginArgs('foobar')).toEqual({ type: 'menu' })
+  })
 
-  test("marketplace without action returns type only", () => {
-    expect(parsePluginArgs("marketplace")).toEqual({ type: "marketplace" });
-  });
-});
+  test('marketplace without action returns type only', () => {
+    expect(parsePluginArgs('marketplace')).toEqual({ type: 'marketplace' })
+  })
+})
diff --git a/src/commands/plugin/index.tsx b/src/commands/plugin/index.tsx
index 34d505bb5..781217f38 100644
--- a/src/commands/plugin/index.tsx
+++ b/src/commands/plugin/index.tsx
@@ -1,4 +1,4 @@
-import type { Command } from '../../commands.js'
+import type { Command } from '../../commands.js';
 
 const plugin = {
   type: 'local-jsx',
@@ -7,6 +7,6 @@ const plugin = {
   description: 'Manage Claude Code plugins',
   immediate: true,
   load: () => import('./plugin.js'),
-} satisfies Command
+} satisfies Command;
 
-export default plugin
+export default plugin;
diff --git a/src/commands/plugin/plugin.tsx b/src/commands/plugin/plugin.tsx
index c19dadf58..33ed781fc 100644
--- a/src/commands/plugin/plugin.tsx
+++ b/src/commands/plugin/plugin.tsx
@@ -1,11 +1,7 @@
-import * as React from 'react'
-import type { LocalJSXCommandOnDone } from '../../types/command.js'
-import { PluginSettings } from './PluginSettings.js'
+import * as React from 'react';
+import type { LocalJSXCommandOnDone } from '../../types/command.js';
+import { PluginSettings } from './PluginSettings.js';
 
-export async function call(
-  onDone: LocalJSXCommandOnDone,
-  _context: unknown,
-  args?: string,
-): Promise<React.ReactNode> {
-  return <PluginSettings onComplete={onDone} args={args} />
+export async function call(onDone: LocalJSXCommandOnDone, _context: unknown, args?: string): Promise<React.ReactNode> {
+  return <PluginSettings onComplete={onDone} args={args} />;
 }
diff --git a/src/commands/plugin/pluginDetailsHelpers.tsx b/src/commands/plugin/pluginDetailsHelpers.tsx
index 2a9909e1a..7985239c7 100644
--- a/src/commands/plugin/pluginDetailsHelpers.tsx
+++ b/src/commands/plugin/pluginDetailsHelpers.tsx
@@ -4,28 +4,28 @@
  * Used by both DiscoverPlugins and BrowseMarketplace components.
  */
 
-import * as React from 'react'
-import { ConfigurableShortcutHint } from '../../components/ConfigurableShortcutHint.js'
-import { Box, Byline, Text } from '@anthropic/ink'
-import type { PluginMarketplaceEntry } from '../../utils/plugins/schemas.js'
+import * as React from 'react';
+import { ConfigurableShortcutHint } from '../../components/ConfigurableShortcutHint.js';
+import { Box, Byline, Text } from '@anthropic/ink';
+import type { PluginMarketplaceEntry } from '../../utils/plugins/schemas.js';
 
 /**
  * Represents a plugin available for installation from a marketplace
  */
 export type InstallablePlugin = {
-  entry: PluginMarketplaceEntry
-  marketplaceName: string
-  pluginId: string
-  isInstalled: boolean
-}
+  entry: PluginMarketplaceEntry;
+  marketplaceName: string;
+  pluginId: string;
+  isInstalled: boolean;
+};
 
 /**
  * Menu option for plugin details view
  */
 export type PluginDetailsMenuOption = {
-  label: string
-  action: string
-}
+  label: string;
+  action: string;
+};
 
 /**
  * Extract GitHub repo info from a plugin's source
@@ -35,17 +35,13 @@ export function extractGitHubRepo(plugin: InstallablePlugin): string | null {
     plugin.entry.source &&
     typeof plugin.entry.source === 'object' &&
     'source' in plugin.entry.source &&
-    plugin.entry.source.source === 'github'
+    plugin.entry.source.source === 'github';
 
-  if (
-    isGitHub &&
-    typeof plugin.entry.source === 'object' &&
-    'repo' in plugin.entry.source
-  ) {
-    return plugin.entry.source.repo
+  if (isGitHub && typeof plugin.entry.source === 'object' && 'repo' in plugin.entry.source) {
+    return plugin.entry.source.repo;
   }
 
-  return null
+  return null;
 }
 
 /**
@@ -65,25 +61,21 @@ export function buildPluginDetailsMenuOptions(
       label: 'Install for you, in this repo only (local scope)',
       action: 'install-local',
     },
-  ]
+  ];
   if (hasHomepage) {
-    options.push({ label: 'Open homepage', action: 'homepage' })
+    options.push({ label: 'Open homepage', action: 'homepage' });
   }
   if (githubRepo) {
-    options.push({ label: 'View on GitHub', action: 'github' })
+    options.push({ label: 'View on GitHub', action: 'github' });
   }
-  options.push({ label: 'Back to plugin list', action: 'back' })
-  return options
+  options.push({ label: 'Back to plugin list', action: 'back' });
+  return options;
 }
 
 /**
  * Key hint component for plugin selection screens
  */
-export function PluginSelectionKeyHint({
-  hasSelection,
-}: {
-  hasSelection: boolean
-}): React.ReactNode {
+export function PluginSelectionKeyHint({ hasSelection }: { hasSelection: boolean }): React.ReactNode {
   return (
     <Box marginTop={1}>
       <Text dimColor italic>
@@ -97,26 +89,11 @@ export function PluginSelectionKeyHint({
               bold
             />
           )}
-          <ConfigurableShortcutHint
-            action="plugin:toggle"
-            context="Plugin"
-            fallback="Space"
-            description="toggle"
-          />
-          <ConfigurableShortcutHint
-            action="select:accept"
-            context="Select"
-            fallback="Enter"
-            description="details"
-          />
-          <ConfigurableShortcutHint
-            action="confirm:no"
-            context="Confirmation"
-            fallback="Esc"
-            description="back"
-          />
+          <ConfigurableShortcutHint action="plugin:toggle" context="Plugin" fallback="Space" description="toggle" />
+          <ConfigurableShortcutHint action="select:accept" context="Select" fallback="Enter" description="details" />
+          <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="back" />
         </Byline>
       </Text>
     </Box>
-  )
+  );
 }
diff --git a/src/commands/plugin/src/services/analytics/index.ts b/src/commands/plugin/src/services/analytics/index.ts
index 142e7b6f5..2e0f796da 100644
--- a/src/commands/plugin/src/services/analytics/index.ts
+++ b/src/commands/plugin/src/services/analytics/index.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any;
-export type logEvent = any;
+export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any
+export type logEvent = any
diff --git a/src/commands/plugin/types.ts b/src/commands/plugin/types.ts
index 436f786ee..86e77fa74 100644
--- a/src/commands/plugin/types.ts
+++ b/src/commands/plugin/types.ts
@@ -1,3 +1,3 @@
 // Auto-generated stub — replace with real implementation
-export type ViewState = any;
-export type PluginSettingsProps = any;
+export type ViewState = any
+export type PluginSettingsProps = any
diff --git a/src/commands/plugin/unifiedTypes.ts b/src/commands/plugin/unifiedTypes.ts
index 7100863b2..68b595f8b 100644
--- a/src/commands/plugin/unifiedTypes.ts
+++ b/src/commands/plugin/unifiedTypes.ts
@@ -1,2 +1,2 @@
 // Auto-generated stub — replace with real implementation
-export type UnifiedInstalledItem = any;
+export type UnifiedInstalledItem = any
diff --git a/src/commands/poor/index.ts b/src/commands/poor/index.ts
index 0ae331a68..199c0447e 100644
--- a/src/commands/poor/index.ts
+++ b/src/commands/poor/index.ts
@@ -3,7 +3,8 @@ import type { Command } from '../../commands.js'
 const poor = {
   type: 'local',
   name: 'poor',
-  description: 'Toggle poor mode — disable extract_memories and prompt_suggestion to save tokens',
+  description:
+    'Toggle poor mode — disable extract_memories and prompt_suggestion to save tokens',
   supportsNonInteractive: false,
   load: () => import('./poor.js'),
 } satisfies Command
diff --git a/src/commands/poor/poorMode.ts b/src/commands/poor/poorMode.ts
index 84f4ab857..d6ab2e99f 100644
--- a/src/commands/poor/poorMode.ts
+++ b/src/commands/poor/poorMode.ts
@@ -5,7 +5,10 @@
  * Persisted to settings.json so it survives session restarts.
  */
 
-import { getInitialSettings, updateSettingsForSource } from '../../utils/settings/settings.js'
+import {
+  getInitialSettings,
+  updateSettingsForSource,
+} from '../../utils/settings/settings.js'
 
 let poorModeActive: boolean | null = null
 
diff --git a/src/commands/privacy-settings/privacy-settings.tsx b/src/commands/privacy-settings/privacy-settings.tsx
index e9ac86619..0ede11716 100644
--- a/src/commands/privacy-settings/privacy-settings.tsx
+++ b/src/commands/privacy-settings/privacy-settings.tsx
@@ -1,75 +1,56 @@
-import * as React from 'react'
-import {
-  type GroveDecision,
-  GroveDialog,
-  PrivacySettingsDialog,
-} from '../../components/grove/Grove.js'
+import * as React from 'react';
+import { type GroveDecision, GroveDialog, PrivacySettingsDialog } from '../../components/grove/Grove.js';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from '../../services/analytics/index.js'
-import {
-  getGroveNoticeConfig,
-  getGroveSettings,
-  isQualifiedForGrove,
-} from '../../services/api/grove.js'
-import type { LocalJSXCommandOnDone } from '../../types/command.js'
+} from '../../services/analytics/index.js';
+import { getGroveNoticeConfig, getGroveSettings, isQualifiedForGrove } from '../../services/api/grove.js';
+import type { LocalJSXCommandOnDone } from '../../types/command.js';
 
-const FALLBACK_MESSAGE =
-  'Review and manage your privacy settings at https://claude.ai/settings/data-privacy-controls'
+const FALLBACK_MESSAGE = 'Review and manage your privacy settings at https://claude.ai/settings/data-privacy-controls';
 
-export async function call(
-  onDone: LocalJSXCommandOnDone,
-): Promise<React.ReactNode | null> {
-  const qualified = await isQualifiedForGrove()
+export async function call(onDone: LocalJSXCommandOnDone): Promise<React.ReactNode | null> {
+  const qualified = await isQualifiedForGrove();
   if (!qualified) {
-    onDone(FALLBACK_MESSAGE)
-    return null
+    onDone(FALLBACK_MESSAGE);
+    return null;
   }
 
-  const [settingsResult, configResult] = await Promise.all([
-    getGroveSettings(),
-    getGroveNoticeConfig(),
-  ])
+  const [settingsResult, configResult] = await Promise.all([getGroveSettings(), getGroveNoticeConfig()]);
   // Hide dialog on API failure (after retry)
   if (!settingsResult.success) {
-    onDone(FALLBACK_MESSAGE)
-    return null
+    onDone(FALLBACK_MESSAGE);
+    return null;
   }
-  const settings = settingsResult.data
-  const config = configResult.success ? configResult.data : null
+  const settings = settingsResult.data;
+  const config = configResult.success ? configResult.data : null;
 
   async function onDoneWithDecision(decision: GroveDecision) {
     if (decision === 'escape' || decision === 'defer') {
       onDone('Privacy settings dialog dismissed', {
         display: 'system',
-      })
-      return
+      });
+      return;
     }
-    await onDoneWithSettingsCheck()
+    await onDoneWithSettingsCheck();
   }
 
   async function onDoneWithSettingsCheck() {
-    const updatedSettingsResult = await getGroveSettings()
+    const updatedSettingsResult = await getGroveSettings();
     if (!updatedSettingsResult.success) {
       onDone('Unable to retrieve updated privacy settings', {
         display: 'system',
-      })
-      return
+      });
+      return;
     }
-    const updatedSettings = updatedSettingsResult.data
-    const groveStatus = updatedSettings.grove_enabled ? 'true' : 'false'
-    onDone(`"Help improve Claude" set to ${groveStatus}.`)
-    if (
-      settings.grove_enabled !== null &&
-      settings.grove_enabled !== updatedSettings.grove_enabled
-    ) {
+    const updatedSettings = updatedSettingsResult.data;
+    const groveStatus = updatedSettings.grove_enabled ? 'true' : 'false';
+    onDone(`"Help improve Claude" set to ${groveStatus}.`);
+    if (settings.grove_enabled !== null && settings.grove_enabled !== updatedSettings.grove_enabled) {
       logEvent('tengu_grove_policy_toggled', {
-        state:
-          updatedSettings.grove_enabled as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        location:
-          'settings' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
+        state: updatedSettings.grove_enabled as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        location: 'settings' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
     }
   }
 
@@ -82,15 +63,9 @@ export async function call(
         domainExcluded={config?.domain_excluded}
         onDone={onDoneWithSettingsCheck}
       ></PrivacySettingsDialog>
-    )
+    );
   }
 
   // Show the GroveDialog for users who haven't accepted terms yet
-  return (
-    <GroveDialog
-      showIfAlreadyViewed={true}
-      onDone={onDoneWithDecision}
-      location={'settings'}
-    />
-  )
+  return <GroveDialog showIfAlreadyViewed={true} onDone={onDoneWithDecision} location={'settings'} />;
 }
diff --git a/src/commands/provider.ts b/src/commands/provider.ts
index 19b19c021..c2d43163f 100644
--- a/src/commands/provider.ts
+++ b/src/commands/provider.ts
@@ -26,7 +26,9 @@ function getEnvVarForProvider(provider: string): string {
 function getMergedEnv(): Record<string, string> {
   const settings = getSettings_DEPRECATED()
   const merged: Record<string, string> = Object.fromEntries(
-    Object.entries(process.env).filter((e): e is [string, string] => e[1] !== undefined)
+    Object.entries(process.env).filter(
+      (e): e is [string, string] => e[1] !== undefined,
+    ),
   )
   if (settings?.env) {
     Object.assign(merged, settings.env)
@@ -123,7 +125,12 @@ const call: LocalCommandCall = async (args, context) => {
   // Handle different provider types
   // - 'anthropic', 'openai', 'gemini' are stored in settings.json (persistent)
   // - 'bedrock', 'vertex', 'foundry' are env-only (do NOT touch settings.json)
-  if (arg === 'anthropic' || arg === 'openai' || arg === 'gemini' || arg === 'grok') {
+  if (
+    arg === 'anthropic' ||
+    arg === 'openai' ||
+    arg === 'gemini' ||
+    arg === 'grok'
+  ) {
     // Clear any cloud provider env vars to avoid conflicts
     delete process.env.CLAUDE_CODE_USE_BEDROCK
     delete process.env.CLAUDE_CODE_USE_VERTEX
diff --git a/src/commands/rate-limit-options/rate-limit-options.tsx b/src/commands/rate-limit-options/rate-limit-options.tsx
index 50198f561..736ef87b6 100644
--- a/src/commands/rate-limit-options/rate-limit-options.tsx
+++ b/src/commands/rate-limit-options/rate-limit-options.tsx
@@ -1,71 +1,50 @@
-import React, { useMemo, useState } from 'react'
-import type {
-  CommandResultDisplay,
-  LocalJSXCommandContext,
-} from '../../commands.js'
-import {
-  type OptionWithDescription,
-  Select,
-} from '../../components/CustomSelect/select.js'
-import { Dialog } from '@anthropic/ink'
-import { getFeatureValue_CACHED_MAY_BE_STALE } from '../../services/analytics/growthbook.js'
-import { logEvent } from '../../services/analytics/index.js'
-import { useClaudeAiLimits } from '../../services/claudeAiLimitsHook.js'
-import type { ToolUseContext } from '../../Tool.js'
-import type { LocalJSXCommandOnDone } from '../../types/command.js'
-import {
-  getOauthAccountInfo,
-  getRateLimitTier,
-  getSubscriptionType,
-} from '../../utils/auth.js'
-import { hasClaudeAiBillingAccess } from '../../utils/billing.js'
-import { call as extraUsageCall } from '../extra-usage/extra-usage.js'
-import { extraUsage } from '../extra-usage/index.js'
-import upgrade from '../upgrade/index.js'
-import { call as upgradeCall } from '../upgrade/upgrade.js'
+import React, { useMemo, useState } from 'react';
+import type { CommandResultDisplay, LocalJSXCommandContext } from '../../commands.js';
+import { type OptionWithDescription, Select } from '../../components/CustomSelect/select.js';
+import { Dialog } from '@anthropic/ink';
+import { getFeatureValue_CACHED_MAY_BE_STALE } from '../../services/analytics/growthbook.js';
+import { logEvent } from '../../services/analytics/index.js';
+import { useClaudeAiLimits } from '../../services/claudeAiLimitsHook.js';
+import type { ToolUseContext } from '../../Tool.js';
+import type { LocalJSXCommandOnDone } from '../../types/command.js';
+import { getOauthAccountInfo, getRateLimitTier, getSubscriptionType } from '../../utils/auth.js';
+import { hasClaudeAiBillingAccess } from '../../utils/billing.js';
+import { call as extraUsageCall } from '../extra-usage/extra-usage.js';
+import { extraUsage } from '../extra-usage/index.js';
+import upgrade from '../upgrade/index.js';
+import { call as upgradeCall } from '../upgrade/upgrade.js';
 
-type RateLimitOptionsMenuOptionType = 'upgrade' | 'extra-usage' | 'cancel'
+type RateLimitOptionsMenuOptionType = 'upgrade' | 'extra-usage' | 'cancel';
 
 type RateLimitOptionsMenuProps = {
   onDone: (
     result?: string,
     options?:
       | {
-          display?: CommandResultDisplay | undefined
+          display?: CommandResultDisplay | undefined;
         }
       | undefined,
-  ) => void
-  context: ToolUseContext & LocalJSXCommandContext
-}
+  ) => void;
+  context: ToolUseContext & LocalJSXCommandContext;
+};
 
-function RateLimitOptionsMenu({
-  onDone,
-  context,
-}: RateLimitOptionsMenuProps): React.ReactNode {
-  const [subCommandJSX, setSubCommandJSX] = useState<React.ReactNode>(null)
-  const claudeAiLimits = useClaudeAiLimits()
-  const subscriptionType = getSubscriptionType()
-  const rateLimitTier = getRateLimitTier()
-  const hasExtraUsageEnabled =
-    getOauthAccountInfo()?.hasExtraUsageEnabled === true
-  const isMax = subscriptionType === 'max'
-  const isMax20x = isMax && rateLimitTier === 'default_claude_max_20x'
-  const isTeamOrEnterprise =
-    subscriptionType === 'team' || subscriptionType === 'enterprise'
-  const buyFirst = getFeatureValue_CACHED_MAY_BE_STALE(
-    'tengu_jade_anvil_4',
-    false,
-  )
+function RateLimitOptionsMenu({ onDone, context }: RateLimitOptionsMenuProps): React.ReactNode {
+  const [subCommandJSX, setSubCommandJSX] = useState<React.ReactNode>(null);
+  const claudeAiLimits = useClaudeAiLimits();
+  const subscriptionType = getSubscriptionType();
+  const rateLimitTier = getRateLimitTier();
+  const hasExtraUsageEnabled = getOauthAccountInfo()?.hasExtraUsageEnabled === true;
+  const isMax = subscriptionType === 'max';
+  const isMax20x = isMax && rateLimitTier === 'default_claude_max_20x';
+  const isTeamOrEnterprise = subscriptionType === 'team' || subscriptionType === 'enterprise';
+  const buyFirst = getFeatureValue_CACHED_MAY_BE_STALE('tengu_jade_anvil_4', false);
 
-  const options = useMemo<
-    OptionWithDescription<RateLimitOptionsMenuOptionType>[]
-  >(() => {
-    const actionOptions: OptionWithDescription<RateLimitOptionsMenuOptionType>[] =
-      []
+  const options = useMemo<OptionWithDescription<RateLimitOptionsMenuOptionType>[]>(() => {
+    const actionOptions: OptionWithDescription<RateLimitOptionsMenuOptionType>[] = [];
 
     if (extraUsage.isEnabled()) {
-      const hasBillingAccess = hasClaudeAiBillingAccess()
-      const needsToRequestFromAdmin = isTeamOrEnterprise && !hasBillingAccess
+      const hasBillingAccess = hasClaudeAiBillingAccess();
+      const needsToRequestFromAdmin = isTeamOrEnterprise && !hasBillingAccess;
       // Org spend cap depleted - non-admins can't request more since there's nothing to allocate
       // - out_of_credits: wallet empty
       // - org_level_disabled_until: org spend cap hit for the month
@@ -73,29 +52,26 @@ function RateLimitOptionsMenu({
       const isOrgSpendCapDepleted =
         claudeAiLimits.overageDisabledReason === 'out_of_credits' ||
         claudeAiLimits.overageDisabledReason === 'org_level_disabled_until' ||
-        claudeAiLimits.overageDisabledReason === 'org_service_zero_credit_limit'
+        claudeAiLimits.overageDisabledReason === 'org_service_zero_credit_limit';
 
       // Hide for non-admin Team/Enterprise users when org spend cap is depleted
       if (needsToRequestFromAdmin && isOrgSpendCapDepleted) {
         // Don't show extra-usage option
       } else {
         const isOverageState =
-          claudeAiLimits.overageStatus === 'rejected' ||
-          claudeAiLimits.overageStatus === 'allowed_warning'
+          claudeAiLimits.overageStatus === 'rejected' || claudeAiLimits.overageStatus === 'allowed_warning';
 
-        let label: string
+        let label: string;
         if (needsToRequestFromAdmin) {
-          label = isOverageState ? 'Request more' : 'Request extra usage'
+          label = isOverageState ? 'Request more' : 'Request extra usage';
         } else {
-          label = hasExtraUsageEnabled
-            ? 'Add funds to continue with extra usage'
-            : 'Switch to extra usage'
+          label = hasExtraUsageEnabled ? 'Add funds to continue with extra usage' : 'Switch to extra usage';
         }
 
         actionOptions.push({
           label,
           value: 'extra-usage',
-        })
+        });
       }
     }
 
@@ -103,19 +79,18 @@ function RateLimitOptionsMenu({
       actionOptions.push({
         label: 'Upgrade your plan',
         value: 'upgrade',
-      })
+      });
     }
 
-    const cancelOption: OptionWithDescription<RateLimitOptionsMenuOptionType> =
-      {
-        label: 'Stop and wait for limit to reset',
-        value: 'cancel',
-      }
+    const cancelOption: OptionWithDescription<RateLimitOptionsMenuOptionType> = {
+      label: 'Stop and wait for limit to reset',
+      value: 'cancel',
+    };
 
     if (buyFirst) {
-      return [...actionOptions, cancelOption]
+      return [...actionOptions, cancelOption];
     }
-    return [cancelOption, ...actionOptions]
+    return [cancelOption, ...actionOptions];
   }, [
     buyFirst,
     isMax20x,
@@ -123,55 +98,51 @@ function RateLimitOptionsMenu({
     hasExtraUsageEnabled,
     claudeAiLimits.overageStatus,
     claudeAiLimits.overageDisabledReason,
-  ])
+  ]);
 
   function handleCancel(): void {
-    logEvent('tengu_rate_limit_options_menu_cancel', {})
-    onDone(undefined, { display: 'skip' })
+    logEvent('tengu_rate_limit_options_menu_cancel', {});
+    onDone(undefined, { display: 'skip' });
   }
 
   function handleSelect(value: RateLimitOptionsMenuOptionType): void {
     if (value === 'upgrade') {
-      logEvent('tengu_rate_limit_options_menu_select_upgrade', {})
+      logEvent('tengu_rate_limit_options_menu_select_upgrade', {});
       void upgradeCall(onDone, context).then(jsx => {
         if (jsx) {
-          setSubCommandJSX(jsx)
+          setSubCommandJSX(jsx);
         }
-      })
+      });
     } else if (value === 'extra-usage') {
-      logEvent('tengu_rate_limit_options_menu_select_extra_usage', {})
+      logEvent('tengu_rate_limit_options_menu_select_extra_usage', {});
       void extraUsageCall(onDone, context).then(jsx => {
         if (jsx) {
-          setSubCommandJSX(jsx)
+          setSubCommandJSX(jsx);
         }
-      })
+      });
     } else if (value === 'cancel') {
-      handleCancel()
+      handleCancel();
     }
   }
 
   if (subCommandJSX) {
-    return subCommandJSX
+    return subCommandJSX;
   }
 
   return (
-    <Dialog
-      title="What do you want to do?"
-      onCancel={handleCancel}
-      color="suggestion"
-    >
+    <Dialog title="What do you want to do?" onCancel={handleCancel} color="suggestion">
       <Select<RateLimitOptionsMenuOptionType>
         options={options}
         onChange={handleSelect}
         visibleOptionCount={options.length}
       />
     </Dialog>
-  )
+  );
 }
 
 export async function call(
   onDone: LocalJSXCommandOnDone,
   context: ToolUseContext & LocalJSXCommandContext,
 ): Promise<React.ReactNode> {
-  return <RateLimitOptionsMenu onDone={onDone} context={context} />
+  return <RateLimitOptionsMenu onDone={onDone} context={context} />;
 }
diff --git a/src/commands/remote-env/remote-env.tsx b/src/commands/remote-env/remote-env.tsx
index 1c5f3feb6..f08a37a09 100644
--- a/src/commands/remote-env/remote-env.tsx
+++ b/src/commands/remote-env/remote-env.tsx
@@ -1,9 +1,7 @@
-import * as React from 'react'
-import { RemoteEnvironmentDialog } from '../../components/RemoteEnvironmentDialog.js'
-import type { LocalJSXCommandOnDone } from '../../types/command.js'
+import * as React from 'react';
+import { RemoteEnvironmentDialog } from '../../components/RemoteEnvironmentDialog.js';
+import type { LocalJSXCommandOnDone } from '../../types/command.js';
 
-export async function call(
-  onDone: LocalJSXCommandOnDone,
-): Promise<React.ReactNode> {
-  return <RemoteEnvironmentDialog onDone={onDone} />
+export async function call(onDone: LocalJSXCommandOnDone): Promise<React.ReactNode> {
+  return <RemoteEnvironmentDialog onDone={onDone} />;
 }
diff --git a/src/commands/remote-setup/remote-setup.tsx b/src/commands/remote-setup/remote-setup.tsx
index 3a68f2908..e1d42740c 100644
--- a/src/commands/remote-setup/remote-setup.tsx
+++ b/src/commands/remote-setup/remote-setup.tsx
@@ -1,15 +1,15 @@
-import { execa } from 'execa'
-import * as React from 'react'
-import { useEffect, useState } from 'react'
-import { Select } from '../../components/CustomSelect/index.js'
-import { Box, Dialog, LoadingState, Text } from '@anthropic/ink'
+import { execa } from 'execa';
+import * as React from 'react';
+import { useEffect, useState } from 'react';
+import { Select } from '../../components/CustomSelect/index.js';
+import { Box, Dialog, LoadingState, Text } from '@anthropic/ink';
 import {
   logEvent,
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS as SafeString,
-} from '../../services/analytics/index.js'
-import type { LocalJSXCommandOnDone } from '../../types/command.js'
-import { openBrowser } from '../../utils/browser.js'
-import { getGhAuthStatus } from '../../utils/github/ghAuthStatus.js'
+} from '../../services/analytics/index.js';
+import type { LocalJSXCommandOnDone } from '../../types/command.js';
+import { openBrowser } from '../../utils/browser.js';
+import { getGhAuthStatus } from '../../utils/github/ghAuthStatus.js';
 import {
   createDefaultEnvironment,
   getCodeWebUrl,
@@ -17,25 +17,25 @@ import {
   importGithubToken,
   isSignedIn,
   RedactedGithubToken,
-} from './api.js'
+} from './api.js';
 
 type CheckResult =
   | { status: 'not_signed_in' }
   | { status: 'has_gh_token'; token: RedactedGithubToken }
   | { status: 'gh_not_installed' }
-  | { status: 'gh_not_authenticated' }
+  | { status: 'gh_not_authenticated' };
 
 async function checkLoginState(): Promise<CheckResult> {
   if (!(await isSignedIn())) {
-    return { status: 'not_signed_in' }
+    return { status: 'not_signed_in' };
   }
 
-  const ghStatus = await getGhAuthStatus()
+  const ghStatus = await getGhAuthStatus();
   if (ghStatus === 'not_installed') {
-    return { status: 'gh_not_installed' }
+    return { status: 'gh_not_installed' };
   }
   if (ghStatus === 'not_authenticated') {
-    return { status: 'gh_not_authenticated' }
+    return { status: 'gh_not_authenticated' };
   }
 
   // ghStatus === 'authenticated'. getGhAuthStatus spawns with stdout:'ignore'
@@ -45,125 +45,113 @@ async function checkLoginState(): Promise<CheckResult> {
     stderr: 'ignore',
     timeout: 5000,
     reject: false,
-  })
-  const trimmed = stdout.trim()
+  });
+  const trimmed = stdout.trim();
   if (!trimmed) {
-    return { status: 'gh_not_authenticated' }
+    return { status: 'gh_not_authenticated' };
   }
-  return { status: 'has_gh_token', token: new RedactedGithubToken(trimmed) }
+  return { status: 'has_gh_token', token: new RedactedGithubToken(trimmed) };
 }
 
 function errorMessage(err: ImportTokenError, codeUrl: string): string {
   switch (err.kind) {
     case 'not_signed_in':
-      return `Login failed. Please visit ${codeUrl} and login using the GitHub App`
+      return `Login failed. Please visit ${codeUrl} and login using the GitHub App`;
     case 'invalid_token':
-      return 'GitHub rejected that token. Run `gh auth login` and try again.'
+      return 'GitHub rejected that token. Run `gh auth login` and try again.';
     case 'server':
-      return `Server error (${err.status}). Try again in a moment.`
+      return `Server error (${err.status}). Try again in a moment.`;
     case 'network':
-      return "Couldn't reach the server. Check your connection."
+      return "Couldn't reach the server. Check your connection.";
   }
 }
 
-type Step =
-  | { name: 'checking' }
-  | { name: 'confirm'; token: RedactedGithubToken }
-  | { name: 'uploading' }
+type Step = { name: 'checking' } | { name: 'confirm'; token: RedactedGithubToken } | { name: 'uploading' };
 
 function Web({ onDone }: { onDone: LocalJSXCommandOnDone }) {
-  const [step, setStep] = useState<Step>({ name: 'checking' })
+  const [step, setStep] = useState<Step>({ name: 'checking' });
 
   useEffect(() => {
-    logEvent('tengu_remote_setup_started', {})
+    logEvent('tengu_remote_setup_started', {});
     void checkLoginState().then(async result => {
       switch (result.status) {
         case 'not_signed_in':
           logEvent('tengu_remote_setup_result', {
             result: 'not_signed_in' as SafeString,
-          })
-          onDone('Not signed in to Claude. Run /login first.')
-          return
+          });
+          onDone('Not signed in to Claude. Run /login first.');
+          return;
         case 'gh_not_installed':
         case 'gh_not_authenticated': {
-          const url = `${getCodeWebUrl()}/onboarding?step=alt-auth`
-          await openBrowser(url)
+          const url = `${getCodeWebUrl()}/onboarding?step=alt-auth`;
+          await openBrowser(url);
           logEvent('tengu_remote_setup_result', {
             result: result.status as SafeString,
-          })
+          });
           onDone(
             result.status === 'gh_not_installed'
               ? `GitHub CLI not found. Install it via https://cli.github.com/, then run \`gh auth login\`, or connect GitHub on the web: ${url}`
               : `GitHub CLI not authenticated. Run \`gh auth login\` and try again, or connect GitHub on the web: ${url}`,
-          )
-          return
+          );
+          return;
         }
         case 'has_gh_token':
-          setStep({ name: 'confirm', token: result.token })
+          setStep({ name: 'confirm', token: result.token });
       }
-    })
+    });
     // onDone is stable across renders; intentionally not in deps.
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [])
+  }, []);
 
   const handleCancel = () => {
     logEvent('tengu_remote_setup_result', {
       result: 'cancelled' as SafeString,
-    })
-    onDone()
-  }
+    });
+    onDone();
+  };
 
   const handleConfirm = async (token: RedactedGithubToken) => {
-    setStep({ name: 'uploading' })
+    setStep({ name: 'uploading' });
 
-    const result = await importGithubToken(token)
+    const result = await importGithubToken(token);
     if (!result.ok) {
-      const err = (result as { ok: false; error: ImportTokenError }).error
+      const err = (result as { ok: false; error: ImportTokenError }).error;
       logEvent('tengu_remote_setup_result', {
         result: 'import_failed' as SafeString,
         error_kind: err.kind as SafeString,
-      })
-      onDone(errorMessage(err, getCodeWebUrl()))
-      return
+      });
+      onDone(errorMessage(err, getCodeWebUrl()));
+      return;
     }
 
     // Token import succeeded. Environment creation is best-effort — if it
     // fails, the web state machine routes to env-setup on landing, which is
     // one extra click but still better than the OAuth dance.
-    await createDefaultEnvironment()
+    await createDefaultEnvironment();
 
-    const url = getCodeWebUrl()
-    await openBrowser(url)
+    const url = getCodeWebUrl();
+    await openBrowser(url);
 
     logEvent('tengu_remote_setup_result', {
       result: 'success' as SafeString,
-    })
-    onDone(`Connected as ${result.result.github_username}. Opened ${url}`)
-  }
+    });
+    onDone(`Connected as ${result.result.github_username}. Opened ${url}`);
+  };
 
   if (step.name === 'checking') {
-    return <LoadingState message="Checking login status…" />
+    return <LoadingState message="Checking login status…" />;
   }
 
   if (step.name === 'uploading') {
-    return <LoadingState message="Connecting GitHub to Claude…" />
+    return <LoadingState message="Connecting GitHub to Claude…" />;
   }
 
-  const token = step.token
+  const token = step.token;
   return (
-    <Dialog
-      title="Connect Claude on the web to GitHub?"
-      onCancel={handleCancel}
-      hideInputGuide
-    >
+    <Dialog title="Connect Claude on the web to GitHub?" onCancel={handleCancel} hideInputGuide>
       <Box flexDirection="column">
-        <Text>
-          Claude on the web requires connecting to your GitHub account to clone
-          and push code on your behalf.
-        </Text>
-        <Text dimColor>
-          Your local credentials are used to authenticate with GitHub
-        </Text>
+        <Text>Claude on the web requires connecting to your GitHub account to clone and push code on your behalf.</Text>
+        <Text dimColor>Your local credentials are used to authenticate with GitHub</Text>
       </Box>
       <Select
         options={[
@@ -172,19 +160,17 @@ function Web({ onDone }: { onDone: LocalJSXCommandOnDone }) {
         ]}
         onChange={value => {
           if (value === 'send') {
-            void handleConfirm(token)
+            void handleConfirm(token);
           } else {
-            handleCancel()
+            handleCancel();
           }
         }}
         onCancel={handleCancel}
       />
     </Dialog>
-  )
+  );
 }
 
-export async function call(
-  onDone: LocalJSXCommandOnDone,
-): Promise<React.ReactNode> {
-  return <Web onDone={onDone} />
+export async function call(onDone: LocalJSXCommandOnDone): Promise<React.ReactNode> {
+  return <Web onDone={onDone} />;
 }
diff --git a/src/commands/rename/generateSessionName.ts b/src/commands/rename/generateSessionName.ts
index d369d0604..31e1a7885 100644
--- a/src/commands/rename/generateSessionName.ts
+++ b/src/commands/rename/generateSessionName.ts
@@ -43,7 +43,9 @@ export async function generateSessionName(
       },
     })
 
-    const content = Array.isArray(result.message.content) ? extractTextContent(result.message.content) : (result.message.content as string)
+    const content = Array.isArray(result.message.content)
+      ? extractTextContent(result.message.content)
+      : (result.message.content as string)
 
     const response = safeParseJSON(content)
     if (
diff --git a/src/commands/reset-limits/index.ts b/src/commands/reset-limits/index.ts
index 1b034263a..1e6cb2ce8 100644
--- a/src/commands/reset-limits/index.ts
+++ b/src/commands/reset-limits/index.ts
@@ -1,4 +1,4 @@
 // Auto-generated stub — replace with real implementation
-const stub = { isEnabled: () => false, isHidden: true, name: 'stub' };
-export const resetLimits = stub;
-export const resetLimitsNonInteractive = stub;
+const stub = { isEnabled: () => false, isHidden: true, name: 'stub' }
+export const resetLimits = stub
+export const resetLimitsNonInteractive = stub
diff --git a/src/commands/resume/resume.tsx b/src/commands/resume/resume.tsx
index dbfb7f96a..406ca81ec 100644
--- a/src/commands/resume/resume.tsx
+++ b/src/commands/resume/resume.tsx
@@ -1,22 +1,22 @@
-import chalk from 'chalk'
-import type { UUID } from 'crypto'
-import figures from 'figures'
-import * as React from 'react'
-import { getOriginalCwd, getSessionId } from '../../bootstrap/state.js'
-import type { CommandResultDisplay, ResumeEntrypoint } from '../../commands.js'
-import { LogSelector } from '../../components/LogSelector.js'
-import { MessageResponse } from '../../components/MessageResponse.js'
-import { Spinner } from '../../components/Spinner.js'
-import { useIsInsideModal } from '../../context/modalContext.js'
-import { useTerminalSize } from '../../hooks/useTerminalSize.js'
-import { setClipboard } from '@anthropic/ink'
-import { Box, Text } from '@anthropic/ink'
-import type { LocalJSXCommandCall } from '../../types/command.js'
-import type { LogOption } from '../../types/logs.js'
-import { agenticSessionSearch } from '../../utils/agenticSessionSearch.js'
-import { checkCrossProjectResume } from '../../utils/crossProjectResume.js'
-import { getWorktreePaths } from '../../utils/getWorktreePaths.js'
-import { logError } from '../../utils/log.js'
+import chalk from 'chalk';
+import type { UUID } from 'crypto';
+import figures from 'figures';
+import * as React from 'react';
+import { getOriginalCwd, getSessionId } from '../../bootstrap/state.js';
+import type { CommandResultDisplay, ResumeEntrypoint } from '../../commands.js';
+import { LogSelector } from '../../components/LogSelector.js';
+import { MessageResponse } from '../../components/MessageResponse.js';
+import { Spinner } from '../../components/Spinner.js';
+import { useIsInsideModal } from '../../context/modalContext.js';
+import { useTerminalSize } from '../../hooks/useTerminalSize.js';
+import { setClipboard } from '@anthropic/ink';
+import { Box, Text } from '@anthropic/ink';
+import type { LocalJSXCommandCall } from '../../types/command.js';
+import type { LogOption } from '../../types/logs.js';
+import { agenticSessionSearch } from '../../utils/agenticSessionSearch.js';
+import { checkCrossProjectResume } from '../../utils/crossProjectResume.js';
+import { getWorktreePaths } from '../../utils/getWorktreePaths.js';
+import { logError } from '../../utils/log.js';
 import {
   getLastSessionLog,
   getSessionIdFromLog,
@@ -26,19 +26,19 @@ import {
   loadFullLog,
   loadSameRepoMessageLogs,
   searchSessionsByCustomTitle,
-} from '../../utils/sessionStorage.js'
-import { validateUuid } from '../../utils/uuid.js'
+} from '../../utils/sessionStorage.js';
+import { validateUuid } from '../../utils/uuid.js';
 
 type ResumeResult =
   | { resultType: 'sessionNotFound'; arg: string }
-  | { resultType: 'multipleMatches'; arg: string; count: number }
+  | { resultType: 'multipleMatches'; arg: string; count: number };
 
 function resumeHelpMessage(result: ResumeResult): string {
   switch (result.resultType) {
     case 'sessionNotFound':
-      return `Session ${chalk.bold(result.arg)} was not found.`
+      return `Session ${chalk.bold(result.arg)} was not found.`;
     case 'multipleMatches':
-      return `Found ${result.count} sessions matching ${chalk.bold(result.arg)}. Please use /resume to pick a specific session.`
+      return `Found ${result.count} sessions matching ${chalk.bold(result.arg)}. Please use /resume to pick a specific session.`;
   }
 }
 
@@ -47,14 +47,14 @@ function ResumeError({
   args,
   onDone,
 }: {
-  message: string
-  args: string
-  onDone: () => void
+  message: string;
+  args: string;
+  onDone: () => void;
 }): React.ReactNode {
   React.useEffect(() => {
-    const timer = setTimeout(onDone, 0)
-    return () => clearTimeout(timer)
-  }, [onDone])
+    const timer = setTimeout(onDone, 0);
+    return () => clearTimeout(timer);
+  }, [onDone]);
 
   return (
     <Box flexDirection="column">
@@ -65,95 +65,82 @@ function ResumeError({
         <Text>{message}</Text>
       </MessageResponse>
     </Box>
-  )
+  );
 }
 
 function ResumeCommand({
   onDone,
   onResume,
 }: {
-  onDone: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-  onResume: (
-    sessionId: UUID,
-    log: LogOption,
-    entrypoint: ResumeEntrypoint,
-  ) => Promise<void>
+  onDone: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+  onResume: (sessionId: UUID, log: LogOption, entrypoint: ResumeEntrypoint) => Promise<void>;
 }): React.ReactNode {
-  const [logs, setLogs] = React.useState<LogOption[]>([])
-  const [worktreePaths, setWorktreePaths] = React.useState<string[]>([])
-  const [loading, setLoading] = React.useState(true)
-  const [resuming, setResuming] = React.useState(false)
-  const [showAllProjects, setShowAllProjects] = React.useState(false)
-  const { rows } = useTerminalSize()
-  const insideModal = useIsInsideModal()
+  const [logs, setLogs] = React.useState<LogOption[]>([]);
+  const [worktreePaths, setWorktreePaths] = React.useState<string[]>([]);
+  const [loading, setLoading] = React.useState(true);
+  const [resuming, setResuming] = React.useState(false);
+  const [showAllProjects, setShowAllProjects] = React.useState(false);
+  const { rows } = useTerminalSize();
+  const insideModal = useIsInsideModal();
 
   const loadLogs = React.useCallback(
     async (allProjects: boolean, paths: string[]) => {
-      setLoading(true)
+      setLoading(true);
       try {
-        const allLogs = allProjects
-          ? await loadAllProjectsMessageLogs()
-          : await loadSameRepoMessageLogs(paths)
-        const resumable = filterResumableSessions(allLogs, getSessionId())
+        const allLogs = allProjects ? await loadAllProjectsMessageLogs() : await loadSameRepoMessageLogs(paths);
+        const resumable = filterResumableSessions(allLogs, getSessionId());
         if (resumable.length === 0) {
-          onDone('No conversations found to resume')
-          return
+          onDone('No conversations found to resume');
+          return;
         }
-        setLogs(resumable)
+        setLogs(resumable);
       } catch (_err) {
-        onDone('Failed to load conversations')
+        onDone('Failed to load conversations');
       } finally {
-        setLoading(false)
+        setLoading(false);
       }
     },
     [onDone],
-  )
+  );
 
   React.useEffect(() => {
     async function init() {
-      const paths = await getWorktreePaths(getOriginalCwd())
-      setWorktreePaths(paths)
-      void loadLogs(false, paths)
+      const paths = await getWorktreePaths(getOriginalCwd());
+      setWorktreePaths(paths);
+      void loadLogs(false, paths);
     }
-    void init()
-  }, [loadLogs])
+    void init();
+  }, [loadLogs]);
 
   const handleToggleAllProjects = React.useCallback(() => {
-    const newValue = !showAllProjects
-    setShowAllProjects(newValue)
-    void loadLogs(newValue, worktreePaths)
-  }, [showAllProjects, loadLogs, worktreePaths])
+    const newValue = !showAllProjects;
+    setShowAllProjects(newValue);
+    void loadLogs(newValue, worktreePaths);
+  }, [showAllProjects, loadLogs, worktreePaths]);
 
   async function handleSelect(log: LogOption) {
-    const sessionId = validateUuid(getSessionIdFromLog(log))
+    const sessionId = validateUuid(getSessionIdFromLog(log));
     if (!sessionId) {
-      onDone('Failed to resume conversation')
-      return
+      onDone('Failed to resume conversation');
+      return;
     }
 
     // Load full messages for lite logs
-    const fullLog = isLiteLog(log) ? await loadFullLog(log) : log
+    const fullLog = isLiteLog(log) ? await loadFullLog(log) : log;
 
     // Check if this conversation is from a different directory
-    const crossProjectCheck = checkCrossProjectResume(
-      fullLog,
-      showAllProjects,
-      worktreePaths,
-    )
+    const crossProjectCheck = checkCrossProjectResume(fullLog, showAllProjects, worktreePaths);
     if (crossProjectCheck.isCrossProject) {
       if (crossProjectCheck.isSameRepoWorktree) {
         // Same repo worktree - can resume directly
-        setResuming(true)
-        void onResume(sessionId, fullLog, 'slash_command_picker')
-        return
+        setResuming(true);
+        void onResume(sessionId, fullLog, 'slash_command_picker');
+        return;
       }
 
       // Different project - show command instead of resuming
-      const raw = await setClipboard((crossProjectCheck as { command: string }).command)
-      if (raw) process.stdout.write(raw)
+      const raw = await setClipboard((crossProjectCheck as { command: string }).command);
+      if (raw) process.stdout.write(raw);
 
       // Format the output message
       const message = [
@@ -165,19 +152,19 @@ function ResumeCommand({
         '',
         '(Command copied to clipboard)',
         '',
-      ].join('\n')
+      ].join('\n');
 
-      onDone(message, { display: 'user' })
-      return
+      onDone(message, { display: 'user' });
+      return;
     }
 
     // Same directory - proceed with resume
-    setResuming(true)
-    void onResume(sessionId, fullLog, 'slash_command_picker')
+    setResuming(true);
+    void onResume(sessionId, fullLog, 'slash_command_picker');
   }
 
   function handleCancel() {
-    onDone('Resume cancelled', { display: 'system' })
+    onDone('Resume cancelled', { display: 'system' });
   }
 
   if (loading) {
@@ -186,7 +173,7 @@ function ResumeCommand({
         <Spinner />
         <Text> Loading conversations…</Text>
       </Box>
-    )
+    );
   }
 
   if (resuming) {
@@ -195,7 +182,7 @@ function ResumeCommand({
         <Spinner />
         <Text> Resuming conversation…</Text>
       </Box>
-    )
+    );
   }
 
   return (
@@ -209,77 +196,60 @@ function ResumeCommand({
       onToggleAllProjects={handleToggleAllProjects}
       onAgenticSearch={agenticSessionSearch}
     />
-  )
+  );
 }
 
-export function filterResumableSessions(
-  logs: LogOption[],
-  currentSessionId: string,
-): LogOption[] {
-  return logs.filter(
-    l => !l.isSidechain && getSessionIdFromLog(l) !== currentSessionId,
-  )
+export function filterResumableSessions(logs: LogOption[], currentSessionId: string): LogOption[] {
+  return logs.filter(l => !l.isSidechain && getSessionIdFromLog(l) !== currentSessionId);
 }
 
 export const call: LocalJSXCommandCall = async (onDone, context, args) => {
-  const onResume = async (
-    sessionId: UUID,
-    log: LogOption,
-    entrypoint: ResumeEntrypoint,
-  ) => {
+  const onResume = async (sessionId: UUID, log: LogOption, entrypoint: ResumeEntrypoint) => {
     try {
-      await context.resume?.(sessionId, log, entrypoint)
-      onDone(undefined, { display: 'skip' })
+      await context.resume?.(sessionId, log, entrypoint);
+      onDone(undefined, { display: 'skip' });
     } catch (error) {
-      logError(error as Error)
-      onDone(`Failed to resume: ${(error as Error).message}`)
+      logError(error as Error);
+      onDone(`Failed to resume: ${(error as Error).message}`);
     }
-  }
+  };
 
-  const arg = args?.trim()
+  const arg = args?.trim();
 
   // No argument provided - show picker
   if (!arg) {
-    return (
-      <ResumeCommand key={Date.now()} onDone={onDone} onResume={onResume} />
-    )
+    return <ResumeCommand key={Date.now()} onDone={onDone} onResume={onResume} />;
   }
 
   // Load logs to search (includes same-repo worktrees)
-  const worktreePaths = await getWorktreePaths(getOriginalCwd())
-  const logs = await loadSameRepoMessageLogs(worktreePaths)
+  const worktreePaths = await getWorktreePaths(getOriginalCwd());
+  const logs = await loadSameRepoMessageLogs(worktreePaths);
   if (logs.length === 0) {
-    const message = 'No conversations found to resume.'
-    return (
-      <ResumeError
-        message={message}
-        args={arg}
-        onDone={() => onDone(message)}
-      />
-    )
+    const message = 'No conversations found to resume.';
+    return <ResumeError message={message} args={arg} onDone={() => onDone(message)} />;
   }
 
   // First, check if arg is a valid UUID
-  const maybeSessionId = validateUuid(arg)
+  const maybeSessionId = validateUuid(arg);
   if (maybeSessionId) {
     const matchingLogs = logs
       .filter(l => getSessionIdFromLog(l) === maybeSessionId)
-      .sort((a, b) => b.modified.getTime() - a.modified.getTime())
+      .sort((a, b) => b.modified.getTime() - a.modified.getTime());
 
     if (matchingLogs.length > 0) {
-      const log = matchingLogs[0]!
-      const fullLog = isLiteLog(log) ? await loadFullLog(log) : log
-      void onResume(maybeSessionId, fullLog, 'slash_command_session_id')
-      return null
+      const log = matchingLogs[0]!;
+      const fullLog = isLiteLog(log) ? await loadFullLog(log) : log;
+      void onResume(maybeSessionId, fullLog, 'slash_command_session_id');
+      return null;
     }
 
     // Enriched logs didn't find it — try direct file lookup. This handles
     // sessions filtered out by enrichLogs (e.g., first message >16KB makes
     // firstPrompt extraction fail, causing the session to be dropped).
-    const directLog = await getLastSessionLog(maybeSessionId)
+    const directLog = await getLastSessionLog(maybeSessionId);
     if (directLog) {
-      void onResume(maybeSessionId, directLog, 'slash_command_session_id')
-      return null
+      void onResume(maybeSessionId, directLog, 'slash_command_session_id');
+      return null;
     }
   }
 
@@ -287,14 +257,14 @@ export const call: LocalJSXCommandCall = async (onDone, context, args) => {
   if (isCustomTitleEnabled()) {
     const titleMatches = await searchSessionsByCustomTitle(arg, {
       exact: true,
-    })
+    });
     if (titleMatches.length === 1) {
-      const log = titleMatches[0]!
-      const sessionId = getSessionIdFromLog(log)
+      const log = titleMatches[0]!;
+      const sessionId = getSessionIdFromLog(log);
       if (sessionId) {
-        const fullLog = isLiteLog(log) ? await loadFullLog(log) : log
-        void onResume(sessionId, fullLog, 'slash_command_title')
-        return null
+        const fullLog = isLiteLog(log) ? await loadFullLog(log) : log;
+        void onResume(sessionId, fullLog, 'slash_command_title');
+        return null;
       }
     }
 
@@ -304,20 +274,12 @@ export const call: LocalJSXCommandCall = async (onDone, context, args) => {
         resultType: 'multipleMatches',
         arg,
         count: titleMatches.length,
-      })
-      return (
-        <ResumeError
-          message={message}
-          args={arg}
-          onDone={() => onDone(message)}
-        />
-      )
+      });
+      return <ResumeError message={message} args={arg} onDone={() => onDone(message)} />;
     }
   }
 
   // No match found - show error
-  const message = resumeHelpMessage({ resultType: 'sessionNotFound', arg })
-  return (
-    <ResumeError message={message} args={arg} onDone={() => onDone(message)} />
-  )
-}
+  const message = resumeHelpMessage({ resultType: 'sessionNotFound', arg });
+  return <ResumeError message={message} args={arg} onDone={() => onDone(message)} />;
+};
diff --git a/src/commands/review/UltrareviewOverageDialog.tsx b/src/commands/review/UltrareviewOverageDialog.tsx
index 12ea10429..5d3b304b3 100644
--- a/src/commands/review/UltrareviewOverageDialog.tsx
+++ b/src/commands/review/UltrareviewOverageDialog.tsx
@@ -1,70 +1,56 @@
-import React, { useCallback, useRef, useState } from 'react'
-import { Select } from '../../components/CustomSelect/select.js'
-import { Box, Dialog, Text } from '@anthropic/ink'
+import React, { useCallback, useRef, useState } from 'react';
+import { Select } from '../../components/CustomSelect/select.js';
+import { Box, Dialog, Text } from '@anthropic/ink';
 
 type Props = {
-  onProceed: (signal: AbortSignal) => Promise<void>
-  onCancel: () => void
-}
+  onProceed: (signal: AbortSignal) => Promise<void>;
+  onCancel: () => void;
+};
 
-export function UltrareviewOverageDialog({
-  onProceed,
-  onCancel,
-}: Props): React.ReactNode {
-  const [isLaunching, setIsLaunching] = useState(false)
-  const abortControllerRef = useRef(new AbortController())
+export function UltrareviewOverageDialog({ onProceed, onCancel }: Props): React.ReactNode {
+  const [isLaunching, setIsLaunching] = useState(false);
+  const abortControllerRef = useRef(new AbortController());
 
   const handleSelect = useCallback(
     (value: string) => {
       if (value === 'proceed') {
-        setIsLaunching(true)
+        setIsLaunching(true);
         // If onProceed rejects (e.g. launchRemoteReview throws), onDone is
         // never called and the dialog stays mounted — restore the Select so
         // the user can retry or cancel instead of staring at "Launching…".
-        void onProceed(abortControllerRef.current.signal).catch(() =>
-          setIsLaunching(false),
-        )
+        void onProceed(abortControllerRef.current.signal).catch(() => setIsLaunching(false));
       } else {
-        onCancel()
+        onCancel();
       }
     },
     [onProceed, onCancel],
-  )
+  );
 
   // Escape during launch aborts the in-flight onProceed via signal so the
   // caller can skip side effects (confirmOverage, onDone) — otherwise a
   // fire-and-forget launch would keep running and bill despite "cancelled".
   const handleCancel = useCallback(() => {
-    abortControllerRef.current.abort()
-    onCancel()
-  }, [onCancel])
+    abortControllerRef.current.abort();
+    onCancel();
+  }, [onCancel]);
 
   const options = [
     { label: 'Proceed with Extra Usage billing', value: 'proceed' },
     { label: 'Cancel', value: 'cancel' },
-  ]
+  ];
 
   return (
-    <Dialog
-      title="Ultrareview billing"
-      onCancel={handleCancel}
-      color="background"
-    >
+    <Dialog title="Ultrareview billing" onCancel={handleCancel} color="background">
       <Box flexDirection="column" gap={1}>
         <Text>
-          Your free ultrareviews for this organization are used. Further reviews
-          bill as Extra Usage (pay-per-use).
+          Your free ultrareviews for this organization are used. Further reviews bill as Extra Usage (pay-per-use).
         </Text>
         {isLaunching ? (
           <Text color="background">Launching…</Text>
         ) : (
-          <Select
-            options={options}
-            onChange={handleSelect}
-            onCancel={handleCancel}
-          />
+          <Select options={options} onChange={handleSelect} onCancel={handleCancel} />
         )}
       </Box>
     </Dialog>
-  )
+  );
 }
diff --git a/src/commands/review/reviewRemote.ts b/src/commands/review/reviewRemote.ts
index 23d3943ef..c440713aa 100644
--- a/src/commands/review/reviewRemote.ts
+++ b/src/commands/review/reviewRemote.ts
@@ -137,9 +137,9 @@ export async function launchRemoteReview(
   // consume at session creation routes billing: first N zero-rate, then
   // anthropic:cccr org-service-key (overage-only).
   if (!eligibility.eligible) {
-    const blockers = (eligibility as { eligible: false; errors: Array<{ type: string }> }).errors.filter(
-      e => e.type !== 'no_remote_environment',
-    )
+    const blockers = (
+      eligibility as { eligible: false; errors: Array<{ type: string }> }
+    ).errors.filter(e => e.type !== 'no_remote_environment')
     if (blockers.length > 0) {
       logEvent('tengu_review_remote_precondition_failed', {
         precondition_errors: blockers
@@ -148,7 +148,9 @@ export async function launchRemoteReview(
             ',',
           ) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
       })
-      const reasons = (blockers as BackgroundRemoteSessionPrecondition[]).map(formatPreconditionError).join('\n')
+      const reasons = (blockers as BackgroundRemoteSessionPrecondition[])
+        .map(formatPreconditionError)
+        .join('\n')
       return [
         {
           type: 'text',
diff --git a/src/commands/review/ultrareviewCommand.tsx b/src/commands/review/ultrareviewCommand.tsx
index faad0fc2f..ab1004dcc 100644
--- a/src/commands/review/ultrareviewCommand.tsx
+++ b/src/commands/review/ultrareviewCommand.tsx
@@ -1,21 +1,14 @@
-import type { ContentBlockParam } from '@anthropic-ai/sdk/resources/messages.js'
-import React from 'react'
-import type {
-  LocalJSXCommandCall,
-  LocalJSXCommandOnDone,
-} from '../../types/command.js'
-import {
-  checkOverageGate,
-  confirmOverage,
-  launchRemoteReview,
-} from './reviewRemote.js'
-import { UltrareviewOverageDialog } from './UltrareviewOverageDialog.js'
+import type { ContentBlockParam } from '@anthropic-ai/sdk/resources/messages.js';
+import React from 'react';
+import type { LocalJSXCommandCall, LocalJSXCommandOnDone } from '../../types/command.js';
+import { checkOverageGate, confirmOverage, launchRemoteReview } from './reviewRemote.js';
+import { UltrareviewOverageDialog } from './UltrareviewOverageDialog.js';
 
 function contentBlocksToString(blocks: ContentBlockParam[]): string {
   return blocks
     .map(b => (b.type === 'text' ? b.text : ''))
     .filter(Boolean)
-    .join('\n')
+    .join('\n');
 }
 
 async function launchAndDone(
@@ -25,65 +18,57 @@ async function launchAndDone(
   billingNote: string,
   signal?: AbortSignal,
 ): Promise<void> {
-  const result = await launchRemoteReview(args, context, billingNote)
+  const result = await launchRemoteReview(args, context, billingNote);
   // User hit Escape during the ~5s launch — the dialog already showed
   // "cancelled" and unmounted, so skip onDone (would write to a dead
   // transcript slot) and let the caller skip confirmOverage.
-  if (signal?.aborted) return
+  if (signal?.aborted) return;
   if (result) {
-    onDone(contentBlocksToString(result), { shouldQuery: true })
+    onDone(contentBlocksToString(result), { shouldQuery: true });
   } else {
     // Precondition failures now return specific ContentBlockParam[] above.
     // null only reaches here on teleport failure (PR mode) or non-github
     // repo — both are CCR/repo connectivity issues.
-    onDone(
-      'Ultrareview failed to launch the remote session. Check that this is a GitHub repo and try again.',
-      { display: 'system' },
-    )
+    onDone('Ultrareview failed to launch the remote session. Check that this is a GitHub repo and try again.', {
+      display: 'system',
+    });
   }
 }
 
 export const call: LocalJSXCommandCall = async (onDone, context, args) => {
-  const gate = await checkOverageGate()
+  const gate = await checkOverageGate();
 
   if (gate.kind === 'not-enabled') {
-    onDone(
-      'Free ultrareviews used. Enable Extra Usage at https://claude.ai/settings/billing to continue.',
-      { display: 'system' },
-    )
-    return null
+    onDone('Free ultrareviews used. Enable Extra Usage at https://claude.ai/settings/billing to continue.', {
+      display: 'system',
+    });
+    return null;
   }
 
   if (gate.kind === 'low-balance') {
     onDone(
       `Balance too low to launch ultrareview ($${gate.available.toFixed(2)} available, $10 minimum). Top up at https://claude.ai/settings/billing`,
       { display: 'system' },
-    )
-    return null
+    );
+    return null;
   }
 
   if (gate.kind === 'needs-confirm') {
     return (
       <UltrareviewOverageDialog
         onProceed={async signal => {
-          await launchAndDone(
-            args,
-            context,
-            onDone,
-            ' This review bills as Extra Usage.',
-            signal,
-          )
+          await launchAndDone(args, context, onDone, ' This review bills as Extra Usage.', signal);
           // Only persist the confirmation flag after a non-aborted launch —
           // otherwise Escape-during-launch would leave the flag set and
           // skip this dialog on the next attempt.
-          if (!signal.aborted) confirmOverage()
+          if (!signal.aborted) confirmOverage();
         }}
         onCancel={() => onDone('Ultrareview cancelled.', { display: 'system' })}
       />
-    )
+    );
   }
 
   // gate.kind === 'proceed'
-  await launchAndDone(args, context, onDone, gate.billingNote)
-  return null
-}
+  await launchAndDone(args, context, onDone, gate.billingNote);
+  return null;
+};
diff --git a/src/commands/sandbox-toggle/sandbox-toggle.tsx b/src/commands/sandbox-toggle/sandbox-toggle.tsx
index 5f8d46097..a41e6d946 100644
--- a/src/commands/sandbox-toggle/sandbox-toggle.tsx
+++ b/src/commands/sandbox-toggle/sandbox-toggle.tsx
@@ -1,53 +1,45 @@
-import { relative } from 'path'
-import React from 'react'
-import { getCwdState } from '../../bootstrap/state.js'
-import { SandboxSettings } from '../../components/sandbox/SandboxSettings.js'
-import { color } from '@anthropic/ink'
-import { getPlatform } from '../../utils/platform.js'
-import {
-  addToExcludedCommands,
-  SandboxManager,
-} from '../../utils/sandbox/sandbox-adapter.js'
-import {
-  getSettings_DEPRECATED,
-  getSettingsFilePathForSource,
-} from '../../utils/settings/settings.js'
-import type { ThemeName } from '../../utils/theme.js'
+import { relative } from 'path';
+import React from 'react';
+import { getCwdState } from '../../bootstrap/state.js';
+import { SandboxSettings } from '../../components/sandbox/SandboxSettings.js';
+import { color } from '@anthropic/ink';
+import { getPlatform } from '../../utils/platform.js';
+import { addToExcludedCommands, SandboxManager } from '../../utils/sandbox/sandbox-adapter.js';
+import { getSettings_DEPRECATED, getSettingsFilePathForSource } from '../../utils/settings/settings.js';
+import type { ThemeName } from '../../utils/theme.js';
 
 export async function call(
   onDone: (result?: string) => void,
   _context: unknown,
   args?: string,
 ): Promise<React.ReactNode | null> {
-  const settings = getSettings_DEPRECATED()
-  const themeName: ThemeName = (settings.theme as ThemeName) || 'light'
+  const settings = getSettings_DEPRECATED();
+  const themeName: ThemeName = (settings.theme as ThemeName) || 'light';
 
-  const platform = getPlatform()
+  const platform = getPlatform();
 
   if (!SandboxManager.isSupportedPlatform()) {
     // WSL1 users will see this since isSupportedPlatform returns false for WSL1
     const errorMessage =
       platform === 'wsl'
         ? 'Error: Sandboxing requires WSL2. WSL1 is not supported.'
-        : 'Error: Sandboxing is currently only supported on macOS, Linux, and WSL2.'
-    const message = color('error', themeName)(errorMessage)
-    onDone(message)
-    return null
+        : 'Error: Sandboxing is currently only supported on macOS, Linux, and WSL2.';
+    const message = color('error', themeName)(errorMessage);
+    onDone(message);
+    return null;
   }
 
   // Check dependencies - get structured result with errors/warnings
-  const depCheck = SandboxManager.checkDependencies()
+  const depCheck = SandboxManager.checkDependencies();
 
   // Check if platform is in enabledPlatforms list (undocumented enterprise setting)
   if (!SandboxManager.isPlatformInEnabledList()) {
     const message = color(
       'error',
       themeName,
-    )(
-      `Error: Sandboxing is disabled for this platform (${platform}) via the enabledPlatforms setting.`,
-    )
-    onDone(message)
-    return null
+    )(`Error: Sandboxing is disabled for this platform (${platform}) via the enabledPlatforms setting.`);
+    onDone(message);
+    return null;
   }
 
   // Check if sandbox settings are locked by higher-priority settings
@@ -55,73 +47,64 @@ export async function call(
     const message = color(
       'error',
       themeName,
-    )(
-      'Error: Sandbox settings are overridden by a higher-priority configuration and cannot be changed locally.',
-    )
-    onDone(message)
-    return null
+    )('Error: Sandbox settings are overridden by a higher-priority configuration and cannot be changed locally.');
+    onDone(message);
+    return null;
   }
 
   // Parse the arguments
-  const trimmedArgs = args?.trim() || ''
+  const trimmedArgs = args?.trim() || '';
 
   // If no args, show the interactive menu
   if (!trimmedArgs) {
-    return <SandboxSettings onComplete={onDone} depCheck={depCheck} />
+    return <SandboxSettings onComplete={onDone} depCheck={depCheck} />;
   }
 
   // Handle subcommands
   if (trimmedArgs) {
-    const parts = trimmedArgs.split(' ')
-    const subcommand = parts[0]
+    const parts = trimmedArgs.split(' ');
+    const subcommand = parts[0];
 
     if (subcommand === 'exclude') {
       // Handle exclude subcommand
-      const commandPattern = trimmedArgs.slice('exclude '.length).trim()
+      const commandPattern = trimmedArgs.slice('exclude '.length).trim();
 
       if (!commandPattern) {
         const message = color(
           'error',
           themeName,
-        )(
-          'Error: Please provide a command pattern to exclude (e.g., /sandbox exclude "npm run test:*")',
-        )
-        onDone(message)
-        return null
+        )('Error: Please provide a command pattern to exclude (e.g., /sandbox exclude "npm run test:*")');
+        onDone(message);
+        return null;
       }
 
       // Remove quotes if present
-      const cleanPattern = commandPattern.replace(/^["']|["']$/g, '')
+      const cleanPattern = commandPattern.replace(/^["']|["']$/g, '');
 
       // Add to excludedCommands
-      addToExcludedCommands(cleanPattern)
+      addToExcludedCommands(cleanPattern);
 
       // Get the local settings path and make it relative to cwd
-      const localSettingsPath = getSettingsFilePathForSource('localSettings')
+      const localSettingsPath = getSettingsFilePathForSource('localSettings');
       const relativePath = localSettingsPath
         ? relative(getCwdState(), localSettingsPath)
-        : '.claude/settings.local.json'
+        : '.claude/settings.local.json';
 
-      const message = color(
-        'success',
-        themeName,
-      )(`Added "${cleanPattern}" to excluded commands in ${relativePath}`)
+      const message = color('success', themeName)(`Added "${cleanPattern}" to excluded commands in ${relativePath}`);
 
-      onDone(message)
-      return null
+      onDone(message);
+      return null;
     } else {
       // Unknown subcommand
       const message = color(
         'error',
         themeName,
-      )(
-        `Error: Unknown subcommand "${subcommand}". Available subcommand: exclude`,
-      )
-      onDone(message)
-      return null
+      )(`Error: Unknown subcommand "${subcommand}". Available subcommand: exclude`);
+      onDone(message);
+      return null;
     }
   }
 
   // Should never reach here since we handle all cases above
-  return null
+  return null;
 }
diff --git a/src/commands/session/session.tsx b/src/commands/session/session.tsx
index 18312e183..d6e8c11c1 100644
--- a/src/commands/session/session.tsx
+++ b/src/commands/session/session.tsx
@@ -1,55 +1,53 @@
-import { toString as qrToString } from 'qrcode'
-import * as React from 'react'
-import { useEffect, useState } from 'react'
-import { Box, Pane, Text } from '@anthropic/ink'
-import { useKeybinding } from '../../keybindings/useKeybinding.js'
-import { useAppState } from '../../state/AppState.js'
-import type { LocalJSXCommandCall } from '../../types/command.js'
-import { logForDebugging } from '../../utils/debug.js'
+import { toString as qrToString } from 'qrcode';
+import * as React from 'react';
+import { useEffect, useState } from 'react';
+import { Box, Pane, Text } from '@anthropic/ink';
+import { useKeybinding } from '../../keybindings/useKeybinding.js';
+import { useAppState } from '../../state/AppState.js';
+import type { LocalJSXCommandCall } from '../../types/command.js';
+import { logForDebugging } from '../../utils/debug.js';
 
 type Props = {
-  onDone: () => void
-}
+  onDone: () => void;
+};
 
 function SessionInfo({ onDone }: Props): React.ReactNode {
-  const remoteSessionUrl = useAppState(s => s.remoteSessionUrl)
-  const [qrCode, setQrCode] = useState<string>('')
+  const remoteSessionUrl = useAppState(s => s.remoteSessionUrl);
+  const [qrCode, setQrCode] = useState<string>('');
 
   // Generate QR code when URL is available
   useEffect(() => {
-    if (!remoteSessionUrl) return
+    if (!remoteSessionUrl) return;
 
-    const url = remoteSessionUrl
+    const url = remoteSessionUrl;
     async function generateQRCode(): Promise<void> {
       const qr = await qrToString(url, {
         type: 'utf8',
         errorCorrectionLevel: 'L',
-      })
-      setQrCode(qr)
+      });
+      setQrCode(qr);
     }
     // Intentionally silent fail - URL is still shown so QR is non-critical
     generateQRCode().catch(e => {
-      logForDebugging('QR code generation failed', e)
-    })
-  }, [remoteSessionUrl])
+      logForDebugging('QR code generation failed', e);
+    });
+  }, [remoteSessionUrl]);
 
   // Handle ESC to dismiss
-  useKeybinding('confirm:no', onDone, { context: 'Confirmation' })
+  useKeybinding('confirm:no', onDone, { context: 'Confirmation' });
 
   // Not in remote mode
   if (!remoteSessionUrl) {
     return (
       <Pane>
-        <Text color="warning">
-          Not in remote mode. Start with `claude --remote` to use this command.
-        </Text>
+        <Text color="warning">Not in remote mode. Start with `claude --remote` to use this command.</Text>
         <Text dimColor>(press esc to close)</Text>
       </Pane>
-    )
+    );
   }
 
-  const lines = qrCode.split('\n').filter(line => line.length > 0)
-  const isLoading = lines.length === 0
+  const lines = qrCode.split('\n').filter(line => line.length > 0);
+  const isLoading = lines.length === 0;
 
   return (
     <Pane>
@@ -58,11 +56,7 @@ function SessionInfo({ onDone }: Props): React.ReactNode {
       </Box>
 
       {/* QR Code - silently fails if generation errors, URL is still shown */}
-      {isLoading ? (
-        <Text dimColor>Generating QR code…</Text>
-      ) : (
-        lines.map((line, i) => <Text key={i}>{line}</Text>)
-      )}
+      {isLoading ? <Text dimColor>Generating QR code…</Text> : lines.map((line, i) => <Text key={i}>{line}</Text>)}
 
       {/* URL */}
       <Box marginTop={1}>
@@ -74,9 +68,9 @@ function SessionInfo({ onDone }: Props): React.ReactNode {
         <Text dimColor>(press esc to close)</Text>
       </Box>
     </Pane>
-  )
+  );
 }
 
 export const call: LocalJSXCommandCall = async onDone => {
-  return <SessionInfo onDone={onDone} />
-}
+  return <SessionInfo onDone={onDone} />;
+};
diff --git a/src/commands/skills/skills.tsx b/src/commands/skills/skills.tsx
index 568efdc52..7547b5e66 100644
--- a/src/commands/skills/skills.tsx
+++ b/src/commands/skills/skills.tsx
@@ -1,11 +1,8 @@
-import * as React from 'react'
-import type { LocalJSXCommandContext } from '../../commands.js'
-import { SkillsMenu } from '../../components/skills/SkillsMenu.js'
-import type { LocalJSXCommandOnDone } from '../../types/command.js'
+import * as React from 'react';
+import type { LocalJSXCommandContext } from '../../commands.js';
+import { SkillsMenu } from '../../components/skills/SkillsMenu.js';
+import type { LocalJSXCommandOnDone } from '../../types/command.js';
 
-export async function call(
-  onDone: LocalJSXCommandOnDone,
-  context: LocalJSXCommandContext,
-): Promise<React.ReactNode> {
-  return <SkillsMenu onExit={onDone} commands={context.options.commands} />
+export async function call(onDone: LocalJSXCommandOnDone, context: LocalJSXCommandContext): Promise<React.ReactNode> {
+  return <SkillsMenu onExit={onDone} commands={context.options.commands} />;
 }
diff --git a/src/commands/src/commands.ts b/src/commands/src/commands.ts
index 8552dd207..4d2f681ce 100644
--- a/src/commands/src/commands.ts
+++ b/src/commands/src/commands.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type CommandResultDisplay = any;
+export type CommandResultDisplay = any
diff --git a/src/commands/src/services/analytics/index.ts b/src/commands/src/services/analytics/index.ts
index 60402f927..c095b5a65 100644
--- a/src/commands/src/services/analytics/index.ts
+++ b/src/commands/src/services/analytics/index.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type logEvent = any;
+export type logEvent = any
diff --git a/src/commands/stats/stats.tsx b/src/commands/stats/stats.tsx
index b467ee3d6..86110777e 100644
--- a/src/commands/stats/stats.tsx
+++ b/src/commands/stats/stats.tsx
@@ -1,7 +1,7 @@
-import * as React from 'react'
-import { Stats } from '../../components/Stats.js'
-import type { LocalJSXCommandCall } from '../../types/command.js'
+import * as React from 'react';
+import { Stats } from '../../components/Stats.js';
+import type { LocalJSXCommandCall } from '../../types/command.js';
 
 export const call: LocalJSXCommandCall = async onDone => {
-  return <Stats onClose={onDone} />
-}
+  return <Stats onClose={onDone} />;
+};
diff --git a/src/commands/status/status.tsx b/src/commands/status/status.tsx
index 25bb4b107..b57eed763 100644
--- a/src/commands/status/status.tsx
+++ b/src/commands/status/status.tsx
@@ -1,11 +1,8 @@
-import * as React from 'react'
-import type { LocalJSXCommandContext } from '../../commands.js'
-import { Settings } from '../../components/Settings/Settings.js'
-import type { LocalJSXCommandOnDone } from '../../types/command.js'
+import * as React from 'react';
+import type { LocalJSXCommandContext } from '../../commands.js';
+import { Settings } from '../../components/Settings/Settings.js';
+import type { LocalJSXCommandOnDone } from '../../types/command.js';
 
-export async function call(
-  onDone: LocalJSXCommandOnDone,
-  context: LocalJSXCommandContext,
-): Promise<React.ReactNode> {
-  return <Settings onClose={onDone} context={context} defaultTab="Status" />
+export async function call(onDone: LocalJSXCommandOnDone, context: LocalJSXCommandContext): Promise<React.ReactNode> {
+  return <Settings onClose={onDone} context={context} defaultTab="Status" />;
 }
diff --git a/src/commands/statusline.tsx b/src/commands/statusline.tsx
index 46d2e7d57..5c6ae530e 100644
--- a/src/commands/statusline.tsx
+++ b/src/commands/statusline.tsx
@@ -1,6 +1,6 @@
-import type { ContentBlockParam } from '@anthropic-ai/sdk/resources/index.mjs'
-import type { Command } from '../commands.js'
-import { AGENT_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/AgentTool/constants.js'
+import type { ContentBlockParam } from '@anthropic-ai/sdk/resources/index.mjs';
+import type { Command } from '../commands.js';
+import { AGENT_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/AgentTool/constants.js';
 
 const statusline = {
   type: 'prompt',
@@ -9,23 +9,18 @@ const statusline = {
   aliases: [],
   name: 'statusline',
   progressMessage: 'setting up statusLine',
-  allowedTools: [
-    AGENT_TOOL_NAME,
-    'Read(~/**)',
-    'Edit(~/.claude/settings.json)',
-  ],
+  allowedTools: [AGENT_TOOL_NAME, 'Read(~/**)', 'Edit(~/.claude/settings.json)'],
   source: 'builtin',
   disableNonInteractive: true,
   async getPromptForCommand(args): Promise<ContentBlockParam[]> {
-    const prompt =
-      args.trim() || 'Configure my statusLine from my shell PS1 configuration'
+    const prompt = args.trim() || 'Configure my statusLine from my shell PS1 configuration';
     return [
       {
         type: 'text',
         text: `Create an ${AGENT_TOOL_NAME} with subagent_type "statusline-setup" and the prompt "${prompt}"`,
       },
-    ]
+    ];
   },
-} satisfies Command
+} satisfies Command;
 
-export default statusline
+export default statusline;
diff --git a/src/commands/subscribe-pr.ts b/src/commands/subscribe-pr.ts
index db1b10658..d02f2d1ce 100644
--- a/src/commands/subscribe-pr.ts
+++ b/src/commands/subscribe-pr.ts
@@ -97,7 +97,7 @@ const call: LocalCommandCall = async (args, _context) => {
       }
     }
     const lines = subs.map(
-      (s) => `  ${s.repo}#${s.prNumber}  (since ${s.subscribedAt})`,
+      s => `  ${s.repo}#${s.prNumber}  (since ${s.subscribedAt})`,
     )
     return {
       type: 'text',
@@ -115,7 +115,7 @@ const call: LocalCommandCall = async (args, _context) => {
     const subs = readSubscriptions()
     const before = subs.length
     const after = subs.filter(
-      (s) => !(s.repo === parsed.repo && s.prNumber === parsed.prNumber),
+      s => !(s.repo === parsed.repo && s.prNumber === parsed.prNumber),
     )
     if (after.length === before) {
       return {
@@ -138,7 +138,7 @@ const call: LocalCommandCall = async (args, _context) => {
 
   const subs = readSubscriptions()
   const existing = subs.find(
-    (s) => s.repo === parsed.repo && s.prNumber === parsed.prNumber,
+    s => s.repo === parsed.repo && s.prNumber === parsed.prNumber,
   )
   if (existing) {
     return {
diff --git a/src/commands/tag/tag.tsx b/src/commands/tag/tag.tsx
index ea5813d59..67a153e6a 100644
--- a/src/commands/tag/tag.tsx
+++ b/src/commands/tag/tag.tsx
@@ -1,37 +1,28 @@
-import chalk from 'chalk'
-import type { UUID } from 'crypto'
-import * as React from 'react'
-import { getSessionId } from '../../bootstrap/state.js'
-import type { CommandResultDisplay } from '../../commands.js'
-import { Select } from '../../components/CustomSelect/select.js'
-import { Dialog } from '@anthropic/ink'
-import { COMMON_HELP_ARGS, COMMON_INFO_ARGS } from '../../constants/xml.js'
-import { Box, Text } from '@anthropic/ink'
-import { logEvent } from '../../services/analytics/index.js'
-import type { LocalJSXCommandOnDone } from '../../types/command.js'
-import { recursivelySanitizeUnicode } from '../../utils/sanitization.js'
-import {
-  getCurrentSessionTag,
-  getTranscriptPath,
-  saveTag,
-} from '../../utils/sessionStorage.js'
+import chalk from 'chalk';
+import type { UUID } from 'crypto';
+import * as React from 'react';
+import { getSessionId } from '../../bootstrap/state.js';
+import type { CommandResultDisplay } from '../../commands.js';
+import { Select } from '../../components/CustomSelect/select.js';
+import { Dialog } from '@anthropic/ink';
+import { COMMON_HELP_ARGS, COMMON_INFO_ARGS } from '../../constants/xml.js';
+import { Box, Text } from '@anthropic/ink';
+import { logEvent } from '../../services/analytics/index.js';
+import type { LocalJSXCommandOnDone } from '../../types/command.js';
+import { recursivelySanitizeUnicode } from '../../utils/sanitization.js';
+import { getCurrentSessionTag, getTranscriptPath, saveTag } from '../../utils/sessionStorage.js';
 
 function ConfirmRemoveTag({
   tagName,
   onConfirm,
   onCancel,
 }: {
-  tagName: string
-  onConfirm: () => void
-  onCancel: () => void
+  tagName: string;
+  onConfirm: () => void;
+  onCancel: () => void;
 }): React.ReactNode {
   return (
-    <Dialog
-      title="Remove tag?"
-      subtitle={`Current tag: #${tagName}`}
-      onCancel={onCancel}
-      color="warning"
-    >
+    <Dialog title="Remove tag?" subtitle={`Current tag: #${tagName}`} onCancel={onCancel} color="warning">
       <Box flexDirection="column" gap={1}>
         <Text>This will remove the tag from the current session.</Text>
         <Select<'yes' | 'no'>
@@ -43,90 +34,84 @@ function ConfirmRemoveTag({
         />
       </Box>
     </Dialog>
-  )
+  );
 }
 
 function ToggleTagAndClose({
   tagName,
   onDone,
 }: {
-  tagName: string
-  onDone: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
+  tagName: string;
+  onDone: (result?: string, options?: { display?: CommandResultDisplay }) => void;
 }): React.ReactNode {
-  const [showConfirm, setShowConfirm] = React.useState(false)
-  const [sessionId, setSessionId] = React.useState<UUID | null>(null)
+  const [showConfirm, setShowConfirm] = React.useState(false);
+  const [sessionId, setSessionId] = React.useState<UUID | null>(null);
   // Sanitize unicode to prevent hidden character attacks and normalize
-  const normalizedTag = recursivelySanitizeUnicode(tagName).trim()
+  const normalizedTag = recursivelySanitizeUnicode(tagName).trim();
 
   React.useEffect(() => {
-    const id = getSessionId() as UUID
+    const id = getSessionId() as UUID;
 
     if (!id) {
-      onDone('No active session to tag', { display: 'system' })
-      return
+      onDone('No active session to tag', { display: 'system' });
+      return;
     }
 
     if (!normalizedTag) {
-      onDone('Tag name cannot be empty', { display: 'system' })
-      return
+      onDone('Tag name cannot be empty', { display: 'system' });
+      return;
     }
 
-    setSessionId(id)
-    const currentTag = getCurrentSessionTag(id)
+    setSessionId(id);
+    const currentTag = getCurrentSessionTag(id);
 
     // If same tag exists, show confirmation dialog
     if (currentTag === normalizedTag) {
-      logEvent('tengu_tag_command_remove_prompt', {})
-      setShowConfirm(true)
+      logEvent('tengu_tag_command_remove_prompt', {});
+      setShowConfirm(true);
     } else {
       // Add the new tag directly
-      const isReplacing = !!currentTag
-      logEvent('tengu_tag_command_add', { is_replacing: isReplacing })
+      const isReplacing = !!currentTag;
+      logEvent('tengu_tag_command_add', { is_replacing: isReplacing });
       void (async () => {
-        const fullPath = getTranscriptPath()
-        await saveTag(id, normalizedTag, fullPath)
+        const fullPath = getTranscriptPath();
+        await saveTag(id, normalizedTag, fullPath);
         onDone(`Tagged session with ${chalk.cyan(`#${normalizedTag}`)}`, {
           display: 'system',
-        })
-      })()
+        });
+      })();
     }
-  }, [normalizedTag, onDone])
+  }, [normalizedTag, onDone]);
 
   if (showConfirm && sessionId) {
     return (
       <ConfirmRemoveTag
         tagName={normalizedTag}
         onConfirm={async () => {
-          logEvent('tengu_tag_command_remove_confirmed', {})
-          const fullPath = getTranscriptPath()
-          await saveTag(sessionId, '', fullPath)
+          logEvent('tengu_tag_command_remove_confirmed', {});
+          const fullPath = getTranscriptPath();
+          await saveTag(sessionId, '', fullPath);
           onDone(`Removed tag ${chalk.cyan(`#${normalizedTag}`)}`, {
             display: 'system',
-          })
+          });
         }}
         onCancel={() => {
-          logEvent('tengu_tag_command_remove_cancelled', {})
+          logEvent('tengu_tag_command_remove_cancelled', {});
           onDone(`Kept tag ${chalk.cyan(`#${normalizedTag}`)}`, {
             display: 'system',
-          })
+          });
         }}
       />
-    )
+    );
   }
 
-  return null
+  return null;
 }
 
 function ShowHelp({
   onDone,
 }: {
-  onDone: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
+  onDone: (result?: string, options?: { display?: CommandResultDisplay }) => void;
 }): React.ReactNode {
   React.useEffect(() => {
     onDone(
@@ -142,26 +127,22 @@ Examples:
   /tag feature-auth
   /tag wip`,
       { display: 'system' },
-    )
-  }, [onDone])
+    );
+  }, [onDone]);
 
-  return null
+  return null;
 }
 
-export async function call(
-  onDone: LocalJSXCommandOnDone,
-  _context: unknown,
-  args?: string,
-): Promise<React.ReactNode> {
-  args = args?.trim() || ''
+export async function call(onDone: LocalJSXCommandOnDone, _context: unknown, args?: string): Promise<React.ReactNode> {
+  args = args?.trim() || '';
 
   if (COMMON_INFO_ARGS.includes(args) || COMMON_HELP_ARGS.includes(args)) {
-    return <ShowHelp onDone={onDone} />
+    return <ShowHelp onDone={onDone} />;
   }
 
   if (!args) {
-    return <ShowHelp onDone={onDone} />
+    return <ShowHelp onDone={onDone} />;
   }
 
-  return <ToggleTagAndClose tagName={args} onDone={onDone} />
+  return <ToggleTagAndClose tagName={args} onDone={onDone} />;
 }
diff --git a/src/commands/tasks/tasks.tsx b/src/commands/tasks/tasks.tsx
index 09be9f87c..ee2e0b156 100644
--- a/src/commands/tasks/tasks.tsx
+++ b/src/commands/tasks/tasks.tsx
@@ -1,11 +1,8 @@
-import * as React from 'react'
-import type { LocalJSXCommandContext } from '../../commands.js'
-import { BackgroundTasksDialog } from '../../components/tasks/BackgroundTasksDialog.js'
-import type { LocalJSXCommandOnDone } from '../../types/command.js'
+import * as React from 'react';
+import type { LocalJSXCommandContext } from '../../commands.js';
+import { BackgroundTasksDialog } from '../../components/tasks/BackgroundTasksDialog.js';
+import type { LocalJSXCommandOnDone } from '../../types/command.js';
 
-export async function call(
-  onDone: LocalJSXCommandOnDone,
-  context: LocalJSXCommandContext,
-): Promise<React.ReactNode> {
-  return <BackgroundTasksDialog toolUseContext={context} onDone={onDone} />
+export async function call(onDone: LocalJSXCommandOnDone, context: LocalJSXCommandContext): Promise<React.ReactNode> {
+  return <BackgroundTasksDialog toolUseContext={context} onDone={onDone} />;
 }
diff --git a/src/commands/terminalSetup/src/utils/theme.ts b/src/commands/terminalSetup/src/utils/theme.ts
index 62c7ea83c..b6a2857b7 100644
--- a/src/commands/terminalSetup/src/utils/theme.ts
+++ b/src/commands/terminalSetup/src/utils/theme.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type ThemeName = any;
+export type ThemeName = any
diff --git a/src/commands/terminalSetup/terminalSetup.tsx b/src/commands/terminalSetup/terminalSetup.tsx
index c7776da46..349205b32 100644
--- a/src/commands/terminalSetup/terminalSetup.tsx
+++ b/src/commands/terminalSetup/terminalSetup.tsx
@@ -1,35 +1,32 @@
-import chalk from 'chalk'
-import { randomBytes } from 'crypto'
-import { copyFile, mkdir, readFile, writeFile } from 'fs/promises'
-import { homedir, platform } from 'os'
-import { dirname, join } from 'path'
-import type { ThemeName } from 'src/utils/theme.js'
-import { pathToFileURL } from 'url'
-import { supportsHyperlinks } from '@anthropic/ink'
-import { color } from '@anthropic/ink'
-import { maybeMarkProjectOnboardingComplete } from '../../projectOnboardingState.js'
-import type { ToolUseContext } from '../../Tool.js'
-import type {
-  LocalJSXCommandContext,
-  LocalJSXCommandOnDone,
-} from '../../types/command.js'
+import chalk from 'chalk';
+import { randomBytes } from 'crypto';
+import { copyFile, mkdir, readFile, writeFile } from 'fs/promises';
+import { homedir, platform } from 'os';
+import { dirname, join } from 'path';
+import type { ThemeName } from 'src/utils/theme.js';
+import { pathToFileURL } from 'url';
+import { supportsHyperlinks } from '@anthropic/ink';
+import { color } from '@anthropic/ink';
+import { maybeMarkProjectOnboardingComplete } from '../../projectOnboardingState.js';
+import type { ToolUseContext } from '../../Tool.js';
+import type { LocalJSXCommandContext, LocalJSXCommandOnDone } from '../../types/command.js';
 import {
   backupTerminalPreferences,
   checkAndRestoreTerminalBackup,
   getTerminalPlistPath,
   markTerminalSetupComplete,
-} from '../../utils/appleTerminalBackup.js'
-import { setupShellCompletion } from '../../utils/completionCache.js'
-import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js'
-import { env } from '../../utils/env.js'
-import { isFsInaccessible } from '../../utils/errors.js'
-import { execFileNoThrow } from '../../utils/execFileNoThrow.js'
-import { addItemToJSONCArray, safeParseJSONC } from '../../utils/json.js'
-import { logError } from '../../utils/log.js'
-import { getPlatform } from '../../utils/platform.js'
-import { jsonParse, jsonStringify } from '../../utils/slowOperations.js'
+} from '../../utils/appleTerminalBackup.js';
+import { setupShellCompletion } from '../../utils/completionCache.js';
+import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js';
+import { env } from '../../utils/env.js';
+import { isFsInaccessible } from '../../utils/errors.js';
+import { execFileNoThrow } from '../../utils/execFileNoThrow.js';
+import { addItemToJSONCArray, safeParseJSONC } from '../../utils/json.js';
+import { logError } from '../../utils/log.js';
+import { getPlatform } from '../../utils/platform.js';
+import { jsonParse, jsonStringify } from '../../utils/slowOperations.js';
 
-const EOL = '\n'
+const EOL = '\n';
 
 // Terminals that natively support CSI u / Kitty keyboard protocol
 const NATIVE_CSIU_TERMINALS: Record<string, string> = {
@@ -38,7 +35,7 @@ const NATIVE_CSIU_TERMINALS: Record<string, string> = {
   'iTerm.app': 'iTerm2',
   WezTerm: 'WezTerm',
   WarpTerminal: 'Warp',
-}
+};
 
 /**
  * Detect if we're running in a VSCode Remote SSH session.
@@ -46,8 +43,8 @@ const NATIVE_CSIU_TERMINALS: Record<string, string> = {
  * not the remote server where Claude is running.
  */
 function isVSCodeRemoteSSH(): boolean {
-  const askpassMain = process.env.VSCODE_GIT_ASKPASS_MAIN ?? ''
-  const path = process.env.PATH ?? ''
+  const askpassMain = process.env.VSCODE_GIT_ASKPASS_MAIN ?? '';
+  const path = process.env.PATH ?? '';
 
   // Check both env vars - VSCODE_GIT_ASKPASS_MAIN is more reliable when git extension
   // is active, and PATH is a fallback. Omit path separator for Windows compatibility.
@@ -58,14 +55,14 @@ function isVSCodeRemoteSSH(): boolean {
     path.includes('.vscode-server') ||
     path.includes('.cursor-server') ||
     path.includes('.windsurf-server')
-  )
+  );
 }
 
 export function getNativeCSIuTerminalDisplayName(): string | null {
   if (!env.terminal || !(env.terminal in NATIVE_CSIU_TERMINALS)) {
-    return null
+    return null;
   }
-  return NATIVE_CSIU_TERMINALS[env.terminal] ?? null
+  return NATIVE_CSIU_TERMINALS[env.terminal] ?? null;
 }
 
 /**
@@ -81,11 +78,11 @@ export function getNativeCSIuTerminalDisplayName(): string | null {
  */
 function formatPathLink(filePath: string): string {
   if (!supportsHyperlinks()) {
-    return filePath
+    return filePath;
   }
-  const fileUrl = pathToFileURL(filePath).href
+  const fileUrl = pathToFileURL(filePath).href;
   // OSC 8 hyperlink: \e]8;;URL\a TEXT \e]8;;\a
-  return `\x1b]8;;${fileUrl}\x07${filePath}\x1b]8;;\x07`
+  return `\x1b]8;;${fileUrl}\x07${filePath}\x1b]8;;\x07`;
 }
 
 export function shouldOfferTerminalSetup(): boolean {
@@ -99,75 +96,71 @@ export function shouldOfferTerminalSetup(): boolean {
     env.terminal === 'windsurf' ||
     env.terminal === 'alacritty' ||
     env.terminal === 'zed'
-  )
+  );
 }
 
 export async function setupTerminal(theme: ThemeName): Promise<string> {
-  let result = ''
+  let result = '';
 
   switch (env.terminal) {
     case 'Apple_Terminal':
-      result = await enableOptionAsMetaForTerminal(theme)
-      break
+      result = await enableOptionAsMetaForTerminal(theme);
+      break;
     case 'vscode':
-      result = await installBindingsForVSCodeTerminal('VSCode', theme)
-      break
+      result = await installBindingsForVSCodeTerminal('VSCode', theme);
+      break;
     case 'cursor':
-      result = await installBindingsForVSCodeTerminal('Cursor', theme)
-      break
+      result = await installBindingsForVSCodeTerminal('Cursor', theme);
+      break;
     case 'windsurf':
-      result = await installBindingsForVSCodeTerminal('Windsurf', theme)
-      break
+      result = await installBindingsForVSCodeTerminal('Windsurf', theme);
+      break;
     case 'alacritty':
-      result = await installBindingsForAlacritty(theme)
-      break
+      result = await installBindingsForAlacritty(theme);
+      break;
     case 'zed':
-      result = await installBindingsForZed(theme)
-      break
+      result = await installBindingsForZed(theme);
+      break;
     case null:
-      break
+      break;
   }
 
   saveGlobalConfig(current => {
-    if (
-      ['vscode', 'cursor', 'windsurf', 'alacritty', 'zed'].includes(
-        env.terminal ?? '',
-      )
-    ) {
-      if (current.shiftEnterKeyBindingInstalled === true) return current
-      return { ...current, shiftEnterKeyBindingInstalled: true }
+    if (['vscode', 'cursor', 'windsurf', 'alacritty', 'zed'].includes(env.terminal ?? '')) {
+      if (current.shiftEnterKeyBindingInstalled === true) return current;
+      return { ...current, shiftEnterKeyBindingInstalled: true };
     } else if (env.terminal === 'Apple_Terminal') {
-      if (current.optionAsMetaKeyInstalled === true) return current
-      return { ...current, optionAsMetaKeyInstalled: true }
+      if (current.optionAsMetaKeyInstalled === true) return current;
+      return { ...current, optionAsMetaKeyInstalled: true };
     }
-    return current
-  })
+    return current;
+  });
 
-  maybeMarkProjectOnboardingComplete()
+  maybeMarkProjectOnboardingComplete();
 
   // Install shell completions (ant-only, since the completion command is ant-only)
   if (process.env.USER_TYPE === 'ant') {
-    result += await setupShellCompletion(theme)
+    result += await setupShellCompletion(theme);
   }
 
-  return result
+  return result;
 }
 
 export function isShiftEnterKeyBindingInstalled(): boolean {
-  return getGlobalConfig().shiftEnterKeyBindingInstalled === true
+  return getGlobalConfig().shiftEnterKeyBindingInstalled === true;
 }
 
 export function hasUsedBackslashReturn(): boolean {
-  return getGlobalConfig().hasUsedBackslashReturn === true
+  return getGlobalConfig().hasUsedBackslashReturn === true;
 }
 
 export function markBackslashReturnUsed(): void {
-  const config = getGlobalConfig()
+  const config = getGlobalConfig();
   if (!config.hasUsedBackslashReturn) {
     saveGlobalConfig(current => ({
       ...current,
       hasUsedBackslashReturn: true,
-    }))
+    }));
   }
 }
 
@@ -179,22 +172,22 @@ export async function call(
   if (env.terminal && env.terminal in NATIVE_CSIU_TERMINALS) {
     const message = `Shift+Enter is natively supported in ${NATIVE_CSIU_TERMINALS[env.terminal]}.
 
-No configuration needed. Just use Shift+Enter to add newlines.`
-    onDone(message)
-    return null
+No configuration needed. Just use Shift+Enter to add newlines.`;
+    onDone(message);
+    return null;
   }
 
   // Check if terminal is supported
   if (!shouldOfferTerminalSetup()) {
-    const terminalName = env.terminal || 'your current terminal'
-    const currentPlatform = getPlatform()
+    const terminalName = env.terminal || 'your current terminal';
+    const currentPlatform = getPlatform();
 
     // Build platform-specific terminal suggestions
-    let platformTerminals = ''
+    let platformTerminals = '';
     if (currentPlatform === 'macos') {
-      platformTerminals = '   • macOS: Apple Terminal\n'
+      platformTerminals = '   • macOS: Apple Terminal\n';
     } else if (currentPlatform === 'windows') {
-      platformTerminals = '   • Windows: Windows Terminal\n'
+      platformTerminals = '   • Windows: Windows Terminal\n';
     }
     // For Linux and other platforms, we don't show native terminal options
     // since they're not currently supported
@@ -211,22 +204,22 @@ ${platformTerminals}   • IDE: VSCode, Cursor, Windsurf, Zed
    • Other: Alacritty
 3. Return to tmux/screen - settings will persist
 
-${chalk.dim('Note: iTerm2, WezTerm, Ghostty, Kitty, and Warp support Shift+Enter natively.')}`
-    onDone(message)
-    return null
+${chalk.dim('Note: iTerm2, WezTerm, Ghostty, Kitty, and Warp support Shift+Enter natively.')}`;
+    onDone(message);
+    return null;
   }
 
-  const result = await setupTerminal(context.options.theme)
-  onDone(result)
-  return null
+  const result = await setupTerminal(context.options.theme);
+  onDone(result);
+  return null;
 }
 
 type VSCodeKeybinding = {
-  key: string
-  command: string
-  args: { text: string }
-  when: string
-}
+  key: string;
+  command: string;
+  args: { text: string };
+  when: string;
+};
 
 async function installBindingsForVSCodeTerminal(
   editor: 'VSCode' | 'Cursor' | 'Windsurf' = 'VSCode',
@@ -247,10 +240,10 @@ async function installBindingsForVSCodeTerminal(
     "args": { "text": "\\u001b\\r" },
     "when": "terminalFocus"
   }
-]`)}${EOL}`
+]`)}${EOL}`;
   }
 
-  const editorDir = editor === 'VSCode' ? 'Code' : editor
+  const editorDir = editor === 'VSCode' ? 'Code' : editor;
   const userDirPath = join(
     homedir(),
     platform() === 'win32'
@@ -258,38 +251,38 @@ async function installBindingsForVSCodeTerminal(
       : platform() === 'darwin'
         ? join('Library', 'Application Support', editorDir, 'User')
         : join('.config', editorDir, 'User'),
-  )
-  const keybindingsPath = join(userDirPath, 'keybindings.json')
+  );
+  const keybindingsPath = join(userDirPath, 'keybindings.json');
 
   try {
     // Ensure user directory exists (idempotent with recursive)
-    await mkdir(userDirPath, { recursive: true })
+    await mkdir(userDirPath, { recursive: true });
 
     // Read existing keybindings file, or default to empty array if it doesn't exist
-    let content = '[]'
-    let keybindings: VSCodeKeybinding[] = []
-    let fileExists = false
+    let content = '[]';
+    let keybindings: VSCodeKeybinding[] = [];
+    let fileExists = false;
     try {
-      content = await readFile(keybindingsPath, { encoding: 'utf-8' })
-      fileExists = true
-      keybindings = (safeParseJSONC(content) as VSCodeKeybinding[]) ?? []
+      content = await readFile(keybindingsPath, { encoding: 'utf-8' });
+      fileExists = true;
+      keybindings = (safeParseJSONC(content) as VSCodeKeybinding[]) ?? [];
     } catch (e: unknown) {
-      if (!isFsInaccessible(e)) throw e
+      if (!isFsInaccessible(e)) throw e;
     }
 
     // Backup the existing file before modifying it
     if (fileExists) {
-      const randomSha = randomBytes(4).toString('hex')
-      const backupPath = `${keybindingsPath}.${randomSha}.bak`
+      const randomSha = randomBytes(4).toString('hex');
+      const backupPath = `${keybindingsPath}.${randomSha}.bak`;
       try {
-        await copyFile(keybindingsPath, backupPath)
+        await copyFile(keybindingsPath, backupPath);
       } catch {
         return `${color(
           'warning',
           theme,
         )(
           `Error backing up existing ${editor} terminal keybindings. Bailing out.`,
-        )}${EOL}${chalk.dim(`See ${formatPathLink(keybindingsPath)}`)}${EOL}${chalk.dim(`Backup path: ${formatPathLink(backupPath)}`)}${EOL}`
+        )}${EOL}${chalk.dim(`See ${formatPathLink(keybindingsPath)}`)}${EOL}${chalk.dim(`Backup path: ${formatPathLink(backupPath)}`)}${EOL}`;
       }
     }
 
@@ -299,14 +292,14 @@ async function installBindingsForVSCodeTerminal(
         binding.key === 'shift+enter' &&
         binding.command === 'workbench.action.terminal.sendSequence' &&
         binding.when === 'terminalFocus',
-    )
+    );
     if (existingBinding) {
       return `${color(
         'warning',
         theme,
       )(
         `Found existing ${editor} terminal Shift+Enter key binding. Remove it to continue.`,
-      )}${EOL}${chalk.dim(`See ${formatPathLink(keybindingsPath)}`)}${EOL}`
+      )}${EOL}${chalk.dim(`See ${formatPathLink(keybindingsPath)}`)}${EOL}`;
     }
 
     // Create the new keybinding
@@ -315,38 +308,34 @@ async function installBindingsForVSCodeTerminal(
       command: 'workbench.action.terminal.sendSequence',
       args: { text: '\u001b\r' },
       when: 'terminalFocus',
-    }
+    };
 
     // Modify the content by adding the new keybinding while preserving comments and formatting
-    const updatedContent = addItemToJSONCArray(content, newKeybinding)
+    const updatedContent = addItemToJSONCArray(content, newKeybinding);
 
     // Write the updated content back to the file
-    await writeFile(keybindingsPath, updatedContent, { encoding: 'utf-8' })
+    await writeFile(keybindingsPath, updatedContent, { encoding: 'utf-8' });
 
     return `${color(
       'success',
       theme,
     )(
       `Installed ${editor} terminal Shift+Enter key binding`,
-    )}${EOL}${chalk.dim(`See ${formatPathLink(keybindingsPath)}`)}${EOL}`
+    )}${EOL}${chalk.dim(`See ${formatPathLink(keybindingsPath)}`)}${EOL}`;
   } catch (error) {
-    logError(error)
-    throw new Error(
-      `Failed to install ${editor} terminal Shift+Enter key binding`,
-    )
+    logError(error);
+    throw new Error(`Failed to install ${editor} terminal Shift+Enter key binding`);
   }
 }
 
-async function enableOptionAsMetaForProfile(
-  profileName: string,
-): Promise<boolean> {
+async function enableOptionAsMetaForProfile(profileName: string): Promise<boolean> {
   // First try to add the property (in case it doesn't exist)
   // Quote the profile name to handle names with spaces (e.g., "Man Page", "Red Sands")
   const { code: addCode } = await execFileNoThrow('/usr/libexec/PlistBuddy', [
     '-c',
     `Add :'Window Settings':'${profileName}':useOptionAsMetaKey bool true`,
     getTerminalPlistPath(),
-  ])
+  ]);
 
   // If adding fails (likely because it already exists), try setting it instead
   if (addCode !== 0) {
@@ -354,31 +343,25 @@ async function enableOptionAsMetaForProfile(
       '-c',
       `Set :'Window Settings':'${profileName}':useOptionAsMetaKey true`,
       getTerminalPlistPath(),
-    ])
+    ]);
 
     if (setCode !== 0) {
-      logError(
-        new Error(
-          `Failed to enable Option as Meta key for Terminal.app profile: ${profileName}`,
-        ),
-      )
-      return false
+      logError(new Error(`Failed to enable Option as Meta key for Terminal.app profile: ${profileName}`));
+      return false;
     }
   }
 
-  return true
+  return true;
 }
 
-async function disableAudioBellForProfile(
-  profileName: string,
-): Promise<boolean> {
+async function disableAudioBellForProfile(profileName: string): Promise<boolean> {
   // First try to add the property (in case it doesn't exist)
   // Quote the profile name to handle names with spaces (e.g., "Man Page", "Red Sands")
   const { code: addCode } = await execFileNoThrow('/usr/libexec/PlistBuddy', [
     '-c',
     `Add :'Window Settings':'${profileName}':Bell bool false`,
     getTerminalPlistPath(),
-  ])
+  ]);
 
   // If adding fails (likely because it already exists), try setting it instead
   if (addCode !== 0) {
@@ -386,114 +369,98 @@ async function disableAudioBellForProfile(
       '-c',
       `Set :'Window Settings':'${profileName}':Bell false`,
       getTerminalPlistPath(),
-    ])
+    ]);
 
     if (setCode !== 0) {
-      logError(
-        new Error(
-          `Failed to disable audio bell for Terminal.app profile: ${profileName}`,
-        ),
-      )
-      return false
+      logError(new Error(`Failed to disable audio bell for Terminal.app profile: ${profileName}`));
+      return false;
     }
   }
 
-  return true
+  return true;
 }
 
 // Enable Option as Meta key for Terminal.app
-async function enableOptionAsMetaForTerminal(
-  theme: ThemeName,
-): Promise<string> {
+async function enableOptionAsMetaForTerminal(theme: ThemeName): Promise<string> {
   try {
     // Create a backup of the current plist file
-    const backupPath = await backupTerminalPreferences()
+    const backupPath = await backupTerminalPreferences();
     if (!backupPath) {
-      throw new Error(
-        'Failed to create backup of Terminal.app preferences, bailing out',
-      )
+      throw new Error('Failed to create backup of Terminal.app preferences, bailing out');
     }
 
     // Read the current default profile from the plist
-    const { stdout: defaultProfile, code: readCode } = await execFileNoThrow(
-      'defaults',
-      ['read', 'com.apple.Terminal', 'Default Window Settings'],
-    )
+    const { stdout: defaultProfile, code: readCode } = await execFileNoThrow('defaults', [
+      'read',
+      'com.apple.Terminal',
+      'Default Window Settings',
+    ]);
 
     if (readCode !== 0 || !defaultProfile.trim()) {
-      throw new Error('Failed to read default Terminal.app profile')
+      throw new Error('Failed to read default Terminal.app profile');
     }
 
-    const { stdout: startupProfile, code: startupCode } = await execFileNoThrow(
-      'defaults',
-      ['read', 'com.apple.Terminal', 'Startup Window Settings'],
-    )
+    const { stdout: startupProfile, code: startupCode } = await execFileNoThrow('defaults', [
+      'read',
+      'com.apple.Terminal',
+      'Startup Window Settings',
+    ]);
     if (startupCode !== 0 || !startupProfile.trim()) {
-      throw new Error('Failed to read startup Terminal.app profile')
+      throw new Error('Failed to read startup Terminal.app profile');
     }
 
-    let wasAnyProfileUpdated = false
+    let wasAnyProfileUpdated = false;
 
-    const defaultProfileName = defaultProfile.trim()
-    const optionAsMetaEnabled =
-      await enableOptionAsMetaForProfile(defaultProfileName)
-    const audioBellDisabled =
-      await disableAudioBellForProfile(defaultProfileName)
+    const defaultProfileName = defaultProfile.trim();
+    const optionAsMetaEnabled = await enableOptionAsMetaForProfile(defaultProfileName);
+    const audioBellDisabled = await disableAudioBellForProfile(defaultProfileName);
 
     if (optionAsMetaEnabled || audioBellDisabled) {
-      wasAnyProfileUpdated = true
+      wasAnyProfileUpdated = true;
     }
 
-    const startupProfileName = startupProfile.trim()
+    const startupProfileName = startupProfile.trim();
 
     // Only proceed if the startup profile is different from the default profile
     if (startupProfileName !== defaultProfileName) {
-      const startupOptionAsMetaEnabled =
-        await enableOptionAsMetaForProfile(startupProfileName)
-      const startupAudioBellDisabled =
-        await disableAudioBellForProfile(startupProfileName)
+      const startupOptionAsMetaEnabled = await enableOptionAsMetaForProfile(startupProfileName);
+      const startupAudioBellDisabled = await disableAudioBellForProfile(startupProfileName);
 
       if (startupOptionAsMetaEnabled || startupAudioBellDisabled) {
-        wasAnyProfileUpdated = true
+        wasAnyProfileUpdated = true;
       }
     }
 
     if (!wasAnyProfileUpdated) {
-      throw new Error(
-        'Failed to enable Option as Meta key or disable audio bell for any Terminal.app profile',
-      )
+      throw new Error('Failed to enable Option as Meta key or disable audio bell for any Terminal.app profile');
     }
 
     // Flush the preferences cache
-    await execFileNoThrow('killall', ['cfprefsd'])
+    await execFileNoThrow('killall', ['cfprefsd']);
 
-    markTerminalSetupComplete()
+    markTerminalSetupComplete();
 
     return `${color(
       'success',
       theme,
     )(
       `Configured Terminal.app settings:`,
-    )}${EOL}${color('success', theme)('- Enabled "Use Option as Meta key"')}${EOL}${color('success', theme)('- Switched to visual bell')}${EOL}${chalk.dim('Option+Enter will now enter a newline.')}${EOL}${chalk.dim('You must restart Terminal.app for changes to take effect.', theme)}${EOL}`
+    )}${EOL}${color('success', theme)('- Enabled "Use Option as Meta key"')}${EOL}${color('success', theme)('- Switched to visual bell')}${EOL}${chalk.dim('Option+Enter will now enter a newline.')}${EOL}${chalk.dim('You must restart Terminal.app for changes to take effect.', theme)}${EOL}`;
   } catch (error) {
-    logError(error)
+    logError(error);
 
     // Attempt to restore from backup
-    const restoreResult = await checkAndRestoreTerminalBackup()
+    const restoreResult = await checkAndRestoreTerminalBackup();
 
-    const errorMessage = 'Failed to enable Option as Meta key for Terminal.app.'
+    const errorMessage = 'Failed to enable Option as Meta key for Terminal.app.';
     if (restoreResult.status === 'restored') {
-      throw new Error(
-        `${errorMessage} Your settings have been restored from backup.`,
-      )
+      throw new Error(`${errorMessage} Your settings have been restored from backup.`);
     } else if (restoreResult.status === 'failed') {
       throw new Error(
         `${errorMessage} Restoring from backup failed, try manually with: defaults import com.apple.Terminal ${restoreResult.backupPath}`,
-      )
+      );
     } else {
-      throw new Error(
-        `${errorMessage} No backup was available to restore from.`,
-      )
+      throw new Error(`${errorMessage} No backup was available to restore from.`);
     }
   }
 }
@@ -502,128 +469,122 @@ async function installBindingsForAlacritty(theme: ThemeName): Promise<string> {
   const ALACRITTY_KEYBINDING = `[[keyboard.bindings]]
 key = "Return"
 mods = "Shift"
-chars = "\\u001B\\r"`
+chars = "\\u001B\\r"`;
 
   // Get Alacritty config file paths in order of preference
-  const configPaths: string[] = []
+  const configPaths: string[] = [];
 
   // XDG config path (Linux and macOS)
-  const xdgConfigHome = process.env.XDG_CONFIG_HOME
+  const xdgConfigHome = process.env.XDG_CONFIG_HOME;
   if (xdgConfigHome) {
-    configPaths.push(join(xdgConfigHome, 'alacritty', 'alacritty.toml'))
+    configPaths.push(join(xdgConfigHome, 'alacritty', 'alacritty.toml'));
   } else {
-    configPaths.push(join(homedir(), '.config', 'alacritty', 'alacritty.toml'))
+    configPaths.push(join(homedir(), '.config', 'alacritty', 'alacritty.toml'));
   }
 
   // Windows-specific path
   if (platform() === 'win32') {
-    const appData = process.env.APPDATA
+    const appData = process.env.APPDATA;
     if (appData) {
-      configPaths.push(join(appData, 'alacritty', 'alacritty.toml'))
+      configPaths.push(join(appData, 'alacritty', 'alacritty.toml'));
     }
   }
 
   // Find existing config file by attempting to read it, or use first preferred path
-  let configPath: string | null = null
-  let configContent = ''
-  let configExists = false
+  let configPath: string | null = null;
+  let configContent = '';
+  let configExists = false;
 
   for (const path of configPaths) {
     try {
-      configContent = await readFile(path, { encoding: 'utf-8' })
-      configPath = path
-      configExists = true
-      break
+      configContent = await readFile(path, { encoding: 'utf-8' });
+      configPath = path;
+      configExists = true;
+      break;
     } catch (e: unknown) {
-      if (!isFsInaccessible(e)) throw e
+      if (!isFsInaccessible(e)) throw e;
       // File missing or inaccessible — try next config path
     }
   }
 
   // If no config exists, use the first path (XDG/default location)
   if (!configPath) {
-    configPath = configPaths[0] ?? null
+    configPath = configPaths[0] ?? null;
   }
 
   if (!configPath) {
-    throw new Error('No valid config path found for Alacritty')
+    throw new Error('No valid config path found for Alacritty');
   }
 
   try {
     if (configExists) {
       // Check if keybinding already exists (look for Shift+Return binding)
-      if (
-        configContent.includes('mods = "Shift"') &&
-        configContent.includes('key = "Return"')
-      ) {
+      if (configContent.includes('mods = "Shift"') && configContent.includes('key = "Return"')) {
         return `${color(
           'warning',
           theme,
         )(
           'Found existing Alacritty Shift+Enter key binding. Remove it to continue.',
-        )}${EOL}${chalk.dim(`See ${formatPathLink(configPath)}`)}${EOL}`
+        )}${EOL}${chalk.dim(`See ${formatPathLink(configPath)}`)}${EOL}`;
       }
 
       // Create backup
-      const randomSha = randomBytes(4).toString('hex')
-      const backupPath = `${configPath}.${randomSha}.bak`
+      const randomSha = randomBytes(4).toString('hex');
+      const backupPath = `${configPath}.${randomSha}.bak`;
       try {
-        await copyFile(configPath, backupPath)
+        await copyFile(configPath, backupPath);
       } catch {
         return `${color(
           'warning',
           theme,
         )(
           'Error backing up existing Alacritty config. Bailing out.',
-        )}${EOL}${chalk.dim(`See ${formatPathLink(configPath)}`)}${EOL}${chalk.dim(`Backup path: ${formatPathLink(backupPath)}`)}${EOL}`
+        )}${EOL}${chalk.dim(`See ${formatPathLink(configPath)}`)}${EOL}${chalk.dim(`Backup path: ${formatPathLink(backupPath)}`)}${EOL}`;
       }
     } else {
       // Ensure config directory exists (idempotent with recursive)
-      await mkdir(dirname(configPath), { recursive: true })
+      await mkdir(dirname(configPath), { recursive: true });
     }
 
     // Add the keybinding to the config
-    let updatedContent = configContent
+    let updatedContent = configContent;
     if (configContent && !configContent.endsWith('\n')) {
-      updatedContent += '\n'
+      updatedContent += '\n';
     }
-    updatedContent += '\n' + ALACRITTY_KEYBINDING + '\n'
+    updatedContent += '\n' + ALACRITTY_KEYBINDING + '\n';
 
     // Write the updated config
-    await writeFile(configPath, updatedContent, { encoding: 'utf-8' })
+    await writeFile(configPath, updatedContent, { encoding: 'utf-8' });
 
-    return `${color(
-      'success',
-      theme,
-    )('Installed Alacritty Shift+Enter key binding')}${EOL}${color(
+    return `${color('success', theme)('Installed Alacritty Shift+Enter key binding')}${EOL}${color(
       'success',
       theme,
     )(
       'You may need to restart Alacritty for changes to take effect',
-    )}${EOL}${chalk.dim(`See ${formatPathLink(configPath)}`)}${EOL}`
+    )}${EOL}${chalk.dim(`See ${formatPathLink(configPath)}`)}${EOL}`;
   } catch (error) {
-    logError(error)
-    throw new Error('Failed to install Alacritty Shift+Enter key binding')
+    logError(error);
+    throw new Error('Failed to install Alacritty Shift+Enter key binding');
   }
 }
 
 async function installBindingsForZed(theme: ThemeName): Promise<string> {
   // Zed uses JSON keybindings similar to VSCode
-  const zedDir = join(homedir(), '.config', 'zed')
-  const keymapPath = join(zedDir, 'keymap.json')
+  const zedDir = join(homedir(), '.config', 'zed');
+  const keymapPath = join(zedDir, 'keymap.json');
 
   try {
     // Ensure zed directory exists (idempotent with recursive)
-    await mkdir(zedDir, { recursive: true })
+    await mkdir(zedDir, { recursive: true });
 
     // Read existing keymap file, or default to empty array if it doesn't exist
-    let keymapContent = '[]'
-    let fileExists = false
+    let keymapContent = '[]';
+    let fileExists = false;
     try {
-      keymapContent = await readFile(keymapPath, { encoding: 'utf-8' })
-      fileExists = true
+      keymapContent = await readFile(keymapPath, { encoding: 'utf-8' });
+      fileExists = true;
     } catch (e: unknown) {
-      if (!isFsInaccessible(e)) throw e
+      if (!isFsInaccessible(e)) throw e;
     }
 
     if (fileExists) {
@@ -634,36 +595,36 @@ async function installBindingsForZed(theme: ThemeName): Promise<string> {
           theme,
         )(
           'Found existing Zed Shift+Enter key binding. Remove it to continue.',
-        )}${EOL}${chalk.dim(`See ${formatPathLink(keymapPath)}`)}${EOL}`
+        )}${EOL}${chalk.dim(`See ${formatPathLink(keymapPath)}`)}${EOL}`;
       }
 
       // Create backup
-      const randomSha = randomBytes(4).toString('hex')
-      const backupPath = `${keymapPath}.${randomSha}.bak`
+      const randomSha = randomBytes(4).toString('hex');
+      const backupPath = `${keymapPath}.${randomSha}.bak`;
       try {
-        await copyFile(keymapPath, backupPath)
+        await copyFile(keymapPath, backupPath);
       } catch {
         return `${color(
           'warning',
           theme,
         )(
           'Error backing up existing Zed keymap. Bailing out.',
-        )}${EOL}${chalk.dim(`See ${formatPathLink(keymapPath)}`)}${EOL}${chalk.dim(`Backup path: ${formatPathLink(backupPath)}`)}${EOL}`
+        )}${EOL}${chalk.dim(`See ${formatPathLink(keymapPath)}`)}${EOL}${chalk.dim(`Backup path: ${formatPathLink(backupPath)}`)}${EOL}`;
       }
     }
 
     // Parse and modify the keymap
     let keymap: Array<{
-      context?: string
-      bindings: Record<string, string | string[]>
-    }>
+      context?: string;
+      bindings: Record<string, string | string[]>;
+    }>;
     try {
-      keymap = jsonParse(keymapContent)
+      keymap = jsonParse(keymapContent);
       if (!Array.isArray(keymap)) {
-        keymap = []
+        keymap = [];
       }
     } catch {
-      keymap = []
+      keymap = [];
     }
 
     // Add the new keybinding for terminal context
@@ -672,21 +633,19 @@ async function installBindingsForZed(theme: ThemeName): Promise<string> {
       bindings: {
         'shift-enter': ['terminal::SendText', '\u001b\r'],
       },
-    })
+    });
 
     // Write the updated keymap
     await writeFile(keymapPath, jsonStringify(keymap, null, 2) + '\n', {
       encoding: 'utf-8',
-    })
+    });
 
     return `${color(
       'success',
       theme,
-    )(
-      'Installed Zed Shift+Enter key binding',
-    )}${EOL}${chalk.dim(`See ${formatPathLink(keymapPath)}`)}${EOL}`
+    )('Installed Zed Shift+Enter key binding')}${EOL}${chalk.dim(`See ${formatPathLink(keymapPath)}`)}${EOL}`;
   } catch (error) {
-    logError(error)
-    throw new Error('Failed to install Zed Shift+Enter key binding')
+    logError(error);
+    throw new Error('Failed to install Zed Shift+Enter key binding');
   }
 }
diff --git a/src/commands/theme/theme.tsx b/src/commands/theme/theme.tsx
index 26d4bd1aa..3411b1db0 100644
--- a/src/commands/theme/theme.tsx
+++ b/src/commands/theme/theme.tsx
@@ -1,36 +1,33 @@
-import * as React from 'react'
-import type { CommandResultDisplay } from '../../commands.js'
-import { Pane } from '@anthropic/ink'
-import { ThemePicker } from '../../components/ThemePicker.js'
-import { useTheme } from '@anthropic/ink'
-import type { LocalJSXCommandCall } from '../../types/command.js'
+import * as React from 'react';
+import type { CommandResultDisplay } from '../../commands.js';
+import { Pane } from '@anthropic/ink';
+import { ThemePicker } from '../../components/ThemePicker.js';
+import { useTheme } from '@anthropic/ink';
+import type { LocalJSXCommandCall } from '../../types/command.js';
 
 type Props = {
-  onDone: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-}
+  onDone: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+};
 
 function ThemePickerCommand({ onDone }: Props): React.ReactNode {
-  const [, setTheme] = useTheme()
+  const [, setTheme] = useTheme();
 
   return (
     <Pane color="permission">
       <ThemePicker
         onThemeSelect={setting => {
-          setTheme(setting)
-          onDone(`Theme set to ${setting}`)
+          setTheme(setting);
+          onDone(`Theme set to ${setting}`);
         }}
         onCancel={() => {
-          onDone('Theme picker dismissed', { display: 'system' })
+          onDone('Theme picker dismissed', { display: 'system' });
         }}
         skipExitHandling={true}
       />
     </Pane>
-  )
+  );
 }
 
 export const call: LocalJSXCommandCall = async (onDone, _context) => {
-  return <ThemePickerCommand onDone={onDone} />
-}
+  return <ThemePickerCommand onDone={onDone} />;
+};
diff --git a/src/commands/thinkback/thinkback.tsx b/src/commands/thinkback/thinkback.tsx
index 1986cd4ed..72ed87dc2 100644
--- a/src/commands/thinkback/thinkback.tsx
+++ b/src/commands/thinkback/thinkback.tsx
@@ -1,83 +1,76 @@
-import { execa } from 'execa'
-import { readFile } from 'fs/promises'
-import { join } from 'path'
-import * as React from 'react'
-import { useCallback, useEffect, useState } from 'react'
-import type { CommandResultDisplay } from '../../commands.js'
-import { Select } from '../../components/CustomSelect/select.js'
-import { Dialog } from '@anthropic/ink'
-import { Spinner } from '../../components/Spinner.js'
-import { Box, Text, instances } from '@anthropic/ink'
-import { enablePluginOp } from '../../services/plugins/pluginOperations.js'
-import { logForDebugging } from '../../utils/debug.js'
-import { isENOENT, toError } from '../../utils/errors.js'
-import { execFileNoThrow } from '../../utils/execFileNoThrow.js'
-import { pathExists } from '../../utils/file.js'
-import { logError } from '../../utils/log.js'
-import { getPlatform } from '../../utils/platform.js'
-import { clearAllCaches } from '../../utils/plugins/cacheUtils.js'
-import { isPluginInstalled } from '../../utils/plugins/installedPluginsManager.js'
+import { execa } from 'execa';
+import { readFile } from 'fs/promises';
+import { join } from 'path';
+import * as React from 'react';
+import { useCallback, useEffect, useState } from 'react';
+import type { CommandResultDisplay } from '../../commands.js';
+import { Select } from '../../components/CustomSelect/select.js';
+import { Dialog } from '@anthropic/ink';
+import { Spinner } from '../../components/Spinner.js';
+import { Box, Text, instances } from '@anthropic/ink';
+import { enablePluginOp } from '../../services/plugins/pluginOperations.js';
+import { logForDebugging } from '../../utils/debug.js';
+import { isENOENT, toError } from '../../utils/errors.js';
+import { execFileNoThrow } from '../../utils/execFileNoThrow.js';
+import { pathExists } from '../../utils/file.js';
+import { logError } from '../../utils/log.js';
+import { getPlatform } from '../../utils/platform.js';
+import { clearAllCaches } from '../../utils/plugins/cacheUtils.js';
+import { isPluginInstalled } from '../../utils/plugins/installedPluginsManager.js';
 import {
   addMarketplaceSource,
   clearMarketplacesCache,
   loadKnownMarketplacesConfig,
   refreshMarketplace,
-} from '../../utils/plugins/marketplaceManager.js'
-import { OFFICIAL_MARKETPLACE_NAME } from '../../utils/plugins/officialMarketplace.js'
-import { loadAllPlugins } from '../../utils/plugins/pluginLoader.js'
-import { installSelectedPlugins } from '../../utils/plugins/pluginStartupCheck.js'
+} from '../../utils/plugins/marketplaceManager.js';
+import { OFFICIAL_MARKETPLACE_NAME } from '../../utils/plugins/officialMarketplace.js';
+import { loadAllPlugins } from '../../utils/plugins/pluginLoader.js';
+import { installSelectedPlugins } from '../../utils/plugins/pluginStartupCheck.js';
 
 // Marketplace and plugin identifiers - varies by user type
-const INTERNAL_MARKETPLACE_NAME = 'claude-code-marketplace'
-const INTERNAL_MARKETPLACE_REPO = 'anthropics/claude-code-marketplace'
-const OFFICIAL_MARKETPLACE_REPO = 'anthropics/claude-plugins-official'
+const INTERNAL_MARKETPLACE_NAME = 'claude-code-marketplace';
+const INTERNAL_MARKETPLACE_REPO = 'anthropics/claude-code-marketplace';
+const OFFICIAL_MARKETPLACE_REPO = 'anthropics/claude-plugins-official';
 
 function getMarketplaceName(): string {
-  return process.env.USER_TYPE === 'ant'
-    ? INTERNAL_MARKETPLACE_NAME
-    : OFFICIAL_MARKETPLACE_NAME
+  return process.env.USER_TYPE === 'ant' ? INTERNAL_MARKETPLACE_NAME : OFFICIAL_MARKETPLACE_NAME;
 }
 
 function getMarketplaceRepo(): string {
-  return process.env.USER_TYPE === 'ant'
-    ? INTERNAL_MARKETPLACE_REPO
-    : OFFICIAL_MARKETPLACE_REPO
+  return process.env.USER_TYPE === 'ant' ? INTERNAL_MARKETPLACE_REPO : OFFICIAL_MARKETPLACE_REPO;
 }
 
 function getPluginId(): string {
-  return `thinkback@${getMarketplaceName()}`
+  return `thinkback@${getMarketplaceName()}`;
 }
 
-const SKILL_NAME = 'thinkback'
+const SKILL_NAME = 'thinkback';
 
 /**
  * Get the thinkback skill directory from the installed plugin's cache path
  */
 async function getThinkbackSkillDir(): Promise<string | null> {
-  const { enabled } = await loadAllPlugins()
-  const thinkbackPlugin = enabled.find(
-    p =>
-      p.name === 'thinkback' || (p.source && p.source.includes(getPluginId())),
-  )
+  const { enabled } = await loadAllPlugins();
+  const thinkbackPlugin = enabled.find(p => p.name === 'thinkback' || (p.source && p.source.includes(getPluginId())));
 
   if (!thinkbackPlugin) {
-    return null
+    return null;
   }
 
-  const skillDir = join(thinkbackPlugin.path, 'skills', SKILL_NAME)
+  const skillDir = join(thinkbackPlugin.path, 'skills', SKILL_NAME);
   if (await pathExists(skillDir)) {
-    return skillDir
+    return skillDir;
   }
 
-  return null
+  return null;
 }
 
 export async function playAnimation(skillDir: string): Promise<{
-  success: boolean
-  message: string
+  success: boolean;
+  message: string;
 }> {
-  const dataPath = join(skillDir, 'year_in_review.js')
-  const playerPath = join(skillDir, 'player.js')
+  const dataPath = join(skillDir, 'year_in_review.js');
+  const playerPath = join(skillDir, 'player.js');
 
   // Both files are prerequisites for the node subprocess. Read them here
   // (not at call sites) so all callers get consistent error messaging. The
@@ -88,71 +81,65 @@ export async function playAnimation(skillDir: string): Promise<{
   // than thrown — the old pathExists-based code never threw, and one caller
   // (handleSelect) uses `void playAnimation().then(...)` without a .catch().
   try {
-    await readFile(dataPath)
+    await readFile(dataPath);
   } catch (e: unknown) {
     if (isENOENT(e)) {
       return {
         success: false,
         message: 'No animation found. Run /think-back first to generate one.',
-      }
+      };
     }
-    logError(e)
+    logError(e);
     return {
       success: false,
       message: `Could not access animation data: ${toError(e).message}`,
-    }
+    };
   }
 
   try {
-    await readFile(playerPath)
+    await readFile(playerPath);
   } catch (e: unknown) {
     if (isENOENT(e)) {
       return {
         success: false,
-        message:
-          'Player script not found. The player.js file is missing from the thinkback skill.',
-      }
+        message: 'Player script not found. The player.js file is missing from the thinkback skill.',
+      };
     }
-    logError(e)
+    logError(e);
     return {
       success: false,
       message: `Could not access player script: ${toError(e).message}`,
-    }
+    };
   }
 
   // Get ink instance for terminal takeover
-  const inkInstance = instances.get(process.stdout)
+  const inkInstance = instances.get(process.stdout);
   if (!inkInstance) {
-    return { success: false, message: 'Failed to access terminal instance' }
+    return { success: false, message: 'Failed to access terminal instance' };
   }
 
-  inkInstance.enterAlternateScreen()
+  inkInstance.enterAlternateScreen();
   try {
     await execa('node', [playerPath], {
       stdio: 'inherit',
       cwd: skillDir,
       reject: false,
-    })
+    });
   } catch {
     // Animation may have been interrupted (e.g., Ctrl+C)
   } finally {
-    inkInstance.exitAlternateScreen()
+    inkInstance.exitAlternateScreen();
   }
 
   // Open the HTML file in browser for video download
-  const htmlPath = join(skillDir, 'year_in_review.html')
+  const htmlPath = join(skillDir, 'year_in_review.html');
   if (await pathExists(htmlPath)) {
-    const platform = getPlatform()
-    const openCmd =
-      platform === 'macos'
-        ? 'open'
-        : platform === 'windows'
-          ? 'start'
-          : 'xdg-open'
-    void execFileNoThrow(openCmd, [htmlPath])
+    const platform = getPlatform();
+    const openCmd = platform === 'macos' ? 'open' : platform === 'windows' ? 'start' : 'xdg-open';
+    void execFileNoThrow(openCmd, [htmlPath]);
   }
 
-  return { success: true, message: 'Year in review animation complete!' }
+  return { success: true, message: 'Year in review animation complete!' };
 }
 
 type InstallState =
@@ -161,122 +148,113 @@ type InstallState =
   | { phase: 'installing-plugin' }
   | { phase: 'enabling-plugin' }
   | { phase: 'ready' }
-  | { phase: 'error'; message: string }
+  | { phase: 'error'; message: string };
 
 function ThinkbackInstaller({
   onReady,
   onError,
 }: {
-  onReady: () => void
-  onError: (message: string) => void
+  onReady: () => void;
+  onError: (message: string) => void;
 }): React.ReactNode {
-  const [state, setState] = useState<InstallState>({ phase: 'checking' })
-  const [progressMessage, setProgressMessage] = useState('')
+  const [state, setState] = useState<InstallState>({ phase: 'checking' });
+  const [progressMessage, setProgressMessage] = useState('');
 
   useEffect(() => {
     async function checkAndInstall(): Promise<void> {
       try {
         // Check if marketplace is installed
-        const knownMarketplaces = await loadKnownMarketplacesConfig()
-        const marketplaceName = getMarketplaceName()
-        const marketplaceRepo = getMarketplaceRepo()
-        const pluginId = getPluginId()
-        const marketplaceInstalled = marketplaceName in knownMarketplaces
+        const knownMarketplaces = await loadKnownMarketplacesConfig();
+        const marketplaceName = getMarketplaceName();
+        const marketplaceRepo = getMarketplaceRepo();
+        const pluginId = getPluginId();
+        const marketplaceInstalled = marketplaceName in knownMarketplaces;
 
         // Check if plugin is already installed first
-        const pluginAlreadyInstalled = isPluginInstalled(pluginId)
+        const pluginAlreadyInstalled = isPluginInstalled(pluginId);
 
         if (!marketplaceInstalled) {
           // Install the marketplace
-          setState({ phase: 'installing-marketplace' })
-          logForDebugging(`Installing marketplace ${marketplaceRepo}`)
+          setState({ phase: 'installing-marketplace' });
+          logForDebugging(`Installing marketplace ${marketplaceRepo}`);
 
-          await addMarketplaceSource(
-            { source: 'github', repo: marketplaceRepo },
-            message => {
-              setProgressMessage(message)
-            },
-          )
-          clearAllCaches()
-          logForDebugging(`Marketplace ${marketplaceName} installed`)
+          await addMarketplaceSource({ source: 'github', repo: marketplaceRepo }, message => {
+            setProgressMessage(message);
+          });
+          clearAllCaches();
+          logForDebugging(`Marketplace ${marketplaceName} installed`);
         } else if (!pluginAlreadyInstalled) {
           // Marketplace installed but plugin not installed - refresh to get latest plugins
           // Only refresh when needed to avoid potentially destructive git operations
-          setState({ phase: 'installing-marketplace' })
-          setProgressMessage('Updating marketplace…')
-          logForDebugging(`Refreshing marketplace ${marketplaceName}`)
+          setState({ phase: 'installing-marketplace' });
+          setProgressMessage('Updating marketplace…');
+          logForDebugging(`Refreshing marketplace ${marketplaceName}`);
 
           await refreshMarketplace(marketplaceName, message => {
-            setProgressMessage(message)
-          })
-          clearMarketplacesCache()
-          clearAllCaches()
-          logForDebugging(`Marketplace ${marketplaceName} refreshed`)
+            setProgressMessage(message);
+          });
+          clearMarketplacesCache();
+          clearAllCaches();
+          logForDebugging(`Marketplace ${marketplaceName} refreshed`);
         }
 
         if (!pluginAlreadyInstalled) {
           // Install the plugin
-          setState({ phase: 'installing-plugin' })
-          logForDebugging(`Installing plugin ${pluginId}`)
+          setState({ phase: 'installing-plugin' });
+          logForDebugging(`Installing plugin ${pluginId}`);
 
-          const result = await installSelectedPlugins([pluginId])
+          const result = await installSelectedPlugins([pluginId]);
 
           if (result.failed.length > 0) {
-            const errorMsg = result.failed
-              .map(f => `${f.name}: ${f.error}`)
-              .join(', ')
-            throw new Error(`Failed to install plugin: ${errorMsg}`)
+            const errorMsg = result.failed.map(f => `${f.name}: ${f.error}`).join(', ');
+            throw new Error(`Failed to install plugin: ${errorMsg}`);
           }
 
-          clearAllCaches()
-          logForDebugging(`Plugin ${pluginId} installed`)
+          clearAllCaches();
+          logForDebugging(`Plugin ${pluginId} installed`);
         } else {
           // Plugin is installed, check if it's enabled
-          const { disabled } = await loadAllPlugins()
-          const isDisabled = disabled.some(
-            p => p.name === 'thinkback' || p.source?.includes(pluginId),
-          )
+          const { disabled } = await loadAllPlugins();
+          const isDisabled = disabled.some(p => p.name === 'thinkback' || p.source?.includes(pluginId));
 
           if (isDisabled) {
             // Enable the plugin
-            setState({ phase: 'enabling-plugin' })
-            logForDebugging(`Enabling plugin ${pluginId}`)
+            setState({ phase: 'enabling-plugin' });
+            logForDebugging(`Enabling plugin ${pluginId}`);
 
-            const enableResult = await enablePluginOp(pluginId)
+            const enableResult = await enablePluginOp(pluginId);
             if (!enableResult.success) {
-              throw new Error(
-                `Failed to enable plugin: ${enableResult.message}`,
-              )
+              throw new Error(`Failed to enable plugin: ${enableResult.message}`);
             }
 
-            clearAllCaches()
-            logForDebugging(`Plugin ${pluginId} enabled`)
+            clearAllCaches();
+            logForDebugging(`Plugin ${pluginId} enabled`);
           }
         }
 
-        setState({ phase: 'ready' })
-        onReady()
+        setState({ phase: 'ready' });
+        onReady();
       } catch (error) {
-        const err = toError(error)
-        logError(err)
-        setState({ phase: 'error', message: err.message })
-        onError(err.message)
+        const err = toError(error);
+        logError(err);
+        setState({ phase: 'error', message: err.message });
+        onError(err.message);
       }
     }
 
-    void checkAndInstall()
-  }, [onReady, onError])
+    void checkAndInstall();
+  }, [onReady, onError]);
 
   if (state.phase === 'error') {
     return (
       <Box flexDirection="column">
         <Text color="error">Error: {state.message}</Text>
       </Box>
-    )
+    );
   }
 
   if (state.phase === 'ready') {
-    return null
+    return null;
   }
 
   const statusMessage =
@@ -286,7 +264,7 @@ function ThinkbackInstaller({
         ? 'Installing marketplace…'
         : state.phase === 'enabling-plugin'
           ? 'Enabling thinkback plugin…'
-          : 'Installing thinkback plugin…'
+          : 'Installing thinkback plugin…';
 
   return (
     <Box flexDirection="column">
@@ -295,11 +273,11 @@ function ThinkbackInstaller({
         <Text>{progressMessage || statusMessage}</Text>
       </Box>
     </Box>
-  )
+  );
 }
 
-type MenuAction = 'play' | 'edit' | 'fix' | 'regenerate'
-type GenerativeAction = Exclude<MenuAction, 'play'>
+type MenuAction = 'play' | 'edit' | 'fix' | 'regenerate';
+type GenerativeAction = Exclude<MenuAction, 'play'>;
 
 function ThinkbackMenu({
   onDone,
@@ -307,15 +285,12 @@ function ThinkbackMenu({
   skillDir,
   hasGenerated,
 }: {
-  onDone: (
-    result?: string,
-    options?: { display?: CommandResultDisplay; shouldQuery?: boolean },
-  ) => void
-  onAction: (action: GenerativeAction) => void
-  skillDir: string
-  hasGenerated: boolean
+  onDone: (result?: string, options?: { display?: CommandResultDisplay; shouldQuery?: boolean }) => void;
+  onAction: (action: GenerativeAction) => void;
+  skillDir: string;
+  hasGenerated: boolean;
 }): React.ReactNode {
-  const [hasSelected, setHasSelected] = useState(false)
+  const [hasSelected, setHasSelected] = useState(false);
 
   const options = hasGenerated
     ? [
@@ -346,26 +321,26 @@ function ThinkbackMenu({
           value: 'regenerate' as const,
           description: 'Generate your personalized animation',
         },
-      ]
+      ];
 
   function handleSelect(value: MenuAction): void {
-    setHasSelected(true)
+    setHasSelected(true);
     if (value === 'play') {
       // Play runs the terminal-takeover animation, then signal done with skip
       void playAnimation(skillDir).then(() => {
-        onDone(undefined, { display: 'skip' })
-      })
+        onDone(undefined, { display: 'skip' });
+      });
     } else {
-      onAction(value)
+      onAction(value);
     }
   }
 
   function handleCancel(): void {
-    onDone(undefined, { display: 'skip' })
+    onDone(undefined, { display: 'skip' });
   }
 
   if (hasSelected) {
-    return null
+    return null;
   }
 
   return (
@@ -380,91 +355,77 @@ function ThinkbackMenu({
         {!hasGenerated && (
           <Box flexDirection="column">
             <Text>Relive your year of coding with Claude.</Text>
-            <Text dimColor>
-              {
-                "We'll create a personalized ASCII animation celebrating your journey."
-              }
-            </Text>
+            <Text dimColor>{"We'll create a personalized ASCII animation celebrating your journey."}</Text>
           </Box>
         )}
 
         {/* Menu */}
-        <Select
-          options={options}
-          onChange={handleSelect}
-          visibleOptionCount={5}
-        />
+        <Select options={options} onChange={handleSelect} visibleOptionCount={5} />
       </Box>
     </Dialog>
-  )
+  );
 }
 
 const EDIT_PROMPT =
-  'Use the Skill tool to invoke the "thinkback" skill with mode=edit to modify my existing Claude Code year in review animation. Ask me what I want to change. When the animation is ready, tell the user to run /think-back again to play it.'
+  'Use the Skill tool to invoke the "thinkback" skill with mode=edit to modify my existing Claude Code year in review animation. Ask me what I want to change. When the animation is ready, tell the user to run /think-back again to play it.';
 
 const FIX_PROMPT =
-  'Use the Skill tool to invoke the "thinkback" skill with mode=fix to fix validation or rendering errors in my existing Claude Code year in review animation. Run the validator, identify errors, and fix them. When the animation is ready, tell the user to run /think-back again to play it.'
+  'Use the Skill tool to invoke the "thinkback" skill with mode=fix to fix validation or rendering errors in my existing Claude Code year in review animation. Run the validator, identify errors, and fix them. When the animation is ready, tell the user to run /think-back again to play it.';
 
 const REGENERATE_PROMPT =
-  'Use the Skill tool to invoke the "thinkback" skill with mode=regenerate to create a completely new Claude Code year in review animation from scratch. Delete the existing animation and start fresh. When the animation is ready, tell the user to run /think-back again to play it.'
+  'Use the Skill tool to invoke the "thinkback" skill with mode=regenerate to create a completely new Claude Code year in review animation from scratch. Delete the existing animation and start fresh. When the animation is ready, tell the user to run /think-back again to play it.';
 
 function ThinkbackFlow({
   onDone,
 }: {
-  onDone: (
-    result?: string,
-    options?: { display?: CommandResultDisplay; shouldQuery?: boolean },
-  ) => void
+  onDone: (result?: string, options?: { display?: CommandResultDisplay; shouldQuery?: boolean }) => void;
 }): React.ReactNode {
-  const [installComplete, setInstallComplete] = useState(false)
-  const [installError, setInstallError] = useState<string | null>(null)
-  const [skillDir, setSkillDir] = useState<string | null>(null)
-  const [hasGenerated, setHasGenerated] = useState<boolean | null>(null)
+  const [installComplete, setInstallComplete] = useState(false);
+  const [installError, setInstallError] = useState<string | null>(null);
+  const [skillDir, setSkillDir] = useState<string | null>(null);
+  const [hasGenerated, setHasGenerated] = useState<boolean | null>(null);
 
   function handleReady(): void {
-    setInstallComplete(true)
+    setInstallComplete(true);
   }
 
   const handleError = useCallback(
     (message: string): void => {
-      setInstallError(message)
+      setInstallError(message);
       // Call onDone with the error message so the model can continue
-      onDone(
-        `Error with thinkback: ${message}. Try running /plugin to manually install the think-back plugin.`,
-        { display: 'system' },
-      )
+      onDone(`Error with thinkback: ${message}. Try running /plugin to manually install the think-back plugin.`, {
+        display: 'system',
+      });
     },
     [onDone],
-  )
+  );
 
   useEffect(() => {
     if (installComplete && !skillDir && !installError) {
       // Get the skill directory after installation
       void getThinkbackSkillDir().then(dir => {
         if (dir) {
-          logForDebugging(`Thinkback skill directory: ${dir}`)
-          setSkillDir(dir)
+          logForDebugging(`Thinkback skill directory: ${dir}`);
+          setSkillDir(dir);
         } else {
-          handleError('Could not find thinkback skill directory')
+          handleError('Could not find thinkback skill directory');
         }
-      })
+      });
     }
-  }, [installComplete, skillDir, installError, handleError])
+  }, [installComplete, skillDir, installError, handleError]);
 
   // Check for generated file once we have skillDir
   useEffect(() => {
     if (!skillDir) {
-      return
+      return;
     }
 
-    const dataPath = join(skillDir, 'year_in_review.js')
+    const dataPath = join(skillDir, 'year_in_review.js');
     void pathExists(dataPath).then(exists => {
-      logForDebugging(
-        `Checking for ${dataPath}: ${exists ? 'found' : 'not found'}`,
-      )
-      setHasGenerated(exists)
-    })
-  }, [skillDir])
+      logForDebugging(`Checking for ${dataPath}: ${exists ? 'found' : 'not found'}`);
+      setHasGenerated(exists);
+    });
+  }, [skillDir]);
 
   function handleAction(action: GenerativeAction): void {
     // Send prompt to model based on action
@@ -472,23 +433,21 @@ function ThinkbackFlow({
       edit: EDIT_PROMPT,
       fix: FIX_PROMPT,
       regenerate: REGENERATE_PROMPT,
-    }
-    onDone(prompts[action], { display: 'user', shouldQuery: true })
+    };
+    onDone(prompts[action], { display: 'user', shouldQuery: true });
   }
 
   if (installError) {
     return (
       <Box flexDirection="column">
         <Text color="error">Error: {installError}</Text>
-        <Text dimColor>
-          Try running /plugin to manually install the think-back plugin.
-        </Text>
+        <Text dimColor>Try running /plugin to manually install the think-back plugin.</Text>
       </Box>
-    )
+    );
   }
 
   if (!installComplete) {
-    return <ThinkbackInstaller onReady={handleReady} onError={handleError} />
+    return <ThinkbackInstaller onReady={handleReady} onError={handleError} />;
   }
 
   if (!skillDir || hasGenerated === null) {
@@ -497,24 +456,14 @@ function ThinkbackFlow({
         <Spinner />
         <Text>Loading thinkback skill…</Text>
       </Box>
-    )
+    );
   }
 
-  return (
-    <ThinkbackMenu
-      onDone={onDone}
-      onAction={handleAction}
-      skillDir={skillDir}
-      hasGenerated={hasGenerated}
-    />
-  )
+  return <ThinkbackMenu onDone={onDone} onAction={handleAction} skillDir={skillDir} hasGenerated={hasGenerated} />;
 }
 
 export async function call(
-  onDone: (
-    result?: string,
-    options?: { display?: CommandResultDisplay; shouldQuery?: boolean },
-  ) => void,
+  onDone: (result?: string, options?: { display?: CommandResultDisplay; shouldQuery?: boolean }) => void,
 ): Promise<React.ReactNode> {
-  return <ThinkbackFlow onDone={onDone} />
+  return <ThinkbackFlow onDone={onDone} />;
 }
diff --git a/src/commands/ultraplan.tsx b/src/commands/ultraplan.tsx
index c04f3be49..8dfac7280 100644
--- a/src/commands/ultraplan.tsx
+++ b/src/commands/ultraplan.tsx
@@ -29,11 +29,10 @@ import {
   getPromptText,
   getDialogConfig,
   getPromptIdentifier,
-  type PromptIdentifier
+  type PromptIdentifier,
 } from '../utils/ultraplan/prompt.js';
 import { registerCleanup } from '../utils/cleanupRegistry.js';
 
-
 // TODO(prod-hardening): OAuth token may go stale over the 30min poll;
 // consider refresh.
 
@@ -47,7 +46,7 @@ const ULTRAPLAN_TIMEOUT_MS = 30 * 60 * 1000;
 export const CCR_TERMS_URL = 'https://code.claude.com/docs/en/claude-code-on-the-web';
 
 export function getUltraplanTimeoutMs(): number {
-  return getFeatureValue_CACHED_MAY_BE_STALE('tengu_ultraplan_timeout_seconds', 1800) * 1000
+  return getFeatureValue_CACHED_MAY_BE_STALE('tengu_ultraplan_timeout_seconds', 1800) * 1000;
 }
 
 /**
@@ -56,7 +55,10 @@ export function getUltraplanTimeoutMs(): number {
  * @returns
  */
 export function isUltraplanEnabled(): boolean {
-  return getFeatureValue_CACHED_MAY_BE_STALE<{enabled: boolean} | null>('tengu_ultraplan_config', { enabled: true })?.enabled === true
+  return (
+    getFeatureValue_CACHED_MAY_BE_STALE<{ enabled: boolean } | null>('tengu_ultraplan_config', { enabled: true })
+      ?.enabled === true
+  );
 }
 
 // CCR runs against the first-party API — use the canonical ID, not the
@@ -301,7 +303,8 @@ export async function launchUltraplan(opts: {
    */
   onSessionReady?: (msg: string) => void;
 }): Promise<string> {
-  const { blurb, seedPlan, promptIdentifier, getAppState, setAppState, signal, disconnectedBridge, onSessionReady } = opts;
+  const { blurb, seedPlan, promptIdentifier, getAppState, setAppState, signal, disconnectedBridge, onSessionReady } =
+    opts;
 
   const { ultraplanSessionUrl: active, ultraplanLaunching } = getAppState();
   if (active || ultraplanLaunching) {
@@ -334,7 +337,7 @@ export async function launchUltraplan(opts: {
 
   // Set synchronously before the detached flow to prevent duplicate launches
   // during the teleportToRemote window.
-  setAppState(prev => prev.ultraplanLaunching ? prev : { ...prev, ultraplanLaunching: true });
+  setAppState(prev => (prev.ultraplanLaunching ? prev : { ...prev, ultraplanLaunching: true }));
   void launchDetached({
     blurb,
     seedPlan,
@@ -356,7 +359,15 @@ async function launchDetached(opts: {
   signal: AbortSignal;
   onSessionReady?: (msg: string) => void;
 }): Promise<void> {
-  const { blurb, seedPlan, promptIdentifier = getPromptIdentifier(), getAppState, setAppState, signal, onSessionReady } = opts;
+  const {
+    blurb,
+    seedPlan,
+    promptIdentifier = getPromptIdentifier(),
+    getAppState,
+    setAppState,
+    signal,
+    onSessionReady,
+  } = opts;
   // Hoisted so the catch block can archive the remote session if an error
   // occurs after teleportToRemote succeeds (avoids 30min orphan).
   let sessionId: string | undefined;
@@ -396,13 +407,15 @@ async function launchDetached(opts: {
       onCreateFail: msg => {
         createFailMsg = msg;
       },
-    })
+    });
     if (!session) {
       let failMsg = bundleFailMsg ?? createFailMsg;
       logEvent('tengu_ultraplan_create_failed', {
         reason: (bundleFailMsg
           ? 'bundle_fail'
-          : createFailMsg ? 'create_api_fail' : 'teleport_null') as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          : createFailMsg
+            ? 'create_api_fail'
+            : 'teleport_null') as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
       });
       enqueuePendingNotification({
         value: `ultraplan: session creation failed${failMsg ? ` — ${failMsg}` : ''}. See --debug for details.`,
@@ -421,7 +434,7 @@ async function launchDetached(opts: {
     onSessionReady?.(buildSessionReadyMessage(url));
     logEvent('tengu_ultraplan_launched', {
       has_seed_plan: Boolean(seedPlan),
-      prompt_identifier: promptIdentifier as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS
+      prompt_identifier: promptIdentifier as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
       // model: model as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
     });
     // TODO(#23985): replace registerRemoteAgentTask + startDetachedPoll with
@@ -438,9 +451,9 @@ async function launchDetached(opts: {
       isUltraplan: true,
     });
     startDetachedPoll(taskId, session.id, url, getAppState, setAppState);
-    registerCleanup(async()=>{
-      if(getAppState().ultraplanSessionUrl === url) {
-         await archiveRemoteSession(session.id, 1500)
+    registerCleanup(async () => {
+      if (getAppState().ultraplanSessionUrl === url) {
+        await archiveRemoteSession(session.id, 1500);
       }
     });
   } catch (e) {
@@ -456,7 +469,7 @@ async function launchDetached(opts: {
     enqueuePendingNotification({
       value: `Ultraplan hit an unexpected error during launch. Wait for the user's next instructions.`,
       mode: 'task-notification',
-      isMeta: true
+      isMeta: true,
     });
 
     if (sessionId) {
@@ -467,11 +480,11 @@ async function launchDetached(opts: {
       );
       // ultraplanSessionUrl may have been set before the throw; clear it so
       // the "already polling" guard doesn't block future launches.
-      setAppState(prev => prev.ultraplanSessionUrl ? { ...prev, ultraplanSessionUrl: undefined } : prev);
+      setAppState(prev => (prev.ultraplanSessionUrl ? { ...prev, ultraplanSessionUrl: undefined } : prev));
     }
   } finally {
     // No-op on success: the url-setting setAppState already cleared this.
-    setAppState(prev => prev.ultraplanLaunching ? { ...prev, ultraplanLaunching: undefined } : prev);
+    setAppState(prev => (prev.ultraplanLaunching ? { ...prev, ultraplanLaunching: undefined } : prev));
   }
 }
 
diff --git a/src/commands/upgrade/upgrade.tsx b/src/commands/upgrade/upgrade.tsx
index f2041971e..06b8c9fcf 100644
--- a/src/commands/upgrade/upgrade.tsx
+++ b/src/commands/upgrade/upgrade.tsx
@@ -1,14 +1,11 @@
-import * as React from 'react'
-import type { LocalJSXCommandContext } from '../../commands.js'
-import { getOauthProfileFromOauthToken } from '../../services/oauth/getOauthProfile.js'
-import type { LocalJSXCommandOnDone } from '../../types/command.js'
-import {
-  getClaudeAIOAuthTokens,
-  isClaudeAISubscriber,
-} from '../../utils/auth.js'
-import { openBrowser } from '../../utils/browser.js'
-import { logError } from '../../utils/log.js'
-import { Login } from '../login/login.js'
+import * as React from 'react';
+import type { LocalJSXCommandContext } from '../../commands.js';
+import { getOauthProfileFromOauthToken } from '../../services/oauth/getOauthProfile.js';
+import type { LocalJSXCommandOnDone } from '../../types/command.js';
+import { getClaudeAIOAuthTokens, isClaudeAISubscriber } from '../../utils/auth.js';
+import { openBrowser } from '../../utils/browser.js';
+import { logError } from '../../utils/log.js';
+import { Login } from '../login/login.js';
 
 export async function call(
   onDone: LocalJSXCommandOnDone,
@@ -17,18 +14,16 @@ export async function call(
   try {
     // Check if user is already on the highest Max plan (20x)
     if (isClaudeAISubscriber()) {
-      const tokens = getClaudeAIOAuthTokens()
-      let isMax20x = false
+      const tokens = getClaudeAIOAuthTokens();
+      let isMax20x = false;
 
       if (tokens?.subscriptionType && tokens?.rateLimitTier) {
-        isMax20x =
-          tokens.subscriptionType === 'max' &&
-          tokens.rateLimitTier === 'default_claude_max_20x'
+        isMax20x = tokens.subscriptionType === 'max' && tokens.rateLimitTier === 'default_claude_max_20x';
       } else if (tokens?.accessToken) {
-        const profile = await getOauthProfileFromOauthToken(tokens.accessToken)
+        const profile = await getOauthProfileFromOauthToken(tokens.accessToken);
         isMax20x =
           profile?.organization?.organization_type === 'claude_max' &&
-          profile?.organization?.rate_limit_tier === 'default_claude_max_20x'
+          profile?.organization?.rate_limit_tier === 'default_claude_max_20x';
       }
 
       if (isMax20x) {
@@ -36,32 +31,26 @@ export async function call(
           onDone,
           0,
           'You are already on the highest Max subscription plan. For additional usage, run /login to switch to an API usage-billed account.',
-        )
-        return null
+        );
+        return null;
       }
     }
 
-    const url = 'https://claude.ai/upgrade/max'
-    await openBrowser(url)
+    const url = 'https://claude.ai/upgrade/max';
+    await openBrowser(url);
 
     return (
       <Login
-        startingMessage={
-          'Starting new login following /upgrade. Exit with Ctrl-C to use existing account.'
-        }
+        startingMessage={'Starting new login following /upgrade. Exit with Ctrl-C to use existing account.'}
         onDone={success => {
-          context.onChangeAPIKey()
-          onDone(success ? 'Login successful' : 'Login interrupted')
+          context.onChangeAPIKey();
+          onDone(success ? 'Login successful' : 'Login interrupted');
         }}
       />
-    )
+    );
   } catch (error) {
-    logError(error as Error)
-    setTimeout(
-      onDone,
-      0,
-      'Failed to open browser. Please visit https://claude.ai/upgrade/max to upgrade.',
-    )
+    logError(error as Error);
+    setTimeout(onDone, 0, 'Failed to open browser. Please visit https://claude.ai/upgrade/max to upgrade.');
   }
-  return null
+  return null;
 }
diff --git a/src/commands/usage/usage.tsx b/src/commands/usage/usage.tsx
index b0c1aebf7..94e271187 100644
--- a/src/commands/usage/usage.tsx
+++ b/src/commands/usage/usage.tsx
@@ -1,7 +1,7 @@
-import * as React from 'react'
-import { Settings } from '../../components/Settings/Settings.js'
-import type { LocalJSXCommandCall } from '../../types/command.js'
+import * as React from 'react';
+import { Settings } from '../../components/Settings/Settings.js';
+import type { LocalJSXCommandCall } from '../../types/command.js';
 
 export const call: LocalJSXCommandCall = async (onDone, context) => {
-  return <Settings onClose={onDone} context={context} defaultTab="Usage" />
-}
+  return <Settings onClose={onDone} context={context} defaultTab="Usage" />;
+};
diff --git a/src/commands/workflows/index.ts b/src/commands/workflows/index.ts
index aba9ca07a..03a680c0a 100644
--- a/src/commands/workflows/index.ts
+++ b/src/commands/workflows/index.ts
@@ -7,10 +7,13 @@ const call: LocalCommandCall = async (_args, _context) => {
   if (commands.length === 0) {
     return {
       type: 'text',
-      value: 'No workflows found. Add workflow files to .claude/workflows/ (YAML or Markdown).',
+      value:
+        'No workflows found. Add workflow files to .claude/workflows/ (YAML or Markdown).',
     }
   }
-  const list = commands.map((cmd) => `  /${cmd.name} - ${cmd.description}`).join('\n')
+  const list = commands
+    .map(cmd => `  /${cmd.name} - ${cmd.description}`)
+    .join('\n')
   return { type: 'text', value: `Available workflows:\n${list}` }
 }
 
diff --git a/src/components/AgentProgressLine.tsx b/src/components/AgentProgressLine.tsx
index c15a765a4..953b9cb9e 100644
--- a/src/components/AgentProgressLine.tsx
+++ b/src/components/AgentProgressLine.tsx
@@ -1,25 +1,25 @@
-import * as React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { formatNumber } from '../utils/format.js'
-import type { Theme } from '../utils/theme.js'
+import * as React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { formatNumber } from '../utils/format.js';
+import type { Theme } from '../utils/theme.js';
 
 type Props = {
-  agentType: string
-  description?: string
-  name?: string
-  descriptionColor?: keyof Theme
-  taskDescription?: string
-  toolUseCount: number
-  tokens: number | null
-  color?: keyof Theme
-  isLast: boolean
-  isResolved: boolean
-  isError: boolean
-  isAsync?: boolean
-  shouldAnimate: boolean
-  lastToolInfo?: string | null
-  hideType?: boolean
-}
+  agentType: string;
+  description?: string;
+  name?: string;
+  descriptionColor?: keyof Theme;
+  taskDescription?: string;
+  toolUseCount: number;
+  tokens: number | null;
+  color?: keyof Theme;
+  isLast: boolean;
+  isResolved: boolean;
+  isError: boolean;
+  isAsync?: boolean;
+  shouldAnimate: boolean;
+  lastToolInfo?: string | null;
+  hideType?: boolean;
+};
 
 export function AgentProgressLine({
   agentType,
@@ -38,19 +38,19 @@ export function AgentProgressLine({
   lastToolInfo,
   hideType = false,
 }: Props): React.ReactNode {
-  const treeChar = isLast ? '└─' : '├─'
-  const isBackgrounded = isAsync && isResolved
+  const treeChar = isLast ? '└─' : '├─';
+  const isBackgrounded = isAsync && isResolved;
 
   // Determine the status text
   const getStatusText = (): string => {
     if (!isResolved) {
-      return lastToolInfo || 'Initializing…'
+      return lastToolInfo || 'Initializing…';
     }
     if (isBackgrounded) {
-      return taskDescription ?? 'Running in the background'
+      return taskDescription ?? 'Running in the background';
     }
-    return 'Done'
-  }
+    return 'Done';
+  };
 
   return (
     <Box flexDirection="column">
@@ -64,20 +64,13 @@ export function AgentProgressLine({
             </>
           ) : (
             <>
-              <Text
-                bold
-                backgroundColor={color}
-                color={color ? 'inverseText' : undefined}
-              >
+              <Text bold backgroundColor={color} color={color ? 'inverseText' : undefined}>
                 {agentType}
               </Text>
               {description && (
                 <>
                   {' ('}
-                  <Text
-                    backgroundColor={descriptionColor}
-                    color={descriptionColor ? 'inverseText' : undefined}
-                  >
+                  <Text backgroundColor={descriptionColor} color={descriptionColor ? 'inverseText' : undefined}>
                     {description}
                   </Text>
                   {')'}
@@ -101,5 +94,5 @@ export function AgentProgressLine({
         </Box>
       )}
     </Box>
-  )
+  );
 }
diff --git a/src/components/App.tsx b/src/components/App.tsx
index e88ea7f10..d963499c8 100644
--- a/src/components/App.tsx
+++ b/src/components/App.tsx
@@ -1,38 +1,30 @@
-import React from 'react'
-import { FpsMetricsProvider } from '../context/fpsMetrics.js'
-import { StatsProvider, type StatsStore } from '../context/stats.js'
-import { type AppState, AppStateProvider } from '../state/AppState.js'
-import { onChangeAppState } from '../state/onChangeAppState.js'
-import type { FpsMetrics } from '../utils/fpsTracker.js'
-import { ThemeProvider } from '@anthropic/ink'
+import React from 'react';
+import { FpsMetricsProvider } from '../context/fpsMetrics.js';
+import { StatsProvider, type StatsStore } from '../context/stats.js';
+import { type AppState, AppStateProvider } from '../state/AppState.js';
+import { onChangeAppState } from '../state/onChangeAppState.js';
+import type { FpsMetrics } from '../utils/fpsTracker.js';
+import { ThemeProvider } from '@anthropic/ink';
 
 type Props = {
-  getFpsMetrics: () => FpsMetrics | undefined
-  stats?: StatsStore
-  initialState: AppState
-  children: React.ReactNode
-}
+  getFpsMetrics: () => FpsMetrics | undefined;
+  stats?: StatsStore;
+  initialState: AppState;
+  children: React.ReactNode;
+};
 
 /**
  * Top-level wrapper for interactive sessions.
  * Provides FPS metrics, stats context, and app state to the component tree.
  */
-export function App({
-  getFpsMetrics,
-  stats,
-  initialState,
-  children,
-}: Props): React.ReactNode {
+export function App({ getFpsMetrics, stats, initialState, children }: Props): React.ReactNode {
   return (
     <FpsMetricsProvider getFpsMetrics={getFpsMetrics}>
       <StatsProvider store={stats}>
-        <AppStateProvider
-          initialState={initialState}
-          onChangeAppState={onChangeAppState}
-        >
+        <AppStateProvider initialState={initialState} onChangeAppState={onChangeAppState}>
           {children}
         </AppStateProvider>
       </StatsProvider>
     </FpsMetricsProvider>
-  )
+  );
 }
diff --git a/src/components/ApproveApiKey.tsx b/src/components/ApproveApiKey.tsx
index 545e78f6f..7934c3d72 100644
--- a/src/components/ApproveApiKey.tsx
+++ b/src/components/ApproveApiKey.tsx
@@ -1,17 +1,14 @@
-import React from 'react'
-import { Text, Dialog } from '@anthropic/ink'
-import { saveGlobalConfig } from '../utils/config.js'
-import { Select } from './CustomSelect/index.js'
+import React from 'react';
+import { Text, Dialog } from '@anthropic/ink';
+import { saveGlobalConfig } from '../utils/config.js';
+import { Select } from './CustomSelect/index.js';
 
 type Props = {
-  customApiKeyTruncated: string
-  onDone(approved: boolean): void
-}
+  customApiKeyTruncated: string;
+  onDone(approved: boolean): void;
+};
 
-export function ApproveApiKey({
-  customApiKeyTruncated,
-  onDone,
-}: Props): React.ReactNode {
+export function ApproveApiKey({ customApiKeyTruncated, onDone }: Props): React.ReactNode {
   function onChange(value: 'yes' | 'no') {
     switch (value) {
       case 'yes': {
@@ -19,38 +16,28 @@ export function ApproveApiKey({
           ...current,
           customApiKeyResponses: {
             ...current.customApiKeyResponses,
-            approved: [
-              ...(current.customApiKeyResponses?.approved ?? []),
-              customApiKeyTruncated,
-            ],
+            approved: [...(current.customApiKeyResponses?.approved ?? []), customApiKeyTruncated],
           },
-        }))
-        onDone(true)
-        break
+        }));
+        onDone(true);
+        break;
       }
       case 'no': {
         saveGlobalConfig(current => ({
           ...current,
           customApiKeyResponses: {
             ...current.customApiKeyResponses,
-            rejected: [
-              ...(current.customApiKeyResponses?.rejected ?? []),
-              customApiKeyTruncated,
-            ],
+            rejected: [...(current.customApiKeyResponses?.rejected ?? []), customApiKeyTruncated],
           },
-        }))
-        onDone(false)
-        break
+        }));
+        onDone(false);
+        break;
       }
     }
   }
 
   return (
-    <Dialog
-      title="Detected a custom API key in your environment"
-      color="warning"
-      onCancel={() => onChange('no')}
-    >
+    <Dialog title="Detected a custom API key in your environment" color="warning" onCancel={() => onChange('no')}>
       <Text>
         <Text bold>ANTHROPIC_API_KEY</Text>
         <Text>: sk-ant-...{customApiKeyTruncated}</Text>
@@ -74,5 +61,5 @@ export function ApproveApiKey({
         onCancel={() => onChange('no')}
       />
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/AutoModeOptInDialog.tsx b/src/components/AutoModeOptInDialog.tsx
index 95c7eaac3..f200eea7a 100644
--- a/src/components/AutoModeOptInDialog.tsx
+++ b/src/components/AutoModeOptInDialog.tsx
@@ -1,52 +1,48 @@
-import React from 'react'
-import { logEvent } from 'src/services/analytics/index.js'
-import { Box, Dialog, Link, Text } from '@anthropic/ink'
-import { updateSettingsForSource } from '../utils/settings/settings.js'
-import { Select } from './CustomSelect/index.js'
+import React from 'react';
+import { logEvent } from 'src/services/analytics/index.js';
+import { Box, Dialog, Link, Text } from '@anthropic/ink';
+import { updateSettingsForSource } from '../utils/settings/settings.js';
+import { Select } from './CustomSelect/index.js';
 
 // NOTE: This copy is legally reviewed — do not modify without Legal team approval.
 export const AUTO_MODE_DESCRIPTION =
-  "Auto mode lets Claude handle permission prompts automatically — Claude checks each tool call for risky actions and prompt injection before executing. Actions Claude identifies as safe are executed, while actions Claude identifies as risky are blocked and Claude may try a different approach. Ideal for long-running tasks. Sessions are slightly more expensive. Claude can make mistakes that allow harmful commands to run, it's recommended to only use in isolated environments. Shift+Tab to change mode."
+  "Auto mode lets Claude handle permission prompts automatically — Claude checks each tool call for risky actions and prompt injection before executing. Actions Claude identifies as safe are executed, while actions Claude identifies as risky are blocked and Claude may try a different approach. Ideal for long-running tasks. Sessions are slightly more expensive. Claude can make mistakes that allow harmful commands to run, it's recommended to only use in isolated environments. Shift+Tab to change mode.";
 
 type Props = {
-  onAccept(): void
-  onDecline(): void
+  onAccept(): void;
+  onDecline(): void;
   // Startup gate: decline exits the process, so relabel accordingly.
-  declineExits?: boolean
-}
+  declineExits?: boolean;
+};
 
-export function AutoModeOptInDialog({
-  onAccept,
-  onDecline,
-  declineExits,
-}: Props): React.ReactNode {
+export function AutoModeOptInDialog({ onAccept, onDecline, declineExits }: Props): React.ReactNode {
   React.useEffect(() => {
-    logEvent('tengu_auto_mode_opt_in_dialog_shown', {})
-  }, [])
+    logEvent('tengu_auto_mode_opt_in_dialog_shown', {});
+  }, []);
 
   function onChange(value: 'accept' | 'accept-default' | 'decline') {
     switch (value) {
       case 'accept': {
-        logEvent('tengu_auto_mode_opt_in_dialog_accept', {})
+        logEvent('tengu_auto_mode_opt_in_dialog_accept', {});
         updateSettingsForSource('userSettings', {
           skipAutoPermissionPrompt: true,
-        })
-        onAccept()
-        break
+        });
+        onAccept();
+        break;
       }
       case 'accept-default': {
-        logEvent('tengu_auto_mode_opt_in_dialog_accept_default', {})
+        logEvent('tengu_auto_mode_opt_in_dialog_accept_default', {});
         updateSettingsForSource('userSettings', {
           skipAutoPermissionPrompt: true,
           permissions: { defaultMode: 'auto' },
-        })
-        onAccept()
-        break
+        });
+        onAccept();
+        break;
       }
       case 'decline': {
-        logEvent('tengu_auto_mode_opt_in_dialog_decline', {})
-        onDecline()
-        break
+        logEvent('tengu_auto_mode_opt_in_dialog_decline', {});
+        onDecline();
+        break;
       }
     }
   }
@@ -75,11 +71,9 @@ export function AutoModeOptInDialog({
             value: 'decline' as const,
           },
         ]}
-        onChange={value =>
-          onChange(value as 'accept' | 'accept-default' | 'decline')
-        }
+        onChange={value => onChange(value as 'accept' | 'accept-default' | 'decline')}
         onCancel={onDecline}
       />
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/AutoUpdater.tsx b/src/components/AutoUpdater.tsx
index 6e9898ada..3d468a2c6 100644
--- a/src/components/AutoUpdater.tsx
+++ b/src/components/AutoUpdater.tsx
@@ -1,12 +1,12 @@
-import * as React from 'react'
-import { useEffect, useRef, useState } from 'react'
+import * as React from 'react';
+import { useEffect, useRef, useState } from 'react';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from 'src/services/analytics/index.js'
-import { useInterval } from 'usehooks-ts'
-import { useUpdateNotification } from '../hooks/useUpdateNotification.js'
-import { Box, Text } from '@anthropic/ink'
+} from 'src/services/analytics/index.js';
+import { useInterval } from 'usehooks-ts';
+import { useUpdateNotification } from '../hooks/useUpdateNotification.js';
+import { Box, Text } from '@anthropic/ink';
 import {
   type AutoUpdaterResult,
   getLatestVersion,
@@ -14,26 +14,23 @@ import {
   type InstallStatus,
   installGlobalPackage,
   shouldSkipVersion,
-} from '../utils/autoUpdater.js'
-import { getGlobalConfig, isAutoUpdaterDisabled } from '../utils/config.js'
-import { logForDebugging } from '../utils/debug.js'
-import { getCurrentInstallationType } from '../utils/doctorDiagnostic.js'
-import {
-  installOrUpdateClaudePackage,
-  localInstallationExists,
-} from '../utils/localInstaller.js'
-import { removeInstalledSymlink } from '../utils/nativeInstaller/index.js'
-import { gt, gte } from '../utils/semver.js'
-import { getInitialSettings } from '../utils/settings/settings.js'
+} from '../utils/autoUpdater.js';
+import { getGlobalConfig, isAutoUpdaterDisabled } from '../utils/config.js';
+import { logForDebugging } from '../utils/debug.js';
+import { getCurrentInstallationType } from '../utils/doctorDiagnostic.js';
+import { installOrUpdateClaudePackage, localInstallationExists } from '../utils/localInstaller.js';
+import { removeInstalledSymlink } from '../utils/nativeInstaller/index.js';
+import { gt, gte } from '../utils/semver.js';
+import { getInitialSettings } from '../utils/settings/settings.js';
 
 type Props = {
-  isUpdating: boolean
-  onChangeIsUpdating: (isUpdating: boolean) => void
-  onAutoUpdaterResult: (autoUpdaterResult: AutoUpdaterResult) => void
-  autoUpdaterResult: AutoUpdaterResult | null
-  showSuccessMessage: boolean
-  verbose: boolean
-}
+  isUpdating: boolean;
+  onChangeIsUpdating: (isUpdating: boolean) => void;
+  onAutoUpdaterResult: (autoUpdaterResult: AutoUpdaterResult) => void;
+  autoUpdaterResult: AutoUpdaterResult | null;
+  showSuccessMessage: boolean;
+  verbose: boolean;
+};
 
 export function AutoUpdater({
   isUpdating,
@@ -44,61 +41,56 @@ export function AutoUpdater({
   verbose,
 }: Props): React.ReactNode {
   const [versions, setVersions] = useState<{
-    global?: string | null
-    latest?: string | null
-  }>({})
-  const [hasLocalInstall, setHasLocalInstall] = useState(false)
-  const updateSemver = useUpdateNotification(autoUpdaterResult?.version)
+    global?: string | null;
+    latest?: string | null;
+  }>({});
+  const [hasLocalInstall, setHasLocalInstall] = useState(false);
+  const updateSemver = useUpdateNotification(autoUpdaterResult?.version);
 
   useEffect(() => {
-    void localInstallationExists().then(setHasLocalInstall)
-  }, [])
+    void localInstallationExists().then(setHasLocalInstall);
+  }, []);
 
   // Track latest isUpdating value in a ref so the memoized checkForUpdates
   // callback always sees the current value. Without this, the 30-minute
   // interval fires with a stale closure where isUpdating is false, allowing
   // a concurrent installGlobalPackage() to run while one is already in
   // progress.
-  const isUpdatingRef = useRef(isUpdating)
-  isUpdatingRef.current = isUpdating
+  const isUpdatingRef = useRef(isUpdating);
+  isUpdatingRef.current = isUpdating;
 
   const checkForUpdates = React.useCallback(async () => {
     if (isUpdatingRef.current) {
-      return
+      return;
     }
 
-    if (
-      process.env.NODE_ENV === 'test' ||
-      process.env.NODE_ENV === 'development'
-    ) {
-      logForDebugging(
-        'AutoUpdater: Skipping update check in test/dev environment',
-      )
-      return
+    if (process.env.NODE_ENV === 'test' || process.env.NODE_ENV === 'development') {
+      logForDebugging('AutoUpdater: Skipping update check in test/dev environment');
+      return;
     }
 
-    const currentVersion = MACRO.VERSION
-    const channel = getInitialSettings()?.autoUpdatesChannel ?? 'latest'
-    let latestVersion = await getLatestVersion(channel)
-    const isDisabled = isAutoUpdaterDisabled()
+    const currentVersion = MACRO.VERSION;
+    const channel = getInitialSettings()?.autoUpdatesChannel ?? 'latest';
+    let latestVersion = await getLatestVersion(channel);
+    const isDisabled = isAutoUpdaterDisabled();
 
     // Check if max version is set (server-side kill switch for auto-updates)
-    const maxVersion = await getMaxVersion()
+    const maxVersion = await getMaxVersion();
     if (maxVersion && latestVersion && gt(latestVersion, maxVersion)) {
       logForDebugging(
         `AutoUpdater: maxVersion ${maxVersion} is set, capping update from ${latestVersion} to ${maxVersion}`,
-      )
+      );
       if (gte(currentVersion, maxVersion)) {
         logForDebugging(
           `AutoUpdater: current version ${currentVersion} is already at or above maxVersion ${maxVersion}, skipping update`,
-        )
-        setVersions({ global: currentVersion, latest: latestVersion })
-        return
+        );
+        setVersions({ global: currentVersion, latest: latestVersion });
+        return;
       }
-      latestVersion = maxVersion
+      latestVersion = maxVersion;
     }
 
-    setVersions({ global: currentVersion, latest: latestVersion })
+    setVersions({ global: currentVersion, latest: latestVersion });
 
     // Check if update needed and perform update
     if (
@@ -108,127 +100,112 @@ export function AutoUpdater({
       !gte(currentVersion, latestVersion) &&
       !shouldSkipVersion(latestVersion)
     ) {
-      const startTime = Date.now()
-      onChangeIsUpdating(true)
+      const startTime = Date.now();
+      onChangeIsUpdating(true);
 
       // Remove native installer symlink since we're using JS-based updates
       // But only if user hasn't migrated to native installation
-      const config = getGlobalConfig()
+      const config = getGlobalConfig();
       if (config.installMethod !== 'native') {
-        await removeInstalledSymlink()
+        await removeInstalledSymlink();
       }
 
       // Detect actual running installation type
-      const installationType = await getCurrentInstallationType()
-      logForDebugging(
-        `AutoUpdater: Detected installation type: ${installationType}`,
-      )
+      const installationType = await getCurrentInstallationType();
+      logForDebugging(`AutoUpdater: Detected installation type: ${installationType}`);
 
       // Skip update for development builds
       if (installationType === 'development') {
-        logForDebugging('AutoUpdater: Cannot auto-update development build')
-        onChangeIsUpdating(false)
-        return
+        logForDebugging('AutoUpdater: Cannot auto-update development build');
+        onChangeIsUpdating(false);
+        return;
       }
 
       // Choose the appropriate update method based on what's actually running
-      let installStatus: InstallStatus
-      let updateMethod: 'local' | 'global'
+      let installStatus: InstallStatus;
+      let updateMethod: 'local' | 'global';
 
       if (installationType === 'npm-local') {
         // Use local update for local installations
-        logForDebugging('AutoUpdater: Using local update method')
-        updateMethod = 'local'
-        installStatus = await installOrUpdateClaudePackage(channel)
+        logForDebugging('AutoUpdater: Using local update method');
+        updateMethod = 'local';
+        installStatus = await installOrUpdateClaudePackage(channel);
       } else if (installationType === 'npm-global') {
         // Use global update for global installations
-        logForDebugging('AutoUpdater: Using global update method')
-        updateMethod = 'global'
-        installStatus = await installGlobalPackage()
+        logForDebugging('AutoUpdater: Using global update method');
+        updateMethod = 'global';
+        installStatus = await installGlobalPackage();
       } else if (installationType === 'native') {
         // This shouldn't happen - native should use NativeAutoUpdater
-        logForDebugging(
-          'AutoUpdater: Unexpected native installation in non-native updater',
-        )
-        onChangeIsUpdating(false)
-        return
+        logForDebugging('AutoUpdater: Unexpected native installation in non-native updater');
+        onChangeIsUpdating(false);
+        return;
       } else {
         // Fallback to config-based detection for unknown types
-        logForDebugging(
-          `AutoUpdater: Unknown installation type, falling back to config`,
-        )
-        const isMigrated = config.installMethod === 'local'
-        updateMethod = isMigrated ? 'local' : 'global'
+        logForDebugging(`AutoUpdater: Unknown installation type, falling back to config`);
+        const isMigrated = config.installMethod === 'local';
+        updateMethod = isMigrated ? 'local' : 'global';
 
         if (isMigrated) {
-          installStatus = await installOrUpdateClaudePackage(channel)
+          installStatus = await installOrUpdateClaudePackage(channel);
         } else {
-          installStatus = await installGlobalPackage()
+          installStatus = await installGlobalPackage();
         }
       }
 
-      onChangeIsUpdating(false)
+      onChangeIsUpdating(false);
 
       if (installStatus === 'success') {
         logEvent('tengu_auto_updater_success', {
-          fromVersion:
-            currentVersion as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-          toVersion:
-            latestVersion as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          fromVersion: currentVersion as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          toVersion: latestVersion as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
           durationMs: Date.now() - startTime,
           wasMigrated: updateMethod === 'local',
-          installationType:
-            installationType as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        })
+          installationType: installationType as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        });
       } else {
         logEvent('tengu_auto_updater_fail', {
-          fromVersion:
-            currentVersion as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-          attemptedVersion:
-            latestVersion as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-          status:
-            installStatus as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          fromVersion: currentVersion as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          attemptedVersion: latestVersion as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          status: installStatus as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
           durationMs: Date.now() - startTime,
           wasMigrated: updateMethod === 'local',
-          installationType:
-            installationType as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        })
+          installationType: installationType as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        });
       }
 
       onAutoUpdaterResult({
         version: latestVersion,
         status: installStatus,
-      })
+      });
     }
     // isUpdating intentionally omitted from deps; we read isUpdatingRef
     // instead so the guard is always current without changing callback
     // identity (which would re-trigger the initial-check useEffect below).
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    // biome-ignore lint/correctness/useExhaustiveDependencies: isUpdating read via ref
-  }, [onAutoUpdaterResult])
+  }, [onAutoUpdaterResult]);
 
   // Initial check
   useEffect(() => {
-    void checkForUpdates()
-  }, [checkForUpdates])
+    void checkForUpdates();
+  }, [checkForUpdates]);
 
   // Check every 30 minutes
-  useInterval(checkForUpdates, 30 * 60 * 1000)
+  useInterval(checkForUpdates, 30 * 60 * 1000);
 
   if (!autoUpdaterResult?.version && (!versions.global || !versions.latest)) {
-    return null
+    return null;
   }
 
   if (!autoUpdaterResult?.version && !isUpdating) {
-    return null
+    return null;
   }
 
   return (
     <Box flexDirection="row" gap={1}>
       {verbose && (
         <Text dimColor wrap="truncate">
-          globalVersion: {versions.global} &middot; latestVersion:{' '}
-          {versions.latest}
+          globalVersion: {versions.global} &middot; latestVersion: {versions.latest}
         </Text>
       )}
       {isUpdating ? (
@@ -248,8 +225,7 @@ export function AutoUpdater({
           </Text>
         )
       )}
-      {(autoUpdaterResult?.status === 'install_failed' ||
-        autoUpdaterResult?.status === 'no_permissions') && (
+      {(autoUpdaterResult?.status === 'install_failed' || autoUpdaterResult?.status === 'no_permissions') && (
         <Text color="error" wrap="truncate">
           ✗ Auto-update failed &middot; Try <Text bold>claude doctor</Text> or{' '}
           <Text bold>
@@ -260,5 +236,5 @@ export function AutoUpdater({
         </Text>
       )}
     </Box>
-  )
+  );
 }
diff --git a/src/components/AutoUpdaterWrapper.tsx b/src/components/AutoUpdaterWrapper.tsx
index 709c776d2..f1f4c5807 100644
--- a/src/components/AutoUpdaterWrapper.tsx
+++ b/src/components/AutoUpdaterWrapper.tsx
@@ -1,21 +1,21 @@
-import { feature } from 'bun:bundle'
-import * as React from 'react'
-import type { AutoUpdaterResult } from '../utils/autoUpdater.js'
-import { isAutoUpdaterDisabled } from '../utils/config.js'
-import { logForDebugging } from '../utils/debug.js'
-import { getCurrentInstallationType } from '../utils/doctorDiagnostic.js'
-import { AutoUpdater } from './AutoUpdater.js'
-import { NativeAutoUpdater } from './NativeAutoUpdater.js'
-import { PackageManagerAutoUpdater } from './PackageManagerAutoUpdater.js'
+import { feature } from 'bun:bundle';
+import * as React from 'react';
+import type { AutoUpdaterResult } from '../utils/autoUpdater.js';
+import { isAutoUpdaterDisabled } from '../utils/config.js';
+import { logForDebugging } from '../utils/debug.js';
+import { getCurrentInstallationType } from '../utils/doctorDiagnostic.js';
+import { AutoUpdater } from './AutoUpdater.js';
+import { NativeAutoUpdater } from './NativeAutoUpdater.js';
+import { PackageManagerAutoUpdater } from './PackageManagerAutoUpdater.js';
 
 type Props = {
-  isUpdating: boolean
-  onChangeIsUpdating: (isUpdating: boolean) => void
-  onAutoUpdaterResult: (autoUpdaterResult: AutoUpdaterResult) => void
-  autoUpdaterResult: AutoUpdaterResult | null
-  showSuccessMessage: boolean
-  verbose: boolean
-}
+  isUpdating: boolean;
+  onChangeIsUpdating: (isUpdating: boolean) => void;
+  onAutoUpdaterResult: (autoUpdaterResult: AutoUpdaterResult) => void;
+  autoUpdaterResult: AutoUpdaterResult | null;
+  showSuccessMessage: boolean;
+  verbose: boolean;
+};
 
 export function AutoUpdaterWrapper({
   isUpdating,
@@ -25,41 +25,30 @@ export function AutoUpdaterWrapper({
   showSuccessMessage,
   verbose,
 }: Props): React.ReactNode {
-  const [useNativeInstaller, setUseNativeInstaller] = React.useState<
-    boolean | null
-  >(null)
-  const [isPackageManager, setIsPackageManager] = React.useState<
-    boolean | null
-  >(null)
+  const [useNativeInstaller, setUseNativeInstaller] = React.useState<boolean | null>(null);
+  const [isPackageManager, setIsPackageManager] = React.useState<boolean | null>(null);
 
   React.useEffect(() => {
     async function checkInstallation() {
       // Skip installation type detection if auto-updates are disabled (ant-only)
       // This avoids potentially slow package manager detection (spawnSync calls)
-      if (
-        feature('SKIP_DETECTION_WHEN_AUTOUPDATES_DISABLED') &&
-        isAutoUpdaterDisabled()
-      ) {
-        logForDebugging(
-          'AutoUpdaterWrapper: Skipping detection, auto-updates disabled',
-        )
-        return
+      if (feature('SKIP_DETECTION_WHEN_AUTOUPDATES_DISABLED') && isAutoUpdaterDisabled()) {
+        logForDebugging('AutoUpdaterWrapper: Skipping detection, auto-updates disabled');
+        return;
       }
 
-      const installationType = await getCurrentInstallationType()
-      logForDebugging(
-        `AutoUpdaterWrapper: Installation type: ${installationType}`,
-      )
-      setUseNativeInstaller(installationType === 'native')
-      setIsPackageManager(installationType === 'package-manager')
+      const installationType = await getCurrentInstallationType();
+      logForDebugging(`AutoUpdaterWrapper: Installation type: ${installationType}`);
+      setUseNativeInstaller(installationType === 'native');
+      setIsPackageManager(installationType === 'package-manager');
     }
 
-    void checkInstallation()
-  }, [])
+    void checkInstallation();
+  }, []);
 
   // Don't render until we know the installation type
   if (useNativeInstaller === null || isPackageManager === null) {
-    return null
+    return null;
   }
 
   if (isPackageManager) {
@@ -72,10 +61,10 @@ export function AutoUpdaterWrapper({
         onChangeIsUpdating={onChangeIsUpdating}
         showSuccessMessage={showSuccessMessage}
       />
-    )
+    );
   }
 
-  const Updater = useNativeInstaller ? NativeAutoUpdater : AutoUpdater
+  const Updater = useNativeInstaller ? NativeAutoUpdater : AutoUpdater;
 
   return (
     <Updater
@@ -86,5 +75,5 @@ export function AutoUpdaterWrapper({
       onChangeIsUpdating={onChangeIsUpdating}
       showSuccessMessage={showSuccessMessage}
     />
-  )
+  );
 }
diff --git a/src/components/AwsAuthStatusBox.tsx b/src/components/AwsAuthStatusBox.tsx
index fbe0216d7..4421b014b 100644
--- a/src/components/AwsAuthStatusBox.tsx
+++ b/src/components/AwsAuthStatusBox.tsx
@@ -1,41 +1,30 @@
-import React, { useEffect, useState } from 'react'
-import { Box, Link, Text } from '@anthropic/ink'
-import {
-  type AwsAuthStatus,
-  AwsAuthStatusManager,
-} from '../utils/awsAuthStatusManager.js'
+import React, { useEffect, useState } from 'react';
+import { Box, Link, Text } from '@anthropic/ink';
+import { type AwsAuthStatus, AwsAuthStatusManager } from '../utils/awsAuthStatusManager.js';
 
-const URL_RE = /https?:\/\/\S+/
+const URL_RE = /https?:\/\/\S+/;
 
 export function AwsAuthStatusBox(): React.ReactNode {
-  const [status, setStatus] = useState<AwsAuthStatus>(
-    AwsAuthStatusManager.getInstance().getStatus(),
-  )
+  const [status, setStatus] = useState<AwsAuthStatus>(AwsAuthStatusManager.getInstance().getStatus());
 
   useEffect(() => {
     // Subscribe to status updates
-    const unsubscribe = AwsAuthStatusManager.getInstance().subscribe(setStatus)
-    return unsubscribe
-  }, [])
+    const unsubscribe = AwsAuthStatusManager.getInstance().subscribe(setStatus);
+    return unsubscribe;
+  }, []);
 
   // Don't show anything if not authenticating and no error
   if (!status.isAuthenticating && !status.error && status.output.length === 0) {
-    return null
+    return null;
   }
 
   // Don't show if authentication succeeded (no error and not authenticating)
   if (!status.isAuthenticating && !status.error) {
-    return null
+    return null;
   }
 
   return (
-    <Box
-      flexDirection="column"
-      borderStyle="round"
-      borderColor="permission"
-      paddingX={1}
-      marginY={1}
-    >
+    <Box flexDirection="column" borderStyle="round" borderColor="permission" paddingX={1} marginY={1}>
       <Text bold color="permission">
         Cloud Authentication
       </Text>
@@ -43,25 +32,25 @@ export function AwsAuthStatusBox(): React.ReactNode {
       {status.output.length > 0 && (
         <Box flexDirection="column" marginTop={1}>
           {status.output.slice(-5).map((line, index) => {
-            const m = line.match(URL_RE)
+            const m = line.match(URL_RE);
             if (!m) {
               return (
                 <Text key={index} dimColor>
                   {line}
                 </Text>
-              )
+              );
             }
-            const url = m[0]
-            const start = m.index ?? 0
-            const before = line.slice(0, start)
-            const after = line.slice(start + url.length)
+            const url = m[0];
+            const start = m.index ?? 0;
+            const before = line.slice(0, start);
+            const after = line.slice(start + url.length);
             return (
               <Text key={index} dimColor>
                 {before}
                 <Link url={url}>{url}</Link>
                 {after}
               </Text>
-            )
+            );
           })}
         </Box>
       )}
@@ -72,5 +61,5 @@ export function AwsAuthStatusBox(): React.ReactNode {
         </Box>
       )}
     </Box>
-  )
+  );
 }
diff --git a/src/components/BaseTextInput.tsx b/src/components/BaseTextInput.tsx
index 054e6e2e0..44442ef1b 100644
--- a/src/components/BaseTextInput.tsx
+++ b/src/components/BaseTextInput.tsx
@@ -1,23 +1,20 @@
-import React from 'react'
-import { renderPlaceholder } from '../hooks/renderPlaceholder.js'
-import { usePasteHandler } from '../hooks/usePasteHandler.js'
-import { useDeclaredCursor } from '@anthropic/ink'
-import { Ansi, Box, Text, useInput } from '@anthropic/ink'
-import type {
-  BaseInputState,
-  BaseTextInputProps,
-} from '../types/textInputTypes.js'
-import type { TextHighlight } from '../utils/textHighlighting.js'
-import { HighlightedInput } from './PromptInput/ShimmeredInput.js'
+import React from 'react';
+import { renderPlaceholder } from '../hooks/renderPlaceholder.js';
+import { usePasteHandler } from '../hooks/usePasteHandler.js';
+import { useDeclaredCursor } from '@anthropic/ink';
+import { Ansi, Box, Text, useInput } from '@anthropic/ink';
+import type { BaseInputState, BaseTextInputProps } from '../types/textInputTypes.js';
+import type { TextHighlight } from '../utils/textHighlighting.js';
+import { HighlightedInput } from './PromptInput/ShimmeredInput.js';
 
 type BaseTextInputComponentProps = BaseTextInputProps & {
-  inputState: BaseInputState
-  children?: React.ReactNode
-  terminalFocus: boolean
-  highlights?: TextHighlight[]
-  invert?: (text: string) => string
-  hidePlaceholderText?: boolean
-}
+  inputState: BaseInputState;
+  children?: React.ReactNode;
+  terminalFocus: boolean;
+  highlights?: TextHighlight[];
+  invert?: (text: string) => string;
+  hidePlaceholderText?: boolean;
+};
 
 /**
  * A base component for text inputs that handles rendering and basic input
@@ -30,7 +27,7 @@ export function BaseTextInput({
   hidePlaceholderText,
   ...props
 }: BaseTextInputComponentProps): React.ReactNode {
-  const { onInput, renderedValue, cursorLine, cursorColumn } = inputState
+  const { onInput, renderedValue, cursorLine, cursorColumn } = inputState;
 
   // Park the native terminal cursor at the input caret. Terminal emulators
   // position IME preedit text at the physical cursor, and screen readers /
@@ -43,27 +40,27 @@ export function BaseTextInput({
     line: cursorLine,
     column: cursorColumn,
     active: Boolean(props.focus && props.showCursor && terminalFocus),
-  })
+  });
 
   const { wrappedOnInput, isPasting } = usePasteHandler({
     onPaste: props.onPaste,
     onInput: (input, key) => {
       // Prevent Enter key from triggering submission during paste
       if (isPasting && key.return) {
-        return
+        return;
       }
-      onInput(input, key)
+      onInput(input, key);
     },
     onImagePaste: props.onImagePaste,
-  })
+  });
 
   // Notify parent when paste state changes
-  const { onIsPastingChange } = props
+  const { onIsPastingChange } = props;
   React.useEffect(() => {
     if (onIsPastingChange) {
-      onIsPastingChange(isPasting)
+      onIsPastingChange(isPasting);
     }
-  }, [isPasting, onIsPastingChange])
+  }, [isPasting, onIsPastingChange]);
 
   const { showPlaceholder, renderedPlaceholder } = renderPlaceholder({
     placeholder: props.placeholder,
@@ -73,9 +70,9 @@ export function BaseTextInput({
     terminalFocus,
     invert,
     hidePlaceholderText,
-  })
+  });
 
-  useInput(wrappedOnInput, { isActive: props.focus })
+  useInput(wrappedOnInput, { isActive: props.focus });
 
   // Show argument hint only when we have a value and the hint is provided
   // Only show the argument hint when:
@@ -84,30 +81,21 @@ export function BaseTextInput({
   // 3. The command doesn't have arguments yet (no text after the space)
   // 4. We're actually typing a command (the value starts with /)
   const commandWithoutArgs =
-    (props.value && props.value.trim().indexOf(' ') === -1) ||
-    (props.value && props.value.endsWith(' '))
+    (props.value && props.value.trim().indexOf(' ') === -1) || (props.value && props.value.endsWith(' '));
 
   const showArgumentHint = Boolean(
-    props.argumentHint &&
-      props.value &&
-      commandWithoutArgs &&
-      props.value.startsWith('/'),
-  )
+    props.argumentHint && props.value && commandWithoutArgs && props.value.startsWith('/'),
+  );
 
   // Filter out highlights that contain the cursor position
   const cursorFiltered =
     props.showCursor && props.highlights
-      ? props.highlights.filter(
-          h =>
-            h.dimColor ||
-            props.cursorOffset < h.start ||
-            props.cursorOffset >= h.end,
-        )
-      : props.highlights
+      ? props.highlights.filter(h => h.dimColor || props.cursorOffset < h.start || props.cursorOffset >= h.end)
+      : props.highlights;
 
   // Adjust highlights for viewport windowing: highlight positions reference the
   // full input text, but renderedValue only contains the windowed subset.
-  const { viewportCharOffset, viewportCharEnd } = inputState
+  const { viewportCharOffset, viewportCharEnd } = inputState;
   const filteredHighlights =
     cursorFiltered && viewportCharOffset > 0
       ? cursorFiltered
@@ -117,17 +105,14 @@ export function BaseTextInput({
             start: Math.max(0, h.start - viewportCharOffset),
             end: h.end - viewportCharOffset,
           }))
-      : cursorFiltered
+      : cursorFiltered;
 
-  const hasHighlights = filteredHighlights && filteredHighlights.length > 0
+  const hasHighlights = filteredHighlights && filteredHighlights.length > 0;
 
   if (hasHighlights) {
     return (
       <Box ref={cursorRef}>
-        <HighlightedInput
-          text={renderedValue}
-          highlights={filteredHighlights}
-        />
+        <HighlightedInput text={renderedValue} highlights={filteredHighlights} />
         {showArgumentHint && (
           <Text dimColor>
             {props.value?.endsWith(' ') ? '' : ' '}
@@ -136,7 +121,7 @@ export function BaseTextInput({
         )}
         {children}
       </Box>
-    )
+    );
   }
 
   return (
@@ -158,5 +143,5 @@ export function BaseTextInput({
         {children}
       </Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/BashModeProgress.tsx b/src/components/BashModeProgress.tsx
index 817320220..181f56d52 100644
--- a/src/components/BashModeProgress.tsx
+++ b/src/components/BashModeProgress.tsx
@@ -1,27 +1,20 @@
-import React from 'react'
-import { Box } from '@anthropic/ink'
-import { BashTool } from '@claude-code-best/builtin-tools/tools/BashTool/BashTool.js'
-import type { ShellProgress } from '../types/tools.js'
-import { UserBashInputMessage } from './messages/UserBashInputMessage.js'
-import { ShellProgressMessage } from './shell/ShellProgressMessage.js'
+import React from 'react';
+import { Box } from '@anthropic/ink';
+import { BashTool } from '@claude-code-best/builtin-tools/tools/BashTool/BashTool.js';
+import type { ShellProgress } from '../types/tools.js';
+import { UserBashInputMessage } from './messages/UserBashInputMessage.js';
+import { ShellProgressMessage } from './shell/ShellProgressMessage.js';
 
 type Props = {
-  input: string
-  progress: ShellProgress | null
-  verbose: boolean
-}
+  input: string;
+  progress: ShellProgress | null;
+  verbose: boolean;
+};
 
-export function BashModeProgress({
-  input,
-  progress,
-  verbose,
-}: Props): React.ReactNode {
+export function BashModeProgress({ input, progress, verbose }: Props): React.ReactNode {
   return (
     <Box flexDirection="column" marginTop={1}>
-      <UserBashInputMessage
-        addMargin={false}
-        param={{ text: `<bash-input>${input}</bash-input>`, type: 'text' }}
-      />
+      <UserBashInputMessage addMargin={false} param={{ text: `<bash-input>${input}</bash-input>`, type: 'text' }} />
       {progress ? (
         <ShellProgressMessage
           fullOutput={progress.fullOutput}
@@ -38,5 +31,5 @@ export function BashModeProgress({
         })
       )}
     </Box>
-  )
+  );
 }
diff --git a/src/components/BridgeDialog.tsx b/src/components/BridgeDialog.tsx
index 14c8c8ce2..961c1cc72 100644
--- a/src/components/BridgeDialog.tsx
+++ b/src/components/BridgeDialog.tsx
@@ -1,67 +1,64 @@
-import { basename } from 'path'
-import { toString as qrToString } from 'qrcode'
-import * as React from 'react'
-import { useEffect, useState } from 'react'
-import { getOriginalCwd } from '../bootstrap/state.js'
+import { basename } from 'path';
+import { toString as qrToString } from 'qrcode';
+import * as React from 'react';
+import { useEffect, useState } from 'react';
+import { getOriginalCwd } from '../bootstrap/state.js';
 import {
   buildActiveFooterText,
   buildIdleFooterText,
   FAILED_FOOTER_TEXT,
   getBridgeStatus,
-} from '../bridge/bridgeStatusUtil.js'
-import {
-  BRIDGE_FAILED_INDICATOR,
-  BRIDGE_READY_INDICATOR,
-} from '../constants/figures.js'
-import { useRegisterOverlay } from '../context/overlayContext.js'
+} from '../bridge/bridgeStatusUtil.js';
+import { BRIDGE_FAILED_INDICATOR, BRIDGE_READY_INDICATOR } from '../constants/figures.js';
+import { useRegisterOverlay } from '../context/overlayContext.js';
 // eslint-disable-next-line custom-rules/prefer-use-keybindings -- raw 'd' key for disconnect, not a configurable keybinding action
-import { Box, Text, useInput } from '@anthropic/ink'
-import { useKeybindings } from '../keybindings/useKeybinding.js'
-import { useAppState, useSetAppState } from '../state/AppState.js'
-import { saveGlobalConfig } from '../utils/config.js'
-import { getBranch } from '../utils/git.js'
-import { Dialog } from '@anthropic/ink'
+import { Box, Text, useInput } from '@anthropic/ink';
+import { useKeybindings } from '../keybindings/useKeybinding.js';
+import { useAppState, useSetAppState } from '../state/AppState.js';
+import { saveGlobalConfig } from '../utils/config.js';
+import { getBranch } from '../utils/git.js';
+import { Dialog } from '@anthropic/ink';
 
 type Props = {
-  onDone: () => void
-}
+  onDone: () => void;
+};
 
 export function BridgeDialog({ onDone }: Props): React.ReactNode {
-  useRegisterOverlay('bridge-dialog')
+  useRegisterOverlay('bridge-dialog');
 
-  const connected = useAppState(s => s.replBridgeConnected)
-  const sessionActive = useAppState(s => s.replBridgeSessionActive)
-  const reconnecting = useAppState(s => s.replBridgeReconnecting)
-  const connectUrl = useAppState(s => s.replBridgeConnectUrl)
-  const sessionUrl = useAppState(s => s.replBridgeSessionUrl)
-  const error = useAppState(s => s.replBridgeError)
-  const explicit = useAppState(s => s.replBridgeExplicit)
-  const environmentId = useAppState(s => s.replBridgeEnvironmentId)
-  const sessionId = useAppState(s => s.replBridgeSessionId)
-  const verbose = useAppState(s => s.verbose)
-  const setAppState = useSetAppState()
+  const connected = useAppState(s => s.replBridgeConnected);
+  const sessionActive = useAppState(s => s.replBridgeSessionActive);
+  const reconnecting = useAppState(s => s.replBridgeReconnecting);
+  const connectUrl = useAppState(s => s.replBridgeConnectUrl);
+  const sessionUrl = useAppState(s => s.replBridgeSessionUrl);
+  const error = useAppState(s => s.replBridgeError);
+  const explicit = useAppState(s => s.replBridgeExplicit);
+  const environmentId = useAppState(s => s.replBridgeEnvironmentId);
+  const sessionId = useAppState(s => s.replBridgeSessionId);
+  const verbose = useAppState(s => s.verbose);
+  const setAppState = useSetAppState();
 
-  const [showQR, setShowQR] = useState(false)
-  const [qrText, setQrText] = useState('')
-  const [branchName, setBranchName] = useState('')
+  const [showQR, setShowQR] = useState(false);
+  const [qrText, setQrText] = useState('');
+  const [branchName, setBranchName] = useState('');
 
-  const repoName = basename(getOriginalCwd())
+  const repoName = basename(getOriginalCwd());
 
   // Fetch branch name on mount
   useEffect(() => {
     getBranch()
       .then(setBranchName)
-      .catch(() => {})
-  }, [])
+      .catch(() => {});
+  }, []);
 
   // The URL to display/QR: session URL when connected, connect URL when ready
-  const displayUrl = sessionActive ? sessionUrl : connectUrl
+  const displayUrl = sessionActive ? sessionUrl : connectUrl;
 
   // Generate QR code when URL changes or QR is toggled on
   useEffect(() => {
     if (!showQR || !displayUrl) {
-      setQrText('')
-      return
+      setQrText('');
+      return;
     }
     qrToString(displayUrl, {
       type: 'terminal',
@@ -69,18 +66,18 @@ export function BridgeDialog({ onDone }: Props): React.ReactNode {
       small: true,
     })
       .then(setQrText)
-      .catch(() => setQrText(''))
-  }, [showQR, displayUrl])
+      .catch(() => setQrText(''));
+  }, [showQR, displayUrl]);
 
   useKeybindings(
     {
       'confirm:yes': onDone,
       'confirm:toggle': () => {
-        setShowQR(prev => !prev)
+        setShowQR(prev => !prev);
       },
     },
     { context: 'Confirmation' },
-  )
+  );
 
   useInput(input => {
     if (input === 'd') {
@@ -90,33 +87,32 @@ export function BridgeDialog({ onDone }: Props): React.ReactNode {
       // GB-rollout user out permanently.
       if (explicit) {
         saveGlobalConfig(current => {
-          if (current.remoteControlAtStartup === false) return current
-          return { ...current, remoteControlAtStartup: false }
-        })
+          if (current.remoteControlAtStartup === false) return current;
+          return { ...current, remoteControlAtStartup: false };
+        });
       }
       setAppState(prev => {
-        if (!prev.replBridgeEnabled) return prev
-        return { ...prev, replBridgeEnabled: false }
-      })
-      onDone()
+        if (!prev.replBridgeEnabled) return prev;
+        return { ...prev, replBridgeEnabled: false };
+      });
+      onDone();
     }
-  })
+  });
 
   const { label: statusLabel, color: statusColor } = getBridgeStatus({
     error,
     connected,
     sessionActive,
     reconnecting,
-  })
-  const indicator = error ? BRIDGE_FAILED_INDICATOR : BRIDGE_READY_INDICATOR
-  const qrLines = qrText ? qrText.split('\n').filter(l => l.length > 0) : []
+  });
+  const indicator = error ? BRIDGE_FAILED_INDICATOR : BRIDGE_READY_INDICATOR;
+  const qrLines = qrText ? qrText.split('\n').filter(l => l.length > 0) : [];
 
   // Build suffix with repo and branch (matches standalone bridge format)
-  const contextParts: string[] = []
-  if (repoName) contextParts.push(repoName)
-  if (branchName) contextParts.push(branchName)
-  const contextSuffix =
-    contextParts.length > 0 ? ' \u00b7 ' + contextParts.join(' \u00b7 ') : ''
+  const contextParts: string[] = [];
+  if (repoName) contextParts.push(repoName);
+  if (branchName) contextParts.push(branchName);
+  const contextSuffix = contextParts.length > 0 ? ' \u00b7 ' + contextParts.join(' \u00b7 ') : '';
 
   // Footer text matches standalone bridge
   const footerText = error
@@ -125,7 +121,7 @@ export function BridgeDialog({ onDone }: Props): React.ReactNode {
       ? sessionActive
         ? buildActiveFooterText(displayUrl)
         : buildIdleFooterText(displayUrl)
-      : undefined
+      : undefined;
 
   return (
     <Dialog title="Remote Control" onCancel={onDone} hideInputGuide>
@@ -138,9 +134,7 @@ export function BridgeDialog({ onDone }: Props): React.ReactNode {
             <Text dimColor>{contextSuffix}</Text>
           </Text>
           {error && <Text color="error">{error}</Text>}
-          {verbose && environmentId && (
-            <Text dimColor>Environment: {environmentId}</Text>
-          )}
+          {verbose && environmentId && <Text dimColor>Environment: {environmentId}</Text>}
           {verbose && sessionId && <Text dimColor>Session: {sessionId}</Text>}
         </Box>
         {showQR && qrLines.length > 0 && (
@@ -151,10 +145,8 @@ export function BridgeDialog({ onDone }: Props): React.ReactNode {
           </Box>
         )}
         {footerText && <Text dimColor>{footerText}</Text>}
-        <Text dimColor>
-          d to disconnect · space for QR code · Enter/Esc to close
-        </Text>
+        <Text dimColor>d to disconnect · space for QR code · Enter/Esc to close</Text>
       </Box>
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/BypassPermissionsModeDialog.tsx b/src/components/BypassPermissionsModeDialog.tsx
index 8e8e40d88..cf7118ce3 100644
--- a/src/components/BypassPermissionsModeDialog.tsx
+++ b/src/components/BypassPermissionsModeDialog.tsx
@@ -1,61 +1,54 @@
-import React, { useCallback } from 'react'
-import { logEvent } from 'src/services/analytics/index.js'
-import { Box, Link, Newline, Text } from '@anthropic/ink'
-import { gracefulShutdownSync } from '../utils/gracefulShutdown.js'
-import { updateSettingsForSource } from '../utils/settings/settings.js'
-import { Select } from './CustomSelect/index.js'
-import { Dialog } from '@anthropic/ink'
+import React, { useCallback } from 'react';
+import { logEvent } from 'src/services/analytics/index.js';
+import { Box, Link, Newline, Text } from '@anthropic/ink';
+import { gracefulShutdownSync } from '../utils/gracefulShutdown.js';
+import { updateSettingsForSource } from '../utils/settings/settings.js';
+import { Select } from './CustomSelect/index.js';
+import { Dialog } from '@anthropic/ink';
 
 type Props = {
-  onAccept(): void
-}
+  onAccept(): void;
+};
 
-export function BypassPermissionsModeDialog({
-  onAccept,
-}: Props): React.ReactNode {
+export function BypassPermissionsModeDialog({ onAccept }: Props): React.ReactNode {
   React.useEffect(() => {
-    logEvent('tengu_bypass_permissions_mode_dialog_shown', {})
-  }, [])
+    logEvent('tengu_bypass_permissions_mode_dialog_shown', {});
+  }, []);
 
   function onChange(value: 'accept' | 'decline') {
     switch (value) {
       case 'accept': {
-        logEvent('tengu_bypass_permissions_mode_dialog_accept', {})
+        logEvent('tengu_bypass_permissions_mode_dialog_accept', {});
 
         updateSettingsForSource('userSettings', {
           skipDangerousModePermissionPrompt: true,
-        })
-        onAccept()
-        break
+        });
+        onAccept();
+        break;
       }
       case 'decline': {
-        gracefulShutdownSync(1)
-        break
+        gracefulShutdownSync(1);
+        break;
       }
     }
   }
 
   const handleEscape = useCallback(() => {
-    gracefulShutdownSync(0)
-  }, [])
+    gracefulShutdownSync(0);
+  }, []);
 
   return (
-    <Dialog
-      title="WARNING: Claude Code running in Bypass Permissions mode"
-      color="error"
-      onCancel={handleEscape}
-    >
+    <Dialog title="WARNING: Claude Code running in Bypass Permissions mode" color="error" onCancel={handleEscape}>
       <Box flexDirection="column" gap={1}>
         <Text>
-          In Bypass Permissions mode, Claude Code will not ask for your approval
-          before running potentially dangerous commands.
+          In Bypass Permissions mode, Claude Code will not ask for your approval before running potentially dangerous
+          commands.
           <Newline />
-          This mode should only be used in a sandboxed container/VM that has
-          restricted internet access and can easily be restored if damaged.
+          This mode should only be used in a sandboxed container/VM that has restricted internet access and can easily
+          be restored if damaged.
         </Text>
         <Text>
-          By proceeding, you accept all responsibility for actions taken while
-          running in Bypass Permissions mode.
+          By proceeding, you accept all responsibility for actions taken while running in Bypass Permissions mode.
         </Text>
 
         <Link url="https://code.claude.com/docs/en/security" />
@@ -69,5 +62,5 @@ export function BypassPermissionsModeDialog({
         onChange={value => onChange(value as 'accept' | 'decline')}
       />
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/ChannelDowngradeDialog.tsx b/src/components/ChannelDowngradeDialog.tsx
index 5122dda7b..9d5379bbb 100644
--- a/src/components/ChannelDowngradeDialog.tsx
+++ b/src/components/ChannelDowngradeDialog.tsx
@@ -1,42 +1,32 @@
-import React from 'react'
-import { Text } from '@anthropic/ink'
-import { Select } from './CustomSelect/index.js'
-import { Dialog } from '@anthropic/ink'
+import React from 'react';
+import { Text } from '@anthropic/ink';
+import { Select } from './CustomSelect/index.js';
+import { Dialog } from '@anthropic/ink';
 
-export type ChannelDowngradeChoice = 'downgrade' | 'stay' | 'cancel'
+export type ChannelDowngradeChoice = 'downgrade' | 'stay' | 'cancel';
 
 type Props = {
-  currentVersion: string
-  onChoice: (choice: ChannelDowngradeChoice) => void
-}
+  currentVersion: string;
+  onChoice: (choice: ChannelDowngradeChoice) => void;
+};
 
 /**
  * Dialog shown when switching from latest to stable channel.
  * Allows user to choose whether to downgrade or stay on current version.
  */
-export function ChannelDowngradeDialog({
-  currentVersion,
-  onChoice,
-}: Props): React.ReactNode {
+export function ChannelDowngradeDialog({ currentVersion, onChoice }: Props): React.ReactNode {
   function handleSelect(value: ChannelDowngradeChoice): void {
-    onChoice(value)
+    onChoice(value);
   }
 
   function handleCancel(): void {
-    onChoice('cancel')
+    onChoice('cancel');
   }
 
   return (
-    <Dialog
-      title="Switch to Stable Channel"
-      onCancel={handleCancel}
-      color="permission"
-      hideBorder
-      hideInputGuide
-    >
+    <Dialog title="Switch to Stable Channel" onCancel={handleCancel} color="permission" hideBorder hideInputGuide>
       <Text>
-        The stable channel may have an older version than what you&apos;re
-        currently running ({currentVersion}).
+        The stable channel may have an older version than what you&apos;re currently running ({currentVersion}).
       </Text>
       <Text dimColor>How would you like to handle this?</Text>
       <Select
@@ -53,5 +43,5 @@ export function ChannelDowngradeDialog({
         onChange={handleSelect}
       />
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/ClaudeCodeHint/PluginHintMenu.tsx b/src/components/ClaudeCodeHint/PluginHintMenu.tsx
index e461afb77..71fc91203 100644
--- a/src/components/ClaudeCodeHint/PluginHintMenu.tsx
+++ b/src/components/ClaudeCodeHint/PluginHintMenu.tsx
@@ -1,17 +1,17 @@
-import * as React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { Select } from '../CustomSelect/select.js'
-import { PermissionDialog } from '../permissions/PermissionDialog.js'
+import * as React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { Select } from '../CustomSelect/select.js';
+import { PermissionDialog } from '../permissions/PermissionDialog.js';
 
 type Props = {
-  pluginName: string
-  pluginDescription?: string
-  marketplaceName: string
-  sourceCommand: string
-  onResponse: (response: 'yes' | 'no' | 'disable') => void
-}
+  pluginName: string;
+  pluginDescription?: string;
+  marketplaceName: string;
+  sourceCommand: string;
+  onResponse: (response: 'yes' | 'no' | 'disable') => void;
+};
 
-const AUTO_DISMISS_MS = 30_000
+const AUTO_DISMISS_MS = 30_000;
 
 export function PluginHintMenu({
   pluginName,
@@ -20,28 +20,24 @@ export function PluginHintMenu({
   sourceCommand,
   onResponse,
 }: Props): React.ReactNode {
-  const onResponseRef = React.useRef(onResponse)
-  onResponseRef.current = onResponse
+  const onResponseRef = React.useRef(onResponse);
+  onResponseRef.current = onResponse;
 
   React.useEffect(() => {
-    const timeoutId = setTimeout(
-      ref => ref.current('no'),
-      AUTO_DISMISS_MS,
-      onResponseRef,
-    )
-    return () => clearTimeout(timeoutId)
-  }, [])
+    const timeoutId = setTimeout(ref => ref.current('no'), AUTO_DISMISS_MS, onResponseRef);
+    return () => clearTimeout(timeoutId);
+  }, []);
 
   function onSelect(value: string): void {
     switch (value) {
       case 'yes':
-        onResponse('yes')
-        break
+        onResponse('yes');
+        break;
       case 'disable':
-        onResponse('disable')
-        break
+        onResponse('disable');
+        break;
       default:
-        onResponse('no')
+        onResponse('no');
     }
   }
 
@@ -62,15 +58,14 @@ export function PluginHintMenu({
       label: "No, and don't show plugin installation hints again",
       value: 'disable',
     },
-  ]
+  ];
 
   return (
     <PermissionDialog title="Plugin Recommendation">
       <Box flexDirection="column" paddingX={2} paddingY={1}>
         <Box marginBottom={1}>
           <Text dimColor>
-            The <Text bold>{sourceCommand}</Text> command suggests installing a
-            plugin.
+            The <Text bold>{sourceCommand}</Text> command suggests installing a plugin.
           </Text>
         </Box>
         <Box>
@@ -90,13 +85,9 @@ export function PluginHintMenu({
           <Text>Would you like to install it?</Text>
         </Box>
         <Box>
-          <Select
-            options={options}
-            onChange={onSelect}
-            onCancel={() => onResponse('no')}
-          />
+          <Select options={options} onChange={onSelect} onCancel={() => onResponse('no')} />
         </Box>
       </Box>
     </PermissionDialog>
-  )
+  );
 }
diff --git a/src/components/ClaudeInChromeOnboarding.tsx b/src/components/ClaudeInChromeOnboarding.tsx
index ad2ca096c..a722010cb 100644
--- a/src/components/ClaudeInChromeOnboarding.tsx
+++ b/src/components/ClaudeInChromeOnboarding.tsx
@@ -1,61 +1,54 @@
-import React from 'react'
-import { logEvent } from 'src/services/analytics/index.js'
+import React from 'react';
+import { logEvent } from 'src/services/analytics/index.js';
 // eslint-disable-next-line custom-rules/prefer-use-keybindings -- enter to continue
-import { Box, Dialog, Link, Newline, Text, useInput } from '@anthropic/ink'
-import { isChromeExtensionInstalled } from '../utils/claudeInChrome/setup.js'
-import { saveGlobalConfig } from '../utils/config.js'
+import { Box, Dialog, Link, Newline, Text, useInput } from '@anthropic/ink';
+import { isChromeExtensionInstalled } from '../utils/claudeInChrome/setup.js';
+import { saveGlobalConfig } from '../utils/config.js';
 
-const CHROME_EXTENSION_URL = 'https://claude.ai/chrome'
-const CHROME_PERMISSIONS_URL = 'https://clau.de/chrome/permissions'
+const CHROME_EXTENSION_URL = 'https://claude.ai/chrome';
+const CHROME_PERMISSIONS_URL = 'https://clau.de/chrome/permissions';
 
 type Props = {
-  onDone(): void
-}
+  onDone(): void;
+};
 
 export function ClaudeInChromeOnboarding({ onDone }: Props): React.ReactNode {
-  const [isExtensionInstalled, setIsExtensionInstalled] = React.useState(false)
+  const [isExtensionInstalled, setIsExtensionInstalled] = React.useState(false);
 
   React.useEffect(() => {
-    logEvent('tengu_claude_in_chrome_onboarding_shown', {})
-    void isChromeExtensionInstalled().then(setIsExtensionInstalled)
+    logEvent('tengu_claude_in_chrome_onboarding_shown', {});
+    void isChromeExtensionInstalled().then(setIsExtensionInstalled);
     saveGlobalConfig(current => {
-      return { ...current, hasCompletedClaudeInChromeOnboarding: true }
-    })
-  }, [])
+      return { ...current, hasCompletedClaudeInChromeOnboarding: true };
+    });
+  }, []);
 
   // Handle Enter to continue
   useInput((_input, key) => {
     if (key.return) {
-      onDone()
+      onDone();
     }
-  })
+  });
 
   return (
-    <Dialog
-      title="Claude in Chrome (Beta)"
-      onCancel={onDone}
-      color="chromeYellow"
-    >
+    <Dialog title="Claude in Chrome (Beta)" onCancel={onDone} color="chromeYellow">
       <Box flexDirection="column" gap={1}>
         <Text>
-          Claude in Chrome works with the Chrome extension to let you control
-          your browser directly from Claude Code. You can navigate websites,
-          fill forms, capture screenshots, record GIFs, and debug with console
-          logs and network requests.
+          Claude in Chrome works with the Chrome extension to let you control your browser directly from Claude Code.
+          You can navigate websites, fill forms, capture screenshots, record GIFs, and debug with console logs and
+          network requests.
           {!isExtensionInstalled && (
             <>
               <Newline />
               <Newline />
-              Requires the Chrome extension. Get started at{' '}
-              <Link url={CHROME_EXTENSION_URL} />
+              Requires the Chrome extension. Get started at <Link url={CHROME_EXTENSION_URL} />
             </>
           )}
         </Text>
 
         <Text dimColor>
-          Site-level permissions are inherited from the Chrome extension. Manage
-          permissions in the Chrome extension settings to control which sites
-          Claude can browse, click, and type on
+          Site-level permissions are inherited from the Chrome extension. Manage permissions in the Chrome extension
+          settings to control which sites Claude can browse, click, and type on
           {isExtensionInstalled && (
             <>
               {' '}
@@ -73,5 +66,5 @@ export function ClaudeInChromeOnboarding({ onDone }: Props): React.ReactNode {
         </Text>
       </Box>
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/ClaudeMdExternalIncludesDialog.tsx b/src/components/ClaudeMdExternalIncludesDialog.tsx
index 2614010ca..2a7756d3b 100644
--- a/src/components/ClaudeMdExternalIncludesDialog.tsx
+++ b/src/components/ClaudeMdExternalIncludesDialog.tsx
@@ -1,15 +1,15 @@
-import React, { useCallback } from 'react'
-import { logEvent } from 'src/services/analytics/index.js'
-import { Box, Dialog, Link, Text } from '@anthropic/ink'
-import type { ExternalClaudeMdInclude } from '../utils/claudemd.js'
-import { saveCurrentProjectConfig } from '../utils/config.js'
-import { Select } from './CustomSelect/index.js'
+import React, { useCallback } from 'react';
+import { logEvent } from 'src/services/analytics/index.js';
+import { Box, Dialog, Link, Text } from '@anthropic/ink';
+import type { ExternalClaudeMdInclude } from '../utils/claudemd.js';
+import { saveCurrentProjectConfig } from '../utils/config.js';
+import { Select } from './CustomSelect/index.js';
 
 type Props = {
-  onDone(): void
-  isStandaloneDialog?: boolean
-  externalIncludes?: ExternalClaudeMdInclude[]
-}
+  onDone(): void;
+  isStandaloneDialog?: boolean;
+  externalIncludes?: ExternalClaudeMdInclude[];
+};
 
 export function ClaudeMdExternalIncludesDialog({
   onDone,
@@ -18,36 +18,36 @@ export function ClaudeMdExternalIncludesDialog({
 }: Props): React.ReactNode {
   React.useEffect(() => {
     // Log when dialog is shown
-    logEvent('tengu_claude_md_includes_dialog_shown', {})
-  }, [])
+    logEvent('tengu_claude_md_includes_dialog_shown', {});
+  }, []);
 
   const handleSelection = useCallback(
     (value: 'yes' | 'no') => {
       if (value === 'no') {
-        logEvent('tengu_claude_md_external_includes_dialog_declined', {})
+        logEvent('tengu_claude_md_external_includes_dialog_declined', {});
         // Mark that we've shown the dialog but it was declined
         saveCurrentProjectConfig(current => ({
           ...current,
           hasClaudeMdExternalIncludesApproved: false,
           hasClaudeMdExternalIncludesWarningShown: true,
-        }))
+        }));
       } else {
-        logEvent('tengu_claude_md_external_includes_dialog_accepted', {})
+        logEvent('tengu_claude_md_external_includes_dialog_accepted', {});
         saveCurrentProjectConfig(current => ({
           ...current,
           hasClaudeMdExternalIncludesApproved: true,
           hasClaudeMdExternalIncludesWarningShown: true,
-        }))
+        }));
       }
 
-      onDone()
+      onDone();
     },
     [onDone],
-  )
+  );
 
   const handleEscape = useCallback(() => {
-    handleSelection('no')
-  }, [handleSelection])
+    handleSelection('no');
+  }, [handleSelection]);
 
   return (
     <Dialog
@@ -58,8 +58,8 @@ export function ClaudeMdExternalIncludesDialog({
       hideInputGuide={!isStandaloneDialog}
     >
       <Text>
-        This project&apos;s CLAUDE.md imports files outside the current working
-        directory. Never allow this for third-party repositories.
+        This project&apos;s CLAUDE.md imports files outside the current working directory. Never allow this for
+        third-party repositories.
       </Text>
 
       {externalIncludes && externalIncludes.length > 0 && (
@@ -75,8 +75,7 @@ export function ClaudeMdExternalIncludesDialog({
       )}
 
       <Text dimColor>
-        Important: Only use Claude Code with files you trust. Accessing
-        untrusted files may pose security risks{' '}
+        Important: Only use Claude Code with files you trust. Accessing untrusted files may pose security risks{' '}
         <Link url="https://code.claude.com/docs/en/security" />{' '}
       </Text>
 
@@ -88,5 +87,5 @@ export function ClaudeMdExternalIncludesDialog({
         onChange={value => handleSelection(value as 'yes' | 'no')}
       />
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/ClickableImageRef.tsx b/src/components/ClickableImageRef.tsx
index 2aa6485b6..803bf291b 100644
--- a/src/components/ClickableImageRef.tsx
+++ b/src/components/ClickableImageRef.tsx
@@ -1,14 +1,14 @@
-import * as React from 'react'
-import { pathToFileURL } from 'url'
-import { Link, supportsHyperlinks, Text } from '@anthropic/ink'
-import { getStoredImagePath } from '../utils/imageStore.js'
-import type { Theme } from '../utils/theme.js'
+import * as React from 'react';
+import { pathToFileURL } from 'url';
+import { Link, supportsHyperlinks, Text } from '@anthropic/ink';
+import { getStoredImagePath } from '../utils/imageStore.js';
+import type { Theme } from '../utils/theme.js';
 
 type Props = {
-  imageId: number
-  backgroundColor?: keyof Theme
-  isSelected?: boolean
-}
+  imageId: number;
+  backgroundColor?: keyof Theme;
+  isSelected?: boolean;
+};
 
 /**
  * Renders an image reference like [Image #1] as a clickable link.
@@ -18,17 +18,13 @@ type Props = {
  * - Terminal doesn't support hyperlinks
  * - Image file is not found in the store
  */
-export function ClickableImageRef({
-  imageId,
-  backgroundColor,
-  isSelected = false,
-}: Props): React.ReactNode {
-  const imagePath = getStoredImagePath(imageId)
-  const displayText = `[Image #${imageId}]`
+export function ClickableImageRef({ imageId, backgroundColor, isSelected = false }: Props): React.ReactNode {
+  const imagePath = getStoredImagePath(imageId);
+  const displayText = `[Image #${imageId}]`;
 
   // If we have a stored image and terminal supports hyperlinks, make it clickable
   if (imagePath && supportsHyperlinks()) {
-    const fileUrl = pathToFileURL(imagePath).href
+    const fileUrl = pathToFileURL(imagePath).href;
 
     return (
       <Link
@@ -39,15 +35,11 @@ export function ClickableImageRef({
           </Text>
         }
       >
-        <Text
-          backgroundColor={backgroundColor}
-          inverse={isSelected}
-          bold={isSelected}
-        >
+        <Text backgroundColor={backgroundColor} inverse={isSelected} bold={isSelected}>
           {displayText}
         </Text>
       </Link>
-    )
+    );
   }
 
   // Fallback: styled but not clickable
@@ -55,5 +47,5 @@ export function ClickableImageRef({
     <Text backgroundColor={backgroundColor} inverse={isSelected}>
       {displayText}
     </Text>
-  )
+  );
 }
diff --git a/src/components/CompactSummary.tsx b/src/components/CompactSummary.tsx
index 5d582a299..895c69eea 100644
--- a/src/components/CompactSummary.tsx
+++ b/src/components/CompactSummary.tsx
@@ -1,25 +1,27 @@
-import * as React from 'react'
-import { BLACK_CIRCLE } from '../constants/figures.js'
-import { Box, Text } from '@anthropic/ink'
-import type { Screen } from '../screens/REPL.js'
-import type { NormalizedUserMessage } from '../types/message.js'
-import { getUserMessageText } from '../utils/messages.js'
-import { ConfigurableShortcutHint } from './ConfigurableShortcutHint.js'
-import { MessageResponse } from './MessageResponse.js'
+import * as React from 'react';
+import { BLACK_CIRCLE } from '../constants/figures.js';
+import { Box, Text } from '@anthropic/ink';
+import type { Screen } from '../screens/REPL.js';
+import type { NormalizedUserMessage } from '../types/message.js';
+import { getUserMessageText } from '../utils/messages.js';
+import { ConfigurableShortcutHint } from './ConfigurableShortcutHint.js';
+import { MessageResponse } from './MessageResponse.js';
 
 type Props = {
-  message: NormalizedUserMessage
-  screen: Screen
-}
+  message: NormalizedUserMessage;
+  screen: Screen;
+};
 
 export function CompactSummary({ message, screen }: Props): React.ReactNode {
-  const isTranscriptMode = screen === 'transcript'
-  const textContent = getUserMessageText(message) || ''
-  const metadata = message.summarizeMetadata as {
-    messagesSummarized?: number
-    direction?: string
-    userContext?: string
-  } | undefined
+  const isTranscriptMode = screen === 'transcript';
+  const textContent = getUserMessageText(message) || '';
+  const metadata = message.summarizeMetadata as
+    | {
+        messagesSummarized?: number;
+        direction?: string;
+        userContext?: string;
+      }
+    | undefined;
 
   // "Summarize from here" with metadata
   if (metadata) {
@@ -36,9 +38,7 @@ export function CompactSummary({ message, screen }: Props): React.ReactNode {
                 <Box flexDirection="column">
                   <Text dimColor>
                     Summarized {metadata.messagesSummarized} messages{' '}
-                    {metadata.direction === 'up_to'
-                      ? 'up to this point'
-                      : 'from this point'}
+                    {metadata.direction === 'up_to' ? 'up to this point' : 'from this point'}
                   </Text>
                   {metadata.userContext && (
                     <Text dimColor>
@@ -67,7 +67,7 @@ export function CompactSummary({ message, screen }: Props): React.ReactNode {
           </Box>
         </Box>
       </Box>
-    )
+    );
   }
 
   // Default compact summary (auto-compact)
@@ -101,5 +101,5 @@ export function CompactSummary({ message, screen }: Props): React.ReactNode {
         </MessageResponse>
       )}
     </Box>
-  )
+  );
 }
diff --git a/src/components/ConfigurableShortcutHint.tsx b/src/components/ConfigurableShortcutHint.tsx
index 36ec0acd9..6fff0db94 100644
--- a/src/components/ConfigurableShortcutHint.tsx
+++ b/src/components/ConfigurableShortcutHint.tsx
@@ -1,25 +1,22 @@
-import * as React from 'react'
-import type {
-  KeybindingAction,
-  KeybindingContextName,
-} from '../keybindings/types.js'
-import { useShortcutDisplay } from '../keybindings/useShortcutDisplay.js'
-import { KeyboardShortcutHint } from '@anthropic/ink'
+import * as React from 'react';
+import type { KeybindingAction, KeybindingContextName } from '../keybindings/types.js';
+import { useShortcutDisplay } from '../keybindings/useShortcutDisplay.js';
+import { KeyboardShortcutHint } from '@anthropic/ink';
 
 type Props = {
   /** The keybinding action (e.g., 'app:toggleTranscript') */
-  action: KeybindingAction
+  action: KeybindingAction;
   /** The keybinding context (e.g., 'Global') */
-  context: KeybindingContextName
+  context: KeybindingContextName;
   /** Default shortcut if keybinding not configured */
-  fallback: string
+  fallback: string;
   /** The action description text (e.g., 'expand') */
-  description: string
+  description: string;
   /** Whether to wrap in parentheses */
-  parens?: boolean
+  parens?: boolean;
   /** Whether to show in bold */
-  bold?: boolean
-}
+  bold?: boolean;
+};
 
 /**
  * KeyboardShortcutHint that displays the user-configured shortcut.
@@ -41,13 +38,6 @@ export function ConfigurableShortcutHint({
   parens,
   bold,
 }: Props): React.ReactNode {
-  const shortcut = useShortcutDisplay(action, context, fallback)
-  return (
-    <KeyboardShortcutHint
-      shortcut={shortcut}
-      action={description}
-      parens={parens}
-      bold={bold}
-    />
-  )
+  const shortcut = useShortcutDisplay(action, context, fallback);
+  return <KeyboardShortcutHint shortcut={shortcut} action={description} parens={parens} bold={bold} />;
 }
diff --git a/src/components/ConsoleOAuthFlow.tsx b/src/components/ConsoleOAuthFlow.tsx
index bd1dd5d1e..c3bae5708 100644
--- a/src/components/ConsoleOAuthFlow.tsx
+++ b/src/components/ConsoleOAuthFlow.tsx
@@ -1,59 +1,59 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react'
+import React, { useCallback, useEffect, useRef, useState } from 'react';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from 'src/services/analytics/index.js'
-import { installOAuthTokens } from '../cli/handlers/auth.js'
-import { useTerminalSize } from '../hooks/useTerminalSize.js'
-import { setClipboard, useTerminalNotification, Box, Link, Text, KeyboardShortcutHint } from '@anthropic/ink'
-import { useKeybinding } from '../keybindings/useKeybinding.js'
-import { getSSLErrorHint } from '../services/api/errorUtils.js'
-import { sendNotification } from '../services/notifier.js'
-import { OAuthService } from '../services/oauth/index.js'
-import { getOauthAccountInfo, validateForceLoginOrg } from '../utils/auth.js'
-import { logError } from '../utils/log.js'
-import { getSettings_DEPRECATED, updateSettingsForSource } from '../utils/settings/settings.js'
-import { Select } from './CustomSelect/select.js'
-import { Spinner } from './Spinner.js'
-import TextInput from './TextInput.js'
-import { fi } from 'zod/v4/locales'
+} from 'src/services/analytics/index.js';
+import { installOAuthTokens } from '../cli/handlers/auth.js';
+import { useTerminalSize } from '../hooks/useTerminalSize.js';
+import { setClipboard, useTerminalNotification, Box, Link, Text, KeyboardShortcutHint } from '@anthropic/ink';
+import { useKeybinding } from '../keybindings/useKeybinding.js';
+import { getSSLErrorHint } from '../services/api/errorUtils.js';
+import { sendNotification } from '../services/notifier.js';
+import { OAuthService } from '../services/oauth/index.js';
+import { getOauthAccountInfo, validateForceLoginOrg } from '../utils/auth.js';
+import { logError } from '../utils/log.js';
+import { getSettings_DEPRECATED, updateSettingsForSource } from '../utils/settings/settings.js';
+import { Select } from './CustomSelect/select.js';
+import { Spinner } from './Spinner.js';
+import TextInput from './TextInput.js';
+import { fi } from 'zod/v4/locales';
 
 type Props = {
-  onDone(): void
-  startingMessage?: string
-  mode?: 'login' | 'setup-token'
-  forceLoginMethod?: 'claudeai' | 'console'
-}
+  onDone(): void;
+  startingMessage?: string;
+  mode?: 'login' | 'setup-token';
+  forceLoginMethod?: 'claudeai' | 'console';
+};
 
 type OAuthStatus =
   | { state: 'idle' } // Initial state, waiting to select login method
   | { state: 'platform_setup' } // Show platform setup info (Bedrock/Vertex/Foundry)
   | {
-      state: 'custom_platform'
-      baseUrl: string
-      apiKey: string
-      haikuModel: string
-      sonnetModel: string
-      opusModel: string
-      activeField: 'base_url' | 'api_key' | 'haiku_model' | 'sonnet_model' | 'opus_model'
+      state: 'custom_platform';
+      baseUrl: string;
+      apiKey: string;
+      haikuModel: string;
+      sonnetModel: string;
+      opusModel: string;
+      activeField: 'base_url' | 'api_key' | 'haiku_model' | 'sonnet_model' | 'opus_model';
     } // Custom platform: configure API endpoint and model names
   | {
-      state: 'openai_chat_api'
-      baseUrl: string
-      apiKey: string
-      haikuModel: string
-      sonnetModel: string
-      opusModel: string
-      activeField: 'base_url' | 'api_key' | 'haiku_model' | 'sonnet_model' | 'opus_model'
+      state: 'openai_chat_api';
+      baseUrl: string;
+      apiKey: string;
+      haikuModel: string;
+      sonnetModel: string;
+      opusModel: string;
+      activeField: 'base_url' | 'api_key' | 'haiku_model' | 'sonnet_model' | 'opus_model';
     } // OpenAI Chat Completions API platform
   | {
-      state: 'gemini_api'
-      baseUrl: string
-      apiKey: string
-      haikuModel: string
-      sonnetModel: string
-      opusModel: string
-      activeField: 'base_url' | 'api_key' | 'haiku_model' | 'sonnet_model' | 'opus_model'
+      state: 'gemini_api';
+      baseUrl: string;
+      apiKey: string;
+      haikuModel: string;
+      sonnetModel: string;
+      opusModel: string;
+      activeField: 'base_url' | 'api_key' | 'haiku_model' | 'sonnet_model' | 'opus_model';
     } // Gemini Generate Content API platform
   | { state: 'ready_to_start' } // Flow started, waiting for browser to open
   | { state: 'waiting_for_login'; url: string } // Browser opened, waiting for user to login
@@ -61,170 +61,165 @@ type OAuthStatus =
   | { state: 'about_to_retry'; nextState: OAuthStatus }
   | { state: 'success'; token?: string }
   | {
-      state: 'error'
-      message: string
-      toRetry?: OAuthStatus
-    }
+      state: 'error';
+      message: string;
+      toRetry?: OAuthStatus;
+    };
 
-const PASTE_HERE_MSG = 'Paste code here if prompted > '
+const PASTE_HERE_MSG = 'Paste code here if prompted > ';
 export function ConsoleOAuthFlow({
   onDone,
   startingMessage,
   mode = 'login',
   forceLoginMethod: forceLoginMethodProp,
 }: Props): React.ReactNode {
-  const settings = getSettings_DEPRECATED() || {}
-  const forceLoginMethod = forceLoginMethodProp ?? settings.forceLoginMethod
-  const orgUUID = settings.forceLoginOrgUUID
+  const settings = getSettings_DEPRECATED() || {};
+  const forceLoginMethod = forceLoginMethodProp ?? settings.forceLoginMethod;
+  const orgUUID = settings.forceLoginOrgUUID;
   const forcedMethodMessage =
     forceLoginMethod === 'claudeai'
       ? 'Login method pre-selected: Subscription Plan (Claude Pro/Max)'
       : forceLoginMethod === 'console'
         ? 'Login method pre-selected: API Usage Billing (Anthropic Console)'
-        : null
+        : null;
 
-  const terminal = useTerminalNotification()
+  const terminal = useTerminalNotification();
 
   const [oauthStatus, setOAuthStatus] = useState<OAuthStatus>(() => {
     if (mode === 'setup-token') {
-      return { state: 'ready_to_start' }
+      return { state: 'ready_to_start' };
     }
     if (forceLoginMethod === 'claudeai' || forceLoginMethod === 'console') {
-      return { state: 'ready_to_start' }
+      return { state: 'ready_to_start' };
     }
-    return { state: 'idle' }
-  })
+    return { state: 'idle' };
+  });
 
-  const [pastedCode, setPastedCode] = useState('')
-  const [cursorOffset, setCursorOffset] = useState(0)
-  const [oauthService] = useState(() => new OAuthService())
+  const [pastedCode, setPastedCode] = useState('');
+  const [cursorOffset, setCursorOffset] = useState(0);
+  const [oauthService] = useState(() => new OAuthService());
   const [loginWithClaudeAi, setLoginWithClaudeAi] = useState(() => {
     // Use Claude AI auth for setup-token mode to support user:inference scope
-    return mode === 'setup-token' || forceLoginMethod === 'claudeai'
-  })
+    return mode === 'setup-token' || forceLoginMethod === 'claudeai';
+  });
   // After a few seconds we suggest the user to copy/paste url if the
   // browser did not open automatically. In this flow we expect the user to
   // copy the code from the browser and paste it in the terminal
-  const [showPastePrompt, setShowPastePrompt] = useState(false)
-  const [urlCopied, setUrlCopied] = useState(false)
+  const [showPastePrompt, setShowPastePrompt] = useState(false);
+  const [urlCopied, setUrlCopied] = useState(false);
 
-  const textInputColumns = useTerminalSize().columns - PASTE_HERE_MSG.length - 1
+  const textInputColumns = useTerminalSize().columns - PASTE_HERE_MSG.length - 1;
 
   // Log forced login method on mount
   useEffect(() => {
     if (forceLoginMethod === 'claudeai') {
-      logEvent('tengu_oauth_claudeai_forced', {})
+      logEvent('tengu_oauth_claudeai_forced', {});
     } else if (forceLoginMethod === 'console') {
-      logEvent('tengu_oauth_console_forced', {})
+      logEvent('tengu_oauth_console_forced', {});
     }
-  }, [forceLoginMethod])
+  }, [forceLoginMethod]);
 
   // Retry logic
   useEffect(() => {
     if (oauthStatus.state === 'about_to_retry') {
-      const timer = setTimeout(setOAuthStatus, 1000, oauthStatus.nextState)
-      return () => clearTimeout(timer)
+      const timer = setTimeout(setOAuthStatus, 1000, oauthStatus.nextState);
+      return () => clearTimeout(timer);
     }
-  }, [oauthStatus])
+  }, [oauthStatus]);
 
   // Handle Enter to continue on success state
   useKeybinding(
     'confirm:yes',
     () => {
-      logEvent('tengu_oauth_success', { loginWithClaudeAi })
-      onDone()
+      logEvent('tengu_oauth_success', { loginWithClaudeAi });
+      onDone();
     },
     {
       context: 'Confirmation',
       isActive: oauthStatus.state === 'success' && mode !== 'setup-token',
     },
-  )
+  );
 
   // Handle Enter to continue from platform setup
   useKeybinding(
     'confirm:yes',
     () => {
-      setOAuthStatus({ state: 'idle' })
+      setOAuthStatus({ state: 'idle' });
     },
     {
       context: 'Confirmation',
       isActive: oauthStatus.state === 'platform_setup',
     },
-  )
+  );
 
   // Handle Enter to retry on error state
   useKeybinding(
     'confirm:yes',
     () => {
       if (oauthStatus.state === 'error' && oauthStatus.toRetry) {
-        setPastedCode('')
+        setPastedCode('');
         setOAuthStatus({
           state: 'about_to_retry',
           nextState: oauthStatus.toRetry,
-        })
+        });
       }
     },
     {
       context: 'Confirmation',
       isActive: oauthStatus.state === 'error' && !!oauthStatus.toRetry,
     },
-  )
+  );
 
   useEffect(() => {
-    if (
-      pastedCode === 'c' &&
-      oauthStatus.state === 'waiting_for_login' &&
-      showPastePrompt &&
-      !urlCopied
-    ) {
+    if (pastedCode === 'c' && oauthStatus.state === 'waiting_for_login' && showPastePrompt && !urlCopied) {
       void setClipboard(oauthStatus.url).then(raw => {
-        if (raw) process.stdout.write(raw)
-        setUrlCopied(true)
-        setTimeout(setUrlCopied, 2000, false)
-      })
-      setPastedCode('')
+        if (raw) process.stdout.write(raw);
+        setUrlCopied(true);
+        setTimeout(setUrlCopied, 2000, false);
+      });
+      setPastedCode('');
     }
-  }, [pastedCode, oauthStatus, showPastePrompt, urlCopied])
+  }, [pastedCode, oauthStatus, showPastePrompt, urlCopied]);
 
   async function handleSubmitCode(value: string, url: string) {
     try {
       // Expecting format "authorizationCode#state" from the authorization callback URL
-      const [authorizationCode, state] = value.split('#')
+      const [authorizationCode, state] = value.split('#');
 
       if (!authorizationCode || !state) {
         setOAuthStatus({
           state: 'error',
           message: 'Invalid code. Please make sure the full code was copied',
           toRetry: { state: 'waiting_for_login', url },
-        })
-        return
+        });
+        return;
       }
 
       // Track which path the user is taking (manual code entry)
-      logEvent('tengu_oauth_manual_entry', {})
+      logEvent('tengu_oauth_manual_entry', {});
       oauthService.handleManualAuthCodeInput({
         authorizationCode,
         state,
-      })
+      });
     } catch (err: unknown) {
-      logError(err)
+      logError(err);
       setOAuthStatus({
         state: 'error',
         message: (err as Error).message,
         toRetry: { state: 'waiting_for_login', url },
-      })
+      });
     }
   }
 
   const startOAuth = useCallback(async () => {
     try {
-      logEvent('tengu_oauth_flow_start', { loginWithClaudeAi })
+      logEvent('tengu_oauth_flow_start', { loginWithClaudeAi });
 
       const result = await oauthService
         .startOAuthFlow(
           async url => {
-            setOAuthStatus({ state: 'waiting_for_login', url })
-            setTimeout(setShowPastePrompt, 3000, true)
+            setOAuthStatus({ state: 'waiting_for_login', url });
+            setTimeout(setShowPastePrompt, 3000, true);
           },
           {
             loginWithClaudeAi,
@@ -234,13 +229,11 @@ export function ConsoleOAuthFlow({
           },
         )
         .catch(err => {
-          const isTokenExchangeError = err.message.includes(
-            'Token exchange failed',
-          )
+          const isTokenExchangeError = err.message.includes('Token exchange failed');
           // Enterprise TLS proxies (Zscaler et al.) intercept the token
           // exchange POST and cause cryptic SSL errors. Surface an
           // actionable hint so the user isn't stuck in a login loop.
-          const sslHint = getSSLErrorHint(err)
+          const sslHint = getSSLErrorHint(err);
           setOAuthStatus({
             state: 'error',
             message:
@@ -248,73 +241,66 @@ export function ConsoleOAuthFlow({
               (isTokenExchangeError
                 ? 'Failed to exchange authorization code for access token. Please try again.'
                 : err.message),
-            toRetry:
-              mode === 'setup-token'
-                ? { state: 'ready_to_start' }
-                : { state: 'idle' },
-          })
+            toRetry: mode === 'setup-token' ? { state: 'ready_to_start' } : { state: 'idle' },
+          });
           logEvent('tengu_oauth_token_exchange_error', {
             error: err.message,
             ssl_error: sslHint !== null,
-          })
-          throw err
-        })
+          });
+          throw err;
+        });
 
       if (mode === 'setup-token') {
         // For setup-token mode, return the OAuth access token directly (it can be used as an API key)
         // Don't save to keychain - the token is displayed for manual use with CLAUDE_CODE_OAUTH_TOKEN
-        setOAuthStatus({ state: 'success', token: result.accessToken })
+        setOAuthStatus({ state: 'success', token: result.accessToken });
       } else {
-        await installOAuthTokens(result)
+        await installOAuthTokens(result);
 
-        const orgResult = await validateForceLoginOrg()
+        const orgResult = await validateForceLoginOrg();
         if (!orgResult.valid) {
-          throw new Error((orgResult as { valid: false; message: string }).message)
+          throw new Error((orgResult as { valid: false; message: string }).message);
         }
         // Reset modelType to anthropic when using OAuth login
-        updateSettingsForSource('userSettings', { modelType: 'anthropic' } as any)
+        updateSettingsForSource('userSettings', { modelType: 'anthropic' } as any);
 
-        setOAuthStatus({ state: 'success' })
+        setOAuthStatus({ state: 'success' });
         void sendNotification(
           {
             message: 'Claude Code login successful',
             notificationType: 'auth_success',
           },
           terminal,
-        )
+        );
       }
     } catch (err) {
-      const errorMessage = (err as Error).message
-      const sslHint = getSSLErrorHint(err)
+      const errorMessage = (err as Error).message;
+      const sslHint = getSSLErrorHint(err);
       setOAuthStatus({
         state: 'error',
         message: sslHint ?? errorMessage,
         toRetry: {
           state: mode === 'setup-token' ? 'ready_to_start' : 'idle',
         },
-      })
+      });
       logEvent('tengu_oauth_error', {
-        error:
-          errorMessage as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        error: errorMessage as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
         ssl_error: sslHint !== null,
-      })
+      });
     }
-  }, [oauthService, setShowPastePrompt, loginWithClaudeAi, mode, orgUUID])
+  }, [oauthService, setShowPastePrompt, loginWithClaudeAi, mode, orgUUID]);
 
-  const pendingOAuthStartRef = useRef(false)
+  const pendingOAuthStartRef = useRef(false);
 
   useEffect(() => {
-    if (
-      oauthStatus.state === 'ready_to_start' &&
-      !pendingOAuthStartRef.current
-    ) {
-      pendingOAuthStartRef.current = true
+    if (oauthStatus.state === 'ready_to_start' && !pendingOAuthStartRef.current) {
+      pendingOAuthStartRef.current = true;
       // Start OAuth flow and reset the pending flag when complete
       void startOAuth().finally(() => {
-        pendingOAuthStartRef.current = false
-      })
+        pendingOAuthStartRef.current = false;
+      });
     }
-  }, [oauthStatus.state, startOAuth])
+  }, [oauthStatus.state, startOAuth]);
 
   // Auto-exit for setup-token mode
   useEffect(() => {
@@ -322,33 +308,31 @@ export function ConsoleOAuthFlow({
       // Delay to ensure static content is fully rendered before exiting
       const timer = setTimeout(
         (loginWithClaudeAi, onDone) => {
-          logEvent('tengu_oauth_success', { loginWithClaudeAi })
+          logEvent('tengu_oauth_success', { loginWithClaudeAi });
           // Don't clear terminal so the token remains visible
-          onDone()
+          onDone();
         },
         500,
         loginWithClaudeAi,
         onDone,
-      )
-      return () => clearTimeout(timer)
+      );
+      return () => clearTimeout(timer);
     }
-  }, [mode, oauthStatus, loginWithClaudeAi, onDone])
+  }, [mode, oauthStatus, loginWithClaudeAi, onDone]);
 
   // Cleanup OAuth service when component unmounts
   useEffect(() => {
     return () => {
-      oauthService.cleanup()
-    }
-  }, [oauthService])
+      oauthService.cleanup();
+    };
+  }, [oauthService]);
 
   return (
     <Box flexDirection="column" gap={1}>
       {oauthStatus.state === 'waiting_for_login' && showPastePrompt && (
         <Box flexDirection="column" key="urlToCopy" gap={1} paddingBottom={1}>
           <Box paddingX={1}>
-            <Text dimColor>
-              Browser didn&apos;t open? Use the url below to sign in{' '}
-            </Text>
+            <Text dimColor>Browser didn&apos;t open? Use the url below to sign in </Text>
             {urlCopied ? (
               <Text color="success">(Copied!)</Text>
             ) : (
@@ -362,27 +346,17 @@ export function ConsoleOAuthFlow({
           </Link>
         </Box>
       )}
-      {mode === 'setup-token' &&
-        oauthStatus.state === 'success' &&
-        oauthStatus.token && (
-          <Box key="tokenOutput" flexDirection="column" gap={1} paddingTop={1}>
-            <Text color="success">
-              ✓ Long-lived authentication token created successfully!
-            </Text>
-            <Box flexDirection="column" gap={1}>
-              <Text>Your OAuth token (valid for 1 year):</Text>
-              <Text color="warning">{oauthStatus.token}</Text>
-              <Text dimColor>
-                Store this token securely. You won&apos;t be able to see it
-                again.
-              </Text>
-              <Text dimColor>
-                Use this token by setting: export
-                CLAUDE_CODE_OAUTH_TOKEN=&lt;token&gt;
-              </Text>
-            </Box>
+      {mode === 'setup-token' && oauthStatus.state === 'success' && oauthStatus.token && (
+        <Box key="tokenOutput" flexDirection="column" gap={1} paddingTop={1}>
+          <Text color="success">✓ Long-lived authentication token created successfully!</Text>
+          <Box flexDirection="column" gap={1}>
+            <Text>Your OAuth token (valid for 1 year):</Text>
+            <Text color="warning">{oauthStatus.token}</Text>
+            <Text dimColor>Store this token securely. You won&apos;t be able to see it again.</Text>
+            <Text dimColor>Use this token by setting: export CLAUDE_CODE_OAUTH_TOKEN=&lt;token&gt;</Text>
           </Box>
-        )}
+        </Box>
+      )}
       <Box paddingLeft={1} flexDirection="column" gap={1}>
         <OAuthStatusMessage
           oauthStatus={oauthStatus}
@@ -402,25 +376,25 @@ export function ConsoleOAuthFlow({
         />
       </Box>
     </Box>
-  )
+  );
 }
 
 type OAuthStatusMessageProps = {
-  oauthStatus: OAuthStatus
-  mode: 'login' | 'setup-token'
-  startingMessage: string | undefined
-  forcedMethodMessage: string | null
-  showPastePrompt: boolean
-  pastedCode: string
-  setPastedCode: (value: string) => void
-  cursorOffset: number
-  onDone: () => void
-  setCursorOffset: (offset: number) => void
-  textInputColumns: number
-  handleSubmitCode: (value: string, url: string) => void
-  setOAuthStatus: (status: OAuthStatus) => void
-  setLoginWithClaudeAi: (value: boolean) => void
-}
+  oauthStatus: OAuthStatus;
+  mode: 'login' | 'setup-token';
+  startingMessage: string | undefined;
+  forcedMethodMessage: string | null;
+  showPastePrompt: boolean;
+  pastedCode: string;
+  setPastedCode: (value: string) => void;
+  cursorOffset: number;
+  onDone: () => void;
+  setCursorOffset: (offset: number) => void;
+  textInputColumns: number;
+  handleSubmitCode: (value: string, url: string) => void;
+  setOAuthStatus: (status: OAuthStatus) => void;
+  setLoginWithClaudeAi: (value: boolean) => void;
+};
 
 function OAuthStatusMessage({
   oauthStatus,
@@ -456,8 +430,7 @@ function OAuthStatusMessage({
                 {
                   label: (
                     <Text>
-                      Anthropic Compatible ·{' '}
-                      <Text dimColor>Configure your own API endpoint</Text>
+                      Anthropic Compatible · <Text dimColor>Configure your own API endpoint</Text>
                       {'\n'}
                     </Text>
                   ),
@@ -466,10 +439,7 @@ function OAuthStatusMessage({
                 {
                   label: (
                     <Text>
-                      OpenAI Compatible ·{' '}
-                      <Text dimColor>
-                        Ollama, DeepSeek, vLLM, One API, etc.
-                      </Text>
+                      OpenAI Compatible · <Text dimColor>Ollama, DeepSeek, vLLM, One API, etc.</Text>
                       {'\n'}
                     </Text>
                   ),
@@ -478,8 +448,7 @@ function OAuthStatusMessage({
                 {
                   label: (
                     <Text>
-                      Gemini API ·{' '}
-                      <Text dimColor>Google Gemini native REST/SSE</Text>
+                      Gemini API · <Text dimColor>Google Gemini native REST/SSE</Text>
                       {'\n'}
                     </Text>
                   ),
@@ -488,16 +457,14 @@ function OAuthStatusMessage({
                 {
                   label: (
                     <Text>
-                      Claude account with subscription ·{' '}
-                      <Text dimColor>Pro, Max, Team, or Enterprise</Text>
+                      Claude account with subscription · <Text dimColor>Pro, Max, Team, or Enterprise</Text>
                       {process.env.USER_TYPE === 'ant' && (
                         <Text>
                           {'\n'}
                           <Text color="warning">[ANT-ONLY]</Text>{' '}
                           <Text dimColor>
-                            Please use this option unless you need to login to a
-                            special org for accessing sensitive data (e.g.
-                            customer data, HIPI data) with the Console option
+                            Please use this option unless you need to login to a special org for accessing sensitive
+                            data (e.g. customer data, HIPI data) with the Console option
                           </Text>
                         </Text>
                       )}
@@ -509,8 +476,7 @@ function OAuthStatusMessage({
                 {
                   label: (
                     <Text>
-                      Anthropic Console account ·{' '}
-                      <Text dimColor>API usage billing</Text>
+                      Anthropic Console account · <Text dimColor>API usage billing</Text>
                       {'\n'}
                     </Text>
                   ),
@@ -519,10 +485,7 @@ function OAuthStatusMessage({
                 {
                   label: (
                     <Text>
-                      3rd-party platform ·{' '}
-                      <Text dimColor>
-                        Amazon Bedrock, Microsoft Foundry, or Vertex AI
-                      </Text>
+                      3rd-party platform · <Text dimColor>Amazon Bedrock, Microsoft Foundry, or Vertex AI</Text>
                       {'\n'}
                     </Text>
                   ),
@@ -531,7 +494,7 @@ function OAuthStatusMessage({
               ]}
               onChange={value => {
                 if (value === 'custom_platform') {
-                  logEvent('tengu_custom_platform_selected', {})
+                  logEvent('tengu_custom_platform_selected', {});
                   setOAuthStatus({
                     state: 'custom_platform',
                     baseUrl: process.env.ANTHROPIC_BASE_URL ?? '',
@@ -540,9 +503,9 @@ function OAuthStatusMessage({
                     sonnetModel: process.env.ANTHROPIC_DEFAULT_SONNET_MODEL ?? '',
                     opusModel: process.env.ANTHROPIC_DEFAULT_OPUS_MODEL ?? '',
                     activeField: 'base_url',
-                  })
+                  });
                 } else if (value === 'openai_chat_api') {
-                  logEvent('tengu_openai_chat_api_selected', {})
+                  logEvent('tengu_openai_chat_api_selected', {});
                   setOAuthStatus({
                     state: 'openai_chat_api',
                     baseUrl: process.env.OPENAI_BASE_URL ?? '',
@@ -551,9 +514,9 @@ function OAuthStatusMessage({
                     sonnetModel: process.env.OPENAI_DEFAULT_SONNET_MODEL ?? '',
                     opusModel: process.env.OPENAI_DEFAULT_OPUS_MODEL ?? '',
                     activeField: 'base_url',
-                  })
+                  });
                 } else if (value === 'gemini_api') {
-                  logEvent('tengu_gemini_api_selected', {})
+                  logEvent('tengu_gemini_api_selected', {});
                   setOAuthStatus({
                     state: 'gemini_api',
                     baseUrl: process.env.GEMINI_BASE_URL ?? '',
@@ -562,583 +525,100 @@ function OAuthStatusMessage({
                     sonnetModel: process.env.GEMINI_DEFAULT_SONNET_MODEL ?? '',
                     opusModel: process.env.GEMINI_DEFAULT_OPUS_MODEL ?? '',
                     activeField: 'base_url',
-                  })
+                  });
                 } else if (value === 'platform') {
-                  logEvent('tengu_oauth_platform_selected', {})
-                  setOAuthStatus({ state: 'platform_setup' })
+                  logEvent('tengu_oauth_platform_selected', {});
+                  setOAuthStatus({ state: 'platform_setup' });
                 } else {
-                  setOAuthStatus({ state: 'ready_to_start' })
+                  setOAuthStatus({ state: 'ready_to_start' });
                   if (value === 'claudeai') {
-                    logEvent('tengu_oauth_claudeai_selected', {})
-                    setLoginWithClaudeAi(true)
+                    logEvent('tengu_oauth_claudeai_selected', {});
+                    setLoginWithClaudeAi(true);
                   } else {
-                    logEvent('tengu_oauth_console_selected', {})
-                    setLoginWithClaudeAi(false)
+                    logEvent('tengu_oauth_console_selected', {});
+                    setLoginWithClaudeAi(false);
                   }
                 }
               }}
             />
           </Box>
         </Box>
-      )
+      );
 
-    case 'custom_platform':
-      {
-        type Field = 'base_url' | 'api_key' | 'haiku_model' | 'sonnet_model' | 'opus_model'
-        const FIELDS: Field[] = ['base_url', 'api_key', 'haiku_model', 'sonnet_model', 'opus_model']
-        const cp = oauthStatus as {
-          state: 'custom_platform'
-          activeField: Field
-          baseUrl: string
-          apiKey: string
-          haikuModel: string
-          sonnetModel: string
-          opusModel: string
-        }
-        const { activeField, baseUrl, apiKey, haikuModel, sonnetModel, opusModel } = cp
-        const displayValues: Record<Field, string> = {
-          base_url: baseUrl,
-          api_key: apiKey,
-          haiku_model: haikuModel,
-          sonnet_model: sonnetModel,
-          opus_model: opusModel,
-        }
+    case 'custom_platform': {
+      type Field = 'base_url' | 'api_key' | 'haiku_model' | 'sonnet_model' | 'opus_model';
+      const FIELDS: Field[] = ['base_url', 'api_key', 'haiku_model', 'sonnet_model', 'opus_model'];
+      const cp = oauthStatus as {
+        state: 'custom_platform';
+        activeField: Field;
+        baseUrl: string;
+        apiKey: string;
+        haikuModel: string;
+        sonnetModel: string;
+        opusModel: string;
+      };
+      const { activeField, baseUrl, apiKey, haikuModel, sonnetModel, opusModel } = cp;
+      const displayValues: Record<Field, string> = {
+        base_url: baseUrl,
+        api_key: apiKey,
+        haiku_model: haikuModel,
+        sonnet_model: sonnetModel,
+        opus_model: opusModel,
+      };
 
-        const [inputValue, setInputValue] = useState(() => displayValues[activeField])
-        const [inputCursorOffset, setInputCursorOffset] = useState(
-          () => displayValues[activeField].length,
-        )
+      const [inputValue, setInputValue] = useState(() => displayValues[activeField]);
+      const [inputCursorOffset, setInputCursorOffset] = useState(() => displayValues[activeField].length);
 
-        const buildState = useCallback(
-          (field: Field, value: string, newActive?: Field) => {
-            const s = {
-              state: 'custom_platform' as const,
-              activeField: newActive ?? activeField,
-              baseUrl,
-              apiKey,
-              haikuModel,
-              sonnetModel,
-              opusModel,
-            }
-            switch (field) {
-              case 'base_url':
-                return { ...s, baseUrl: value }
-              case 'api_key':
-                return { ...s, apiKey: value }
-              case 'haiku_model':
-                return { ...s, haikuModel: value }
-              case 'sonnet_model':
-                return { ...s, sonnetModel: value }
-              case 'opus_model':
-                return { ...s, opusModel: value }
-            }
-          },
-          [activeField, baseUrl, apiKey, haikuModel, sonnetModel, opusModel],
-        )
-
-        const switchTo = useCallback(
-          (target: Field) => {
-            setOAuthStatus(buildState(activeField, inputValue, target))
-            setInputValue(displayValues[target] ?? '')
-            setInputCursorOffset((displayValues[target] ?? '').length)
-          },
-          [activeField, inputValue, displayValues, buildState, setOAuthStatus],
-        )
-
-        const doSave = useCallback(() => {
-          const finalVals = { ...displayValues, [activeField]: inputValue }
-          const env: Record<string, string> = {}
-
-          // Validate base_url if provided
-          if (finalVals.base_url) {
-            try {
-              new URL(finalVals.base_url)
-            } catch {
-              setOAuthStatus({
-                state: 'error',
-                message: 'Invalid base URL: please enter a full URL including protocol (e.g., https://api.example.com)',
-                toRetry: {
-                  state: 'custom_platform',
-                  baseUrl: '',
-                  apiKey: '',
-                  haikuModel: '',
-                  sonnetModel: '',
-                  opusModel: '',
-                  activeField: 'base_url',
-                },
-              })
-              return
-            }
-            env.ANTHROPIC_BASE_URL = finalVals.base_url
+      const buildState = useCallback(
+        (field: Field, value: string, newActive?: Field) => {
+          const s = {
+            state: 'custom_platform' as const,
+            activeField: newActive ?? activeField,
+            baseUrl,
+            apiKey,
+            haikuModel,
+            sonnetModel,
+            opusModel,
+          };
+          switch (field) {
+            case 'base_url':
+              return { ...s, baseUrl: value };
+            case 'api_key':
+              return { ...s, apiKey: value };
+            case 'haiku_model':
+              return { ...s, haikuModel: value };
+            case 'sonnet_model':
+              return { ...s, sonnetModel: value };
+            case 'opus_model':
+              return { ...s, opusModel: value };
           }
+        },
+        [activeField, baseUrl, apiKey, haikuModel, sonnetModel, opusModel],
+      );
 
-          if (finalVals.api_key) env.ANTHROPIC_AUTH_TOKEN = finalVals.api_key
-          if (finalVals.haiku_model) env.ANTHROPIC_DEFAULT_HAIKU_MODEL = finalVals.haiku_model
-          if (finalVals.sonnet_model) env.ANTHROPIC_DEFAULT_SONNET_MODEL = finalVals.sonnet_model
-          if (finalVals.opus_model) env.ANTHROPIC_DEFAULT_OPUS_MODEL = finalVals.opus_model
-          const { error } = updateSettingsForSource('userSettings', {
-            modelType: 'anthropic' as any,
-            env,
-          } as any)
-          if (error) {
+      const switchTo = useCallback(
+        (target: Field) => {
+          setOAuthStatus(buildState(activeField, inputValue, target));
+          setInputValue(displayValues[target] ?? '');
+          setInputCursorOffset((displayValues[target] ?? '').length);
+        },
+        [activeField, inputValue, displayValues, buildState, setOAuthStatus],
+      );
+
+      const doSave = useCallback(() => {
+        const finalVals = { ...displayValues, [activeField]: inputValue };
+        const env: Record<string, string> = {};
+
+        // Validate base_url if provided
+        if (finalVals.base_url) {
+          try {
+            new URL(finalVals.base_url);
+          } catch {
             setOAuthStatus({
               state: 'error',
-              message: 'Failed to save settings. Please try again.',
+              message: 'Invalid base URL: please enter a full URL including protocol (e.g., https://api.example.com)',
               toRetry: {
                 state: 'custom_platform',
-                baseUrl: finalVals.base_url ?? '',
-                apiKey: finalVals.api_key ?? '',
-                haikuModel: finalVals.haiku_model ?? '',
-                sonnetModel: finalVals.sonnet_model ?? '',
-                opusModel: finalVals.opus_model ?? '',
-                activeField: 'base_url',
-              },
-            })
-          } else {
-            for (const [k, v] of Object.entries(env)) process.env[k] = v
-            setOAuthStatus({ state: 'success' })
-            void onDone()
-          }
-        }, [activeField, inputValue, displayValues, setOAuthStatus, onDone])
-
-        const handleEnter = useCallback(() => {
-          const idx = FIELDS.indexOf(activeField)
-          if (idx === FIELDS.length - 1) {
-            setOAuthStatus(buildState(activeField, inputValue))
-            doSave()
-          } else {
-            const next = FIELDS[idx + 1]!
-            setOAuthStatus(buildState(activeField, inputValue, next))
-            setInputValue(displayValues[next] ?? '')
-            setInputCursorOffset((displayValues[next] ?? '').length)
-          }
-        }, [activeField, inputValue, buildState, doSave, displayValues, setOAuthStatus])
-
-        useKeybinding(
-          'tabs:next',
-          () => {
-            const idx = FIELDS.indexOf(activeField)
-            if (idx < FIELDS.length - 1) {
-              setOAuthStatus(buildState(activeField, inputValue, FIELDS[idx + 1]))
-              setInputValue(displayValues[FIELDS[idx + 1]!] ?? '')
-              setInputCursorOffset((displayValues[FIELDS[idx + 1]!] ?? '').length)
-            }
-          },
-          { context: 'FormField' },
-        )
-        useKeybinding(
-          'tabs:previous',
-          () => {
-            const idx = FIELDS.indexOf(activeField)
-            if (idx > 0) {
-              setOAuthStatus(buildState(activeField, inputValue, FIELDS[idx - 1]))
-              setInputValue(displayValues[FIELDS[idx - 1]!] ?? '')
-              setInputCursorOffset((displayValues[FIELDS[idx - 1]!] ?? '').length)
-            }
-          },
-          { context: 'FormField' },
-        )
-        useKeybinding(
-          'confirm:no',
-          () => {
-            setOAuthStatus({ state: 'idle' })
-          },
-          { context: 'Confirmation' },
-        )
-
-        const columns = useTerminalSize().columns - 20
-
-        const renderRow = (
-          field: Field,
-          label: string,
-          opts?: { mask?: boolean; placeholder?: string },
-        ) => {
-          const active = activeField === field
-          const val = displayValues[field]
-          return (
-            <Box>
-              <Text
-                backgroundColor={active ? 'suggestion' : undefined}
-                color={active ? 'inverseText' : undefined}
-              >
-                {` ${label} `}
-              </Text>
-              <Text> </Text>
-              {active ? (
-                <TextInput
-                  value={inputValue}
-                  onChange={setInputValue}
-                  onSubmit={handleEnter}
-                  cursorOffset={inputCursorOffset}
-                  onChangeCursorOffset={setInputCursorOffset}
-                  columns={columns}
-                  mask={opts?.mask ? '*' : undefined}
-                  focus={true}
-                />
-              ) : val ? (
-                <Text color="success">
-                  {opts?.mask
-                    ? val.slice(0, 8) + '\u00b7'.repeat(Math.max(0, val.length - 8))
-                    : val}
-                </Text>
-              ) : null}
-            </Box>
-          )
-        }
-
-        return (
-          <Box flexDirection="column" gap={1}>
-            <Text bold>Anthropic Compatible Setup</Text>
-            <Box flexDirection="column" gap={1}>
-              {renderRow('base_url', 'Base URL ')}
-              {renderRow('api_key', 'API Key  ', { mask: true })}
-              {renderRow('haiku_model', 'Haiku    ')}
-              {renderRow('sonnet_model', 'Sonnet   ')}
-              {renderRow('opus_model', 'Opus     ')}
-            </Box>
-            <Text dimColor>
-              ↑↓/Tab to switch · Enter on last field to save · Esc to go back
-            </Text>
-          </Box>
-        )
-      }
-
-    case 'openai_chat_api':
-      {
-        type OpenAIField = 'base_url' | 'api_key' | 'haiku_model' | 'sonnet_model' | 'opus_model'
-        const OPENAI_FIELDS: OpenAIField[] = [
-          'base_url',
-          'api_key',
-          'haiku_model',
-          'sonnet_model',
-          'opus_model',
-        ]
-        const op = oauthStatus as {
-          state: 'openai_chat_api'
-          activeField: OpenAIField
-          baseUrl: string
-          apiKey: string
-          haikuModel: string
-          sonnetModel: string
-          opusModel: string
-        }
-        const { activeField, baseUrl, apiKey, haikuModel, sonnetModel, opusModel } = op
-        const openaiDisplayValues: Record<OpenAIField, string> = {
-          base_url: baseUrl,
-          api_key: apiKey,
-          haiku_model: haikuModel,
-          sonnet_model: sonnetModel,
-          opus_model: opusModel,
-        }
-
-        const [openaiInputValue, setOpenaiInputValue] = useState(
-          () => openaiDisplayValues[activeField],
-        )
-        const [openaiInputCursorOffset, setOpenaiInputCursorOffset] = useState(
-          () => openaiDisplayValues[activeField].length,
-        )
-
-        const buildOpenAIState = useCallback(
-          (field: OpenAIField, value: string, newActive?: OpenAIField) => {
-            const s = {
-              state: 'openai_chat_api' as const,
-              activeField: newActive ?? activeField,
-              baseUrl,
-              apiKey,
-              haikuModel,
-              sonnetModel,
-              opusModel,
-            }
-            switch (field) {
-              case 'base_url':
-                return { ...s, baseUrl: value }
-              case 'api_key':
-                return { ...s, apiKey: value }
-              case 'haiku_model':
-                return { ...s, haikuModel: value }
-              case 'sonnet_model':
-                return { ...s, sonnetModel: value }
-              case 'opus_model':
-                return { ...s, opusModel: value }
-            }
-          },
-          [activeField, baseUrl, apiKey, haikuModel, sonnetModel, opusModel],
-        )
-
-        const doOpenAISave = useCallback(() => {
-          const finalVals = { ...openaiDisplayValues, [activeField]: openaiInputValue }
-          const env: Record<string, string> = {}
-
-          // Validate base_url if provided
-          if (finalVals.base_url) {
-            try {
-              new URL(finalVals.base_url)
-            } catch {
-              setOAuthStatus({
-                state: 'error',
-                message: 'Invalid base URL: please enter a full URL including protocol (e.g., https://api.example.com)',
-                toRetry: {
-                  state: 'openai_chat_api',
-                  baseUrl: '',
-                  apiKey: '',
-                  haikuModel: '',
-                  sonnetModel: '',
-                  opusModel: '',
-                  activeField: 'base_url',
-                },
-              })
-              return
-            }
-            env.OPENAI_BASE_URL = finalVals.base_url
-          }
-
-          if (finalVals.api_key) env.OPENAI_API_KEY = finalVals.api_key
-          if (finalVals.haiku_model) env.OPENAI_DEFAULT_HAIKU_MODEL = finalVals.haiku_model
-          if (finalVals.sonnet_model) env.OPENAI_DEFAULT_SONNET_MODEL = finalVals.sonnet_model
-          if (finalVals.opus_model) env.OPENAI_DEFAULT_OPUS_MODEL = finalVals.opus_model
-          const { error } = updateSettingsForSource('userSettings', {
-            modelType: 'openai' as any,
-            env,
-          } as any)
-          if (error) {
-            setOAuthStatus({
-              state: 'error',
-              message: 'Failed to save settings. Please try again.',
-              toRetry: {
-                state: 'openai_chat_api',
-                baseUrl: finalVals.base_url ?? '',
-                apiKey: finalVals.api_key ?? '',
-                haikuModel: finalVals.haiku_model ?? '',
-                sonnetModel: finalVals.sonnet_model ?? '',
-                opusModel: finalVals.opus_model ?? '',
-                activeField: 'base_url',
-              },
-            })
-          } else {
-            for (const [k, v] of Object.entries(env)) process.env[k] = v
-            setOAuthStatus({ state: 'success' })
-            void onDone()
-          }
-        }, [activeField, openaiInputValue, openaiDisplayValues, setOAuthStatus, onDone])
-
-        const handleOpenAIEnter = useCallback(() => {
-          const idx = OPENAI_FIELDS.indexOf(activeField)
-          if (idx === OPENAI_FIELDS.length - 1) {
-            setOAuthStatus(buildOpenAIState(activeField, openaiInputValue))
-            doOpenAISave()
-          } else {
-            const next = OPENAI_FIELDS[idx + 1]!
-            setOAuthStatus(buildOpenAIState(activeField, openaiInputValue, next))
-            setOpenaiInputValue(openaiDisplayValues[next] ?? '')
-            setOpenaiInputCursorOffset((openaiDisplayValues[next] ?? '').length)
-          }
-        }, [
-          activeField,
-          openaiInputValue,
-          buildOpenAIState,
-          doOpenAISave,
-          openaiDisplayValues,
-          setOAuthStatus,
-        ])
-
-        useKeybinding(
-          'tabs:next',
-          () => {
-            const idx = OPENAI_FIELDS.indexOf(activeField)
-            if (idx < OPENAI_FIELDS.length - 1) {
-              setOAuthStatus(
-                buildOpenAIState(activeField, openaiInputValue, OPENAI_FIELDS[idx + 1]),
-              )
-              setOpenaiInputValue(openaiDisplayValues[OPENAI_FIELDS[idx + 1]!] ?? '')
-              setOpenaiInputCursorOffset(
-                (openaiDisplayValues[OPENAI_FIELDS[idx + 1]!] ?? '').length,
-              )
-            }
-          },
-          { context: 'FormField' },
-        )
-        useKeybinding(
-          'tabs:previous',
-          () => {
-            const idx = OPENAI_FIELDS.indexOf(activeField)
-            if (idx > 0) {
-              setOAuthStatus(
-                buildOpenAIState(activeField, openaiInputValue, OPENAI_FIELDS[idx - 1]),
-              )
-              setOpenaiInputValue(openaiDisplayValues[OPENAI_FIELDS[idx - 1]!] ?? '')
-              setOpenaiInputCursorOffset(
-                (openaiDisplayValues[OPENAI_FIELDS[idx - 1]!] ?? '').length,
-              )
-            }
-          },
-          { context: 'FormField' },
-        )
-        useKeybinding(
-          'confirm:no',
-          () => {
-            setOAuthStatus({ state: 'idle' })
-          },
-          { context: 'Confirmation' },
-        )
-
-        const openaiColumns = useTerminalSize().columns - 20
-
-        const renderOpenAIRow = (
-          field: OpenAIField,
-          label: string,
-          opts?: { mask?: boolean },
-        ) => {
-          const active = activeField === field
-          const val = openaiDisplayValues[field]
-          return (
-            <Box>
-              <Text
-                backgroundColor={active ? 'suggestion' : undefined}
-                color={active ? 'inverseText' : undefined}
-              >
-                {` ${label} `}
-              </Text>
-              <Text> </Text>
-              {active ? (
-                <TextInput
-                  value={openaiInputValue}
-                  onChange={setOpenaiInputValue}
-                  onSubmit={handleOpenAIEnter}
-                  cursorOffset={openaiInputCursorOffset}
-                  onChangeCursorOffset={setOpenaiInputCursorOffset}
-                  columns={openaiColumns}
-                  mask={opts?.mask ? '*' : undefined}
-                  focus={true}
-                />
-              ) : val ? (
-                <Text color="success">
-                  {opts?.mask
-                    ? val.slice(0, 8) + '\u00b7'.repeat(Math.max(0, val.length - 8))
-                    : val}
-                </Text>
-              ) : null}
-            </Box>
-          )
-        }
-
-        return (
-          <Box flexDirection="column" gap={1}>
-            <Text bold>OpenAI Compatible API Setup</Text>
-            <Text dimColor>
-              Configure an OpenAI Chat Completions compatible endpoint (e.g.
-              Ollama, DeepSeek, vLLM).
-            </Text>
-            <Box flexDirection="column" gap={1}>
-              {renderOpenAIRow('base_url', 'Base URL ')}
-              {renderOpenAIRow('api_key', 'API Key  ', { mask: true })}
-              {renderOpenAIRow('haiku_model', 'Haiku    ')}
-              {renderOpenAIRow('sonnet_model', 'Sonnet   ')}
-              {renderOpenAIRow('opus_model', 'Opus     ')}
-            </Box>
-            <Text dimColor>
-              ↑↓/Tab to switch · Enter on last field to save · Esc to go back
-            </Text>
-          </Box>
-        )
-      }
-
-    case 'gemini_api':
-      {
-        type GeminiField = 'base_url' | 'api_key' | 'haiku_model' | 'sonnet_model' | 'opus_model'
-        const GEMINI_FIELDS: GeminiField[] = [
-          'base_url',
-          'api_key',
-          'haiku_model',
-          'sonnet_model',
-          'opus_model',
-        ]
-        const gp = oauthStatus as {
-          state: 'gemini_api'
-          activeField: GeminiField
-          baseUrl: string
-          apiKey: string
-          haikuModel: string
-          sonnetModel: string
-          opusModel: string
-        }
-        const { activeField, baseUrl, apiKey, haikuModel, sonnetModel, opusModel } = gp
-        const geminiDisplayValues: Record<GeminiField, string> = {
-          base_url: baseUrl,
-          api_key: apiKey,
-          haiku_model: haikuModel,
-          sonnet_model: sonnetModel,
-          opus_model: opusModel,
-        }
-
-        const [geminiInputValue, setGeminiInputValue] = useState(
-          () => geminiDisplayValues[activeField],
-        )
-        const [geminiInputCursorOffset, setGeminiInputCursorOffset] = useState(
-          () => geminiDisplayValues[activeField].length,
-        )
-
-        const buildGeminiState = useCallback(
-          (field: GeminiField, value: string, newActive?: GeminiField) => {
-            const s = {
-              state: 'gemini_api' as const,
-              activeField: newActive ?? activeField,
-              baseUrl,
-              apiKey,
-              haikuModel,
-              sonnetModel,
-              opusModel,
-            }
-            switch (field) {
-              case 'base_url':
-                return { ...s, baseUrl: value }
-              case 'api_key':
-                return { ...s, apiKey: value }
-              case 'haiku_model':
-                return { ...s, haikuModel: value }
-              case 'sonnet_model':
-                return { ...s, sonnetModel: value }
-              case 'opus_model':
-                return { ...s, opusModel: value }
-            }
-          },
-          [activeField, baseUrl, apiKey, haikuModel, sonnetModel, opusModel],
-        )
-
-        const doGeminiSave = useCallback(() => {
-          const finalVals = { ...geminiDisplayValues, [activeField]: geminiInputValue }
-          if (!finalVals.haiku_model || !finalVals.sonnet_model || !finalVals.opus_model) {
-            setOAuthStatus({
-              state: 'error',
-              message: 'Gemini setup requires Haiku, Sonnet, and Opus model names.',
-              toRetry: {
-                state: 'gemini_api',
-                baseUrl: finalVals.base_url,
-                apiKey: finalVals.api_key,
-                haikuModel: finalVals.haiku_model,
-                sonnetModel: finalVals.sonnet_model,
-                opusModel: finalVals.opus_model,
-                activeField,
-              },
-            })
-            return
-          }
-
-          const env: Record<string, string> = {}
-          if (finalVals.base_url) env.GEMINI_BASE_URL = finalVals.base_url
-          if (finalVals.api_key) env.GEMINI_API_KEY = finalVals.api_key
-          if (finalVals.haiku_model) env.GEMINI_DEFAULT_HAIKU_MODEL = finalVals.haiku_model
-          if (finalVals.sonnet_model) env.GEMINI_DEFAULT_SONNET_MODEL = finalVals.sonnet_model
-          if (finalVals.opus_model) env.GEMINI_DEFAULT_OPUS_MODEL = finalVals.opus_model
-          const { error } = updateSettingsForSource('userSettings', {
-            modelType: 'gemini' as any,
-            env,
-          } as any)
-          if (error) {
-            setOAuthStatus({
-              state: 'error',
-              message: `Failed to save: ${error.message}`,
-              toRetry: {
-                state: 'gemini_api',
                 baseUrl: '',
                 apiKey: '',
                 haikuModel: '',
@@ -1146,134 +626,530 @@ function OAuthStatusMessage({
                 opusModel: '',
                 activeField: 'base_url',
               },
-            })
-          } else {
-            for (const [k, v] of Object.entries(env)) process.env[k] = v
-            setOAuthStatus({ state: 'success' })
-            void onDone()
+            });
+            return;
           }
-        }, [activeField, geminiInputValue, geminiDisplayValues, onDone, setOAuthStatus])
-
-        const handleGeminiEnter = useCallback(() => {
-          const idx = GEMINI_FIELDS.indexOf(activeField)
-          if (idx === GEMINI_FIELDS.length - 1) {
-            setOAuthStatus(buildGeminiState(activeField, geminiInputValue))
-            doGeminiSave()
-          } else {
-            const next = GEMINI_FIELDS[idx + 1]!
-            setOAuthStatus(buildGeminiState(activeField, geminiInputValue, next))
-            setGeminiInputValue(geminiDisplayValues[next] ?? '')
-            setGeminiInputCursorOffset((geminiDisplayValues[next] ?? '').length)
-          }
-        }, [
-          activeField,
-          buildGeminiState,
-          doGeminiSave,
-          geminiDisplayValues,
-          geminiInputValue,
-          setOAuthStatus,
-        ])
-
-        useKeybinding(
-          'tabs:next',
-          () => {
-            const idx = GEMINI_FIELDS.indexOf(activeField)
-            if (idx < GEMINI_FIELDS.length - 1) {
-              setOAuthStatus(
-                buildGeminiState(activeField, geminiInputValue, GEMINI_FIELDS[idx + 1]),
-              )
-              setGeminiInputValue(geminiDisplayValues[GEMINI_FIELDS[idx + 1]!] ?? '')
-              setGeminiInputCursorOffset(
-                (geminiDisplayValues[GEMINI_FIELDS[idx + 1]!] ?? '').length,
-              )
-            }
-          },
-          { context: 'FormField' },
-        )
-        useKeybinding(
-          'tabs:previous',
-          () => {
-            const idx = GEMINI_FIELDS.indexOf(activeField)
-            if (idx > 0) {
-              setOAuthStatus(
-                buildGeminiState(activeField, geminiInputValue, GEMINI_FIELDS[idx - 1]),
-              )
-              setGeminiInputValue(geminiDisplayValues[GEMINI_FIELDS[idx - 1]!] ?? '')
-              setGeminiInputCursorOffset(
-                (geminiDisplayValues[GEMINI_FIELDS[idx - 1]!] ?? '').length,
-              )
-            }
-          },
-          { context: 'FormField' },
-        )
-        useKeybinding(
-          'confirm:no',
-          () => {
-            setOAuthStatus({ state: 'idle' })
-          },
-          { context: 'Confirmation' },
-        )
-
-        const geminiColumns = useTerminalSize().columns - 20
-
-        const renderGeminiRow = (
-          field: GeminiField,
-          label: string,
-          opts?: { mask?: boolean },
-        ) => {
-          const active = activeField === field
-          const val = geminiDisplayValues[field]
-          return (
-            <Box>
-              <Text
-                backgroundColor={active ? 'suggestion' : undefined}
-                color={active ? 'inverseText' : undefined}
-              >
-                {` ${label} `}
-              </Text>
-              <Text> </Text>
-              {active ? (
-                <TextInput
-                  value={geminiInputValue}
-                  onChange={setGeminiInputValue}
-                  onSubmit={handleGeminiEnter}
-                  cursorOffset={geminiInputCursorOffset}
-                  onChangeCursorOffset={setGeminiInputCursorOffset}
-                  columns={geminiColumns}
-                  mask={opts?.mask ? '*' : undefined}
-                  focus={true}
-                />
-              ) : val ? (
-                <Text color="success">
-                  {opts?.mask
-                    ? val.slice(0, 8) + '\u00b7'.repeat(Math.max(0, val.length - 8))
-                    : val}
-                </Text>
-              ) : null}
-            </Box>
-          )
+          env.ANTHROPIC_BASE_URL = finalVals.base_url;
         }
 
+        if (finalVals.api_key) env.ANTHROPIC_AUTH_TOKEN = finalVals.api_key;
+        if (finalVals.haiku_model) env.ANTHROPIC_DEFAULT_HAIKU_MODEL = finalVals.haiku_model;
+        if (finalVals.sonnet_model) env.ANTHROPIC_DEFAULT_SONNET_MODEL = finalVals.sonnet_model;
+        if (finalVals.opus_model) env.ANTHROPIC_DEFAULT_OPUS_MODEL = finalVals.opus_model;
+        const { error } = updateSettingsForSource('userSettings', {
+          modelType: 'anthropic' as any,
+          env,
+        } as any);
+        if (error) {
+          setOAuthStatus({
+            state: 'error',
+            message: 'Failed to save settings. Please try again.',
+            toRetry: {
+              state: 'custom_platform',
+              baseUrl: finalVals.base_url ?? '',
+              apiKey: finalVals.api_key ?? '',
+              haikuModel: finalVals.haiku_model ?? '',
+              sonnetModel: finalVals.sonnet_model ?? '',
+              opusModel: finalVals.opus_model ?? '',
+              activeField: 'base_url',
+            },
+          });
+        } else {
+          for (const [k, v] of Object.entries(env)) process.env[k] = v;
+          setOAuthStatus({ state: 'success' });
+          void onDone();
+        }
+      }, [activeField, inputValue, displayValues, setOAuthStatus, onDone]);
+
+      const handleEnter = useCallback(() => {
+        const idx = FIELDS.indexOf(activeField);
+        if (idx === FIELDS.length - 1) {
+          setOAuthStatus(buildState(activeField, inputValue));
+          doSave();
+        } else {
+          const next = FIELDS[idx + 1]!;
+          setOAuthStatus(buildState(activeField, inputValue, next));
+          setInputValue(displayValues[next] ?? '');
+          setInputCursorOffset((displayValues[next] ?? '').length);
+        }
+      }, [activeField, inputValue, buildState, doSave, displayValues, setOAuthStatus]);
+
+      useKeybinding(
+        'tabs:next',
+        () => {
+          const idx = FIELDS.indexOf(activeField);
+          if (idx < FIELDS.length - 1) {
+            setOAuthStatus(buildState(activeField, inputValue, FIELDS[idx + 1]));
+            setInputValue(displayValues[FIELDS[idx + 1]!] ?? '');
+            setInputCursorOffset((displayValues[FIELDS[idx + 1]!] ?? '').length);
+          }
+        },
+        { context: 'FormField' },
+      );
+      useKeybinding(
+        'tabs:previous',
+        () => {
+          const idx = FIELDS.indexOf(activeField);
+          if (idx > 0) {
+            setOAuthStatus(buildState(activeField, inputValue, FIELDS[idx - 1]));
+            setInputValue(displayValues[FIELDS[idx - 1]!] ?? '');
+            setInputCursorOffset((displayValues[FIELDS[idx - 1]!] ?? '').length);
+          }
+        },
+        { context: 'FormField' },
+      );
+      useKeybinding(
+        'confirm:no',
+        () => {
+          setOAuthStatus({ state: 'idle' });
+        },
+        { context: 'Confirmation' },
+      );
+
+      const columns = useTerminalSize().columns - 20;
+
+      const renderRow = (field: Field, label: string, opts?: { mask?: boolean; placeholder?: string }) => {
+        const active = activeField === field;
+        const val = displayValues[field];
         return (
-          <Box flexDirection="column" gap={1}>
-            <Text bold>Gemini API Setup</Text>
-            <Text dimColor>
-              Configure a Gemini Generate Content compatible endpoint. Base URL is
-              optional and defaults to Google&apos;s v1beta API.
-            </Text>
-            <Box flexDirection="column" gap={1}>
-              {renderGeminiRow('base_url', 'Base URL ')}
-              {renderGeminiRow('api_key', 'API Key  ', { mask: true })}
-              {renderGeminiRow('haiku_model', 'Haiku    ')}
-              {renderGeminiRow('sonnet_model', 'Sonnet   ')}
-              {renderGeminiRow('opus_model', 'Opus     ')}
-            </Box>
-            <Text dimColor>
-              ↑↓/Tab to switch · Enter on last field to save · Esc to go back
+          <Box>
+            <Text backgroundColor={active ? 'suggestion' : undefined} color={active ? 'inverseText' : undefined}>
+              {` ${label} `}
             </Text>
+            <Text> </Text>
+            {active ? (
+              <TextInput
+                value={inputValue}
+                onChange={setInputValue}
+                onSubmit={handleEnter}
+                cursorOffset={inputCursorOffset}
+                onChangeCursorOffset={setInputCursorOffset}
+                columns={columns}
+                mask={opts?.mask ? '*' : undefined}
+                focus={true}
+              />
+            ) : val ? (
+              <Text color="success">
+                {opts?.mask ? val.slice(0, 8) + '\u00b7'.repeat(Math.max(0, val.length - 8)) : val}
+              </Text>
+            ) : null}
           </Box>
-        )
-      }
+        );
+      };
+
+      return (
+        <Box flexDirection="column" gap={1}>
+          <Text bold>Anthropic Compatible Setup</Text>
+          <Box flexDirection="column" gap={1}>
+            {renderRow('base_url', 'Base URL ')}
+            {renderRow('api_key', 'API Key  ', { mask: true })}
+            {renderRow('haiku_model', 'Haiku    ')}
+            {renderRow('sonnet_model', 'Sonnet   ')}
+            {renderRow('opus_model', 'Opus     ')}
+          </Box>
+          <Text dimColor>↑↓/Tab to switch · Enter on last field to save · Esc to go back</Text>
+        </Box>
+      );
+    }
+
+    case 'openai_chat_api': {
+      type OpenAIField = 'base_url' | 'api_key' | 'haiku_model' | 'sonnet_model' | 'opus_model';
+      const OPENAI_FIELDS: OpenAIField[] = ['base_url', 'api_key', 'haiku_model', 'sonnet_model', 'opus_model'];
+      const op = oauthStatus as {
+        state: 'openai_chat_api';
+        activeField: OpenAIField;
+        baseUrl: string;
+        apiKey: string;
+        haikuModel: string;
+        sonnetModel: string;
+        opusModel: string;
+      };
+      const { activeField, baseUrl, apiKey, haikuModel, sonnetModel, opusModel } = op;
+      const openaiDisplayValues: Record<OpenAIField, string> = {
+        base_url: baseUrl,
+        api_key: apiKey,
+        haiku_model: haikuModel,
+        sonnet_model: sonnetModel,
+        opus_model: opusModel,
+      };
+
+      const [openaiInputValue, setOpenaiInputValue] = useState(() => openaiDisplayValues[activeField]);
+      const [openaiInputCursorOffset, setOpenaiInputCursorOffset] = useState(
+        () => openaiDisplayValues[activeField].length,
+      );
+
+      const buildOpenAIState = useCallback(
+        (field: OpenAIField, value: string, newActive?: OpenAIField) => {
+          const s = {
+            state: 'openai_chat_api' as const,
+            activeField: newActive ?? activeField,
+            baseUrl,
+            apiKey,
+            haikuModel,
+            sonnetModel,
+            opusModel,
+          };
+          switch (field) {
+            case 'base_url':
+              return { ...s, baseUrl: value };
+            case 'api_key':
+              return { ...s, apiKey: value };
+            case 'haiku_model':
+              return { ...s, haikuModel: value };
+            case 'sonnet_model':
+              return { ...s, sonnetModel: value };
+            case 'opus_model':
+              return { ...s, opusModel: value };
+          }
+        },
+        [activeField, baseUrl, apiKey, haikuModel, sonnetModel, opusModel],
+      );
+
+      const doOpenAISave = useCallback(() => {
+        const finalVals = { ...openaiDisplayValues, [activeField]: openaiInputValue };
+        const env: Record<string, string> = {};
+
+        // Validate base_url if provided
+        if (finalVals.base_url) {
+          try {
+            new URL(finalVals.base_url);
+          } catch {
+            setOAuthStatus({
+              state: 'error',
+              message: 'Invalid base URL: please enter a full URL including protocol (e.g., https://api.example.com)',
+              toRetry: {
+                state: 'openai_chat_api',
+                baseUrl: '',
+                apiKey: '',
+                haikuModel: '',
+                sonnetModel: '',
+                opusModel: '',
+                activeField: 'base_url',
+              },
+            });
+            return;
+          }
+          env.OPENAI_BASE_URL = finalVals.base_url;
+        }
+
+        if (finalVals.api_key) env.OPENAI_API_KEY = finalVals.api_key;
+        if (finalVals.haiku_model) env.OPENAI_DEFAULT_HAIKU_MODEL = finalVals.haiku_model;
+        if (finalVals.sonnet_model) env.OPENAI_DEFAULT_SONNET_MODEL = finalVals.sonnet_model;
+        if (finalVals.opus_model) env.OPENAI_DEFAULT_OPUS_MODEL = finalVals.opus_model;
+        const { error } = updateSettingsForSource('userSettings', {
+          modelType: 'openai' as any,
+          env,
+        } as any);
+        if (error) {
+          setOAuthStatus({
+            state: 'error',
+            message: 'Failed to save settings. Please try again.',
+            toRetry: {
+              state: 'openai_chat_api',
+              baseUrl: finalVals.base_url ?? '',
+              apiKey: finalVals.api_key ?? '',
+              haikuModel: finalVals.haiku_model ?? '',
+              sonnetModel: finalVals.sonnet_model ?? '',
+              opusModel: finalVals.opus_model ?? '',
+              activeField: 'base_url',
+            },
+          });
+        } else {
+          for (const [k, v] of Object.entries(env)) process.env[k] = v;
+          setOAuthStatus({ state: 'success' });
+          void onDone();
+        }
+      }, [activeField, openaiInputValue, openaiDisplayValues, setOAuthStatus, onDone]);
+
+      const handleOpenAIEnter = useCallback(() => {
+        const idx = OPENAI_FIELDS.indexOf(activeField);
+        if (idx === OPENAI_FIELDS.length - 1) {
+          setOAuthStatus(buildOpenAIState(activeField, openaiInputValue));
+          doOpenAISave();
+        } else {
+          const next = OPENAI_FIELDS[idx + 1]!;
+          setOAuthStatus(buildOpenAIState(activeField, openaiInputValue, next));
+          setOpenaiInputValue(openaiDisplayValues[next] ?? '');
+          setOpenaiInputCursorOffset((openaiDisplayValues[next] ?? '').length);
+        }
+      }, [activeField, openaiInputValue, buildOpenAIState, doOpenAISave, openaiDisplayValues, setOAuthStatus]);
+
+      useKeybinding(
+        'tabs:next',
+        () => {
+          const idx = OPENAI_FIELDS.indexOf(activeField);
+          if (idx < OPENAI_FIELDS.length - 1) {
+            setOAuthStatus(buildOpenAIState(activeField, openaiInputValue, OPENAI_FIELDS[idx + 1]));
+            setOpenaiInputValue(openaiDisplayValues[OPENAI_FIELDS[idx + 1]!] ?? '');
+            setOpenaiInputCursorOffset((openaiDisplayValues[OPENAI_FIELDS[idx + 1]!] ?? '').length);
+          }
+        },
+        { context: 'FormField' },
+      );
+      useKeybinding(
+        'tabs:previous',
+        () => {
+          const idx = OPENAI_FIELDS.indexOf(activeField);
+          if (idx > 0) {
+            setOAuthStatus(buildOpenAIState(activeField, openaiInputValue, OPENAI_FIELDS[idx - 1]));
+            setOpenaiInputValue(openaiDisplayValues[OPENAI_FIELDS[idx - 1]!] ?? '');
+            setOpenaiInputCursorOffset((openaiDisplayValues[OPENAI_FIELDS[idx - 1]!] ?? '').length);
+          }
+        },
+        { context: 'FormField' },
+      );
+      useKeybinding(
+        'confirm:no',
+        () => {
+          setOAuthStatus({ state: 'idle' });
+        },
+        { context: 'Confirmation' },
+      );
+
+      const openaiColumns = useTerminalSize().columns - 20;
+
+      const renderOpenAIRow = (field: OpenAIField, label: string, opts?: { mask?: boolean }) => {
+        const active = activeField === field;
+        const val = openaiDisplayValues[field];
+        return (
+          <Box>
+            <Text backgroundColor={active ? 'suggestion' : undefined} color={active ? 'inverseText' : undefined}>
+              {` ${label} `}
+            </Text>
+            <Text> </Text>
+            {active ? (
+              <TextInput
+                value={openaiInputValue}
+                onChange={setOpenaiInputValue}
+                onSubmit={handleOpenAIEnter}
+                cursorOffset={openaiInputCursorOffset}
+                onChangeCursorOffset={setOpenaiInputCursorOffset}
+                columns={openaiColumns}
+                mask={opts?.mask ? '*' : undefined}
+                focus={true}
+              />
+            ) : val ? (
+              <Text color="success">
+                {opts?.mask ? val.slice(0, 8) + '\u00b7'.repeat(Math.max(0, val.length - 8)) : val}
+              </Text>
+            ) : null}
+          </Box>
+        );
+      };
+
+      return (
+        <Box flexDirection="column" gap={1}>
+          <Text bold>OpenAI Compatible API Setup</Text>
+          <Text dimColor>Configure an OpenAI Chat Completions compatible endpoint (e.g. Ollama, DeepSeek, vLLM).</Text>
+          <Box flexDirection="column" gap={1}>
+            {renderOpenAIRow('base_url', 'Base URL ')}
+            {renderOpenAIRow('api_key', 'API Key  ', { mask: true })}
+            {renderOpenAIRow('haiku_model', 'Haiku    ')}
+            {renderOpenAIRow('sonnet_model', 'Sonnet   ')}
+            {renderOpenAIRow('opus_model', 'Opus     ')}
+          </Box>
+          <Text dimColor>↑↓/Tab to switch · Enter on last field to save · Esc to go back</Text>
+        </Box>
+      );
+    }
+
+    case 'gemini_api': {
+      type GeminiField = 'base_url' | 'api_key' | 'haiku_model' | 'sonnet_model' | 'opus_model';
+      const GEMINI_FIELDS: GeminiField[] = ['base_url', 'api_key', 'haiku_model', 'sonnet_model', 'opus_model'];
+      const gp = oauthStatus as {
+        state: 'gemini_api';
+        activeField: GeminiField;
+        baseUrl: string;
+        apiKey: string;
+        haikuModel: string;
+        sonnetModel: string;
+        opusModel: string;
+      };
+      const { activeField, baseUrl, apiKey, haikuModel, sonnetModel, opusModel } = gp;
+      const geminiDisplayValues: Record<GeminiField, string> = {
+        base_url: baseUrl,
+        api_key: apiKey,
+        haiku_model: haikuModel,
+        sonnet_model: sonnetModel,
+        opus_model: opusModel,
+      };
+
+      const [geminiInputValue, setGeminiInputValue] = useState(() => geminiDisplayValues[activeField]);
+      const [geminiInputCursorOffset, setGeminiInputCursorOffset] = useState(
+        () => geminiDisplayValues[activeField].length,
+      );
+
+      const buildGeminiState = useCallback(
+        (field: GeminiField, value: string, newActive?: GeminiField) => {
+          const s = {
+            state: 'gemini_api' as const,
+            activeField: newActive ?? activeField,
+            baseUrl,
+            apiKey,
+            haikuModel,
+            sonnetModel,
+            opusModel,
+          };
+          switch (field) {
+            case 'base_url':
+              return { ...s, baseUrl: value };
+            case 'api_key':
+              return { ...s, apiKey: value };
+            case 'haiku_model':
+              return { ...s, haikuModel: value };
+            case 'sonnet_model':
+              return { ...s, sonnetModel: value };
+            case 'opus_model':
+              return { ...s, opusModel: value };
+          }
+        },
+        [activeField, baseUrl, apiKey, haikuModel, sonnetModel, opusModel],
+      );
+
+      const doGeminiSave = useCallback(() => {
+        const finalVals = { ...geminiDisplayValues, [activeField]: geminiInputValue };
+        if (!finalVals.haiku_model || !finalVals.sonnet_model || !finalVals.opus_model) {
+          setOAuthStatus({
+            state: 'error',
+            message: 'Gemini setup requires Haiku, Sonnet, and Opus model names.',
+            toRetry: {
+              state: 'gemini_api',
+              baseUrl: finalVals.base_url,
+              apiKey: finalVals.api_key,
+              haikuModel: finalVals.haiku_model,
+              sonnetModel: finalVals.sonnet_model,
+              opusModel: finalVals.opus_model,
+              activeField,
+            },
+          });
+          return;
+        }
+
+        const env: Record<string, string> = {};
+        if (finalVals.base_url) env.GEMINI_BASE_URL = finalVals.base_url;
+        if (finalVals.api_key) env.GEMINI_API_KEY = finalVals.api_key;
+        if (finalVals.haiku_model) env.GEMINI_DEFAULT_HAIKU_MODEL = finalVals.haiku_model;
+        if (finalVals.sonnet_model) env.GEMINI_DEFAULT_SONNET_MODEL = finalVals.sonnet_model;
+        if (finalVals.opus_model) env.GEMINI_DEFAULT_OPUS_MODEL = finalVals.opus_model;
+        const { error } = updateSettingsForSource('userSettings', {
+          modelType: 'gemini' as any,
+          env,
+        } as any);
+        if (error) {
+          setOAuthStatus({
+            state: 'error',
+            message: `Failed to save: ${error.message}`,
+            toRetry: {
+              state: 'gemini_api',
+              baseUrl: '',
+              apiKey: '',
+              haikuModel: '',
+              sonnetModel: '',
+              opusModel: '',
+              activeField: 'base_url',
+            },
+          });
+        } else {
+          for (const [k, v] of Object.entries(env)) process.env[k] = v;
+          setOAuthStatus({ state: 'success' });
+          void onDone();
+        }
+      }, [activeField, geminiInputValue, geminiDisplayValues, onDone, setOAuthStatus]);
+
+      const handleGeminiEnter = useCallback(() => {
+        const idx = GEMINI_FIELDS.indexOf(activeField);
+        if (idx === GEMINI_FIELDS.length - 1) {
+          setOAuthStatus(buildGeminiState(activeField, geminiInputValue));
+          doGeminiSave();
+        } else {
+          const next = GEMINI_FIELDS[idx + 1]!;
+          setOAuthStatus(buildGeminiState(activeField, geminiInputValue, next));
+          setGeminiInputValue(geminiDisplayValues[next] ?? '');
+          setGeminiInputCursorOffset((geminiDisplayValues[next] ?? '').length);
+        }
+      }, [activeField, buildGeminiState, doGeminiSave, geminiDisplayValues, geminiInputValue, setOAuthStatus]);
+
+      useKeybinding(
+        'tabs:next',
+        () => {
+          const idx = GEMINI_FIELDS.indexOf(activeField);
+          if (idx < GEMINI_FIELDS.length - 1) {
+            setOAuthStatus(buildGeminiState(activeField, geminiInputValue, GEMINI_FIELDS[idx + 1]));
+            setGeminiInputValue(geminiDisplayValues[GEMINI_FIELDS[idx + 1]!] ?? '');
+            setGeminiInputCursorOffset((geminiDisplayValues[GEMINI_FIELDS[idx + 1]!] ?? '').length);
+          }
+        },
+        { context: 'FormField' },
+      );
+      useKeybinding(
+        'tabs:previous',
+        () => {
+          const idx = GEMINI_FIELDS.indexOf(activeField);
+          if (idx > 0) {
+            setOAuthStatus(buildGeminiState(activeField, geminiInputValue, GEMINI_FIELDS[idx - 1]));
+            setGeminiInputValue(geminiDisplayValues[GEMINI_FIELDS[idx - 1]!] ?? '');
+            setGeminiInputCursorOffset((geminiDisplayValues[GEMINI_FIELDS[idx - 1]!] ?? '').length);
+          }
+        },
+        { context: 'FormField' },
+      );
+      useKeybinding(
+        'confirm:no',
+        () => {
+          setOAuthStatus({ state: 'idle' });
+        },
+        { context: 'Confirmation' },
+      );
+
+      const geminiColumns = useTerminalSize().columns - 20;
+
+      const renderGeminiRow = (field: GeminiField, label: string, opts?: { mask?: boolean }) => {
+        const active = activeField === field;
+        const val = geminiDisplayValues[field];
+        return (
+          <Box>
+            <Text backgroundColor={active ? 'suggestion' : undefined} color={active ? 'inverseText' : undefined}>
+              {` ${label} `}
+            </Text>
+            <Text> </Text>
+            {active ? (
+              <TextInput
+                value={geminiInputValue}
+                onChange={setGeminiInputValue}
+                onSubmit={handleGeminiEnter}
+                cursorOffset={geminiInputCursorOffset}
+                onChangeCursorOffset={setGeminiInputCursorOffset}
+                columns={geminiColumns}
+                mask={opts?.mask ? '*' : undefined}
+                focus={true}
+              />
+            ) : val ? (
+              <Text color="success">
+                {opts?.mask ? val.slice(0, 8) + '\u00b7'.repeat(Math.max(0, val.length - 8)) : val}
+              </Text>
+            ) : null}
+          </Box>
+        );
+      };
+
+      return (
+        <Box flexDirection="column" gap={1}>
+          <Text bold>Gemini API Setup</Text>
+          <Text dimColor>
+            Configure a Gemini Generate Content compatible endpoint. Base URL is optional and defaults to Google&apos;s
+            v1beta API.
+          </Text>
+          <Box flexDirection="column" gap={1}>
+            {renderGeminiRow('base_url', 'Base URL ')}
+            {renderGeminiRow('api_key', 'API Key  ', { mask: true })}
+            {renderGeminiRow('haiku_model', 'Haiku    ')}
+            {renderGeminiRow('sonnet_model', 'Sonnet   ')}
+            {renderGeminiRow('opus_model', 'Opus     ')}
+          </Box>
+          <Text dimColor>↑↓/Tab to switch · Enter on last field to save · Esc to go back</Text>
+        </Box>
+      );
+    }
 
     case 'platform_setup':
       return (
@@ -1282,14 +1158,12 @@ function OAuthStatusMessage({
 
           <Box flexDirection="column" gap={1}>
             <Text>
-              Claude Code supports Amazon Bedrock, Microsoft Foundry, and Vertex
-              AI. Set the required environment variables, then restart Claude
-              Code.
+              Claude Code supports Amazon Bedrock, Microsoft Foundry, and Vertex AI. Set the required environment
+              variables, then restart Claude Code.
             </Text>
 
             <Text>
-              If you are part of an enterprise organization, contact your
-              administrator for setup instructions.
+              If you are part of an enterprise organization, contact your administrator for setup instructions.
             </Text>
 
             <Box flexDirection="column" marginTop={1}>
@@ -1321,7 +1195,7 @@ function OAuthStatusMessage({
             </Box>
           </Box>
         </Box>
-      )
+      );
 
     case 'waiting_for_login':
       return (
@@ -1345,9 +1219,7 @@ function OAuthStatusMessage({
               <TextInput
                 value={pastedCode}
                 onChange={setPastedCode}
-                onSubmit={(value: string) =>
-                  handleSubmitCode(value, oauthStatus.url)
-                }
+                onSubmit={(value: string) => handleSubmitCode(value, oauthStatus.url)}
                 cursorOffset={cursorOffset}
                 onChangeCursorOffset={setCursorOffset}
                 columns={textInputColumns}
@@ -1356,7 +1228,7 @@ function OAuthStatusMessage({
             </Box>
           )}
         </Box>
-      )
+      );
 
     case 'creating_api_key':
       return (
@@ -1366,14 +1238,14 @@ function OAuthStatusMessage({
             <Text>Creating API key for Claude Code…</Text>
           </Box>
         </Box>
-      )
+      );
 
     case 'about_to_retry':
       return (
         <Box flexDirection="column" gap={1}>
           <Text color="permission">Retrying…</Text>
         </Box>
-      )
+      );
 
     case 'success':
       return (
@@ -1382,8 +1254,7 @@ function OAuthStatusMessage({
             <>
               {getOauthAccountInfo()?.emailAddress ? (
                 <Text dimColor>
-                  Logged in as{' '}
-                  <Text>{getOauthAccountInfo()?.emailAddress}</Text>
+                  Logged in as <Text>{getOauthAccountInfo()?.emailAddress}</Text>
                 </Text>
               ) : null}
               <Text color="success">
@@ -1392,7 +1263,7 @@ function OAuthStatusMessage({
             </>
           )}
         </Box>
-      )
+      );
 
     case 'error':
       return (
@@ -1407,9 +1278,9 @@ function OAuthStatusMessage({
             </Box>
           )}
         </Box>
-      )
+      );
 
     default:
-      return null
+      return null;
   }
 }
diff --git a/src/components/ContextSuggestions.tsx b/src/components/ContextSuggestions.tsx
index 2017d7ab9..60ab9a5c6 100644
--- a/src/components/ContextSuggestions.tsx
+++ b/src/components/ContextSuggestions.tsx
@@ -1,15 +1,15 @@
-import figures from 'figures'
-import * as React from 'react'
-import { Box, Text, StatusIcon } from '@anthropic/ink'
-import type { ContextSuggestion } from '../utils/contextSuggestions.js'
-import { formatTokens } from '../utils/format.js'
+import figures from 'figures';
+import * as React from 'react';
+import { Box, Text, StatusIcon } from '@anthropic/ink';
+import type { ContextSuggestion } from '../utils/contextSuggestions.js';
+import { formatTokens } from '../utils/format.js';
 
 type Props = {
-  suggestions: ContextSuggestion[]
-}
+  suggestions: ContextSuggestion[];
+};
 
 export function ContextSuggestions({ suggestions }: Props): React.ReactNode {
-  if (suggestions.length === 0) return null
+  if (suggestions.length === 0) return null;
 
   return (
     <Box flexDirection="column" marginTop={1}>
@@ -22,8 +22,7 @@ export function ContextSuggestions({ suggestions }: Props): React.ReactNode {
             {suggestion.savingsTokens ? (
               <Text dimColor>
                 {' '}
-                {figures.arrowRight} save ~
-                {formatTokens(suggestion.savingsTokens)}
+                {figures.arrowRight} save ~{formatTokens(suggestion.savingsTokens)}
               </Text>
             ) : null}
           </Box>
@@ -33,5 +32,5 @@ export function ContextSuggestions({ suggestions }: Props): React.ReactNode {
         </Box>
       ))}
     </Box>
-  )
+  );
 }
diff --git a/src/components/ContextVisualization.tsx b/src/components/ContextVisualization.tsx
index 3502db5f8..6fffd7609 100644
--- a/src/components/ContextVisualization.tsx
+++ b/src/components/ContextVisualization.tsx
@@ -1,18 +1,15 @@
-import { feature } from 'bun:bundle'
-import * as React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import type { ContextData } from '../utils/analyzeContext.js'
-import { generateContextSuggestions } from '../utils/contextSuggestions.js'
-import { getDisplayPath } from '../utils/file.js'
-import { formatTokens } from '../utils/format.js'
-import {
-  getSourceDisplayName,
-  type SettingSource,
-} from '../utils/settings/constants.js'
-import { plural } from '../utils/stringUtils.js'
-import { ContextSuggestions } from './ContextSuggestions.js'
+import { feature } from 'bun:bundle';
+import * as React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import type { ContextData } from '../utils/analyzeContext.js';
+import { generateContextSuggestions } from '../utils/contextSuggestions.js';
+import { getDisplayPath } from '../utils/file.js';
+import { formatTokens } from '../utils/format.js';
+import { getSourceDisplayName, type SettingSource } from '../utils/settings/constants.js';
+import { plural } from '../utils/stringUtils.js';
+import { ContextSuggestions } from './ContextSuggestions.js';
 
-const RESERVED_CATEGORY_NAME = 'Autocompact buffer'
+const RESERVED_CATEGORY_NAME = 'Autocompact buffer';
 
 /**
  * One-liner for the legend header showing what context-collapse has done.
@@ -25,41 +22,35 @@ function CollapseStatus(): React.ReactNode {
   if (feature('CONTEXT_COLLAPSE')) {
     /* eslint-disable @typescript-eslint/no-require-imports */
     const { getStats, isContextCollapseEnabled } =
-      require('../services/contextCollapse/index.js') as typeof import('../services/contextCollapse/index.js')
+      require('../services/contextCollapse/index.js') as typeof import('../services/contextCollapse/index.js');
     /* eslint-enable @typescript-eslint/no-require-imports */
-    if (!isContextCollapseEnabled()) return null
+    if (!isContextCollapseEnabled()) return null;
 
-    const s = getStats()
-    const { health: h } = s
+    const s = getStats();
+    const { health: h } = s;
 
-    const parts: string[] = []
+    const parts: string[] = [];
     if (s.collapsedSpans > 0) {
-      parts.push(
-        `${s.collapsedSpans} ${plural(s.collapsedSpans, 'span')} summarized (${s.collapsedMessages} msgs)`,
-      )
+      parts.push(`${s.collapsedSpans} ${plural(s.collapsedSpans, 'span')} summarized (${s.collapsedMessages} msgs)`);
     }
-    if (s.stagedSpans > 0) parts.push(`${s.stagedSpans} staged`)
+    if (s.stagedSpans > 0) parts.push(`${s.stagedSpans} staged`);
     const summary =
       parts.length > 0
         ? parts.join(', ')
         : h.totalSpawns > 0
           ? `${h.totalSpawns} ${plural(h.totalSpawns, 'spawn')}, nothing staged yet`
-          : 'waiting for first trigger'
+          : 'waiting for first trigger';
 
-    let line2: React.ReactNode = null
+    let line2: React.ReactNode = null;
     if (h.totalErrors > 0) {
       line2 = (
         <Text color="warning">
           Collapse errors: {h.totalErrors}/{h.totalSpawns} spawns failed
           {h.lastError ? ` (last: ${h.lastError.slice(0, 60)})` : ''}
         </Text>
-      )
+      );
     } else if (h.emptySpawnWarningEmitted) {
-      line2 = (
-        <Text color="warning">
-          Collapse idle: {h.totalEmptySpawns} consecutive empty runs
-        </Text>
-      )
+      line2 = <Text color="warning">Collapse idle: {h.totalEmptySpawns} consecutive empty runs</Text>;
     }
 
     return (
@@ -67,51 +58,45 @@ function CollapseStatus(): React.ReactNode {
         <Text dimColor>Context strategy: collapse ({summary})</Text>
         {line2}
       </>
-    )
+    );
   }
-  return null
+  return null;
 }
 
 // Order for displaying source groups: Project > User > Managed > Plugin > Built-in
-const SOURCE_DISPLAY_ORDER = [
-  'Project',
-  'User',
-  'Managed',
-  'Plugin',
-  'Built-in',
-]
+const SOURCE_DISPLAY_ORDER = ['Project', 'User', 'Managed', 'Plugin', 'Built-in'];
 
 /** Group items by source type for display, sorted by tokens descending within each group */
-function groupBySource<
-  T extends { source: SettingSource | 'plugin' | 'built-in'; tokens: number },
->(items: T[]): Map<string, T[]> {
-  const groups = new Map<string, T[]>()
+function groupBySource<T extends { source: SettingSource | 'plugin' | 'built-in'; tokens: number }>(
+  items: T[],
+): Map<string, T[]> {
+  const groups = new Map<string, T[]>();
   for (const item of items) {
-    const key = getSourceDisplayName(item.source)
-    const existing = groups.get(key) || []
-    existing.push(item)
-    groups.set(key, existing)
+    const key = getSourceDisplayName(item.source);
+    const existing = groups.get(key) || [];
+    existing.push(item);
+    groups.set(key, existing);
   }
   // Sort each group by tokens descending
   for (const [key, group] of groups.entries()) {
     groups.set(
       key,
       group.sort((a, b) => b.tokens - a.tokens),
-    )
+    );
   }
   // Return groups in consistent order
-  const orderedGroups = new Map<string, T[]>()
+  const orderedGroups = new Map<string, T[]>();
   for (const source of SOURCE_DISPLAY_ORDER) {
-    const group = groups.get(source)
+    const group = groups.get(source);
     if (group) {
-      orderedGroups.set(source, group)
+      orderedGroups.set(source, group);
     }
   }
-  return orderedGroups
+  return orderedGroups;
 }
 
 interface Props {
-  data: ContextData
+  data: ContextData;
 }
 
 export function ContextVisualization({ data }: Props): React.ReactNode {
@@ -130,25 +115,17 @@ export function ContextVisualization({ data }: Props): React.ReactNode {
     agents,
     skills,
     messageBreakdown,
-  } = data
+  } = data;
 
   // Filter out categories with 0 tokens for the legend, and exclude Free space, Autocompact buffer, and deferred
   const visibleCategories = categories.filter(
-    cat =>
-      cat.tokens > 0 &&
-      cat.name !== 'Free space' &&
-      cat.name !== RESERVED_CATEGORY_NAME &&
-      !cat.isDeferred,
-  )
+    cat => cat.tokens > 0 && cat.name !== 'Free space' && cat.name !== RESERVED_CATEGORY_NAME && !cat.isDeferred,
+  );
   // Check if MCP tools are deferred (loaded on-demand via tool search)
-  const hasDeferredMcpTools = categories.some(
-    cat => cat.isDeferred && cat.name.includes('MCP'),
-  )
+  const hasDeferredMcpTools = categories.some(cat => cat.isDeferred && cat.name.includes('MCP'));
   // Check if builtin tools are deferred
-  const hasDeferredBuiltinTools = deferredBuiltinTools.length > 0
-  const autocompactCategory = categories.find(
-    cat => cat.name === RESERVED_CATEGORY_NAME,
-  )
+  const hasDeferredBuiltinTools = deferredBuiltinTools.length > 0;
+  const autocompactCategory = categories.find(cat => cat.name === RESERVED_CATEGORY_NAME);
 
   return (
     <Box flexDirection="column" paddingLeft={1}>
@@ -164,20 +141,20 @@ export function ContextVisualization({ data }: Props): React.ReactNode {
                     <Text key={colIndex} dimColor>
                       {'⛶ '}
                     </Text>
-                  )
+                  );
                 }
                 if (square.categoryName === RESERVED_CATEGORY_NAME) {
                   return (
                     <Text key={colIndex} color={square.color}>
                       {'⛝ '}
                     </Text>
-                  )
+                  );
                 }
                 return (
                   <Text key={colIndex} color={square.color}>
                     {square.squareFullness >= 0.7 ? '⛁ ' : '⛀ '}
                   </Text>
-                )
+                );
               })}
             </Box>
           ))}
@@ -186,8 +163,7 @@ export function ContextVisualization({ data }: Props): React.ReactNode {
         {/* Legend to the right */}
         <Box flexDirection="column" gap={0} flexShrink={0}>
           <Text dimColor>
-            {model} · {formatTokens(totalTokens)}/{formatTokens(rawMaxTokens)}{' '}
-            tokens ({percentage}%)
+            {model} · {formatTokens(totalTokens)}/{formatTokens(rawMaxTokens)} tokens ({percentage}%)
           </Text>
           <CollapseStatus />
           <Text> </Text>
@@ -195,15 +171,13 @@ export function ContextVisualization({ data }: Props): React.ReactNode {
             Estimated usage by category
           </Text>
           {visibleCategories.map((cat, index) => {
-            const tokenDisplay = formatTokens(cat.tokens)
+            const tokenDisplay = formatTokens(cat.tokens);
             // Show "N/A" for deferred categories since they don't count toward context
-            const percentDisplay = cat.isDeferred
-              ? 'N/A'
-              : `${((cat.tokens / rawMaxTokens) * 100).toFixed(1)}%`
-            const isReserved = cat.name === RESERVED_CATEGORY_NAME
-            const displayName = cat.name
+            const percentDisplay = cat.isDeferred ? 'N/A' : `${((cat.tokens / rawMaxTokens) * 100).toFixed(1)}%`;
+            const isReserved = cat.name === RESERVED_CATEGORY_NAME;
+            const displayName = cat.name;
             // Deferred categories don't appear in grid, so show blank instead of symbol
-            const symbol = cat.isDeferred ? ' ' : isReserved ? '⛝' : '⛁'
+            const symbol = cat.isDeferred ? ' ' : isReserved ? '⛝' : '⛁';
 
             return (
               <Box key={index}>
@@ -213,23 +187,15 @@ export function ContextVisualization({ data }: Props): React.ReactNode {
                   {tokenDisplay} tokens ({percentDisplay})
                 </Text>
               </Box>
-            )
+            );
           })}
           {(categories.find(c => c.name === 'Free space')?.tokens ?? 0) > 0 && (
             <Box>
               <Text dimColor>⛶</Text>
               <Text> Free space: </Text>
               <Text dimColor>
-                {formatTokens(
-                  categories.find(c => c.name === 'Free space')?.tokens || 0,
-                )}{' '}
-                (
-                {(
-                  ((categories.find(c => c.name === 'Free space')?.tokens ||
-                    0) /
-                    rawMaxTokens) *
-                  100
-                ).toFixed(1)}
+                {formatTokens(categories.find(c => c.name === 'Free space')?.tokens || 0)} (
+                {(((categories.find(c => c.name === 'Free space')?.tokens || 0) / rawMaxTokens) * 100).toFixed(1)}
                 %)
               </Text>
             </Box>
@@ -253,10 +219,7 @@ export function ContextVisualization({ data }: Props): React.ReactNode {
           <Box flexDirection="column" marginTop={1}>
             <Box>
               <Text bold>MCP tools</Text>
-              <Text dimColor>
-                {' '}
-                · /mcp{hasDeferredMcpTools ? ' (loaded on-demand)' : ''}
-              </Text>
+              <Text dimColor> · /mcp{hasDeferredMcpTools ? ' (loaded on-demand)' : ''}</Text>
             </Box>
             {/* Show loaded tools first */}
             {mcpTools.some(t => t.isLoaded) && (
@@ -297,63 +260,57 @@ export function ContextVisualization({ data }: Props): React.ReactNode {
         )}
 
         {/* Show builtin tools: always-loaded + deferred (ant-only) */}
-        {((systemTools && systemTools.length > 0) || hasDeferredBuiltinTools) &&
-          process.env.USER_TYPE === 'ant' && (
+        {((systemTools && systemTools.length > 0) || hasDeferredBuiltinTools) && process.env.USER_TYPE === 'ant' && (
+          <Box flexDirection="column" marginTop={1}>
+            <Box>
+              <Text bold>[ANT-ONLY] System tools</Text>
+              {hasDeferredBuiltinTools && <Text dimColor> (some loaded on-demand)</Text>}
+            </Box>
+            {/* Always-loaded + deferred-but-loaded tools */}
             <Box flexDirection="column" marginTop={1}>
-              <Box>
-                <Text bold>[ANT-ONLY] System tools</Text>
-                {hasDeferredBuiltinTools && (
-                  <Text dimColor> (some loaded on-demand)</Text>
-                )}
-              </Box>
-              {/* Always-loaded + deferred-but-loaded tools */}
-              <Box flexDirection="column" marginTop={1}>
-                <Text dimColor>Loaded</Text>
-                {systemTools?.map((tool, i) => (
-                  <Box key={`sys-${i}`}>
+              <Text dimColor>Loaded</Text>
+              {systemTools?.map((tool, i) => (
+                <Box key={`sys-${i}`}>
+                  <Text>└ {tool.name}: </Text>
+                  <Text dimColor>{formatTokens(tool.tokens)} tokens</Text>
+                </Box>
+              ))}
+              {deferredBuiltinTools
+                .filter(t => t.isLoaded)
+                .map((tool, i) => (
+                  <Box key={`def-${i}`}>
                     <Text>└ {tool.name}: </Text>
                     <Text dimColor>{formatTokens(tool.tokens)} tokens</Text>
                   </Box>
                 ))}
+            </Box>
+            {/* Deferred (not yet loaded) tools */}
+            {hasDeferredBuiltinTools && deferredBuiltinTools.some(t => !t.isLoaded) && (
+              <Box flexDirection="column" marginTop={1}>
+                <Text dimColor>Available</Text>
                 {deferredBuiltinTools
-                  .filter(t => t.isLoaded)
+                  .filter(t => !t.isLoaded)
                   .map((tool, i) => (
-                    <Box key={`def-${i}`}>
-                      <Text>└ {tool.name}: </Text>
-                      <Text dimColor>{formatTokens(tool.tokens)} tokens</Text>
+                    <Box key={i}>
+                      <Text dimColor>└ {tool.name}</Text>
                     </Box>
                   ))}
               </Box>
-              {/* Deferred (not yet loaded) tools */}
-              {hasDeferredBuiltinTools &&
-                deferredBuiltinTools.some(t => !t.isLoaded) && (
-                  <Box flexDirection="column" marginTop={1}>
-                    <Text dimColor>Available</Text>
-                    {deferredBuiltinTools
-                      .filter(t => !t.isLoaded)
-                      .map((tool, i) => (
-                        <Box key={i}>
-                          <Text dimColor>└ {tool.name}</Text>
-                        </Box>
-                      ))}
-                  </Box>
-                )}
-            </Box>
-          )}
+            )}
+          </Box>
+        )}
 
-        {systemPromptSections &&
-          systemPromptSections.length > 0 &&
-          process.env.USER_TYPE === 'ant' && (
-            <Box flexDirection="column" marginTop={1}>
-              <Text bold>[ANT-ONLY] System prompt sections</Text>
-              {systemPromptSections.map((section, i) => (
-                <Box key={i}>
-                  <Text>└ {section.name}: </Text>
-                  <Text dimColor>{formatTokens(section.tokens)} tokens</Text>
-                </Box>
-              ))}
-            </Box>
-          )}
+        {systemPromptSections && systemPromptSections.length > 0 && process.env.USER_TYPE === 'ant' && (
+          <Box flexDirection="column" marginTop={1}>
+            <Text bold>[ANT-ONLY] System prompt sections</Text>
+            {systemPromptSections.map((section, i) => (
+              <Box key={i}>
+                <Text>└ {section.name}: </Text>
+                <Text dimColor>{formatTokens(section.tokens)} tokens</Text>
+              </Box>
+            ))}
+          </Box>
+        )}
 
         {agents.length > 0 && (
           <Box flexDirection="column" marginTop={1}>
@@ -361,19 +318,17 @@ export function ContextVisualization({ data }: Props): React.ReactNode {
               <Text bold>Custom agents</Text>
               <Text dimColor> · /agents</Text>
             </Box>
-            {Array.from(groupBySource(agents).entries()).map(
-              ([sourceDisplay, sourceAgents]) => (
-                <Box key={sourceDisplay} flexDirection="column" marginTop={1}>
-                  <Text dimColor>{sourceDisplay}</Text>
-                  {sourceAgents.map((agent, i) => (
-                    <Box key={i}>
-                      <Text>└ {agent.agentType}: </Text>
-                      <Text dimColor>{formatTokens(agent.tokens)} tokens</Text>
-                    </Box>
-                  ))}
-                </Box>
-              ),
-            )}
+            {Array.from(groupBySource(agents).entries()).map(([sourceDisplay, sourceAgents]) => (
+              <Box key={sourceDisplay} flexDirection="column" marginTop={1}>
+                <Text dimColor>{sourceDisplay}</Text>
+                {sourceAgents.map((agent, i) => (
+                  <Box key={i}>
+                    <Text>└ {agent.agentType}: </Text>
+                    <Text dimColor>{formatTokens(agent.tokens)} tokens</Text>
+                  </Box>
+                ))}
+              </Box>
+            ))}
           </Box>
         )}
 
@@ -398,19 +353,17 @@ export function ContextVisualization({ data }: Props): React.ReactNode {
               <Text bold>Skills</Text>
               <Text dimColor> · /skills</Text>
             </Box>
-            {Array.from(groupBySource(skills.skillFrontmatter).entries()).map(
-              ([sourceDisplay, sourceSkills]) => (
-                <Box key={sourceDisplay} flexDirection="column" marginTop={1}>
-                  <Text dimColor>{sourceDisplay}</Text>
-                  {sourceSkills.map((skill, i) => (
-                    <Box key={i}>
-                      <Text>└ {skill.name}: </Text>
-                      <Text dimColor>{formatTokens(skill.tokens)} tokens</Text>
-                    </Box>
-                  ))}
-                </Box>
-              ),
-            )}
+            {Array.from(groupBySource(skills.skillFrontmatter).entries()).map(([sourceDisplay, sourceSkills]) => (
+              <Box key={sourceDisplay} flexDirection="column" marginTop={1}>
+                <Text dimColor>{sourceDisplay}</Text>
+                {sourceSkills.map((skill, i) => (
+                  <Box key={i}>
+                    <Text>└ {skill.name}: </Text>
+                    <Text dimColor>{formatTokens(skill.tokens)} tokens</Text>
+                  </Box>
+                ))}
+              </Box>
+            ))}
           </Box>
         )}
 
@@ -421,37 +374,27 @@ export function ContextVisualization({ data }: Props): React.ReactNode {
             <Box flexDirection="column" marginLeft={1}>
               <Box>
                 <Text>Tool calls: </Text>
-                <Text dimColor>
-                  {formatTokens(messageBreakdown.toolCallTokens)} tokens
-                </Text>
+                <Text dimColor>{formatTokens(messageBreakdown.toolCallTokens)} tokens</Text>
               </Box>
 
               <Box>
                 <Text>Tool results: </Text>
-                <Text dimColor>
-                  {formatTokens(messageBreakdown.toolResultTokens)} tokens
-                </Text>
+                <Text dimColor>{formatTokens(messageBreakdown.toolResultTokens)} tokens</Text>
               </Box>
 
               <Box>
                 <Text>Attachments: </Text>
-                <Text dimColor>
-                  {formatTokens(messageBreakdown.attachmentTokens)} tokens
-                </Text>
+                <Text dimColor>{formatTokens(messageBreakdown.attachmentTokens)} tokens</Text>
               </Box>
 
               <Box>
                 <Text>Assistant messages (non-tool): </Text>
-                <Text dimColor>
-                  {formatTokens(messageBreakdown.assistantMessageTokens)} tokens
-                </Text>
+                <Text dimColor>{formatTokens(messageBreakdown.assistantMessageTokens)} tokens</Text>
               </Box>
 
               <Box>
                 <Text>User messages (non-tool-result): </Text>
-                <Text dimColor>
-                  {formatTokens(messageBreakdown.userMessageTokens)} tokens
-                </Text>
+                <Text dimColor>{formatTokens(messageBreakdown.userMessageTokens)} tokens</Text>
               </Box>
             </Box>
 
@@ -462,8 +405,7 @@ export function ContextVisualization({ data }: Props): React.ReactNode {
                   <Box key={i} marginLeft={1}>
                     <Text>└ {tool.name}: </Text>
                     <Text dimColor>
-                      calls {formatTokens(tool.callTokens)}, results{' '}
-                      {formatTokens(tool.resultTokens)}
+                      calls {formatTokens(tool.callTokens)}, results {formatTokens(tool.resultTokens)}
                     </Text>
                   </Box>
                 ))}
@@ -473,16 +415,12 @@ export function ContextVisualization({ data }: Props): React.ReactNode {
             {messageBreakdown.attachmentsByType.length > 0 && (
               <Box flexDirection="column" marginTop={1}>
                 <Text bold>[ANT-ONLY] Top attachments</Text>
-                {messageBreakdown.attachmentsByType
-                  .slice(0, 5)
-                  .map((attachment, i) => (
-                    <Box key={i} marginLeft={1}>
-                      <Text>└ {attachment.name}: </Text>
-                      <Text dimColor>
-                        {formatTokens(attachment.tokens)} tokens
-                      </Text>
-                    </Box>
-                  ))}
+                {messageBreakdown.attachmentsByType.slice(0, 5).map((attachment, i) => (
+                  <Box key={i} marginLeft={1}>
+                    <Text>└ {attachment.name}: </Text>
+                    <Text dimColor>{formatTokens(attachment.tokens)} tokens</Text>
+                  </Box>
+                ))}
               </Box>
             )}
           </Box>
@@ -490,5 +428,5 @@ export function ContextVisualization({ data }: Props): React.ReactNode {
       </Box>
       <ContextSuggestions suggestions={generateContextSuggestions(data)} />
     </Box>
-  )
+  );
 }
diff --git a/src/components/CoordinatorAgentStatus.tsx b/src/components/CoordinatorAgentStatus.tsx
index 0df45ea46..2caa408bc 100644
--- a/src/components/CoordinatorAgentStatus.tsx
+++ b/src/components/CoordinatorAgentStatus.tsx
@@ -6,27 +6,17 @@
  * always; a timestamp shows until passed. Enter to view/steer, x to dismiss.
  */
 
-import figures from 'figures'
-import * as React from 'react'
-import { BLACK_CIRCLE, PAUSE_ICON, PLAY_ICON } from '../constants/figures.js'
-import { useTerminalSize } from '../hooks/useTerminalSize.js'
-import { Box, Text, stringWidth, wrapText } from '@anthropic/ink'
-import {
-  type AppState,
-  useAppState,
-  useSetAppState,
-} from '../state/AppState.js'
-import {
-  enterTeammateView,
-  exitTeammateView,
-} from '../state/teammateViewHelpers.js'
-import {
-  isPanelAgentTask,
-  type LocalAgentTaskState,
-} from '../tasks/LocalAgentTask/LocalAgentTask.js'
-import { formatDuration, formatNumber } from '../utils/format.js'
-import { evictTerminalTask } from '../utils/task/framework.js'
-import { isTerminalStatus } from './tasks/taskStatusUtils.js'
+import figures from 'figures';
+import * as React from 'react';
+import { BLACK_CIRCLE, PAUSE_ICON, PLAY_ICON } from '../constants/figures.js';
+import { useTerminalSize } from '../hooks/useTerminalSize.js';
+import { Box, Text, stringWidth, wrapText } from '@anthropic/ink';
+import { type AppState, useAppState, useSetAppState } from '../state/AppState.js';
+import { enterTeammateView, exitTeammateView } from '../state/teammateViewHelpers.js';
+import { isPanelAgentTask, type LocalAgentTaskState } from '../tasks/LocalAgentTask/LocalAgentTask.js';
+import { formatDuration, formatNumber } from '../utils/format.js';
+import { evictTerminalTask } from '../utils/task/framework.js';
+import { isTerminalStatus } from './tasks/taskStatusUtils.js';
 
 /**
  * Which panel-managed tasks currently have a visible row.
@@ -36,62 +26,57 @@ import { isTerminalStatus } from './tasks/taskStatusUtils.js'
  * the filter time-dependent. Shared by panel render, useCoordinatorTaskCount,
  * and index resolvers so the math can't drift.
  */
-export function getVisibleAgentTasks(
-  tasks: AppState['tasks'],
-): LocalAgentTaskState[] {
+export function getVisibleAgentTasks(tasks: AppState['tasks']): LocalAgentTaskState[] {
   return Object.values(tasks)
-    .filter(
-      (t): t is LocalAgentTaskState =>
-        isPanelAgentTask(t) && t.evictAfter !== 0,
-    )
-    .sort((a, b) => a.startTime - b.startTime)
+    .filter((t): t is LocalAgentTaskState => isPanelAgentTask(t) && t.evictAfter !== 0)
+    .sort((a, b) => a.startTime - b.startTime);
 }
 
 export function CoordinatorTaskPanel(): React.ReactNode {
-  const tasks = useAppState(s => s.tasks)
-  const viewingAgentTaskId = useAppState(s => s.viewingAgentTaskId)
-  const agentNameRegistry = useAppState(s => s.agentNameRegistry)
-  const coordinatorTaskIndex = useAppState(s => s.coordinatorTaskIndex)
-  const tasksSelected = useAppState(s => s.footerSelection === 'tasks')
-  const selectedIndex = tasksSelected ? coordinatorTaskIndex : undefined
-  const setAppState = useSetAppState()
+  const tasks = useAppState(s => s.tasks);
+  const viewingAgentTaskId = useAppState(s => s.viewingAgentTaskId);
+  const agentNameRegistry = useAppState(s => s.agentNameRegistry);
+  const coordinatorTaskIndex = useAppState(s => s.coordinatorTaskIndex);
+  const tasksSelected = useAppState(s => s.footerSelection === 'tasks');
+  const selectedIndex = tasksSelected ? coordinatorTaskIndex : undefined;
+  const setAppState = useSetAppState();
 
-  const visibleTasks = getVisibleAgentTasks(tasks)
-  const hasTasks = Object.values(tasks).some(isPanelAgentTask)
+  const visibleTasks = getVisibleAgentTasks(tasks);
+  const hasTasks = Object.values(tasks).some(isPanelAgentTask);
 
   // 1s tick: re-render for elapsed time + evict tasks past their deadline.
   // The eviction deletes from prev.tasks, which makes useCoordinatorTaskCount
   // (and other consumers) see the updated count without their own tick.
-  const tasksRef = React.useRef(tasks)
-  tasksRef.current = tasks
-  const [, setTick] = React.useState(0)
+  const tasksRef = React.useRef(tasks);
+  tasksRef.current = tasks;
+  const [, setTick] = React.useState(0);
   React.useEffect(() => {
-    if (!hasTasks) return
+    if (!hasTasks) return;
     const interval = setInterval(
       (tasksRef, setAppState, setTick) => {
-        const now = Date.now()
+        const now = Date.now();
         for (const t of Object.values(tasksRef.current)) {
           if (isPanelAgentTask(t) && (t.evictAfter ?? Infinity) <= now) {
-            evictTerminalTask(t.id, setAppState)
+            evictTerminalTask(t.id, setAppState);
           }
         }
-        setTick((prev: number) => prev + 1)
+        setTick((prev: number) => prev + 1);
       },
       1000,
       tasksRef,
       setAppState,
       setTick,
-    )
-    return () => clearInterval(interval)
-  }, [hasTasks, setAppState])
+    );
+    return () => clearInterval(interval);
+  }, [hasTasks, setAppState]);
   const nameByAgentId = React.useMemo(() => {
-    const inv = new Map<string, string>()
-    for (const [n, id] of agentNameRegistry) inv.set(id, n)
-    return inv
-  }, [agentNameRegistry])
+    const inv = new Map<string, string>();
+    for (const [n, id] of agentNameRegistry) inv.set(id, n);
+    return inv;
+  }, [agentNameRegistry]);
 
   if (visibleTasks.length === 0) {
-    return null
+    return null;
   }
 
   return (
@@ -112,7 +97,7 @@ export function CoordinatorTaskPanel(): React.ReactNode {
         />
       ))}
     </Box>
-  )
+  );
 }
 
 /**
@@ -121,12 +106,12 @@ export function CoordinatorTaskPanel(): React.ReactNode {
  * stays accurate without needing its own tick.
  */
 export function useCoordinatorTaskCount(): number {
-  const tasks = useAppState(s => s.tasks)
+  const tasks = useAppState(s => s.tasks);
   return React.useMemo(() => {
-    if ((process.env.USER_TYPE as string) !== 'ant') return 0
-    const count = getVisibleAgentTasks(tasks).length
-    return count > 0 ? count + 1 : 0
-  }, [tasks])
+    if ((process.env.USER_TYPE as string) !== 'ant') return 0;
+    const count = getVisibleAgentTasks(tasks).length;
+    return count > 0 ? count + 1 : 0;
+  }, [tasks]);
 }
 
 function MainLine({
@@ -134,95 +119,71 @@ function MainLine({
   isViewed,
   onClick,
 }: {
-  isSelected?: boolean
-  isViewed?: boolean
-  onClick: () => void
+  isSelected?: boolean;
+  isViewed?: boolean;
+  onClick: () => void;
 }): React.ReactNode {
-  const [hover, setHover] = React.useState(false)
-  const prefix = isSelected || hover ? figures.pointer + ' ' : '  '
-  const bullet = isViewed ? BLACK_CIRCLE : figures.circle
+  const [hover, setHover] = React.useState(false);
+  const prefix = isSelected || hover ? figures.pointer + ' ' : '  ';
+  const bullet = isViewed ? BLACK_CIRCLE : figures.circle;
   return (
-    <Box
-      onClick={onClick}
-      onMouseEnter={() => setHover(true)}
-      onMouseLeave={() => setHover(false)}
-    >
+    <Box onClick={onClick} onMouseEnter={() => setHover(true)} onMouseLeave={() => setHover(false)}>
       <Text dimColor={!isSelected && !isViewed && !hover} bold={isViewed}>
         {prefix}
         {bullet} main
       </Text>
     </Box>
-  )
+  );
 }
 
 type AgentLineProps = {
-  task: LocalAgentTaskState
-  name?: string
-  isSelected?: boolean
-  isViewed?: boolean
-  onClick?: () => void
-}
+  task: LocalAgentTaskState;
+  name?: string;
+  isSelected?: boolean;
+  isViewed?: boolean;
+  onClick?: () => void;
+};
 
-function AgentLine({
-  task,
-  name,
-  isSelected,
-  isViewed,
-  onClick,
-}: AgentLineProps): React.ReactNode {
-  const { columns } = useTerminalSize()
-  const [hover, setHover] = React.useState(false)
-  const isRunning = !isTerminalStatus(task.status)
-  const pausedMs = task.totalPausedMs ?? 0
+function AgentLine({ task, name, isSelected, isViewed, onClick }: AgentLineProps): React.ReactNode {
+  const { columns } = useTerminalSize();
+  const [hover, setHover] = React.useState(false);
+  const isRunning = !isTerminalStatus(task.status);
+  const pausedMs = task.totalPausedMs ?? 0;
   const elapsedMs = Math.max(
     0,
-    isRunning
-      ? Date.now() - task.startTime - pausedMs
-      : (task.endTime ?? task.startTime) - task.startTime - pausedMs,
-  )
+    isRunning ? Date.now() - task.startTime - pausedMs : (task.endTime ?? task.startTime) - task.startTime - pausedMs,
+  );
 
-  const elapsed = formatDuration(elapsedMs)
-  const tokenCount = task.progress?.tokenCount
+  const elapsed = formatDuration(elapsedMs);
+  const tokenCount = task.progress?.tokenCount;
 
   // Derive direction arrow from activity state, same logic as Spinner
-  const lastActivity = task.progress?.lastActivity
-  const arrow = lastActivity ? figures.arrowDown : figures.arrowUp
+  const lastActivity = task.progress?.lastActivity;
+  const arrow = lastActivity ? figures.arrowDown : figures.arrowUp;
 
-  const tokenText =
-    tokenCount !== undefined && tokenCount > 0
-      ? ` · ${arrow} ${formatNumber(tokenCount)} tokens`
-      : ''
+  const tokenText = tokenCount !== undefined && tokenCount > 0 ? ` · ${arrow} ${formatNumber(tokenCount)} tokens` : '';
 
-  const queuedCount = task.pendingMessages.length
-  const queuedText = queuedCount > 0 ? ` · ${queuedCount} queued` : ''
+  const queuedCount = task.pendingMessages.length;
+  const queuedText = queuedCount > 0 ? ` · ${queuedCount} queued` : '';
 
   // Precedence: AI summary > static description (no tool-call activity noise)
-  const displayDescription = task.progress?.summary || task.description
+  const displayDescription = task.progress?.summary || task.description;
 
-  const highlighted = isSelected || hover
-  const prefix = highlighted ? figures.pointer + ' ' : '  '
-  const bullet = isViewed ? BLACK_CIRCLE : figures.circle
-  const dim = !highlighted && !isViewed
+  const highlighted = isSelected || hover;
+  const prefix = highlighted ? figures.pointer + ' ' : '  ';
+  const bullet = isViewed ? BLACK_CIRCLE : figures.circle;
+  const dim = !highlighted && !isViewed;
 
-  const sep = isRunning ? PLAY_ICON : PAUSE_ICON
+  const sep = isRunning ? PLAY_ICON : PAUSE_ICON;
   // Name is the steering handle — kept out of truncation and undimmed so it
   // stays readable even when the row is inactive. Short by convention (the
   // Agent tool prompt asks for "one or two words, lowercase").
-  const namePart = name ? `${name}: ` : ''
-  const hintPart =
-    isSelected && !isViewed ? ` · x to ${isRunning ? 'stop' : 'clear'}` : ''
-  const suffixPart = ` ${sep} ${elapsed}${tokenText}${queuedText}${hintPart}`
+  const namePart = name ? `${name}: ` : '';
+  const hintPart = isSelected && !isViewed ? ` · x to ${isRunning ? 'stop' : 'clear'}` : '';
+  const suffixPart = ` ${sep} ${elapsed}${tokenText}${queuedText}${hintPart}`;
   const availableForDesc =
-    columns -
-    stringWidth(prefix) -
-    stringWidth(`${bullet} `) -
-    stringWidth(namePart) -
-    stringWidth(suffixPart)
-  const truncated = wrapText(
-    displayDescription,
-    Math.max(0, availableForDesc),
-    'truncate-end',
-  )
+    columns - stringWidth(prefix) - stringWidth(`${bullet} `) - stringWidth(namePart) - stringWidth(suffixPart);
+  const truncated = wrapText(displayDescription, Math.max(0, availableForDesc), 'truncate-end');
 
   const line = (
     <Text dimColor={dim} bold={isViewed}>
@@ -241,16 +202,12 @@ function AgentLine({
       {queuedCount > 0 && <Text color="warning">{queuedText}</Text>}
       {hintPart && <Text dimColor>{hintPart}</Text>}
     </Text>
-  )
+  );
 
-  if (!onClick) return line
+  if (!onClick) return line;
   return (
-    <Box
-      onClick={onClick}
-      onMouseEnter={() => setHover(true)}
-      onMouseLeave={() => setHover(false)}
-    >
+    <Box onClick={onClick} onMouseEnter={() => setHover(true)} onMouseLeave={() => setHover(false)}>
       {line}
     </Box>
-  )
+  );
 }
diff --git a/src/components/CostThresholdDialog.tsx b/src/components/CostThresholdDialog.tsx
index 283e76c44..a04efbc85 100644
--- a/src/components/CostThresholdDialog.tsx
+++ b/src/components/CostThresholdDialog.tsx
@@ -1,17 +1,14 @@
-import React from 'react'
-import { Box, Dialog, Link, Text } from '@anthropic/ink'
-import { Select } from './CustomSelect/index.js'
+import React from 'react';
+import { Box, Dialog, Link, Text } from '@anthropic/ink';
+import { Select } from './CustomSelect/index.js';
 
 type Props = {
-  onDone: () => void
-}
+  onDone: () => void;
+};
 
 export function CostThresholdDialog({ onDone }: Props): React.ReactNode {
   return (
-    <Dialog
-      title="You've spent $5 on the Anthropic API this session."
-      onCancel={onDone}
-    >
+    <Dialog title="You've spent $5 on the Anthropic API this session." onCancel={onDone}>
       <Box flexDirection="column">
         <Text>Learn more about how to monitor your spending:</Text>
         <Link url="https://code.claude.com/docs/en/costs" />
@@ -26,5 +23,5 @@ export function CostThresholdDialog({ onDone }: Props): React.ReactNode {
         onChange={onDone}
       />
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/CtrlOToExpand.tsx b/src/components/CtrlOToExpand.tsx
index 01ac3b2fb..426f0e179 100644
--- a/src/components/CtrlOToExpand.tsx
+++ b/src/components/CtrlOToExpand.tsx
@@ -1,49 +1,35 @@
-import chalk from 'chalk'
-import React, { useContext } from 'react'
-import { Text } from '@anthropic/ink'
-import { getShortcutDisplay } from '../keybindings/shortcutFormat.js'
-import { useShortcutDisplay } from '../keybindings/useShortcutDisplay.js'
-import { KeyboardShortcutHint } from '@anthropic/ink'
-import { InVirtualListContext } from './messageActions.js'
+import chalk from 'chalk';
+import React, { useContext } from 'react';
+import { Text } from '@anthropic/ink';
+import { getShortcutDisplay } from '../keybindings/shortcutFormat.js';
+import { useShortcutDisplay } from '../keybindings/useShortcutDisplay.js';
+import { KeyboardShortcutHint } from '@anthropic/ink';
+import { InVirtualListContext } from './messageActions.js';
 
 // Context to track if we're inside a sub agent
 // Similar to MessageResponseContext, this helps us avoid showing
 // too many "(ctrl+o to expand)" hints in sub agent output
-const SubAgentContext = React.createContext(false)
+const SubAgentContext = React.createContext(false);
 
-export function SubAgentProvider({
-  children,
-}: {
-  children: React.ReactNode
-}): React.ReactNode {
-  return (
-    <SubAgentContext.Provider value={true}>{children}</SubAgentContext.Provider>
-  )
+export function SubAgentProvider({ children }: { children: React.ReactNode }): React.ReactNode {
+  return <SubAgentContext.Provider value={true}>{children}</SubAgentContext.Provider>;
 }
 
 export function CtrlOToExpand(): React.ReactNode {
-  const isInSubAgent = useContext(SubAgentContext)
-  const inVirtualList = useContext(InVirtualListContext)
-  const expandShortcut = useShortcutDisplay(
-    'app:toggleTranscript',
-    'Global',
-    'ctrl+o',
-  )
+  const isInSubAgent = useContext(SubAgentContext);
+  const inVirtualList = useContext(InVirtualListContext);
+  const expandShortcut = useShortcutDisplay('app:toggleTranscript', 'Global', 'ctrl+o');
   if (isInSubAgent || inVirtualList) {
-    return null
+    return null;
   }
   return (
     <Text dimColor>
       <KeyboardShortcutHint shortcut={expandShortcut} action="expand" parens />
     </Text>
-  )
+  );
 }
 
 export function ctrlOToExpand(): string {
-  const shortcut = getShortcutDisplay(
-    'app:toggleTranscript',
-    'Global',
-    'ctrl+o',
-  )
-  return chalk.dim(`(${shortcut} to expand)`)
+  const shortcut = getShortcutDisplay('app:toggleTranscript', 'Global', 'ctrl+o');
+  return chalk.dim(`(${shortcut} to expand)`);
 }
diff --git a/src/components/CustomSelect/SelectMulti.tsx b/src/components/CustomSelect/SelectMulti.tsx
index 198917487..5f1f15ac2 100644
--- a/src/components/CustomSelect/SelectMulti.tsx
+++ b/src/components/CustomSelect/SelectMulti.tsx
@@ -1,69 +1,66 @@
-import figures from 'figures'
-import React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import type { PastedContent } from '../../utils/config.js'
-import type { ImageDimensions } from '../../utils/imageResizer.js'
-import type { OptionWithDescription } from './select.js'
-import { SelectInputOption } from './select-input-option.js'
-import { SelectOption } from './select-option.js'
-import { useMultiSelectState } from './use-multi-select-state.js'
+import figures from 'figures';
+import React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import type { PastedContent } from '../../utils/config.js';
+import type { ImageDimensions } from '../../utils/imageResizer.js';
+import type { OptionWithDescription } from './select.js';
+import { SelectInputOption } from './select-input-option.js';
+import { SelectOption } from './select-option.js';
+import { useMultiSelectState } from './use-multi-select-state.js';
 
 export type SelectMultiProps<T> = {
-  readonly isDisabled?: boolean
-  readonly visibleOptionCount?: number
-  readonly options: OptionWithDescription<T>[]
-  readonly defaultValue?: T[]
-  readonly onCancel: () => void
-  readonly onChange?: (values: T[]) => void
-  readonly onFocus?: (value: T) => void
-  readonly focusValue?: T
+  readonly isDisabled?: boolean;
+  readonly visibleOptionCount?: number;
+  readonly options: OptionWithDescription<T>[];
+  readonly defaultValue?: T[];
+  readonly onCancel: () => void;
+  readonly onChange?: (values: T[]) => void;
+  readonly onFocus?: (value: T) => void;
+  readonly focusValue?: T;
   /**
    * Text for the submit button. When provided, a submit button is shown and
    * Enter toggles selection (submit only fires when the button is focused).
    * When omitted, Enter submits directly and Space toggles selection.
    */
-  readonly submitButtonText?: string
+  readonly submitButtonText?: string;
   /**
    * Callback when user submits. Receives the currently selected values.
    */
-  readonly onSubmit?: (values: T[]) => void
+  readonly onSubmit?: (values: T[]) => void;
   /**
    * When true, hides the numeric indexes next to each option.
    */
-  readonly hideIndexes?: boolean
+  readonly hideIndexes?: boolean;
   /**
    * Callback when user presses down from the last item (submit button).
    * If provided, navigation will not wrap to the first item.
    */
-  readonly onDownFromLastItem?: () => void
+  readonly onDownFromLastItem?: () => void;
   /**
    * Callback when user presses up from the first item.
    * If provided, navigation will not wrap to the last item.
    */
-  readonly onUpFromFirstItem?: () => void
+  readonly onUpFromFirstItem?: () => void;
   /**
    * Focus the last option initially instead of the first.
    */
-  readonly initialFocusLast?: boolean
+  readonly initialFocusLast?: boolean;
   /**
    * Callback to open external editor for editing input option values.
    * When provided, ctrl+g will trigger this callback in input options
    * with the current value and a setter function to update the internal state.
    */
-  readonly onOpenEditor?: (
-    currentValue: string,
-    setValue: (value: string) => void,
-  ) => void
+  readonly onOpenEditor?: (currentValue: string, setValue: (value: string) => void) => void;
   readonly onImagePaste?: (
     base64Image: string,
     mediaType?: string,
     filename?: string,
     dimensions?: ImageDimensions,
     sourcePath?: string,
-  ) => void
-  readonly pastedContents?: Record<number, PastedContent>
-  readonly onRemoveImage?: (id: number) => void
-}
+  ) => void;
+  readonly pastedContents?: Record<number, PastedContent>;
+  readonly onRemoveImage?: (id: number) => void;
+};
 
 export function SelectMulti<T>({
   isDisabled = false,
@@ -100,53 +97,44 @@ export function SelectMulti<T>({
     onUpFromFirstItem,
     initialFocusLast,
     hideIndexes,
-  })
+  });
 
-  const maxIndexWidth = options.length.toString().length
+  const maxIndexWidth = options.length.toString().length;
 
   return (
     <Box flexDirection="column">
       <Box flexDirection="column">
         {state.visibleOptions.map((option, index) => {
-          const isOptionFocused =
-            !isDisabled &&
-            state.focusedValue === option.value &&
-            !state.isSubmitFocused
-          const isSelected = state.selectedValues.includes(option.value)
+          const isOptionFocused = !isDisabled && state.focusedValue === option.value && !state.isSubmitFocused;
+          const isSelected = state.selectedValues.includes(option.value);
 
-          const isFirstVisibleOption = option.index === state.visibleFromIndex
-          const isLastVisibleOption = option.index === state.visibleToIndex - 1
-          const areMoreOptionsBelow = state.visibleToIndex < options.length
-          const areMoreOptionsAbove = state.visibleFromIndex > 0
+          const isFirstVisibleOption = option.index === state.visibleFromIndex;
+          const isLastVisibleOption = option.index === state.visibleToIndex - 1;
+          const areMoreOptionsBelow = state.visibleToIndex < options.length;
+          const areMoreOptionsAbove = state.visibleFromIndex > 0;
 
-          const i = state.visibleFromIndex + index + 1
+          const i = state.visibleFromIndex + index + 1;
 
           if (option.type === 'input') {
-            const inputValue = state.inputValues.get(option.value) || ''
+            const inputValue = state.inputValues.get(option.value) || '';
 
             return (
               <Box key={String(option.value)} gap={1}>
                 <SelectInputOption
                   option={option}
                   isFocused={isOptionFocused}
-                  isSelected={
-                    false /* We show selection state differently for multi-select */
-                  }
-                  shouldShowDownArrow={
-                    areMoreOptionsBelow && isLastVisibleOption
-                  }
-                  shouldShowUpArrow={
-                    areMoreOptionsAbove && isFirstVisibleOption
-                  }
+                  isSelected={false /* We show selection state differently for multi-select */}
+                  shouldShowDownArrow={areMoreOptionsBelow && isLastVisibleOption}
+                  shouldShowUpArrow={areMoreOptionsAbove && isFirstVisibleOption}
                   maxIndexWidth={maxIndexWidth}
                   index={i}
                   inputValue={inputValue}
                   onInputChange={value => {
-                    state.updateInputValue(option.value, value)
+                    state.updateInputValue(option.value, value);
                   }}
                   onSubmit={() => {}} /* We handle submit higher up */
                   onExit={() => {
-                    onCancel()
+                    onCancel();
                   }}
                   layout="compact"
                   onOpenEditor={onOpenEditor}
@@ -154,56 +142,39 @@ export function SelectMulti<T>({
                   pastedContents={pastedContents}
                   onRemoveImage={onRemoveImage}
                 >
-                  <Text color={isSelected ? 'success' : undefined}>
-                    [{isSelected ? figures.tick : ' '}]{' '}
-                  </Text>
+                  <Text color={isSelected ? 'success' : undefined}>[{isSelected ? figures.tick : ' '}] </Text>
                 </SelectInputOption>
               </Box>
-            )
+            );
           }
 
           return (
             <Box key={String(option.value)} gap={1}>
               <SelectOption
                 isFocused={isOptionFocused}
-                isSelected={
-                  false /* We show selection state differently for multi-select */
-                }
+                isSelected={false /* We show selection state differently for multi-select */}
                 shouldShowDownArrow={areMoreOptionsBelow && isLastVisibleOption}
                 shouldShowUpArrow={areMoreOptionsAbove && isFirstVisibleOption}
                 description={option.description}
               >
-                {!hideIndexes && (
-                  <Text dimColor>{`${i}.`.padEnd(maxIndexWidth)}</Text>
-                )}
-                <Text color={isSelected ? 'success' : undefined}>
-                  [{isSelected ? figures.tick : ' '}]
-                </Text>
-                <Text color={isOptionFocused ? 'suggestion' : undefined}>
-                  {option.label}
-                </Text>
+                {!hideIndexes && <Text dimColor>{`${i}.`.padEnd(maxIndexWidth)}</Text>}
+                <Text color={isSelected ? 'success' : undefined}>[{isSelected ? figures.tick : ' '}]</Text>
+                <Text color={isOptionFocused ? 'suggestion' : undefined}>{option.label}</Text>
               </SelectOption>
             </Box>
-          )
+          );
         })}
       </Box>
       {submitButtonText && onSubmit && (
         <Box marginTop={0} gap={1}>
-          {state.isSubmitFocused ? (
-            <Text color="suggestion">{figures.pointer}</Text>
-          ) : (
-            <Text> </Text>
-          )}
+          {state.isSubmitFocused ? <Text color="suggestion">{figures.pointer}</Text> : <Text> </Text>}
           <Box marginLeft={3}>
-            <Text
-              color={state.isSubmitFocused ? 'suggestion' : undefined}
-              bold={true}
-            >
+            <Text color={state.isSubmitFocused ? 'suggestion' : undefined} bold={true}>
               {submitButtonText}
             </Text>
           </Box>
         </Box>
       )}
     </Box>
-  )
+  );
 }
diff --git a/src/components/CustomSelect/select-input-option.tsx b/src/components/CustomSelect/select-input-option.tsx
index ccb8a3989..7ff24f43e 100644
--- a/src/components/CustomSelect/select-input-option.tsx
+++ b/src/components/CustomSelect/select-input-option.tsx
@@ -1,55 +1,49 @@
-import React, { type ReactNode, useEffect, useRef, useState } from 'react'
+import React, { type ReactNode, useEffect, useRef, useState } from 'react';
 // eslint-disable-next-line custom-rules/prefer-use-keybindings -- UP arrow exit not in Attachments bindings
-import { Box, Text, useInput } from '@anthropic/ink'
-import {
-  useKeybinding,
-  useKeybindings,
-} from '../../keybindings/useKeybinding.js'
-import type { PastedContent } from '../../utils/config.js'
-import { getImageFromClipboard } from '../../utils/imagePaste.js'
-import type { ImageDimensions } from '../../utils/imageResizer.js'
-import { ClickableImageRef } from '../ClickableImageRef.js'
-import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js'
-import { Byline } from '@anthropic/ink'
-import TextInput from '../TextInput.js'
-import type { OptionWithDescription } from './select.js'
-import { SelectOption } from './select-option.js'
+import { Box, Text, useInput } from '@anthropic/ink';
+import { useKeybinding, useKeybindings } from '../../keybindings/useKeybinding.js';
+import type { PastedContent } from '../../utils/config.js';
+import { getImageFromClipboard } from '../../utils/imagePaste.js';
+import type { ImageDimensions } from '../../utils/imageResizer.js';
+import { ClickableImageRef } from '../ClickableImageRef.js';
+import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js';
+import { Byline } from '@anthropic/ink';
+import TextInput from '../TextInput.js';
+import type { OptionWithDescription } from './select.js';
+import { SelectOption } from './select-option.js';
 
 type Props<T> = {
-  option: Extract<OptionWithDescription<T>, { type: 'input' }>
-  isFocused: boolean
-  isSelected: boolean
-  shouldShowDownArrow: boolean
-  shouldShowUpArrow: boolean
-  maxIndexWidth: number
-  index: number
-  inputValue: string
-  onInputChange: (value: string) => void
-  onSubmit: (value: string) => void
-  onExit?: () => void
-  layout: 'compact' | 'expanded'
-  children?: ReactNode
+  option: Extract<OptionWithDescription<T>, { type: 'input' }>;
+  isFocused: boolean;
+  isSelected: boolean;
+  shouldShowDownArrow: boolean;
+  shouldShowUpArrow: boolean;
+  maxIndexWidth: number;
+  index: number;
+  inputValue: string;
+  onInputChange: (value: string) => void;
+  onSubmit: (value: string) => void;
+  onExit?: () => void;
+  layout: 'compact' | 'expanded';
+  children?: ReactNode;
   /**
    * When true, shows the label before the input field.
    * When false (default), uses the label as the placeholder.
    */
-  showLabel?: boolean
+  showLabel?: boolean;
   /**
    * Callback to open external editor for editing the input value.
    * When provided, ctrl+g will trigger this callback with the current value
    * and a setter function to update the internal state.
    */
-  onOpenEditor?: (
-    currentValue: string,
-    setValue: (value: string) => void,
-  ) => void
+  onOpenEditor?: (currentValue: string, setValue: (value: string) => void) => void;
   /**
    * When true, automatically reset cursor to end of line when:
    * - Option becomes focused
    * - Input value changes
    * This prevents cursor position bugs when the input value updates asynchronously.
    */
-  resetCursorOnUpdate?: boolean
+  resetCursorOnUpdate?: boolean;
   /**
    * Optional callback when an image is pasted into the input.
    */
@@ -59,32 +53,32 @@ type Props<T> = {
     filename?: string,
     dimensions?: ImageDimensions,
     sourcePath?: string,
-  ) => void
+  ) => void;
   /**
    * Pasted content to display inline above the input when focused.
    */
-  pastedContents?: Record<number, PastedContent>
+  pastedContents?: Record<number, PastedContent>;
   /**
    * Callback to remove a pasted image by its ID.
    */
-  onRemoveImage?: (id: number) => void
+  onRemoveImage?: (id: number) => void;
   /**
    * Whether image selection mode is active.
    */
-  imagesSelected?: boolean
+  imagesSelected?: boolean;
   /**
    * Currently selected image index within the image attachments array.
    */
-  selectedImageIndex?: number
+  selectedImageIndex?: number;
   /**
    * Callback to set image selection mode on/off.
    */
-  onImagesSelectedChange?: (selected: boolean) => void
+  onImagesSelectedChange?: (selected: boolean) => void;
   /**
    * Callback to change the selected image index.
    */
-  onSelectedImageIndexChange?: (index: number) => void
-}
+  onSelectedImageIndexChange?: (index: number) => void;
+};
 
 export function SelectInputOption<T>({
   option,
@@ -111,17 +105,15 @@ export function SelectInputOption<T>({
   onImagesSelectedChange,
   onSelectedImageIndexChange,
 }: Props<T>): React.ReactNode {
-  const imageAttachments = pastedContents
-    ? Object.values(pastedContents).filter(c => c.type === 'image')
-    : []
+  const imageAttachments = pastedContents ? Object.values(pastedContents).filter(c => c.type === 'image') : [];
 
   // Allow individual options to force showing the label via showLabelWithValue
-  const showLabel = showLabelProp || option.showLabelWithValue === true
-  const [cursorOffset, setCursorOffset] = useState(inputValue.length)
+  const showLabel = showLabelProp || option.showLabelWithValue === true;
+  const [cursorOffset, setCursorOffset] = useState(inputValue.length);
 
   // Track whether the latest inputValue change was from user typing/pasting,
   // so we can skip resetting cursor to end on user-initiated changes.
-  const isUserEditing = useRef(false)
+  const isUserEditing = useRef(false);
 
   // Reset cursor to end of line when:
   // 1. Option becomes focused (user navigates to it)
@@ -131,119 +123,101 @@ export function SelectInputOption<T>({
   useEffect(() => {
     if (resetCursorOnUpdate && isFocused) {
       if (isUserEditing.current) {
-        isUserEditing.current = false
+        isUserEditing.current = false;
       } else {
-        setCursorOffset(inputValue.length)
+        setCursorOffset(inputValue.length);
       }
     }
-  }, [resetCursorOnUpdate, isFocused, inputValue])
+  }, [resetCursorOnUpdate, isFocused, inputValue]);
 
   // ctrl+g to open external editor (reuses chat:externalEditor keybinding)
   useKeybinding(
     'chat:externalEditor',
     () => {
-      onOpenEditor?.(inputValue, onInputChange)
+      onOpenEditor?.(inputValue, onInputChange);
     },
     { context: 'Chat', isActive: isFocused && !!onOpenEditor },
-  )
+  );
 
   // ctrl+v to paste image from clipboard (same as PromptInput)
   useKeybinding(
     'chat:imagePaste',
     () => {
-      if (!onImagePaste) return
+      if (!onImagePaste) return;
       void getImageFromClipboard().then(imageData => {
         if (imageData) {
-          onImagePaste(
-            imageData.base64,
-            imageData.mediaType,
-            undefined,
-            imageData.dimensions,
-          )
+          onImagePaste(imageData.base64, imageData.mediaType, undefined, imageData.dimensions);
         }
-      })
+      });
     },
     { context: 'Chat', isActive: isFocused && !!onImagePaste },
-  )
+  );
 
   // Backspace with empty input removes the last pasted image (non-image-selection mode)
   useKeybinding(
     'attachments:remove',
     () => {
       if (imageAttachments.length > 0 && onRemoveImage) {
-        onRemoveImage(imageAttachments.at(-1)!.id)
+        onRemoveImage(imageAttachments.at(-1)!.id);
       }
     },
     {
       context: 'Attachments',
-      isActive:
-        isFocused &&
-        !imagesSelected &&
-        inputValue === '' &&
-        imageAttachments.length > 0 &&
-        !!onRemoveImage,
+      isActive: isFocused && !imagesSelected && inputValue === '' && imageAttachments.length > 0 && !!onRemoveImage,
     },
-  )
+  );
 
   // Image selection mode keybindings — reuses existing Attachments actions
   useKeybindings(
     {
       'attachments:next': () => {
         if (imageAttachments.length > 1) {
-          onSelectedImageIndexChange?.(
-            (selectedImageIndex + 1) % imageAttachments.length,
-          )
+          onSelectedImageIndexChange?.((selectedImageIndex + 1) % imageAttachments.length);
         }
       },
       'attachments:previous': () => {
         if (imageAttachments.length > 1) {
-          onSelectedImageIndexChange?.(
-            (selectedImageIndex - 1 + imageAttachments.length) %
-              imageAttachments.length,
-          )
+          onSelectedImageIndexChange?.((selectedImageIndex - 1 + imageAttachments.length) % imageAttachments.length);
         }
       },
       'attachments:remove': () => {
-        const img = imageAttachments[selectedImageIndex]
+        const img = imageAttachments[selectedImageIndex];
         if (img && onRemoveImage) {
-          onRemoveImage(img.id)
+          onRemoveImage(img.id);
           // If no images left after removal, exit image selection
           if (imageAttachments.length <= 1) {
-            onImagesSelectedChange?.(false)
+            onImagesSelectedChange?.(false);
           } else {
             // Adjust index if we deleted the last image
-            onSelectedImageIndexChange?.(
-              Math.min(selectedImageIndex, imageAttachments.length - 2),
-            )
+            onSelectedImageIndexChange?.(Math.min(selectedImageIndex, imageAttachments.length - 2));
           }
         }
       },
       'attachments:exit': () => {
-        onImagesSelectedChange?.(false)
+        onImagesSelectedChange?.(false);
       },
     },
     { context: 'Attachments', isActive: isFocused && !!imagesSelected },
-  )
+  );
 
   // UP arrow exits image selection mode (UP isn't bound to attachments:exit)
   useInput(
     (_input, key) => {
       if (key.upArrow) {
-        onImagesSelectedChange?.(false)
+        onImagesSelectedChange?.(false);
       }
     },
     { isActive: isFocused && !!imagesSelected },
-  )
+  );
 
   // Exit image mode when option loses focus
   useEffect(() => {
     if (!isFocused && imagesSelected) {
-      onImagesSelectedChange?.(false)
+      onImagesSelectedChange?.(false);
     }
-  }, [isFocused, imagesSelected, onImagesSelectedChange])
+  }, [isFocused, imagesSelected, onImagesSelectedChange]);
 
-  const descriptionPaddingLeft =
-    layout === 'expanded' ? maxIndexWidth + 3 : maxIndexWidth + 4
+  const descriptionPaddingLeft = layout === 'expanded' ? maxIndexWidth + 3 : maxIndexWidth + 4;
 
   return (
     <Box flexDirection="column" flexShrink={0}>
@@ -254,28 +228,21 @@ export function SelectInputOption<T>({
         shouldShowUpArrow={shouldShowUpArrow}
         declareCursor={false}
       >
-        <Box
-          flexDirection="row"
-          flexShrink={layout === 'compact' ? 0 : undefined}
-        >
+        <Box flexDirection="row" flexShrink={layout === 'compact' ? 0 : undefined}>
           <Text dimColor>{`${index}.`.padEnd(maxIndexWidth + 2)}</Text>
           {children}
           {showLabel ? (
             <>
-              <Text color={isFocused ? 'suggestion' : undefined}>
-                {option.label}
-              </Text>
+              <Text color={isFocused ? 'suggestion' : undefined}>{option.label}</Text>
               {isFocused ? (
                 <>
-                  <Text color="suggestion">
-                    {option.labelValueSeparator ?? ', '}
-                  </Text>
+                  <Text color="suggestion">{option.labelValueSeparator ?? ', '}</Text>
                   <TextInput
                     value={inputValue}
                     onChange={value => {
-                      isUserEditing.current = true
-                      onInputChange(value)
-                      option.onChange(value)
+                      isUserEditing.current = true;
+                      onInputChange(value);
+                      option.onChange(value);
                     }}
                     onSubmit={onSubmit}
                     onExit={onExit}
@@ -288,13 +255,13 @@ export function SelectInputOption<T>({
                     columns={80}
                     onImagePaste={onImagePaste}
                     onPaste={(pastedText: string) => {
-                      isUserEditing.current = true
-                      const before = inputValue.slice(0, cursorOffset)
-                      const after = inputValue.slice(cursorOffset)
-                      const newValue = before + pastedText + after
-                      onInputChange(newValue)
-                      option.onChange(newValue)
-                      setCursorOffset(before.length + pastedText.length)
+                      isUserEditing.current = true;
+                      const before = inputValue.slice(0, cursorOffset);
+                      const after = inputValue.slice(cursorOffset);
+                      const newValue = before + pastedText + after;
+                      onInputChange(newValue);
+                      option.onChange(newValue);
+                      setCursorOffset(before.length + pastedText.length);
                     }}
                   />
                 </>
@@ -311,16 +278,13 @@ export function SelectInputOption<T>({
             <TextInput
               value={inputValue}
               onChange={value => {
-                isUserEditing.current = true
-                onInputChange(value)
-                option.onChange(value)
+                isUserEditing.current = true;
+                onInputChange(value);
+                option.onChange(value);
               }}
               onSubmit={onSubmit}
               onExit={onExit}
-              placeholder={
-                option.placeholder ||
-                (typeof option.label === 'string' ? option.label : undefined)
-              }
+              placeholder={option.placeholder || (typeof option.label === 'string' ? option.label : undefined)}
               focus={!imagesSelected}
               showCursor={true}
               multiline={true}
@@ -329,19 +293,17 @@ export function SelectInputOption<T>({
               columns={80}
               onImagePaste={onImagePaste}
               onPaste={(pastedText: string) => {
-                isUserEditing.current = true
-                const before = inputValue.slice(0, cursorOffset)
-                const after = inputValue.slice(cursorOffset)
-                const newValue = before + pastedText + after
-                onInputChange(newValue)
-                option.onChange(newValue)
-                setCursorOffset(before.length + pastedText.length)
+                isUserEditing.current = true;
+                const before = inputValue.slice(0, cursorOffset);
+                const after = inputValue.slice(cursorOffset);
+                const newValue = before + pastedText + after;
+                onInputChange(newValue);
+                option.onChange(newValue);
+                setCursorOffset(before.length + pastedText.length);
               }}
             />
           ) : (
-            <Text color={inputValue ? undefined : 'inactive'}>
-              {inputValue || option.placeholder || option.label}
-            </Text>
+            <Text color={inputValue ? undefined : 'inactive'}>{inputValue || option.placeholder || option.label}</Text>
           )}
         </Box>
       </SelectOption>
@@ -349,9 +311,7 @@ export function SelectInputOption<T>({
         <Box paddingLeft={descriptionPaddingLeft}>
           <Text
             dimColor={option.dimDescription !== false}
-            color={
-              isSelected ? 'success' : isFocused ? 'suggestion' : undefined
-            }
+            color={isSelected ? 'success' : isFocused ? 'suggestion' : undefined}
           >
             {option.description}
           </Text>
@@ -408,5 +368,5 @@ export function SelectInputOption<T>({
       )}
       {layout === 'expanded' && <Text> </Text>}
     </Box>
-  )
+  );
 }
diff --git a/src/components/CustomSelect/select-option.tsx b/src/components/CustomSelect/select-option.tsx
index a4c5a386d..c779f4039 100644
--- a/src/components/CustomSelect/select-option.tsx
+++ b/src/components/CustomSelect/select-option.tsx
@@ -1,43 +1,43 @@
-import React, { type ReactNode } from 'react'
-import { ListItem } from '@anthropic/ink'
+import React, { type ReactNode } from 'react';
+import { ListItem } from '@anthropic/ink';
 
 export type SelectOptionProps = {
   /**
    * Determines if option is focused.
    */
-  readonly isFocused: boolean
+  readonly isFocused: boolean;
 
   /**
    * Determines if option is selected.
    */
-  readonly isSelected: boolean
+  readonly isSelected: boolean;
 
   /**
    * Option label.
    */
-  readonly children: ReactNode
+  readonly children: ReactNode;
 
   /**
    * Optional description to display below the label.
    */
-  readonly description?: string
+  readonly description?: string;
 
   /**
    * Determines if the down arrow should be shown.
    */
-  readonly shouldShowDownArrow?: boolean
+  readonly shouldShowDownArrow?: boolean;
 
   /**
    * Determines if the up arrow should be shown.
    */
-  readonly shouldShowUpArrow?: boolean
+  readonly shouldShowUpArrow?: boolean;
 
   /**
    * Whether ListItem should declare the terminal cursor position.
    * Set false when a child declares its own cursor (e.g. BaseTextInput).
    */
-  readonly declareCursor?: boolean
-}
+  readonly declareCursor?: boolean;
+};
 
 export function SelectOption({
   isFocused,
@@ -60,5 +60,5 @@ export function SelectOption({
     >
       {children}
     </ListItem>
-  )
+  );
 }
diff --git a/src/components/CustomSelect/select.tsx b/src/components/CustomSelect/select.tsx
index 7d368c2c3..65251bd4e 100644
--- a/src/components/CustomSelect/select.tsx
+++ b/src/components/CustomSelect/select.tsx
@@ -1,43 +1,43 @@
-import figures from 'figures'
-import React, { type ReactNode, useEffect, useRef, useState } from 'react'
-import { Ansi, Box, Text, stringWidth, useDeclaredCursor } from '@anthropic/ink'
-import { count } from '../../utils/array.js'
-import type { PastedContent } from '../../utils/config.js'
-import type { ImageDimensions } from '../../utils/imageResizer.js'
-import { SelectInputOption } from './select-input-option.js'
-import { SelectOption } from './select-option.js'
-import { useSelectInput } from './use-select-input.js'
-import { useSelectState } from './use-select-state.js'
+import figures from 'figures';
+import React, { type ReactNode, useEffect, useRef, useState } from 'react';
+import { Ansi, Box, Text, stringWidth, useDeclaredCursor } from '@anthropic/ink';
+import { count } from '../../utils/array.js';
+import type { PastedContent } from '../../utils/config.js';
+import type { ImageDimensions } from '../../utils/imageResizer.js';
+import { SelectInputOption } from './select-input-option.js';
+import { SelectOption } from './select-option.js';
+import { useSelectInput } from './use-select-input.js';
+import { useSelectState } from './use-select-state.js';
 
 // Extract text content from ReactNode for width calculation
 function getTextContent(node: ReactNode): string {
-  if (typeof node === 'string') return node
-  if (typeof node === 'number') return String(node)
-  if (!node) return ''
-  if (Array.isArray(node)) return node.map(getTextContent).join('')
+  if (typeof node === 'string') return node;
+  if (typeof node === 'number') return String(node);
+  if (!node) return '';
+  if (Array.isArray(node)) return node.map(getTextContent).join('');
   if (React.isValidElement<{ children?: ReactNode }>(node)) {
-    return getTextContent(node.props.children)
+    return getTextContent(node.props.children);
   }
-  return ''
+  return '';
 }
 
 type BaseOption<T> = {
-  description?: string
-  dimDescription?: boolean
-  label: ReactNode
-  value: T
-  disabled?: boolean
-}
+  description?: string;
+  dimDescription?: boolean;
+  label: ReactNode;
+  value: T;
+  disabled?: boolean;
+};
 
 export type OptionWithDescription<T = string> =
   | (BaseOption<T> & {
-      type?: 'text'
+      type?: 'text';
     })
   | (BaseOption<T> & {
-      type: 'input'
-      onChange: (value: string) => void
-      placeholder?: string
-      initialValue?: string
+      type: 'input';
+      onChange: (value: string) => void;
+      placeholder?: string;
+      initialValue?: string;
       /**
        * Controls behavior when submitting with empty input:
        * - true: calls onChange (treats empty as valid submission)
@@ -46,26 +46,26 @@ export type OptionWithDescription<T = string> =
        * Also affects initial Enter press: when true, submits immediately;
        * when false, enters input mode first so user can type.
        */
-      allowEmptySubmitToCancel?: boolean
+      allowEmptySubmitToCancel?: boolean;
       /**
        * When true, always shows the label alongside the input value, regardless of
        * the global inlineDescriptions/showLabel setting. Use this when the label
        * provides important context that should always be visible (e.g., "Yes, and allow...").
        */
-      showLabelWithValue?: boolean
+      showLabelWithValue?: boolean;
       /**
        * Custom separator between label and value when showLabel is true.
        * Defaults to ", ". Use ": " for labels that read better with a colon.
        */
-      labelValueSeparator?: string
+      labelValueSeparator?: string;
       /**
        * When true, automatically reset cursor to end of line when:
        * - Option becomes focused
        * - Input value changes
        * This prevents cursor position bugs when the input value updates asynchronously.
        */
-      resetCursorOnUpdate?: boolean
-    })
+      resetCursorOnUpdate?: boolean;
+    });
 
 export type SelectProps<T> = {
   /**
@@ -73,65 +73,65 @@ export type SelectProps<T> = {
    *
    * @default false
    */
-  readonly isDisabled?: boolean
+  readonly isDisabled?: boolean;
 
   /**
    * When true, prevents selection on Enter but allows scrolling.
    *
    * @default false
    */
-  readonly disableSelection?: boolean
+  readonly disableSelection?: boolean;
 
   /**
    * When true, hides the numeric indexes next to each option.
    *
    * @default false
    */
-  readonly hideIndexes?: boolean
+  readonly hideIndexes?: boolean;
 
   /**
    * Number of visible options.
    *
    * @default 5
    */
-  readonly visibleOptionCount?: number
+  readonly visibleOptionCount?: number;
 
   /**
    * Highlight text in option labels.
    */
-  readonly highlightText?: string
+  readonly highlightText?: string;
 
   /**
    * Options.
    */
-  readonly options: OptionWithDescription<T>[]
+  readonly options: OptionWithDescription<T>[];
 
   /**
    * Default value.
    */
-  readonly defaultValue?: T
+  readonly defaultValue?: T;
 
   /**
    * Callback when cancel is pressed.
    */
-  readonly onCancel?: () => void
+  readonly onCancel?: () => void;
 
   /**
    * Callback when selected option changes.
    */
-  readonly onChange?: (value: T) => void
+  readonly onChange?: (value: T) => void;
 
   /**
    * Callback when focused option changes.
    * Note: This is for one-way notification only. Avoid combining with focusValue
    * for bidirectional sync, as this can cause feedback loops.
    */
-  readonly onFocus?: (value: T) => void
+  readonly onFocus?: (value: T) => void;
 
   /**
    * Initial value to focus. This is used to set focus when the component mounts.
    */
-  readonly defaultFocusValue?: T
+  readonly defaultFocusValue?: T;
 
   /**
    * Layout of the options.
@@ -139,7 +139,7 @@ export type SelectProps<T> = {
    * - `expanded` uses multiple lines and an empty line between options
    * - `compact-vertical` uses compact index formatting with descriptions below labels
    */
-  readonly layout?: 'compact' | 'expanded' | 'compact-vertical'
+  readonly layout?: 'compact' | 'expanded' | 'compact-vertical';
 
   /**
    * When true, descriptions are rendered inline after the label instead of
@@ -147,35 +147,32 @@ export type SelectProps<T> = {
    *
    * @default false
    */
-  readonly inlineDescriptions?: boolean
+  readonly inlineDescriptions?: boolean;
 
   /**
    * Callback when user presses up from the first item.
    * If provided, navigation will not wrap to the last item.
    */
-  readonly onUpFromFirstItem?: () => void
+  readonly onUpFromFirstItem?: () => void;
 
   /**
    * Callback when user presses down from the last item.
    * If provided, navigation will not wrap to the first item.
    */
-  readonly onDownFromLastItem?: () => void
+  readonly onDownFromLastItem?: () => void;
 
   /**
    * Callback when input mode should be toggled for an option.
    * Called when Tab is pressed (to enter or exit input mode).
    */
-  readonly onInputModeToggle?: (value: T) => void
+  readonly onInputModeToggle?: (value: T) => void;
 
   /**
    * Callback to open external editor for editing input option values.
    * When provided, ctrl+g will trigger this callback in input options
    * with the current value and a setter function to update the internal state.
    */
-  readonly onOpenEditor?: (
-    currentValue: string,
-    setValue: (value: string) => void,
-  ) => void
+  readonly onOpenEditor?: (currentValue: string, setValue: (value: string) => void) => void;
 
   /**
    * Optional callback when an image is pasted into an input option.
@@ -186,18 +183,18 @@ export type SelectProps<T> = {
     filename?: string,
     dimensions?: ImageDimensions,
     sourcePath?: string,
-  ) => void
+  ) => void;
 
   /**
    * Pasted content to display inline in input options.
    */
-  readonly pastedContents?: Record<number, PastedContent>
+  readonly pastedContents?: Record<number, PastedContent>;
 
   /**
    * Callback to remove a pasted image by its ID.
    */
-  readonly onRemoveImage?: (id: number) => void
-}
+  readonly onRemoveImage?: (id: number) => void;
+};
 
 export function Select<T>({
   isDisabled = false,
@@ -222,47 +219,47 @@ export function Select<T>({
   onRemoveImage,
 }: SelectProps<T>): React.ReactNode {
   // Image selection mode state
-  const [imagesSelected, setImagesSelected] = useState(false)
-  const [selectedImageIndex, setSelectedImageIndex] = useState(0)
+  const [imagesSelected, setImagesSelected] = useState(false);
+  const [selectedImageIndex, setSelectedImageIndex] = useState(0);
 
   // State for input type options
   const [inputValues, setInputValues] = useState<Map<T, string>>(() => {
-    const initialMap = new Map<T, string>()
+    const initialMap = new Map<T, string>();
     options.forEach(option => {
       if (option.type === 'input' && option.initialValue) {
-        initialMap.set(option.value, option.initialValue)
+        initialMap.set(option.value, option.initialValue);
       }
-    })
-    return initialMap
-  })
+    });
+    return initialMap;
+  });
 
   // Track the last initialValue we synced, so we can detect user edits
-  const lastInitialValues = useRef<Map<T, string>>(new Map())
+  const lastInitialValues = useRef<Map<T, string>>(new Map());
 
   // Sync initialValue changes to inputValues state, but only if user hasn't edited
   useEffect(() => {
     for (const option of options) {
       if (option.type === 'input' && option.initialValue !== undefined) {
-        const lastInitial = lastInitialValues.current.get(option.value) ?? ''
-        const currentValue = inputValues.get(option.value) ?? ''
-        const newInitial = option.initialValue
+        const lastInitial = lastInitialValues.current.get(option.value) ?? '';
+        const currentValue = inputValues.get(option.value) ?? '';
+        const newInitial = option.initialValue;
 
         // Only update if:
         // 1. The initialValue has changed
         // 2. The user hasn't edited (current value still matches the last initialValue we set)
         if (newInitial !== lastInitial && currentValue === lastInitial) {
           setInputValues(prev => {
-            const next = new Map(prev)
-            next.set(option.value, newInitial)
-            return next
-          })
+            const next = new Map(prev);
+            next.set(option.value, newInitial);
+            return next;
+          });
         }
 
         // Always track the latest initialValue
-        lastInitialValues.current.set(option.value, newInitial)
+        lastInitialValues.current.set(option.value, newInitial);
       }
     }
-  }, [options, inputValues])
+  }, [options, inputValues]);
 
   const state = useSelectState({
     visibleOptionCount,
@@ -272,7 +269,7 @@ export function Select<T>({
     onCancel,
     onFocus,
     focusValue: defaultFocusValue,
-  })
+  });
 
   useSelectInput({
     isDisabled,
@@ -286,48 +283,42 @@ export function Select<T>({
     inputValues,
     imagesSelected,
     onEnterImageSelection: () => {
-      if (
-        pastedContents &&
-        Object.values(pastedContents).some(c => c.type === 'image')
-      ) {
-        const imageCount = count(
-          Object.values(pastedContents),
-          c => c.type === 'image',
-        )
-        setImagesSelected(true)
-        setSelectedImageIndex(imageCount - 1)
-        return true
+      if (pastedContents && Object.values(pastedContents).some(c => c.type === 'image')) {
+        const imageCount = count(Object.values(pastedContents), c => c.type === 'image');
+        setImagesSelected(true);
+        setSelectedImageIndex(imageCount - 1);
+        return true;
       }
-      return false
+      return false;
     },
-  })
+  });
 
   const styles = {
     container: () => ({ flexDirection: 'column' as const }),
     highlightedText: () => ({ bold: true }),
-  }
+  };
 
   if (layout === 'expanded') {
-    const maxIndexWidth = state.options.length.toString().length
+    const maxIndexWidth = state.options.length.toString().length;
 
     return (
       <Box {...styles.container()}>
         {state.visibleOptions.map((option, index) => {
-          const isFirstVisibleOption = option.index === state.visibleFromIndex
-          const isLastVisibleOption = option.index === state.visibleToIndex - 1
-          const areMoreOptionsBelow = state.visibleToIndex < options.length
-          const areMoreOptionsAbove = state.visibleFromIndex > 0
+          const isFirstVisibleOption = option.index === state.visibleFromIndex;
+          const isLastVisibleOption = option.index === state.visibleToIndex - 1;
+          const areMoreOptionsBelow = state.visibleToIndex < options.length;
+          const areMoreOptionsAbove = state.visibleFromIndex > 0;
 
-          const i = state.visibleFromIndex + index + 1
+          const i = state.visibleFromIndex + index + 1;
 
-          const isFocused = !isDisabled && state.focusedValue === option.value
-          const isSelected = state.value === option.value
+          const isFocused = !isDisabled && state.focusedValue === option.value;
+          const isSelected = state.value === option.value;
 
           // Handle input type options
           if (option.type === 'input') {
             const inputValue = inputValues.has(option.value)
               ? inputValues.get(option.value)!
-              : option.initialValue || ''
+              : option.initialValue || '';
 
             return (
               <SelectInputOption
@@ -342,23 +333,18 @@ export function Select<T>({
                 inputValue={inputValue}
                 onInputChange={value => {
                   setInputValues(prev => {
-                    const next = new Map(prev)
-                    next.set(option.value, value)
-                    return next
-                  })
+                    const next = new Map(prev);
+                    next.set(option.value, value);
+                    return next;
+                  });
                 }}
                 onSubmit={(value: string) => {
                   const hasImageAttachments =
-                    pastedContents &&
-                    Object.values(pastedContents).some(c => c.type === 'image')
-                  if (
-                    value.trim() ||
-                    hasImageAttachments ||
-                    option.allowEmptySubmitToCancel
-                  ) {
-                    onChange?.(option.value)
+                    pastedContents && Object.values(pastedContents).some(c => c.type === 'image');
+                  if (value.trim() || hasImageAttachments || option.allowEmptySubmitToCancel) {
+                    onChange?.(option.value);
                   } else {
-                    onCancel?.()
+                    onCancel?.();
                   }
                 }}
                 onExit={onCancel}
@@ -374,20 +360,16 @@ export function Select<T>({
                 onImagesSelectedChange={setImagesSelected}
                 onSelectedImageIndexChange={setSelectedImageIndex}
               />
-            )
+            );
           }
 
           // Handle text type options
-          let label: ReactNode = option.label
+          let label: ReactNode = option.label;
 
           // Only apply highlight when label is a string
-          if (
-            typeof option.label === 'string' &&
-            highlightText &&
-            option.label.includes(highlightText)
-          ) {
-            const labelText = option.label
-            const index = labelText.indexOf(highlightText)
+          if (typeof option.label === 'string' && highlightText && option.label.includes(highlightText)) {
+            const labelText = option.label;
+            const index = labelText.indexOf(highlightText);
 
             label = (
               <>
@@ -395,24 +377,20 @@ export function Select<T>({
                 <Text {...styles.highlightedText()}>{highlightText}</Text>
                 {labelText.slice(index + highlightText.length)}
               </>
-            )
+            );
           }
 
-          const isOptionDisabled = option.disabled === true
+          const isOptionDisabled = option.disabled === true;
           const optionColor = isOptionDisabled
             ? undefined
             : isSelected
               ? 'success'
               : isFocused
                 ? 'suggestion'
-                : undefined
+                : undefined;
 
           return (
-            <Box
-              key={String(option.value)}
-              flexDirection="column"
-              flexShrink={0}
-            >
+            <Box key={String(option.value)} flexDirection="column" flexShrink={0}>
               <SelectOption
                 isFocused={isFocused}
                 isSelected={isSelected}
@@ -425,47 +403,40 @@ export function Select<T>({
               </SelectOption>
               {option.description && (
                 <Box paddingLeft={2}>
-                  <Text
-                    dimColor={
-                      isOptionDisabled || option.dimDescription !== false
-                    }
-                    color={optionColor}
-                  >
+                  <Text dimColor={isOptionDisabled || option.dimDescription !== false} color={optionColor}>
                     <Ansi>{option.description}</Ansi>
                   </Text>
                 </Box>
               )}
               <Text> </Text>
             </Box>
-          )
+          );
         })}
       </Box>
-    )
+    );
   }
 
   if (layout === 'compact-vertical') {
-    const maxIndexWidth = hideIndexes
-      ? 0
-      : state.options.length.toString().length
+    const maxIndexWidth = hideIndexes ? 0 : state.options.length.toString().length;
 
     return (
       <Box {...styles.container()}>
         {state.visibleOptions.map((option, index) => {
-          const isFirstVisibleOption = option.index === state.visibleFromIndex
-          const isLastVisibleOption = option.index === state.visibleToIndex - 1
-          const areMoreOptionsBelow = state.visibleToIndex < options.length
-          const areMoreOptionsAbove = state.visibleFromIndex > 0
+          const isFirstVisibleOption = option.index === state.visibleFromIndex;
+          const isLastVisibleOption = option.index === state.visibleToIndex - 1;
+          const areMoreOptionsBelow = state.visibleToIndex < options.length;
+          const areMoreOptionsAbove = state.visibleFromIndex > 0;
 
-          const i = state.visibleFromIndex + index + 1
+          const i = state.visibleFromIndex + index + 1;
 
-          const isFocused = !isDisabled && state.focusedValue === option.value
-          const isSelected = state.value === option.value
+          const isFocused = !isDisabled && state.focusedValue === option.value;
+          const isSelected = state.value === option.value;
 
           // Handle input type options
           if (option.type === 'input') {
             const inputValue = inputValues.has(option.value)
               ? inputValues.get(option.value)!
-              : option.initialValue || ''
+              : option.initialValue || '';
 
             return (
               <SelectInputOption
@@ -480,23 +451,18 @@ export function Select<T>({
                 inputValue={inputValue}
                 onInputChange={value => {
                   setInputValues(prev => {
-                    const next = new Map(prev)
-                    next.set(option.value, value)
-                    return next
-                  })
+                    const next = new Map(prev);
+                    next.set(option.value, value);
+                    return next;
+                  });
                 }}
                 onSubmit={(value: string) => {
                   const hasImageAttachments =
-                    pastedContents &&
-                    Object.values(pastedContents).some(c => c.type === 'image')
-                  if (
-                    value.trim() ||
-                    hasImageAttachments ||
-                    option.allowEmptySubmitToCancel
-                  ) {
-                    onChange?.(option.value)
+                    pastedContents && Object.values(pastedContents).some(c => c.type === 'image');
+                  if (value.trim() || hasImageAttachments || option.allowEmptySubmitToCancel) {
+                    onChange?.(option.value);
                   } else {
-                    onCancel?.()
+                    onCancel?.();
                   }
                 }}
                 onExit={onCancel}
@@ -512,20 +478,16 @@ export function Select<T>({
                 onImagesSelectedChange={setImagesSelected}
                 onSelectedImageIndexChange={setSelectedImageIndex}
               />
-            )
+            );
           }
 
           // Handle text type options
-          let label: ReactNode = option.label
+          let label: ReactNode = option.label;
 
           // Only apply highlight when label is a string
-          if (
-            typeof option.label === 'string' &&
-            highlightText &&
-            option.label.includes(highlightText)
-          ) {
-            const labelText = option.label
-            const index = labelText.indexOf(highlightText)
+          if (typeof option.label === 'string' && highlightText && option.label.includes(highlightText)) {
+            const labelText = option.label;
+            const index = labelText.indexOf(highlightText);
 
             label = (
               <>
@@ -533,17 +495,13 @@ export function Select<T>({
                 <Text {...styles.highlightedText()}>{highlightText}</Text>
                 {labelText.slice(index + highlightText.length)}
               </>
-            )
+            );
           }
 
-          const isOptionDisabled = option.disabled === true
+          const isOptionDisabled = option.disabled === true;
 
           return (
-            <Box
-              key={String(option.value)}
-              flexDirection="column"
-              flexShrink={0}
-            >
+            <Box key={String(option.value)} flexDirection="column" flexShrink={0}>
               <SelectOption
                 isFocused={isFocused}
                 isSelected={isSelected}
@@ -551,20 +509,10 @@ export function Select<T>({
                 shouldShowUpArrow={areMoreOptionsAbove && isFirstVisibleOption}
               >
                 <>
-                  {!hideIndexes && (
-                    <Text dimColor>{`${i}.`.padEnd(maxIndexWidth + 1)}</Text>
-                  )}
+                  {!hideIndexes && <Text dimColor>{`${i}.`.padEnd(maxIndexWidth + 1)}</Text>}
                   <Text
                     dimColor={isOptionDisabled}
-                    color={
-                      isOptionDisabled
-                        ? undefined
-                        : isSelected
-                          ? 'success'
-                          : isFocused
-                            ? 'suggestion'
-                            : undefined
-                    }
+                    color={isOptionDisabled ? undefined : isSelected ? 'success' : isFocused ? 'suggestion' : undefined}
                   >
                     {label}
                   </Text>
@@ -573,67 +521,50 @@ export function Select<T>({
               {option.description && (
                 <Box paddingLeft={hideIndexes ? 4 : maxIndexWidth + 4}>
                   <Text
-                    dimColor={
-                      isOptionDisabled || option.dimDescription !== false
-                    }
-                    color={
-                      isOptionDisabled
-                        ? undefined
-                        : isSelected
-                          ? 'success'
-                          : isFocused
-                            ? 'suggestion'
-                            : undefined
-                    }
+                    dimColor={isOptionDisabled || option.dimDescription !== false}
+                    color={isOptionDisabled ? undefined : isSelected ? 'success' : isFocused ? 'suggestion' : undefined}
                   >
                     <Ansi>{option.description}</Ansi>
                   </Text>
                 </Box>
               )}
             </Box>
-          )
+          );
         })}
       </Box>
-    )
+    );
   }
 
-  const maxIndexWidth = hideIndexes ? 0 : state.options.length.toString().length
+  const maxIndexWidth = hideIndexes ? 0 : state.options.length.toString().length;
 
   // Check if any visible options have descriptions (for two-column layout)
   // Also check that there are NO input options, since they're not supported in two-column layout
   // Skip two-column layout when inlineDescriptions is enabled
-  const hasInputOptions = state.visibleOptions.some(opt => opt.type === 'input')
-  const hasDescriptions =
-    !inlineDescriptions &&
-    !hasInputOptions &&
-    state.visibleOptions.some(opt => opt.description)
+  const hasInputOptions = state.visibleOptions.some(opt => opt.type === 'input');
+  const hasDescriptions = !inlineDescriptions && !hasInputOptions && state.visibleOptions.some(opt => opt.description);
 
   // Pre-compute option data for two-column layout
   const optionData = state.visibleOptions.map((option, index) => {
-    const isFirstVisibleOption = option.index === state.visibleFromIndex
-    const isLastVisibleOption = option.index === state.visibleToIndex - 1
-    const areMoreOptionsBelow = state.visibleToIndex < options.length
-    const areMoreOptionsAbove = state.visibleFromIndex > 0
-    const i = state.visibleFromIndex + index + 1
-    const isFocused = !isDisabled && state.focusedValue === option.value
-    const isSelected = state.value === option.value
-    const isOptionDisabled = option.disabled === true
+    const isFirstVisibleOption = option.index === state.visibleFromIndex;
+    const isLastVisibleOption = option.index === state.visibleToIndex - 1;
+    const areMoreOptionsBelow = state.visibleToIndex < options.length;
+    const areMoreOptionsAbove = state.visibleFromIndex > 0;
+    const i = state.visibleFromIndex + index + 1;
+    const isFocused = !isDisabled && state.focusedValue === option.value;
+    const isSelected = state.value === option.value;
+    const isOptionDisabled = option.disabled === true;
 
-    let label: ReactNode = option.label
-    if (
-      typeof option.label === 'string' &&
-      highlightText &&
-      option.label.includes(highlightText)
-    ) {
-      const labelText = option.label
-      const idx = labelText.indexOf(highlightText)
+    let label: ReactNode = option.label;
+    if (typeof option.label === 'string' && highlightText && option.label.includes(highlightText)) {
+      const labelText = option.label;
+      const idx = labelText.indexOf(highlightText);
       label = (
         <>
           {labelText.slice(0, idx)}
           <Text {...styles.highlightedText()}>{highlightText}</Text>
           {labelText.slice(idx + highlightText.length)}
         </>
-      )
+      );
     }
 
     return {
@@ -645,41 +576,37 @@ export function Select<T>({
       isOptionDisabled,
       shouldShowDownArrow: areMoreOptionsBelow && isLastVisibleOption,
       shouldShowUpArrow: areMoreOptionsAbove && isFirstVisibleOption,
-    }
-  })
+    };
+  });
 
   // Calculate max label width for alignment when descriptions exist
   if (hasDescriptions) {
     const maxLabelWidth = Math.max(
       ...optionData.map(data => {
-        if (data.option.type === 'input') return 0
-        const labelText = getTextContent(data.option.label)
+        if (data.option.type === 'input') return 0;
+        const labelText = getTextContent(data.option.label);
         // Width: indicator (1) + space (1) + index + label + space + checkmark (1)
-        const indexWidth = hideIndexes ? 0 : maxIndexWidth + 2
-        const checkmarkWidth = data.isSelected ? 2 : 0
-        return 2 + indexWidth + stringWidth(labelText) + checkmarkWidth
+        const indexWidth = hideIndexes ? 0 : maxIndexWidth + 2;
+        const checkmarkWidth = data.isSelected ? 2 : 0;
+        return 2 + indexWidth + stringWidth(labelText) + checkmarkWidth;
       }),
-    )
+    );
 
     return (
       <Box {...styles.container()}>
         {optionData.map(data => {
           if (data.option.type === 'input') {
             // Input options not supported in two-column layout
-            return null
+            return null;
           }
-          const labelText = getTextContent(data.option.label)
-          const indexWidth = hideIndexes ? 0 : maxIndexWidth + 2
-          const checkmarkWidth = data.isSelected ? 2 : 0
-          const currentLabelWidth =
-            2 + indexWidth + stringWidth(labelText) + checkmarkWidth
-          const padding = maxLabelWidth - currentLabelWidth
+          const labelText = getTextContent(data.option.label);
+          const indexWidth = hideIndexes ? 0 : maxIndexWidth + 2;
+          const checkmarkWidth = data.isSelected ? 2 : 0;
+          const currentLabelWidth = 2 + indexWidth + stringWidth(labelText) + checkmarkWidth;
+          const padding = maxLabelWidth - currentLabelWidth;
 
           return (
-            <TwoColumnRow
-              key={String(data.option.value)}
-              isFocused={data.isFocused}
-            >
+            <TwoColumnRow key={String(data.option.value)} isFocused={data.isFocused}>
               {/* Label part - no gap, handle spacing explicitly */}
               <Box flexDirection="row" flexShrink={0}>
                 {data.isFocused ? (
@@ -704,16 +631,10 @@ export function Select<T>({
                           : undefined
                   }
                 >
-                  {!hideIndexes && (
-                    <Text dimColor>
-                      {`${data.index}.`.padEnd(maxIndexWidth + 2)}
-                    </Text>
-                  )}
+                  {!hideIndexes && <Text dimColor>{`${data.index}.`.padEnd(maxIndexWidth + 2)}</Text>}
                   {data.label}
                 </Text>
-                {data.isSelected && (
-                  <Text color="success"> {figures.tick}</Text>
-                )}
+                {data.isSelected && <Text color="success"> {figures.tick}</Text>}
                 {/* Padding to align descriptions */}
                 {padding > 0 && <Text>{' '.repeat(padding)}</Text>}
               </Box>
@@ -721,10 +642,7 @@ export function Select<T>({
               <Box flexGrow={1} marginLeft={2}>
                 <Text
                   wrap="wrap"
-                  dimColor={
-                    data.isOptionDisabled ||
-                    data.option.dimDescription !== false
-                  }
+                  dimColor={data.isOptionDisabled || data.option.dimDescription !== false}
                   color={
                     data.isOptionDisabled
                       ? undefined
@@ -739,10 +657,10 @@ export function Select<T>({
                 </Text>
               </Box>
             </TwoColumnRow>
-          )
+          );
         })}
       </Box>
-    )
+    );
   }
 
   return (
@@ -750,19 +668,17 @@ export function Select<T>({
       {state.visibleOptions.map((option, index) => {
         // Handle input type options
         if (option.type === 'input') {
-          const inputValue = inputValues.has(option.value)
-            ? inputValues.get(option.value)!
-            : option.initialValue || ''
+          const inputValue = inputValues.has(option.value) ? inputValues.get(option.value)! : option.initialValue || '';
 
-          const isFirstVisibleOption = option.index === state.visibleFromIndex
-          const isLastVisibleOption = option.index === state.visibleToIndex - 1
-          const areMoreOptionsBelow = state.visibleToIndex < options.length
-          const areMoreOptionsAbove = state.visibleFromIndex > 0
+          const isFirstVisibleOption = option.index === state.visibleFromIndex;
+          const isLastVisibleOption = option.index === state.visibleToIndex - 1;
+          const areMoreOptionsBelow = state.visibleToIndex < options.length;
+          const areMoreOptionsAbove = state.visibleFromIndex > 0;
 
-          const i = state.visibleFromIndex + index + 1
+          const i = state.visibleFromIndex + index + 1;
 
-          const isFocused = !isDisabled && state.focusedValue === option.value
-          const isSelected = state.value === option.value
+          const isFocused = !isDisabled && state.focusedValue === option.value;
+          const isSelected = state.value === option.value;
 
           return (
             <SelectInputOption
@@ -777,23 +693,18 @@ export function Select<T>({
               inputValue={inputValue}
               onInputChange={value => {
                 setInputValues(prev => {
-                  const next = new Map(prev)
-                  next.set(option.value, value)
-                  return next
-                })
+                  const next = new Map(prev);
+                  next.set(option.value, value);
+                  return next;
+                });
               }}
               onSubmit={(value: string) => {
                 const hasImageAttachments =
-                  pastedContents &&
-                  Object.values(pastedContents).some(c => c.type === 'image')
-                if (
-                  value.trim() ||
-                  hasImageAttachments ||
-                  option.allowEmptySubmitToCancel
-                ) {
-                  onChange?.(option.value)
+                  pastedContents && Object.values(pastedContents).some(c => c.type === 'image');
+                if (value.trim() || hasImageAttachments || option.allowEmptySubmitToCancel) {
+                  onChange?.(option.value);
                 } else {
-                  onCancel?.()
+                  onCancel?.();
                 }
               }}
               onExit={onCancel}
@@ -809,20 +720,16 @@ export function Select<T>({
               onImagesSelectedChange={setImagesSelected}
               onSelectedImageIndexChange={setSelectedImageIndex}
             />
-          )
+          );
         }
 
         // Handle text type options
-        let label: ReactNode = option.label
+        let label: ReactNode = option.label;
 
         // Only apply highlight when label is a string
-        if (
-          typeof option.label === 'string' &&
-          highlightText &&
-          option.label.includes(highlightText)
-        ) {
-          const labelText = option.label
-          const index = labelText.indexOf(highlightText)
+        if (typeof option.label === 'string' && highlightText && option.label.includes(highlightText)) {
+          const labelText = option.label;
+          const index = labelText.indexOf(highlightText);
 
           label = (
             <>
@@ -830,19 +737,19 @@ export function Select<T>({
               <Text {...styles.highlightedText()}>{highlightText}</Text>
               {labelText.slice(index + highlightText.length)}
             </>
-          )
+          );
         }
 
-        const isFirstVisibleOption = option.index === state.visibleFromIndex
-        const isLastVisibleOption = option.index === state.visibleToIndex - 1
-        const areMoreOptionsBelow = state.visibleToIndex < options.length
-        const areMoreOptionsAbove = state.visibleFromIndex > 0
+        const isFirstVisibleOption = option.index === state.visibleFromIndex;
+        const isLastVisibleOption = option.index === state.visibleToIndex - 1;
+        const areMoreOptionsBelow = state.visibleToIndex < options.length;
+        const areMoreOptionsAbove = state.visibleFromIndex > 0;
 
-        const i = state.visibleFromIndex + index + 1
+        const i = state.visibleFromIndex + index + 1;
 
-        const isFocused = !isDisabled && state.focusedValue === option.value
-        const isSelected = state.value === option.value
-        const isOptionDisabled = option.disabled === true
+        const isFocused = !isDisabled && state.focusedValue === option.value;
+        const isSelected = state.value === option.value;
+        const isOptionDisabled = option.disabled === true;
 
         return (
           <SelectOption
@@ -853,31 +760,14 @@ export function Select<T>({
             shouldShowUpArrow={areMoreOptionsAbove && isFirstVisibleOption}
           >
             <Box flexDirection="row" flexShrink={0}>
-              {!hideIndexes && (
-                <Text dimColor>{`${i}.`.padEnd(maxIndexWidth + 2)}</Text>
-              )}
+              {!hideIndexes && <Text dimColor>{`${i}.`.padEnd(maxIndexWidth + 2)}</Text>}
               <Text
                 dimColor={isOptionDisabled}
-                color={
-                  isOptionDisabled
-                    ? undefined
-                    : isSelected
-                      ? 'success'
-                      : isFocused
-                        ? 'suggestion'
-                        : undefined
-                }
+                color={isOptionDisabled ? undefined : isSelected ? 'success' : isFocused ? 'suggestion' : undefined}
               >
                 {label}
                 {inlineDescriptions && option.description && (
-                  <Text
-                    dimColor={
-                      isOptionDisabled || option.dimDescription !== false
-                    }
-                  >
-                    {' '}
-                    {option.description}
-                  </Text>
+                  <Text dimColor={isOptionDisabled || option.dimDescription !== false}> {option.description}</Text>
                 )}
               </Text>
             </Box>
@@ -886,46 +776,32 @@ export function Select<T>({
                 <Text
                   wrap="wrap-trim"
                   dimColor={isOptionDisabled || option.dimDescription !== false}
-                  color={
-                    isOptionDisabled
-                      ? undefined
-                      : isSelected
-                        ? 'success'
-                        : isFocused
-                          ? 'suggestion'
-                          : undefined
-                  }
+                  color={isOptionDisabled ? undefined : isSelected ? 'success' : isFocused ? 'suggestion' : undefined}
                 >
                   <Ansi>{option.description}</Ansi>
                 </Text>
               </Box>
             )}
           </SelectOption>
-        )
+        );
       })}
     </Box>
-  )
+  );
 }
 
 // Row container for the two-column (label + description) layout. Unlike
 // the other Select layouts, this one doesn't render through SelectOption →
 // ListItem, so it declares the native cursor directly. Parks the cursor
 // on the pointer indicator so screen readers / magnifiers track focus.
-function TwoColumnRow({
-  isFocused,
-  children,
-}: {
-  isFocused: boolean
-  children: ReactNode
-}): React.ReactNode {
+function TwoColumnRow({ isFocused, children }: { isFocused: boolean; children: ReactNode }): React.ReactNode {
   const cursorRef = useDeclaredCursor({
     line: 0,
     column: 0,
     active: isFocused,
-  })
+  });
   return (
     <Box ref={cursorRef} flexDirection="row">
       {children}
     </Box>
-  )
+  );
 }
diff --git a/src/components/CustomSelect/use-multi-select-state.ts b/src/components/CustomSelect/use-multi-select-state.ts
index a089a20d4..66ca78d70 100644
--- a/src/components/CustomSelect/use-multi-select-state.ts
+++ b/src/components/CustomSelect/use-multi-select-state.ts
@@ -381,7 +381,7 @@ export function useMultiSelectState<T>({
 
       // Handle numeric keys (1-9) for direct selection
       if (!hideIndexes && /^[0-9]+$/.test(normalizedInput)) {
-        const index = parseInt(normalizedInput) - 1
+        const index = parseInt(normalizedInput, 10) - 1
         if (index >= 0 && index < options.length) {
           const value = options[index]!.value
           const newValues = selectedValues.includes(value)
diff --git a/src/components/CustomSelect/use-select-input.ts b/src/components/CustomSelect/use-select-input.ts
index b289056ee..0dcccc3c1 100644
--- a/src/components/CustomSelect/use-select-input.ts
+++ b/src/components/CustomSelect/use-select-input.ts
@@ -255,7 +255,7 @@ export const useSelectInput = <T>({
           disableSelection !== 'numeric' &&
           /^[0-9]+$/.test(normalizedInput)
         ) {
-          const index = parseInt(normalizedInput) - 1
+          const index = parseInt(normalizedInput, 10) - 1
           if (index >= 0 && index < state.options.length) {
             const selectedOption = state.options[index]!
             if (selectedOption.disabled === true) {
diff --git a/src/components/DesktopHandoff.tsx b/src/components/DesktopHandoff.tsx
index 8dfe65156..60e51e3ae 100644
--- a/src/components/DesktopHandoff.tsx
+++ b/src/components/DesktopHandoff.tsx
@@ -1,120 +1,106 @@
-import React, { useEffect, useState } from 'react'
-import type { CommandResultDisplay } from '../commands.js'
+import React, { useEffect, useState } from 'react';
+import type { CommandResultDisplay } from '../commands.js';
 // eslint-disable-next-line custom-rules/prefer-use-keybindings -- raw input for "any key" dismiss and y/n prompt
-import { Box, Text, useInput, LoadingState } from '@anthropic/ink'
-import { getDesktopInstallStatus, openCurrentSessionInDesktop } from '../utils/desktopDeepLink.js'
-import { openBrowser } from '../utils/browser.js'
+import { Box, Text, useInput, LoadingState } from '@anthropic/ink';
+import { getDesktopInstallStatus, openCurrentSessionInDesktop } from '../utils/desktopDeepLink.js';
+import { openBrowser } from '../utils/browser.js';
 
-import { errorMessage } from '../utils/errors.js'
-import { gracefulShutdown } from '../utils/gracefulShutdown.js'
-import { flushSessionStorage } from '../utils/sessionStorage.js'
+import { errorMessage } from '../utils/errors.js';
+import { gracefulShutdown } from '../utils/gracefulShutdown.js';
+import { flushSessionStorage } from '../utils/sessionStorage.js';
 
-const DESKTOP_DOCS_URL = 'https://clau.de/desktop'
+const DESKTOP_DOCS_URL = 'https://clau.de/desktop';
 
 export function getDownloadUrl(): string {
   switch (process.platform) {
     case 'win32':
-      return 'https://claude.ai/api/desktop/win32/x64/exe/latest/redirect'
+      return 'https://claude.ai/api/desktop/win32/x64/exe/latest/redirect';
     default:
-      return 'https://claude.ai/api/desktop/darwin/universal/dmg/latest/redirect'
+      return 'https://claude.ai/api/desktop/darwin/universal/dmg/latest/redirect';
   }
 }
 
-type DesktopHandoffState =
-  | 'checking'
-  | 'prompt-download'
-  | 'flushing'
-  | 'opening'
-  | 'success'
-  | 'error'
+type DesktopHandoffState = 'checking' | 'prompt-download' | 'flushing' | 'opening' | 'success' | 'error';
 
 type Props = {
-  onDone: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-}
+  onDone: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+};
 
 export function DesktopHandoff({ onDone }: Props): React.ReactNode {
-  const [state, setState] = useState<DesktopHandoffState>('checking')
-  const [error, setError] = useState<string | null>(null)
-  const [downloadMessage, setDownloadMessage] = useState<string>('')
+  const [state, setState] = useState<DesktopHandoffState>('checking');
+  const [error, setError] = useState<string | null>(null);
+  const [downloadMessage, setDownloadMessage] = useState<string>('');
 
   // Handle keyboard input for error and prompt-download states
   useInput(input => {
     if (state === 'error') {
-      onDone(error ?? 'Unknown error', { display: 'system' })
-      return
+      onDone(error ?? 'Unknown error', { display: 'system' });
+      return;
     }
     if (state === 'prompt-download') {
       if (input === 'y' || input === 'Y') {
-        openBrowser(getDownloadUrl()).catch(() => {})
+        openBrowser(getDownloadUrl()).catch(() => {});
         onDone(
           `Starting download. Re-run /desktop once you\u2019ve installed the app.\nLearn more at ${DESKTOP_DOCS_URL}`,
           { display: 'system' },
-        )
+        );
       } else if (input === 'n' || input === 'N') {
-        onDone(
-          `The desktop app is required for /desktop. Learn more at ${DESKTOP_DOCS_URL}`,
-          { display: 'system' },
-        )
+        onDone(`The desktop app is required for /desktop. Learn more at ${DESKTOP_DOCS_URL}`, { display: 'system' });
       }
     }
-  })
+  });
 
   useEffect(() => {
     async function performHandoff(): Promise<void> {
       // Check Desktop install status
-      setState('checking')
-      const installStatus = await getDesktopInstallStatus()
+      setState('checking');
+      const installStatus = await getDesktopInstallStatus();
 
       if (installStatus.status === 'not-installed') {
-        setDownloadMessage('Claude Desktop is not installed.')
-        setState('prompt-download')
-        return
+        setDownloadMessage('Claude Desktop is not installed.');
+        setState('prompt-download');
+        return;
       }
 
       if (installStatus.status === 'version-too-old') {
-        setDownloadMessage(
-          `Claude Desktop needs to be updated (found v${installStatus.version}, need v1.1.2396+).`,
-        )
-        setState('prompt-download')
-        return
+        setDownloadMessage(`Claude Desktop needs to be updated (found v${installStatus.version}, need v1.1.2396+).`);
+        setState('prompt-download');
+        return;
       }
 
       // Flush session storage to ensure transcript is fully written
-      setState('flushing')
-      await flushSessionStorage()
+      setState('flushing');
+      await flushSessionStorage();
 
       // Open the deep link (uses claude-dev:// in dev mode)
-      setState('opening')
-      const result = await openCurrentSessionInDesktop()
+      setState('opening');
+      const result = await openCurrentSessionInDesktop();
 
       if (!result.success) {
-        setError(result.error ?? 'Failed to open Claude Desktop')
-        setState('error')
-        return
+        setError(result.error ?? 'Failed to open Claude Desktop');
+        setState('error');
+        return;
       }
 
       // Success - exit the CLI
-      setState('success')
+      setState('success');
 
       // Give the user a moment to see the success message
       setTimeout(
         async (onDone: Props['onDone']) => {
-          onDone('Session transferred to Claude Desktop', { display: 'system' })
-          await gracefulShutdown(0, 'other')
+          onDone('Session transferred to Claude Desktop', { display: 'system' });
+          await gracefulShutdown(0, 'other');
         },
         500,
         onDone,
-      )
+      );
     }
 
     performHandoff().catch(err => {
-      setError(errorMessage(err))
-      setState('error')
-    })
-  }, [onDone])
+      setError(errorMessage(err));
+      setState('error');
+    });
+  }, [onDone]);
 
   if (state === 'error') {
     return (
@@ -122,7 +108,7 @@ export function DesktopHandoff({ onDone }: Props): React.ReactNode {
         <Text color="error">Error: {error}</Text>
         <Text dimColor>Press any key to continue…</Text>
       </Box>
-    )
+    );
   }
 
   if (state === 'prompt-download') {
@@ -131,18 +117,15 @@ export function DesktopHandoff({ onDone }: Props): React.ReactNode {
         <Text>{downloadMessage}</Text>
         <Text>Download now? (y/n)</Text>
       </Box>
-    )
+    );
   }
 
-  const messages: Record<
-    Exclude<DesktopHandoffState, 'error' | 'prompt-download'>,
-    string
-  > = {
+  const messages: Record<Exclude<DesktopHandoffState, 'error' | 'prompt-download'>, string> = {
     checking: 'Checking for Claude Desktop…',
     flushing: 'Saving session…',
     opening: 'Opening Claude Desktop…',
     success: 'Opening in Claude Desktop…',
-  }
+  };
 
-  return <LoadingState message={messages[state]} />
+  return <LoadingState message={messages[state]} />;
 }
diff --git a/src/components/DesktopUpsell/DesktopUpsellStartup.tsx b/src/components/DesktopUpsell/DesktopUpsellStartup.tsx
index f2ca4d46e..a73b9f226 100644
--- a/src/components/DesktopUpsell/DesktopUpsellStartup.tsx
+++ b/src/components/DesktopUpsell/DesktopUpsellStartup.tsx
@@ -1,84 +1,78 @@
-import * as React from 'react'
-import { useEffect, useState } from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { getDynamicConfig_CACHED_MAY_BE_STALE } from '../../services/analytics/growthbook.js'
-import { logEvent } from '../../services/analytics/index.js'
-import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js'
-import { Select } from '../CustomSelect/select.js'
-import { DesktopHandoff } from '../DesktopHandoff.js'
-import { PermissionDialog } from '../permissions/PermissionDialog.js'
+import * as React from 'react';
+import { useEffect, useState } from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { getDynamicConfig_CACHED_MAY_BE_STALE } from '../../services/analytics/growthbook.js';
+import { logEvent } from '../../services/analytics/index.js';
+import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js';
+import { Select } from '../CustomSelect/select.js';
+import { DesktopHandoff } from '../DesktopHandoff.js';
+import { PermissionDialog } from '../permissions/PermissionDialog.js';
 
 type DesktopUpsellConfig = {
-  enable_shortcut_tip: boolean
-  enable_startup_dialog: boolean
-}
+  enable_shortcut_tip: boolean;
+  enable_startup_dialog: boolean;
+};
 
 const DESKTOP_UPSELL_DEFAULT: DesktopUpsellConfig = {
   enable_shortcut_tip: false,
   enable_startup_dialog: false,
-}
+};
 
 export function getDesktopUpsellConfig(): DesktopUpsellConfig {
-  return getDynamicConfig_CACHED_MAY_BE_STALE(
-    'tengu_desktop_upsell',
-    DESKTOP_UPSELL_DEFAULT,
-  )
+  return getDynamicConfig_CACHED_MAY_BE_STALE('tengu_desktop_upsell', DESKTOP_UPSELL_DEFAULT);
 }
 
 function isSupportedPlatform(): boolean {
-  return (
-    process.platform === 'darwin' ||
-    (process.platform === 'win32' && process.arch === 'x64')
-  )
+  return process.platform === 'darwin' || (process.platform === 'win32' && process.arch === 'x64');
 }
 
 export function shouldShowDesktopUpsellStartup(): boolean {
-  if (!isSupportedPlatform()) return false
-  if (!getDesktopUpsellConfig().enable_startup_dialog) return false
-  const config = getGlobalConfig()
-  if (config.desktopUpsellDismissed) return false
-  if ((config.desktopUpsellSeenCount ?? 0) >= 3) return false
-  return true
+  if (!isSupportedPlatform()) return false;
+  if (!getDesktopUpsellConfig().enable_startup_dialog) return false;
+  const config = getGlobalConfig();
+  if (config.desktopUpsellDismissed) return false;
+  if ((config.desktopUpsellSeenCount ?? 0) >= 3) return false;
+  return true;
 }
 
-type DesktopUpsellSelection = 'try' | 'not-now' | 'never'
+type DesktopUpsellSelection = 'try' | 'not-now' | 'never';
 
 type Props = {
-  onDone: () => void
-}
+  onDone: () => void;
+};
 
 export function DesktopUpsellStartup({ onDone }: Props): React.ReactNode {
-  const [showHandoff, setShowHandoff] = useState(false)
+  const [showHandoff, setShowHandoff] = useState(false);
 
   // Increment seen count on mount (guard in updater for StrictMode safety)
   useEffect(() => {
-    const newCount = (getGlobalConfig().desktopUpsellSeenCount ?? 0) + 1
+    const newCount = (getGlobalConfig().desktopUpsellSeenCount ?? 0) + 1;
     saveGlobalConfig(prev => {
-      if ((prev.desktopUpsellSeenCount ?? 0) >= newCount) return prev
-      return { ...prev, desktopUpsellSeenCount: newCount }
-    })
-    logEvent('tengu_desktop_upsell_shown', { seen_count: newCount })
-  }, [])
+      if ((prev.desktopUpsellSeenCount ?? 0) >= newCount) return prev;
+      return { ...prev, desktopUpsellSeenCount: newCount };
+    });
+    logEvent('tengu_desktop_upsell_shown', { seen_count: newCount });
+  }, []);
 
   if (showHandoff) {
-    return <DesktopHandoff onDone={() => onDone()} />
+    return <DesktopHandoff onDone={() => onDone()} />;
   }
 
   function handleSelect(value: DesktopUpsellSelection): void {
     switch (value) {
       case 'try':
-        setShowHandoff(true)
-        return
+        setShowHandoff(true);
+        return;
       case 'never':
         saveGlobalConfig(prev => {
-          if (prev.desktopUpsellDismissed) return prev
-          return { ...prev, desktopUpsellDismissed: true }
-        })
-        onDone()
-        return
+          if (prev.desktopUpsellDismissed) return prev;
+          return { ...prev, desktopUpsellDismissed: true };
+        });
+        onDone();
+        return;
       case 'not-now':
-        onDone()
-        return
+        onDone();
+        return;
     }
   }
 
@@ -86,23 +80,16 @@ export function DesktopUpsellStartup({ onDone }: Props): React.ReactNode {
     { label: 'Open in Claude Code Desktop', value: 'try' as const },
     { label: 'Not now', value: 'not-now' as const },
     { label: "Don't ask again", value: 'never' as const },
-  ]
+  ];
 
   return (
     <PermissionDialog title="Try Claude Code Desktop">
       <Box flexDirection="column" paddingX={2} paddingY={1}>
         <Box marginBottom={1}>
-          <Text>
-            Same Claude Code with visual diffs, live app preview, parallel
-            sessions, and more.
-          </Text>
+          <Text>Same Claude Code with visual diffs, live app preview, parallel sessions, and more.</Text>
         </Box>
-        <Select
-          options={options}
-          onChange={handleSelect}
-          onCancel={() => handleSelect('not-now')}
-        />
+        <Select options={options} onChange={handleSelect} onCancel={() => handleSelect('not-now')} />
       </Box>
     </PermissionDialog>
-  )
+  );
 }
diff --git a/src/components/DevBar.tsx b/src/components/DevBar.tsx
index c1f8aa9ee..181557239 100644
--- a/src/components/DevBar.tsx
+++ b/src/components/DevBar.tsx
@@ -1,46 +1,44 @@
-import * as React from 'react'
-import { useState } from 'react'
-import { getSlowOperations } from '../bootstrap/state.js'
-import { Text, useInterval } from '@anthropic/ink'
+import * as React from 'react';
+import { useState } from 'react';
+import { getSlowOperations } from '../bootstrap/state.js';
+import { Text, useInterval } from '@anthropic/ink';
 
 // Show DevBar for dev builds or all ants
 function shouldShowDevBar(): boolean {
-  return (
-    process.env.NODE_ENV === 'development' || process.env.USER_TYPE === 'ant'
-  )
+  return process.env.NODE_ENV === 'development' || process.env.USER_TYPE === 'ant';
 }
 
 export function DevBar(): React.ReactNode {
   const [slowOps, setSlowOps] =
     useState<
       ReadonlyArray<{
-        operation: string
-        durationMs: number
-        timestamp: number
+        operation: string;
+        durationMs: number;
+        timestamp: number;
       }>
-    >(getSlowOperations)
+    >(getSlowOperations);
 
   useInterval(
     () => {
-      setSlowOps(getSlowOperations())
+      setSlowOps(getSlowOperations());
     },
     shouldShowDevBar() ? 500 : null,
-  )
+  );
 
   // Only show when there's something to display
   if (!shouldShowDevBar() || slowOps.length === 0) {
-    return null
+    return null;
   }
 
   // Single-line format so short terminals don't lose rows to dev noise.
   const recentOps = slowOps
     .slice(-3)
     .map(op => `${op.operation} (${Math.round(op.durationMs)}ms)`)
-    .join(' · ')
+    .join(' · ');
 
   return (
     <Text wrap="truncate-end" color="warning">
       [ANT-ONLY] slow sync: {recentOps}
     </Text>
-  )
+  );
 }
diff --git a/src/components/DevChannelsDialog.tsx b/src/components/DevChannelsDialog.tsx
index f055e4ae6..e2fe4bd81 100644
--- a/src/components/DevChannelsDialog.tsx
+++ b/src/components/DevChannelsDialog.tsx
@@ -1,54 +1,42 @@
-import React, { useCallback } from 'react'
-import type { ChannelEntry } from '../bootstrap/state.js'
-import { Box, Text, Dialog } from '@anthropic/ink'
-import { gracefulShutdownSync } from '../utils/gracefulShutdown.js'
-import { Select } from './CustomSelect/index.js'
+import React, { useCallback } from 'react';
+import type { ChannelEntry } from '../bootstrap/state.js';
+import { Box, Text, Dialog } from '@anthropic/ink';
+import { gracefulShutdownSync } from '../utils/gracefulShutdown.js';
+import { Select } from './CustomSelect/index.js';
 
 type Props = {
-  channels: ChannelEntry[]
-  onAccept(): void
-}
+  channels: ChannelEntry[];
+  onAccept(): void;
+};
 
-export function DevChannelsDialog({
-  channels,
-  onAccept,
-}: Props): React.ReactNode {
+export function DevChannelsDialog({ channels, onAccept }: Props): React.ReactNode {
   function onChange(value: 'accept' | 'exit') {
     switch (value) {
       case 'accept':
-        onAccept()
-        break
+        onAccept();
+        break;
       case 'exit':
-        gracefulShutdownSync(1)
-        break
+        gracefulShutdownSync(1);
+        break;
     }
   }
 
   const handleEscape = useCallback(() => {
-    gracefulShutdownSync(0)
-  }, [])
+    gracefulShutdownSync(0);
+  }, []);
 
   return (
-    <Dialog
-      title="WARNING: Loading development channels"
-      color="error"
-      onCancel={handleEscape}
-    >
+    <Dialog title="WARNING: Loading development channels" color="error" onCancel={handleEscape}>
       <Box flexDirection="column" gap={1}>
         <Text>
-          --dangerously-load-development-channels is for local channel
-          development only. Do not use this option to run channels you have
-          downloaded off the internet.
+          --dangerously-load-development-channels is for local channel development only. Do not use this option to run
+          channels you have downloaded off the internet.
         </Text>
         <Text>Please use --channels to run a list of approved channels.</Text>
         <Text dimColor>
           Channels:{' '}
           {channels
-            .map(c =>
-              c.kind === 'plugin'
-                ? `plugin:${c.name}@${c.marketplace}`
-                : `server:${c.name}`,
-            )
+            .map(c => (c.kind === 'plugin' ? `plugin:${c.name}@${c.marketplace}` : `server:${c.name}`))
             .join(', ')}
         </Text>
       </Box>
@@ -61,5 +49,5 @@ export function DevChannelsDialog({
         onChange={value => onChange(value as 'accept' | 'exit')}
       />
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/DiagnosticsDisplay.tsx b/src/components/DiagnosticsDisplay.tsx
index 5a92190b5..d588eb9b7 100644
--- a/src/components/DiagnosticsDisplay.tsx
+++ b/src/components/DiagnosticsDisplay.tsx
@@ -1,33 +1,27 @@
-import { relative } from 'path'
-import React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { DiagnosticTrackingService } from '../services/diagnosticTracking.js'
-import type { Attachment } from '../utils/attachments.js'
-import { getCwd } from '../utils/cwd.js'
-import { CtrlOToExpand } from './CtrlOToExpand.js'
-import { MessageResponse } from './MessageResponse.js'
+import { relative } from 'path';
+import React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { DiagnosticTrackingService } from '../services/diagnosticTracking.js';
+import type { Attachment } from '../utils/attachments.js';
+import { getCwd } from '../utils/cwd.js';
+import { CtrlOToExpand } from './CtrlOToExpand.js';
+import { MessageResponse } from './MessageResponse.js';
 
-type DiagnosticsAttachment = Extract<Attachment, { type: 'diagnostics' }>
+type DiagnosticsAttachment = Extract<Attachment, { type: 'diagnostics' }>;
 
 type DiagnosticsDisplayProps = {
-  attachment: DiagnosticsAttachment
-  verbose: boolean
-}
+  attachment: DiagnosticsAttachment;
+  verbose: boolean;
+};
 
-export function DiagnosticsDisplay({
-  attachment,
-  verbose,
-}: DiagnosticsDisplayProps): React.ReactNode {
+export function DiagnosticsDisplay({ attachment, verbose }: DiagnosticsDisplayProps): React.ReactNode {
   // Only show if there are diagnostics to report
-  if (attachment.files.length === 0) return null
+  if (attachment.files.length === 0) return null;
 
   // Count total issues
-  const totalIssues = attachment.files.reduce(
-    (sum, file) => sum + file.diagnostics.length,
-    0,
-  )
+  const totalIssues = attachment.files.reduce((sum, file) => sum + file.diagnostics.length, 0);
 
-  const fileCount = attachment.files.length
+  const fileCount = attachment.files.length;
 
   if (verbose) {
     // Show all diagnostics in verbose mode (ctrl+o)
@@ -37,14 +31,7 @@ export function DiagnosticsDisplay({
           <React.Fragment key={fileIndex}>
             <MessageResponse>
               <Text dimColor wrap="wrap">
-                <Text bold>
-                  {relative(
-                    getCwd(),
-                    file.uri
-                      .replace('file://', '')
-                      .replace('_claude_fs_right:', ''),
-                  )}
-                </Text>{' '}
+                <Text bold>{relative(getCwd(), file.uri.replace('file://', '').replace('_claude_fs_right:', ''))}</Text>{' '}
                 <Text dimColor>
                   {file.uri.startsWith('file://')
                     ? '(file://)'
@@ -59,12 +46,9 @@ export function DiagnosticsDisplay({
               <MessageResponse key={diagIndex}>
                 <Text dimColor wrap="wrap">
                   {'  '}
-                  {DiagnosticTrackingService.getSeveritySymbol(
-                    diagnostic.severity,
-                  )}
+                  {DiagnosticTrackingService.getSeveritySymbol(diagnostic.severity)}
                   {' [Line '}
-                  {diagnostic.range.start.line + 1}:
-                  {diagnostic.range.start.character + 1}
+                  {diagnostic.range.start.line + 1}:{diagnostic.range.start.character + 1}
                   {'] '}
                   {diagnostic.message}
                   {diagnostic.code ? ` [${diagnostic.code}]` : ''}
@@ -75,17 +59,16 @@ export function DiagnosticsDisplay({
           </React.Fragment>
         ))}
       </Box>
-    )
+    );
   } else {
     // Show summary in normal mode
     return (
       <MessageResponse>
         <Text dimColor wrap="wrap">
-          Found <Text bold>{totalIssues}</Text> new diagnostic{' '}
-          {totalIssues === 1 ? 'issue' : 'issues'} in {fileCount}{' '}
+          Found <Text bold>{totalIssues}</Text> new diagnostic {totalIssues === 1 ? 'issue' : 'issues'} in {fileCount}{' '}
           {fileCount === 1 ? 'file' : 'files'} <CtrlOToExpand />
         </Text>
       </MessageResponse>
-    )
+    );
   }
 }
diff --git a/src/components/EffortCallout.tsx b/src/components/EffortCallout.tsx
index a9acc10a8..95a45f27e 100644
--- a/src/components/EffortCallout.tsx
+++ b/src/components/EffortCallout.tsx
@@ -1,72 +1,66 @@
-import React, { useCallback, useEffect, useRef } from 'react'
-import { Box, Text } from '@anthropic/ink'
-import {
-  isMaxSubscriber,
-  isProSubscriber,
-  isTeamSubscriber,
-} from '../utils/auth.js'
-import { getGlobalConfig, saveGlobalConfig } from '../utils/config.js'
-import type { EffortLevel } from '../utils/effort.js'
+import React, { useCallback, useEffect, useRef } from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { isMaxSubscriber, isProSubscriber, isTeamSubscriber } from '../utils/auth.js';
+import { getGlobalConfig, saveGlobalConfig } from '../utils/config.js';
+import type { EffortLevel } from '../utils/effort.js';
 import {
   convertEffortValueToLevel,
   getDefaultEffortForModel,
   getOpusDefaultEffortConfig,
   toPersistableEffort,
-} from '../utils/effort.js'
-import { parseUserSpecifiedModel } from '../utils/model/model.js'
-import { updateSettingsForSource } from '../utils/settings/settings.js'
-import type { OptionWithDescription } from './CustomSelect/select.js'
-import { Select } from './CustomSelect/select.js'
-import { effortLevelToSymbol } from './EffortIndicator.js'
-import { PermissionDialog } from './permissions/PermissionDialog.js'
+} from '../utils/effort.js';
+import { parseUserSpecifiedModel } from '../utils/model/model.js';
+import { updateSettingsForSource } from '../utils/settings/settings.js';
+import type { OptionWithDescription } from './CustomSelect/select.js';
+import { Select } from './CustomSelect/select.js';
+import { effortLevelToSymbol } from './EffortIndicator.js';
+import { PermissionDialog } from './permissions/PermissionDialog.js';
 
-type EffortCalloutSelection = EffortLevel | undefined | 'dismiss'
+type EffortCalloutSelection = EffortLevel | undefined | 'dismiss';
 
 type Props = {
-  model: string
-  onDone: (selection: EffortCalloutSelection) => void
-}
+  model: string;
+  onDone: (selection: EffortCalloutSelection) => void;
+};
 
-const AUTO_DISMISS_MS = 30_000
+const AUTO_DISMISS_MS = 30_000;
 
 export function EffortCallout({ model, onDone }: Props): React.ReactNode {
-  const defaultEffortConfig = getOpusDefaultEffortConfig()
+  const defaultEffortConfig = getOpusDefaultEffortConfig();
   // Latest-ref pattern — write via effect so React Compiler can memoize.
-  const onDoneRef = useRef(onDone)
+  const onDoneRef = useRef(onDone);
   useEffect(() => {
-    onDoneRef.current = onDone
-  })
+    onDoneRef.current = onDone;
+  });
 
   const handleCancel = useCallback((): void => {
-    onDoneRef.current('dismiss')
-  }, [])
+    onDoneRef.current('dismiss');
+  }, []);
 
   // Permanently dismiss on mount so it only shows once
   useEffect(() => {
-    markV2Dismissed()
-  }, [])
+    markV2Dismissed();
+  }, []);
 
   // 30-second auto-dismiss timer
   useEffect(() => {
-    const timeoutId = setTimeout(handleCancel, AUTO_DISMISS_MS)
-    return () => clearTimeout(timeoutId)
-  }, [handleCancel])
+    const timeoutId = setTimeout(handleCancel, AUTO_DISMISS_MS);
+    return () => clearTimeout(timeoutId);
+  }, [handleCancel]);
 
-  const defaultEffort = getDefaultEffortForModel(model)
-  const defaultLevel = defaultEffort
-    ? convertEffortValueToLevel(defaultEffort)
-    : 'high'
+  const defaultEffort = getDefaultEffortForModel(model);
+  const defaultLevel = defaultEffort ? convertEffortValueToLevel(defaultEffort) : 'high';
 
   const handleSelect = useCallback(
     (value: EffortLevel): void => {
-      const effortLevel = value === defaultLevel ? undefined : value
+      const effortLevel = value === defaultLevel ? undefined : value;
       updateSettingsForSource('userSettings', {
         effortLevel: toPersistableEffort(effortLevel),
-      })
-      onDoneRef.current(value)
+      });
+      onDoneRef.current(value);
     },
     [defaultLevel],
-  )
+  );
 
   const options: OptionWithDescription<EffortLevel>[] = [
     {
@@ -75,7 +69,7 @@ export function EffortCallout({ model, onDone }: Props): React.ReactNode {
     },
     { label: <EffortOptionLabel level="high" text="High" />, value: 'high' },
     { label: <EffortOptionLabel level="low" text="Low" />, value: 'low' },
-  ]
+  ];
 
   return (
     <PermissionDialog title={defaultEffortConfig.dialogTitle}>
@@ -85,41 +79,26 @@ export function EffortCallout({ model, onDone }: Props): React.ReactNode {
         </Box>
         <Box marginBottom={1}>
           <Text dimColor>
-            <EffortIndicatorSymbol level="low" /> low {'·'}{' '}
-            <EffortIndicatorSymbol level="medium" /> medium {'·'}{' '}
+            <EffortIndicatorSymbol level="low" /> low {'·'} <EffortIndicatorSymbol level="medium" /> medium {'·'}{' '}
             <EffortIndicatorSymbol level="high" /> high
           </Text>
         </Box>
-        <Select
-          options={options}
-          onChange={handleSelect}
-          onCancel={handleCancel}
-        />
+        <Select options={options} onChange={handleSelect} onCancel={handleCancel} />
       </Box>
     </PermissionDialog>
-  )
+  );
 }
 
-function EffortIndicatorSymbol({
-  level,
-}: {
-  level: EffortLevel
-}): React.ReactNode {
-  return <Text color="suggestion">{effortLevelToSymbol(level)}</Text>
+function EffortIndicatorSymbol({ level }: { level: EffortLevel }): React.ReactNode {
+  return <Text color="suggestion">{effortLevelToSymbol(level)}</Text>;
 }
 
-function EffortOptionLabel({
-  level,
-  text,
-}: {
-  level: EffortLevel
-  text: string
-}): React.ReactNode {
+function EffortOptionLabel({ level, text }: { level: EffortLevel; text: string }): React.ReactNode {
   return (
     <>
       <EffortIndicatorSymbol level={level} /> {text}
     </>
-  )
+  );
 }
 
 /**
@@ -132,46 +111,46 @@ function EffortOptionLabel({
  */
 export function shouldShowEffortCallout(model: string): boolean {
   // Only show for Opus 4.6 for now
-  const parsed = parseUserSpecifiedModel(model)
+  const parsed = parseUserSpecifiedModel(model);
   if (!parsed.toLowerCase().includes('opus-4-6')) {
-    return false
+    return false;
   }
 
-  const config = getGlobalConfig()
-  if (config.effortCalloutV2Dismissed) return false
+  const config = getGlobalConfig();
+  if (config.effortCalloutV2Dismissed) return false;
 
   // Don't show to brand-new users — they never knew the old default, so this
   // isn't a change for them. Mark as dismissed so it stays suppressed.
   if (config.numStartups <= 1) {
-    markV2Dismissed()
-    return false
+    markV2Dismissed();
+    return false;
   }
 
   // Pro users already had medium default before this PR. Show the new copy,
   // but skip if they already saw the v1 dialog — no point nagging twice.
   if (isProSubscriber()) {
     if (config.effortCalloutDismissed) {
-      markV2Dismissed()
-      return false
+      markV2Dismissed();
+      return false;
     }
-    return getOpusDefaultEffortConfig().enabled
+    return getOpusDefaultEffortConfig().enabled;
   }
 
   // Max/Team are the target of the tengu_grey_step2 config.
   // Don't mark dismissed when config is disabled — they should see the dialog
   // once it's enabled for them.
   if (isMaxSubscriber() || isTeamSubscriber()) {
-    return getOpusDefaultEffortConfig().enabled
+    return getOpusDefaultEffortConfig().enabled;
   }
 
   // Everyone else (free tier, API key, non-subscribers): not in scope.
-  markV2Dismissed()
-  return false
+  markV2Dismissed();
+  return false;
 }
 
 function markV2Dismissed(): void {
   saveGlobalConfig(current => {
-    if (current.effortCalloutV2Dismissed) return current
-    return { ...current, effortCalloutV2Dismissed: true }
-  })
+    if (current.effortCalloutV2Dismissed) return current;
+    return { ...current, effortCalloutV2Dismissed: true };
+  });
 }
diff --git a/src/components/ExitFlow.tsx b/src/components/ExitFlow.tsx
index c2e527054..f442c23e5 100644
--- a/src/components/ExitFlow.tsx
+++ b/src/components/ExitFlow.tsx
@@ -1,33 +1,29 @@
-import sample from 'lodash-es/sample.js'
-import React from 'react'
-import { gracefulShutdown } from '../utils/gracefulShutdown.js'
-import { WorktreeExitDialog } from './WorktreeExitDialog.js'
+import sample from 'lodash-es/sample.js';
+import React from 'react';
+import { gracefulShutdown } from '../utils/gracefulShutdown.js';
+import { WorktreeExitDialog } from './WorktreeExitDialog.js';
 
-const GOODBYE_MESSAGES = ['Goodbye!', 'See ya!', 'Bye!', 'Catch you later!']
+const GOODBYE_MESSAGES = ['Goodbye!', 'See ya!', 'Bye!', 'Catch you later!'];
 
 function getRandomGoodbyeMessage(): string {
-  return sample(GOODBYE_MESSAGES) ?? 'Goodbye!'
+  return sample(GOODBYE_MESSAGES) ?? 'Goodbye!';
 }
 
 type Props = {
-  onDone: (message?: string) => void
-  onCancel?: () => void
-  showWorktree: boolean
-}
+  onDone: (message?: string) => void;
+  onCancel?: () => void;
+  showWorktree: boolean;
+};
 
-export function ExitFlow({
-  showWorktree,
-  onDone,
-  onCancel,
-}: Props): React.ReactNode {
+export function ExitFlow({ showWorktree, onDone, onCancel }: Props): React.ReactNode {
   async function onExit(resultMessage?: string) {
-    onDone(resultMessage ?? getRandomGoodbyeMessage())
-    await gracefulShutdown(0, 'prompt_input_exit')
+    onDone(resultMessage ?? getRandomGoodbyeMessage());
+    await gracefulShutdown(0, 'prompt_input_exit');
   }
 
   if (showWorktree) {
-    return <WorktreeExitDialog onDone={onExit} onCancel={onCancel} />
+    return <WorktreeExitDialog onDone={onExit} onCancel={onCancel} />;
   }
 
-  return null
+  return null;
 }
diff --git a/src/components/ExportDialog.tsx b/src/components/ExportDialog.tsx
index b217d4c15..652426e65 100644
--- a/src/components/ExportDialog.tsx
+++ b/src/components/ExportDialog.tsx
@@ -1,86 +1,78 @@
-import { join } from 'path'
-import React, { useCallback, useState } from 'react'
-import type { ExitState } from '../hooks/useExitOnCtrlCDWithKeybindings.js'
-import { useTerminalSize } from '../hooks/useTerminalSize.js'
-import { setClipboard, Box, Text, Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink'
-import { useKeybinding } from '../keybindings/useKeybinding.js'
-import { getCwd } from '../utils/cwd.js'
-import { writeFileSync_DEPRECATED } from '../utils/slowOperations.js'
-import { ConfigurableShortcutHint } from './ConfigurableShortcutHint.js'
-import { Select } from './CustomSelect/select.js'
-import TextInput from './TextInput.js'
+import { join } from 'path';
+import React, { useCallback, useState } from 'react';
+import type { ExitState } from '../hooks/useExitOnCtrlCDWithKeybindings.js';
+import { useTerminalSize } from '../hooks/useTerminalSize.js';
+import { setClipboard, Box, Text, Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink';
+import { useKeybinding } from '../keybindings/useKeybinding.js';
+import { getCwd } from '../utils/cwd.js';
+import { writeFileSync_DEPRECATED } from '../utils/slowOperations.js';
+import { ConfigurableShortcutHint } from './ConfigurableShortcutHint.js';
+import { Select } from './CustomSelect/select.js';
+import TextInput from './TextInput.js';
 
 type ExportDialogProps = {
-  content: string
-  defaultFilename: string
-  onDone: (result: { success: boolean; message: string }) => void
-}
+  content: string;
+  defaultFilename: string;
+  onDone: (result: { success: boolean; message: string }) => void;
+};
 
-type ExportOption = 'clipboard' | 'file'
+type ExportOption = 'clipboard' | 'file';
 
-export function ExportDialog({
-  content,
-  defaultFilename,
-  onDone,
-}: ExportDialogProps): React.ReactNode {
-  const [, setSelectedOption] = useState<ExportOption | null>(null)
-  const [filename, setFilename] = useState<string>(defaultFilename)
-  const [cursorOffset, setCursorOffset] = useState<number>(
-    defaultFilename.length,
-  )
-  const [showFilenameInput, setShowFilenameInput] = useState(false)
-  const { columns } = useTerminalSize()
+export function ExportDialog({ content, defaultFilename, onDone }: ExportDialogProps): React.ReactNode {
+  const [, setSelectedOption] = useState<ExportOption | null>(null);
+  const [filename, setFilename] = useState<string>(defaultFilename);
+  const [cursorOffset, setCursorOffset] = useState<number>(defaultFilename.length);
+  const [showFilenameInput, setShowFilenameInput] = useState(false);
+  const { columns } = useTerminalSize();
 
   // Handle going back from filename input to option selection
   const handleGoBack = useCallback(() => {
-    setShowFilenameInput(false)
-    setSelectedOption(null)
-  }, [])
+    setShowFilenameInput(false);
+    setSelectedOption(null);
+  }, []);
 
   const handleSelectOption = async (value: string): Promise<void> => {
     if (value === 'clipboard') {
       // Copy to clipboard immediately
-      const raw = await setClipboard(content)
-      if (raw) process.stdout.write(raw)
-      onDone({ success: true, message: 'Conversation copied to clipboard' })
+      const raw = await setClipboard(content);
+      if (raw) process.stdout.write(raw);
+      onDone({ success: true, message: 'Conversation copied to clipboard' });
     } else if (value === 'file') {
-      setSelectedOption('file')
-      setShowFilenameInput(true)
+      setSelectedOption('file');
+      setShowFilenameInput(true);
     }
-  }
+  };
 
   const handleFilenameSubmit = () => {
-    const finalFilename = filename.endsWith('.txt')
-      ? filename
-      : filename.replace(/\.[^.]+$/, '') + '.txt'
-    const filepath = join(getCwd(), finalFilename)
+    const finalFilename = filename.endsWith('.txt') ? filename : filename.replace(/\.[^.]+$/, '') + '.txt';
+    const filepath = join(getCwd(), finalFilename);
 
     try {
       writeFileSync_DEPRECATED(filepath, content, {
         encoding: 'utf-8',
         flush: true,
-      })
+      });
       onDone({
         success: true,
         message: `Conversation exported to: ${filepath}`,
-      })
+      });
     } catch (error) {
       onDone({
         success: false,
         message: `Failed to export conversation: ${error instanceof Error ? error.message : 'Unknown error'}`,
-      })
+      });
     }
-  }
+  };
 
   // Dialog calls onCancel when Escape is pressed. If we are in the filename
   // input sub-screen, go back to the option list instead of closing entirely.
   const handleCancel = useCallback(() => {
     if (showFilenameInput) {
-      handleGoBack()
+      handleGoBack();
     } else {
-      onDone({ success: false, message: 'Export cancelled' })
+      onDone({ success: false, message: 'Export cancelled' });
     }
-  }, [showFilenameInput, handleGoBack, onDone])
+  }, [showFilenameInput, handleGoBack, onDone]);
 
   const options = [
     {
@@ -93,7 +85,7 @@ export function ExportDialog({
       value: 'file',
       description: 'Save the conversation to a file in the current directory',
     },
-  ]
+  ];
 
   // Custom input guide that changes based on dialog state
   function renderInputGuide(exitState: ExitState): React.ReactNode {
@@ -101,35 +93,23 @@ export function ExportDialog({
       return (
         <Byline>
           <KeyboardShortcutHint shortcut="Enter" action="save" />
-          <ConfigurableShortcutHint
-            action="confirm:no"
-            context="Confirmation"
-            fallback="Esc"
-            description="go back"
-          />
+          <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="go back" />
         </Byline>
-      )
+      );
     }
 
     if (exitState.pending) {
-      return <Text>Press {exitState.keyName} again to exit</Text>
+      return <Text>Press {exitState.keyName} again to exit</Text>;
     }
 
-    return (
-      <ConfigurableShortcutHint
-        action="confirm:no"
-        context="Confirmation"
-        fallback="Esc"
-        description="cancel"
-      />
-    )
+    return <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="cancel" />;
   }
 
   // Use Settings context so 'n' key doesn't cancel (allows typing 'n' in filename input)
   useKeybinding('confirm:no', handleCancel, {
     context: 'Settings',
     isActive: showFilenameInput,
-  })
+  });
 
   return (
     <Dialog
@@ -141,11 +121,7 @@ export function ExportDialog({
       isCancelActive={!showFilenameInput}
     >
       {!showFilenameInput ? (
-        <Select
-          options={options}
-          onChange={handleSelectOption}
-          onCancel={handleCancel}
-        />
+        <Select options={options} onChange={handleSelectOption} onCancel={handleCancel} />
       ) : (
         <Box flexDirection="column">
           <Text>Enter filename:</Text>
@@ -165,5 +141,5 @@ export function ExportDialog({
         </Box>
       )}
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/FallbackToolUseErrorMessage.tsx b/src/components/FallbackToolUseErrorMessage.tsx
index a60ad65b9..f4bc1d1f1 100644
--- a/src/components/FallbackToolUseErrorMessage.tsx
+++ b/src/components/FallbackToolUseErrorMessage.tsx
@@ -1,63 +1,49 @@
-import type { ToolResultBlockParam } from '@anthropic-ai/sdk/resources/messages/messages.mjs'
-import * as React from 'react'
-import { stripUnderlineAnsi } from 'src/components/shell/OutputLine.js'
-import { extractTag } from 'src/utils/messages.js'
-import { removeSandboxViolationTags } from 'src/utils/sandbox/sandbox-ui-utils.js'
-import { Box, Text } from '@anthropic/ink'
-import { useShortcutDisplay } from '../keybindings/useShortcutDisplay.js'
-import { countCharInString } from '../utils/stringUtils.js'
-import { MessageResponse } from './MessageResponse.js'
+import type { ToolResultBlockParam } from '@anthropic-ai/sdk/resources/messages/messages.mjs';
+import * as React from 'react';
+import { stripUnderlineAnsi } from 'src/components/shell/OutputLine.js';
+import { extractTag } from 'src/utils/messages.js';
+import { removeSandboxViolationTags } from 'src/utils/sandbox/sandbox-ui-utils.js';
+import { Box, Text } from '@anthropic/ink';
+import { useShortcutDisplay } from '../keybindings/useShortcutDisplay.js';
+import { countCharInString } from '../utils/stringUtils.js';
+import { MessageResponse } from './MessageResponse.js';
 
-const MAX_RENDERED_LINES = 10
+const MAX_RENDERED_LINES = 10;
 
 type Props = {
-  result: ToolResultBlockParam['content']
-  verbose: boolean
-}
+  result: ToolResultBlockParam['content'];
+  verbose: boolean;
+};
 
-export function FallbackToolUseErrorMessage({
-  result,
-  verbose,
-}: Props): React.ReactNode {
-  const transcriptShortcut = useShortcutDisplay(
-    'app:toggleTranscript',
-    'Global',
-    'ctrl+o',
-  )
-  let error: string
+export function FallbackToolUseErrorMessage({ result, verbose }: Props): React.ReactNode {
+  const transcriptShortcut = useShortcutDisplay('app:toggleTranscript', 'Global', 'ctrl+o');
+  let error: string;
 
   if (typeof result !== 'string') {
-    error = 'Tool execution failed'
+    error = 'Tool execution failed';
   } else {
-    const extractedError = extractTag(result, 'tool_use_error') ?? result
+    const extractedError = extractTag(result, 'tool_use_error') ?? result;
     // Remove sandbox_violations tags from error display (Claude still sees them in the tool result)
-    const withoutSandboxViolations = removeSandboxViolationTags(extractedError)
+    const withoutSandboxViolations = removeSandboxViolationTags(extractedError);
     // Strip <error> tags but keep their content (tags are for the model, not the UI)
-    const withoutErrorTags = withoutSandboxViolations.replace(/<\/?error>/g, '')
-    const trimmed = withoutErrorTags.trim()
+    const withoutErrorTags = withoutSandboxViolations.replace(/<\/?error>/g, '');
+    const trimmed = withoutErrorTags.trim();
     if (!verbose && trimmed.includes('InputValidationError: ')) {
-      error = 'Invalid tool parameters'
-    } else if (
-      trimmed.startsWith('Error: ') ||
-      trimmed.startsWith('Cancelled: ')
-    ) {
-      error = trimmed
+      error = 'Invalid tool parameters';
+    } else if (trimmed.startsWith('Error: ') || trimmed.startsWith('Cancelled: ')) {
+      error = trimmed;
     } else {
-      error = `Error: ${trimmed}`
+      error = `Error: ${trimmed}`;
     }
   }
 
-  const plusLines = countCharInString(error, '\n') + 1 - MAX_RENDERED_LINES
+  const plusLines = countCharInString(error, '\n') + 1 - MAX_RENDERED_LINES;
 
   return (
     <MessageResponse>
       <Box flexDirection="column">
         <Text color="error">
-          {stripUnderlineAnsi(
-            verbose
-              ? error
-              : error.split('\n').slice(0, MAX_RENDERED_LINES).join('\n'),
-          )}
+          {stripUnderlineAnsi(verbose ? error : error.split('\n').slice(0, MAX_RENDERED_LINES).join('\n'))}
         </Text>
         {!verbose && plusLines > 0 && (
           // The careful <Text> layout is a workaround for the dim-bold
@@ -75,5 +61,5 @@ export function FallbackToolUseErrorMessage({
         )}
       </Box>
     </MessageResponse>
-  )
+  );
 }
diff --git a/src/components/FallbackToolUseRejectedMessage.tsx b/src/components/FallbackToolUseRejectedMessage.tsx
index 95ec389cc..b128b5146 100644
--- a/src/components/FallbackToolUseRejectedMessage.tsx
+++ b/src/components/FallbackToolUseRejectedMessage.tsx
@@ -1,11 +1,11 @@
-import * as React from 'react'
-import { InterruptedByUser } from './InterruptedByUser.js'
-import { MessageResponse } from './MessageResponse.js'
+import * as React from 'react';
+import { InterruptedByUser } from './InterruptedByUser.js';
+import { MessageResponse } from './MessageResponse.js';
 
 export function FallbackToolUseRejectedMessage(): React.ReactNode {
   return (
     <MessageResponse height={1}>
       <InterruptedByUser />
     </MessageResponse>
-  )
+  );
 }
diff --git a/src/components/FastIcon.tsx b/src/components/FastIcon.tsx
index b89283145..b3ae42ad5 100644
--- a/src/components/FastIcon.tsx
+++ b/src/components/FastIcon.tsx
@@ -1,13 +1,13 @@
-import chalk from 'chalk'
-import * as React from 'react'
-import { LIGHTNING_BOLT } from '../constants/figures.js'
-import { Text, color } from '@anthropic/ink'
-import { getGlobalConfig } from '../utils/config.js'
-import { resolveThemeSetting } from '../utils/systemTheme.js'
+import chalk from 'chalk';
+import * as React from 'react';
+import { LIGHTNING_BOLT } from '../constants/figures.js';
+import { Text, color } from '@anthropic/ink';
+import { getGlobalConfig } from '../utils/config.js';
+import { resolveThemeSetting } from '../utils/systemTheme.js';
 
 type Props = {
-  cooldown?: boolean
-}
+  cooldown?: boolean;
+};
 
 export function FastIcon({ cooldown }: Props): React.ReactNode {
   if (cooldown) {
@@ -15,18 +15,18 @@ export function FastIcon({ cooldown }: Props): React.ReactNode {
       <Text color="promptBorder" dimColor>
         {LIGHTNING_BOLT}
       </Text>
-    )
+    );
   }
-  return <Text color="fastMode">{LIGHTNING_BOLT}</Text>
+  return <Text color="fastMode">{LIGHTNING_BOLT}</Text>;
 }
 
 export function getFastIconString(applyColor = true, cooldown = false): string {
   if (!applyColor) {
-    return LIGHTNING_BOLT
+    return LIGHTNING_BOLT;
   }
-  const themeName = resolveThemeSetting(getGlobalConfig().theme)
+  const themeName = resolveThemeSetting(getGlobalConfig().theme);
   if (cooldown) {
-    return chalk.dim(color('promptBorder', themeName)(LIGHTNING_BOLT))
+    return chalk.dim(color('promptBorder', themeName)(LIGHTNING_BOLT));
   }
-  return color('fastMode', themeName)(LIGHTNING_BOLT)
+  return color('fastMode', themeName)(LIGHTNING_BOLT);
 }
diff --git a/src/components/Feedback.tsx b/src/components/Feedback.tsx
index 56a7ba99c..0e13c103a 100644
--- a/src/components/Feedback.tsx
+++ b/src/components/Feedback.tsx
@@ -1,184 +1,166 @@
-import axios from 'axios'
-import { readFile, stat } from 'fs/promises'
-import * as React from 'react'
-import { useCallback, useEffect, useState } from 'react'
-import { getLastAPIRequest } from 'src/bootstrap/state.js'
-import { logEventTo1P } from 'src/services/analytics/firstPartyEventLogger.js'
+import axios from 'axios';
+import { readFile, stat } from 'fs/promises';
+import * as React from 'react';
+import { useCallback, useEffect, useState } from 'react';
+import { getLastAPIRequest } from 'src/bootstrap/state.js';
+import { logEventTo1P } from 'src/services/analytics/firstPartyEventLogger.js';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from 'src/services/analytics/index.js'
-import {
-  getLastAssistantMessage,
-  normalizeMessagesForAPI,
-} from 'src/utils/messages.js'
-import type { CommandResultDisplay } from '../commands.js'
-import { useTerminalSize } from '../hooks/useTerminalSize.js'
-import { Box, Text, useInput } from '@anthropic/ink'
-import { useKeybinding } from '../keybindings/useKeybinding.js'
-import { queryHaiku } from '../services/api/claude.js'
-import { startsWithApiErrorPrefix } from '../services/api/errors.js'
-import type { Message } from '../types/message.js'
-import { checkAndRefreshOAuthTokenIfNeeded } from '../utils/auth.js'
-import { openBrowser } from '../utils/browser.js'
-import { logForDebugging } from '../utils/debug.js'
-import { env } from '../utils/env.js'
-import { type GitRepoState, getGitState, getIsGit } from '../utils/git.js'
-import { getAuthHeaders, getUserAgent } from '../utils/http.js'
-import { getInMemoryErrors, logError } from '../utils/log.js'
-import { isEssentialTrafficOnly } from '../utils/privacyLevel.js'
+} from 'src/services/analytics/index.js';
+import { getLastAssistantMessage, normalizeMessagesForAPI } from 'src/utils/messages.js';
+import type { CommandResultDisplay } from '../commands.js';
+import { useTerminalSize } from '../hooks/useTerminalSize.js';
+import { Box, Text, useInput } from '@anthropic/ink';
+import { useKeybinding } from '../keybindings/useKeybinding.js';
+import { queryHaiku } from '../services/api/claude.js';
+import { startsWithApiErrorPrefix } from '../services/api/errors.js';
+import type { Message } from '../types/message.js';
+import { checkAndRefreshOAuthTokenIfNeeded } from '../utils/auth.js';
+import { openBrowser } from '../utils/browser.js';
+import { logForDebugging } from '../utils/debug.js';
+import { env } from '../utils/env.js';
+import { type GitRepoState, getGitState, getIsGit } from '../utils/git.js';
+import { getAuthHeaders, getUserAgent } from '../utils/http.js';
+import { getInMemoryErrors, logError } from '../utils/log.js';
+import { isEssentialTrafficOnly } from '../utils/privacyLevel.js';
 import {
   extractTeammateTranscriptsFromTasks,
   getTranscriptPath,
   loadAllSubagentTranscriptsFromDisk,
   MAX_TRANSCRIPT_READ_BYTES,
-} from '../utils/sessionStorage.js'
-import { jsonStringify } from '../utils/slowOperations.js'
-import { asSystemPrompt } from '../utils/systemPromptType.js'
-import { ConfigurableShortcutHint } from './ConfigurableShortcutHint.js'
-import { Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink'
-import TextInput from './TextInput.js'
+} from '../utils/sessionStorage.js';
+import { jsonStringify } from '../utils/slowOperations.js';
+import { asSystemPrompt } from '../utils/systemPromptType.js';
+import { ConfigurableShortcutHint } from './ConfigurableShortcutHint.js';
+import { Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink';
+import TextInput from './TextInput.js';
 
 // This value was determined experimentally by testing the URL length limit
-const GITHUB_URL_LIMIT = 7250
+const GITHUB_URL_LIMIT = 7250;
 const GITHUB_ISSUES_REPO_URL =
   process.env.USER_TYPE === 'ant'
     ? 'https://github.com/anthropics/claude-cli-internal/issues'
-    : 'https://github.com/anthropics/claude-code/issues'
+    : 'https://github.com/anthropics/claude-code/issues';
 
 type Props = {
-  abortSignal: AbortSignal
-  messages: Message[]
-  initialDescription?: string
-  onDone(result: string, options?: { display?: CommandResultDisplay }): void
+  abortSignal: AbortSignal;
+  messages: Message[];
+  initialDescription?: string;
+  onDone(result: string, options?: { display?: CommandResultDisplay }): void;
   backgroundTasks?: {
     [taskId: string]: {
-      type: string
-      identity?: { agentId: string }
-      messages?: Message[]
-    }
-  }
-}
+      type: string;
+      identity?: { agentId: string };
+      messages?: Message[];
+    };
+  };
+};
 
-type Step = 'userInput' | 'consent' | 'submitting' | 'done'
+type Step = 'userInput' | 'consent' | 'submitting' | 'done';
 
 type FeedbackData = {
   // latestAssistantMessageId is the message ID from the latest main model call
-  latestAssistantMessageId: string | null
-  message_count: number
-  datetime: string
-  description: string
-  platform: string
-  gitRepo: boolean
-  version: string | null
-  transcript: Message[]
-  subagentTranscripts?: { [agentId: string]: Message[] }
-  rawTranscriptJsonl?: string
-}
+  latestAssistantMessageId: string | null;
+  message_count: number;
+  datetime: string;
+  description: string;
+  platform: string;
+  gitRepo: boolean;
+  version: string | null;
+  transcript: Message[];
+  subagentTranscripts?: { [agentId: string]: Message[] };
+  rawTranscriptJsonl?: string;
+};
 
 // Utility function to redact sensitive information from strings
 export function redactSensitiveInfo(text: string): string {
-  let redacted = text
+  let redacted = text;
 
   // Anthropic API keys (sk-ant...) with or without quotes
   // First handle the case with quotes
-  redacted = redacted.replace(/"(sk-ant[^\s"']{24,})"/g, '"[REDACTED_API_KEY]"')
+  redacted = redacted.replace(/"(sk-ant[^\s"']{24,})"/g, '"[REDACTED_API_KEY]"');
   // Then handle the cases without quotes - more general pattern
   redacted = redacted.replace(
     // eslint-disable-next-line custom-rules/no-lookbehind-regex -- .replace(re, string) on /bug path: no-match returns same string (Object.is)
     /(?<![A-Za-z0-9"'])(sk-ant-?[A-Za-z0-9_-]{10,})(?![A-Za-z0-9"'])/g,
     '[REDACTED_API_KEY]',
-  )
+  );
 
   // AWS keys - AWSXXXX format - add the pattern we need for the test
-  redacted = redacted.replace(
-    /AWS key: "(AWS[A-Z0-9]{20,})"/g,
-    'AWS key: "[REDACTED_AWS_KEY]"',
-  )
+  redacted = redacted.replace(/AWS key: "(AWS[A-Z0-9]{20,})"/g, 'AWS key: "[REDACTED_AWS_KEY]"');
 
   // AWS AKIAXXX keys
-  redacted = redacted.replace(/(AKIA[A-Z0-9]{16})/g, '[REDACTED_AWS_KEY]')
+  redacted = redacted.replace(/(AKIA[A-Z0-9]{16})/g, '[REDACTED_AWS_KEY]');
 
   // Google Cloud keys
   redacted = redacted.replace(
     // eslint-disable-next-line custom-rules/no-lookbehind-regex -- same as above
     /(?<![A-Za-z0-9])(AIza[A-Za-z0-9_-]{35})(?![A-Za-z0-9])/g,
     '[REDACTED_GCP_KEY]',
-  )
+  );
 
   // Vertex AI service account keys
   redacted = redacted.replace(
     // eslint-disable-next-line custom-rules/no-lookbehind-regex -- same as above
     /(?<![A-Za-z0-9])([a-z0-9-]+@[a-z0-9-]+\.iam\.gserviceaccount\.com)(?![A-Za-z0-9])/g,
     '[REDACTED_GCP_SERVICE_ACCOUNT]',
-  )
+  );
 
   // Generic API keys in headers
-  redacted = redacted.replace(
-    /(["']?x-api-key["']?\s*[:=]\s*["']?)[^"',\s)}\]]+/gi,
-    '$1[REDACTED_API_KEY]',
-  )
+  redacted = redacted.replace(/(["']?x-api-key["']?\s*[:=]\s*["']?)[^"',\s)}\]]+/gi, '$1[REDACTED_API_KEY]');
 
   // Authorization headers and Bearer tokens
   redacted = redacted.replace(
     /(["']?authorization["']?\s*[:=]\s*["']?(bearer\s+)?)[^"',\s)}\]]+/gi,
     '$1[REDACTED_TOKEN]',
-  )
+  );
 
   // AWS environment variables
-  redacted = redacted.replace(
-    /(AWS[_-][A-Za-z0-9_]+\s*[=:]\s*)["']?[^"',\s)}\]]+["']?/gi,
-    '$1[REDACTED_AWS_VALUE]',
-  )
+  redacted = redacted.replace(/(AWS[_-][A-Za-z0-9_]+\s*[=:]\s*)["']?[^"',\s)}\]]+["']?/gi, '$1[REDACTED_AWS_VALUE]');
 
   // GCP environment variables
-  redacted = redacted.replace(
-    /(GOOGLE[_-][A-Za-z0-9_]+\s*[=:]\s*)["']?[^"',\s)}\]]+["']?/gi,
-    '$1[REDACTED_GCP_VALUE]',
-  )
+  redacted = redacted.replace(/(GOOGLE[_-][A-Za-z0-9_]+\s*[=:]\s*)["']?[^"',\s)}\]]+["']?/gi, '$1[REDACTED_GCP_VALUE]');
 
   // Environment variables with keys
   redacted = redacted.replace(
     /((API[-_]?KEY|TOKEN|SECRET|PASSWORD)\s*[=:]\s*)["']?[^"',\s)}\]]+["']?/gi,
     '$1[REDACTED]',
-  )
+  );
 
-  return redacted
+  return redacted;
 }
 
 // Get sanitized error logs with sensitive information redacted
 function getSanitizedErrorLogs(): Array<{
-  error?: string
-  timestamp?: string
+  error?: string;
+  timestamp?: string;
 }> {
   // Sanitize error logs to remove any API keys
   return getInMemoryErrors().map(errorInfo => {
     // Create a copy of the error info to avoid modifying the original
-    const errorCopy = { ...errorInfo } as { error?: string; timestamp?: string }
+    const errorCopy = { ...errorInfo } as { error?: string; timestamp?: string };
 
     // Sanitize error if present and is a string
     if (errorCopy && typeof errorCopy.error === 'string') {
-      errorCopy.error = redactSensitiveInfo(errorCopy.error)
+      errorCopy.error = redactSensitiveInfo(errorCopy.error);
     }
 
-    return errorCopy
-  })
+    return errorCopy;
+  });
 }
 
 async function loadRawTranscriptJsonl(): Promise<string | null> {
   try {
-    const transcriptPath = getTranscriptPath()
-    const { size } = await stat(transcriptPath)
+    const transcriptPath = getTranscriptPath();
+    const { size } = await stat(transcriptPath);
     if (size > MAX_TRANSCRIPT_READ_BYTES) {
-      logForDebugging(
-        `Skipping raw transcript read: file too large (${size} bytes)`,
-        { level: 'warn' },
-      )
-      return null
+      logForDebugging(`Skipping raw transcript read: file too large (${size} bytes)`, { level: 'warn' });
+      return null;
     }
-    return await readFile(transcriptPath, 'utf-8')
+    return await readFile(transcriptPath, 'utf-8');
   } catch {
-    return null
+    return null;
   }
 }
 
@@ -189,49 +171,48 @@ export function Feedback({
   onDone,
   backgroundTasks = {},
 }: Props): React.ReactNode {
-  const [step, setStep] = useState<Step>('userInput')
-  const [cursorOffset, setCursorOffset] = useState(0)
-  const [description, setDescription] = useState(initialDescription ?? '')
-  const [feedbackId, setFeedbackId] = useState<string | null>(null)
-  const [error, setError] = useState<string | null>(null)
+  const [step, setStep] = useState<Step>('userInput');
+  const [cursorOffset, setCursorOffset] = useState(0);
+  const [description, setDescription] = useState(initialDescription ?? '');
+  const [feedbackId, setFeedbackId] = useState<string | null>(null);
+  const [error, setError] = useState<string | null>(null);
   const [envInfo, setEnvInfo] = useState<{
-    isGit: boolean
-    gitState: GitRepoState | null
-  }>({ isGit: false, gitState: null })
-  const [title, setTitle] = useState<string | null>(null)
-  const textInputColumns = useTerminalSize().columns - 4
+    isGit: boolean;
+    gitState: GitRepoState | null;
+  }>({ isGit: false, gitState: null });
+  const [title, setTitle] = useState<string | null>(null);
+  const textInputColumns = useTerminalSize().columns - 4;
 
   useEffect(() => {
     async function loadEnvInfo() {
-      const isGit = await getIsGit()
-      let gitState: GitRepoState | null = null
+      const isGit = await getIsGit();
+      let gitState: GitRepoState | null = null;
       if (isGit) {
-        gitState = await getGitState()
+        gitState = await getGitState();
       }
-      setEnvInfo({ isGit, gitState })
+      setEnvInfo({ isGit, gitState });
     }
-    void loadEnvInfo()
-  }, [])
+    void loadEnvInfo();
+  }, []);
 
   const submitReport = useCallback(async () => {
-    setStep('submitting')
-    setError(null)
-    setFeedbackId(null)
+    setStep('submitting');
+    setError(null);
+    setFeedbackId(null);
 
     // Get sanitized errors for the report
-    const sanitizedErrors = getSanitizedErrorLogs()
+    const sanitizedErrors = getSanitizedErrorLogs();
 
     // Extract last assistant message ID from messages array
-    const lastAssistantMessage = getLastAssistantMessage(messages)
-    const lastAssistantMessageId = lastAssistantMessage?.requestId ?? null
+    const lastAssistantMessage = getLastAssistantMessage(messages);
+    const lastAssistantMessageId = lastAssistantMessage?.requestId ?? null;
 
     const [diskTranscripts, rawTranscriptJsonl] = await Promise.all([
       loadAllSubagentTranscriptsFromDisk(),
       loadRawTranscriptJsonl(),
-    ])
-    const teammateTranscripts =
-      extractTeammateTranscriptsFromTasks(backgroundTasks)
-    const subagentTranscripts = { ...diskTranscripts, ...teammateTranscripts }
+    ]);
+    const teammateTranscripts = extractTeammateTranscriptsFromTasks(backgroundTasks);
+    const subagentTranscripts = { ...diskTranscripts, ...teammateTranscripts };
 
     const reportData = {
       latestAssistantMessageId: lastAssistantMessageId,
@@ -249,46 +230,40 @@ export function Feedback({
         subagentTranscripts,
       }),
       ...(rawTranscriptJsonl && { rawTranscriptJsonl }),
-    }
+    };
 
     const [result, t] = await Promise.all([
       submitFeedback(reportData as FeedbackData, abortSignal),
       generateTitle(description, abortSignal),
-    ])
+    ]);
 
-    setTitle(t)
+    setTitle(t);
 
     if (result.success) {
       if (result.feedbackId) {
-        setFeedbackId(result.feedbackId)
+        setFeedbackId(result.feedbackId);
         logEvent('tengu_bug_report_submitted', {
-          feedback_id:
-            result.feedbackId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          feedback_id: result.feedbackId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
           last_assistant_message_id:
             lastAssistantMessageId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        })
+        });
         // 1P-only: freeform text approved for BQ. Join on feedback_id.
         logEventTo1P('tengu_bug_report_description', {
-          feedback_id:
-            result.feedbackId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-          description: redactSensitiveInfo(
-            description,
-          ) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        })
+          feedback_id: result.feedbackId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          description: redactSensitiveInfo(description) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        });
       }
-      setStep('done')
+      setStep('done');
     } else {
       if (result.isZdrOrg) {
-        setError(
-          'Feedback collection is not available for organizations with custom data retention policies.',
-        )
+        setError('Feedback collection is not available for organizations with custom data retention policies.');
       } else {
-        setError('Could not submit feedback. Please try again later.')
+        setError('Could not submit feedback. Please try again later.');
       }
       // Stay on userInput step so user can retry with their content preserved
-      setStep('userInput')
+      setStep('userInput');
     }
-  }, [description, envInfo.isGit, messages])
+  }, [description, envInfo.isGit, messages]);
 
   // Handle cancel - this will be called by Dialog's automatic Esc handling
   const handleCancel = useCallback(() => {
@@ -297,43 +272,38 @@ export function Feedback({
       if (error) {
         onDone('Error submitting feedback / bug report', {
           display: 'system',
-        })
+        });
       } else {
-        onDone('Feedback / bug report submitted', { display: 'system' })
+        onDone('Feedback / bug report submitted', { display: 'system' });
       }
-      return
+      return;
     }
-    onDone('Feedback / bug report cancelled', { display: 'system' })
-  }, [step, error, onDone])
+    onDone('Feedback / bug report cancelled', { display: 'system' });
+  }, [step, error, onDone]);
 
   // During text input, use Settings context where only Escape (not 'n') triggers confirm:no.
   // This allows typing 'n' in the text field while still supporting Escape to cancel.
   useKeybinding('confirm:no', handleCancel, {
     context: 'Settings',
     isActive: step === 'userInput',
-  })
+  });
 
   useInput((input, key) => {
     // Allow any key press to close the dialog when done or when there's an error
     if (step === 'done') {
       if (key.return && title) {
         // Open GitHub issue URL when Enter is pressed
-        const issueUrl = createGitHubIssueUrl(
-          feedbackId ?? '',
-          title,
-          description,
-          getSanitizedErrorLogs(),
-        )
-        void openBrowser(issueUrl)
+        const issueUrl = createGitHubIssueUrl(feedbackId ?? '', title, description, getSanitizedErrorLogs());
+        void openBrowser(issueUrl);
       }
       if (error) {
         onDone('Error submitting feedback / bug report', {
           display: 'system',
-        })
+        });
       } else {
-        onDone('Feedback / bug report submitted', { display: 'system' })
+        onDone('Feedback / bug report submitted', { display: 'system' });
       }
-      return
+      return;
     }
 
     // When in userInput step with error, allow user to edit and retry
@@ -341,14 +311,14 @@ export function Feedback({
     if (error && step !== 'userInput') {
       onDone('Error submitting feedback / bug report', {
         display: 'system',
-      })
-      return
+      });
+      return;
     }
 
     if (step === 'consent' && (key.return || input === ' ')) {
-      void submitReport()
+      void submitReport();
     }
-  })
+  });
 
   return (
     <Dialog
@@ -361,22 +331,12 @@ export function Feedback({
         ) : step === 'userInput' ? (
           <Byline>
             <KeyboardShortcutHint shortcut="Enter" action="continue" />
-            <ConfigurableShortcutHint
-              action="confirm:no"
-              context="Confirmation"
-              fallback="Esc"
-              description="cancel"
-            />
+            <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="cancel" />
           </Byline>
         ) : step === 'consent' ? (
           <Byline>
             <KeyboardShortcutHint shortcut="Enter" action="submit" />
-            <ConfigurableShortcutHint
-              action="confirm:no"
-              context="Confirmation"
-              fallback="Esc"
-              description="cancel"
-            />
+            <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="cancel" />
           </Byline>
         ) : null
       }
@@ -387,17 +347,15 @@ export function Feedback({
           <TextInput
             value={description}
             onChange={value => {
-              setDescription(value)
+              setDescription(value);
               // Clear error when user starts editing to allow retry
               if (error) {
-                setError(null)
+                setError(null);
               }
             }}
             columns={textInputColumns}
             onSubmit={() => setStep('consent')}
-            onExitMessage={() =>
-              onDone('Feedback cancelled', { display: 'system' })
-            }
+            onExitMessage={() => onDone('Feedback cancelled', { display: 'system' })}
             cursorOffset={cursorOffset}
             onChangeCursorOffset={setCursorOffset}
             showCursor
@@ -405,9 +363,7 @@ export function Feedback({
           {error && (
             <Box flexDirection="column" gap={1}>
               <Text color="error">{error}</Text>
-              <Text dimColor>
-                Edit and press Enter to retry, or Esc to cancel
-              </Text>
+              <Text dimColor>Edit and press Enter to retry, or Esc to cancel</Text>
             </Box>
           )}
         </Box>
@@ -418,8 +374,7 @@ export function Feedback({
           <Text>This report will include:</Text>
           <Box marginLeft={2} flexDirection="column">
             <Text>
-              - Your feedback / bug description:{' '}
-              <Text dimColor>{description}</Text>
+              - Your feedback / bug description: <Text dimColor>{description}</Text>
             </Text>
             <Text>
               - Environment info:{' '}
@@ -432,12 +387,8 @@ export function Feedback({
                 - Git repo metadata:{' '}
                 <Text dimColor>
                   {envInfo.gitState.branchName}
-                  {envInfo.gitState.commitHash
-                    ? `, ${envInfo.gitState.commitHash.slice(0, 7)}`
-                    : ''}
-                  {envInfo.gitState.remoteUrl
-                    ? ` @ ${envInfo.gitState.remoteUrl}`
-                    : ''}
+                  {envInfo.gitState.commitHash ? `, ${envInfo.gitState.commitHash.slice(0, 7)}` : ''}
+                  {envInfo.gitState.remoteUrl ? ` @ ${envInfo.gitState.remoteUrl}` : ''}
                   {!envInfo.gitState.isHeadOnRemote && ', not synced'}
                   {!envInfo.gitState.isClean && ', has local changes'}
                 </Text>
@@ -447,9 +398,8 @@ export function Feedback({
           </Box>
           <Box marginTop={1}>
             <Text wrap="wrap" dimColor>
-              We will use your feedback to debug related issues or to improve{' '}
-              Claude Code&apos;s functionality (eg. to reduce the risk of bugs
-              occurring in the future).
+              We will use your feedback to debug related issues or to improve Claude Code&apos;s functionality (eg. to
+              reduce the risk of bugs occurring in the future).
             </Text>
           </Box>
           <Box marginTop={1}>
@@ -468,24 +418,17 @@ export function Feedback({
 
       {step === 'done' && (
         <Box flexDirection="column">
-          {error ? (
-            <Text color="error">{error}</Text>
-          ) : (
-            <Text color="success">Thank you for your report!</Text>
-          )}
+          {error ? <Text color="error">{error}</Text> : <Text color="success">Thank you for your report!</Text>}
           {feedbackId && <Text dimColor>Feedback ID: {feedbackId}</Text>}
           <Box marginTop={1}>
             <Text>Press </Text>
             <Text bold>Enter </Text>
-            <Text>
-              to open your browser and draft a GitHub issue, or any other key to
-              close.
-            </Text>
+            <Text>to open your browser and draft a GitHub issue, or any other key to close.</Text>
           </Box>
         </Box>
       )}
     </Dialog>
-  )
+  );
 }
 
 export function createGitHubIssueUrl(
@@ -493,12 +436,12 @@ export function createGitHubIssueUrl(
   title: string,
   description: string,
   errors: Array<{
-    error?: string
-    timestamp?: string
+    error?: string;
+    timestamp?: string;
   }>,
 ): string {
-  const sanitizedTitle = redactSensitiveInfo(title)
-  const sanitizedDescription = redactSensitiveInfo(description)
+  const sanitizedTitle = redactSensitiveInfo(title);
+  const sanitizedDescription = redactSensitiveInfo(description);
 
   const bodyPrefix =
     `**Bug Description**\n${sanitizedDescription}\n\n` +
@@ -507,84 +450,62 @@ export function createGitHubIssueUrl(
     `- Terminal: ${env.terminal}\n` +
     `- Version: ${MACRO.VERSION || 'unknown'}\n` +
     `- Feedback ID: ${feedbackId}\n` +
-    `\n**Errors**\n\`\`\`json\n`
-  const errorSuffix = `\n\`\`\`\n`
-  const errorsJson = jsonStringify(errors)
+    `\n**Errors**\n\`\`\`json\n`;
+  const errorSuffix = `\n\`\`\`\n`;
+  const errorsJson = jsonStringify(errors);
 
-  const baseUrl = `${GITHUB_ISSUES_REPO_URL}/new?title=${encodeURIComponent(sanitizedTitle)}&labels=user-reported,bug&body=`
-  const truncationNote = `\n**Note:** Content was truncated.\n`
+  const baseUrl = `${GITHUB_ISSUES_REPO_URL}/new?title=${encodeURIComponent(sanitizedTitle)}&labels=user-reported,bug&body=`;
+  const truncationNote = `\n**Note:** Content was truncated.\n`;
 
-  const encodedPrefix = encodeURIComponent(bodyPrefix)
-  const encodedSuffix = encodeURIComponent(errorSuffix)
-  const encodedNote = encodeURIComponent(truncationNote)
-  const encodedErrors = encodeURIComponent(errorsJson)
+  const encodedPrefix = encodeURIComponent(bodyPrefix);
+  const encodedSuffix = encodeURIComponent(errorSuffix);
+  const encodedNote = encodeURIComponent(truncationNote);
+  const encodedErrors = encodeURIComponent(errorsJson);
 
   // Calculate space available for errors
   const spaceForErrors =
-    GITHUB_URL_LIMIT -
-    baseUrl.length -
-    encodedPrefix.length -
-    encodedSuffix.length -
-    encodedNote.length
+    GITHUB_URL_LIMIT - baseUrl.length - encodedPrefix.length - encodedSuffix.length - encodedNote.length;
 
   // If description alone exceeds limit, truncate everything
   if (spaceForErrors <= 0) {
-    const ellipsis = encodeURIComponent('…')
-    const buffer = 50 // Extra safety margin
-    const maxEncodedLength =
-      GITHUB_URL_LIMIT -
-      baseUrl.length -
-      ellipsis.length -
-      encodedNote.length -
-      buffer
-    const fullBody = bodyPrefix + errorsJson + errorSuffix
-    let encodedFullBody = encodeURIComponent(fullBody)
+    const ellipsis = encodeURIComponent('…');
+    const buffer = 50; // Extra safety margin
+    const maxEncodedLength = GITHUB_URL_LIMIT - baseUrl.length - ellipsis.length - encodedNote.length - buffer;
+    const fullBody = bodyPrefix + errorsJson + errorSuffix;
+    let encodedFullBody = encodeURIComponent(fullBody);
 
     if (encodedFullBody.length > maxEncodedLength) {
-      encodedFullBody = encodedFullBody.slice(0, maxEncodedLength)
+      encodedFullBody = encodedFullBody.slice(0, maxEncodedLength);
       // Don't cut in middle of %XX sequence
-      const lastPercent = encodedFullBody.lastIndexOf('%')
+      const lastPercent = encodedFullBody.lastIndexOf('%');
       if (lastPercent >= encodedFullBody.length - 2) {
-        encodedFullBody = encodedFullBody.slice(0, lastPercent)
+        encodedFullBody = encodedFullBody.slice(0, lastPercent);
       }
     }
 
-    return baseUrl + encodedFullBody + ellipsis + encodedNote
+    return baseUrl + encodedFullBody + ellipsis + encodedNote;
   }
 
   // If errors fit, no truncation needed
   if (encodedErrors.length <= spaceForErrors) {
-    return baseUrl + encodedPrefix + encodedErrors + encodedSuffix
+    return baseUrl + encodedPrefix + encodedErrors + encodedSuffix;
   }
 
   // Truncate errors to fit (prioritize keeping description)
   // Slice encoded errors directly, then trim to avoid cutting %XX sequences
-  const ellipsis = encodeURIComponent('…')
-  const buffer = 50 // Extra safety margin
-  let truncatedEncodedErrors = encodedErrors.slice(
-    0,
-    spaceForErrors - ellipsis.length - buffer,
-  )
+  const ellipsis = encodeURIComponent('…');
+  const buffer = 50; // Extra safety margin
+  let truncatedEncodedErrors = encodedErrors.slice(0, spaceForErrors - ellipsis.length - buffer);
   // If we cut in middle of %XX, back up to before the %
-  const lastPercent = truncatedEncodedErrors.lastIndexOf('%')
+  const lastPercent = truncatedEncodedErrors.lastIndexOf('%');
   if (lastPercent >= truncatedEncodedErrors.length - 2) {
-    truncatedEncodedErrors = truncatedEncodedErrors.slice(0, lastPercent)
+    truncatedEncodedErrors = truncatedEncodedErrors.slice(0, lastPercent);
   }
 
-  return (
-    baseUrl +
-    encodedPrefix +
-    truncatedEncodedErrors +
-    ellipsis +
-    encodedSuffix +
-    encodedNote
-  )
+  return baseUrl + encodedPrefix + truncatedEncodedErrors + ellipsis + encodedSuffix + encodedNote;
 }
 
-async function generateTitle(
-  description: string,
-  abortSignal: AbortSignal,
-): Promise<string> {
+async function generateTitle(description: string, abortSignal: AbortSignal): Promise<string> {
   try {
     const response = await queryHaiku({
       systemPrompt: asSystemPrompt([
@@ -611,24 +532,21 @@ async function generateTitle(
         querySource: 'feedback',
         mcpTools: [],
       },
-    })
+    });
 
-    const _firstBlock = response?.message?.content?.[0] as unknown as Record<string, unknown> | undefined
-    const title =
-      _firstBlock?.type === 'text'
-        ? (_firstBlock.text as string)
-        : 'Bug Report'
+    const _firstBlock = response?.message?.content?.[0] as unknown as Record<string, unknown> | undefined;
+    const title = _firstBlock?.type === 'text' ? (_firstBlock.text as string) : 'Bug Report';
 
     // Check if the title contains an API error message
     if (startsWithApiErrorPrefix(title)) {
-      return createFallbackTitle(description)
+      return createFallbackTitle(description);
     }
 
-    return title
+    return title;
   } catch (error) {
     // If there's any error in title generation, use a fallback title
-    logError(error)
-    return createFallbackTitle(description)
+    logError(error);
+    return createFallbackTitle(description);
   }
 }
 
@@ -636,45 +554,45 @@ function createFallbackTitle(description: string): string {
   // Create a safe fallback title based on the bug description
 
   // Try to extract a meaningful title from the first line
-  const firstLine = description.split('\n')[0] || ''
+  const firstLine = description.split('\n')[0] || '';
 
   // If the first line is very short, use it directly
   if (firstLine.length <= 60 && firstLine.length > 5) {
-    return firstLine
+    return firstLine;
   }
 
   // For longer descriptions, create a truncated version
   // Truncate at word boundaries when possible
-  let truncated = firstLine.slice(0, 60)
+  let truncated = firstLine.slice(0, 60);
   if (firstLine.length > 60) {
     // Find the last space before the 60 char limit
-    const lastSpace = truncated.lastIndexOf(' ')
+    const lastSpace = truncated.lastIndexOf(' ');
     if (lastSpace > 30) {
       // Only trim at word if we're not cutting too much
-      truncated = truncated.slice(0, lastSpace)
+      truncated = truncated.slice(0, lastSpace);
     }
-    truncated += '...'
+    truncated += '...';
   }
 
-  return truncated.length < 10 ? 'Bug Report' : truncated
+  return truncated.length < 10 ? 'Bug Report' : truncated;
 }
 
 // Helper function to sanitize and log errors without exposing API keys
 function sanitizeAndLogError(err: unknown): void {
   if (err instanceof Error) {
     // Create a copy with potentially sensitive info redacted
-    const safeError = new Error(redactSensitiveInfo(err.message))
+    const safeError = new Error(redactSensitiveInfo(err.message));
 
     // Also redact the stack trace if present
     if (err.stack) {
-      safeError.stack = redactSensitiveInfo(err.stack)
+      safeError.stack = redactSensitiveInfo(err.stack);
     }
 
-    logError(safeError)
+    logError(safeError);
   } else {
     // For non-Error objects, convert to string and redact sensitive info
-    const errorString = redactSensitiveInfo(String(err))
-    logError(new Error(errorString))
+    const errorString = redactSensitiveInfo(String(err));
+    logError(new Error(errorString));
   }
 }
 
@@ -683,24 +601,24 @@ async function submitFeedback(
   signal?: AbortSignal,
 ): Promise<{ success: boolean; feedbackId?: string; isZdrOrg?: boolean }> {
   if (isEssentialTrafficOnly()) {
-    return { success: false }
+    return { success: false };
   }
 
   try {
     // Ensure OAuth token is fresh before getting auth headers
     // This prevents 401 errors from stale cached tokens
-    await checkAndRefreshOAuthTokenIfNeeded()
+    await checkAndRefreshOAuthTokenIfNeeded();
 
-    const authResult = getAuthHeaders()
+    const authResult = getAuthHeaders();
     if (authResult.error) {
-      return { success: false }
+      return { success: false };
     }
 
     const headers: Record<string, string> = {
       'Content-Type': 'application/json',
       'User-Agent': getUserAgent(),
       ...authResult.headers,
-    }
+    };
 
     const response = await axios.post(
       'https://api.anthropic.com/api/claude_cli_feedback',
@@ -712,47 +630,37 @@ async function submitFeedback(
         timeout: 30000, // 30 second timeout to prevent hanging
         signal,
       },
-    )
+    );
 
     if (response.status === 200) {
-      const result = response.data
+      const result = response.data;
       if (result?.feedback_id) {
-        return { success: true, feedbackId: result.feedback_id }
+        return { success: true, feedbackId: result.feedback_id };
       }
-      sanitizeAndLogError(
-        new Error(
-          'Failed to submit feedback: request did not return feedback_id',
-        ),
-      )
-      return { success: false }
+      sanitizeAndLogError(new Error('Failed to submit feedback: request did not return feedback_id'));
+      return { success: false };
     }
 
-    sanitizeAndLogError(
-      new Error('Failed to submit feedback:' + response.status),
-    )
-    return { success: false }
+    sanitizeAndLogError(new Error('Failed to submit feedback:' + response.status));
+    return { success: false };
   } catch (err) {
     // Handle cancellation/abort - don't log as error
     if (axios.isCancel(err)) {
-      return { success: false }
+      return { success: false };
     }
 
     if (axios.isAxiosError(err) && err.response?.status === 403) {
-      const errorData = err.response.data
+      const errorData = err.response.data;
       if (
         errorData?.error?.type === 'permission_error' &&
         errorData?.error?.message?.includes('Custom data retention settings')
       ) {
-        sanitizeAndLogError(
-          new Error(
-            'Cannot submit feedback because custom data retention settings are enabled',
-          ),
-        )
-        return { success: false, isZdrOrg: true }
+        sanitizeAndLogError(new Error('Cannot submit feedback because custom data retention settings are enabled'));
+        return { success: false, isZdrOrg: true };
       }
     }
     // Use our safe error logging function to avoid leaking API keys
-    sanitizeAndLogError(err)
-    return { success: false }
+    sanitizeAndLogError(err);
+    return { success: false };
   }
 }
diff --git a/src/components/FeedbackSurvey/FeedbackSurvey.tsx b/src/components/FeedbackSurvey/FeedbackSurvey.tsx
index a92213441..6620d32a8 100644
--- a/src/components/FeedbackSurvey/FeedbackSurvey.tsx
+++ b/src/components/FeedbackSurvey/FeedbackSurvey.tsx
@@ -1,34 +1,25 @@
-import React from 'react'
+import React from 'react';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from 'src/services/analytics/index.js'
-import { Box, Text } from '@anthropic/ink'
-import {
-  FeedbackSurveyView,
-  isValidResponseInput,
-} from './FeedbackSurveyView.js'
-import type { TranscriptShareResponse } from './TranscriptSharePrompt.js'
-import { TranscriptSharePrompt } from './TranscriptSharePrompt.js'
-import { useDebouncedDigitInput } from './useDebouncedDigitInput.js'
-import type { FeedbackSurveyResponse } from './utils.js'
+} from 'src/services/analytics/index.js';
+import { Box, Text } from '@anthropic/ink';
+import { FeedbackSurveyView, isValidResponseInput } from './FeedbackSurveyView.js';
+import type { TranscriptShareResponse } from './TranscriptSharePrompt.js';
+import { TranscriptSharePrompt } from './TranscriptSharePrompt.js';
+import { useDebouncedDigitInput } from './useDebouncedDigitInput.js';
+import type { FeedbackSurveyResponse } from './utils.js';
 
 type Props = {
-  state:
-    | 'closed'
-    | 'open'
-    | 'thanks'
-    | 'transcript_prompt'
-    | 'submitting'
-    | 'submitted'
-  lastResponse: FeedbackSurveyResponse | null
-  handleSelect: (selected: FeedbackSurveyResponse) => void
-  handleTranscriptSelect?: (selected: TranscriptShareResponse) => void
-  inputValue: string
-  setInputValue: (value: string) => void
-  onRequestFeedback?: () => void
-  message?: string
-}
+  state: 'closed' | 'open' | 'thanks' | 'transcript_prompt' | 'submitting' | 'submitted';
+  lastResponse: FeedbackSurveyResponse | null;
+  handleSelect: (selected: FeedbackSurveyResponse) => void;
+  handleTranscriptSelect?: (selected: TranscriptShareResponse) => void;
+  inputValue: string;
+  setInputValue: (value: string) => void;
+  onRequestFeedback?: () => void;
+  message?: string;
+};
 
 export function FeedbackSurvey({
   state,
@@ -41,7 +32,7 @@ export function FeedbackSurvey({
   message,
 }: Props): React.ReactNode {
   if (state === 'closed') {
-    return null
+    return null;
   }
 
   if (state === 'thanks') {
@@ -52,17 +43,15 @@ export function FeedbackSurvey({
         setInputValue={setInputValue}
         onRequestFeedback={onRequestFeedback}
       />
-    )
+    );
   }
 
   if (state === 'submitted') {
     return (
       <Box marginTop={1}>
-        <Text color="success">
-          {'\u2713'} Thanks for sharing your transcript!
-        </Text>
+        <Text color="success">{'\u2713'} Thanks for sharing your transcript!</Text>
       </Box>
-    )
+    );
   }
 
   if (state === 'submitting') {
@@ -70,24 +59,20 @@ export function FeedbackSurvey({
       <Box marginTop={1}>
         <Text dimColor>Sharing transcript{'\u2026'}</Text>
       </Box>
-    )
+    );
   }
 
   if (state === 'transcript_prompt') {
     if (!handleTranscriptSelect) {
-      return null
+      return null;
     }
     // Hide prompt if user is typing non-response characters
     if (inputValue && !['1', '2', '3'].includes(inputValue)) {
-      return null
+      return null;
     }
     return (
-      <TranscriptSharePrompt
-        onSelect={handleTranscriptSelect}
-        inputValue={inputValue}
-        setInputValue={setInputValue}
-      />
-    )
+      <TranscriptSharePrompt onSelect={handleTranscriptSelect} inputValue={inputValue} setInputValue={setInputValue} />
+    );
   }
 
   // state === 'open'
@@ -95,7 +80,7 @@ export function FeedbackSurvey({
   // This prevents the survey from showing up when the user is typing a message,
   // which can result in accidental survey submissions (e.g. "s3cmd").
   if (inputValue && !isValidResponseInput(inputValue)) {
-    return null
+    return null;
   }
 
   return (
@@ -105,17 +90,17 @@ export function FeedbackSurvey({
       setInputValue={setInputValue}
       message={message}
     />
-  )
+  );
 }
 
 type ThanksProps = {
-  lastResponse: FeedbackSurveyResponse | null
-  inputValue: string
-  setInputValue: (value: string) => void
-  onRequestFeedback?: () => void
-}
+  lastResponse: FeedbackSurveyResponse | null;
+  inputValue: string;
+  setInputValue: (value: string) => void;
+  onRequestFeedback?: () => void;
+};
 
-const isFollowUpDigit = (char: string): char is '1' => char === '1'
+const isFollowUpDigit = (char: string): char is '1' => char === '1';
 
 function FeedbackSurveyThanks({
   lastResponse,
@@ -123,7 +108,7 @@ function FeedbackSurveyThanks({
   setInputValue,
   onRequestFeedback,
 }: ThanksProps): React.ReactNode {
-  const showFollowUp = onRequestFeedback && lastResponse === 'good'
+  const showFollowUp = onRequestFeedback && lastResponse === 'good';
 
   // Listen for "1" keypress to launch /feedback
   useDebouncedDigitInput({
@@ -134,34 +119,28 @@ function FeedbackSurveyThanks({
     once: true,
     onDigit: () => {
       logEvent('tengu_feedback_survey_event', {
-        event_type:
-          'followup_accepted' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        response:
-          lastResponse as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
-      onRequestFeedback?.()
+        event_type: 'followup_accepted' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        response: lastResponse as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
+      onRequestFeedback?.();
     },
-  })
+  });
 
-  const feedbackCommand =
-    process.env.USER_TYPE === 'ant' ? '/issue' : '/feedback'
+  const feedbackCommand = process.env.USER_TYPE === 'ant' ? '/issue' : '/feedback';
 
   return (
     <Box marginTop={1} flexDirection="column">
       <Text color="success">Thanks for the feedback!</Text>
       {showFollowUp ? (
         <Text dimColor>
-          (Optional) Press [<Text color="ansi:cyan">1</Text>] to tell us what
-          went well {' \u00b7 '}
+          (Optional) Press [<Text color="ansi:cyan">1</Text>] to tell us what went well {' \u00b7 '}
           {feedbackCommand}
         </Text>
       ) : lastResponse === 'bad' ? (
         <Text dimColor>Use /issue to report model behavior issues.</Text>
       ) : (
-        <Text dimColor>
-          Use {feedbackCommand} to share detailed feedback anytime.
-        </Text>
+        <Text dimColor>Use {feedbackCommand} to share detailed feedback anytime.</Text>
       )}
     </Box>
-  )
+  );
 }
diff --git a/src/components/FeedbackSurvey/FeedbackSurveyView.tsx b/src/components/FeedbackSurvey/FeedbackSurveyView.tsx
index 5a8721e12..3d738e795 100644
--- a/src/components/FeedbackSurvey/FeedbackSurveyView.tsx
+++ b/src/components/FeedbackSurvey/FeedbackSurveyView.tsx
@@ -1,29 +1,29 @@
-import React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { useDebouncedDigitInput } from './useDebouncedDigitInput.js'
-import type { FeedbackSurveyResponse } from './utils.js'
+import React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { useDebouncedDigitInput } from './useDebouncedDigitInput.js';
+import type { FeedbackSurveyResponse } from './utils.js';
 
 type Props = {
-  onSelect: (option: FeedbackSurveyResponse) => void
-  inputValue: string
-  setInputValue: (value: string) => void
-  message?: string
-}
+  onSelect: (option: FeedbackSurveyResponse) => void;
+  inputValue: string;
+  setInputValue: (value: string) => void;
+  message?: string;
+};
 
-const RESPONSE_INPUTS = ['0', '1', '2', '3'] as const
-type ResponseInput = (typeof RESPONSE_INPUTS)[number]
+const RESPONSE_INPUTS = ['0', '1', '2', '3'] as const;
+type ResponseInput = (typeof RESPONSE_INPUTS)[number];
 
 const inputToResponse: Record<ResponseInput, FeedbackSurveyResponse> = {
   '0': 'dismissed',
   '1': 'bad',
   '2': 'fine',
   '3': 'good',
-} as const
+} as const;
 
 export const isValidResponseInput = (input: string): input is ResponseInput =>
-  (RESPONSE_INPUTS as readonly string[]).includes(input)
+  (RESPONSE_INPUTS as readonly string[]).includes(input);
 
-const DEFAULT_MESSAGE = 'How is Claude doing this session? (optional)'
+const DEFAULT_MESSAGE = 'How is Claude doing this session? (optional)';
 
 export function FeedbackSurveyView({
   onSelect,
@@ -36,7 +36,7 @@ export function FeedbackSurveyView({
     setInputValue,
     isValidDigit: isValidResponseInput,
     onDigit: digit => onSelect(inputToResponse[digit]),
-  })
+  });
 
   return (
     <Box flexDirection="column" marginTop={1}>
@@ -68,5 +68,5 @@ export function FeedbackSurveyView({
         </Box>
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/components/FeedbackSurvey/TranscriptSharePrompt.tsx b/src/components/FeedbackSurvey/TranscriptSharePrompt.tsx
index d3f39d25e..6da2ea017 100644
--- a/src/components/FeedbackSurvey/TranscriptSharePrompt.tsx
+++ b/src/components/FeedbackSurvey/TranscriptSharePrompt.tsx
@@ -1,55 +1,45 @@
-import React from 'react'
-import { BLACK_CIRCLE } from '../../constants/figures.js'
-import { Box, Text } from '@anthropic/ink'
-import { useDebouncedDigitInput } from './useDebouncedDigitInput.js'
+import React from 'react';
+import { BLACK_CIRCLE } from '../../constants/figures.js';
+import { Box, Text } from '@anthropic/ink';
+import { useDebouncedDigitInput } from './useDebouncedDigitInput.js';
 
-export type TranscriptShareResponse = 'yes' | 'no' | 'dont_ask_again'
+export type TranscriptShareResponse = 'yes' | 'no' | 'dont_ask_again';
 
 type Props = {
-  onSelect: (option: TranscriptShareResponse) => void
-  inputValue: string
-  setInputValue: (value: string) => void
-}
+  onSelect: (option: TranscriptShareResponse) => void;
+  inputValue: string;
+  setInputValue: (value: string) => void;
+};
 
-const RESPONSE_INPUTS = ['1', '2', '3'] as const
-type ResponseInput = (typeof RESPONSE_INPUTS)[number]
+const RESPONSE_INPUTS = ['1', '2', '3'] as const;
+type ResponseInput = (typeof RESPONSE_INPUTS)[number];
 
 const inputToResponse: Record<ResponseInput, TranscriptShareResponse> = {
   '1': 'yes',
   '2': 'no',
   '3': 'dont_ask_again',
-} as const
+} as const;
 
 const isValidResponseInput = (input: string): input is ResponseInput =>
-  (RESPONSE_INPUTS as readonly string[]).includes(input)
+  (RESPONSE_INPUTS as readonly string[]).includes(input);
 
-export function TranscriptSharePrompt({
-  onSelect,
-  inputValue,
-  setInputValue,
-}: Props): React.ReactNode {
+export function TranscriptSharePrompt({ onSelect, inputValue, setInputValue }: Props): React.ReactNode {
   useDebouncedDigitInput({
     inputValue,
     setInputValue,
     isValidDigit: isValidResponseInput,
     onDigit: digit => onSelect(inputToResponse[digit]),
-  })
+  });
 
   return (
     <Box flexDirection="column" marginTop={1}>
       <Box>
         <Text color="ansi:cyan">{BLACK_CIRCLE} </Text>
-        <Text bold>
-          Can Anthropic look at your session transcript to help us improve
-          Claude Code?
-        </Text>
+        <Text bold>Can Anthropic look at your session transcript to help us improve Claude Code?</Text>
       </Box>
 
       <Box marginLeft={2}>
-        <Text dimColor>
-          Learn more:
-          https://code.claude.com/docs/en/data-usage#session-quality-surveys
-        </Text>
+        <Text dimColor>Learn more: https://code.claude.com/docs/en/data-usage#session-quality-surveys</Text>
       </Box>
 
       <Box marginLeft={2}>
@@ -70,5 +60,5 @@ export function TranscriptSharePrompt({
         </Box>
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/components/FeedbackSurvey/src/hooks/useDynamicConfig.ts b/src/components/FeedbackSurvey/src/hooks/useDynamicConfig.ts
index 5657e8465..bb1fe312d 100644
--- a/src/components/FeedbackSurvey/src/hooks/useDynamicConfig.ts
+++ b/src/components/FeedbackSurvey/src/hooks/useDynamicConfig.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useDynamicConfig = any;
+export type useDynamicConfig = any
diff --git a/src/components/FeedbackSurvey/src/services/analytics/config.ts b/src/components/FeedbackSurvey/src/services/analytics/config.ts
index 5ce8a06db..da7d58f1e 100644
--- a/src/components/FeedbackSurvey/src/services/analytics/config.ts
+++ b/src/components/FeedbackSurvey/src/services/analytics/config.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type isFeedbackSurveyDisabled = any;
+export type isFeedbackSurveyDisabled = any
diff --git a/src/components/FeedbackSurvey/src/services/analytics/growthbook.ts b/src/components/FeedbackSurvey/src/services/analytics/growthbook.ts
index 1df9f09d9..cb078eac7 100644
--- a/src/components/FeedbackSurvey/src/services/analytics/growthbook.ts
+++ b/src/components/FeedbackSurvey/src/services/analytics/growthbook.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type getFeatureValue_CACHED_MAY_BE_STALE = any;
-export type checkStatsigFeatureGate_CACHED_MAY_BE_STALE = any;
+export type getFeatureValue_CACHED_MAY_BE_STALE = any
+export type checkStatsigFeatureGate_CACHED_MAY_BE_STALE = any
diff --git a/src/components/FeedbackSurvey/src/services/analytics/index.ts b/src/components/FeedbackSurvey/src/services/analytics/index.ts
index 142e7b6f5..2e0f796da 100644
--- a/src/components/FeedbackSurvey/src/services/analytics/index.ts
+++ b/src/components/FeedbackSurvey/src/services/analytics/index.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any;
-export type logEvent = any;
+export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any
+export type logEvent = any
diff --git a/src/components/FeedbackSurvey/useFeedbackSurvey.tsx b/src/components/FeedbackSurvey/useFeedbackSurvey.tsx
index 166c2dcdd..2d5712b94 100644
--- a/src/components/FeedbackSurvey/useFeedbackSurvey.tsx
+++ b/src/components/FeedbackSurvey/useFeedbackSurvey.tsx
@@ -1,40 +1,37 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { useDynamicConfig } from 'src/hooks/useDynamicConfig.js'
-import { isFeedbackSurveyDisabled } from 'src/services/analytics/config.js'
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useDynamicConfig } from 'src/hooks/useDynamicConfig.js';
+import { isFeedbackSurveyDisabled } from 'src/services/analytics/config.js';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from 'src/services/analytics/index.js'
-import { isPolicyAllowed } from '../../services/policyLimits/index.js'
-import type { Message } from '../../types/message.js'
-import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js'
-import { isEnvTruthy } from '../../utils/envUtils.js'
-import { getLastAssistantMessage } from '../../utils/messages.js'
-import { getMainLoopModel } from '../../utils/model/model.js'
-import { getInitialSettings } from '../../utils/settings/settings.js'
-import { logOTelEvent } from '../../utils/telemetry/events.js'
-import {
-  submitTranscriptShare,
-  type TranscriptShareTrigger,
-} from './submitTranscriptShare.js'
-import type { TranscriptShareResponse } from './TranscriptSharePrompt.js'
-import { useSurveyState } from './useSurveyState.js'
-import type { FeedbackSurveyResponse, FeedbackSurveyType } from './utils.js'
+} from 'src/services/analytics/index.js';
+import { isPolicyAllowed } from '../../services/policyLimits/index.js';
+import type { Message } from '../../types/message.js';
+import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js';
+import { isEnvTruthy } from '../../utils/envUtils.js';
+import { getLastAssistantMessage } from '../../utils/messages.js';
+import { getMainLoopModel } from '../../utils/model/model.js';
+import { getInitialSettings } from '../../utils/settings/settings.js';
+import { logOTelEvent } from '../../utils/telemetry/events.js';
+import { submitTranscriptShare, type TranscriptShareTrigger } from './submitTranscriptShare.js';
+import type { TranscriptShareResponse } from './TranscriptSharePrompt.js';
+import { useSurveyState } from './useSurveyState.js';
+import type { FeedbackSurveyResponse, FeedbackSurveyType } from './utils.js';
 
 type FeedbackSurveyConfig = {
-  minTimeBeforeFeedbackMs: number
-  minTimeBetweenFeedbackMs: number
-  minTimeBetweenGlobalFeedbackMs: number
-  minUserTurnsBeforeFeedback: number
-  minUserTurnsBetweenFeedback: number
-  hideThanksAfterMs: number
-  onForModels: string[]
-  probability: number
-}
+  minTimeBeforeFeedbackMs: number;
+  minTimeBetweenFeedbackMs: number;
+  minTimeBetweenGlobalFeedbackMs: number;
+  minUserTurnsBeforeFeedback: number;
+  minUserTurnsBetweenFeedback: number;
+  hideThanksAfterMs: number;
+  onForModels: string[];
+  probability: number;
+};
 
 type TranscriptAskConfig = {
-  probability: number
-}
+  probability: number;
+};
 
 const DEFAULT_FEEDBACK_SURVEY_CONFIG: FeedbackSurveyConfig = {
   minTimeBeforeFeedbackMs: 600000,
@@ -45,11 +42,11 @@ const DEFAULT_FEEDBACK_SURVEY_CONFIG: FeedbackSurveyConfig = {
   hideThanksAfterMs: 3000,
   onForModels: ['*'],
   probability: 0.005,
-}
+};
 
 const DEFAULT_TRANSCRIPT_ASK_CONFIG: TranscriptAskConfig = {
   probability: 0,
-}
+};
 
 export function useFeedbackSurvey(
   messages: Message[],
@@ -58,177 +55,145 @@ export function useFeedbackSurvey(
   surveyType: FeedbackSurveyType = 'session',
   hasActivePrompt: boolean = false,
 ): {
-  state:
-    | 'closed'
-    | 'open'
-    | 'thanks'
-    | 'transcript_prompt'
-    | 'submitting'
-    | 'submitted'
-  lastResponse: FeedbackSurveyResponse | null
-  handleSelect: (selected: FeedbackSurveyResponse) => boolean
-  handleTranscriptSelect: (selected: TranscriptShareResponse) => void
+  state: 'closed' | 'open' | 'thanks' | 'transcript_prompt' | 'submitting' | 'submitted';
+  lastResponse: FeedbackSurveyResponse | null;
+  handleSelect: (selected: FeedbackSurveyResponse) => boolean;
+  handleTranscriptSelect: (selected: TranscriptShareResponse) => void;
 } {
-  const lastAssistantMessageIdRef = useRef('unknown')
-  lastAssistantMessageIdRef.current =
-    getLastAssistantMessage(messages)?.message?.id || 'unknown'
+  const lastAssistantMessageIdRef = useRef('unknown');
+  lastAssistantMessageIdRef.current = getLastAssistantMessage(messages)?.message?.id || 'unknown';
   const [feedbackSurvey, setFeedbackSurvey] = useState<{
-    timeLastShown: number | null
-    submitCountAtLastAppearance: number | null
-  }>(() => ({ timeLastShown: null, submitCountAtLastAppearance: null }))
-  const config = useDynamicConfig<FeedbackSurveyConfig>(
-    'tengu_feedback_survey_config',
-    DEFAULT_FEEDBACK_SURVEY_CONFIG,
-  )
+    timeLastShown: number | null;
+    submitCountAtLastAppearance: number | null;
+  }>(() => ({ timeLastShown: null, submitCountAtLastAppearance: null }));
+  const config = useDynamicConfig<FeedbackSurveyConfig>('tengu_feedback_survey_config', DEFAULT_FEEDBACK_SURVEY_CONFIG);
   const badTranscriptAskConfig = useDynamicConfig<TranscriptAskConfig>(
     'tengu_bad_survey_transcript_ask_config',
     DEFAULT_TRANSCRIPT_ASK_CONFIG,
-  )
+  );
   const goodTranscriptAskConfig = useDynamicConfig<TranscriptAskConfig>(
     'tengu_good_survey_transcript_ask_config',
     DEFAULT_TRANSCRIPT_ASK_CONFIG,
-  )
-  const settingsRate = getInitialSettings().feedbackSurveyRate
-  const sessionStartTime = useRef(Date.now())
-  const submitCountAtSessionStart = useRef(submitCount)
-  const submitCountRef = useRef(submitCount)
-  submitCountRef.current = submitCount
-  const messagesRef = useRef(messages)
-  messagesRef.current = messages
+  );
+  const settingsRate = getInitialSettings().feedbackSurveyRate;
+  const sessionStartTime = useRef(Date.now());
+  const submitCountAtSessionStart = useRef(submitCount);
+  const submitCountRef = useRef(submitCount);
+  submitCountRef.current = submitCount;
+  const messagesRef = useRef(messages);
+  messagesRef.current = messages;
   // Probability gate: roll once when eligibility conditions are met, not on every
   // useMemo re-evaluation. Without this, each dependency change (submitCount,
   // isLoading toggle, etc.) re-rolls Math.random(), making the survey almost
   // certain to appear after enough renders.
-  const probabilityPassedRef = useRef(false)
-  const lastEligibleSubmitCountRef = useRef<number | null>(null)
+  const probabilityPassedRef = useRef(false);
+  const lastEligibleSubmitCountRef = useRef<number | null>(null);
 
-  const updateLastShownTime = useCallback(
-    (timestamp: number, submitCountValue: number) => {
-      setFeedbackSurvey(prev => {
-        if (
-          prev.timeLastShown === timestamp &&
-          prev.submitCountAtLastAppearance === submitCountValue
-        ) {
-          return prev
-        }
-        return {
-          timeLastShown: timestamp,
-          submitCountAtLastAppearance: submitCountValue,
-        }
-      })
-      // Persist cross-session pacing state (previously done by onChangeAppState observer)
-      if (getGlobalConfig().feedbackSurveyState?.lastShownTime !== timestamp) {
-        saveGlobalConfig(current => ({
-          ...current,
-          feedbackSurveyState: {
-            lastShownTime: timestamp,
-          },
-        }))
+  const updateLastShownTime = useCallback((timestamp: number, submitCountValue: number) => {
+    setFeedbackSurvey(prev => {
+      if (prev.timeLastShown === timestamp && prev.submitCountAtLastAppearance === submitCountValue) {
+        return prev;
       }
-    },
-    [],
-  )
+      return {
+        timeLastShown: timestamp,
+        submitCountAtLastAppearance: submitCountValue,
+      };
+    });
+    // Persist cross-session pacing state (previously done by onChangeAppState observer)
+    if (getGlobalConfig().feedbackSurveyState?.lastShownTime !== timestamp) {
+      saveGlobalConfig(current => ({
+        ...current,
+        feedbackSurveyState: {
+          lastShownTime: timestamp,
+        },
+      }));
+    }
+  }, []);
 
   const onOpen = useCallback(
     (appearanceId: string) => {
-      updateLastShownTime(Date.now(), submitCountRef.current)
+      updateLastShownTime(Date.now(), submitCountRef.current);
       logEvent('tengu_feedback_survey_event', {
-        event_type:
-          'appeared' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        appearance_id:
-          appearanceId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        event_type: 'appeared' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        appearance_id: appearanceId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
         last_assistant_message_id:
           lastAssistantMessageIdRef.current as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        survey_type:
-          surveyType as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
+        survey_type: surveyType as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
       void logOTelEvent('feedback_survey', {
         event_type: 'appeared',
         appearance_id: appearanceId,
         survey_type: surveyType,
-      })
+      });
     },
     [updateLastShownTime, surveyType],
-  )
+  );
 
   const onSelect = useCallback(
     (appearanceId: string, selected: FeedbackSurveyResponse) => {
-      updateLastShownTime(Date.now(), submitCountRef.current)
+      updateLastShownTime(Date.now(), submitCountRef.current);
       logEvent('tengu_feedback_survey_event', {
-        event_type:
-          'responded' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        appearance_id:
-          appearanceId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        response:
-          selected as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        event_type: 'responded' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        appearance_id: appearanceId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        response: selected as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
         last_assistant_message_id:
           lastAssistantMessageIdRef.current as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        survey_type:
-          surveyType as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
+        survey_type: surveyType as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
       void logOTelEvent('feedback_survey', {
         event_type: 'responded',
         appearance_id: appearanceId,
         response: selected,
         survey_type: surveyType,
-      })
+      });
     },
     [updateLastShownTime, surveyType],
-  )
+  );
 
   const shouldShowTranscriptPrompt = useCallback(
     (selected: FeedbackSurveyResponse) => {
       // Only bad and good ratings trigger the transcript ask
       if (selected !== 'bad' && selected !== 'good') {
-        return false
+        return false;
       }
 
       // Don't show if user previously chose "Don't ask again"
       if (getGlobalConfig().transcriptShareDismissed) {
-        return false
+        return false;
       }
 
       // Don't show if product feedback is blocked by org policy (ZDR)
       if (!isPolicyAllowed('allow_product_feedback')) {
-        return false
+        return false;
       }
 
       // Probability gate from GrowthBook config (separate per rating)
-      const probability =
-        selected === 'bad'
-          ? badTranscriptAskConfig.probability
-          : goodTranscriptAskConfig.probability
-      return Math.random() <= probability
+      const probability = selected === 'bad' ? badTranscriptAskConfig.probability : goodTranscriptAskConfig.probability;
+      return Math.random() <= probability;
     },
     [badTranscriptAskConfig.probability, goodTranscriptAskConfig.probability],
-  )
+  );
 
   const onTranscriptPromptShown = useCallback(
     (appearanceId: string, surveyResponse: FeedbackSurveyResponse) => {
       const trigger: TranscriptShareTrigger =
-        surveyResponse === 'good'
-          ? 'good_feedback_survey'
-          : 'bad_feedback_survey'
+        surveyResponse === 'good' ? 'good_feedback_survey' : 'bad_feedback_survey';
       logEvent('tengu_feedback_survey_event', {
-        event_type:
-          'transcript_prompt_appeared' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        appearance_id:
-          appearanceId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        event_type: 'transcript_prompt_appeared' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        appearance_id: appearanceId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
         last_assistant_message_id:
           lastAssistantMessageIdRef.current as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        survey_type:
-          surveyType as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        trigger:
-          trigger as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
+        survey_type: surveyType as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        trigger: trigger as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
       void logOTelEvent('feedback_survey', {
         event_type: 'transcript_prompt_appeared',
         appearance_id: appearanceId,
         survey_type: surveyType,
-      })
+      });
     },
     [surveyType],
-  )
+  );
 
   const onTranscriptSelect = useCallback(
     async (
@@ -237,166 +202,143 @@ export function useFeedbackSurvey(
       surveyResponse: FeedbackSurveyResponse | null,
     ): Promise<boolean> => {
       const trigger: TranscriptShareTrigger =
-        surveyResponse === 'good'
-          ? 'good_feedback_survey'
-          : 'bad_feedback_survey'
+        surveyResponse === 'good' ? 'good_feedback_survey' : 'bad_feedback_survey';
 
       logEvent('tengu_feedback_survey_event', {
-        event_type:
-          `transcript_share_${selected}` as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        appearance_id:
-          appearanceId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        event_type: `transcript_share_${selected}` as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        appearance_id: appearanceId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
         last_assistant_message_id:
           lastAssistantMessageIdRef.current as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        survey_type:
-          surveyType as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        trigger:
-          trigger as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
+        survey_type: surveyType as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        trigger: trigger as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
 
       if (selected === 'dont_ask_again') {
         saveGlobalConfig(current => ({
           ...current,
           transcriptShareDismissed: true,
-        }))
+        }));
       }
 
       if (selected === 'yes') {
-        const result = await submitTranscriptShare(
-          messagesRef.current,
-          trigger,
-          appearanceId,
-        )
+        const result = await submitTranscriptShare(messagesRef.current, trigger, appearanceId);
         logEvent('tengu_feedback_survey_event', {
           event_type: (result.success
             ? 'transcript_share_submitted'
             : 'transcript_share_failed') as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-          appearance_id:
-            appearanceId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-          trigger:
-            trigger as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        })
-        return result.success
+          appearance_id: appearanceId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          trigger: trigger as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        });
+        return result.success;
       }
 
-      return false
+      return false;
     },
     [surveyType],
-  )
+  );
 
-  const { state, lastResponse, open, handleSelect, handleTranscriptSelect } =
-    useSurveyState({
-      hideThanksAfterMs: config.hideThanksAfterMs,
-      onOpen,
-      onSelect,
-      shouldShowTranscriptPrompt,
-      onTranscriptPromptShown,
-      onTranscriptSelect,
-    })
+  const { state, lastResponse, open, handleSelect, handleTranscriptSelect } = useSurveyState({
+    hideThanksAfterMs: config.hideThanksAfterMs,
+    onOpen,
+    onSelect,
+    shouldShowTranscriptPrompt,
+    onTranscriptPromptShown,
+    onTranscriptSelect,
+  });
 
-  const currentModel = getMainLoopModel()
+  const currentModel = getMainLoopModel();
   const isModelAllowed = useMemo(() => {
     if (config.onForModels.length === 0) {
-      return false
+      return false;
     }
     if (config.onForModels.includes('*')) {
-      return true
+      return true;
     }
-    return config.onForModels.includes(currentModel)
-  }, [config.onForModels, currentModel])
+    return config.onForModels.includes(currentModel);
+  }, [config.onForModels, currentModel]);
 
   const shouldOpen = useMemo(() => {
     if (state !== 'closed') {
-      return false
+      return false;
     }
 
     if (isLoading) {
-      return false
+      return false;
     }
 
     // Don't show survey when permission or ask question prompts are visible
     if (hasActivePrompt) {
-      return false
+      return false;
     }
 
     // Force display for testing
-    if (
-      process.env.CLAUDE_FORCE_DISPLAY_SURVEY &&
-      !feedbackSurvey.timeLastShown
-    ) {
-      return true
+    if (process.env.CLAUDE_FORCE_DISPLAY_SURVEY && !feedbackSurvey.timeLastShown) {
+      return true;
     }
 
     if (!isModelAllowed) {
-      return false
+      return false;
     }
 
     if (isEnvTruthy(process.env.CLAUDE_CODE_DISABLE_FEEDBACK_SURVEY)) {
-      return false
+      return false;
     }
 
     if (isFeedbackSurveyDisabled()) {
-      return false
+      return false;
     }
 
     // Check if product feedback is allowed by org policy
     if (!isPolicyAllowed('allow_product_feedback')) {
-      return false
+      return false;
     }
 
     // Check session-local pacing
     if (feedbackSurvey.timeLastShown) {
       // Check time elapsed since last appearance in this session
-      const timeSinceLastShown = Date.now() - feedbackSurvey.timeLastShown
+      const timeSinceLastShown = Date.now() - feedbackSurvey.timeLastShown;
       if (timeSinceLastShown < config.minTimeBetweenFeedbackMs) {
-        return false
+        return false;
       }
       // Check user turn requirement for subsequent appearances
       if (
         feedbackSurvey.submitCountAtLastAppearance !== null &&
-        submitCount <
-          feedbackSurvey.submitCountAtLastAppearance +
-            config.minUserTurnsBetweenFeedback
+        submitCount < feedbackSurvey.submitCountAtLastAppearance + config.minUserTurnsBetweenFeedback
       ) {
-        return false
+        return false;
       }
     } else {
       // First appearance in this session
-      const timeSinceSessionStart = Date.now() - sessionStartTime.current
+      const timeSinceSessionStart = Date.now() - sessionStartTime.current;
       if (timeSinceSessionStart < config.minTimeBeforeFeedbackMs) {
-        return false
+        return false;
       }
-      if (
-        submitCount <
-        submitCountAtSessionStart.current + config.minUserTurnsBeforeFeedback
-      ) {
-        return false
+      if (submitCount < submitCountAtSessionStart.current + config.minUserTurnsBeforeFeedback) {
+        return false;
       }
     }
 
     // Probability check: roll once per eligibility window to avoid re-rolling
     // on every useMemo re-evaluation (which would make triggering near-certain).
     if (lastEligibleSubmitCountRef.current !== submitCount) {
-      lastEligibleSubmitCountRef.current = submitCount
-      probabilityPassedRef.current =
-        Math.random() <= (settingsRate ?? config.probability)
+      lastEligibleSubmitCountRef.current = submitCount;
+      probabilityPassedRef.current = Math.random() <= (settingsRate ?? config.probability);
     }
     if (!probabilityPassedRef.current) {
-      return false
+      return false;
     }
 
     // Check global pacing (across all sessions)
     // Leave this till last because it reads from the filesystem which is expensive.
-    const globalFeedbackState = getGlobalConfig().feedbackSurveyState
+    const globalFeedbackState = getGlobalConfig().feedbackSurveyState;
     if (globalFeedbackState?.lastShownTime) {
-      const timeSinceGlobalLastShown =
-        Date.now() - globalFeedbackState.lastShownTime
+      const timeSinceGlobalLastShown = Date.now() - globalFeedbackState.lastShownTime;
       if (timeSinceGlobalLastShown < config.minTimeBetweenGlobalFeedbackMs) {
-        return false
+        return false;
       }
     }
 
-    return true
+    return true;
   }, [
     state,
     isLoading,
@@ -412,13 +354,13 @@ export function useFeedbackSurvey(
     config.minUserTurnsBeforeFeedback,
     config.probability,
     settingsRate,
-  ])
+  ]);
 
   useEffect(() => {
     if (shouldOpen) {
-      open()
+      open();
     }
-  }, [shouldOpen, open])
+  }, [shouldOpen, open]);
 
-  return { state, lastResponse, handleSelect, handleTranscriptSelect }
+  return { state, lastResponse, handleSelect, handleTranscriptSelect };
 }
diff --git a/src/components/FeedbackSurvey/useFrustrationDetection.ts b/src/components/FeedbackSurvey/useFrustrationDetection.ts
index b2f028a34..de258fe34 100644
--- a/src/components/FeedbackSurvey/useFrustrationDetection.ts
+++ b/src/components/FeedbackSurvey/useFrustrationDetection.ts
@@ -5,5 +5,5 @@ export function useFrustrationDetection(
   _hasActivePrompt: boolean,
   _otherSurveyOpen: boolean,
 ): { state: 'closed' | 'open'; handleTranscriptSelect: () => void } {
-  return { state: 'closed', handleTranscriptSelect: () => {} };
+  return { state: 'closed', handleTranscriptSelect: () => {} }
 }
diff --git a/src/components/FeedbackSurvey/useMemorySurvey.tsx b/src/components/FeedbackSurvey/useMemorySurvey.tsx
index 81767eac8..354377ac6 100644
--- a/src/components/FeedbackSurvey/useMemorySurvey.tsx
+++ b/src/components/FeedbackSurvey/useMemorySurvey.tsx
@@ -1,58 +1,52 @@
-import { useCallback, useEffect, useMemo, useRef } from 'react'
-import { isFeedbackSurveyDisabled } from 'src/services/analytics/config.js'
-import { getFeatureValue_CACHED_MAY_BE_STALE } from 'src/services/analytics/growthbook.js'
+import { useCallback, useEffect, useMemo, useRef } from 'react';
+import { isFeedbackSurveyDisabled } from 'src/services/analytics/config.js';
+import { getFeatureValue_CACHED_MAY_BE_STALE } from 'src/services/analytics/growthbook.js';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from 'src/services/analytics/index.js'
-import { isAutoMemoryEnabled } from '../../memdir/paths.js'
-import { isPolicyAllowed } from '../../services/policyLimits/index.js'
-import { FILE_READ_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/FileReadTool/prompt.js'
-import type { Message } from '../../types/message.js'
-import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js'
-import { isEnvTruthy } from '../../utils/envUtils.js'
-import { isAutoManagedMemoryFile } from '../../utils/memoryFileDetection.js'
-import {
-  extractTextContent,
-  getLastAssistantMessage,
-} from '../../utils/messages.js'
-import { logOTelEvent } from '../../utils/telemetry/events.js'
-import { submitTranscriptShare } from './submitTranscriptShare.js'
-import type { TranscriptShareResponse } from './TranscriptSharePrompt.js'
-import { useSurveyState } from './useSurveyState.js'
-import type { FeedbackSurveyResponse } from './utils.js'
+} from 'src/services/analytics/index.js';
+import { isAutoMemoryEnabled } from '../../memdir/paths.js';
+import { isPolicyAllowed } from '../../services/policyLimits/index.js';
+import { FILE_READ_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/FileReadTool/prompt.js';
+import type { Message } from '../../types/message.js';
+import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js';
+import { isEnvTruthy } from '../../utils/envUtils.js';
+import { isAutoManagedMemoryFile } from '../../utils/memoryFileDetection.js';
+import { extractTextContent, getLastAssistantMessage } from '../../utils/messages.js';
+import { logOTelEvent } from '../../utils/telemetry/events.js';
+import { submitTranscriptShare } from './submitTranscriptShare.js';
+import type { TranscriptShareResponse } from './TranscriptSharePrompt.js';
+import { useSurveyState } from './useSurveyState.js';
+import type { FeedbackSurveyResponse } from './utils.js';
 
-const HIDE_THANKS_AFTER_MS = 3000
-const MEMORY_SURVEY_GATE = 'tengu_dunwich_bell'
-const MEMORY_SURVEY_EVENT = 'tengu_memory_survey_event'
-const SURVEY_PROBABILITY = 0.2
-const TRANSCRIPT_SHARE_TRIGGER = 'memory_survey'
+const HIDE_THANKS_AFTER_MS = 3000;
+const MEMORY_SURVEY_GATE = 'tengu_dunwich_bell';
+const MEMORY_SURVEY_EVENT = 'tengu_memory_survey_event';
+const SURVEY_PROBABILITY = 0.2;
+const TRANSCRIPT_SHARE_TRIGGER = 'memory_survey';
 
-const MEMORY_WORD_RE = /\bmemor(?:y|ies)\b/i
+const MEMORY_WORD_RE = /\bmemor(?:y|ies)\b/i;
 
 function hasMemoryFileRead(messages: Message[]): boolean {
   for (const message of messages) {
     if (message.type !== 'assistant') {
-      continue
+      continue;
     }
-    const content = message.message!.content
+    const content = message.message!.content;
     if (!Array.isArray(content)) {
-      continue
+      continue;
     }
     for (const block of content) {
       if (block.type !== 'tool_use' || block.name !== FILE_READ_TOOL_NAME) {
-        continue
+        continue;
       }
-      const input = block.input as { file_path?: unknown }
-      if (
-        typeof input.file_path === 'string' &&
-        isAutoManagedMemoryFile(input.file_path)
-      ) {
-        return true
+      const input = block.input as { file_path?: unknown };
+      if (typeof input.file_path === 'string' && isAutoManagedMemoryFile(input.file_path)) {
+        return true;
       }
     }
   }
-  return false
+  return false;
 }
 
 export function useMemorySurvey(
@@ -61,223 +55,182 @@ export function useMemorySurvey(
   hasActivePrompt = false,
   { enabled = true }: { enabled?: boolean } = {},
 ): {
-  state:
-    | 'closed'
-    | 'open'
-    | 'thanks'
-    | 'transcript_prompt'
-    | 'submitting'
-    | 'submitted'
-  lastResponse: FeedbackSurveyResponse | null
-  handleSelect: (selected: FeedbackSurveyResponse) => void
-  handleTranscriptSelect: (selected: TranscriptShareResponse) => void
+  state: 'closed' | 'open' | 'thanks' | 'transcript_prompt' | 'submitting' | 'submitted';
+  lastResponse: FeedbackSurveyResponse | null;
+  handleSelect: (selected: FeedbackSurveyResponse) => void;
+  handleTranscriptSelect: (selected: TranscriptShareResponse) => void;
 } {
   // Track assistant message UUIDs that were already evaluated so we don't
   // re-roll probability on re-renders or re-scan messages for the same turn.
-  const seenAssistantUuids = useRef<Set<string>>(new Set())
+  const seenAssistantUuids = useRef<Set<string>>(new Set());
   // Once a memory file read is observed it stays true for the session —
   // skip the O(n) scan on subsequent turns.
-  const memoryReadSeen = useRef(false)
-  const messagesRef = useRef(messages)
-  messagesRef.current = messages
+  const memoryReadSeen = useRef(false);
+  const messagesRef = useRef(messages);
+  messagesRef.current = messages;
 
   const onOpen = useCallback((appearanceId: string) => {
     logEvent(MEMORY_SURVEY_EVENT, {
-      event_type:
-        'appeared' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      appearance_id:
-        appearanceId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-    })
+      event_type: 'appeared' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      appearance_id: appearanceId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+    });
     void logOTelEvent('feedback_survey', {
       event_type: 'appeared',
       appearance_id: appearanceId,
       survey_type: 'memory',
-    })
-  }, [])
+    });
+  }, []);
 
-  const onSelect = useCallback(
-    (appearanceId: string, selected: FeedbackSurveyResponse) => {
-      logEvent(MEMORY_SURVEY_EVENT, {
-        event_type:
-          'responded' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        appearance_id:
-          appearanceId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        response:
-          selected as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
-      void logOTelEvent('feedback_survey', {
-        event_type: 'responded',
-        appearance_id: appearanceId,
-        response: selected,
-        survey_type: 'memory',
-      })
-    },
-    [],
-  )
+  const onSelect = useCallback((appearanceId: string, selected: FeedbackSurveyResponse) => {
+    logEvent(MEMORY_SURVEY_EVENT, {
+      event_type: 'responded' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      appearance_id: appearanceId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      response: selected as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+    });
+    void logOTelEvent('feedback_survey', {
+      event_type: 'responded',
+      appearance_id: appearanceId,
+      response: selected,
+      survey_type: 'memory',
+    });
+  }, []);
 
-  const shouldShowTranscriptPrompt = useCallback(
-    (selected: FeedbackSurveyResponse) => {
-      if (process.env.USER_TYPE !== 'ant') {
-        return false
-      }
-      if (selected !== 'bad' && selected !== 'good') {
-        return false
-      }
-      if (getGlobalConfig().transcriptShareDismissed) {
-        return false
-      }
-      if (!isPolicyAllowed('allow_product_feedback')) {
-        return false
-      }
-      return true
-    },
-    [],
-  )
+  const shouldShowTranscriptPrompt = useCallback((selected: FeedbackSurveyResponse) => {
+    if (process.env.USER_TYPE !== 'ant') {
+      return false;
+    }
+    if (selected !== 'bad' && selected !== 'good') {
+      return false;
+    }
+    if (getGlobalConfig().transcriptShareDismissed) {
+      return false;
+    }
+    if (!isPolicyAllowed('allow_product_feedback')) {
+      return false;
+    }
+    return true;
+  }, []);
 
   const onTranscriptPromptShown = useCallback((appearanceId: string) => {
     logEvent(MEMORY_SURVEY_EVENT, {
-      event_type:
-        'transcript_prompt_appeared' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      appearance_id:
-        appearanceId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      trigger:
-        TRANSCRIPT_SHARE_TRIGGER as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-    })
+      event_type: 'transcript_prompt_appeared' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      appearance_id: appearanceId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      trigger: TRANSCRIPT_SHARE_TRIGGER as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+    });
     void logOTelEvent('feedback_survey', {
       event_type: 'transcript_prompt_appeared',
       appearance_id: appearanceId,
       survey_type: 'memory',
-    })
-  }, [])
+    });
+  }, []);
 
   const onTranscriptSelect = useCallback(
-    async (
-      appearanceId: string,
-      selected: TranscriptShareResponse,
-    ): Promise<boolean> => {
+    async (appearanceId: string, selected: TranscriptShareResponse): Promise<boolean> => {
       logEvent(MEMORY_SURVEY_EVENT, {
-        event_type:
-          `transcript_share_${selected}` as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        appearance_id:
-          appearanceId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        trigger:
-          TRANSCRIPT_SHARE_TRIGGER as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
+        event_type: `transcript_share_${selected}` as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        appearance_id: appearanceId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        trigger: TRANSCRIPT_SHARE_TRIGGER as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
 
       if (selected === 'dont_ask_again') {
         saveGlobalConfig(current => ({
           ...current,
           transcriptShareDismissed: true,
-        }))
+        }));
       }
 
       if (selected === 'yes') {
-        const result = await submitTranscriptShare(
-          messagesRef.current,
-          TRANSCRIPT_SHARE_TRIGGER,
-          appearanceId,
-        )
+        const result = await submitTranscriptShare(messagesRef.current, TRANSCRIPT_SHARE_TRIGGER, appearanceId);
         logEvent(MEMORY_SURVEY_EVENT, {
           event_type: (result.success
             ? 'transcript_share_submitted'
             : 'transcript_share_failed') as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-          appearance_id:
-            appearanceId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-          trigger:
-            TRANSCRIPT_SHARE_TRIGGER as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        })
-        return result.success
+          appearance_id: appearanceId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          trigger: TRANSCRIPT_SHARE_TRIGGER as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        });
+        return result.success;
       }
 
-      return false
+      return false;
     },
     [],
-  )
+  );
 
-  const { state, lastResponse, open, handleSelect, handleTranscriptSelect } =
-    useSurveyState({
-      hideThanksAfterMs: HIDE_THANKS_AFTER_MS,
-      onOpen,
-      onSelect,
-      shouldShowTranscriptPrompt,
-      onTranscriptPromptShown,
-      onTranscriptSelect,
-    })
+  const { state, lastResponse, open, handleSelect, handleTranscriptSelect } = useSurveyState({
+    hideThanksAfterMs: HIDE_THANKS_AFTER_MS,
+    onOpen,
+    onSelect,
+    shouldShowTranscriptPrompt,
+    onTranscriptPromptShown,
+    onTranscriptSelect,
+  });
 
-  const lastAssistant = useMemo(
-    () => getLastAssistantMessage(messages),
-    [messages],
-  )
+  const lastAssistant = useMemo(() => getLastAssistantMessage(messages), [messages]);
 
   useEffect(() => {
-    if (!enabled) return
+    if (!enabled) return;
 
     // /clear resets messages but REPL stays mounted — reset refs so a memory
     // read from the previous conversation doesn't leak into the new one.
     if (messages.length === 0) {
-      memoryReadSeen.current = false
-      seenAssistantUuids.current.clear()
-      return
+      memoryReadSeen.current = false;
+      seenAssistantUuids.current.clear();
+      return;
     }
 
     if (state !== 'closed' || isLoading || hasActivePrompt) {
-      return
+      return;
     }
 
     // 3P default: survey off (no GrowthBook on Bedrock/Vertex/Foundry).
     if (!getFeatureValue_CACHED_MAY_BE_STALE(MEMORY_SURVEY_GATE, false)) {
-      return
+      return;
     }
 
     if (!isAutoMemoryEnabled()) {
-      return
+      return;
     }
 
     if (isFeedbackSurveyDisabled()) {
-      return
+      return;
     }
 
     if (!isPolicyAllowed('allow_product_feedback')) {
-      return
+      return;
     }
 
     if (isEnvTruthy(process.env.CLAUDE_CODE_DISABLE_FEEDBACK_SURVEY)) {
-      return
+      return;
     }
 
     if (!lastAssistant || seenAssistantUuids.current.has(lastAssistant.uuid)) {
-      return
+      return;
     }
 
-    const text = extractTextContent(Array.isArray(lastAssistant.message.content) ? lastAssistant.message.content : [], ' ')
+    const text = extractTextContent(
+      Array.isArray(lastAssistant.message.content) ? lastAssistant.message.content : [],
+      ' ',
+    );
     if (!MEMORY_WORD_RE.test(text)) {
-      return
+      return;
     }
 
     // Mark as evaluated before the memory-read scan so a turn that mentions
     // "memory" but has no memory read doesn't trigger repeated O(n) scans
     // on subsequent renders with the same last assistant message.
-    seenAssistantUuids.current.add(lastAssistant.uuid)
+    seenAssistantUuids.current.add(lastAssistant.uuid);
 
     if (!memoryReadSeen.current) {
-      memoryReadSeen.current = hasMemoryFileRead(messages)
+      memoryReadSeen.current = hasMemoryFileRead(messages);
     }
     if (!memoryReadSeen.current) {
-      return
+      return;
     }
 
     if (Math.random() < SURVEY_PROBABILITY) {
-      open()
+      open();
     }
-  }, [
-    enabled,
-    state,
-    isLoading,
-    hasActivePrompt,
-    lastAssistant,
-    messages,
-    open,
-  ])
+  }, [enabled, state, isLoading, hasActivePrompt, lastAssistant, messages, open]);
 
-  return { state, lastResponse, handleSelect, handleTranscriptSelect }
+  return { state, lastResponse, handleSelect, handleTranscriptSelect };
 }
diff --git a/src/components/FeedbackSurvey/usePostCompactSurvey.tsx b/src/components/FeedbackSurvey/usePostCompactSurvey.tsx
index 99e80dfed..8db492d9f 100644
--- a/src/components/FeedbackSurvey/usePostCompactSurvey.tsx
+++ b/src/components/FeedbackSurvey/usePostCompactSurvey.tsx
@@ -1,39 +1,36 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { isFeedbackSurveyDisabled } from 'src/services/analytics/config.js'
-import { checkStatsigFeatureGate_CACHED_MAY_BE_STALE } from 'src/services/analytics/growthbook.js'
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { isFeedbackSurveyDisabled } from 'src/services/analytics/config.js';
+import { checkStatsigFeatureGate_CACHED_MAY_BE_STALE } from 'src/services/analytics/growthbook.js';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from 'src/services/analytics/index.js'
-import { shouldUseSessionMemoryCompaction } from '../../services/compact/sessionMemoryCompact.js'
-import type { Message } from '../../types/message.js'
-import { isEnvTruthy } from '../../utils/envUtils.js'
-import { isCompactBoundaryMessage } from '../../utils/messages.js'
-import { logOTelEvent } from '../../utils/telemetry/events.js'
-import { useSurveyState } from './useSurveyState.js'
-import type { FeedbackSurveyResponse } from './utils.js'
+} from 'src/services/analytics/index.js';
+import { shouldUseSessionMemoryCompaction } from '../../services/compact/sessionMemoryCompact.js';
+import type { Message } from '../../types/message.js';
+import { isEnvTruthy } from '../../utils/envUtils.js';
+import { isCompactBoundaryMessage } from '../../utils/messages.js';
+import { logOTelEvent } from '../../utils/telemetry/events.js';
+import { useSurveyState } from './useSurveyState.js';
+import type { FeedbackSurveyResponse } from './utils.js';
 
-const HIDE_THANKS_AFTER_MS = 3000
-const POST_COMPACT_SURVEY_GATE = 'tengu_post_compact_survey'
-const SURVEY_PROBABILITY = 0.2 // Show survey 20% of the time after compaction
+const HIDE_THANKS_AFTER_MS = 3000;
+const POST_COMPACT_SURVEY_GATE = 'tengu_post_compact_survey';
+const SURVEY_PROBABILITY = 0.2; // Show survey 20% of the time after compaction
 
-function hasMessageAfterBoundary(
-  messages: Message[],
-  boundaryUuid: string,
-): boolean {
-  const boundaryIndex = messages.findIndex(msg => msg.uuid === boundaryUuid)
+function hasMessageAfterBoundary(messages: Message[], boundaryUuid: string): boolean {
+  const boundaryIndex = messages.findIndex(msg => msg.uuid === boundaryUuid);
   if (boundaryIndex === -1) {
-    return false
+    return false;
   }
 
   // Check if there's a user or assistant message after the boundary
   for (let i = boundaryIndex + 1; i < messages.length; i++) {
-    const msg = messages[i]
+    const msg = messages[i];
     if (msg && (msg.type === 'user' || msg.type === 'assistant')) {
-      return true
+      return true;
     }
   }
-  return false
+  return false;
 }
 
 export function usePostCompactSurvey(
@@ -42,154 +39,119 @@ export function usePostCompactSurvey(
   hasActivePrompt = false,
   { enabled = true }: { enabled?: boolean } = {},
 ): {
-  state:
-    | 'closed'
-    | 'open'
-    | 'thanks'
-    | 'transcript_prompt'
-    | 'submitting'
-    | 'submitted'
-  lastResponse: FeedbackSurveyResponse | null
-  handleSelect: (selected: FeedbackSurveyResponse) => void
+  state: 'closed' | 'open' | 'thanks' | 'transcript_prompt' | 'submitting' | 'submitted';
+  lastResponse: FeedbackSurveyResponse | null;
+  handleSelect: (selected: FeedbackSurveyResponse) => void;
 } {
-  const [gateEnabled, setGateEnabled] = useState<boolean | null>(null)
-  const seenCompactBoundaries = useRef<Set<string>>(new Set())
+  const [gateEnabled, setGateEnabled] = useState<boolean | null>(null);
+  const seenCompactBoundaries = useRef<Set<string>>(new Set());
   // Track the compact boundary we're waiting on (to show survey after next message)
-  const pendingCompactBoundaryUuid = useRef<string | null>(null)
+  const pendingCompactBoundaryUuid = useRef<string | null>(null);
 
   const onOpen = useCallback((appearanceId: string) => {
-    const smCompactionEnabled = shouldUseSessionMemoryCompaction()
+    const smCompactionEnabled = shouldUseSessionMemoryCompaction();
     logEvent('tengu_post_compact_survey_event', {
-      event_type:
-        'appeared' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      appearance_id:
-        appearanceId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      event_type: 'appeared' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      appearance_id: appearanceId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
       session_memory_compaction_enabled:
         smCompactionEnabled as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-    })
+    });
     void logOTelEvent('feedback_survey', {
       event_type: 'appeared',
       appearance_id: appearanceId,
       survey_type: 'post_compact',
-    })
-  }, [])
+    });
+  }, []);
 
-  const onSelect = useCallback(
-    (appearanceId: string, selected: FeedbackSurveyResponse) => {
-      const smCompactionEnabled = shouldUseSessionMemoryCompaction()
-      logEvent('tengu_post_compact_survey_event', {
-        event_type:
-          'responded' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        appearance_id:
-          appearanceId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        response:
-          selected as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        session_memory_compaction_enabled:
-          smCompactionEnabled as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
-      void logOTelEvent('feedback_survey', {
-        event_type: 'responded',
-        appearance_id: appearanceId,
-        response: selected,
-        survey_type: 'post_compact',
-      })
-    },
-    [],
-  )
+  const onSelect = useCallback((appearanceId: string, selected: FeedbackSurveyResponse) => {
+    const smCompactionEnabled = shouldUseSessionMemoryCompaction();
+    logEvent('tengu_post_compact_survey_event', {
+      event_type: 'responded' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      appearance_id: appearanceId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      response: selected as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      session_memory_compaction_enabled:
+        smCompactionEnabled as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+    });
+    void logOTelEvent('feedback_survey', {
+      event_type: 'responded',
+      appearance_id: appearanceId,
+      response: selected,
+      survey_type: 'post_compact',
+    });
+  }, []);
 
   const { state, lastResponse, open, handleSelect } = useSurveyState({
     hideThanksAfterMs: HIDE_THANKS_AFTER_MS,
     onOpen,
     onSelect,
-  })
+  });
 
   // Check the feature gate on mount
   useEffect(() => {
-    if (!enabled) return
-    setGateEnabled(
-      checkStatsigFeatureGate_CACHED_MAY_BE_STALE(POST_COMPACT_SURVEY_GATE),
-    )
-  }, [enabled])
+    if (!enabled) return;
+    setGateEnabled(checkStatsigFeatureGate_CACHED_MAY_BE_STALE(POST_COMPACT_SURVEY_GATE));
+  }, [enabled]);
 
   // Find compact boundary messages
   const currentCompactBoundaries = useMemo(
-    () =>
-      new Set(
-        messages
-          .filter(msg => isCompactBoundaryMessage(msg))
-          .map(msg => msg.uuid),
-      ),
+    () => new Set(messages.filter(msg => isCompactBoundaryMessage(msg)).map(msg => msg.uuid)),
     [messages],
-  )
+  );
 
   // Detect new compact boundaries and defer showing survey until next message
   useEffect(() => {
-    if (!enabled) return
+    if (!enabled) return;
 
     // Don't process if already showing
     if (state !== 'closed' || isLoading) {
-      return
+      return;
     }
 
     // Don't show survey when permission or ask question prompts are visible
     if (hasActivePrompt) {
-      return
+      return;
     }
 
     // Check if the gate is enabled
     if (gateEnabled !== true) {
-      return
+      return;
     }
 
     if (isFeedbackSurveyDisabled()) {
-      return
+      return;
     }
 
     // Check if survey is explicitly disabled
     if (isEnvTruthy(process.env.CLAUDE_CODE_DISABLE_FEEDBACK_SURVEY)) {
-      return
+      return;
     }
 
     // First, check if we have a pending compact and a new message has arrived
     if (pendingCompactBoundaryUuid.current !== null) {
-      if (
-        hasMessageAfterBoundary(messages, pendingCompactBoundaryUuid.current)
-      ) {
+      if (hasMessageAfterBoundary(messages, pendingCompactBoundaryUuid.current)) {
         // A new message arrived after the compact - decide whether to show survey
-        pendingCompactBoundaryUuid.current = null
+        pendingCompactBoundaryUuid.current = null;
 
         // Only show survey 20% of the time
         if (Math.random() < SURVEY_PROBABILITY) {
-          open()
+          open();
         }
-        return
+        return;
       }
     }
 
     // Find new compact boundaries that we haven't seen yet
-    const newBoundaries = Array.from(currentCompactBoundaries).filter(
-      uuid => !seenCompactBoundaries.current.has(uuid),
-    )
+    const newBoundaries = Array.from(currentCompactBoundaries).filter(uuid => !seenCompactBoundaries.current.has(uuid));
 
     if (newBoundaries.length > 0) {
       // Mark these boundaries as seen
-      seenCompactBoundaries.current = new Set(currentCompactBoundaries)
+      seenCompactBoundaries.current = new Set(currentCompactBoundaries);
 
       // Don't show survey immediately - wait for next message
       // Store the most recent new boundary UUID
-      pendingCompactBoundaryUuid.current =
-        newBoundaries[newBoundaries.length - 1]!
+      pendingCompactBoundaryUuid.current = newBoundaries[newBoundaries.length - 1]!;
     }
-  }, [
-    enabled,
-    currentCompactBoundaries,
-    state,
-    isLoading,
-    hasActivePrompt,
-    gateEnabled,
-    messages,
-    open,
-  ])
+  }, [enabled, currentCompactBoundaries, state, isLoading, hasActivePrompt, gateEnabled, messages, open]);
 
-  return { state, lastResponse, handleSelect }
+  return { state, lastResponse, handleSelect };
 }
diff --git a/src/components/FeedbackSurvey/useSurveyState.tsx b/src/components/FeedbackSurvey/useSurveyState.tsx
index e00c82c0d..0d5a47c1c 100644
--- a/src/components/FeedbackSurvey/useSurveyState.tsx
+++ b/src/components/FeedbackSurvey/useSurveyState.tsx
@@ -1,34 +1,22 @@
-import { randomUUID } from 'crypto'
-import { useCallback, useRef, useState } from 'react'
-import type { TranscriptShareResponse } from './TranscriptSharePrompt.js'
-import type { FeedbackSurveyResponse } from './utils.js'
+import { randomUUID } from 'crypto';
+import { useCallback, useRef, useState } from 'react';
+import type { TranscriptShareResponse } from './TranscriptSharePrompt.js';
+import type { FeedbackSurveyResponse } from './utils.js';
 
-type SurveyState =
-  | 'closed'
-  | 'open'
-  | 'thanks'
-  | 'transcript_prompt'
-  | 'submitting'
-  | 'submitted'
+type SurveyState = 'closed' | 'open' | 'thanks' | 'transcript_prompt' | 'submitting' | 'submitted';
 
 type UseSurveyStateOptions = {
-  hideThanksAfterMs: number
-  onOpen: (appearanceId: string) => void | Promise<void>
-  onSelect: (
-    appearanceId: string,
-    selected: FeedbackSurveyResponse,
-  ) => void | Promise<void>
-  shouldShowTranscriptPrompt?: (selected: FeedbackSurveyResponse) => boolean
-  onTranscriptPromptShown?: (
-    appearanceId: string,
-    surveyResponse: FeedbackSurveyResponse,
-  ) => void
+  hideThanksAfterMs: number;
+  onOpen: (appearanceId: string) => void | Promise<void>;
+  onSelect: (appearanceId: string, selected: FeedbackSurveyResponse) => void | Promise<void>;
+  shouldShowTranscriptPrompt?: (selected: FeedbackSurveyResponse) => boolean;
+  onTranscriptPromptShown?: (appearanceId: string, surveyResponse: FeedbackSurveyResponse) => void;
   onTranscriptSelect?: (
     appearanceId: string,
     selected: TranscriptShareResponse,
     surveyResponse: FeedbackSurveyResponse | null,
-  ) => boolean | Promise<boolean>
-}
+  ) => boolean | Promise<boolean>;
+};
 
 export function useSurveyState({
   hideThanksAfterMs,
@@ -38,107 +26,93 @@ export function useSurveyState({
   onTranscriptPromptShown,
   onTranscriptSelect,
 }: UseSurveyStateOptions): {
-  state: SurveyState
-  lastResponse: FeedbackSurveyResponse | null
-  open: () => void
-  handleSelect: (selected: FeedbackSurveyResponse) => boolean
-  handleTranscriptSelect: (selected: TranscriptShareResponse) => void
+  state: SurveyState;
+  lastResponse: FeedbackSurveyResponse | null;
+  open: () => void;
+  handleSelect: (selected: FeedbackSurveyResponse) => boolean;
+  handleTranscriptSelect: (selected: TranscriptShareResponse) => void;
 } {
-  const [state, setState] = useState<SurveyState>('closed')
-  const [lastResponse, setLastResponse] =
-    useState<FeedbackSurveyResponse | null>(null)
-  const appearanceId = useRef(randomUUID())
-  const lastResponseRef = useRef<FeedbackSurveyResponse | null>(null)
+  const [state, setState] = useState<SurveyState>('closed');
+  const [lastResponse, setLastResponse] = useState<FeedbackSurveyResponse | null>(null);
+  const appearanceId = useRef(randomUUID());
+  const lastResponseRef = useRef<FeedbackSurveyResponse | null>(null);
 
   const showThanksThenClose = useCallback(() => {
-    setState('thanks')
+    setState('thanks');
     setTimeout(
       (setState, setLastResponse) => {
-        setState('closed')
-        setLastResponse(null)
+        setState('closed');
+        setLastResponse(null);
       },
       hideThanksAfterMs,
       setState,
       setLastResponse,
-    )
-  }, [hideThanksAfterMs])
+    );
+  }, [hideThanksAfterMs]);
 
   const showSubmittedThenClose = useCallback(() => {
-    setState('submitted')
-    setTimeout(setState, hideThanksAfterMs, 'closed')
-  }, [hideThanksAfterMs])
+    setState('submitted');
+    setTimeout(setState, hideThanksAfterMs, 'closed');
+  }, [hideThanksAfterMs]);
 
   const open = useCallback(() => {
     if (state !== 'closed') {
-      return
+      return;
     }
-    setState('open')
-    appearanceId.current = randomUUID()
-    void onOpen(appearanceId.current)
-  }, [state, onOpen])
+    setState('open');
+    appearanceId.current = randomUUID();
+    void onOpen(appearanceId.current);
+  }, [state, onOpen]);
 
   const handleSelect = useCallback(
     (selected: FeedbackSurveyResponse): boolean => {
-      setLastResponse(selected)
-      lastResponseRef.current = selected
+      setLastResponse(selected);
+      lastResponseRef.current = selected;
       // Always fire the survey response event first
-      void onSelect(appearanceId.current, selected)
+      void onSelect(appearanceId.current, selected);
 
       if (selected === 'dismissed') {
-        setState('closed')
-        setLastResponse(null)
+        setState('closed');
+        setLastResponse(null);
       } else if (shouldShowTranscriptPrompt?.(selected)) {
-        setState('transcript_prompt')
-        onTranscriptPromptShown?.(appearanceId.current, selected)
-        return true
+        setState('transcript_prompt');
+        onTranscriptPromptShown?.(appearanceId.current, selected);
+        return true;
       } else {
-        showThanksThenClose()
+        showThanksThenClose();
       }
-      return false
+      return false;
     },
-    [
-      showThanksThenClose,
-      onSelect,
-      shouldShowTranscriptPrompt,
-      onTranscriptPromptShown,
-    ],
-  )
+    [showThanksThenClose, onSelect, shouldShowTranscriptPrompt, onTranscriptPromptShown],
+  );
 
   const handleTranscriptSelect = useCallback(
     (selected: TranscriptShareResponse) => {
       switch (selected) {
         case 'yes':
-          setState('submitting')
+          setState('submitting');
           void (async () => {
             try {
-              const success = await onTranscriptSelect?.(
-                appearanceId.current,
-                selected,
-                lastResponseRef.current,
-              )
+              const success = await onTranscriptSelect?.(appearanceId.current, selected, lastResponseRef.current);
               if (success) {
-                showSubmittedThenClose()
+                showSubmittedThenClose();
               } else {
-                showThanksThenClose()
+                showThanksThenClose();
               }
             } catch {
-              showThanksThenClose()
+              showThanksThenClose();
             }
-          })()
-          break
+          })();
+          break;
         case 'no':
         case 'dont_ask_again':
-          void onTranscriptSelect?.(
-            appearanceId.current,
-            selected,
-            lastResponseRef.current,
-          )
-          showThanksThenClose()
-          break
+          void onTranscriptSelect?.(appearanceId.current, selected, lastResponseRef.current);
+          showThanksThenClose();
+          break;
       }
     },
     [showThanksThenClose, showSubmittedThenClose, onTranscriptSelect],
-  )
+  );
 
-  return { state, lastResponse, open, handleSelect, handleTranscriptSelect }
+  return { state, lastResponse, open, handleSelect, handleTranscriptSelect };
 }
diff --git a/src/components/FeedbackSurvey/utils.ts b/src/components/FeedbackSurvey/utils.ts
index bce6606fb..501e8e41e 100644
--- a/src/components/FeedbackSurvey/utils.ts
+++ b/src/components/FeedbackSurvey/utils.ts
@@ -1,3 +1,3 @@
 // Auto-generated stub — replace with real implementation
-export type FeedbackSurveyResponse = any;
-export type FeedbackSurveyType = any;
+export type FeedbackSurveyResponse = any
+export type FeedbackSurveyType = any
diff --git a/src/components/FileEditToolDiff.tsx b/src/components/FileEditToolDiff.tsx
index 4b9f6f66b..71acf4338 100644
--- a/src/components/FileEditToolDiff.tsx
+++ b/src/components/FileEditToolDiff.tsx
@@ -1,62 +1,42 @@
-import type { StructuredPatchHunk } from 'diff'
-import * as React from 'react'
-import { Suspense, use, useState } from 'react'
-import { useTerminalSize } from '../hooks/useTerminalSize.js'
-import { Box, Text } from '@anthropic/ink'
-import type { FileEdit } from '@claude-code-best/builtin-tools/tools/FileEditTool/types.js'
-import {
-  findActualString,
-  preserveQuoteStyle,
-} from '@claude-code-best/builtin-tools/tools/FileEditTool/utils.js'
-import {
-  adjustHunkLineNumbers,
-  CONTEXT_LINES,
-  getPatchForDisplay,
-} from '../utils/diff.js'
-import { logError } from '../utils/log.js'
-import {
-  CHUNK_SIZE,
-  openForScan,
-  readCapped,
-  scanForContext,
-} from '../utils/readEditContext.js'
-import { firstLineOf } from '../utils/stringUtils.js'
-import { StructuredDiffList } from './StructuredDiffList.js'
+import type { StructuredPatchHunk } from 'diff';
+import * as React from 'react';
+import { Suspense, use, useState } from 'react';
+import { useTerminalSize } from '../hooks/useTerminalSize.js';
+import { Box, Text } from '@anthropic/ink';
+import type { FileEdit } from '@claude-code-best/builtin-tools/tools/FileEditTool/types.js';
+import { findActualString, preserveQuoteStyle } from '@claude-code-best/builtin-tools/tools/FileEditTool/utils.js';
+import { adjustHunkLineNumbers, CONTEXT_LINES, getPatchForDisplay } from '../utils/diff.js';
+import { logError } from '../utils/log.js';
+import { CHUNK_SIZE, openForScan, readCapped, scanForContext } from '../utils/readEditContext.js';
+import { firstLineOf } from '../utils/stringUtils.js';
+import { StructuredDiffList } from './StructuredDiffList.js';
 
 type Props = {
-  file_path: string
-  edits: FileEdit[]
-}
+  file_path: string;
+  edits: FileEdit[];
+};
 
 type DiffData = {
-  patch: StructuredPatchHunk[]
-  firstLine: string | null
-  fileContent: string | undefined
-}
+  patch: StructuredPatchHunk[];
+  firstLine: string | null;
+  fileContent: string | undefined;
+};
 
 export function FileEditToolDiff(props: Props): React.ReactNode {
   // Snapshot on mount — the diff must stay consistent even if the file changes
   // while the dialog is open. useMemo on props.edits would re-read the file on
   // every render because callers pass fresh array literals.
-  const [dataPromise] = useState(() =>
-    loadDiffData(props.file_path, props.edits),
-  )
+  const [dataPromise] = useState(() => loadDiffData(props.file_path, props.edits));
   return (
     <Suspense fallback={<DiffFrame placeholder />}>
       <DiffBody promise={dataPromise} file_path={props.file_path} />
     </Suspense>
-  )
+  );
 }
 
-function DiffBody({
-  promise,
-  file_path,
-}: {
-  promise: Promise<DiffData>
-  file_path: string
-}): React.ReactNode {
-  const { patch, firstLine, fileContent } = use(promise)
-  const { columns } = useTerminalSize()
+function DiffBody({ promise, file_path }: { promise: Promise<DiffData>; file_path: string }): React.ReactNode {
+  const { patch, firstLine, fileContent } = use(promise);
+  const { columns } = useTerminalSize();
   return (
     <DiffFrame>
       <StructuredDiffList
@@ -68,57 +48,42 @@ function DiffBody({
         fileContent={fileContent}
       />
     </DiffFrame>
-  )
+  );
 }
 
-function DiffFrame({
-  children,
-  placeholder,
-}: {
-  children?: React.ReactNode
-  placeholder?: boolean
-}): React.ReactNode {
+function DiffFrame({ children, placeholder }: { children?: React.ReactNode; placeholder?: boolean }): React.ReactNode {
   return (
     <Box flexDirection="column">
-      <Box
-        borderColor="subtle"
-        borderStyle="dashed"
-        flexDirection="column"
-        borderLeft={false}
-        borderRight={false}
-      >
+      <Box borderColor="subtle" borderStyle="dashed" flexDirection="column" borderLeft={false} borderRight={false}>
         {placeholder ? <Text dimColor>…</Text> : children}
       </Box>
     </Box>
-  )
+  );
 }
 
-async function loadDiffData(
-  file_path: string,
-  edits: FileEdit[],
-): Promise<DiffData> {
-  const valid = edits.filter(e => e.old_string != null && e.new_string != null)
-  const single = valid.length === 1 ? valid[0]! : undefined
+async function loadDiffData(file_path: string, edits: FileEdit[]): Promise<DiffData> {
+  const valid = edits.filter(e => e.old_string != null && e.new_string != null);
+  const single = valid.length === 1 ? valid[0]! : undefined;
 
   // SedEditPermissionRequest passes the entire file as old_string. Scanning for
   // a needle ≥ CHUNK_SIZE allocates O(needle) for the overlap buffer — skip the
   // file read entirely and diff the inputs we already have.
   if (single && single.old_string.length >= CHUNK_SIZE) {
-    return diffToolInputsOnly(file_path, [single])
+    return diffToolInputsOnly(file_path, [single]);
   }
 
   try {
-    const handle = await openForScan(file_path)
-    if (handle === null) return diffToolInputsOnly(file_path, valid)
+    const handle = await openForScan(file_path);
+    if (handle === null) return diffToolInputsOnly(file_path, valid);
     try {
       // Multi-edit and empty old_string genuinely need full-file for sequential
       // replacements — structuredPatch needs before/after strings. replace_all
       // routes through the chunked path below (shows first-occurrence window;
       // matches within the slice still replace via edit.replace_all).
       if (!single || single.old_string === '') {
-        const file = await readCapped(handle)
-        if (file === null) return diffToolInputsOnly(file_path, valid)
-        const normalized = valid.map(e => normalizeEdit(file, e))
+        const file = await readCapped(handle);
+        if (file === null) return diffToolInputsOnly(file_path, valid);
+        const normalized = valid.map(e => normalizeEdit(file, e));
         return {
           patch: getPatchForDisplay({
             filePath: file_path,
@@ -127,30 +92,30 @@ async function loadDiffData(
           }),
           firstLine: firstLineOf(file),
           fileContent: file,
-        }
+        };
       }
 
-      const ctx = await scanForContext(handle, single.old_string, CONTEXT_LINES)
+      const ctx = await scanForContext(handle, single.old_string, CONTEXT_LINES);
       if (ctx.truncated || ctx.content === '') {
-        return diffToolInputsOnly(file_path, [single])
+        return diffToolInputsOnly(file_path, [single]);
       }
-      const normalized = normalizeEdit(ctx.content, single)
+      const normalized = normalizeEdit(ctx.content, single);
       const hunks = getPatchForDisplay({
         filePath: file_path,
         fileContents: ctx.content,
         edits: [normalized],
-      })
+      });
       return {
         patch: adjustHunkLineNumbers(hunks, ctx.lineOffset - 1),
         firstLine: ctx.lineOffset === 1 ? firstLineOf(ctx.content) : null,
         fileContent: ctx.content,
-      }
+      };
     } finally {
-      await handle.close()
+      await handle.close();
     }
   } catch (e) {
-    logError(e as Error)
-    return diffToolInputsOnly(file_path, valid)
+    logError(e as Error);
+    return diffToolInputsOnly(file_path, valid);
   }
 }
 
@@ -165,16 +130,11 @@ function diffToolInputsOnly(filePath: string, edits: FileEdit[]): DiffData {
     ),
     firstLine: null,
     fileContent: undefined,
-  }
+  };
 }
 
 function normalizeEdit(fileContent: string, edit: FileEdit): FileEdit {
-  const actualOld =
-    findActualString(fileContent, edit.old_string) || edit.old_string
-  const actualNew = preserveQuoteStyle(
-    edit.old_string,
-    actualOld,
-    edit.new_string,
-  )
-  return { ...edit, old_string: actualOld, new_string: actualNew }
+  const actualOld = findActualString(fileContent, edit.old_string) || edit.old_string;
+  const actualNew = preserveQuoteStyle(edit.old_string, actualOld, edit.new_string);
+  return { ...edit, old_string: actualOld, new_string: actualNew };
 }
diff --git a/src/components/FileEditToolUpdatedMessage.tsx b/src/components/FileEditToolUpdatedMessage.tsx
index 5fbc68005..f711c6271 100644
--- a/src/components/FileEditToolUpdatedMessage.tsx
+++ b/src/components/FileEditToolUpdatedMessage.tsx
@@ -1,20 +1,20 @@
-import type { StructuredPatchHunk } from 'diff'
-import * as React from 'react'
-import { useTerminalSize } from '../hooks/useTerminalSize.js'
-import { Box, Text } from '@anthropic/ink'
-import { count } from '../utils/array.js'
-import { MessageResponse } from './MessageResponse.js'
-import { StructuredDiffList } from './StructuredDiffList.js'
+import type { StructuredPatchHunk } from 'diff';
+import * as React from 'react';
+import { useTerminalSize } from '../hooks/useTerminalSize.js';
+import { Box, Text } from '@anthropic/ink';
+import { count } from '../utils/array.js';
+import { MessageResponse } from './MessageResponse.js';
+import { StructuredDiffList } from './StructuredDiffList.js';
 
 type Props = {
-  filePath: string
-  structuredPatch: StructuredPatchHunk[]
-  firstLine: string | null
-  fileContent?: string
-  style?: 'condensed'
-  verbose: boolean
-  previewHint?: string
-}
+  filePath: string;
+  structuredPatch: StructuredPatchHunk[];
+  firstLine: string | null;
+  fileContent?: string;
+  style?: 'condensed';
+  verbose: boolean;
+  previewHint?: string;
+};
 
 export function FileEditToolUpdatedMessage({
   filePath,
@@ -25,33 +25,25 @@ export function FileEditToolUpdatedMessage({
   verbose,
   previewHint,
 }: Props): React.ReactNode {
-  const { columns } = useTerminalSize()
-  const numAdditions = structuredPatch.reduce(
-    (acc, hunk) => acc + count(hunk.lines, _ => _.startsWith('+')),
-    0,
-  )
-  const numRemovals = structuredPatch.reduce(
-    (acc, hunk) => acc + count(hunk.lines, _ => _.startsWith('-')),
-    0,
-  )
+  const { columns } = useTerminalSize();
+  const numAdditions = structuredPatch.reduce((acc, hunk) => acc + count(hunk.lines, _ => _.startsWith('+')), 0);
+  const numRemovals = structuredPatch.reduce((acc, hunk) => acc + count(hunk.lines, _ => _.startsWith('-')), 0);
 
   const text = (
     <Text>
       {numAdditions > 0 ? (
         <>
-          Added <Text bold>{numAdditions}</Text>{' '}
-          {numAdditions > 1 ? 'lines' : 'line'}
+          Added <Text bold>{numAdditions}</Text> {numAdditions > 1 ? 'lines' : 'line'}
         </>
       ) : null}
       {numAdditions > 0 && numRemovals > 0 ? ', ' : null}
       {numRemovals > 0 ? (
         <>
-          {numAdditions === 0 ? 'R' : 'r'}emoved <Text bold>{numRemovals}</Text>{' '}
-          {numRemovals > 1 ? 'lines' : 'line'}
+          {numAdditions === 0 ? 'R' : 'r'}emoved <Text bold>{numRemovals}</Text> {numRemovals > 1 ? 'lines' : 'line'}
         </>
       ) : null}
     </Text>
-  )
+  );
 
   // Plan files: invert condensed behavior
   // - Regular mode: just show the hint (user can type /plan to see full content)
@@ -62,10 +54,10 @@ export function FileEditToolUpdatedMessage({
         <MessageResponse>
           <Text dimColor>{previewHint}</Text>
         </MessageResponse>
-      )
+      );
     }
   } else if (style === 'condensed' && !verbose) {
-    return text
+    return text;
   }
 
   return (
@@ -82,5 +74,5 @@ export function FileEditToolUpdatedMessage({
         />
       </Box>
     </MessageResponse>
-  )
+  );
 }
diff --git a/src/components/FileEditToolUseRejectedMessage.tsx b/src/components/FileEditToolUseRejectedMessage.tsx
index 2d53117d2..bc09f5d57 100644
--- a/src/components/FileEditToolUseRejectedMessage.tsx
+++ b/src/components/FileEditToolUseRejectedMessage.tsx
@@ -1,27 +1,27 @@
-import type { StructuredPatchHunk } from 'diff'
-import { relative } from 'path'
-import * as React from 'react'
-import { useTerminalSize } from 'src/hooks/useTerminalSize.js'
-import { getCwd } from 'src/utils/cwd.js'
-import { Box, Text } from '@anthropic/ink'
-import { HighlightedCode } from './HighlightedCode.js'
-import { MessageResponse } from './MessageResponse.js'
-import { StructuredDiffList } from './StructuredDiffList.js'
+import type { StructuredPatchHunk } from 'diff';
+import { relative } from 'path';
+import * as React from 'react';
+import { useTerminalSize } from 'src/hooks/useTerminalSize.js';
+import { getCwd } from 'src/utils/cwd.js';
+import { Box, Text } from '@anthropic/ink';
+import { HighlightedCode } from './HighlightedCode.js';
+import { MessageResponse } from './MessageResponse.js';
+import { StructuredDiffList } from './StructuredDiffList.js';
 
-const MAX_LINES_TO_RENDER = 10
+const MAX_LINES_TO_RENDER = 10;
 
 type Props = {
-  file_path: string
-  operation: 'write' | 'update'
+  file_path: string;
+  operation: 'write' | 'update';
   // For updates - show diff
-  patch?: StructuredPatchHunk[]
-  firstLine: string | null
-  fileContent?: string
+  patch?: StructuredPatchHunk[];
+  firstLine: string | null;
+  fileContent?: string;
   // For new file creation - show content preview
-  content?: string
-  style?: 'condensed'
-  verbose: boolean
-}
+  content?: string;
+  style?: 'condensed';
+  verbose: boolean;
+};
 
 export function FileEditToolUseRejectedMessage({
   file_path,
@@ -33,7 +33,7 @@ export function FileEditToolUseRejectedMessage({
   style,
   verbose,
 }: Props): React.ReactNode {
-  const { columns } = useTerminalSize()
+  const { columns } = useTerminalSize();
   const text = (
     <Box flexDirection="row">
       <Text color="subtle">User rejected {operation} to </Text>
@@ -41,43 +41,34 @@ export function FileEditToolUseRejectedMessage({
         {verbose ? file_path : relative(getCwd(), file_path)}
       </Text>
     </Box>
-  )
+  );
 
   // For condensed style, just show the text
   if (style === 'condensed' && !verbose) {
-    return <MessageResponse>{text}</MessageResponse>
+    return <MessageResponse>{text}</MessageResponse>;
   }
 
   // For new file creation, show content preview (dimmed)
   if (operation === 'write' && content !== undefined) {
-    const lines = content.split('\n')
-    const numLines = lines.length
-    const plusLines = numLines - MAX_LINES_TO_RENDER
-    const truncatedContent = verbose
-      ? content
-      : lines.slice(0, MAX_LINES_TO_RENDER).join('\n')
+    const lines = content.split('\n');
+    const numLines = lines.length;
+    const plusLines = numLines - MAX_LINES_TO_RENDER;
+    const truncatedContent = verbose ? content : lines.slice(0, MAX_LINES_TO_RENDER).join('\n');
 
     return (
       <MessageResponse>
         <Box flexDirection="column">
           {text}
-          <HighlightedCode
-            code={truncatedContent || '(No content)'}
-            filePath={file_path}
-            width={columns - 12}
-            dim
-          />
-          {!verbose && plusLines > 0 && (
-            <Text dimColor>… +{plusLines} lines</Text>
-          )}
+          <HighlightedCode code={truncatedContent || '(No content)'} filePath={file_path} width={columns - 12} dim />
+          {!verbose && plusLines > 0 && <Text dimColor>… +{plusLines} lines</Text>}
         </Box>
       </MessageResponse>
-    )
+    );
   }
 
   // For updates, show diff
   if (!patch || patch.length === 0) {
-    return <MessageResponse>{text}</MessageResponse>
+    return <MessageResponse>{text}</MessageResponse>;
   }
 
   return (
@@ -94,5 +85,5 @@ export function FileEditToolUseRejectedMessage({
         />
       </Box>
     </MessageResponse>
-  )
+  );
 }
diff --git a/src/components/FilePathLink.tsx b/src/components/FilePathLink.tsx
index 9ab7f3cd1..b974300f0 100644
--- a/src/components/FilePathLink.tsx
+++ b/src/components/FilePathLink.tsx
@@ -1,13 +1,13 @@
-import React from 'react'
-import { pathToFileURL } from 'url'
-import { Link } from '@anthropic/ink'
+import React from 'react';
+import { pathToFileURL } from 'url';
+import { Link } from '@anthropic/ink';
 
 type Props = {
   /** The absolute file path */
-  filePath: string
+  filePath: string;
   /** Optional display text (defaults to filePath) */
-  children?: React.ReactNode
-}
+  children?: React.ReactNode;
+};
 
 /**
  * Renders a file path as an OSC 8 hyperlink.
@@ -15,5 +15,5 @@ type Props = {
  * even when they appear inside parentheses or other text.
  */
 export function FilePathLink({ filePath, children }: Props): React.ReactNode {
-  return <Link url={pathToFileURL(filePath).href}>{children ?? filePath}</Link>
+  return <Link url={pathToFileURL(filePath).href}>{children ?? filePath}</Link>;
 }
diff --git a/src/components/FullscreenLayout.tsx b/src/components/FullscreenLayout.tsx
index 4427fa4d4..e373cf070 100644
--- a/src/components/FullscreenLayout.tsx
+++ b/src/components/FullscreenLayout.tsx
@@ -10,23 +10,19 @@ import React, {
   useRef,
   useState,
   useSyncExternalStore,
-} from 'react'
-import { fileURLToPath } from 'url'
-import { ModalContext } from '../context/modalContext.js'
-import {
-  PromptOverlayProvider,
-  usePromptOverlay,
-  usePromptOverlayDialog,
-} from '../context/promptOverlayContext.js'
-import { useTerminalSize } from '../hooks/useTerminalSize.js'
-import { Box, ScrollBox, type ScrollBoxHandle, Text, instances } from '@anthropic/ink'
-import type { Message } from '../types/message.js'
-import { openBrowser, openPath } from '../utils/browser.js'
-import { isFullscreenEnvEnabled } from '../utils/fullscreen.js'
-import { plural } from '../utils/stringUtils.js'
-import { isNullRenderingAttachment } from './messages/nullRenderingAttachments.js'
-import PromptInputFooterSuggestions from './PromptInput/PromptInputFooterSuggestions.js'
-import type { StickyPrompt } from './VirtualMessageList.js'
+} from 'react';
+import { fileURLToPath } from 'url';
+import { ModalContext } from '../context/modalContext.js';
+import { PromptOverlayProvider, usePromptOverlay, usePromptOverlayDialog } from '../context/promptOverlayContext.js';
+import { useTerminalSize } from '../hooks/useTerminalSize.js';
+import { Box, ScrollBox, type ScrollBoxHandle, Text, instances } from '@anthropic/ink';
+import type { Message } from '../types/message.js';
+import { openBrowser, openPath } from '../utils/browser.js';
+import { isFullscreenEnvEnabled } from '../utils/fullscreen.js';
+import { plural } from '../utils/stringUtils.js';
+import { isNullRenderingAttachment } from './messages/nullRenderingAttachments.js';
+import PromptInputFooterSuggestions from './PromptInput/PromptInputFooterSuggestions.js';
+import type { StickyPrompt } from './VirtualMessageList.js';
 
 /** Rows of transcript context kept visible above the modal pane's ▔ divider. */
 const MODAL_TRANSCRIPT_PEEK = 2;
@@ -232,10 +228,10 @@ export function countUnseenAssistantTurns(messages: readonly Message[], dividerI
 }
 
 function assistantHasVisibleText(m: Message): boolean {
-  if (m.type !== 'assistant') return false
-  if (!Array.isArray(m.message!.content)) return false
+  if (m.type !== 'assistant') return false;
+  if (!Array.isArray(m.message!.content)) return false;
   for (const b of m.message!.content) {
-    if (typeof b !== 'string' && b.type === 'text' && b.text.trim() !== '') return true
+    if (typeof b !== 'string' && b.type === 'text' && b.text.trim() !== '') return true;
   }
   return false;
 }
diff --git a/src/components/GlobalSearchDialog.tsx b/src/components/GlobalSearchDialog.tsx
index 3a41099cd..74e7dbc91 100644
--- a/src/components/GlobalSearchDialog.tsx
+++ b/src/components/GlobalSearchDialog.tsx
@@ -1,123 +1,114 @@
-import { resolve as resolvePath } from 'path'
-import * as React from 'react'
-import { useEffect, useRef, useState } from 'react'
-import { useRegisterOverlay } from '../context/overlayContext.js'
-import { useTerminalSize } from '../hooks/useTerminalSize.js'
-import { Text } from '@anthropic/ink'
-import { logEvent } from '../services/analytics/index.js'
-import { getCwd } from '../utils/cwd.js'
-import { openFileInExternalEditor } from '../utils/editor.js'
-import { truncatePathMiddle, truncateToWidth } from '../utils/format.js'
-import { highlightMatch } from '../utils/highlightMatch.js'
-import { relativePath } from '../utils/permissions/filesystem.js'
-import { readFileInRange } from '../utils/readFileInRange.js'
-import { ripGrepStream } from '../utils/ripgrep.js'
-import { FuzzyPicker, LoadingState } from '@anthropic/ink'
+import { resolve as resolvePath } from 'path';
+import * as React from 'react';
+import { useEffect, useRef, useState } from 'react';
+import { useRegisterOverlay } from '../context/overlayContext.js';
+import { useTerminalSize } from '../hooks/useTerminalSize.js';
+import { Text } from '@anthropic/ink';
+import { logEvent } from '../services/analytics/index.js';
+import { getCwd } from '../utils/cwd.js';
+import { openFileInExternalEditor } from '../utils/editor.js';
+import { truncatePathMiddle, truncateToWidth } from '../utils/format.js';
+import { highlightMatch } from '../utils/highlightMatch.js';
+import { relativePath } from '../utils/permissions/filesystem.js';
+import { readFileInRange } from '../utils/readFileInRange.js';
+import { ripGrepStream } from '../utils/ripgrep.js';
+import { FuzzyPicker, LoadingState } from '@anthropic/ink';
 
 type Props = {
-  onDone: () => void
-  onInsert: (text: string) => void
-}
+  onDone: () => void;
+  onInsert: (text: string) => void;
+};
 
 type Match = {
-  file: string
-  line: number
-  text: string
-}
+  file: string;
+  line: number;
+  text: string;
+};
 
-const VISIBLE_RESULTS = 12
-const DEBOUNCE_MS = 100
-const PREVIEW_CONTEXT_LINES = 4
+const VISIBLE_RESULTS = 12;
+const DEBOUNCE_MS = 100;
+const PREVIEW_CONTEXT_LINES = 4;
 // rg -m is per-file; we also cap the parsed array to keep memory bounded.
-const MAX_MATCHES_PER_FILE = 10
-const MAX_TOTAL_MATCHES = 500
+const MAX_MATCHES_PER_FILE = 10;
+const MAX_TOTAL_MATCHES = 500;
 
 /**
  * Global Search dialog (ctrl+shift+f / cmd+shift+f).
  * Debounced ripgrep search across the workspace.
  */
-export function GlobalSearchDialog({
-  onDone,
-  onInsert,
-}: Props): React.ReactNode {
-  useRegisterOverlay('global-search')
-  const { columns, rows } = useTerminalSize()
-  const previewOnRight = columns >= 140
+export function GlobalSearchDialog({ onDone, onInsert }: Props): React.ReactNode {
+  useRegisterOverlay('global-search');
+  const { columns, rows } = useTerminalSize();
+  const previewOnRight = columns >= 140;
   // Chrome (title + search + matchLabel + hints + pane border + gaps) eats
   // ~14 rows. Shrink the list on short terminals so the dialog doesn't clip.
-  const visibleResults = Math.min(VISIBLE_RESULTS, Math.max(4, rows - 14))
+  const visibleResults = Math.min(VISIBLE_RESULTS, Math.max(4, rows - 14));
 
-  const [matches, setMatches] = useState<Match[]>([])
-  const [truncated, setTruncated] = useState(false)
-  const [isSearching, setIsSearching] = useState(false)
-  const [query, setQuery] = useState('')
-  const [focused, setFocused] = useState<Match | undefined>(undefined)
+  const [matches, setMatches] = useState<Match[]>([]);
+  const [truncated, setTruncated] = useState(false);
+  const [isSearching, setIsSearching] = useState(false);
+  const [query, setQuery] = useState('');
+  const [focused, setFocused] = useState<Match | undefined>(undefined);
   const [preview, setPreview] = useState<{
-    file: string
-    line: number
-    content: string
-  } | null>(null)
-  const abortRef = useRef<AbortController | null>(null)
-  const timeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null)
+    file: string;
+    line: number;
+    content: string;
+  } | null>(null);
+  const abortRef = useRef<AbortController | null>(null);
+  const timeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
 
   useEffect(() => {
     return () => {
-      if (timeoutRef.current) clearTimeout(timeoutRef.current)
-      abortRef.current?.abort()
-    }
-  }, [])
+      if (timeoutRef.current) clearTimeout(timeoutRef.current);
+      abortRef.current?.abort();
+    };
+  }, []);
 
   // Load context lines around the focused match. AbortController prevents
   // holding ↓ from piling up reads.
   useEffect(() => {
     if (!focused) {
-      setPreview(null)
-      return
+      setPreview(null);
+      return;
     }
-    const controller = new AbortController()
-    const absolute = resolvePath(getCwd(), focused.file)
-    const start = Math.max(0, focused.line - PREVIEW_CONTEXT_LINES - 1)
-    void readFileInRange(
-      absolute,
-      start,
-      PREVIEW_CONTEXT_LINES * 2 + 1,
-      undefined,
-      controller.signal,
-    )
+    const controller = new AbortController();
+    const absolute = resolvePath(getCwd(), focused.file);
+    const start = Math.max(0, focused.line - PREVIEW_CONTEXT_LINES - 1);
+    void readFileInRange(absolute, start, PREVIEW_CONTEXT_LINES * 2 + 1, undefined, controller.signal)
       .then(r => {
-        if (controller.signal.aborted) return
+        if (controller.signal.aborted) return;
         setPreview({
           file: focused.file,
           line: focused.line,
           content: r.content,
-        })
+        });
       })
       .catch(() => {
-        if (controller.signal.aborted) return
+        if (controller.signal.aborted) return;
         setPreview({
           file: focused.file,
           line: focused.line,
           content: '(preview unavailable)',
-        })
-      })
-    return () => controller.abort()
-  }, [focused])
+        });
+      });
+    return () => controller.abort();
+  }, [focused]);
 
   const handleQueryChange = (q: string) => {
-    setQuery(q)
-    if (timeoutRef.current) clearTimeout(timeoutRef.current)
-    abortRef.current?.abort()
+    setQuery(q);
+    if (timeoutRef.current) clearTimeout(timeoutRef.current);
+    abortRef.current?.abort();
 
     if (!q.trim()) {
-      setMatches(m => (m.length ? [] : m))
-      setIsSearching(false)
-      setTruncated(false)
-      return
+      setMatches(m => (m.length ? [] : m));
+      setIsSearching(false);
+      setTruncated(false);
+      return;
     }
-    const controller = new AbortController()
-    abortRef.current = controller
-    setIsSearching(true)
-    setTruncated(false)
+    const controller = new AbortController();
+    abortRef.current = controller;
+    setIsSearching(true);
+    setTruncated(false);
     // Client-filter existing results while rg walks — keeps something on
     // screen instead of flashing blank. rg results are merged in (deduped by
     // file:line) rather than replaced, so the count is monotonic within a
@@ -127,13 +118,11 @@ export function GlobalSearchDialog({
     // includes the new query lowered. Non-narrowing (broadening/different):
     // filter is best-effort — may briefly show a subset until rg fills in
     // the rest.
-    const queryLower = q.toLowerCase()
+    const queryLower = q.toLowerCase();
     setMatches(m => {
-      const filtered = m.filter(match =>
-        match.text.toLowerCase().includes(queryLower),
-      )
-      return filtered.length === m.length ? m : filtered
-    })
+      const filtered = m.filter(match => match.text.toLowerCase().includes(queryLower));
+      return filtered.length === m.length ? m : filtered;
+    });
 
     timeoutRef.current = setTimeout(
       (query, controller, setMatches, setTruncated, setIsSearching) => {
@@ -142,52 +131,41 @@ export function GlobalSearchDialog({
         // display (otherwise the cwd prefix eats the width budget).
         // relativePath() returns POSIX-normalized output so truncatePathMiddle
         // (which uses lastIndexOf('/')) works on Windows too.
-        const cwd = getCwd()
-        let collected = 0
+        const cwd = getCwd();
+        let collected = 0;
         void ripGrepStream(
           // -e disambiguates pattern from options when the query starts with '-'
           // (e.g. searching for "--verbose" or "-rf"). See GrepTool.ts for the
           // same precaution.
-          [
-            '-n',
-            '--no-heading',
-            '-i',
-            '-m',
-            String(MAX_MATCHES_PER_FILE),
-            '-F',
-            '-e',
-            query,
-          ],
+          ['-n', '--no-heading', '-i', '-m', String(MAX_MATCHES_PER_FILE), '-F', '-e', query],
           cwd,
           controller.signal,
           lines => {
-            if (controller.signal.aborted) return
-            const parsed: Match[] = []
+            if (controller.signal.aborted) return;
+            const parsed: Match[] = [];
             for (const line of lines) {
-              const m = parseRipgrepLine(line)
-              if (!m) continue
-              const rel = relativePath(cwd, m.file)
-              parsed.push({ ...m, file: rel.startsWith('..') ? m.file : rel })
+              const m = parseRipgrepLine(line);
+              if (!m) continue;
+              const rel = relativePath(cwd, m.file);
+              parsed.push({ ...m, file: rel.startsWith('..') ? m.file : rel });
             }
-            if (!parsed.length) return
-            collected += parsed.length
+            if (!parsed.length) return;
+            collected += parsed.length;
             setMatches(prev => {
               // Append+dedupe instead of replace: prev may hold client-
               // filtered results that are valid matches for this query.
               // Replacing would drop the count to this chunk's size then
               // grow it back — visible as a flicker.
-              const seen = new Set(prev.map(matchKey))
-              const fresh = parsed.filter(p => !seen.has(matchKey(p)))
-              if (!fresh.length) return prev
-              const next = prev.concat(fresh)
-              return next.length > MAX_TOTAL_MATCHES
-                ? next.slice(0, MAX_TOTAL_MATCHES)
-                : next
-            })
+              const seen = new Set(prev.map(matchKey));
+              const fresh = parsed.filter(p => !seen.has(matchKey(p)));
+              if (!fresh.length) return prev;
+              const next = prev.concat(fresh);
+              return next.length > MAX_TOTAL_MATCHES ? next.slice(0, MAX_TOTAL_MATCHES) : next;
+            });
             if (collected >= MAX_TOTAL_MATCHES) {
-              controller.abort()
-              setTruncated(true)
-              setIsSearching(false)
+              controller.abort();
+              setTruncated(true);
+              setIsSearching(false);
             }
           },
         )
@@ -195,10 +173,10 @@ export function GlobalSearchDialog({
           // Stream closed with zero chunks — clear stale results so
           // "No matches" renders instead of the previous query's list.
           .finally(() => {
-            if (controller.signal.aborted) return
-            if (collected === 0) setMatches(m => (m.length ? [] : m))
-            setIsSearching(false)
-          })
+            if (controller.signal.aborted) return;
+            if (collected === 0) setMatches(m => (m.length ? [] : m));
+            setIsSearching(false);
+          });
       },
       DEBOUNCE_MS,
       q,
@@ -206,45 +184,36 @@ export function GlobalSearchDialog({
       setMatches,
       setTruncated,
       setIsSearching,
-    )
-  }
+    );
+  };
 
-  const listWidth = previewOnRight
-    ? Math.floor((columns - 10) * 0.5)
-    : columns - 8
-  const maxPathWidth = Math.max(20, Math.floor(listWidth * 0.4))
-  const maxTextWidth = Math.max(20, listWidth - maxPathWidth - 4)
-  const previewWidth = previewOnRight
-    ? Math.max(40, columns - listWidth - 14)
-    : columns - 6
+  const listWidth = previewOnRight ? Math.floor((columns - 10) * 0.5) : columns - 8;
+  const maxPathWidth = Math.max(20, Math.floor(listWidth * 0.4));
+  const maxTextWidth = Math.max(20, listWidth - maxPathWidth - 4);
+  const previewWidth = previewOnRight ? Math.max(40, columns - listWidth - 14) : columns - 6;
 
   const handleOpen = (m: Match) => {
-    const opened = openFileInExternalEditor(
-      resolvePath(getCwd(), m.file),
-      m.line,
-    )
+    const opened = openFileInExternalEditor(resolvePath(getCwd(), m.file), m.line);
     logEvent('tengu_global_search_select', {
       result_count: matches.length,
       opened_editor: opened,
-    })
-    onDone()
-  }
+    });
+    onDone();
+  };
 
   const handleInsert = (m: Match, mention: boolean) => {
-    onInsert(mention ? `@${m.file}#L${m.line} ` : `${m.file}:${m.line} `)
+    onInsert(mention ? `@${m.file}#L${m.line} ` : `${m.file}:${m.line} `);
     logEvent('tengu_global_search_insert', {
       result_count: matches.length,
       mention,
-    })
-    onDone()
-  }
+    });
+    onDone();
+  };
 
   // Always pass a non-empty string so the line is reserved — prevents the
   // searchBox from bouncing when the count appears/disappears.
   const matchLabel =
-    matches.length > 0
-      ? `${matches.length}${truncated ? '+' : ''} matches${isSearching ? '…' : ''}`
-      : ' '
+    matches.length > 0 ? `${matches.length}${truncated ? '+' : ''} matches${isSearching ? '…' : ''}` : ' ';
 
   return (
     <FuzzyPicker
@@ -264,9 +233,7 @@ export function GlobalSearchDialog({
         handler: m => handleInsert(m, false),
       }}
       onCancel={onDone}
-      emptyMessage={q =>
-        isSearching ? 'Searching…' : q ? 'No matches' : 'Type to search…'
-      }
+      emptyMessage={q => (isSearching ? 'Searching…' : q ? 'No matches' : 'Type to search…')}
       matchLabel={matchLabel}
       selectAction="open in editor"
       renderItem={(m, isFocused) => (
@@ -274,10 +241,7 @@ export function GlobalSearchDialog({
           <Text dimColor>
             {truncatePathMiddle(m.file, maxPathWidth)}:{m.line}
           </Text>{' '}
-          {highlightMatch(
-            truncateToWidth(m.text.trimStart(), maxTextWidth),
-            query,
-          )}
+          {highlightMatch(truncateToWidth(m.text.trimStart(), maxTextWidth), query)}
         </Text>
       )}
       renderPreview={m =>
@@ -287,9 +251,7 @@ export function GlobalSearchDialog({
               {truncatePathMiddle(m.file, previewWidth)}:{m.line}
             </Text>
             {preview.content.split('\n').map((line, i) => (
-              <Text key={i}>
-                {highlightMatch(truncateToWidth(line, previewWidth), query)}
-              </Text>
+              <Text key={i}>{highlightMatch(truncateToWidth(line, previewWidth), query)}</Text>
             ))}
           </>
         ) : (
@@ -297,11 +259,11 @@ export function GlobalSearchDialog({
         )
       }
     />
-  )
+  );
 }
 
 function matchKey(m: Match): string {
-  return `${m.file}:${m.line}`
+  return `${m.file}:${m.line}`;
 }
 
 /**
@@ -312,10 +274,10 @@ function matchKey(m: Match): string {
  * @internal exported for testing
  */
 export function parseRipgrepLine(line: string): Match | null {
-  const m = /^(.*?):(\d+):(.*)$/.exec(line)
-  if (!m) return null
-  const [, file, lineStr, text] = m
-  const lineNum = Number(lineStr)
-  if (!file || !Number.isFinite(lineNum)) return null
-  return { file, line: lineNum, text: text ?? '' }
+  const m = /^(.*?):(\d+):(.*)$/.exec(line);
+  if (!m) return null;
+  const [, file, lineStr, text] = m;
+  const lineNum = Number(lineStr);
+  if (!file || !Number.isFinite(lineNum)) return null;
+  return { file, line: lineNum, text: text ?? '' };
 }
diff --git a/src/components/HelpV2/Commands.tsx b/src/components/HelpV2/Commands.tsx
index eb086e8d5..1787d4983 100644
--- a/src/components/HelpV2/Commands.tsx
+++ b/src/components/HelpV2/Commands.tsx
@@ -1,48 +1,41 @@
-import * as React from 'react'
-import { useMemo } from 'react'
-import { type Command, formatDescriptionWithSource } from '../../commands.js'
-import { truncate } from '../../utils/truncate.js'
-import { Box, Text, useTabHeaderFocus } from '@anthropic/ink'
-import { Select } from '../CustomSelect/select.js'
+import * as React from 'react';
+import { useMemo } from 'react';
+import { type Command, formatDescriptionWithSource } from '../../commands.js';
+import { truncate } from '../../utils/truncate.js';
+import { Box, Text, useTabHeaderFocus } from '@anthropic/ink';
+import { Select } from '../CustomSelect/select.js';
 
 type Props = {
-  commands: Command[]
-  maxHeight: number
-  columns: number
-  title: string
-  onCancel: () => void
-  emptyMessage?: string
-}
+  commands: Command[];
+  maxHeight: number;
+  columns: number;
+  title: string;
+  onCancel: () => void;
+  emptyMessage?: string;
+};
 
-export function Commands({
-  commands,
-  maxHeight,
-  columns,
-  title,
-  onCancel,
-  emptyMessage,
-}: Props): React.ReactNode {
-  const { headerFocused, focusHeader } = useTabHeaderFocus()
-  const maxWidth = Math.max(1, columns - 10)
-  const visibleCount = Math.max(1, Math.floor((maxHeight - 10) / 2))
+export function Commands({ commands, maxHeight, columns, title, onCancel, emptyMessage }: Props): React.ReactNode {
+  const { headerFocused, focusHeader } = useTabHeaderFocus();
+  const maxWidth = Math.max(1, columns - 10);
+  const visibleCount = Math.max(1, Math.floor((maxHeight - 10) / 2));
 
   const options = useMemo(() => {
     // Custom commands can appear more than once (e.g. same name at user and
     // project scope). Dedupe by name to avoid React key collisions in Select.
-    const seen = new Set<string>()
+    const seen = new Set<string>();
     return commands
       .filter(cmd => {
-        if (seen.has(cmd.name)) return false
-        seen.add(cmd.name)
-        return true
+        if (seen.has(cmd.name)) return false;
+        seen.add(cmd.name);
+        return true;
       })
       .sort((a, b) => a.name.localeCompare(b.name))
       .map(cmd => ({
         label: `/${cmd.name}`,
         value: cmd.name,
         description: truncate(formatDescriptionWithSource(cmd), maxWidth, true),
-      }))
-  }, [commands, maxWidth])
+      }));
+  }, [commands, maxWidth]);
 
   return (
     <Box flexDirection="column" paddingY={1}>
@@ -66,5 +59,5 @@ export function Commands({
         </>
       )}
     </Box>
-  )
+  );
 }
diff --git a/src/components/HelpV2/General.tsx b/src/components/HelpV2/General.tsx
index 4117d9568..017b5c675 100644
--- a/src/components/HelpV2/General.tsx
+++ b/src/components/HelpV2/General.tsx
@@ -1,14 +1,14 @@
-import * as React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { PromptInputHelpMenu } from '../PromptInput/PromptInputHelpMenu.js'
+import * as React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { PromptInputHelpMenu } from '../PromptInput/PromptInputHelpMenu.js';
 
 export function General(): React.ReactNode {
   return (
     <Box flexDirection="column" paddingY={1} gap={1}>
       <Box>
         <Text>
-          Claude understands your codebase, makes edits with your permission,
-          and executes commands — right from your terminal.
+          Claude understands your codebase, makes edits with your permission, and executes commands — right from your
+          terminal.
         </Text>
       </Box>
       <Box flexDirection="column">
@@ -18,5 +18,5 @@ export function General(): React.ReactNode {
         <PromptInputHelpMenu gap={2} fixedWidth={true} />
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/components/HelpV2/HelpV2.tsx b/src/components/HelpV2/HelpV2.tsx
index 2a3e0b4e2..4218cd628 100644
--- a/src/components/HelpV2/HelpV2.tsx
+++ b/src/components/HelpV2/HelpV2.tsx
@@ -1,66 +1,55 @@
-import * as React from 'react'
-import { useExitOnCtrlCDWithKeybindings } from 'src/hooks/useExitOnCtrlCDWithKeybindings.js'
-import { useShortcutDisplay } from 'src/keybindings/useShortcutDisplay.js'
+import * as React from 'react';
+import { useExitOnCtrlCDWithKeybindings } from 'src/hooks/useExitOnCtrlCDWithKeybindings.js';
+import { useShortcutDisplay } from 'src/keybindings/useShortcutDisplay.js';
 import {
   builtInCommandNames,
   type Command,
   type CommandResultDisplay,
   INTERNAL_ONLY_COMMANDS,
-} from '../../commands.js'
-import { useIsInsideModal } from '../../context/modalContext.js'
-import { useTerminalSize } from '../../hooks/useTerminalSize.js'
-import { Box, Link, Text, Tab, Tabs, Pane } from '@anthropic/ink'
-import { useKeybinding } from '../../keybindings/useKeybinding.js'
-import { Commands } from './Commands.js'
-import { General } from './General.js'
+} from '../../commands.js';
+import { useIsInsideModal } from '../../context/modalContext.js';
+import { useTerminalSize } from '../../hooks/useTerminalSize.js';
+import { Box, Link, Text, Tab, Tabs, Pane } from '@anthropic/ink';
+import { useKeybinding } from '../../keybindings/useKeybinding.js';
+import { Commands } from './Commands.js';
+import { General } from './General.js';
 
 type Props = {
-  onClose: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-  commands: Command[]
-}
+  onClose: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+  commands: Command[];
+};
 
 export function HelpV2({ onClose, commands }: Props): React.ReactNode {
-  const { rows, columns } = useTerminalSize()
-  const maxHeight = Math.floor(rows / 2)
+  const { rows, columns } = useTerminalSize();
+  const maxHeight = Math.floor(rows / 2);
   // Inside the modal slot, FullscreenLayout already caps height and Pane/Tabs
   // use flexShrink=0 (see #23592) — our own height= constraint would clip the
   // footer since Tabs won't shrink to fit. Let the modal slot handle sizing.
-  const insideModal = useIsInsideModal()
+  const insideModal = useIsInsideModal();
 
-  const close = () => onClose('Help dialog dismissed', { display: 'system' })
-  useKeybinding('help:dismiss', close, { context: 'Help' })
-  const exitState = useExitOnCtrlCDWithKeybindings(close)
-  const dismissShortcut = useShortcutDisplay('help:dismiss', 'Help', 'esc')
+  const close = () => onClose('Help dialog dismissed', { display: 'system' });
+  useKeybinding('help:dismiss', close, { context: 'Help' });
+  const exitState = useExitOnCtrlCDWithKeybindings(close);
+  const dismissShortcut = useShortcutDisplay('help:dismiss', 'Help', 'esc');
 
-  const builtinNames = builtInCommandNames()
-  let builtinCommands = commands.filter(
-    cmd => builtinNames.has(cmd.name) && !cmd.isHidden,
-  )
-  let antOnlyCommands: Command[] = []
+  const builtinNames = builtInCommandNames();
+  let builtinCommands = commands.filter(cmd => builtinNames.has(cmd.name) && !cmd.isHidden);
+  let antOnlyCommands: Command[] = [];
 
   // We have to do this in an `if` to help treeshaking
   if (process.env.USER_TYPE === 'ant') {
-    const internalOnlyNames = new Set(INTERNAL_ONLY_COMMANDS.map(_ => _.name))
-    builtinCommands = builtinCommands.filter(
-      cmd => !internalOnlyNames.has(cmd.name),
-    )
-    antOnlyCommands = commands.filter(
-      cmd => internalOnlyNames.has(cmd.name) && !cmd.isHidden,
-    )
+    const internalOnlyNames = new Set(INTERNAL_ONLY_COMMANDS.map(_ => _.name));
+    builtinCommands = builtinCommands.filter(cmd => !internalOnlyNames.has(cmd.name));
+    antOnlyCommands = commands.filter(cmd => internalOnlyNames.has(cmd.name) && !cmd.isHidden);
   }
 
-  const customCommands = commands.filter(
-    cmd => !builtinNames.has(cmd.name) && !cmd.isHidden,
-  )
+  const customCommands = commands.filter(cmd => !builtinNames.has(cmd.name) && !cmd.isHidden);
 
   const tabs = [
     <Tab key="general" title="general">
       <General />
     </Tab>,
-  ]
+  ];
 
   tabs.push(
     <Tab key="commands" title="commands">
@@ -72,7 +61,7 @@ export function HelpV2({ onClose, commands }: Props): React.ReactNode {
         onCancel={close}
       />
     </Tab>,
-  )
+  );
 
   tabs.push(
     <Tab key="custom" title="custom-commands">
@@ -85,7 +74,7 @@ export function HelpV2({ onClose, commands }: Props): React.ReactNode {
         onCancel={close}
       />
     </Tab>,
-  )
+  );
 
   if (process.env.USER_TYPE === 'ant' && antOnlyCommands.length > 0) {
     tabs.push(
@@ -98,18 +87,14 @@ export function HelpV2({ onClose, commands }: Props): React.ReactNode {
           onCancel={close}
         />
       </Tab>,
-    )
+    );
   }
 
   return (
     <Box flexDirection="column" height={insideModal ? undefined : maxHeight}>
       <Pane color="professionalBlue">
         <Tabs
-          title={
-            process.env.USER_TYPE === 'ant'
-              ? '/help'
-              : `Claude Code v${MACRO.VERSION}`
-          }
+          title={process.env.USER_TYPE === 'ant' ? '/help' : `Claude Code v${MACRO.VERSION}`}
           color="professionalBlue"
           defaultTab="general"
         >
@@ -117,8 +102,7 @@ export function HelpV2({ onClose, commands }: Props): React.ReactNode {
         </Tabs>
         <Box marginTop={1}>
           <Text>
-            For more help:{' '}
-            <Link url="https://code.claude.com/docs/en/overview" />
+            For more help: <Link url="https://code.claude.com/docs/en/overview" />
           </Text>
         </Box>
         <Box marginTop={1}>
@@ -132,5 +116,5 @@ export function HelpV2({ onClose, commands }: Props): React.ReactNode {
         </Box>
       </Pane>
     </Box>
-  )
+  );
 }
diff --git a/src/components/HelpV2/src/hooks/useExitOnCtrlCDWithKeybindings.ts b/src/components/HelpV2/src/hooks/useExitOnCtrlCDWithKeybindings.ts
index 38810d68c..317a9c014 100644
--- a/src/components/HelpV2/src/hooks/useExitOnCtrlCDWithKeybindings.ts
+++ b/src/components/HelpV2/src/hooks/useExitOnCtrlCDWithKeybindings.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useExitOnCtrlCDWithKeybindings = any;
+export type useExitOnCtrlCDWithKeybindings = any
diff --git a/src/components/HelpV2/src/keybindings/useShortcutDisplay.ts b/src/components/HelpV2/src/keybindings/useShortcutDisplay.ts
index 351fb3f9e..b28484bd5 100644
--- a/src/components/HelpV2/src/keybindings/useShortcutDisplay.ts
+++ b/src/components/HelpV2/src/keybindings/useShortcutDisplay.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useShortcutDisplay = any;
+export type useShortcutDisplay = any
diff --git a/src/components/HighlightedCode.tsx b/src/components/HighlightedCode.tsx
index 3cfe9a736..7ed23bf52 100644
--- a/src/components/HighlightedCode.tsx
+++ b/src/components/HighlightedCode.tsx
@@ -1,21 +1,21 @@
-import * as React from 'react'
-import { memo, useEffect, useMemo, useRef, useState } from 'react'
-import { useSettings } from '../hooks/useSettings.js'
-import { Ansi, Box, type DOMElement, measureElement, NoSelect, Text, useTheme } from '@anthropic/ink'
-import { isFullscreenEnvEnabled } from '../utils/fullscreen.js'
-import sliceAnsi from '../utils/sliceAnsi.js'
-import { countCharInString } from '../utils/stringUtils.js'
-import { HighlightedCodeFallback } from './HighlightedCode/Fallback.js'
-import { expectColorFile } from './StructuredDiff/colorDiff.js'
+import * as React from 'react';
+import { memo, useEffect, useMemo, useRef, useState } from 'react';
+import { useSettings } from '../hooks/useSettings.js';
+import { Ansi, Box, type DOMElement, measureElement, NoSelect, Text, useTheme } from '@anthropic/ink';
+import { isFullscreenEnvEnabled } from '../utils/fullscreen.js';
+import sliceAnsi from '../utils/sliceAnsi.js';
+import { countCharInString } from '../utils/stringUtils.js';
+import { HighlightedCodeFallback } from './HighlightedCode/Fallback.js';
+import { expectColorFile } from './StructuredDiff/colorDiff.js';
 
 type Props = {
-  code: string
-  filePath: string
-  width?: number
-  dim?: boolean
-}
+  code: string;
+  filePath: string;
+  width?: number;
+  dim?: boolean;
+};
 
-const DEFAULT_WIDTH = 80
+const DEFAULT_WIDTH = 80;
 
 export const HighlightedCode = memo(function HighlightedCode({
   code,
@@ -23,39 +23,38 @@ export const HighlightedCode = memo(function HighlightedCode({
   width,
   dim = false,
 }: Props): React.ReactElement {
-  const ref = useRef<DOMElement>(null)
-  const [measuredWidth, setMeasuredWidth] = useState(width || DEFAULT_WIDTH)
-  const [theme] = useTheme()
-  const settings = useSettings()
-  const syntaxHighlightingDisabled =
-    settings.syntaxHighlightingDisabled ?? false
+  const ref = useRef<DOMElement>(null);
+  const [measuredWidth, setMeasuredWidth] = useState(width || DEFAULT_WIDTH);
+  const [theme] = useTheme();
+  const settings = useSettings();
+  const syntaxHighlightingDisabled = settings.syntaxHighlightingDisabled ?? false;
 
   const colorFile = useMemo(() => {
     if (syntaxHighlightingDisabled) {
-      return null
+      return null;
     }
-    const ColorFile = expectColorFile()
+    const ColorFile = expectColorFile();
     if (!ColorFile) {
-      return null
+      return null;
     }
-    return new ColorFile(code, filePath)
-  }, [code, filePath, syntaxHighlightingDisabled])
+    return new ColorFile(code, filePath);
+  }, [code, filePath, syntaxHighlightingDisabled]);
 
   useEffect(() => {
     if (!width && ref.current) {
-      const { width: elementWidth } = measureElement(ref.current)
+      const { width: elementWidth } = measureElement(ref.current);
       if (elementWidth > 0) {
-        setMeasuredWidth(elementWidth - 2)
+        setMeasuredWidth(elementWidth - 2);
       }
     }
-  }, [width])
+  }, [width]);
 
   const lines = useMemo(() => {
     if (colorFile === null) {
-      return null
+      return null;
     }
-    return colorFile.render(theme, measuredWidth, dim)
-  }, [colorFile, theme, measuredWidth, dim])
+    return colorFile.render(theme, measuredWidth, dim);
+  }, [colorFile, theme, measuredWidth, dim]);
 
   // Gutter width matches ColorFile's layout in lib.rs: space + right-aligned
   // line number (max_digits = lineCount.toString().length) + space. No marker
@@ -64,10 +63,10 @@ export const HighlightedCode = memo(function HighlightedCode({
   // (~4× DOM nodes + sliceAnsi cost); non-fullscreen uses terminal-native
   // selection where noSelect is meaningless.
   const gutterWidth = useMemo(() => {
-    if (!isFullscreenEnvEnabled()) return 0
-    const lineCount = countCharInString(code, '\n') + 1
-    return lineCount.toString().length + 2
-  }, [code])
+    if (!isFullscreenEnvEnabled()) return 0;
+    const lineCount = countCharInString(code, '\n') + 1;
+    return lineCount.toString().length + 2;
+  }, [code]);
 
   return (
     <Box ref={ref}>
@@ -84,26 +83,15 @@ export const HighlightedCode = memo(function HighlightedCode({
           )}
         </Box>
       ) : (
-        <HighlightedCodeFallback
-          code={code}
-          filePath={filePath}
-          dim={dim}
-          skipColoring={syntaxHighlightingDisabled}
-        />
+        <HighlightedCodeFallback code={code} filePath={filePath} dim={dim} skipColoring={syntaxHighlightingDisabled} />
       )}
     </Box>
-  )
-})
+  );
+});
 
-function CodeLine({
-  line,
-  gutterWidth,
-}: {
-  line: string
-  gutterWidth: number
-}): React.ReactNode {
-  const gutter = sliceAnsi(line, 0, gutterWidth)
-  const content = sliceAnsi(line, gutterWidth)
+function CodeLine({ line, gutterWidth }: { line: string; gutterWidth: number }): React.ReactNode {
+  const gutter = sliceAnsi(line, 0, gutterWidth);
+  const content = sliceAnsi(line, gutterWidth);
   return (
     <Box flexDirection="row">
       <NoSelect fromLeftEdge>
@@ -115,5 +103,5 @@ function CodeLine({
         <Ansi>{content}</Ansi>
       </Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/HighlightedCode/Fallback.tsx b/src/components/HighlightedCode/Fallback.tsx
index e81d44f3d..cc71b7f3d 100644
--- a/src/components/HighlightedCode/Fallback.tsx
+++ b/src/components/HighlightedCode/Fallback.tsx
@@ -1,42 +1,42 @@
-import { extname } from 'path'
-import React, { Suspense, use, useMemo } from 'react'
-import { Ansi, Text } from '@anthropic/ink'
-import { getCliHighlightPromise } from '../../utils/cliHighlight.js'
-import { logForDebugging } from '../../utils/debug.js'
-import { convertLeadingTabsToSpaces } from '../../utils/file.js'
-import { hashPair } from '../../utils/hash.js'
+import { extname } from 'path';
+import React, { Suspense, use, useMemo } from 'react';
+import { Ansi, Text } from '@anthropic/ink';
+import { getCliHighlightPromise } from '../../utils/cliHighlight.js';
+import { logForDebugging } from '../../utils/debug.js';
+import { convertLeadingTabsToSpaces } from '../../utils/file.js';
+import { hashPair } from '../../utils/hash.js';
 
 type Props = {
-  code: string
-  filePath: string
-  dim?: boolean
-  skipColoring?: boolean
-}
+  code: string;
+  filePath: string;
+  dim?: boolean;
+  skipColoring?: boolean;
+};
 
 // Module-level highlight cache — hl.highlight() is the hot cost on virtual-
 // scroll remounts. useMemo doesn't survive unmount→remount. Keyed by hash
 // of code+language to avoid retaining full source strings (#24180 RSS fix).
-const HL_CACHE_MAX = 500
-const hlCache = new Map<string, string>()
+const HL_CACHE_MAX = 500;
+const hlCache = new Map<string, string>();
 function cachedHighlight(
   hl: NonNullable<Awaited<ReturnType<typeof getCliHighlightPromise>>>,
   code: string,
   language: string,
 ): string {
-  const key = hashPair(language, code)
-  const hit = hlCache.get(key)
+  const key = hashPair(language, code);
+  const hit = hlCache.get(key);
   if (hit !== undefined) {
-    hlCache.delete(key)
-    hlCache.set(key, hit)
-    return hit
+    hlCache.delete(key);
+    hlCache.set(key, hit);
+    return hit;
   }
-  const out = hl.highlight(code, { language })
+  const out = hl.highlight(code, { language });
   if (hlCache.size >= HL_CACHE_MAX) {
-    const first = hlCache.keys().next().value
-    if (first !== undefined) hlCache.delete(first)
+    const first = hlCache.keys().next().value;
+    if (first !== undefined) hlCache.delete(first);
   }
-  hlCache.set(key, out)
-  return out
+  hlCache.set(key, out);
+  return out;
 }
 
 export function HighlightedCodeFallback({
@@ -45,55 +45,45 @@ export function HighlightedCodeFallback({
   dim = false,
   skipColoring = false,
 }: Props): React.ReactElement {
-  const codeWithSpaces = convertLeadingTabsToSpaces(code)
+  const codeWithSpaces = convertLeadingTabsToSpaces(code);
   if (skipColoring) {
     return (
       <Text dimColor={dim}>
         <Ansi>{codeWithSpaces}</Ansi>
       </Text>
-    )
+    );
   }
-  const language = extname(filePath).slice(1)
+  const language = extname(filePath).slice(1);
   return (
     <Text dimColor={dim}>
       <Suspense fallback={<Ansi>{codeWithSpaces}</Ansi>}>
         <Highlighted codeWithSpaces={codeWithSpaces} language={language} />
       </Suspense>
     </Text>
-  )
+  );
 }
 
-function Highlighted({
-  codeWithSpaces,
-  language,
-}: {
-  codeWithSpaces: string
-  language: string
-}): React.ReactElement {
-  const hl = use(getCliHighlightPromise())
+function Highlighted({ codeWithSpaces, language }: { codeWithSpaces: string; language: string }): React.ReactElement {
+  const hl = use(getCliHighlightPromise());
   const out = useMemo(() => {
-    if (!hl) return codeWithSpaces
-    let highlightLang = 'markdown'
+    if (!hl) return codeWithSpaces;
+    let highlightLang = 'markdown';
     if (language) {
       if (hl.supportsLanguage(language)) {
-        highlightLang = language
+        highlightLang = language;
       } else {
-        logForDebugging(
-          `Language not supported while highlighting code, falling back to markdown: ${language}`,
-        )
+        logForDebugging(`Language not supported while highlighting code, falling back to markdown: ${language}`);
       }
     }
     try {
-      return cachedHighlight(hl, codeWithSpaces, highlightLang)
+      return cachedHighlight(hl, codeWithSpaces, highlightLang);
     } catch (e) {
       if (e instanceof Error && e.message.includes('Unknown language')) {
-        logForDebugging(
-          `Language not supported while highlighting code, falling back to markdown: ${e}`,
-        )
-        return cachedHighlight(hl, codeWithSpaces, 'markdown')
+        logForDebugging(`Language not supported while highlighting code, falling back to markdown: ${e}`);
+        return cachedHighlight(hl, codeWithSpaces, 'markdown');
       }
-      return codeWithSpaces
+      return codeWithSpaces;
     }
-  }, [codeWithSpaces, language, hl])
-  return <Ansi>{out}</Ansi>
+  }, [codeWithSpaces, language, hl]);
+  return <Ansi>{out}</Ansi>;
 }
diff --git a/src/components/HistorySearchDialog.tsx b/src/components/HistorySearchDialog.tsx
index 54bf98372..e2c557c9f 100644
--- a/src/components/HistorySearchDialog.tsx
+++ b/src/components/HistorySearchDialog.tsx
@@ -1,97 +1,86 @@
-import * as React from 'react'
-import { useEffect, useMemo, useState } from 'react'
-import { useRegisterOverlay } from '../context/overlayContext.js'
-import {
-  getTimestampedHistory,
-  type TimestampedHistoryEntry,
-} from '../history.js'
-import { useTerminalSize } from '../hooks/useTerminalSize.js'
-import { Box, Text, stringWidth, wrapAnsi } from '@anthropic/ink'
-import { logEvent } from '../services/analytics/index.js'
-import type { HistoryEntry } from '../utils/config.js'
-import { formatRelativeTimeAgo, truncateToWidth } from '../utils/format.js'
-import { FuzzyPicker } from '@anthropic/ink'
+import * as React from 'react';
+import { useEffect, useMemo, useState } from 'react';
+import { useRegisterOverlay } from '../context/overlayContext.js';
+import { getTimestampedHistory, type TimestampedHistoryEntry } from '../history.js';
+import { useTerminalSize } from '../hooks/useTerminalSize.js';
+import { Box, Text, stringWidth, wrapAnsi } from '@anthropic/ink';
+import { logEvent } from '../services/analytics/index.js';
+import type { HistoryEntry } from '../utils/config.js';
+import { formatRelativeTimeAgo, truncateToWidth } from '../utils/format.js';
+import { FuzzyPicker } from '@anthropic/ink';
 
 type Props = {
-  initialQuery?: string
-  onSelect: (entry: HistoryEntry) => void
-  onCancel: () => void
-}
+  initialQuery?: string;
+  onSelect: (entry: HistoryEntry) => void;
+  onCancel: () => void;
+};
 
-const PREVIEW_ROWS = 6
-const AGE_WIDTH = 8
+const PREVIEW_ROWS = 6;
+const AGE_WIDTH = 8;
 
 type Item = {
-  entry: TimestampedHistoryEntry
-  display: string
-  lower: string
-  firstLine: string
-  age: string
-}
+  entry: TimestampedHistoryEntry;
+  display: string;
+  lower: string;
+  firstLine: string;
+  age: string;
+};
 
-export function HistorySearchDialog({
-  initialQuery,
-  onSelect,
-  onCancel,
-}: Props): React.ReactNode {
-  useRegisterOverlay('history-search')
-  const { columns } = useTerminalSize()
+export function HistorySearchDialog({ initialQuery, onSelect, onCancel }: Props): React.ReactNode {
+  useRegisterOverlay('history-search');
+  const { columns } = useTerminalSize();
 
-  const [items, setItems] = useState<Item[] | null>(null)
-  const [query, setQuery] = useState(initialQuery ?? '')
+  const [items, setItems] = useState<Item[] | null>(null);
+  const [query, setQuery] = useState(initialQuery ?? '');
 
   useEffect(() => {
-    let cancelled = false
+    let cancelled = false;
     void (async () => {
-      const reader = getTimestampedHistory()
-      const loaded: Item[] = []
+      const reader = getTimestampedHistory();
+      const loaded: Item[] = [];
       for await (const entry of reader) {
         if (cancelled) {
-          void reader.return(undefined)
-          return
+          void reader.return(undefined);
+          return;
         }
-        const display = entry.display
-        const nl = display.indexOf('\n')
-        const age = formatRelativeTimeAgo(new Date(entry.timestamp))
+        const display = entry.display;
+        const nl = display.indexOf('\n');
+        const age = formatRelativeTimeAgo(new Date(entry.timestamp));
         loaded.push({
           entry,
           display,
           lower: display.toLowerCase(),
           firstLine: nl === -1 ? display : display.slice(0, nl),
           age: age + ' '.repeat(Math.max(0, AGE_WIDTH - stringWidth(age))),
-        })
+        });
       }
-      if (!cancelled) setItems(loaded)
-    })()
+      if (!cancelled) setItems(loaded);
+    })();
     return () => {
-      cancelled = true
-    }
-  }, [])
+      cancelled = true;
+    };
+  }, []);
 
   const filtered = useMemo(() => {
-    if (!items) return []
-    const q = query.trim().toLowerCase()
-    if (!q) return items
-    const exact: Item[] = []
-    const fuzzy: Item[] = []
+    if (!items) return [];
+    const q = query.trim().toLowerCase();
+    if (!q) return items;
+    const exact: Item[] = [];
+    const fuzzy: Item[] = [];
     for (const item of items) {
       if (item.lower.includes(q)) {
-        exact.push(item)
+        exact.push(item);
       } else if (isSubsequence(item.lower, q)) {
-        fuzzy.push(item)
+        fuzzy.push(item);
       }
     }
-    return exact.concat(fuzzy)
-  }, [items, query])
+    return exact.concat(fuzzy);
+  }, [items, query]);
 
-  const previewOnRight = columns >= 100
-  const listWidth = previewOnRight
-    ? Math.floor((columns - 6) * 0.5)
-    : columns - 6
-  const rowWidth = Math.max(20, listWidth - AGE_WIDTH - 1)
-  const previewWidth = previewOnRight
-    ? Math.max(20, columns - listWidth - 12)
-    : Math.max(20, columns - 10)
+  const previewOnRight = columns >= 100;
+  const listWidth = previewOnRight ? Math.floor((columns - 6) * 0.5) : columns - 6;
+  const rowWidth = Math.max(20, listWidth - AGE_WIDTH - 1);
+  const previewWidth = previewOnRight ? Math.max(20, columns - listWidth - 12) : Math.max(20, columns - 10);
 
   return (
     <FuzzyPicker
@@ -105,47 +94,29 @@ export function HistorySearchDialog({
         logEvent('tengu_history_picker_select', {
           result_count: filtered.length,
           query_length: query.length,
-        })
-        void item.entry.resolve().then(onSelect)
+        });
+        void item.entry.resolve().then(onSelect);
       }}
       onCancel={onCancel}
-      emptyMessage={q =>
-        items === null
-          ? 'Loading…'
-          : q
-            ? 'No matching prompts'
-            : 'No history yet'
-      }
+      emptyMessage={q => (items === null ? 'Loading…' : q ? 'No matching prompts' : 'No history yet')}
       selectAction="use"
       direction="up"
       previewPosition={previewOnRight ? 'right' : 'bottom'}
       renderItem={(item, isFocused) => (
         <Text>
           <Text dimColor>{item.age}</Text>
-          <Text color={isFocused ? 'suggestion' : undefined}>
-            {' '}
-            {truncateToWidth(item.firstLine, rowWidth)}
-          </Text>
+          <Text color={isFocused ? 'suggestion' : undefined}> {truncateToWidth(item.firstLine, rowWidth)}</Text>
         </Text>
       )}
       renderPreview={item => {
         const wrapped = wrapAnsi(item.display, previewWidth, { hard: true })
           .split('\n')
-          .filter(l => l.trim() !== '')
-        const overflow = wrapped.length > PREVIEW_ROWS
-        const shown = wrapped.slice(
-          0,
-          overflow ? PREVIEW_ROWS - 1 : PREVIEW_ROWS,
-        )
-        const more = wrapped.length - shown.length
+          .filter(l => l.trim() !== '');
+        const overflow = wrapped.length > PREVIEW_ROWS;
+        const shown = wrapped.slice(0, overflow ? PREVIEW_ROWS - 1 : PREVIEW_ROWS);
+        const more = wrapped.length - shown.length;
         return (
-          <Box
-            flexDirection="column"
-            borderStyle="round"
-            borderDimColor
-            paddingX={1}
-            height={PREVIEW_ROWS + 2}
-          >
+          <Box flexDirection="column" borderStyle="round" borderDimColor paddingX={1} height={PREVIEW_ROWS + 2}>
             {shown.map((row, i) => (
               <Text key={i} dimColor>
                 {row}
@@ -153,16 +124,16 @@ export function HistorySearchDialog({
             ))}
             {more > 0 && <Text dimColor>{`… +${more} more lines`}</Text>}
           </Box>
-        )
+        );
       }}
     />
-  )
+  );
 }
 
 function isSubsequence(text: string, query: string): boolean {
-  let j = 0
+  let j = 0;
   for (let i = 0; i < text.length && j < query.length; i++) {
-    if (text[i] === query[j]) j++
+    if (text[i] === query[j]) j++;
   }
-  return j === query.length
+  return j === query.length;
 }
diff --git a/src/components/IdeAutoConnectDialog.tsx b/src/components/IdeAutoConnectDialog.tsx
index f262cc465..eb0e3f53a 100644
--- a/src/components/IdeAutoConnectDialog.tsx
+++ b/src/components/IdeAutoConnectDialog.tsx
@@ -1,91 +1,77 @@
-import React, { useCallback } from 'react'
-import { Text, Dialog } from '@anthropic/ink'
-import { getGlobalConfig, saveGlobalConfig } from '../utils/config.js'
-import { isSupportedTerminal } from '../utils/ide.js'
-import { Select } from './CustomSelect/index.js'
+import React, { useCallback } from 'react';
+import { Text, Dialog } from '@anthropic/ink';
+import { getGlobalConfig, saveGlobalConfig } from '../utils/config.js';
+import { isSupportedTerminal } from '../utils/ide.js';
+import { Select } from './CustomSelect/index.js';
 
 type IdeAutoConnectDialogProps = {
-  onComplete: () => void
-}
+  onComplete: () => void;
+};
 
-export function IdeAutoConnectDialog({
-  onComplete,
-}: IdeAutoConnectDialogProps): React.ReactNode {
+export function IdeAutoConnectDialog({ onComplete }: IdeAutoConnectDialogProps): React.ReactNode {
   const handleSelect = useCallback(
     async (value: string) => {
-      const autoConnect = value === 'yes'
+      const autoConnect = value === 'yes';
 
       // Save the preference and mark dialog as shown
       saveGlobalConfig(current => ({
         ...current,
         autoConnectIde: autoConnect,
         hasIdeAutoConnectDialogBeenShown: true,
-      }))
+      }));
 
-      onComplete()
+      onComplete();
     },
     [onComplete],
-  )
+  );
 
   const options = [
     { label: 'Yes', value: 'yes' },
     { label: 'No', value: 'no' },
-  ]
+  ];
 
   return (
-    <Dialog
-      title="Do you wish to enable auto-connect to IDE?"
-      color="ide"
-      onCancel={onComplete}
-    >
+    <Dialog title="Do you wish to enable auto-connect to IDE?" color="ide" onCancel={onComplete}>
       <Select options={options} onChange={handleSelect} defaultValue={'yes'} />
-      <Text dimColor>
-        You can also configure this in /config or with the --ide flag
-      </Text>
+      <Text dimColor>You can also configure this in /config or with the --ide flag</Text>
     </Dialog>
-  )
+  );
 }
 
 export function shouldShowAutoConnectDialog(): boolean {
-  const config = getGlobalConfig()
-  return (
-    !isSupportedTerminal() &&
-    config.autoConnectIde !== true &&
-    config.hasIdeAutoConnectDialogBeenShown !== true
-  )
+  const config = getGlobalConfig();
+  return !isSupportedTerminal() && config.autoConnectIde !== true && config.hasIdeAutoConnectDialogBeenShown !== true;
 }
 
 type IdeDisableAutoConnectDialogProps = {
-  onComplete: (disableAutoConnect: boolean) => void
-}
+  onComplete: (disableAutoConnect: boolean) => void;
+};
 
-export function IdeDisableAutoConnectDialog({
-  onComplete,
-}: IdeDisableAutoConnectDialogProps): React.ReactNode {
+export function IdeDisableAutoConnectDialog({ onComplete }: IdeDisableAutoConnectDialogProps): React.ReactNode {
   const handleSelect = useCallback(
     (value: string) => {
-      const disableAutoConnect = value === 'yes'
+      const disableAutoConnect = value === 'yes';
 
       if (disableAutoConnect) {
         saveGlobalConfig(current => ({
           ...current,
           autoConnectIde: false,
-        }))
+        }));
       }
 
-      onComplete(disableAutoConnect)
+      onComplete(disableAutoConnect);
     },
     [onComplete],
-  )
+  );
 
   const handleCancel = useCallback(() => {
-    onComplete(false)
-  }, [onComplete])
+    onComplete(false);
+  }, [onComplete]);
 
   const options = [
     { label: 'No', value: 'no' },
     { label: 'Yes', value: 'yes' },
-  ]
+  ];
 
   return (
     <Dialog
@@ -96,10 +82,10 @@ export function IdeDisableAutoConnectDialog({
     >
       <Select options={options} onChange={handleSelect} defaultValue={'no'} />
     </Dialog>
-  )
+  );
 }
 
 export function shouldShowDisableAutoConnectDialog(): boolean {
-  const config = getGlobalConfig()
-  return !isSupportedTerminal() && config.autoConnectIde === true
+  const config = getGlobalConfig();
+  return !isSupportedTerminal() && config.autoConnectIde === true;
 }
diff --git a/src/components/IdeOnboardingDialog.tsx b/src/components/IdeOnboardingDialog.tsx
index aae0b1742..13354971b 100644
--- a/src/components/IdeOnboardingDialog.tsx
+++ b/src/components/IdeOnboardingDialog.tsx
@@ -1,27 +1,24 @@
-import React from 'react'
-import { envDynamic } from 'src/utils/envDynamic.js'
-import { Box, Text } from '@anthropic/ink'
-import { useKeybindings } from '../keybindings/useKeybinding.js'
-import { getGlobalConfig, saveGlobalConfig } from '../utils/config.js'
-import { env } from '../utils/env.js'
+import React from 'react';
+import { envDynamic } from 'src/utils/envDynamic.js';
+import { Box, Text } from '@anthropic/ink';
+import { useKeybindings } from '../keybindings/useKeybinding.js';
+import { getGlobalConfig, saveGlobalConfig } from '../utils/config.js';
+import { env } from '../utils/env.js';
 import {
   getTerminalIdeType,
   type IDEExtensionInstallationStatus,
   isJetBrainsIde,
   toIDEDisplayName,
-} from '../utils/ide.js'
-import { Dialog } from '@anthropic/ink'
+} from '../utils/ide.js';
+import { Dialog } from '@anthropic/ink';
 
 interface Props {
-  onDone: () => void
-  installationStatus: IDEExtensionInstallationStatus | null
+  onDone: () => void;
+  installationStatus: IDEExtensionInstallationStatus | null;
 }
 
-export function IdeOnboardingDialog({
-  onDone,
-  installationStatus,
-}: Props): React.ReactNode {
-  markDialogAsShown()
+export function IdeOnboardingDialog({ onDone, installationStatus }: Props): React.ReactNode {
+  markDialogAsShown();
 
   // Handle Enter/Escape to dismiss
   useKeybindings(
@@ -30,16 +27,15 @@ export function IdeOnboardingDialog({
       'confirm:no': onDone,
     },
     { context: 'Confirmation' },
-  )
+  );
 
-  const ideType = installationStatus?.ideType ?? getTerminalIdeType()
-  const isJetBrains = isJetBrainsIde(ideType)
+  const ideType = installationStatus?.ideType ?? getTerminalIdeType();
+  const isJetBrains = isJetBrainsIde(ideType);
 
-  const ideName = toIDEDisplayName(ideType)
-  const installedVersion = installationStatus?.installedVersion
-  const pluginOrExtension = isJetBrains ? 'plugin' : 'extension'
-  const mentionShortcut =
-    env.platform === 'darwin' ? 'Cmd+Option+K' : 'Ctrl+Alt+K'
+  const ideName = toIDEDisplayName(ideType);
+  const installedVersion = installationStatus?.installedVersion;
+  const pluginOrExtension = isJetBrains ? 'plugin' : 'extension';
+  const mentionShortcut = env.platform === 'darwin' ? 'Cmd+Option+K' : 'Ctrl+Alt+K';
 
   return (
     <>
@@ -50,23 +46,18 @@ export function IdeOnboardingDialog({
             <Text>Welcome to Claude Code for {ideName}</Text>
           </>
         }
-        subtitle={
-          installedVersion
-            ? `installed ${pluginOrExtension} v${installedVersion}`
-            : undefined
-        }
+        subtitle={installedVersion ? `installed ${pluginOrExtension} v${installedVersion}` : undefined}
         color="ide"
         onCancel={onDone}
         hideInputGuide
       >
         <Box flexDirection="column" gap={1}>
           <Text>
-            • Claude has context of <Text color="suggestion">⧉ open files</Text>{' '}
-            and <Text color="suggestion">⧉ selected lines</Text>
+            • Claude has context of <Text color="suggestion">⧉ open files</Text> and{' '}
+            <Text color="suggestion">⧉ selected lines</Text>
           </Text>
           <Text>
-            • Review Claude Code&apos;s changes{' '}
-            <Text color="diffAddedWord">+11</Text>{' '}
+            • Review Claude Code&apos;s changes <Text color="diffAddedWord">+11</Text>{' '}
             <Text color="diffRemovedWord">-22</Text> in the comfort of your IDE
           </Text>
           <Text>
@@ -84,25 +75,25 @@ export function IdeOnboardingDialog({
         </Text>
       </Box>
     </>
-  )
+  );
 }
 
 export function hasIdeOnboardingDialogBeenShown(): boolean {
-  const config = getGlobalConfig()
-  const terminal = envDynamic.terminal || 'unknown'
-  return config.hasIdeOnboardingBeenShown?.[terminal] === true
+  const config = getGlobalConfig();
+  const terminal = envDynamic.terminal || 'unknown';
+  return config.hasIdeOnboardingBeenShown?.[terminal] === true;
 }
 
 function markDialogAsShown(): void {
   if (hasIdeOnboardingDialogBeenShown()) {
-    return
+    return;
   }
-  const terminal = envDynamic.terminal || 'unknown'
+  const terminal = envDynamic.terminal || 'unknown';
   saveGlobalConfig(current => ({
     ...current,
     hasIdeOnboardingBeenShown: {
       ...current.hasIdeOnboardingBeenShown,
       [terminal]: true,
     },
-  }))
+  }));
 }
diff --git a/src/components/IdeStatusIndicator.tsx b/src/components/IdeStatusIndicator.tsx
index 13096b120..426f00094 100644
--- a/src/components/IdeStatusIndicator.tsx
+++ b/src/components/IdeStatusIndicator.tsx
@@ -1,38 +1,32 @@
-import { basename } from 'path'
-import * as React from 'react'
-import { useIdeConnectionStatus } from '../hooks/useIdeConnectionStatus.js'
-import type { IDESelection } from '../hooks/useIdeSelection.js'
-import { Text } from '@anthropic/ink'
-import type { MCPServerConnection } from '../services/mcp/types.js'
+import { basename } from 'path';
+import * as React from 'react';
+import { useIdeConnectionStatus } from '../hooks/useIdeConnectionStatus.js';
+import type { IDESelection } from '../hooks/useIdeSelection.js';
+import { Text } from '@anthropic/ink';
+import type { MCPServerConnection } from '../services/mcp/types.js';
 
 type IdeStatusIndicatorProps = {
-  ideSelection: IDESelection | undefined
-  mcpClients?: MCPServerConnection[]
-}
+  ideSelection: IDESelection | undefined;
+  mcpClients?: MCPServerConnection[];
+};
 
-export function IdeStatusIndicator({
-  ideSelection,
-  mcpClients,
-}: IdeStatusIndicatorProps): React.ReactNode {
-  const { status: ideStatus } = useIdeConnectionStatus(mcpClients)
+export function IdeStatusIndicator({ ideSelection, mcpClients }: IdeStatusIndicatorProps): React.ReactNode {
+  const { status: ideStatus } = useIdeConnectionStatus(mcpClients);
 
   // Check if we should show the IDE selection indicator
   const shouldShowIdeSelection =
-    ideStatus === 'connected' &&
-    (ideSelection?.filePath ||
-      (ideSelection?.text && ideSelection.lineCount > 0))
+    ideStatus === 'connected' && (ideSelection?.filePath || (ideSelection?.text && ideSelection.lineCount > 0));
 
   if (ideStatus === null || !shouldShowIdeSelection || !ideSelection) {
-    return null
+    return null;
   }
 
   if (ideSelection.text && ideSelection.lineCount > 0) {
     return (
       <Text color="ide" key="selection-indicator" wrap="truncate">
-        ⧉ {ideSelection.lineCount}{' '}
-        {ideSelection.lineCount === 1 ? 'line' : 'lines'} selected
+        ⧉ {ideSelection.lineCount} {ideSelection.lineCount === 1 ? 'line' : 'lines'} selected
       </Text>
-    )
+    );
   }
 
   if (ideSelection.filePath) {
@@ -40,6 +34,6 @@ export function IdeStatusIndicator({
       <Text color="ide" key="selection-indicator" wrap="truncate">
         ⧉ In {basename(ideSelection.filePath)}
       </Text>
-    )
+    );
   }
 }
diff --git a/src/components/IdleReturnDialog.tsx b/src/components/IdleReturnDialog.tsx
index 9ffc8893a..3ea6d7b4f 100644
--- a/src/components/IdleReturnDialog.tsx
+++ b/src/components/IdleReturnDialog.tsx
@@ -1,24 +1,20 @@
-import React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { formatTokens } from '../utils/format.js'
-import { Select } from './CustomSelect/index.js'
-import { Dialog } from '@anthropic/ink'
+import React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { formatTokens } from '../utils/format.js';
+import { Select } from './CustomSelect/index.js';
+import { Dialog } from '@anthropic/ink';
 
-type IdleReturnAction = 'continue' | 'clear' | 'dismiss' | 'never'
+type IdleReturnAction = 'continue' | 'clear' | 'dismiss' | 'never';
 
 type Props = {
-  idleMinutes: number
-  totalInputTokens: number
-  onDone: (action: IdleReturnAction) => void
-}
+  idleMinutes: number;
+  totalInputTokens: number;
+  onDone: (action: IdleReturnAction) => void;
+};
 
-export function IdleReturnDialog({
-  idleMinutes,
-  totalInputTokens,
-  onDone,
-}: Props): React.ReactNode {
-  const formattedIdle = formatIdleDuration(idleMinutes)
-  const formattedTokens = formatTokens(totalInputTokens)
+export function IdleReturnDialog({ idleMinutes, totalInputTokens, onDone }: Props): React.ReactNode {
+  const formattedIdle = formatIdleDuration(idleMinutes);
+  const formattedTokens = formatTokens(totalInputTokens);
 
   return (
     <Dialog
@@ -26,9 +22,7 @@ export function IdleReturnDialog({
       onCancel={() => onDone('dismiss')}
     >
       <Box flexDirection="column">
-        <Text>
-          If this is a new task, clearing context will save usage and be faster.
-        </Text>
+        <Text>If this is a new task, clearing context will save usage and be faster.</Text>
       </Box>
       <Select
         options={[
@@ -48,20 +42,20 @@ export function IdleReturnDialog({
         onChange={(value: IdleReturnAction) => onDone(value)}
       />
     </Dialog>
-  )
+  );
 }
 
 function formatIdleDuration(minutes: number): string {
   if (minutes < 1) {
-    return '< 1m'
+    return '< 1m';
   }
   if (minutes < 60) {
-    return `${Math.floor(minutes)}m`
+    return `${Math.floor(minutes)}m`;
   }
-  const hours = Math.floor(minutes / 60)
-  const remainingMinutes = Math.floor(minutes % 60)
+  const hours = Math.floor(minutes / 60);
+  const remainingMinutes = Math.floor(minutes % 60);
   if (remainingMinutes === 0) {
-    return `${hours}h`
+    return `${hours}h`;
   }
-  return `${hours}h ${remainingMinutes}m`
+  return `${hours}h ${remainingMinutes}m`;
 }
diff --git a/src/components/InterruptedByUser.tsx b/src/components/InterruptedByUser.tsx
index 13c641f0b..019650804 100644
--- a/src/components/InterruptedByUser.tsx
+++ b/src/components/InterruptedByUser.tsx
@@ -1,5 +1,5 @@
-import * as React from 'react'
-import { Text } from '@anthropic/ink'
+import * as React from 'react';
+import { Text } from '@anthropic/ink';
 
 export function InterruptedByUser(): React.ReactNode {
   return (
@@ -11,5 +11,5 @@ export function InterruptedByUser(): React.ReactNode {
         <Text dimColor>· What should Claude do instead?</Text>
       )}
     </>
-  )
+  );
 }
diff --git a/src/components/InvalidConfigDialog.tsx b/src/components/InvalidConfigDialog.tsx
index 7bbc04b14..920714cf5 100644
--- a/src/components/InvalidConfigDialog.tsx
+++ b/src/components/InvalidConfigDialog.tsx
@@ -1,25 +1,22 @@
-import React from 'react'
-import { Box, Dialog, wrappedRender as render, Text } from '@anthropic/ink'
-import { KeybindingSetup } from '../keybindings/KeybindingProviderSetup.js'
-import { AppStateProvider } from '../state/AppState.js'
-import type { ConfigParseError } from '../utils/errors.js'
-import { getBaseRenderOptions } from '../utils/renderOptions.js'
-import {
-  jsonStringify,
-  writeFileSync_DEPRECATED,
-} from '../utils/slowOperations.js'
-import type { ThemeName } from '../utils/theme.js'
-import { Select } from './CustomSelect/index.js'
+import React from 'react';
+import { Box, Dialog, wrappedRender as render, Text } from '@anthropic/ink';
+import { KeybindingSetup } from '../keybindings/KeybindingProviderSetup.js';
+import { AppStateProvider } from '../state/AppState.js';
+import type { ConfigParseError } from '../utils/errors.js';
+import { getBaseRenderOptions } from '../utils/renderOptions.js';
+import { jsonStringify, writeFileSync_DEPRECATED } from '../utils/slowOperations.js';
+import type { ThemeName } from '../utils/theme.js';
+import { Select } from './CustomSelect/index.js';
 
 interface InvalidConfigHandlerProps {
-  error: ConfigParseError
+  error: ConfigParseError;
 }
 
 interface InvalidConfigDialogProps {
-  filePath: string
-  errorDescription: string
-  onExit: () => void
-  onReset: () => void
+  filePath: string;
+  errorDescription: string;
+  onExit: () => void;
+  onReset: () => void;
 }
 
 /**
@@ -34,18 +31,17 @@ function InvalidConfigDialog({
   // Handler for Select onChange
   const handleSelect = (value: string) => {
     if (value === 'exit') {
-      onExit()
+      onExit();
     } else {
-      onReset()
+      onReset();
     }
-  }
+  };
 
   return (
     <Dialog title="Configuration Error" color="error" onCancel={onExit}>
       <Box flexDirection="column" gap={1}>
         <Text>
-          The configuration file at <Text bold>{filePath}</Text> contains
-          invalid JSON.
+          The configuration file at <Text bold>{filePath}</Text> contains invalid JSON.
         </Text>
         <Text>{errorDescription}</Text>
       </Box>
@@ -61,28 +57,27 @@ function InvalidConfigDialog({
         />
       </Box>
     </Dialog>
-  )
+  );
 }
 
 /**
  * Safe fallback theme name for error dialogs to avoid circular dependency.
  * Uses a hardcoded dark theme that doesn't require reading from config.
  */
-const SAFE_ERROR_THEME_NAME: ThemeName = 'dark'
+const SAFE_ERROR_THEME_NAME: ThemeName = 'dark';
 
-export async function showInvalidConfigDialog({
-  error,
-}: InvalidConfigHandlerProps): Promise<void> {
+export async function showInvalidConfigDialog({ error }: InvalidConfigHandlerProps): Promise<void> {
   // Extend RenderOptions with theme property for this specific usage
-  type SafeRenderOptions = Parameters<typeof render>[1] & { theme?: ThemeName }
+  type SafeRenderOptions = Parameters<typeof render>[1] & { theme?: ThemeName };
 
   const renderOptions: SafeRenderOptions = {
     ...getBaseRenderOptions(false),
     // IMPORTANT: Use hardcoded theme name to avoid circular dependency with getGlobalConfig()
     // This allows the error dialog to show even when config file has JSON syntax errors
     theme: SAFE_ERROR_THEME_NAME,
-  }
+  };
 
+  // biome-ignore lint/suspicious/noAsyncPromiseExecutor: render must be awaited inside executor
   await new Promise<void>(async resolve => {
     const { unmount } = await render(
       <AppStateProvider>
@@ -91,24 +86,23 @@ export async function showInvalidConfigDialog({
             filePath={error.filePath}
             errorDescription={error.message}
             onExit={() => {
-              unmount()
-              void resolve()
-              process.exit(1)
+              unmount();
+              void resolve();
+              process.exit(1);
             }}
             onReset={() => {
-              writeFileSync_DEPRECATED(
-                error.filePath,
-                jsonStringify(error.defaultConfig, null, 2),
-                { flush: false, encoding: 'utf8' },
-              )
-              unmount()
-              void resolve()
-              process.exit(0)
+              writeFileSync_DEPRECATED(error.filePath, jsonStringify(error.defaultConfig, null, 2), {
+                flush: false,
+                encoding: 'utf8',
+              });
+              unmount();
+              void resolve();
+              process.exit(0);
             }}
           />
         </KeybindingSetup>
       </AppStateProvider>,
       renderOptions,
-    )
-  })
+    );
+  });
 }
diff --git a/src/components/InvalidSettingsDialog.tsx b/src/components/InvalidSettingsDialog.tsx
index f3b0db018..071d302f9 100644
--- a/src/components/InvalidSettingsDialog.tsx
+++ b/src/components/InvalidSettingsDialog.tsx
@@ -1,38 +1,32 @@
-import React from 'react'
-import { Text, Dialog } from '@anthropic/ink'
-import type { ValidationError } from '../utils/settings/validation.js'
-import { Select } from './CustomSelect/index.js'
-import { ValidationErrorsList } from './ValidationErrorsList.js'
+import React from 'react';
+import { Text, Dialog } from '@anthropic/ink';
+import type { ValidationError } from '../utils/settings/validation.js';
+import { Select } from './CustomSelect/index.js';
+import { ValidationErrorsList } from './ValidationErrorsList.js';
 
 type Props = {
-  settingsErrors: ValidationError[]
-  onContinue: () => void
-  onExit: () => void
-}
+  settingsErrors: ValidationError[];
+  onContinue: () => void;
+  onExit: () => void;
+};
 
 /**
  * Dialog shown when settings files have validation errors.
  * User must choose to continue (skipping invalid files) or exit to fix them.
  */
-export function InvalidSettingsDialog({
-  settingsErrors,
-  onContinue,
-  onExit,
-}: Props): React.ReactNode {
+export function InvalidSettingsDialog({ settingsErrors, onContinue, onExit }: Props): React.ReactNode {
   function handleSelect(value: string): void {
     if (value === 'exit') {
-      onExit()
+      onExit();
     } else {
-      onContinue()
+      onContinue();
     }
   }
 
   return (
     <Dialog title="Settings Error" onCancel={onExit} color="warning">
       <ValidationErrorsList errors={settingsErrors} />
-      <Text dimColor>
-        Files with errors are skipped entirely, not just the invalid settings.
-      </Text>
+      <Text dimColor>Files with errors are skipped entirely, not just the invalid settings.</Text>
       <Select
         options={[
           { label: 'Exit and fix manually', value: 'exit' },
@@ -44,5 +38,5 @@ export function InvalidSettingsDialog({
         onChange={handleSelect}
       />
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/KeybindingWarnings.tsx b/src/components/KeybindingWarnings.tsx
index dc1b5a74a..9fc161dd0 100644
--- a/src/components/KeybindingWarnings.tsx
+++ b/src/components/KeybindingWarnings.tsx
@@ -1,10 +1,10 @@
-import React from 'react'
-import { Box, Text } from '@anthropic/ink'
+import React from 'react';
+import { Box, Text } from '@anthropic/ink';
 import {
   getCachedKeybindingWarnings,
   getKeybindingsPath,
   isKeybindingCustomizationEnabled,
-} from '../keybindings/loadUserBindings.js'
+} from '../keybindings/loadUserBindings.js';
 
 /**
  * Displays keybinding validation warnings in the UI.
@@ -16,17 +16,17 @@ import {
 export function KeybindingWarnings(): React.ReactNode {
   // Only show warnings when keybinding customization is enabled
   if (!isKeybindingCustomizationEnabled()) {
-    return null
+    return null;
   }
 
-  const warnings = getCachedKeybindingWarnings()
+  const warnings = getCachedKeybindingWarnings();
 
   if (warnings.length === 0) {
-    return null
+    return null;
   }
 
-  const errors = warnings.filter(w => w.severity === 'error')
-  const warns = warnings.filter(w => w.severity === 'warning')
+  const errors = warnings.filter(w => w.severity === 'error');
+  const warns = warnings.filter(w => w.severity === 'warning');
 
   return (
     <Box flexDirection="column" marginTop={1} marginBottom={1}>
@@ -68,5 +68,5 @@ export function KeybindingWarnings(): React.ReactNode {
         ))}
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/components/LanguagePicker.tsx b/src/components/LanguagePicker.tsx
index ae357ff8e..fa4dbfdd1 100644
--- a/src/components/LanguagePicker.tsx
+++ b/src/components/LanguagePicker.tsx
@@ -1,32 +1,26 @@
-import figures from 'figures'
-import React, { useState } from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { useKeybinding } from '../keybindings/useKeybinding.js'
-import TextInput from './TextInput.js'
+import figures from 'figures';
+import React, { useState } from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { useKeybinding } from '../keybindings/useKeybinding.js';
+import TextInput from './TextInput.js';
 
 type Props = {
-  initialLanguage: string | undefined
-  onComplete: (language: string | undefined) => void
-  onCancel: () => void
-}
+  initialLanguage: string | undefined;
+  onComplete: (language: string | undefined) => void;
+  onCancel: () => void;
+};
 
-export function LanguagePicker({
-  initialLanguage,
-  onComplete,
-  onCancel,
-}: Props): React.ReactNode {
-  const [language, setLanguage] = useState(initialLanguage)
-  const [cursorOffset, setCursorOffset] = useState(
-    (initialLanguage ?? '').length,
-  )
+export function LanguagePicker({ initialLanguage, onComplete, onCancel }: Props): React.ReactNode {
+  const [language, setLanguage] = useState(initialLanguage);
+  const [cursorOffset, setCursorOffset] = useState((initialLanguage ?? '').length);
 
   // Use configurable keybinding for ESC to cancel
   // Use Settings context so 'n' key doesn't trigger cancel (allows typing 'n' in input)
-  useKeybinding('confirm:no', onCancel, { context: 'Settings' })
+  useKeybinding('confirm:no', onCancel, { context: 'Settings' });
 
   function handleSubmit(): void {
-    const trimmed = language?.trim()
-    onComplete(trimmed || undefined)
+    const trimmed = language?.trim();
+    onComplete(trimmed || undefined);
   }
 
   return (
@@ -48,5 +42,5 @@ export function LanguagePicker({
       </Box>
       <Text dimColor>Leave empty for default (English)</Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/LogSelector.tsx b/src/components/LogSelector.tsx
index 806a0082d..ca64d666d 100644
--- a/src/components/LogSelector.tsx
+++ b/src/components/LogSelector.tsx
@@ -1,171 +1,145 @@
-import chalk from 'chalk'
-import figures from 'figures'
-import Fuse from 'fuse.js'
-import React from 'react'
-import { getOriginalCwd, getSessionId } from '../bootstrap/state.js'
-import { useExitOnCtrlCDWithKeybindings } from '../hooks/useExitOnCtrlCDWithKeybindings.js'
-import { useSearchInput } from '../hooks/useSearchInput.js'
-import { useTerminalSize } from '../hooks/useTerminalSize.js'
-import { applyColor, Box, Text, useInput, useTerminalFocus, useTheme, type Color, Byline, Divider, KeyboardShortcutHint } from '@anthropic/ink'
-import { useKeybinding } from '../keybindings/useKeybinding.js'
-import { logEvent } from '../services/analytics/index.js'
-import type { LogOption, SerializedMessage } from '../types/logs.js'
-import { formatLogMetadata, truncateToWidth } from '../utils/format.js'
-import { getWorktreePaths } from '../utils/getWorktreePaths.js'
-import { getBranch } from '../utils/git.js'
-import { getLogDisplayTitle } from '../utils/log.js'
+import chalk from 'chalk';
+import figures from 'figures';
+import Fuse from 'fuse.js';
+import React from 'react';
+import { getOriginalCwd, getSessionId } from '../bootstrap/state.js';
+import { useExitOnCtrlCDWithKeybindings } from '../hooks/useExitOnCtrlCDWithKeybindings.js';
+import { useSearchInput } from '../hooks/useSearchInput.js';
+import { useTerminalSize } from '../hooks/useTerminalSize.js';
+import {
+  applyColor,
+  Box,
+  Text,
+  useInput,
+  useTerminalFocus,
+  useTheme,
+  type Color,
+  Byline,
+  Divider,
+  KeyboardShortcutHint,
+} from '@anthropic/ink';
+import { useKeybinding } from '../keybindings/useKeybinding.js';
+import { logEvent } from '../services/analytics/index.js';
+import type { LogOption, SerializedMessage } from '../types/logs.js';
+import { formatLogMetadata, truncateToWidth } from '../utils/format.js';
+import { getWorktreePaths } from '../utils/getWorktreePaths.js';
+import { getBranch } from '../utils/git.js';
+import { getLogDisplayTitle } from '../utils/log.js';
 import {
   getFirstMeaningfulUserMessageTextContent,
   getSessionIdFromLog,
   isCustomTitleEnabled,
   saveCustomTitle,
-} from '../utils/sessionStorage.js'
-import { getTheme } from '../utils/theme.js'
-import { ConfigurableShortcutHint } from './ConfigurableShortcutHint.js'
-import { Select } from './CustomSelect/select.js'
-import { SearchBox } from './SearchBox.js'
-import { SessionPreview } from './SessionPreview.js'
-import { Spinner } from './Spinner.js'
-import { TagTabs } from './TagTabs.js'
-import TextInput from './TextInput.js'
-import { type TreeNode, TreeSelect } from './ui/TreeSelect.js'
+} from '../utils/sessionStorage.js';
+import { getTheme } from '../utils/theme.js';
+import { ConfigurableShortcutHint } from './ConfigurableShortcutHint.js';
+import { Select } from './CustomSelect/select.js';
+import { SearchBox } from './SearchBox.js';
+import { SessionPreview } from './SessionPreview.js';
+import { Spinner } from './Spinner.js';
+import { TagTabs } from './TagTabs.js';
+import TextInput from './TextInput.js';
+import { type TreeNode, TreeSelect } from './ui/TreeSelect.js';
 
 type AgenticSearchState =
   | { status: 'idle' }
   | { status: 'searching' }
   | { status: 'results'; results: LogOption[]; query: string }
-  | { status: 'error'; message: string }
+  | { status: 'error'; message: string };
 
 export type LogSelectorProps = {
-  logs: LogOption[]
-  maxHeight?: number
-  forceWidth?: number
-  onCancel?: () => void
-  onSelect: (log: LogOption) => void
-  onLogsChanged?: () => void
-  onLoadMore?: (count: number) => void
-  initialSearchQuery?: string
-  showAllProjects?: boolean
-  onToggleAllProjects?: () => void
-  onAgenticSearch?: (
-    query: string,
-    logs: LogOption[],
-    signal?: AbortSignal,
-  ) => Promise<LogOption[]>
-}
+  logs: LogOption[];
+  maxHeight?: number;
+  forceWidth?: number;
+  onCancel?: () => void;
+  onSelect: (log: LogOption) => void;
+  onLogsChanged?: () => void;
+  onLoadMore?: (count: number) => void;
+  initialSearchQuery?: string;
+  showAllProjects?: boolean;
+  onToggleAllProjects?: () => void;
+  onAgenticSearch?: (query: string, logs: LogOption[], signal?: AbortSignal) => Promise<LogOption[]>;
+};
 
-type LogTreeNode = TreeNode<{ log: LogOption; indexInFiltered: number }>
+type LogTreeNode = TreeNode<{ log: LogOption; indexInFiltered: number }>;
 
 function normalizeAndTruncateToWidth(text: string, maxWidth: number): string {
-  const normalized = text.replace(/\s+/g, ' ').trim()
-  return truncateToWidth(normalized, maxWidth)
+  const normalized = text.replace(/\s+/g, ' ').trim();
+  return truncateToWidth(normalized, maxWidth);
 }
 
 // Width of prefixes that TreeSelect will add
-const PARENT_PREFIX_WIDTH = 2 // '▼ ' or '▶ '
-const CHILD_PREFIX_WIDTH = 4 // '  ▸ '
+const PARENT_PREFIX_WIDTH = 2; // '▼ ' or '▶ '
+const CHILD_PREFIX_WIDTH = 4; // '  ▸ '
 
 // Deep search constants
-const DEEP_SEARCH_MAX_MESSAGES = 2000
-const DEEP_SEARCH_CROP_SIZE = 1000
-const DEEP_SEARCH_MAX_TEXT_LENGTH = 50000 // Cap searchable text per session
-const FUSE_THRESHOLD = 0.3
-const DATE_TIE_THRESHOLD_MS = 60 * 1000 // 1 minute - use relevance as tie-breaker within this window
-const SNIPPET_CONTEXT_CHARS = 50 // Characters to show before/after match
+const DEEP_SEARCH_MAX_MESSAGES = 2000;
+const DEEP_SEARCH_CROP_SIZE = 1000;
+const DEEP_SEARCH_MAX_TEXT_LENGTH = 50000; // Cap searchable text per session
+const FUSE_THRESHOLD = 0.3;
+const DATE_TIE_THRESHOLD_MS = 60 * 1000; // 1 minute - use relevance as tie-breaker within this window
+const SNIPPET_CONTEXT_CHARS = 50; // Characters to show before/after match
 
-type Snippet = { before: string; match: string; after: string }
+type Snippet = { before: string; match: string; after: string };
 
-function formatSnippet(
-  { before, match, after }: Snippet,
-  highlightColor: (text: string) => string,
-): string {
-  return chalk.dim(before) + highlightColor(match) + chalk.dim(after)
+function formatSnippet({ before, match, after }: Snippet, highlightColor: (text: string) => string): string {
+  return chalk.dim(before) + highlightColor(match) + chalk.dim(after);
 }
 
-function extractSnippet(
-  text: string,
-  query: string,
-  contextChars: number,
-): Snippet | null {
+function extractSnippet(text: string, query: string, contextChars: number): Snippet | null {
   // Find exact query occurrence (case-insensitive).
   // Note: Fuse does fuzzy matching, so this may miss some fuzzy matches.
   // This is acceptable for now - in the future we could use Fuse's includeMatches
   // option and work with the match indices directly.
-  const matchIndex = text.toLowerCase().indexOf(query.toLowerCase())
-  if (matchIndex === -1) return null
+  const matchIndex = text.toLowerCase().indexOf(query.toLowerCase());
+  if (matchIndex === -1) return null;
 
-  const matchEnd = matchIndex + query.length
-  const snippetStart = Math.max(0, matchIndex - contextChars)
-  const snippetEnd = Math.min(text.length, matchEnd + contextChars)
+  const matchEnd = matchIndex + query.length;
+  const snippetStart = Math.max(0, matchIndex - contextChars);
+  const snippetEnd = Math.min(text.length, matchEnd + contextChars);
 
-  const beforeRaw = text.slice(snippetStart, matchIndex)
-  const matchText = text.slice(matchIndex, matchEnd)
-  const afterRaw = text.slice(matchEnd, snippetEnd)
+  const beforeRaw = text.slice(snippetStart, matchIndex);
+  const matchText = text.slice(matchIndex, matchEnd);
+  const afterRaw = text.slice(matchEnd, snippetEnd);
 
   return {
-    before:
-      (snippetStart > 0 ? '…' : '') +
-      beforeRaw.replace(/\s+/g, ' ').trimStart(),
+    before: (snippetStart > 0 ? '…' : '') + beforeRaw.replace(/\s+/g, ' ').trimStart(),
     match: matchText.trim(),
-    after:
-      afterRaw.replace(/\s+/g, ' ').trimEnd() +
-      (snippetEnd < text.length ? '…' : ''),
-  }
+    after: afterRaw.replace(/\s+/g, ' ').trimEnd() + (snippetEnd < text.length ? '…' : ''),
+  };
 }
 
 function buildLogLabel(
   log: LogOption,
   maxLabelWidth: number,
   options?: {
-    isGroupHeader?: boolean
-    isChild?: boolean
-    forkCount?: number
+    isGroupHeader?: boolean;
+    isChild?: boolean;
+    forkCount?: number;
   },
 ): string {
-  const {
-    isGroupHeader = false,
-    isChild = false,
-    forkCount = 0,
-  } = options || {}
+  const { isGroupHeader = false, isChild = false, forkCount = 0 } = options || {};
 
   // TreeSelect will add the prefix, so we just need to account for its width
-  const prefixWidth =
-    isGroupHeader && forkCount > 0
-      ? PARENT_PREFIX_WIDTH
-      : isChild
-        ? CHILD_PREFIX_WIDTH
-        : 0
+  const prefixWidth = isGroupHeader && forkCount > 0 ? PARENT_PREFIX_WIDTH : isChild ? CHILD_PREFIX_WIDTH : 0;
 
   const sessionCountSuffix =
-    isGroupHeader && forkCount > 0
-      ? ` (+${forkCount} other ${forkCount === 1 ? 'session' : 'sessions'})`
-      : ''
+    isGroupHeader && forkCount > 0 ? ` (+${forkCount} other ${forkCount === 1 ? 'session' : 'sessions'})` : '';
 
-  const sidechainSuffix = log.isSidechain ? ' (sidechain)' : ''
+  const sidechainSuffix = log.isSidechain ? ' (sidechain)' : '';
 
-  const maxSummaryWidth =
-    maxLabelWidth -
-    prefixWidth -
-    sidechainSuffix.length -
-    sessionCountSuffix.length
-  const truncatedSummary = normalizeAndTruncateToWidth(
-    getLogDisplayTitle(log),
-    maxSummaryWidth,
-  )
-  return `${truncatedSummary}${sidechainSuffix}${sessionCountSuffix}`
+  const maxSummaryWidth = maxLabelWidth - prefixWidth - sidechainSuffix.length - sessionCountSuffix.length;
+  const truncatedSummary = normalizeAndTruncateToWidth(getLogDisplayTitle(log), maxSummaryWidth);
+  return `${truncatedSummary}${sidechainSuffix}${sessionCountSuffix}`;
 }
 
-function buildLogMetadata(
-  log: LogOption,
-  options?: { isChild?: boolean; showProjectPath?: boolean },
-): string {
-  const { isChild = false, showProjectPath = false } = options || {}
+function buildLogMetadata(log: LogOption, options?: { isChild?: boolean; showProjectPath?: boolean }): string {
+  const { isChild = false, showProjectPath = false } = options || {};
   // Match the child prefix width for proper alignment
-  const childPadding = isChild ? '    ' : '' // 4 spaces to match '  ▸ '
-  const baseMetadata = formatLogMetadata(log)
-  const projectSuffix =
-    showProjectPath && log.projectPath ? ` · ${log.projectPath}` : ''
-  return childPadding + baseMetadata + projectSuffix
+  const childPadding = isChild ? '    ' : ''; // 4 spaces to match '  ▸ '
+  const baseMetadata = formatLogMetadata(log);
+  const projectSuffix = showProjectPath && log.projectPath ? ` · ${log.projectPath}` : '';
+  return childPadding + baseMetadata + projectSuffix;
 }
 
 export function LogSelector({
@@ -181,192 +155,168 @@ export function LogSelector({
   onToggleAllProjects,
   onAgenticSearch,
 }: LogSelectorProps): React.ReactNode {
-  const terminalSize = useTerminalSize()
-  const columns = forceWidth === undefined ? terminalSize.columns : forceWidth
-  const exitState = useExitOnCtrlCDWithKeybindings(onCancel)
-  const isTerminalFocused = useTerminalFocus()
-  const isResumeWithRenameEnabled = isCustomTitleEnabled()
-  const isDeepSearchEnabled = process.env.USER_TYPE === 'ant'
-  const [themeName] = useTheme()
-  const theme = getTheme(themeName)
+  const terminalSize = useTerminalSize();
+  const columns = forceWidth === undefined ? terminalSize.columns : forceWidth;
+  const exitState = useExitOnCtrlCDWithKeybindings(onCancel);
+  const isTerminalFocused = useTerminalFocus();
+  const isResumeWithRenameEnabled = isCustomTitleEnabled();
+  const isDeepSearchEnabled = process.env.USER_TYPE === 'ant';
+  const [themeName] = useTheme();
+  const theme = getTheme(themeName);
   const highlightColor = React.useMemo(
     () => (text: string) => applyColor(text, theme.warning as Color),
     [theme.warning],
-  )
-  const isAgenticSearchEnabled = process.env.USER_TYPE === 'ant'
+  );
+  const isAgenticSearchEnabled = process.env.USER_TYPE === 'ant';
 
-  const [currentBranch, setCurrentBranch] = React.useState<string | null>(null)
-  const [branchFilterEnabled, setBranchFilterEnabled] = React.useState(false)
-  const [showAllWorktrees, setShowAllWorktrees] = React.useState(false)
-  const [hasMultipleWorktrees, setHasMultipleWorktrees] = React.useState(false)
-  const currentCwd = React.useMemo(() => getOriginalCwd(), [])
-  const [renameValue, setRenameValue] = React.useState('')
-  const [renameCursorOffset, setRenameCursorOffset] = React.useState(0)
-  const [expandedGroupSessionIds, setExpandedGroupSessionIds] = React.useState<
-    Set<string>
-  >(new Set())
-  const [focusedNode, setFocusedNode] = React.useState<LogTreeNode | null>(null)
+  const [currentBranch, setCurrentBranch] = React.useState<string | null>(null);
+  const [branchFilterEnabled, setBranchFilterEnabled] = React.useState(false);
+  const [showAllWorktrees, setShowAllWorktrees] = React.useState(false);
+  const [hasMultipleWorktrees, setHasMultipleWorktrees] = React.useState(false);
+  const currentCwd = React.useMemo(() => getOriginalCwd(), []);
+  const [renameValue, setRenameValue] = React.useState('');
+  const [renameCursorOffset, setRenameCursorOffset] = React.useState(0);
+  const [expandedGroupSessionIds, setExpandedGroupSessionIds] = React.useState<Set<string>>(new Set());
+  const [focusedNode, setFocusedNode] = React.useState<LogTreeNode | null>(null);
   // Track focused index for scroll position display in title
-  const [focusedIndex, setFocusedIndex] = React.useState(1)
-  const [viewMode, setViewMode] = React.useState<
-    'list' | 'preview' | 'rename' | 'search'
-  >('list')
-  const [previewLog, setPreviewLog] = React.useState<LogOption | null>(null)
-  const prevFocusedIdRef = React.useRef<string | null>(null)
-  const [selectedTagIndex, setSelectedTagIndex] = React.useState(0)
+  const [focusedIndex, setFocusedIndex] = React.useState(1);
+  const [viewMode, setViewMode] = React.useState<'list' | 'preview' | 'rename' | 'search'>('list');
+  const [previewLog, setPreviewLog] = React.useState<LogOption | null>(null);
+  const prevFocusedIdRef = React.useRef<string | null>(null);
+  const [selectedTagIndex, setSelectedTagIndex] = React.useState(0);
 
   // Agentic search state
-  const [agenticSearchState, setAgenticSearchState] =
-    React.useState<AgenticSearchState>({ status: 'idle' })
+  const [agenticSearchState, setAgenticSearchState] = React.useState<AgenticSearchState>({ status: 'idle' });
   // Track if the "Search deeply using Claude" option is focused
-  const [isAgenticSearchOptionFocused, setIsAgenticSearchOptionFocused] =
-    React.useState(false)
+  const [isAgenticSearchOptionFocused, setIsAgenticSearchOptionFocused] = React.useState(false);
   // AbortController for cancelling agentic search
-  const agenticSearchAbortRef = React.useRef<AbortController | null>(null)
+  const agenticSearchAbortRef = React.useRef<AbortController | null>(null);
 
   const {
     query: searchQuery,
     setQuery: setSearchQuery,
     cursorOffset: searchCursorOffset,
   } = useSearchInput({
-    isActive:
-      viewMode === 'search' && agenticSearchState.status !== 'searching',
+    isActive: viewMode === 'search' && agenticSearchState.status !== 'searching',
     onExit: () => {
-      setViewMode('list')
-      logEvent('tengu_session_search_toggled', { enabled: false })
+      setViewMode('list');
+      logEvent('tengu_session_search_toggled', { enabled: false });
     },
     onExitUp: () => {
-      setViewMode('list')
-      logEvent('tengu_session_search_toggled', { enabled: false })
+      setViewMode('list');
+      logEvent('tengu_session_search_toggled', { enabled: false });
     },
     passthroughCtrlKeys: ['n'],
     initialQuery: initialSearchQuery || '',
-  })
+  });
 
   // Debounce transcript search for performance (title search is instant)
-  const deferredSearchQuery = React.useDeferredValue(searchQuery)
+  const deferredSearchQuery = React.useDeferredValue(searchQuery);
 
   // Additional debounce for deep search - wait 300ms after typing stops
-  const [debouncedDeepSearchQuery, setDebouncedDeepSearchQuery] =
-    React.useState('')
+  const [debouncedDeepSearchQuery, setDebouncedDeepSearchQuery] = React.useState('');
   React.useEffect(() => {
     if (!deferredSearchQuery) {
-      setDebouncedDeepSearchQuery('')
-      return
+      setDebouncedDeepSearchQuery('');
+      return;
     }
-    const timeoutId = setTimeout(
-      setDebouncedDeepSearchQuery,
-      300,
-      deferredSearchQuery,
-    )
-    return () => clearTimeout(timeoutId)
-  }, [deferredSearchQuery])
+    const timeoutId = setTimeout(setDebouncedDeepSearchQuery, 300, deferredSearchQuery);
+    return () => clearTimeout(timeoutId);
+  }, [deferredSearchQuery]);
 
   // State for async deep search results
   const [deepSearchResults, setDeepSearchResults] = React.useState<{
-    results: Array<{ log: LogOption; score?: number; searchableText: string }>
-    query: string
-  } | null>(null)
-  const [isSearching, setIsSearching] = React.useState(false)
+    results: Array<{ log: LogOption; score?: number; searchableText: string }>;
+    query: string;
+  } | null>(null);
+  const [isSearching, setIsSearching] = React.useState(false);
 
   React.useEffect(() => {
-    void getBranch().then(branch => setCurrentBranch(branch))
+    void getBranch().then(branch => setCurrentBranch(branch));
     void getWorktreePaths(currentCwd).then(paths => {
-      setHasMultipleWorktrees(paths.length > 1)
-    })
-  }, [currentCwd])
+      setHasMultipleWorktrees(paths.length > 1);
+    });
+  }, [currentCwd]);
 
   // Memoize searchable text extraction - only recompute when logs change
-  const searchableTextByLog = React.useMemo(
-    () => new Map(logs.map(log => [log, buildSearchableText(log)])),
-    [logs],
-  )
+  const searchableTextByLog = React.useMemo(() => new Map(logs.map(log => [log, buildSearchableText(log)])), [logs]);
 
   // Pre-build Fuse index once when logs change (not on every search query)
   const fuseIndex = React.useMemo(() => {
-    if (!isDeepSearchEnabled) return null
+    if (!isDeepSearchEnabled) return null;
 
     const logsWithText = logs
       .map(log => ({
         log,
         searchableText: searchableTextByLog.get(log) ?? '',
       }))
-      .filter(item => item.searchableText)
+      .filter(item => item.searchableText);
 
     return new Fuse(logsWithText, {
       keys: ['searchableText'],
       threshold: FUSE_THRESHOLD,
       ignoreLocation: true,
       includeScore: true,
-    })
-  }, [logs, searchableTextByLog, isDeepSearchEnabled])
+    });
+  }, [logs, searchableTextByLog, isDeepSearchEnabled]);
 
   // Compute unique tags from logs (before any filtering)
-  const uniqueTags = React.useMemo(() => getUniqueTags(logs), [logs])
-  const hasTags = uniqueTags.length > 0
-  const tagTabs = React.useMemo(
-    () => (hasTags ? ['All', ...uniqueTags] : []),
-    [hasTags, uniqueTags],
-  )
+  const uniqueTags = React.useMemo(() => getUniqueTags(logs), [logs]);
+  const hasTags = uniqueTags.length > 0;
+  const tagTabs = React.useMemo(() => (hasTags ? ['All', ...uniqueTags] : []), [hasTags, uniqueTags]);
 
   // Clamp out-of-bounds index (e.g., after logs change) without an extra render
-  const effectiveTagIndex =
-    tagTabs.length > 0 && selectedTagIndex < tagTabs.length
-      ? selectedTagIndex
-      : 0
-  const selectedTab = tagTabs[effectiveTagIndex]
-  const tagFilter = selectedTab === 'All' ? undefined : selectedTab
+  const effectiveTagIndex = tagTabs.length > 0 && selectedTagIndex < tagTabs.length ? selectedTagIndex : 0;
+  const selectedTab = tagTabs[effectiveTagIndex];
+  const tagFilter = selectedTab === 'All' ? undefined : selectedTab;
 
   // Tag tabs are now a single line with horizontal scrolling
-  const tagTabsLines = hasTags ? 1 : 0
+  const tagTabsLines = hasTags ? 1 : 0;
 
   // Base filtering (instant) - applies tag, branch, and resume filters
   const baseFilteredLogs = React.useMemo(() => {
-    let filtered = logs
+    let filtered = logs;
     if (isResumeWithRenameEnabled) {
       filtered = logs.filter(log => {
-        const currentSessionId = getSessionId()
-        const logSessionId = getSessionIdFromLog(log)
-        const isCurrentSession =
-          currentSessionId && logSessionId === currentSessionId
+        const currentSessionId = getSessionId();
+        const logSessionId = getSessionIdFromLog(log);
+        const isCurrentSession = currentSessionId && logSessionId === currentSessionId;
         // Always show current session
         if (isCurrentSession) {
-          return true
+          return true;
         }
         // Always show sessions with custom titles (e.g., loop mode sessions)
         if (log.customTitle) {
-          return true
+          return true;
         }
         // For full logs, check messages array
-        const fromMessages = getFirstMeaningfulUserMessageTextContent(
-          log.messages,
-        )
+        const fromMessages = getFirstMeaningfulUserMessageTextContent(log.messages);
         if (fromMessages) {
-          return true
+          return true;
         }
         // All logs reaching this component are enriched — include if
         // they have a prompt or custom title
         if (log.firstPrompt || log.customTitle) {
-          return true
+          return true;
         }
-        return false
-      })
+        return false;
+      });
     }
 
     // Apply tag filter if specified
     if (tagFilter !== undefined) {
-      filtered = filtered.filter(log => log.tag === tagFilter)
+      filtered = filtered.filter(log => log.tag === tagFilter);
     }
 
     if (branchFilterEnabled && currentBranch) {
-      filtered = filtered.filter(log => log.gitBranch === currentBranch)
+      filtered = filtered.filter(log => log.gitBranch === currentBranch);
     }
 
     if (hasMultipleWorktrees && !showAllWorktrees) {
-      filtered = filtered.filter(log => log.projectPath === currentCwd)
+      filtered = filtered.filter(log => log.projectPath === currentCwd);
     }
 
-    return filtered
+    return filtered;
   }, [
     logs,
     isResumeWithRenameEnabled,
@@ -376,70 +326,54 @@ export function LogSelector({
     hasMultipleWorktrees,
     showAllWorktrees,
     currentCwd,
-  ])
+  ]);
 
   // Instant title/branch/tag/PR filtering (runs on every keystroke, but is fast)
   const titleFilteredLogs = React.useMemo(() => {
     if (!searchQuery) {
-      return baseFilteredLogs
+      return baseFilteredLogs;
     }
-    const query = searchQuery.toLowerCase()
+    const query = searchQuery.toLowerCase();
     return baseFilteredLogs.filter(log => {
-      const displayedTitle = getLogDisplayTitle(log).toLowerCase()
-      const branch = (log.gitBranch || '').toLowerCase()
-      const tag = (log.tag || '').toLowerCase()
-      const prInfo = log.prNumber
-        ? `pr #${log.prNumber} ${log.prRepository || ''}`.toLowerCase()
-        : ''
-      return (
-        displayedTitle.includes(query) ||
-        branch.includes(query) ||
-        tag.includes(query) ||
-        prInfo.includes(query)
-      )
-    })
-  }, [baseFilteredLogs, searchQuery])
+      const displayedTitle = getLogDisplayTitle(log).toLowerCase();
+      const branch = (log.gitBranch || '').toLowerCase();
+      const tag = (log.tag || '').toLowerCase();
+      const prInfo = log.prNumber ? `pr #${log.prNumber} ${log.prRepository || ''}`.toLowerCase() : '';
+      return displayedTitle.includes(query) || branch.includes(query) || tag.includes(query) || prInfo.includes(query);
+    });
+  }, [baseFilteredLogs, searchQuery]);
 
   // Show searching indicator when query is pending debounce
   React.useEffect(() => {
-    if (
-      isDeepSearchEnabled &&
-      deferredSearchQuery &&
-      deferredSearchQuery !== debouncedDeepSearchQuery
-    ) {
-      setIsSearching(true)
+    if (isDeepSearchEnabled && deferredSearchQuery && deferredSearchQuery !== debouncedDeepSearchQuery) {
+      setIsSearching(true);
     }
-  }, [deferredSearchQuery, debouncedDeepSearchQuery, isDeepSearchEnabled])
+  }, [deferredSearchQuery, debouncedDeepSearchQuery, isDeepSearchEnabled]);
 
   // Async deep search effect - runs after 300ms debounce
   React.useEffect(() => {
     if (!isDeepSearchEnabled || !debouncedDeepSearchQuery || !fuseIndex) {
-      setDeepSearchResults(null)
-      setIsSearching(false)
-      return
+      setDeepSearchResults(null);
+      setIsSearching(false);
+      return;
     }
 
     // Use setTimeout(0) to yield to the event loop - prevents UI freeze
     const timeoutId = setTimeout(
-      (
-        fuseIndex,
-        debouncedDeepSearchQuery,
-        setDeepSearchResults,
-        setIsSearching,
-      ) => {
-        const results = fuseIndex.search(debouncedDeepSearchQuery)
+      (fuseIndex, debouncedDeepSearchQuery, setDeepSearchResults, setIsSearching) => {
+        const results = fuseIndex.search(debouncedDeepSearchQuery);
 
         // Sort by date (newest first), with relevance as tie-breaker within same minute
         results.sort((a, b) => {
-          const aTime = new Date(a.item.log.modified).getTime()
-          const bTime = new Date(b.item.log.modified).getTime()
-          const timeDiff = bTime - aTime
+          const aTime = new Date(a.item.log.modified).getTime();
+          const bTime = new Date(b.item.log.modified).getTime();
+          const timeDiff = bTime - aTime;
           if (Math.abs(timeDiff) > DATE_TIE_THRESHOLD_MS) {
-            return timeDiff
+            return timeDiff;
           }
           // Within same minute window, use relevance score (lower is better)
-          return (a.score ?? 1) - (b.score ?? 1)
-        })
+          return (a.score ?? 1) - (b.score ?? 1);
+        });
 
         setDeepSearchResults({
           results: results.map(r => ({
@@ -448,174 +382,141 @@ export function LogSelector({
             searchableText: r.item.searchableText,
           })),
           query: debouncedDeepSearchQuery,
-        })
-        setIsSearching(false)
+        });
+        setIsSearching(false);
       },
       0,
       fuseIndex,
       debouncedDeepSearchQuery,
       setDeepSearchResults,
       setIsSearching,
-    )
+    );
 
     return () => {
-      clearTimeout(timeoutId)
-    }
-  }, [debouncedDeepSearchQuery, fuseIndex, isDeepSearchEnabled])
+      clearTimeout(timeoutId);
+    };
+  }, [debouncedDeepSearchQuery, fuseIndex, isDeepSearchEnabled]);
 
   // Merge title matches with async deep search results
   const { filteredLogs, snippets } = React.useMemo(() => {
-    const snippetMap = new Map<LogOption, Snippet>()
+    const snippetMap = new Map<LogOption, Snippet>();
 
     // Start with instant title matches
-    let filtered = titleFilteredLogs
+    let filtered = titleFilteredLogs;
 
     // Merge in deep search results if available and query matches
-    if (
-      deepSearchResults &&
-      debouncedDeepSearchQuery &&
-      deepSearchResults.query === debouncedDeepSearchQuery
-    ) {
+    if (deepSearchResults && debouncedDeepSearchQuery && deepSearchResults.query === debouncedDeepSearchQuery) {
       // Extract snippets from deep search results
       for (const result of deepSearchResults.results) {
         if (result.searchableText) {
-          const snippet = extractSnippet(
-            result.searchableText,
-            debouncedDeepSearchQuery,
-            SNIPPET_CONTEXT_CHARS,
-          )
+          const snippet = extractSnippet(result.searchableText, debouncedDeepSearchQuery, SNIPPET_CONTEXT_CHARS);
           if (snippet) {
-            snippetMap.set(result.log, snippet)
+            snippetMap.set(result.log, snippet);
           }
         }
       }
 
       // Add transcript-only matches (not already in title matches)
-      const titleMatchIds = new Set(filtered.map(log => log.messages[0]?.uuid))
+      const titleMatchIds = new Set(filtered.map(log => log.messages[0]?.uuid));
       const transcriptOnlyMatches = deepSearchResults.results
         .map(r => r.log)
-        .filter(log => !titleMatchIds.has(log.messages[0]?.uuid))
-      filtered = [...filtered, ...transcriptOnlyMatches]
+        .filter(log => !titleMatchIds.has(log.messages[0]?.uuid));
+      filtered = [...filtered, ...transcriptOnlyMatches];
     }
 
-    return { filteredLogs: filtered, snippets: snippetMap }
-  }, [titleFilteredLogs, deepSearchResults, debouncedDeepSearchQuery])
+    return { filteredLogs: filtered, snippets: snippetMap };
+  }, [titleFilteredLogs, deepSearchResults, debouncedDeepSearchQuery]);
 
   // Use agentic search results when available and non-empty, otherwise use regular filtered logs
   const displayedLogs = React.useMemo(() => {
-    if (
-      agenticSearchState.status === 'results' &&
-      agenticSearchState.results.length > 0
-    ) {
-      return agenticSearchState.results
+    if (agenticSearchState.status === 'results' && agenticSearchState.results.length > 0) {
+      return agenticSearchState.results;
     }
-    return filteredLogs
-  }, [agenticSearchState, filteredLogs])
+    return filteredLogs;
+  }, [agenticSearchState, filteredLogs]);
 
   // Calculate available width for the summary text
-  const maxLabelWidth = Math.max(30, columns - 4)
+  const maxLabelWidth = Math.max(30, columns - 4);
 
   // Build tree nodes for grouped view
   const treeNodes = React.useMemo<LogTreeNode[]>(() => {
     if (!isResumeWithRenameEnabled) {
-      return []
+      return [];
     }
 
-    const sessionGroups = groupLogsBySessionId(displayedLogs)
+    const sessionGroups = groupLogsBySessionId(displayedLogs);
 
-    return Array.from(sessionGroups.entries()).map(
-      ([sessionId, groupLogs]): LogTreeNode => {
-        const latestLog = groupLogs[0]!
-        const indexInFiltered = displayedLogs.indexOf(latestLog)
-        const snippet = snippets.get(latestLog)
-        const snippetStr = snippet
-          ? formatSnippet(snippet, highlightColor)
-          : null
+    return Array.from(sessionGroups.entries()).map(([sessionId, groupLogs]): LogTreeNode => {
+      const latestLog = groupLogs[0]!;
+      const indexInFiltered = displayedLogs.indexOf(latestLog);
+      const snippet = snippets.get(latestLog);
+      const snippetStr = snippet ? formatSnippet(snippet, highlightColor) : null;
 
-        if (groupLogs.length === 1) {
-          // Single log - no children
-          const metadata = buildLogMetadata(latestLog, {
-            showProjectPath: showAllProjects,
-          })
-          return {
-            id: `log:${sessionId}:0`,
-            value: { log: latestLog, indexInFiltered },
-            label: buildLogLabel(latestLog, maxLabelWidth),
-            description: snippetStr ? `${metadata}\n  ${snippetStr}` : metadata,
-            dimDescription: true,
-          }
-        }
-
-        // Multiple logs - parent with children
-        const forkCount = groupLogs.length - 1
-        const children: LogTreeNode[] = groupLogs.slice(1).map((log, index) => {
-          const childIndexInFiltered = displayedLogs.indexOf(log)
-          const childSnippet = snippets.get(log)
-          const childSnippetStr = childSnippet
-            ? formatSnippet(childSnippet, highlightColor)
-            : null
-          const childMetadata = buildLogMetadata(log, {
-            isChild: true,
-            showProjectPath: showAllProjects,
-          })
-          return {
-            id: `log:${sessionId}:${index + 1}`,
-            value: { log, indexInFiltered: childIndexInFiltered },
-            label: buildLogLabel(log, maxLabelWidth, { isChild: true }),
-            description: childSnippetStr
-              ? `${childMetadata}\n      ${childSnippetStr}`
-              : childMetadata,
-            dimDescription: true,
-          }
-        })
-
-        const parentMetadata = buildLogMetadata(latestLog, {
+      if (groupLogs.length === 1) {
+        // Single log - no children
+        const metadata = buildLogMetadata(latestLog, {
           showProjectPath: showAllProjects,
-        })
+        });
         return {
-          id: `group:${sessionId}`,
+          id: `log:${sessionId}:0`,
           value: { log: latestLog, indexInFiltered },
-          label: buildLogLabel(latestLog, maxLabelWidth, {
-            isGroupHeader: true,
-            forkCount,
-          }),
-          description: snippetStr
-            ? `${parentMetadata}\n  ${snippetStr}`
-            : parentMetadata,
+          label: buildLogLabel(latestLog, maxLabelWidth),
+          description: snippetStr ? `${metadata}\n  ${snippetStr}` : metadata,
           dimDescription: true,
-          children,
-        }
-      },
-    )
-  }, [
-    isResumeWithRenameEnabled,
-    displayedLogs,
-    maxLabelWidth,
-    showAllProjects,
-    snippets,
-    highlightColor,
-  ])
+        };
+      }
+
+      // Multiple logs - parent with children
+      const forkCount = groupLogs.length - 1;
+      const children: LogTreeNode[] = groupLogs.slice(1).map((log, index) => {
+        const childIndexInFiltered = displayedLogs.indexOf(log);
+        const childSnippet = snippets.get(log);
+        const childSnippetStr = childSnippet ? formatSnippet(childSnippet, highlightColor) : null;
+        const childMetadata = buildLogMetadata(log, {
+          isChild: true,
+          showProjectPath: showAllProjects,
+        });
+        return {
+          id: `log:${sessionId}:${index + 1}`,
+          value: { log, indexInFiltered: childIndexInFiltered },
+          label: buildLogLabel(log, maxLabelWidth, { isChild: true }),
+          description: childSnippetStr ? `${childMetadata}\n      ${childSnippetStr}` : childMetadata,
+          dimDescription: true,
+        };
+      });
+
+      const parentMetadata = buildLogMetadata(latestLog, {
+        showProjectPath: showAllProjects,
+      });
+      return {
+        id: `group:${sessionId}`,
+        value: { log: latestLog, indexInFiltered },
+        label: buildLogLabel(latestLog, maxLabelWidth, {
+          isGroupHeader: true,
+          forkCount,
+        }),
+        description: snippetStr ? `${parentMetadata}\n  ${snippetStr}` : parentMetadata,
+        dimDescription: true,
+        children,
+      };
+    });
+  }, [isResumeWithRenameEnabled, displayedLogs, maxLabelWidth, showAllProjects, snippets, highlightColor]);
 
   // Build options for old flat list view
   const flatOptions = React.useMemo(() => {
     if (isResumeWithRenameEnabled) {
-      return []
+      return [];
     }
 
     return displayedLogs.map((log, index) => {
-      const rawSummary = getLogDisplayTitle(log)
-      const summaryWithSidechain =
-        rawSummary + (log.isSidechain ? ' (sidechain)' : '')
-      const summary = normalizeAndTruncateToWidth(
-        summaryWithSidechain,
-        maxLabelWidth,
-      )
+      const rawSummary = getLogDisplayTitle(log);
+      const summaryWithSidechain = rawSummary + (log.isSidechain ? ' (sidechain)' : '');
+      const summary = normalizeAndTruncateToWidth(summaryWithSidechain, maxLabelWidth);
 
-      const baseDescription = formatLogMetadata(log)
-      const projectSuffix =
-        showAllProjects && log.projectPath ? ` · ${log.projectPath}` : ''
-      const snippet = snippets.get(log)
-      const snippetStr = snippet ? formatSnippet(snippet, highlightColor) : null
+      const baseDescription = formatLogMetadata(log);
+      const projectSuffix = showAllProjects && log.projectPath ? ` · ${log.projectPath}` : '';
+      const snippet = snippets.get(log);
+      const snippetStr = snippet ? formatSnippet(snippet, highlightColor) : null;
 
       return {
         label: summary,
@@ -624,236 +525,210 @@ export function LogSelector({
           : baseDescription + projectSuffix,
         dimDescription: true,
         value: index.toString(),
-      }
-    })
-  }, [
-    isResumeWithRenameEnabled,
-    displayedLogs,
-    highlightColor,
-    maxLabelWidth,
-    showAllProjects,
-    snippets,
-  ])
+      };
+    });
+  }, [isResumeWithRenameEnabled, displayedLogs, highlightColor, maxLabelWidth, showAllProjects, snippets]);
 
   // Derive the focused log from focusedNode
-  const focusedLog = focusedNode?.value.log ?? null
+  const focusedLog = focusedNode?.value.log ?? null;
 
   const getExpandCollapseHint = (): string => {
-    if (!isResumeWithRenameEnabled || !focusedLog) return ''
-    const sessionId = getSessionIdFromLog(focusedLog)
-    if (!sessionId) return ''
+    if (!isResumeWithRenameEnabled || !focusedLog) return '';
+    const sessionId = getSessionIdFromLog(focusedLog);
+    if (!sessionId) return '';
 
-    const sessionLogs = displayedLogs.filter(
-      log => getSessionIdFromLog(log) === sessionId,
-    )
-    const hasMultipleLogs = sessionLogs.length > 1
+    const sessionLogs = displayedLogs.filter(log => getSessionIdFromLog(log) === sessionId);
+    const hasMultipleLogs = sessionLogs.length > 1;
 
-    if (!hasMultipleLogs) return ''
+    if (!hasMultipleLogs) return '';
 
-    const isExpanded = expandedGroupSessionIds.has(sessionId)
-    const isChildNode = sessionLogs.indexOf(focusedLog) > 0
+    const isExpanded = expandedGroupSessionIds.has(sessionId);
+    const isChildNode = sessionLogs.indexOf(focusedLog) > 0;
 
     if (isChildNode) {
-      return '← to collapse'
+      return '← to collapse';
     }
 
-    return isExpanded ? '← to collapse' : '→ to expand'
-  }
+    return isExpanded ? '← to collapse' : '→ to expand';
+  };
 
   const handleRenameSubmit = React.useCallback(async () => {
-    const sessionId = focusedLog ? getSessionIdFromLog(focusedLog) : undefined
+    const sessionId = focusedLog ? getSessionIdFromLog(focusedLog) : undefined;
     if (!focusedLog || !sessionId) {
-      setViewMode('list')
-      setRenameValue('')
-      return
+      setViewMode('list');
+      setRenameValue('');
+      return;
     }
 
     if (renameValue.trim()) {
       // Pass fullPath for cross-project sessions (different worktrees)
-      await saveCustomTitle(sessionId, renameValue.trim(), focusedLog.fullPath)
+      await saveCustomTitle(sessionId, renameValue.trim(), focusedLog.fullPath);
       if (isResumeWithRenameEnabled && onLogsChanged) {
-        onLogsChanged()
+        onLogsChanged();
       }
     }
-    setViewMode('list')
-    setRenameValue('')
-  }, [focusedLog, renameValue, onLogsChanged, isResumeWithRenameEnabled])
+    setViewMode('list');
+    setRenameValue('');
+  }, [focusedLog, renameValue, onLogsChanged, isResumeWithRenameEnabled]);
 
   const exitSearchMode = React.useCallback(() => {
-    setViewMode('list')
-    logEvent('tengu_session_search_toggled', { enabled: false })
-  }, [])
+    setViewMode('list');
+    logEvent('tengu_session_search_toggled', { enabled: false });
+  }, []);
 
   const enterSearchMode = React.useCallback(() => {
-    setViewMode('search')
-    logEvent('tengu_session_search_toggled', { enabled: true })
-  }, [])
+    setViewMode('search');
+    logEvent('tengu_session_search_toggled', { enabled: true });
+  }, []);
 
   // Handler for triggering agentic search
   const handleAgenticSearch = React.useCallback(async () => {
     if (!searchQuery.trim() || !onAgenticSearch || !isAgenticSearchEnabled) {
-      return
+      return;
     }
 
     // Abort any previous search
-    agenticSearchAbortRef.current?.abort()
-    const abortController = new AbortController()
-    agenticSearchAbortRef.current = abortController
+    agenticSearchAbortRef.current?.abort();
+    const abortController = new AbortController();
+    agenticSearchAbortRef.current = abortController;
 
-    setAgenticSearchState({ status: 'searching' })
+    setAgenticSearchState({ status: 'searching' });
     logEvent('tengu_agentic_search_started', {
       query_length: searchQuery.length,
-    })
+    });
 
     try {
-      const results = await onAgenticSearch(
-        searchQuery,
-        logs,
-        abortController.signal,
-      )
+      const results = await onAgenticSearch(searchQuery, logs, abortController.signal);
       // Check if aborted before updating state
       if (abortController.signal.aborted) {
-        return
+        return;
       }
-      setAgenticSearchState({ status: 'results', results, query: searchQuery })
+      setAgenticSearchState({ status: 'results', results, query: searchQuery });
       logEvent('tengu_agentic_search_completed', {
         query_length: searchQuery.length,
         results_count: results.length,
-      })
+      });
     } catch (error) {
       // Don't show error for aborted requests
       if (abortController.signal.aborted) {
-        return
+        return;
       }
       setAgenticSearchState({
         status: 'error',
         message: error instanceof Error ? error.message : 'Search failed',
-      })
+      });
       logEvent('tengu_agentic_search_error', {
         query_length: searchQuery.length,
-      })
+      });
     }
-  }, [searchQuery, onAgenticSearch, isAgenticSearchEnabled, logs])
+  }, [searchQuery, onAgenticSearch, isAgenticSearchEnabled, logs]);
 
   // Clear agentic search results/error when query changes
   React.useEffect(() => {
-    if (
-      agenticSearchState.status !== 'idle' &&
-      agenticSearchState.status !== 'searching'
-    ) {
+    if (agenticSearchState.status !== 'idle' && agenticSearchState.status !== 'searching') {
       // Clear if the query has changed from the one used for results/error
       if (
-        (agenticSearchState.status === 'results' &&
-          agenticSearchState.query !== searchQuery) ||
+        (agenticSearchState.status === 'results' && agenticSearchState.query !== searchQuery) ||
         agenticSearchState.status === 'error'
       ) {
-        setAgenticSearchState({ status: 'idle' })
+        setAgenticSearchState({ status: 'idle' });
       }
     }
-  }, [searchQuery, agenticSearchState])
+  }, [searchQuery, agenticSearchState]);
 
   // Cleanup: abort any in-progress agentic search on unmount
   React.useEffect(() => {
     return () => {
-      agenticSearchAbortRef.current?.abort()
-    }
-  }, [])
+      agenticSearchAbortRef.current?.abort();
+    };
+  }, []);
 
   // Focus first item when agentic search completes with results
-  const prevAgenticStatusRef = React.useRef(agenticSearchState.status)
+  const prevAgenticStatusRef = React.useRef(agenticSearchState.status);
   React.useEffect(() => {
-    const prevStatus = prevAgenticStatusRef.current
-    prevAgenticStatusRef.current = agenticSearchState.status
+    const prevStatus = prevAgenticStatusRef.current;
+    prevAgenticStatusRef.current = agenticSearchState.status;
 
     // When search just completed, focus the first item in the list
     if (prevStatus === 'searching' && agenticSearchState.status === 'results') {
       if (isResumeWithRenameEnabled && treeNodes.length > 0) {
-        setFocusedNode(treeNodes[0]!)
+        setFocusedNode(treeNodes[0]!);
       } else if (!isResumeWithRenameEnabled && displayedLogs.length > 0) {
-        const firstLog = displayedLogs[0]!
+        const firstLog = displayedLogs[0]!;
         setFocusedNode({
           id: '0',
           value: { log: firstLog, indexInFiltered: 0 },
           label: '',
-        })
+        });
       }
     }
-  }, [
-    agenticSearchState.status,
-    isResumeWithRenameEnabled,
-    treeNodes,
-    displayedLogs,
-  ])
+  }, [agenticSearchState.status, isResumeWithRenameEnabled, treeNodes, displayedLogs]);
 
   const handleFlatOptionsSelectFocus = React.useCallback(
     (value: string) => {
-      const index = parseInt(value, 10)
-      const log = displayedLogs[index]
+      const index = parseInt(value, 10);
+      const log = displayedLogs[index];
       if (!log || prevFocusedIdRef.current === index.toString()) {
-        return
+        return;
       }
-      prevFocusedIdRef.current = index.toString()
+      prevFocusedIdRef.current = index.toString();
       setFocusedNode({
         id: index.toString(),
         value: { log, indexInFiltered: index },
         label: '',
-      })
-      setFocusedIndex(index + 1)
+      });
+      setFocusedIndex(index + 1);
     },
     [displayedLogs],
-  )
+  );
 
   const handleTreeSelectFocus = React.useCallback(
     (node: LogTreeNode) => {
-      setFocusedNode(node)
+      setFocusedNode(node);
       // Update focused index for scroll position display
-      const index = displayedLogs.findIndex(
-        log => getSessionIdFromLog(log) === getSessionIdFromLog(node.value.log),
-      )
+      const index = displayedLogs.findIndex(log => getSessionIdFromLog(log) === getSessionIdFromLog(node.value.log));
       if (index >= 0) {
-        setFocusedIndex(index + 1)
+        setFocusedIndex(index + 1);
       }
     },
     [displayedLogs],
-  )
+  );
 
   // Escape to abort agentic search in progress
   useKeybinding(
     'confirm:no',
     () => {
-      agenticSearchAbortRef.current?.abort()
-      setAgenticSearchState({ status: 'idle' })
-      logEvent('tengu_agentic_search_cancelled', {})
+      agenticSearchAbortRef.current?.abort();
+      setAgenticSearchState({ status: 'idle' });
+      logEvent('tengu_agentic_search_cancelled', {});
     },
     {
       context: 'Confirmation',
-      isActive:
-        viewMode !== 'preview' && agenticSearchState.status === 'searching',
+      isActive: viewMode !== 'preview' && agenticSearchState.status === 'searching',
     },
-  )
+  );
 
   // Escape in rename mode - exit rename mode
   // Use Settings context so 'n' key doesn't exit (allows typing 'n' in rename input)
   useKeybinding(
     'confirm:no',
     () => {
-      setViewMode('list')
-      setRenameValue('')
+      setViewMode('list');
+      setRenameValue('');
     },
     {
       context: 'Settings',
-      isActive:
-        viewMode === 'rename' && agenticSearchState.status !== 'searching',
+      isActive: viewMode === 'rename' && agenticSearchState.status !== 'searching',
     },
-  )
+  );
 
   // Escape when agentic search option focused - clear and cancel
   useKeybinding(
     'confirm:no',
     () => {
-      setSearchQuery('')
-      setIsAgenticSearchOptionFocused(false)
-      onCancel?.()
+      setSearchQuery('');
+      setIsAgenticSearchOptionFocused(false);
+      onCancel?.();
     },
     {
       context: 'Confirmation',
@@ -864,19 +739,19 @@ export function LogSelector({
         isAgenticSearchOptionFocused &&
         agenticSearchState.status !== 'searching',
     },
-  )
+  );
 
   // Handle non-escape input
   useInput(
     (input, key) => {
       if (viewMode === 'preview') {
         // Preview mode handles its own input
-        return
+        return;
       }
 
       // Agentic search abort is now handled via keybinding
       if (agenticSearchState.status === 'searching') {
-        return
+        return;
       }
 
       if (viewMode === 'rename') {
@@ -885,7 +760,7 @@ export function LogSelector({
       } else if (viewMode === 'search') {
         // Text input is handled by useSearchInput hook
         if (input.toLowerCase() === 'n' && key.ctrl) {
-          exitSearchMode()
+          exitSearchMode();
         } else if (key.return || key.downArrow) {
           // Focus agentic search option if applicable
           if (
@@ -894,7 +769,7 @@ export function LogSelector({
             isAgenticSearchEnabled &&
             agenticSearchState.status !== 'results'
           ) {
-            setIsAgenticSearchOptionFocused(true)
+            setIsAgenticSearchOptionFocused(true);
           }
         }
       } else {
@@ -902,120 +777,109 @@ export function LogSelector({
         if (isAgenticSearchOptionFocused) {
           if (key.return) {
             // Trigger agentic search
-            void handleAgenticSearch()
-            setIsAgenticSearchOptionFocused(false)
-            return
+            void handleAgenticSearch();
+            setIsAgenticSearchOptionFocused(false);
+            return;
           } else if (key.downArrow) {
             // Move focus to the session list
-            setIsAgenticSearchOptionFocused(false)
-            return
+            setIsAgenticSearchOptionFocused(false);
+            return;
           } else if (key.upArrow) {
             // Go back to search mode
-            setViewMode('search')
-            setIsAgenticSearchOptionFocused(false)
-            return
+            setViewMode('search');
+            setIsAgenticSearchOptionFocused(false);
+            return;
           }
         }
 
         // Handle tab cycling for tag tabs
         if (hasTags && key.tab) {
-          const offset = key.shift ? -1 : 1
+          const offset = key.shift ? -1 : 1;
           setSelectedTagIndex(prev => {
-            const current = prev < tagTabs.length ? prev : 0
-            const newIndex =
-              (current + tagTabs.length + offset) % tagTabs.length
-            const newTab = tagTabs[newIndex]
+            const current = prev < tagTabs.length ? prev : 0;
+            const newIndex = (current + tagTabs.length + offset) % tagTabs.length;
+            const newTab = tagTabs[newIndex];
             logEvent('tengu_session_tag_filter_changed', {
               is_all: newTab === 'All',
               tag_count: uniqueTags.length,
-            })
-            return newIndex
-          })
-          return
+            });
+            return newIndex;
+          });
+          return;
         }
 
-        const keyIsNotCtrlOrMeta = !key.ctrl && !key.meta
-        const lowerInput = input.toLowerCase()
+        const keyIsNotCtrlOrMeta = !key.ctrl && !key.meta;
+        const lowerInput = input.toLowerCase();
         // Ctrl+letter shortcuts for actions (freeing up plain letters for type-to-search)
         if (lowerInput === 'a' && key.ctrl && onToggleAllProjects) {
-          onToggleAllProjects()
+          onToggleAllProjects();
           logEvent('tengu_session_all_projects_toggled', {
             enabled: !showAllProjects,
-          })
+          });
         } else if (lowerInput === 'b' && key.ctrl) {
-          const newEnabled = !branchFilterEnabled
-          setBranchFilterEnabled(newEnabled)
+          const newEnabled = !branchFilterEnabled;
+          setBranchFilterEnabled(newEnabled);
           logEvent('tengu_session_branch_filter_toggled', {
             enabled: newEnabled,
-          })
+          });
         } else if (lowerInput === 'w' && key.ctrl && hasMultipleWorktrees) {
-          const newValue = !showAllWorktrees
-          setShowAllWorktrees(newValue)
+          const newValue = !showAllWorktrees;
+          setShowAllWorktrees(newValue);
           logEvent('tengu_session_worktree_filter_toggled', {
             enabled: newValue,
-          })
+          });
         } else if (lowerInput === '/' && keyIsNotCtrlOrMeta) {
-          setViewMode('search')
-          logEvent('tengu_session_search_toggled', { enabled: true })
+          setViewMode('search');
+          logEvent('tengu_session_search_toggled', { enabled: true });
         } else if (lowerInput === 'r' && key.ctrl && focusedLog) {
-          setViewMode('rename')
-          setRenameValue('')
-          logEvent('tengu_session_rename_started', {})
+          setViewMode('rename');
+          setRenameValue('');
+          logEvent('tengu_session_rename_started', {});
         } else if (lowerInput === 'v' && key.ctrl && focusedLog) {
-          setPreviewLog(focusedLog)
-          setViewMode('preview')
+          setPreviewLog(focusedLog);
+          setViewMode('preview');
           logEvent('tengu_session_preview_opened', {
             messageCount: focusedLog.messageCount,
-          })
-        } else if (
-          focusedLog &&
-          keyIsNotCtrlOrMeta &&
-          input.length > 0 &&
-          !/^\s+$/.test(input)
-        ) {
+          });
+        } else if (focusedLog && keyIsNotCtrlOrMeta && input.length > 0 && !/^\s+$/.test(input)) {
           // Any printable character enters search mode and starts typing
-          setViewMode('search')
-          setSearchQuery(input)
-          logEvent('tengu_session_search_toggled', { enabled: true })
+          setViewMode('search');
+          setSearchQuery(input);
+          logEvent('tengu_session_search_toggled', { enabled: true });
         }
       }
     },
     { isActive: true },
-  )
+  );
 
-  const filterIndicators = []
+  const filterIndicators = [];
   if (branchFilterEnabled && currentBranch) {
-    filterIndicators.push(currentBranch)
+    filterIndicators.push(currentBranch);
   }
   if (hasMultipleWorktrees && !showAllWorktrees) {
-    filterIndicators.push('current worktree')
+    filterIndicators.push('current worktree');
   }
 
-  const showAdditionalFilterLine =
-    filterIndicators.length > 0 && viewMode !== 'search'
+  const showAdditionalFilterLine = filterIndicators.length > 0 && viewMode !== 'search';
 
   // Search box takes 3 lines (border top, content, border bottom)
-  const searchBoxLines = 3
-  const headerLines =
-    5 + searchBoxLines + (showAdditionalFilterLine ? 1 : 0) + tagTabsLines
-  const footerLines = 2
-  const visibleCount = Math.max(
-    1,
-    Math.floor((maxHeight - headerLines - footerLines) / 3),
-  )
+  const searchBoxLines = 3;
+  const headerLines = 5 + searchBoxLines + (showAdditionalFilterLine ? 1 : 0) + tagTabsLines;
+  const footerLines = 2;
+  const visibleCount = Math.max(1, Math.floor((maxHeight - headerLines - footerLines) / 3));
 
   // Progressive loading: request more logs when user scrolls near the end
   React.useEffect(() => {
-    if (!onLoadMore) return
-    const buffer = visibleCount * 2
+    if (!onLoadMore) return;
+    const buffer = visibleCount * 2;
     if (focusedIndex + buffer >= displayedLogs.length) {
-      onLoadMore(visibleCount * 3)
+      onLoadMore(visibleCount * 3);
     }
-  }, [focusedIndex, visibleCount, displayedLogs.length, onLoadMore])
+  }, [focusedIndex, visibleCount, displayedLogs.length, onLoadMore]);
 
   // Early return if no logs
   if (logs.length === 0) {
-    return null
+    return null;
   }
 
   // Show preview mode if active
@@ -1024,12 +888,12 @@ export function LogSelector({
       <SessionPreview
         log={previewLog}
         onExit={() => {
-          setViewMode('list')
-          setPreviewLog(null)
+          setViewMode('list');
+          setPreviewLog(null);
         }}
         onSelect={onSelect}
       />
-    )
+    );
   }
 
   return (
@@ -1087,14 +951,13 @@ export function LogSelector({
       )}
 
       {/* Results header when agentic search completed with results */}
-      {agenticSearchState.status === 'results' &&
-        agenticSearchState.results.length > 0 && (
-          <Box paddingLeft={1} marginBottom={1} flexShrink={0}>
-            <Text dimColor italic>
-              Claude found these results:
-            </Text>
-          </Box>
-        )}
+      {agenticSearchState.status === 'results' && agenticSearchState.results.length > 0 && (
+        <Box paddingLeft={1} marginBottom={1} flexShrink={0}>
+          <Text dimColor italic>
+            Claude found these results:
+          </Text>
+        </Box>
+      )}
 
       {/* Fallback message when agentic search found no results and deep search also has nothing */}
       {agenticSearchState.status === 'results' &&
@@ -1125,15 +988,10 @@ export function LogSelector({
         agenticSearchState.status !== 'error' && (
           <Box flexShrink={0} flexDirection="column">
             <Box flexDirection="row" gap={1}>
-              <Text
-                color={isAgenticSearchOptionFocused ? 'suggestion' : undefined}
-              >
+              <Text color={isAgenticSearchOptionFocused ? 'suggestion' : undefined}>
                 {isAgenticSearchOptionFocused ? figures.pointer : ' '}
               </Text>
-              <Text
-                color={isAgenticSearchOptionFocused ? 'suggestion' : undefined}
-                bold={isAgenticSearchOptionFocused}
-              >
+              <Text color={isAgenticSearchOptionFocused ? 'suggestion' : undefined} bold={isAgenticSearchOptionFocused}>
                 Search deeply using Claude →
               </Text>
             </Box>
@@ -1142,8 +1000,7 @@ export function LogSelector({
         )}
 
       {/* Hide session list when agentic search is in progress */}
-      {agenticSearchState.status === 'searching' ? null : viewMode ===
-          'rename' && focusedLog ? (
+      {agenticSearchState.status === 'searching' ? null : viewMode === 'rename' && focusedLog ? (
         <Box paddingLeft={2} flexDirection="column">
           <Text bold>Rename session:</Text>
           <Box paddingTop={1}>
@@ -1151,10 +1008,7 @@ export function LogSelector({
               value={renameValue}
               onChange={setRenameValue}
               onSubmit={handleRenameSubmit}
-              placeholder={getLogDisplayTitle(
-                focusedLog!,
-                'Enter new session name',
-              )}
+              placeholder={getLogDisplayTitle(focusedLog!, 'Enter new session name')}
               columns={columns}
               cursorOffset={renameCursorOffset}
               onChangeCursorOffset={setRenameCursorOffset}
@@ -1166,7 +1020,7 @@ export function LogSelector({
         <TreeSelect
           nodes={treeNodes}
           onSelect={node => {
-            onSelect(node.value.log)
+            onSelect(node.value.log);
           }}
           onFocus={handleTreeSelectFocus}
           onCancel={onCancel}
@@ -1178,36 +1032,27 @@ export function LogSelector({
           isNodeExpanded={nodeId => {
             // Always expand if in search or branch filter mode
             if (viewMode === 'search' || branchFilterEnabled) {
-              return true
+              return true;
             }
             // Extract sessionId from node ID (format: "group:sessionId")
-            const sessionId =
-              typeof nodeId === 'string' && nodeId.startsWith('group:')
-                ? nodeId.substring(6)
-                : null
-            return sessionId ? expandedGroupSessionIds.has(sessionId) : false
+            const sessionId = typeof nodeId === 'string' && nodeId.startsWith('group:') ? nodeId.substring(6) : null;
+            return sessionId ? expandedGroupSessionIds.has(sessionId) : false;
           }}
           onExpand={nodeId => {
-            const sessionId =
-              typeof nodeId === 'string' && nodeId.startsWith('group:')
-                ? nodeId.substring(6)
-                : null
+            const sessionId = typeof nodeId === 'string' && nodeId.startsWith('group:') ? nodeId.substring(6) : null;
             if (sessionId) {
-              setExpandedGroupSessionIds(prev => new Set(prev).add(sessionId))
-              logEvent('tengu_session_group_expanded', {})
+              setExpandedGroupSessionIds(prev => new Set(prev).add(sessionId));
+              logEvent('tengu_session_group_expanded', {});
             }
           }}
           onCollapse={nodeId => {
-            const sessionId =
-              typeof nodeId === 'string' && nodeId.startsWith('group:')
-                ? nodeId.substring(6)
-                : null
+            const sessionId = typeof nodeId === 'string' && nodeId.startsWith('group:') ? nodeId.substring(6) : null;
             if (sessionId) {
               setExpandedGroupSessionIds(prev => {
-                const newSet = new Set(prev)
-                newSet.delete(sessionId)
-                return newSet
-              })
+                const newSet = new Set(prev);
+                newSet.delete(sessionId);
+                return newSet;
+              });
             }
           }}
           onUpFromFirstItem={enterSearchMode}
@@ -1217,10 +1062,10 @@ export function LogSelector({
           options={flatOptions}
           onChange={value => {
             // Old flat list mode - index directly maps to displayedLogs
-            const itemIndex = parseInt(value, 10)
-            const log = displayedLogs[itemIndex]
+            const itemIndex = parseInt(value, 10);
+            const log = displayedLogs[itemIndex];
             if (log) {
-              onSelect(log)
+              onSelect(log);
             }
           }}
           visibleOptionCount={visibleCount}
@@ -1275,18 +1120,9 @@ export function LogSelector({
         ) : viewMode === 'search' ? (
           <Text dimColor>
             <Byline>
-              <Text>
-                {isSearching && isDeepSearchEnabled
-                  ? 'Searching…'
-                  : 'Type to Search'}
-              </Text>
+              <Text>{isSearching && isDeepSearchEnabled ? 'Searching…' : 'Type to Search'}</Text>
               <KeyboardShortcutHint shortcut="Enter" action="select" />
-              <ConfigurableShortcutHint
-                action="confirm:no"
-                context="Confirmation"
-                fallback="Esc"
-                description="clear"
-              />
+              <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="clear" />
             </Byline>
           </Text>
         ) : (
@@ -1298,12 +1134,7 @@ export function LogSelector({
                   action={`show ${showAllProjects ? 'current dir' : 'all projects'}`}
                 />
               )}
-              {currentBranch && (
-                <KeyboardShortcutHint
-                  shortcut="Ctrl+B"
-                  action="toggle branch"
-                />
-              )}
+              {currentBranch && <KeyboardShortcutHint shortcut="Ctrl+B" action="toggle branch" />}
               {hasMultipleWorktrees && (
                 <KeyboardShortcutHint
                   shortcut="Ctrl+W"
@@ -1319,15 +1150,13 @@ export function LogSelector({
                 fallback="Esc"
                 description="cancel"
               />
-              {getExpandCollapseHint() && (
-                <Text>{getExpandCollapseHint()}</Text>
-              )}
+              {getExpandCollapseHint() && <Text>{getExpandCollapseHint()}</Text>}
             </Byline>
           </Text>
         )}
       </Box>
     </Box>
-  )
+  );
 }
 
 /**
@@ -1337,32 +1166,32 @@ export function LogSelector({
 function extractSearchableText(message: SerializedMessage): string {
   // Only extract from user and assistant messages that have content
   if (message.type !== 'user' && message.type !== 'assistant') {
-    return ''
+    return '';
   }
 
-  const content = 'message' in message ? message.message?.content : undefined
-  if (!content) return ''
+  const content = 'message' in message ? message.message?.content : undefined;
+  if (!content) return '';
 
   // Handle string content (simple messages)
   if (typeof content === 'string') {
-    return content
+    return content;
   }
 
   // Handle array of content blocks
   if (Array.isArray(content)) {
     return content
       .map(block => {
-        if (typeof block === 'string') return block
-        if ('text' in block && typeof block.text === 'string') return block.text
-        return ''
+        if (typeof block === 'string') return block;
+        if ('text' in block && typeof block.text === 'string') return block.text;
+        return '';
         // we don't return thinking blocks and tool names here;
         // they're not useful for search, as they can add noise to the fuzzy matching
       })
       .filter(Boolean)
-      .join(' ')
+      .join(' ');
   }
 
-  return ''
+  return '';
 }
 
 /**
@@ -1373,14 +1202,8 @@ function buildSearchableText(log: LogOption): string {
   const searchableMessages =
     log.messages.length <= DEEP_SEARCH_MAX_MESSAGES
       ? log.messages
-      : [
-          ...log.messages.slice(0, DEEP_SEARCH_CROP_SIZE),
-          ...log.messages.slice(-DEEP_SEARCH_CROP_SIZE),
-        ]
-  const messageText = searchableMessages
-    .map(extractSearchableText)
-    .filter(Boolean)
-    .join(' ')
+      : [...log.messages.slice(0, DEEP_SEARCH_CROP_SIZE), ...log.messages.slice(-DEEP_SEARCH_CROP_SIZE)];
+  const messageText = searchableMessages.map(extractSearchableText).filter(Boolean).join(' ');
 
   const metadata = [
     log.customTitle,
@@ -1392,50 +1215,42 @@ function buildSearchableText(log: LogOption): string {
     log.prRepository,
   ]
     .filter(Boolean)
-    .join(' ')
+    .join(' ');
 
-  const fullText = `${metadata} ${messageText}`.trim()
-  return fullText.length > DEEP_SEARCH_MAX_TEXT_LENGTH
-    ? fullText.slice(0, DEEP_SEARCH_MAX_TEXT_LENGTH)
-    : fullText
+  const fullText = `${metadata} ${messageText}`.trim();
+  return fullText.length > DEEP_SEARCH_MAX_TEXT_LENGTH ? fullText.slice(0, DEEP_SEARCH_MAX_TEXT_LENGTH) : fullText;
 }
 
-function groupLogsBySessionId(
-  filteredLogs: LogOption[],
-): Map<string, LogOption[]> {
-  const groups = new Map<string, LogOption[]>()
+function groupLogsBySessionId(filteredLogs: LogOption[]): Map<string, LogOption[]> {
+  const groups = new Map<string, LogOption[]>();
 
   for (const log of filteredLogs) {
-    const sessionId = getSessionIdFromLog(log)
+    const sessionId = getSessionIdFromLog(log);
     if (sessionId) {
-      const existing = groups.get(sessionId)
+      const existing = groups.get(sessionId);
       if (existing) {
-        existing.push(log)
+        existing.push(log);
       } else {
-        groups.set(sessionId, [log])
+        groups.set(sessionId, [log]);
       }
     }
   }
 
   // Sort logs within each group by modified date (newest first)
-  groups.forEach(logs =>
-    logs.sort(
-      (a, b) => new Date(b.modified).getTime() - new Date(a.modified).getTime(),
-    ),
-  )
+  groups.forEach(logs => logs.sort((a, b) => new Date(b.modified).getTime() - new Date(a.modified).getTime()));
 
-  return groups
+  return groups;
 }
 
 /**
  * Get unique tags from a list of logs, sorted alphabetically
  */
 function getUniqueTags(logs: LogOption[]): string[] {
-  const tags = new Set<string>()
+  const tags = new Set<string>();
   for (const log of logs) {
     if (log.tag) {
-      tags.add(log.tag)
+      tags.add(log.tag);
     }
   }
-  return Array.from(tags).sort((a, b) => a.localeCompare(b))
+  return Array.from(tags).sort((a, b) => a.localeCompare(b));
 }
diff --git a/src/components/LogoV2/AnimatedAsterisk.tsx b/src/components/LogoV2/AnimatedAsterisk.tsx
index 9e72baaa2..d8bb2b783 100644
--- a/src/components/LogoV2/AnimatedAsterisk.tsx
+++ b/src/components/LogoV2/AnimatedAsterisk.tsx
@@ -1,57 +1,51 @@
-import * as React from 'react'
-import { useEffect, useRef, useState } from 'react'
-import { TEARDROP_ASTERISK } from '../../constants/figures.js'
-import { Box, Text, useAnimationFrame } from '@anthropic/ink'
-import { getInitialSettings } from '../../utils/settings/settings.js'
-import { hueToRgb, toRGBColor } from '../Spinner/utils.js'
+import * as React from 'react';
+import { useEffect, useRef, useState } from 'react';
+import { TEARDROP_ASTERISK } from '../../constants/figures.js';
+import { Box, Text, useAnimationFrame } from '@anthropic/ink';
+import { getInitialSettings } from '../../utils/settings/settings.js';
+import { hueToRgb, toRGBColor } from '../Spinner/utils.js';
 
-const SWEEP_DURATION_MS = 1500
-const SWEEP_COUNT = 2
-const TOTAL_ANIMATION_MS = SWEEP_DURATION_MS * SWEEP_COUNT
-const SETTLED_GREY = toRGBColor({ r: 153, g: 153, b: 153 })
+const SWEEP_DURATION_MS = 1500;
+const SWEEP_COUNT = 2;
+const TOTAL_ANIMATION_MS = SWEEP_DURATION_MS * SWEEP_COUNT;
+const SETTLED_GREY = toRGBColor({ r: 153, g: 153, b: 153 });
 
-export function AnimatedAsterisk({
-  char = TEARDROP_ASTERISK,
-}: {
-  char?: string
-}): React.ReactNode {
+export function AnimatedAsterisk({ char = TEARDROP_ASTERISK }: { char?: string }): React.ReactNode {
   // Read prefersReducedMotion once at mount — no useSettings() subscription,
   // since that would re-render whenever settings change.
-  const [reducedMotion] = useState(
-    () => getInitialSettings().prefersReducedMotion ?? false,
-  )
-  const [done, setDone] = useState(reducedMotion)
+  const [reducedMotion] = useState(() => getInitialSettings().prefersReducedMotion ?? false);
+  const [done, setDone] = useState(reducedMotion);
   // useAnimationFrame's clock is shared — capture our start offset so the
   // sweep always begins at hue 0 regardless of when we mount.
-  const startTimeRef = useRef<number | null>(null)
+  const startTimeRef = useRef<number | null>(null);
   // Wire the ref so useAnimationFrame's viewport-pause kicks in: if the
   // user submits a message before the sweep finishes, the clock stops
   // automatically once this row enters scrollback (prevents flicker).
-  const [ref, time] = useAnimationFrame(done ? null : 50)
+  const [ref, time] = useAnimationFrame(done ? null : 50);
 
   useEffect(() => {
-    if (done) return
-    const t = setTimeout(setDone, TOTAL_ANIMATION_MS, true)
-    return () => clearTimeout(t)
-  }, [done])
+    if (done) return;
+    const t = setTimeout(setDone, TOTAL_ANIMATION_MS, true);
+    return () => clearTimeout(t);
+  }, [done]);
 
   if (done) {
     return (
       <Box ref={ref}>
         <Text color={SETTLED_GREY}>{char}</Text>
       </Box>
-    )
+    );
   }
 
   if (startTimeRef.current === null) {
-    startTimeRef.current = time
+    startTimeRef.current = time;
   }
-  const elapsed = time - startTimeRef.current
-  const hue = ((elapsed / SWEEP_DURATION_MS) * 360) % 360
+  const elapsed = time - startTimeRef.current;
+  const hue = ((elapsed / SWEEP_DURATION_MS) * 360) % 360;
 
   return (
     <Box ref={ref}>
       <Text color={toRGBColor(hueToRgb(hue))}>{char}</Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/LogoV2/AnimatedClawd.tsx b/src/components/LogoV2/AnimatedClawd.tsx
index 5ad68babb..741f801f0 100644
--- a/src/components/LogoV2/AnimatedClawd.tsx
+++ b/src/components/LogoV2/AnimatedClawd.tsx
@@ -1,14 +1,14 @@
-import * as React from 'react'
-import { useEffect, useRef, useState } from 'react'
-import { Box } from '@anthropic/ink'
-import { getInitialSettings } from '../../utils/settings/settings.js'
-import { Clawd, type ClawdPose } from './Clawd.js'
+import * as React from 'react';
+import { useEffect, useRef, useState } from 'react';
+import { Box } from '@anthropic/ink';
+import { getInitialSettings } from '../../utils/settings/settings.js';
+import { Clawd, type ClawdPose } from './Clawd.js';
 
-type Frame = { pose: ClawdPose; offset: number }
+type Frame = { pose: ClawdPose; offset: number };
 
 /** Hold a pose for n frames (60ms each). */
 function hold(pose: ClawdPose, offset: number, frames: number): Frame[] {
-  return Array.from({ length: frames }, () => ({ pose, offset }))
+  return Array.from({ length: frames }, () => ({ pose, offset }));
 }
 
 // Offset semantics: marginTop in a fixed-height-3 container. 0 = normal,
@@ -24,21 +24,21 @@ const JUMP_WAVE: readonly Frame[] = [
   ...hold('default', 1, 2), // crouch again
   ...hold('arms-up', 0, 3), // spring!
   ...hold('default', 0, 1),
-]
+];
 
 // Click animation: glance right, then left, then back.
 const LOOK_AROUND: readonly Frame[] = [
   ...hold('look-right', 0, 5),
   ...hold('look-left', 0, 5),
   ...hold('default', 0, 1),
-]
+];
 
-const CLICK_ANIMATIONS: readonly (readonly Frame[])[] = [JUMP_WAVE, LOOK_AROUND]
+const CLICK_ANIMATIONS: readonly (readonly Frame[])[] = [JUMP_WAVE, LOOK_AROUND];
 
-const IDLE: Frame = { pose: 'default', offset: 0 }
-const FRAME_MS = 60
-const incrementFrame = (i: number) => i + 1
-const CLAWD_HEIGHT = 3
+const IDLE: Frame = { pose: 'default', offset: 0 };
+const FRAME_MS = 60;
+const incrementFrame = (i: number) => i + 1;
+const CLAWD_HEIGHT = 3;
 
 /**
  * Clawd with click-triggered animations (crouch-jump with arms up, or
@@ -49,48 +49,44 @@ const CLAWD_HEIGHT = 3
  * elsewhere this renders and behaves identically to plain `<Clawd />`.
  */
 export function AnimatedClawd(): React.ReactNode {
-  const { pose, bounceOffset, onClick } = useClawdAnimation()
+  const { pose, bounceOffset, onClick } = useClawdAnimation();
   return (
     <Box height={CLAWD_HEIGHT} flexDirection="column" onClick={onClick}>
       <Box marginTop={bounceOffset} flexShrink={0}>
         <Clawd pose={pose} />
       </Box>
     </Box>
-  )
+  );
 }
 
 function useClawdAnimation(): {
-  pose: ClawdPose
-  bounceOffset: number
-  onClick: () => void
+  pose: ClawdPose;
+  bounceOffset: number;
+  onClick: () => void;
 } {
   // Read once at mount — no useSettings() subscription, since that would
   // re-render on any settings change.
-  const [reducedMotion] = useState(
-    () => getInitialSettings().prefersReducedMotion ?? false,
-  )
-  const [frameIndex, setFrameIndex] = useState(-1)
-  const sequenceRef = useRef<readonly Frame[]>(JUMP_WAVE)
+  const [reducedMotion] = useState(() => getInitialSettings().prefersReducedMotion ?? false);
+  const [frameIndex, setFrameIndex] = useState(-1);
+  const sequenceRef = useRef<readonly Frame[]>(JUMP_WAVE);
 
   const onClick = () => {
-    if (reducedMotion || frameIndex !== -1) return
-    sequenceRef.current =
-      CLICK_ANIMATIONS[Math.floor(Math.random() * CLICK_ANIMATIONS.length)]!
-    setFrameIndex(0)
-  }
+    if (reducedMotion || frameIndex !== -1) return;
+    sequenceRef.current = CLICK_ANIMATIONS[Math.floor(Math.random() * CLICK_ANIMATIONS.length)]!;
+    setFrameIndex(0);
+  };
 
   useEffect(() => {
-    if (frameIndex === -1) return
+    if (frameIndex === -1) return;
     if (frameIndex >= sequenceRef.current.length) {
-      setFrameIndex(-1)
-      return
+      setFrameIndex(-1);
+      return;
     }
-    const timer = setTimeout(setFrameIndex, FRAME_MS, incrementFrame)
-    return () => clearTimeout(timer)
-  }, [frameIndex])
+    const timer = setTimeout(setFrameIndex, FRAME_MS, incrementFrame);
+    return () => clearTimeout(timer);
+  }, [frameIndex]);
 
-  const seq = sequenceRef.current
-  const current =
-    frameIndex >= 0 && frameIndex < seq.length ? seq[frameIndex]! : IDLE
-  return { pose: current.pose, bounceOffset: current.offset, onClick }
+  const seq = sequenceRef.current;
+  const current = frameIndex >= 0 && frameIndex < seq.length ? seq[frameIndex]! : IDLE;
+  return { pose: current.pose, bounceOffset: current.offset, onClick };
 }
diff --git a/src/components/LogoV2/ChannelsNotice.tsx b/src/components/LogoV2/ChannelsNotice.tsx
index c58f400c1..7740f320c 100644
--- a/src/components/LogoV2/ChannelsNotice.tsx
+++ b/src/components/LogoV2/ChannelsNotice.tsx
@@ -4,23 +4,16 @@
 // docs/feature-gating.md). Do NOT import this module statically from
 // unguarded code.
 
-import * as React from 'react'
-import { useState } from 'react'
-import {
-  type ChannelEntry,
-  getAllowedChannels,
-  getHasDevChannels,
-} from '../../bootstrap/state.js'
-import { Box, Text } from '@anthropic/ink'
-import { isChannelsEnabled } from '../../services/mcp/channelAllowlist.js'
-import { getEffectiveChannelAllowlist } from '../../services/mcp/channelNotification.js'
-import { getMcpConfigsByScope } from '../../services/mcp/config.js'
-import {
-  getClaudeAIOAuthTokens,
-  getSubscriptionType,
-} from '../../utils/auth.js'
-import { loadInstalledPluginsV2 } from '../../utils/plugins/installedPluginsManager.js'
-import { getSettingsForSource } from '../../utils/settings/settings.js'
+import * as React from 'react';
+import { useState } from 'react';
+import { type ChannelEntry, getAllowedChannels, getHasDevChannels } from '../../bootstrap/state.js';
+import { Box, Text } from '@anthropic/ink';
+import { isChannelsEnabled } from '../../services/mcp/channelAllowlist.js';
+import { getEffectiveChannelAllowlist } from '../../services/mcp/channelNotification.js';
+import { getMcpConfigsByScope } from '../../services/mcp/config.js';
+import { getClaudeAIOAuthTokens, getSubscriptionType } from '../../utils/auth.js';
+import { loadInstalledPluginsV2 } from '../../utils/plugins/installedPluginsManager.js';
+import { getSettingsForSource } from '../../utils/settings/settings.js';
 
 export function ChannelsNotice(): React.ReactNode {
   // Snapshot all reads at mount. This notice enters scrollback immediately
@@ -29,46 +22,42 @@ export function ChannelsNotice(): React.ReactNode {
   // (session cache updated by background polling / /login), and
   // isChannelsEnabled (GrowthBook 5-min refresh) must be captured once
   // so a later re-render cannot flip branches.
-  const [{ channels, disabled, noAuth, policyBlocked, list, unmatched }] =
-    useState(() => {
-      const ch = getAllowedChannels()
-      if (ch.length === 0)
-        return {
-          channels: ch,
-          disabled: false,
-          noAuth: false,
-          policyBlocked: false,
-          list: '',
-          unmatched: [] as Unmatched[],
-        }
-      const l = ch.map(formatEntry).join(', ')
-      const sub = getSubscriptionType()
-      const managed = sub === 'team' || sub === 'enterprise'
-      const policy = getSettingsForSource('policySettings')
-      const allowlist = getEffectiveChannelAllowlist(
-        sub,
-        policy?.allowedChannelPlugins,
-      )
+  const [{ channels, disabled, noAuth, policyBlocked, list, unmatched }] = useState(() => {
+    const ch = getAllowedChannels();
+    if (ch.length === 0)
       return {
         channels: ch,
-        disabled: !isChannelsEnabled(),
-        noAuth: !getClaudeAIOAuthTokens()?.accessToken,
-        policyBlocked: managed && policy?.channelsEnabled !== true,
-        list: l,
-        unmatched: findUnmatched(ch, allowlist),
-      }
-    })
-  if (channels.length === 0) return null
+        disabled: false,
+        noAuth: false,
+        policyBlocked: false,
+        list: '',
+        unmatched: [] as Unmatched[],
+      };
+    const l = ch.map(formatEntry).join(', ');
+    const sub = getSubscriptionType();
+    const managed = sub === 'team' || sub === 'enterprise';
+    const policy = getSettingsForSource('policySettings');
+    const allowlist = getEffectiveChannelAllowlist(sub, policy?.allowedChannelPlugins);
+    return {
+      channels: ch,
+      disabled: !isChannelsEnabled(),
+      noAuth: !getClaudeAIOAuthTokens()?.accessToken,
+      policyBlocked: managed && policy?.channelsEnabled !== true,
+      list: l,
+      unmatched: findUnmatched(ch, allowlist),
+    };
+  });
+  if (channels.length === 0) return null;
 
   // When both flags are passed, the list mixes entries and a single flag
   // name would be wrong for half of it. entry.dev distinguishes origin.
-  const hasNonDev = channels.some(c => !c.dev)
+  const hasNonDev = channels.some(c => !c.dev);
   const flag =
     getHasDevChannels() && hasNonDev
       ? 'Channels'
       : getHasDevChannels()
         ? '--dangerously-load-development-channels'
-        : '--channels'
+        : '--channels';
 
   if (disabled) {
     return (
@@ -78,7 +67,7 @@ export function ChannelsNotice(): React.ReactNode {
         </Text>
         <Text dimColor>Channels are not currently available</Text>
       </Box>
-    )
+    );
   }
 
   if (noAuth) {
@@ -87,11 +76,9 @@ export function ChannelsNotice(): React.ReactNode {
         <Text color="error">
           {flag} ignored ({list})
         </Text>
-        <Text dimColor>
-          Channels require claude.ai authentication · run /login, then restart
-        </Text>
+        <Text dimColor>Channels require claude.ai authentication · run /login, then restart</Text>
       </Box>
-    )
+    );
   }
 
   if (policyBlocked) {
@@ -101,17 +88,14 @@ export function ChannelsNotice(): React.ReactNode {
           {flag} blocked by org policy ({list})
         </Text>
         <Text dimColor>Inbound messages will be silently dropped</Text>
-        <Text dimColor>
-          Have an administrator set channelsEnabled: true in managed settings to
-          enable
-        </Text>
+        <Text dimColor>Have an administrator set channelsEnabled: true in managed settings to enable</Text>
         {unmatched.map(u => (
           <Text key={`${formatEntry(u.entry)}:${u.why}`} color="warning">
             {formatEntry(u.entry)} · {u.why}
           </Text>
         ))}
       </Box>
-    )
+    );
   }
 
   // "Listening for" not "active" — at this point we only know the allowlist
@@ -121,9 +105,8 @@ export function ChannelsNotice(): React.ReactNode {
     <Box paddingLeft={2} flexDirection="column">
       <Text color="error">Listening for channel messages from: {list}</Text>
       <Text dimColor>
-        Experimental · inbound messages will be pushed into this session, this
-        carries prompt injection risks. Restart Claude Code without {flag} to
-        disable.
+        Experimental · inbound messages will be pushed into this session, this carries prompt injection risks. Restart
+        Claude Code without {flag} to disable.
       </Text>
       {unmatched.map(u => (
         <Text key={`${formatEntry(u.entry)}:${u.why}`} color="warning">
@@ -131,16 +114,14 @@ export function ChannelsNotice(): React.ReactNode {
         </Text>
       ))}
     </Box>
-  )
+  );
 }
 
 function formatEntry(c: ChannelEntry): string {
-  return c.kind === 'plugin'
-    ? `plugin:${c.name}@${c.marketplace}`
-    : `server:${c.name}`
+  return c.kind === 'plugin' ? `plugin:${c.name}@${c.marketplace}` : `server:${c.name}`;
 }
 
-type Unmatched = { entry: ChannelEntry; why: string }
+type Unmatched = { entry: ChannelEntry; why: string };
 
 function findUnmatched(
   entries: readonly ChannelEntry[],
@@ -149,60 +130,50 @@ function findUnmatched(
   // Server-kind: build one Set from all scopes up front. getMcpConfigsByScope
   // is not cached (project scope walks the dir tree); getMcpConfigByName would
   // redo that walk per entry.
-  const scopes = ['enterprise', 'user', 'project', 'local'] as const
-  const configured = new Set<string>()
+  const scopes = ['enterprise', 'user', 'project', 'local'] as const;
+  const configured = new Set<string>();
   for (const scope of scopes) {
     for (const name of Object.keys(getMcpConfigsByScope(scope).servers)) {
-      configured.add(name)
+      configured.add(name);
     }
   }
 
   // Plugin-kind installed check: installed_plugins.json keys are
   // `name@marketplace`. loadInstalledPluginsV2 is cached.
-  const installedPluginIds = new Set(
-    Object.keys(loadInstalledPluginsV2().plugins),
-  )
+  const installedPluginIds = new Set(Object.keys(loadInstalledPluginsV2().plugins));
 
   // Plugin-kind allowlist check: same {marketplace, plugin} test as the
   // gate at channelNotification.ts. entry.dev bypasses (dev flag opts out
   // of the allowlist). Org list replaces ledger when set (team/enterprise).
   // GrowthBook _CACHED_MAY_BE_STALE — cold cache yields [] so every plugin
   // entry warns; same tradeoff the gate already accepts.
-  const { entries: allowed, source } = allowlist
+  const { entries: allowed, source } = allowlist;
 
   // Independent ifs — a plugin entry that's both uninstalled AND
   // unlisted shows two lines. Server kind checks config + dev flag.
-  const out: Unmatched[] = []
+  const out: Unmatched[] = [];
   for (const entry of entries) {
     if (entry.kind === 'server') {
       if (!configured.has(entry.name)) {
-        out.push({ entry, why: 'no MCP server configured with that name' })
+        out.push({ entry, why: 'no MCP server configured with that name' });
       }
       if (!entry.dev) {
         out.push({
           entry,
           why: 'server: entries need --dangerously-load-development-channels',
-        })
+        });
       }
-      continue
+      continue;
     }
     if (!installedPluginIds.has(`${entry.name}@${entry.marketplace}`)) {
-      out.push({ entry, why: 'plugin not installed' })
+      out.push({ entry, why: 'plugin not installed' });
     }
-    if (
-      !entry.dev &&
-      !allowed.some(
-        e => e.plugin === entry.name && e.marketplace === entry.marketplace,
-      )
-    ) {
+    if (!entry.dev && !allowed.some(e => e.plugin === entry.name && e.marketplace === entry.marketplace)) {
       out.push({
         entry,
-        why:
-          source === 'org'
-            ? "not on your org's approved channels list"
-            : 'not on the approved channels allowlist',
-      })
+        why: source === 'org' ? "not on your org's approved channels list" : 'not on the approved channels allowlist',
+      });
     }
   }
-  return out
+  return out;
 }
diff --git a/src/components/LogoV2/Clawd.tsx b/src/components/LogoV2/Clawd.tsx
index 6969466bc..55bf67cb6 100644
--- a/src/components/LogoV2/Clawd.tsx
+++ b/src/components/LogoV2/Clawd.tsx
@@ -1,16 +1,16 @@
-import * as React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { env } from '../../utils/env.js'
+import * as React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { env } from '../../utils/env.js';
 
 export type ClawdPose =
   | 'default'
   | 'arms-up' // both arms raised (used during jump)
   | 'look-left' // both pupils shifted left
-  | 'look-right' // both pupils shifted right
+  | 'look-right'; // both pupils shifted right
 
 type Props = {
-  pose?: ClawdPose
-}
+  pose?: ClawdPose;
+};
 
 // Standard-terminal pose fragments. Each row is split into segments so we can
 // vary only the parts that change (eyes, arms) while keeping the body/bg spans
@@ -23,23 +23,23 @@ type Props = {
 // default (▛/▜, bottom pupils) — otherwise only one eye would appear to move.
 type Segments = {
   /** row 1 left (no bg): optional raised arm + side */
-  r1L: string
+  r1L: string;
   /** row 1 eyes (with bg): left-eye, forehead, right-eye */
-  r1E: string
+  r1E: string;
   /** row 1 right (no bg): side + optional raised arm */
-  r1R: string
+  r1R: string;
   /** row 2 left (no bg): arm + body curve */
-  r2L: string
+  r2L: string;
   /** row 2 right (no bg): body curve + arm */
-  r2R: string
-}
+  r2R: string;
+};
 
 const POSES: Record<ClawdPose, Segments> = {
   default: { r1L: ' ▐', r1E: '▛███▜', r1R: '▌', r2L: '▝▜', r2R: '▛▘' },
   'look-left': { r1L: ' ▐', r1E: '▟███▟', r1R: '▌', r2L: '▝▜', r2R: '▛▘' },
   'look-right': { r1L: ' ▐', r1E: '▙███▙', r1R: '▌', r2L: '▝▜', r2R: '▛▘' },
   'arms-up': { r1L: '▗▟', r1E: '▛███▜', r1R: '▙▖', r2L: ' ▜', r2R: '▛ ' },
-}
+};
 
 // Apple Terminal uses a bg-fill trick (see below), so only eye poses make
 // sense. Arm poses fall back to default.
@@ -48,13 +48,13 @@ const APPLE_EYES: Record<ClawdPose, string> = {
   'look-left': ' ▘   ▘ ',
   'look-right': ' ▝   ▝ ',
   'arms-up': ' ▗   ▖ ',
-}
+};
 
 export function Clawd({ pose = 'default' }: Props = {}): React.ReactNode {
   if (env.terminal === 'Apple_Terminal') {
-    return <AppleTerminalClawd pose={pose} />
+    return <AppleTerminalClawd pose={pose} />;
   }
-  const p = POSES[pose]
+  const p = POSES[pose];
   return (
     <Box flexDirection="column">
       <Text>
@@ -75,7 +75,7 @@ export function Clawd({ pose = 'default' }: Props = {}): React.ReactNode {
         {'  '}▘▘ ▝▝{'  '}
       </Text>
     </Box>
-  )
+  );
 }
 
 function AppleTerminalClawd({ pose }: { pose: ClawdPose }): React.ReactNode {
@@ -94,5 +94,5 @@ function AppleTerminalClawd({ pose }: { pose: ClawdPose }): React.ReactNode {
       <Text backgroundColor="clawd_body">{' '.repeat(7)}</Text>
       <Text color="clawd_body">▘▘ ▝▝</Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/LogoV2/CondensedLogo.tsx b/src/components/LogoV2/CondensedLogo.tsx
index eb048ec2d..50ffb18e2 100644
--- a/src/components/LogoV2/CondensedLogo.tsx
+++ b/src/components/LogoV2/CondensedLogo.tsx
@@ -1,83 +1,71 @@
-import * as React from 'react'
-import { type ReactNode, useEffect } from 'react'
-import { useMainLoopModel } from '../../hooks/useMainLoopModel.js'
-import { useTerminalSize } from '../../hooks/useTerminalSize.js'
-import { Box, Text, stringWidth } from '@anthropic/ink'
-import { useAppState } from '../../state/AppState.js'
-import { getEffortSuffix } from '../../utils/effort.js'
-import { truncate } from '../../utils/format.js'
-import { isFullscreenEnvEnabled } from '../../utils/fullscreen.js'
-import {
-  formatModelAndBilling,
-  getLogoDisplayData,
-  truncatePath,
-} from '../../utils/logoV2Utils.js'
-import { renderModelSetting } from '../../utils/model/model.js'
-import { OffscreenFreeze } from '../OffscreenFreeze.js'
-import { AnimatedClawd } from './AnimatedClawd.js'
-import { Clawd } from './Clawd.js'
-import {
-  GuestPassesUpsell,
-  incrementGuestPassesSeenCount,
-  useShowGuestPassesUpsell,
-} from './GuestPassesUpsell.js'
+import * as React from 'react';
+import { type ReactNode, useEffect } from 'react';
+import { useMainLoopModel } from '../../hooks/useMainLoopModel.js';
+import { useTerminalSize } from '../../hooks/useTerminalSize.js';
+import { Box, Text, stringWidth } from '@anthropic/ink';
+import { useAppState } from '../../state/AppState.js';
+import { getEffortSuffix } from '../../utils/effort.js';
+import { truncate } from '../../utils/format.js';
+import { isFullscreenEnvEnabled } from '../../utils/fullscreen.js';
+import { formatModelAndBilling, getLogoDisplayData, truncatePath } from '../../utils/logoV2Utils.js';
+import { renderModelSetting } from '../../utils/model/model.js';
+import { OffscreenFreeze } from '../OffscreenFreeze.js';
+import { AnimatedClawd } from './AnimatedClawd.js';
+import { Clawd } from './Clawd.js';
+import { GuestPassesUpsell, incrementGuestPassesSeenCount, useShowGuestPassesUpsell } from './GuestPassesUpsell.js';
 import {
   incrementOverageCreditUpsellSeenCount,
   OverageCreditUpsell,
   useShowOverageCreditUpsell,
-} from './OverageCreditUpsell.js'
+} from './OverageCreditUpsell.js';
 
 export function CondensedLogo(): ReactNode {
-  const { columns } = useTerminalSize()
-  const agent = useAppState(s => s.agent)
-  const effortValue = useAppState(s => s.effortValue)
-  const model = useMainLoopModel()
-  const modelDisplayName = renderModelSetting(model)
-  const { version, cwd, billingType, agentName: agentNameFromSettings } = getLogoDisplayData()
+  const { columns } = useTerminalSize();
+  const agent = useAppState(s => s.agent);
+  const effortValue = useAppState(s => s.effortValue);
+  const model = useMainLoopModel();
+  const modelDisplayName = renderModelSetting(model);
+  const { version, cwd, billingType, agentName: agentNameFromSettings } = getLogoDisplayData();
 
   // Prefer AppState.agent (set from --agent CLI flag) over settings
-  const agentName = agent ?? agentNameFromSettings
-  const showGuestPassesUpsell = useShowGuestPassesUpsell()
-  const showOverageCreditUpsell = useShowOverageCreditUpsell()
+  const agentName = agent ?? agentNameFromSettings;
+  const showGuestPassesUpsell = useShowGuestPassesUpsell();
+  const showOverageCreditUpsell = useShowOverageCreditUpsell();
 
   useEffect(() => {
     if (showGuestPassesUpsell) {
-      incrementGuestPassesSeenCount()
+      incrementGuestPassesSeenCount();
     }
-  }, [showGuestPassesUpsell])
+  }, [showGuestPassesUpsell]);
 
   useEffect(() => {
     if (showOverageCreditUpsell && !showGuestPassesUpsell) {
-      incrementOverageCreditUpsellSeenCount()
+      incrementOverageCreditUpsellSeenCount();
     }
-  }, [showOverageCreditUpsell, showGuestPassesUpsell])
+  }, [showOverageCreditUpsell, showGuestPassesUpsell]);
 
   // Calculate available width for text content
   // Account for: condensed clawd width (11 chars) + gap (2) + padding (2) = 15 chars
-  const textWidth = Math.max(columns - 15, 20)
+  const textWidth = Math.max(columns - 15, 20);
 
   // Truncate version to fit within available width, accounting for "Claude Code v" prefix
-  const versionPrefix = 'Claude Code v'
-  const truncatedVersion = truncate(
-    version,
-    Math.max(textWidth - versionPrefix.length, 6),
-  )
+  const versionPrefix = 'Claude Code v';
+  const truncatedVersion = truncate(version, Math.max(textWidth - versionPrefix.length, 6));
 
-  const effortSuffix = getEffortSuffix(model, effortValue)
-  const { shouldSplit, truncatedModel, truncatedBilling } =
-    formatModelAndBilling(
-      modelDisplayName + effortSuffix,
-      billingType,
-      textWidth,
-    )
+  const effortSuffix = getEffortSuffix(model, effortValue);
+  const { shouldSplit, truncatedModel, truncatedBilling } = formatModelAndBilling(
+    modelDisplayName + effortSuffix,
+    billingType,
+    textWidth,
+  );
 
   // Truncate path, accounting for agent name if present
-  const separator = ' · '
-  const atPrefix = '@'
+  const separator = ' · ';
+  const atPrefix = '@';
   const cwdAvailableWidth = agentName
     ? textWidth - atPrefix.length - stringWidth(agentName) - separator.length
-    : textWidth
-  const truncatedCwd = truncatePath(cwd, Math.max(cwdAvailableWidth, 10))
+    : textWidth;
+  const truncatedCwd = truncatePath(cwd, Math.max(cwdAvailableWidth, 10));
 
   // OffscreenFreeze: the logo sits at the top of the message list and is the
   // first thing to enter scrollback. useMainLoopModel() subscribes to model
@@ -86,33 +74,28 @@ export function CondensedLogo(): ReactNode {
   return (
     <OffscreenFreeze>
       <Box flexDirection="row" gap={2} alignItems="center">
-      {isFullscreenEnvEnabled() ? <AnimatedClawd /> : <Clawd />}
+        {isFullscreenEnvEnabled() ? <AnimatedClawd /> : <Clawd />}
 
-      {/* Info */}
-      <Box flexDirection="column">
-        <Text>
-          <Text bold>Claude Code</Text>{' '}
-          <Text dimColor>v{truncatedVersion}</Text>
-        </Text>
-        {shouldSplit ? (
-          <>
-            <Text dimColor>{truncatedModel}</Text>
-            <Text dimColor>{truncatedBilling}</Text>
-          </>
-        ) : (
-          <Text dimColor>
-            {truncatedModel} · {truncatedBilling}
+        {/* Info */}
+        <Box flexDirection="column">
+          <Text>
+            <Text bold>Claude Code</Text> <Text dimColor>v{truncatedVersion}</Text>
           </Text>
-        )}
-        <Text dimColor>
-          {agentName ? `@${agentName} · ${truncatedCwd}` : truncatedCwd}
-        </Text>
-        {showGuestPassesUpsell && <GuestPassesUpsell />}
-        {!showGuestPassesUpsell && showOverageCreditUpsell && (
-          <OverageCreditUpsell maxWidth={textWidth} twoLine />
-        )}
-      </Box>
+          {shouldSplit ? (
+            <>
+              <Text dimColor>{truncatedModel}</Text>
+              <Text dimColor>{truncatedBilling}</Text>
+            </>
+          ) : (
+            <Text dimColor>
+              {truncatedModel} · {truncatedBilling}
+            </Text>
+          )}
+          <Text dimColor>{agentName ? `@${agentName} · ${truncatedCwd}` : truncatedCwd}</Text>
+          {showGuestPassesUpsell && <GuestPassesUpsell />}
+          {!showGuestPassesUpsell && showOverageCreditUpsell && <OverageCreditUpsell maxWidth={textWidth} twoLine />}
+        </Box>
       </Box>
     </OffscreenFreeze>
-  )
+  );
 }
diff --git a/src/components/LogoV2/EmergencyTip.tsx b/src/components/LogoV2/EmergencyTip.tsx
index 33280bcf7..52a373e71 100644
--- a/src/components/LogoV2/EmergencyTip.tsx
+++ b/src/components/LogoV2/EmergencyTip.tsx
@@ -1,34 +1,31 @@
-import * as React from 'react'
-import { useEffect, useMemo } from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { getDynamicConfig_CACHED_MAY_BE_STALE } from 'src/services/analytics/growthbook.js'
-import { getGlobalConfig, saveGlobalConfig } from 'src/utils/config.js'
+import * as React from 'react';
+import { useEffect, useMemo } from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { getDynamicConfig_CACHED_MAY_BE_STALE } from 'src/services/analytics/growthbook.js';
+import { getGlobalConfig, saveGlobalConfig } from 'src/utils/config.js';
 
-const CONFIG_NAME = 'tengu-top-of-feed-tip'
+const CONFIG_NAME = 'tengu-top-of-feed-tip';
 
 export function EmergencyTip(): React.ReactNode {
-  const tip = useMemo(getTipOfFeed, [])
+  const tip = useMemo(getTipOfFeed, []);
   // Memoize to prevent re-reads after we save - we want the value at mount time
-  const lastShownTip = useMemo(
-    () => getGlobalConfig().lastShownEmergencyTip,
-    [],
-  )
+  const lastShownTip = useMemo(() => getGlobalConfig().lastShownEmergencyTip, []);
 
   // Only show if this is a new/different tip
-  const shouldShow = tip.tip && tip.tip !== lastShownTip
+  const shouldShow = tip.tip && tip.tip !== lastShownTip;
 
   // Save the tip we're showing so we don't show it again
   useEffect(() => {
     if (shouldShow) {
       saveGlobalConfig(current => {
-        if (current.lastShownEmergencyTip === tip.tip) return current
-        return { ...current, lastShownEmergencyTip: tip.tip }
-      })
+        if (current.lastShownEmergencyTip === tip.tip) return current;
+        return { ...current, lastShownEmergencyTip: tip.tip };
+      });
     }
-  }, [shouldShow, tip.tip])
+  }, [shouldShow, tip.tip]);
 
   if (!shouldShow) {
-    return null
+    return null;
   }
 
   return (
@@ -43,23 +40,20 @@ export function EmergencyTip(): React.ReactNode {
         {tip.tip}
       </Text>
     </Box>
-  )
+  );
 }
 
 type TipOfFeed = {
-  tip: string
-  color?: 'dim' | 'warning' | 'error'
-}
+  tip: string;
+  color?: 'dim' | 'warning' | 'error';
+};
 
-const DEFAULT_TIP: TipOfFeed = { tip: '', color: 'dim' }
+const DEFAULT_TIP: TipOfFeed = { tip: '', color: 'dim' };
 
 /**
  * Get the tip of the feed from dynamic config with caching
  * Returns cached value immediately, updates in background
  */
 function getTipOfFeed(): TipOfFeed {
-  return getDynamicConfig_CACHED_MAY_BE_STALE<TipOfFeed>(
-    CONFIG_NAME,
-    DEFAULT_TIP,
-  )
+  return getDynamicConfig_CACHED_MAY_BE_STALE<TipOfFeed>(CONFIG_NAME, DEFAULT_TIP);
 }
diff --git a/src/components/LogoV2/ExperimentEnrollmentNotice.tsx b/src/components/LogoV2/ExperimentEnrollmentNotice.tsx
index 6210eb20c..d2a41459e 100644
--- a/src/components/LogoV2/ExperimentEnrollmentNotice.tsx
+++ b/src/components/LogoV2/ExperimentEnrollmentNotice.tsx
@@ -1,9 +1,9 @@
-import * as React from 'react'
+import * as React from 'react';
 
 /**
  * Internal-only component. Shows experiment enrollment status for internal
  * users. Stubbed — returns null in non-internal builds.
  */
 export function ExperimentEnrollmentNotice(): React.ReactNode {
-	return null
+  return null;
 }
diff --git a/src/components/LogoV2/Feed.tsx b/src/components/LogoV2/Feed.tsx
index be849bfd7..06fe49031 100644
--- a/src/components/LogoV2/Feed.tsx
+++ b/src/components/LogoV2/Feed.tsx
@@ -1,65 +1,57 @@
-import * as React from 'react'
-import { Box, Text, stringWidth } from '@anthropic/ink'
-import { truncate } from '../../utils/format.js'
+import * as React from 'react';
+import { Box, Text, stringWidth } from '@anthropic/ink';
+import { truncate } from '../../utils/format.js';
 
 export type FeedLine = {
-  text: string
-  timestamp?: string
-}
+  text: string;
+  timestamp?: string;
+};
 
 export type FeedConfig = {
-  title: string
-  lines: FeedLine[]
-  footer?: string
-  emptyMessage?: string
-  customContent?: { content: React.ReactNode; width: number }
-}
+  title: string;
+  lines: FeedLine[];
+  footer?: string;
+  emptyMessage?: string;
+  customContent?: { content: React.ReactNode; width: number };
+};
 
 type FeedProps = {
-  config: FeedConfig
-  actualWidth: number
-}
+  config: FeedConfig;
+  actualWidth: number;
+};
 
 export function calculateFeedWidth(config: FeedConfig): number {
-  const { title, lines, footer, emptyMessage, customContent } = config
+  const { title, lines, footer, emptyMessage, customContent } = config;
 
-  let maxWidth = stringWidth(title)
+  let maxWidth = stringWidth(title);
 
   if (customContent !== undefined) {
-    maxWidth = Math.max(maxWidth, customContent.width)
+    maxWidth = Math.max(maxWidth, customContent.width);
   } else if (lines.length === 0 && emptyMessage) {
-    maxWidth = Math.max(maxWidth, stringWidth(emptyMessage))
+    maxWidth = Math.max(maxWidth, stringWidth(emptyMessage));
   } else {
-    const gap = '  '
-    const maxTimestampWidth = Math.max(
-      0,
-      ...lines.map(line => (line.timestamp ? stringWidth(line.timestamp) : 0)),
-    )
+    const gap = '  ';
+    const maxTimestampWidth = Math.max(0, ...lines.map(line => (line.timestamp ? stringWidth(line.timestamp) : 0)));
 
     for (const line of lines) {
-      const timestampWidth = maxTimestampWidth > 0 ? maxTimestampWidth : 0
-      const lineWidth =
-        stringWidth(line.text) +
-        (timestampWidth > 0 ? timestampWidth + gap.length : 0)
-      maxWidth = Math.max(maxWidth, lineWidth)
+      const timestampWidth = maxTimestampWidth > 0 ? maxTimestampWidth : 0;
+      const lineWidth = stringWidth(line.text) + (timestampWidth > 0 ? timestampWidth + gap.length : 0);
+      maxWidth = Math.max(maxWidth, lineWidth);
     }
   }
 
   if (footer) {
-    maxWidth = Math.max(maxWidth, stringWidth(footer))
+    maxWidth = Math.max(maxWidth, stringWidth(footer));
   }
 
-  return maxWidth
+  return maxWidth;
 }
 
 export function Feed({ config, actualWidth }: FeedProps): React.ReactNode {
-  const { title, lines, footer, emptyMessage, customContent } = config
+  const { title, lines, footer, emptyMessage, customContent } = config;
 
-  const gap = '  '
-  const maxTimestampWidth = Math.max(
-    0,
-    ...lines.map(line => (line.timestamp ? stringWidth(line.timestamp) : 0)),
-  )
+  const gap = '  ';
+  const maxTimestampWidth = Math.max(0, ...lines.map(line => (line.timestamp ? stringWidth(line.timestamp) : 0)));
 
   return (
     <Box flexDirection="column" width={actualWidth}>
@@ -80,25 +72,19 @@ export function Feed({ config, actualWidth }: FeedProps): React.ReactNode {
       ) : (
         <>
           {lines.map((line, index) => {
-            const textWidth = Math.max(
-              10,
-              actualWidth -
-                (maxTimestampWidth > 0 ? maxTimestampWidth + gap.length : 0),
-            )
+            const textWidth = Math.max(10, actualWidth - (maxTimestampWidth > 0 ? maxTimestampWidth + gap.length : 0));
 
             return (
               <Text key={index}>
                 {maxTimestampWidth > 0 && (
                   <>
-                    <Text dimColor>
-                      {(line.timestamp || '').padEnd(maxTimestampWidth)}
-                    </Text>
+                    <Text dimColor>{(line.timestamp || '').padEnd(maxTimestampWidth)}</Text>
                     {gap}
                   </>
                 )}
                 <Text>{truncate(line.text, textWidth)}</Text>
               </Text>
-            )
+            );
           })}
           {footer && (
             <Text dimColor italic>
@@ -108,5 +94,5 @@ export function Feed({ config, actualWidth }: FeedProps): React.ReactNode {
         </>
       )}
     </Box>
-  )
+  );
 }
diff --git a/src/components/LogoV2/FeedColumn.tsx b/src/components/LogoV2/FeedColumn.tsx
index 4c6ae84f5..9fc36b82f 100644
--- a/src/components/LogoV2/FeedColumn.tsx
+++ b/src/components/LogoV2/FeedColumn.tsx
@@ -1,32 +1,27 @@
-import * as React from 'react'
-import { Box } from '@anthropic/ink'
-import { Divider } from '@anthropic/ink'
-import type { FeedConfig } from './Feed.js'
-import { calculateFeedWidth, Feed } from './Feed.js'
+import * as React from 'react';
+import { Box } from '@anthropic/ink';
+import { Divider } from '@anthropic/ink';
+import type { FeedConfig } from './Feed.js';
+import { calculateFeedWidth, Feed } from './Feed.js';
 
 type FeedColumnProps = {
-  feeds: FeedConfig[]
-  maxWidth: number
-}
+  feeds: FeedConfig[];
+  maxWidth: number;
+};
 
-export function FeedColumn({
-  feeds,
-  maxWidth,
-}: FeedColumnProps): React.ReactNode {
-  const feedWidths = feeds.map(feed => calculateFeedWidth(feed))
-  const maxOfAllFeeds = Math.max(...feedWidths)
-  const actualWidth = Math.min(maxOfAllFeeds, maxWidth)
+export function FeedColumn({ feeds, maxWidth }: FeedColumnProps): React.ReactNode {
+  const feedWidths = feeds.map(feed => calculateFeedWidth(feed));
+  const maxOfAllFeeds = Math.max(...feedWidths);
+  const actualWidth = Math.min(maxOfAllFeeds, maxWidth);
 
   return (
     <Box flexDirection="column">
       {feeds.map((feed, index) => (
         <React.Fragment key={index}>
           <Feed config={feed} actualWidth={actualWidth} />
-          {index < feeds.length - 1 && (
-            <Divider color="claude" width={actualWidth} />
-          )}
+          {index < feeds.length - 1 && <Divider color="claude" width={actualWidth} />}
         </React.Fragment>
       ))}
     </Box>
-  )
+  );
 }
diff --git a/src/components/LogoV2/GateOverridesWarning.tsx b/src/components/LogoV2/GateOverridesWarning.tsx
index 32325eefa..603ca2ce9 100644
--- a/src/components/LogoV2/GateOverridesWarning.tsx
+++ b/src/components/LogoV2/GateOverridesWarning.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react'
+import * as React from 'react';
 
 /**
  * Internal-only component. Displays a warning when feature-gate overrides
@@ -6,5 +6,5 @@ import * as React from 'react'
  * non-internal builds.
  */
 export function GateOverridesWarning(): React.ReactNode {
-	return null
+  return null;
 }
diff --git a/src/components/LogoV2/GuestPassesUpsell.tsx b/src/components/LogoV2/GuestPassesUpsell.tsx
index c1bae01b4..4f98c06b1 100644
--- a/src/components/LogoV2/GuestPassesUpsell.tsx
+++ b/src/components/LogoV2/GuestPassesUpsell.tsx
@@ -1,73 +1,72 @@
-import * as React from 'react'
-import { useState } from 'react'
-import { Text } from '@anthropic/ink'
-import { logEvent } from '../../services/analytics/index.js'
+import * as React from 'react';
+import { useState } from 'react';
+import { Text } from '@anthropic/ink';
+import { logEvent } from '../../services/analytics/index.js';
 import {
   checkCachedPassesEligibility,
   formatCreditAmount,
   getCachedReferrerReward,
   getCachedRemainingPasses,
-} from '../../services/api/referral.js'
-import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js'
+} from '../../services/api/referral.js';
+import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js';
 
 function resetIfPassesRefreshed(): void {
-  const remaining = getCachedRemainingPasses()
-  if (remaining == null || remaining <= 0) return
-  const config = getGlobalConfig()
-  const lastSeen = config.passesLastSeenRemaining ?? 0
+  const remaining = getCachedRemainingPasses();
+  if (remaining == null || remaining <= 0) return;
+  const config = getGlobalConfig();
+  const lastSeen = config.passesLastSeenRemaining ?? 0;
   if (remaining > lastSeen) {
     saveGlobalConfig(prev => ({
       ...prev,
       passesUpsellSeenCount: 0,
       hasVisitedPasses: false,
       passesLastSeenRemaining: remaining,
-    }))
+    }));
   }
 }
 
 function shouldShowGuestPassesUpsell(): boolean {
-  const { eligible, hasCache } = checkCachedPassesEligibility()
+  const { eligible, hasCache } = checkCachedPassesEligibility();
   // Only show if eligible and cache exists (don't block on fetch)
-  if (!eligible || !hasCache) return false
+  if (!eligible || !hasCache) return false;
   // Reset upsell counters if passes were refreshed (covers both campaign change and pass refresh)
-  resetIfPassesRefreshed()
+  resetIfPassesRefreshed();
 
-  const config = getGlobalConfig()
-  if ((config.passesUpsellSeenCount ?? 0) >= 3) return false
-  if (config.hasVisitedPasses) return false
+  const config = getGlobalConfig();
+  if ((config.passesUpsellSeenCount ?? 0) >= 3) return false;
+  if (config.hasVisitedPasses) return false;
 
-  return true
+  return true;
 }
 
 export function useShowGuestPassesUpsell(): boolean {
-  const [show] = useState(() => shouldShowGuestPassesUpsell())
-  return show
+  const [show] = useState(() => shouldShowGuestPassesUpsell());
+  return show;
 }
 
 export function incrementGuestPassesSeenCount(): void {
-  let newCount = 0
+  let newCount = 0;
   saveGlobalConfig(prev => {
-    newCount = (prev.passesUpsellSeenCount ?? 0) + 1
+    newCount = (prev.passesUpsellSeenCount ?? 0) + 1;
     return {
       ...prev,
       passesUpsellSeenCount: newCount,
-    }
-  })
+    };
+  });
   logEvent('tengu_guest_passes_upsell_shown', {
     seen_count: newCount,
-  })
+  });
 }
 
 // Condensed layout for mini welcome screen
 export function GuestPassesUpsell(): React.ReactNode {
-  const reward = getCachedReferrerReward()
+  const reward = getCachedReferrerReward();
   return (
     <Text dimColor>
-      <Text color="claude">[✻]</Text> <Text color="claude">[✻]</Text>{' '}
-      <Text color="claude">[✻]</Text> ·{' '}
+      <Text color="claude">[✻]</Text> <Text color="claude">[✻]</Text> <Text color="claude">[✻]</Text> ·{' '}
       {reward
         ? `Share Claude Code and earn ${formatCreditAmount(reward)} of extra usage · /passes`
         : '3 guest passes at /passes'}
     </Text>
-  )
+  );
 }
diff --git a/src/components/LogoV2/LogoV2.tsx b/src/components/LogoV2/LogoV2.tsx
index c7dcf4139..f0a9db030 100644
--- a/src/components/LogoV2/LogoV2.tsx
+++ b/src/components/LogoV2/LogoV2.tsx
@@ -1,7 +1,7 @@
 // biome-ignore-all assist/source/organizeImports: ANT-ONLY import markers must not be reordered
-import * as React from 'react'
-import { Box, Text, color, stringWidth } from '@anthropic/ink'
-import { useTerminalSize } from '../../hooks/useTerminalSize.js'
+import * as React from 'react';
+import { Box, Text, color, stringWidth } from '@anthropic/ink';
+import { useTerminalSize } from '../../hooks/useTerminalSize.js';
 import {
   getLayoutMode,
   calculateLayoutDimensions,
@@ -11,46 +11,39 @@ import {
   getRecentActivitySync,
   getRecentReleaseNotesSync,
   getLogoDisplayData,
-} from '../../utils/logoV2Utils.js'
-import { truncate } from '../../utils/format.js'
-import { getDisplayPath } from '../../utils/file.js'
-import { Clawd } from './Clawd.js'
-import { FeedColumn } from './FeedColumn.js'
+} from '../../utils/logoV2Utils.js';
+import { truncate } from '../../utils/format.js';
+import { getDisplayPath } from '../../utils/file.js';
+import { Clawd } from './Clawd.js';
+import { FeedColumn } from './FeedColumn.js';
 import {
   createRecentActivityFeed,
   createWhatsNewFeed,
   createProjectOnboardingFeed,
   createGuestPassesFeed,
-} from './feedConfigs.js'
-import { getGlobalConfig, saveGlobalConfig } from 'src/utils/config.js'
-import { resolveThemeSetting } from 'src/utils/systemTheme.js'
-import { getInitialSettings } from 'src/utils/settings/settings.js'
-import {
-  isDebugMode,
-  isDebugToStdErr,
-  getDebugLogPath,
-} from 'src/utils/debug.js'
-import { useEffect, useState } from 'react'
+} from './feedConfigs.js';
+import { getGlobalConfig, saveGlobalConfig } from 'src/utils/config.js';
+import { resolveThemeSetting } from 'src/utils/systemTheme.js';
+import { getInitialSettings } from 'src/utils/settings/settings.js';
+import { isDebugMode, isDebugToStdErr, getDebugLogPath } from 'src/utils/debug.js';
+import { useEffect, useState } from 'react';
 import {
   getSteps,
   shouldShowProjectOnboarding,
   incrementProjectOnboardingSeenCount,
-} from '../../projectOnboardingState.js'
-import { CondensedLogo } from './CondensedLogo.js'
-import { OffscreenFreeze } from '../OffscreenFreeze.js'
-import { checkForReleaseNotesSync } from '../../utils/releaseNotes.js'
-import { getDumpPromptsPath } from 'src/services/api/dumpPrompts.js'
-import { isEnvTruthy } from 'src/utils/envUtils.js'
-import {
-  getStartupPerfLogPath,
-  isDetailedProfilingEnabled,
-} from 'src/utils/startupProfiler.js'
-import { EmergencyTip } from './EmergencyTip.js'
-import { VoiceModeNotice } from './VoiceModeNotice.js'
-import { Opus1mMergeNotice } from './Opus1mMergeNotice.js'
-import { GateOverridesWarning } from './GateOverridesWarning.js'
-import { ExperimentEnrollmentNotice } from './ExperimentEnrollmentNotice.js'
-import { feature } from 'bun:bundle'
+} from '../../projectOnboardingState.js';
+import { CondensedLogo } from './CondensedLogo.js';
+import { OffscreenFreeze } from '../OffscreenFreeze.js';
+import { checkForReleaseNotesSync } from '../../utils/releaseNotes.js';
+import { getDumpPromptsPath } from 'src/services/api/dumpPrompts.js';
+import { isEnvTruthy } from 'src/utils/envUtils.js';
+import { getStartupPerfLogPath, isDetailedProfilingEnabled } from 'src/utils/startupProfiler.js';
+import { EmergencyTip } from './EmergencyTip.js';
+import { VoiceModeNotice } from './VoiceModeNotice.js';
+import { Opus1mMergeNotice } from './Opus1mMergeNotice.js';
+import { GateOverridesWarning } from './GateOverridesWarning.js';
+import { ExperimentEnrollmentNotice } from './ExperimentEnrollmentNotice.js';
+import { feature } from 'bun:bundle';
 
 // Conditional require so ChannelsNotice.tsx tree-shakes when both flags are
 // false. A module-scope helper component inside a feature() ternary does NOT
@@ -61,128 +54,98 @@ import { feature } from 'bun:bundle'
 const ChannelsNoticeModule =
   feature('KAIROS') || feature('KAIROS_CHANNELS')
     ? (require('./ChannelsNotice.js') as typeof import('./ChannelsNotice.js'))
-    : null
+    : null;
 /* eslint-enable @typescript-eslint/no-require-imports */
-import { SandboxManager } from 'src/utils/sandbox/sandbox-adapter.js'
-import {
-  useShowGuestPassesUpsell,
-  incrementGuestPassesSeenCount,
-} from './GuestPassesUpsell.js'
+import { SandboxManager } from 'src/utils/sandbox/sandbox-adapter.js';
+import { useShowGuestPassesUpsell, incrementGuestPassesSeenCount } from './GuestPassesUpsell.js';
 import {
   useShowOverageCreditUpsell,
   incrementOverageCreditUpsellSeenCount,
   createOverageCreditFeed,
-} from './OverageCreditUpsell.js'
-import { plural } from '../../utils/stringUtils.js'
-import { useAppState } from '../../state/AppState.js'
-import { getEffortSuffix } from '../../utils/effort.js'
-import { useMainLoopModel } from '../../hooks/useMainLoopModel.js'
-import { renderModelSetting } from '../../utils/model/model.js'
+} from './OverageCreditUpsell.js';
+import { plural } from '../../utils/stringUtils.js';
+import { useAppState } from '../../state/AppState.js';
+import { getEffortSuffix } from '../../utils/effort.js';
+import { useMainLoopModel } from '../../hooks/useMainLoopModel.js';
+import { renderModelSetting } from '../../utils/model/model.js';
 
-const LEFT_PANEL_MAX_WIDTH = 50
+const LEFT_PANEL_MAX_WIDTH = 50;
 
 export function LogoV2(): React.ReactNode {
-  const activities = getRecentActivitySync()
-  const username = getGlobalConfig().oauthAccount?.displayName ?? ''
+  const activities = getRecentActivitySync();
+  const username = getGlobalConfig().oauthAccount?.displayName ?? '';
 
-  const { columns } = useTerminalSize()
-  const showOnboarding = shouldShowProjectOnboarding()
-  const showSandboxStatus = SandboxManager.isSandboxingEnabled()
-  const showGuestPassesUpsell = useShowGuestPassesUpsell()
-  const showOverageCreditUpsell = useShowOverageCreditUpsell()
-  const agent = useAppState(s => s.agent)
-  const effortValue = useAppState(s => s.effortValue)
+  const { columns } = useTerminalSize();
+  const showOnboarding = shouldShowProjectOnboarding();
+  const showSandboxStatus = SandboxManager.isSandboxingEnabled();
+  const showGuestPassesUpsell = useShowGuestPassesUpsell();
+  const showOverageCreditUpsell = useShowOverageCreditUpsell();
+  const agent = useAppState(s => s.agent);
+  const effortValue = useAppState(s => s.effortValue);
 
-  const config = getGlobalConfig()
+  const config = getGlobalConfig();
 
-  let changelog: string[]
+  let changelog: string[];
   try {
-    changelog = getRecentReleaseNotesSync(3)
+    changelog = getRecentReleaseNotesSync(3);
   } catch {
-    changelog = []
+    changelog = [];
   }
 
   // Get company announcements and select one:
   // - First startup (numStartups === 1): show first announcement
   // - All other startups: randomly select from announcements
   const [announcement] = useState(() => {
-    const announcements = getInitialSettings().companyAnnouncements
-    if (!announcements || announcements.length === 0) return undefined
+    const announcements = getInitialSettings().companyAnnouncements;
+    if (!announcements || announcements.length === 0) return undefined;
     return config.numStartups === 1
       ? announcements[0]
-      : announcements[Math.floor(Math.random() * announcements.length)]
-  })
-  const { hasReleaseNotes } = checkForReleaseNotesSync(
-    config.lastReleaseNotesSeen,
-  )
+      : announcements[Math.floor(Math.random() * announcements.length)];
+  });
+  const { hasReleaseNotes } = checkForReleaseNotesSync(config.lastReleaseNotesSeen);
 
   useEffect(() => {
-    const currentConfig = getGlobalConfig()
+    const currentConfig = getGlobalConfig();
     if (currentConfig.lastReleaseNotesSeen === MACRO.VERSION) {
-      return
+      return;
     }
     saveGlobalConfig(current => {
-      if (current.lastReleaseNotesSeen === MACRO.VERSION) return current
-      return { ...current, lastReleaseNotesSeen: MACRO.VERSION }
-    })
+      if (current.lastReleaseNotesSeen === MACRO.VERSION) return current;
+      return { ...current, lastReleaseNotesSeen: MACRO.VERSION };
+    });
     if (showOnboarding) {
-      incrementProjectOnboardingSeenCount()
+      incrementProjectOnboardingSeenCount();
     }
-  }, [config, showOnboarding])
+  }, [config, showOnboarding]);
 
   // In condensed mode (early-return below renders <CondensedLogo/>),
   // CondensedLogo's own useEffect handles the impression count. Skipping
   // here avoids double-counting since hooks fire before the early return.
-  const isCondensedMode =
-    !hasReleaseNotes &&
-    !showOnboarding &&
-    !isEnvTruthy(process.env.CLAUDE_CODE_FORCE_FULL_LOGO)
+  const isCondensedMode = !hasReleaseNotes && !showOnboarding && !isEnvTruthy(process.env.CLAUDE_CODE_FORCE_FULL_LOGO);
 
   useEffect(() => {
     if (showGuestPassesUpsell && !showOnboarding && !isCondensedMode) {
-      incrementGuestPassesSeenCount()
+      incrementGuestPassesSeenCount();
     }
-  }, [showGuestPassesUpsell, showOnboarding, isCondensedMode])
+  }, [showGuestPassesUpsell, showOnboarding, isCondensedMode]);
 
   useEffect(() => {
-    if (
-      showOverageCreditUpsell &&
-      !showOnboarding &&
-      !showGuestPassesUpsell &&
-      !isCondensedMode
-    ) {
-      incrementOverageCreditUpsellSeenCount()
+    if (showOverageCreditUpsell && !showOnboarding && !showGuestPassesUpsell && !isCondensedMode) {
+      incrementOverageCreditUpsellSeenCount();
     }
-  }, [
-    showOverageCreditUpsell,
-    showOnboarding,
-    showGuestPassesUpsell,
-    isCondensedMode,
-  ])
+  }, [showOverageCreditUpsell, showOnboarding, showGuestPassesUpsell, isCondensedMode]);
 
-  const model = useMainLoopModel()
-  const fullModelDisplayName = renderModelSetting(model)
-  const {
-    version,
-    cwd,
-    billingType,
-    agentName: agentNameFromSettings,
-  } = getLogoDisplayData()
+  const model = useMainLoopModel();
+  const fullModelDisplayName = renderModelSetting(model);
+  const { version, cwd, billingType, agentName: agentNameFromSettings } = getLogoDisplayData();
   // Prefer AppState.agent (set from --agent CLI flag) over settings
-  const agentName = agent ?? agentNameFromSettings
+  const agentName = agent ?? agentNameFromSettings;
   // -20 to account for the max length of subscription name " · Claude Enterprise".
-  const effortSuffix = getEffortSuffix(model, effortValue)
-  const modelDisplayName = truncate(
-    fullModelDisplayName + effortSuffix,
-    LEFT_PANEL_MAX_WIDTH - 20,
-  )
+  const effortSuffix = getEffortSuffix(model, effortValue);
+  const modelDisplayName = truncate(fullModelDisplayName + effortSuffix, LEFT_PANEL_MAX_WIDTH - 20);
 
   // Show condensed logo if no new changelog and not showing onboarding and not forcing full logo
-  if (
-    !hasReleaseNotes &&
-    !showOnboarding &&
-    !isEnvTruthy(process.env.CLAUDE_CODE_FORCE_FULL_LOGO)
-  ) {
+  if (!hasReleaseNotes && !showOnboarding && !isEnvTruthy(process.env.CLAUDE_CODE_FORCE_FULL_LOGO)) {
     return (
       <>
         <CondensedLogo />
@@ -192,17 +155,13 @@ export function LogoV2(): React.ReactNode {
         {isDebugMode() && (
           <Box paddingLeft={2} flexDirection="column">
             <Text color="warning">Debug mode enabled</Text>
-            <Text dimColor>
-              Logging to: {isDebugToStdErr() ? 'stderr' : getDebugLogPath()}
-            </Text>
+            <Text dimColor>Logging to: {isDebugToStdErr() ? 'stderr' : getDebugLogPath()}</Text>
           </Box>
         )}
         <EmergencyTip />
         {process.env.CLAUDE_CODE_TMUX_SESSION && (
           <Box paddingLeft={2} flexDirection="column">
-            <Text dimColor>
-              tmux session: {process.env.CLAUDE_CODE_TMUX_SESSION}
-            </Text>
+            <Text dimColor>tmux session: {process.env.CLAUDE_CODE_TMUX_SESSION}</Text>
             <Text dimColor>
               {process.env.CLAUDE_CODE_TMUX_PREFIX_CONFLICTS
                 ? `Detach: ${process.env.CLAUDE_CODE_TMUX_PREFIX} ${process.env.CLAUDE_CODE_TMUX_PREFIX} d (press prefix twice - Claude uses ${process.env.CLAUDE_CODE_TMUX_PREFIX})`
@@ -213,9 +172,7 @@ export function LogoV2(): React.ReactNode {
         {announcement && (
           <Box paddingLeft={2} flexDirection="column">
             {!process.env.IS_DEMO && config.oauthAccount?.organizationName && (
-              <Text dimColor>
-                Message from {config.oauthAccount.organizationName}:
-              </Text>
+              <Text dimColor>Message from {config.oauthAccount.organizationName}:</Text>
             )}
             <Text>{announcement}</Text>
           </Box>
@@ -228,51 +185,41 @@ export function LogoV2(): React.ReactNode {
         {process.env.USER_TYPE === 'ant' && !process.env.DEMO_VERSION && (
           <Box paddingLeft={2} flexDirection="column">
             <Text color="warning">[ANT-ONLY] Logs:</Text>
-            <Text dimColor>
-              API calls: {getDisplayPath(getDumpPromptsPath())}
-            </Text>
-            <Text dimColor>
-              Debug logs: {getDisplayPath(getDebugLogPath())}
-            </Text>
+            <Text dimColor>API calls: {getDisplayPath(getDumpPromptsPath())}</Text>
+            <Text dimColor>Debug logs: {getDisplayPath(getDebugLogPath())}</Text>
             {isDetailedProfilingEnabled() && (
-              <Text dimColor>
-                Startup Perf: {getDisplayPath(getStartupPerfLogPath())}
-              </Text>
+              <Text dimColor>Startup Perf: {getDisplayPath(getStartupPerfLogPath())}</Text>
             )}
           </Box>
         )}
         {process.env.USER_TYPE === 'ant' && <GateOverridesWarning />}
         {process.env.USER_TYPE === 'ant' && <ExperimentEnrollmentNotice />}
       </>
-    )
+    );
   }
 
   // Calculate layout and display values
-  const layoutMode = getLayoutMode(columns)
+  const layoutMode = getLayoutMode(columns);
 
-  const userTheme = resolveThemeSetting(getGlobalConfig().theme)
-  const borderTitle = ` ${color('claude', userTheme)('Claude Code')} ${color('inactive', userTheme)(`v${version}`)} `
-  const compactBorderTitle = color('claude', userTheme)(' Claude Code ')
+  const userTheme = resolveThemeSetting(getGlobalConfig().theme);
+  const borderTitle = ` ${color('claude', userTheme)('Claude Code')} ${color('inactive', userTheme)(`v${version}`)} `;
+  const compactBorderTitle = color('claude', userTheme)(' Claude Code ');
 
   // Early return for compact mode
   if (layoutMode === 'compact') {
-    const layoutWidth = 4 // border + padding
-    let welcomeMessage = formatWelcomeMessage(username)
+    const layoutWidth = 4; // border + padding
+    let welcomeMessage = formatWelcomeMessage(username);
     if (stringWidth(welcomeMessage) > columns - layoutWidth) {
-      welcomeMessage = formatWelcomeMessage(null)
+      welcomeMessage = formatWelcomeMessage(null);
     }
 
     // Calculate cwd width accounting for agent name if present
-    const separator = ' · '
-    const atPrefix = '@'
+    const separator = ' · ';
+    const atPrefix = '@';
     const cwdAvailableWidth = agentName
-      ? columns -
-        layoutWidth -
-        atPrefix.length -
-        stringWidth(agentName) -
-        separator.length
-      : columns - layoutWidth
-    const truncatedCwd = truncatePath(cwd, Math.max(cwdAvailableWidth, 10))
+      ? columns - layoutWidth - atPrefix.length - stringWidth(agentName) - separator.length
+      : columns - layoutWidth;
+    const truncatedCwd = truncatePath(cwd, Math.max(cwdAvailableWidth, 10));
     // OffscreenFreeze: logo is the first thing to enter scrollback; useMainLoopModel()
     // subscribes to model changes and getLogoDisplayData() reads cwd/subscription —
     // any change while in scrollback forces a full reset.
@@ -300,9 +247,7 @@ export function LogoV2(): React.ReactNode {
             </Box>
             <Text dimColor>{modelDisplayName}</Text>
             <Text dimColor>{billingType}</Text>
-            <Text dimColor>
-              {agentName ? `@${agentName} · ${truncatedCwd}` : truncatedCwd}
-            </Text>
+            <Text dimColor>{agentName ? `@${agentName} · ${truncatedCwd}` : truncatedCwd}</Text>
           </Box>
         </OffscreenFreeze>
         <VoiceModeNotice />
@@ -310,45 +255,32 @@ export function LogoV2(): React.ReactNode {
         {ChannelsNoticeModule && <ChannelsNoticeModule.ChannelsNotice />}
         {showSandboxStatus && (
           <Box marginTop={1} flexDirection="column">
-            <Text color="warning">
-              Your bash commands will be sandboxed. Disable with /sandbox.
-            </Text>
+            <Text color="warning">Your bash commands will be sandboxed. Disable with /sandbox.</Text>
           </Box>
         )}
         {process.env.USER_TYPE === 'ant' && <GateOverridesWarning />}
         {process.env.USER_TYPE === 'ant' && <ExperimentEnrollmentNotice />}
       </>
-    )
+    );
   }
 
-  const welcomeMessage = formatWelcomeMessage(username)
+  const welcomeMessage = formatWelcomeMessage(username);
   const modelLine =
     !process.env.IS_DEMO && config.oauthAccount?.organizationName
       ? `${modelDisplayName} · ${billingType} · ${config.oauthAccount.organizationName}`
-      : `${modelDisplayName} · ${billingType}`
+      : `${modelDisplayName} · ${billingType}`;
   // Calculate cwd width accounting for agent name if present
-  const cwdSeparator = ' · '
-  const cwdAtPrefix = '@'
+  const cwdSeparator = ' · ';
+  const cwdAtPrefix = '@';
   const cwdAvailableWidth = agentName
-    ? LEFT_PANEL_MAX_WIDTH -
-      cwdAtPrefix.length -
-      stringWidth(agentName) -
-      cwdSeparator.length
-    : LEFT_PANEL_MAX_WIDTH
-  const truncatedCwd = truncatePath(cwd, Math.max(cwdAvailableWidth, 10))
-  const cwdLine = agentName ? `@${agentName} · ${truncatedCwd}` : truncatedCwd
-  const optimalLeftWidth = calculateOptimalLeftWidth(
-    welcomeMessage,
-    cwdLine,
-    modelLine,
-  )
+    ? LEFT_PANEL_MAX_WIDTH - cwdAtPrefix.length - stringWidth(agentName) - cwdSeparator.length
+    : LEFT_PANEL_MAX_WIDTH;
+  const truncatedCwd = truncatePath(cwd, Math.max(cwdAvailableWidth, 10));
+  const cwdLine = agentName ? `@${agentName} · ${truncatedCwd}` : truncatedCwd;
+  const optimalLeftWidth = calculateOptimalLeftWidth(welcomeMessage, cwdLine, modelLine);
 
   // Calculate layout dimensions
-  const { leftWidth, rightWidth } = calculateLayoutDimensions(
-    columns,
-    layoutMode,
-    optimalLeftWidth,
-  )
+  const { leftWidth, rightWidth } = calculateLayoutDimensions(columns, layoutMode, optimalLeftWidth);
 
   return (
     <>
@@ -365,11 +297,7 @@ export function LogoV2(): React.ReactNode {
           }}
         >
           {/* Main content */}
-          <Box
-            flexDirection={layoutMode === 'horizontal' ? 'row' : 'column'}
-            paddingX={1}
-            gap={1}
-          >
+          <Box flexDirection={layoutMode === 'horizontal' ? 'row' : 'column'} paddingX={1} gap={1}>
             {/* Left Panel */}
             <Box
               flexDirection="column"
@@ -408,24 +336,12 @@ export function LogoV2(): React.ReactNode {
               <FeedColumn
                 feeds={
                   showOnboarding
-                    ? [
-                        createProjectOnboardingFeed(getSteps()),
-                        createRecentActivityFeed(activities),
-                      ]
+                    ? [createProjectOnboardingFeed(getSteps()), createRecentActivityFeed(activities)]
                     : showGuestPassesUpsell
-                      ? [
-                          createRecentActivityFeed(activities),
-                          createGuestPassesFeed(),
-                        ]
+                      ? [createRecentActivityFeed(activities), createGuestPassesFeed()]
                       : showOverageCreditUpsell
-                        ? [
-                            createRecentActivityFeed(activities),
-                            createOverageCreditFeed(),
-                          ]
-                        : [
-                            createRecentActivityFeed(activities),
-                            createWhatsNewFeed(changelog),
-                          ]
+                        ? [createRecentActivityFeed(activities), createOverageCreditFeed()]
+                        : [createRecentActivityFeed(activities), createWhatsNewFeed(changelog)]
                 }
                 maxWidth={rightWidth}
               />
@@ -439,17 +355,13 @@ export function LogoV2(): React.ReactNode {
       {isDebugMode() && (
         <Box paddingLeft={2} flexDirection="column">
           <Text color="warning">Debug mode enabled</Text>
-          <Text dimColor>
-            Logging to: {isDebugToStdErr() ? 'stderr' : getDebugLogPath()}
-          </Text>
+          <Text dimColor>Logging to: {isDebugToStdErr() ? 'stderr' : getDebugLogPath()}</Text>
         </Box>
       )}
       <EmergencyTip />
       {process.env.CLAUDE_CODE_TMUX_SESSION && (
         <Box paddingLeft={2} flexDirection="column">
-          <Text dimColor>
-            tmux session: {process.env.CLAUDE_CODE_TMUX_SESSION}
-          </Text>
+          <Text dimColor>tmux session: {process.env.CLAUDE_CODE_TMUX_SESSION}</Text>
           <Text dimColor>
             {process.env.CLAUDE_CODE_TMUX_PREFIX_CONFLICTS
               ? `Detach: ${process.env.CLAUDE_CODE_TMUX_PREFIX} ${process.env.CLAUDE_CODE_TMUX_PREFIX} d (press prefix twice - Claude uses ${process.env.CLAUDE_CODE_TMUX_PREFIX})`
@@ -460,18 +372,14 @@ export function LogoV2(): React.ReactNode {
       {announcement && (
         <Box paddingLeft={2} flexDirection="column">
           {!process.env.IS_DEMO && config.oauthAccount?.organizationName && (
-            <Text dimColor>
-              Message from {config.oauthAccount.organizationName}:
-            </Text>
+            <Text dimColor>Message from {config.oauthAccount.organizationName}:</Text>
           )}
           <Text>{announcement}</Text>
         </Box>
       )}
       {showSandboxStatus && (
         <Box paddingLeft={2} flexDirection="column">
-          <Text color="warning">
-            Your bash commands will be sandboxed. Disable with /sandbox.
-          </Text>
+          <Text color="warning">Your bash commands will be sandboxed. Disable with /sandbox.</Text>
         </Box>
       )}
       {process.env.USER_TYPE === 'ant' && !process.env.DEMO_VERSION && (
@@ -482,20 +390,15 @@ export function LogoV2(): React.ReactNode {
       {process.env.USER_TYPE === 'ant' && !process.env.DEMO_VERSION && (
         <Box paddingLeft={2} flexDirection="column">
           <Text color="warning">[ANT-ONLY] Logs:</Text>
-          <Text dimColor>
-            API calls: {getDisplayPath(getDumpPromptsPath())}
-          </Text>
+          <Text dimColor>API calls: {getDisplayPath(getDumpPromptsPath())}</Text>
           <Text dimColor>Debug logs: {getDisplayPath(getDebugLogPath())}</Text>
           {isDetailedProfilingEnabled() && (
-            <Text dimColor>
-              Startup Perf: {getDisplayPath(getStartupPerfLogPath())}
-            </Text>
+            <Text dimColor>Startup Perf: {getDisplayPath(getStartupPerfLogPath())}</Text>
           )}
         </Box>
       )}
       {process.env.USER_TYPE === 'ant' && <GateOverridesWarning />}
       {process.env.USER_TYPE === 'ant' && <ExperimentEnrollmentNotice />}
     </>
-  )
+  );
 }
-
diff --git a/src/components/LogoV2/Opus1mMergeNotice.tsx b/src/components/LogoV2/Opus1mMergeNotice.tsx
index 9bbf84752..318ab1255 100644
--- a/src/components/LogoV2/Opus1mMergeNotice.tsx
+++ b/src/components/LogoV2/Opus1mMergeNotice.tsx
@@ -1,41 +1,35 @@
-import * as React from 'react'
-import { useEffect, useState } from 'react'
-import { UP_ARROW } from '../../constants/figures.js'
-import { Box, Text } from '@anthropic/ink'
-import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js'
-import { isOpus1mMergeEnabled } from '../../utils/model/model.js'
-import { AnimatedAsterisk } from './AnimatedAsterisk.js'
+import * as React from 'react';
+import { useEffect, useState } from 'react';
+import { UP_ARROW } from '../../constants/figures.js';
+import { Box, Text } from '@anthropic/ink';
+import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js';
+import { isOpus1mMergeEnabled } from '../../utils/model/model.js';
+import { AnimatedAsterisk } from './AnimatedAsterisk.js';
 
-const MAX_SHOW_COUNT = 6
+const MAX_SHOW_COUNT = 6;
 
 export function shouldShowOpus1mMergeNotice(): boolean {
-  return (
-    isOpus1mMergeEnabled() &&
-    (getGlobalConfig().opus1mMergeNoticeSeenCount ?? 0) < MAX_SHOW_COUNT
-  )
+  return isOpus1mMergeEnabled() && (getGlobalConfig().opus1mMergeNoticeSeenCount ?? 0) < MAX_SHOW_COUNT;
 }
 
 export function Opus1mMergeNotice(): React.ReactNode {
-  const [show] = useState(shouldShowOpus1mMergeNotice)
+  const [show] = useState(shouldShowOpus1mMergeNotice);
 
   useEffect(() => {
-    if (!show) return
-    const newCount = (getGlobalConfig().opus1mMergeNoticeSeenCount ?? 0) + 1
+    if (!show) return;
+    const newCount = (getGlobalConfig().opus1mMergeNoticeSeenCount ?? 0) + 1;
     saveGlobalConfig(prev => {
-      if ((prev.opus1mMergeNoticeSeenCount ?? 0) >= newCount) return prev
-      return { ...prev, opus1mMergeNoticeSeenCount: newCount }
-    })
-  }, [show])
+      if ((prev.opus1mMergeNoticeSeenCount ?? 0) >= newCount) return prev;
+      return { ...prev, opus1mMergeNoticeSeenCount: newCount };
+    });
+  }, [show]);
 
-  if (!show) return null
+  if (!show) return null;
 
   return (
     <Box paddingLeft={2}>
       <AnimatedAsterisk char={UP_ARROW} />
-      <Text dimColor>
-        {' '}
-        Opus now defaults to 1M context · 5x more room, same pricing
-      </Text>
+      <Text dimColor> Opus now defaults to 1M context · 5x more room, same pricing</Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/LogoV2/OverageCreditUpsell.tsx b/src/components/LogoV2/OverageCreditUpsell.tsx
index c08140645..194488557 100644
--- a/src/components/LogoV2/OverageCreditUpsell.tsx
+++ b/src/components/LogoV2/OverageCreditUpsell.tsx
@@ -1,17 +1,17 @@
-import * as React from 'react'
-import { useState } from 'react'
-import { Text } from '@anthropic/ink'
-import { logEvent } from '../../services/analytics/index.js'
+import * as React from 'react';
+import { useState } from 'react';
+import { Text } from '@anthropic/ink';
+import { logEvent } from '../../services/analytics/index.js';
 import {
   formatGrantAmount,
   getCachedOverageCreditGrant,
   refreshOverageCreditGrantCache,
-} from '../../services/api/overageCreditGrant.js'
-import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js'
-import { truncate } from '../../utils/format.js'
-import type { FeedConfig } from './Feed.js'
+} from '../../services/api/overageCreditGrant.js';
+import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js';
+import { truncate } from '../../utils/format.js';
+import type { FeedConfig } from './Feed.js';
 
-const MAX_IMPRESSIONS = 3
+const MAX_IMPRESSIONS = 3;
 
 /**
  * Whether to show the overage credit upsell on any surface.
@@ -29,20 +29,19 @@ const MAX_IMPRESSIONS = 3
  *   (welcome feed, tips).
  */
 export function isEligibleForOverageCreditGrant(): boolean {
-  const info = getCachedOverageCreditGrant()
-  if (!info || !info.available || info.granted) return false
-  return formatGrantAmount(info) !== null
+  const info = getCachedOverageCreditGrant();
+  if (!info || !info.available || info.granted) return false;
+  return formatGrantAmount(info) !== null;
 }
 
 export function shouldShowOverageCreditUpsell(): boolean {
-  if (!isEligibleForOverageCreditGrant()) return false
+  if (!isEligibleForOverageCreditGrant()) return false;
 
-  const config = getGlobalConfig()
-  if (config.hasVisitedExtraUsage) return false
-  if ((config.overageCreditUpsellSeenCount ?? 0) >= MAX_IMPRESSIONS)
-    return false
+  const config = getGlobalConfig();
+  if (config.hasVisitedExtraUsage) return false;
+  if ((config.overageCreditUpsellSeenCount ?? 0) >= MAX_IMPRESSIONS) return false;
 
-  return true
+  return true;
 }
 
 /**
@@ -50,78 +49,71 @@ export function shouldShowOverageCreditUpsell(): boolean {
  * unconditionally on mount — it no-ops if cache is fresh.
  */
 export function maybeRefreshOverageCreditCache(): void {
-  if (getCachedOverageCreditGrant() !== null) return
-  void refreshOverageCreditGrantCache()
+  if (getCachedOverageCreditGrant() !== null) return;
+  void refreshOverageCreditGrantCache();
 }
 
 export function useShowOverageCreditUpsell(): boolean {
   const [show] = useState(() => {
-    maybeRefreshOverageCreditCache()
-    return shouldShowOverageCreditUpsell()
-  })
-  return show
+    maybeRefreshOverageCreditCache();
+    return shouldShowOverageCreditUpsell();
+  });
+  return show;
 }
 
 export function incrementOverageCreditUpsellSeenCount(): void {
-  let newCount = 0
+  let newCount = 0;
   saveGlobalConfig(prev => {
-    newCount = (prev.overageCreditUpsellSeenCount ?? 0) + 1
+    newCount = (prev.overageCreditUpsellSeenCount ?? 0) + 1;
     return {
       ...prev,
       overageCreditUpsellSeenCount: newCount,
-    }
-  })
-  logEvent('tengu_overage_credit_upsell_shown', { seen_count: newCount })
+    };
+  });
+  logEvent('tengu_overage_credit_upsell_shown', { seen_count: newCount });
 }
 
 // Copy from "OC & Bulk Overages copy" doc (#6 — CLI /usage)
 function getUsageText(amount: string): string {
-  return `${amount} in extra usage for third-party apps · /extra-usage`
+  return `${amount} in extra usage for third-party apps · /extra-usage`;
 }
 
 // Copy from "OC & Bulk Overages copy" doc (#4 — CLI Welcome screen).
 // Char budgets: title ≤19, subtitle ≤48.
-const FEED_SUBTITLE = 'On us. Works on third-party apps · /extra-usage'
+const FEED_SUBTITLE = 'On us. Works on third-party apps · /extra-usage';
 
 function getFeedTitle(amount: string): string {
-  return `${amount} in extra usage`
+  return `${amount} in extra usage`;
 }
 
-type Props = { maxWidth?: number; twoLine?: boolean }
+type Props = { maxWidth?: number; twoLine?: boolean };
 
-export function OverageCreditUpsell({
-  maxWidth,
-  twoLine,
-}: Props): React.ReactNode {
-  const info = getCachedOverageCreditGrant()
-  if (!info) return null
-  const amount = formatGrantAmount(info)
-  if (!amount) return null
+export function OverageCreditUpsell({ maxWidth, twoLine }: Props): React.ReactNode {
+  const info = getCachedOverageCreditGrant();
+  if (!info) return null;
+  const amount = formatGrantAmount(info);
+  if (!amount) return null;
 
   if (twoLine) {
-    const title = getFeedTitle(amount)
+    const title = getFeedTitle(amount);
     return (
       <>
-        <Text color="claude">
-          {maxWidth ? truncate(title, maxWidth) : title}
-        </Text>
-        <Text dimColor>
-          {maxWidth ? truncate(FEED_SUBTITLE, maxWidth) : FEED_SUBTITLE}
-        </Text>
+        <Text color="claude">{maxWidth ? truncate(title, maxWidth) : title}</Text>
+        <Text dimColor>{maxWidth ? truncate(FEED_SUBTITLE, maxWidth) : FEED_SUBTITLE}</Text>
       </>
-    )
+    );
   }
 
-  const text = getUsageText(amount)
-  const display = maxWidth ? truncate(text, maxWidth) : text
-  const highlightLen = Math.min(getFeedTitle(amount).length, display.length)
+  const text = getUsageText(amount);
+  const display = maxWidth ? truncate(text, maxWidth) : text;
+  const highlightLen = Math.min(getFeedTitle(amount).length, display.length);
 
   return (
     <Text dimColor>
       <Text color="claude">{display.slice(0, highlightLen)}</Text>
       {display.slice(highlightLen)}
     </Text>
-  )
+  );
 }
 
 /**
@@ -132,9 +124,9 @@ export function OverageCreditUpsell({
  * Char budgets: title ≤19, subtitle ≤48.
  */
 export function createOverageCreditFeed(): FeedConfig {
-  const info = getCachedOverageCreditGrant()
-  const amount = info ? formatGrantAmount(info) : null
-  const title = amount ? getFeedTitle(amount) : 'extra usage credit'
+  const info = getCachedOverageCreditGrant();
+  const amount = info ? formatGrantAmount(info) : null;
+  const title = amount ? getFeedTitle(amount) : 'extra usage credit';
   return {
     title,
     lines: [],
@@ -142,5 +134,5 @@ export function createOverageCreditFeed(): FeedConfig {
       content: <Text dimColor>{FEED_SUBTITLE}</Text>,
       width: Math.max(title.length, FEED_SUBTITLE.length),
     },
-  }
+  };
 }
diff --git a/src/components/LogoV2/VoiceModeNotice.tsx b/src/components/LogoV2/VoiceModeNotice.tsx
index b8e74e3c6..b2512026d 100644
--- a/src/components/LogoV2/VoiceModeNotice.tsx
+++ b/src/components/LogoV2/VoiceModeNotice.tsx
@@ -1,19 +1,19 @@
-import { feature } from 'bun:bundle'
-import * as React from 'react'
-import { useEffect, useState } from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js'
-import { getInitialSettings } from '../../utils/settings/settings.js'
-import { isVoiceModeEnabled } from '../../voice/voiceModeEnabled.js'
-import { AnimatedAsterisk } from './AnimatedAsterisk.js'
-import { shouldShowOpus1mMergeNotice } from './Opus1mMergeNotice.js'
+import { feature } from 'bun:bundle';
+import * as React from 'react';
+import { useEffect, useState } from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js';
+import { getInitialSettings } from '../../utils/settings/settings.js';
+import { isVoiceModeEnabled } from '../../voice/voiceModeEnabled.js';
+import { AnimatedAsterisk } from './AnimatedAsterisk.js';
+import { shouldShowOpus1mMergeNotice } from './Opus1mMergeNotice.js';
 
-const MAX_SHOW_COUNT = 3
+const MAX_SHOW_COUNT = 3;
 
 export function VoiceModeNotice(): React.ReactNode {
   // Positive ternary pattern — see docs/feature-gating.md.
   // All strings must be inside the guarded branch for dead-code elimination.
-  return feature('VOICE_MODE') ? <VoiceModeNoticeInner /> : null
+  return feature('VOICE_MODE') ? <VoiceModeNoticeInner /> : null;
 }
 
 function VoiceModeNoticeInner(): React.ReactNode {
@@ -28,24 +28,24 @@ function VoiceModeNoticeInner(): React.ReactNode {
       getInitialSettings().voiceEnabled !== true &&
       (getGlobalConfig().voiceNoticeSeenCount ?? 0) < MAX_SHOW_COUNT &&
       !shouldShowOpus1mMergeNotice(),
-  )
+  );
 
   useEffect(() => {
-    if (!show) return
+    if (!show) return;
     // Capture outside the updater so StrictMode's second invocation is a no-op.
-    const newCount = (getGlobalConfig().voiceNoticeSeenCount ?? 0) + 1
+    const newCount = (getGlobalConfig().voiceNoticeSeenCount ?? 0) + 1;
     saveGlobalConfig(prev => {
-      if ((prev.voiceNoticeSeenCount ?? 0) >= newCount) return prev
-      return { ...prev, voiceNoticeSeenCount: newCount }
-    })
-  }, [show])
+      if ((prev.voiceNoticeSeenCount ?? 0) >= newCount) return prev;
+      return { ...prev, voiceNoticeSeenCount: newCount };
+    });
+  }, [show]);
 
-  if (!show) return null
+  if (!show) return null;
 
   return (
     <Box paddingLeft={2}>
       <AnimatedAsterisk />
       <Text dimColor> Voice mode is now available · /voice to enable</Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/LogoV2/WelcomeV2.tsx b/src/components/LogoV2/WelcomeV2.tsx
index ccbbcbf44..85d804cba 100644
--- a/src/components/LogoV2/WelcomeV2.tsx
+++ b/src/components/LogoV2/WelcomeV2.tsx
@@ -1,17 +1,15 @@
-import React from 'react'
-import { Box, Text, useTheme } from '@anthropic/ink'
-import { env } from '../../utils/env.js'
+import React from 'react';
+import { Box, Text, useTheme } from '@anthropic/ink';
+import { env } from '../../utils/env.js';
 
-const WELCOME_V2_WIDTH = 58
+const WELCOME_V2_WIDTH = 58;
 
 export function WelcomeV2(): React.ReactNode {
-  const [theme] = useTheme()
-  const welcomeMessage = 'Welcome to Claude Code'
+  const [theme] = useTheme();
+  const welcomeMessage = 'Welcome to Claude Code';
 
   if (env.terminal === 'Apple_Terminal') {
-    return (
-      <AppleTerminalWelcomeV2 theme={theme} welcomeMessage={welcomeMessage} />
-    )
+    return <AppleTerminalWelcomeV2 theme={theme} welcomeMessage={welcomeMessage} />;
   }
 
   if (['light', 'light-daltonized', 'light-ansi'].includes(theme)) {
@@ -22,30 +20,14 @@ export function WelcomeV2(): React.ReactNode {
             <Text color="claude">{welcomeMessage} </Text>
             <Text dimColor>v{MACRO.VERSION} </Text>
           </Text>
-          <Text>
-            {'…………………………………………………………………………………………………………………………………………………………'}
-          </Text>
-          <Text>
-            {'                                                          '}
-          </Text>
-          <Text>
-            {'                                                          '}
-          </Text>
-          <Text>
-            {'                                                          '}
-          </Text>
-          <Text>
-            {'            ░░░░░░                                        '}
-          </Text>
-          <Text>
-            {'    ░░░   ░░░░░░░░░░                                      '}
-          </Text>
-          <Text>
-            {'   ░░░░░░░░░░░░░░░░░░░                                    '}
-          </Text>
-          <Text>
-            {'                                                          '}
-          </Text>
+          <Text>{'…………………………………………………………………………………………………………………………………………………………'}</Text>
+          <Text>{'                                                          '}</Text>
+          <Text>{'                                                          '}</Text>
+          <Text>{'                                                          '}</Text>
+          <Text>{'            ░░░░░░                                        '}</Text>
+          <Text>{'    ░░░   ░░░░░░░░░░                                      '}</Text>
+          <Text>{'   ░░░░░░░░░░░░░░░░░░░                                    '}</Text>
+          <Text>{'                                                          '}</Text>
           <Text>
             <Text dimColor>{'                           ░░░░'}</Text>
             <Text>{'                     ██    '}</Text>
@@ -54,9 +36,7 @@ export function WelcomeV2(): React.ReactNode {
             <Text dimColor>{'                         ░░░░░░░░░░'}</Text>
             <Text>{'               ██▒▒██  '}</Text>
           </Text>
-          <Text>
-            {'                                            ▒▒      ██   ▒'}
-          </Text>
+          <Text>{'                                            ▒▒      ██   ▒'}</Text>
           <Text>
             {'      '}
             <Text color="clawd_body"> █████████ </Text>
@@ -81,7 +61,7 @@ export function WelcomeV2(): React.ReactNode {
           </Text>
         </Text>
       </Box>
-    )
+    );
   }
 
   return (
@@ -91,41 +71,21 @@ export function WelcomeV2(): React.ReactNode {
           <Text color="claude">{welcomeMessage} </Text>
           <Text dimColor>v{MACRO.VERSION} </Text>
         </Text>
-        <Text>
-          {'…………………………………………………………………………………………………………………………………………………………'}
-        </Text>
-        <Text>
-          {'                                                          '}
-        </Text>
-        <Text>
-          {'     *                                       █████▓▓░     '}
-        </Text>
-        <Text>
-          {'                                 *         ███▓░     ░░   '}
-        </Text>
-        <Text>
-          {'            ░░░░░░                        ███▓░           '}
-        </Text>
-        <Text>
-          {'    ░░░   ░░░░░░░░░░                      ███▓░           '}
-        </Text>
+        <Text>{'…………………………………………………………………………………………………………………………………………………………'}</Text>
+        <Text>{'                                                          '}</Text>
+        <Text>{'     *                                       █████▓▓░     '}</Text>
+        <Text>{'                                 *         ███▓░     ░░   '}</Text>
+        <Text>{'            ░░░░░░                        ███▓░           '}</Text>
+        <Text>{'    ░░░   ░░░░░░░░░░                      ███▓░           '}</Text>
         <Text>
           <Text>{'   ░░░░░░░░░░░░░░░░░░░    '}</Text>
           <Text bold>*</Text>
           <Text>{'                ██▓░░      ▓   '}</Text>
         </Text>
-        <Text>
-          {'                                             ░▓▓███▓▓░    '}
-        </Text>
-        <Text dimColor>
-          {' *                                 ░░░░                   '}
-        </Text>
-        <Text dimColor>
-          {'                                 ░░░░░░░░                 '}
-        </Text>
-        <Text dimColor>
-          {'                               ░░░░░░░░░░░░░░░░           '}
-        </Text>
+        <Text>{'                                             ░▓▓███▓▓░    '}</Text>
+        <Text dimColor>{' *                                 ░░░░                   '}</Text>
+        <Text dimColor>{'                                 ░░░░░░░░                 '}</Text>
+        <Text dimColor>{'                               ░░░░░░░░░░░░░░░░           '}</Text>
         <Text>
           {'      '}
           <Text color="clawd_body"> █████████ </Text>
@@ -152,21 +112,16 @@ export function WelcomeV2(): React.ReactNode {
         </Text>
       </Text>
     </Box>
-  )
+  );
 }
 
 type AppleTerminalWelcomeV2Props = {
-  theme: string
-  welcomeMessage: string
-}
+  theme: string;
+  welcomeMessage: string;
+};
 
-function AppleTerminalWelcomeV2({
-  theme,
-  welcomeMessage,
-}: AppleTerminalWelcomeV2Props): React.ReactNode {
-  const isLightTheme = ['light', 'light-daltonized', 'light-ansi'].includes(
-    theme,
-  )
+function AppleTerminalWelcomeV2({ theme, welcomeMessage }: AppleTerminalWelcomeV2Props): React.ReactNode {
+  const isLightTheme = ['light', 'light-daltonized', 'light-ansi'].includes(theme);
 
   if (isLightTheme) {
     return (
@@ -176,30 +131,14 @@ function AppleTerminalWelcomeV2({
             <Text color="claude">{welcomeMessage} </Text>
             <Text dimColor>v{MACRO.VERSION} </Text>
           </Text>
-          <Text>
-            {'…………………………………………………………………………………………………………………………………………………………'}
-          </Text>
-          <Text>
-            {'                                                          '}
-          </Text>
-          <Text>
-            {'                                                          '}
-          </Text>
-          <Text>
-            {'                                                          '}
-          </Text>
-          <Text>
-            {'            ░░░░░░                                        '}
-          </Text>
-          <Text>
-            {'    ░░░   ░░░░░░░░░░                                      '}
-          </Text>
-          <Text>
-            {'   ░░░░░░░░░░░░░░░░░░░                                    '}
-          </Text>
-          <Text>
-            {'                                                          '}
-          </Text>
+          <Text>{'…………………………………………………………………………………………………………………………………………………………'}</Text>
+          <Text>{'                                                          '}</Text>
+          <Text>{'                                                          '}</Text>
+          <Text>{'                                                          '}</Text>
+          <Text>{'            ░░░░░░                                        '}</Text>
+          <Text>{'    ░░░   ░░░░░░░░░░                                      '}</Text>
+          <Text>{'   ░░░░░░░░░░░░░░░░░░░                                    '}</Text>
+          <Text>{'                                                          '}</Text>
           <Text>
             <Text dimColor>{'                           ░░░░'}</Text>
             <Text>{'                     ██    '}</Text>
@@ -208,12 +147,8 @@ function AppleTerminalWelcomeV2({
             <Text dimColor>{'                         ░░░░░░░░░░'}</Text>
             <Text>{'               ██▒▒██  '}</Text>
           </Text>
-          <Text>
-            {'                                            ▒▒      ██   ▒'}
-          </Text>
-          <Text>
-            {'                                          ▒▒░░▒▒      ▒ ▒▒'}
-          </Text>
+          <Text>{'                                            ▒▒      ██   ▒'}</Text>
+          <Text>{'                                          ▒▒░░▒▒      ▒ ▒▒'}</Text>
           <Text>
             {'      '}
             <Text color="clawd_body">▗</Text>
@@ -242,7 +177,7 @@ function AppleTerminalWelcomeV2({
           </Text>
         </Text>
       </Box>
-    )
+    );
   }
 
   return (
@@ -252,41 +187,21 @@ function AppleTerminalWelcomeV2({
           <Text color="claude">{welcomeMessage} </Text>
           <Text dimColor>v{MACRO.VERSION} </Text>
         </Text>
-        <Text>
-          {'…………………………………………………………………………………………………………………………………………………………'}
-        </Text>
-        <Text>
-          {'                                                          '}
-        </Text>
-        <Text>
-          {'     *                                       █████▓▓░     '}
-        </Text>
-        <Text>
-          {'                                 *         ███▓░     ░░   '}
-        </Text>
-        <Text>
-          {'            ░░░░░░                        ███▓░           '}
-        </Text>
-        <Text>
-          {'    ░░░   ░░░░░░░░░░                      ███▓░           '}
-        </Text>
+        <Text>{'…………………………………………………………………………………………………………………………………………………………'}</Text>
+        <Text>{'                                                          '}</Text>
+        <Text>{'     *                                       █████▓▓░     '}</Text>
+        <Text>{'                                 *         ███▓░     ░░   '}</Text>
+        <Text>{'            ░░░░░░                        ███▓░           '}</Text>
+        <Text>{'    ░░░   ░░░░░░░░░░                      ███▓░           '}</Text>
         <Text>
           <Text>{'   ░░░░░░░░░░░░░░░░░░░    '}</Text>
           <Text bold>*</Text>
           <Text>{'                ██▓░░      ▓   '}</Text>
         </Text>
-        <Text>
-          {'                                             ░▓▓███▓▓░    '}
-        </Text>
-        <Text dimColor>
-          {' *                                 ░░░░                   '}
-        </Text>
-        <Text dimColor>
-          {'                                 ░░░░░░░░                 '}
-        </Text>
-        <Text dimColor>
-          {'                               ░░░░░░░░░░░░░░░░           '}
-        </Text>
+        <Text>{'                                             ░▓▓███▓▓░    '}</Text>
+        <Text dimColor>{' *                                 ░░░░                   '}</Text>
+        <Text dimColor>{'                                 ░░░░░░░░                 '}</Text>
+        <Text dimColor>{'                               ░░░░░░░░░░░░░░░░           '}</Text>
         <Text>
           {'                                                      '}
           <Text dimColor>*</Text>
@@ -322,5 +237,5 @@ function AppleTerminalWelcomeV2({
         </Text>
       </Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/LogoV2/feedConfigs.tsx b/src/components/LogoV2/feedConfigs.tsx
index 8f6652f3c..9a326bd17 100644
--- a/src/components/LogoV2/feedConfigs.tsx
+++ b/src/components/LogoV2/feedConfigs.tsx
@@ -1,103 +1,96 @@
-import figures from 'figures'
-import { homedir } from 'os'
-import * as React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import type { Step } from '../../projectOnboardingState.js'
-import {
-  formatCreditAmount,
-  getCachedReferrerReward,
-} from '../../services/api/referral.js'
-import type { LogOption } from '../../types/logs.js'
-import { getCwd } from '../../utils/cwd.js'
-import { formatRelativeTimeAgo } from '../../utils/format.js'
-import type { FeedConfig, FeedLine } from './Feed.js'
+import figures from 'figures';
+import { homedir } from 'os';
+import * as React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import type { Step } from '../../projectOnboardingState.js';
+import { formatCreditAmount, getCachedReferrerReward } from '../../services/api/referral.js';
+import type { LogOption } from '../../types/logs.js';
+import { getCwd } from '../../utils/cwd.js';
+import { formatRelativeTimeAgo } from '../../utils/format.js';
+import type { FeedConfig, FeedLine } from './Feed.js';
 
 export function createRecentActivityFeed(activities: LogOption[]): FeedConfig {
   const lines: FeedLine[] = activities.map(log => {
-    const time = formatRelativeTimeAgo(log.modified)
-    const description =
-      log.summary && log.summary !== 'No prompt' ? log.summary : log.firstPrompt
+    const time = formatRelativeTimeAgo(log.modified);
+    const description = log.summary && log.summary !== 'No prompt' ? log.summary : log.firstPrompt;
 
     return {
       text: description || '',
       timestamp: time,
-    }
-  })
+    };
+  });
 
   return {
     title: 'Recent activity',
     lines,
     footer: lines.length > 0 ? '/resume for more' : undefined,
     emptyMessage: 'No recent activity',
-  }
+  };
 }
 
 export function createWhatsNewFeed(releaseNotes: string[]): FeedConfig {
   const lines: FeedLine[] = releaseNotes.map(note => {
     if (process.env.USER_TYPE === 'ant') {
-      const match = note.match(/^(\d+\s+\w+\s+ago)\s+(.+)$/)
+      const match = note.match(/^(\d+\s+\w+\s+ago)\s+(.+)$/);
       if (match) {
         return {
           timestamp: match[1],
           text: match[2] || '',
-        }
+        };
       }
     }
     return {
       text: note,
-    }
-  })
+    };
+  });
 
   const emptyMessage =
     process.env.USER_TYPE === 'ant'
       ? 'Unable to fetch latest claude-cli-internal commits'
-      : 'Check the Claude Code changelog for updates'
+      : 'Check the Claude Code changelog for updates';
 
   return {
-    title:
-      process.env.USER_TYPE === 'ant'
-        ? "What's new [ANT-ONLY: Latest CC commits]"
-        : "What's new",
+    title: process.env.USER_TYPE === 'ant' ? "What's new [ANT-ONLY: Latest CC commits]" : "What's new",
     lines,
     footer: lines.length > 0 ? '/release-notes for more' : undefined,
     emptyMessage,
-  }
+  };
 }
 
 export function createProjectOnboardingFeed(steps: Step[]): FeedConfig {
   const enabledSteps = steps
     .filter(({ isEnabled }) => isEnabled)
-    .sort((a, b) => Number(a.isComplete) - Number(b.isComplete))
+    .sort((a, b) => Number(a.isComplete) - Number(b.isComplete));
 
   const lines: FeedLine[] = enabledSteps.map(({ text, isComplete }) => {
-    const checkmark = isComplete ? `${figures.tick} ` : ''
+    const checkmark = isComplete ? `${figures.tick} ` : '';
     return {
       text: `${checkmark}${text}`,
-    }
-  })
+    };
+  });
 
   const warningText =
     getCwd() === homedir()
       ? 'Note: You have launched claude in your home directory. For the best experience, launch it in a project directory instead.'
-      : undefined
+      : undefined;
 
   if (warningText) {
     lines.push({
       text: warningText,
-    })
+    });
   }
 
   return {
     title: 'Tips for getting started',
     lines,
-  }
+  };
 }
 
 export function createGuestPassesFeed(): FeedConfig {
-  const reward = getCachedReferrerReward()
+  const reward = getCachedReferrerReward();
   const subtitle = reward
     ? `Share Claude Code and earn ${formatCreditAmount(reward)} of extra usage`
-    : 'Share Claude Code with friends'
+    : 'Share Claude Code with friends';
   return {
     title: '3 guest passes',
     lines: [],
@@ -113,5 +106,5 @@ export function createGuestPassesFeed(): FeedConfig {
       width: 48,
     },
     footer: '/passes',
-  }
+  };
 }
diff --git a/src/components/LogoV2/src/ink.ts b/src/components/LogoV2/src/ink.ts
index d373e1b93..3b3a26275 100644
--- a/src/components/LogoV2/src/ink.ts
+++ b/src/components/LogoV2/src/ink.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type Box = any;
-export type Text = any;
-export type useTheme = any;
+export type Box = any
+export type Text = any
+export type useTheme = any
diff --git a/src/components/LogoV2/src/services/analytics/growthbook.ts b/src/components/LogoV2/src/services/analytics/growthbook.ts
index 7e9a775d0..5416d7f06 100644
--- a/src/components/LogoV2/src/services/analytics/growthbook.ts
+++ b/src/components/LogoV2/src/services/analytics/growthbook.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getDynamicConfig_CACHED_MAY_BE_STALE = any;
+export type getDynamicConfig_CACHED_MAY_BE_STALE = any
diff --git a/src/components/LogoV2/src/services/api/dumpPrompts.ts b/src/components/LogoV2/src/services/api/dumpPrompts.ts
index bba0c3d9a..581217586 100644
--- a/src/components/LogoV2/src/services/api/dumpPrompts.ts
+++ b/src/components/LogoV2/src/services/api/dumpPrompts.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getDumpPromptsPath = any;
+export type getDumpPromptsPath = any
diff --git a/src/components/LogoV2/src/utils/config.ts b/src/components/LogoV2/src/utils/config.ts
index 7cf15deca..b3f5e0f8c 100644
--- a/src/components/LogoV2/src/utils/config.ts
+++ b/src/components/LogoV2/src/utils/config.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type getGlobalConfig = any;
-export type saveGlobalConfig = any;
+export type getGlobalConfig = any
+export type saveGlobalConfig = any
diff --git a/src/components/LogoV2/src/utils/debug.ts b/src/components/LogoV2/src/utils/debug.ts
index 75bad1b41..7ad69514c 100644
--- a/src/components/LogoV2/src/utils/debug.ts
+++ b/src/components/LogoV2/src/utils/debug.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type isDebugMode = any;
-export type isDebugToStdErr = any;
-export type getDebugLogPath = any;
+export type isDebugMode = any
+export type isDebugToStdErr = any
+export type getDebugLogPath = any
diff --git a/src/components/LogoV2/src/utils/envUtils.ts b/src/components/LogoV2/src/utils/envUtils.ts
index deb349096..dfe8dd636 100644
--- a/src/components/LogoV2/src/utils/envUtils.ts
+++ b/src/components/LogoV2/src/utils/envUtils.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type isEnvTruthy = any;
+export type isEnvTruthy = any
diff --git a/src/components/LogoV2/src/utils/sandbox/sandbox-adapter.ts b/src/components/LogoV2/src/utils/sandbox/sandbox-adapter.ts
index edebe2640..e9f663b72 100644
--- a/src/components/LogoV2/src/utils/sandbox/sandbox-adapter.ts
+++ b/src/components/LogoV2/src/utils/sandbox/sandbox-adapter.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type SandboxManager = any;
+export type SandboxManager = any
diff --git a/src/components/LogoV2/src/utils/settings/settings.ts b/src/components/LogoV2/src/utils/settings/settings.ts
index 7765101ae..324f43196 100644
--- a/src/components/LogoV2/src/utils/settings/settings.ts
+++ b/src/components/LogoV2/src/utils/settings/settings.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getInitialSettings = any;
+export type getInitialSettings = any
diff --git a/src/components/LogoV2/src/utils/startupProfiler.ts b/src/components/LogoV2/src/utils/startupProfiler.ts
index 16c5c6e4a..f424889b6 100644
--- a/src/components/LogoV2/src/utils/startupProfiler.ts
+++ b/src/components/LogoV2/src/utils/startupProfiler.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type getStartupPerfLogPath = any;
-export type isDetailedProfilingEnabled = any;
+export type getStartupPerfLogPath = any
+export type isDetailedProfilingEnabled = any
diff --git a/src/components/LogoV2/src/utils/systemTheme.ts b/src/components/LogoV2/src/utils/systemTheme.ts
index c69869078..942450b66 100644
--- a/src/components/LogoV2/src/utils/systemTheme.ts
+++ b/src/components/LogoV2/src/utils/systemTheme.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type resolveThemeSetting = any;
+export type resolveThemeSetting = any
diff --git a/src/components/LspRecommendation/LspRecommendationMenu.tsx b/src/components/LspRecommendation/LspRecommendationMenu.tsx
index 3ea815069..579cfa835 100644
--- a/src/components/LspRecommendation/LspRecommendationMenu.tsx
+++ b/src/components/LspRecommendation/LspRecommendationMenu.tsx
@@ -1,16 +1,16 @@
-import * as React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { Select } from '../CustomSelect/select.js'
-import { PermissionDialog } from '../permissions/PermissionDialog.js'
+import * as React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { Select } from '../CustomSelect/select.js';
+import { PermissionDialog } from '../permissions/PermissionDialog.js';
 
 type Props = {
-  pluginName: string
-  pluginDescription?: string
-  fileExtension: string
-  onResponse: (response: 'yes' | 'no' | 'never' | 'disable') => void
-}
+  pluginName: string;
+  pluginDescription?: string;
+  fileExtension: string;
+  onResponse: (response: 'yes' | 'no' | 'never' | 'disable') => void;
+};
 
-const AUTO_DISMISS_MS = 30_000
+const AUTO_DISMISS_MS = 30_000;
 
 export function LspRecommendationMenu({
   pluginName,
@@ -19,33 +19,29 @@ export function LspRecommendationMenu({
   onResponse,
 }: Props): React.ReactNode {
   // Use ref to avoid timer reset when onResponse changes
-  const onResponseRef = React.useRef(onResponse)
-  onResponseRef.current = onResponse
+  const onResponseRef = React.useRef(onResponse);
+  onResponseRef.current = onResponse;
 
   // 30-second auto-dismiss timer - counts as ignored (no)
   React.useEffect(() => {
-    const timeoutId = setTimeout(
-      ref => ref.current('no'),
-      AUTO_DISMISS_MS,
-      onResponseRef,
-    )
-    return () => clearTimeout(timeoutId)
-  }, [])
+    const timeoutId = setTimeout(ref => ref.current('no'), AUTO_DISMISS_MS, onResponseRef);
+    return () => clearTimeout(timeoutId);
+  }, []);
 
   function onSelect(value: string): void {
     switch (value) {
       case 'yes':
-        onResponse('yes')
-        break
+        onResponse('yes');
+        break;
       case 'no':
-        onResponse('no')
-        break
+        onResponse('no');
+        break;
       case 'never':
-        onResponse('never')
-        break
+        onResponse('never');
+        break;
       case 'disable':
-        onResponse('disable')
-        break
+        onResponse('disable');
+        break;
     }
   }
 
@@ -74,16 +70,13 @@ export function LspRecommendationMenu({
       label: 'Disable all LSP recommendations',
       value: 'disable',
     },
-  ]
+  ];
 
   return (
     <PermissionDialog title="LSP Plugin Recommendation">
       <Box flexDirection="column" paddingX={2} paddingY={1}>
         <Box marginBottom={1}>
-          <Text dimColor>
-            LSP provides code intelligence like go-to-definition and error
-            checking
-          </Text>
+          <Text dimColor>LSP provides code intelligence like go-to-definition and error checking</Text>
         </Box>
         <Box>
           <Text dimColor>Plugin:</Text>
@@ -102,13 +95,9 @@ export function LspRecommendationMenu({
           <Text>Would you like to install this LSP plugin?</Text>
         </Box>
         <Box>
-          <Select
-            options={options}
-            onChange={onSelect}
-            onCancel={() => onResponse('no')}
-          />
+          <Select options={options} onChange={onSelect} onCancel={() => onResponse('no')} />
         </Box>
       </Box>
     </PermissionDialog>
-  )
+  );
 }
diff --git a/src/components/MCPServerApprovalDialog.tsx b/src/components/MCPServerApprovalDialog.tsx
index f80d42008..4f35a929b 100644
--- a/src/components/MCPServerApprovalDialog.tsx
+++ b/src/components/MCPServerApprovalDialog.tsx
@@ -1,76 +1,65 @@
-import React from 'react'
+import React from 'react';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from 'src/services/analytics/index.js'
-import {
-  getSettings_DEPRECATED,
-  updateSettingsForSource,
-} from '../utils/settings/settings.js'
-import { Select } from './CustomSelect/index.js'
-import { Dialog } from '@anthropic/ink'
-import { MCPServerDialogCopy } from './MCPServerDialogCopy.js'
+} from 'src/services/analytics/index.js';
+import { getSettings_DEPRECATED, updateSettingsForSource } from '../utils/settings/settings.js';
+import { Select } from './CustomSelect/index.js';
+import { Dialog } from '@anthropic/ink';
+import { MCPServerDialogCopy } from './MCPServerDialogCopy.js';
 
 type Props = {
-  serverName: string
-  onDone(): void
-}
+  serverName: string;
+  onDone(): void;
+};
 
-export function MCPServerApprovalDialog({
-  serverName,
-  onDone,
-}: Props): React.ReactNode {
+export function MCPServerApprovalDialog({ serverName, onDone }: Props): React.ReactNode {
   function onChange(value: 'yes' | 'yes_all' | 'no') {
     logEvent('tengu_mcp_dialog_choice', {
-      choice:
-        value as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-    })
+      choice: value as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+    });
 
     switch (value) {
       case 'yes':
       case 'yes_all': {
         // Get current enabled servers from settings
-        const currentSettings = getSettings_DEPRECATED() || {}
-        const enabledServers = currentSettings.enabledMcpjsonServers || []
+        const currentSettings = getSettings_DEPRECATED() || {};
+        const enabledServers = currentSettings.enabledMcpjsonServers || [];
 
         // Add server if not already enabled
         if (!enabledServers.includes(serverName)) {
           updateSettingsForSource('localSettings', {
             enabledMcpjsonServers: [...enabledServers, serverName],
-          })
+          });
         }
 
         if (value === 'yes_all') {
           updateSettingsForSource('localSettings', {
             enableAllProjectMcpServers: true,
-          })
+          });
         }
-        onDone()
-        break
+        onDone();
+        break;
       }
       case 'no': {
         // Get current disabled servers from settings
-        const currentSettings = getSettings_DEPRECATED() || {}
-        const disabledServers = currentSettings.disabledMcpjsonServers || []
+        const currentSettings = getSettings_DEPRECATED() || {};
+        const disabledServers = currentSettings.disabledMcpjsonServers || [];
 
         // Add server if not already disabled
         if (!disabledServers.includes(serverName)) {
           updateSettingsForSource('localSettings', {
             disabledMcpjsonServers: [...disabledServers, serverName],
-          })
+          });
         }
-        onDone()
-        break
+        onDone();
+        break;
       }
     }
   }
 
   return (
-    <Dialog
-      title={`New MCP server found in .mcp.json: ${serverName}`}
-      color="warning"
-      onCancel={() => onChange('no')}
-    >
+    <Dialog title={`New MCP server found in .mcp.json: ${serverName}`} color="warning" onCancel={() => onChange('no')}>
       <MCPServerDialogCopy />
 
       <Select
@@ -86,5 +75,5 @@ export function MCPServerApprovalDialog({
         onCancel={() => onChange('no')}
       />
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/MCPServerDesktopImportDialog.tsx b/src/components/MCPServerDesktopImportDialog.tsx
index aaea61894..401ddd11e 100644
--- a/src/components/MCPServerDesktopImportDialog.tsx
+++ b/src/components/MCPServerDesktopImportDialog.tsx
@@ -1,66 +1,54 @@
-import React, { useCallback, useEffect, useState } from 'react'
-import { gracefulShutdown } from 'src/utils/gracefulShutdown.js'
-import { writeToStdout } from 'src/utils/process.js'
-import { Box, color, Text, useTheme, Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink'
-import { addMcpConfig, getAllMcpConfigs } from '../services/mcp/config.js'
-import type {
-  ConfigScope,
-  McpServerConfig,
-  ScopedMcpServerConfig,
-} from '../services/mcp/types.js'
-import { plural } from '../utils/stringUtils.js'
-import { ConfigurableShortcutHint } from './ConfigurableShortcutHint.js'
-import { SelectMulti } from './CustomSelect/SelectMulti.js'
+import React, { useCallback, useEffect, useState } from 'react';
+import { gracefulShutdown } from 'src/utils/gracefulShutdown.js';
+import { writeToStdout } from 'src/utils/process.js';
+import { Box, color, Text, useTheme, Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink';
+import { addMcpConfig, getAllMcpConfigs } from '../services/mcp/config.js';
+import type { ConfigScope, McpServerConfig, ScopedMcpServerConfig } from '../services/mcp/types.js';
+import { plural } from '../utils/stringUtils.js';
+import { ConfigurableShortcutHint } from './ConfigurableShortcutHint.js';
+import { SelectMulti } from './CustomSelect/SelectMulti.js';
 
 type Props = {
-  servers: Record<string, McpServerConfig>
-  scope: ConfigScope
-  onDone(): void
-}
+  servers: Record<string, McpServerConfig>;
+  scope: ConfigScope;
+  onDone(): void;
+};
 
-export function MCPServerDesktopImportDialog({
-  servers,
-  scope,
-  onDone,
-}: Props): React.ReactNode {
-  const serverNames = Object.keys(servers)
-  const [existingServers, setExistingServers] = useState<
-    Record<string, ScopedMcpServerConfig>
-  >({})
+export function MCPServerDesktopImportDialog({ servers, scope, onDone }: Props): React.ReactNode {
+  const serverNames = Object.keys(servers);
+  const [existingServers, setExistingServers] = useState<Record<string, ScopedMcpServerConfig>>({});
 
   useEffect(() => {
-    void getAllMcpConfigs().then(({ servers }) => setExistingServers(servers))
-  }, [])
+    void getAllMcpConfigs().then(({ servers }) => setExistingServers(servers));
+  }, []);
 
-  const collisions = serverNames.filter(
-    name => existingServers[name] !== undefined,
-  )
+  const collisions = serverNames.filter(name => existingServers[name] !== undefined);
 
   async function onSubmit(selectedServers: string[]) {
-    let importedCount = 0
+    let importedCount = 0;
 
     for (const serverName of selectedServers) {
-      const serverConfig = servers[serverName]
+      const serverConfig = servers[serverName];
       if (serverConfig) {
         // If the server name already exists, find a new name with _1, _2, etc.
-        let finalName = serverName
+        let finalName = serverName;
         if (existingServers[finalName] !== undefined) {
-          let counter = 1
+          let counter = 1;
           while (existingServers[`${serverName}_${counter}`] !== undefined) {
-            counter++
+            counter++;
           }
-          finalName = `${serverName}_${counter}`
+          finalName = `${serverName}_${counter}`;
         }
 
-        await addMcpConfig(finalName, serverConfig, scope)
-        importedCount++
+        await addMcpConfig(finalName, serverConfig, scope);
+        importedCount++;
       }
     }
 
-    done(importedCount)
+    done(importedCount);
   }
 
-  const [theme] = useTheme()
+  const [theme] = useTheme();
 
   // Define done before using in useCallback
   const done = useCallback(
@@ -68,21 +56,21 @@ export function MCPServerDesktopImportDialog({
       if (importedCount > 0) {
         writeToStdout(
           `\n${color('success', theme)(`Successfully imported ${importedCount} MCP ${plural(importedCount, 'server')} to ${scope} config.`)}\n`,
-        )
+        );
       } else {
-        writeToStdout('\nNo servers were imported.')
+        writeToStdout('\nNo servers were imported.');
       }
-      onDone()
+      onDone();
 
-      void gracefulShutdown()
+      void gracefulShutdown();
     },
     [theme, scope, onDone],
-  )
+  );
 
   // Handle ESC to cancel (import 0 servers)
   const handleEscCancel = useCallback(() => {
-    done(0)
-  }, [done])
+    done(0);
+  }, [done]);
 
   return (
     <>
@@ -95,8 +83,8 @@ export function MCPServerDesktopImportDialog({
       >
         {collisions.length > 0 && (
           <Text color="warning">
-            Note: Some servers already exist with the same name. If selected,
-            they will be imported with a numbered suffix.
+            Note: Some servers already exist with the same name. If selected, they will be imported with a numbered
+            suffix.
           </Text>
         )}
         <Text>Please select the servers you want to import:</Text>
@@ -117,15 +105,10 @@ export function MCPServerDesktopImportDialog({
           <Byline>
             <KeyboardShortcutHint shortcut="Space" action="select" />
             <KeyboardShortcutHint shortcut="Enter" action="confirm" />
-            <ConfigurableShortcutHint
-              action="confirm:no"
-              context="Confirmation"
-              fallback="Esc"
-              description="cancel"
-            />
+            <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="cancel" />
           </Byline>
         </Text>
       </Box>
     </>
-  )
+  );
 }
diff --git a/src/components/MCPServerDialogCopy.tsx b/src/components/MCPServerDialogCopy.tsx
index f6a87674f..016ce30bc 100644
--- a/src/components/MCPServerDialogCopy.tsx
+++ b/src/components/MCPServerDialogCopy.tsx
@@ -1,12 +1,11 @@
-import React from 'react'
-import { Link, Text } from '@anthropic/ink'
+import React from 'react';
+import { Link, Text } from '@anthropic/ink';
 
 export function MCPServerDialogCopy(): React.ReactNode {
   return (
     <Text>
-      MCP servers may execute code or access system resources. All tool calls
-      require approval. Learn more in the{' '}
+      MCP servers may execute code or access system resources. All tool calls require approval. Learn more in the{' '}
       <Link url="https://code.claude.com/docs/en/mcp">MCP documentation</Link>.
     </Text>
-  )
+  );
 }
diff --git a/src/components/MCPServerMultiselectDialog.tsx b/src/components/MCPServerMultiselectDialog.tsx
index fa41da3a7..a448afb4f 100644
--- a/src/components/MCPServerMultiselectDialog.tsx
+++ b/src/components/MCPServerMultiselectDialog.tsx
@@ -1,78 +1,64 @@
-import partition from 'lodash-es/partition.js'
-import React, { useCallback } from 'react'
-import { logEvent } from 'src/services/analytics/index.js'
-import { Box, Text } from '@anthropic/ink'
-import {
-  getSettings_DEPRECATED,
-  updateSettingsForSource,
-} from '../utils/settings/settings.js'
-import { ConfigurableShortcutHint } from './ConfigurableShortcutHint.js'
-import { SelectMulti } from './CustomSelect/SelectMulti.js'
-import { Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink'
-import { MCPServerDialogCopy } from './MCPServerDialogCopy.js'
+import partition from 'lodash-es/partition.js';
+import React, { useCallback } from 'react';
+import { logEvent } from 'src/services/analytics/index.js';
+import { Box, Text } from '@anthropic/ink';
+import { getSettings_DEPRECATED, updateSettingsForSource } from '../utils/settings/settings.js';
+import { ConfigurableShortcutHint } from './ConfigurableShortcutHint.js';
+import { SelectMulti } from './CustomSelect/SelectMulti.js';
+import { Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink';
+import { MCPServerDialogCopy } from './MCPServerDialogCopy.js';
 
 type Props = {
-  serverNames: string[]
-  onDone(): void
-}
+  serverNames: string[];
+  onDone(): void;
+};
 
-export function MCPServerMultiselectDialog({
-  serverNames,
-  onDone,
-}: Props): React.ReactNode {
+export function MCPServerMultiselectDialog({ serverNames, onDone }: Props): React.ReactNode {
   function onSubmit(selectedServers: string[]) {
-    const currentSettings = getSettings_DEPRECATED() || {}
-    const enabledServers = currentSettings.enabledMcpjsonServers || []
-    const disabledServers = currentSettings.disabledMcpjsonServers || []
+    const currentSettings = getSettings_DEPRECATED() || {};
+    const enabledServers = currentSettings.enabledMcpjsonServers || [];
+    const disabledServers = currentSettings.disabledMcpjsonServers || [];
 
     // Use partition to separate approved and rejected servers
-    const [approvedServers, rejectedServers] = partition(serverNames, server =>
-      selectedServers.includes(server),
-    )
+    const [approvedServers, rejectedServers] = partition(serverNames, server => selectedServers.includes(server));
 
     logEvent('tengu_mcp_multidialog_choice', {
       approved: approvedServers.length,
       rejected: rejectedServers.length,
-    })
+    });
 
     // Update settings with approved servers
     if (approvedServers.length > 0) {
-      const newEnabledServers = [
-        ...new Set([...enabledServers, ...approvedServers]),
-      ]
+      const newEnabledServers = [...new Set([...enabledServers, ...approvedServers])];
       updateSettingsForSource('localSettings', {
         enabledMcpjsonServers: newEnabledServers,
-      })
+      });
     }
 
     // Update settings with rejected servers
     if (rejectedServers.length > 0) {
-      const newDisabledServers = [
-        ...new Set([...disabledServers, ...rejectedServers]),
-      ]
+      const newDisabledServers = [...new Set([...disabledServers, ...rejectedServers])];
       updateSettingsForSource('localSettings', {
         disabledMcpjsonServers: newDisabledServers,
-      })
+      });
     }
 
-    onDone()
+    onDone();
   }
 
   // Handle ESC to reject all servers
   const handleEscRejectAll = useCallback(() => {
-    const currentSettings = getSettings_DEPRECATED() || {}
-    const disabledServers = currentSettings.disabledMcpjsonServers || []
+    const currentSettings = getSettings_DEPRECATED() || {};
+    const disabledServers = currentSettings.disabledMcpjsonServers || [];
 
-    const newDisabledServers = [
-      ...new Set([...disabledServers, ...serverNames]),
-    ]
+    const newDisabledServers = [...new Set([...disabledServers, ...serverNames])];
 
     updateSettingsForSource('localSettings', {
       disabledMcpjsonServers: newDisabledServers,
-    })
+    });
 
-    onDone()
-  }, [serverNames, onDone])
+    onDone();
+  }, [serverNames, onDone]);
 
   return (
     <>
@@ -111,5 +97,5 @@ export function MCPServerMultiselectDialog({
         </Text>
       </Box>
     </>
-  )
+  );
 }
diff --git a/src/components/ManagedSettingsSecurityDialog/ManagedSettingsSecurityDialog.tsx b/src/components/ManagedSettingsSecurityDialog/ManagedSettingsSecurityDialog.tsx
index 2d7de2ec7..11769aef8 100644
--- a/src/components/ManagedSettingsSecurityDialog/ManagedSettingsSecurityDialog.tsx
+++ b/src/components/ManagedSettingsSecurityDialog/ManagedSettingsSecurityDialog.tsx
@@ -1,52 +1,40 @@
-import React from 'react'
-import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js'
-import { Box, Text } from '@anthropic/ink'
-import { useKeybinding } from '../../keybindings/useKeybinding.js'
-import type { SettingsJson } from '../../utils/settings/types.js'
-import { Select } from '../CustomSelect/index.js'
-import { PermissionDialog } from '../permissions/PermissionDialog.js'
-import {
-  extractDangerousSettings,
-  formatDangerousSettingsList,
-} from './utils.js'
+import React from 'react';
+import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js';
+import { Box, Text } from '@anthropic/ink';
+import { useKeybinding } from '../../keybindings/useKeybinding.js';
+import type { SettingsJson } from '../../utils/settings/types.js';
+import { Select } from '../CustomSelect/index.js';
+import { PermissionDialog } from '../permissions/PermissionDialog.js';
+import { extractDangerousSettings, formatDangerousSettingsList } from './utils.js';
 
 type Props = {
-  settings: SettingsJson
-  onAccept: () => void
-  onReject: () => void
-}
+  settings: SettingsJson;
+  onAccept: () => void;
+  onReject: () => void;
+};
 
-export function ManagedSettingsSecurityDialog({
-  settings,
-  onAccept,
-  onReject,
-}: Props): React.ReactNode {
-  const dangerous = extractDangerousSettings(settings)
-  const settingsList = formatDangerousSettingsList(dangerous)
+export function ManagedSettingsSecurityDialog({ settings, onAccept, onReject }: Props): React.ReactNode {
+  const dangerous = extractDangerousSettings(settings);
+  const settingsList = formatDangerousSettingsList(dangerous);
 
-  const exitState = useExitOnCtrlCDWithKeybindings()
+  const exitState = useExitOnCtrlCDWithKeybindings();
 
-  useKeybinding('confirm:no', onReject, { context: 'Confirmation' })
+  useKeybinding('confirm:no', onReject, { context: 'Confirmation' });
 
   function onChange(value: 'accept' | 'exit'): void {
     if (value === 'exit') {
-      onReject()
-      return
+      onReject();
+      return;
     }
-    onAccept()
+    onAccept();
   }
 
   return (
-    <PermissionDialog
-      color="warning"
-      titleColor="warning"
-      title="Managed settings require approval"
-    >
+    <PermissionDialog color="warning" titleColor="warning" title="Managed settings require approval">
       <Box flexDirection="column" gap={1} paddingTop={1}>
         <Text>
-          Your organization has configured managed settings that could allow
-          execution of arbitrary code or interception of your prompts and
-          responses.
+          Your organization has configured managed settings that could allow execution of arbitrary code or interception
+          of your prompts and responses.
         </Text>
 
         <Box flexDirection="column">
@@ -62,8 +50,8 @@ export function ManagedSettingsSecurityDialog({
         </Box>
 
         <Text>
-          Only accept if you trust your organization&apos;s IT administration
-          and expect these settings to be configured.
+          Only accept if you trust your organization&apos;s IT administration and expect these settings to be
+          configured.
         </Text>
 
         <Select
@@ -76,13 +64,9 @@ export function ManagedSettingsSecurityDialog({
         />
 
         <Text dimColor>
-          {exitState.pending ? (
-            <>Press {exitState.keyName} again to exit</>
-          ) : (
-            <>Enter to confirm · Esc to exit</>
-          )}
+          {exitState.pending ? <>Press {exitState.keyName} again to exit</> : <>Enter to confirm · Esc to exit</>}
         </Text>
       </Box>
     </PermissionDialog>
-  )
+  );
 }
diff --git a/src/components/Markdown.tsx b/src/components/Markdown.tsx
index 063404baf..0ef2f18db 100644
--- a/src/components/Markdown.tsx
+++ b/src/components/Markdown.tsx
@@ -1,29 +1,26 @@
-import { marked, type Token, type Tokens } from 'marked'
-import React, { Suspense, use, useMemo, useRef } from 'react'
-import { useSettings } from '../hooks/useSettings.js'
-import { Ansi, Box, useTheme } from '@anthropic/ink'
-import {
-  type CliHighlight,
-  getCliHighlightPromise,
-} from '../utils/cliHighlight.js'
-import { hashContent } from '../utils/hash.js'
-import { configureMarked, formatToken } from '../utils/markdown.js'
-import { stripPromptXMLTags } from '../utils/messages.js'
-import { MarkdownTable } from './MarkdownTable.js'
+import { marked, type Token, type Tokens } from 'marked';
+import React, { Suspense, use, useMemo, useRef } from 'react';
+import { useSettings } from '../hooks/useSettings.js';
+import { Ansi, Box, useTheme } from '@anthropic/ink';
+import { type CliHighlight, getCliHighlightPromise } from '../utils/cliHighlight.js';
+import { hashContent } from '../utils/hash.js';
+import { configureMarked, formatToken } from '../utils/markdown.js';
+import { stripPromptXMLTags } from '../utils/messages.js';
+import { MarkdownTable } from './MarkdownTable.js';
 
 type Props = {
-  children: string
+  children: string;
   /** When true, render all text content as dim */
-  dimColor?: boolean
-}
+  dimColor?: boolean;
+};
 
 // Module-level token cache — marked.lexer is the hot cost on virtual-scroll
 // remounts (~3ms per message). useMemo doesn't survive unmount→remount, so
 // scrolling back to a previously-visible message re-parses. Messages are
 // immutable in history; same content → same tokens. Keyed by hash to avoid
 // retaining full content strings (turn50→turn99 RSS regression, #24180).
-const TOKEN_CACHE_MAX = 500
-const tokenCache = new Map<string, Token[]>()
+const TOKEN_CACHE_MAX = 500;
+const tokenCache = new Map<string, Token[]>();
 
 // Characters that indicate markdown syntax. If none are present, skip the
 // ~3ms marked.lexer call entirely — render as a single paragraph. Covers
@@ -31,11 +28,11 @@ const tokenCache = new Map<string, Token[]>()
 // plain sentences. Checked via indexOf (not regex) for speed.
 // Single regex: matches any MD marker or ordered-list start (N. at line start).
 // One pass instead of 10× includes scans.
-const MD_SYNTAX_RE = /[#*`|[>\-_~]|\n\n|^\d+\. |\n\d+\. /
+const MD_SYNTAX_RE = /[#*`|[>\-_~]|\n\n|^\d+\. |\n\d+\. /;
 function hasMarkdownSyntax(s: string): boolean {
   // Sample first 500 chars — if markdown exists it's usually early (headers,
   // code fence, list). Long tool outputs are mostly plain text tails.
-  return MD_SYNTAX_RE.test(s.length > 500 ? s.slice(0, 500) : s)
+  return MD_SYNTAX_RE.test(s.length > 500 ? s.slice(0, 500) : s);
 }
 
 function cachedLexer(content: string): Token[] {
@@ -51,25 +48,25 @@ function cachedLexer(content: string): Token[] {
         text: content,
         tokens: [{ type: 'text', raw: content, text: content }],
       } as Token,
-    ]
+    ];
   }
-  const key = hashContent(content)
-  const hit = tokenCache.get(key)
+  const key = hashContent(content);
+  const hit = tokenCache.get(key);
   if (hit) {
     // Promote to MRU — without this the eviction is FIFO (scrolling back to
     // an early message evicts the very item you're looking at).
-    tokenCache.delete(key)
-    tokenCache.set(key, hit)
-    return hit
+    tokenCache.delete(key);
+    tokenCache.set(key, hit);
+    return hit;
   }
-  const tokens = marked.lexer(content)
+  const tokens = marked.lexer(content);
   if (tokenCache.size >= TOKEN_CACHE_MAX) {
     // LRU-ish: drop oldest. Map preserves insertion order.
-    const first = tokenCache.keys().next().value
-    if (first !== undefined) tokenCache.delete(first)
+    const first = tokenCache.keys().next().value;
+    if (first !== undefined) tokenCache.delete(first);
   }
-  tokenCache.set(key, tokens)
-  return tokens
+  tokenCache.set(key, tokens);
+  return tokens;
 }
 
 /**
@@ -78,9 +75,9 @@ function cachedLexer(content: string): Token[] {
  * - Other content is rendered as ANSI strings via formatToken
  */
 export function Markdown(props: Props): React.ReactNode {
-  const settings = useSettings()
+  const settings = useSettings();
   if (settings.syntaxHighlightingDisabled) {
-    return <MarkdownBody {...props} highlight={null} />
+    return <MarkdownBody {...props} highlight={null} />;
   }
   // Suspense fallback renders with highlight=null — plain markdown shows
   // for ~50ms on first ever render while cli-highlight loads.
@@ -88,26 +85,22 @@ export function Markdown(props: Props): React.ReactNode {
     <Suspense fallback={<MarkdownBody {...props} highlight={null} />}>
       <MarkdownWithHighlight {...props} />
     </Suspense>
-  )
+  );
 }
 
 function MarkdownWithHighlight(props: Props): React.ReactNode {
-  const highlight = use(getCliHighlightPromise())
-  return <MarkdownBody {...props} highlight={highlight} />
+  const highlight = use(getCliHighlightPromise());
+  return <MarkdownBody {...props} highlight={highlight} />;
 }
 
-function MarkdownBody({
-  children,
-  dimColor,
-  highlight,
-}: Props & { highlight: CliHighlight | null }): React.ReactNode {
-  const [theme] = useTheme()
-  configureMarked()
+function MarkdownBody({ children, dimColor, highlight }: Props & { highlight: CliHighlight | null }): React.ReactNode {
+  const [theme] = useTheme();
+  configureMarked();
 
   const elements = useMemo(() => {
-    const tokens = cachedLexer(stripPromptXMLTags(children))
-    const elements: React.ReactNode[] = []
-    let nonTableContent = ''
+    const tokens = cachedLexer(stripPromptXMLTags(children));
+    const elements: React.ReactNode[] = [];
+    let nonTableContent = '';
 
     function flushNonTableContent(): void {
       if (nonTableContent) {
@@ -115,40 +108,34 @@ function MarkdownBody({
           <Ansi key={elements.length} dimColor={dimColor}>
             {nonTableContent.trim()}
           </Ansi>,
-        )
-        nonTableContent = ''
+        );
+        nonTableContent = '';
       }
     }
 
     for (const token of tokens) {
       if (token.type === 'table') {
-        flushNonTableContent()
-        elements.push(
-          <MarkdownTable
-            key={elements.length}
-            token={token as Tokens.Table}
-            highlight={highlight}
-          />,
-        )
+        flushNonTableContent();
+        elements.push(<MarkdownTable key={elements.length} token={token as Tokens.Table} highlight={highlight} />);
       } else {
-        nonTableContent += formatToken(token, theme, 0, null, null, highlight)
+        nonTableContent += formatToken(token, theme, 0, null, null, highlight);
       }
     }
 
-    flushNonTableContent()
-    return elements
-  }, [children, dimColor, highlight, theme])
+    flushNonTableContent();
+    return elements;
+  }, [children, dimColor, highlight, theme]);
 
   return (
     <Box flexDirection="column" gap={1}>
       {elements}
     </Box>
-  )
+  );
 }
 
 type StreamingProps = {
-  children: string
-}
+  children: string;
+};
 
 /**
  * Renders markdown during streaming by splitting at the last top-level block
@@ -160,49 +147,47 @@ type StreamingProps = {
  * is idempotent and safe under StrictMode double-rendering. Component unmounts
  * between turns (streamingText → null), resetting the ref.
  */
-export function StreamingMarkdown({
-  children,
-}: StreamingProps): React.ReactNode {
+export function StreamingMarkdown({ children }: StreamingProps): React.ReactNode {
   // React Compiler: this component reads and writes stablePrefixRef.current
   // during render by design. The boundary only advances (monotonic), so
   // the ref mutation is idempotent under StrictMode double-render — but the
   // compiler can't prove that, and memoizing around the ref reads would
   // break the algorithm (stale boundary). Opt out.
-  'use no memo'
-  configureMarked()
+  'use no memo';
+  configureMarked();
 
   // Strip before boundary tracking so it matches <Markdown>'s stripping
   // (line 29). When a closing tag arrives, stripped(N+1) is not a prefix
   // of stripped(N), but the startsWith reset below handles that with a
   // one-time re-lex on the smaller stripped string.
-  const stripped = stripPromptXMLTags(children)
+  const stripped = stripPromptXMLTags(children);
 
-  const stablePrefixRef = useRef('')
+  const stablePrefixRef = useRef('');
 
   // Reset if text was replaced (defensive; normally unmount handles this)
   if (!stripped.startsWith(stablePrefixRef.current)) {
-    stablePrefixRef.current = ''
+    stablePrefixRef.current = '';
   }
 
   // Lex only from current boundary — O(unstable length), not O(full text)
-  const boundary = stablePrefixRef.current.length
-  const tokens = marked.lexer(stripped.substring(boundary))
+  const boundary = stablePrefixRef.current.length;
+  const tokens = marked.lexer(stripped.substring(boundary));
 
   // Last non-space token is the growing block; everything before is final
-  let lastContentIdx = tokens.length - 1
+  let lastContentIdx = tokens.length - 1;
   while (lastContentIdx >= 0 && tokens[lastContentIdx]!.type === 'space') {
-    lastContentIdx--
+    lastContentIdx--;
   }
-  let advance = 0
+  let advance = 0;
   for (let i = 0; i < lastContentIdx; i++) {
-    advance += tokens[i]!.raw.length
+    advance += tokens[i]!.raw.length;
   }
   if (advance > 0) {
-    stablePrefixRef.current = stripped.substring(0, boundary + advance)
+    stablePrefixRef.current = stripped.substring(0, boundary + advance);
   }
 
-  const stablePrefix = stablePrefixRef.current
-  const unstableSuffix = stripped.substring(stablePrefix.length)
+  const stablePrefix = stablePrefixRef.current;
+  const unstableSuffix = stripped.substring(stablePrefix.length);
 
   // stablePrefix is memoized inside <Markdown> via useMemo([children, ...])
   // so it never re-parses as the unstable suffix grows
@@ -211,5 +196,5 @@ export function StreamingMarkdown({
       {stablePrefix && <Markdown>{stablePrefix}</Markdown>}
       {unstableSuffix && <Markdown>{unstableSuffix}</Markdown>}
     </Box>
-  )
+  );
 }
diff --git a/src/components/MarkdownTable.tsx b/src/components/MarkdownTable.tsx
index 0b3473d43..a6ece910c 100644
--- a/src/components/MarkdownTable.tsx
+++ b/src/components/MarkdownTable.tsx
@@ -1,37 +1,37 @@
-import type { Token, Tokens } from 'marked'
-import React from 'react'
-import stripAnsi from 'strip-ansi'
-import { useTerminalSize } from '../hooks/useTerminalSize.js'
-import { Ansi, stringWidth, useTheme, wrapAnsi } from '@anthropic/ink'
-import type { CliHighlight } from '../utils/cliHighlight.js'
-import { formatToken, padAligned } from '../utils/markdown.js'
+import type { Token, Tokens } from 'marked';
+import React from 'react';
+import stripAnsi from 'strip-ansi';
+import { useTerminalSize } from '../hooks/useTerminalSize.js';
+import { Ansi, stringWidth, useTheme, wrapAnsi } from '@anthropic/ink';
+import type { CliHighlight } from '../utils/cliHighlight.js';
+import { formatToken, padAligned } from '../utils/markdown.js';
 
 /** Accounts for parent indentation (e.g. message dot prefix) and terminal
  *  resize races. Without enough margin the table overflows its layout box
  *  and Ink's clip truncates differently on alternating frames, causing an
  *  infinite flicker loop in scrollback. */
-const SAFETY_MARGIN = 4
+const SAFETY_MARGIN = 4;
 
 /** Minimum column width to prevent degenerate layouts */
-const MIN_COLUMN_WIDTH = 3
+const MIN_COLUMN_WIDTH = 3;
 
 /**
  * Maximum number of lines per row before switching to vertical format.
  * When wrapping would make rows taller than this, vertical (key-value)
  * format provides better readability.
  */
-const MAX_ROW_LINES = 4
+const MAX_ROW_LINES = 4;
 
 /** ANSI escape codes for text formatting */
-const ANSI_BOLD_START = '\x1b[1m'
-const ANSI_BOLD_END = '\x1b[22m'
+const ANSI_BOLD_START = '\x1b[1m';
+const ANSI_BOLD_END = '\x1b[22m';
 
 type Props = {
-  token: Tokens.Table
-  highlight: CliHighlight | null
+  token: Tokens.Table;
+  highlight: CliHighlight | null;
   /** Override terminal width (useful for testing) */
-  forceWidth?: number
-}
+  forceWidth?: number;
+};
 
 /**
  * Wrap text to fit within a given width, returning array of lines.
@@ -40,26 +40,22 @@ type Props = {
  * @param hard - If true, break words that exceed width (needed when columns
  *               are narrower than the longest word). Default false.
  */
-function wrapText(
-  text: string,
-  width: number,
-  options?: { hard?: boolean },
-): string[] {
-  if (width <= 0) return [text]
+function wrapText(text: string, width: number, options?: { hard?: boolean }): string[] {
+  if (width <= 0) return [text];
   // Strip trailing whitespace/newlines before wrapping.
   // formatToken() adds EOL to paragraphs and other token types,
   // which would otherwise create extra blank lines in table cells.
-  const trimmedText = text.trimEnd()
+  const trimmedText = text.trimEnd();
   const wrapped = wrapAnsi(trimmedText, width, {
     hard: options?.hard ?? false,
     trim: false,
     wordWrap: true,
-  })
+  });
   // Filter out empty lines that result from trailing newlines or
   // multiple consecutive newlines in the source content.
-  const lines = wrapped.split('\n').filter(line => line.length > 0)
+  const lines = wrapped.split('\n').filter(line => line.length > 0);
   // Ensure we always return at least one line (empty string for empty cells)
-  return lines.length > 0 ? lines : ['']
+  return lines.length > 0 ? lines : [''];
 }
 
 /**
@@ -70,174 +66,152 @@ function wrapText(
  * 3. Wrapping text within cells (no truncation)
  * 4. Properly aligning multi-line rows with borders
  */
-export function MarkdownTable({
-  token,
-  highlight,
-  forceWidth,
-}: Props): React.ReactNode {
-  const [theme] = useTheme()
-  const { columns: actualTerminalWidth } = useTerminalSize()
-  const terminalWidth = forceWidth ?? actualTerminalWidth
+export function MarkdownTable({ token, highlight, forceWidth }: Props): React.ReactNode {
+  const [theme] = useTheme();
+  const { columns: actualTerminalWidth } = useTerminalSize();
+  const terminalWidth = forceWidth ?? actualTerminalWidth;
 
   // Format cell content to ANSI string
   function formatCell(tokens: Token[] | undefined): string {
-    return (
-      tokens
-        ?.map(_ => formatToken(_, theme, 0, null, null, highlight))
-        .join('') ?? ''
-    )
+    return tokens?.map(_ => formatToken(_, theme, 0, null, null, highlight)).join('') ?? '';
   }
 
   // Get plain text (stripped of ANSI codes)
   function getPlainText(tokens: Token[] | undefined): string {
-    return stripAnsi(formatCell(tokens))
+    return stripAnsi(formatCell(tokens));
   }
 
   // Get the longest word width in a cell (minimum width to avoid breaking words)
   function getMinWidth(tokens: Token[] | undefined): number {
-    const text = getPlainText(tokens)
-    const words = text.split(/\s+/).filter(w => w.length > 0)
-    if (words.length === 0) return MIN_COLUMN_WIDTH
-    return Math.max(...words.map(w => stringWidth(w)), MIN_COLUMN_WIDTH)
+    const text = getPlainText(tokens);
+    const words = text.split(/\s+/).filter(w => w.length > 0);
+    if (words.length === 0) return MIN_COLUMN_WIDTH;
+    return Math.max(...words.map(w => stringWidth(w)), MIN_COLUMN_WIDTH);
   }
 
   // Get ideal width (full content without wrapping)
   function getIdealWidth(tokens: Token[] | undefined): number {
-    return Math.max(stringWidth(getPlainText(tokens)), MIN_COLUMN_WIDTH)
+    return Math.max(stringWidth(getPlainText(tokens)), MIN_COLUMN_WIDTH);
   }
 
   // Calculate column widths
   // Step 1: Get minimum (longest word) and ideal (full content) widths
   const minWidths = token.header.map((header, colIndex) => {
-    let maxMinWidth = getMinWidth(header.tokens)
+    let maxMinWidth = getMinWidth(header.tokens);
     for (const row of token.rows) {
-      maxMinWidth = Math.max(maxMinWidth, getMinWidth(row[colIndex]?.tokens))
+      maxMinWidth = Math.max(maxMinWidth, getMinWidth(row[colIndex]?.tokens));
     }
-    return maxMinWidth
-  })
+    return maxMinWidth;
+  });
 
   const idealWidths = token.header.map((header, colIndex) => {
-    let maxIdeal = getIdealWidth(header.tokens)
+    let maxIdeal = getIdealWidth(header.tokens);
     for (const row of token.rows) {
-      maxIdeal = Math.max(maxIdeal, getIdealWidth(row[colIndex]?.tokens))
+      maxIdeal = Math.max(maxIdeal, getIdealWidth(row[colIndex]?.tokens));
     }
-    return maxIdeal
-  })
+    return maxIdeal;
+  });
 
   // Step 2: Calculate available space
   // Border overhead: │ content │ content │ = 1 + (width + 3) per column
-  const numCols = token.header.length
-  const borderOverhead = 1 + numCols * 3 // │ + (2 padding + 1 border) per col
+  const numCols = token.header.length;
+  const borderOverhead = 1 + numCols * 3; // │ + (2 padding + 1 border) per col
   // Account for SAFETY_MARGIN to avoid triggering the fallback safety check
-  const availableWidth = Math.max(
-    terminalWidth - borderOverhead - SAFETY_MARGIN,
-    numCols * MIN_COLUMN_WIDTH,
-  )
+  const availableWidth = Math.max(terminalWidth - borderOverhead - SAFETY_MARGIN, numCols * MIN_COLUMN_WIDTH);
 
   // Step 3: Calculate column widths that fit available space
-  const totalMin = minWidths.reduce((sum, w) => sum + w, 0)
-  const totalIdeal = idealWidths.reduce((sum, w) => sum + w, 0)
+  const totalMin = minWidths.reduce((sum, w) => sum + w, 0);
+  const totalIdeal = idealWidths.reduce((sum, w) => sum + w, 0);
 
   // Track whether columns are narrower than longest words (needs hard wrap)
-  let needsHardWrap = false
+  let needsHardWrap = false;
 
-  let columnWidths: number[]
+  let columnWidths: number[];
   if (totalIdeal <= availableWidth) {
     // Everything fits - use ideal widths
-    columnWidths = idealWidths
+    columnWidths = idealWidths;
   } else if (totalMin <= availableWidth) {
     // Need to shrink - give each column its min, distribute remaining space
-    const extraSpace = availableWidth - totalMin
-    const overflows = idealWidths.map((ideal, i) => ideal - minWidths[i]!)
-    const totalOverflow = overflows.reduce((sum, o) => sum + o, 0)
+    const extraSpace = availableWidth - totalMin;
+    const overflows = idealWidths.map((ideal, i) => ideal - minWidths[i]!);
+    const totalOverflow = overflows.reduce((sum, o) => sum + o, 0);
 
     columnWidths = minWidths.map((min, i) => {
-      if (totalOverflow === 0) return min
-      const extra = Math.floor((overflows[i]! / totalOverflow) * extraSpace)
-      return min + extra
-    })
+      if (totalOverflow === 0) return min;
+      const extra = Math.floor((overflows[i]! / totalOverflow) * extraSpace);
+      return min + extra;
+    });
   } else {
     // Table wider than terminal at minimum widths
     // Shrink columns proportionally to fit, allowing word breaks
-    needsHardWrap = true
-    const scaleFactor = availableWidth / totalMin
-    columnWidths = minWidths.map(w =>
-      Math.max(Math.floor(w * scaleFactor), MIN_COLUMN_WIDTH),
-    )
+    needsHardWrap = true;
+    const scaleFactor = availableWidth / totalMin;
+    columnWidths = minWidths.map(w => Math.max(Math.floor(w * scaleFactor), MIN_COLUMN_WIDTH));
   }
 
   // Step 4: Calculate max row lines to determine if vertical format is needed
   function calculateMaxRowLines(): number {
-    let maxLines = 1
+    let maxLines = 1;
     // Check header
     for (let i = 0; i < token.header.length; i++) {
-      const content = formatCell(token.header[i]!.tokens)
+      const content = formatCell(token.header[i]!.tokens);
       const wrapped = wrapText(content, columnWidths[i]!, {
         hard: needsHardWrap,
-      })
-      maxLines = Math.max(maxLines, wrapped.length)
+      });
+      maxLines = Math.max(maxLines, wrapped.length);
     }
     // Check rows
     for (const row of token.rows) {
       for (let i = 0; i < row.length; i++) {
-        const content = formatCell(row[i]?.tokens)
+        const content = formatCell(row[i]?.tokens);
         const wrapped = wrapText(content, columnWidths[i]!, {
           hard: needsHardWrap,
-        })
-        maxLines = Math.max(maxLines, wrapped.length)
+        });
+        maxLines = Math.max(maxLines, wrapped.length);
       }
     }
-    return maxLines
+    return maxLines;
   }
 
   // Use vertical format if wrapping would make rows too tall
-  const maxRowLines = calculateMaxRowLines()
-  const useVerticalFormat = maxRowLines > MAX_ROW_LINES
+  const maxRowLines = calculateMaxRowLines();
+  const useVerticalFormat = maxRowLines > MAX_ROW_LINES;
 
   // Render a single row with potential multi-line cells
   // Returns an array of strings, one per line of the row
-  function renderRowLines(
-    cells: Array<{ tokens?: Token[] }>,
-    isHeader: boolean,
-  ): string[] {
+  function renderRowLines(cells: Array<{ tokens?: Token[] }>, isHeader: boolean): string[] {
     // Get wrapped lines for each cell (preserving ANSI formatting)
     const cellLines = cells.map((cell, colIndex) => {
-      const formattedText = formatCell(cell.tokens)
-      const width = columnWidths[colIndex]!
-      return wrapText(formattedText, width, { hard: needsHardWrap })
-    })
+      const formattedText = formatCell(cell.tokens);
+      const width = columnWidths[colIndex]!;
+      return wrapText(formattedText, width, { hard: needsHardWrap });
+    });
 
     // Find max number of lines in this row
-    const maxLines = Math.max(...cellLines.map(lines => lines.length), 1)
+    const maxLines = Math.max(...cellLines.map(lines => lines.length), 1);
 
     // Calculate vertical offset for each cell (to center vertically)
-    const verticalOffsets = cellLines.map(lines =>
-      Math.floor((maxLines - lines.length) / 2),
-    )
+    const verticalOffsets = cellLines.map(lines => Math.floor((maxLines - lines.length) / 2));
 
     // Build each line of the row as a single string
-    const result: string[] = []
+    const result: string[] = [];
     for (let lineIdx = 0; lineIdx < maxLines; lineIdx++) {
-      let line = '│'
+      let line = '│';
       for (let colIndex = 0; colIndex < cells.length; colIndex++) {
-        const lines = cellLines[colIndex]!
-        const offset = verticalOffsets[colIndex]!
-        const contentLineIdx = lineIdx - offset
-        const lineText =
-          contentLineIdx >= 0 && contentLineIdx < lines.length
-            ? lines[contentLineIdx]!
-            : ''
-        const width = columnWidths[colIndex]!
+        const lines = cellLines[colIndex]!;
+        const offset = verticalOffsets[colIndex]!;
+        const contentLineIdx = lineIdx - offset;
+        const lineText = contentLineIdx >= 0 && contentLineIdx < lines.length ? lines[contentLineIdx]! : '';
+        const width = columnWidths[colIndex]!;
         // Headers always centered; data uses table alignment
-        const align = isHeader ? 'center' : (token.align?.[colIndex] ?? 'left')
+        const align = isHeader ? 'center' : (token.align?.[colIndex] ?? 'left');
 
-        line +=
-          ' ' + padAligned(lineText, stringWidth(lineText), width, align) + ' │'
+        line += ' ' + padAligned(lineText, stringWidth(lineText), width, align) + ' │';
       }
-      result.push(line)
+      result.push(line);
     }
 
-    return result
+    return result;
   }
 
   // Render horizontal border as a single string
@@ -246,109 +220,102 @@ export function MarkdownTable({
       top: ['┌', '─', '┬', '┐'],
       middle: ['├', '─', '┼', '┤'],
       bottom: ['└', '─', '┴', '┘'],
-    }[type] as [string, string, string, string]
+    }[type] as [string, string, string, string];
 
-    let line = left
+    let line = left;
     columnWidths.forEach((width, colIndex) => {
-      line += mid.repeat(width + 2)
-      line += colIndex < columnWidths.length - 1 ? cross : right
-    })
-    return line
+      line += mid.repeat(width + 2);
+      line += colIndex < columnWidths.length - 1 ? cross : right;
+    });
+    return line;
   }
 
   // Render vertical format (key-value pairs) for extra-narrow terminals
   function renderVerticalFormat(): string {
-    const lines: string[] = []
-    const headers = token.header.map(h => getPlainText(h.tokens))
-    const separatorWidth = Math.min(terminalWidth - 1, 40)
-    const separator = '─'.repeat(separatorWidth)
+    const lines: string[] = [];
+    const headers = token.header.map(h => getPlainText(h.tokens));
+    const separatorWidth = Math.min(terminalWidth - 1, 40);
+    const separator = '─'.repeat(separatorWidth);
     // Small indent for wrapped lines (just 2 spaces)
-    const wrapIndent = '  '
+    const wrapIndent = '  ';
 
     token.rows.forEach((row, rowIndex) => {
       if (rowIndex > 0) {
-        lines.push(separator)
+        lines.push(separator);
       }
 
       row.forEach((cell, colIndex) => {
-        const label = headers[colIndex] || `Column ${colIndex + 1}`
+        const label = headers[colIndex] || `Column ${colIndex + 1}`;
         // Clean value: trim, remove extra internal whitespace/newlines
-        const rawValue = formatCell(cell.tokens).trimEnd()
-        const value = rawValue.replace(/\n+/g, ' ').replace(/\s+/g, ' ').trim()
+        const rawValue = formatCell(cell.tokens).trimEnd();
+        const value = rawValue.replace(/\n+/g, ' ').replace(/\s+/g, ' ').trim();
 
         // Wrap value to fit terminal, accounting for label on first line
-        const firstLineWidth = terminalWidth - stringWidth(label) - 3
-        const subsequentLineWidth = terminalWidth - wrapIndent.length - 1
+        const firstLineWidth = terminalWidth - stringWidth(label) - 3;
+        const subsequentLineWidth = terminalWidth - wrapIndent.length - 1;
 
         // Two-pass wrap: first line is narrower (label takes space),
         // continuation lines get the full width minus indent.
-        const firstPassLines = wrapText(value, Math.max(firstLineWidth, 10))
-        const firstLine = firstPassLines[0] || ''
+        const firstPassLines = wrapText(value, Math.max(firstLineWidth, 10));
+        const firstLine = firstPassLines[0] || '';
 
-        let wrappedValue: string[]
-        if (
-          firstPassLines.length <= 1 ||
-          subsequentLineWidth <= firstLineWidth
-        ) {
-          wrappedValue = firstPassLines
+        let wrappedValue: string[];
+        if (firstPassLines.length <= 1 || subsequentLineWidth <= firstLineWidth) {
+          wrappedValue = firstPassLines;
         } else {
           // Re-join remaining text and re-wrap to the wider continuation width
           const remainingText = firstPassLines
             .slice(1)
             .map(l => l.trim())
-            .join(' ')
-          const rewrapped = wrapText(remainingText, subsequentLineWidth)
-          wrappedValue = [firstLine, ...rewrapped]
+            .join(' ');
+          const rewrapped = wrapText(remainingText, subsequentLineWidth);
+          wrappedValue = [firstLine, ...rewrapped];
         }
 
         // First line: bold label + value
-        lines.push(
-          `${ANSI_BOLD_START}${label}:${ANSI_BOLD_END} ${wrappedValue[0] || ''}`,
-        )
+        lines.push(`${ANSI_BOLD_START}${label}:${ANSI_BOLD_END} ${wrappedValue[0] || ''}`);
 
         // Subsequent lines with small indent (skip empty lines)
         for (let i = 1; i < wrappedValue.length; i++) {
-          const line = wrappedValue[i]!
-          if (!line.trim()) continue
-          lines.push(`${wrapIndent}${line}`)
+          const line = wrappedValue[i]!;
+          if (!line.trim()) continue;
+          lines.push(`${wrapIndent}${line}`);
         }
-      })
-    })
+      });
+    });
 
-    return lines.join('\n')
+    return lines.join('\n');
   }
 
   // Choose format based on available width
   if (useVerticalFormat) {
-    return <Ansi>{renderVerticalFormat()}</Ansi>
+    return <Ansi>{renderVerticalFormat()}</Ansi>;
   }
 
   // Build the complete horizontal table as an array of strings
-  const tableLines: string[] = []
-  tableLines.push(renderBorderLine('top'))
-  tableLines.push(...renderRowLines(token.header, true))
-  tableLines.push(renderBorderLine('middle'))
+  const tableLines: string[] = [];
+  tableLines.push(renderBorderLine('top'));
+  tableLines.push(...renderRowLines(token.header, true));
+  tableLines.push(renderBorderLine('middle'));
   token.rows.forEach((row, rowIndex) => {
-    tableLines.push(...renderRowLines(row, false))
+    tableLines.push(...renderRowLines(row, false));
     if (rowIndex < token.rows.length - 1) {
-      tableLines.push(renderBorderLine('middle'))
+      tableLines.push(renderBorderLine('middle'));
     }
-  })
-  tableLines.push(renderBorderLine('bottom'))
+  });
+  tableLines.push(renderBorderLine('bottom'));
 
   // Safety check: verify no line exceeds terminal width.
   // This catches edge cases during terminal resize where calculations
   // were based on a different width than the current render target.
-  const maxLineWidth = Math.max(
-    ...tableLines.map(line => stringWidth(stripAnsi(line))),
-  )
+  const maxLineWidth = Math.max(...tableLines.map(line => stringWidth(stripAnsi(line))));
 
   // If we're within SAFETY_MARGIN characters of the edge, use vertical format
   // to account for terminal resize race conditions.
   if (maxLineWidth > terminalWidth - SAFETY_MARGIN) {
-    return <Ansi>{renderVerticalFormat()}</Ansi>
+    return <Ansi>{renderVerticalFormat()}</Ansi>;
   }
 
   // Render as a single Ansi block to prevent Ink from wrapping mid-row
-  return <Ansi>{tableLines.join('\n')}</Ansi>
+  return <Ansi>{tableLines.join('\n')}</Ansi>;
 }
diff --git a/src/components/MemoryUsageIndicator.tsx b/src/components/MemoryUsageIndicator.tsx
index 92bc9e419..8945a730d 100644
--- a/src/components/MemoryUsageIndicator.tsx
+++ b/src/components/MemoryUsageIndicator.tsx
@@ -1,7 +1,7 @@
-import * as React from 'react'
-import { useMemoryUsage } from '../hooks/useMemoryUsage.js'
-import { Box, Text } from '@anthropic/ink'
-import { formatFileSize } from '../utils/format.js'
+import * as React from 'react';
+import { useMemoryUsage } from '../hooks/useMemoryUsage.js';
+import { Box, Text } from '@anthropic/ink';
+import { formatFileSize } from '../utils/format.js';
 
 export function MemoryUsageIndicator(): React.ReactNode {
   // Ant-only: the /heapdump link is an internal debugging aid. Gating before
@@ -9,26 +9,25 @@ export function MemoryUsageIndicator(): React.ReactNode {
   // USER_TYPE is a build-time constant, so the hook call below is either always
   // reached or dead-code-eliminated — never conditional at runtime.
   if (process.env.USER_TYPE !== 'ant') {
-    return null
+    return null;
   }
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  // biome-ignore lint/correctness/useHookAtTopLevel: USER_TYPE is a build-time constant
-  const memoryUsage = useMemoryUsage()
+  const memoryUsage = useMemoryUsage();
 
   if (!memoryUsage) {
-    return null
+    return null;
   }
 
-  const { heapUsed, status } = memoryUsage
+  const { heapUsed, status } = memoryUsage;
 
   // Only show indicator when memory usage is high or critical
   if (status === 'normal') {
-    return null
+    return null;
   }
 
-  const formattedSize = formatFileSize(heapUsed)
-  const color = status === 'critical' ? 'error' : 'warning'
+  const formattedSize = formatFileSize(heapUsed);
+  const color = status === 'critical' ? 'error' : 'warning';
 
   return (
     <Box>
@@ -36,5 +35,5 @@ export function MemoryUsageIndicator(): React.ReactNode {
         High memory usage ({formattedSize}) · /heapdump
       </Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/Message.tsx b/src/components/Message.tsx
index c069a4e1d..6a1653e15 100644
--- a/src/components/Message.tsx
+++ b/src/components/Message.tsx
@@ -1,21 +1,18 @@
-import { feature } from 'bun:bundle'
-import type { BetaContentBlock } from '@anthropic-ai/sdk/resources/beta/messages/messages.mjs'
+import { feature } from 'bun:bundle';
+import type { BetaContentBlock } from '@anthropic-ai/sdk/resources/beta/messages/messages.mjs';
 import type {
   ImageBlockParam,
   TextBlockParam,
   ThinkingBlockParam,
   ToolResultBlockParam,
   ToolUseBlockParam,
-} from '@anthropic-ai/sdk/resources/index.mjs'
-import * as React from 'react'
-import type { Command } from '../commands.js'
-import { useTerminalSize } from '../hooks/useTerminalSize.js'
-import { Box } from '@anthropic/ink'
-import type { Tools } from '../Tool.js'
-import {
-  type ConnectorTextBlock,
-  isConnectorTextBlock,
-} from '../types/connectorText.js'
+} from '@anthropic-ai/sdk/resources/index.mjs';
+import * as React from 'react';
+import type { Command } from '../commands.js';
+import { useTerminalSize } from '../hooks/useTerminalSize.js';
+import { Box } from '@anthropic/ink';
+import type { Tools } from '../Tool.js';
+import { type ConnectorTextBlock, isConnectorTextBlock } from '../types/connectorText.js';
 import type {
   AssistantMessage,
   AttachmentMessage as AttachmentMessageType,
@@ -24,27 +21,27 @@ import type {
   NormalizedUserMessage,
   ProgressMessage,
   SystemMessage,
-} from '../types/message.js'
-import { type AdvisorBlock, isAdvisorBlock } from '../utils/advisor.js'
-import { isFullscreenEnvEnabled } from '../utils/fullscreen.js'
-import { logError } from '../utils/log.js'
-import type { buildMessageLookups } from '../utils/messages.js'
-import { CompactSummary } from './CompactSummary.js'
-import { AdvisorMessage } from './messages/AdvisorMessage.js'
-import { AssistantRedactedThinkingMessage } from './messages/AssistantRedactedThinkingMessage.js'
-import { AssistantTextMessage } from './messages/AssistantTextMessage.js'
-import { AssistantThinkingMessage } from './messages/AssistantThinkingMessage.js'
-import { AssistantToolUseMessage } from './messages/AssistantToolUseMessage.js'
-import { AttachmentMessage } from './messages/AttachmentMessage.js'
-import { CollapsedReadSearchContent } from './messages/CollapsedReadSearchContent.js'
-import { CompactBoundaryMessage } from './messages/CompactBoundaryMessage.js'
-import { GroupedToolUseContent } from './messages/GroupedToolUseContent.js'
-import { SystemTextMessage } from './messages/SystemTextMessage.js'
-import { UserImageMessage } from './messages/UserImageMessage.js'
-import { UserTextMessage } from './messages/UserTextMessage.js'
-import { UserToolResultMessage } from './messages/UserToolResultMessage/UserToolResultMessage.js'
-import { OffscreenFreeze } from './OffscreenFreeze.js'
-import { ExpandShellOutputProvider } from './shell/ExpandShellOutputContext.js'
+} from '../types/message.js';
+import { type AdvisorBlock, isAdvisorBlock } from '../utils/advisor.js';
+import { isFullscreenEnvEnabled } from '../utils/fullscreen.js';
+import { logError } from '../utils/log.js';
+import type { buildMessageLookups } from '../utils/messages.js';
+import { CompactSummary } from './CompactSummary.js';
+import { AdvisorMessage } from './messages/AdvisorMessage.js';
+import { AssistantRedactedThinkingMessage } from './messages/AssistantRedactedThinkingMessage.js';
+import { AssistantTextMessage } from './messages/AssistantTextMessage.js';
+import { AssistantThinkingMessage } from './messages/AssistantThinkingMessage.js';
+import { AssistantToolUseMessage } from './messages/AssistantToolUseMessage.js';
+import { AttachmentMessage } from './messages/AttachmentMessage.js';
+import { CollapsedReadSearchContent } from './messages/CollapsedReadSearchContent.js';
+import { CompactBoundaryMessage } from './messages/CompactBoundaryMessage.js';
+import { GroupedToolUseContent } from './messages/GroupedToolUseContent.js';
+import { SystemTextMessage } from './messages/SystemTextMessage.js';
+import { UserImageMessage } from './messages/UserImageMessage.js';
+import { UserTextMessage } from './messages/UserTextMessage.js';
+import { UserToolResultMessage } from './messages/UserToolResultMessage/UserToolResultMessage.js';
+import { OffscreenFreeze } from './OffscreenFreeze.js';
+import { ExpandShellOutputProvider } from './shell/ExpandShellOutputContext.js';
 
 export type Props = {
   message:
@@ -53,31 +50,31 @@ export type Props = {
     | AttachmentMessageType
     | SystemMessage
     | GroupedToolUseMessageType
-    | CollapsedReadSearchGroupType
-  lookups: ReturnType<typeof buildMessageLookups>
+    | CollapsedReadSearchGroupType;
+  lookups: ReturnType<typeof buildMessageLookups>;
   // TODO: Find a way to remove this, and leave spacing to the consumer
   /** Absolute width for the container Box. When provided, eliminates a wrapper Box in the caller. */
-  containerWidth?: number
-  addMargin: boolean
-  tools: Tools
-  commands: Command[]
-  verbose: boolean
-  inProgressToolUseIDs: Set<string>
-  progressMessagesForMessage: ProgressMessage[]
-  shouldAnimate: boolean
-  shouldShowDot: boolean
-  style?: 'condensed'
-  width?: number | string
-  isTranscriptMode: boolean
-  isStatic: boolean
-  onOpenRateLimitOptions?: () => void
-  isActiveCollapsedGroup?: boolean
-  isUserContinuation?: boolean
+  containerWidth?: number;
+  addMargin: boolean;
+  tools: Tools;
+  commands: Command[];
+  verbose: boolean;
+  inProgressToolUseIDs: Set<string>;
+  progressMessagesForMessage: ProgressMessage[];
+  shouldAnimate: boolean;
+  shouldShowDot: boolean;
+  style?: 'condensed';
+  width?: number | string;
+  isTranscriptMode: boolean;
+  isStatic: boolean;
+  onOpenRateLimitOptions?: () => void;
+  isActiveCollapsedGroup?: boolean;
+  isUserContinuation?: boolean;
   /** ID of the last thinking block (uuid:index) to show, used for hiding past thinking in transcript mode */
-  lastThinkingBlockId?: string | null
+  lastThinkingBlockId?: string | null;
   /** UUID of the latest user bash output message (for auto-expanding) */
-  latestBashOutputUUID?: string | null
-}
+  latestBashOutputUUID?: string | null;
+};
 
 function MessageImpl({
   message,
@@ -109,7 +106,7 @@ function MessageImpl({
           verbose={verbose}
           isTranscriptMode={isTranscriptMode}
         />
-      )
+      );
     case 'assistant':
       return (
         <Box flexDirection="column" width={containerWidth ?? '100%'}>
@@ -136,38 +133,37 @@ function MessageImpl({
             />
           ))}
         </Box>
-      )
+      );
     case 'user': {
       if (message.isCompactSummary) {
-        return (
-          <CompactSummary
-            message={message}
-            screen={isTranscriptMode ? 'transcript' : 'prompt'}
-          />
-        )
+        return <CompactSummary message={message} screen={isTranscriptMode ? 'transcript' : 'prompt'} />;
       }
       // Precompute the imageIndex prop for each content block. The previous
       // version incremented a counter inside the .map() callback, which
       // React Compiler bails on ("UpdateExpression to variables captured
       // within lambdas"). A plain for loop keeps the mutation out of a
       // closure so the compiler can memoize MessageImpl.
-      const imageIndices: number[] = []
-      let imagePosition = 0
+      const imageIndices: number[] = [];
+      let imagePosition = 0;
       for (const param of message.message.content as Array<{ type: string }>) {
         if (param.type === 'image') {
-          const id = message.imagePasteIds?.[imagePosition]
-          imagePosition++
-          imageIndices.push(id ?? imagePosition)
+          const id = message.imagePasteIds?.[imagePosition];
+          imagePosition++;
+          imageIndices.push(id ?? imagePosition);
         } else {
-          imageIndices.push(imagePosition)
+          imageIndices.push(imagePosition);
         }
       }
       // Check if this message is the latest bash output - if so, wrap content
       // with provider so OutputLine can show full output via context
-      const isLatestBashOutput = latestBashOutputUUID === message.uuid
+      const isLatestBashOutput = latestBashOutputUUID === message.uuid;
       const content = (
         <Box flexDirection="column" width={containerWidth ?? '100%'}>
-          {(message.message.content as Array<TextBlockParam | ImageBlockParam | ToolUseBlockParam | ToolResultBlockParam>).map((param, index) => (
+          {(
+            message.message.content as Array<
+              TextBlockParam | ImageBlockParam | ToolUseBlockParam | ToolResultBlockParam
+            >
+          ).map((param, index) => (
             <UserMessage
               key={index}
               message={message}
@@ -184,12 +180,8 @@ function MessageImpl({
             />
           ))}
         </Box>
-      )
-      return isLatestBashOutput ? (
-        <ExpandShellOutputProvider>{content}</ExpandShellOutputProvider>
-      ) : (
-        content
-      )
+      );
+      return isLatestBashOutput ? <ExpandShellOutputProvider>{content}</ExpandShellOutputProvider> : content;
     }
     case 'system':
       if (message.subtype === 'compact_boundary') {
@@ -197,32 +189,32 @@ function MessageImpl({
         // appends instead of resetting, Messages.tsx skips the boundary
         // filter) — scroll up for history, no need for the ctrl+o hint.
         if (isFullscreenEnvEnabled()) {
-          return null
+          return null;
         }
-        return <CompactBoundaryMessage />
+        return <CompactBoundaryMessage />;
       }
       if (message.subtype === 'microcompact_boundary') {
         // Logged at creation time in createMicrocompactBoundaryMessage
-        return null
+        return null;
       }
       if (feature('HISTORY_SNIP')) {
         /* eslint-disable @typescript-eslint/no-require-imports */
         const { isSnipBoundaryMessage } =
-          require('../services/compact/snipProjection.js') as typeof import('../services/compact/snipProjection.js')
+          require('../services/compact/snipProjection.js') as typeof import('../services/compact/snipProjection.js');
         const { isSnipMarkerMessage } =
-          require('../services/compact/snipCompact.js') as typeof import('../services/compact/snipCompact.js')
+          require('../services/compact/snipCompact.js') as typeof import('../services/compact/snipCompact.js');
         /* eslint-enable @typescript-eslint/no-require-imports */
         if (isSnipBoundaryMessage(message)) {
           /* eslint-disable @typescript-eslint/no-require-imports */
           const { SnipBoundaryMessage } =
-            require('./messages/SnipBoundaryMessage.js') as typeof import('./messages/SnipBoundaryMessage.js')
+            require('./messages/SnipBoundaryMessage.js') as typeof import('./messages/SnipBoundaryMessage.js');
           /* eslint-enable @typescript-eslint/no-require-imports */
-          return <SnipBoundaryMessage message={message} />
+          return <SnipBoundaryMessage message={message} />;
         }
         if (isSnipMarkerMessage(message)) {
           // Internal registration marker — not user-facing. The boundary
           // message (above) is what shows when snips actually execute.
-          return null
+          return null;
         }
       }
       if (message.subtype === 'local_command') {
@@ -233,7 +225,7 @@ function MessageImpl({
             verbose={verbose}
             isTranscriptMode={isTranscriptMode}
           />
-        )
+        );
       }
       return (
         <SystemTextMessage
@@ -242,7 +234,7 @@ function MessageImpl({
           verbose={verbose}
           isTranscriptMode={isTranscriptMode}
         />
-      )
+      );
     case 'grouped_tool_use':
       return (
         <GroupedToolUseContent
@@ -252,7 +244,7 @@ function MessageImpl({
           inProgressToolUseIDs={inProgressToolUseIDs}
           shouldAnimate={shouldAnimate}
         />
-      )
+      );
     case 'collapsed_read_search':
       // OffscreenFreeze: the verb flips "Reading…"→"Read" when tools complete.
       // If the group has scrolled into scrollback by then, the update triggers
@@ -277,7 +269,7 @@ function MessageImpl({
             isActiveGroup={isActiveCollapsedGroup}
           />
         </OffscreenFreeze>
-      )
+      );
   }
 }
 
@@ -294,23 +286,19 @@ function UserMessage({
   lookups,
   isTranscriptMode,
 }: {
-  message: NormalizedUserMessage
-  addMargin: boolean
-  tools: Tools
-  progressMessagesForMessage: ProgressMessage[]
-  param:
-    | TextBlockParam
-    | ImageBlockParam
-    | ToolUseBlockParam
-    | ToolResultBlockParam
-  style?: 'condensed'
-  verbose: boolean
-  imageIndex?: number
-  isUserContinuation: boolean
-  lookups: ReturnType<typeof buildMessageLookups>
-  isTranscriptMode: boolean
+  message: NormalizedUserMessage;
+  addMargin: boolean;
+  tools: Tools;
+  progressMessagesForMessage: ProgressMessage[];
+  param: TextBlockParam | ImageBlockParam | ToolUseBlockParam | ToolResultBlockParam;
+  style?: 'condensed';
+  verbose: boolean;
+  imageIndex?: number;
+  isUserContinuation: boolean;
+  lookups: ReturnType<typeof buildMessageLookups>;
+  isTranscriptMode: boolean;
 }): React.ReactNode {
-  const { columns } = useTerminalSize()
+  const { columns } = useTerminalSize();
   switch (param.type) {
     case 'text':
       return (
@@ -322,16 +310,11 @@ function UserMessage({
           isTranscriptMode={isTranscriptMode}
           timestamp={message.timestamp as string | undefined}
         />
-      )
+      );
     case 'image':
       // If previous message is user (text or image), this is a continuation - use connector
       // Otherwise this image starts a new user turn - use margin
-      return (
-        <UserImageMessage
-          imageId={imageIndex}
-          addMargin={addMargin && !isUserContinuation}
-        />
-      )
+      return <UserImageMessage imageId={imageIndex} addMargin={addMargin && !isUserContinuation} />;
     case 'tool_result':
       return (
         <UserToolResultMessage
@@ -345,9 +328,9 @@ function UserMessage({
           width={columns - 5}
           isTranscriptMode={isTranscriptMode}
         />
-      )
+      );
     default:
-      return undefined
+      return undefined;
   }
 }
 
@@ -378,25 +361,25 @@ function AssistantMessageBlock({
     | ImageBlockParam
     | ThinkingBlockParam
     | ToolUseBlockParam
-    | ToolResultBlockParam
-  addMargin: boolean
-  tools: Tools
-  commands: Command[]
-  verbose: boolean
-  inProgressToolUseIDs: Set<string>
-  progressMessagesForMessage: ProgressMessage[]
-  shouldAnimate: boolean
-  shouldShowDot: boolean
-  width?: number | string
-  inProgressToolCallCount?: number
-  isTranscriptMode: boolean
-  lookups: ReturnType<typeof buildMessageLookups>
-  onOpenRateLimitOptions?: () => void
+    | ToolResultBlockParam;
+  addMargin: boolean;
+  tools: Tools;
+  commands: Command[];
+  verbose: boolean;
+  inProgressToolUseIDs: Set<string>;
+  progressMessagesForMessage: ProgressMessage[];
+  shouldAnimate: boolean;
+  shouldShowDot: boolean;
+  width?: number | string;
+  inProgressToolCallCount?: number;
+  isTranscriptMode: boolean;
+  lookups: ReturnType<typeof buildMessageLookups>;
+  onOpenRateLimitOptions?: () => void;
   /** ID of this content block's message:index for thinking block comparison */
-  thinkingBlockId: string
+  thinkingBlockId: string;
   /** ID of the last thinking block to show, null means show all */
-  lastThinkingBlockId?: string | null
-  advisorModel?: string
+  lastThinkingBlockId?: string | null;
+  advisorModel?: string;
 }): React.ReactNode {
   if (feature('CONNECTOR_TEXT')) {
     if (isConnectorTextBlock(param)) {
@@ -409,7 +392,7 @@ function AssistantMessageBlock({
           width={width}
           onOpenRateLimitOptions={onOpenRateLimitOptions}
         />
-      )
+      );
     }
   }
   switch (param.type) {
@@ -429,7 +412,7 @@ function AssistantMessageBlock({
           lookups={lookups}
           isTranscriptMode={isTranscriptMode}
         />
-      )
+      );
     case 'text':
       return (
         <AssistantTextMessage
@@ -440,19 +423,18 @@ function AssistantMessageBlock({
           width={width}
           onOpenRateLimitOptions={onOpenRateLimitOptions}
         />
-      )
+      );
     case 'redacted_thinking':
       if (!isTranscriptMode && !verbose) {
-        return null
+        return null;
       }
-      return <AssistantRedactedThinkingMessage addMargin={addMargin} />
+      return <AssistantRedactedThinkingMessage addMargin={addMargin} />;
     case 'thinking': {
       if (!isTranscriptMode && !verbose) {
-        return null
+        return null;
       }
       // In transcript mode with hidePastThinking, only show the last thinking block
-      const isLastThinking =
-        !lastThinkingBlockId || thinkingBlockId === lastThinkingBlockId
+      const isLastThinking = !lastThinkingBlockId || thinkingBlockId === lastThinkingBlockId;
       return (
         <AssistantThinkingMessage
           addMargin={addMargin}
@@ -461,7 +443,7 @@ function AssistantMessageBlock({
           verbose={verbose}
           hideInTranscript={isTranscriptMode && !isLastThinking}
         />
-      )
+      );
     }
     case 'server_tool_use':
     case 'advisor_tool_result':
@@ -476,29 +458,24 @@ function AssistantMessageBlock({
             verbose={verbose || isTranscriptMode}
             advisorModel={advisorModel}
           />
-        )
+        );
       }
-      logError(new Error(`Unable to render server tool block: ${param.type}`))
-      return null
+      logError(new Error(`Unable to render server tool block: ${param.type}`));
+      return null;
     default:
-      logError(new Error(`Unable to render message type: ${param.type}`))
-      return null
+      logError(new Error(`Unable to render message type: ${param.type}`));
+      return null;
   }
 }
 
-export function hasThinkingContent(m: {
-  type: string
-  message?: { content: Array<{ type: string }> }
-}): boolean {
-  if (m.type !== 'assistant' || !m.message) return false
-  return m.message.content.some(
-    b => b.type === 'thinking' || b.type === 'redacted_thinking',
-  )
+export function hasThinkingContent(m: { type: string; message?: { content: Array<{ type: string }> } }): boolean {
+  if (m.type !== 'assistant' || !m.message) return false;
+  return m.message.content.some(b => b.type === 'thinking' || b.type === 'redacted_thinking');
 }
 
 /** Exported for testing */
 export function areMessagePropsEqual(prev: Props, next: Props): boolean {
-  if (prev.message.uuid !== next.message.uuid) return false
+  if (prev.message.uuid !== next.message.uuid) return false;
   // Only re-render on lastThinkingBlockId change if this message actually
   // has thinking content — otherwise every message in scrollback re-renders
   // whenever streaming thinking starts/stops (CC-941).
@@ -506,21 +483,21 @@ export function areMessagePropsEqual(prev: Props, next: Props): boolean {
     prev.lastThinkingBlockId !== next.lastThinkingBlockId &&
     hasThinkingContent(next.message as Parameters<typeof hasThinkingContent>[0])
   ) {
-    return false
+    return false;
   }
   // Verbose toggle changes thinking block visibility/expansion
-  if (prev.verbose !== next.verbose) return false
+  if (prev.verbose !== next.verbose) return false;
   // Only re-render if this message's "is latest bash output" status changed,
   // not when the global latestBashOutputUUID changes to a different message
-  const prevIsLatest = prev.latestBashOutputUUID === prev.message.uuid
-  const nextIsLatest = next.latestBashOutputUUID === next.message.uuid
-  if (prevIsLatest !== nextIsLatest) return false
-  if (prev.isTranscriptMode !== next.isTranscriptMode) return false
+  const prevIsLatest = prev.latestBashOutputUUID === prev.message.uuid;
+  const nextIsLatest = next.latestBashOutputUUID === next.message.uuid;
+  if (prevIsLatest !== nextIsLatest) return false;
+  if (prev.isTranscriptMode !== next.isTranscriptMode) return false;
   // containerWidth is an absolute number in the no-metadata path (wrapper
   // Box is skipped). Static messages must re-render on terminal resize.
-  if (prev.containerWidth !== next.containerWidth) return false
-  if (prev.isStatic && next.isStatic) return true
-  return false
+  if (prev.containerWidth !== next.containerWidth) return false;
+  if (prev.isStatic && next.isStatic) return true;
+  return false;
 }
 
-export const Message = React.memo(MessageImpl, areMessagePropsEqual)
+export const Message = React.memo(MessageImpl, areMessagePropsEqual);
diff --git a/src/components/MessageModel.tsx b/src/components/MessageModel.tsx
index d57c7ef6a..2dd8c98e0 100644
--- a/src/components/MessageModel.tsx
+++ b/src/components/MessageModel.tsx
@@ -1,33 +1,30 @@
-import React from 'react'
-import { Box, Text, stringWidth } from '@anthropic/ink'
-import type { NormalizedMessage } from '../types/message.js'
+import React from 'react';
+import { Box, Text, stringWidth } from '@anthropic/ink';
+import type { NormalizedMessage } from '../types/message.js';
 
 type Props = {
-  message: NormalizedMessage
-  isTranscriptMode: boolean
-}
+  message: NormalizedMessage;
+  isTranscriptMode: boolean;
+};
 
-export function MessageModel({
-  message,
-  isTranscriptMode,
-}: Props): React.ReactNode {
-  const content = message.message?.content
-  const contentArray = Array.isArray(content) ? content : []
+export function MessageModel({ message, isTranscriptMode }: Props): React.ReactNode {
+  const content = message.message?.content;
+  const contentArray = Array.isArray(content) ? content : [];
   const shouldShowModel =
     isTranscriptMode &&
     message.type === 'assistant' &&
     message.message?.model &&
-    contentArray.some((c: any) => c?.type === 'text')
+    contentArray.some((c: any) => c?.type === 'text');
 
   if (!shouldShowModel) {
-    return null
+    return null;
   }
 
-  const model = message.message!.model as string
+  const model = message.message!.model as string;
 
   return (
     <Box minWidth={stringWidth(model) + 8}>
       <Text dimColor>{model}</Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/MessageResponse.tsx b/src/components/MessageResponse.tsx
index a8dd8613c..00852fe8c 100644
--- a/src/components/MessageResponse.tsx
+++ b/src/components/MessageResponse.tsx
@@ -1,16 +1,16 @@
-import * as React from 'react'
-import { useContext } from 'react'
-import { Box, NoSelect, Text, Ratchet } from '@anthropic/ink'
+import * as React from 'react';
+import { useContext } from 'react';
+import { Box, NoSelect, Text, Ratchet } from '@anthropic/ink';
 
 type Props = {
-  children: React.ReactNode
-  height?: number
-}
+  children: React.ReactNode;
+  height?: number;
+};
 
 export function MessageResponse({ children, height }: Props): React.ReactNode {
-  const isMessageResponse = useContext(MessageResponseContext)
+  const isMessageResponse = useContext(MessageResponseContext);
   if (isMessageResponse) {
-    return children
+    return children;
   }
   const content = (
     <MessageResponseProvider>
@@ -23,26 +23,18 @@ export function MessageResponse({ children, height }: Props): React.ReactNode {
         </Box>
       </Box>
     </MessageResponseProvider>
-  )
+  );
   if (height !== undefined) {
-    return content
+    return content;
   }
-  return <Ratchet lock="offscreen">{content}</Ratchet>
+  return <Ratchet lock="offscreen">{content}</Ratchet>;
 }
 
 // This is a context that is used to determine if the message response
 // is rendered as a descendant of another MessageResponse. We use it
 // to avoid rendering nested ⎿ characters.
-const MessageResponseContext = React.createContext(false)
+const MessageResponseContext = React.createContext(false);
 
-function MessageResponseProvider({
-  children,
-}: {
-  children: React.ReactNode
-}): React.ReactNode {
-  return (
-    <MessageResponseContext.Provider value={true}>
-      {children}
-    </MessageResponseContext.Provider>
-  )
+function MessageResponseProvider({ children }: { children: React.ReactNode }): React.ReactNode {
+  return <MessageResponseContext.Provider value={true}>{children}</MessageResponseContext.Provider>;
 }
diff --git a/src/components/MessageRow.tsx b/src/components/MessageRow.tsx
index dbcfe8e4e..1acad7ca0 100644
--- a/src/components/MessageRow.tsx
+++ b/src/components/MessageRow.tsx
@@ -1,61 +1,68 @@
-import * as React from 'react'
-import type { Command } from '../commands.js'
-import { Box } from '@anthropic/ink'
-import type { Screen } from '../screens/REPL.js'
-import type { Tools } from '../Tool.js'
-import type { RenderableMessage } from '../types/message.js'
+import * as React from 'react';
+import type { Command } from '../commands.js';
+import { Box } from '@anthropic/ink';
+import type { Screen } from '../screens/REPL.js';
+import type { Tools } from '../Tool.js';
+import type { RenderableMessage } from '../types/message.js';
 import {
   getDisplayMessageFromCollapsed,
   getToolSearchOrReadInfo,
   getToolUseIdsFromCollapsedGroup,
   hasAnyToolInProgress,
-} from '../utils/collapseReadSearch.js'
+} from '../utils/collapseReadSearch.js';
 import {
   type buildMessageLookups,
   EMPTY_STRING_SET,
   getProgressMessagesFromLookup,
   getSiblingToolUseIDsFromLookup,
   getToolUseID,
-} from '../utils/messages.js'
-import { hasThinkingContent, Message } from './Message.js'
+} from '../utils/messages.js';
+import { hasThinkingContent, Message } from './Message.js';
 
 // Narrow the first element of MessageContent to a block with known shape.
-type ContentBlock = { type: string; name?: string; input?: unknown; id?: string; text?: string; [key: string]: unknown }
+type ContentBlock = {
+  type: string;
+  name?: string;
+  input?: unknown;
+  id?: string;
+  text?: string;
+  [key: string]: unknown;
+};
 const firstBlock = (content: unknown): ContentBlock | undefined => {
-  if (!Array.isArray(content)) return undefined
-  const b = content[0]
-  if (b == null || typeof b === 'string') return undefined
-  return b as ContentBlock
-}
-import { MessageModel } from './MessageModel.js'
-import { shouldRenderStatically } from './Messages.js'
-import { MessageTimestamp } from './MessageTimestamp.js'
-import { OffscreenFreeze } from './OffscreenFreeze.js'
+  if (!Array.isArray(content)) return undefined;
+  const b = content[0];
+  if (b == null || typeof b === 'string') return undefined;
+  return b as ContentBlock;
+};
+import { MessageModel } from './MessageModel.js';
+import { shouldRenderStatically } from './Messages.js';
+import { MessageTimestamp } from './MessageTimestamp.js';
+import { OffscreenFreeze } from './OffscreenFreeze.js';
 
 export type Props = {
-  message: RenderableMessage
+  message: RenderableMessage;
   /** Whether the previous message in renderableMessages is also a user message. */
-  isUserContinuation: boolean
+  isUserContinuation: boolean;
   /**
    * Whether there is non-skippable content after this message in renderableMessages.
    * Only needs to be accurate for `collapsed_read_search` messages — used to decide
    * if the collapsed group spinner should stay active. Pass `false` otherwise.
    */
-  hasContentAfter: boolean
-  tools: Tools
-  commands: Command[]
-  verbose: boolean
-  inProgressToolUseIDs: Set<string>
-  streamingToolUseIDs: Set<string>
-  screen: Screen
-  canAnimate: boolean
-  onOpenRateLimitOptions?: () => void
-  lastThinkingBlockId: string | null
-  latestBashOutputUUID: string | null
-  columns: number
-  isLoading: boolean
-  lookups: ReturnType<typeof buildMessageLookups>
-}
+  hasContentAfter: boolean;
+  tools: Tools;
+  commands: Command[];
+  verbose: boolean;
+  inProgressToolUseIDs: Set<string>;
+  streamingToolUseIDs: Set<string>;
+  screen: Screen;
+  canAnimate: boolean;
+  onOpenRateLimitOptions?: () => void;
+  lastThinkingBlockId: string | null;
+  latestBashOutputUUID: string | null;
+  columns: number;
+  isLoading: boolean;
+  lookups: ReturnType<typeof buildMessageLookups>;
+};
 
 /**
  * Scans forward from `index+1` to check if any "real" content follows. Used to
@@ -74,54 +81,46 @@ export function hasContentAfterIndex(
   streamingToolUseIDs: Set<string>,
 ): boolean {
   for (let i = index + 1; i < messages.length; i++) {
-    const msg = messages[i]
+    const msg = messages[i];
     if (msg?.type === 'assistant') {
-      const content = firstBlock(msg.message.content)
-      if (
-        content?.type === 'thinking' ||
-        content?.type === 'redacted_thinking'
-      ) {
-        continue
+      const content = firstBlock(msg.message.content);
+      if (content?.type === 'thinking' || content?.type === 'redacted_thinking') {
+        continue;
       }
       if (content?.type === 'tool_use') {
-        if (
-          getToolSearchOrReadInfo(content.name!, content.input, tools)
-            .isCollapsible
-        ) {
-          continue
+        if (getToolSearchOrReadInfo(content.name!, content.input, tools).isCollapsible) {
+          continue;
         }
         // Non-collapsible tool uses appear in syntheticStreamingToolUseMessages
         // before their ID is added to inProgressToolUseIDs. Skip while streaming
         // to avoid briefly finalizing the read group.
         if (streamingToolUseIDs.has(content.id!)) {
-          continue
+          continue;
         }
       }
-      return true
+      return true;
     }
     if (msg?.type === 'system' || msg?.type === 'attachment') {
-      continue
+      continue;
     }
     // Tool results arrive while the collapsed group is still being built
     if (msg?.type === 'user') {
-      const content = firstBlock(msg.message.content)
+      const content = firstBlock(msg.message.content);
       if (content?.type === 'tool_result') {
-        continue
+        continue;
       }
     }
     // Collapsible grouped_tool_use messages arrive transiently before being
     // merged into the current collapsed group on the next render cycle
     if (msg?.type === 'grouped_tool_use') {
-      const firstInput = firstBlock(msg.messages[0]?.message.content)?.input
-      if (
-        getToolSearchOrReadInfo(msg.toolName, firstInput, tools).isCollapsible
-      ) {
-        continue
+      const firstInput = firstBlock(msg.messages[0]?.message.content)?.input;
+      if (getToolSearchOrReadInfo(msg.toolName, firstInput, tools).isCollapsible) {
+        continue;
       }
     }
-    return true
+    return true;
   }
-  return false
+  return false;
 }
 
 function MessageRowImpl({
@@ -142,32 +141,22 @@ function MessageRowImpl({
   isLoading,
   lookups,
 }: Props): React.ReactNode {
-  const isTranscriptMode = screen === 'transcript'
-  const isGrouped = msg.type === 'grouped_tool_use'
-  const isCollapsed = msg.type === 'collapsed_read_search'
+  const isTranscriptMode = screen === 'transcript';
+  const isGrouped = msg.type === 'grouped_tool_use';
+  const isCollapsed = msg.type === 'collapsed_read_search';
 
   // A collapsed group is "active" (grey dot, present tense "Reading…") when its tools
   // are still executing OR when the overall query is still running with nothing after it.
   // hasAnyToolInProgress takes priority: if tools are running, always show active regardless
   // of what else is in the message list (avoids false finalization during parallel execution).
   const isActiveCollapsedGroup =
-    isCollapsed &&
-    (hasAnyToolInProgress(msg, inProgressToolUseIDs) ||
-      (isLoading && !hasContentAfter))
+    isCollapsed && (hasAnyToolInProgress(msg, inProgressToolUseIDs) || (isLoading && !hasContentAfter));
 
-  const displayMsg = isGrouped
-    ? msg.displayMessage
-    : isCollapsed
-      ? getDisplayMessageFromCollapsed(msg)
-      : msg
+  const displayMsg = isGrouped ? msg.displayMessage : isCollapsed ? getDisplayMessageFromCollapsed(msg) : msg;
 
-  const progressMessagesForMessage =
-    isGrouped || isCollapsed ? [] : getProgressMessagesFromLookup(msg, lookups)
+  const progressMessagesForMessage = isGrouped || isCollapsed ? [] : getProgressMessagesFromLookup(msg, lookups);
 
-  const siblingToolUseIDs =
-    isGrouped || isCollapsed
-      ? EMPTY_STRING_SET
-      : getSiblingToolUseIDsFromLookup(msg, lookups)
+  const siblingToolUseIDs = isGrouped || isCollapsed ? EMPTY_STRING_SET : getSiblingToolUseIDsFromLookup(msg, lookups);
 
   const isStatic = shouldRenderStatically(
     msg,
@@ -176,30 +165,29 @@ function MessageRowImpl({
     siblingToolUseIDs,
     screen,
     lookups,
-  )
+  );
 
-  let shouldAnimate = false
+  let shouldAnimate = false;
   if (canAnimate) {
     if (isGrouped) {
       shouldAnimate = msg.messages.some(m => {
-        const content = firstBlock(m.message.content)
-        return (
-          content?.type === 'tool_use' && inProgressToolUseIDs.has(content.id!)
-        )
-      })
+        const content = firstBlock(m.message.content);
+        return content?.type === 'tool_use' && inProgressToolUseIDs.has(content.id!);
+      });
     } else if (isCollapsed) {
-      shouldAnimate = hasAnyToolInProgress(msg, inProgressToolUseIDs)
+      shouldAnimate = hasAnyToolInProgress(msg, inProgressToolUseIDs);
     } else {
-      const toolUseID = getToolUseID(msg)
-      shouldAnimate = !toolUseID || inProgressToolUseIDs.has(toolUseID)
+      const toolUseID = getToolUseID(msg);
+      shouldAnimate = !toolUseID || inProgressToolUseIDs.has(toolUseID);
     }
   }
 
   const hasMetadata =
     isTranscriptMode &&
     displayMsg.type === 'assistant' &&
-    (Array.isArray(displayMsg.message.content) && (displayMsg.message.content as Array<{ type: string }>).some(c => c.type === 'text')) &&
-    (displayMsg.timestamp || displayMsg.message.model)
+    Array.isArray(displayMsg.message.content) &&
+    (displayMsg.message.content as Array<{ type: string }>).some(c => c.type === 'text') &&
+    (displayMsg.timestamp || displayMsg.message.model);
 
   const messageEl = (
     <Message
@@ -222,7 +210,7 @@ function MessageRowImpl({
       lastThinkingBlockId={lastThinkingBlockId}
       latestBashOutputUUID={latestBashOutputUUID}
     />
-  )
+  );
   // OffscreenFreeze: the outer React.memo already bails for static messages,
   // so this only wraps rows that DO re-render — in-progress tools, collapsed
   // read/search spinners, bash elapsed timers. When those rows have scrolled
@@ -230,81 +218,64 @@ function MessageRowImpl({
   // change forces log-update.ts into a full terminal reset per tick. Freezing
   // returns the cached element ref so React bails and produces zero diff.
   if (!hasMetadata) {
-    return <OffscreenFreeze>{messageEl}</OffscreenFreeze>
+    return <OffscreenFreeze>{messageEl}</OffscreenFreeze>;
   }
   // Margin on children, not here — else null items (hook_success etc.) get phantom 1-row spacing.
   return (
     <OffscreenFreeze>
       <Box width={columns} flexDirection="column">
-        <Box
-          flexDirection="row"
-          justifyContent="flex-end"
-          gap={1}
-          marginTop={1}
-        >
-          <MessageTimestamp
-            message={displayMsg}
-            isTranscriptMode={isTranscriptMode}
-          />
-          <MessageModel
-            message={displayMsg}
-            isTranscriptMode={isTranscriptMode}
-          />
+        <Box flexDirection="row" justifyContent="flex-end" gap={1} marginTop={1}>
+          <MessageTimestamp message={displayMsg} isTranscriptMode={isTranscriptMode} />
+          <MessageModel message={displayMsg} isTranscriptMode={isTranscriptMode} />
         </Box>
         {messageEl}
       </Box>
     </OffscreenFreeze>
-  )
+  );
 }
 
 /**
  * Checks if a message is "streaming" - i.e., its content may still be changing.
  * Exported for testing.
  */
-export function isMessageStreaming(
-  msg: RenderableMessage,
-  streamingToolUseIDs: Set<string>,
-): boolean {
+export function isMessageStreaming(msg: RenderableMessage, streamingToolUseIDs: Set<string>): boolean {
   if (msg.type === 'grouped_tool_use') {
     return msg.messages.some(m => {
-      const content = firstBlock(m.message.content)
-      return content?.type === 'tool_use' && streamingToolUseIDs.has(content.id!)
-    })
+      const content = firstBlock(m.message.content);
+      return content?.type === 'tool_use' && streamingToolUseIDs.has(content.id!);
+    });
   }
   if (msg.type === 'collapsed_read_search') {
-    const toolIds = getToolUseIdsFromCollapsedGroup(msg)
-    return toolIds.some(id => streamingToolUseIDs.has(id))
+    const toolIds = getToolUseIdsFromCollapsedGroup(msg);
+    return toolIds.some(id => streamingToolUseIDs.has(id));
   }
-  const toolUseID = getToolUseID(msg)
-  return !!toolUseID && streamingToolUseIDs.has(toolUseID)
+  const toolUseID = getToolUseID(msg);
+  return !!toolUseID && streamingToolUseIDs.has(toolUseID);
 }
 
 /**
  * Checks if all tools in a message are resolved.
  * Exported for testing.
  */
-export function allToolsResolved(
-  msg: RenderableMessage,
-  resolvedToolUseIDs: Set<string>,
-): boolean {
+export function allToolsResolved(msg: RenderableMessage, resolvedToolUseIDs: Set<string>): boolean {
   if (msg.type === 'grouped_tool_use') {
     return msg.messages.every(m => {
-      const content = firstBlock(m.message.content)
-      return content?.type === 'tool_use' && resolvedToolUseIDs.has(content.id!)
-    })
+      const content = firstBlock(m.message.content);
+      return content?.type === 'tool_use' && resolvedToolUseIDs.has(content.id!);
+    });
   }
   if (msg.type === 'collapsed_read_search') {
-    const toolIds = getToolUseIdsFromCollapsedGroup(msg)
-    return toolIds.every(id => resolvedToolUseIDs.has(id))
+    const toolIds = getToolUseIdsFromCollapsedGroup(msg);
+    return toolIds.every(id => resolvedToolUseIDs.has(id));
   }
   if (msg.type === 'assistant') {
-    const block = firstBlock(msg.message.content)
+    const block = firstBlock(msg.message.content);
     if (block?.type === 'server_tool_use') {
-      return resolvedToolUseIDs.has(block.id!)
+      return resolvedToolUseIDs.has(block.id!);
     }
   }
-  const toolUseID = getToolUseID(msg)
-  return !toolUseID || resolvedToolUseIDs.has(toolUseID)
+  const toolUseID = getToolUseID(msg);
+  return !toolUseID || resolvedToolUseIDs.has(toolUseID);
 }
 
 /**
@@ -315,29 +286,26 @@ export function allToolsResolved(
  */
 export function areMessageRowPropsEqual(prev: Props, next: Props): boolean {
   // Different message reference = content may have changed, must re-render
-  if (prev.message !== next.message) return false
+  if (prev.message !== next.message) return false;
 
   // Screen mode change = re-render
-  if (prev.screen !== next.screen) return false
+  if (prev.screen !== next.screen) return false;
 
   // Verbose toggle changes thinking block visibility
-  if (prev.verbose !== next.verbose) return false
+  if (prev.verbose !== next.verbose) return false;
 
   // collapsed_read_search is never static in prompt mode (matches shouldRenderStatically)
-  if (
-    prev.message.type === 'collapsed_read_search' &&
-    next.screen !== 'transcript'
-  ) {
-    return false
+  if (prev.message.type === 'collapsed_read_search' && next.screen !== 'transcript') {
+    return false;
   }
 
   // Width change affects Box layout
-  if (prev.columns !== next.columns) return false
+  if (prev.columns !== next.columns) return false;
 
   // latestBashOutputUUID affects rendering (full vs truncated output)
-  const prevIsLatestBash = prev.latestBashOutputUUID === prev.message.uuid
-  const nextIsLatestBash = next.latestBashOutputUUID === next.message.uuid
-  if (prevIsLatestBash !== nextIsLatestBash) return false
+  const prevIsLatestBash = prev.latestBashOutputUUID === prev.message.uuid;
+  const nextIsLatestBash = next.latestBashOutputUUID === next.message.uuid;
+  if (prevIsLatestBash !== nextIsLatestBash) return false;
 
   // lastThinkingBlockId affects thinking block visibility — but only for
   // messages that HAVE thinking content. Checking unconditionally busts the
@@ -346,21 +314,18 @@ export function areMessageRowPropsEqual(prev: Props, next: Props): boolean {
     prev.lastThinkingBlockId !== next.lastThinkingBlockId &&
     hasThinkingContent(next.message as Parameters<typeof hasThinkingContent>[0])
   ) {
-    return false
+    return false;
   }
 
   // Check if this message is still "in flight"
-  const isStreaming = isMessageStreaming(prev.message, prev.streamingToolUseIDs)
-  const isResolved = allToolsResolved(
-    prev.message,
-    prev.lookups.resolvedToolUseIDs,
-  )
+  const isStreaming = isMessageStreaming(prev.message, prev.streamingToolUseIDs);
+  const isResolved = allToolsResolved(prev.message, prev.lookups.resolvedToolUseIDs);
 
   // Only bail out for truly static messages
-  if (isStreaming || !isResolved) return false
+  if (isStreaming || !isResolved) return false;
 
   // Static message - safe to skip re-render
-  return true
+  return true;
 }
 
-export const MessageRow = React.memo(MessageRowImpl, areMessageRowPropsEqual)
+export const MessageRow = React.memo(MessageRowImpl, areMessageRowPropsEqual);
diff --git a/src/components/MessageSelector.tsx b/src/components/MessageSelector.tsx
index caca52aa7..a54a84b03 100644
--- a/src/components/MessageSelector.tsx
+++ b/src/components/MessageSelector.tsx
@@ -1,50 +1,43 @@
-import type {
-  ContentBlockParam,
-  TextBlockParam,
-} from '@anthropic-ai/sdk/resources/index.mjs'
-import { randomUUID, type UUID } from 'crypto'
-import figures from 'figures'
-import * as React from 'react'
-import { useCallback, useEffect, useMemo, useState } from 'react'
+import type { ContentBlockParam, TextBlockParam } from '@anthropic-ai/sdk/resources/index.mjs';
+import { randomUUID, type UUID } from 'crypto';
+import figures from 'figures';
+import * as React from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from 'src/services/analytics/index.js'
-import { useAppState } from 'src/state/AppState.js'
+} from 'src/services/analytics/index.js';
+import { useAppState } from 'src/state/AppState.js';
 import {
   type DiffStats,
   fileHistoryCanRestore,
   fileHistoryEnabled,
   fileHistoryGetDiffStats,
-} from 'src/utils/fileHistory.js'
-import { logError } from 'src/utils/log.js'
-import { useExitOnCtrlCDWithKeybindings } from '../hooks/useExitOnCtrlCDWithKeybindings.js'
-import { Box, Text, Divider } from '@anthropic/ink'
-import { useKeybinding, useKeybindings } from '../keybindings/useKeybinding.js'
-import type {
-  Message,
-  PartialCompactDirection,
-  UserMessage,
-} from '../types/message.js'
-import { stripDisplayTags } from '../utils/displayTags.js'
+} from 'src/utils/fileHistory.js';
+import { logError } from 'src/utils/log.js';
+import { useExitOnCtrlCDWithKeybindings } from '../hooks/useExitOnCtrlCDWithKeybindings.js';
+import { Box, Text, Divider } from '@anthropic/ink';
+import { useKeybinding, useKeybindings } from '../keybindings/useKeybinding.js';
+import type { Message, PartialCompactDirection, UserMessage } from '../types/message.js';
+import { stripDisplayTags } from '../utils/displayTags.js';
 import {
   createUserMessage,
   extractTag,
   isEmptyMessageText,
   isSyntheticMessage,
   isToolUseResultMessage,
-} from '../utils/messages.js'
-import { type OptionWithDescription, Select } from './CustomSelect/select.js'
-import { Spinner } from './Spinner.js'
+} from '../utils/messages.js';
+import { type OptionWithDescription, Select } from './CustomSelect/select.js';
+import { Spinner } from './Spinner.js';
 
 function isTextBlock(block: ContentBlockParam): block is TextBlockParam {
-  return block.type === 'text'
+  return block.type === 'text';
 }
 
-import * as path from 'path'
-import { useTerminalSize } from 'src/hooks/useTerminalSize.js'
-import type { FileEditOutput } from '@claude-code-best/builtin-tools/tools/FileEditTool/types.js'
-import type { Output as FileWriteToolOutput } from '@claude-code-best/builtin-tools/tools/FileWriteTool/FileWriteTool.js'
+import * as path from 'path';
+import { useTerminalSize } from 'src/hooks/useTerminalSize.js';
+import type { FileEditOutput } from '@claude-code-best/builtin-tools/tools/FileEditTool/types.js';
+import type { Output as FileWriteToolOutput } from '@claude-code-best/builtin-tools/tools/FileWriteTool/FileWriteTool.js';
 import {
   BASH_STDERR_TAG,
   BASH_STDOUT_TAG,
@@ -54,40 +47,28 @@ import {
   TASK_NOTIFICATION_TAG,
   TEAMMATE_MESSAGE_TAG,
   TICK_TAG,
-} from '../constants/xml.js'
-import { count } from '../utils/array.js'
-import { formatRelativeTimeAgo, truncate } from '../utils/format.js'
-import type { Theme } from '../utils/theme.js'
-type RestoreOption =
-  | 'both'
-  | 'conversation'
-  | 'code'
-  | 'summarize'
-  | 'summarize_up_to'
-  | 'nevermind'
+} from '../constants/xml.js';
+import { count } from '../utils/array.js';
+import { formatRelativeTimeAgo, truncate } from '../utils/format.js';
+import type { Theme } from '../utils/theme.js';
+type RestoreOption = 'both' | 'conversation' | 'code' | 'summarize' | 'summarize_up_to' | 'nevermind';
 
-function isSummarizeOption(
-  option: RestoreOption | null,
-): option is 'summarize' | 'summarize_up_to' {
-  return option === 'summarize' || option === 'summarize_up_to'
+function isSummarizeOption(option: RestoreOption | null): option is 'summarize' | 'summarize_up_to' {
+  return option === 'summarize' || option === 'summarize_up_to';
 }
 
 type Props = {
-  messages: Message[]
-  onPreRestore: () => void
-  onRestoreMessage: (message: UserMessage) => Promise<void>
-  onRestoreCode: (message: UserMessage) => Promise<void>
-  onSummarize: (
-    message: UserMessage,
-    feedback?: string,
-    direction?: PartialCompactDirection,
-  ) => Promise<void>
-  onClose: () => void
+  messages: Message[];
+  onPreRestore: () => void;
+  onRestoreMessage: (message: UserMessage) => Promise<void>;
+  onRestoreCode: (message: UserMessage) => Promise<void>;
+  onSummarize: (message: UserMessage, feedback?: string, direction?: PartialCompactDirection) => Promise<void>;
+  onClose: () => void;
   /** Skip pick-list, land on confirm. Caller ran skip-check first. Esc closes fully (no back-to-list). */
-  preselectedMessage?: UserMessage
-}
+  preselectedMessage?: UserMessage;
+};
 
-const MAX_VISIBLE_MESSAGES = 7
+const MAX_VISIBLE_MESSAGES = 7;
 
 export function MessageSelector({
   messages,
@@ -98,12 +79,12 @@ export function MessageSelector({
   onClose,
   preselectedMessage,
 }: Props): React.ReactNode {
-  const fileHistory = useAppState(s => s.fileHistory)
-  const [error, setError] = useState<string | undefined>(undefined)
-  const isFileHistoryEnabled = fileHistoryEnabled()
+  const fileHistory = useAppState(s => s.fileHistory);
+  const [error, setError] = useState<string | undefined>(undefined);
+  const isFileHistoryEnabled = fileHistoryEnabled();
 
   // Add current prompt as a virtual message
-  const currentUUID = useMemo(randomUUID, [])
+  const currentUUID = useMemo(randomUUID, []);
   const messageOptions = useMemo(
     () => [
       ...messages.filter(selectableUserMessagesFilter),
@@ -115,62 +96,48 @@ export function MessageSelector({
       } as UserMessage,
     ],
     [messages, currentUUID],
-  )
-  const [selectedIndex, setSelectedIndex] = useState(messageOptions.length - 1)
+  );
+  const [selectedIndex, setSelectedIndex] = useState(messageOptions.length - 1);
 
   // Orient the selected message as the middle of the visible options
   const firstVisibleIndex = Math.max(
     0,
-    Math.min(
-      selectedIndex - Math.floor(MAX_VISIBLE_MESSAGES / 2),
-      messageOptions.length - MAX_VISIBLE_MESSAGES,
-    ),
-  )
+    Math.min(selectedIndex - Math.floor(MAX_VISIBLE_MESSAGES / 2), messageOptions.length - MAX_VISIBLE_MESSAGES),
+  );
 
-  const hasMessagesToSelect = messageOptions.length > 1
+  const hasMessagesToSelect = messageOptions.length > 1;
 
-  const [messageToRestore, setMessageToRestore] = useState<
-    UserMessage | undefined
-  >(preselectedMessage)
-  const [diffStatsForRestore, setDiffStatsForRestore] = useState<
-    DiffStats | undefined
-  >(undefined)
+  const [messageToRestore, setMessageToRestore] = useState<UserMessage | undefined>(preselectedMessage);
+  const [diffStatsForRestore, setDiffStatsForRestore] = useState<DiffStats | undefined>(undefined);
 
   useEffect(() => {
-    if (!preselectedMessage || !isFileHistoryEnabled) return
-    let cancelled = false
-    void fileHistoryGetDiffStats(fileHistory, preselectedMessage.uuid).then(
-      stats => {
-        if (!cancelled) setDiffStatsForRestore(stats)
-      },
-    )
+    if (!preselectedMessage || !isFileHistoryEnabled) return;
+    let cancelled = false;
+    void fileHistoryGetDiffStats(fileHistory, preselectedMessage.uuid).then(stats => {
+      if (!cancelled) setDiffStatsForRestore(stats);
+    });
     return () => {
-      cancelled = true
-    }
-  }, [preselectedMessage, isFileHistoryEnabled, fileHistory])
+      cancelled = true;
+    };
+  }, [preselectedMessage, isFileHistoryEnabled, fileHistory]);
 
-  const [isRestoring, setIsRestoring] = useState(false)
-  const [restoringOption, setRestoringOption] = useState<RestoreOption | null>(
-    null,
-  )
-  const [selectedRestoreOption, setSelectedRestoreOption] =
-    useState<RestoreOption>('both')
+  const [isRestoring, setIsRestoring] = useState(false);
+  const [restoringOption, setRestoringOption] = useState<RestoreOption | null>(null);
+  const [selectedRestoreOption, setSelectedRestoreOption] = useState<RestoreOption>('both');
   // Per-option feedback state; Select's internal inputValues Map persists
   // per-option text independently, so sharing one variable would desync.
-  const [summarizeFromFeedback, setSummarizeFromFeedback] = useState('')
-  const [summarizeUpToFeedback, setSummarizeUpToFeedback] = useState('')
+  const [summarizeFromFeedback, setSummarizeFromFeedback] = useState('');
+  const [summarizeUpToFeedback, setSummarizeUpToFeedback] = useState('');
 
   // Generate options with summarize as input type for inline context
-  function getRestoreOptions(
-    canRestoreCode: boolean,
-  ): OptionWithDescription<RestoreOption>[] {
+  function getRestoreOptions(canRestoreCode: boolean): OptionWithDescription<RestoreOption>[] {
     const baseOptions: OptionWithDescription<RestoreOption>[] = canRestoreCode
       ? [
           { value: 'both', label: 'Restore code and conversation' },
           { value: 'conversation', label: 'Restore conversation' },
           { value: 'code', label: 'Restore code' },
         ]
-      : [{ value: 'conversation', label: 'Restore conversation' }]
+      : [{ value: 'conversation', label: 'Restore conversation' }];
 
     const summarizeInputProps = {
       type: 'input' as const,
@@ -179,196 +146,181 @@ export function MessageSelector({
       allowEmptySubmitToCancel: true,
       showLabelWithValue: true,
       labelValueSeparator: ': ',
-    }
+    };
     baseOptions.push({
       value: 'summarize',
       label: 'Summarize from here',
       ...summarizeInputProps,
       onChange: setSummarizeFromFeedback,
-    })
+    });
     if (process.env.USER_TYPE === 'ant') {
       baseOptions.push({
         value: 'summarize_up_to',
         label: 'Summarize up to here',
         ...summarizeInputProps,
         onChange: setSummarizeUpToFeedback,
-      })
+      });
     }
 
-    baseOptions.push({ value: 'nevermind', label: 'Never mind' })
-    return baseOptions
+    baseOptions.push({ value: 'nevermind', label: 'Never mind' });
+    return baseOptions;
   }
 
   // Log when selector is opened
   useEffect(() => {
-    logEvent('tengu_message_selector_opened', {})
-  }, [])
+    logEvent('tengu_message_selector_opened', {});
+  }, []);
 
   // Helper to restore conversation without confirmation
   async function restoreConversationDirectly(message: UserMessage) {
-    onPreRestore()
-    setIsRestoring(true)
+    onPreRestore();
+    setIsRestoring(true);
     try {
-      await onRestoreMessage(message)
-      setIsRestoring(false)
-      onClose()
+      await onRestoreMessage(message);
+      setIsRestoring(false);
+      onClose();
     } catch (error) {
-      logError(error as Error)
-      setIsRestoring(false)
-      setError(`Failed to restore the conversation:\n${error}`)
+      logError(error as Error);
+      setIsRestoring(false);
+      setError(`Failed to restore the conversation:\n${error}`);
     }
   }
 
   async function handleSelect(message: UserMessage) {
-    const index = messages.indexOf(message)
-    const indexFromEnd = messages.length - 1 - index
+    const index = messages.indexOf(message);
+    const indexFromEnd = messages.length - 1 - index;
 
     logEvent('tengu_message_selector_selected', {
       index_from_end: indexFromEnd,
-      message_type:
-        message.type as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      message_type: message.type as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
       is_current_prompt: false,
-    })
+    });
 
     // Do nothing if the message is not found
     if (!messages.includes(message)) {
-      onClose()
-      return
+      onClose();
+      return;
     }
 
     if (!isFileHistoryEnabled) {
-      await restoreConversationDirectly(message)
-      return
+      await restoreConversationDirectly(message);
+      return;
     }
 
-    const diffStats = await fileHistoryGetDiffStats(fileHistory, message.uuid)
-    setMessageToRestore(message)
-    setDiffStatsForRestore(diffStats)
+    const diffStats = await fileHistoryGetDiffStats(fileHistory, message.uuid);
+    setMessageToRestore(message);
+    setDiffStatsForRestore(diffStats);
   }
 
   async function onSelectRestoreOption(option: RestoreOption) {
     logEvent('tengu_message_selector_restore_option_selected', {
-      option:
-        option as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-    })
+      option: option as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+    });
     if (!messageToRestore) {
-      setError('Message not found.')
-      return
+      setError('Message not found.');
+      return;
     }
     if (option === 'nevermind') {
-      if (preselectedMessage) onClose()
-      else setMessageToRestore(undefined)
-      return
+      if (preselectedMessage) onClose();
+      else setMessageToRestore(undefined);
+      return;
     }
 
     if (isSummarizeOption(option)) {
-      onPreRestore()
-      setIsRestoring(true)
-      setRestoringOption(option)
-      setError(undefined)
+      onPreRestore();
+      setIsRestoring(true);
+      setRestoringOption(option);
+      setError(undefined);
       try {
-        const direction = option === 'summarize_up_to' ? 'up_to' : 'from'
-        const feedback =
-          (direction === 'up_to'
-            ? summarizeUpToFeedback
-            : summarizeFromFeedback
-          ).trim() || undefined
-        await onSummarize(messageToRestore, feedback, direction)
-        setIsRestoring(false)
-        setRestoringOption(null)
-        setMessageToRestore(undefined)
-        onClose()
+        const direction = option === 'summarize_up_to' ? 'up_to' : 'from';
+        const feedback = (direction === 'up_to' ? summarizeUpToFeedback : summarizeFromFeedback).trim() || undefined;
+        await onSummarize(messageToRestore, feedback, direction);
+        setIsRestoring(false);
+        setRestoringOption(null);
+        setMessageToRestore(undefined);
+        onClose();
       } catch (error) {
-        logError(error as Error)
-        setIsRestoring(false)
-        setRestoringOption(null)
-        setMessageToRestore(undefined)
-        setError(`Failed to summarize:\n${error}`)
+        logError(error as Error);
+        setIsRestoring(false);
+        setRestoringOption(null);
+        setMessageToRestore(undefined);
+        setError(`Failed to summarize:\n${error}`);
       }
-      return
+      return;
     }
 
-    onPreRestore()
-    setIsRestoring(true)
-    setError(undefined)
+    onPreRestore();
+    setIsRestoring(true);
+    setError(undefined);
 
-    let codeError: Error | null = null
-    let conversationError: Error | null = null
+    let codeError: Error | null = null;
+    let conversationError: Error | null = null;
 
     if (option === 'code' || option === 'both') {
       try {
-        await onRestoreCode(messageToRestore)
+        await onRestoreCode(messageToRestore);
       } catch (error) {
-        codeError = error as Error
-        logError(codeError)
+        codeError = error as Error;
+        logError(codeError);
       }
     }
 
     if (option === 'conversation' || option === 'both') {
       try {
-        await onRestoreMessage(messageToRestore)
+        await onRestoreMessage(messageToRestore);
       } catch (error) {
-        conversationError = error as Error
-        logError(conversationError)
+        conversationError = error as Error;
+        logError(conversationError);
       }
     }
 
-    setIsRestoring(false)
-    setMessageToRestore(undefined)
+    setIsRestoring(false);
+    setMessageToRestore(undefined);
 
     // Handle errors
     if (conversationError && codeError) {
-      setError(
-        `Failed to restore the conversation and code:\n${conversationError}\n${codeError}`,
-      )
+      setError(`Failed to restore the conversation and code:\n${conversationError}\n${codeError}`);
     } else if (conversationError) {
-      setError(`Failed to restore the conversation:\n${conversationError}`)
+      setError(`Failed to restore the conversation:\n${conversationError}`);
     } else if (codeError) {
-      setError(`Failed to restore the code:\n${codeError}`)
+      setError(`Failed to restore the code:\n${codeError}`);
     } else {
       // Success - close the selector
-      onClose()
+      onClose();
     }
   }
 
-  const exitState = useExitOnCtrlCDWithKeybindings()
+  const exitState = useExitOnCtrlCDWithKeybindings();
 
   const handleEscape = useCallback(() => {
     if (messageToRestore && !preselectedMessage) {
       // Go back to message list instead of closing entirely
-      setMessageToRestore(undefined)
-      return
+      setMessageToRestore(undefined);
+      return;
     }
-    logEvent('tengu_message_selector_cancelled', {})
-    onClose()
-  }, [onClose, messageToRestore, preselectedMessage])
+    logEvent('tengu_message_selector_cancelled', {});
+    onClose();
+  }, [onClose, messageToRestore, preselectedMessage]);
 
-  const moveUp = useCallback(
-    () => setSelectedIndex(prev => Math.max(0, prev - 1)),
-    [],
-  )
+  const moveUp = useCallback(() => setSelectedIndex(prev => Math.max(0, prev - 1)), []);
   const moveDown = useCallback(
-    () =>
-      setSelectedIndex(prev => Math.min(messageOptions.length - 1, prev + 1)),
+    () => setSelectedIndex(prev => Math.min(messageOptions.length - 1, prev + 1)),
     [messageOptions.length],
-  )
-  const jumpToTop = useCallback(() => setSelectedIndex(0), [])
-  const jumpToBottom = useCallback(
-    () => setSelectedIndex(messageOptions.length - 1),
-    [messageOptions.length],
-  )
+  );
+  const jumpToTop = useCallback(() => setSelectedIndex(0), []);
+  const jumpToBottom = useCallback(() => setSelectedIndex(messageOptions.length - 1), [messageOptions.length]);
   const handleSelectCurrent = useCallback(() => {
-    const selected = messageOptions[selectedIndex]
+    const selected = messageOptions[selectedIndex];
     if (selected) {
-      void handleSelect(selected)
+      void handleSelect(selected);
     }
-  }, [messageOptions, selectedIndex, handleSelect])
+  }, [messageOptions, selectedIndex, handleSelect]);
 
   // Escape to close - uses Confirmation context where escape is bound
   useKeybinding('confirm:no', handleEscape, {
     context: 'Confirmation',
     isActive: !messageToRestore,
-  })
+  });
 
   // Message selector navigation keybindings
   useKeybindings(
@@ -381,64 +333,53 @@ export function MessageSelector({
     },
     {
       context: 'MessageSelector',
-      isActive:
-        !isRestoring && !error && !messageToRestore && hasMessagesToSelect,
+      isActive: !isRestoring && !error && !messageToRestore && hasMessagesToSelect,
     },
-  )
+  );
 
-  const [fileHistoryMetadata, setFileHistoryMetadata] = useState<
-    Record<number, DiffStats>
-  >({})
+  const [fileHistoryMetadata, setFileHistoryMetadata] = useState<Record<number, DiffStats>>({});
 
   useEffect(() => {
     async function loadFileHistoryMetadata() {
       if (!isFileHistoryEnabled) {
-        return
+        return;
       }
       // Load file snapshot metadata
       void Promise.all(
         messageOptions.map(async (userMessage, itemIndex) => {
           if (userMessage.uuid !== currentUUID) {
-            const canRestore = fileHistoryCanRestore(
-              fileHistory,
-              userMessage.uuid,
-            )
+            const canRestore = fileHistoryCanRestore(fileHistory, userMessage.uuid);
 
-            const nextUserMessage = messageOptions.at(itemIndex + 1)
+            const nextUserMessage = messageOptions.at(itemIndex + 1);
             const diffStats = canRestore
               ? computeDiffStatsBetweenMessages(
                   messages,
                   userMessage.uuid,
-                  nextUserMessage?.uuid !== currentUUID
-                    ? nextUserMessage?.uuid
-                    : undefined,
+                  nextUserMessage?.uuid !== currentUUID ? nextUserMessage?.uuid : undefined,
                 )
-              : undefined
+              : undefined;
 
             if (diffStats !== undefined) {
               setFileHistoryMetadata(prev => ({
                 ...prev,
                 [itemIndex]: diffStats,
-              }))
+              }));
             } else {
               setFileHistoryMetadata(prev => ({
                 ...prev,
                 [itemIndex]: undefined,
-              }))
+              }));
             }
           }
         }),
-      )
+      );
     }
-    void loadFileHistoryMetadata()
-  }, [messageOptions, messages, currentUUID, fileHistory, isFileHistoryEnabled])
+    void loadFileHistoryMetadata();
+  }, [messageOptions, messages, currentUUID, fileHistory, isFileHistoryEnabled]);
 
   const canRestoreCode =
-    isFileHistoryEnabled &&
-    diffStatsForRestore?.filesChanged &&
-    diffStatsForRestore.filesChanged.length > 0
-  const showPickList =
-    !error && !messageToRestore && !preselectedMessage && hasMessagesToSelect
+    isFileHistoryEnabled && diffStatsForRestore?.filesChanged && diffStatsForRestore.filesChanged.length > 0;
+  const showPickList = !error && !messageToRestore && !preselectedMessage && hasMessagesToSelect;
 
   return (
     <Box flexDirection="column" width="100%">
@@ -461,9 +402,8 @@ export function MessageSelector({
         {!error && messageToRestore && hasMessagesToSelect && (
           <>
             <Text>
-              Confirm you want to restore{' '}
-              {!diffStatsForRestore && 'the conversation '}to the point before
-              you sent this message:
+              Confirm you want to restore {!diffStatsForRestore && 'the conversation '}to the point before you sent this
+              message:
             </Text>
             <Box
               flexDirection="column"
@@ -475,11 +415,7 @@ export function MessageSelector({
               borderLeft={true}
               borderLeftDimColor
             >
-              <UserMessageOption
-                userMessage={messageToRestore}
-                color="text"
-                isCurrent={false}
-              />
+              <UserMessageOption userMessage={messageToRestore} color="text" isCurrent={false} />
               <Text dimColor>
                 ({formatRelativeTimeAgo(new Date(messageToRestore.timestamp as string | number | Date))})
               </Text>
@@ -499,25 +435,14 @@ export function MessageSelector({
                 isDisabled={isRestoring}
                 options={getRestoreOptions(!!canRestoreCode)}
                 defaultFocusValue={canRestoreCode ? 'both' : 'conversation'}
-                onFocus={value =>
-                  setSelectedRestoreOption(value as RestoreOption)
-                }
-                onChange={value =>
-                  onSelectRestoreOption(value as RestoreOption)
-                }
-                onCancel={() =>
-                  preselectedMessage
-                    ? onClose()
-                    : setMessageToRestore(undefined)
-                }
+                onFocus={value => setSelectedRestoreOption(value as RestoreOption)}
+                onChange={value => onSelectRestoreOption(value as RestoreOption)}
+                onCancel={() => (preselectedMessage ? onClose() : setMessageToRestore(undefined))}
               />
             )}
             {canRestoreCode && (
               <Box marginBottom={1}>
-                <Text dimColor>
-                  {figures.warning} Rewinding does not affect files edited
-                  manually or via bash.
-                </Text>
+                <Text dimColor>{figures.warning} Rewinding does not affect files edited manually or via bash.</Text>
               </Box>
             )}
           </>
@@ -525,29 +450,21 @@ export function MessageSelector({
         {showPickList && (
           <>
             {isFileHistoryEnabled ? (
-              <Text>
-                Restore the code and/or conversation to the point before…
-              </Text>
+              <Text>Restore the code and/or conversation to the point before…</Text>
             ) : (
-              <Text>
-                Restore and fork the conversation to the point before…
-              </Text>
+              <Text>Restore and fork the conversation to the point before…</Text>
             )}
             <Box width="100%" flexDirection="column">
               {messageOptions
-                .slice(
-                  firstVisibleIndex,
-                  firstVisibleIndex + MAX_VISIBLE_MESSAGES,
-                )
+                .slice(firstVisibleIndex, firstVisibleIndex + MAX_VISIBLE_MESSAGES)
                 .map((msg, visibleOptionIndex) => {
-                  const optionIndex = firstVisibleIndex + visibleOptionIndex
-                  const isSelected = optionIndex === selectedIndex
-                  const isCurrent = msg.uuid === currentUUID
+                  const optionIndex = firstVisibleIndex + visibleOptionIndex;
+                  const isSelected = optionIndex === selectedIndex;
+                  const isCurrent = msg.uuid === currentUUID;
 
-                  const metadataLoaded = optionIndex in fileHistoryMetadata
-                  const metadata = fileHistoryMetadata[optionIndex]
-                  const numFilesChanged =
-                    metadata?.filesChanged && metadata.filesChanged.length
+                  const metadataLoaded = optionIndex in fileHistoryMetadata;
+                  const metadata = fileHistoryMetadata[optionIndex];
+                  const numFilesChanged = metadata?.filesChanged && metadata.filesChanged.length;
 
                   return (
                     <Box
@@ -582,8 +499,7 @@ export function MessageSelector({
                                 <Text dimColor={!isSelected} color="inactive">
                                   {numFilesChanged ? (
                                     <>
-                                      {numFilesChanged === 1 &&
-                                      metadata.filesChanged![0]
+                                      {numFilesChanged === 1 && metadata.filesChanged![0]
                                         ? `${path.basename(metadata.filesChanged![0])} `
                                         : `${numFilesChanged} files changed `}
                                       <DiffStatsText diffStats={metadata} />
@@ -602,7 +518,7 @@ export function MessageSelector({
                         )}
                       </Box>
                     </Box>
-                  )
+                  );
                 })}
             </Box>
           </>
@@ -612,30 +528,27 @@ export function MessageSelector({
             {exitState.pending ? (
               <>Press {exitState.keyName} again to exit</>
             ) : (
-              <>
-                {!error && hasMessagesToSelect && 'Enter to continue · '}Esc to
-                exit
-              </>
+              <>{!error && hasMessagesToSelect && 'Enter to continue · '}Esc to exit</>
             )}
           </Text>
         )}
       </Box>
     </Box>
-  )
+  );
 }
 
 function getRestoreOptionConversationText(option: RestoreOption): string {
   switch (option) {
     case 'summarize':
-      return 'Messages after this point will be summarized.'
+      return 'Messages after this point will be summarized.';
     case 'summarize_up_to':
-      return 'Preceding messages will be summarized. This and subsequent messages will remain unchanged — you will stay at the end of the conversation.'
+      return 'Preceding messages will be summarized. This and subsequent messages will remain unchanged — you will stay at the end of the conversation.';
     case 'both':
     case 'conversation':
-      return 'The conversation will be forked.'
+      return 'The conversation will be forked.';
     case 'code':
     case 'nevermind':
-      return 'The conversation will be unchanged.'
+      return 'The conversation will be unchanged.';
   }
 }
 
@@ -644,19 +557,15 @@ function RestoreOptionDescription({
   canRestoreCode,
   diffStatsForRestore,
 }: {
-  selectedRestoreOption: RestoreOption
-  canRestoreCode: boolean
-  diffStatsForRestore: DiffStats | undefined
+  selectedRestoreOption: RestoreOption;
+  canRestoreCode: boolean;
+  diffStatsForRestore: DiffStats | undefined;
 }): React.ReactNode {
-  const showCodeRestore =
-    canRestoreCode &&
-    (selectedRestoreOption === 'both' || selectedRestoreOption === 'code')
+  const showCodeRestore = canRestoreCode && (selectedRestoreOption === 'both' || selectedRestoreOption === 'code');
 
   return (
     <Box flexDirection="column">
-      <Text dimColor>
-        {getRestoreOptionConversationText(selectedRestoreOption)}
-      </Text>
+      <Text dimColor>{getRestoreOptionConversationText(selectedRestoreOption)}</Text>
       {!isSummarizeOption(selectedRestoreOption) &&
         (showCodeRestore ? (
           <RestoreCodeConfirmation diffStatsForRestore={diffStatsForRestore} />
@@ -664,64 +573,54 @@ function RestoreOptionDescription({
           <Text dimColor>The code will be unchanged.</Text>
         ))}
     </Box>
-  )
+  );
 }
 
 function RestoreCodeConfirmation({
   diffStatsForRestore,
 }: {
-  diffStatsForRestore: DiffStats | undefined
+  diffStatsForRestore: DiffStats | undefined;
 }): React.ReactNode {
   if (diffStatsForRestore === undefined) {
-    return undefined
+    return undefined;
   }
-  if (
-    !diffStatsForRestore.filesChanged ||
-    !diffStatsForRestore.filesChanged[0]
-  ) {
-    return (
-      <Text dimColor>The code has not changed (nothing will be restored).</Text>
-    )
+  if (!diffStatsForRestore.filesChanged || !diffStatsForRestore.filesChanged[0]) {
+    return <Text dimColor>The code has not changed (nothing will be restored).</Text>;
   }
 
-  const numFilesChanged = diffStatsForRestore.filesChanged.length
+  const numFilesChanged = diffStatsForRestore.filesChanged.length;
 
-  let fileLabel = ''
+  let fileLabel = '';
   if (numFilesChanged === 1) {
-    fileLabel = path.basename(diffStatsForRestore.filesChanged[0] || '')
+    fileLabel = path.basename(diffStatsForRestore.filesChanged[0] || '');
   } else if (numFilesChanged === 2) {
-    const file1 = path.basename(diffStatsForRestore.filesChanged[0] || '')
-    const file2 = path.basename(diffStatsForRestore.filesChanged[1] || '')
-    fileLabel = `${file1} and ${file2}`
+    const file1 = path.basename(diffStatsForRestore.filesChanged[0] || '');
+    const file2 = path.basename(diffStatsForRestore.filesChanged[1] || '');
+    fileLabel = `${file1} and ${file2}`;
   } else {
-    const file1 = path.basename(diffStatsForRestore.filesChanged[0] || '')
-    fileLabel = `${file1} and ${diffStatsForRestore.filesChanged.length - 1} other files`
+    const file1 = path.basename(diffStatsForRestore.filesChanged[0] || '');
+    fileLabel = `${file1} and ${diffStatsForRestore.filesChanged.length - 1} other files`;
   }
 
   return (
     <>
       <Text dimColor>
-        The code will be restored{' '}
-        <DiffStatsText diffStats={diffStatsForRestore} /> in {fileLabel}.
+        The code will be restored <DiffStatsText diffStats={diffStatsForRestore} /> in {fileLabel}.
       </Text>
     </>
-  )
+  );
 }
 
-function DiffStatsText({
-  diffStats,
-}: {
-  diffStats: DiffStats | undefined
-}): React.ReactNode {
+function DiffStatsText({ diffStats }: { diffStats: DiffStats | undefined }): React.ReactNode {
   if (!diffStats || !diffStats.filesChanged) {
-    return undefined
+    return undefined;
   }
   return (
     <>
       <Text color="diffAddedWord">+{diffStats.insertions} </Text>
       <Text color="diffRemovedWord">-{diffStats.deletions}</Text>
     </>
-  )
+  );
 }
 
 function UserMessageOption({
@@ -731,13 +630,13 @@ function UserMessageOption({
   isCurrent,
   paddingRight,
 }: {
-  userMessage: UserMessage
-  color?: keyof Theme
-  dimColor?: boolean
-  isCurrent: boolean
-  paddingRight?: number
+  userMessage: UserMessage;
+  color?: keyof Theme;
+  dimColor?: boolean;
+  isCurrent: boolean;
+  paddingRight?: number;
 }): React.ReactNode {
-  const { columns } = useTerminalSize()
+  const { columns } = useTerminalSize();
   if (isCurrent) {
     return (
       <Box width="100%">
@@ -745,21 +644,20 @@ function UserMessageOption({
           (current)
         </Text>
       </Box>
-    )
+    );
   }
 
-  const content = userMessage.message!.content
-  const lastBlock =
-    typeof content === 'string' ? null : content![content!.length - 1]
+  const content = userMessage.message!.content;
+  const lastBlock = typeof content === 'string' ? null : content![content!.length - 1];
   const rawMessageText =
     typeof content === 'string'
       ? content.trim()
       : lastBlock && isTextBlock(lastBlock)
         ? lastBlock.text.trim()
-        : '(no prompt)'
+        : '(no prompt)';
 
   // Strip display-unfriendly tags (like <ide_opened_file>) before showing in the list
-  const messageText = stripDisplayTags(rawMessageText)
+  const messageText = stripDisplayTags(rawMessageText);
 
   if (isEmptyMessageText(messageText)) {
     return (
@@ -768,12 +666,12 @@ function UserMessageOption({
           ((empty message))
         </Text>
       </Box>
-    )
+    );
   }
 
   // Bash inputs
   if (messageText.includes('<bash-input>')) {
-    const input = extractTag(messageText, 'bash-input')
+    const input = extractTag(messageText, 'bash-input');
     if (input) {
       return (
         <Box flexDirection="row" width="100%">
@@ -783,15 +681,15 @@ function UserMessageOption({
             {input}
           </Text>
         </Box>
-      )
+      );
     }
   }
 
   // Skills and slash commands
   if (messageText.includes(`<${COMMAND_MESSAGE_TAG}>`)) {
-    const commandMessage = extractTag(messageText, COMMAND_MESSAGE_TAG)
-    const args = extractTag(messageText, 'command-args')
-    const isSkillFormat = extractTag(messageText, 'skill-format') === 'true'
+    const commandMessage = extractTag(messageText, COMMAND_MESSAGE_TAG);
+    const args = extractTag(messageText, 'command-args');
+    const isSkillFormat = extractTag(messageText, 'skill-format') === 'true';
     if (commandMessage) {
       if (isSkillFormat) {
         // Skills: Display as "Skill(name)"
@@ -801,7 +699,7 @@ function UserMessageOption({
               Skill({commandMessage})
             </Text>
           </Box>
-        )
+        );
       } else {
         // Slash commands: Add "/" prefix and include args
         return (
@@ -810,7 +708,7 @@ function UserMessageOption({
               /{commandMessage} {args}
             </Text>
           </Box>
-        )
+        );
       }
     }
   }
@@ -824,7 +722,7 @@ function UserMessageOption({
           : messageText.slice(0, 500).split('\n').slice(0, 4).join('\n')}
       </Text>
     </Box>
-  )
+  );
 }
 
 /**
@@ -835,92 +733,78 @@ function computeDiffStatsBetweenMessages(
   fromMessageId: UUID,
   toMessageId: UUID | undefined,
 ): DiffStats | undefined {
-  const startIndex = messages.findIndex(msg => msg.uuid === fromMessageId)
+  const startIndex = messages.findIndex(msg => msg.uuid === fromMessageId);
   if (startIndex === -1) {
-    return undefined
+    return undefined;
   }
 
-  let endIndex = toMessageId
-    ? messages.findIndex(msg => msg.uuid === toMessageId)
-    : messages.length
+  let endIndex = toMessageId ? messages.findIndex(msg => msg.uuid === toMessageId) : messages.length;
   if (endIndex === -1) {
-    endIndex = messages.length
+    endIndex = messages.length;
   }
 
-  const filesChanged: string[] = []
-  let insertions = 0
-  let deletions = 0
+  const filesChanged: string[] = [];
+  let insertions = 0;
+  let deletions = 0;
 
   for (let i = startIndex + 1; i < endIndex; i++) {
-    const msg = messages[i]
+    const msg = messages[i];
     if (!msg || !isToolUseResultMessage(msg)) {
-      continue
+      continue;
     }
 
-    const result = msg.toolUseResult as FileEditOutput | FileWriteToolOutput
+    const result = msg.toolUseResult as FileEditOutput | FileWriteToolOutput;
     if (!result || !result.filePath || !result.structuredPatch) {
-      continue
+      continue;
     }
 
     if (!filesChanged.includes(result.filePath)) {
-      filesChanged.push(result.filePath)
+      filesChanged.push(result.filePath);
     }
 
     try {
       if ('type' in result && result.type === 'create') {
-        insertions += result.content.split(/\r?\n/).length
+        insertions += result.content.split(/\r?\n/).length;
       } else {
         for (const hunk of result.structuredPatch) {
-          const additions = count(hunk.lines, line => line.startsWith('+'))
-          const removals = count(hunk.lines, line => line.startsWith('-'))
+          const additions = count(hunk.lines, line => line.startsWith('+'));
+          const removals = count(hunk.lines, line => line.startsWith('-'));
 
-          insertions += additions
-          deletions += removals
+          insertions += additions;
+          deletions += removals;
         }
       }
-    } catch {
-      continue
-    }
+    } catch {}
   }
 
   return {
     filesChanged,
     insertions,
     deletions,
-  }
+  };
 }
 
-export function selectableUserMessagesFilter(
-  message: Message,
-): message is UserMessage {
+export function selectableUserMessagesFilter(message: Message): message is UserMessage {
   if (message.type !== 'user') {
-    return false
+    return false;
   }
-  if (
-    Array.isArray(message.message!.content) &&
-    message.message!.content[0]?.type === 'tool_result'
-  ) {
-    return false
+  if (Array.isArray(message.message!.content) && message.message!.content[0]?.type === 'tool_result') {
+    return false;
   }
   if (isSyntheticMessage(message)) {
-    return false
+    return false;
   }
   if (message.isMeta) {
-    return false
+    return false;
   }
   if (message.isCompactSummary || message.isVisibleInTranscriptOnly) {
-    return false
+    return false;
   }
 
-  const content = message.message!.content
-  const lastBlock =
-    typeof content === 'string' ? null : content![content!.length - 1]
+  const content = message.message!.content;
+  const lastBlock = typeof content === 'string' ? null : content![content!.length - 1];
   const messageText =
-    typeof content === 'string'
-      ? content.trim()
-      : lastBlock && isTextBlock(lastBlock)
-        ? lastBlock.text.trim()
-        : ''
+    typeof content === 'string' ? content.trim() : lastBlock && isTextBlock(lastBlock) ? lastBlock.text.trim() : '';
 
   // Filter out non-user-authored messages (command outputs, task notifications, ticks).
   if (
@@ -932,9 +816,9 @@ export function selectableUserMessagesFilter(
     messageText.indexOf(`<${TICK_TAG}>`) !== -1 ||
     messageText.indexOf(`<${TEAMMATE_MESSAGE_TAG}`) !== -1
   ) {
-    return false
+    return false;
   }
-  return true
+  return true;
 }
 
 /**
@@ -942,42 +826,37 @@ export function selectableUserMessagesFilter(
  * or non-meaningful content. Returns true if there's nothing meaningful to confirm -
  * for example, if the user hit enter then immediately cancelled.
  */
-export function messagesAfterAreOnlySynthetic(
-  messages: Message[],
-  fromIndex: number,
-): boolean {
+export function messagesAfterAreOnlySynthetic(messages: Message[], fromIndex: number): boolean {
   for (let i = fromIndex + 1; i < messages.length; i++) {
-    const msg = messages[i]
-    if (!msg) continue
+    const msg = messages[i];
+    if (!msg) continue;
 
     // Skip known non-meaningful message types
-    if (isSyntheticMessage(msg)) continue
-    if (isToolUseResultMessage(msg)) continue
-    if (msg.type === 'progress') continue
-    if (msg.type === 'system') continue
-    if (msg.type === 'attachment') continue
-    if (msg.type === 'user' && msg.isMeta) continue
+    if (isSyntheticMessage(msg)) continue;
+    if (isToolUseResultMessage(msg)) continue;
+    if (msg.type === 'progress') continue;
+    if (msg.type === 'system') continue;
+    if (msg.type === 'attachment') continue;
+    if (msg.type === 'user' && msg.isMeta) continue;
 
     // Assistant with actual content = meaningful
     if (msg.type === 'assistant') {
-      const content = msg.message!.content
+      const content = msg.message!.content;
       if (Array.isArray(content)) {
         const hasMeaningfulContent = content.some(
-          block =>
-            (block.type === 'text' && block.text.trim()) ||
-            block.type === 'tool_use',
-        )
-        if (hasMeaningfulContent) return false
+          block => (block.type === 'text' && block.text.trim()) || block.type === 'tool_use',
+        );
+        if (hasMeaningfulContent) return false;
       }
-      continue
+      continue;
     }
 
     // User messages that aren't synthetic or meta = meaningful
     if (msg.type === 'user') {
-      return false
+      return false;
     }
 
     // Other types (e.g., tombstone) are non-meaningful, continue
   }
-  return true
+  return true;
 }
diff --git a/src/components/MessageTimestamp.tsx b/src/components/MessageTimestamp.tsx
index 0aa93dc5c..650d747b2 100644
--- a/src/components/MessageTimestamp.tsx
+++ b/src/components/MessageTimestamp.tsx
@@ -1,38 +1,34 @@
-import React from 'react'
-import { Box, Text, stringWidth } from '@anthropic/ink'
-import type { NormalizedMessage } from '../types/message.js'
+import React from 'react';
+import { Box, Text, stringWidth } from '@anthropic/ink';
+import type { NormalizedMessage } from '../types/message.js';
 
 type Props = {
-  message: NormalizedMessage
-  isTranscriptMode: boolean
-}
+  message: NormalizedMessage;
+  isTranscriptMode: boolean;
+};
 
-export function MessageTimestamp({
-  message,
-  isTranscriptMode,
-}: Props): React.ReactNode {
+export function MessageTimestamp({ message, isTranscriptMode }: Props): React.ReactNode {
   const shouldShowTimestamp =
     isTranscriptMode &&
     message.timestamp &&
     message.type === 'assistant' &&
-    (Array.isArray(message.message!.content) ? (message.message!.content as {type: string}[]).some(c => c.type === 'text') : false)
+    (Array.isArray(message.message!.content)
+      ? (message.message!.content as { type: string }[]).some(c => c.type === 'text')
+      : false);
 
   if (!shouldShowTimestamp) {
-    return null
+    return null;
   }
 
-  const formattedTimestamp = new Date(message.timestamp as string | number | Date).toLocaleTimeString(
-    'en-US',
-    {
-      hour: '2-digit',
-      minute: '2-digit',
-      hour12: true,
-    },
-  )
+  const formattedTimestamp = new Date(message.timestamp as string | number | Date).toLocaleTimeString('en-US', {
+    hour: '2-digit',
+    minute: '2-digit',
+    hour12: true,
+  });
 
   return (
     <Box minWidth={stringWidth(formattedTimestamp)}>
       <Text dimColor>{formattedTimestamp}</Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/Messages.tsx b/src/components/Messages.tsx
index 7bcbe96a5..bff0a835e 100644
--- a/src/components/Messages.tsx
+++ b/src/components/Messages.tsx
@@ -1,37 +1,37 @@
-import { feature } from 'bun:bundle'
-import chalk from 'chalk'
-import type { UUID } from 'crypto'
-import type { RefObject } from 'react'
-import * as React from 'react'
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { every } from 'src/utils/set.js'
-import { getIsRemoteMode } from '../bootstrap/state.js'
-import type { Command } from '../commands.js'
-import { BLACK_CIRCLE } from '../constants/figures.js'
-import { useTerminalSize } from '../hooks/useTerminalSize.js'
-import type { ScrollBoxHandle } from '@anthropic/ink'
-import { useTerminalNotification } from '@anthropic/ink'
-import { Box, Text } from '@anthropic/ink'
-import { useShortcutDisplay } from '../keybindings/useShortcutDisplay.js'
-import type { Screen } from '../screens/REPL.js'
-import type { Tools } from '../Tool.js'
-import { findToolByName } from '../Tool.js'
-import type { AgentDefinitionsResult } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
+import { feature } from 'bun:bundle';
+import chalk from 'chalk';
+import type { UUID } from 'crypto';
+import type { RefObject } from 'react';
+import * as React from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { every } from 'src/utils/set.js';
+import { getIsRemoteMode } from '../bootstrap/state.js';
+import type { Command } from '../commands.js';
+import { BLACK_CIRCLE } from '../constants/figures.js';
+import { useTerminalSize } from '../hooks/useTerminalSize.js';
+import type { ScrollBoxHandle } from '@anthropic/ink';
+import { useTerminalNotification } from '@anthropic/ink';
+import { Box, Text } from '@anthropic/ink';
+import { useShortcutDisplay } from '../keybindings/useShortcutDisplay.js';
+import type { Screen } from '../screens/REPL.js';
+import type { Tools } from '../Tool.js';
+import { findToolByName } from '../Tool.js';
+import type { AgentDefinitionsResult } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js';
 import type {
   Message as MessageType,
   NormalizedMessage,
   ProgressMessage as ProgressMessageType,
   RenderableMessage,
-} from '../types/message.js'
-import { type AdvisorBlock, isAdvisorBlock } from '../utils/advisor.js'
-import { collapseBackgroundBashNotifications } from '../utils/collapseBackgroundBashNotifications.js'
-import { collapseHookSummaries } from '../utils/collapseHookSummaries.js'
-import { collapseReadSearchGroups } from '../utils/collapseReadSearch.js'
-import { collapseTeammateShutdowns } from '../utils/collapseTeammateShutdowns.js'
-import { getGlobalConfig } from '../utils/config.js'
-import { isEnvTruthy } from '../utils/envUtils.js'
-import { isFullscreenEnvEnabled } from '../utils/fullscreen.js'
-import { applyGrouping } from '../utils/groupToolUses.js'
+} from '../types/message.js';
+import { type AdvisorBlock, isAdvisorBlock } from '../utils/advisor.js';
+import { collapseBackgroundBashNotifications } from '../utils/collapseBackgroundBashNotifications.js';
+import { collapseHookSummaries } from '../utils/collapseHookSummaries.js';
+import { collapseReadSearchGroups } from '../utils/collapseReadSearch.js';
+import { collapseTeammateShutdowns } from '../utils/collapseTeammateShutdowns.js';
+import { getGlobalConfig } from '../utils/config.js';
+import { isEnvTruthy } from '../utils/envUtils.js';
+import { isFullscreenEnvEnabled } from '../utils/fullscreen.js';
+import { applyGrouping } from '../utils/groupToolUses.js';
 import {
   buildMessageLookups,
   createAssistantMessage,
@@ -46,26 +46,26 @@ import {
   type StreamingThinking,
   type StreamingToolUse,
   shouldShowUserMessage,
-} from '../utils/messages.js'
-import { plural } from '../utils/stringUtils.js'
-import { renderableSearchText } from '../utils/transcriptSearch.js'
-import { Divider } from '@anthropic/ink'
-import type { UnseenDivider } from './FullscreenLayout.js'
-import { LogoV2 } from './LogoV2/LogoV2.js'
-import { StreamingMarkdown } from './Markdown.js'
-import { hasContentAfterIndex, MessageRow } from './MessageRow.js'
+} from '../utils/messages.js';
+import { plural } from '../utils/stringUtils.js';
+import { renderableSearchText } from '../utils/transcriptSearch.js';
+import { Divider } from '@anthropic/ink';
+import type { UnseenDivider } from './FullscreenLayout.js';
+import { LogoV2 } from './LogoV2/LogoV2.js';
+import { StreamingMarkdown } from './Markdown.js';
+import { hasContentAfterIndex, MessageRow } from './MessageRow.js';
 import {
   InVirtualListContext,
   type MessageActionsNav,
   MessageActionsSelectedContext,
   type MessageActionsState,
-} from './messageActions.js'
-import { AssistantThinkingMessage } from './messages/AssistantThinkingMessage.js'
-import { isNullRenderingAttachment } from './messages/nullRenderingAttachments.js'
-import { OffscreenFreeze } from './OffscreenFreeze.js'
-import type { ToolUseConfirm } from './permissions/PermissionRequest.js'
-import { StatusNotices } from './StatusNotices.js'
-import type { JumpHandle } from './VirtualMessageList.js'
+} from './messageActions.js';
+import { AssistantThinkingMessage } from './messages/AssistantThinkingMessage.js';
+import { isNullRenderingAttachment } from './messages/nullRenderingAttachments.js';
+import { OffscreenFreeze } from './OffscreenFreeze.js';
+import type { ToolUseConfirm } from './permissions/PermissionRequest.js';
+import { StatusNotices } from './StatusNotices.js';
+import type { JumpHandle } from './VirtualMessageList.js';
 
 // Memoed logo header: this box is the FIRST sibling before all MessageRows
 // in main-screen mode. If it becomes dirty on every Messages re-render,
@@ -78,7 +78,7 @@ import type { JumpHandle } from './VirtualMessageList.js'
 const LogoHeader = React.memo(function LogoHeader({
   agentDefinitions,
 }: {
-  agentDefinitions: AgentDefinitionsResult | undefined
+  agentDefinitions: AgentDefinitionsResult | undefined;
 }): React.ReactNode {
   // LogoV2 has its own internal OffscreenFreeze (catches its useAppState
   // re-renders). This outer freeze catches agentDefinitions changes and any
@@ -92,29 +92,26 @@ const LogoHeader = React.memo(function LogoHeader({
         </React.Suspense>
       </Box>
     </OffscreenFreeze>
-  )
-})
+  );
+});
 
 // Dead code elimination: conditional import for proactive mode
 /* eslint-disable @typescript-eslint/no-require-imports */
-const proactiveModule =
-  feature('PROACTIVE') || feature('KAIROS')
-    ? require('../proactive/index.js')
-    : null
+const proactiveModule = feature('PROACTIVE') || feature('KAIROS') ? require('../proactive/index.js') : null;
 const BRIEF_TOOL_NAME: string | null =
   feature('KAIROS') || feature('KAIROS_BRIEF')
     ? (
         require('@claude-code-best/builtin-tools/tools/BriefTool/prompt.js') as typeof import('@claude-code-best/builtin-tools/tools/BriefTool/prompt.js')
       ).BRIEF_TOOL_NAME
-    : null
+    : null;
 const SEND_USER_FILE_TOOL_NAME: string | null = feature('KAIROS')
   ? (
       require('@claude-code-best/builtin-tools/tools/SendUserFileTool/prompt.js') as typeof import('@claude-code-best/builtin-tools/tools/SendUserFileTool/prompt.js')
     ).SEND_USER_FILE_TOOL_NAME
-  : null
+  : null;
 
 /* eslint-enable @typescript-eslint/no-require-imports */
-import { VirtualMessageList } from './VirtualMessageList.js'
+import { VirtualMessageList } from './VirtualMessageList.js';
 
 /**
  * In brief-only mode, filter messages to show ONLY Brief tool_use blocks,
@@ -124,59 +121,56 @@ import { VirtualMessageList } from './VirtualMessageList.js'
  */
 export function filterForBriefTool<
   T extends {
-    type: string
-    subtype?: string
-    isMeta?: boolean
-    isApiErrorMessage?: boolean
+    type: string;
+    subtype?: string;
+    isMeta?: boolean;
+    isApiErrorMessage?: boolean;
     message?: {
       content: Array<{
-        type: string
-        name?: string
-        tool_use_id?: string
-      }>
-    }
+        type: string;
+        name?: string;
+        tool_use_id?: string;
+      }>;
+    };
     attachment?: {
-      type: string
-      isMeta?: boolean
-      origin?: unknown
-      commandMode?: string
-    }
+      type: string;
+      isMeta?: boolean;
+      origin?: unknown;
+      commandMode?: string;
+    };
   },
 >(messages: T[], briefToolNames: string[]): T[] {
-  const nameSet = new Set(briefToolNames)
+  const nameSet = new Set(briefToolNames);
   // tool_use always precedes its tool_result in the array, so we can collect
   // IDs and match against them in a single pass.
-  const briefToolUseIDs = new Set<string>()
+  const briefToolUseIDs = new Set<string>();
   return messages.filter(msg => {
     // System messages (attach confirmation, remote errors, compact boundaries)
     // must stay visible — dropping them leaves the viewer with no feedback.
     // Exception: api_metrics is per-turn debug noise (TTFT, config writes,
     // hook timing) that defeats the point of brief mode. Still visible in
     // transcript mode (ctrl+o) which bypasses this filter.
-    if (msg.type === 'system') return msg.subtype !== 'api_metrics'
-    const block = msg.message?.content[0]
+    if (msg.type === 'system') return msg.subtype !== 'api_metrics';
+    const block = msg.message?.content[0];
     if (msg.type === 'assistant') {
       // API error messages (auth failures, rate limits, etc.) must stay visible
-      if (msg.isApiErrorMessage) return true
+      if (msg.isApiErrorMessage) return true;
       // Keep Brief tool_use blocks (renders with standard tool call chrome,
       // and must be in the list so buildMessageLookups can resolve tool results)
       if (block?.type === 'tool_use' && block.name && nameSet.has(block.name)) {
         if ('id' in block) {
-          briefToolUseIDs.add((block as { id: string }).id)
+          briefToolUseIDs.add((block as { id: string }).id);
         }
-        return true
+        return true;
       }
-      return false
+      return false;
     }
     if (msg.type === 'user') {
       if (block?.type === 'tool_result') {
-        return (
-          block.tool_use_id !== undefined &&
-          briefToolUseIDs.has(block.tool_use_id)
-        )
+        return block.tool_use_id !== undefined && briefToolUseIDs.has(block.tool_use_id);
       }
       // Real user input only — drop meta/tick messages.
-      return !msg.isMeta
+      return !msg.isMeta;
     }
     if (msg.type === 'attachment') {
       // Human input drained mid-turn arrives as a queued_command attachment
@@ -185,16 +179,11 @@ export function filterForBriefTool<
       // identifies human-typed input; task-notification callers set
       // mode: 'task-notification' but not origin/isMeta, so the positive
       // commandMode check is required to exclude them.
-      const att = msg.attachment
-      return (
-        att?.type === 'queued_command' &&
-        att.commandMode === 'prompt' &&
-        !att.isMeta &&
-        att.origin === undefined
-      )
+      const att = msg.attachment;
+      return att?.type === 'queued_command' && att.commandMode === 'prompt' && !att.isMeta && att.origin === undefined;
     }
-    return false
-  })
+    return false;
+  });
 }
 
 /**
@@ -208,119 +197,113 @@ export function filterForBriefTool<
  */
 export function dropTextInBriefTurns<
   T extends {
-    type: string
-    isMeta?: boolean
-    message?: { content: Array<{ type: string; name?: string }> }
+    type: string;
+    isMeta?: boolean;
+    message?: { content: Array<{ type: string; name?: string }> };
   },
 >(messages: T[], briefToolNames: string[]): T[] {
-  const nameSet = new Set(briefToolNames)
+  const nameSet = new Set(briefToolNames);
   // First pass: find which turns (bounded by non-meta user messages) contain
   // a Brief tool_use. Tag each assistant text block with its turn index.
-  const turnsWithBrief = new Set<number>()
-  const textIndexToTurn: number[] = []
-  let turn = 0
+  const turnsWithBrief = new Set<number>();
+  const textIndexToTurn: number[] = [];
+  let turn = 0;
   for (let i = 0; i < messages.length; i++) {
-    const msg = messages[i]!
-    const block = msg.message?.content[0]
+    const msg = messages[i]!;
+    const block = msg.message?.content[0];
     if (msg.type === 'user' && block?.type !== 'tool_result' && !msg.isMeta) {
-      turn++
-      continue
+      turn++;
+      continue;
     }
     if (msg.type === 'assistant') {
       if (block?.type === 'text') {
-        textIndexToTurn[i] = turn
-      } else if (
-        block?.type === 'tool_use' &&
-        block.name &&
-        nameSet.has(block.name)
-      ) {
-        turnsWithBrief.add(turn)
+        textIndexToTurn[i] = turn;
+      } else if (block?.type === 'tool_use' && block.name && nameSet.has(block.name)) {
+        turnsWithBrief.add(turn);
       }
     }
   }
-  if (turnsWithBrief.size === 0) return messages
+  if (turnsWithBrief.size === 0) return messages;
   // Second pass: drop text blocks whose turn called Brief.
   return messages.filter((_, i) => {
-    const t = textIndexToTurn[i]
-    return t === undefined || !turnsWithBrief.has(t)
-  })
+    const t = textIndexToTurn[i];
+    return t === undefined || !turnsWithBrief.has(t);
+  });
 }
 
 type Props = {
-  messages: MessageType[]
-  tools: Tools
-  commands: Command[]
-  verbose: boolean
+  messages: MessageType[];
+  tools: Tools;
+  commands: Command[];
+  verbose: boolean;
   toolJSX: {
-    jsx: React.ReactNode | null
-    shouldHidePromptInput: boolean
-    shouldContinueAnimation?: true
-  } | null
-  toolUseConfirmQueue: ToolUseConfirm[]
-  inProgressToolUseIDs: Set<string>
-  isMessageSelectorVisible: boolean
-  conversationId: string
-  screen: Screen
-  streamingToolUses: StreamingToolUse[]
-  showAllInTranscript?: boolean
-  agentDefinitions?: AgentDefinitionsResult
-  onOpenRateLimitOptions?: () => void
+    jsx: React.ReactNode | null;
+    shouldHidePromptInput: boolean;
+    shouldContinueAnimation?: true;
+  } | null;
+  toolUseConfirmQueue: ToolUseConfirm[];
+  inProgressToolUseIDs: Set<string>;
+  isMessageSelectorVisible: boolean;
+  conversationId: string;
+  screen: Screen;
+  streamingToolUses: StreamingToolUse[];
+  showAllInTranscript?: boolean;
+  agentDefinitions?: AgentDefinitionsResult;
+  onOpenRateLimitOptions?: () => void;
   /** Hide the logo/header - used for subagent zoom view */
-  hideLogo?: boolean
-  isLoading: boolean
+  hideLogo?: boolean;
+  isLoading: boolean;
   /** In transcript mode, hide all thinking blocks except the last one */
-  hidePastThinking?: boolean
+  hidePastThinking?: boolean;
   /** Streaming thinking content (live updates, not frozen) */
-  streamingThinking?: StreamingThinking | null
+  streamingThinking?: StreamingThinking | null;
   /** Streaming text preview (rendered as last item so transition to final message is positionally seamless) */
-  streamingText?: string | null
+  streamingText?: string | null;
   /** When true, only show Brief tool output (hide everything else) */
-  isBriefOnly?: boolean
+  isBriefOnly?: boolean;
   /** Fullscreen-mode "─── N new ───" divider. Renders before the first
    *  renderableMessage derived from firstUnseenUuid (matched by the 24-char
    *  prefix that deriveUUID preserves). */
-  unseenDivider?: UnseenDivider
+  unseenDivider?: UnseenDivider;
   /** Fullscreen-mode ScrollBox handle. Enables React-level virtualization when present. */
-  scrollRef?: RefObject<ScrollBoxHandle | null>
+  scrollRef?: RefObject<ScrollBoxHandle | null>;
   /** Fullscreen-mode: enable sticky-prompt tracking (writes via ScrollChromeContext). */
-  trackStickyPrompt?: boolean
+  trackStickyPrompt?: boolean;
   /** Transcript search: jump-to-index + setSearchQuery/nextMatch/prevMatch. */
-  jumpRef?: RefObject<JumpHandle | null>
+  jumpRef?: RefObject<JumpHandle | null>;
   /** Transcript search: fires when match count/position changes. */
-  onSearchMatchesChange?: (count: number, current: number) => void
+  onSearchMatchesChange?: (count: number, current: number) => void;
   /** Paint an existing DOM subtree to fresh Screen, scan. Element comes
    *  from the main tree (all real providers). Message-relative positions. */
-  scanElement?: (
-    el: import('@anthropic/ink').DOMElement,
-  ) => import('@anthropic/ink').MatchPosition[]
+  scanElement?: (el: import('@anthropic/ink').DOMElement) => import('@anthropic/ink').MatchPosition[];
   /** Position-based CURRENT highlight. positions stable (msg-relative),
    *  rowOffset tracks scroll. null clears. */
   setPositions?: (
     state: {
-      positions: import('@anthropic/ink').MatchPosition[]
-      rowOffset: number
-      currentIdx: number
+      positions: import('@anthropic/ink').MatchPosition[];
+      rowOffset: number;
+      currentIdx: number;
     } | null,
-  ) => void
+  ) => void;
   /** Bypass MAX_MESSAGES_WITHOUT_VIRTUALIZATION. For one-shot headless renders
    *  (e.g. /export via renderToString) where the memory concern doesn't apply
    *  and the "already in scrollback" justification doesn't hold. */
-  disableRenderCap?: boolean
+  disableRenderCap?: boolean;
   /** In-transcript cursor; expanded overrides verbose for selected message. */
-  cursor?: MessageActionsState | null
-  setCursor?: (cursor: MessageActionsState | null) => void
+  cursor?: MessageActionsState | null;
+  setCursor?: (cursor: MessageActionsState | null) => void;
   /** Passed through to VirtualMessageList (heightCache owns visibility). */
-  cursorNavRef?: React.Ref<MessageActionsNav>
+  cursorNavRef?: React.Ref<MessageActionsNav>;
   /** Render only collapsed.slice(start, end). For chunked headless export
    *  (streamRenderedMessages in exportRenderer.tsx): prep runs on the FULL
    *  messages array so grouping/lookups are correct, but only this slice
    *  chunk instead of the full session. The logo renders only for chunk 0
    *  (start === 0); later chunks are mid-stream continuations.
    *  Measured Mar 2026: 538-msg session, 20 slices → −55% plateau RSS. */
-  renderRange?: readonly [start: number, end: number]
-}
+  renderRange?: readonly [start: number, end: number];
+};
 
-const MAX_MESSAGES_TO_SHOW_IN_TRANSCRIPT_MODE = 30
+const MAX_MESSAGES_TO_SHOW_IN_TRANSCRIPT_MODE = 30;
 
 // Safety cap for the non-virtualized render path (fullscreen off or
 // explicitly disabled). Ink mounts a full fiber tree per message (~250 KB
@@ -351,10 +334,10 @@ const MAX_MESSAGES_TO_SHOW_IN_TRANSCRIPT_MODE = 30
 // slice roughly where it was instead of resetting to 0 — which would
 // jump from ~200 rendered messages to the full history, orphaning
 // in-progress badge snapshots in scrollback.
-const MAX_MESSAGES_WITHOUT_VIRTUALIZATION = 200
-const MESSAGE_CAP_STEP = 50
+const MAX_MESSAGES_WITHOUT_VIRTUALIZATION = 200;
+const MESSAGE_CAP_STEP = 50;
 
-export type SliceAnchor = { uuid: string; idx: number } | null
+export type SliceAnchor = { uuid: string; idx: number } | null;
 
 /** Exported for testing. Mutates anchorRef when the window needs to advance. */
 export function computeSliceStart(
@@ -363,33 +346,23 @@ export function computeSliceStart(
   cap = MAX_MESSAGES_WITHOUT_VIRTUALIZATION,
   step = MESSAGE_CAP_STEP,
 ): number {
-  const anchor = anchorRef.current
-  const anchorIdx = anchor
-    ? collapsed.findIndex(m => m.uuid === anchor.uuid)
-    : -1
+  const anchor = anchorRef.current;
+  const anchorIdx = anchor ? collapsed.findIndex(m => m.uuid === anchor.uuid) : -1;
   // Anchor found → use it. Anchor lost → fall back to stored index
   // (clamped) so collapse-regrouping uuid churn doesn't reset to 0.
-  let start =
-    anchorIdx >= 0
-      ? anchorIdx
-      : anchor
-        ? Math.min(anchor.idx, Math.max(0, collapsed.length - cap))
-        : 0
+  let start = anchorIdx >= 0 ? anchorIdx : anchor ? Math.min(anchor.idx, Math.max(0, collapsed.length - cap)) : 0;
   if (collapsed.length - start > cap + step) {
-    start = collapsed.length - cap
+    start = collapsed.length - cap;
   }
   // Refresh anchor from whatever lives at the current start — heals a
   // stale uuid after fallback and captures a new one after advancement.
-  const msgAtStart = collapsed[start]
-  if (
-    msgAtStart &&
-    (anchor?.uuid !== msgAtStart.uuid || anchor.idx !== start)
-  ) {
-    anchorRef.current = { uuid: msgAtStart.uuid, idx: start }
+  const msgAtStart = collapsed[start];
+  if (msgAtStart && (anchor?.uuid !== msgAtStart.uuid || anchor.idx !== start)) {
+    anchorRef.current = { uuid: msgAtStart.uuid, idx: start };
   } else if (!msgAtStart && anchor) {
-    anchorRef.current = null
+    anchorRef.current = null;
   }
-  return start
+  return start;
 }
 
 const MessagesImpl = ({
@@ -426,139 +399,118 @@ const MessagesImpl = ({
   cursorNavRef,
   renderRange,
 }: Props): React.ReactNode => {
-  const { columns } = useTerminalSize()
-  const toggleShowAllShortcut = useShortcutDisplay(
-    'transcript:toggleShowAll',
-    'Transcript',
-    'Ctrl+E',
-  )
+  const { columns } = useTerminalSize();
+  const toggleShowAllShortcut = useShortcutDisplay('transcript:toggleShowAll', 'Transcript', 'Ctrl+E');
 
-  const normalizedMessages = useMemo(
-    () => normalizeMessages(messages).filter(isNotEmptyMessage),
-    [messages],
-  )
+  const normalizedMessages = useMemo(() => normalizeMessages(messages).filter(isNotEmptyMessage), [messages]);
 
   // Check if streaming thinking should be visible (streaming or within 30s timeout)
   const isStreamingThinkingVisible = useMemo(() => {
-    if (!streamingThinking) return false
-    if (streamingThinking.isStreaming) return true
+    if (!streamingThinking) return false;
+    if (streamingThinking.isStreaming) return true;
     if (streamingThinking.streamingEndedAt) {
-      return Date.now() - streamingThinking.streamingEndedAt < 30000
+      return Date.now() - streamingThinking.streamingEndedAt < 30000;
     }
-    return false
-  }, [streamingThinking])
+    return false;
+  }, [streamingThinking]);
 
   // Find the last thinking block (message UUID + content index) for hiding past thinking in transcript mode
   // When streaming thinking is visible, use a special ID that won't match any completed thinking block
   // With adaptive thinking, only consider thinking blocks from the current turn and stop searching once we
   // hit the last user message.
   const lastThinkingBlockId = useMemo(() => {
-    if (!hidePastThinking) return null
+    if (!hidePastThinking) return null;
     // If streaming thinking is visible, hide all completed thinking blocks by using a non-matching ID
-    if (isStreamingThinkingVisible) return 'streaming'
+    if (isStreamingThinkingVisible) return 'streaming';
     // Iterate backwards to find the last message with a thinking block
     for (let i = normalizedMessages.length - 1; i >= 0; i--) {
-      const msg = normalizedMessages[i]
+      const msg = normalizedMessages[i];
       if (msg?.type === 'assistant') {
-        const content = msg.message!.content as Array<{ type: string }>
+        const content = msg.message!.content as Array<{ type: string }>;
         // Find the last thinking block in this message
         for (let j = content.length - 1; j >= 0; j--) {
           if (content[j]?.type === 'thinking') {
-            return `${msg.uuid}:${j}`
+            return `${msg.uuid}:${j}`;
           }
         }
       } else if (msg?.type === 'user') {
-        const content = msg.message!.content as Array<{ type: string }>
-        const hasToolResult = content.some(
-          block => block.type === 'tool_result',
-        )
+        const content = msg.message!.content as Array<{ type: string }>;
+        const hasToolResult = content.some(block => block.type === 'tool_result');
         if (!hasToolResult) {
           // Reached a previous user turn so don't show stale thinking from before
-          return 'no-thinking'
+          return 'no-thinking';
         }
       }
     }
-    return null
-  }, [normalizedMessages, hidePastThinking, isStreamingThinkingVisible])
+    return null;
+  }, [normalizedMessages, hidePastThinking, isStreamingThinkingVisible]);
 
   // Find the latest user bash output message (from ! commands)
   // This allows us to show full output for the most recent bash command
   const latestBashOutputUUID = useMemo(() => {
     // Iterate backwards to find the last user message with bash output
     for (let i = normalizedMessages.length - 1; i >= 0; i--) {
-      const msg = normalizedMessages[i]
+      const msg = normalizedMessages[i];
       if (msg?.type === 'user') {
-        const content = msg.message!.content as Array<{ type: string; text?: string }>
+        const content = msg.message!.content as Array<{ type: string; text?: string }>;
         // Check if any text content is bash output
         for (const block of content) {
           if (block.type === 'text') {
-            const text = block.text ?? ''
-            if (
-              text.startsWith('<bash-stdout') ||
-              text.startsWith('<bash-stderr')
-            ) {
-              return msg.uuid
+            const text = block.text ?? '';
+            if (text.startsWith('<bash-stdout') || text.startsWith('<bash-stderr')) {
+              return msg.uuid;
             }
           }
         }
       }
     }
-    return null
-  }, [normalizedMessages])
+    return null;
+  }, [normalizedMessages]);
 
   // streamingToolUses updates on every input_json_delta while normalizedMessages
   // stays stable — precompute the Set so the filter is O(k) not O(n×k) per chunk.
-  const normalizedToolUseIDs = useMemo(
-    () => getToolUseIDs(normalizedMessages),
-    [normalizedMessages],
-  )
+  const normalizedToolUseIDs = useMemo(() => getToolUseIDs(normalizedMessages), [normalizedMessages]);
 
   const streamingToolUsesWithoutInProgress = useMemo(
     () =>
       streamingToolUses.filter(
-        stu =>
-          !inProgressToolUseIDs.has(stu.contentBlock.id) &&
-          !normalizedToolUseIDs.has(stu.contentBlock.id),
+        stu => !inProgressToolUseIDs.has(stu.contentBlock.id) && !normalizedToolUseIDs.has(stu.contentBlock.id),
       ),
     [streamingToolUses, inProgressToolUseIDs, normalizedToolUseIDs],
-  )
+  );
 
   const syntheticStreamingToolUseMessages = useMemo(
     () =>
       streamingToolUsesWithoutInProgress.flatMap(streamingToolUse => {
         const msg = createAssistantMessage({
           content: [streamingToolUse.contentBlock],
-        })
+        });
         // Override randomUUID with deterministic value derived from content
         // block ID to prevent React key changes on every memo recomputation.
         // Same class of bug fixed in normalizeMessages (commit 383326e613):
         // fresh randomUUID → unstable React keys → component remounts →
         // Ink rendering corruption (overlapping text from stale DOM nodes).
-        msg.uuid = deriveUUID(streamingToolUse.contentBlock.id as UUID, 0)
-        return normalizeMessages([msg])
+        msg.uuid = deriveUUID(streamingToolUse.contentBlock.id as UUID, 0);
+        return normalizeMessages([msg]);
       }),
     [streamingToolUsesWithoutInProgress],
-  )
+  );
 
-  const isTranscriptMode = screen === 'transcript'
+  const isTranscriptMode = screen === 'transcript';
   // Hoisted to mount-time — this component re-renders on every scroll.
-  const disableVirtualScroll = useMemo(
-    () => isEnvTruthy(process.env.CLAUDE_CODE_DISABLE_VIRTUAL_SCROLL),
-    [],
-  )
+  const disableVirtualScroll = useMemo(() => isEnvTruthy(process.env.CLAUDE_CODE_DISABLE_VIRTUAL_SCROLL), []);
   // Virtual scroll replaces the transcript cap: everything is scrollable and
   // memory is bounded by the mounted-item count, not the total. scrollRef is
   // only passed when isFullscreenEnvEnabled() is true (REPL.tsx gates it),
   // so scrollRef's presence is the signal.
-  const virtualScrollRuntimeGate = scrollRef != null && !disableVirtualScroll
-  const shouldTruncate =
-    isTranscriptMode && !showAllInTranscript && !virtualScrollRuntimeGate
+  const virtualScrollRuntimeGate = scrollRef != null && !disableVirtualScroll;
+  const shouldTruncate = isTranscriptMode && !showAllInTranscript && !virtualScrollRuntimeGate;
 
   // Anchor for the first rendered message in the non-virtualized cap slice.
   // Monotonic advance only — mutation during render is idempotent (safe
   // under StrictMode double-render). See MAX_MESSAGES_WITHOUT_VIRTUALIZATION
   // comment above for why this replaced count-based slicing.
-  const sliceAnchorRef = useRef<SliceAnchor>(null)
+  const sliceAnchorRef = useRef<SliceAnchor>(null);
 
   // Expensive message transforms — filter, reorder, group, collapse, lookups.
   // All O(n) over 27k messages. Split from the renderRange slice so scrolling
@@ -566,107 +518,87 @@ const MessagesImpl = ({
   // useMemo included renderRange → every scroll rebuilt 6 Maps over 27k
   // messages + 4 filter/map passes = ~50ms alloc per scroll → GC pressure →
   // 100-173ms stop-the-world pauses on the 1GB heap.
-  const { collapsed, lookups, hasTruncatedMessages, hiddenMessageCount } =
-    useMemo(() => {
-      // In fullscreen mode the alt buffer has no native scrollback, so the
-      // compact-boundary filter just hides history the ScrollBox could
-      // otherwise scroll to. Main-screen mode keeps the filter — pre-compact
-      // rows live above the viewport in native scrollback there, and
-      // re-rendering them triggers full resets.
-      // includeSnipped: UI rendering keeps snipped messages for scrollback
-      // (this PR's core goal — full history in UI, filter only for the model).
-      // Also avoids a UUID mismatch: normalizeMessages derives new UUIDs, so
-      // projectSnippedView's check against original removedUuids would fail.
-      const compactAwareMessages =
-        verbose || isFullscreenEnvEnabled()
-          ? normalizedMessages
-          : getMessagesAfterCompactBoundary(normalizedMessages, {
-              includeSnipped: true,
-            })
+  const { collapsed, lookups, hasTruncatedMessages, hiddenMessageCount } = useMemo(() => {
+    // In fullscreen mode the alt buffer has no native scrollback, so the
+    // compact-boundary filter just hides history the ScrollBox could
+    // otherwise scroll to. Main-screen mode keeps the filter — pre-compact
+    // rows live above the viewport in native scrollback there, and
+    // re-rendering them triggers full resets.
+    // includeSnipped: UI rendering keeps snipped messages for scrollback
+    // (this PR's core goal — full history in UI, filter only for the model).
+    // Also avoids a UUID mismatch: normalizeMessages derives new UUIDs, so
+    // projectSnippedView's check against original removedUuids would fail.
+    const compactAwareMessages =
+      verbose || isFullscreenEnvEnabled()
+        ? normalizedMessages
+        : getMessagesAfterCompactBoundary(normalizedMessages, {
+            includeSnipped: true,
+          });
 
-      const messagesToShowNotTruncated = reorderMessagesInUI(
-        compactAwareMessages
-          .filter(
-            (msg): msg is Exclude<NormalizedMessage, ProgressMessageType> =>
-              msg.type !== 'progress',
-          )
-          // CC-724: drop attachment messages that AttachmentMessage renders as
-          // null (hook_success, hook_additional_context, hook_cancelled, etc.)
-          // BEFORE counting/slicing so they don't inflate the "N messages"
-          // count in ctrl-o or consume slots in the 200-message render cap.
-          .filter(msg => !isNullRenderingAttachment(msg))
-          .filter(_ => shouldShowUserMessage(_, isTranscriptMode)) as Parameters<typeof reorderMessagesInUI>[0],
-        syntheticStreamingToolUseMessages,
-      )
-      // Three-tier filtering. Transcript mode (ctrl+o screen) is truly unfiltered.
-      // Brief-only: SendUserMessage + user input only. Default: drop redundant
-      // assistant text in turns where SendUserMessage was called (the model's
-      // text is working-notes that duplicate the SendUserMessage content).
-      const briefToolNames = [BRIEF_TOOL_NAME, SEND_USER_FILE_TOOL_NAME].filter(
-        (n): n is string => n !== null,
-      )
-      // dropTextInBriefTurns should only trigger on SendUserMessage turns —
-      // SendUserFile delivers a file without replacement text, so dropping
-      // assistant text for file-only turns would leave the user with no context.
-      const dropTextToolNames = [BRIEF_TOOL_NAME].filter(
-        (n): n is string => n !== null,
-      )
-      const briefFiltered =
-        briefToolNames.length > 0 && !isTranscriptMode
-          ? isBriefOnly
-            ? filterForBriefTool(messagesToShowNotTruncated as Parameters<typeof filterForBriefTool>[0], briefToolNames)
-            : dropTextToolNames.length > 0
-              ? dropTextInBriefTurns(
-                  messagesToShowNotTruncated as Parameters<typeof dropTextInBriefTurns>[0],
-                  dropTextToolNames,
-                )
-              : messagesToShowNotTruncated
-          : messagesToShowNotTruncated
-
-      const messagesToShow = shouldTruncate
-        ? briefFiltered.slice(-MAX_MESSAGES_TO_SHOW_IN_TRANSCRIPT_MODE)
-        : briefFiltered
-
-      const hasTruncatedMessages =
-        shouldTruncate &&
-        briefFiltered.length > MAX_MESSAGES_TO_SHOW_IN_TRANSCRIPT_MODE
-
-      const { messages: groupedMessages } = applyGrouping(
-        messagesToShow as MessageType[],
-        tools,
-        verbose,
-      )
-
-      const collapsed = collapseBackgroundBashNotifications(
-        collapseHookSummaries(
-          collapseTeammateShutdowns(
-            collapseReadSearchGroups(groupedMessages, tools),
-          ),
-        ),
-        verbose,
-      )
-
-      const lookups = buildMessageLookups(normalizedMessages, messagesToShow as MessageType[])
-
-      const hiddenMessageCount =
-        messagesToShowNotTruncated.length -
-        MAX_MESSAGES_TO_SHOW_IN_TRANSCRIPT_MODE
-
-      return {
-        collapsed,
-        lookups,
-        hasTruncatedMessages,
-        hiddenMessageCount,
-      }
-    }, [
-      verbose,
-      normalizedMessages,
-      isTranscriptMode,
+    const messagesToShowNotTruncated = reorderMessagesInUI(
+      compactAwareMessages
+        .filter((msg): msg is Exclude<NormalizedMessage, ProgressMessageType> => msg.type !== 'progress')
+        // CC-724: drop attachment messages that AttachmentMessage renders as
+        // null (hook_success, hook_additional_context, hook_cancelled, etc.)
+        // BEFORE counting/slicing so they don't inflate the "N messages"
+        // count in ctrl-o or consume slots in the 200-message render cap.
+        .filter(msg => !isNullRenderingAttachment(msg))
+        .filter(_ => shouldShowUserMessage(_, isTranscriptMode)) as Parameters<typeof reorderMessagesInUI>[0],
       syntheticStreamingToolUseMessages,
-      shouldTruncate,
-      tools,
-      isBriefOnly,
-    ])
+    );
+    // Three-tier filtering. Transcript mode (ctrl+o screen) is truly unfiltered.
+    // Brief-only: SendUserMessage + user input only. Default: drop redundant
+    // assistant text in turns where SendUserMessage was called (the model's
+    // text is working-notes that duplicate the SendUserMessage content).
+    const briefToolNames = [BRIEF_TOOL_NAME, SEND_USER_FILE_TOOL_NAME].filter((n): n is string => n !== null);
+    // dropTextInBriefTurns should only trigger on SendUserMessage turns —
+    // SendUserFile delivers a file without replacement text, so dropping
+    // assistant text for file-only turns would leave the user with no context.
+    const dropTextToolNames = [BRIEF_TOOL_NAME].filter((n): n is string => n !== null);
+    const briefFiltered =
+      briefToolNames.length > 0 && !isTranscriptMode
+        ? isBriefOnly
+          ? filterForBriefTool(messagesToShowNotTruncated as Parameters<typeof filterForBriefTool>[0], briefToolNames)
+          : dropTextToolNames.length > 0
+            ? dropTextInBriefTurns(
+                messagesToShowNotTruncated as Parameters<typeof dropTextInBriefTurns>[0],
+                dropTextToolNames,
+              )
+            : messagesToShowNotTruncated
+        : messagesToShowNotTruncated;
+
+    const messagesToShow = shouldTruncate
+      ? briefFiltered.slice(-MAX_MESSAGES_TO_SHOW_IN_TRANSCRIPT_MODE)
+      : briefFiltered;
+
+    const hasTruncatedMessages = shouldTruncate && briefFiltered.length > MAX_MESSAGES_TO_SHOW_IN_TRANSCRIPT_MODE;
+
+    const { messages: groupedMessages } = applyGrouping(messagesToShow as MessageType[], tools, verbose);
+
+    const collapsed = collapseBackgroundBashNotifications(
+      collapseHookSummaries(collapseTeammateShutdowns(collapseReadSearchGroups(groupedMessages, tools))),
+      verbose,
+    );
+
+    const lookups = buildMessageLookups(normalizedMessages, messagesToShow as MessageType[]);
+
+    const hiddenMessageCount = messagesToShowNotTruncated.length - MAX_MESSAGES_TO_SHOW_IN_TRANSCRIPT_MODE;
+
+    return {
+      collapsed,
+      lookups,
+      hasTruncatedMessages,
+      hiddenMessageCount,
+    };
+  }, [
+    verbose,
+    normalizedMessages,
+    isTranscriptMode,
+    syntheticStreamingToolUseMessages,
+    shouldTruncate,
+    tools,
+    isBriefOnly,
+  ]);
 
   // Cheap slice — only runs when scroll range or slice config changes.
   const renderableMessages = useMemo(() => {
@@ -677,57 +609,52 @@ const MessagesImpl = ({
     // component's lifetime (scrollRef is either always passed or never).
     // renderRange is first: the chunked export path slices the
     // post-grouping array so each chunk gets correct tool-call grouping.
-    const capApplies = !virtualScrollRuntimeGate && !disableRenderCap
-    const sliceStart = capApplies
-      ? computeSliceStart(collapsed, sliceAnchorRef)
-      : 0
+    const capApplies = !virtualScrollRuntimeGate && !disableRenderCap;
+    const sliceStart = capApplies ? computeSliceStart(collapsed, sliceAnchorRef) : 0;
     return renderRange
       ? collapsed.slice(renderRange[0], renderRange[1])
       : sliceStart > 0
         ? collapsed.slice(sliceStart)
-        : collapsed
-  }, [collapsed, renderRange, virtualScrollRuntimeGate, disableRenderCap])
+        : collapsed;
+  }, [collapsed, renderRange, virtualScrollRuntimeGate, disableRenderCap]);
 
   const streamingToolUseIDs = useMemo(
     () => new Set(streamingToolUses.map(_ => _.contentBlock.id)),
     [streamingToolUses],
-  )
+  );
 
   // Divider insertion point: first renderableMessage whose uuid shares the
   // 24-char prefix with firstUnseenUuid (deriveUUID keeps the first 24
   // chars of the source message uuid, so this matches any block from it).
   const dividerBeforeIndex = useMemo(() => {
-    if (!unseenDivider) return -1
-    const prefix = unseenDivider.firstUnseenUuid.slice(0, 24)
-    return renderableMessages.findIndex(m => m.uuid.slice(0, 24) === prefix)
-  }, [unseenDivider, renderableMessages])
+    if (!unseenDivider) return -1;
+    const prefix = unseenDivider.firstUnseenUuid.slice(0, 24);
+    return renderableMessages.findIndex(m => m.uuid.slice(0, 24) === prefix);
+  }, [unseenDivider, renderableMessages]);
 
   const selectedIdx = useMemo(() => {
-    if (!cursor) return -1
-    return renderableMessages.findIndex(m => m.uuid === cursor.uuid)
-  }, [cursor, renderableMessages])
+    if (!cursor) return -1;
+    return renderableMessages.findIndex(m => m.uuid === cursor.uuid);
+  }, [cursor, renderableMessages]);
 
   // Fullscreen: click a message to toggle verbose rendering for it. Keyed by
   // tool_use_id where available so a tool_use and its tool_result (separate
   // rows) expand together; falls back to uuid for groups/thinking. Stale keys
   // are harmless — they never match anything in renderableMessages.
-  const [expandedKeys, setExpandedKeys] = useState<ReadonlySet<string>>(
-    () => new Set(),
-  )
+  const [expandedKeys, setExpandedKeys] = useState<ReadonlySet<string>>(() => new Set());
   const onItemClick = useCallback((msg: RenderableMessage) => {
-    const k = expandKey(msg)
+    const k = expandKey(msg);
     setExpandedKeys(prev => {
-      const next = new Set(prev)
-      if (next.has(k)) next.delete(k)
-      else next.add(k)
-      return next
-    })
-  }, [])
+      const next = new Set(prev);
+      if (next.has(k)) next.delete(k);
+      else next.add(k);
+      return next;
+    });
+  }, []);
   const isItemExpanded = useCallback(
-    (msg: RenderableMessage) =>
-      expandedKeys.size > 0 && expandedKeys.has(expandKey(msg)),
+    (msg: RenderableMessage) => expandedKeys.size > 0 && expandedKeys.has(expandKey(msg)),
     [expandedKeys],
-  )
+  );
   // Only hover/click messages where the verbose toggle reveals more:
   // collapsed read/search groups, or tool results that self-report truncation
   // via isResultTruncated. Callback must be stable across message updates: if
@@ -735,70 +662,62 @@ const MessagesImpl = ({
   // attaches after the mouse is already inside → hover never fires. tools is
   // session-stable; lookups is read via ref so the callback doesn't churn on
   // every new message.
-  const lookupsRef = useRef(lookups)
-  lookupsRef.current = lookups
+  const lookupsRef = useRef(lookups);
+  lookupsRef.current = lookups;
   const isItemClickable = useCallback(
     (msg: RenderableMessage): boolean => {
-      if (msg.type === 'collapsed_read_search') return true
+      if (msg.type === 'collapsed_read_search') return true;
       if (msg.type === 'assistant') {
-        const content = msg.message!.content
-        const b = (Array.isArray(content) ? content[0] : undefined) as unknown as AdvisorBlock | undefined
+        const content = msg.message!.content;
+        const b = (Array.isArray(content) ? content[0] : undefined) as unknown as AdvisorBlock | undefined;
         return (
-          b != null &&
-          isAdvisorBlock(b) &&
-          b.type === 'advisor_tool_result' &&
-          b.content.type === 'advisor_result'
-        )
+          b != null && isAdvisorBlock(b) && b.type === 'advisor_tool_result' && b.content.type === 'advisor_result'
+        );
       }
-      if (msg.type !== 'user') return false
-      const b = (msg.message!.content as Array<{ type: string; tool_use_id?: string; is_error?: boolean; [key: string]: unknown }>)[0]
-      if (b?.type !== 'tool_result' || b.is_error || !msg.toolUseResult)
-        return false
-      const name = lookupsRef.current.toolUseByToolUseID.get(
-        b.tool_use_id ?? '',
-      )?.name
-      const tool = name ? findToolByName(tools, name) : undefined
-      return tool?.isResultTruncated?.(msg.toolUseResult as never) ?? false
+      if (msg.type !== 'user') return false;
+      const b = (
+        msg.message!.content as Array<{
+          type: string;
+          tool_use_id?: string;
+          is_error?: boolean;
+          [key: string]: unknown;
+        }>
+      )[0];
+      if (b?.type !== 'tool_result' || b.is_error || !msg.toolUseResult) return false;
+      const name = lookupsRef.current.toolUseByToolUseID.get(b.tool_use_id ?? '')?.name;
+      const tool = name ? findToolByName(tools, name) : undefined;
+      return tool?.isResultTruncated?.(msg.toolUseResult as never) ?? false;
     },
     [tools],
-  )
+  );
 
   const canAnimate =
-    (!toolJSX || !!toolJSX.shouldContinueAnimation) &&
-    !toolUseConfirmQueue.length &&
-    !isMessageSelectorVisible
+    (!toolJSX || !!toolJSX.shouldContinueAnimation) && !toolUseConfirmQueue.length && !isMessageSelectorVisible;
 
-  const hasToolsInProgress = inProgressToolUseIDs.size > 0
+  const hasToolsInProgress = inProgressToolUseIDs.size > 0;
 
   // Report progress to terminal (for terminals that support OSC 9;4)
-  const { progress } = useTerminalNotification()
-  const prevProgressState = useRef<string | null>(null)
+  const { progress } = useTerminalNotification();
+  const prevProgressState = useRef<string | null>(null);
   const progressEnabled =
     getGlobalConfig().terminalProgressBarEnabled &&
     !getIsRemoteMode() &&
-    !(proactiveModule?.isProactiveActive() ?? false)
+    !(proactiveModule?.isProactiveActive() ?? false);
   useEffect(() => {
-    const state = progressEnabled
-      ? hasToolsInProgress
-        ? 'indeterminate'
-        : 'completed'
-      : null
-    if (prevProgressState.current === state) return
-    prevProgressState.current = state
-    progress(state)
-  }, [progress, progressEnabled, hasToolsInProgress])
+    const state = progressEnabled ? (hasToolsInProgress ? 'indeterminate' : 'completed') : null;
+    if (prevProgressState.current === state) return;
+    prevProgressState.current = state;
+    progress(state);
+  }, [progress, progressEnabled, hasToolsInProgress]);
   useEffect(() => {
-    return () => progress(null)
-  }, [progress])
+    return () => progress(null);
+  }, [progress]);
 
-  const messageKey = useCallback(
-    (msg: RenderableMessage) => `${msg.uuid}-${conversationId}`,
-    [conversationId],
-  )
+  const messageKey = useCallback((msg: RenderableMessage) => `${msg.uuid}-${conversationId}`, [conversationId]);
 
   const renderMessageRow = (msg: RenderableMessage, index: number) => {
-    const prevType = index > 0 ? renderableMessages[index - 1]?.type : undefined
-    const isUserContinuation = msg.type === 'user' && prevType === 'user'
+    const prevType = index > 0 ? renderableMessages[index - 1]?.type : undefined;
+    const isUserContinuation = msg.type === 'user' && prevType === 'user';
     // hasContentAfter is only consumed for collapsed_read_search groups;
     // skip the scan for everything else. streamingText is rendered as a
     // sibling after this map, so it's never in renderableMessages — OR it
@@ -806,15 +725,9 @@ const MessagesImpl = ({
     // streaming instead of waiting for the block to finalize.
     const hasContentAfter =
       msg.type === 'collapsed_read_search' &&
-      (!!streamingText ||
-        hasContentAfterIndex(
-          renderableMessages,
-          index,
-          tools,
-          streamingToolUseIDs,
-        ))
+      (!!streamingText || hasContentAfterIndex(renderableMessages, index, tools, streamingToolUseIDs));
 
-    const k = messageKey(msg)
+    const k = messageKey(msg);
     const row = (
       <MessageRow
         key={k}
@@ -823,11 +736,7 @@ const MessagesImpl = ({
         hasContentAfter={hasContentAfter}
         tools={tools}
         commands={commands}
-        verbose={
-          verbose ||
-          isItemExpanded(msg) ||
-          (cursor?.expanded === true && index === selectedIdx)
-        }
+        verbose={verbose || isItemExpanded(msg) || (cursor?.expanded === true && index === selectedIdx)}
         inProgressToolUseIDs={inProgressToolUseIDs}
         streamingToolUseIDs={streamingToolUseIDs}
         screen={screen}
@@ -839,18 +748,15 @@ const MessagesImpl = ({
         isLoading={isLoading}
         lookups={lookups}
       />
-    )
+    );
 
     // Per-row Provider — only 2 rows re-render on selection change.
     // Wrapped BEFORE divider branch so both return paths get it.
     const wrapped = (
-      <MessageActionsSelectedContext.Provider
-        key={k}
-        value={index === selectedIdx}
-      >
+      <MessageActionsSelectedContext.Provider key={k} value={index === selectedIdx}>
         {row}
       </MessageActionsSelectedContext.Provider>
-    )
+    );
 
     if (unseenDivider && index === dividerBeforeIndex) {
       return [
@@ -862,10 +768,10 @@ const MessagesImpl = ({
           />
         </Box>,
         wrapped,
-      ]
+      ];
     }
-    return wrapped
-  }
+    return wrapped;
+  };
 
   // Search indexing: for tool_result messages, look up the Tool and use
   // its extractSearchText — tool-owned, precise, matches what
@@ -877,30 +783,24 @@ const MessagesImpl = ({
   // A second-React-root reconcile approach was tried and ruled out
   // (measured 3.1ms/msg, growing — flushSyncWork processes all roots;
   // component hooks mutate shared state → main root accumulates updates).
-  const searchTextCache = useRef(new WeakMap<RenderableMessage, string>())
+  const searchTextCache = useRef(new WeakMap<RenderableMessage, string>());
   const extractSearchText = useCallback(
     (msg: RenderableMessage): string => {
-      const cached = searchTextCache.current.get(msg)
-      if (cached !== undefined) return cached
-      let text = renderableSearchText(msg)
+      const cached = searchTextCache.current.get(msg);
+      if (cached !== undefined) return cached;
+      let text = renderableSearchText(msg);
       // If this is a tool_result message and the tool implements
       // extractSearchText, prefer that — it's precise (tool-owned)
       // vs renderableSearchText's field-name heuristic.
-      if (
-        msg.type === 'user' &&
-        msg.toolUseResult &&
-        Array.isArray(msg.message.content)
-      ) {
-        const tr = msg.message.content.find(b => b.type === 'tool_result')
+      if (msg.type === 'user' && msg.toolUseResult && Array.isArray(msg.message.content)) {
+        const tr = msg.message.content.find(b => b.type === 'tool_result');
         if (tr && 'tool_use_id' in tr) {
-          const tu = lookups.toolUseByToolUseID.get(tr.tool_use_id)
-          const tool = tu && findToolByName(tools, tu.name)
-          const extracted = tool?.extractSearchText?.(
-            msg.toolUseResult as never,
-          )
+          const tu = lookups.toolUseByToolUseID.get(tr.tool_use_id);
+          const tool = tu && findToolByName(tools, tu.name);
+          const extracted = tool?.extractSearchText?.(msg.toolUseResult as never);
           // undefined = tool didn't implement → keep heuristic. Empty
           // string = tool says "nothing to index" → respect that.
-          if (extracted !== undefined) text = extracted
+          if (extracted !== undefined) text = extracted;
         }
       }
       // Cache LOWERED: setSearchQuery's hot loop indexOfs per keystroke.
@@ -908,19 +808,17 @@ const MessagesImpl = ({
       // ~same steady-state memory for zero per-keystroke alloc. Cache
       // GC's with messages on transcript exit. Tool methods return raw;
       // renderableSearchText already lowercases (redundant but cheap).
-      const lowered = text.toLowerCase()
-      searchTextCache.current.set(msg, lowered)
-      return lowered
+      const lowered = text.toLowerCase();
+      searchTextCache.current.set(msg, lowered);
+      return lowered;
     },
     [tools, lookups],
-  )
+  );
 
   return (
     <>
       {/* Logo */}
-      {!hideLogo && !(renderRange && renderRange[0] > 0) && (
-        <LogoHeader agentDefinitions={agentDefinitions} />
-      )}
+      {!hideLogo && !(renderRange && renderRange[0] > 0) && <LogoHeader agentDefinitions={agentDefinitions} />}
 
       {/* Truncation indicator */}
       {hasTruncatedMessages && (
@@ -979,12 +877,7 @@ const MessagesImpl = ({
       )}
 
       {streamingText && !isBriefOnly && (
-        <Box
-          alignItems="flex-start"
-          flexDirection="row"
-          marginTop={1}
-          width="100%"
-        >
+        <Box alignItems="flex-start" flexDirection="row" marginTop={1} width="100%">
           <Box flexDirection="row">
             <Box minWidth={2}>
               <Text color="text">{BLACK_CIRCLE}</Text>
@@ -1011,17 +904,13 @@ const MessagesImpl = ({
         </Box>
       )}
     </>
-  )
-}
+  );
+};
 
 /** Key for click-to-expand: tool_use_id where available (so tool_use + its
  *  tool_result expand together), else uuid for groups/thinking. */
 function expandKey(msg: RenderableMessage): string {
-  return (
-    (msg.type === 'assistant' || msg.type === 'user'
-      ? getToolUseID(msg)
-      : null) ?? msg.uuid
-  )
+  return (msg.type === 'assistant' || msg.type === 'user' ? getToolUseID(msg) : null) ?? msg.uuid;
 }
 
 // Custom comparator to prevent unnecessary re-renders during streaming.
@@ -1030,15 +919,15 @@ function expandKey(msg: RenderableMessage): string {
 // 2. streamingToolUses array is recreated on every delta, but only contentBlock matters for rendering
 // 3. streamingThinking changes on every delta - we DO want to re-render for this
 function setsEqual<T>(a: Set<T>, b: Set<T>): boolean {
-  if (a.size !== b.size) return false
+  if (a.size !== b.size) return false;
   for (const item of a) {
-    if (!b.has(item)) return false
+    if (!b.has(item)) return false;
   }
-  return true
+  return true;
 }
 
 export const Messages = React.memo(MessagesImpl, (prev, next) => {
-  const keys = Object.keys(prev) as (keyof typeof prev)[]
+  const keys = Object.keys(prev) as (keyof typeof prev)[];
   for (const key of keys) {
     if (
       key === 'onOpenRateLimitOptions' ||
@@ -1051,50 +940,41 @@ export const Messages = React.memo(MessagesImpl, (prev, next) => {
       key === 'scanElement' ||
       key === 'setPositions'
     )
-      continue
+      continue;
     if (prev[key] !== next[key]) {
       if (key === 'streamingToolUses') {
-        const p = prev.streamingToolUses
-        const n = next.streamingToolUses
-        if (
-          p.length === n.length &&
-          p.every((item, i) => item.contentBlock === n[i]?.contentBlock)
-        ) {
-          continue
+        const p = prev.streamingToolUses;
+        const n = next.streamingToolUses;
+        if (p.length === n.length && p.every((item, i) => item.contentBlock === n[i]?.contentBlock)) {
+          continue;
         }
       }
       if (key === 'inProgressToolUseIDs') {
         if (setsEqual(prev.inProgressToolUseIDs, next.inProgressToolUseIDs)) {
-          continue
+          continue;
         }
       }
       if (key === 'unseenDivider') {
-        const p = prev.unseenDivider
-        const n = next.unseenDivider
-        if (
-          p?.firstUnseenUuid === n?.firstUnseenUuid &&
-          p?.count === n?.count
-        ) {
-          continue
+        const p = prev.unseenDivider;
+        const n = next.unseenDivider;
+        if (p?.firstUnseenUuid === n?.firstUnseenUuid && p?.count === n?.count) {
+          continue;
         }
       }
       if (key === 'tools') {
-        const p = prev.tools
-        const n = next.tools
-        if (
-          p.length === n.length &&
-          p.every((tool, i) => tool.name === n[i]?.name)
-        ) {
-          continue
+        const p = prev.tools;
+        const n = next.tools;
+        if (p.length === n.length && p.every((tool, i) => tool.name === n[i]?.name)) {
+          continue;
         }
       }
       // streamingThinking changes frequently - always re-render when it changes
       // (no special handling needed, default behavior is correct)
-      return false
+      return false;
     }
   }
-  return true
-})
+  return true;
+});
 
 export function shouldRenderStatically(
   message: RenderableMessage,
@@ -1105,58 +985,55 @@ export function shouldRenderStatically(
   lookups: ReturnType<typeof buildMessageLookups>,
 ): boolean {
   if (screen === 'transcript') {
-    return true
+    return true;
   }
   switch (message.type) {
     case 'attachment':
     case 'user':
     case 'assistant': {
       if (message.type === 'assistant') {
-        const block = (message.message!.content as Array<{ type: string; id?: string }>)[0]
+        const block = (message.message!.content as Array<{ type: string; id?: string }>)[0];
         if (block?.type === 'server_tool_use') {
-          return lookups.resolvedToolUseIDs.has(block.id!)
+          return lookups.resolvedToolUseIDs.has(block.id!);
         }
       }
-      const toolUseID = getToolUseID(message)
+      const toolUseID = getToolUseID(message);
       if (!toolUseID) {
-        return true
+        return true;
       }
       if (streamingToolUseIDs.has(toolUseID)) {
-        return false
+        return false;
       }
       if (inProgressToolUseIDs.has(toolUseID)) {
-        return false
+        return false;
       }
 
       // Check if there are any unresolved PostToolUse hooks for this tool use
       // If so, keep the message transient so the HookProgressMessage can update
       if (hasUnresolvedHooksFromLookup(toolUseID, 'PostToolUse', lookups)) {
-        return false
+        return false;
       }
 
-      return every(siblingToolUseIDs, lookups.resolvedToolUseIDs)
+      return every(siblingToolUseIDs, lookups.resolvedToolUseIDs);
     }
     case 'system': {
       // api errors always render dynamically, since we hide
       // them as soon as we see another non-error message.
-      return message.subtype !== 'api_error'
+      return message.subtype !== 'api_error';
     }
     case 'grouped_tool_use': {
       const allResolved = message.messages.every(msg => {
-        const content = (msg.message!.content as Array<{ type: string; id?: string }>)[0]
-        return (
-          content?.type === 'tool_use' &&
-          lookups.resolvedToolUseIDs.has(content.id!)
-        )
-      })
-      return allResolved
+        const content = (msg.message!.content as Array<{ type: string; id?: string }>)[0];
+        return content?.type === 'tool_use' && lookups.resolvedToolUseIDs.has(content.id!);
+      });
+      return allResolved;
     }
     case 'collapsed_read_search': {
       // In prompt mode, never mark as static to prevent flicker between API turns
       // (In transcript mode, we already returned true at the top of this function)
-      return false
+      return false;
     }
     default:
-      return true
+      return true;
   }
 }
diff --git a/src/components/ModelPicker.tsx b/src/components/ModelPicker.tsx
index b9f5155bc..a38708266 100644
--- a/src/components/ModelPicker.tsx
+++ b/src/components/ModelPicker.tsx
@@ -1,21 +1,21 @@
-import capitalize from 'lodash-es/capitalize.js'
-import * as React from 'react'
-import { useCallback, useMemo, useState } from 'react'
-import { has1mContext } from '../utils/context.js'
-import { useExitOnCtrlCDWithKeybindings } from 'src/hooks/useExitOnCtrlCDWithKeybindings.js'
+import capitalize from 'lodash-es/capitalize.js';
+import * as React from 'react';
+import { useCallback, useMemo, useState } from 'react';
+import { has1mContext } from '../utils/context.js';
+import { useExitOnCtrlCDWithKeybindings } from 'src/hooks/useExitOnCtrlCDWithKeybindings.js';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from 'src/services/analytics/index.js'
+} from 'src/services/analytics/index.js';
 import {
   FAST_MODE_MODEL_DISPLAY,
   isFastModeAvailable,
   isFastModeCooldown,
   isFastModeEnabled,
-} from 'src/utils/fastMode.js'
-import { Box, Text } from '@anthropic/ink'
-import { useKeybindings } from '../keybindings/useKeybinding.js'
-import { useAppState, useSetAppState } from '../state/AppState.js'
+} from 'src/utils/fastMode.js';
+import { Box, Text } from '@anthropic/ink';
+import { useKeybindings } from '../keybindings/useKeybinding.js';
+import { useAppState, useSetAppState } from '../state/AppState.js';
 import {
   convertEffortValueToLevel,
   type EffortLevel,
@@ -24,42 +24,39 @@ import {
   modelSupportsMaxEffort,
   resolvePickerEffortPersistence,
   toPersistableEffort,
-} from '../utils/effort.js'
+} from '../utils/effort.js';
 import {
   getDefaultMainLoopModel,
   type ModelSetting,
   modelDisplayString,
   parseUserSpecifiedModel,
-} from '../utils/model/model.js'
-import { getModelOptions } from '../utils/model/modelOptions.js'
-import {
-  getSettingsForSource,
-  updateSettingsForSource,
-} from '../utils/settings/settings.js'
-import { ConfigurableShortcutHint } from './ConfigurableShortcutHint.js'
-import { Select } from './CustomSelect/index.js'
-import { Byline, KeyboardShortcutHint, Pane } from '@anthropic/ink'
-import { effortLevelToSymbol } from './EffortIndicator.js'
+} from '../utils/model/model.js';
+import { getModelOptions } from '../utils/model/modelOptions.js';
+import { getSettingsForSource, updateSettingsForSource } from '../utils/settings/settings.js';
+import { ConfigurableShortcutHint } from './ConfigurableShortcutHint.js';
+import { Select } from './CustomSelect/index.js';
+import { Byline, KeyboardShortcutHint, Pane } from '@anthropic/ink';
+import { effortLevelToSymbol } from './EffortIndicator.js';
 
 export type Props = {
-  initial: string | null
-  sessionModel?: ModelSetting
-  onSelect: (model: string | null, effort: EffortLevel | undefined) => void
-  onCancel?: () => void
-  isStandaloneCommand?: boolean
-  showFastModeNotice?: boolean
+  initial: string | null;
+  sessionModel?: ModelSetting;
+  onSelect: (model: string | null, effort: EffortLevel | undefined) => void;
+  onCancel?: () => void;
+  isStandaloneCommand?: boolean;
+  showFastModeNotice?: boolean;
   /** Overrides the dim header line below "Select model". */
-  headerText?: string
+  headerText?: string;
   /**
    * When true, skip writing effortLevel to userSettings on selection.
    * Used by the assistant installer wizard where the model choice is
    * project-scoped (written to the assistant's .claude/settings.json via
    * install.ts) and should not leak to the user's global ~/.claude/settings.
    */
-  skipSettingsWrite?: boolean
-}
+  skipSettingsWrite?: boolean;
+};
 
-const NO_PREFERENCE = '__NO_PREFERENCE__'
+const NO_PREFERENCE = '__NO_PREFERENCE__';
 
 export function ModelPicker({
   initial,
@@ -71,49 +68,40 @@ export function ModelPicker({
   headerText,
   skipSettingsWrite,
 }: Props): React.ReactNode {
-  const setAppState = useSetAppState()
-  const exitState = useExitOnCtrlCDWithKeybindings()
-  const maxVisible = 10
+  const setAppState = useSetAppState();
+  const exitState = useExitOnCtrlCDWithKeybindings();
+  const maxVisible = 10;
 
-  const initialValue = initial === null ? NO_PREFERENCE : initial
-  const [focusedValue, setFocusedValue] = useState<string | undefined>(
-    initialValue,
-  )
+  const initialValue = initial === null ? NO_PREFERENCE : initial;
+  const [focusedValue, setFocusedValue] = useState<string | undefined>(initialValue);
 
-  const isFastMode = useAppState(s =>
-    isFastModeEnabled() ? s.fastMode : false,
-  )
+  const isFastMode = useAppState(s => (isFastModeEnabled() ? s.fastMode : false));
 
   const [marked1MValues, setMarked1MValues] = useState<Set<string>>(
-    () => new Set(has1mContext(initialValue) ? [initialValue.replace(/\[1m\]/i, '')] : [])
-  )
+    () => new Set(has1mContext(initialValue) ? [initialValue.replace(/\[1m\]/i, '')] : []),
+  );
 
   const handleToggle1M = useCallback(() => {
-    if (!focusedValue || focusedValue === NO_PREFERENCE) return
+    if (!focusedValue || focusedValue === NO_PREFERENCE) return;
     setMarked1MValues(prev => {
-      const next = new Set(prev)
+      const next = new Set(prev);
       if (next.has(focusedValue)) {
-        next.delete(focusedValue)
+        next.delete(focusedValue);
       } else {
-        next.add(focusedValue)
+        next.add(focusedValue);
       }
-      return next
-    })
-  }, [focusedValue])
+      return next;
+    });
+  }, [focusedValue]);
 
-  const [hasToggledEffort, setHasToggledEffort] = useState(false)
-  const effortValue = useAppState(s => s.effortValue)
+  const [hasToggledEffort, setHasToggledEffort] = useState(false);
+  const effortValue = useAppState(s => s.effortValue);
   const [effort, setEffort] = useState<EffortLevel | undefined>(
-    effortValue !== undefined
-      ? convertEffortValueToLevel(effortValue)
-      : undefined,
-  )
+    effortValue !== undefined ? convertEffortValueToLevel(effortValue) : undefined,
+  );
 
   // Memoize all derived values to prevent re-renders
-  const modelOptions = useMemo(
-    () => getModelOptions(isFastMode ?? false),
-    [isFastMode],
-  )
+  const modelOptions = useMemo(() => getModelOptions(isFastMode ?? false), [isFastMode]);
 
   // Ensure the initial value is in the options list
   // This handles edge cases where the user's current model (e.g., 'haiku' for 3P users)
@@ -127,10 +115,10 @@ export function ModelPicker({
           label: modelDisplayString(initial),
           description: 'Current model',
         },
-      ]
+      ];
     }
-    return modelOptions
-  }, [modelOptions, initial])
+    return modelOptions;
+  }, [modelOptions, initial]);
 
   const selectOptions = useMemo(
     () =>
@@ -139,59 +127,43 @@ export function ModelPicker({
         value: opt.value === null ? NO_PREFERENCE : opt.value,
       })),
     [optionsWithInitial],
-  )
+  );
   const initialFocusValue = useMemo(
-    () =>
-      selectOptions.some(_ => _.value === initialValue)
-        ? initialValue
-        : (selectOptions[0]?.value ?? undefined),
+    () => (selectOptions.some(_ => _.value === initialValue) ? initialValue : (selectOptions[0]?.value ?? undefined)),
     [selectOptions, initialValue],
-  )
-  const visibleCount = Math.min(maxVisible, selectOptions.length)
-  const hiddenCount = Math.max(0, selectOptions.length - visibleCount)
+  );
+  const visibleCount = Math.min(maxVisible, selectOptions.length);
+  const hiddenCount = Math.max(0, selectOptions.length - visibleCount);
 
-  const focusedModelName = selectOptions.find(
-    opt => opt.value === focusedValue,
-  )?.label
-  const focusedModel = resolveOptionModel(focusedValue)
-  const is1MMarked = focusedValue !== undefined && focusedValue !== NO_PREFERENCE && marked1MValues.has(focusedValue)
-  const focusedSupportsEffort = focusedModel
-    ? modelSupportsEffort(focusedModel)
-    : false
-  const focusedSupportsMax = focusedModel
-    ? modelSupportsMaxEffort(focusedModel)
-    : false
-  const focusedDefaultEffort = getDefaultEffortLevelForOption(focusedValue)
+  const focusedModelName = selectOptions.find(opt => opt.value === focusedValue)?.label;
+  const focusedModel = resolveOptionModel(focusedValue);
+  const is1MMarked = focusedValue !== undefined && focusedValue !== NO_PREFERENCE && marked1MValues.has(focusedValue);
+  const focusedSupportsEffort = focusedModel ? modelSupportsEffort(focusedModel) : false;
+  const focusedSupportsMax = focusedModel ? modelSupportsMaxEffort(focusedModel) : false;
+  const focusedDefaultEffort = getDefaultEffortLevelForOption(focusedValue);
   // Clamp display when 'max' is selected but the focused model doesn't support it.
   // resolveAppliedEffort() does the same downgrade at API-send time.
-  const displayEffort =
-    effort === 'max' && !focusedSupportsMax ? 'high' : effort
+  const displayEffort = effort === 'max' && !focusedSupportsMax ? 'high' : effort;
 
   const handleFocus = useCallback(
     (value: string) => {
-      setFocusedValue(value)
+      setFocusedValue(value);
       if (!hasToggledEffort && effortValue === undefined) {
-        setEffort(getDefaultEffortLevelForOption(value))
+        setEffort(getDefaultEffortLevelForOption(value));
       }
     },
     [hasToggledEffort, effortValue],
-  )
+  );
 
   // Effort level cycling keybindings
   const handleCycleEffort = useCallback(
     (direction: 'left' | 'right') => {
-      if (!focusedSupportsEffort) return
-      setEffort(prev =>
-        cycleEffortLevel(
-          prev ?? focusedDefaultEffort,
-          direction,
-          focusedSupportsMax,
-        ),
-      )
-      setHasToggledEffort(true)
+      if (!focusedSupportsEffort) return;
+      setEffort(prev => cycleEffortLevel(prev ?? focusedDefaultEffort, direction, focusedSupportsMax));
+      setHasToggledEffort(true);
     },
     [focusedSupportsEffort, focusedSupportsMax, focusedDefaultEffort],
-  )
+  );
 
   useKeybindings(
     {
@@ -200,13 +172,12 @@ export function ModelPicker({
       'modelPicker:toggle1M': () => handleToggle1M(),
     },
     { context: 'ModelPicker' },
-  )
+  );
 
   function handleSelect(value: string): void {
     logEvent('tengu_model_command_menu_effort', {
-      effort:
-        effort as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-    })
+      effort: effort as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+    });
     if (!skipSettingsWrite) {
       // Prior comes from userSettings on disk — NOT merged settings (which
       // includes project/policy layers that must not leak into the user's
@@ -218,28 +189,25 @@ export function ModelPicker({
         getDefaultEffortLevelForOption(value),
         getSettingsForSource('userSettings')?.effortLevel,
         hasToggledEffort,
-      )
-      const persistable = toPersistableEffort(effortLevel)
+      );
+      const persistable = toPersistableEffort(effortLevel);
       if (persistable !== undefined) {
-        updateSettingsForSource('userSettings', { effortLevel: persistable })
+        updateSettingsForSource('userSettings', { effortLevel: persistable });
       }
-      setAppState(prev => ({ ...prev, effortValue: effortLevel }))
+      setAppState(prev => ({ ...prev, effortValue: effortLevel }));
     }
 
-    const selectedModel = resolveOptionModel(value)
-    const selectedEffort =
-      hasToggledEffort && selectedModel && modelSupportsEffort(selectedModel)
-        ? effort
-        : undefined
+    const selectedModel = resolveOptionModel(value);
+    const selectedEffort = hasToggledEffort && selectedModel && modelSupportsEffort(selectedModel) ? effort : undefined;
     if (value === NO_PREFERENCE) {
-      onSelect(null, selectedEffort)
-      return
+      onSelect(null, selectedEffort);
+      return;
     }
     // Apply or strip [1m] suffix based on user toggle
-    const wants1M = marked1MValues.has(value)
-    const baseValue = value.replace(/\[1m\]/i, '')
-    const finalValue = wants1M ? `${baseValue}[1m]` : baseValue
-    onSelect(finalValue, selectedEffort)
+    const wants1M = marked1MValues.has(value);
+    const baseValue = value.replace(/\[1m\]/i, '');
+    const finalValue = wants1M ? `${baseValue}[1m]` : baseValue;
+    onSelect(finalValue, selectedEffort);
   }
 
   const content = (
@@ -255,8 +223,8 @@ export function ModelPicker({
           </Text>
           {sessionModel && (
             <Text dimColor>
-              Currently using {modelDisplayString(sessionModel)} for this
-              session (set by plan mode). Selecting a model will undo this.
+              Currently using {modelDisplayString(sessionModel)} for this session (set by plan mode). Selecting a model
+              will undo this.
             </Text>
           )}
         </Box>
@@ -283,10 +251,8 @@ export function ModelPicker({
         <Box marginBottom={1} flexDirection="column">
           {focusedSupportsEffort ? (
             <Text dimColor>
-              <EffortLevelIndicator effort={displayEffort} />{' '}
-              {capitalize(displayEffort)} effort
-              {displayEffort === focusedDefaultEffort ? ` (default)` : ``}{' '}
-              <Text color="subtle">← → to adjust</Text>
+              <EffortLevelIndicator effort={displayEffort} /> {capitalize(displayEffort)} effort
+              {displayEffort === focusedDefaultEffort ? ` (default)` : ``} <Text color="subtle">← → to adjust</Text>
             </Text>
           ) : (
             <Text color="subtle">
@@ -311,16 +277,14 @@ export function ModelPicker({
           showFastModeNotice ? (
             <Box marginBottom={1}>
               <Text dimColor>
-                Fast mode is <Text bold>ON</Text> and available with{' '}
-                {FAST_MODE_MODEL_DISPLAY} only (/fast). Switching to other
-                models turn off fast mode.
+                Fast mode is <Text bold>ON</Text> and available with {FAST_MODE_MODEL_DISPLAY} only (/fast). Switching
+                to other models turn off fast mode.
               </Text>
             </Box>
           ) : isFastModeAvailable() && !isFastModeCooldown() ? (
             <Box marginBottom={1}>
               <Text dimColor>
-                Use <Text bold>/fast</Text> to turn on Fast mode (
-                {FAST_MODE_MODEL_DISPLAY} only).
+                Use <Text bold>/fast</Text> to turn on Fast mode ({FAST_MODE_MODEL_DISPLAY} only).
               </Text>
             </Box>
           ) : null
@@ -334,68 +298,45 @@ export function ModelPicker({
           ) : (
             <Byline>
               <KeyboardShortcutHint shortcut="Enter" action="confirm" />
-              <ConfigurableShortcutHint
-                action="select:cancel"
-                context="Select"
-                fallback="Esc"
-                description="exit"
-              />
+              <ConfigurableShortcutHint action="select:cancel" context="Select" fallback="Esc" description="exit" />
             </Byline>
           )}
         </Text>
       )}
     </Box>
-  )
+  );
 
   if (!isStandaloneCommand) {
-    return content
+    return content;
   }
 
-  return <Pane color="permission">{content}</Pane>
+  return <Pane color="permission">{content}</Pane>;
 }
 
 function resolveOptionModel(value?: string): string | undefined {
-  if (!value) return undefined
-  return value === NO_PREFERENCE
-    ? getDefaultMainLoopModel()
-    : parseUserSpecifiedModel(value)
+  if (!value) return undefined;
+  return value === NO_PREFERENCE ? getDefaultMainLoopModel() : parseUserSpecifiedModel(value);
 }
 
-function EffortLevelIndicator({
-  effort,
-}: {
-  effort?: EffortLevel
-}): React.ReactNode {
-  return (
-    <Text color={effort ? 'claude' : 'subtle'}>
-      {effortLevelToSymbol(effort ?? 'low')}
-    </Text>
-  )
+function EffortLevelIndicator({ effort }: { effort?: EffortLevel }): React.ReactNode {
+  return <Text color={effort ? 'claude' : 'subtle'}>{effortLevelToSymbol(effort ?? 'low')}</Text>;
 }
 
-function cycleEffortLevel(
-  current: EffortLevel,
-  direction: 'left' | 'right',
-  includeMax: boolean,
-): EffortLevel {
-  const levels: EffortLevel[] = includeMax
-    ? ['low', 'medium', 'high', 'max']
-    : ['low', 'medium', 'high']
+function cycleEffortLevel(current: EffortLevel, direction: 'left' | 'right', includeMax: boolean): EffortLevel {
+  const levels: EffortLevel[] = includeMax ? ['low', 'medium', 'high', 'max'] : ['low', 'medium', 'high'];
   // If the current level isn't in the cycle (e.g. 'max' after switching to a
   // non-Opus model), clamp to 'high'.
-  const idx = levels.indexOf(current)
-  const currentIndex = idx !== -1 ? idx : levels.indexOf('high')
+  const idx = levels.indexOf(current);
+  const currentIndex = idx !== -1 ? idx : levels.indexOf('high');
   if (direction === 'right') {
-    return levels[(currentIndex + 1) % levels.length]!
+    return levels[(currentIndex + 1) % levels.length]!;
   } else {
-    return levels[(currentIndex - 1 + levels.length) % levels.length]!
+    return levels[(currentIndex - 1 + levels.length) % levels.length]!;
   }
 }
 
 function getDefaultEffortLevelForOption(value?: string): EffortLevel {
-  const resolved = resolveOptionModel(value) ?? getDefaultMainLoopModel()
-  const defaultValue = getDefaultEffortForModel(resolved)
-  return defaultValue !== undefined
-    ? convertEffortValueToLevel(defaultValue)
-    : 'high'
+  const resolved = resolveOptionModel(value) ?? getDefaultMainLoopModel();
+  const defaultValue = getDefaultEffortForModel(resolved);
+  return defaultValue !== undefined ? convertEffortValueToLevel(defaultValue) : 'high';
 }
diff --git a/src/components/NativeAutoUpdater.tsx b/src/components/NativeAutoUpdater.tsx
index 77d84e968..f090f0f85 100644
--- a/src/components/NativeAutoUpdater.tsx
+++ b/src/components/NativeAutoUpdater.tsx
@@ -1,58 +1,54 @@
-import * as React from 'react'
-import { useEffect, useRef, useState } from 'react'
-import { logEvent } from 'src/services/analytics/index.js'
-import { logForDebugging } from 'src/utils/debug.js'
-import { logError } from 'src/utils/log.js'
-import { useInterval } from 'usehooks-ts'
-import { useUpdateNotification } from '../hooks/useUpdateNotification.js'
-import { Box, Text } from '@anthropic/ink'
-import type { AutoUpdaterResult } from '../utils/autoUpdater.js'
-import { getMaxVersion, getMaxVersionMessage } from '../utils/autoUpdater.js'
-import { isAutoUpdaterDisabled } from '../utils/config.js'
-import { installLatest } from '../utils/nativeInstaller/index.js'
-import { gt } from '../utils/semver.js'
-import { getInitialSettings } from '../utils/settings/settings.js'
+import * as React from 'react';
+import { useEffect, useRef, useState } from 'react';
+import { logEvent } from 'src/services/analytics/index.js';
+import { logForDebugging } from 'src/utils/debug.js';
+import { logError } from 'src/utils/log.js';
+import { useInterval } from 'usehooks-ts';
+import { useUpdateNotification } from '../hooks/useUpdateNotification.js';
+import { Box, Text } from '@anthropic/ink';
+import type { AutoUpdaterResult } from '../utils/autoUpdater.js';
+import { getMaxVersion, getMaxVersionMessage } from '../utils/autoUpdater.js';
+import { isAutoUpdaterDisabled } from '../utils/config.js';
+import { installLatest } from '../utils/nativeInstaller/index.js';
+import { gt } from '../utils/semver.js';
+import { getInitialSettings } from '../utils/settings/settings.js';
 
 /**
  * Categorize error messages for analytics
  */
 function getErrorType(errorMessage: string): string {
   if (errorMessage.includes('timeout')) {
-    return 'timeout'
+    return 'timeout';
   }
   if (errorMessage.includes('Checksum mismatch')) {
-    return 'checksum_mismatch'
+    return 'checksum_mismatch';
   }
   if (errorMessage.includes('ENOENT') || errorMessage.includes('not found')) {
-    return 'not_found'
+    return 'not_found';
   }
   if (errorMessage.includes('EACCES') || errorMessage.includes('permission')) {
-    return 'permission_denied'
+    return 'permission_denied';
   }
   if (errorMessage.includes('ENOSPC')) {
-    return 'disk_full'
+    return 'disk_full';
   }
   if (errorMessage.includes('npm')) {
-    return 'npm_error'
+    return 'npm_error';
   }
-  if (
-    errorMessage.includes('network') ||
-    errorMessage.includes('ECONNREFUSED') ||
-    errorMessage.includes('ENOTFOUND')
-  ) {
-    return 'network_error'
+  if (errorMessage.includes('network') || errorMessage.includes('ECONNREFUSED') || errorMessage.includes('ENOTFOUND')) {
+    return 'network_error';
   }
-  return 'unknown'
+  return 'unknown';
 }
 
 type Props = {
-  isUpdating: boolean
-  onChangeIsUpdating: (isUpdating: boolean) => void
-  onAutoUpdaterResult: (autoUpdaterResult: AutoUpdaterResult) => void
-  autoUpdaterResult: AutoUpdaterResult | null
-  showSuccessMessage: boolean
-  verbose: boolean
-}
+  isUpdating: boolean;
+  onChangeIsUpdating: (isUpdating: boolean) => void;
+  onAutoUpdaterResult: (autoUpdaterResult: AutoUpdaterResult) => void;
+  autoUpdaterResult: AutoUpdaterResult | null;
+  showSuccessMessage: boolean;
+  verbose: boolean;
+};
 
 export function NativeAutoUpdater({
   isUpdating,
@@ -63,90 +59,84 @@ export function NativeAutoUpdater({
   verbose,
 }: Props): React.ReactNode {
   const [versions, setVersions] = useState<{
-    current?: string | null
-    latest?: string | null
-  }>({})
-  const [maxVersionIssue, setMaxVersionIssue] = useState<string | null>(null)
-  const updateSemver = useUpdateNotification(autoUpdaterResult?.version)
-  const channel = getInitialSettings()?.autoUpdatesChannel ?? 'latest'
+    current?: string | null;
+    latest?: string | null;
+  }>({});
+  const [maxVersionIssue, setMaxVersionIssue] = useState<string | null>(null);
+  const updateSemver = useUpdateNotification(autoUpdaterResult?.version);
+  const channel = getInitialSettings()?.autoUpdatesChannel ?? 'latest';
 
   // Track latest isUpdating value in a ref so the memoized checkForUpdates
   // callback always sees the current value without changing callback identity
   // (which would re-trigger the initial-check useEffect below and cause
   // repeated downloads on remount — the upstream trigger for #22413).
-  const isUpdatingRef = useRef(isUpdating)
-  isUpdatingRef.current = isUpdating
+  const isUpdatingRef = useRef(isUpdating);
+  isUpdatingRef.current = isUpdating;
 
   const checkForUpdates = React.useCallback(async () => {
     if (isUpdatingRef.current) {
-      return
+      return;
     }
 
-    if (
-      process.env.NODE_ENV === 'test' ||
-      process.env.NODE_ENV === 'development'
-    ) {
-      logForDebugging(
-        'NativeAutoUpdater: Skipping update check in test/dev environment',
-      )
-      return
+    if (process.env.NODE_ENV === 'test' || process.env.NODE_ENV === 'development') {
+      logForDebugging('NativeAutoUpdater: Skipping update check in test/dev environment');
+      return;
     }
 
     if (isAutoUpdaterDisabled()) {
-      return
+      return;
     }
 
-    onChangeIsUpdating(true)
-    const startTime = Date.now()
+    onChangeIsUpdating(true);
+    const startTime = Date.now();
 
     // Log the start of an auto-update check for funnel analysis
-    logEvent('tengu_native_auto_updater_start', {})
+    logEvent('tengu_native_auto_updater_start', {});
 
     try {
       // Check if current version is above the max allowed version
-      const maxVersion = await getMaxVersion()
+      const maxVersion = await getMaxVersion();
       if (maxVersion && gt(MACRO.VERSION, maxVersion)) {
-        const msg = await getMaxVersionMessage()
-        setMaxVersionIssue(msg ?? 'affects your version')
+        const msg = await getMaxVersionMessage();
+        setMaxVersionIssue(msg ?? 'affects your version');
       }
 
-      const result = await installLatest(channel)
-      const currentVersion = MACRO.VERSION
-      const latencyMs = Date.now() - startTime
+      const result = await installLatest(channel);
+      const currentVersion = MACRO.VERSION;
+      const latencyMs = Date.now() - startTime;
 
       // Handle lock contention gracefully - just return without treating as error
       if (result.lockFailed) {
         logEvent('tengu_native_auto_updater_lock_contention', {
           latency_ms: latencyMs,
-        })
-        return // Silently skip this update check, will try again later
+        });
+        return; // Silently skip this update check, will try again later
       }
 
       // Update versions for display
-      setVersions({ current: currentVersion, latest: result.latestVersion })
+      setVersions({ current: currentVersion, latest: result.latestVersion });
 
       if (result.wasUpdated) {
         logEvent('tengu_native_auto_updater_success', {
           latency_ms: latencyMs,
-        })
+        });
 
         onAutoUpdaterResult({
           version: result.latestVersion,
           status: 'success',
-        })
+        });
       } else {
         // Already up to date
         logEvent('tengu_native_auto_updater_up_to_date', {
           latency_ms: latencyMs,
-        })
+        });
       }
     } catch (error) {
-      const latencyMs = Date.now() - startTime
-      const errorMessage =
-        error instanceof Error ? error.message : String(error)
-      logError(error)
+      const latencyMs = Date.now() - startTime;
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      logError(error);
 
-      const errorType = getErrorType(errorMessage)
+      const errorType = getErrorType(errorMessage);
       logEvent('tengu_native_auto_updater_fail', {
         latency_ms: latencyMs,
         error_timeout: errorType === 'timeout',
@@ -156,41 +146,39 @@ export function NativeAutoUpdater({
         error_disk_full: errorType === 'disk_full',
         error_npm: errorType === 'npm_error',
         error_network: errorType === 'network_error',
-      })
+      });
 
       onAutoUpdaterResult({
         version: null,
         status: 'install_failed',
-      })
+      });
     } finally {
-      onChangeIsUpdating(false)
+      onChangeIsUpdating(false);
     }
     // isUpdating intentionally omitted from deps; we read isUpdatingRef
     // instead so the guard is always current without changing callback
     // identity (which would re-trigger the initial-check useEffect below).
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    // biome-ignore lint/correctness/useExhaustiveDependencies: isUpdating read via ref
-  }, [onAutoUpdaterResult, channel])
+  }, [onAutoUpdaterResult, channel]);
 
   // Initial check
   useEffect(() => {
-    void checkForUpdates()
-  }, [checkForUpdates])
+    void checkForUpdates();
+  }, [checkForUpdates]);
 
   // Check every 30 minutes
-  useInterval(checkForUpdates, 30 * 60 * 1000)
+  useInterval(checkForUpdates, 30 * 60 * 1000);
 
-  const hasUpdateResult = !!autoUpdaterResult?.version
-  const hasVersionInfo = !!versions.current && !!versions.latest
+  const hasUpdateResult = !!autoUpdaterResult?.version;
+  const hasVersionInfo = !!versions.current && !!versions.latest;
   // Show the component when:
   // - warning banner needed (above max version), or
   // - there's an update result to display (success/error), or
   // - actively checking and we have version info to show
-  const shouldRender =
-    !!maxVersionIssue || hasUpdateResult || (isUpdating && hasVersionInfo)
+  const shouldRender = !!maxVersionIssue || hasUpdateResult || (isUpdating && hasVersionInfo);
 
   if (!shouldRender) {
-    return null
+    return null;
   }
 
   return (
@@ -222,10 +210,9 @@ export function NativeAutoUpdater({
       )}
       {maxVersionIssue && process.env.USER_TYPE === 'ant' && (
         <Text color="warning">
-          ⚠ Known issue: {maxVersionIssue} &middot; Run{' '}
-          <Text bold>claude rollback --safe</Text> to downgrade
+          ⚠ Known issue: {maxVersionIssue} &middot; Run <Text bold>claude rollback --safe</Text> to downgrade
         </Text>
       )}
     </Box>
-  )
+  );
 }
diff --git a/src/components/NotebookEditToolUseRejectedMessage.tsx b/src/components/NotebookEditToolUseRejectedMessage.tsx
index fc4e4f317..014bc545e 100644
--- a/src/components/NotebookEditToolUseRejectedMessage.tsx
+++ b/src/components/NotebookEditToolUseRejectedMessage.tsx
@@ -1,18 +1,18 @@
-import { relative } from 'path'
-import * as React from 'react'
-import { getCwd } from 'src/utils/cwd.js'
-import { Box, Text } from '@anthropic/ink'
-import { HighlightedCode } from './HighlightedCode.js'
-import { MessageResponse } from './MessageResponse.js'
+import { relative } from 'path';
+import * as React from 'react';
+import { getCwd } from 'src/utils/cwd.js';
+import { Box, Text } from '@anthropic/ink';
+import { HighlightedCode } from './HighlightedCode.js';
+import { MessageResponse } from './MessageResponse.js';
 
 type Props = {
-  notebook_path: string
-  cell_id: string | undefined
-  new_source: string
-  cell_type?: 'code' | 'markdown'
-  edit_mode?: 'replace' | 'insert' | 'delete'
-  verbose: boolean
-}
+  notebook_path: string;
+  cell_id: string | undefined;
+  new_source: string;
+  cell_type?: 'code' | 'markdown';
+  edit_mode?: 'replace' | 'insert' | 'delete';
+  verbose: boolean;
+};
 
 export function NotebookEditToolUseRejectedMessage({
   notebook_path,
@@ -22,7 +22,7 @@ export function NotebookEditToolUseRejectedMessage({
   edit_mode = 'replace',
   verbose,
 }: Props): React.ReactNode {
-  const operation = edit_mode === 'delete' ? 'delete' : `${edit_mode} cell in`
+  const operation = edit_mode === 'delete' ? 'delete' : `${edit_mode} cell in`;
 
   return (
     <MessageResponse>
@@ -36,14 +36,10 @@ export function NotebookEditToolUseRejectedMessage({
         </Box>
         {edit_mode !== 'delete' && (
           <Box marginTop={1} flexDirection="column">
-            <HighlightedCode
-              code={new_source}
-              filePath={cell_type === 'markdown' ? 'file.md' : 'file.py'}
-              dim
-            />
+            <HighlightedCode code={new_source} filePath={cell_type === 'markdown' ? 'file.md' : 'file.py'} dim />
           </Box>
         )}
       </Box>
     </MessageResponse>
-  )
+  );
 }
diff --git a/src/components/OffscreenFreeze.tsx b/src/components/OffscreenFreeze.tsx
index 8a94b5bd9..a374ea397 100644
--- a/src/components/OffscreenFreeze.tsx
+++ b/src/components/OffscreenFreeze.tsx
@@ -1,10 +1,10 @@
-import React, { useContext, useRef } from 'react'
-import { useTerminalViewport, Box } from '@anthropic/ink'
-import { InVirtualListContext } from './messageActions.js'
+import React, { useContext, useRef } from 'react';
+import { useTerminalViewport, Box } from '@anthropic/ink';
+import { InVirtualListContext } from './messageActions.js';
 
 type Props = {
-  children: React.ReactNode
-}
+  children: React.ReactNode;
+};
 
 /**
  * Freezes children when they scroll above the terminal viewport (into scrollback).
@@ -23,16 +23,16 @@ type Props = {
 export function OffscreenFreeze({ children }: Props): React.ReactNode {
   // React Compiler: reading cached.current in the return is the entire
   // freeze mechanism — memoizing this component would defeat it. Opt out.
-  'use no memo'
-  const inVirtualList = useContext(InVirtualListContext)
-  const [ref, { isVisible }] = useTerminalViewport()
-  const cached = useRef(children)
+  'use no memo';
+  const inVirtualList = useContext(InVirtualListContext);
+  const [ref, { isVisible }] = useTerminalViewport();
+  const cached = useRef(children);
   // Virtual list has no terminal scrollback — the ScrollBox clips inside the
   // viewport, so there's nothing to freeze. Freezing there also blocks
   // click-to-expand since useTerminalViewport's visibility calc can disagree
   // with the ScrollBox's virtual scroll position.
   if (isVisible || inVirtualList) {
-    cached.current = children
+    cached.current = children;
   }
-  return <Box ref={ref}>{cached.current}</Box>
+  return <Box ref={ref}>{cached.current}</Box>;
 }
diff --git a/src/components/Onboarding.tsx b/src/components/Onboarding.tsx
index 8391cf886..6b7b12c1c 100644
--- a/src/components/Onboarding.tsx
+++ b/src/components/Onboarding.tsx
@@ -1,80 +1,70 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react'
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from 'src/services/analytics/index.js'
-import {
-  setupTerminal,
-  shouldOfferTerminalSetup,
-} from '../commands/terminalSetup/terminalSetup.js'
-import { useExitOnCtrlCDWithKeybindings } from '../hooks/useExitOnCtrlCDWithKeybindings.js'
-import { Box, Link, Newline, Text, useTheme } from '@anthropic/ink'
-import { useKeybindings } from '../keybindings/useKeybinding.js'
-import { isAnthropicAuthEnabled } from '../utils/auth.js'
-import { normalizeApiKeyForConfig } from '../utils/authPortable.js'
-import { getCustomApiKeyStatus } from '../utils/config.js'
-import { env } from '../utils/env.js'
-import { isRunningOnHomespace } from '../utils/envUtils.js'
-import { PreflightStep } from '../utils/preflightChecks.js'
-import type { ThemeSetting } from '../utils/theme.js'
-import { ApproveApiKey } from './ApproveApiKey.js'
-import { ConsoleOAuthFlow } from './ConsoleOAuthFlow.js'
-import { Select } from './CustomSelect/select.js'
-import { WelcomeV2 } from './LogoV2/WelcomeV2.js'
-import { PressEnterToContinue } from './PressEnterToContinue.js'
-import { ThemePicker } from './ThemePicker.js'
-import { OrderedList } from './ui/OrderedList.js'
+} from 'src/services/analytics/index.js';
+import { setupTerminal, shouldOfferTerminalSetup } from '../commands/terminalSetup/terminalSetup.js';
+import { useExitOnCtrlCDWithKeybindings } from '../hooks/useExitOnCtrlCDWithKeybindings.js';
+import { Box, Link, Newline, Text, useTheme } from '@anthropic/ink';
+import { useKeybindings } from '../keybindings/useKeybinding.js';
+import { isAnthropicAuthEnabled } from '../utils/auth.js';
+import { normalizeApiKeyForConfig } from '../utils/authPortable.js';
+import { getCustomApiKeyStatus } from '../utils/config.js';
+import { env } from '../utils/env.js';
+import { isRunningOnHomespace } from '../utils/envUtils.js';
+import { PreflightStep } from '../utils/preflightChecks.js';
+import type { ThemeSetting } from '../utils/theme.js';
+import { ApproveApiKey } from './ApproveApiKey.js';
+import { ConsoleOAuthFlow } from './ConsoleOAuthFlow.js';
+import { Select } from './CustomSelect/select.js';
+import { WelcomeV2 } from './LogoV2/WelcomeV2.js';
+import { PressEnterToContinue } from './PressEnterToContinue.js';
+import { ThemePicker } from './ThemePicker.js';
+import { OrderedList } from './ui/OrderedList.js';
 
-type StepId =
-  | 'preflight'
-  | 'theme'
-  | 'oauth'
-  | 'api-key'
-  | 'security'
-  | 'terminal-setup'
+type StepId = 'preflight' | 'theme' | 'oauth' | 'api-key' | 'security' | 'terminal-setup';
 
 interface OnboardingStep {
-  id: StepId
-  component: React.ReactNode
+  id: StepId;
+  component: React.ReactNode;
 }
 
 type Props = {
-  onDone(): void
-}
+  onDone(): void;
+};
 
 export function Onboarding({ onDone }: Props): React.ReactNode {
-  const [currentStepIndex, setCurrentStepIndex] = useState(0)
-  const [skipOAuth, setSkipOAuth] = useState(false)
-  const [oauthEnabled] = useState(() => isAnthropicAuthEnabled())
-  const [theme, setTheme] = useTheme()
+  const [currentStepIndex, setCurrentStepIndex] = useState(0);
+  const [skipOAuth, setSkipOAuth] = useState(false);
+  const [oauthEnabled] = useState(() => isAnthropicAuthEnabled());
+  const [theme, setTheme] = useTheme();
 
   useEffect(() => {
     logEvent('tengu_began_setup', {
       oauthEnabled,
-    })
-  }, [oauthEnabled])
+    });
+  }, [oauthEnabled]);
 
   function goToNextStep() {
     if (currentStepIndex < steps.length - 1) {
-      const nextIndex = currentStepIndex + 1
-      setCurrentStepIndex(nextIndex)
+      const nextIndex = currentStepIndex + 1;
+      setCurrentStepIndex(nextIndex);
 
       logEvent('tengu_onboarding_step', {
         oauthEnabled,
-        stepId: steps[nextIndex]
-          ?.id as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
+        stepId: steps[nextIndex]?.id as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
     } else {
-      onDone()
+      onDone();
     }
   }
 
   function handleThemeSelection(newTheme: ThemeSetting) {
-    setTheme(newTheme)
-    goToNextStep()
+    setTheme(newTheme);
+    goToNextStep();
   }
 
-  const exitState = useExitOnCtrlCDWithKeybindings()
+  const exitState = useExitOnCtrlCDWithKeybindings();
 
   // Define all onboarding steps
   const themeStep = (
@@ -87,7 +77,7 @@ export function Onboarding({ onDone }: Props): React.ReactNode {
         skipExitHandling={true} // Skip exit handling as Onboarding already handles it
       />
     </Box>
-  )
+  );
 
   const securityStep = (
     <Box flexDirection="column" gap={1} paddingLeft={1}>
@@ -108,9 +98,7 @@ export function Onboarding({ onDone }: Props): React.ReactNode {
             </Text>
           </OrderedList.Item>
           <OrderedList.Item>
-            <Text>
-              Due to prompt injection risks, only use it with code you trust
-            </Text>
+            <Text>Due to prompt injection risks, only use it with code you trust</Text>
             <Text dimColor wrap="wrap">
               For more details see:
               <Newline />
@@ -121,49 +109,42 @@ export function Onboarding({ onDone }: Props): React.ReactNode {
       </Box>
       <PressEnterToContinue />
     </Box>
-  )
+  );
 
-  const preflightStep = <PreflightStep onSuccess={goToNextStep} />
+  const preflightStep = <PreflightStep onSuccess={goToNextStep} />;
   // Create the steps array - determine which steps to include based on reAuth and oauthEnabled
   const apiKeyNeedingApproval = useMemo(() => {
     // Add API key step if needed
     // On homespace, ANTHROPIC_API_KEY is preserved in process.env for child
     // processes but ignored by Claude Code itself (see auth.ts).
     if (!process.env.ANTHROPIC_API_KEY || isRunningOnHomespace()) {
-      return ''
+      return '';
     }
-    const customApiKeyTruncated = normalizeApiKeyForConfig(
-      process.env.ANTHROPIC_API_KEY,
-    )
+    const customApiKeyTruncated = normalizeApiKeyForConfig(process.env.ANTHROPIC_API_KEY);
     if (getCustomApiKeyStatus(customApiKeyTruncated) === 'new') {
-      return customApiKeyTruncated
+      return customApiKeyTruncated;
     }
-  }, [])
+  }, []);
 
   function handleApiKeyDone(approved: boolean) {
     if (approved) {
-      setSkipOAuth(true)
+      setSkipOAuth(true);
     }
-    goToNextStep()
+    goToNextStep();
   }
 
-  const steps: OnboardingStep[] = []
+  const steps: OnboardingStep[] = [];
   // Preflight check disabled — users may use third-party API providers
   // if (oauthEnabled) {
   //   steps.push({ id: 'preflight', component: preflightStep })
   // }
-  steps.push({ id: 'theme', component: themeStep })
+  steps.push({ id: 'theme', component: themeStep });
 
   if (apiKeyNeedingApproval) {
     steps.push({
       id: 'api-key',
-      component: (
-        <ApproveApiKey
-          customApiKeyTruncated={apiKeyNeedingApproval}
-          onDone={handleApiKeyDone}
-        />
-      ),
-    })
+      component: <ApproveApiKey customApiKeyTruncated={apiKeyNeedingApproval} onDone={handleApiKeyDone} />,
+    });
   }
 
   if (oauthEnabled) {
@@ -174,10 +155,10 @@ export function Onboarding({ onDone }: Props): React.ReactNode {
           <ConsoleOAuthFlow onDone={goToNextStep} />
         </SkippableStep>
       ),
-    })
+    });
   }
 
-  steps.push({ id: 'security', component: securityStep })
+  steps.push({ id: 'security', component: securityStep });
 
   if (shouldOfferTerminalSetup()) {
     steps.push({
@@ -210,41 +191,37 @@ export function Onboarding({ onDone }: Props): React.ReactNode {
                   // Errors already logged in setupTerminal, just swallow and proceed
                   void setupTerminal(theme)
                     .catch(() => {})
-                    .finally(goToNextStep)
+                    .finally(goToNextStep);
                 } else {
-                  goToNextStep()
+                  goToNextStep();
                 }
               }}
               onCancel={() => goToNextStep()}
             />
             <Text dimColor>
-              {exitState.pending ? (
-                <>Press {exitState.keyName} again to exit</>
-              ) : (
-                <>Enter to confirm · Esc to skip</>
-              )}
+              {exitState.pending ? <>Press {exitState.keyName} again to exit</> : <>Enter to confirm · Esc to skip</>}
             </Text>
           </Box>
         </Box>
       ),
-    })
+    });
   }
 
-  const currentStep = steps[currentStepIndex]
+  const currentStep = steps[currentStepIndex];
 
   // Handle Enter on security step and Escape on terminal-setup step
   // Dependencies match what goToNextStep uses internally
   const handleSecurityContinue = useCallback(() => {
     if (currentStepIndex === steps.length - 1) {
-      onDone()
+      onDone();
     } else {
-      goToNextStep()
+      goToNextStep();
     }
-  }, [currentStepIndex, steps.length, oauthEnabled, onDone])
+  }, [currentStepIndex, steps.length, oauthEnabled, onDone]);
 
   const handleTerminalSetupSkip = useCallback(() => {
-    goToNextStep()
-  }, [currentStepIndex, steps.length, oauthEnabled, onDone])
+    goToNextStep();
+  }, [currentStepIndex, steps.length, oauthEnabled, onDone]);
 
   useKeybindings(
     {
@@ -254,7 +231,7 @@ export function Onboarding({ onDone }: Props): React.ReactNode {
       context: 'Confirmation',
       isActive: currentStep?.id === 'security',
     },
-  )
+  );
 
   useKeybindings(
     {
@@ -264,7 +241,7 @@ export function Onboarding({ onDone }: Props): React.ReactNode {
       context: 'Confirmation',
       isActive: currentStep?.id === 'terminal-setup',
     },
-  )
+  );
 
   return (
     <Box flexDirection="column">
@@ -278,7 +255,7 @@ export function Onboarding({ onDone }: Props): React.ReactNode {
         )}
       </Box>
     </Box>
-  )
+  );
 }
 
 export function SkippableStep({
@@ -286,17 +263,17 @@ export function SkippableStep({
   onSkip,
   children,
 }: {
-  skip: boolean
-  onSkip(): void
-  children: React.ReactNode
+  skip: boolean;
+  onSkip(): void;
+  children: React.ReactNode;
 }): React.ReactNode {
   useEffect(() => {
     if (skip) {
-      onSkip()
+      onSkip();
     }
-  }, [skip, onSkip])
+  }, [skip, onSkip]);
   if (skip) {
-    return null
+    return null;
   }
-  return children
+  return children;
 }
diff --git a/src/components/OutputStylePicker.tsx b/src/components/OutputStylePicker.tsx
index 5717a26e6..aa12855e3 100644
--- a/src/components/OutputStylePicker.tsx
+++ b/src/components/OutputStylePicker.tsx
@@ -1,36 +1,29 @@
-import * as React from 'react'
-import { useCallback, useEffect, useState } from 'react'
-import {
-  getAllOutputStyles,
-  OUTPUT_STYLE_CONFIG,
-  type OutputStyleConfig,
-} from '../constants/outputStyles.js'
-import { Box, Text, Dialog } from '@anthropic/ink'
-import type { OutputStyle } from '../utils/config.js'
-import { getCwd } from '../utils/cwd.js'
-import type { OptionWithDescription } from './CustomSelect/select.js'
-import { Select } from './CustomSelect/select.js'
+import * as React from 'react';
+import { useCallback, useEffect, useState } from 'react';
+import { getAllOutputStyles, OUTPUT_STYLE_CONFIG, type OutputStyleConfig } from '../constants/outputStyles.js';
+import { Box, Text, Dialog } from '@anthropic/ink';
+import type { OutputStyle } from '../utils/config.js';
+import { getCwd } from '../utils/cwd.js';
+import type { OptionWithDescription } from './CustomSelect/select.js';
+import { Select } from './CustomSelect/select.js';
 
-const DEFAULT_OUTPUT_STYLE_LABEL = 'Default'
-const DEFAULT_OUTPUT_STYLE_DESCRIPTION =
-  'Claude completes coding tasks efficiently and provides concise responses'
+const DEFAULT_OUTPUT_STYLE_LABEL = 'Default';
+const DEFAULT_OUTPUT_STYLE_DESCRIPTION = 'Claude completes coding tasks efficiently and provides concise responses';
 
-function mapConfigsToOptions(styles: {
-  [styleName: string]: OutputStyleConfig | null
-}): OptionWithDescription[] {
+function mapConfigsToOptions(styles: { [styleName: string]: OutputStyleConfig | null }): OptionWithDescription[] {
   return Object.entries(styles).map(([style, config]) => ({
     label: config?.name ?? DEFAULT_OUTPUT_STYLE_LABEL,
     value: style,
     description: config?.description ?? DEFAULT_OUTPUT_STYLE_DESCRIPTION,
-  }))
+  }));
 }
 
 export type OutputStylePickerProps = {
-  initialStyle: OutputStyle
-  onComplete: (style: OutputStyle) => void
-  onCancel: () => void
-  isStandaloneCommand?: boolean
-}
+  initialStyle: OutputStyle;
+  onComplete: (style: OutputStyle) => void;
+  onCancel: () => void;
+  isStandaloneCommand?: boolean;
+};
 
 export function OutputStylePicker({
   initialStyle,
@@ -38,32 +31,32 @@ export function OutputStylePicker({
   onCancel,
   isStandaloneCommand,
 }: OutputStylePickerProps): React.ReactNode {
-  const [styleOptions, setStyleOptions] = useState<OptionWithDescription[]>([])
-  const [isLoading, setIsLoading] = useState(true)
+  const [styleOptions, setStyleOptions] = useState<OptionWithDescription[]>([]);
+  const [isLoading, setIsLoading] = useState(true);
 
   useEffect(() => {
     // Load all output styles including custom ones
     getAllOutputStyles(getCwd())
       .then(allStyles => {
-        const options = mapConfigsToOptions(allStyles)
-        setStyleOptions(options)
-        setIsLoading(false)
+        const options = mapConfigsToOptions(allStyles);
+        setStyleOptions(options);
+        setIsLoading(false);
       })
       .catch(() => {
         // On error, fall back to built-in styles only
-        const builtInOptions = mapConfigsToOptions(OUTPUT_STYLE_CONFIG)
-        setStyleOptions(builtInOptions)
-        setIsLoading(false)
-      })
-  }, [])
+        const builtInOptions = mapConfigsToOptions(OUTPUT_STYLE_CONFIG);
+        setStyleOptions(builtInOptions);
+        setIsLoading(false);
+      });
+  }, []);
 
   const handleStyleSelect = useCallback(
     (style: string) => {
-      const outputStyle = style as OutputStyle
-      onComplete(outputStyle)
+      const outputStyle = style as OutputStyle;
+      onComplete(outputStyle);
     },
     [onComplete],
-  )
+  );
 
   return (
     <Dialog
@@ -74,9 +67,7 @@ export function OutputStylePicker({
     >
       <Box flexDirection="column" gap={1}>
         <Box marginTop={1}>
-          <Text dimColor>
-            This changes how Claude Code communicates with you
-          </Text>
+          <Text dimColor>This changes how Claude Code communicates with you</Text>
         </Box>
         {isLoading ? (
           <Text dimColor>Loading output styles…</Text>
@@ -90,5 +81,5 @@ export function OutputStylePicker({
         )}
       </Box>
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/PackageManagerAutoUpdater.tsx b/src/components/PackageManagerAutoUpdater.tsx
index eeef217e2..7fd586ae6 100644
--- a/src/components/PackageManagerAutoUpdater.tsx
+++ b/src/components/PackageManagerAutoUpdater.tsx
@@ -1,95 +1,85 @@
-import * as React from 'react'
-import { useState } from 'react'
-import { useInterval } from 'usehooks-ts'
-import { Text } from '@anthropic/ink'
+import * as React from 'react';
+import { useState } from 'react';
+import { useInterval } from 'usehooks-ts';
+import { Text } from '@anthropic/ink';
 import {
   type AutoUpdaterResult,
   getLatestVersionFromGcs,
   getMaxVersion,
   shouldSkipVersion,
-} from '../utils/autoUpdater.js'
-import { isAutoUpdaterDisabled } from '../utils/config.js'
-import { logForDebugging } from '../utils/debug.js'
-import {
-  getPackageManager,
-  type PackageManager,
-} from '../utils/nativeInstaller/packageManagers.js'
-import { gt, gte } from '../utils/semver.js'
-import { getInitialSettings } from '../utils/settings/settings.js'
+} from '../utils/autoUpdater.js';
+import { isAutoUpdaterDisabled } from '../utils/config.js';
+import { logForDebugging } from '../utils/debug.js';
+import { getPackageManager, type PackageManager } from '../utils/nativeInstaller/packageManagers.js';
+import { gt, gte } from '../utils/semver.js';
+import { getInitialSettings } from '../utils/settings/settings.js';
 
 type Props = {
-  isUpdating: boolean
-  onChangeIsUpdating: (isUpdating: boolean) => void
-  onAutoUpdaterResult: (autoUpdaterResult: AutoUpdaterResult) => void
-  autoUpdaterResult: AutoUpdaterResult | null
-  showSuccessMessage: boolean
-  verbose: boolean
-}
+  isUpdating: boolean;
+  onChangeIsUpdating: (isUpdating: boolean) => void;
+  onAutoUpdaterResult: (autoUpdaterResult: AutoUpdaterResult) => void;
+  autoUpdaterResult: AutoUpdaterResult | null;
+  showSuccessMessage: boolean;
+  verbose: boolean;
+};
 
 export function PackageManagerAutoUpdater({ verbose }: Props): React.ReactNode {
-  const [updateAvailable, setUpdateAvailable] = useState(false)
-  const [packageManager, setPackageManager] =
-    useState<PackageManager>('unknown')
+  const [updateAvailable, setUpdateAvailable] = useState(false);
+  const [packageManager, setPackageManager] = useState<PackageManager>('unknown');
 
   const checkForUpdates = React.useCallback(async () => {
-    if (
-      process.env.NODE_ENV === 'test' ||
-      process.env.NODE_ENV === 'development'
-    ) {
-      return
+    if (process.env.NODE_ENV === 'test' || process.env.NODE_ENV === 'development') {
+      return;
     }
 
     if (isAutoUpdaterDisabled()) {
-      return
+      return;
     }
 
     const [channel, pm] = await Promise.all([
       Promise.resolve(getInitialSettings()?.autoUpdatesChannel ?? 'latest'),
       getPackageManager(),
-    ])
-    setPackageManager(pm)
+    ]);
+    setPackageManager(pm);
 
-    let latest = await getLatestVersionFromGcs(channel)
+    let latest = await getLatestVersionFromGcs(channel);
 
     // Check if max version is set (server-side kill switch for auto-updates)
-    const maxVersion = await getMaxVersion()
+    const maxVersion = await getMaxVersion();
 
     if (maxVersion && latest && gt(latest, maxVersion)) {
       logForDebugging(
         `PackageManagerAutoUpdater: maxVersion ${maxVersion} is set, capping update from ${latest} to ${maxVersion}`,
-      )
+      );
       if (gte(MACRO.VERSION, maxVersion)) {
         logForDebugging(
           `PackageManagerAutoUpdater: current version ${MACRO.VERSION} is already at or above maxVersion ${maxVersion}, skipping update`,
-        )
-        setUpdateAvailable(false)
-        return
+        );
+        setUpdateAvailable(false);
+        return;
       }
-      latest = maxVersion
+      latest = maxVersion;
     }
 
-    const hasUpdate =
-      latest && !gte(MACRO.VERSION, latest) && !shouldSkipVersion(latest)
+    const hasUpdate = latest && !gte(MACRO.VERSION, latest) && !shouldSkipVersion(latest);
 
-    setUpdateAvailable(!!hasUpdate)
+    setUpdateAvailable(!!hasUpdate);
 
     if (hasUpdate) {
-      logForDebugging(
-        `PackageManagerAutoUpdater: Update available ${MACRO.VERSION} -> ${latest}`,
-      )
+      logForDebugging(`PackageManagerAutoUpdater: Update available ${MACRO.VERSION} -> ${latest}`);
     }
-  }, [])
+  }, []);
 
   // Initial check
   React.useEffect(() => {
-    void checkForUpdates()
-  }, [checkForUpdates])
+    void checkForUpdates();
+  }, [checkForUpdates]);
 
   // Check every 30 minutes
-  useInterval(checkForUpdates, 30 * 60 * 1000)
+  useInterval(checkForUpdates, 30 * 60 * 1000);
 
   if (!updateAvailable) {
-    return null
+    return null;
   }
 
   // pacman, deb, and rpm don't get specific commands because they each have
@@ -102,7 +92,7 @@ export function PackageManagerAutoUpdater({ verbose }: Props): React.ReactNode {
         ? 'winget upgrade Anthropic.ClaudeCode'
         : packageManager === 'apk'
           ? 'apk upgrade claude-code'
-          : 'your package manager update command'
+          : 'your package manager update command';
 
   return (
     <>
@@ -115,5 +105,5 @@ export function PackageManagerAutoUpdater({ verbose }: Props): React.ReactNode {
         Update available! Run: <Text bold>{updateCommand}</Text>
       </Text>
     </>
-  )
+  );
 }
diff --git a/src/components/Passes/Passes.tsx b/src/components/Passes/Passes.tsx
index 94b6b2d52..cb9432d46 100644
--- a/src/components/Passes/Passes.tsx
+++ b/src/components/Passes/Passes.tsx
@@ -1,130 +1,120 @@
-import * as React from 'react'
-import { useCallback, useEffect, useState } from 'react'
-import type { CommandResultDisplay } from '../../commands.js'
-import { TEARDROP_ASTERISK } from '../../constants/figures.js'
-import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js'
-import { setClipboard } from '@anthropic/ink'
+import * as React from 'react';
+import { useCallback, useEffect, useState } from 'react';
+import type { CommandResultDisplay } from '../../commands.js';
+import { TEARDROP_ASTERISK } from '../../constants/figures.js';
+import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js';
+import { setClipboard } from '@anthropic/ink';
 // eslint-disable-next-line custom-rules/prefer-use-keybindings -- enter to copy link
-import { Box, Link, Text, useInput } from '@anthropic/ink'
-import { useKeybinding } from '../../keybindings/useKeybinding.js'
-import { logEvent } from '../../services/analytics/index.js'
+import { Box, Link, Text, useInput } from '@anthropic/ink';
+import { useKeybinding } from '../../keybindings/useKeybinding.js';
+import { logEvent } from '../../services/analytics/index.js';
 import {
   fetchReferralRedemptions,
   formatCreditAmount,
   getCachedOrFetchPassesEligibility,
-} from '../../services/api/referral.js'
-import type {
-  ReferralRedemptionsResponse,
-  ReferrerRewardInfo,
-} from '../../services/oauth/types.js'
-import { count } from '../../utils/array.js'
-import { logError } from '../../utils/log.js'
-import { Pane } from '@anthropic/ink'
+} from '../../services/api/referral.js';
+import type { ReferralRedemptionsResponse, ReferrerRewardInfo } from '../../services/oauth/types.js';
+import { count } from '../../utils/array.js';
+import { logError } from '../../utils/log.js';
+import { Pane } from '@anthropic/ink';
 
 type PassStatus = {
-  passNumber: number
-  isAvailable: boolean
-}
+  passNumber: number;
+  isAvailable: boolean;
+};
 
 type Props = {
-  onDone: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-}
+  onDone: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+};
 
 export function Passes({ onDone }: Props): React.ReactNode {
-  const [loading, setLoading] = useState(true)
-  const [passStatuses, setPassStatuses] = useState<PassStatus[]>([])
-  const [isAvailable, setIsAvailable] = useState(false)
-  const [referralLink, setReferralLink] = useState<string | null>(null)
-  const [referrerReward, setReferrerReward] = useState<
-    ReferrerRewardInfo | null | undefined
-  >(undefined)
+  const [loading, setLoading] = useState(true);
+  const [passStatuses, setPassStatuses] = useState<PassStatus[]>([]);
+  const [isAvailable, setIsAvailable] = useState(false);
+  const [referralLink, setReferralLink] = useState<string | null>(null);
+  const [referrerReward, setReferrerReward] = useState<ReferrerRewardInfo | null | undefined>(undefined);
 
   const exitState = useExitOnCtrlCDWithKeybindings(() =>
     onDone('Guest passes dialog dismissed', { display: 'system' }),
-  )
+  );
 
   const handleCancel = useCallback(() => {
-    onDone('Guest passes dialog dismissed', { display: 'system' })
-  }, [onDone])
+    onDone('Guest passes dialog dismissed', { display: 'system' });
+  }, [onDone]);
 
-  useKeybinding('confirm:no', handleCancel, { context: 'Confirmation' })
+  useKeybinding('confirm:no', handleCancel, { context: 'Confirmation' });
 
   useInput((_input, key) => {
     if (key.return && referralLink) {
       void setClipboard(referralLink).then(raw => {
-        if (raw) process.stdout.write(raw)
-        logEvent('tengu_guest_passes_link_copied', {})
-        onDone(`Referral link copied to clipboard!`)
-      })
+        if (raw) process.stdout.write(raw);
+        logEvent('tengu_guest_passes_link_copied', {});
+        onDone(`Referral link copied to clipboard!`);
+      });
     }
-  })
+  });
 
   useEffect(() => {
     async function loadPassesData() {
       try {
         // Check eligibility first (uses cache if available)
-        const eligibilityData = await getCachedOrFetchPassesEligibility()
+        const eligibilityData = await getCachedOrFetchPassesEligibility();
 
         if (!eligibilityData || !eligibilityData.eligible) {
-          setIsAvailable(false)
-          setLoading(false)
-          return
+          setIsAvailable(false);
+          setLoading(false);
+          return;
         }
 
-        setIsAvailable(true)
+        setIsAvailable(true);
 
         // Store the referral link if available
         if (eligibilityData.referral_code_details?.referral_link) {
-          setReferralLink(eligibilityData.referral_code_details.referral_link)
+          setReferralLink(eligibilityData.referral_code_details.referral_link);
         }
 
         // Store referrer reward info for v1 campaign messaging
-        setReferrerReward(eligibilityData.referrer_reward)
+        setReferrerReward(eligibilityData.referrer_reward);
 
         // Use the campaign returned from eligibility for redemptions
-        const campaign =
-          eligibilityData.referral_code_details?.campaign ??
-          'claude_code_guest_pass'
+        const campaign = eligibilityData.referral_code_details?.campaign ?? 'claude_code_guest_pass';
 
         // Fetch redemptions data
-        let redemptionsData: ReferralRedemptionsResponse
+        let redemptionsData: ReferralRedemptionsResponse;
         try {
-          redemptionsData = await fetchReferralRedemptions(campaign)
+          redemptionsData = await fetchReferralRedemptions(campaign);
         } catch (err) {
-          logError(err as Error)
-          setIsAvailable(false)
-          setLoading(false)
-          return
+          logError(err as Error);
+          setIsAvailable(false);
+          setLoading(false);
+          return;
         }
 
         // Build pass statuses array
-        const redemptions = redemptionsData.redemptions || []
-        const maxRedemptions = redemptionsData.limit || 3
-        const statuses: PassStatus[] = []
+        const redemptions = redemptionsData.redemptions || [];
+        const maxRedemptions = redemptionsData.limit || 3;
+        const statuses: PassStatus[] = [];
 
         for (let i = 0; i < maxRedemptions; i++) {
-          const redemption = redemptions[i]
+          const redemption = redemptions[i];
           statuses.push({
             passNumber: i + 1,
             isAvailable: !redemption,
-          })
+          });
         }
 
-        setPassStatuses(statuses)
-        setLoading(false)
+        setPassStatuses(statuses);
+        setLoading(false);
       } catch (err) {
         // For any error, just show passes as not available
-        logError(err as Error)
-        setIsAvailable(false)
-        setLoading(false)
+        logError(err as Error);
+        setIsAvailable(false);
+        setLoading(false);
       }
     }
 
-    void loadPassesData()
-  }, [])
+    void loadPassesData();
+  }, []);
 
   if (loading) {
     return (
@@ -132,15 +122,11 @@ export function Passes({ onDone }: Props): React.ReactNode {
         <Box flexDirection="column" gap={1}>
           <Text dimColor>Loading guest pass information…</Text>
           <Text dimColor italic>
-            {exitState.pending ? (
-              <>Press {exitState.keyName} again to exit</>
-            ) : (
-              <>Esc to cancel</>
-            )}
+            {exitState.pending ? <>Press {exitState.keyName} again to exit</> : <>Esc to cancel</>}
           </Text>
         </Box>
       </Pane>
-    )
+    );
   }
 
   if (!isAvailable) {
@@ -149,27 +135,21 @@ export function Passes({ onDone }: Props): React.ReactNode {
         <Box flexDirection="column" gap={1}>
           <Text>Guest passes are not currently available.</Text>
           <Text dimColor italic>
-            {exitState.pending ? (
-              <>Press {exitState.keyName} again to exit</>
-            ) : (
-              <>Esc to cancel</>
-            )}
+            {exitState.pending ? <>Press {exitState.keyName} again to exit</> : <>Esc to cancel</>}
           </Text>
         </Box>
       </Pane>
-    )
+    );
   }
 
-  const availableCount = count(passStatuses, p => p.isAvailable)
+  const availableCount = count(passStatuses, p => p.isAvailable);
 
   // Sort passes: available first, then redeemed
-  const sortedPasses = [...passStatuses].sort(
-    (a, b) => +b.isAvailable - +a.isAvailable,
-  )
+  const sortedPasses = [...passStatuses].sort((a, b) => +b.isAvailable - +a.isAvailable);
 
   // ASCII art for tickets
   const renderTicket = (pass: PassStatus) => {
-    const isRedeemed = !pass.isAvailable
+    const isRedeemed = !pass.isAvailable;
 
     if (isRedeemed) {
       // Grayed out redeemed ticket with slashes
@@ -179,7 +159,7 @@ export function Passes({ onDone }: Props): React.ReactNode {
           <Text dimColor>{` ) CC ${TEARDROP_ASTERISK} ┊╱`}</Text>
           <Text dimColor>{'└───────╱'}</Text>
         </Box>
-      )
+      );
     }
 
     return (
@@ -192,8 +172,8 @@ export function Passes({ onDone }: Props): React.ReactNode {
         </Text>
         <Text>{'└──────────┘'}</Text>
       </Box>
-    )
-  }
+    );
+  };
 
   return (
     <Pane>
@@ -229,14 +209,10 @@ export function Passes({ onDone }: Props): React.ReactNode {
 
         <Box>
           <Text dimColor italic>
-            {exitState.pending ? (
-              <>Press {exitState.keyName} again to exit</>
-            ) : (
-              <>Enter to copy link · Esc to cancel</>
-            )}
+            {exitState.pending ? <>Press {exitState.keyName} again to exit</> : <>Enter to copy link · Esc to cancel</>}
           </Text>
         </Box>
       </Box>
     </Pane>
-  )
+  );
 }
diff --git a/src/components/PrBadge.tsx b/src/components/PrBadge.tsx
index e2f7a2a7b..172c4474a 100644
--- a/src/components/PrBadge.tsx
+++ b/src/components/PrBadge.tsx
@@ -1,56 +1,44 @@
-import React from 'react'
-import { Link, Text } from '@anthropic/ink'
-import type { PrReviewState } from '../utils/ghPrStatus.js'
+import React from 'react';
+import { Link, Text } from '@anthropic/ink';
+import type { PrReviewState } from '../utils/ghPrStatus.js';
 
 type Props = {
-  number: number
-  url: string
-  reviewState?: PrReviewState
-  bold?: boolean
-}
+  number: number;
+  url: string;
+  reviewState?: PrReviewState;
+  bold?: boolean;
+};
 
-export function PrBadge({
-  number,
-  url,
-  reviewState,
-  bold,
-}: Props): React.ReactNode {
-  const statusColor = getPrStatusColor(reviewState)
+export function PrBadge({ number, url, reviewState, bold }: Props): React.ReactNode {
+  const statusColor = getPrStatusColor(reviewState);
   const label = (
     <Text color={statusColor} dimColor={!statusColor && !bold} bold={bold}>
       #{number}
     </Text>
-  )
+  );
   return (
     <Text>
       <Text dimColor={!bold}>PR</Text>{' '}
       <Link url={url} fallback={label}>
-        <Text
-          color={statusColor}
-          dimColor={!statusColor && !bold}
-          underline
-          bold={bold}
-        >
+        <Text color={statusColor} dimColor={!statusColor && !bold} underline bold={bold}>
           #{number}
         </Text>
       </Link>
     </Text>
-  )
+  );
 }
 
-function getPrStatusColor(
-  state?: PrReviewState,
-): 'success' | 'error' | 'warning' | 'merged' | undefined {
+function getPrStatusColor(state?: PrReviewState): 'success' | 'error' | 'warning' | 'merged' | undefined {
   switch (state) {
     case 'approved':
-      return 'success'
+      return 'success';
     case 'changes_requested':
-      return 'error'
+      return 'error';
     case 'pending':
-      return 'warning'
+      return 'warning';
     case 'merged':
-      return 'merged'
+      return 'merged';
     default:
-      return undefined
+      return undefined;
   }
 }
diff --git a/src/components/PressEnterToContinue.tsx b/src/components/PressEnterToContinue.tsx
index 49b398b12..20eb2fea6 100644
--- a/src/components/PressEnterToContinue.tsx
+++ b/src/components/PressEnterToContinue.tsx
@@ -1,10 +1,10 @@
-import * as React from 'react'
-import { Text } from '@anthropic/ink'
+import * as React from 'react';
+import { Text } from '@anthropic/ink';
 
 export function PressEnterToContinue(): React.ReactNode {
   return (
     <Text color="permission">
       Press <Text bold>Enter</Text> to continue…
     </Text>
-  )
+  );
 }
diff --git a/src/components/PromptInput/HistorySearchInput.tsx b/src/components/PromptInput/HistorySearchInput.tsx
index b8eaf8714..820417183 100644
--- a/src/components/PromptInput/HistorySearchInput.tsx
+++ b/src/components/PromptInput/HistorySearchInput.tsx
@@ -1,23 +1,17 @@
-import * as React from 'react'
-import { Box, Text, stringWidth } from '@anthropic/ink'
-import TextInput from '../TextInput.js'
+import * as React from 'react';
+import { Box, Text, stringWidth } from '@anthropic/ink';
+import TextInput from '../TextInput.js';
 
 type Props = {
-  value: string
-  onChange: (value: string) => void
-  historyFailedMatch: boolean
-}
+  value: string;
+  onChange: (value: string) => void;
+  historyFailedMatch: boolean;
+};
 
-function HistorySearchInput({
-  value,
-  onChange,
-  historyFailedMatch,
-}: Props): React.ReactNode {
+function HistorySearchInput({ value, onChange, historyFailedMatch }: Props): React.ReactNode {
   return (
     <Box gap={1}>
-      <Text dimColor>
-        {historyFailedMatch ? 'no matching prompt:' : 'search prompts:'}
-      </Text>
+      <Text dimColor>{historyFailedMatch ? 'no matching prompt:' : 'search prompts:'}</Text>
       <TextInput
         value={value}
         onChange={onChange}
@@ -31,7 +25,7 @@ function HistorySearchInput({
         dimColor={true}
       />
     </Box>
-  )
+  );
 }
 
-export default HistorySearchInput
+export default HistorySearchInput;
diff --git a/src/components/PromptInput/IssueFlagBanner.tsx b/src/components/PromptInput/IssueFlagBanner.tsx
index 39cb491b9..6d957e796 100644
--- a/src/components/PromptInput/IssueFlagBanner.tsx
+++ b/src/components/PromptInput/IssueFlagBanner.tsx
@@ -1,6 +1,6 @@
-import * as React from 'react'
-import { FLAG_ICON } from '../../constants/figures.js'
-import { Box, Text } from '@anthropic/ink'
+import * as React from 'react';
+import { FLAG_ICON } from '../../constants/figures.js';
+import { Box, Text } from '@anthropic/ink';
 
 /**
  * ANT-ONLY: Banner shown in the transcript that prompts users to report
@@ -8,7 +8,7 @@ import { Box, Text } from '@anthropic/ink'
  */
 export function IssueFlagBanner(): React.ReactNode {
   if (process.env.USER_TYPE !== 'ant') {
-    return null
+    return null;
   }
 
   return (
@@ -24,5 +24,5 @@ export function IssueFlagBanner(): React.ReactNode {
         <Text dimColor> /issue to report it</Text>
       </Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/PromptInput/Notifications.tsx b/src/components/PromptInput/Notifications.tsx
index 6ddccb3cc..a2388657d 100644
--- a/src/components/PromptInput/Notifications.tsx
+++ b/src/components/PromptInput/Notifications.tsx
@@ -1,67 +1,59 @@
-import { feature } from 'bun:bundle'
-import * as React from 'react'
-import { type ReactNode, useEffect, useMemo, useState } from 'react'
-import {
-  type Notification,
-  useNotifications,
-} from 'src/context/notifications.js'
-import { logEvent } from 'src/services/analytics/index.js'
-import { useAppState } from 'src/state/AppState.js'
-import { useVoiceState } from '../../context/voice.js'
-import type { VerificationStatus } from '../../hooks/useApiKeyVerification.js'
-import { useIdeConnectionStatus } from '../../hooks/useIdeConnectionStatus.js'
-import type { IDESelection } from '../../hooks/useIdeSelection.js'
-import { useMainLoopModel } from '../../hooks/useMainLoopModel.js'
-import { useVoiceEnabled } from '../../hooks/useVoiceEnabled.js'
-import { Box, Text } from '@anthropic/ink'
-import { useClaudeAiLimits } from '../../services/claudeAiLimitsHook.js'
-import { calculateTokenWarningState } from '../../services/compact/autoCompact.js'
-import type { MCPServerConnection } from '../../services/mcp/types.js'
-import type { Message } from '../../types/message.js'
-import {
-  getApiKeyHelperElapsedMs,
-  getConfiguredApiKeyHelper,
-  getSubscriptionType,
-} from '../../utils/auth.js'
-import type { AutoUpdaterResult } from '../../utils/autoUpdater.js'
-import { getExternalEditor } from '../../utils/editor.js'
-import { isEnvTruthy } from '../../utils/envUtils.js'
-import { formatDuration } from '../../utils/format.js'
-import { setEnvHookNotifier } from '../../utils/hooks/fileChangedWatcher.js'
-import { toIDEDisplayName } from '../../utils/ide.js'
-import { getMessagesAfterCompactBoundary } from '../../utils/messages.js'
-import { tokenCountFromLastAPIResponse } from '../../utils/tokens.js'
-import { AutoUpdaterWrapper } from '../AutoUpdaterWrapper.js'
-import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js'
-import { IdeStatusIndicator } from '../IdeStatusIndicator.js'
-import { MemoryUsageIndicator } from '../MemoryUsageIndicator.js'
-import { SentryErrorBoundary } from '../SentryErrorBoundary.js'
-import { TokenWarning } from '../TokenWarning.js'
-import { SandboxPromptFooterHint } from './SandboxPromptFooterHint.js'
+import { feature } from 'bun:bundle';
+import * as React from 'react';
+import { type ReactNode, useEffect, useMemo, useState } from 'react';
+import { type Notification, useNotifications } from 'src/context/notifications.js';
+import { logEvent } from 'src/services/analytics/index.js';
+import { useAppState } from 'src/state/AppState.js';
+import { useVoiceState } from '../../context/voice.js';
+import type { VerificationStatus } from '../../hooks/useApiKeyVerification.js';
+import { useIdeConnectionStatus } from '../../hooks/useIdeConnectionStatus.js';
+import type { IDESelection } from '../../hooks/useIdeSelection.js';
+import { useMainLoopModel } from '../../hooks/useMainLoopModel.js';
+import { useVoiceEnabled } from '../../hooks/useVoiceEnabled.js';
+import { Box, Text } from '@anthropic/ink';
+import { useClaudeAiLimits } from '../../services/claudeAiLimitsHook.js';
+import { calculateTokenWarningState } from '../../services/compact/autoCompact.js';
+import type { MCPServerConnection } from '../../services/mcp/types.js';
+import type { Message } from '../../types/message.js';
+import { getApiKeyHelperElapsedMs, getConfiguredApiKeyHelper, getSubscriptionType } from '../../utils/auth.js';
+import type { AutoUpdaterResult } from '../../utils/autoUpdater.js';
+import { getExternalEditor } from '../../utils/editor.js';
+import { isEnvTruthy } from '../../utils/envUtils.js';
+import { formatDuration } from '../../utils/format.js';
+import { setEnvHookNotifier } from '../../utils/hooks/fileChangedWatcher.js';
+import { toIDEDisplayName } from '../../utils/ide.js';
+import { getMessagesAfterCompactBoundary } from '../../utils/messages.js';
+import { tokenCountFromLastAPIResponse } from '../../utils/tokens.js';
+import { AutoUpdaterWrapper } from '../AutoUpdaterWrapper.js';
+import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js';
+import { IdeStatusIndicator } from '../IdeStatusIndicator.js';
+import { MemoryUsageIndicator } from '../MemoryUsageIndicator.js';
+import { SentryErrorBoundary } from '../SentryErrorBoundary.js';
+import { TokenWarning } from '../TokenWarning.js';
+import { SandboxPromptFooterHint } from './SandboxPromptFooterHint.js';
 
 /* eslint-disable @typescript-eslint/no-require-imports */
-const VoiceIndicator: typeof import('./VoiceIndicator.js').VoiceIndicator =
-  feature('VOICE_MODE')
-    ? require('./VoiceIndicator.js').VoiceIndicator
-    : () => null
+const VoiceIndicator: typeof import('./VoiceIndicator.js').VoiceIndicator = feature('VOICE_MODE')
+  ? require('./VoiceIndicator.js').VoiceIndicator
+  : () => null;
 /* eslint-enable @typescript-eslint/no-require-imports */
 
-export const FOOTER_TEMPORARY_STATUS_TIMEOUT = 5000
+export const FOOTER_TEMPORARY_STATUS_TIMEOUT = 5000;
 
 type Props = {
-  apiKeyStatus: VerificationStatus
-  autoUpdaterResult: AutoUpdaterResult | null
-  isAutoUpdating: boolean
-  debug: boolean
-  verbose: boolean
-  messages: Message[]
-  onAutoUpdaterResult: (result: AutoUpdaterResult) => void
-  onChangeIsUpdating: (isUpdating: boolean) => void
-  ideSelection: IDESelection | undefined
-  mcpClients?: MCPServerConnection[]
-  isInputWrapped?: boolean
-  isNarrow?: boolean
-}
+  apiKeyStatus: VerificationStatus;
+  autoUpdaterResult: AutoUpdaterResult | null;
+  isAutoUpdating: boolean;
+  debug: boolean;
+  verbose: boolean;
+  messages: Message[];
+  onAutoUpdaterResult: (result: AutoUpdaterResult) => void;
+  onChangeIsUpdating: (isUpdating: boolean) => void;
+  ideSelection: IDESelection | undefined;
+  mcpClients?: MCPServerConnection[];
+  isInputWrapped?: boolean;
+  isNarrow?: boolean;
+};
 
 export function Notifications({
   apiKeyStatus,
@@ -78,22 +70,19 @@ export function Notifications({
   isNarrow = false,
 }: Props): ReactNode {
   const tokenUsage = useMemo(() => {
-    const messagesForTokenCount = getMessagesAfterCompactBoundary(messages)
-    return tokenCountFromLastAPIResponse(messagesForTokenCount)
-  }, [messages])
+    const messagesForTokenCount = getMessagesAfterCompactBoundary(messages);
+    return tokenCountFromLastAPIResponse(messagesForTokenCount);
+  }, [messages]);
 
   // AppState-sourced model — same source as API requests. getMainLoopModel()
   // re-reads settings.json on every call, so another session's /model write
   // would leak into this session's display (anthropics/claude-code#37596).
-  const mainLoopModel = useMainLoopModel()
-  const isShowingCompactMessage = calculateTokenWarningState(
-    tokenUsage,
-    mainLoopModel,
-  ).isAboveWarningThreshold
-  const { status: ideStatus } = useIdeConnectionStatus(mcpClients)
-  const notifications = useAppState(s => s.notifications)
-  const { addNotification, removeNotification } = useNotifications()
-  const claudeAiLimits = useClaudeAiLimits()
+  const mainLoopModel = useMainLoopModel();
+  const isShowingCompactMessage = calculateTokenWarningState(tokenUsage, mainLoopModel).isAboveWarningThreshold;
+  const { status: ideStatus } = useIdeConnectionStatus(mcpClients);
+  const notifications = useAppState(s => s.notifications);
+  const { addNotification, removeNotification } = useNotifications();
+  const claudeAiLimits = useClaudeAiLimits();
 
   // Register env hook notifier for CwdChanged/FileChanged feedback
   useEffect(() => {
@@ -104,42 +93,36 @@ export function Notifications({
         color: isError ? 'error' : undefined,
         priority: isError ? 'medium' : 'low',
         timeoutMs: isError ? 8000 : 5000,
-      })
-    })
-    return () => setEnvHookNotifier(null)
-  }, [addNotification])
+      });
+    });
+    return () => setEnvHookNotifier(null);
+  }, [addNotification]);
 
   // Check if we should show the IDE selection indicator
   const shouldShowIdeSelection =
-    ideStatus === 'connected' &&
-    (ideSelection?.filePath ||
-      (ideSelection?.text && ideSelection.lineCount > 0))
+    ideStatus === 'connected' && (ideSelection?.filePath || (ideSelection?.text && ideSelection.lineCount > 0));
 
   // Hide update installed message when showing IDE selection
-  const shouldShowAutoUpdater =
-    !shouldShowIdeSelection ||
-    isAutoUpdating ||
-    autoUpdaterResult?.status !== 'success'
+  const shouldShowAutoUpdater = !shouldShowIdeSelection || isAutoUpdating || autoUpdaterResult?.status !== 'success';
 
   // Check if we're in overage mode for UI indicators
-  const isInOverageMode = claudeAiLimits.isUsingOverage
-  const subscriptionType = getSubscriptionType()
-  const isTeamOrEnterprise =
-    subscriptionType === 'team' || subscriptionType === 'enterprise'
+  const isInOverageMode = claudeAiLimits.isUsingOverage;
+  const subscriptionType = getSubscriptionType();
+  const isTeamOrEnterprise = subscriptionType === 'team' || subscriptionType === 'enterprise';
 
   // Check if the external editor hint should be shown
-  const editor = getExternalEditor()
+  const editor = getExternalEditor();
   const shouldShowExternalEditorHint =
     isInputWrapped &&
     !isShowingCompactMessage &&
     apiKeyStatus !== 'invalid' &&
     apiKeyStatus !== 'missing' &&
-    editor !== undefined
+    editor !== undefined;
 
   // Show external editor hint as notification when input is wrapped
   useEffect(() => {
     if (shouldShowExternalEditorHint && editor) {
-      logEvent('tengu_external_editor_hint_shown', {})
+      logEvent('tengu_external_editor_hint_shown', {});
       addNotification({
         key: 'external-editor-hint',
         jsx: (
@@ -154,25 +137,15 @@ export function Notifications({
         ),
         priority: 'immediate',
         timeoutMs: 5000,
-      })
+      });
     } else {
-      removeNotification('external-editor-hint')
+      removeNotification('external-editor-hint');
     }
-  }, [
-    shouldShowExternalEditorHint,
-    editor,
-    addNotification,
-    removeNotification,
-  ])
+  }, [shouldShowExternalEditorHint, editor, addNotification, removeNotification]);
 
   return (
     <SentryErrorBoundary>
-      <Box
-        flexDirection="column"
-        alignItems={isNarrow ? 'flex-start' : 'flex-end'}
-        flexShrink={0}
-        overflowX="hidden"
-      >
+      <Box flexDirection="column" alignItems={isNarrow ? 'flex-start' : 'flex-end'} flexShrink={0} overflowX="hidden">
         <NotificationContent
           ideSelection={ideSelection}
           mcpClients={mcpClients}
@@ -193,7 +166,7 @@ export function Notifications({
         />
       </Box>
     </SentryErrorBoundary>
-  )
+  );
 }
 
 function NotificationContent({
@@ -214,69 +187,61 @@ function NotificationContent({
   onAutoUpdaterResult,
   onChangeIsUpdating,
 }: {
-  ideSelection: IDESelection | undefined
-  mcpClients?: MCPServerConnection[]
+  ideSelection: IDESelection | undefined;
+  mcpClients?: MCPServerConnection[];
   notifications: {
-    current: Notification | null
-    queue: Notification[]
-  }
-  isInOverageMode: boolean
-  isTeamOrEnterprise: boolean
-  apiKeyStatus: VerificationStatus
-  debug: boolean
-  verbose: boolean
-  tokenUsage: number
-  mainLoopModel: string
-  shouldShowAutoUpdater: boolean
-  autoUpdaterResult: AutoUpdaterResult | null
-  isAutoUpdating: boolean
-  isShowingCompactMessage: boolean
-  onAutoUpdaterResult: (result: AutoUpdaterResult) => void
-  onChangeIsUpdating: (isUpdating: boolean) => void
+    current: Notification | null;
+    queue: Notification[];
+  };
+  isInOverageMode: boolean;
+  isTeamOrEnterprise: boolean;
+  apiKeyStatus: VerificationStatus;
+  debug: boolean;
+  verbose: boolean;
+  tokenUsage: number;
+  mainLoopModel: string;
+  shouldShowAutoUpdater: boolean;
+  autoUpdaterResult: AutoUpdaterResult | null;
+  isAutoUpdating: boolean;
+  isShowingCompactMessage: boolean;
+  onAutoUpdaterResult: (result: AutoUpdaterResult) => void;
+  onChangeIsUpdating: (isUpdating: boolean) => void;
 }): ReactNode {
   // Poll apiKeyHelper inflight state to show slow-helper notice.
   // Gated on configuration — most users never set apiKeyHelper, so the
   // effect is a no-op for them (no interval allocated).
-  const [apiKeyHelperSlow, setApiKeyHelperSlow] = useState<string | null>(null)
+  const [apiKeyHelperSlow, setApiKeyHelperSlow] = useState<string | null>(null);
   useEffect(() => {
-    if (!getConfiguredApiKeyHelper()) return
+    if (!getConfiguredApiKeyHelper()) return;
     const interval = setInterval(
       (setSlow: React.Dispatch<React.SetStateAction<string | null>>) => {
-        const ms = getApiKeyHelperElapsedMs()
-        const next = ms >= 10_000 ? formatDuration(ms) : null
-        setSlow(prev => (next === prev ? prev : next))
+        const ms = getApiKeyHelperElapsedMs();
+        const next = ms >= 10_000 ? formatDuration(ms) : null;
+        setSlow(prev => (next === prev ? prev : next));
       },
       1000,
       setApiKeyHelperSlow,
-    )
-    return () => clearInterval(interval)
-  }, [])
+    );
+    return () => clearInterval(interval);
+  }, []);
 
   // Voice state (VOICE_MODE builds only, runtime-gated by GrowthBook)
   const voiceState = feature('VOICE_MODE')
-    ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-      useVoiceState(s => s.voiceState)
-    : ('idle' as const)
-  // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-  const voiceEnabled = feature('VOICE_MODE') ? useVoiceEnabled() : false
+    ? useVoiceState(s => s.voiceState)
+    : ('idle' as const);
+  const voiceEnabled = feature('VOICE_MODE') ? useVoiceEnabled() : false;
   const voiceError = feature('VOICE_MODE')
-    ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-      useVoiceState(s => s.voiceError)
-    : null
+    ? useVoiceState(s => s.voiceError)
+    : null;
   const isBriefOnly =
     feature('KAIROS') || feature('KAIROS_BRIEF')
-      ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-        useAppState(s => s.isBriefOnly)
-      : false
+      ? useAppState(s => s.isBriefOnly)
+      : false;
 
   // When voice is actively recording or processing, replace all
   // notifications with just the voice indicator.
-  if (
-    feature('VOICE_MODE') &&
-    voiceEnabled &&
-    (voiceState === 'recording' || voiceState === 'processing')
-  ) {
-    return <VoiceIndicator voiceState={voiceState} />
+  if (feature('VOICE_MODE') && voiceEnabled && (voiceState === 'recording' || voiceState === 'processing')) {
+    return <VoiceIndicator voiceState={voiceState} />;
   }
 
   return (
@@ -288,11 +253,7 @@ function NotificationContent({
             {notifications.current.jsx}
           </Text>
         ) : (
-          <Text
-            color={notifications.current.color}
-            dimColor={!notifications.current.color}
-            wrap="truncate"
-          >
+          <Text color={notifications.current.color} dimColor={!notifications.current.color} wrap="truncate">
             {notifications.current.text}
           </Text>
         ))}
@@ -336,9 +297,7 @@ function NotificationContent({
           </Text>
         </Box>
       )}
-      {!isBriefOnly && (
-        <TokenWarning tokenUsage={tokenUsage} model={mainLoopModel} />
-      )}
+      {!isBriefOnly && <TokenWarning tokenUsage={tokenUsage} model={mainLoopModel} />}
       {feature('VOICE_MODE')
         ? voiceEnabled &&
           voiceError && (
@@ -352,5 +311,5 @@ function NotificationContent({
       <MemoryUsageIndicator />
       <SandboxPromptFooterHint />
     </>
-  )
+  );
 }
diff --git a/src/components/PromptInput/PromptInput.tsx b/src/components/PromptInput/PromptInput.tsx
index 3d43a1fae..1bceeedd7 100644
--- a/src/components/PromptInput/PromptInput.tsx
+++ b/src/components/PromptInput/PromptInput.tsx
@@ -1,314 +1,228 @@
-import { feature } from 'bun:bundle'
-import chalk from 'chalk'
-import * as path from 'path'
-import * as React from 'react'
-import {
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-  useSyncExternalStore,
-} from 'react'
-import { useNotifications } from 'src/context/notifications.js'
-import { useCommandQueue } from 'src/hooks/useCommandQueue.js'
-import {
-  type IDEAtMentioned,
-  useIdeAtMentioned,
-} from 'src/hooks/useIdeAtMentioned.js'
+import { feature } from 'bun:bundle';
+import chalk from 'chalk';
+import * as path from 'path';
+import * as React from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState, useSyncExternalStore } from 'react';
+import { useNotifications } from 'src/context/notifications.js';
+import { useCommandQueue } from 'src/hooks/useCommandQueue.js';
+import { type IDEAtMentioned, useIdeAtMentioned } from 'src/hooks/useIdeAtMentioned.js';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from 'src/services/analytics/index.js'
-import {
-  type AppState,
-  useAppState,
-  useAppStateStore,
-  useSetAppState,
-} from 'src/state/AppState.js'
-import type { FooterItem } from 'src/state/AppStateStore.js'
-import { getCwd } from 'src/utils/cwd.js'
-import {
-  isQueuedCommandEditable,
-  popAllEditable,
-} from 'src/utils/messageQueueManager.js'
-import stripAnsi from 'strip-ansi'
-import { companionReservedColumns } from '../../buddy/CompanionSprite.js'
-import {
-  findBuddyTriggerPositions,
-  useBuddyNotification,
-} from '../../buddy/useBuddyNotification.js'
-import { FastModePicker } from '../../commands/fast/fast.js'
-import { isUltrareviewEnabled } from '../../commands/review/ultrareviewEnabled.js'
-import { getNativeCSIuTerminalDisplayName } from '../../commands/terminalSetup/terminalSetup.js'
-import { type Command, hasCommand } from '../../commands.js'
-import { useIsModalOverlayActive } from '../../context/overlayContext.js'
-import { useSetPromptOverlayDialog } from '../../context/promptOverlayContext.js'
-import {
-  formatImageRef,
-  formatPastedTextRef,
-  getPastedTextRefNumLines,
-  parseReferences,
-} from '../../history.js'
-import type { VerificationStatus } from '../../hooks/useApiKeyVerification.js'
-import {
-  type HistoryMode,
-  useArrowKeyHistory,
-} from '../../hooks/useArrowKeyHistory.js'
-import { useDoublePress } from '../../hooks/useDoublePress.js'
-import { useHistorySearch } from '../../hooks/useHistorySearch.js'
-import type { IDESelection } from '../../hooks/useIdeSelection.js'
-import { useInputBuffer } from '../../hooks/useInputBuffer.js'
-import { useMainLoopModel } from '../../hooks/useMainLoopModel.js'
-import { usePromptSuggestion } from '../../hooks/usePromptSuggestion.js'
-import { useTerminalSize } from '../../hooks/useTerminalSize.js'
-import { useTypeahead } from '../../hooks/useTypeahead.js'
-import { Box, type BorderTextOptions, type ClickEvent, type Key, stringWidth, Text, useInput } from '@anthropic/ink'
-import { useOptionalKeybindingContext } from '../../keybindings/KeybindingContext.js'
-import { getShortcutDisplay } from '../../keybindings/shortcutFormat.js'
-import {
-  useKeybinding,
-  useKeybindings,
-} from '../../keybindings/useKeybinding.js'
-import type { MCPServerConnection } from '../../services/mcp/types.js'
-import {
-  abortPromptSuggestion,
-  logSuggestionSuppressed,
-} from '../../services/PromptSuggestion/promptSuggestion.js'
-import {
-  type ActiveSpeculationState,
-  abortSpeculation,
-} from '../../services/PromptSuggestion/speculation.js'
-import {
-  getActiveAgentForInput,
-  getViewedTeammateTask,
-} from '../../state/selectors.js'
-import {
-  enterTeammateView,
-  exitTeammateView,
-  stopOrDismissAgent,
-} from '../../state/teammateViewHelpers.js'
-import type { ToolPermissionContext } from '../../Tool.js'
-import { getRunningTeammatesSorted } from '../../tasks/InProcessTeammateTask/InProcessTeammateTask.js'
-import type { InProcessTeammateTaskState } from '../../tasks/InProcessTeammateTask/types.js'
-import {
-  isPanelAgentTask,
-  type LocalAgentTaskState,
-} from '../../tasks/LocalAgentTask/LocalAgentTask.js'
-import { isBackgroundTask } from '../../tasks/types.js'
+} from 'src/services/analytics/index.js';
+import { type AppState, useAppState, useAppStateStore, useSetAppState } from 'src/state/AppState.js';
+import type { FooterItem } from 'src/state/AppStateStore.js';
+import { getCwd } from 'src/utils/cwd.js';
+import { isQueuedCommandEditable, popAllEditable } from 'src/utils/messageQueueManager.js';
+import stripAnsi from 'strip-ansi';
+import { companionReservedColumns } from '../../buddy/CompanionSprite.js';
+import { findBuddyTriggerPositions, useBuddyNotification } from '../../buddy/useBuddyNotification.js';
+import { FastModePicker } from '../../commands/fast/fast.js';
+import { isUltrareviewEnabled } from '../../commands/review/ultrareviewEnabled.js';
+import { getNativeCSIuTerminalDisplayName } from '../../commands/terminalSetup/terminalSetup.js';
+import { type Command, hasCommand } from '../../commands.js';
+import { useIsModalOverlayActive } from '../../context/overlayContext.js';
+import { useSetPromptOverlayDialog } from '../../context/promptOverlayContext.js';
+import { formatImageRef, formatPastedTextRef, getPastedTextRefNumLines, parseReferences } from '../../history.js';
+import type { VerificationStatus } from '../../hooks/useApiKeyVerification.js';
+import { type HistoryMode, useArrowKeyHistory } from '../../hooks/useArrowKeyHistory.js';
+import { useDoublePress } from '../../hooks/useDoublePress.js';
+import { useHistorySearch } from '../../hooks/useHistorySearch.js';
+import type { IDESelection } from '../../hooks/useIdeSelection.js';
+import { useInputBuffer } from '../../hooks/useInputBuffer.js';
+import { useMainLoopModel } from '../../hooks/useMainLoopModel.js';
+import { usePromptSuggestion } from '../../hooks/usePromptSuggestion.js';
+import { useTerminalSize } from '../../hooks/useTerminalSize.js';
+import { useTypeahead } from '../../hooks/useTypeahead.js';
+import { Box, type BorderTextOptions, type ClickEvent, type Key, stringWidth, Text, useInput } from '@anthropic/ink';
+import { useOptionalKeybindingContext } from '../../keybindings/KeybindingContext.js';
+import { getShortcutDisplay } from '../../keybindings/shortcutFormat.js';
+import { useKeybinding, useKeybindings } from '../../keybindings/useKeybinding.js';
+import type { MCPServerConnection } from '../../services/mcp/types.js';
+import { abortPromptSuggestion, logSuggestionSuppressed } from '../../services/PromptSuggestion/promptSuggestion.js';
+import { type ActiveSpeculationState, abortSpeculation } from '../../services/PromptSuggestion/speculation.js';
+import { getActiveAgentForInput, getViewedTeammateTask } from '../../state/selectors.js';
+import { enterTeammateView, exitTeammateView, stopOrDismissAgent } from '../../state/teammateViewHelpers.js';
+import type { ToolPermissionContext } from '../../Tool.js';
+import { getRunningTeammatesSorted } from '../../tasks/InProcessTeammateTask/InProcessTeammateTask.js';
+import type { InProcessTeammateTaskState } from '../../tasks/InProcessTeammateTask/types.js';
+import { isPanelAgentTask, type LocalAgentTaskState } from '../../tasks/LocalAgentTask/LocalAgentTask.js';
+import { isBackgroundTask } from '../../tasks/types.js';
 import {
   AGENT_COLOR_TO_THEME_COLOR,
   AGENT_COLORS,
   type AgentColorName,
-} from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js'
-import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
-import type { Message } from '../../types/message.js'
-import type { PermissionMode } from '../../types/permissions.js'
-import type {
-  BaseTextInputProps,
-  PromptInputMode,
-  VimMode,
-} from '../../types/textInputTypes.js'
-import { isAgentSwarmsEnabled } from '../../utils/agentSwarmsEnabled.js'
-import { count } from '../../utils/array.js'
-import type { AutoUpdaterResult } from '../../utils/autoUpdater.js'
-import { Cursor } from '../../utils/Cursor.js'
-import {
-  getGlobalConfig,
-  type PastedContent,
-  saveGlobalConfig,
-} from '../../utils/config.js'
-import { logForDebugging } from '../../utils/debug.js'
-import {
-  parseDirectMemberMessage,
-  sendDirectMemberMessage,
-} from '../../utils/directMemberMessage.js'
-import type { EffortLevel } from '../../utils/effort.js'
-import { env } from '../../utils/env.js'
-import { errorMessage } from '../../utils/errors.js'
-import { isBilledAsExtraUsage } from '../../utils/extraUsage.js'
+} from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js';
+import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js';
+import type { Message } from '../../types/message.js';
+import type { PermissionMode } from '../../types/permissions.js';
+import type { BaseTextInputProps, PromptInputMode, VimMode } from '../../types/textInputTypes.js';
+import { isAgentSwarmsEnabled } from '../../utils/agentSwarmsEnabled.js';
+import { count } from '../../utils/array.js';
+import type { AutoUpdaterResult } from '../../utils/autoUpdater.js';
+import { Cursor } from '../../utils/Cursor.js';
+import { getGlobalConfig, type PastedContent, saveGlobalConfig } from '../../utils/config.js';
+import { logForDebugging } from '../../utils/debug.js';
+import { parseDirectMemberMessage, sendDirectMemberMessage } from '../../utils/directMemberMessage.js';
+import type { EffortLevel } from '../../utils/effort.js';
+import { env } from '../../utils/env.js';
+import { errorMessage } from '../../utils/errors.js';
+import { isBilledAsExtraUsage } from '../../utils/extraUsage.js';
 import {
   getFastModeUnavailableReason,
   isFastModeAvailable,
   isFastModeCooldown,
   isFastModeEnabled,
   isFastModeSupportedByModel,
-} from '../../utils/fastMode.js'
-import { isFullscreenEnvEnabled } from '../../utils/fullscreen.js'
-import type { PromptInputHelpers } from '../../utils/handlePromptSubmit.js'
-import {
-  getImageFromClipboard,
-  PASTE_THRESHOLD,
-} from '../../utils/imagePaste.js'
-import type { ImageDimensions } from '../../utils/imageResizer.js'
-import { cacheImagePath, storeImage } from '../../utils/imageStore.js'
-import {
-  isMacosOptionChar,
-  MACOS_OPTION_SPECIAL_CHARS,
-} from '../../utils/keyboardShortcuts.js'
-import { logError } from '../../utils/log.js'
-import {
-  isOpus1mMergeEnabled,
-  modelDisplayString,
-} from '../../utils/model/model.js'
-import { setAutoModeActive } from '../../utils/permissions/autoModeState.js'
-import {
-  cyclePermissionMode,
-  getNextPermissionMode,
-} from '../../utils/permissions/getNextPermissionMode.js'
-import { transitionPermissionMode } from '../../utils/permissions/permissionSetup.js'
-import { getPlatform } from '../../utils/platform.js'
-import type { ProcessUserInputContext } from '../../utils/processUserInput/processUserInput.js'
-import { editPromptInEditor } from '../../utils/promptEditor.js'
-import { hasAutoModeOptIn } from '../../utils/settings/settings.js'
-import { findBtwTriggerPositions } from '../../utils/sideQuestion.js'
-import { findSlashCommandPositions } from '../../utils/suggestions/commandSuggestions.js'
+} from '../../utils/fastMode.js';
+import { isFullscreenEnvEnabled } from '../../utils/fullscreen.js';
+import type { PromptInputHelpers } from '../../utils/handlePromptSubmit.js';
+import { getImageFromClipboard, PASTE_THRESHOLD } from '../../utils/imagePaste.js';
+import type { ImageDimensions } from '../../utils/imageResizer.js';
+import { cacheImagePath, storeImage } from '../../utils/imageStore.js';
+import { isMacosOptionChar, MACOS_OPTION_SPECIAL_CHARS } from '../../utils/keyboardShortcuts.js';
+import { logError } from '../../utils/log.js';
+import { isOpus1mMergeEnabled, modelDisplayString } from '../../utils/model/model.js';
+import { setAutoModeActive } from '../../utils/permissions/autoModeState.js';
+import { cyclePermissionMode, getNextPermissionMode } from '../../utils/permissions/getNextPermissionMode.js';
+import { transitionPermissionMode } from '../../utils/permissions/permissionSetup.js';
+import { getPlatform } from '../../utils/platform.js';
+import type { ProcessUserInputContext } from '../../utils/processUserInput/processUserInput.js';
+import { editPromptInEditor } from '../../utils/promptEditor.js';
+import { hasAutoModeOptIn } from '../../utils/settings/settings.js';
+import { findBtwTriggerPositions } from '../../utils/sideQuestion.js';
+import { findSlashCommandPositions } from '../../utils/suggestions/commandSuggestions.js';
 import {
   findSlackChannelPositions,
   getKnownChannelsVersion,
   hasSlackMcpServer,
   subscribeKnownChannels,
-} from '../../utils/suggestions/slackChannelSuggestions.js'
-import { isInProcessEnabled } from '../../utils/swarm/backends/registry.js'
-import { syncTeammateMode } from '../../utils/swarm/teamHelpers.js'
-import type { TeamSummary } from '../../utils/teamDiscovery.js'
-import { getTeammateColor } from '../../utils/teammate.js'
-import { isInProcessTeammate } from '../../utils/teammateContext.js'
-import { writeToMailbox } from '../../utils/teammateMailbox.js'
-import type { TextHighlight } from '../../utils/textHighlighting.js'
-import type { Theme } from '../../utils/theme.js'
-import {
-  findThinkingTriggerPositions,
-  getRainbowColor,
-  isUltrathinkEnabled,
-} from '../../utils/thinking.js'
-import { findTokenBudgetPositions } from '../../utils/tokenBudget.js'
-import {
-  findUltraplanTriggerPositions,
-  findUltrareviewTriggerPositions,
-} from '../../utils/ultraplan/keyword.js'
-import { AutoModeOptInDialog } from '../AutoModeOptInDialog.js'
-import { BridgeDialog } from '../BridgeDialog.js'
-import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js'
-import {
-  getVisibleAgentTasks,
-  useCoordinatorTaskCount,
-} from '../CoordinatorAgentStatus.js'
-import { getEffortNotificationText } from '../EffortIndicator.js'
-import { getFastIconString } from '../FastIcon.js'
-import { GlobalSearchDialog } from '../GlobalSearchDialog.js'
-import { HistorySearchDialog } from '../HistorySearchDialog.js'
-import { ModelPicker } from '../ModelPicker.js'
-import { QuickOpenDialog } from '../QuickOpenDialog.js'
-import TextInput from '../TextInput.js'
-import { ThinkingToggle } from '../ThinkingToggle.js'
-import { BackgroundTasksDialog } from '../tasks/BackgroundTasksDialog.js'
-import { shouldHideTasksFooter } from '../tasks/taskStatusUtils.js'
-import { TeamsDialog } from '../teams/TeamsDialog.js'
-import VimTextInput from '../VimTextInput.js'
-import { getModeFromInput, getValueFromInput } from './inputModes.js'
-import {
-  FOOTER_TEMPORARY_STATUS_TIMEOUT,
-  Notifications,
-} from './Notifications.js'
-import PromptInputFooter from './PromptInputFooter.js'
-import type { SuggestionItem } from './PromptInputFooterSuggestions.js'
-import { PromptInputModeIndicator } from './PromptInputModeIndicator.js'
-import { PromptInputQueuedCommands } from './PromptInputQueuedCommands.js'
-import { PromptInputStashNotice } from './PromptInputStashNotice.js'
-import { useMaybeTruncateInput } from './useMaybeTruncateInput.js'
-import { usePromptInputPlaceholder } from './usePromptInputPlaceholder.js'
-import { useShowFastIconHint } from './useShowFastIconHint.js'
-import { useSwarmBanner } from './useSwarmBanner.js'
-import { isNonSpacePrintable, isVimModeEnabled } from './utils.js'
+} from '../../utils/suggestions/slackChannelSuggestions.js';
+import { isInProcessEnabled } from '../../utils/swarm/backends/registry.js';
+import { syncTeammateMode } from '../../utils/swarm/teamHelpers.js';
+import type { TeamSummary } from '../../utils/teamDiscovery.js';
+import { getTeammateColor } from '../../utils/teammate.js';
+import { isInProcessTeammate } from '../../utils/teammateContext.js';
+import { writeToMailbox } from '../../utils/teammateMailbox.js';
+import type { TextHighlight } from '../../utils/textHighlighting.js';
+import type { Theme } from '../../utils/theme.js';
+import { findThinkingTriggerPositions, getRainbowColor, isUltrathinkEnabled } from '../../utils/thinking.js';
+import { findTokenBudgetPositions } from '../../utils/tokenBudget.js';
+import { findUltraplanTriggerPositions, findUltrareviewTriggerPositions } from '../../utils/ultraplan/keyword.js';
+import { AutoModeOptInDialog } from '../AutoModeOptInDialog.js';
+import { BridgeDialog } from '../BridgeDialog.js';
+import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js';
+import { getVisibleAgentTasks, useCoordinatorTaskCount } from '../CoordinatorAgentStatus.js';
+import { getEffortNotificationText } from '../EffortIndicator.js';
+import { getFastIconString } from '../FastIcon.js';
+import { GlobalSearchDialog } from '../GlobalSearchDialog.js';
+import { HistorySearchDialog } from '../HistorySearchDialog.js';
+import { ModelPicker } from '../ModelPicker.js';
+import { QuickOpenDialog } from '../QuickOpenDialog.js';
+import TextInput from '../TextInput.js';
+import { ThinkingToggle } from '../ThinkingToggle.js';
+import { BackgroundTasksDialog } from '../tasks/BackgroundTasksDialog.js';
+import { shouldHideTasksFooter } from '../tasks/taskStatusUtils.js';
+import { TeamsDialog } from '../teams/TeamsDialog.js';
+import VimTextInput from '../VimTextInput.js';
+import { getModeFromInput, getValueFromInput } from './inputModes.js';
+import { FOOTER_TEMPORARY_STATUS_TIMEOUT, Notifications } from './Notifications.js';
+import PromptInputFooter from './PromptInputFooter.js';
+import type { SuggestionItem } from './PromptInputFooterSuggestions.js';
+import { PromptInputModeIndicator } from './PromptInputModeIndicator.js';
+import { PromptInputQueuedCommands } from './PromptInputQueuedCommands.js';
+import { PromptInputStashNotice } from './PromptInputStashNotice.js';
+import { useMaybeTruncateInput } from './useMaybeTruncateInput.js';
+import { usePromptInputPlaceholder } from './usePromptInputPlaceholder.js';
+import { useShowFastIconHint } from './useShowFastIconHint.js';
+import { useSwarmBanner } from './useSwarmBanner.js';
+import { isNonSpacePrintable, isVimModeEnabled } from './utils.js';
 
 type Props = {
-  debug: boolean
-  ideSelection: IDESelection | undefined
-  toolPermissionContext: ToolPermissionContext
-  setToolPermissionContext: (ctx: ToolPermissionContext) => void
-  apiKeyStatus: VerificationStatus
-  commands: Command[]
-  agents: AgentDefinition[]
-  isLoading: boolean
-  verbose: boolean
-  messages: Message[]
-  onAutoUpdaterResult: (result: AutoUpdaterResult) => void
-  autoUpdaterResult: AutoUpdaterResult | null
-  input: string
-  onInputChange: (value: string) => void
-  mode: PromptInputMode
-  onModeChange: (mode: PromptInputMode) => void
+  debug: boolean;
+  ideSelection: IDESelection | undefined;
+  toolPermissionContext: ToolPermissionContext;
+  setToolPermissionContext: (ctx: ToolPermissionContext) => void;
+  apiKeyStatus: VerificationStatus;
+  commands: Command[];
+  agents: AgentDefinition[];
+  isLoading: boolean;
+  verbose: boolean;
+  messages: Message[];
+  onAutoUpdaterResult: (result: AutoUpdaterResult) => void;
+  autoUpdaterResult: AutoUpdaterResult | null;
+  input: string;
+  onInputChange: (value: string) => void;
+  mode: PromptInputMode;
+  onModeChange: (mode: PromptInputMode) => void;
   stashedPrompt:
     | {
-        text: string
-        cursorOffset: number
-        pastedContents: Record<number, PastedContent>
+        text: string;
+        cursorOffset: number;
+        pastedContents: Record<number, PastedContent>;
       }
-    | undefined
+    | undefined;
   setStashedPrompt: (
     value:
       | {
-          text: string
-          cursorOffset: number
-          pastedContents: Record<number, PastedContent>
+          text: string;
+          cursorOffset: number;
+          pastedContents: Record<number, PastedContent>;
         }
       | undefined,
-  ) => void
-  submitCount: number
-  onShowMessageSelector: () => void
+  ) => void;
+  submitCount: number;
+  onShowMessageSelector: () => void;
   /** Fullscreen message actions: shift+↑ enters cursor. */
-  onMessageActionsEnter?: () => void
-  mcpClients: MCPServerConnection[]
-  pastedContents: Record<number, PastedContent>
-  setPastedContents: React.Dispatch<
-    React.SetStateAction<Record<number, PastedContent>>
-  >
-  vimMode: VimMode
-  setVimMode: (mode: VimMode) => void
-  showBashesDialog: string | boolean
-  setShowBashesDialog: (show: string | boolean) => void
-  onExit: () => void
+  onMessageActionsEnter?: () => void;
+  mcpClients: MCPServerConnection[];
+  pastedContents: Record<number, PastedContent>;
+  setPastedContents: React.Dispatch<React.SetStateAction<Record<number, PastedContent>>>;
+  vimMode: VimMode;
+  setVimMode: (mode: VimMode) => void;
+  showBashesDialog: string | boolean;
+  setShowBashesDialog: (show: string | boolean) => void;
+  onExit: () => void;
   getToolUseContext: (
     messages: Message[],
     newMessages: Message[],
     abortController: AbortController,
     mainLoopModel: string,
-  ) => ProcessUserInputContext
+  ) => ProcessUserInputContext;
   onSubmit: (
     input: string,
     helpers: PromptInputHelpers,
     speculationAccept?: {
-      state: ActiveSpeculationState
-      speculationSessionTimeSavedMs: number
-      setAppState: (f: (prev: AppState) => AppState) => void
+      state: ActiveSpeculationState;
+      speculationSessionTimeSavedMs: number;
+      setAppState: (f: (prev: AppState) => AppState) => void;
     },
     options?: { fromKeybinding?: boolean },
-  ) => Promise<void>
+  ) => Promise<void>;
   onAgentSubmit?: (
     input: string,
     task: InProcessTeammateTaskState | LocalAgentTaskState,
     helpers: PromptInputHelpers,
-  ) => Promise<void>
-  isSearchingHistory: boolean
-  setIsSearchingHistory: (isSearching: boolean) => void
-  onDismissSideQuestion?: () => void
-  isSideQuestionVisible?: boolean
-  helpOpen: boolean
-  setHelpOpen: React.Dispatch<React.SetStateAction<boolean>>
-  hasSuppressedDialogs?: boolean
-  isLocalJSXCommandActive?: boolean
+  ) => Promise<void>;
+  isSearchingHistory: boolean;
+  setIsSearchingHistory: (isSearching: boolean) => void;
+  onDismissSideQuestion?: () => void;
+  isSideQuestionVisible?: boolean;
+  helpOpen: boolean;
+  setHelpOpen: React.Dispatch<React.SetStateAction<boolean>>;
+  hasSuppressedDialogs?: boolean;
+  isLocalJSXCommandActive?: boolean;
   insertTextRef?: React.MutableRefObject<{
-    insert: (text: string) => void
-    setInputWithCursor: (value: string, cursor: number) => void
-    cursorOffset: number
-  } | null>
-  voiceInterimRange?: { start: number; end: number } | null
-}
+    insert: (text: string) => void;
+    setInputWithCursor: (value: string, cursor: number) => void;
+    cursorOffset: number;
+  } | null>;
+  voiceInterimRange?: { start: number; end: number } | null;
+};
 
 // Bottom slot has maxHeight="50%"; reserve lines for footer, border, status.
-const PROMPT_FOOTER_LINES = 5
-const MIN_INPUT_VIEWPORT_LINES = 3
+const PROMPT_FOOTER_LINES = 5;
+const MIN_INPUT_VIEWPORT_LINES = 3;
 
 function PromptInput({
   debug,
@@ -354,96 +268,82 @@ function PromptInput({
   insertTextRef,
   voiceInterimRange,
 }: Props): React.ReactNode {
-  const mainLoopModel = useMainLoopModel()
+  const mainLoopModel = useMainLoopModel();
   // A local-jsx command (e.g., /mcp while agent is running) renders a full-
   // screen dialog on top of PromptInput via the immediate-command path with
   // shouldHidePromptInput: false. Those dialogs don't register in the overlay
   // system, so treat them as a modal overlay here to stop navigation keys from
   // leaking into TextInput/footer handlers and stacking a second dialog.
-  const isModalOverlayActive =
-    useIsModalOverlayActive() || isLocalJSXCommandActive
-  const [isAutoUpdating, setIsAutoUpdating] = useState(false)
+  const isModalOverlayActive = useIsModalOverlayActive() || isLocalJSXCommandActive;
+  const [isAutoUpdating, setIsAutoUpdating] = useState(false);
   const [exitMessage, setExitMessage] = useState<{
-    show: boolean
-    key?: string
-  }>({ show: false })
-  const [cursorOffset, setCursorOffset] = useState<number>(input.length)
+    show: boolean;
+    key?: string;
+  }>({ show: false });
+  const [cursorOffset, setCursorOffset] = useState<number>(input.length);
   // Track the last input value set via internal handlers so we can detect
   // external input changes (e.g. speech-to-text injection) and move cursor to end.
-  const lastInternalInputRef = React.useRef(input)
+  const lastInternalInputRef = React.useRef(input);
   if (input !== lastInternalInputRef.current) {
     // Input changed externally (not through any internal handler) — move cursor to end
-    setCursorOffset(input.length)
-    lastInternalInputRef.current = input
+    setCursorOffset(input.length);
+    lastInternalInputRef.current = input;
   }
   // Wrap onInputChange to track internal changes before they trigger re-render
   const trackAndSetInput = React.useCallback(
     (value: string) => {
-      lastInternalInputRef.current = value
-      onInputChange(value)
+      lastInternalInputRef.current = value;
+      onInputChange(value);
     },
     [onInputChange],
-  )
+  );
   // Expose an insertText function so callers (e.g. STT) can splice text at the
   // current cursor position instead of replacing the entire input.
   if (insertTextRef) {
     insertTextRef.current = {
       cursorOffset,
       insert: (text: string) => {
-        const needsSpace =
-          cursorOffset === input.length &&
-          input.length > 0 &&
-          !/\s$/.test(input)
-        const insertText = needsSpace ? ' ' + text : text
-        const newValue =
-          input.slice(0, cursorOffset) + insertText + input.slice(cursorOffset)
-        lastInternalInputRef.current = newValue
-        onInputChange(newValue)
-        setCursorOffset(cursorOffset + insertText.length)
+        const needsSpace = cursorOffset === input.length && input.length > 0 && !/\s$/.test(input);
+        const insertText = needsSpace ? ' ' + text : text;
+        const newValue = input.slice(0, cursorOffset) + insertText + input.slice(cursorOffset);
+        lastInternalInputRef.current = newValue;
+        onInputChange(newValue);
+        setCursorOffset(cursorOffset + insertText.length);
       },
       setInputWithCursor: (value: string, cursor: number) => {
-        lastInternalInputRef.current = value
-        onInputChange(value)
-        setCursorOffset(cursor)
+        lastInternalInputRef.current = value;
+        onInputChange(value);
+        setCursorOffset(cursor);
       },
-    }
+    };
   }
-  const store = useAppStateStore()
-  const setAppState = useSetAppState()
-  const tasks = useAppState(s => s.tasks)
-  const replBridgeConnected = useAppState(s => s.replBridgeConnected)
-  const replBridgeExplicit = useAppState(s => s.replBridgeExplicit)
-  const replBridgeReconnecting = useAppState(s => s.replBridgeReconnecting)
+  const store = useAppStateStore();
+  const setAppState = useSetAppState();
+  const tasks = useAppState(s => s.tasks);
+  const replBridgeConnected = useAppState(s => s.replBridgeConnected);
+  const replBridgeExplicit = useAppState(s => s.replBridgeExplicit);
+  const replBridgeReconnecting = useAppState(s => s.replBridgeReconnecting);
   // Must match BridgeStatusIndicator's render condition (PromptInputFooter.tsx) —
   // the pill returns null for implicit-and-not-reconnecting, so nav must too,
   // otherwise bridge becomes an invisible selection stop.
-  const bridgeFooterVisible =
-    replBridgeConnected && (replBridgeExplicit || replBridgeReconnecting)
+  const bridgeFooterVisible = replBridgeConnected && (replBridgeExplicit || replBridgeReconnecting);
   // Tmux pill (ant-only) — visible when there's an active tungsten session
-  const hasTungstenSession = useAppState(
-    s =>
-      process.env.USER_TYPE === 'ant' && s.tungstenActiveSession !== undefined,
-  )
-  const tmuxFooterVisible =
-    process.env.USER_TYPE === 'ant' && hasTungstenSession
+  const hasTungstenSession = useAppState(s => process.env.USER_TYPE === 'ant' && s.tungstenActiveSession !== undefined);
+  const tmuxFooterVisible = process.env.USER_TYPE === 'ant' && hasTungstenSession;
   // WebBrowser pill — visible when a browser is open
-  const bagelFooterVisible = useAppState(s =>
-        false,
-  )
-  const teamContext = useAppState(s => s.teamContext)
-  const queuedCommands = useCommandQueue()
-  const promptSuggestionState = useAppState(s => s.promptSuggestion)
-  const speculation = useAppState(s => s.speculation)
-  const speculationSessionTimeSavedMs = useAppState(
-    s => s.speculationSessionTimeSavedMs,
-  )
-  const viewingAgentTaskId = useAppState(s => s.viewingAgentTaskId)
-  const viewSelectionMode = useAppState(s => s.viewSelectionMode)
-  const showSpinnerTree = useAppState(s => s.expandedView) === 'teammates'
+  const bagelFooterVisible = useAppState(s => false);
+  const teamContext = useAppState(s => s.teamContext);
+  const queuedCommands = useCommandQueue();
+  const promptSuggestionState = useAppState(s => s.promptSuggestion);
+  const speculation = useAppState(s => s.speculation);
+  const speculationSessionTimeSavedMs = useAppState(s => s.speculationSessionTimeSavedMs);
+  const viewingAgentTaskId = useAppState(s => s.viewingAgentTaskId);
+  const viewSelectionMode = useAppState(s => s.viewSelectionMode);
+  const showSpinnerTree = useAppState(s => s.expandedView) === 'teammates';
   const { companion: _companion, companionMuted } = feature('BUDDY')
     ? getGlobalConfig()
-    : { companion: undefined, companionMuted: undefined }
-  const companionFooterVisible = !!_companion && !companionMuted
+    : { companion: undefined, companionMuted: undefined };
+  const companionFooterVisible = !!_companion && !companionMuted;
   // Brief mode: BriefSpinner/BriefIdleStatus own the 2-row footprint above
   // the input. Dropping marginTop here lets the spinner sit flush against
   // the input bar. viewingAgentTaskId mirrors the gate on both (Spinner.tsx,
@@ -451,35 +351,27 @@ function PromptInput({
   // its own marginTop, so the gap stays even without ours.
   const briefOwnsGap =
     feature('KAIROS') || feature('KAIROS_BRIEF')
-      ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-        useAppState(s => s.isBriefOnly) && !viewingAgentTaskId
-      : false
-  const mainLoopModel_ = useAppState(s => s.mainLoopModel)
-  const mainLoopModelForSession = useAppState(s => s.mainLoopModelForSession)
-  const thinkingEnabled = useAppState(s => s.thinkingEnabled)
-  const isFastMode = useAppState(s =>
-    isFastModeEnabled() ? s.fastMode : false,
-  )
-  const effortValue = useAppState(s => s.effortValue)
-  const viewedTeammate = getViewedTeammateTask(store.getState())
-  const viewingAgentName = viewedTeammate?.identity.agentName
+      ? useAppState(s => s.isBriefOnly) && !viewingAgentTaskId
+      : false;
+  const mainLoopModel_ = useAppState(s => s.mainLoopModel);
+  const mainLoopModelForSession = useAppState(s => s.mainLoopModelForSession);
+  const thinkingEnabled = useAppState(s => s.thinkingEnabled);
+  const isFastMode = useAppState(s => (isFastModeEnabled() ? s.fastMode : false));
+  const effortValue = useAppState(s => s.effortValue);
+  const viewedTeammate = getViewedTeammateTask(store.getState());
+  const viewingAgentName = viewedTeammate?.identity.agentName;
   // identity.color is typed as `string | undefined` (not AgentColorName) because
   // teammate identity comes from file-based config. Validate before casting to
   // ensure we only use valid color names (falls back to cyan if invalid).
   const viewingAgentColor =
-    viewedTeammate?.identity.color &&
-    AGENT_COLORS.includes(viewedTeammate.identity.color as AgentColorName)
+    viewedTeammate?.identity.color && AGENT_COLORS.includes(viewedTeammate.identity.color as AgentColorName)
       ? (viewedTeammate.identity.color as AgentColorName)
-      : undefined
+      : undefined;
   // In-process teammates sorted alphabetically for footer team selector
-  const inProcessTeammates = useMemo(
-    () => getRunningTeammatesSorted(tasks),
-    [tasks],
-  )
+  const inProcessTeammates = useMemo(() => getRunningTeammatesSorted(tasks), [tasks]);
 
   // Team mode: all background tasks are in-process teammates
-  const isTeammateMode =
-    inProcessTeammates.length > 0 || viewedTeammate !== undefined
+  const isTeammateMode = inProcessTeammates.length > 0 || viewedTeammate !== undefined;
 
   // When viewing a teammate, show their permission mode in the footer instead of the leader's
   const effectiveToolPermissionContext = useMemo((): ToolPermissionContext => {
@@ -487,125 +379,114 @@ function PromptInput({
       return {
         ...toolPermissionContext,
         mode: viewedTeammate.permissionMode,
-      }
+      };
     }
-    return toolPermissionContext
-  }, [viewedTeammate, toolPermissionContext])
-  const { historyQuery, setHistoryQuery, historyMatch, historyFailedMatch } =
-    useHistorySearch(
-      entry => {
-        setPastedContents(entry.pastedContents)
-        void onSubmit(entry.display)
-      },
-      input,
-      trackAndSetInput,
-      setCursorOffset,
-      cursorOffset,
-      onModeChange,
-      mode,
-      isSearchingHistory,
-      setIsSearchingHistory,
-      setPastedContents,
-      pastedContents,
-    )
+    return toolPermissionContext;
+  }, [viewedTeammate, toolPermissionContext]);
+  const { historyQuery, setHistoryQuery, historyMatch, historyFailedMatch } = useHistorySearch(
+    entry => {
+      setPastedContents(entry.pastedContents);
+      void onSubmit(entry.display);
+    },
+    input,
+    trackAndSetInput,
+    setCursorOffset,
+    cursorOffset,
+    onModeChange,
+    mode,
+    isSearchingHistory,
+    setIsSearchingHistory,
+    setPastedContents,
+    pastedContents,
+  );
   // Counter for paste IDs (shared between images and text).
   // Compute initial value once from existing messages (for --continue/--resume).
   // useRef(fn()) evaluates fn() on every render and discards the result after
   // mount — getInitialPasteId walks all messages + regex-scans text blocks,
   // so guard with a lazy-init pattern to run it exactly once.
-  const nextPasteIdRef = useRef(-1)
+  const nextPasteIdRef = useRef(-1);
   if (nextPasteIdRef.current === -1) {
-    nextPasteIdRef.current = getInitialPasteId(messages)
+    nextPasteIdRef.current = getInitialPasteId(messages);
   }
   // Armed by onImagePaste; if the very next keystroke is a non-space
   // printable, inputFilter prepends a space before it. Any other input
   // (arrow, escape, backspace, paste, space) disarms without inserting.
-  const pendingSpaceAfterPillRef = useRef(false)
+  const pendingSpaceAfterPillRef = useRef(false);
 
-  const [showTeamsDialog, setShowTeamsDialog] = useState(false)
-  const [showBridgeDialog, setShowBridgeDialog] = useState(false)
-  const [teammateFooterIndex, setTeammateFooterIndex] = useState(0)
+  const [showTeamsDialog, setShowTeamsDialog] = useState(false);
+  const [showBridgeDialog, setShowBridgeDialog] = useState(false);
+  const [teammateFooterIndex, setTeammateFooterIndex] = useState(0);
   // -1 sentinel: tasks pill is selected but no specific agent row is selected yet.
   // First ↓ selects the pill, second ↓ moves to row 0. Prevents double-select
   // of pill + row when both bg tasks (pill) and forked agents (rows) are visible.
-  const coordinatorTaskIndex = useAppState(s => s.coordinatorTaskIndex)
+  const coordinatorTaskIndex = useAppState(s => s.coordinatorTaskIndex);
   const setCoordinatorTaskIndex = useCallback(
     (v: number | ((prev: number) => number)) =>
       setAppState(prev => {
-        const next = typeof v === 'function' ? v(prev.coordinatorTaskIndex) : v
-        if (next === prev.coordinatorTaskIndex) return prev
-        return { ...prev, coordinatorTaskIndex: next }
+        const next = typeof v === 'function' ? v(prev.coordinatorTaskIndex) : v;
+        if (next === prev.coordinatorTaskIndex) return prev;
+        return { ...prev, coordinatorTaskIndex: next };
       }),
     [setAppState],
-  )
-  const coordinatorTaskCount = useCoordinatorTaskCount()
+  );
+  const coordinatorTaskCount = useCoordinatorTaskCount();
   // The pill (BackgroundTaskStatus) only renders when non-local_agent bg tasks
   // exist. When only local_agent tasks are running (coordinator/fork mode), the
   // pill is absent, so the -1 sentinel would leave nothing visually selected.
   // In that case, skip -1 and treat 0 as the minimum selectable index.
   const hasBgTaskPill = useMemo(
     () =>
-      Object.values(tasks).some(
-        t =>
-          isBackgroundTask(t) &&
-          !(process.env.USER_TYPE === 'ant' && isPanelAgentTask(t)),
-      ),
+      Object.values(tasks).some(t => isBackgroundTask(t) && !(process.env.USER_TYPE === 'ant' && isPanelAgentTask(t))),
     [tasks],
-  )
-  const minCoordinatorIndex = hasBgTaskPill ? -1 : 0
+  );
+  const minCoordinatorIndex = hasBgTaskPill ? -1 : 0;
   // Clamp index when tasks complete and the list shrinks beneath the cursor
   useEffect(() => {
     if (coordinatorTaskIndex >= coordinatorTaskCount) {
-      setCoordinatorTaskIndex(
-        Math.max(minCoordinatorIndex, coordinatorTaskCount - 1),
-      )
+      setCoordinatorTaskIndex(Math.max(minCoordinatorIndex, coordinatorTaskCount - 1));
     } else if (coordinatorTaskIndex < minCoordinatorIndex) {
-      setCoordinatorTaskIndex(minCoordinatorIndex)
+      setCoordinatorTaskIndex(minCoordinatorIndex);
     }
-  }, [coordinatorTaskCount, coordinatorTaskIndex, minCoordinatorIndex])
-  const [isPasting, setIsPasting] = useState(false)
-  const [isExternalEditorActive, setIsExternalEditorActive] = useState(false)
-  const [showModelPicker, setShowModelPicker] = useState(false)
-  const [showQuickOpen, setShowQuickOpen] = useState(false)
-  const [showGlobalSearch, setShowGlobalSearch] = useState(false)
-  const [showHistoryPicker, setShowHistoryPicker] = useState(false)
-  const [showFastModePicker, setShowFastModePicker] = useState(false)
-  const [showThinkingToggle, setShowThinkingToggle] = useState(false)
-  const [showAutoModeOptIn, setShowAutoModeOptIn] = useState(false)
-  const [previousModeBeforeAuto, setPreviousModeBeforeAuto] =
-    useState<PermissionMode | null>(null)
-  const autoModeOptInTimeoutRef = useRef<NodeJS.Timeout | null>(null)
+  }, [coordinatorTaskCount, coordinatorTaskIndex, minCoordinatorIndex]);
+  const [isPasting, setIsPasting] = useState(false);
+  const [isExternalEditorActive, setIsExternalEditorActive] = useState(false);
+  const [showModelPicker, setShowModelPicker] = useState(false);
+  const [showQuickOpen, setShowQuickOpen] = useState(false);
+  const [showGlobalSearch, setShowGlobalSearch] = useState(false);
+  const [showHistoryPicker, setShowHistoryPicker] = useState(false);
+  const [showFastModePicker, setShowFastModePicker] = useState(false);
+  const [showThinkingToggle, setShowThinkingToggle] = useState(false);
+  const [showAutoModeOptIn, setShowAutoModeOptIn] = useState(false);
+  const [previousModeBeforeAuto, setPreviousModeBeforeAuto] = useState<PermissionMode | null>(null);
+  const autoModeOptInTimeoutRef = useRef<NodeJS.Timeout | null>(null);
 
   // Check if cursor is on the first line of input
   const isCursorOnFirstLine = useMemo(() => {
-    const firstNewlineIndex = input.indexOf('\n')
+    const firstNewlineIndex = input.indexOf('\n');
     if (firstNewlineIndex === -1) {
-      return true // No newlines, cursor is always on first line
+      return true; // No newlines, cursor is always on first line
     }
-    return cursorOffset <= firstNewlineIndex
-  }, [input, cursorOffset])
+    return cursorOffset <= firstNewlineIndex;
+  }, [input, cursorOffset]);
 
   const isCursorOnLastLine = useMemo(() => {
-    const lastNewlineIndex = input.lastIndexOf('\n')
+    const lastNewlineIndex = input.lastIndexOf('\n');
     if (lastNewlineIndex === -1) {
-      return true // No newlines, cursor is always on last line
+      return true; // No newlines, cursor is always on last line
     }
-    return cursorOffset > lastNewlineIndex
-  }, [input, cursorOffset])
+    return cursorOffset > lastNewlineIndex;
+  }, [input, cursorOffset]);
 
   // Derive team info from teamContext (no filesystem I/O needed)
   // A session can only lead one team at a time
   const cachedTeams: TeamSummary[] = useMemo(() => {
-    if (!isAgentSwarmsEnabled()) return []
+    if (!isAgentSwarmsEnabled()) return [];
     // In-process mode uses Shift+Down/Up navigation instead of footer menu
-    if (isInProcessEnabled()) return []
+    if (isInProcessEnabled()) return [];
     if (!teamContext) {
-      return []
+      return [];
     }
-    const teammateCount = count(
-      Object.values(teamContext.teammates),
-      t => t.name !== 'team-lead',
-    )
+    const teammateCount = count(Object.values(teamContext.teammates), t => t.name !== 'team-lead');
     return [
       {
         name: teamContext.teamName,
@@ -613,25 +494,21 @@ function PromptInput({
         runningCount: 0,
         idleCount: 0,
       },
-    ]
-  }, [teamContext])
+    ];
+  }, [teamContext]);
 
   // ─── Footer pill navigation ─────────────────────────────────────────────
   // Which pills render below the input box. Order here IS the nav order
   // (down/right = forward, up/left = back). Selection lives in AppState so
   // pills rendered outside PromptInput (CompanionSprite) can read focus.
-  const runningTaskCount = useMemo(
-    () => count(Object.values(tasks), t => t.status === 'running'),
-    [tasks],
-  )
+  const runningTaskCount = useMemo(() => count(Object.values(tasks), t => t.status === 'running'), [tasks]);
   // Panel shows retained-completed agents too (getVisibleAgentTasks), so the
   // pill must stay navigable whenever the panel has rows — not just when
   // something is running.
   const tasksFooterVisible =
-    (runningTaskCount > 0 ||
-      (process.env.USER_TYPE === 'ant' && coordinatorTaskCount > 0)) &&
-    !shouldHideTasksFooter(tasks, showSpinnerTree)
-  const teamsFooterVisible = cachedTeams.length > 0
+    (runningTaskCount > 0 || (process.env.USER_TYPE === 'ant' && coordinatorTaskCount > 0)) &&
+    !shouldHideTasksFooter(tasks, showSpinnerTree);
+  const teamsFooterVisible = cachedTeams.length > 0;
 
   const footerItems = useMemo(
     () =>
@@ -651,60 +528,49 @@ function PromptInput({
       bridgeFooterVisible,
       companionFooterVisible,
     ],
-  )
+  );
 
   // Effective selection: null if the selected pill stopped rendering (bridge
   // disconnected, task finished). The derivation makes the UI correct
   // immediately; the useEffect below clears the raw state so it doesn't
   // resurrect when the same pill reappears (new task starts → focus stolen).
-  const rawFooterSelection = useAppState(s => s.footerSelection)
-  const footerItemSelected =
-    rawFooterSelection && footerItems.includes(rawFooterSelection)
-      ? rawFooterSelection
-      : null
+  const rawFooterSelection = useAppState(s => s.footerSelection);
+  const footerItemSelected = rawFooterSelection && footerItems.includes(rawFooterSelection) ? rawFooterSelection : null;
 
   useEffect(() => {
     if (rawFooterSelection && !footerItemSelected) {
-      setAppState(prev =>
-        prev.footerSelection === null
-          ? prev
-          : { ...prev, footerSelection: null },
-      )
+      setAppState(prev => (prev.footerSelection === null ? prev : { ...prev, footerSelection: null }));
     }
-  }, [rawFooterSelection, footerItemSelected, setAppState])
+  }, [rawFooterSelection, footerItemSelected, setAppState]);
 
-  const tasksSelected = footerItemSelected === 'tasks'
-  const tmuxSelected = footerItemSelected === 'tmux'
-  const bagelSelected = footerItemSelected === 'bagel'
-  const teamsSelected = footerItemSelected === 'teams'
-  const bridgeSelected = footerItemSelected === 'bridge'
+  const tasksSelected = footerItemSelected === 'tasks';
+  const tmuxSelected = footerItemSelected === 'tmux';
+  const bagelSelected = footerItemSelected === 'bagel';
+  const teamsSelected = footerItemSelected === 'teams';
+  const bridgeSelected = footerItemSelected === 'bridge';
 
   function selectFooterItem(item: FooterItem | null): void {
-    setAppState(prev =>
-      prev.footerSelection === item ? prev : { ...prev, footerSelection: item },
-    )
+    setAppState(prev => (prev.footerSelection === item ? prev : { ...prev, footerSelection: item }));
     if (item === 'tasks') {
-      setTeammateFooterIndex(0)
-      setCoordinatorTaskIndex(minCoordinatorIndex)
+      setTeammateFooterIndex(0);
+      setCoordinatorTaskIndex(minCoordinatorIndex);
     }
   }
 
   // delta: +1 = down/right, -1 = up/left. Returns true if nav happened
   // (including deselecting at the start), false if at a boundary.
   function navigateFooter(delta: 1 | -1, exitAtStart = false): boolean {
-    const idx = footerItemSelected
-      ? footerItems.indexOf(footerItemSelected)
-      : -1
-    const next = footerItems[idx + delta]
+    const idx = footerItemSelected ? footerItems.indexOf(footerItemSelected) : -1;
+    const next = footerItems[idx + delta];
     if (next) {
-      selectFooterItem(next)
-      return true
+      selectFooterItem(next);
+      return true;
     }
     if (delta < 0 && exitAtStart) {
-      selectFooterItem(null)
-      return true
+      selectFooterItem(null);
+      return true;
     }
-    return false
+    return false;
   }
 
   // Prompt suggestion hook - reads suggestions generated by forked agent in query loop
@@ -716,124 +582,100 @@ function PromptInput({
   } = usePromptSuggestion({
     inputValue: input,
     isAssistantResponding: isLoading,
-  })
+  });
 
   const displayedValue = useMemo(
     () =>
       isSearchingHistory && historyMatch
-        ? getValueFromInput(
-            typeof historyMatch === 'string'
-              ? historyMatch
-              : historyMatch.display,
-          )
+        ? getValueFromInput(typeof historyMatch === 'string' ? historyMatch : historyMatch.display)
         : input,
     [isSearchingHistory, historyMatch, input],
-  )
+  );
 
-  const thinkTriggers = useMemo(
-    () => findThinkingTriggerPositions(displayedValue),
-    [displayedValue],
-  )
+  const thinkTriggers = useMemo(() => findThinkingTriggerPositions(displayedValue), [displayedValue]);
 
-  const ultraplanSessionUrl = useAppState(s => s.ultraplanSessionUrl)
-  const ultraplanLaunching = useAppState(s => s.ultraplanLaunching)
+  const ultraplanSessionUrl = useAppState(s => s.ultraplanSessionUrl);
+  const ultraplanLaunching = useAppState(s => s.ultraplanLaunching);
   const ultraplanTriggers = useMemo(
     () =>
       feature('ULTRAPLAN') && !ultraplanSessionUrl && !ultraplanLaunching
         ? findUltraplanTriggerPositions(displayedValue)
         : [],
     [displayedValue, ultraplanSessionUrl, ultraplanLaunching],
-  )
+  );
 
   const ultrareviewTriggers = useMemo(
-    () =>
-      isUltrareviewEnabled()
-        ? findUltrareviewTriggerPositions(displayedValue)
-        : [],
+    () => (isUltrareviewEnabled() ? findUltrareviewTriggerPositions(displayedValue) : []),
     [displayedValue],
-  )
+  );
 
-  const btwTriggers = useMemo(
-    () => findBtwTriggerPositions(displayedValue),
-    [displayedValue],
-  )
+  const btwTriggers = useMemo(() => findBtwTriggerPositions(displayedValue), [displayedValue]);
 
-  const buddyTriggers = useMemo(
-    () => findBuddyTriggerPositions(displayedValue),
-    [displayedValue],
-  )
+  const buddyTriggers = useMemo(() => findBuddyTriggerPositions(displayedValue), [displayedValue]);
 
   const slashCommandTriggers = useMemo(() => {
-    const positions = findSlashCommandPositions(displayedValue)
+    const positions = findSlashCommandPositions(displayedValue);
     // Only highlight valid commands
     return positions.filter(pos => {
-      const commandName = displayedValue.slice(pos.start + 1, pos.end) // +1 to skip "/"
-      return hasCommand(commandName, commands)
-    })
-  }, [displayedValue, commands])
+      const commandName = displayedValue.slice(pos.start + 1, pos.end); // +1 to skip "/"
+      return hasCommand(commandName, commands);
+    });
+  }, [displayedValue, commands]);
 
   const tokenBudgetTriggers = useMemo(
-    () =>
-      feature('TOKEN_BUDGET') ? findTokenBudgetPositions(displayedValue) : [],
+    () => (feature('TOKEN_BUDGET') ? findTokenBudgetPositions(displayedValue) : []),
     [displayedValue],
-  )
+  );
 
-  const knownChannelsVersion = useSyncExternalStore(
-    subscribeKnownChannels,
-    getKnownChannelsVersion,
-  )
+  const knownChannelsVersion = useSyncExternalStore(subscribeKnownChannels, getKnownChannelsVersion);
   const slackChannelTriggers = useMemo(
-    () =>
-      hasSlackMcpServer(store.getState().mcp.clients)
-        ? findSlackChannelPositions(displayedValue)
-        : [],
+    () => (hasSlackMcpServer(store.getState().mcp.clients) ? findSlackChannelPositions(displayedValue) : []),
     // eslint-disable-next-line react-hooks/exhaustive-deps -- store is a stable ref
     [displayedValue, knownChannelsVersion],
-  )
+  );
 
   // Find @name mentions and highlight with team member's color
   const memberMentionHighlights = useMemo((): Array<{
-    start: number
-    end: number
-    themeColor: keyof Theme
+    start: number;
+    end: number;
+    themeColor: keyof Theme;
   }> => {
-    if (!isAgentSwarmsEnabled()) return []
-    if (!teamContext?.teammates) return []
+    if (!isAgentSwarmsEnabled()) return [];
+    if (!teamContext?.teammates) return [];
 
     const highlights: Array<{
-      start: number
-      end: number
-      themeColor: keyof Theme
-    }> = []
-    const members = teamContext.teammates
-    if (!members) return highlights
+      start: number;
+      end: number;
+      themeColor: keyof Theme;
+    }> = [];
+    const members = teamContext.teammates;
+    if (!members) return highlights;
 
     // Find all @name patterns in the input
-    const regex = /(^|\s)@([\w-]+)/g
-    const memberValues = Object.values(members)
-    let match
+    const regex = /(^|\s)@([\w-]+)/g;
+    const memberValues = Object.values(members);
+    let match;
     while ((match = regex.exec(displayedValue)) !== null) {
-      const leadingSpace = match[1] ?? ''
-      const nameStart = match.index + leadingSpace.length
-      const fullMatch = match[0].trimStart()
-      const name = match[2]
+      const leadingSpace = match[1] ?? '';
+      const nameStart = match.index + leadingSpace.length;
+      const fullMatch = match[0].trimStart();
+      const name = match[2];
 
       // Check if this name matches a team member
-      const member = memberValues.find(t => t.name === name)
+      const member = memberValues.find(t => t.name === name);
       if (member?.color) {
-        const themeColor =
-          AGENT_COLOR_TO_THEME_COLOR[member.color as AgentColorName]
+        const themeColor = AGENT_COLOR_TO_THEME_COLOR[member.color as AgentColorName];
         if (themeColor) {
           highlights.push({
             start: nameStart,
             end: nameStart + fullMatch.length,
             themeColor,
-          })
+          });
         }
       }
     }
-    return highlights
-  }, [displayedValue, teamContext])
+    return highlights;
+  }, [displayedValue, teamContext]);
 
   const imageRefPositions = useMemo(
     () =>
@@ -841,30 +683,26 @@ function PromptInput({
         .filter(r => r.match.startsWith('[Image'))
         .map(r => ({ start: r.index, end: r.index + r.match.length })),
     [displayedValue],
-  )
+  );
 
   // chip.start is the "selected" state: the inverted chip IS the cursor.
   // chip.end stays a normal position so you can park the cursor right after
   // `]` like any other character.
-  const cursorAtImageChip = imageRefPositions.some(
-    r => r.start === cursorOffset,
-  )
+  const cursorAtImageChip = imageRefPositions.some(r => r.start === cursorOffset);
 
   // up/down movement or a fullscreen click can land the cursor strictly
   // inside a chip; snap to the nearer boundary so it's never editable
   // char-by-char.
   useEffect(() => {
-    const inside = imageRefPositions.find(
-      r => cursorOffset > r.start && cursorOffset < r.end,
-    )
+    const inside = imageRefPositions.find(r => cursorOffset > r.start && cursorOffset < r.end);
     if (inside) {
-      const mid = (inside.start + inside.end) / 2
-      setCursorOffset(cursorOffset < mid ? inside.start : inside.end)
+      const mid = (inside.start + inside.end) / 2;
+      setCursorOffset(cursorOffset < mid ? inside.start : inside.end);
     }
-  }, [cursorOffset, imageRefPositions, setCursorOffset])
+  }, [cursorOffset, imageRefPositions, setCursorOffset]);
 
   const combinedHighlights = useMemo((): TextHighlight[] => {
-    const highlights: TextHighlight[] = []
+    const highlights: TextHighlight[] = [];
 
     // Invert the [Image #N] chip when the cursor is at chip.start (the
     // "selected" state) so backspace-to-delete is visually obvious.
@@ -876,7 +714,7 @@ function PromptInput({
           color: undefined,
           inverse: true,
           priority: 8,
-        })
+        });
       }
     }
 
@@ -886,7 +724,7 @@ function PromptInput({
         end: cursorOffset + historyQuery.length,
         color: 'warning',
         priority: 20,
-      })
+      });
     }
 
     // Add "btw" highlighting (solid yellow)
@@ -896,7 +734,7 @@ function PromptInput({
         end: trigger.end,
         color: 'warning',
         priority: 15,
-      })
+      });
     }
 
     // Add /command highlighting (blue)
@@ -906,7 +744,7 @@ function PromptInput({
         end: trigger.end,
         color: 'suggestion',
         priority: 5,
-      })
+      });
     }
 
     // Add token budget highlighting (blue)
@@ -916,7 +754,7 @@ function PromptInput({
         end: trigger.end,
         color: 'suggestion',
         priority: 5,
-      })
+      });
     }
 
     for (const trigger of slackChannelTriggers) {
@@ -925,7 +763,7 @@ function PromptInput({
         end: trigger.end,
         color: 'suggestion',
         priority: 5,
-      })
+      });
     }
 
     // Add @name highlighting with team member's color
@@ -935,7 +773,7 @@ function PromptInput({
         end: mention.end,
         color: mention.themeColor,
         priority: 5,
-      })
+      });
     }
 
     // Dim interim voice dictation text
@@ -946,7 +784,7 @@ function PromptInput({
         color: undefined,
         dimColor: true,
         priority: 1,
-      })
+      });
     }
 
     // Rainbow highlighting for ultrathink keyword (per-character cycling colors)
@@ -959,7 +797,7 @@ function PromptInput({
             color: getRainbowColor(i - trigger.start),
             shimmerColor: getRainbowColor(i - trigger.start, true),
             priority: 10,
-          })
+          });
         }
       }
     }
@@ -974,7 +812,7 @@ function PromptInput({
             color: getRainbowColor(i - trigger.start),
             shimmerColor: getRainbowColor(i - trigger.start, true),
             priority: 10,
-          })
+          });
         }
       }
     }
@@ -988,7 +826,7 @@ function PromptInput({
           color: getRainbowColor(i - trigger.start),
           shimmerColor: getRainbowColor(i - trigger.start, true),
           priority: 10,
-        })
+        });
       }
     }
 
@@ -1001,11 +839,11 @@ function PromptInput({
           color: getRainbowColor(i - trigger.start),
           shimmerColor: getRainbowColor(i - trigger.start, true),
           priority: 10,
-        })
+        });
       }
     }
 
-    return highlights
+    return highlights;
   }, [
     isSearchingHistory,
     historyQuery,
@@ -1024,9 +862,9 @@ function PromptInput({
     ultraplanTriggers,
     ultrareviewTriggers,
     buddyTriggers,
-  ])
+  ]);
 
-  const { addNotification, removeNotification } = useNotifications()
+  const { addNotification, removeNotification } = useNotifications();
 
   // Show ultrathink notification
   useEffect(() => {
@@ -1036,11 +874,11 @@ function PromptInput({
         text: 'Effort set to high for this turn',
         priority: 'immediate',
         timeoutMs: 5000,
-      })
+      });
     } else {
-      removeNotification('ultrathink-active')
+      removeNotification('ultrathink-active');
     }
-  }, [addNotification, removeNotification, thinkTriggers.length])
+  }, [addNotification, removeNotification, thinkTriggers.length]);
 
   useEffect(() => {
     if (feature('ULTRAPLAN') && ultraplanTriggers.length) {
@@ -1049,11 +887,11 @@ function PromptInput({
         text: 'This prompt will launch an ultraplan session in Claude Code on the web',
         priority: 'immediate',
         timeoutMs: 5000,
-      })
+      });
     } else {
-      removeNotification('ultraplan-active')
+      removeNotification('ultraplan-active');
     }
-  }, [addNotification, removeNotification, ultraplanTriggers.length])
+  }, [addNotification, removeNotification, ultraplanTriggers.length]);
 
   useEffect(() => {
     if (isUltrareviewEnabled() && ultrareviewTriggers.length) {
@@ -1062,72 +900,66 @@ function PromptInput({
         text: 'Run /ultrareview after Claude finishes to review these changes in the cloud',
         priority: 'immediate',
         timeoutMs: 5000,
-      })
+      });
     }
-  }, [addNotification, ultrareviewTriggers.length])
+  }, [addNotification, ultrareviewTriggers.length]);
 
   // Track input length for stash hint
-  const prevInputLengthRef = useRef(input.length)
-  const peakInputLengthRef = useRef(input.length)
+  const prevInputLengthRef = useRef(input.length);
+  const peakInputLengthRef = useRef(input.length);
 
   // Dismiss stash hint when user makes any input change
   const dismissStashHint = useCallback(() => {
-    removeNotification('stash-hint')
-  }, [removeNotification])
+    removeNotification('stash-hint');
+  }, [removeNotification]);
 
   // Show stash hint when user gradually clears substantial input
   useEffect(() => {
-    const prevLength = prevInputLengthRef.current
-    const peakLength = peakInputLengthRef.current
-    const currentLength = input.length
-    prevInputLengthRef.current = currentLength
+    const prevLength = prevInputLengthRef.current;
+    const peakLength = peakInputLengthRef.current;
+    const currentLength = input.length;
+    prevInputLengthRef.current = currentLength;
 
     // Update peak when input grows
     if (currentLength > peakLength) {
-      peakInputLengthRef.current = currentLength
-      return
+      peakInputLengthRef.current = currentLength;
+      return;
     }
 
     // Reset state when input is empty
     if (currentLength === 0) {
-      peakInputLengthRef.current = 0
-      return
+      peakInputLengthRef.current = 0;
+      return;
     }
 
     // Detect gradual clear: peak was high, current is low, but this wasn't a single big jump
     // (rapid clears like esc-esc go from 20+ to 0 in one step)
-    const clearedSubstantialInput = peakLength >= 20 && currentLength <= 5
-    const wasRapidClear = prevLength >= 20 && currentLength <= 5
+    const clearedSubstantialInput = peakLength >= 20 && currentLength <= 5;
+    const wasRapidClear = prevLength >= 20 && currentLength <= 5;
 
     if (clearedSubstantialInput && !wasRapidClear) {
-      const config = getGlobalConfig()
+      const config = getGlobalConfig();
       if (!config.hasUsedStash) {
         addNotification({
           key: 'stash-hint',
           jsx: (
             <Text dimColor>
-              Tip:{' '}
-              <ConfigurableShortcutHint
-                action="chat:stash"
-                context="Chat"
-                fallback="ctrl+s"
-                description="stash"
-              />
+              Tip: <ConfigurableShortcutHint action="chat:stash" context="Chat" fallback="ctrl+s" description="stash" />
             </Text>
           ),
           priority: 'immediate',
           timeoutMs: FOOTER_TEMPORARY_STATUS_TIMEOUT,
-        })
+        });
       }
-      peakInputLengthRef.current = currentLength
+      peakInputLengthRef.current = currentLength;
     }
-  }, [input.length, addNotification])
+  }, [input.length, addNotification]);
 
   // Initialize input buffer for undo functionality
   const { pushToBuffer, undo, canUndo, clearBuffer } = useInputBuffer({
     maxBufferSize: 50,
     debounceMs: 1000,
-  })
+  });
 
   useMaybeTruncateInput({
     input,
@@ -1135,232 +967,187 @@ function PromptInput({
     onInputChange: trackAndSetInput,
     setCursorOffset,
     setPastedContents,
-  })
+  });
 
   const defaultPlaceholder = usePromptInputPlaceholder({
     input,
     submitCount,
     viewingAgentName,
-  })
+  });
 
   const onChange = useCallback(
     (value: string) => {
       if (value === '?') {
-        logEvent('tengu_help_toggled', {})
-        setHelpOpen(v => !v)
-        return
+        logEvent('tengu_help_toggled', {});
+        setHelpOpen(v => !v);
+        return;
       }
-      setHelpOpen(false)
+      setHelpOpen(false);
 
       // Dismiss stash hint when user makes any input change
-      dismissStashHint()
+      dismissStashHint();
 
       // Cancel any pending prompt suggestion and speculation when user types
-      abortPromptSuggestion()
-      abortSpeculation(setAppState)
+      abortPromptSuggestion();
+      abortSpeculation(setAppState);
 
       // Check if this is a single character insertion at the start
-      const isSingleCharInsertion = value.length === input.length + 1
-      const insertedAtStart = cursorOffset === 0
-      const mode = getModeFromInput(value)
+      const isSingleCharInsertion = value.length === input.length + 1;
+      const insertedAtStart = cursorOffset === 0;
+      const mode = getModeFromInput(value);
 
       if (insertedAtStart && mode !== 'prompt') {
         if (isSingleCharInsertion) {
-          onModeChange(mode)
-          return
+          onModeChange(mode);
+          return;
         }
         // Multi-char insertion into empty input (e.g. tab-accepting "! gcloud auth login")
         if (input.length === 0) {
-          onModeChange(mode)
-          const valueWithoutMode = getValueFromInput(value).replaceAll(
-            '\t',
-            '    ',
-          )
-          pushToBuffer(input, cursorOffset, pastedContents)
-          trackAndSetInput(valueWithoutMode)
-          setCursorOffset(valueWithoutMode.length)
-          return
+          onModeChange(mode);
+          const valueWithoutMode = getValueFromInput(value).replaceAll('\t', '    ');
+          pushToBuffer(input, cursorOffset, pastedContents);
+          trackAndSetInput(valueWithoutMode);
+          setCursorOffset(valueWithoutMode.length);
+          return;
         }
       }
 
-      const processedValue = value.replaceAll('\t', '    ')
+      const processedValue = value.replaceAll('\t', '    ');
 
       // Push current state to buffer before making changes
       if (input !== processedValue) {
-        pushToBuffer(input, cursorOffset, pastedContents)
+        pushToBuffer(input, cursorOffset, pastedContents);
       }
 
       // Deselect footer items when user types
-      setAppState(prev =>
-        prev.footerSelection === null
-          ? prev
-          : { ...prev, footerSelection: null },
-      )
+      setAppState(prev => (prev.footerSelection === null ? prev : { ...prev, footerSelection: null }));
 
-      trackAndSetInput(processedValue)
+      trackAndSetInput(processedValue);
     },
-    [
-      trackAndSetInput,
-      onModeChange,
-      input,
-      cursorOffset,
-      pushToBuffer,
-      pastedContents,
-      dismissStashHint,
-      setAppState,
-    ],
-  )
+    [trackAndSetInput, onModeChange, input, cursorOffset, pushToBuffer, pastedContents, dismissStashHint, setAppState],
+  );
 
-  const {
-    resetHistory,
-    onHistoryUp,
-    onHistoryDown,
-    dismissSearchHint,
-    historyIndex,
-  } = useArrowKeyHistory(
-    (
-      value: string,
-      historyMode: HistoryMode,
-      pastedContents: Record<number, PastedContent>,
-    ) => {
-      onChange(value)
-      onModeChange(historyMode)
-      setPastedContents(pastedContents)
+  const { resetHistory, onHistoryUp, onHistoryDown, dismissSearchHint, historyIndex } = useArrowKeyHistory(
+    (value: string, historyMode: HistoryMode, pastedContents: Record<number, PastedContent>) => {
+      onChange(value);
+      onModeChange(historyMode);
+      setPastedContents(pastedContents);
     },
     input,
     pastedContents,
     setCursorOffset,
     mode,
-  )
+  );
 
   // Dismiss search hint when user starts searching
   useEffect(() => {
     if (isSearchingHistory) {
-      dismissSearchHint()
+      dismissSearchHint();
     }
-  }, [isSearchingHistory, dismissSearchHint])
+  }, [isSearchingHistory, dismissSearchHint]);
 
   // Only use history navigation when there are 0 or 1 slash command suggestions.
   // Footer nav is NOT here — when a pill is selected, TextInput focus=false so
   // these never fire. The Footer keybinding context handles ↑/↓ instead.
   function handleHistoryUp() {
     if (suggestions.length > 1) {
-      return
+      return;
     }
 
     // Only navigate history when cursor is on the first line.
     // In multiline inputs, up arrow should move the cursor (handled by TextInput)
     // and only trigger history when at the top of the input.
     if (!isCursorOnFirstLine) {
-      return
+      return;
     }
 
     // If there's an editable queued command, move it to the input for editing when UP is pressed
-    const hasEditableCommand = queuedCommands.some(isQueuedCommandEditable)
+    const hasEditableCommand = queuedCommands.some(isQueuedCommandEditable);
     if (hasEditableCommand) {
-      void popAllCommandsFromQueue()
-      return
+      void popAllCommandsFromQueue();
+      return;
     }
 
-    onHistoryUp()
+    onHistoryUp();
   }
 
   function handleHistoryDown() {
     if (suggestions.length > 1) {
-      return
+      return;
     }
 
     // Only navigate history/footer when cursor is on the last line.
     // In multiline inputs, down arrow should move the cursor (handled by TextInput)
     // and only trigger navigation when at the bottom of the input.
     if (!isCursorOnLastLine) {
-      return
+      return;
     }
 
     // At bottom of history → enter footer at first visible pill
     if (onHistoryDown() && footerItems.length > 0) {
-      const first = footerItems[0]!
-      selectFooterItem(first)
+      const first = footerItems[0]!;
+      selectFooterItem(first);
       if (first === 'tasks' && !getGlobalConfig().hasSeenTasksHint) {
-        saveGlobalConfig(c =>
-          c.hasSeenTasksHint ? c : { ...c, hasSeenTasksHint: true },
-        )
+        saveGlobalConfig(c => (c.hasSeenTasksHint ? c : { ...c, hasSeenTasksHint: true }));
       }
     }
   }
 
   // Create a suggestions state directly - we'll sync it with useTypeahead later
   const [suggestionsState, setSuggestionsStateRaw] = useState<{
-    suggestions: SuggestionItem[]
-    selectedSuggestion: number
-    commandArgumentHint?: string
+    suggestions: SuggestionItem[];
+    selectedSuggestion: number;
+    commandArgumentHint?: string;
   }>({
     suggestions: [],
     selectedSuggestion: -1,
     commandArgumentHint: undefined,
-  })
+  });
 
   // Setter for suggestions state
   const setSuggestionsState = useCallback(
-    (
-      updater:
-        | typeof suggestionsState
-        | ((prev: typeof suggestionsState) => typeof suggestionsState),
-    ) => {
-      setSuggestionsStateRaw(prev =>
-        typeof updater === 'function' ? updater(prev) : updater,
-      )
+    (updater: typeof suggestionsState | ((prev: typeof suggestionsState) => typeof suggestionsState)) => {
+      setSuggestionsStateRaw(prev => (typeof updater === 'function' ? updater(prev) : updater));
     },
     [],
-  )
+  );
 
   const onSubmit = useCallback(
     async (inputParam: string, isSubmittingSlashCommand = false) => {
-      inputParam = inputParam.trimEnd()
+      inputParam = inputParam.trimEnd();
 
       // Don't submit if a footer indicator is being opened. Read fresh from
       // store — footer:openSelected calls selectFooterItem(null) then onSubmit
       // in the same tick, and the closure value hasn't updated yet. Apply the
       // same "still visible?" derivation as footerItemSelected so a stale
       // selection (pill disappeared) doesn't swallow Enter.
-      const state = store.getState()
-      if (
-        state.footerSelection &&
-        footerItems.includes(state.footerSelection)
-      ) {
-        return
+      const state = store.getState();
+      if (state.footerSelection && footerItems.includes(state.footerSelection)) {
+        return;
       }
 
       // Enter in selection modes confirms selection (useBackgroundTaskNavigation).
       // BaseTextInput's useInput registers before that hook (child effects fire first),
       // so without this guard Enter would double-fire and auto-submit the suggestion.
       if (state.viewSelectionMode === 'selecting-agent') {
-        return
+        return;
       }
 
       // Check for images early - we need this for suggestion logic below
-      const hasImages = Object.values(pastedContents).some(
-        c => c.type === 'image',
-      )
+      const hasImages = Object.values(pastedContents).some(c => c.type === 'image');
 
       // If input is empty OR matches the suggestion, submit it
       // But if there are images attached, don't auto-accept the suggestion -
       // the user wants to submit just the image(s).
       // Only in leader view — promptSuggestion is leader-context, not teammate.
-      const suggestionText = promptSuggestionState.text
-      const inputMatchesSuggestion =
-        inputParam.trim() === '' || inputParam === suggestionText
-      if (
-        inputMatchesSuggestion &&
-        suggestionText &&
-        !hasImages &&
-        !state.viewingAgentTaskId
-      ) {
+      const suggestionText = promptSuggestionState.text;
+      const inputMatchesSuggestion = inputParam.trim() === '' || inputParam === suggestionText;
+      if (inputMatchesSuggestion && suggestionText && !hasImages && !state.viewingAgentTaskId) {
         // If speculation is active, inject messages immediately as they stream
         if (speculation.status === 'active') {
-          markAccepted()
+          markAccepted();
           // skipReset: resetSuggestion would abort the speculation before we accept it
-          logOutcomeAtSubmission(suggestionText, { skipReset: true })
+          logOutcomeAtSubmission(suggestionText, { skipReset: true });
 
           void onSubmitProp(
             suggestionText,
@@ -1374,27 +1161,27 @@ function PromptInput({
               speculationSessionTimeSavedMs: speculationSessionTimeSavedMs,
               setAppState,
             },
-          )
-          return // Skip normal query - speculation handled it
+          );
+          return; // Skip normal query - speculation handled it
         }
 
         // Regular suggestion acceptance (requires shownAt > 0)
         if (promptSuggestionState.shownAt > 0) {
-          markAccepted()
-          inputParam = suggestionText
+          markAccepted();
+          inputParam = suggestionText;
         }
       }
 
       // Handle @name direct message
       if (isAgentSwarmsEnabled()) {
-        const directMessage = parseDirectMemberMessage(inputParam)
+        const directMessage = parseDirectMemberMessage(inputParam);
         if (directMessage) {
           const result = await sendDirectMemberMessage(
             directMessage.recipientName,
             directMessage.message,
             teamContext,
             writeToMailbox,
-          )
+          );
 
           if (result.success) {
             addNotification({
@@ -1402,12 +1189,12 @@ function PromptInput({
               text: `Sent to @${result.recipientName}`,
               priority: 'immediate',
               timeoutMs: 3000,
-            })
-            trackAndSetInput('')
-            setCursorOffset(0)
-            clearBuffer()
-            resetHistory()
-            return
+            });
+            trackAndSetInput('');
+            setCursorOffset(0);
+            clearBuffer();
+            resetHistory();
+            return;
           } else if (!result.success && (result as { error: string }).error === 'no_team_context') {
             // No team context - fall through to normal prompt submission
           } else {
@@ -1419,44 +1206,38 @@ function PromptInput({
 
       // Allow submission if there are images attached, even without text
       if (inputParam.trim() === '' && !hasImages) {
-        return
+        return;
       }
 
       // PromptInput UX: Check if suggestions dropdown is showing
       // For directory suggestions, allow submission (Tab is used for completion)
       const hasDirectorySuggestions =
         suggestionsState.suggestions.length > 0 &&
-        suggestionsState.suggestions.every(s => s.description === 'directory')
+        suggestionsState.suggestions.every(s => s.description === 'directory');
 
-      if (
-        suggestionsState.suggestions.length > 0 &&
-        !isSubmittingSlashCommand &&
-        !hasDirectorySuggestions
-      ) {
-        logForDebugging(
-          `[onSubmit] early return: suggestions showing (count=${suggestionsState.suggestions.length})`,
-        )
-        return // Don't submit, user needs to clear suggestions first
+      if (suggestionsState.suggestions.length > 0 && !isSubmittingSlashCommand && !hasDirectorySuggestions) {
+        logForDebugging(`[onSubmit] early return: suggestions showing (count=${suggestionsState.suggestions.length})`);
+        return; // Don't submit, user needs to clear suggestions first
       }
 
       // Log suggestion outcome if one exists
       if (promptSuggestionState.text && promptSuggestionState.shownAt > 0) {
-        logOutcomeAtSubmission(inputParam)
+        logOutcomeAtSubmission(inputParam);
       }
 
       // Clear stash hint notification on submit
-      removeNotification('stash-hint')
+      removeNotification('stash-hint');
 
       // Route input to viewed agent (in-process teammate or named local_agent).
-      const activeAgent = getActiveAgentForInput(store.getState())
+      const activeAgent = getActiveAgentForInput(store.getState());
       if (activeAgent.type !== 'leader' && onAgentSubmit) {
-        logEvent('tengu_transcript_input_to_teammate', {})
+        logEvent('tengu_transcript_input_to_teammate', {});
         await onAgentSubmit(inputParam, activeAgent.task, {
           setCursorOffset,
           clearBuffer,
           resetHistory,
-        })
-        return
+        });
+        return;
       }
 
       // Normal leader submission
@@ -1464,7 +1245,7 @@ function PromptInput({
         setCursorOffset,
         clearBuffer,
         resetHistory,
-      })
+      });
     },
     [
       promptSuggestionState,
@@ -1484,15 +1265,9 @@ function PromptInput({
       pastedContents,
       removeNotification,
     ],
-  )
+  );
 
-  const {
-    suggestions,
-    selectedSuggestion,
-    commandArgumentHint,
-    inlineGhostText,
-    maxColumnWidth,
-  } = useTypeahead({
+  const { suggestions, selectedSuggestion, commandArgumentHint, inlineGhostText, maxColumnWidth } = useTypeahead({
     commands,
     onInputChange: trackAndSetInput,
     onSubmit,
@@ -1506,29 +1281,20 @@ function PromptInput({
     suppressSuggestions: isSearchingHistory || historyIndex > 0,
     markAccepted,
     onModeChange,
-  })
+  });
 
   // Track if prompt suggestion should be shown (computed later with terminal width).
   // Hidden in teammate view — suggestion is leader-context only.
-  const showPromptSuggestion =
-    mode === 'prompt' &&
-    suggestions.length === 0 &&
-    promptSuggestion &&
-    !viewingAgentTaskId
+  const showPromptSuggestion = mode === 'prompt' && suggestions.length === 0 && promptSuggestion && !viewingAgentTaskId;
   if (showPromptSuggestion) {
-    markShown()
+    markShown();
   }
 
   // If suggestion was generated but can't be shown due to timing, log suppression.
   // Exclude teammate view: markShown() is gated above, so shownAt stays 0 there —
   // but that's not a timing failure, the suggestion is valid when returning to leader.
-  if (
-    promptSuggestionState.text &&
-    !promptSuggestion &&
-    promptSuggestionState.shownAt === 0 &&
-    !viewingAgentTaskId
-  ) {
-    logSuggestionSuppressed('timing', promptSuggestionState.text)
+  if (promptSuggestionState.text && !promptSuggestion && promptSuggestionState.shownAt === 0 && !viewingAgentTaskId) {
+    logSuggestionSuppressed('timing', promptSuggestionState.text);
     setAppState(prev => ({
       ...prev,
       promptSuggestion: {
@@ -1538,7 +1304,7 @@ function PromptInput({
         acceptedAt: 0,
         generationRequestId: null,
       },
-    }))
+    }));
   }
 
   function onImagePaste(
@@ -1548,10 +1314,10 @@ function PromptInput({
     dimensions?: ImageDimensions,
     sourcePath?: string,
   ) {
-    logEvent('tengu_paste_image', {})
-    onModeChange('prompt')
+    logEvent('tengu_paste_image', {});
+    onModeChange('prompt');
 
-    const pasteId = nextPasteIdRef.current++
+    const pasteId = nextPasteIdRef.current++;
 
     const newContent: PastedContent = {
       id: pasteId,
@@ -1561,22 +1327,22 @@ function PromptInput({
       filename: filename || 'Pasted image',
       dimensions,
       sourcePath,
-    }
+    };
 
     // Cache path immediately (fast) so links work on render
-    cacheImagePath(newContent)
+    cacheImagePath(newContent);
 
     // Store image to disk in background
-    void storeImage(newContent)
+    void storeImage(newContent);
 
     // Update UI
-    setPastedContents(prev => ({ ...prev, [pasteId]: newContent }))
+    setPastedContents(prev => ({ ...prev, [pasteId]: newContent }));
     // Multi-image paste calls onImagePaste in a loop. If the ref is already
     // armed, the previous pill's lazy space fires now (before this pill)
     // rather than being lost.
-    const prefix = pendingSpaceAfterPillRef.current ? ' ' : ''
-    insertTextAtCursor(prefix + formatImageRef(pasteId))
-    pendingSpaceAfterPillRef.current = true
+    const prefix = pendingSpaceAfterPillRef.current ? ' ' : '';
+    insertTextAtCursor(prefix + formatImageRef(pasteId));
+    pendingSpaceAfterPillRef.current = true;
   }
 
   // Prune images whose [Image #N] placeholder is no longer in the input text.
@@ -1584,168 +1350,154 @@ function PromptInput({
   // the ref. onImagePaste batches setPastedContents + insertTextAtCursor in the
   // same event, so this effect sees the placeholder already present.
   useEffect(() => {
-    const referencedIds = new Set(parseReferences(input).map(r => r.id))
+    const referencedIds = new Set(parseReferences(input).map(r => r.id));
     setPastedContents(prev => {
-      const orphaned = Object.values(prev).filter(
-        c => c.type === 'image' && !referencedIds.has(c.id),
-      )
-      if (orphaned.length === 0) return prev
-      const next = { ...prev }
-      for (const img of orphaned) delete next[img.id]
-      return next
-    })
-  }, [input, setPastedContents])
+      const orphaned = Object.values(prev).filter(c => c.type === 'image' && !referencedIds.has(c.id));
+      if (orphaned.length === 0) return prev;
+      const next = { ...prev };
+      for (const img of orphaned) delete next[img.id];
+      return next;
+    });
+  }, [input, setPastedContents]);
 
   function onTextPaste(rawText: string) {
-    pendingSpaceAfterPillRef.current = false
+    pendingSpaceAfterPillRef.current = false;
     // Clean up pasted text - strip ANSI escape codes and normalize line endings and tabs
-    let text = stripAnsi(rawText).replace(/\r/g, '\n').replaceAll('\t', '    ')
+    let text = stripAnsi(rawText).replace(/\r/g, '\n').replaceAll('\t', '    ');
 
     // Match typed/auto-suggest: `!cmd` pasted into empty input enters bash mode.
     if (input.length === 0) {
-      const pastedMode = getModeFromInput(text)
+      const pastedMode = getModeFromInput(text);
       if (pastedMode !== 'prompt') {
-        onModeChange(pastedMode)
-        text = getValueFromInput(text)
+        onModeChange(pastedMode);
+        text = getValueFromInput(text);
       }
     }
 
-    const numLines = getPastedTextRefNumLines(text)
+    const numLines = getPastedTextRefNumLines(text);
     // Limit the number of lines to show in the input
     // If the overall layout is too high then Ink will repaint
     // the entire terminal.
     // The actual required height is dependent on the content, this
     // is just an estimate.
-    const maxLines = Math.min(rows - 10, 2)
+    const maxLines = Math.min(rows - 10, 2);
 
     // Use special handling for long pasted text (>PASTE_THRESHOLD chars)
     // or if it exceeds the number of lines we want to show
     if (text.length > PASTE_THRESHOLD || numLines > maxLines) {
-      const pasteId = nextPasteIdRef.current++
+      const pasteId = nextPasteIdRef.current++;
 
       const newContent: PastedContent = {
         id: pasteId,
         type: 'text',
         content: text,
-      }
+      };
 
-      setPastedContents(prev => ({ ...prev, [pasteId]: newContent }))
+      setPastedContents(prev => ({ ...prev, [pasteId]: newContent }));
 
-      insertTextAtCursor(formatPastedTextRef(pasteId, numLines))
+      insertTextAtCursor(formatPastedTextRef(pasteId, numLines));
     } else {
       // For shorter pastes, just insert the text normally
-      insertTextAtCursor(text)
+      insertTextAtCursor(text);
     }
   }
 
-  const lazySpaceInputFilter = useCallback(
-    (input: string, key: Key): string => {
-      if (!pendingSpaceAfterPillRef.current) return input
-      pendingSpaceAfterPillRef.current = false
-      if (isNonSpacePrintable(input, key)) return ' ' + input
-      return input
-    },
-    [],
-  )
+  const lazySpaceInputFilter = useCallback((input: string, key: Key): string => {
+    if (!pendingSpaceAfterPillRef.current) return input;
+    pendingSpaceAfterPillRef.current = false;
+    if (isNonSpacePrintable(input, key)) return ' ' + input;
+    return input;
+  }, []);
 
   function insertTextAtCursor(text: string) {
     // Push current state to buffer before inserting
-    pushToBuffer(input, cursorOffset, pastedContents)
+    pushToBuffer(input, cursorOffset, pastedContents);
 
-    const newInput =
-      input.slice(0, cursorOffset) + text + input.slice(cursorOffset)
-    trackAndSetInput(newInput)
-    setCursorOffset(cursorOffset + text.length)
+    const newInput = input.slice(0, cursorOffset) + text + input.slice(cursorOffset);
+    trackAndSetInput(newInput);
+    setCursorOffset(cursorOffset + text.length);
   }
 
   const doublePressEscFromEmpty = useDoublePress(
     () => {},
     () => onShowMessageSelector(),
-  )
+  );
 
   // Function to get the queued command for editing. Returns true if commands were popped.
   const popAllCommandsFromQueue = useCallback((): boolean => {
-    const result = popAllEditable(input, cursorOffset)
+    const result = popAllEditable(input, cursorOffset);
     if (!result) {
-      return false
+      return false;
     }
 
-    trackAndSetInput(result.text)
-    onModeChange('prompt') // Always prompt mode for queued commands
-    setCursorOffset(result.cursorOffset)
+    trackAndSetInput(result.text);
+    onModeChange('prompt'); // Always prompt mode for queued commands
+    setCursorOffset(result.cursorOffset);
 
     // Restore images from queued commands to pastedContents
     if (result.images.length > 0) {
       setPastedContents(prev => {
-        const newContents = { ...prev }
+        const newContents = { ...prev };
         for (const image of result.images) {
-          newContents[image.id] = image
+          newContents[image.id] = image;
         }
-        return newContents
-      })
+        return newContents;
+      });
     }
 
-    return true
-  }, [trackAndSetInput, onModeChange, input, cursorOffset, setPastedContents])
+    return true;
+  }, [trackAndSetInput, onModeChange, input, cursorOffset, setPastedContents]);
 
   // Insert the at-mentioned reference (the file and, optionally, a line range) when
   // we receive an at-mentioned notification the IDE.
   const onIdeAtMentioned = function (atMentioned: IDEAtMentioned) {
-    logEvent('tengu_ext_at_mentioned', {})
-    let atMentionedText: string
-    const relativePath = path.relative(getCwd(), atMentioned.filePath)
+    logEvent('tengu_ext_at_mentioned', {});
+    let atMentionedText: string;
+    const relativePath = path.relative(getCwd(), atMentioned.filePath);
     if (atMentioned.lineStart && atMentioned.lineEnd) {
       atMentionedText =
         atMentioned.lineStart === atMentioned.lineEnd
           ? `@${relativePath}#L${atMentioned.lineStart} `
-          : `@${relativePath}#L${atMentioned.lineStart}-${atMentioned.lineEnd} `
+          : `@${relativePath}#L${atMentioned.lineStart}-${atMentioned.lineEnd} `;
     } else {
-      atMentionedText = `@${relativePath} `
+      atMentionedText = `@${relativePath} `;
     }
-    const cursorChar = input[cursorOffset - 1] ?? ' '
+    const cursorChar = input[cursorOffset - 1] ?? ' ';
     if (!/\s/.test(cursorChar)) {
-      atMentionedText = ` ${atMentionedText}`
+      atMentionedText = ` ${atMentionedText}`;
     }
-    insertTextAtCursor(atMentionedText)
-  }
-  useIdeAtMentioned(mcpClients, onIdeAtMentioned)
+    insertTextAtCursor(atMentionedText);
+  };
+  useIdeAtMentioned(mcpClients, onIdeAtMentioned);
 
   // Handler for chat:undo - undo last edit
   const handleUndo = useCallback(() => {
     if (canUndo) {
-      const previousState = undo()
+      const previousState = undo();
       if (previousState) {
-        trackAndSetInput(previousState.text)
-        setCursorOffset(previousState.cursorOffset)
-        setPastedContents(previousState.pastedContents)
+        trackAndSetInput(previousState.text);
+        setCursorOffset(previousState.cursorOffset);
+        setPastedContents(previousState.pastedContents);
       }
     }
-  }, [canUndo, undo, trackAndSetInput, setPastedContents])
+  }, [canUndo, undo, trackAndSetInput, setPastedContents]);
 
   // Handler for chat:newline - insert a newline at the cursor position
   const handleNewline = useCallback(() => {
-    pushToBuffer(input, cursorOffset, pastedContents)
-    const newInput =
-      input.slice(0, cursorOffset) + '\n' + input.slice(cursorOffset)
-    trackAndSetInput(newInput)
-    setCursorOffset(cursorOffset + 1)
-  }, [
-    input,
-    cursorOffset,
-    trackAndSetInput,
-    setCursorOffset,
-    pushToBuffer,
-    pastedContents,
-  ])
+    pushToBuffer(input, cursorOffset, pastedContents);
+    const newInput = input.slice(0, cursorOffset) + '\n' + input.slice(cursorOffset);
+    trackAndSetInput(newInput);
+    setCursorOffset(cursorOffset + 1);
+  }, [input, cursorOffset, trackAndSetInput, setCursorOffset, pushToBuffer, pastedContents]);
 
   // Handler for chat:externalEditor - edit in $EDITOR
   const handleExternalEditor = useCallback(async () => {
-    logEvent('tengu_external_editor_used', {})
-    setIsExternalEditorActive(true)
+    logEvent('tengu_external_editor_used', {});
+    setIsExternalEditorActive(true);
 
     try {
       // Pass pastedContents to expand collapsed text references
-      const result = await editPromptInEditor(input, pastedContents)
+      const result = await editPromptInEditor(input, pastedContents);
 
       if (result.error) {
         addNotification({
@@ -1753,91 +1505,76 @@ function PromptInput({
           text: result.error,
           color: 'warning',
           priority: 'high',
-        })
+        });
       }
 
       if (result.content !== null && result.content !== input) {
         // Push current state to buffer before making changes
-        pushToBuffer(input, cursorOffset, pastedContents)
+        pushToBuffer(input, cursorOffset, pastedContents);
 
-        trackAndSetInput(result.content)
-        setCursorOffset(result.content.length)
+        trackAndSetInput(result.content);
+        setCursorOffset(result.content.length);
       }
     } catch (err) {
       if (err instanceof Error) {
-        logError(err)
+        logError(err);
       }
       addNotification({
         key: 'external-editor-error',
         text: `External editor failed: ${errorMessage(err)}`,
         color: 'warning',
         priority: 'high',
-      })
+      });
     } finally {
-      setIsExternalEditorActive(false)
+      setIsExternalEditorActive(false);
     }
-  }, [
-    input,
-    cursorOffset,
-    pastedContents,
-    pushToBuffer,
-    trackAndSetInput,
-    addNotification,
-  ])
+  }, [input, cursorOffset, pastedContents, pushToBuffer, trackAndSetInput, addNotification]);
 
   // Handler for chat:stash - stash/unstash prompt
   const handleStash = useCallback(() => {
     if (input.trim() === '' && stashedPrompt !== undefined) {
       // Pop stash when input is empty
-      trackAndSetInput(stashedPrompt.text)
-      setCursorOffset(stashedPrompt.cursorOffset)
-      setPastedContents(stashedPrompt.pastedContents)
-      setStashedPrompt(undefined)
+      trackAndSetInput(stashedPrompt.text);
+      setCursorOffset(stashedPrompt.cursorOffset);
+      setPastedContents(stashedPrompt.pastedContents);
+      setStashedPrompt(undefined);
     } else if (input.trim() !== '') {
       // Push to stash (save text, cursor position, and pasted contents)
-      setStashedPrompt({ text: input, cursorOffset, pastedContents })
-      trackAndSetInput('')
-      setCursorOffset(0)
-      setPastedContents({})
+      setStashedPrompt({ text: input, cursorOffset, pastedContents });
+      trackAndSetInput('');
+      setCursorOffset(0);
+      setPastedContents({});
       // Track usage for /discover and stop showing hint
       saveGlobalConfig(c => {
-        if (c.hasUsedStash) return c
-        return { ...c, hasUsedStash: true }
-      })
+        if (c.hasUsedStash) return c;
+        return { ...c, hasUsedStash: true };
+      });
     }
-  }, [
-    input,
-    cursorOffset,
-    stashedPrompt,
-    trackAndSetInput,
-    setStashedPrompt,
-    pastedContents,
-    setPastedContents,
-  ])
+  }, [input, cursorOffset, stashedPrompt, trackAndSetInput, setStashedPrompt, pastedContents, setPastedContents]);
 
   // Handler for chat:modelPicker - toggle model picker
   const handleModelPicker = useCallback(() => {
-    setShowModelPicker(prev => !prev)
+    setShowModelPicker(prev => !prev);
     if (helpOpen) {
-      setHelpOpen(false)
+      setHelpOpen(false);
     }
-  }, [helpOpen])
+  }, [helpOpen]);
 
   // Handler for chat:fastMode - toggle fast mode picker
   const handleFastModePicker = useCallback(() => {
-    setShowFastModePicker(prev => !prev)
+    setShowFastModePicker(prev => !prev);
     if (helpOpen) {
-      setHelpOpen(false)
+      setHelpOpen(false);
     }
-  }, [helpOpen])
+  }, [helpOpen]);
 
   // Handler for chat:thinkingToggle - toggle thinking mode
   const handleThinkingToggle = useCallback(() => {
-    setShowThinkingToggle(prev => !prev)
+    setShowThinkingToggle(prev => !prev);
     if (helpOpen) {
-      setHelpOpen(false)
+      setHelpOpen(false);
     }
-  }, [helpOpen])
+  }, [helpOpen]);
 
   // Handler for chat:cycleMode - cycle through permission modes
   const handleCycleMode = useCallback(() => {
@@ -1846,22 +1583,22 @@ function PromptInput({
       const teammateContext: ToolPermissionContext = {
         ...toolPermissionContext,
         mode: viewedTeammate.permissionMode,
-      }
+      };
       // Pass undefined for teamContext (unused but kept for API compatibility)
-      const nextMode = getNextPermissionMode(teammateContext, undefined)
+      const nextMode = getNextPermissionMode(teammateContext, undefined);
 
       logEvent('tengu_mode_cycle', {
         to: nextMode as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
+      });
 
-      const teammateTaskId = viewingAgentTaskId
+      const teammateTaskId = viewingAgentTaskId;
       setAppState(prev => {
-        const task = prev.tasks[teammateTaskId]
+        const task = prev.tasks[teammateTaskId];
         if (!task || task.type !== 'in_process_teammate') {
-          return prev
+          return prev;
         }
         if (task.permissionMode === nextMode) {
-          return prev
+          return prev;
         }
         return {
           ...prev,
@@ -1872,39 +1609,36 @@ function PromptInput({
               permissionMode: nextMode,
             },
           },
-        }
-      })
+        };
+      });
 
       if (helpOpen) {
-        setHelpOpen(false)
+        setHelpOpen(false);
       }
-      return
+      return;
     }
 
     // Compute the next mode without triggering side effects first
     logForDebugging(
       `[auto-mode] handleCycleMode: currentMode=${toolPermissionContext.mode} isAutoModeAvailable=${toolPermissionContext.isAutoModeAvailable} showAutoModeOptIn=${showAutoModeOptIn} timeoutPending=${!!autoModeOptInTimeoutRef.current}`,
-    )
-    const nextMode = getNextPermissionMode(toolPermissionContext, teamContext)
+    );
+    const nextMode = getNextPermissionMode(toolPermissionContext, teamContext);
 
     // Check if user is entering auto mode for the first time. Gated on the
     // persistent settings flag (hasAutoModeOptIn) rather than the broader
     // hasAutoModeOptInAnySource so that --enable-auto-mode users still see
     // the warning dialog once — the CLI flag should grant carousel access,
     // not bypass the safety text.
-    let isEnteringAutoModeFirstTime = false
+    let isEnteringAutoModeFirstTime = false;
     if (feature('TRANSCRIPT_CLASSIFIER')) {
       isEnteringAutoModeFirstTime =
-        nextMode === 'auto' &&
-        toolPermissionContext.mode !== 'auto' &&
-        !hasAutoModeOptIn() &&
-        !viewingAgentTaskId // Only show for primary agent, not subagents
+        nextMode === 'auto' && toolPermissionContext.mode !== 'auto' && !hasAutoModeOptIn() && !viewingAgentTaskId; // Only show for primary agent, not subagents
     }
 
     if (feature('TRANSCRIPT_CLASSIFIER')) {
       if (isEnteringAutoModeFirstTime) {
         // Store previous mode so we can revert if user declines
-        setPreviousModeBeforeAuto(toolPermissionContext.mode)
+        setPreviousModeBeforeAuto(toolPermissionContext.mode);
 
         // Only update the UI mode label — do NOT call transitionPermissionMode
         // or cyclePermissionMode yet; we haven't confirmed with the user.
@@ -1914,30 +1648,30 @@ function PromptInput({
             ...prev.toolPermissionContext,
             mode: 'auto',
           },
-        }))
+        }));
         setToolPermissionContext({
           ...toolPermissionContext,
           mode: 'auto',
-        })
+        });
 
         // Show opt-in dialog after 400ms debounce
         if (autoModeOptInTimeoutRef.current) {
-          clearTimeout(autoModeOptInTimeoutRef.current)
+          clearTimeout(autoModeOptInTimeoutRef.current);
         }
         autoModeOptInTimeoutRef.current = setTimeout(
           (setShowAutoModeOptIn, autoModeOptInTimeoutRef) => {
-            setShowAutoModeOptIn(true)
-            autoModeOptInTimeoutRef.current = null
+            setShowAutoModeOptIn(true);
+            autoModeOptInTimeoutRef.current = null;
           },
           400,
           setShowAutoModeOptIn,
           autoModeOptInTimeoutRef,
-        )
+        );
 
         if (helpOpen) {
-          setHelpOpen(false)
+          setHelpOpen(false);
         }
-        return
+        return;
       }
     }
 
@@ -1949,14 +1683,14 @@ function PromptInput({
     if (feature('TRANSCRIPT_CLASSIFIER')) {
       if (showAutoModeOptIn || autoModeOptInTimeoutRef.current) {
         if (showAutoModeOptIn) {
-          logEvent('tengu_auto_mode_opt_in_dialog_decline', {})
+          logEvent('tengu_auto_mode_opt_in_dialog_decline', {});
         }
-        setShowAutoModeOptIn(false)
+        setShowAutoModeOptIn(false);
         if (autoModeOptInTimeoutRef.current) {
-          clearTimeout(autoModeOptInTimeoutRef.current)
-          autoModeOptInTimeoutRef.current = null
+          clearTimeout(autoModeOptInTimeoutRef.current);
+          autoModeOptInTimeoutRef.current = null;
         }
-        setPreviousModeBeforeAuto(null)
+        setPreviousModeBeforeAuto(null);
         // Fall through — mode is 'auto', cyclePermissionMode below goes to 'default'.
       }
     }
@@ -1964,21 +1698,18 @@ function PromptInput({
     // Now that we know this is NOT the first-time auto mode path,
     // call cyclePermissionMode to apply side effects (e.g. strip
     // dangerous permissions, activate classifier)
-    const { context: preparedContext } = cyclePermissionMode(
-      toolPermissionContext,
-      teamContext,
-    )
+    const { context: preparedContext } = cyclePermissionMode(toolPermissionContext, teamContext);
 
     logEvent('tengu_mode_cycle', {
       to: nextMode as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-    })
+    });
 
     // Track when user enters plan mode
     if (nextMode === 'plan') {
       saveGlobalConfig(current => ({
         ...current,
         lastPlanModeUse: Date.now(),
-      }))
+      }));
     }
 
     // Set the mode via setAppState directly because setToolPermissionContext
@@ -1991,18 +1722,18 @@ function PromptInput({
         ...preparedContext,
         mode: nextMode,
       },
-    }))
+    }));
     setToolPermissionContext({
       ...preparedContext,
       mode: nextMode,
-    })
+    });
 
     // If this is a teammate, update config.json so team lead sees the change
-    syncTeammateMode(nextMode, teamContext?.teamName)
+    syncTeammateMode(nextMode, teamContext?.teamName);
 
     // Close help tips if they're open when mode is cycled
     if (helpOpen) {
-      setHelpOpen(false)
+      setHelpOpen(false);
     }
   }, [
     toolPermissionContext,
@@ -2013,13 +1744,13 @@ function PromptInput({
     setToolPermissionContext,
     helpOpen,
     showAutoModeOptIn,
-  ])
+  ]);
 
   // Handler for auto mode opt-in dialog acceptance
   const handleAutoModeOptInAccept = useCallback(() => {
     if (feature('TRANSCRIPT_CLASSIFIER')) {
-      setShowAutoModeOptIn(false)
-      setPreviousModeBeforeAuto(null)
+      setShowAutoModeOptIn(false);
+      setPreviousModeBeforeAuto(null);
 
       // Now that the user accepted, apply the full transition: activate the
       // auto mode backend (classifier, beta headers) and strip dangerous
@@ -2028,49 +1759,42 @@ function PromptInput({
         previousModeBeforeAuto ?? toolPermissionContext.mode,
         'auto',
         toolPermissionContext,
-      )
+      );
       setAppState(prev => ({
         ...prev,
         toolPermissionContext: {
           ...strippedContext,
           mode: 'auto',
         },
-      }))
+      }));
       setToolPermissionContext({
         ...strippedContext,
         mode: 'auto',
-      })
+      });
 
       // Close help tips if they're open when auto mode is enabled
       if (helpOpen) {
-        setHelpOpen(false)
+        setHelpOpen(false);
       }
     }
-  }, [
-    helpOpen,
-    setHelpOpen,
-    previousModeBeforeAuto,
-    toolPermissionContext,
-    setAppState,
-    setToolPermissionContext,
-  ])
+  }, [helpOpen, setHelpOpen, previousModeBeforeAuto, toolPermissionContext, setAppState, setToolPermissionContext]);
 
   // Handler for auto mode opt-in dialog decline
   const handleAutoModeOptInDecline = useCallback(() => {
     if (feature('TRANSCRIPT_CLASSIFIER')) {
       logForDebugging(
         `[auto-mode] handleAutoModeOptInDecline: reverting to ${previousModeBeforeAuto}, setting isAutoModeAvailable=false`,
-      )
-      setShowAutoModeOptIn(false)
+      );
+      setShowAutoModeOptIn(false);
       if (autoModeOptInTimeoutRef.current) {
-        clearTimeout(autoModeOptInTimeoutRef.current)
-        autoModeOptInTimeoutRef.current = null
+        clearTimeout(autoModeOptInTimeoutRef.current);
+        autoModeOptInTimeoutRef.current = null;
       }
 
       // Revert to previous mode and remove auto from the carousel
       // for the rest of this session
       if (previousModeBeforeAuto) {
-        setAutoModeActive(false)
+        setAutoModeActive(false);
         setAppState(prev => ({
           ...prev,
           toolPermissionContext: {
@@ -2078,45 +1802,36 @@ function PromptInput({
             mode: previousModeBeforeAuto,
             isAutoModeAvailable: false,
           },
-        }))
+        }));
         setToolPermissionContext({
           ...toolPermissionContext,
           mode: previousModeBeforeAuto,
           isAutoModeAvailable: false,
-        })
-        setPreviousModeBeforeAuto(null)
+        });
+        setPreviousModeBeforeAuto(null);
       }
     }
-  }, [
-    previousModeBeforeAuto,
-    toolPermissionContext,
-    setAppState,
-    setToolPermissionContext,
-  ])
+  }, [previousModeBeforeAuto, toolPermissionContext, setAppState, setToolPermissionContext]);
 
   // Handler for chat:imagePaste - paste image from clipboard
   const handleImagePaste = useCallback(() => {
     void getImageFromClipboard().then(imageData => {
       if (imageData) {
-        onImagePaste(imageData.base64, imageData.mediaType)
+        onImagePaste(imageData.base64, imageData.mediaType);
       } else {
-        const shortcutDisplay = getShortcutDisplay(
-          'chat:imagePaste',
-          'Chat',
-          'ctrl+v',
-        )
+        const shortcutDisplay = getShortcutDisplay('chat:imagePaste', 'Chat', 'ctrl+v');
         const message = env.isSSH()
           ? "No image found in clipboard. You're SSH'd; try scp?"
-          : `No image found in clipboard. Use ${shortcutDisplay} to paste images.`
+          : `No image found in clipboard. Use ${shortcutDisplay} to paste images.`;
         addNotification({
           key: 'no-image-in-clipboard',
           text: message,
           priority: 'immediate',
           timeoutMs: 1000,
-        })
+        });
       }
-    })
-  }, [addNotification, onImagePaste])
+    });
+  }, [addNotification, onImagePaste]);
 
   // Register chat:submit handler directly in the handler registry (not via
   // useKeybindings) so that only the ChordInterceptor can invoke it for chord
@@ -2124,17 +1839,17 @@ function PromptInput({
   // handled by TextInput directly (via onSubmit prop) and useTypeahead (for
   // autocomplete acceptance). Using useKeybindings would cause
   // stopImmediatePropagation on Enter, blocking autocomplete from seeing the key.
-  const keybindingContext = useOptionalKeybindingContext()
+  const keybindingContext = useOptionalKeybindingContext();
   useEffect(() => {
-    if (!keybindingContext || isModalOverlayActive) return
+    if (!keybindingContext || isModalOverlayActive) return;
     return keybindingContext.registerHandler({
       action: 'chat:submit',
       context: 'Chat',
       handler: () => {
-        void onSubmit(input)
+        void onSubmit(input);
       },
-    })
-  }, [keybindingContext, isModalOverlayActive, onSubmit, input])
+    });
+  }, [keybindingContext, isModalOverlayActive, onSubmit, input]);
 
   // Chat context keybindings for editing shortcuts
   // Note: history:previous/history:next are NOT handled here. They are passed as
@@ -2162,26 +1877,25 @@ function PromptInput({
       handleCycleMode,
       handleImagePaste,
     ],
-  )
+  );
 
   useKeybindings(chatHandlers, {
     context: 'Chat',
     isActive: !isModalOverlayActive,
-  })
+  });
 
   // Shift+↑ enters message-actions cursor. Separate isActive so ctrl+r search
   // doesn't leave stale isSearchingHistory on cursor-exit remount.
   useKeybinding('chat:messageActions', () => onMessageActionsEnter?.(), {
     context: 'Chat',
     isActive: !isModalOverlayActive && !isSearchingHistory,
-  })
+  });
 
   // Fast mode keybinding is only active when fast mode is enabled and available
   useKeybinding('chat:fastMode', handleFastModePicker, {
     context: 'Chat',
-    isActive:
-      !isModalOverlayActive && isFastModeEnabled() && isFastModeAvailable(),
-  })
+    isActive: !isModalOverlayActive && isFastModeEnabled() && isFastModeAvailable(),
+  });
 
   // Handle help:dismiss keybinding (ESC closes help menu)
   // This is registered separately from Chat context so it has priority over
@@ -2189,64 +1903,62 @@ function PromptInput({
   useKeybinding(
     'help:dismiss',
     () => {
-      setHelpOpen(false)
+      setHelpOpen(false);
     },
     { context: 'Help', isActive: helpOpen },
-  )
+  );
 
   // Quick Open / Global Search. Hook calls are unconditional (Rules of Hooks);
   // the handler body is feature()-gated so the setState calls and component
   // references get tree-shaken in external builds.
-  const quickSearchActive = feature('QUICK_SEARCH')
-    ? !isModalOverlayActive
-    : false
+  const quickSearchActive = feature('QUICK_SEARCH') ? !isModalOverlayActive : false;
   useKeybinding(
     'app:quickOpen',
     () => {
       if (feature('QUICK_SEARCH')) {
-        setShowQuickOpen(true)
-        setHelpOpen(false)
+        setShowQuickOpen(true);
+        setHelpOpen(false);
       }
     },
     { context: 'Global', isActive: quickSearchActive },
-  )
+  );
   useKeybinding(
     'app:globalSearch',
     () => {
       if (feature('QUICK_SEARCH')) {
-        setShowGlobalSearch(true)
-        setHelpOpen(false)
+        setShowGlobalSearch(true);
+        setHelpOpen(false);
       }
     },
     { context: 'Global', isActive: quickSearchActive },
-  )
+  );
 
   useKeybinding(
     'history:search',
     () => {
       if (feature('HISTORY_PICKER')) {
-        setShowHistoryPicker(true)
-        setHelpOpen(false)
+        setShowHistoryPicker(true);
+        setHelpOpen(false);
       }
     },
     {
       context: 'Global',
       isActive: feature('HISTORY_PICKER') ? !isModalOverlayActive : false,
     },
-  )
+  );
 
   // Handle Ctrl+C to abort speculation when idle (not loading)
   // CancelRequestHandler only handles Ctrl+C during active tasks
   useKeybinding(
     'app:interrupt',
     () => {
-      abortSpeculation(setAppState)
+      abortSpeculation(setAppState);
     },
     {
       context: 'Global',
       isActive: !isLoading && speculation.status === 'active',
     },
-  )
+  );
 
   // Footer indicator navigation keybindings. ↑/↓ live here (not in
   // handleHistoryUp/Down) because TextInput focus=false when a pill is
@@ -2261,80 +1973,75 @@ function PromptInput({
           coordinatorTaskCount > 0 &&
           coordinatorTaskIndex > minCoordinatorIndex
         ) {
-          setCoordinatorTaskIndex(prev => prev - 1)
-          return
+          setCoordinatorTaskIndex(prev => prev - 1);
+          return;
         }
-        navigateFooter(-1, true)
+        navigateFooter(-1, true);
       },
       'footer:down': () => {
         // ↓ scrolls within the coordinator task list, never leaves the pill
-        if (
-          tasksSelected &&
-          process.env.USER_TYPE === 'ant' &&
-          coordinatorTaskCount > 0
-        ) {
+        if (tasksSelected && process.env.USER_TYPE === 'ant' && coordinatorTaskCount > 0) {
           if (coordinatorTaskIndex < coordinatorTaskCount - 1) {
-            setCoordinatorTaskIndex(prev => prev + 1)
+            setCoordinatorTaskIndex(prev => prev + 1);
           }
-          return
+          return;
         }
         if (tasksSelected && !isTeammateMode) {
-          setShowBashesDialog(true)
-          selectFooterItem(null)
-          return
+          setShowBashesDialog(true);
+          selectFooterItem(null);
+          return;
         }
-        navigateFooter(1)
+        navigateFooter(1);
       },
       'footer:next': () => {
         // Teammate mode: ←/→ cycles within the team member list
         if (tasksSelected && isTeammateMode) {
-          const totalAgents = 1 + inProcessTeammates.length
-          setTeammateFooterIndex(prev => (prev + 1) % totalAgents)
-          return
+          const totalAgents = 1 + inProcessTeammates.length;
+          setTeammateFooterIndex(prev => (prev + 1) % totalAgents);
+          return;
         }
-        navigateFooter(1)
+        navigateFooter(1);
       },
       'footer:previous': () => {
         if (tasksSelected && isTeammateMode) {
-          const totalAgents = 1 + inProcessTeammates.length
-          setTeammateFooterIndex(prev => (prev - 1 + totalAgents) % totalAgents)
-          return
+          const totalAgents = 1 + inProcessTeammates.length;
+          setTeammateFooterIndex(prev => (prev - 1 + totalAgents) % totalAgents);
+          return;
         }
-        navigateFooter(-1)
+        navigateFooter(-1);
       },
       'footer:openSelected': () => {
         if (viewSelectionMode === 'selecting-agent') {
-          return
+          return;
         }
         switch (footerItemSelected) {
           case 'companion':
             if (feature('BUDDY')) {
-              selectFooterItem(null)
-              void onSubmit('/buddy')
+              selectFooterItem(null);
+              void onSubmit('/buddy');
             }
-            break
+            break;
           case 'tasks':
             if (isTeammateMode) {
               // Enter switches to the selected agent's view
               if (teammateFooterIndex === 0) {
-                exitTeammateView(setAppState)
+                exitTeammateView(setAppState);
               } else {
-                const teammate = inProcessTeammates[teammateFooterIndex - 1]
-                if (teammate) enterTeammateView(teammate.id, setAppState)
+                const teammate = inProcessTeammates[teammateFooterIndex - 1];
+                if (teammate) enterTeammateView(teammate.id, setAppState);
               }
             } else if (coordinatorTaskIndex === 0 && coordinatorTaskCount > 0) {
-              exitTeammateView(setAppState)
+              exitTeammateView(setAppState);
             } else {
-              const selectedTaskId =
-                getVisibleAgentTasks(tasks)[coordinatorTaskIndex - 1]?.id
+              const selectedTaskId = getVisibleAgentTasks(tasks)[coordinatorTaskIndex - 1]?.id;
               if (selectedTaskId) {
-                enterTeammateView(selectedTaskId, setAppState)
+                enterTeammateView(selectedTaskId, setAppState);
               } else {
-                setShowBashesDialog(true)
-                selectFooterItem(null)
+                setShowBashesDialog(true);
+                selectFooterItem(null);
               }
             }
-            break
+            break;
           case 'tmux':
             if (process.env.USER_TYPE === 'ant') {
               setAppState(prev =>
@@ -2342,91 +2049,78 @@ function PromptInput({
                   ? { ...prev, tungstenPanelAutoHidden: false }
                   : {
                       ...prev,
-                      tungstenPanelVisible: !(
-                        prev.tungstenPanelVisible ?? true
-                      ),
+                      tungstenPanelVisible: !(prev.tungstenPanelVisible ?? true),
                     },
-              )
+              );
             }
-            break
+            break;
           case 'bagel':
-            break
+            break;
           case 'teams':
-            setShowTeamsDialog(true)
-            selectFooterItem(null)
-            break
+            setShowTeamsDialog(true);
+            selectFooterItem(null);
+            break;
           case 'bridge':
-            setShowBridgeDialog(true)
-            selectFooterItem(null)
-            break
+            setShowBridgeDialog(true);
+            selectFooterItem(null);
+            break;
         }
       },
       'footer:clearSelection': () => {
-        selectFooterItem(null)
+        selectFooterItem(null);
       },
       'footer:close': () => {
         if (tasksSelected && coordinatorTaskIndex >= 1) {
-          const task = getVisibleAgentTasks(tasks)[coordinatorTaskIndex - 1]
-          if (!task) return false
+          const task = getVisibleAgentTasks(tasks)[coordinatorTaskIndex - 1];
+          if (!task) return false;
           // When the selected row IS the viewed agent, 'x' types into the
           // steering input. Any other row — dismiss it.
-          if (
-            viewSelectionMode === 'viewing-agent' &&
-            task.id === viewingAgentTaskId
-          ) {
-            onChange(
-              input.slice(0, cursorOffset) + 'x' + input.slice(cursorOffset),
-            )
-            setCursorOffset(cursorOffset + 1)
-            return
+          if (viewSelectionMode === 'viewing-agent' && task.id === viewingAgentTaskId) {
+            onChange(input.slice(0, cursorOffset) + 'x' + input.slice(cursorOffset));
+            setCursorOffset(cursorOffset + 1);
+            return;
           }
-          stopOrDismissAgent(task.id, setAppState)
+          stopOrDismissAgent(task.id, setAppState);
           if (task.status !== 'running') {
-            setCoordinatorTaskIndex(i => Math.max(minCoordinatorIndex, i - 1))
+            setCoordinatorTaskIndex(i => Math.max(minCoordinatorIndex, i - 1));
           }
-          return
+          return;
         }
         // Not handled — let 'x' fall through to type-to-exit
-        return false
+        return false;
       },
     },
     {
       context: 'Footer',
       isActive: !!footerItemSelected && !isModalOverlayActive,
     },
-  )
+  );
 
   useInput((char, key) => {
     // Skip all input handling when a full-screen dialog is open. These dialogs
     // render via early return, but hooks run unconditionally — so without this
     // guard, Escape inside a dialog leaks to the double-press message-selector.
-    if (
-      showTeamsDialog ||
-      showQuickOpen ||
-      showGlobalSearch ||
-      showHistoryPicker
-    ) {
-      return
+    if (showTeamsDialog || showQuickOpen || showGlobalSearch || showHistoryPicker) {
+      return;
     }
 
     // Detect failed Alt shortcuts on macOS (Option key produces special characters)
     if (getPlatform() === 'macos' && isMacosOptionChar(char)) {
-      const shortcut = MACOS_OPTION_SPECIAL_CHARS[char]
-      const terminalName = getNativeCSIuTerminalDisplayName()
+      const shortcut = MACOS_OPTION_SPECIAL_CHARS[char];
+      const terminalName = getNativeCSIuTerminalDisplayName();
       const jsx = terminalName ? (
         <Text dimColor>
-          To enable {shortcut}, set <Text bold>Option as Meta</Text> in{' '}
-          {terminalName} preferences (⌘,)
+          To enable {shortcut}, set <Text bold>Option as Meta</Text> in {terminalName} preferences (⌘,)
         </Text>
       ) : (
         <Text dimColor>To enable {shortcut}, run /terminal-setup</Text>
-      )
+      );
       addNotification({
         key: 'option-meta-hint',
         jsx,
         priority: 'immediate',
         timeoutMs: 5000,
-      })
+      });
       // Don't return - let the character be typed so user sees the issue
     }
 
@@ -2438,31 +2132,21 @@ function PromptInput({
     // the input and type the char. Nav keys are captured by useKeybindings
     // above, so anything reaching here is genuinely not a footer action.
     // onChange clears footerSelection, so no explicit deselect.
-    if (
-      footerItemSelected &&
-      char &&
-      !key.ctrl &&
-      !key.meta &&
-      !key.escape &&
-      !key.return
-    ) {
-      onChange(input.slice(0, cursorOffset) + char + input.slice(cursorOffset))
-      setCursorOffset(cursorOffset + char.length)
-      return
+    if (footerItemSelected && char && !key.ctrl && !key.meta && !key.escape && !key.return) {
+      onChange(input.slice(0, cursorOffset) + char + input.slice(cursorOffset));
+      setCursorOffset(cursorOffset + char.length);
+      return;
     }
 
     // Exit special modes when backspace/escape/delete/ctrl+u is pressed at cursor position 0
-    if (
-      cursorOffset === 0 &&
-      (key.escape || key.backspace || key.delete || (key.ctrl && char === 'u'))
-    ) {
-      onModeChange('prompt')
-      setHelpOpen(false)
+    if (cursorOffset === 0 && (key.escape || key.backspace || key.delete || (key.ctrl && char === 'u'))) {
+      onModeChange('prompt');
+      setHelpOpen(false);
     }
 
     // Exit help mode when backspace is pressed and input is empty
     if (helpOpen && input === '' && (key.backspace || key.delete)) {
-      setHelpOpen(false)
+      setHelpOpen(false);
     }
 
     // esc is a little overloaded:
@@ -2475,83 +2159,77 @@ function PromptInput({
     if (key.escape) {
       // Abort active speculation
       if (speculation.status === 'active') {
-        abortSpeculation(setAppState)
-        return
+        abortSpeculation(setAppState);
+        return;
       }
 
       // Dismiss side question response if visible
       if (isSideQuestionVisible && onDismissSideQuestion) {
-        onDismissSideQuestion()
-        return
+        onDismissSideQuestion();
+        return;
       }
 
       // Close help menu if open
       if (helpOpen) {
-        setHelpOpen(false)
-        return
+        setHelpOpen(false);
+        return;
       }
 
       // Footer selection clearing is now handled via Footer context keybindings
       // (footer:clearSelection action bound to escape)
       // If a footer item is selected, let the Footer keybinding handle it
       if (footerItemSelected) {
-        return
+        return;
       }
 
       // If there's an editable queued command, move it to the input for editing when ESC is pressed
-      const hasEditableCommand = queuedCommands.some(isQueuedCommandEditable)
+      const hasEditableCommand = queuedCommands.some(isQueuedCommandEditable);
       if (hasEditableCommand) {
-        void popAllCommandsFromQueue()
-        return
+        void popAllCommandsFromQueue();
+        return;
       }
 
       if (messages.length > 0 && !input && !isLoading) {
-        doublePressEscFromEmpty()
+        doublePressEscFromEmpty();
       }
     }
 
     if (key.return && helpOpen) {
-      setHelpOpen(false)
+      setHelpOpen(false);
     }
-  })
+  });
 
-  const swarmBanner = useSwarmBanner()
+  const swarmBanner = useSwarmBanner();
 
-  const fastModeCooldown = isFastModeEnabled() ? isFastModeCooldown() : false
-  const showFastIcon = isFastModeEnabled()
-    ? isFastMode && (isFastModeAvailable() || fastModeCooldown)
-    : false
+  const fastModeCooldown = isFastModeEnabled() ? isFastModeCooldown() : false;
+  const showFastIcon = isFastModeEnabled() ? isFastMode && (isFastModeAvailable() || fastModeCooldown) : false;
 
-  const showFastIconHint = useShowFastIconHint(showFastIcon ?? false)
+  const showFastIconHint = useShowFastIconHint(showFastIcon ?? false);
 
   // Show effort notification on startup and when effort changes.
   // Suppressed in brief/assistant mode — the value reflects the local
   // client's effort, not the connected agent's.
-  const effortNotificationText = briefOwnsGap
-    ? undefined
-    : getEffortNotificationText(effortValue, mainLoopModel)
+  const effortNotificationText = briefOwnsGap ? undefined : getEffortNotificationText(effortValue, mainLoopModel);
   useEffect(() => {
     if (!effortNotificationText) {
-      removeNotification('effort-level')
-      return
+      removeNotification('effort-level');
+      return;
     }
     addNotification({
       key: 'effort-level',
       text: effortNotificationText,
       priority: 'high',
       timeoutMs: 12_000,
-    })
-  }, [effortNotificationText, addNotification, removeNotification])
+    });
+  }, [effortNotificationText, addNotification, removeNotification]);
 
-  useBuddyNotification()
+  useBuddyNotification();
 
   const companionSpeaking = feature('BUDDY')
-    ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-      useAppState(s => s.companionReaction !== undefined)
-    : false
-  const { columns, rows } = useTerminalSize()
-  const textInputColumns =
-    columns - 3 - companionReservedColumns(columns, companionSpeaking)
+    ? useAppState(s => s.companionReaction !== undefined)
+    : false;
+  const { columns, rows } = useTerminalSize();
+  const textInputColumns = columns - 3 - companionReservedColumns(columns, companionSpeaking);
 
   // POC: click-to-position-cursor. Mouse tracking is only enabled inside
   // <AlternateScreen>, so this is dormant in the normal main-screen REPL.
@@ -2560,100 +2238,82 @@ function PromptInput({
   // in the Cursor wrap model. MeasuredText.getOffsetFromPosition handles
   // wide chars, wrapped lines, and clamps past-end clicks to line end.
   const maxVisibleLines = isFullscreenEnvEnabled()
-    ? Math.max(
-        MIN_INPUT_VIEWPORT_LINES,
-        Math.floor(rows / 2) - PROMPT_FOOTER_LINES,
-      )
-    : undefined
+    ? Math.max(MIN_INPUT_VIEWPORT_LINES, Math.floor(rows / 2) - PROMPT_FOOTER_LINES)
+    : undefined;
 
   const handleInputClick = useCallback(
     (e: ClickEvent) => {
       // During history search the displayed text is historyMatch, not
       // input, and showCursor is false anyway — skip rather than
       // compute an offset against the wrong string.
-      if (!input || isSearchingHistory) return
-      const c = Cursor.fromText(input, textInputColumns, cursorOffset)
-      const viewportStart = c.getViewportStartLine(maxVisibleLines)
+      if (!input || isSearchingHistory) return;
+      const c = Cursor.fromText(input, textInputColumns, cursorOffset);
+      const viewportStart = c.getViewportStartLine(maxVisibleLines);
       const offset = c.measuredText.getOffsetFromPosition({
         line: e.localRow + viewportStart,
         column: e.localCol,
-      })
-      setCursorOffset(offset)
+      });
+      setCursorOffset(offset);
     },
-    [
-      input,
-      textInputColumns,
-      isSearchingHistory,
-      cursorOffset,
-      maxVisibleLines,
-    ],
-  )
+    [input, textInputColumns, isSearchingHistory, cursorOffset, maxVisibleLines],
+  );
 
   const handleOpenTasksDialog = useCallback(
     (taskId?: string) => setShowBashesDialog(taskId ?? true),
     [setShowBashesDialog],
-  )
+  );
 
-  const placeholder =
-    showPromptSuggestion && promptSuggestion
-      ? promptSuggestion
-      : defaultPlaceholder
+  const placeholder = showPromptSuggestion && promptSuggestion ? promptSuggestion : defaultPlaceholder;
 
   // Calculate if input has multiple lines
-  const isInputWrapped = useMemo(() => input.includes('\n'), [input])
+  const isInputWrapped = useMemo(() => input.includes('\n'), [input]);
 
   // Memoized callbacks for model picker to prevent re-renders when unrelated
   // state (like notifications) changes. This prevents the inline model picker
   // from visually "jumping" when notifications arrive.
   const handleModelSelect = useCallback(
     (model: string | null, _effort: EffortLevel | undefined) => {
-      let wasFastModeDisabled = false
+      let wasFastModeDisabled = false;
       setAppState(prev => {
-        wasFastModeDisabled =
-          isFastModeEnabled() &&
-          !isFastModeSupportedByModel(model) &&
-          !!prev.fastMode
+        wasFastModeDisabled = isFastModeEnabled() && !isFastModeSupportedByModel(model) && !!prev.fastMode;
         return {
           ...prev,
           mainLoopModel: model,
           mainLoopModelForSession: null,
           // Turn off fast mode if switching to a model that doesn't support it
           ...(wasFastModeDisabled && { fastMode: false }),
-        }
-      })
-      setShowModelPicker(false)
-      const effectiveFastMode = (isFastMode ?? false) && !wasFastModeDisabled
-      let message = `Model set to ${modelDisplayString(model)}`
-      if (
-        isBilledAsExtraUsage(model, effectiveFastMode, isOpus1mMergeEnabled())
-      ) {
-        message += ' · Billed as extra usage'
+        };
+      });
+      setShowModelPicker(false);
+      const effectiveFastMode = (isFastMode ?? false) && !wasFastModeDisabled;
+      let message = `Model set to ${modelDisplayString(model)}`;
+      if (isBilledAsExtraUsage(model, effectiveFastMode, isOpus1mMergeEnabled())) {
+        message += ' · Billed as extra usage';
       }
       if (wasFastModeDisabled) {
-        message += ' · Fast mode OFF'
+        message += ' · Fast mode OFF';
       }
       addNotification({
         key: 'model-switched',
         jsx: <Text>{message}</Text>,
         priority: 'immediate',
         timeoutMs: 3000,
-      })
+      });
       logEvent('tengu_model_picker_hotkey', {
-        model:
-          model as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
+        model: model as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
     },
     [setAppState, addNotification, isFastMode],
-  )
+  );
 
   const handleModelCancel = useCallback(() => {
-    setShowModelPicker(false)
-  }, [])
+    setShowModelPicker(false);
+  }, []);
 
   // Memoize the model picker element to prevent unnecessary re-renders
   // when AppState changes for unrelated reasons (e.g., notifications arriving)
   const modelPickerElement = useMemo(() => {
-    if (!showModelPicker) return null
+    if (!showModelPicker) return null;
     return (
       <Box flexDirection="column" marginTop={1}>
         <ModelPicker
@@ -2663,49 +2323,37 @@ function PromptInput({
           onCancel={handleModelCancel}
           isStandaloneCommand
           showFastModeNotice={
-            isFastModeEnabled() &&
-            isFastMode &&
-            isFastModeSupportedByModel(mainLoopModel_) &&
-            isFastModeAvailable()
+            isFastModeEnabled() && isFastMode && isFastModeSupportedByModel(mainLoopModel_) && isFastModeAvailable()
           }
         />
       </Box>
-    )
-  }, [
-    showModelPicker,
-    mainLoopModel_,
-    mainLoopModelForSession,
-    handleModelSelect,
-    handleModelCancel,
-  ])
+    );
+  }, [showModelPicker, mainLoopModel_, mainLoopModelForSession, handleModelSelect, handleModelCancel]);
 
   const handleFastModeSelect = useCallback(
     (result?: string) => {
-      setShowFastModePicker(false)
+      setShowFastModePicker(false);
       if (result) {
         addNotification({
           key: 'fast-mode-toggled',
           jsx: <Text>{result}</Text>,
           priority: 'immediate',
           timeoutMs: 3000,
-        })
+        });
       }
     },
     [addNotification],
-  )
+  );
 
   // Memoize the fast mode picker element
   const fastModePickerElement = useMemo(() => {
-    if (!showFastModePicker) return null
+    if (!showFastModePicker) return null;
     return (
       <Box flexDirection="column" marginTop={1}>
-        <FastModePicker
-          onDone={handleFastModeSelect}
-          unavailableReason={getFastModeUnavailableReason()}
-        />
+        <FastModePicker onDone={handleFastModeSelect} unavailableReason={getFastModeUnavailableReason()} />
       </Box>
-    )
-  }, [showFastModePicker, handleFastModeSelect])
+    );
+  }, [showFastModePicker, handleFastModeSelect]);
 
   // Memoized callbacks for thinking toggle
   const handleThinkingSelect = useCallback(
@@ -2713,9 +2361,9 @@ function PromptInput({
       setAppState(prev => ({
         ...prev,
         thinkingEnabled: enabled,
-      }))
-      setShowThinkingToggle(false)
-      logEvent('tengu_thinking_toggled_hotkey', { enabled })
+      }));
+      setShowThinkingToggle(false);
+      logEvent('tengu_thinking_toggled_hotkey', { enabled });
       addNotification({
         key: 'thinking-toggled-hotkey',
         jsx: (
@@ -2725,18 +2373,18 @@ function PromptInput({
         ),
         priority: 'immediate',
         timeoutMs: 3000,
-      })
+      });
     },
     [setAppState, addNotification],
-  )
+  );
 
   const handleThinkingCancel = useCallback(() => {
-    setShowThinkingToggle(false)
-  }, [])
+    setShowThinkingToggle(false);
+  }, []);
 
   // Memoize the thinking toggle element
   const thinkingToggleElement = useMemo(() => {
-    if (!showThinkingToggle) return null
+    if (!showThinkingToggle) return null;
     return (
       <Box flexDirection="column" marginTop={1}>
         <ThinkingToggle
@@ -2746,14 +2394,8 @@ function PromptInput({
           isMidConversation={messages.some(m => m.type === 'assistant')}
         />
       </Box>
-    )
-  }, [
-    showThinkingToggle,
-    thinkingEnabled,
-    handleThinkingSelect,
-    handleThinkingCancel,
-    messages.length,
-  ])
+    );
+  }, [showThinkingToggle, thinkingEnabled, handleThinkingSelect, handleThinkingCancel, messages.length]);
 
   // Portal dialog to DialogOverlay in fullscreen so it escapes the bottom
   // slot's overflowY:hidden clip (same pattern as SuggestionsOverlay).
@@ -2762,32 +2404,20 @@ function PromptInput({
   const autoModeOptInDialog = useMemo(
     () =>
       feature('TRANSCRIPT_CLASSIFIER') && showAutoModeOptIn ? (
-        <AutoModeOptInDialog
-          onAccept={handleAutoModeOptInAccept}
-          onDecline={handleAutoModeOptInDecline}
-        />
+        <AutoModeOptInDialog onAccept={handleAutoModeOptInAccept} onDecline={handleAutoModeOptInDecline} />
       ) : null,
     [showAutoModeOptIn, handleAutoModeOptInAccept, handleAutoModeOptInDecline],
-  )
-  useSetPromptOverlayDialog(
-    isFullscreenEnvEnabled() ? autoModeOptInDialog : null,
-  )
+  );
+  useSetPromptOverlayDialog(isFullscreenEnvEnabled() ? autoModeOptInDialog : null);
 
   if (showBashesDialog) {
     return (
       <BackgroundTasksDialog
         onDone={() => setShowBashesDialog(false)}
-        toolUseContext={getToolUseContext(
-          messages,
-          [],
-          new AbortController(),
-          mainLoopModel,
-        )}
-        initialDetailTaskId={
-          typeof showBashesDialog === 'string' ? showBashesDialog : undefined
-        }
+        toolUseContext={getToolUseContext(messages, [], new AbortController(), mainLoopModel)}
+        initialDetailTaskId={typeof showBashesDialog === 'string' ? showBashesDialog : undefined}
       />
-    )
+    );
   }
 
   if (isAgentSwarmsEnabled() && showTeamsDialog) {
@@ -2795,32 +2425,22 @@ function PromptInput({
       <TeamsDialog
         initialTeams={cachedTeams}
         onDone={() => {
-          setShowTeamsDialog(false)
+          setShowTeamsDialog(false);
         }}
       />
-    )
+    );
   }
 
   if (feature('QUICK_SEARCH')) {
     const insertWithSpacing = (text: string) => {
-      const cursorChar = input[cursorOffset - 1] ?? ' '
-      insertTextAtCursor(/\s/.test(cursorChar) ? text : ` ${text}`)
-    }
+      const cursorChar = input[cursorOffset - 1] ?? ' ';
+      insertTextAtCursor(/\s/.test(cursorChar) ? text : ` ${text}`);
+    };
     if (showQuickOpen) {
-      return (
-        <QuickOpenDialog
-          onDone={() => setShowQuickOpen(false)}
-          onInsert={insertWithSpacing}
-        />
-      )
+      return <QuickOpenDialog onDone={() => setShowQuickOpen(false)} onInsert={insertWithSpacing} />;
     }
     if (showGlobalSearch) {
-      return (
-        <GlobalSearchDialog
-          onDone={() => setShowGlobalSearch(false)}
-          onInsert={insertWithSpacing}
-        />
-      )
+      return <GlobalSearchDialog onDone={() => setShowGlobalSearch(false)} onInsert={insertWithSpacing} />;
     }
   }
 
@@ -2829,41 +2449,41 @@ function PromptInput({
       <HistorySearchDialog
         initialQuery={input}
         onSelect={entry => {
-          const entryMode = getModeFromInput(entry.display)
-          const value = getValueFromInput(entry.display)
-          onModeChange(entryMode)
-          trackAndSetInput(value)
-          setPastedContents(entry.pastedContents)
-          setCursorOffset(value.length)
-          setShowHistoryPicker(false)
+          const entryMode = getModeFromInput(entry.display);
+          const value = getValueFromInput(entry.display);
+          onModeChange(entryMode);
+          trackAndSetInput(value);
+          setPastedContents(entry.pastedContents);
+          setCursorOffset(value.length);
+          setShowHistoryPicker(false);
         }}
         onCancel={() => setShowHistoryPicker(false)}
       />
-    )
+    );
   }
 
   // Show loop mode menu when requested (ant-only, eliminated from external builds)
   if (modelPickerElement) {
-    return modelPickerElement
+    return modelPickerElement;
   }
 
   if (fastModePickerElement) {
-    return fastModePickerElement
+    return fastModePickerElement;
   }
 
   if (thinkingToggleElement) {
-    return thinkingToggleElement
+    return thinkingToggleElement;
   }
 
   if (showBridgeDialog) {
     return (
       <BridgeDialog
         onDone={() => {
-          setShowBridgeDialog(false)
-          selectFooterItem(null)
+          setShowBridgeDialog(false);
+          selectFooterItem(null);
         }}
       />
-    )
+    );
   }
 
   const baseProps: BaseTextInputProps = {
@@ -2871,11 +2491,7 @@ function PromptInput({
     onSubmit,
     onChange,
     value: historyMatch
-      ? getValueFromInput(
-          typeof historyMatch === 'string'
-            ? historyMatch
-            : historyMatch.display,
-        )
+      ? getValueFromInput(typeof historyMatch === 'string' ? historyMatch : historyMatch.display)
       : input,
     // History navigation is handled via TextInput props (onHistoryUp/onHistoryDown),
     // NOT via useKeybindings. This allows useTextInput's upOrHistoryUp/downOrHistoryDown
@@ -2890,58 +2506,53 @@ function PromptInput({
     onImagePaste,
     columns: textInputColumns,
     maxVisibleLines,
-    disableCursorMovementForUpDownKeys:
-      suggestions.length > 0 || !!footerItemSelected,
+    disableCursorMovementForUpDownKeys: suggestions.length > 0 || !!footerItemSelected,
     disableEscapeDoublePress: suggestions.length > 0,
     cursorOffset,
     onChangeCursorOffset: setCursorOffset,
     onPaste: onTextPaste,
     onIsPastingChange: setIsPasting,
     focus: !isSearchingHistory && !isModalOverlayActive && !footerItemSelected,
-    showCursor:
-      !footerItemSelected && !isSearchingHistory && !cursorAtImageChip,
+    showCursor: !footerItemSelected && !isSearchingHistory && !cursorAtImageChip,
     argumentHint: commandArgumentHint,
     onUndo: canUndo
       ? () => {
-          const previousState = undo()
+          const previousState = undo();
           if (previousState) {
-            trackAndSetInput(previousState.text)
-            setCursorOffset(previousState.cursorOffset)
-            setPastedContents(previousState.pastedContents)
+            trackAndSetInput(previousState.text);
+            setCursorOffset(previousState.cursorOffset);
+            setPastedContents(previousState.pastedContents);
           }
         }
       : undefined,
     highlights: combinedHighlights,
     inlineGhostText,
     inputFilter: lazySpaceInputFilter,
-  }
+  };
 
   const getBorderColor = (): keyof Theme => {
     const modeColors: Record<string, keyof Theme> = {
       bash: 'bashBorder',
-    }
+    };
 
     // Mode colors take priority, then teammate color, then default
     if (modeColors[mode]) {
-      return modeColors[mode]
+      return modeColors[mode];
     }
 
     // In-process teammates run headless - don't apply teammate colors to leader UI
     if (isInProcessTeammate()) {
-      return 'promptBorder'
+      return 'promptBorder';
     }
 
     // Check for teammate color from environment
-    const teammateColorName = getTeammateColor()
-    if (
-      teammateColorName &&
-      AGENT_COLORS.includes(teammateColorName as AgentColorName)
-    ) {
-      return AGENT_COLOR_TO_THEME_COLOR[teammateColorName as AgentColorName]
+    const teammateColorName = getTeammateColor();
+    if (teammateColorName && AGENT_COLORS.includes(teammateColorName as AgentColorName)) {
+      return AGENT_COLOR_TO_THEME_COLOR[teammateColorName as AgentColorName];
     }
 
-    return 'promptBorder'
-  }
+    return 'promptBorder';
+  };
 
   if (isExternalEditorActive) {
     return (
@@ -2960,18 +2571,14 @@ function PromptInput({
           Save and close editor to continue...
         </Text>
       </Box>
-    )
+    );
   }
 
   const textInputElement = isVimModeEnabled() ? (
-    <VimTextInput
-      {...baseProps}
-      initialMode={vimMode}
-      onModeChange={setVimMode}
-    />
+    <VimTextInput {...baseProps} initialMode={vimMode} onModeChange={setVimMode} />
   ) : (
     <TextInput {...baseProps} />
-  )
+  );
 
   return (
     <Box flexDirection="column" marginTop={briefOwnsGap ? 0 : 1}>
@@ -2987,9 +2594,7 @@ function PromptInput({
           <Text color={swarmBanner.bgColor}>
             {swarmBanner.text ? (
               <>
-                {'─'.repeat(
-                  Math.max(0, columns - stringWidth(swarmBanner.text) - 4),
-                )}
+                {'─'.repeat(Math.max(0, columns - stringWidth(swarmBanner.text) - 4))}
                 <Text backgroundColor={swarmBanner.bgColor} color="inverseText">
                   {' '}
                   {swarmBanner.text}{' '}
@@ -3024,11 +2629,7 @@ function PromptInput({
           borderRight={false}
           borderBottom
           width="100%"
-          borderText={buildBorderText(
-            showFastIcon ?? false,
-            showFastIconHint,
-            fastModeCooldown,
-          )}
+          borderText={buildBorderText(showFastIcon ?? false, showFastIconHint, fastModeCooldown)}
         >
           <PromptInputModeIndicator
             mode={mode}
@@ -3073,9 +2674,7 @@ function PromptInput({
         historyQuery={historyQuery}
         setHistoryQuery={setHistoryQuery}
         historyFailedMatch={historyFailedMatch}
-        onOpenTasksDialog={
-          isFullscreenEnvEnabled() ? handleOpenTasksDialog : undefined
-        }
+        onOpenTasksDialog={isFullscreenEnvEnabled() ? handleOpenTasksDialog : undefined}
       />
       {isFullscreenEnvEnabled() ? null : autoModeOptInDialog}
       {isFullscreenEnvEnabled() ? (
@@ -3122,7 +2721,7 @@ function PromptInput({
         </Box>
       ) : null}
     </Box>
-  )
+  );
 }
 
 /**
@@ -3130,29 +2729,29 @@ function PromptInput({
  * This handles --continue/--resume scenarios where we need to avoid ID collisions.
  */
 function getInitialPasteId(messages: Message[]): number {
-  let maxId = 0
+  let maxId = 0;
   for (const message of messages) {
     if (message.type === 'user') {
       // Check image paste IDs
       if (message.imagePasteIds) {
         for (const id of message.imagePasteIds as number[]) {
-          if (id > maxId) maxId = id
+          if (id > maxId) maxId = id;
         }
       }
       // Check text paste references in message content
       if (Array.isArray(message.message!.content)) {
         for (const block of message.message!.content) {
           if (block.type === 'text') {
-            const refs = parseReferences(block.text)
+            const refs = parseReferences(block.text);
             for (const ref of refs) {
-              if (ref.id > maxId) maxId = ref.id
+              if (ref.id > maxId) maxId = ref.id;
             }
           }
         }
       }
     }
   }
-  return maxId + 1
+  return maxId + 1;
 }
 
 function buildBorderText(
@@ -3160,16 +2759,16 @@ function buildBorderText(
   showFastIconHint: boolean,
   fastModeCooldown: boolean,
 ): BorderTextOptions | undefined {
-  if (!showFastIcon) return undefined
+  if (!showFastIcon) return undefined;
   const fastSeg = showFastIconHint
     ? `${getFastIconString(true, fastModeCooldown)} ${chalk.dim('/fast')}`
-    : getFastIconString(true, fastModeCooldown)
+    : getFastIconString(true, fastModeCooldown);
   return {
     content: ` ${fastSeg} `,
     position: 'top',
     align: 'end',
     offset: 0,
-  }
+  };
 }
 
-export default React.memo(PromptInput)
+export default React.memo(PromptInput);
diff --git a/src/components/PromptInput/PromptInputFooter.tsx b/src/components/PromptInput/PromptInputFooter.tsx
index 2261e56b0..f1193ba9f 100644
--- a/src/components/PromptInput/PromptInputFooter.tsx
+++ b/src/components/PromptInput/PromptInputFooter.tsx
@@ -1,39 +1,32 @@
-import { feature } from 'bun:bundle'
-import * as React from 'react'
-import { memo, type ReactNode, useCallback, useMemo, useRef, useState } from 'react'
-import { isBridgeEnabled } from '../../bridge/bridgeEnabled.js'
-import { getBridgeStatus } from '../../bridge/bridgeStatusUtil.js'
-import { useSetPromptOverlay } from '../../context/promptOverlayContext.js'
-import type { VerificationStatus } from '../../hooks/useApiKeyVerification.js'
-import type { IDESelection } from '../../hooks/useIdeSelection.js'
-import { useSettings } from '../../hooks/useSettings.js'
-import { useTerminalSize } from '../../hooks/useTerminalSize.js'
-import { Box, Text, useInput } from '@anthropic/ink'
-import type { MCPServerConnection } from '../../services/mcp/types.js'
-import { useRegisterOverlay } from '../../context/overlayContext.js'
-import { useAppState, useSetAppState } from '../../state/AppState.js'
-import type { ToolPermissionContext } from '../../Tool.js'
-import type { Message } from '../../types/message.js'
-import type { PromptInputMode, VimMode } from '../../types/textInputTypes.js'
-import type { AutoUpdaterResult } from '../../utils/autoUpdater.js'
-import { isFullscreenEnvEnabled } from '../../utils/fullscreen.js'
-import { getPipeDisplayRole, isPipeControlled } from '../../utils/pipeTransport.js'
-import { isUndercover } from '../../utils/undercover.js'
-import {
-  CoordinatorTaskPanel,
-  useCoordinatorTaskCount,
-} from '../CoordinatorAgentStatus.js'
-import {
-  getLastAssistantMessageId,
-  StatusLine,
-  statusLineShouldDisplay,
-} from '../StatusLine.js'
-import { Notifications } from './Notifications.js'
-import { PromptInputFooterLeftSide } from './PromptInputFooterLeftSide.js'
+import { feature } from 'bun:bundle';
+import * as React from 'react';
+import { memo, type ReactNode, useCallback, useMemo, useRef, useState } from 'react';
+import { isBridgeEnabled } from '../../bridge/bridgeEnabled.js';
+import { getBridgeStatus } from '../../bridge/bridgeStatusUtil.js';
+import { useSetPromptOverlay } from '../../context/promptOverlayContext.js';
+import type { VerificationStatus } from '../../hooks/useApiKeyVerification.js';
+import type { IDESelection } from '../../hooks/useIdeSelection.js';
+import { useSettings } from '../../hooks/useSettings.js';
+import { useTerminalSize } from '../../hooks/useTerminalSize.js';
+import { Box, Text, useInput } from '@anthropic/ink';
+import type { MCPServerConnection } from '../../services/mcp/types.js';
+import { useRegisterOverlay } from '../../context/overlayContext.js';
+import { useAppState, useSetAppState } from '../../state/AppState.js';
+import type { ToolPermissionContext } from '../../Tool.js';
+import type { Message } from '../../types/message.js';
+import type { PromptInputMode, VimMode } from '../../types/textInputTypes.js';
+import type { AutoUpdaterResult } from '../../utils/autoUpdater.js';
+import { isFullscreenEnvEnabled } from '../../utils/fullscreen.js';
+import { getPipeDisplayRole, isPipeControlled } from '../../utils/pipeTransport.js';
+import { isUndercover } from '../../utils/undercover.js';
+import { CoordinatorTaskPanel, useCoordinatorTaskCount } from '../CoordinatorAgentStatus.js';
+import { getLastAssistantMessageId, StatusLine, statusLineShouldDisplay } from '../StatusLine.js';
+import { Notifications } from './Notifications.js';
+import { PromptInputFooterLeftSide } from './PromptInputFooterLeftSide.js';
 
 // Inline pipe status is shown only after /pipes sets pipeIpc.statusVisible.
-import { PromptInputFooterSuggestions, type SuggestionItem } from './PromptInputFooterSuggestions.js'
-import { PromptInputHelpMenu } from './PromptInputHelpMenu.js'
+import { PromptInputFooterSuggestions, type SuggestionItem } from './PromptInputFooterSuggestions.js';
+import { PromptInputHelpMenu } from './PromptInputHelpMenu.js';
 
 type Props = {
   apiKeyStatus: VerificationStatus;
diff --git a/src/components/PromptInput/PromptInputFooterLeftSide.tsx b/src/components/PromptInput/PromptInputFooterLeftSide.tsx
index 8130c8ef1..892c182d5 100644
--- a/src/components/PromptInput/PromptInputFooterLeftSide.tsx
+++ b/src/components/PromptInput/PromptInputFooterLeftSide.tsx
@@ -1,127 +1,110 @@
 // biome-ignore-all assist/source/organizeImports: ANT-ONLY import markers must not be reordered
-import { feature } from 'bun:bundle'
+import { feature } from 'bun:bundle';
 // Dead code elimination: conditional import for COORDINATOR_MODE
 /* eslint-disable @typescript-eslint/no-require-imports */
 const coordinatorModule = feature('COORDINATOR_MODE')
   ? (require('../../coordinator/coordinatorMode.js') as typeof import('../../coordinator/coordinatorMode.js'))
-  : undefined
+  : undefined;
 /* eslint-enable @typescript-eslint/no-require-imports */
-import { Box, Text, Link } from '@anthropic/ink'
-import * as React from 'react'
-import figures from 'figures'
-import {
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-  useSyncExternalStore,
-} from 'react'
-import type { VimMode, PromptInputMode } from '../../types/textInputTypes.js'
-import type { ToolPermissionContext } from '../../Tool.js'
-import { isVimModeEnabled } from './utils.js'
-import { useShortcutDisplay } from '../../keybindings/useShortcutDisplay.js'
+import { Box, Text, Link } from '@anthropic/ink';
+import * as React from 'react';
+import figures from 'figures';
+import { useEffect, useMemo, useRef, useState, useSyncExternalStore } from 'react';
+import type { VimMode, PromptInputMode } from '../../types/textInputTypes.js';
+import type { ToolPermissionContext } from '../../Tool.js';
+import { isVimModeEnabled } from './utils.js';
+import { useShortcutDisplay } from '../../keybindings/useShortcutDisplay.js';
 import {
   isDefaultMode,
   permissionModeSymbol,
   permissionModeTitle,
   getModeColor,
-} from '../../utils/permissions/PermissionMode.js'
-import { BackgroundTaskStatus } from '../tasks/BackgroundTaskStatus.js'
-import { isBackgroundTask } from '../../tasks/types.js'
-import { isPanelAgentTask } from '../../tasks/LocalAgentTask/LocalAgentTask.js'
-import { getVisibleAgentTasks } from '../CoordinatorAgentStatus.js'
-import { count } from '../../utils/array.js'
-import { shouldHideTasksFooter } from '../tasks/taskStatusUtils.js'
-import { isAgentSwarmsEnabled } from '../../utils/agentSwarmsEnabled.js'
-import { TeamStatus } from '../teams/TeamStatus.js'
-import { isInProcessEnabled } from '../../utils/swarm/backends/registry.js'
-import { useAppState, useAppStateStore } from 'src/state/AppState.js'
-import { getIsRemoteMode } from '../../bootstrap/state.js'
-import HistorySearchInput from './HistorySearchInput.js'
-import { usePrStatus } from '../../hooks/usePrStatus.js'
-import { Byline, KeyboardShortcutHint } from '@anthropic/ink'
-import { useTerminalSize } from '../../hooks/useTerminalSize.js'
-import { useTasksV2 } from '../../hooks/useTasksV2.js'
-import { formatDuration } from '../../utils/format.js'
-import { VoiceWarmupHint } from './VoiceIndicator.js'
-import { useVoiceEnabled } from '../../hooks/useVoiceEnabled.js'
-import { useVoiceState } from '../../context/voice.js'
-import { isFullscreenEnvEnabled } from '../../utils/fullscreen.js'
-import { isXtermJs, useHasSelection, useSelection } from '@anthropic/ink'
-import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js'
-import { getPlatform } from '../../utils/platform.js'
-import { PrBadge } from '../PrBadge.js'
+} from '../../utils/permissions/PermissionMode.js';
+import { BackgroundTaskStatus } from '../tasks/BackgroundTaskStatus.js';
+import { isBackgroundTask } from '../../tasks/types.js';
+import { isPanelAgentTask } from '../../tasks/LocalAgentTask/LocalAgentTask.js';
+import { getVisibleAgentTasks } from '../CoordinatorAgentStatus.js';
+import { count } from '../../utils/array.js';
+import { shouldHideTasksFooter } from '../tasks/taskStatusUtils.js';
+import { isAgentSwarmsEnabled } from '../../utils/agentSwarmsEnabled.js';
+import { TeamStatus } from '../teams/TeamStatus.js';
+import { isInProcessEnabled } from '../../utils/swarm/backends/registry.js';
+import { useAppState, useAppStateStore } from 'src/state/AppState.js';
+import { getIsRemoteMode } from '../../bootstrap/state.js';
+import HistorySearchInput from './HistorySearchInput.js';
+import { usePrStatus } from '../../hooks/usePrStatus.js';
+import { Byline, KeyboardShortcutHint } from '@anthropic/ink';
+import { useTerminalSize } from '../../hooks/useTerminalSize.js';
+import { useTasksV2 } from '../../hooks/useTasksV2.js';
+import { formatDuration } from '../../utils/format.js';
+import { VoiceWarmupHint } from './VoiceIndicator.js';
+import { useVoiceEnabled } from '../../hooks/useVoiceEnabled.js';
+import { useVoiceState } from '../../context/voice.js';
+import { isFullscreenEnvEnabled } from '../../utils/fullscreen.js';
+import { isXtermJs, useHasSelection, useSelection } from '@anthropic/ink';
+import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js';
+import { getPlatform } from '../../utils/platform.js';
+import { PrBadge } from '../PrBadge.js';
 
 // Dead code elimination: conditional import for proactive mode
 /* eslint-disable @typescript-eslint/no-require-imports */
-const proactiveModule =
-  feature('PROACTIVE') || feature('KAIROS')
-    ? require('../../proactive/index.js')
-    : null
+const proactiveModule = feature('PROACTIVE') || feature('KAIROS') ? require('../../proactive/index.js') : null;
 /* eslint-enable @typescript-eslint/no-require-imports */
-const NO_OP_SUBSCRIBE = (_cb: () => void) => () => {}
-const NULL = () => null
-const MAX_VOICE_HINT_SHOWS = 3
+const NO_OP_SUBSCRIBE = (_cb: () => void) => () => {};
+const NULL = () => null;
+const MAX_VOICE_HINT_SHOWS = 3;
 
 type Props = {
   exitMessage: {
-    show: boolean
-    key?: string
-  }
-  vimMode: VimMode | undefined
-  mode: PromptInputMode
-  toolPermissionContext: ToolPermissionContext
-  suppressHint: boolean
-  isLoading: boolean
-  showMemoryTypeSelector?: boolean
-  tasksSelected: boolean
-  teamsSelected: boolean
-  tmuxSelected: boolean
-  teammateFooterIndex?: number
-  isPasting?: boolean
-  isSearching: boolean
-  historyQuery: string
-  setHistoryQuery: (query: string) => void
-  historyFailedMatch: boolean
-  onOpenTasksDialog?: (taskId?: string) => void
-}
+    show: boolean;
+    key?: string;
+  };
+  vimMode: VimMode | undefined;
+  mode: PromptInputMode;
+  toolPermissionContext: ToolPermissionContext;
+  suppressHint: boolean;
+  isLoading: boolean;
+  showMemoryTypeSelector?: boolean;
+  tasksSelected: boolean;
+  teamsSelected: boolean;
+  tmuxSelected: boolean;
+  teammateFooterIndex?: number;
+  isPasting?: boolean;
+  isSearching: boolean;
+  historyQuery: string;
+  setHistoryQuery: (query: string) => void;
+  historyFailedMatch: boolean;
+  onOpenTasksDialog?: (taskId?: string) => void;
+};
 
 function ProactiveCountdown(): React.ReactNode {
   const nextTickAt = useSyncExternalStore(
     proactiveModule?.subscribeToProactiveChanges ?? NO_OP_SUBSCRIBE,
     proactiveModule?.getNextTickAt ?? NULL,
     NULL,
-  )
+  );
 
-  const [remainingSeconds, setRemainingSeconds] = useState<number | null>(null)
+  const [remainingSeconds, setRemainingSeconds] = useState<number | null>(null);
 
   useEffect(() => {
     if (nextTickAt === null) {
-      setRemainingSeconds(null)
-      return
+      setRemainingSeconds(null);
+      return;
     }
 
     function update(): void {
-      const remaining = Math.max(
-        0,
-        Math.ceil((nextTickAt! - Date.now()) / 1000),
-      )
-      setRemainingSeconds(remaining)
+      const remaining = Math.max(0, Math.ceil((nextTickAt! - Date.now()) / 1000));
+      setRemainingSeconds(remaining);
     }
 
-    update()
-    const interval = setInterval(update, 1000)
-    return () => clearInterval(interval)
-  }, [nextTickAt])
+    update();
+    const interval = setInterval(update, 1000);
+    return () => clearInterval(interval);
+  }, [nextTickAt]);
 
-  if (remainingSeconds === null) return null
+  if (remainingSeconds === null) return null;
 
-  return (
-    <Text dimColor>
-      waiting{' '}
-      {formatDuration(remainingSeconds * 1000, { mostSignificantOnly: true })}
-    </Text>
-  )
+  return <Text dimColor>waiting {formatDuration(remainingSeconds * 1000, { mostSignificantOnly: true })}</Text>;
 }
 
 export function PromptInputFooterLeftSide({
@@ -147,26 +130,22 @@ export function PromptInputFooterLeftSide({
       <Text dimColor key="exit-message">
         Press {exitMessage.key} again to exit
       </Text>
-    )
+    );
   }
   if (isPasting) {
     return (
       <Text dimColor key="pasting-message">
         Pasting text…
       </Text>
-    )
+    );
   }
 
-  const showVim = isVimModeEnabled() && vimMode === 'INSERT' && !isSearching
+  const showVim = isVimModeEnabled() && vimMode === 'INSERT' && !isSearching;
 
   return (
     <Box justifyContent="flex-start" gap={1}>
       {isSearching && (
-        <HistorySearchInput
-          value={historyQuery}
-          onChange={setHistoryQuery}
-          historyFailedMatch={historyFailedMatch}
-        />
+        <HistorySearchInput value={historyQuery} onChange={setHistoryQuery} historyFailedMatch={historyFailedMatch} />
       )}
       {showVim ? (
         <Text dimColor key="vim-insert">
@@ -185,20 +164,20 @@ export function PromptInputFooterLeftSide({
         onOpenTasksDialog={onOpenTasksDialog}
       />
     </Box>
-  )
+  );
 }
 
 type ModeIndicatorProps = {
-  mode: PromptInputMode
-  toolPermissionContext: ToolPermissionContext
-  showHint: boolean
-  isLoading: boolean
-  tasksSelected: boolean
-  teamsSelected: boolean
-  tmuxSelected: boolean
-  teammateFooterIndex?: number
-  onOpenTasksDialog?: (taskId?: string) => void
-}
+  mode: PromptInputMode;
+  toolPermissionContext: ToolPermissionContext;
+  showHint: boolean;
+  isLoading: boolean;
+  tasksSelected: boolean;
+  teamsSelected: boolean;
+  tmuxSelected: boolean;
+  teammateFooterIndex?: number;
+  onOpenTasksDialog?: (taskId?: string) => void;
+};
 
 function ModeIndicator({
   mode,
@@ -211,110 +190,75 @@ function ModeIndicator({
   teammateFooterIndex,
   onOpenTasksDialog,
 }: ModeIndicatorProps): React.ReactNode {
-  const { columns } = useTerminalSize()
-  const modeCycleShortcut = useShortcutDisplay(
-    'chat:cycleMode',
-    'Chat',
-    'shift+tab',
-  )
-  const tasks = useAppState(s => s.tasks)
-  const teamContext = useAppState(s => s.teamContext)
+  const { columns } = useTerminalSize();
+  const modeCycleShortcut = useShortcutDisplay('chat:cycleMode', 'Chat', 'shift+tab');
+  const tasks = useAppState(s => s.tasks);
+  const teamContext = useAppState(s => s.teamContext);
   // Set once in initialState (main.tsx --remote mode) and never mutated — lazy
   // init captures the immutable value without a subscription.
-  const store = useAppStateStore()
-  const [remoteSessionUrl] = useState(() => store.getState().remoteSessionUrl)
-  const viewSelectionMode = useAppState(s => s.viewSelectionMode)
-  const viewingAgentTaskId = useAppState(s => s.viewingAgentTaskId)
-  const expandedView = useAppState(s => s.expandedView)
-  const showSpinnerTree = expandedView === 'teammates'
-  const prStatus = usePrStatus(isLoading, isPrStatusEnabled())
-  const hasTmuxSession = useAppState(
-    s =>
-      process.env.USER_TYPE === 'ant' && s.tungstenActiveSession !== undefined,
-  )
+  const store = useAppStateStore();
+  const [remoteSessionUrl] = useState(() => store.getState().remoteSessionUrl);
+  const viewSelectionMode = useAppState(s => s.viewSelectionMode);
+  const viewingAgentTaskId = useAppState(s => s.viewingAgentTaskId);
+  const expandedView = useAppState(s => s.expandedView);
+  const showSpinnerTree = expandedView === 'teammates';
+  const prStatus = usePrStatus(isLoading, isPrStatusEnabled());
+  const hasTmuxSession = useAppState(s => process.env.USER_TYPE === 'ant' && s.tungstenActiveSession !== undefined);
 
   const nextTickAt = useSyncExternalStore(
     proactiveModule?.subscribeToProactiveChanges ?? NO_OP_SUBSCRIBE,
     proactiveModule?.getNextTickAt ?? NULL,
     NULL,
-  )
-  // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-  const voiceEnabled = feature('VOICE_MODE') ? useVoiceEnabled() : false
+  );
+  const voiceEnabled = feature('VOICE_MODE') ? useVoiceEnabled() : false;
   const voiceState = feature('VOICE_MODE')
-    ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-      useVoiceState(s => s.voiceState)
-    : ('idle' as const)
+    ? useVoiceState(s => s.voiceState)
+    : ('idle' as const);
   const voiceWarmingUp = feature('VOICE_MODE')
-    ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-      useVoiceState(s => s.voiceWarmingUp)
-    : false
-  const hasSelection = useHasSelection()
-  const selGetState = useSelection().getState
-  const hasNextTick = nextTickAt !== null
-  const isCoordinator = feature('COORDINATOR_MODE')
-    ? coordinatorModule?.isCoordinatorMode() === true
-    : false
+    ? useVoiceState(s => s.voiceWarmingUp)
+    : false;
+  const hasSelection = useHasSelection();
+  const selGetState = useSelection().getState;
+  const hasNextTick = nextTickAt !== null;
+  const isCoordinator = feature('COORDINATOR_MODE') ? coordinatorModule?.isCoordinatorMode() === true : false;
   const runningTaskCount = useMemo(
     () =>
       count(
         Object.values(tasks),
-        t =>
-          isBackgroundTask(t) &&
-          !(process.env.USER_TYPE === 'ant' && isPanelAgentTask(t)),
+        t => isBackgroundTask(t) && !(process.env.USER_TYPE === 'ant' && isPanelAgentTask(t)),
       ),
     [tasks],
-  )
-  const tasksV2 = useTasksV2()
-  const hasTaskItems = tasksV2 !== undefined && tasksV2.length > 0
-  const escShortcut = useShortcutDisplay(
-    'chat:cancel',
-    'Chat',
-    'esc',
-  ).toLowerCase()
-  const todosShortcut = useShortcutDisplay(
-    'app:toggleTodos',
-    'Global',
-    'ctrl+t',
-  )
-  const killAgentsShortcut = useShortcutDisplay(
-    'chat:killAgents',
-    'Chat',
-    'ctrl+x ctrl+k',
-  )
+  );
+  const tasksV2 = useTasksV2();
+  const hasTaskItems = tasksV2 !== undefined && tasksV2.length > 0;
+  const escShortcut = useShortcutDisplay('chat:cancel', 'Chat', 'esc').toLowerCase();
+  const todosShortcut = useShortcutDisplay('app:toggleTodos', 'Global', 'ctrl+t');
+  const killAgentsShortcut = useShortcutDisplay('chat:killAgents', 'Chat', 'ctrl+x ctrl+k');
   const voiceKeyShortcut = feature('VOICE_MODE')
-    ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-      useShortcutDisplay('voice:pushToTalk', 'Chat', 'Space')
-    : ''
+    ? useShortcutDisplay('voice:pushToTalk', 'Chat', 'Space')
+    : '';
   // Captured at mount so the hint doesn't flicker mid-session if another
   // CC instance increments the counter. Incremented once via useEffect the
   // first time voice is enabled in this session — approximates "hint was
   // shown" without tracking the exact render-time condition (which depends
   // on parts/hintParts computed after the early-return hooks boundary).
   const [voiceHintUnderCap] = feature('VOICE_MODE')
-    ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-      useState(
-        () =>
-          (getGlobalConfig().voiceFooterHintSeenCount ?? 0) <
-          MAX_VOICE_HINT_SHOWS,
-      )
-    : [false]
-  // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-  const voiceHintIncrementedRef = feature('VOICE_MODE') ? useRef(false) : null
+    ? useState(() => (getGlobalConfig().voiceFooterHintSeenCount ?? 0) < MAX_VOICE_HINT_SHOWS)
+    : [false];
+  const voiceHintIncrementedRef = feature('VOICE_MODE') ? useRef(false) : null;
   useEffect(() => {
     if (feature('VOICE_MODE')) {
-      if (!voiceEnabled || !voiceHintUnderCap) return
-      if (voiceHintIncrementedRef?.current) return
-      if (voiceHintIncrementedRef) voiceHintIncrementedRef.current = true
-      const newCount = (getGlobalConfig().voiceFooterHintSeenCount ?? 0) + 1
+      if (!voiceEnabled || !voiceHintUnderCap) return;
+      if (voiceHintIncrementedRef?.current) return;
+      if (voiceHintIncrementedRef) voiceHintIncrementedRef.current = true;
+      const newCount = (getGlobalConfig().voiceFooterHintSeenCount ?? 0) + 1;
       saveGlobalConfig(prev => {
-        if ((prev.voiceFooterHintSeenCount ?? 0) >= newCount) return prev
-        return { ...prev, voiceFooterHintSeenCount: newCount }
-      })
+        if ((prev.voiceFooterHintSeenCount ?? 0) >= newCount) return prev;
+        return { ...prev, voiceFooterHintSeenCount: newCount };
+      });
     }
-  }, [voiceEnabled, voiceHintUnderCap])
-  const isKillAgentsConfirmShowing = useAppState(
-    s => s.notifications.current?.key === 'kill-agents-confirm',
-  )
+  }, [voiceEnabled, voiceHintUnderCap]);
+  const isKillAgentsConfirmShowing = useAppState(s => s.notifications.current?.key === 'kill-agents-confirm');
 
   // Derive team info from teamContext (no filesystem I/O needed)
   // Match the same logic as TeamStatus to avoid trailing separator
@@ -323,27 +267,21 @@ function ModeIndicator({
     isAgentSwarmsEnabled() &&
     !isInProcessEnabled() &&
     teamContext !== undefined &&
-    count(Object.values(teamContext.teammates), t => t.name !== 'team-lead') > 0
+    count(Object.values(teamContext.teammates), t => t.name !== 'team-lead') > 0;
 
   if (mode === 'bash') {
-    return <Text color="bashBorder">! for bash mode</Text>
+    return <Text color="bashBorder">! for bash mode</Text>;
   }
 
-  const currentMode = toolPermissionContext?.mode
-  const hasActiveMode = !isDefaultMode(currentMode)
-  const viewedTask = viewingAgentTaskId ? tasks[viewingAgentTaskId] : undefined
-  const isViewingTeammate =
-    viewSelectionMode === 'viewing-agent' &&
-    viewedTask?.type === 'in_process_teammate'
-  const isViewingCompletedTeammate =
-    isViewingTeammate && viewedTask != null && viewedTask.status !== 'running'
-  const hasBackgroundTasks = runningTaskCount > 0 || isViewingTeammate
+  const currentMode = toolPermissionContext?.mode;
+  const hasActiveMode = !isDefaultMode(currentMode);
+  const viewedTask = viewingAgentTaskId ? tasks[viewingAgentTaskId] : undefined;
+  const isViewingTeammate = viewSelectionMode === 'viewing-agent' && viewedTask?.type === 'in_process_teammate';
+  const isViewingCompletedTeammate = isViewingTeammate && viewedTask != null && viewedTask.status !== 'running';
+  const hasBackgroundTasks = runningTaskCount > 0 || isViewingTeammate;
 
   // Count primary items (permission mode or coordinator mode, background tasks, and teams)
-  const primaryItemCount =
-    (isCoordinator || hasActiveMode ? 1 : 0) +
-    (hasBackgroundTasks ? 1 : 0) +
-    (hasTeams ? 1 : 0)
+  const primaryItemCount = (isCoordinator || hasActiveMode ? 1 : 0) + (hasBackgroundTasks ? 1 : 0) + (hasTeams ? 1 : 0);
 
   // PR indicator is short (~10 chars) — unlike the old diff indicator the
   // >=100 threshold was tuned for. Now that auto mode is effectively the
@@ -355,19 +293,16 @@ function ModeIndicator({
     prStatus.reviewState !== null &&
     prStatus.url !== null &&
     primaryItemCount < 2 &&
-    (primaryItemCount === 0 || columns >= 80)
+    (primaryItemCount === 0 || columns >= 80);
 
   // Hide the shift+tab hint when there are 2 primary items
-  const shouldShowModeHint = primaryItemCount < 2
+  const shouldShowModeHint = primaryItemCount < 2;
 
   // Check if we have in-process teammates (showing pills)
   // In spinner-tree mode, pills are disabled - teammates appear in the spinner tree instead
   const hasInProcessTeammates =
-    !showSpinnerTree &&
-    hasBackgroundTasks &&
-    Object.values(tasks).some(t => t.type === 'in_process_teammate')
-  const hasTeammatePills =
-    hasInProcessTeammates || (!showSpinnerTree && isViewingTeammate)
+    !showSpinnerTree && hasBackgroundTasks && Object.values(tasks).some(t => t.type === 'in_process_teammate');
+  const hasTeammatePills = hasInProcessTeammates || (!showSpinnerTree && isViewingTeammate);
 
   // In remote mode (`claude assistant`, --teleport) the agent runs elsewhere;
   // the local permission mode shown here doesn't reflect the agent's state.
@@ -376,20 +311,15 @@ function ModeIndicator({
   const modePart =
     currentMode && hasActiveMode && !getIsRemoteMode() ? (
       <Text color={getModeColor(currentMode)} key="mode">
-        {permissionModeSymbol(currentMode)}{' '}
-        {permissionModeTitle(currentMode).toLowerCase()} on
+        {permissionModeSymbol(currentMode)} {permissionModeTitle(currentMode).toLowerCase()} on
         {shouldShowModeHint && (
           <Text dimColor>
             {' '}
-            <KeyboardShortcutHint
-              shortcut={modeCycleShortcut}
-              action="cycle"
-              parens
-            />
+            <KeyboardShortcutHint shortcut={modeCycleShortcut} action="cycle" parens />
           </Text>
         )}
       </Text>
-    ) : null
+    ) : null;
 
   // Build parts array - exclude BackgroundTaskStatus when we have teammate pills
   // (teammate pills get their own row)
@@ -406,37 +336,20 @@ function ModeIndicator({
     // its click-target Box isn't nested inside the <Text wrap="truncate">
     // wrapper (reconciler throws on Box-in-Text).
     // Tmux pill (ant-only) — appears right after tasks in nav order
-    ...(process.env.USER_TYPE === 'ant' && hasTmuxSession
-      ? [<TungstenPill key="tmux" selected={tmuxSelected} />]
-      : []),
+    ...(process.env.USER_TYPE === 'ant' && hasTmuxSession ? [<TungstenPill key="tmux" selected={tmuxSelected} />] : []),
     ...(isAgentSwarmsEnabled() && hasTeams
-      ? [
-          <TeamStatus
-            key="teams"
-            teamsSelected={teamsSelected}
-            showHint={showHint && !hasBackgroundTasks}
-          />,
-        ]
+      ? [<TeamStatus key="teams" teamsSelected={teamsSelected} showHint={showHint && !hasBackgroundTasks} />]
       : []),
     ...(shouldShowPrStatus
-      ? [
-          <PrBadge
-            key="pr-status"
-            number={prStatus.number!}
-            url={prStatus.url!}
-            reviewState={prStatus.reviewState!}
-          />,
-        ]
+      ? [<PrBadge key="pr-status" number={prStatus.number!} url={prStatus.url!} reviewState={prStatus.reviewState!} />]
       : []),
-  ]
+  ];
 
   // Check if any in-process teammates exist (for hint text cycling)
   const hasAnyInProcessTeammates = Object.values(tasks).some(
     t => t.type === 'in_process_teammate' && t.status === 'running',
-  )
-  const hasRunningAgentTasks = Object.values(tasks).some(
-    t => t.type === 'local_agent' && t.status === 'running',
-  )
+  );
+  const hasRunningAgentTasks = Object.values(tasks).some(t => t.type === 'local_agent' && t.status === 'running');
 
   // Get hint parts separately for potential second-line rendering
   const hintParts = showHint
@@ -451,32 +364,25 @@ function ModeIndicator({
         hasRunningAgentTasks,
         isKillAgentsConfirmShowing,
       )
-    : []
+    : [];
 
   if (isViewingCompletedTeammate) {
     parts.push(
       <Text dimColor key="esc-return">
-        <KeyboardShortcutHint
-          shortcut={escShortcut}
-          action="return to team lead"
-        />
+        <KeyboardShortcutHint shortcut={escShortcut} action="return to team lead" />
       </Text>,
-    )
+    );
   } else if ((feature('PROACTIVE') || feature('KAIROS')) && hasNextTick) {
-    parts.push(<ProactiveCountdown key="proactive" />)
+    parts.push(<ProactiveCountdown key="proactive" />);
   } else if (!hasTeammatePills && showHint) {
-    parts.push(...hintParts)
+    parts.push(...hintParts);
   }
 
   // When we have teammate pills, always render them on their own line above other parts
   if (hasTeammatePills) {
     // Don't append spinner hints when viewing a completed teammate —
     // the "esc to return to team lead" hint already replaces "esc to interrupt"
-    const otherParts = [
-      ...(modePart ? [modePart] : []),
-      ...parts,
-      ...(isViewingCompletedTeammate ? [] : hintParts),
-    ]
+    const otherParts = [...(modePart ? [modePart] : []), ...parts, ...(isViewingCompletedTeammate ? [] : hintParts)];
     return (
       <Box flexDirection="column">
         <Box>
@@ -494,21 +400,18 @@ function ModeIndicator({
           </Box>
         )}
       </Box>
-    )
+    );
   }
 
   // Add "↓ to manage tasks" hint when panel has visible rows
-  const hasCoordinatorTasks =
-    process.env.USER_TYPE === 'ant' && getVisibleAgentTasks(tasks).length > 0
+  const hasCoordinatorTasks = process.env.USER_TYPE === 'ant' && getVisibleAgentTasks(tasks).length > 0;
 
   // Tasks pill renders as a Box sibling (not a parts entry) so its
   // click-target Box isn't nested inside <Text wrap="truncate"> — the
   // reconciler throws on Box-in-Text. Computed here so the empty-checks
   // below still treat "pill present" as non-empty.
   const tasksPart =
-    hasBackgroundTasks &&
-    !hasTeammatePills &&
-    !shouldHideTasksFooter(tasks, showSpinnerTree) ? (
+    hasBackgroundTasks && !hasTeammatePills && !shouldHideTasksFooter(tasks, showSpinnerTree) ? (
       <BackgroundTaskStatus
         tasksSelected={tasksSelected}
         isViewingTeammate={isViewingTeammate}
@@ -516,27 +419,27 @@ function ModeIndicator({
         isLeaderIdle={!isLoading}
         onOpenDialog={onOpenTasksDialog}
       />
-    ) : null
+    ) : null;
 
   if (parts.length === 0 && !tasksPart && !modePart && showHint) {
     parts.push(
       <Text dimColor key="shortcuts-hint">
         ? for shortcuts
       </Text>,
-    )
+    );
   }
 
   // Only replace the idle voice hint when there's something to say — otherwise
   // fall through instead of showing an empty Byline. "esc to clear" was removed
   // (looked like "esc to interrupt" when idle; esc-clears-selection is standard
   // UX) leaving only ctrl+c (copyOnSelect off) and the xterm.js native-select hint.
-  const copyOnSelect = getGlobalConfig().copyOnSelect ?? true
-  const selectionHintHasContent = hasSelection && (!copyOnSelect || isXtermJs())
+  const copyOnSelect = getGlobalConfig().copyOnSelect ?? true;
+  const selectionHintHasContent = hasSelection && (!copyOnSelect || isXtermJs());
 
   // Warmup hint takes priority — when the user is actively holding
   // the activation key, show feedback regardless of other hints.
   if (feature('VOICE_MODE') && voiceEnabled && voiceWarmingUp) {
-    parts.push(<VoiceWarmupHint key="voice-warmup" />)
+    parts.push(<VoiceWarmupHint key="voice-warmup" />);
   } else if (isFullscreenEnvEnabled() && selectionHintHasContent) {
     // xterm.js (VS Code/Cursor/Windsurf) force-selection modifier is
     // platform-specific and gated on macOS (SelectionService.shouldForceSelection):
@@ -548,26 +451,21 @@ function ModeIndicator({
     // option+click hint they just tried.
     // Non-reactive getState() read is safe: lastPressHadAlt is immutable
     // while hasSelection is true (set pre-drag, cleared with selection).
-    const isMac = getPlatform() === 'macos'
-    const altClickFailed = isMac && (selGetState()?.lastPressHadAlt ?? false)
+    const isMac = getPlatform() === 'macos';
+    const altClickFailed = isMac && (selGetState()?.lastPressHadAlt ?? false);
     parts.push(
       <Text dimColor key="selection-copy">
         <Byline>
-          {!copyOnSelect && (
-            <KeyboardShortcutHint shortcut="ctrl+c" action="copy" />
-          )}
+          {!copyOnSelect && <KeyboardShortcutHint shortcut="ctrl+c" action="copy" />}
           {isXtermJs() &&
             (altClickFailed ? (
               <Text>set macOptionClickForcesSelection in VS Code settings</Text>
             ) : (
-              <KeyboardShortcutHint
-                shortcut={isMac ? 'option+click' : 'shift+click'}
-                action="native select"
-              />
+              <KeyboardShortcutHint shortcut={isMac ? 'option+click' : 'shift+click'} action="native select" />
             ))}
         </Byline>
       </Text>,
-    )
+    );
   } else if (
     feature('VOICE_MODE') &&
     parts.length > 0 &&
@@ -581,7 +479,7 @@ function ModeIndicator({
       <Text dimColor key="voice-hint">
         hold {voiceKeyShortcut} to speak
       </Text>,
-    )
+    );
   }
 
   if ((tasksPart || hasCoordinatorTasks) && showHint && !hasTeams) {
@@ -593,7 +491,7 @@ function ModeIndicator({
           <KeyboardShortcutHint shortcut="↓" action="manage" />
         )}
       </Text>,
-    )
+    );
   }
 
   // In fullscreen the bottom section is flexShrink:0 — every row here
@@ -605,7 +503,7 @@ function ModeIndicator({
   // from 0→1 row. Always render 1 row in fullscreen; return a space when
   // empty so Yoga reserves the row without painting anything visible.
   if (parts.length === 0 && !tasksPart && !modePart) {
-    return isFullscreenEnvEnabled() ? <Text> </Text> : null
+    return isFullscreenEnvEnabled() ? <Text> </Text> : null;
   }
 
   // flexShrink=0 keeps mode + pill at natural width; the remaining parts
@@ -630,7 +528,7 @@ function ModeIndicator({
         </Text>
       )}
     </Box>
-  )
+  );
 }
 
 function getSpinnerHintParts(
@@ -644,27 +542,27 @@ function getSpinnerHintParts(
   hasRunningAgentTasks: boolean,
   isKillAgentsConfirmShowing: boolean,
 ): React.ReactElement[] {
-  let toggleAction: string
+  let toggleAction: string;
   if (hasTeammates) {
     // Cycling: none → tasks → teammates → none
     switch (expandedView) {
       case 'none':
-        toggleAction = 'show tasks'
-        break
+        toggleAction = 'show tasks';
+        break;
       case 'tasks':
-        toggleAction = 'show teammates'
-        break
+        toggleAction = 'show teammates';
+        break;
       case 'teammates':
-        toggleAction = 'hide'
-        break
+        toggleAction = 'hide';
+        break;
     }
   } else {
-    toggleAction = expandedView === 'tasks' ? 'hide tasks' : 'show tasks'
+    toggleAction = expandedView === 'tasks' ? 'hide tasks' : 'show tasks';
   }
 
   // Show the toggle hint only when there are task items to display or
   // teammates to cycle to
-  const showToggleHint = hasTaskItems || hasTeammates
+  const showToggleHint = hasTaskItems || hasTeammates;
 
   return [
     ...(isLoading
@@ -677,26 +575,20 @@ function getSpinnerHintParts(
     ...(!isLoading && hasRunningAgentTasks && !isKillAgentsConfirmShowing
       ? [
           <Text dimColor key="kill-agents">
-            <KeyboardShortcutHint
-              shortcut={killAgentsShortcut}
-              action="stop agents"
-            />
+            <KeyboardShortcutHint shortcut={killAgentsShortcut} action="stop agents" />
           </Text>,
         ]
       : []),
     ...(showToggleHint
       ? [
           <Text dimColor key="toggle-tasks">
-            <KeyboardShortcutHint
-              shortcut={todosShortcut}
-              action={toggleAction}
-            />
+            <KeyboardShortcutHint shortcut={todosShortcut} action={toggleAction} />
           </Text>,
         ]
       : []),
-  ]
+  ];
 }
 
 function isPrStatusEnabled(): boolean {
-  return getGlobalConfig().prStatusFooterEnabled ?? true
+  return getGlobalConfig().prStatusFooterEnabled ?? true;
 }
diff --git a/src/components/PromptInput/PromptInputFooterSuggestions.tsx b/src/components/PromptInput/PromptInputFooterSuggestions.tsx
index e6b2065b6..e45167a8c 100644
--- a/src/components/PromptInput/PromptInputFooterSuggestions.tsx
+++ b/src/components/PromptInput/PromptInputFooterSuggestions.tsx
@@ -1,18 +1,18 @@
-import * as React from 'react'
-import { memo, type ReactNode } from 'react'
-import { useTerminalSize } from '../../hooks/useTerminalSize.js'
-import { Box, Text, stringWidth } from '@anthropic/ink'
-import { truncatePathMiddle, truncateToWidth } from '../../utils/format.js'
-import type { Theme } from '../../utils/theme.js'
+import * as React from 'react';
+import { memo, type ReactNode } from 'react';
+import { useTerminalSize } from '../../hooks/useTerminalSize.js';
+import { Box, Text, stringWidth } from '@anthropic/ink';
+import { truncatePathMiddle, truncateToWidth } from '../../utils/format.js';
+import type { Theme } from '../../utils/theme.js';
 
 export type SuggestionItem = {
-  id: string
-  displayText: string
-  tag?: string
-  description?: string
-  metadata?: unknown
-  color?: keyof Theme
-}
+  id: string;
+  displayText: string;
+  tag?: string;
+  description?: string;
+  metadata?: unknown;
+  color?: keyof Theme;
+};
 
 export type SuggestionType =
   | 'command'
@@ -22,30 +22,26 @@ export type SuggestionType =
   | 'shell'
   | 'custom-title'
   | 'slack-channel'
-  | 'none'
+  | 'none';
 
-export const OVERLAY_MAX_ITEMS = 5
+export const OVERLAY_MAX_ITEMS = 5;
 
 /**
  * Get the icon for a suggestion based on its type
  * Icons: + for files, ◇ for MCP resources, * for agents
  */
 function getIcon(itemId: string): string {
-  if (itemId.startsWith('file-')) return '+'
-  if (itemId.startsWith('mcp-resource-')) return '◇'
-  if (itemId.startsWith('agent-')) return '*'
-  return '+'
+  if (itemId.startsWith('file-')) return '+';
+  if (itemId.startsWith('mcp-resource-')) return '◇';
+  if (itemId.startsWith('agent-')) return '*';
+  return '+';
 }
 
 /**
  * Check if an item is a unified suggestion type (file, mcp-resource, or agent)
  */
 function isUnifiedSuggestion(itemId: string): boolean {
-  return (
-    itemId.startsWith('file-') ||
-    itemId.startsWith('mcp-resource-') ||
-    itemId.startsWith('agent-')
-  )
+  return itemId.startsWith('file-') || itemId.startsWith('mcp-resource-') || itemId.startsWith('agent-');
 }
 
 const SuggestionItemRow = memo(function SuggestionItemRow({
@@ -53,109 +49,88 @@ const SuggestionItemRow = memo(function SuggestionItemRow({
   maxColumnWidth,
   isSelected,
 }: {
-  item: SuggestionItem
-  maxColumnWidth?: number
-  isSelected: boolean
+  item: SuggestionItem;
+  maxColumnWidth?: number;
+  isSelected: boolean;
 }): ReactNode {
-  const columns = useTerminalSize().columns
-  const isUnified = isUnifiedSuggestion(item.id)
+  const columns = useTerminalSize().columns;
+  const isUnified = isUnifiedSuggestion(item.id);
 
   // For unified suggestions (file, mcp-resource, agent), use single-line layout with icon
   if (isUnified) {
-    const icon = getIcon(item.id)
-    const textColor: keyof Theme | undefined = isSelected
-      ? 'suggestion'
-      : undefined
-    const dimColor = !isSelected
+    const icon = getIcon(item.id);
+    const textColor: keyof Theme | undefined = isSelected ? 'suggestion' : undefined;
+    const dimColor = !isSelected;
 
-    const isFile = item.id.startsWith('file-')
-    const isMcpResource = item.id.startsWith('mcp-resource-')
+    const isFile = item.id.startsWith('file-');
+    const isMcpResource = item.id.startsWith('mcp-resource-');
 
     // Calculate layout widths
     // Layout: "X " (2) + displayText + " – " (3) + description + padding (4)
-    const iconWidth = 2 // icon + space (fixed)
-    const paddingWidth = 4
-    const separatorWidth = item.description ? 3 : 0 // ' – ' separator
+    const iconWidth = 2; // icon + space (fixed)
+    const paddingWidth = 4;
+    const separatorWidth = item.description ? 3 : 0; // ' – ' separator
 
     // For files, truncate middle of path to show both directory context and filename
     // For MCP resources, limit displayText to 30 chars (truncate from end)
     // For agents, no truncation
-    let displayText: string
+    let displayText: string;
     if (isFile) {
       // Reserve space for description if present, otherwise use all available space
-      const descReserve = item.description
-        ? Math.min(20, stringWidth(item.description))
-        : 0
-      const maxPathLength =
-        columns - iconWidth - paddingWidth - separatorWidth - descReserve
-      displayText = truncatePathMiddle(item.displayText, maxPathLength)
+      const descReserve = item.description ? Math.min(20, stringWidth(item.description)) : 0;
+      const maxPathLength = columns - iconWidth - paddingWidth - separatorWidth - descReserve;
+      displayText = truncatePathMiddle(item.displayText, maxPathLength);
     } else if (isMcpResource) {
-      const maxDisplayTextLength = 30
-      displayText = truncateToWidth(item.displayText, maxDisplayTextLength)
+      const maxDisplayTextLength = 30;
+      displayText = truncateToWidth(item.displayText, maxDisplayTextLength);
     } else {
-      displayText = item.displayText
+      displayText = item.displayText;
     }
 
-    const availableWidth =
-      columns -
-      iconWidth -
-      stringWidth(displayText) -
-      separatorWidth -
-      paddingWidth
+    const availableWidth = columns - iconWidth - stringWidth(displayText) - separatorWidth - paddingWidth;
 
     // Build the full line as a single string to prevent wrapping
-    let lineContent: string
+    let lineContent: string;
     if (item.description) {
-      const maxDescLength = Math.max(0, availableWidth)
-      const truncatedDesc = truncateToWidth(
-        item.description.replace(/\s+/g, ' '),
-        maxDescLength,
-      )
-      lineContent = `${icon} ${displayText} – ${truncatedDesc}`
+      const maxDescLength = Math.max(0, availableWidth);
+      const truncatedDesc = truncateToWidth(item.description.replace(/\s+/g, ' '), maxDescLength);
+      lineContent = `${icon} ${displayText} – ${truncatedDesc}`;
     } else {
-      lineContent = `${icon} ${displayText}`
+      lineContent = `${icon} ${displayText}`;
     }
 
     return (
       <Text color={textColor} dimColor={dimColor} wrap="truncate">
         {lineContent}
       </Text>
-    )
+    );
   }
 
   // For non-unified suggestions (commands, shell, etc.), use improved layout from main
   // Cap the command name column at 40% of terminal width to ensure description has space
-  const maxNameWidth = Math.floor(columns * 0.4)
-  const displayTextWidth = Math.min(
-    maxColumnWidth ?? stringWidth(item.displayText) + 5,
-    maxNameWidth,
-  )
+  const maxNameWidth = Math.floor(columns * 0.4);
+  const displayTextWidth = Math.min(maxColumnWidth ?? stringWidth(item.displayText) + 5, maxNameWidth);
 
-  const textColor = item.color || (isSelected ? 'suggestion' : undefined)
-  const shouldDim = !isSelected
+  const textColor = item.color || (isSelected ? 'suggestion' : undefined);
+  const shouldDim = !isSelected;
 
   // Truncate and pad the display text to fixed width
-  let displayText = item.displayText
+  let displayText = item.displayText;
   if (stringWidth(displayText) > displayTextWidth - 2) {
-    displayText = truncateToWidth(displayText, displayTextWidth - 2)
+    displayText = truncateToWidth(displayText, displayTextWidth - 2);
   }
-  const paddedDisplayText =
-    displayText +
-    ' '.repeat(Math.max(0, displayTextWidth - stringWidth(displayText)))
+  const paddedDisplayText = displayText + ' '.repeat(Math.max(0, displayTextWidth - stringWidth(displayText)));
 
-  const tagText = item.tag ? `[${item.tag}] ` : ''
-  const tagWidth = stringWidth(tagText)
-  const descriptionWidth = Math.max(
-    0,
-    columns - displayTextWidth - tagWidth - 4,
-  )
+  const tagText = item.tag ? `[${item.tag}] ` : '';
+  const tagWidth = stringWidth(tagText);
+  const descriptionWidth = Math.max(0, columns - displayTextWidth - tagWidth - 4);
   // Skill descriptions can contain newlines (e.g. /claude-api's "TRIGGER
   // when:" block). A multi-line row grows the overlay past minHeight; when
   // the filter narrows past that skill, the overlay shrinks and leaves
   // ghost rows. Flatten to one line before truncating.
   const truncatedDescription = item.description
     ? truncateToWidth(item.description.replace(/\s+/g, ' '), descriptionWidth)
-    : ''
+    : '';
 
   return (
     <Text wrap="truncate">
@@ -167,27 +142,24 @@ const SuggestionItemRow = memo(function SuggestionItemRow({
           {tagText}
         </Text>
       ) : null}
-      <Text
-        color={isSelected ? 'suggestion' : undefined}
-        dimColor={!isSelected}
-      >
+      <Text color={isSelected ? 'suggestion' : undefined} dimColor={!isSelected}>
         {truncatedDescription}
       </Text>
     </Text>
-  )
-})
+  );
+});
 
 type Props = {
-  suggestions: SuggestionItem[]
-  selectedSuggestion: number
-  maxColumnWidth?: number
+  suggestions: SuggestionItem[];
+  selectedSuggestion: number;
+  maxColumnWidth?: number;
   /**
    * When true, the suggestions are rendered inside a position=absolute
    * overlay. We omit minHeight and flex-end so the y-clamp in the
    * renderer doesn't push fewer items down into the prompt area.
    */
-  overlay?: boolean
-}
+  overlay?: boolean;
+};
 
 export function PromptInputFooterSuggestions({
   suggestions,
@@ -195,34 +167,27 @@ export function PromptInputFooterSuggestions({
   maxColumnWidth: maxColumnWidthProp,
   overlay,
 }: Props): ReactNode {
-  const { rows } = useTerminalSize()
+  const { rows } = useTerminalSize();
   // Maximum number of suggestions to show at once (leaving space for prompt).
   // Overlay mode (fullscreen) uses a fixed 5 — the floating box sits over
   // the ScrollBox, so terminal height isn't the constraint.
-  const maxVisibleItems = overlay
-    ? OVERLAY_MAX_ITEMS
-    : Math.min(6, Math.max(1, rows - 3))
+  const maxVisibleItems = overlay ? OVERLAY_MAX_ITEMS : Math.min(6, Math.max(1, rows - 3));
 
   // No suggestions to display
   if (suggestions.length === 0) {
-    return null
+    return null;
   }
 
   // Use prop if provided (stable width from all commands), otherwise calculate from visible
-  const maxColumnWidth =
-    maxColumnWidthProp ??
-    Math.max(...suggestions.map(item => stringWidth(item.displayText))) + 5
+  const maxColumnWidth = maxColumnWidthProp ?? Math.max(...suggestions.map(item => stringWidth(item.displayText))) + 5;
 
   // Calculate visible items range based on selected index
   const startIndex = Math.max(
     0,
-    Math.min(
-      selectedSuggestion - Math.floor(maxVisibleItems / 2),
-      suggestions.length - maxVisibleItems,
-    ),
-  )
-  const endIndex = Math.min(startIndex + maxVisibleItems, suggestions.length)
-  const visibleItems = suggestions.slice(startIndex, endIndex)
+    Math.min(selectedSuggestion - Math.floor(maxVisibleItems / 2), suggestions.length - maxVisibleItems),
+  );
+  const endIndex = Math.min(startIndex + maxVisibleItems, suggestions.length);
+  const visibleItems = suggestions.slice(startIndex, endIndex);
 
   // In non-overlay (inline) mode, justifyContent keeps suggestions
   // anchored to the bottom (near the prompt). In overlay mode we omit
@@ -232,10 +197,7 @@ export function PromptInputFooterSuggestions({
   // padding rows that shift the visible items down into the prompt area
   // when the list has fewer items than maxVisibleItems.
   return (
-    <Box
-      flexDirection="column"
-      justifyContent={overlay ? undefined : 'flex-end'}
-    >
+    <Box flexDirection="column" justifyContent={overlay ? undefined : 'flex-end'}>
       {visibleItems.map(item => (
         <SuggestionItemRow
           key={item.id}
@@ -245,7 +207,7 @@ export function PromptInputFooterSuggestions({
         />
       ))}
     </Box>
-  )
+  );
 }
 
-export default memo(PromptInputFooterSuggestions)
+export default memo(PromptInputFooterSuggestions);
diff --git a/src/components/PromptInput/PromptInputHelpMenu.tsx b/src/components/PromptInput/PromptInputHelpMenu.tsx
index 88aa5dfc2..97d2a1b0e 100644
--- a/src/components/PromptInput/PromptInputHelpMenu.tsx
+++ b/src/components/PromptInput/PromptInputHelpMenu.tsx
@@ -1,59 +1,39 @@
-import { feature } from 'bun:bundle'
-import * as React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { getPlatform } from 'src/utils/platform.js'
-import { isKeybindingCustomizationEnabled } from '../../keybindings/loadUserBindings.js'
-import { useShortcutDisplay } from '../../keybindings/useShortcutDisplay.js'
-import { getFeatureValue_CACHED_MAY_BE_STALE } from '../../services/analytics/growthbook.js'
-import { isFastModeAvailable, isFastModeEnabled } from '../../utils/fastMode.js'
-import { getNewlineInstructions } from './utils.js'
+import { feature } from 'bun:bundle';
+import * as React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { getPlatform } from 'src/utils/platform.js';
+import { isKeybindingCustomizationEnabled } from '../../keybindings/loadUserBindings.js';
+import { useShortcutDisplay } from '../../keybindings/useShortcutDisplay.js';
+import { getFeatureValue_CACHED_MAY_BE_STALE } from '../../services/analytics/growthbook.js';
+import { isFastModeAvailable, isFastModeEnabled } from '../../utils/fastMode.js';
+import { getNewlineInstructions } from './utils.js';
 
 /** Format a shortcut for display in the help menu (e.g., "ctrl+o" → "ctrl + o") */
 function formatShortcut(shortcut: string): string {
-  return shortcut.replace(/\+/g, ' + ')
+  return shortcut.replace(/\+/g, ' + ');
 }
 
 type Props = {
-  dimColor?: boolean
-  fixedWidth?: boolean
-  gap?: number
-  paddingX?: number
-}
+  dimColor?: boolean;
+  fixedWidth?: boolean;
+  gap?: number;
+  paddingX?: number;
+};
 
 export function PromptInputHelpMenu(props: Props): React.ReactNode {
-  const { dimColor, fixedWidth, gap, paddingX } = props
+  const { dimColor, fixedWidth, gap, paddingX } = props;
 
   // Get configured shortcuts from keybinding system
-  const transcriptShortcut = formatShortcut(
-    useShortcutDisplay('app:toggleTranscript', 'Global', 'ctrl+o'),
-  )
-  const todosShortcut = formatShortcut(
-    useShortcutDisplay('app:toggleTodos', 'Global', 'ctrl+t'),
-  )
-  const undoShortcut = formatShortcut(
-    useShortcutDisplay('chat:undo', 'Chat', 'ctrl+_'),
-  )
-  const stashShortcut = formatShortcut(
-    useShortcutDisplay('chat:stash', 'Chat', 'ctrl+s'),
-  )
-  const cycleModeShortcut = formatShortcut(
-    useShortcutDisplay('chat:cycleMode', 'Chat', 'shift+tab'),
-  )
-  const modelPickerShortcut = formatShortcut(
-    useShortcutDisplay('chat:modelPicker', 'Chat', 'alt+p'),
-  )
-  const fastModeShortcut = formatShortcut(
-    useShortcutDisplay('chat:fastMode', 'Chat', 'alt+o'),
-  )
-  const externalEditorShortcut = formatShortcut(
-    useShortcutDisplay('chat:externalEditor', 'Chat', 'ctrl+g'),
-  )
-  const terminalShortcut = formatShortcut(
-    useShortcutDisplay('app:toggleTerminal', 'Global', 'meta+j'),
-  )
-  const imagePasteShortcut = formatShortcut(
-    useShortcutDisplay('chat:imagePaste', 'Chat', 'ctrl+v'),
-  )
+  const transcriptShortcut = formatShortcut(useShortcutDisplay('app:toggleTranscript', 'Global', 'ctrl+o'));
+  const todosShortcut = formatShortcut(useShortcutDisplay('app:toggleTodos', 'Global', 'ctrl+t'));
+  const undoShortcut = formatShortcut(useShortcutDisplay('chat:undo', 'Chat', 'ctrl+_'));
+  const stashShortcut = formatShortcut(useShortcutDisplay('chat:stash', 'Chat', 'ctrl+s'));
+  const cycleModeShortcut = formatShortcut(useShortcutDisplay('chat:cycleMode', 'Chat', 'shift+tab'));
+  const modelPickerShortcut = formatShortcut(useShortcutDisplay('chat:modelPicker', 'Chat', 'alt+p'));
+  const fastModeShortcut = formatShortcut(useShortcutDisplay('chat:fastMode', 'Chat', 'alt+o'));
+  const externalEditorShortcut = formatShortcut(useShortcutDisplay('chat:externalEditor', 'Chat', 'ctrl+g'));
+  const terminalShortcut = formatShortcut(useShortcutDisplay('app:toggleTerminal', 'Global', 'meta+j'));
+  const imagePasteShortcut = formatShortcut(useShortcutDisplay('chat:imagePaste', 'Chat', 'ctrl+v'));
 
   // Compute terminal shortcut element outside JSX to satisfy feature() constraint
   const terminalShortcutElement = feature('TERMINAL_PANEL') ? (
@@ -62,7 +42,7 @@ export function PromptInputHelpMenu(props: Props): React.ReactNode {
         <Text dimColor={dimColor}>{terminalShortcut} for terminal</Text>
       </Box>
     ) : null
-  ) : null
+  ) : null;
 
   return (
     <Box paddingX={paddingX} flexDirection="row" gap={gap}>
@@ -89,16 +69,11 @@ export function PromptInputHelpMenu(props: Props): React.ReactNode {
         </Box>
         <Box>
           <Text dimColor={dimColor}>
-            {cycleModeShortcut}{' '}
-            {process.env.USER_TYPE === 'ant'
-              ? 'to cycle modes'
-              : 'to auto-accept edits'}
+            {cycleModeShortcut} {process.env.USER_TYPE === 'ant' ? 'to cycle modes' : 'to auto-accept edits'}
           </Text>
         </Box>
         <Box>
-          <Text dimColor={dimColor}>
-            {transcriptShortcut} for verbose output
-          </Text>
+          <Text dimColor={dimColor}>{transcriptShortcut} for verbose output</Text>
         </Box>
         <Box>
           <Text dimColor={dimColor}>{todosShortcut} to toggle tasks</Text>
@@ -125,18 +100,14 @@ export function PromptInputHelpMenu(props: Props): React.ReactNode {
         </Box>
         {isFastModeEnabled() && isFastModeAvailable() && (
           <Box>
-            <Text dimColor={dimColor}>
-              {fastModeShortcut} to toggle fast mode
-            </Text>
+            <Text dimColor={dimColor}>{fastModeShortcut} to toggle fast mode</Text>
           </Box>
         )}
         <Box>
           <Text dimColor={dimColor}>{stashShortcut} to stash prompt</Text>
         </Box>
         <Box>
-          <Text dimColor={dimColor}>
-            {externalEditorShortcut} to edit in $EDITOR
-          </Text>
+          <Text dimColor={dimColor}>{externalEditorShortcut} to edit in $EDITOR</Text>
         </Box>
         {isKeybindingCustomizationEnabled() && (
           <Box>
@@ -145,5 +116,5 @@ export function PromptInputHelpMenu(props: Props): React.ReactNode {
         )}
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/components/PromptInput/PromptInputModeIndicator.tsx b/src/components/PromptInput/PromptInputModeIndicator.tsx
index b52828ba6..5b4d00167 100644
--- a/src/components/PromptInput/PromptInputModeIndicator.tsx
+++ b/src/components/PromptInput/PromptInputModeIndicator.tsx
@@ -1,22 +1,22 @@
-import figures from 'figures'
-import * as React from 'react'
-import { Box, Text } from '@anthropic/ink'
+import figures from 'figures';
+import * as React from 'react';
+import { Box, Text } from '@anthropic/ink';
 import {
   AGENT_COLOR_TO_THEME_COLOR,
   AGENT_COLORS,
   type AgentColorName,
-} from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js'
-import type { PromptInputMode } from 'src/types/textInputTypes.js'
-import { getTeammateColor } from 'src/utils/teammate.js'
-import type { Theme } from 'src/utils/theme.js'
-import { isAgentSwarmsEnabled } from '../../utils/agentSwarmsEnabled.js'
+} from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js';
+import type { PromptInputMode } from 'src/types/textInputTypes.js';
+import { getTeammateColor } from 'src/utils/teammate.js';
+import type { Theme } from 'src/utils/theme.js';
+import { isAgentSwarmsEnabled } from '../../utils/agentSwarmsEnabled.js';
 
 type Props = {
-  mode: PromptInputMode
-  isLoading: boolean
-  viewingAgentName?: string
-  viewingAgentColor?: AgentColorName
-}
+  mode: PromptInputMode;
+  isLoading: boolean;
+  viewingAgentName?: string;
+  viewingAgentColor?: AgentColorName;
+};
 
 /**
  * Gets the theme color key for the teammate's assigned color.
@@ -24,42 +24,39 @@ type Props = {
  */
 function getTeammateThemeColor(): keyof Theme | undefined {
   if (!isAgentSwarmsEnabled()) {
-    return undefined
+    return undefined;
   }
-  const colorName = getTeammateColor()
+  const colorName = getTeammateColor();
   if (!colorName) {
-    return undefined
+    return undefined;
   }
   if (AGENT_COLORS.includes(colorName as AgentColorName)) {
-    return AGENT_COLOR_TO_THEME_COLOR[colorName as AgentColorName]
+    return AGENT_COLOR_TO_THEME_COLOR[colorName as AgentColorName];
   }
-  return undefined
+  return undefined;
 }
 
 type PromptCharProps = {
-  isLoading: boolean
+  isLoading: boolean;
   // Dead code elimination: parameter named themeColor to avoid "teammate" string in external builds
-  themeColor?: keyof Theme
-}
+  themeColor?: keyof Theme;
+};
 
 /**
  * Renders the prompt character (❯).
  * Teammate color overrides the default color when set.
  */
-function PromptChar({
-  isLoading,
-  themeColor,
-}: PromptCharProps): React.ReactNode {
+function PromptChar({ isLoading, themeColor }: PromptCharProps): React.ReactNode {
   // Assign to original name for clarity within the function
-  const teammateColor = themeColor
-  const isAnt = process.env.USER_TYPE === 'ant'
-  const color = teammateColor ?? (isAnt ? 'subtle' : undefined)
+  const teammateColor = themeColor;
+  const isAnt = process.env.USER_TYPE === 'ant';
+  const color = teammateColor ?? (isAnt ? 'subtle' : undefined);
 
   return (
     <Text color={color} dimColor={isLoading}>
       {figures.pointer}&nbsp;
     </Text>
-  )
+  );
 }
 
 export function PromptInputModeIndicator({
@@ -68,37 +65,24 @@ export function PromptInputModeIndicator({
   viewingAgentName,
   viewingAgentColor,
 }: Props): React.ReactNode {
-  const teammateColor = getTeammateThemeColor()
+  const teammateColor = getTeammateThemeColor();
 
   // Convert viewed teammate's color to theme color
   // Falls back to PromptChar's default (subtle for ants, undefined for external)
-  const viewedTeammateThemeColor = viewingAgentColor
-    ? AGENT_COLOR_TO_THEME_COLOR[viewingAgentColor]
-    : undefined
+  const viewedTeammateThemeColor = viewingAgentColor ? AGENT_COLOR_TO_THEME_COLOR[viewingAgentColor] : undefined;
 
   return (
-    <Box
-      alignItems="flex-start"
-      alignSelf="flex-start"
-      flexWrap="nowrap"
-      justifyContent="flex-start"
-    >
+    <Box alignItems="flex-start" alignSelf="flex-start" flexWrap="nowrap" justifyContent="flex-start">
       {viewingAgentName ? (
         // Use teammate's color on the standard prompt character, matching established style
-        <PromptChar
-          isLoading={isLoading}
-          themeColor={viewedTeammateThemeColor}
-        />
+        <PromptChar isLoading={isLoading} themeColor={viewedTeammateThemeColor} />
       ) : mode === 'bash' ? (
         <Text color="bashBorder" dimColor={isLoading}>
           !&nbsp;
         </Text>
       ) : (
-        <PromptChar
-          isLoading={isLoading}
-          themeColor={isAgentSwarmsEnabled() ? teammateColor : undefined}
-        />
+        <PromptChar isLoading={isLoading} themeColor={isAgentSwarmsEnabled() ? teammateColor : undefined} />
       )}
     </Box>
-  )
+  );
 }
diff --git a/src/components/PromptInput/PromptInputQueuedCommands.tsx b/src/components/PromptInput/PromptInputQueuedCommands.tsx
index e96ba3532..be2a9c58a 100644
--- a/src/components/PromptInput/PromptInputQueuedCommands.tsx
+++ b/src/components/PromptInput/PromptInputQueuedCommands.tsx
@@ -1,26 +1,18 @@
-import { feature } from 'bun:bundle'
-import * as React from 'react'
-import { useMemo } from 'react'
-import { Box } from '@anthropic/ink'
-import { useAppState } from 'src/state/AppState.js'
-import {
-  STATUS_TAG,
-  SUMMARY_TAG,
-  TASK_NOTIFICATION_TAG,
-} from '../../constants/xml.js'
-import { QueuedMessageProvider } from '../../context/QueuedMessageContext.js'
-import { useCommandQueue } from '../../hooks/useCommandQueue.js'
-import type { QueuedCommand } from '../../types/textInputTypes.js'
-import { isQueuedCommandVisible } from '../../utils/messageQueueManager.js'
-import {
-  createUserMessage,
-  EMPTY_LOOKUPS,
-  normalizeMessages,
-} from '../../utils/messages.js'
-import { jsonParse } from '../../utils/slowOperations.js'
-import { Message } from '../Message.js'
+import { feature } from 'bun:bundle';
+import * as React from 'react';
+import { useMemo } from 'react';
+import { Box } from '@anthropic/ink';
+import { useAppState } from 'src/state/AppState.js';
+import { STATUS_TAG, SUMMARY_TAG, TASK_NOTIFICATION_TAG } from '../../constants/xml.js';
+import { QueuedMessageProvider } from '../../context/QueuedMessageContext.js';
+import { useCommandQueue } from '../../hooks/useCommandQueue.js';
+import type { QueuedCommand } from '../../types/textInputTypes.js';
+import { isQueuedCommandVisible } from '../../utils/messageQueueManager.js';
+import { createUserMessage, EMPTY_LOOKUPS, normalizeMessages } from '../../utils/messages.js';
+import { jsonParse } from '../../utils/slowOperations.js';
+import { Message } from '../Message.js';
 
-const EMPTY_SET = new Set<string>()
+const EMPTY_SET = new Set<string>();
 
 /**
  * Check if a command value is an idle notification that should be hidden.
@@ -28,15 +20,15 @@ const EMPTY_SET = new Set<string>()
  */
 function isIdleNotification(value: string): boolean {
   try {
-    const parsed = jsonParse(value)
-    return parsed?.type === 'idle_notification'
+    const parsed = jsonParse(value);
+    return parsed?.type === 'idle_notification';
   } catch {
-    return false
+    return false;
   }
 }
 
 // Maximum number of task notification lines to show
-const MAX_VISIBLE_NOTIFICATIONS = 3
+const MAX_VISIBLE_NOTIFICATIONS = 3;
 
 /**
  * Create a synthetic overflow notification message for capped task notifications.
@@ -45,7 +37,7 @@ function createOverflowNotificationMessage(count: number): string {
   return `<${TASK_NOTIFICATION_TAG}>
 <${SUMMARY_TAG}>+${count} more tasks completed</${SUMMARY_TAG}>
 <${STATUS_TAG}>completed</${STATUS_TAG}>
-</${TASK_NOTIFICATION_TAG}>`
+</${TASK_NOTIFICATION_TAG}>`;
 }
 
 /**
@@ -53,94 +45,79 @@ function createOverflowNotificationMessage(count: number): string {
  * Other command types are always shown in full.
  * Idle notifications are filtered out entirely.
  */
-function processQueuedCommands(
-  queuedCommands: QueuedCommand[],
-): QueuedCommand[] {
+function processQueuedCommands(queuedCommands: QueuedCommand[]): QueuedCommand[] {
   // Filter out idle notifications - they are processed silently
   const filteredCommands = queuedCommands.filter(
     cmd => typeof cmd.value !== 'string' || !isIdleNotification(cmd.value),
-  )
+  );
 
   // Separate task notifications from other commands
-  const taskNotifications = filteredCommands.filter(
-    cmd => cmd.mode === 'task-notification',
-  )
-  const otherCommands = filteredCommands.filter(
-    cmd => cmd.mode !== 'task-notification',
-  )
+  const taskNotifications = filteredCommands.filter(cmd => cmd.mode === 'task-notification');
+  const otherCommands = filteredCommands.filter(cmd => cmd.mode !== 'task-notification');
 
   // If notifications fit within limit, return all commands as-is
   if (taskNotifications.length <= MAX_VISIBLE_NOTIFICATIONS) {
-    return [...otherCommands, ...taskNotifications]
+    return [...otherCommands, ...taskNotifications];
   }
 
   // Show first (MAX_VISIBLE_NOTIFICATIONS - 1) notifications, then a summary
-  const visibleNotifications = taskNotifications.slice(
-    0,
-    MAX_VISIBLE_NOTIFICATIONS - 1,
-  )
-  const overflowCount =
-    taskNotifications.length - (MAX_VISIBLE_NOTIFICATIONS - 1)
+  const visibleNotifications = taskNotifications.slice(0, MAX_VISIBLE_NOTIFICATIONS - 1);
+  const overflowCount = taskNotifications.length - (MAX_VISIBLE_NOTIFICATIONS - 1);
 
   // Create synthetic overflow message
   const overflowCommand: QueuedCommand = {
     value: createOverflowNotificationMessage(overflowCount),
     mode: 'task-notification',
-  }
+  };
 
-  return [...otherCommands, ...visibleNotifications, overflowCommand]
+  return [...otherCommands, ...visibleNotifications, overflowCommand];
 }
 
 function PromptInputQueuedCommandsImpl(): React.ReactNode {
-  const queuedCommands = useCommandQueue()
-  const viewingAgent = useAppState(s => !!s.viewingAgentTaskId)
+  const queuedCommands = useCommandQueue();
+  const viewingAgent = useAppState(s => !!s.viewingAgentTaskId);
   // Brief layout: dim queue items + skip the paddingX (brief messages
   // already indent themselves). Gate mirrors the brief-spinner/message
   // check elsewhere — no teammate-view override needed since this
   // component early-returns when viewing a teammate.
   const useBriefLayout =
     feature('KAIROS') || feature('KAIROS_BRIEF')
-      ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-        useAppState(s => s.isBriefOnly)
-      : false
+      ? useAppState(s => s.isBriefOnly)
+      : false;
 
   // createUserMessage mints a fresh UUID per call; without memoization, streaming
   // re-renders defeat Message's areMessagePropsEqual (compares uuid) → flicker.
   const messages = useMemo(() => {
-    if (queuedCommands.length === 0) return null
+    if (queuedCommands.length === 0) return null;
     // task-notification is shown via useInboxNotification; most isMeta commands
     // (scheduled tasks, proactive ticks) are system-generated and hidden.
     // Channel messages are the exception — isMeta but shown so the keyboard
     // user sees what arrived.
-    const visibleCommands = queuedCommands.filter(isQueuedCommandVisible)
-    if (visibleCommands.length === 0) return null
-    const processedCommands = processQueuedCommands(visibleCommands)
+    const visibleCommands = queuedCommands.filter(isQueuedCommandVisible);
+    if (visibleCommands.length === 0) return null;
+    const processedCommands = processQueuedCommands(visibleCommands);
     return normalizeMessages(
       processedCommands.map(cmd => {
-        let content = cmd.value
+        let content = cmd.value;
         if (cmd.mode === 'bash' && typeof content === 'string') {
-          content = `<bash-input>${content}</bash-input>`
+          content = `<bash-input>${content}</bash-input>`;
         }
         // [Image #N] placeholders are inline in the text value (inserted at
         // paste time), so the queue preview shows them without stub blocks.
-        return createUserMessage({ content })
+        return createUserMessage({ content });
       }),
-    )
-  }, [queuedCommands])
+    );
+  }, [queuedCommands]);
 
   // Don't show leader's queued commands when viewing any agent's transcript
   if (viewingAgent || messages === null) {
-    return null
+    return null;
   }
 
   return (
     <Box marginTop={1} flexDirection="column">
       {messages.map((message, i) => (
-        <QueuedMessageProvider
-          key={i}
-          isFirst={i === 0}
-          useBriefLayout={useBriefLayout}
-        >
+        <QueuedMessageProvider key={i} isFirst={i === 0} useBriefLayout={useBriefLayout}>
           <Message
             message={message}
             lookups={EMPTY_LOOKUPS}
@@ -158,9 +135,7 @@ function PromptInputQueuedCommandsImpl(): React.ReactNode {
         </QueuedMessageProvider>
       ))}
     </Box>
-  )
+  );
 }
 
-export const PromptInputQueuedCommands = React.memo(
-  PromptInputQueuedCommandsImpl,
-)
+export const PromptInputQueuedCommands = React.memo(PromptInputQueuedCommandsImpl);
diff --git a/src/components/PromptInput/PromptInputStashNotice.tsx b/src/components/PromptInput/PromptInputStashNotice.tsx
index c33f43190..866426249 100644
--- a/src/components/PromptInput/PromptInputStashNotice.tsx
+++ b/src/components/PromptInput/PromptInputStashNotice.tsx
@@ -1,21 +1,19 @@
-import figures from 'figures'
-import * as React from 'react'
-import { Box, Text } from '@anthropic/ink'
+import figures from 'figures';
+import * as React from 'react';
+import { Box, Text } from '@anthropic/ink';
 
 type Props = {
-  hasStash: boolean
-}
+  hasStash: boolean;
+};
 
 export function PromptInputStashNotice({ hasStash }: Props): React.ReactNode {
   if (!hasStash) {
-    return null
+    return null;
   }
 
   return (
     <Box paddingLeft={2}>
-      <Text dimColor>
-        {figures.pointerSmall} Stashed (auto-restores after submit)
-      </Text>
+      <Text dimColor>{figures.pointerSmall} Stashed (auto-restores after submit)</Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/PromptInput/SandboxPromptFooterHint.tsx b/src/components/PromptInput/SandboxPromptFooterHint.tsx
index e470509d4..dc831e4c1 100644
--- a/src/components/PromptInput/SandboxPromptFooterHint.tsx
+++ b/src/components/PromptInput/SandboxPromptFooterHint.tsx
@@ -1,61 +1,56 @@
-import * as React from 'react'
-import { type ReactNode, useEffect, useRef, useState } from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { useShortcutDisplay } from '../../keybindings/useShortcutDisplay.js'
-import { SandboxManager } from '../../utils/sandbox/sandbox-adapter.js'
+import * as React from 'react';
+import { type ReactNode, useEffect, useRef, useState } from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { useShortcutDisplay } from '../../keybindings/useShortcutDisplay.js';
+import { SandboxManager } from '../../utils/sandbox/sandbox-adapter.js';
 
 export function SandboxPromptFooterHint(): ReactNode {
-  const [recentViolationCount, setRecentViolationCount] = useState(0)
-  const timerRef = useRef<NodeJS.Timeout | null>(null)
-  const detailsShortcut = useShortcutDisplay(
-    'app:toggleTranscript',
-    'Global',
-    'ctrl+o',
-  )
+  const [recentViolationCount, setRecentViolationCount] = useState(0);
+  const timerRef = useRef<NodeJS.Timeout | null>(null);
+  const detailsShortcut = useShortcutDisplay('app:toggleTranscript', 'Global', 'ctrl+o');
 
   useEffect(() => {
     if (!SandboxManager.isSandboxingEnabled()) {
-      return
+      return;
     }
 
-    const store = SandboxManager.getSandboxViolationStore()
-    let lastCount = store.getTotalCount()
+    const store = SandboxManager.getSandboxViolationStore();
+    let lastCount = store.getTotalCount();
 
     const unsubscribe = store.subscribe(() => {
-      const currentCount = store.getTotalCount()
-      const newViolations = currentCount - lastCount
+      const currentCount = store.getTotalCount();
+      const newViolations = currentCount - lastCount;
 
       if (newViolations > 0) {
-        setRecentViolationCount(newViolations)
-        lastCount = currentCount
+        setRecentViolationCount(newViolations);
+        lastCount = currentCount;
 
         if (timerRef.current) {
-          clearTimeout(timerRef.current)
+          clearTimeout(timerRef.current);
         }
 
-        timerRef.current = setTimeout(setRecentViolationCount, 5000, 0)
+        timerRef.current = setTimeout(setRecentViolationCount, 5000, 0);
       }
-    })
+    });
 
     return () => {
-      unsubscribe()
+      unsubscribe();
       if (timerRef.current) {
-        clearTimeout(timerRef.current)
+        clearTimeout(timerRef.current);
       }
-    }
-  }, [])
+    };
+  }, []);
 
   if (!SandboxManager.isSandboxingEnabled() || recentViolationCount === 0) {
-    return null
+    return null;
   }
 
   return (
     <Box paddingX={0} paddingY={0}>
       <Text color="inactive" wrap="truncate">
-        ⧈ Sandbox blocked {recentViolationCount}{' '}
-        {recentViolationCount === 1 ? 'operation' : 'operations'} ·{' '}
+        ⧈ Sandbox blocked {recentViolationCount} {recentViolationCount === 1 ? 'operation' : 'operations'} ·{' '}
         {detailsShortcut} for details · /sandbox to disable
       </Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/PromptInput/ShimmeredInput.tsx b/src/components/PromptInput/ShimmeredInput.tsx
index a14afbc9b..c98a83c43 100644
--- a/src/components/PromptInput/ShimmeredInput.tsx
+++ b/src/components/PromptInput/ShimmeredInput.tsx
@@ -1,21 +1,18 @@
-import * as React from 'react'
-import { Ansi, Box, Text, useAnimationFrame } from '@anthropic/ink'
-import {
-  segmentTextByHighlights,
-  type TextHighlight,
-} from '../../utils/textHighlighting.js'
-import { ShimmerChar } from '../Spinner/ShimmerChar.js'
+import * as React from 'react';
+import { Ansi, Box, Text, useAnimationFrame } from '@anthropic/ink';
+import { segmentTextByHighlights, type TextHighlight } from '../../utils/textHighlighting.js';
+import { ShimmerChar } from '../Spinner/ShimmerChar.js';
 
 type Props = {
-  text: string
-  highlights: TextHighlight[]
-}
+  text: string;
+  highlights: TextHighlight[];
+};
 
 type LinePart = {
-  text: string
-  highlight: TextHighlight | undefined
-  start: number
-}
+  text: string;
+  highlight: TextHighlight | undefined;
+  start: number;
+};
 
 export function HighlightedInput({ text, highlights }: Props): React.ReactNode {
   // The shimmer animation (below) re-renders this component at 20fps while the
@@ -24,59 +21,57 @@ export function HighlightedInput({ text, highlights }: Props): React.ReactNode {
   // that derives from them: segmentTextByHighlights alone is ~85µs/call
   // (tokenize + sort + O(n²) overlap), which adds up fast at 20fps.
   const { lines, hasShimmer, sweepStart, cycleLength } = React.useMemo(() => {
-    const segments = segmentTextByHighlights(text, highlights)
+    const segments = segmentTextByHighlights(text, highlights);
 
     // Split segments by newlines into per-line groups. Ink's row-direction Box
     // indents continuation lines of a multi-line child to that child's X offset.
     // By splitting at newlines, each line renders as its own row, avoiding the
     // incorrect indentation when highlighted text is followed by wrapped content.
-    const lines: LinePart[][] = [[]]
-    let pos = 0
+    const lines: LinePart[][] = [[]];
+    let pos = 0;
     for (const segment of segments) {
-      const parts = segment.text.split('\n')
+      const parts = segment.text.split('\n');
       for (let i = 0; i < parts.length; i++) {
         if (i > 0) {
-          lines.push([])
-          pos += 1
+          lines.push([]);
+          pos += 1;
         }
-        const part = parts[i]!
+        const part = parts[i]!;
         if (part.length > 0) {
           lines[lines.length - 1]!.push({
             text: part,
             highlight: segment.highlight,
             start: pos,
-          })
+          });
         }
-        pos += part.length
+        pos += part.length;
       }
     }
 
     // Scope the sweep to shimmer-highlighted ranges so cycle time doesn't grow
     // with input length. Padding creates an offscreen pause between sweeps.
-    const hasShimmer = highlights.some(h => h.shimmerColor)
-    let sweepStart = 0
-    let cycleLength = 1
+    const hasShimmer = highlights.some(h => h.shimmerColor);
+    let sweepStart = 0;
+    let cycleLength = 1;
     if (hasShimmer) {
-      const padding = 10
-      let lo = Infinity
-      let hi = -Infinity
+      const padding = 10;
+      let lo = Infinity;
+      let hi = -Infinity;
       for (const h of highlights) {
         if (h.shimmerColor) {
-          lo = Math.min(lo, h.start)
-          hi = Math.max(hi, h.end)
+          lo = Math.min(lo, h.start);
+          hi = Math.max(hi, h.end);
         }
       }
-      sweepStart = lo - padding
-      cycleLength = hi - lo + padding * 2
+      sweepStart = lo - padding;
+      cycleLength = hi - lo + padding * 2;
     }
 
-    return { lines, hasShimmer, sweepStart, cycleLength }
-  }, [text, highlights])
+    return { lines, hasShimmer, sweepStart, cycleLength };
+  }, [text, highlights]);
 
-  const [ref, time] = useAnimationFrame(hasShimmer ? 50 : null)
-  const glimmerIndex = hasShimmer
-    ? sweepStart + (Math.floor(time / 50) % cycleLength)
-    : -100
+  const [ref, time] = useAnimationFrame(hasShimmer ? 50 : null);
+  const glimmerIndex = hasShimmer ? sweepStart + (Math.floor(time / 50) % cycleLength) : -100;
 
   return (
     <Box ref={ref} flexDirection="column">
@@ -100,7 +95,7 @@ export function HighlightedInput({ text, highlights }: Props): React.ReactNode {
                       />
                     ))}
                   </Text>
-                )
+                );
               }
               return (
                 <Text
@@ -111,11 +106,11 @@ export function HighlightedInput({ text, highlights }: Props): React.ReactNode {
                 >
                   <Ansi>{part.text}</Ansi>
                 </Text>
-              )
+              );
             })
           )}
         </Box>
       ))}
     </Box>
-  )
+  );
 }
diff --git a/src/components/PromptInput/VoiceIndicator.tsx b/src/components/PromptInput/VoiceIndicator.tsx
index c6fe0b07f..a2c36ac07 100644
--- a/src/components/PromptInput/VoiceIndicator.tsx
+++ b/src/components/PromptInput/VoiceIndicator.tsx
@@ -1,32 +1,32 @@
-import { feature } from 'bun:bundle'
-import * as React from 'react'
-import { useSettings } from '../../hooks/useSettings.js'
-import { Box, Text, useAnimationFrame } from '@anthropic/ink'
-import { interpolateColor, toRGBColor } from '../Spinner/utils.js'
+import { feature } from 'bun:bundle';
+import * as React from 'react';
+import { useSettings } from '../../hooks/useSettings.js';
+import { Box, Text, useAnimationFrame } from '@anthropic/ink';
+import { interpolateColor, toRGBColor } from '../Spinner/utils.js';
 
 type Props = {
-  voiceState: 'idle' | 'recording' | 'processing'
-}
+  voiceState: 'idle' | 'recording' | 'processing';
+};
 
 // Processing shimmer colors: dim gray to lighter gray (matches ThinkingShimmerText)
-const PROCESSING_DIM = { r: 153, g: 153, b: 153 }
-const PROCESSING_BRIGHT = { r: 185, g: 185, b: 185 }
+const PROCESSING_DIM = { r: 153, g: 153, b: 153 };
+const PROCESSING_BRIGHT = { r: 185, g: 185, b: 185 };
 
-const PULSE_PERIOD_S = 2 // 2 second period for all pulsing animations
+const PULSE_PERIOD_S = 2; // 2 second period for all pulsing animations
 
 export function VoiceIndicator(props: Props): React.ReactNode {
-  if (!feature('VOICE_MODE')) return null
-  return <VoiceIndicatorImpl {...props} />
+  if (!feature('VOICE_MODE')) return null;
+  return <VoiceIndicatorImpl {...props} />;
 }
 
 function VoiceIndicatorImpl({ voiceState }: Props): React.ReactNode {
   switch (voiceState) {
     case 'recording':
-      return <Text dimColor>listening…</Text>
+      return <Text dimColor>listening…</Text>;
     case 'processing':
-      return <ProcessingShimmer />
+      return <ProcessingShimmer />;
     case 'idle':
-      return null
+      return null;
   }
 }
 
@@ -35,29 +35,26 @@ function VoiceIndicatorImpl({ voiceState }: Props): React.ReactNode {
 // timer here runs concurrently with auto-repeat spaces arriving every
 // 30-80ms, compounding re-renders during an already-busy window.
 export function VoiceWarmupHint(): React.ReactNode {
-  if (!feature('VOICE_MODE')) return null
-  return <Text dimColor>keep holding…</Text>
+  if (!feature('VOICE_MODE')) return null;
+  return <Text dimColor>keep holding…</Text>;
 }
 
 function ProcessingShimmer(): React.ReactNode {
-  const settings = useSettings()
-  const reducedMotion = settings.prefersReducedMotion ?? false
-  const [ref, time] = useAnimationFrame(reducedMotion ? null : 50)
+  const settings = useSettings();
+  const reducedMotion = settings.prefersReducedMotion ?? false;
+  const [ref, time] = useAnimationFrame(reducedMotion ? null : 50);
 
   if (reducedMotion) {
-    return <Text color="warning">Voice: processing…</Text>
+    return <Text color="warning">Voice: processing…</Text>;
   }
 
-  const elapsedSec = time / 1000
-  const opacity =
-    (Math.sin((elapsedSec * Math.PI * 2) / PULSE_PERIOD_S) + 1) / 2
-  const color = toRGBColor(
-    interpolateColor(PROCESSING_DIM, PROCESSING_BRIGHT, opacity),
-  )
+  const elapsedSec = time / 1000;
+  const opacity = (Math.sin((elapsedSec * Math.PI * 2) / PULSE_PERIOD_S) + 1) / 2;
+  const color = toRGBColor(interpolateColor(PROCESSING_DIM, PROCESSING_BRIGHT, opacity));
 
   return (
     <Box ref={ref}>
       <Text color={color}>Voice: processing…</Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/PromptInput/src/context/notifications.ts b/src/components/PromptInput/src/context/notifications.ts
index 8db063f70..38a1d4cec 100644
--- a/src/components/PromptInput/src/context/notifications.ts
+++ b/src/components/PromptInput/src/context/notifications.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type Notification = any;
-export type useNotifications = any;
+export type Notification = any
+export type useNotifications = any
diff --git a/src/components/PromptInput/src/history.ts b/src/components/PromptInput/src/history.ts
index 626e5c17d..b0bc41129 100644
--- a/src/components/PromptInput/src/history.ts
+++ b/src/components/PromptInput/src/history.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getPastedTextRefNumLines = any;
+export type getPastedTextRefNumLines = any
diff --git a/src/components/PromptInput/src/hooks/useArrowKeyHistory.ts b/src/components/PromptInput/src/hooks/useArrowKeyHistory.ts
index 943c7404f..a2b9fecc7 100644
--- a/src/components/PromptInput/src/hooks/useArrowKeyHistory.ts
+++ b/src/components/PromptInput/src/hooks/useArrowKeyHistory.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type HistoryMode = any;
+export type HistoryMode = any
diff --git a/src/components/PromptInput/src/hooks/useCommandQueue.ts b/src/components/PromptInput/src/hooks/useCommandQueue.ts
index ef6e2c885..54537f8c4 100644
--- a/src/components/PromptInput/src/hooks/useCommandQueue.ts
+++ b/src/components/PromptInput/src/hooks/useCommandQueue.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useCommandQueue = any;
+export type useCommandQueue = any
diff --git a/src/components/PromptInput/src/hooks/useIdeAtMentioned.ts b/src/components/PromptInput/src/hooks/useIdeAtMentioned.ts
index c0d005f12..974c85c5d 100644
--- a/src/components/PromptInput/src/hooks/useIdeAtMentioned.ts
+++ b/src/components/PromptInput/src/hooks/useIdeAtMentioned.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type IDEAtMentioned = any;
-export type useIdeAtMentioned = any;
+export type IDEAtMentioned = any
+export type useIdeAtMentioned = any
diff --git a/src/components/PromptInput/src/ink.ts b/src/components/PromptInput/src/ink.ts
index 51d6eb4b7..7371bcca6 100644
--- a/src/components/PromptInput/src/ink.ts
+++ b/src/components/PromptInput/src/ink.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type Box = any;
-export type Text = any;
+export type Box = any
+export type Text = any
diff --git a/src/components/PromptInput/src/services/analytics/index.ts b/src/components/PromptInput/src/services/analytics/index.ts
index ce0a9a827..eca4493cf 100644
--- a/src/components/PromptInput/src/services/analytics/index.ts
+++ b/src/components/PromptInput/src/services/analytics/index.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type logEvent = any;
-export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any;
+export type logEvent = any
+export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any
diff --git a/src/components/PromptInput/src/state/AppState.ts b/src/components/PromptInput/src/state/AppState.ts
index 46a69cf69..1323f0469 100644
--- a/src/components/PromptInput/src/state/AppState.ts
+++ b/src/components/PromptInput/src/state/AppState.ts
@@ -1,5 +1,5 @@
 // Auto-generated type stub — replace with real implementation
-export type useAppState = any;
-export type useAppStateStore = any;
-export type AppState = any;
-export type useSetAppState = any;
+export type useAppState = any
+export type useAppStateStore = any
+export type AppState = any
+export type useSetAppState = any
diff --git a/src/components/PromptInput/src/state/AppStateStore.ts b/src/components/PromptInput/src/state/AppStateStore.ts
index f27111408..21e6be93f 100644
--- a/src/components/PromptInput/src/state/AppStateStore.ts
+++ b/src/components/PromptInput/src/state/AppStateStore.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type FooterItem = any;
+export type FooterItem = any
diff --git a/src/components/PromptInput/src/tools/AgentTool/agentColorManager.ts b/src/components/PromptInput/src/tools/AgentTool/agentColorManager.ts
index e2c6f578c..59806be0f 100644
--- a/src/components/PromptInput/src/tools/AgentTool/agentColorManager.ts
+++ b/src/components/PromptInput/src/tools/AgentTool/agentColorManager.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type AGENT_COLOR_TO_THEME_COLOR = any;
-export type AGENT_COLORS = any;
-export type AgentColorName = any;
+export type AGENT_COLOR_TO_THEME_COLOR = any
+export type AGENT_COLORS = any
+export type AgentColorName = any
diff --git a/src/components/PromptInput/src/types/textInputTypes.ts b/src/components/PromptInput/src/types/textInputTypes.ts
index a289d0789..b7c48289d 100644
--- a/src/components/PromptInput/src/types/textInputTypes.ts
+++ b/src/components/PromptInput/src/types/textInputTypes.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type PromptInputMode = any;
+export type PromptInputMode = any
diff --git a/src/components/PromptInput/src/utils/config.ts b/src/components/PromptInput/src/utils/config.ts
index 7e541740c..24e95e8c6 100644
--- a/src/components/PromptInput/src/utils/config.ts
+++ b/src/components/PromptInput/src/utils/config.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type getGlobalConfig = any;
-export type PastedContent = any;
+export type getGlobalConfig = any
+export type PastedContent = any
diff --git a/src/components/PromptInput/src/utils/cwd.ts b/src/components/PromptInput/src/utils/cwd.ts
index 76c192ed8..4bd56a824 100644
--- a/src/components/PromptInput/src/utils/cwd.ts
+++ b/src/components/PromptInput/src/utils/cwd.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getCwd = any;
+export type getCwd = any
diff --git a/src/components/PromptInput/src/utils/exampleCommands.ts b/src/components/PromptInput/src/utils/exampleCommands.ts
index c6ce8c5e9..c33c4a503 100644
--- a/src/components/PromptInput/src/utils/exampleCommands.ts
+++ b/src/components/PromptInput/src/utils/exampleCommands.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getExampleCommandFromCache = any;
+export type getExampleCommandFromCache = any
diff --git a/src/components/PromptInput/src/utils/messageQueueManager.ts b/src/components/PromptInput/src/utils/messageQueueManager.ts
index a08a46829..c9dd61aa0 100644
--- a/src/components/PromptInput/src/utils/messageQueueManager.ts
+++ b/src/components/PromptInput/src/utils/messageQueueManager.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type isQueuedCommandEditable = any;
-export type popAllEditable = any;
+export type isQueuedCommandEditable = any
+export type popAllEditable = any
diff --git a/src/components/PromptInput/src/utils/platform.ts b/src/components/PromptInput/src/utils/platform.ts
index b6686f812..c7486cc77 100644
--- a/src/components/PromptInput/src/utils/platform.ts
+++ b/src/components/PromptInput/src/utils/platform.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getPlatform = any;
+export type getPlatform = any
diff --git a/src/components/PromptInput/src/utils/teammate.ts b/src/components/PromptInput/src/utils/teammate.ts
index fb30f2184..89c60ff40 100644
--- a/src/components/PromptInput/src/utils/teammate.ts
+++ b/src/components/PromptInput/src/utils/teammate.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getTeammateColor = any;
+export type getTeammateColor = any
diff --git a/src/components/PromptInput/src/utils/theme.ts b/src/components/PromptInput/src/utils/theme.ts
index c6999a678..833b24799 100644
--- a/src/components/PromptInput/src/utils/theme.ts
+++ b/src/components/PromptInput/src/utils/theme.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type Theme = any;
+export type Theme = any
diff --git a/src/components/QuickOpenDialog.tsx b/src/components/QuickOpenDialog.tsx
index 336feed0d..eea834599 100644
--- a/src/components/QuickOpenDialog.tsx
+++ b/src/components/QuickOpenDialog.tsx
@@ -1,68 +1,66 @@
-import * as path from 'path'
-import * as React from 'react'
-import { useEffect, useRef, useState } from 'react'
-import { useRegisterOverlay } from '../context/overlayContext.js'
-import { generateFileSuggestions } from '../hooks/fileSuggestions.js'
-import { useTerminalSize } from '../hooks/useTerminalSize.js'
-import { Text } from '@anthropic/ink'
-import { logEvent } from '../services/analytics/index.js'
-import { getCwd } from '../utils/cwd.js'
-import { openFileInExternalEditor } from '../utils/editor.js'
-import { truncatePathMiddle, truncateToWidth } from '../utils/format.js'
-import { highlightMatch } from '../utils/highlightMatch.js'
-import { readFileInRange } from '../utils/readFileInRange.js'
-import { FuzzyPicker, LoadingState } from '@anthropic/ink'
+import * as path from 'path';
+import * as React from 'react';
+import { useEffect, useRef, useState } from 'react';
+import { useRegisterOverlay } from '../context/overlayContext.js';
+import { generateFileSuggestions } from '../hooks/fileSuggestions.js';
+import { useTerminalSize } from '../hooks/useTerminalSize.js';
+import { Text } from '@anthropic/ink';
+import { logEvent } from '../services/analytics/index.js';
+import { getCwd } from '../utils/cwd.js';
+import { openFileInExternalEditor } from '../utils/editor.js';
+import { truncatePathMiddle, truncateToWidth } from '../utils/format.js';
+import { highlightMatch } from '../utils/highlightMatch.js';
+import { readFileInRange } from '../utils/readFileInRange.js';
+import { FuzzyPicker, LoadingState } from '@anthropic/ink';
 
 type Props = {
-  onDone: () => void
-  onInsert: (text: string) => void
-}
+  onDone: () => void;
+  onInsert: (text: string) => void;
+};
 
-const VISIBLE_RESULTS = 8
-const PREVIEW_LINES = 20
+const VISIBLE_RESULTS = 8;
+const PREVIEW_LINES = 20;
 
 /**
  * Quick Open dialog (ctrl+shift+p / cmd+shift+p).
  * Fuzzy file finder with a syntax-highlighted preview of the focused file.
  */
 export function QuickOpenDialog({ onDone, onInsert }: Props): React.ReactNode {
-  useRegisterOverlay('quick-open')
-  const { columns, rows } = useTerminalSize()
+  useRegisterOverlay('quick-open');
+  const { columns, rows } = useTerminalSize();
   // Chrome (title + search + hints + pane border + gaps) eats ~14 rows.
   // Shrink the list on short terminals so the dialog doesn't clip.
-  const visibleResults = Math.min(VISIBLE_RESULTS, Math.max(4, rows - 14))
+  const visibleResults = Math.min(VISIBLE_RESULTS, Math.max(4, rows - 14));
 
-  const [results, setResults] = useState<string[]>([])
-  const [query, setQuery] = useState('')
-  const [focusedPath, setFocusedPath] = useState<string | undefined>(undefined)
+  const [results, setResults] = useState<string[]>([]);
+  const [query, setQuery] = useState('');
+  const [focusedPath, setFocusedPath] = useState<string | undefined>(undefined);
   const [preview, setPreview] = useState<{
-    path: string
-    content: string
-  } | null>(null)
-  const queryGenRef = useRef(0)
-  useEffect(() => () => void queryGenRef.current++, [])
+    path: string;
+    content: string;
+  } | null>(null);
+  const queryGenRef = useRef(0);
+  useEffect(() => () => void queryGenRef.current++, []);
 
-  const previewOnRight = columns >= 120
+  const previewOnRight = columns >= 120;
   // Side preview sits in a fixed-height row alongside the list (visibleCount
   // rows), so overflowing that height garbles the layout — cap to fit, minus
   // one for the path header line.
-  const effectivePreviewLines = previewOnRight
-    ? VISIBLE_RESULTS - 1
-    : PREVIEW_LINES
+  const effectivePreviewLines = previewOnRight ? VISIBLE_RESULTS - 1 : PREVIEW_LINES;
 
   // A generation counter invalidates stale results if the user types faster
   // than the index can respond.
   const handleQueryChange = (q: string) => {
-    setQuery(q)
-    const gen = ++queryGenRef.current
+    setQuery(q);
+    const gen = ++queryGenRef.current;
     if (!q.trim()) {
       // generateFileSuggestions('') returns raw readdir() of cwd (designed for
       // @-mentions). For Quick Open that's just noise — show the empty state.
-      setResults([])
-      return
+      setResults([]);
+      return;
     }
     void generateFileSuggestions(q, true).then(items => {
-      if (gen !== queryGenRef.current) return
+      if (gen !== queryGenRef.current) return;
       // Filter out directory entries — they come back with a trailing path.sep
       // from getTopLevelPaths() and would cause readFileInRange to throw EISDIR,
       // leaving the preview pane stuck on "Loading preview…".
@@ -72,10 +70,10 @@ export function QuickOpenDialog({ onDone, onInsert }: Props): React.ReactNode {
         .filter(i => i.id.startsWith('file-'))
         .map(i => i.displayText)
         .filter(p => !p.endsWith(path.sep))
-        .map(p => p.split(path.sep).join('/'))
-      setResults(paths)
-    })
-  }
+        .map(p => p.split(path.sep).join('/'));
+      setResults(paths);
+    });
+  };
 
   // Load a short preview of the focused file. Each navigation aborts the
   // previous read so holding ↓ doesn't pile up whole-file reads and so a
@@ -86,53 +84,43 @@ export function QuickOpenDialog({ onDone, onInsert }: Props): React.ReactNode {
     if (!focusedPath) {
       // No results — clear so the empty-state renders instead of a stale
       // preview from a previous query.
-      setPreview(null)
-      return
+      setPreview(null);
+      return;
     }
-    const controller = new AbortController()
-    const absolute = path.resolve(getCwd(), focusedPath)
-    void readFileInRange(
-      absolute,
-      0,
-      effectivePreviewLines,
-      undefined,
-      controller.signal,
-    )
+    const controller = new AbortController();
+    const absolute = path.resolve(getCwd(), focusedPath);
+    void readFileInRange(absolute, 0, effectivePreviewLines, undefined, controller.signal)
       .then(r => {
-        if (controller.signal.aborted) return
-        setPreview({ path: focusedPath, content: r.content })
+        if (controller.signal.aborted) return;
+        setPreview({ path: focusedPath, content: r.content });
       })
       .catch(() => {
-        if (controller.signal.aborted) return
-        setPreview({ path: focusedPath, content: '(preview unavailable)' })
-      })
-    return () => controller.abort()
-  }, [focusedPath, effectivePreviewLines])
+        if (controller.signal.aborted) return;
+        setPreview({ path: focusedPath, content: '(preview unavailable)' });
+      });
+    return () => controller.abort();
+  }, [focusedPath, effectivePreviewLines]);
 
-  const maxPathWidth = previewOnRight
-    ? Math.max(20, Math.floor((columns - 10) * 0.4))
-    : Math.max(20, columns - 8)
-  const previewWidth = previewOnRight
-    ? Math.max(40, columns - maxPathWidth - 14)
-    : columns - 6
+  const maxPathWidth = previewOnRight ? Math.max(20, Math.floor((columns - 10) * 0.4)) : Math.max(20, columns - 8);
+  const previewWidth = previewOnRight ? Math.max(40, columns - maxPathWidth - 14) : columns - 6;
 
   const handleOpen = (p: string) => {
-    const opened = openFileInExternalEditor(path.resolve(getCwd(), p))
+    const opened = openFileInExternalEditor(path.resolve(getCwd(), p));
     logEvent('tengu_quick_open_select', {
       result_count: results.length,
       opened_editor: opened,
-    })
-    onDone()
-  }
+    });
+    onDone();
+  };
 
   const handleInsert = (p: string, mention: boolean) => {
-    onInsert(mention ? `@${p} ` : `${p} `)
+    onInsert(mention ? `@${p} ` : `${p} `);
     logEvent('tengu_quick_open_insert', {
       result_count: results.length,
       mention,
-    })
-    onDone()
-  }
+    });
+    onDone();
+  };
 
   return (
     <FuzzyPicker
@@ -155,9 +143,7 @@ export function QuickOpenDialog({ onDone, onInsert }: Props): React.ReactNode {
       emptyMessage={q => (q ? 'No matching files' : 'Start typing to search…')}
       selectAction="open in editor"
       renderItem={(p, isFocused) => (
-        <Text color={isFocused ? 'suggestion' : undefined}>
-          {truncatePathMiddle(p, maxPathWidth)}
-        </Text>
+        <Text color={isFocused ? 'suggestion' : undefined}>{truncatePathMiddle(p, maxPathWidth)}</Text>
       )}
       renderPreview={p =>
         preview ? (
@@ -167,9 +153,7 @@ export function QuickOpenDialog({ onDone, onInsert }: Props): React.ReactNode {
               {preview.path !== p ? ' · loading…' : ''}
             </Text>
             {preview.content.split('\n').map((line, i) => (
-              <Text key={i}>
-                {highlightMatch(truncateToWidth(line, previewWidth), query)}
-              </Text>
+              <Text key={i}>{highlightMatch(truncateToWidth(line, previewWidth), query)}</Text>
             ))}
           </>
         ) : (
@@ -177,5 +161,5 @@ export function QuickOpenDialog({ onDone, onInsert }: Props): React.ReactNode {
         )
       }
     />
-  )
+  );
 }
diff --git a/src/components/RemoteCallout.tsx b/src/components/RemoteCallout.tsx
index 7d9dff991..5bd157d8e 100644
--- a/src/components/RemoteCallout.tsx
+++ b/src/components/RemoteCallout.tsx
@@ -1,37 +1,37 @@
-import React, { useCallback, useEffect, useRef } from 'react'
-import { isBridgeEnabled } from '../bridge/bridgeEnabled.js'
-import { Box, Text } from '@anthropic/ink'
-import { getClaudeAIOAuthTokens } from '../utils/auth.js'
-import { getGlobalConfig, saveGlobalConfig } from '../utils/config.js'
-import type { OptionWithDescription } from './CustomSelect/select.js'
-import { Select } from './CustomSelect/select.js'
-import { PermissionDialog } from './permissions/PermissionDialog.js'
+import React, { useCallback, useEffect, useRef } from 'react';
+import { isBridgeEnabled } from '../bridge/bridgeEnabled.js';
+import { Box, Text } from '@anthropic/ink';
+import { getClaudeAIOAuthTokens } from '../utils/auth.js';
+import { getGlobalConfig, saveGlobalConfig } from '../utils/config.js';
+import type { OptionWithDescription } from './CustomSelect/select.js';
+import { Select } from './CustomSelect/select.js';
+import { PermissionDialog } from './permissions/PermissionDialog.js';
 
-type RemoteCalloutSelection = 'enable' | 'dismiss'
+type RemoteCalloutSelection = 'enable' | 'dismiss';
 
 type Props = {
-  onDone: (selection: RemoteCalloutSelection) => void
-}
+  onDone: (selection: RemoteCalloutSelection) => void;
+};
 
 export function RemoteCallout({ onDone }: Props): React.ReactNode {
-  const onDoneRef = useRef(onDone)
-  onDoneRef.current = onDone
+  const onDoneRef = useRef(onDone);
+  onDoneRef.current = onDone;
 
   const handleCancel = useCallback((): void => {
-    onDoneRef.current('dismiss')
-  }, [])
+    onDoneRef.current('dismiss');
+  }, []);
 
   // Permanently mark as seen on mount so it only shows once
   useEffect(() => {
     saveGlobalConfig(current => {
-      if (current.remoteDialogSeen) return current
-      return { ...current, remoteDialogSeen: true }
-    })
-  }, [])
+      if (current.remoteDialogSeen) return current;
+      return { ...current, remoteDialogSeen: true };
+    });
+  }, []);
 
   const handleSelect = useCallback((value: RemoteCalloutSelection): void => {
-    onDoneRef.current(value)
-  }, [])
+    onDoneRef.current(value);
+  }, []);
 
   const options: OptionWithDescription<RemoteCalloutSelection>[] = [
     {
@@ -44,43 +44,35 @@ export function RemoteCallout({ onDone }: Props): React.ReactNode {
       description: 'You can always enable it later with /remote-control.',
       value: 'dismiss',
     },
-  ]
+  ];
 
   return (
     <PermissionDialog title="Remote Control">
       <Box flexDirection="column" paddingX={2} paddingY={1}>
         <Box marginBottom={1} flexDirection="column">
           <Text>
-            Remote Control lets you access this CLI session from the web
-            (claude.ai/code) or the Claude app, so you can pick up where you
-            left off on any device.
+            Remote Control lets you access this CLI session from the web (claude.ai/code) or the Claude app, so you can
+            pick up where you left off on any device.
           </Text>
           <Text> </Text>
-          <Text>
-            You can disconnect remote access anytime by running /remote-control
-            again.
-          </Text>
+          <Text>You can disconnect remote access anytime by running /remote-control again.</Text>
         </Box>
         <Box>
-          <Select
-            options={options}
-            onChange={handleSelect}
-            onCancel={handleCancel}
-          />
+          <Select options={options} onChange={handleSelect} onCancel={handleCancel} />
         </Box>
       </Box>
     </PermissionDialog>
-  )
+  );
 }
 
 /**
  * Check whether to show the remote callout (first-time dialog).
  */
 export function shouldShowRemoteCallout(): boolean {
-  const config = getGlobalConfig()
-  if (config.remoteDialogSeen) return false
-  if (!isBridgeEnabled()) return false
-  const tokens = getClaudeAIOAuthTokens()
-  if (!tokens?.accessToken) return false
-  return true
+  const config = getGlobalConfig();
+  if (config.remoteDialogSeen) return false;
+  if (!isBridgeEnabled()) return false;
+  const tokens = getClaudeAIOAuthTokens();
+  if (!tokens?.accessToken) return false;
+  return true;
 }
diff --git a/src/components/RemoteEnvironmentDialog.tsx b/src/components/RemoteEnvironmentDialog.tsx
index 436b59583..15b486274 100644
--- a/src/components/RemoteEnvironmentDialog.tsx
+++ b/src/components/RemoteEnvironmentDialog.tsx
@@ -1,88 +1,81 @@
-import chalk from 'chalk'
-import figures from 'figures'
-import * as React from 'react'
-import { useEffect, useState } from 'react'
-import { Text } from '@anthropic/ink'
-import { useKeybinding } from '../keybindings/useKeybinding.js'
-import { toError } from '../utils/errors.js'
-import { logError } from '../utils/log.js'
-import {
-  getSettingSourceName,
-  type SettingSource,
-} from '../utils/settings/constants.js'
-import { updateSettingsForSource } from '../utils/settings/settings.js'
-import { getEnvironmentSelectionInfo } from '../utils/teleport/environmentSelection.js'
-import type { EnvironmentResource } from '../utils/teleport/environments.js'
-import { ConfigurableShortcutHint } from './ConfigurableShortcutHint.js'
-import { Select } from './CustomSelect/select.js'
-import { Byline, Dialog, KeyboardShortcutHint, LoadingState } from '@anthropic/ink'
+import chalk from 'chalk';
+import figures from 'figures';
+import * as React from 'react';
+import { useEffect, useState } from 'react';
+import { Text } from '@anthropic/ink';
+import { useKeybinding } from '../keybindings/useKeybinding.js';
+import { toError } from '../utils/errors.js';
+import { logError } from '../utils/log.js';
+import { getSettingSourceName, type SettingSource } from '../utils/settings/constants.js';
+import { updateSettingsForSource } from '../utils/settings/settings.js';
+import { getEnvironmentSelectionInfo } from '../utils/teleport/environmentSelection.js';
+import type { EnvironmentResource } from '../utils/teleport/environments.js';
+import { ConfigurableShortcutHint } from './ConfigurableShortcutHint.js';
+import { Select } from './CustomSelect/select.js';
+import { Byline, Dialog, KeyboardShortcutHint, LoadingState } from '@anthropic/ink';
 
-const DIALOG_TITLE = 'Select Remote Environment'
-const SETUP_HINT = `Configure environments at: https://claude.ai/code`
+const DIALOG_TITLE = 'Select Remote Environment';
+const SETUP_HINT = `Configure environments at: https://claude.ai/code`;
 
 type Props = {
-  onDone: (message?: string) => void
-}
+  onDone: (message?: string) => void;
+};
 
-type LoadingState = 'loading' | 'updating' | null
+type LoadingState = 'loading' | 'updating' | null;
 
 export function RemoteEnvironmentDialog({ onDone }: Props): React.ReactNode {
-  const [loadingState, setLoadingState] = useState<LoadingState>('loading')
-  const [environments, setEnvironments] = useState<EnvironmentResource[]>([])
-  const [selectedEnvironment, setSelectedEnvironment] =
-    useState<EnvironmentResource | null>(null)
-  const [selectedEnvironmentSource, setSelectedEnvironmentSource] =
-    useState<SettingSource | null>(null)
-  const [error, setError] = useState<string | null>(null)
+  const [loadingState, setLoadingState] = useState<LoadingState>('loading');
+  const [environments, setEnvironments] = useState<EnvironmentResource[]>([]);
+  const [selectedEnvironment, setSelectedEnvironment] = useState<EnvironmentResource | null>(null);
+  const [selectedEnvironmentSource, setSelectedEnvironmentSource] = useState<SettingSource | null>(null);
+  const [error, setError] = useState<string | null>(null);
 
   useEffect(() => {
-    let cancelled = false
+    let cancelled = false;
     async function fetchInfo(): Promise<void> {
       try {
-        const result = await getEnvironmentSelectionInfo()
-        if (cancelled) return
-        setEnvironments(result.availableEnvironments)
-        setSelectedEnvironment(result.selectedEnvironment)
-        setSelectedEnvironmentSource(result.selectedEnvironmentSource)
-        setLoadingState(null)
+        const result = await getEnvironmentSelectionInfo();
+        if (cancelled) return;
+        setEnvironments(result.availableEnvironments);
+        setSelectedEnvironment(result.selectedEnvironment);
+        setSelectedEnvironmentSource(result.selectedEnvironmentSource);
+        setLoadingState(null);
       } catch (err) {
-        if (cancelled) return
-        const fetchError = toError(err)
-        logError(fetchError)
-        setError(fetchError.message)
-        setLoadingState(null)
+        if (cancelled) return;
+        const fetchError = toError(err);
+        logError(fetchError);
+        setError(fetchError.message);
+        setLoadingState(null);
       }
     }
-    void fetchInfo()
+    void fetchInfo();
     return () => {
-      cancelled = true
-    }
-  }, [])
+      cancelled = true;
+    };
+  }, []);
 
   function handleSelect(value: string): void {
     if (value === 'cancel') {
-      onDone()
-      return
+      onDone();
+      return;
     }
 
-    setLoadingState('updating')
+    setLoadingState('updating');
 
-    const selectedEnv = environments.find(env => env.environment_id === value)
+    const selectedEnv = environments.find(env => env.environment_id === value);
 
     if (!selectedEnv) {
-      onDone('Error: Selected environment not found')
-      return
+      onDone('Error: Selected environment not found');
+      return;
     }
 
     updateSettingsForSource('localSettings', {
       remote: {
         defaultEnvironmentId: selectedEnv.environment_id,
       },
-    })
+    });
 
-    onDone(
-      `Set default remote environment to ${chalk.bold(selectedEnv.name)} (${selectedEnv.environment_id})`,
-    )
+    onDone(`Set default remote environment to ${chalk.bold(selectedEnv.name)} (${selectedEnv.environment_id})`);
   }
 
   // Loading state
@@ -91,7 +84,7 @@ export function RemoteEnvironmentDialog({ onDone }: Props): React.ReactNode {
       <Dialog title={DIALOG_TITLE} onCancel={onDone} hideInputGuide>
         <LoadingState message="Loading environments…" />
       </Dialog>
-    )
+    );
   }
 
   // Error state
@@ -100,7 +93,7 @@ export function RemoteEnvironmentDialog({ onDone }: Props): React.ReactNode {
       <Dialog title={DIALOG_TITLE} onCancel={onDone}>
         <Text color="error">Error: {error}</Text>
       </Dialog>
-    )
+    );
   }
 
   // No environments available
@@ -109,17 +102,12 @@ export function RemoteEnvironmentDialog({ onDone }: Props): React.ReactNode {
       <Dialog title={DIALOG_TITLE} subtitle={SETUP_HINT} onCancel={onDone}>
         <Text>No remote environments available.</Text>
       </Dialog>
-    )
+    );
   }
 
   // Single environment - just show info
   if (environments.length === 1) {
-    return (
-      <SingleEnvironmentContent
-        environment={selectedEnvironment}
-        onDone={onDone}
-      />
-    )
+    return <SingleEnvironmentContent environment={selectedEnvironment} onDone={onDone} />;
   }
 
   // Multiple environments - show selection UI
@@ -132,37 +120,32 @@ export function RemoteEnvironmentDialog({ onDone }: Props): React.ReactNode {
       onSelect={handleSelect}
       onCancel={onDone}
     />
-  )
+  );
 }
 
-function EnvironmentLabel({
-  environment,
-}: {
-  environment: EnvironmentResource
-}): React.ReactNode {
+function EnvironmentLabel({ environment }: { environment: EnvironmentResource }): React.ReactNode {
   return (
     <Text>
-      {figures.tick} Using <Text bold>{environment.name}</Text>{' '}
-      <Text dimColor>({environment.environment_id})</Text>
+      {figures.tick} Using <Text bold>{environment.name}</Text> <Text dimColor>({environment.environment_id})</Text>
     </Text>
-  )
+  );
 }
 
 function SingleEnvironmentContent({
   environment,
   onDone,
 }: {
-  environment: EnvironmentResource
-  onDone: () => void
+  environment: EnvironmentResource;
+  onDone: () => void;
 }): React.ReactNode {
   // Handle Enter to continue
-  useKeybinding('confirm:yes', onDone, { context: 'Confirmation' })
+  useKeybinding('confirm:yes', onDone, { context: 'Confirmation' });
 
   return (
     <Dialog title={DIALOG_TITLE} subtitle={SETUP_HINT} onCancel={onDone}>
       <EnvironmentLabel environment={environment} />
     </Dialog>
-  )
+  );
 }
 
 function MultipleEnvironmentsContent({
@@ -173,32 +156,27 @@ function MultipleEnvironmentsContent({
   onSelect,
   onCancel,
 }: {
-  environments: EnvironmentResource[]
-  selectedEnvironment: EnvironmentResource
-  selectedEnvironmentSource: SettingSource | null
-  loadingState: LoadingState
-  onSelect: (value: string) => void
-  onCancel: () => void
+  environments: EnvironmentResource[];
+  selectedEnvironment: EnvironmentResource;
+  selectedEnvironmentSource: SettingSource | null;
+  loadingState: LoadingState;
+  onSelect: (value: string) => void;
+  onCancel: () => void;
 }): React.ReactNode {
   const sourceSuffix =
     selectedEnvironmentSource && selectedEnvironmentSource !== 'localSettings'
       ? ` (from ${getSettingSourceName(selectedEnvironmentSource)} settings)`
-      : ''
+      : '';
 
   const subtitle = (
     <Text>
       Currently using: <Text bold>{selectedEnvironment.name}</Text>
       {sourceSuffix}
     </Text>
-  )
+  );
 
   return (
-    <Dialog
-      title={DIALOG_TITLE}
-      subtitle={subtitle}
-      onCancel={onCancel}
-      hideInputGuide
-    >
+    <Dialog title={DIALOG_TITLE} subtitle={subtitle} onCancel={onCancel} hideInputGuide>
       <Text dimColor>{SETUP_HINT}</Text>
       {loadingState === 'updating' ? (
         <LoadingState message="Updating…" />
@@ -221,14 +199,9 @@ function MultipleEnvironmentsContent({
       <Text dimColor>
         <Byline>
           <KeyboardShortcutHint shortcut="Enter" action="select" />
-          <ConfigurableShortcutHint
-            action="confirm:no"
-            context="Confirmation"
-            fallback="Esc"
-            description="cancel"
-          />
+          <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="cancel" />
         </Byline>
       </Text>
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/ResumeTask.tsx b/src/components/ResumeTask.tsx
index c81ed0291..4822ac13b 100644
--- a/src/components/ResumeTask.tsx
+++ b/src/components/ResumeTask.tsx
@@ -1,133 +1,125 @@
-import React, { useCallback, useState } from 'react'
-import { useTerminalSize } from 'src/hooks/useTerminalSize.js'
-import {
-  type CodeSession,
-  fetchCodeSessionsFromSessionsAPI,
-} from 'src/utils/teleport/api.js'
+import React, { useCallback, useState } from 'react';
+import { useTerminalSize } from 'src/hooks/useTerminalSize.js';
+import { type CodeSession, fetchCodeSessionsFromSessionsAPI } from 'src/utils/teleport/api.js';
 // eslint-disable-next-line custom-rules/prefer-use-keybindings -- raw j/k/arrow list navigation
-import { Box, Text, useInput } from '@anthropic/ink'
-import { useKeybinding } from '../keybindings/useKeybinding.js'
-import { useShortcutDisplay } from '../keybindings/useShortcutDisplay.js'
-import { logForDebugging } from '../utils/debug.js'
-import { detectCurrentRepository } from '../utils/detectRepository.js'
-import { formatRelativeTime } from '../utils/format.js'
-import { ConfigurableShortcutHint } from './ConfigurableShortcutHint.js'
-import { Select } from './CustomSelect/index.js'
-import { Byline, KeyboardShortcutHint } from '@anthropic/ink'
-import { Spinner } from './Spinner.js'
-import { TeleportError } from './TeleportError.js'
+import { Box, Text, useInput } from '@anthropic/ink';
+import { useKeybinding } from '../keybindings/useKeybinding.js';
+import { useShortcutDisplay } from '../keybindings/useShortcutDisplay.js';
+import { logForDebugging } from '../utils/debug.js';
+import { detectCurrentRepository } from '../utils/detectRepository.js';
+import { formatRelativeTime } from '../utils/format.js';
+import { ConfigurableShortcutHint } from './ConfigurableShortcutHint.js';
+import { Select } from './CustomSelect/index.js';
+import { Byline, KeyboardShortcutHint } from '@anthropic/ink';
+import { Spinner } from './Spinner.js';
+import { TeleportError } from './TeleportError.js';
 
 type Props = {
-  onSelect: (session: CodeSession) => void
-  onCancel: () => void
-  isEmbedded?: boolean
-}
+  onSelect: (session: CodeSession) => void;
+  onCancel: () => void;
+  isEmbedded?: boolean;
+};
 
-type LoadErrorType = 'network' | 'auth' | 'api' | 'other'
+type LoadErrorType = 'network' | 'auth' | 'api' | 'other';
 
-const UPDATED_STRING = 'Updated'
-const SPACE_BETWEEN_TABLE_COLUMNS = '  '
+const UPDATED_STRING = 'Updated';
+const SPACE_BETWEEN_TABLE_COLUMNS = '  ';
 
-export function ResumeTask({
-  onSelect,
-  onCancel,
-  isEmbedded = false,
-}: Props): React.ReactNode {
-  const { rows } = useTerminalSize()
-  const [sessions, setSessions] = useState<CodeSession[]>([])
-  const [currentRepo, setCurrentRepo] = useState<string | null>(null)
+export function ResumeTask({ onSelect, onCancel, isEmbedded = false }: Props): React.ReactNode {
+  const { rows } = useTerminalSize();
+  const [sessions, setSessions] = useState<CodeSession[]>([]);
+  const [currentRepo, setCurrentRepo] = useState<string | null>(null);
 
-  const [loading, setLoading] = useState(true)
-  const [loadErrorType, setLoadErrorType] = useState<LoadErrorType | null>(null)
-  const [retrying, setRetrying] = useState(false)
+  const [loading, setLoading] = useState(true);
+  const [loadErrorType, setLoadErrorType] = useState<LoadErrorType | null>(null);
+  const [retrying, setRetrying] = useState(false);
 
-  const [hasCompletedTeleportErrorFlow, setHasCompletedTeleportErrorFlow] =
-    useState(false)
+  const [hasCompletedTeleportErrorFlow, setHasCompletedTeleportErrorFlow] = useState(false);
 
   // Track focused index for scroll position display in title
-  const [focusedIndex, setFocusedIndex] = useState(1)
+  const [focusedIndex, setFocusedIndex] = useState(1);
 
-  const escKey = useShortcutDisplay('confirm:no', 'Confirmation', 'Esc')
+  const escKey = useShortcutDisplay('confirm:no', 'Confirmation', 'Esc');
 
   const loadSessions = useCallback(async () => {
     try {
-      setLoading(true)
-      setLoadErrorType(null)
+      setLoading(true);
+      setLoadErrorType(null);
 
       // Detect current repository
-      const detectedRepo = await detectCurrentRepository()
-      setCurrentRepo(detectedRepo)
-      logForDebugging(`Current repository: ${detectedRepo || 'not detected'}`)
+      const detectedRepo = await detectCurrentRepository();
+      setCurrentRepo(detectedRepo);
+      logForDebugging(`Current repository: ${detectedRepo || 'not detected'}`);
 
-      const codeSessions = await fetchCodeSessionsFromSessionsAPI()
+      const codeSessions = await fetchCodeSessionsFromSessionsAPI();
 
       // Filter sessions by current repository if detected
-      let filteredSessions = codeSessions
+      let filteredSessions = codeSessions;
       if (detectedRepo) {
         filteredSessions = codeSessions.filter(session => {
-          if (!session.repo) return false
-          const sessionRepo = `${session.repo.owner.login}/${session.repo.name}`
-          return sessionRepo === detectedRepo
-        })
+          if (!session.repo) return false;
+          const sessionRepo = `${session.repo.owner.login}/${session.repo.name}`;
+          return sessionRepo === detectedRepo;
+        });
         logForDebugging(
           `Filtered ${filteredSessions.length} sessions for repo ${detectedRepo} from ${codeSessions.length} total`,
-        )
+        );
       }
 
       // Sort by updated_at (newest first)
       const sortedSessions = [...filteredSessions].sort((a, b) => {
-        const dateA = new Date(a.updated_at)
-        const dateB = new Date(b.updated_at)
-        return dateB.getTime() - dateA.getTime()
-      })
+        const dateA = new Date(a.updated_at);
+        const dateB = new Date(b.updated_at);
+        return dateB.getTime() - dateA.getTime();
+      });
 
-      setSessions(sortedSessions)
+      setSessions(sortedSessions);
     } catch (err) {
-      const errorMessage = err instanceof Error ? err.message : String(err)
-      logForDebugging(`Error loading code sessions: ${errorMessage}`)
-      setLoadErrorType(determineErrorType(errorMessage))
+      const errorMessage = err instanceof Error ? err.message : String(err);
+      logForDebugging(`Error loading code sessions: ${errorMessage}`);
+      setLoadErrorType(determineErrorType(errorMessage));
     } finally {
-      setLoading(false)
-      setRetrying(false)
+      setLoading(false);
+      setRetrying(false);
     }
-  }, [])
+  }, []);
 
   const handleRetry = () => {
-    setRetrying(true)
-    void loadSessions()
-  }
+    setRetrying(true);
+    void loadSessions();
+  };
 
   // Handle escape via keybinding
-  useKeybinding('confirm:no', onCancel, { context: 'Confirmation' })
+  useKeybinding('confirm:no', onCancel, { context: 'Confirmation' });
 
   useInput((input, key) => {
     // We need to handle ctrl+c in case we don't render a <Select>
     if (key.ctrl && input === 'c') {
-      onCancel()
-      return
+      onCancel();
+      return;
     }
 
     // Handle retry in error state with 'ctrl+r'
     if (key.ctrl && input === 'r' && loadErrorType) {
-      handleRetry()
-      return
+      handleRetry();
+      return;
     }
 
     // Handle enter key for error states to allow continuation with regular teleport
     if (loadErrorType !== null && key.return) {
-      onCancel() // This will continue with regular teleport flow
-      return
+      onCancel(); // This will continue with regular teleport flow
+      return;
     }
-  })
+  });
 
   const handleErrorComplete = useCallback(() => {
-    setHasCompletedTeleportErrorFlow(true)
-    void loadSessions()
-  }, [setHasCompletedTeleportErrorFlow, loadSessions])
+    setHasCompletedTeleportErrorFlow(true);
+    void loadSessions();
+  }, [setHasCompletedTeleportErrorFlow, loadSessions]);
 
   // Show error dialog if needed
   if (!hasCompletedTeleportErrorFlow) {
-    return <TeleportError onComplete={handleErrorComplete} />
+    return <TeleportError onComplete={handleErrorComplete} />;
   }
 
   if (loading) {
@@ -137,11 +129,9 @@ export function ResumeTask({
           <Spinner />
           <Text bold>Loading Claude Code sessions…</Text>
         </Box>
-        <Text dimColor>
-          {retrying ? 'Retrying…' : 'Fetching your Claude Code sessions…'}
-        </Text>
+        <Text dimColor>{retrying ? 'Retrying…' : 'Fetching your Claude Code sessions…'}</Text>
       </Box>
-    )
+    );
   }
 
   if (loadErrorType) {
@@ -154,11 +144,10 @@ export function ResumeTask({
         {renderErrorSpecificGuidance(loadErrorType)}
 
         <Text dimColor>
-          Press <Text bold>Ctrl+R</Text> to retry · Press{' '}
-          <Text bold>{escKey}</Text> to cancel
+          Press <Text bold>Ctrl+R</Text> to retry · Press <Text bold>{escKey}</Text> to cancel
         </Text>
       </Box>
-    )
+    );
   }
 
   if (sessions.length === 0) {
@@ -174,41 +163,38 @@ export function ResumeTask({
           </Text>
         </Box>
       </Box>
-    )
+    );
   }
 
   const sessionMetadata = sessions.map(session => ({
     ...session,
     timeString: formatRelativeTime(new Date(session.updated_at)),
-  }))
-  const maxTimeStringLength = Math.max(
-    UPDATED_STRING.length,
-    ...sessionMetadata.map(meta => meta.timeString.length),
-  )
+  }));
+  const maxTimeStringLength = Math.max(UPDATED_STRING.length, ...sessionMetadata.map(meta => meta.timeString.length));
 
   const options = sessionMetadata.map(({ timeString, title, id }) => {
-    const paddedTime = timeString.padEnd(maxTimeStringLength, ' ')
+    const paddedTime = timeString.padEnd(maxTimeStringLength, ' ');
 
     // TODO: include branch name when API returns it
     return {
       label: `${paddedTime}  ${title}`,
       value: id,
-    }
-  })
+    };
+  });
 
   // Adjust layout for embedded vs full-screen rendering
   // Overhead: padding (2) + title (1) + marginY (2) + header (1) + footer (1) = 7
-  const layoutOverhead = 7
+  const layoutOverhead = 7;
   const maxVisibleOptions = Math.max(
     1,
     isEmbedded
       ? Math.min(sessions.length, 5, rows - 6 - layoutOverhead)
       : Math.min(sessions.length, rows - 1 - layoutOverhead),
-  )
-  const maxHeight = maxVisibleOptions + layoutOverhead
+  );
+  const maxHeight = maxVisibleOptions + layoutOverhead;
 
   // Show scroll position in title when list needs scrolling
-  const showScrollPosition = sessions.length > maxVisibleOptions
+  const showScrollPosition = sessions.length > maxVisibleOptions;
 
   return (
     <Box flexDirection="column" padding={1} height={maxHeight}>
@@ -234,15 +220,15 @@ export function ResumeTask({
           visibleOptionCount={maxVisibleOptions}
           options={options}
           onChange={value => {
-            const session = sessions.find(s => s.id === value)
+            const session = sessions.find(s => s.id === value);
             if (session) {
-              onSelect(session)
+              onSelect(session);
             }
           }}
           onFocus={value => {
-            const index = options.findIndex(o => o.value === value)
+            const index = options.findIndex(o => o.value === value);
             if (index >= 0) {
-              setFocusedIndex(index + 1)
+              setFocusedIndex(index + 1);
             }
           }}
         />
@@ -252,31 +238,22 @@ export function ResumeTask({
           <Byline>
             <KeyboardShortcutHint shortcut="↑/↓" action="select" />
             <KeyboardShortcutHint shortcut="Enter" action="confirm" />
-            <ConfigurableShortcutHint
-              action="confirm:no"
-              context="Confirmation"
-              fallback="Esc"
-              description="cancel"
-            />
+            <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="cancel" />
           </Byline>
         </Text>
       </Box>
     </Box>
-  )
+  );
 }
 
 /**
  * Determines the type of error based on the error message
  */
 function determineErrorType(errorMessage: string): LoadErrorType {
-  const message = errorMessage.toLowerCase()
+  const message = errorMessage.toLowerCase();
 
-  if (
-    message.includes('fetch') ||
-    message.includes('network') ||
-    message.includes('timeout')
-  ) {
-    return 'network'
+  if (message.includes('fetch') || message.includes('network') || message.includes('timeout')) {
+    return 'network';
   }
 
   if (
@@ -289,58 +266,50 @@ function determineErrorType(errorMessage: string): LoadErrorType {
     message.includes('console account') ||
     message.includes('403')
   ) {
-    return 'auth'
+    return 'auth';
   }
 
-  if (
-    message.includes('api') ||
-    message.includes('rate limit') ||
-    message.includes('500') ||
-    message.includes('529')
-  ) {
-    return 'api'
+  if (message.includes('api') || message.includes('rate limit') || message.includes('500') || message.includes('529')) {
+    return 'api';
   }
 
-  return 'other'
+  return 'other';
 }
 
 /**
  * Renders error-specific troubleshooting guidance
  */
-function renderErrorSpecificGuidance(
-  errorType: LoadErrorType,
-): React.ReactNode {
+function renderErrorSpecificGuidance(errorType: LoadErrorType): React.ReactNode {
   switch (errorType) {
     case 'network':
       return (
         <Box marginY={1} flexDirection="column">
           <Text dimColor>Check your internet connection</Text>
         </Box>
-      )
+      );
 
     case 'auth':
       return (
         <Box marginY={1} flexDirection="column">
           <Text dimColor>Teleport requires a Claude account</Text>
           <Text dimColor>
-            Run <Text bold>/login</Text> and select &quot;Claude account with
-            subscription&quot;
+            Run <Text bold>/login</Text> and select &quot;Claude account with subscription&quot;
           </Text>
         </Box>
-      )
+      );
 
     case 'api':
       return (
         <Box marginY={1} flexDirection="column">
           <Text dimColor>Sorry, Claude encountered an error</Text>
         </Box>
-      )
+      );
 
     case 'other':
       return (
         <Box marginY={1} flexDirection="row">
           <Text dimColor>Sorry, Claude Code encountered an error</Text>
         </Box>
-      )
+      );
   }
 }
diff --git a/src/components/SandboxViolationExpandedView.tsx b/src/components/SandboxViolationExpandedView.tsx
index 93a448c87..b1982547a 100644
--- a/src/components/SandboxViolationExpandedView.tsx
+++ b/src/components/SandboxViolationExpandedView.tsx
@@ -1,53 +1,50 @@
-import * as React from 'react'
-import { type ReactNode, useEffect, useState } from 'react'
-import { Box, Text } from '@anthropic/ink'
-import type { SandboxViolationEvent } from '../utils/sandbox/sandbox-adapter.js'
-import { SandboxManager } from '../utils/sandbox/sandbox-adapter.js'
+import * as React from 'react';
+import { type ReactNode, useEffect, useState } from 'react';
+import { Box, Text } from '@anthropic/ink';
+import type { SandboxViolationEvent } from '../utils/sandbox/sandbox-adapter.js';
+import { SandboxManager } from '../utils/sandbox/sandbox-adapter.js';
 
 /**
  * Format a timestamp as "h:mm:ssa" (e.g., "1:30:45pm").
  * Replaces date-fns format() to avoid pulling in a 39MB dependency for one call.
  */
 function formatTime(date: Date): string {
-  const h = date.getHours() % 12 || 12
-  const m = String(date.getMinutes()).padStart(2, '0')
-  const s = String(date.getSeconds()).padStart(2, '0')
-  const ampm = date.getHours() < 12 ? 'am' : 'pm'
-  return `${h}:${m}:${s}${ampm}`
+  const h = date.getHours() % 12 || 12;
+  const m = String(date.getMinutes()).padStart(2, '0');
+  const s = String(date.getSeconds()).padStart(2, '0');
+  const ampm = date.getHours() < 12 ? 'am' : 'pm';
+  return `${h}:${m}:${s}${ampm}`;
 }
 
-import { getPlatform } from 'src/utils/platform.js'
+import { getPlatform } from 'src/utils/platform.js';
 
 export function SandboxViolationExpandedView(): ReactNode {
-  const [violations, setViolations] = useState<SandboxViolationEvent[]>([])
-  const [totalCount, setTotalCount] = useState(0)
+  const [violations, setViolations] = useState<SandboxViolationEvent[]>([]);
+  const [totalCount, setTotalCount] = useState(0);
 
   useEffect(() => {
     // This is harmless if sandboxing is not enabled
-    const store = SandboxManager.getSandboxViolationStore()
-    const unsubscribe = store.subscribe(
-      (allViolations: SandboxViolationEvent[]) => {
-        setViolations(allViolations.slice(-10))
-        setTotalCount(store.getTotalCount())
-      },
-    )
-    return unsubscribe
-  }, [])
+    const store = SandboxManager.getSandboxViolationStore();
+    const unsubscribe = store.subscribe((allViolations: SandboxViolationEvent[]) => {
+      setViolations(allViolations.slice(-10));
+      setTotalCount(store.getTotalCount());
+    });
+    return unsubscribe;
+  }, []);
 
   if (!SandboxManager.isSandboxingEnabled() || getPlatform() === 'linux') {
-    return null
+    return null;
   }
 
   if (totalCount === 0) {
-    return null
+    return null;
   }
 
   return (
     <Box flexDirection="column" marginTop={1}>
       <Box marginLeft={0}>
         <Text color="permission">
-          ⧈ Sandbox blocked {totalCount} total{' '}
-          {totalCount === 1 ? 'operation' : 'operations'}
+          ⧈ Sandbox blocked {totalCount} total {totalCount === 1 ? 'operation' : 'operations'}
         </Text>
       </Box>
       {violations.map((v, i) => (
@@ -64,5 +61,5 @@ export function SandboxViolationExpandedView(): ReactNode {
         </Text>
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/components/ScrollKeybindingHandler.tsx b/src/components/ScrollKeybindingHandler.tsx
index cdaac3256..6e67c2d8f 100644
--- a/src/components/ScrollKeybindingHandler.tsx
+++ b/src/components/ScrollKeybindingHandler.tsx
@@ -1,28 +1,25 @@
-import React, { type RefObject, useEffect, useRef } from 'react'
-import { useNotifications } from '../context/notifications.js'
-import {
-  useCopyOnSelect,
-  useSelectionBgColor,
-} from '../hooks/useCopyOnSelect.js'
-import type { ScrollBoxHandle, FocusMove, SelectionState } from '@anthropic/ink'
-import { useSelection, type Key, useInput, isXtermJs, getClipboardPath } from '@anthropic/ink'
-import { useKeybindings } from '../keybindings/useKeybinding.js'
-import { logForDebugging } from '../utils/debug.js'
+import React, { type RefObject, useEffect, useRef } from 'react';
+import { useNotifications } from '../context/notifications.js';
+import { useCopyOnSelect, useSelectionBgColor } from '../hooks/useCopyOnSelect.js';
+import type { ScrollBoxHandle, FocusMove, SelectionState } from '@anthropic/ink';
+import { useSelection, type Key, useInput, isXtermJs, getClipboardPath } from '@anthropic/ink';
+import { useKeybindings } from '../keybindings/useKeybinding.js';
+import { logForDebugging } from '../utils/debug.js';
 
 type Props = {
-  scrollRef: RefObject<ScrollBoxHandle | null>
-  isActive: boolean
+  scrollRef: RefObject<ScrollBoxHandle | null>;
+  isActive: boolean;
   /** Called after every scroll action with the resulting sticky state and
    *  the handle (for reading scrollTop/scrollHeight post-scroll). */
-  onScroll?: (sticky: boolean, handle: ScrollBoxHandle) => void
+  onScroll?: (sticky: boolean, handle: ScrollBoxHandle) => void;
   /** Enables modal pager keys (g/G, ctrl+u/d/b/f). Only safe when there
    *  is no text input competing for those characters — i.e. transcript
    *  mode. Defaults to false. When true, G works regardless of editorMode
    *  and sticky state; ctrl+u/d/b/f don't conflict with kill-line/exit/
    *  task:background/kill-agents (none are mounted, or they mount after
    *  this component so stopImmediatePropagation wins). */
-  isModal?: boolean
-}
+  isModal?: boolean;
+};
 
 // Terminals send one SGR wheel event per intended row (verified in Ghostty
 // src/Surface.zig: `for (0..@abs(y.delta)) |_| { mouseReport(.four, ...) }`).
@@ -43,9 +40,9 @@ type Props = {
 // iTerm2 "faster scroll" similar) — base=1 is correct there. Others send 1
 // event/notch — users on those can set CLAUDE_CODE_SCROLL_SPEED=3 to match
 // vim/nvim/opencode app-side defaults. We can't detect which, so knob it.
-const WHEEL_ACCEL_WINDOW_MS = 40
-const WHEEL_ACCEL_STEP = 0.3
-const WHEEL_ACCEL_MAX = 6
+const WHEEL_ACCEL_WINDOW_MS = 40;
+const WHEEL_ACCEL_STEP = 0.3;
+const WHEEL_ACCEL_MAX = 6;
 
 // Encoder bounce debounce + wheel-mode decay curve. Worn/cheap optical
 // encoders emit spurious reverse-direction ticks during fast spins — measured
@@ -61,24 +58,24 @@ const WHEEL_ACCEL_MAX = 6
 // threshold needed, large gaps just have m≈0 → mult→1. Wheel mode is STICKY:
 // once a bounce confirms it's a mouse, the decay curve applies until an idle
 // gap or trackpad-flick-burst signals a possible device switch.
-const WHEEL_BOUNCE_GAP_MAX_MS = 200 // flip-back must arrive within this
+const WHEEL_BOUNCE_GAP_MAX_MS = 200; // flip-back must arrive within this
 // Mouse is ~9 events/sec vs VS Code's ~30 — STEP is 3× xterm.js's 5 to
 // compensate. At gap=100ms (m≈0.63): one click gives 1+15*0.63≈10.5.
-const WHEEL_MODE_STEP = 15
-const WHEEL_MODE_CAP = 15
+const WHEEL_MODE_STEP = 15;
+const WHEEL_MODE_CAP = 15;
 // Max mult growth per event. Without this, the +STEP*m term jumps mult
 // from 1→10 in one event when wheelMode engages mid-scroll (bounce
 // detected after N events in trackpad mode at mult=1). User sees scroll
 // suddenly go 10× faster. Cap=3 gives 1→4→7→10→13→15 over ~0.5s at
 // 9 events/sec — smooth ramp instead of a jump. Decay is unaffected
 // (target<mult wins the min).
-const WHEEL_MODE_RAMP = 3
+const WHEEL_MODE_RAMP = 3;
 // Device-switch disengage: mouse finger-repositions max at ~830ms (measured);
 // trackpad between-gesture pauses are 2000ms+. An idle gap above this means
 // the user stopped — might have switched devices. Disengage; the next mouse
 // bounce re-engages. Trackpad slow swipe (no <5ms bursts, so the burst-count
 // guard doesn't catch it) is what this protects against.
-const WHEEL_MODE_IDLE_DISENGAGE_MS = 1500
+const WHEEL_MODE_IDLE_DISENGAGE_MS = 1500;
 
 // xterm.js: exponential decay. momentum=0.5^(gap/hl) — slow click → m≈0
 // → mult→1 (precision); fast → m≈1 → carries momentum. Steady-state
@@ -88,19 +85,19 @@ const WHEEL_MODE_IDLE_DISENGAGE_MS = 1500
 // frequency is high — at 40 Hz × 6 = 240 rows/sec max demand, which the
 // adaptive drain at ~200fps (measured) handles. Higher cap → pending explosion.
 // Tuned empirically (boris 2026-03). See docs/research/terminal-scroll-*.
-const WHEEL_DECAY_HALFLIFE_MS = 150
-const WHEEL_DECAY_STEP = 5
+const WHEEL_DECAY_HALFLIFE_MS = 150;
+const WHEEL_DECAY_STEP = 5;
 // Same-batch events (<BURST_MS) arrive in one stdin batch — the terminal
 // is doing proportional reporting. Treat as 1 row/event like native.
-const WHEEL_BURST_MS = 5
+const WHEEL_BURST_MS = 5;
 // Cap boundary: slow events (≥GAP_MS) cap low for short smooth drains;
 // fast events cap higher for throughput (adaptive drain handles backlog).
-const WHEEL_DECAY_GAP_MS = 80
-const WHEEL_DECAY_CAP_SLOW = 3 // gap ≥ GAP_MS: precision
-const WHEEL_DECAY_CAP_FAST = 6 // gap < GAP_MS: throughput
+const WHEEL_DECAY_GAP_MS = 80;
+const WHEEL_DECAY_CAP_SLOW = 3; // gap ≥ GAP_MS: precision
+const WHEEL_DECAY_CAP_FAST = 6; // gap < GAP_MS: throughput
 // Idle threshold: gaps beyond this reset to the kick value (2) so the
 // first click after a pause feels responsive regardless of direction.
-const WHEEL_DECAY_IDLE_MS = 500
+const WHEEL_DECAY_IDLE_MS = 500;
 
 /**
  * Whether a keypress should clear the virtual text selection. Mimics
@@ -112,7 +109,7 @@ const WHEEL_DECAY_IDLE_MS = 500
  * excluded — scroll:lineUp/Down already clears via the keybinding path.
  */
 export function shouldClearSelectionOnKey(key: Key): boolean {
-  if (key.wheelUp || key.wheelDown) return false
+  if (key.wheelUp || key.wheelDown) return false;
   const isNav =
     key.leftArrow ||
     key.rightArrow ||
@@ -121,9 +118,9 @@ export function shouldClearSelectionOnKey(key: Key): boolean {
     key.home ||
     key.end ||
     key.pageUp ||
-    key.pageDown
-  if (isNav && (key.shift || key.meta || key.super)) return false
-  return true
+    key.pageDown;
+  if (isNav && (key.shift || key.meta || key.super)) return false;
+  return true;
 }
 
 /**
@@ -137,99 +134,95 @@ export function shouldClearSelectionOnKey(key: Key): boolean {
  * preserves (modified nav). Returns null for non-extend keys.
  */
 export function selectionFocusMoveForKey(key: Key): FocusMove | null {
-  if (!key.shift || key.meta) return null
-  if (key.leftArrow) return 'left'
-  if (key.rightArrow) return 'right'
-  if (key.upArrow) return 'up'
-  if (key.downArrow) return 'down'
-  if (key.home) return 'lineStart'
-  if (key.end) return 'lineEnd'
-  return null
+  if (!key.shift || key.meta) return null;
+  if (key.leftArrow) return 'left';
+  if (key.rightArrow) return 'right';
+  if (key.upArrow) return 'up';
+  if (key.downArrow) return 'down';
+  if (key.home) return 'lineStart';
+  if (key.end) return 'lineEnd';
+  return null;
 }
 
 export type WheelAccelState = {
-  time: number
-  mult: number
-  dir: 0 | 1 | -1
-  xtermJs: boolean
+  time: number;
+  mult: number;
+  dir: 0 | 1 | -1;
+  xtermJs: boolean;
   /** Carried fractional scroll (xterm.js only). scrollBy floors, so without
    *  this a mult of 1.5 gives 1 row every time. Carrying the remainder gives
    *  1,2,1,2 on average for mult=1.5 — correct throughput over time. */
-  frac: number
+  frac: number;
   /** Native-path baseline rows/event. Reset value on idle/reversal; ramp
    *  builds on top. xterm.js path ignores this (own kick=2 tuning). */
-  base: number
+  base: number;
   /** Deferred direction flip (native only). Might be encoder bounce or a
    *  real reversal — resolved by the NEXT event. Real reversal loses 1 row
    *  of latency; bounce is swallowed and triggers wheel mode. The flip's
    *  direction and timestamp are derivable (it's always -state.dir at
    *  state.time) so this is just a marker. */
-  pendingFlip: boolean
+  pendingFlip: boolean;
   /** Set true once a bounce is confirmed (flip-then-flip-back within
    *  BOUNCE_GAP_MAX). Sticky — but disengaged on idle gap >1500ms OR a
    *  trackpad-signature burst (see burstCount). State lives in a useRef so
    *  it persists across device switches; the disengages handle mouse→trackpad. */
-  wheelMode: boolean
+  wheelMode: boolean;
   /** Consecutive <5ms events. Trackpad flick produces 100+ at <5ms; mouse
    *  produces ≤3 (verified in /tmp/wheel-tune.txt). 5+ in a row → trackpad
    *  signature → disengage wheel mode so device-switch doesn't leak mouse
    *  accel to trackpad. */
-  burstCount: number
-}
+  burstCount: number;
+};
 
 /** Compute rows for one wheel event, mutating accel state. Returns 0 when
  *  a direction flip is deferred for bounce detection — call sites no-op on
  *  step=0 (scrollBy(0) is a no-op, onScroll(false) is idempotent). Exported
  *  for tests. */
-export function computeWheelStep(
-  state: WheelAccelState,
-  dir: 1 | -1,
-  now: number,
-): number {
+export function computeWheelStep(state: WheelAccelState, dir: 1 | -1, now: number): number {
   if (!state.xtermJs) {
     // Device-switch guard ①: idle disengage. Runs BEFORE pendingFlip resolve
     // so a pending bounce (28% of last-mouse-events) doesn't bypass it via
     // the real-reversal early return. state.time is either the last committed
     // event OR the deferred flip — both count as "last activity".
     if (state.wheelMode && now - state.time > WHEEL_MODE_IDLE_DISENGAGE_MS) {
-      state.wheelMode = false
-      state.burstCount = 0
-      state.mult = state.base
+      state.wheelMode = false;
+      state.burstCount = 0;
+      state.mult = state.base;
     }
 
     // Resolve any deferred flip BEFORE touching state.time/dir — we need the
     // pre-flip state.dir to distinguish bounce (flip-back) from real reversal
     // (flip persisted), and state.time (= bounce timestamp) for the gap check.
     if (state.pendingFlip) {
-      state.pendingFlip = false
+      state.pendingFlip = false;
       if (dir !== state.dir || now - state.time > WHEEL_BOUNCE_GAP_MAX_MS) {
         // Real reversal: new dir persisted, OR flip-back arrived too late.
         // Commit. The deferred event's 1 row is lost (acceptable latency).
-        state.dir = dir
-        state.time = now
-        state.mult = state.base
-        return Math.floor(state.mult)
+        state.dir = dir;
+        state.time = now;
+        state.mult = state.base;
+        return Math.floor(state.mult);
       }
       // Bounce confirmed: flipped back to original dir within the window.
       // state.dir/mult unchanged from pre-bounce. state.time was advanced to
       // the bounce below, so gap here = flip-back interval — reflects the
       // user's actual click cadence (bounce IS a physical click, just noisy).
-      state.wheelMode = true
+      state.wheelMode = true;
     }
 
-    const gap = now - state.time
+    const gap = now - state.time;
     if (dir !== state.dir && state.dir !== 0) {
       // Flip. Defer — next event decides bounce vs. real reversal. Advance
       // time (but NOT dir/mult): if this turns out to be a bounce, the
       // confirm event's gap will be the flip-back interval, which reflects
       // the user's actual click rate. The bounce IS a physical wheel click,
       // just misread by the encoder — it should count toward cadence.
-      state.pendingFlip = true
-      state.time = now
-      return 0
+      state.pendingFlip = true;
+      state.time = now;
+      return 0;
     }
-    state.dir = dir
-    state.time = now
+    state.dir = dir;
+    state.time = now;
 
     // ─── MOUSE (wheel mode, sticky until device-switch signal) ───
     if (state.wheelMode) {
@@ -242,14 +235,14 @@ export function computeWheelStep(
         // Device-switch guard ②: trackpad flick produces 100+ events at <5ms
         // (measured); mouse produces ≤3. 5+ consecutive → trackpad flick.
         if (++state.burstCount >= 5) {
-          state.wheelMode = false
-          state.burstCount = 0
-          state.mult = state.base
+          state.wheelMode = false;
+          state.burstCount = 0;
+          state.mult = state.base;
         } else {
-          return 1
+          return 1;
         }
       } else {
-        state.burstCount = 0
+        state.burstCount = 0;
       }
     }
     // Re-check: may have disengaged above.
@@ -258,11 +251,11 @@ export function computeWheelStep(
       // the curve handles it (gap=1000ms → m≈0.01 → mult≈1). No frac —
       // rounding loss is minor at high mult, and frac persisting across idle
       // was causing off-by-one on the first click back.
-      const m = Math.pow(0.5, gap / WHEEL_DECAY_HALFLIFE_MS)
-      const cap = Math.max(WHEEL_MODE_CAP, state.base * 2)
-      const next = 1 + (state.mult - 1) * m + WHEEL_MODE_STEP * m
-      state.mult = Math.min(cap, next, state.mult + WHEEL_MODE_RAMP)
-      return Math.floor(state.mult)
+      const m = 0.5 ** (gap / WHEEL_DECAY_HALFLIFE_MS);
+      const cap = Math.max(WHEEL_MODE_CAP, state.base * 2);
+      const next = 1 + (state.mult - 1) * m + WHEEL_MODE_STEP * m;
+      state.mult = Math.min(cap, next, state.mult + WHEEL_MODE_RAMP);
+      return Math.floor(state.mult);
     }
 
     // ─── TRACKPAD / HI-RES (native, non-wheel-mode) ───
@@ -270,44 +263,43 @@ export function computeWheelStep(
     // Trackpad flick delivers 200+ events at <20ms gaps → rails to cap 6.
     // Trackpad slow swipe at 40-400ms gaps → resets every event → 1 row each.
     if (gap > WHEEL_ACCEL_WINDOW_MS) {
-      state.mult = state.base
+      state.mult = state.base;
     } else {
-      const cap = Math.max(WHEEL_ACCEL_MAX, state.base * 2)
-      state.mult = Math.min(cap, state.mult + WHEEL_ACCEL_STEP)
+      const cap = Math.max(WHEEL_ACCEL_MAX, state.base * 2);
+      state.mult = Math.min(cap, state.mult + WHEEL_ACCEL_STEP);
     }
-    return Math.floor(state.mult)
+    return Math.floor(state.mult);
   }
 
   // ─── VSCODE (xterm.js, browser wheel events) ───
   // Browser wheel events — no encoder bounce, no SGR bursts. Decay curve
   // unchanged from the original tuning. Same formula shape as wheel mode
   // above (keep in sync) but STEP=5 not 15 — higher event rate here.
-  const gap = now - state.time
-  const sameDir = dir === state.dir
-  state.time = now
-  state.dir = dir
+  const gap = now - state.time;
+  const sameDir = dir === state.dir;
+  state.time = now;
+  state.dir = dir;
   // xterm.js path. Debug log shows two patterns: (a) 20-50ms gaps during
   // sustained scroll (~30 Hz), (b) <5ms same-batch bursts on flicks. For
   // (b) give 1 row/event — the burst count IS the acceleration, same as
   // native. For (a) the decay curve gives 3-5 rows. For sparse events
   // (100ms+, slow deliberate scroll) the curve gives 1-3.
-  if (sameDir && gap < WHEEL_BURST_MS) return 1
+  if (sameDir && gap < WHEEL_BURST_MS) return 1;
   if (!sameDir || gap > WHEEL_DECAY_IDLE_MS) {
     // Direction reversal or long idle: start at 2 (not 1) so the first
     // click after a pause moves a visible amount. Without this, idle-
     // then-resume in the same direction decays to mult≈1 (1 row).
-    state.mult = 2
-    state.frac = 0
+    state.mult = 2;
+    state.frac = 0;
   } else {
-    const m = Math.pow(0.5, gap / WHEEL_DECAY_HALFLIFE_MS)
-    const cap =
-      gap >= WHEEL_DECAY_GAP_MS ? WHEEL_DECAY_CAP_SLOW : WHEEL_DECAY_CAP_FAST
-    state.mult = Math.min(cap, 1 + (state.mult - 1) * m + WHEEL_DECAY_STEP * m)
+    const m = 0.5 ** (gap / WHEEL_DECAY_HALFLIFE_MS);
+    const cap = gap >= WHEEL_DECAY_GAP_MS ? WHEEL_DECAY_CAP_SLOW : WHEEL_DECAY_CAP_FAST;
+    state.mult = Math.min(cap, 1 + (state.mult - 1) * m + WHEEL_DECAY_STEP * m);
   }
-  const total = state.mult + state.frac
-  const rows = Math.floor(total)
-  state.frac = total - rows
-  return rows
+  const total = state.mult + state.frac;
+  const rows = Math.floor(total);
+  state.frac = total - rows;
+  return rows;
 }
 
 /** Read CLAUDE_CODE_SCROLL_SPEED, default 1, clamp (0, 20].
@@ -317,10 +309,10 @@ export function computeWheelStep(
  *  detect which kind of terminal we're in, hence the knob. Called lazily
  *  from initAndLogWheelAccel so globalSettings.env has loaded. */
 export function readScrollSpeedBase(): number {
-  const raw = process.env.CLAUDE_CODE_SCROLL_SPEED
-  if (!raw) return 1
-  const n = parseFloat(raw)
-  return Number.isNaN(n) || n <= 0 ? 1 : Math.min(n, 20)
+  const raw = process.env.CLAUDE_CODE_SCROLL_SPEED;
+  if (!raw) return 1;
+  const n = parseFloat(raw);
+  return Number.isNaN(n) || n <= 0 ? 1 : Math.min(n, 20);
 }
 
 /** Initial wheel accel state. xtermJs=true selects the decay curve.
@@ -336,7 +328,7 @@ export function initWheelAccel(xtermJs = false, base = 1): WheelAccelState {
     pendingFlip: false,
     wheelMode: false,
     burstCount: 0,
-  }
+  };
 }
 
 // Lazy-init helper. isXtermJs() combines the TERM_PROGRAM env check + async
@@ -346,25 +338,25 @@ export function initWheelAccel(xtermJs = false, base = 1): WheelAccelState {
 // The renderer also calls isXtermJsHost() (in render-node-to-output) to
 // select the drain algorithm — no state to pass through.
 function initAndLogWheelAccel(): WheelAccelState {
-  const xtermJs = isXtermJs()
-  const base = readScrollSpeedBase()
+  const xtermJs = isXtermJs();
+  const base = readScrollSpeedBase();
   logForDebugging(
     `wheel accel: ${xtermJs ? 'decay (xterm.js)' : 'window (native)'} · base=${base} · TERM_PROGRAM=${process.env.TERM_PROGRAM ?? 'unset'}`,
-  )
-  return initWheelAccel(xtermJs, base)
+  );
+  return initWheelAccel(xtermJs, base);
 }
 
 // Drag-to-scroll: when dragging past the viewport edge, scroll by this many
 // rows every AUTOSCROLL_INTERVAL_MS. Mode 1002 mouse tracking only fires on
 // cell change, so a timer is needed to continue scrolling while stationary.
-const AUTOSCROLL_LINES = 2
-const AUTOSCROLL_INTERVAL_MS = 50
+const AUTOSCROLL_LINES = 2;
+const AUTOSCROLL_INTERVAL_MS = 50;
 // Hard cap on consecutive auto-scroll ticks. If the release event is lost
 // (mouse released outside terminal window — some emulators don't capture the
 // pointer and drop the release), isDragging stays true and the timer would
 // run until a scroll boundary. Cap bounds the damage; any new drag motion
 // event restarts the count via check()→start().
-const AUTOSCROLL_MAX_TICKS = 200 // 10s @ 50ms
+const AUTOSCROLL_MAX_TICKS = 200; // 10s @ 50ms
 
 /**
  * Keyboard scroll navigation for the fullscreen layout's message scroll box.
@@ -372,36 +364,31 @@ const AUTOSCROLL_MAX_TICKS = 200 // 10s @ 50ms
  * Scrolling breaks sticky mode; Ctrl+End re-enables it. Wheeling down at
  * the bottom also re-enables sticky so new content follows naturally.
  */
-export function ScrollKeybindingHandler({
-  scrollRef,
-  isActive,
-  onScroll,
-  isModal = false,
-}: Props): React.ReactNode {
-  const selection = useSelection()
-  const { addNotification } = useNotifications()
+export function ScrollKeybindingHandler({ scrollRef, isActive, onScroll, isModal = false }: Props): React.ReactNode {
+  const selection = useSelection();
+  const { addNotification } = useNotifications();
   // Lazy-inited on first wheel event so the XTVERSION probe (fired at
   // raw-mode-enable time) has resolved by then — initializing in useRef()
   // would read getWheelBase() before the probe reply arrives over SSH.
-  const wheelAccel = useRef<WheelAccelState | null>(null)
+  const wheelAccel = useRef<WheelAccelState | null>(null);
 
   function showCopiedToast(text: string): void {
     // getClipboardPath reads env synchronously — predicts what setClipboard
     // did (native pbcopy / tmux load-buffer / raw OSC 52) so we can tell
     // the user whether paste will Just Work or needs prefix+].
-    const path = getClipboardPath()
-    const n = text.length
-    let msg: string
+    const path = getClipboardPath();
+    const n = text.length;
+    let msg: string;
     switch (path) {
       case 'native':
-        msg = `copied ${n} chars to clipboard`
-        break
+        msg = `copied ${n} chars to clipboard`;
+        break;
       case 'tmux-buffer':
-        msg = `copied ${n} chars to tmux buffer · paste with prefix + ]`
-        break
+        msg = `copied ${n} chars to tmux buffer · paste with prefix + ]`;
+        break;
       case 'osc52':
-        msg = `sent ${n} chars via OSC 52 · check terminal clipboard settings if paste fails`
-        break
+        msg = `sent ${n} chars via OSC 52 · check terminal clipboard settings if paste fails`;
+        break;
     }
     addNotification({
       key: 'selection-copied',
@@ -409,12 +396,12 @@ export function ScrollKeybindingHandler({
       color: 'suggestion',
       priority: 'immediate',
       timeoutMs: path === 'native' ? 2000 : 4000,
-    })
+    });
   }
 
   function copyAndToast(): void {
-    const text = selection.copySelection()
-    if (text) showCopiedToast(text)
+    const text = selection.copySelection();
+    if (text) showCopiedToast(text);
   }
 
   // Translate selection to track a keyboard page jump. Selection coords are
@@ -427,110 +414,107 @@ export function ScrollKeybindingHandler({
   // still clears — its async pendingScrollDelta drain means the actual
   // delta isn't known synchronously (follow-up).
   function translateSelectionForJump(s: ScrollBoxHandle, delta: number): void {
-    const sel = selection.getState()
-    if (!sel?.anchor || !sel.focus) return
-    const top = s.getViewportTop()
-    const bottom = top + s.getViewportHeight() - 1
+    const sel = selection.getState();
+    if (!sel?.anchor || !sel.focus) return;
+    const top = s.getViewportTop();
+    const bottom = top + s.getViewportHeight() - 1;
     // Only translate if the selection is ON scrollbox content. Selections
     // in the footer/prompt/StickyPromptHeader are on static text — the
     // scroll doesn't move what's under them. Same guard as ink.tsx's
     // auto-follow translate (commit 36a8d154).
-    if (sel.anchor.row < top || sel.anchor.row > bottom) return
+    if (sel.anchor.row < top || sel.anchor.row > bottom) return;
     // Cross-boundary: anchor in scrollbox, focus in footer/header. Mirror
     // ink.tsx's Flag-3 guard — fall through without shifting OR capturing.
     // The static endpoint pins the selection; shifting would teleport it
     // into scrollbox content.
-    if (sel.focus.row < top || sel.focus.row > bottom) return
-    const max = Math.max(0, s.getScrollHeight() - s.getViewportHeight())
-    const cur = s.getScrollTop() + s.getPendingDelta()
+    if (sel.focus.row < top || sel.focus.row > bottom) return;
+    const max = Math.max(0, s.getScrollHeight() - s.getViewportHeight());
+    const cur = s.getScrollTop() + s.getPendingDelta();
     // Actual scroll distance after boundary clamp. jumpBy may call
     // scrollToBottom when target >= max but the view can't move past max,
     // so the selection shift is bounded here.
-    const actual = Math.max(0, Math.min(max, cur + delta)) - cur
-    if (actual === 0) return
+    const actual = Math.max(0, Math.min(max, cur + delta)) - cur;
+    if (actual === 0) return;
     if (actual > 0) {
       // Scrolling down: content moves up. Rows at the TOP leave viewport.
       // Anchor+focus shift -actual so they track the content that moved up.
-      selection.captureScrolledRows(top, top + actual - 1, 'above')
-      selection.shiftSelection(-actual, top, bottom)
+      selection.captureScrolledRows(top, top + actual - 1, 'above');
+      selection.shiftSelection(-actual, top, bottom);
     } else {
       // Scrolling up: content moves down. Rows at the BOTTOM leave viewport.
-      const a = -actual
-      selection.captureScrolledRows(bottom - a + 1, bottom, 'below')
-      selection.shiftSelection(a, top, bottom)
+      const a = -actual;
+      selection.captureScrolledRows(bottom - a + 1, bottom, 'below');
+      selection.shiftSelection(a, top, bottom);
     }
   }
 
   useKeybindings(
     {
       'scroll:pageUp': () => {
-        const s = scrollRef.current
-        if (!s) return
-        const d = -Math.max(1, Math.floor(s.getViewportHeight() / 2))
-        translateSelectionForJump(s, d)
-        const sticky = jumpBy(s, d)
-        onScroll?.(sticky, s)
+        const s = scrollRef.current;
+        if (!s) return;
+        const d = -Math.max(1, Math.floor(s.getViewportHeight() / 2));
+        translateSelectionForJump(s, d);
+        const sticky = jumpBy(s, d);
+        onScroll?.(sticky, s);
       },
       'scroll:pageDown': () => {
-        const s = scrollRef.current
-        if (!s) return
-        const d = Math.max(1, Math.floor(s.getViewportHeight() / 2))
-        translateSelectionForJump(s, d)
-        const sticky = jumpBy(s, d)
-        onScroll?.(sticky, s)
+        const s = scrollRef.current;
+        if (!s) return;
+        const d = Math.max(1, Math.floor(s.getViewportHeight() / 2));
+        translateSelectionForJump(s, d);
+        const sticky = jumpBy(s, d);
+        onScroll?.(sticky, s);
       },
       'scroll:lineUp': () => {
         // Wheel: scrollBy accumulates into pendingScrollDelta, drained async
         // by the renderer. captureScrolledRows can't read the outgoing rows
         // before they leave (drain is non-deterministic). Clear for now.
-        selection.clearSelection()
-        const s = scrollRef.current
+        selection.clearSelection();
+        const s = scrollRef.current;
         // Return false (not consumed) when the ScrollBox content fits —
         // scroll would be a no-op. Lets a child component's handler take
         // the wheel event instead (e.g. Settings Config's list navigation
         // inside the centered Modal, where the paginated slice always fits).
-        if (!s || s.getScrollHeight() <= s.getViewportHeight()) return false
-        wheelAccel.current ??= initAndLogWheelAccel()
-        scrollUp(s, computeWheelStep(wheelAccel.current, -1, performance.now()))
-        onScroll?.(false, s)
+        if (!s || s.getScrollHeight() <= s.getViewportHeight()) return false;
+        wheelAccel.current ??= initAndLogWheelAccel();
+        scrollUp(s, computeWheelStep(wheelAccel.current, -1, performance.now()));
+        onScroll?.(false, s);
       },
       'scroll:lineDown': () => {
-        selection.clearSelection()
-        const s = scrollRef.current
-        if (!s || s.getScrollHeight() <= s.getViewportHeight()) return false
-        wheelAccel.current ??= initAndLogWheelAccel()
-        const step = computeWheelStep(wheelAccel.current, 1, performance.now())
-        const reachedBottom = scrollDown(s, step)
-        onScroll?.(reachedBottom, s)
+        selection.clearSelection();
+        const s = scrollRef.current;
+        if (!s || s.getScrollHeight() <= s.getViewportHeight()) return false;
+        wheelAccel.current ??= initAndLogWheelAccel();
+        const step = computeWheelStep(wheelAccel.current, 1, performance.now());
+        const reachedBottom = scrollDown(s, step);
+        onScroll?.(reachedBottom, s);
       },
       'scroll:top': () => {
-        const s = scrollRef.current
-        if (!s) return
-        translateSelectionForJump(s, -(s.getScrollTop() + s.getPendingDelta()))
-        s.scrollTo(0)
-        onScroll?.(false, s)
+        const s = scrollRef.current;
+        if (!s) return;
+        translateSelectionForJump(s, -(s.getScrollTop() + s.getPendingDelta()));
+        s.scrollTo(0);
+        onScroll?.(false, s);
       },
       'scroll:bottom': () => {
-        const s = scrollRef.current
-        if (!s) return
-        const max = Math.max(0, s.getScrollHeight() - s.getViewportHeight())
-        translateSelectionForJump(
-          s,
-          max - (s.getScrollTop() + s.getPendingDelta()),
-        )
+        const s = scrollRef.current;
+        if (!s) return;
+        const max = Math.max(0, s.getScrollHeight() - s.getViewportHeight());
+        translateSelectionForJump(s, max - (s.getScrollTop() + s.getPendingDelta()));
         // scrollTo(max) eager-writes scrollTop so the render-phase sticky
         // follow computes followDelta=0. Without this, scrollToBottom()
         // alone leaves scrollTop stale → followDelta=max-stale →
         // shiftSelectionForFollow applies the SAME shift we already did
         // above, 2× offset. scrollToBottom() then re-enables sticky.
-        s.scrollTo(max)
-        s.scrollToBottom()
-        onScroll?.(true, s)
+        s.scrollTo(max);
+        s.scrollToBottom();
+        onScroll?.(true, s);
       },
       'selection:copy': copyAndToast,
     },
     { context: 'Scroll', isActive },
-  )
+  );
 
   // scroll:halfPage*/fullPage* have no default key bindings — ctrl+u/d/b/f
   // all have real owners in normal mode (kill-line/exit/task:background/
@@ -539,40 +523,40 @@ export function ScrollKeybindingHandler({
   useKeybindings(
     {
       'scroll:halfPageUp': () => {
-        const s = scrollRef.current
-        if (!s) return
-        const d = -Math.max(1, Math.floor(s.getViewportHeight() / 2))
-        translateSelectionForJump(s, d)
-        const sticky = jumpBy(s, d)
-        onScroll?.(sticky, s)
+        const s = scrollRef.current;
+        if (!s) return;
+        const d = -Math.max(1, Math.floor(s.getViewportHeight() / 2));
+        translateSelectionForJump(s, d);
+        const sticky = jumpBy(s, d);
+        onScroll?.(sticky, s);
       },
       'scroll:halfPageDown': () => {
-        const s = scrollRef.current
-        if (!s) return
-        const d = Math.max(1, Math.floor(s.getViewportHeight() / 2))
-        translateSelectionForJump(s, d)
-        const sticky = jumpBy(s, d)
-        onScroll?.(sticky, s)
+        const s = scrollRef.current;
+        if (!s) return;
+        const d = Math.max(1, Math.floor(s.getViewportHeight() / 2));
+        translateSelectionForJump(s, d);
+        const sticky = jumpBy(s, d);
+        onScroll?.(sticky, s);
       },
       'scroll:fullPageUp': () => {
-        const s = scrollRef.current
-        if (!s) return
-        const d = -Math.max(1, s.getViewportHeight())
-        translateSelectionForJump(s, d)
-        const sticky = jumpBy(s, d)
-        onScroll?.(sticky, s)
+        const s = scrollRef.current;
+        if (!s) return;
+        const d = -Math.max(1, s.getViewportHeight());
+        translateSelectionForJump(s, d);
+        const sticky = jumpBy(s, d);
+        onScroll?.(sticky, s);
       },
       'scroll:fullPageDown': () => {
-        const s = scrollRef.current
-        if (!s) return
-        const d = Math.max(1, s.getViewportHeight())
-        translateSelectionForJump(s, d)
-        const sticky = jumpBy(s, d)
-        onScroll?.(sticky, s)
+        const s = scrollRef.current;
+        if (!s) return;
+        const d = Math.max(1, s.getViewportHeight());
+        translateSelectionForJump(s, d);
+        const sticky = jumpBy(s, d);
+        onScroll?.(sticky, s);
       },
     },
     { context: 'Scroll', isActive },
-  )
+  );
 
   // Modal pager keys — transcript mode only. less/tmux copy-mode lineage:
   // ctrl+u/d (half-page), ctrl+b/f (full-page), g/G (top/bottom). Tom's
@@ -592,17 +576,15 @@ export function ScrollKeybindingHandler({
   // abandoned (❯ oscillation). See team memory scroll-copy-mode-design.md.
   useInput(
     (input, key, event) => {
-      const s = scrollRef.current
-      if (!s) return
-      const sticky = applyModalPagerAction(s, modalPagerAction(input, key), d =>
-        translateSelectionForJump(s, d),
-      )
-      if (sticky === null) return
-      onScroll?.(sticky, s)
-      event.stopImmediatePropagation()
+      const s = scrollRef.current;
+      if (!s) return;
+      const sticky = applyModalPagerAction(s, modalPagerAction(input, key), d => translateSelectionForJump(s, d));
+      if (sticky === null) return;
+      onScroll?.(sticky, s);
+      event.stopImmediatePropagation();
     },
     { isActive: isActive && isModal },
-  )
+  );
 
   // Esc clears selection; any other keystroke also clears it (matches
   // native terminal behavior where selection disappears on input).
@@ -617,35 +599,35 @@ export function ScrollKeybindingHandler({
   // via useKeybindings and consumes its event before reaching here.
   useInput(
     (input, key, event) => {
-      if (!selection.hasSelection()) return
+      if (!selection.hasSelection()) return;
       if (key.escape) {
-        selection.clearSelection()
-        event.stopImmediatePropagation()
-        return
+        selection.clearSelection();
+        event.stopImmediatePropagation();
+        return;
       }
       if (key.ctrl && !key.shift && !key.meta && input === 'c') {
-        copyAndToast()
-        event.stopImmediatePropagation()
-        return
+        copyAndToast();
+        event.stopImmediatePropagation();
+        return;
       }
-      const move = selectionFocusMoveForKey(key)
+      const move = selectionFocusMoveForKey(key);
       if (move) {
-        selection.moveFocus(move)
-        event.stopImmediatePropagation()
-        return
+        selection.moveFocus(move);
+        event.stopImmediatePropagation();
+        return;
       }
       if (shouldClearSelectionOnKey(key)) {
-        selection.clearSelection()
+        selection.clearSelection();
       }
     },
     { isActive },
-  )
+  );
 
-  useDragToScroll(scrollRef, selection, isActive, onScroll)
-  useCopyOnSelect(selection, isActive, showCopiedToast)
-  useSelectionBgColor(selection)
+  useDragToScroll(scrollRef, selection, isActive, onScroll);
+  useCopyOnSelect(selection, isActive, showCopiedToast);
+  useSelectionBgColor(selection);
 
-  return null
+  return null;
 }
 
 /**
@@ -666,45 +648,39 @@ function useDragToScroll(
   isActive: boolean,
   onScroll: Props['onScroll'],
 ): void {
-  const timerRef = useRef<NodeJS.Timeout | null>(null)
-  const dirRef = useRef<-1 | 0 | 1>(0) // -1 scrolling up, +1 down, 0 idle
+  const timerRef = useRef<NodeJS.Timeout | null>(null);
+  const dirRef = useRef<-1 | 0 | 1>(0); // -1 scrolling up, +1 down, 0 idle
   // Survives stop() — reset only on drag-finish. See check() for semantics.
-  const lastScrolledDirRef = useRef<-1 | 0 | 1>(0)
-  const ticksRef = useRef(0)
+  const lastScrolledDirRef = useRef<-1 | 0 | 1>(0);
+  const ticksRef = useRef(0);
   // onScroll may change identity every render (if not memoized by caller).
   // Read through a ref so the effect doesn't re-subscribe and kill the timer
   // on each scroll-induced re-render.
-  const onScrollRef = useRef(onScroll)
-  onScrollRef.current = onScroll
+  const onScrollRef = useRef(onScroll);
+  onScrollRef.current = onScroll;
 
   useEffect(() => {
-    if (!isActive) return
+    if (!isActive) return;
 
     function stop(): void {
-      dirRef.current = 0
+      dirRef.current = 0;
       if (timerRef.current) {
-        clearInterval(timerRef.current)
-        timerRef.current = null
+        clearInterval(timerRef.current);
+        timerRef.current = null;
       }
     }
 
     function tick(): void {
-      const sel = selection.getState()
-      const s = scrollRef.current
-      const dir = dirRef.current
+      const sel = selection.getState();
+      const s = scrollRef.current;
+      const dir = dirRef.current;
       // dir === 0 defends against a stale interval (start() may have set one
       // after the immediate tick already called stop() at a scroll boundary).
       // ticks cap defends against a lost release event (mouse released
       // outside terminal window) leaving isDragging stuck true.
-      if (
-        !sel?.isDragging ||
-        !sel.focus ||
-        !s ||
-        dir === 0 ||
-        ++ticksRef.current > AUTOSCROLL_MAX_TICKS
-      ) {
-        stop()
-        return
+      if (!sel?.isDragging || !sel.focus || !s || dir === 0 || ++ticksRef.current > AUTOSCROLL_MAX_TICKS) {
+        stop();
+        return;
       }
       // scrollBy accumulates into pendingScrollDelta; the screen buffer
       // doesn't update until the next render drains it. If a previous
@@ -713,44 +689,44 @@ function useDragToScroll(
       // accumulator AND missing the rows that actually scrolled out).
       // Skip this tick; the 50ms interval will retry after Ink's 16ms
       // render catches up. Also prevents shiftAnchor from desyncing.
-      if (s.getPendingDelta() !== 0) return
-      const top = s.getViewportTop()
-      const bottom = top + s.getViewportHeight() - 1
+      if (s.getPendingDelta() !== 0) return;
+      const top = s.getViewportTop();
+      const bottom = top + s.getViewportHeight() - 1;
       // Clamp anchor within [top, bottom]. Not [0, bottom]: the ScrollBox
       // padding row at 0 would produce a blank line between scrolledOffAbove
       // and the on-screen content in getSelectedText. The padding-row
       // highlight was a minor visual nicety; text correctness wins.
       if (dir < 0) {
         if (s.getScrollTop() <= 0) {
-          stop()
-          return
+          stop();
+          return;
         }
         // Scrolling up: content moves down in viewport, so anchor row +N.
         // Clamp to actual scroll distance so anchor stays in sync when near
         // the top boundary (renderer clamps scrollTop to 0 on drain).
-        const actual = Math.min(AUTOSCROLL_LINES, s.getScrollTop())
+        const actual = Math.min(AUTOSCROLL_LINES, s.getScrollTop());
         // Capture rows about to scroll out the BOTTOM before scrollBy
         // overwrites them. Only rows inside the selection are captured
         // (captureScrolledRows intersects with selection bounds).
-        selection.captureScrolledRows(bottom - actual + 1, bottom, 'below')
-        selection.shiftAnchor(actual, 0, bottom)
-        s.scrollBy(-AUTOSCROLL_LINES)
+        selection.captureScrolledRows(bottom - actual + 1, bottom, 'below');
+        selection.shiftAnchor(actual, 0, bottom);
+        s.scrollBy(-AUTOSCROLL_LINES);
       } else {
-        const max = Math.max(0, s.getScrollHeight() - s.getViewportHeight())
+        const max = Math.max(0, s.getScrollHeight() - s.getViewportHeight());
         if (s.getScrollTop() >= max) {
-          stop()
-          return
+          stop();
+          return;
         }
         // Scrolling down: content moves up in viewport, so anchor row -N.
         // Clamp to actual scroll distance so anchor stays in sync when near
         // the bottom boundary (renderer clamps scrollTop to max on drain).
-        const actual = Math.min(AUTOSCROLL_LINES, max - s.getScrollTop())
+        const actual = Math.min(AUTOSCROLL_LINES, max - s.getScrollTop());
         // Capture rows about to scroll out the TOP.
-        selection.captureScrolledRows(top, top + actual - 1, 'above')
-        selection.shiftAnchor(-actual, top, bottom)
-        s.scrollBy(AUTOSCROLL_LINES)
+        selection.captureScrolledRows(top, top + actual - 1, 'above');
+        selection.shiftAnchor(-actual, top, bottom);
+        s.scrollBy(AUTOSCROLL_LINES);
       }
-      onScrollRef.current?.(false, s)
+      onScrollRef.current?.(false, s);
     }
 
     function start(dir: -1 | 1): void {
@@ -758,17 +734,17 @@ function useDragToScroll(
       // may have zeroed this during the pre-crossing phase (accumulators
       // empty until the anchor row enters the capture range). Re-record
       // on every call so the corruption is instantly healed.
-      lastScrolledDirRef.current = dir
-      if (dirRef.current === dir) return // already going this way
-      stop()
-      dirRef.current = dir
-      ticksRef.current = 0
-      tick()
+      lastScrolledDirRef.current = dir;
+      if (dirRef.current === dir) return; // already going this way
+      stop();
+      dirRef.current = dir;
+      ticksRef.current = 0;
+      tick();
       // tick() may have hit a scroll boundary and called stop() (dir reset to
       // 0). Only start the interval if we're still going — otherwise the
       // interval would run forever with dir === 0 doing nothing useful.
       if (dirRef.current === dir) {
-        timerRef.current = setInterval(tick, AUTOSCROLL_INTERVAL_MS)
+        timerRef.current = setInterval(tick, AUTOSCROLL_INTERVAL_MS);
       }
     }
 
@@ -780,14 +756,14 @@ function useDragToScroll(
     // scrolling, highlight walks up with the text). Keeping sticky also
     // avoids useVirtualScroll's tail-walk → forward-walk phantom growth.
     function check(): void {
-      const s = scrollRef.current
+      const s = scrollRef.current;
       if (!s) {
-        stop()
-        return
+        stop();
+        return;
       }
-      const top = s.getViewportTop()
-      const bottom = top + s.getViewportHeight() - 1
-      const sel = selection.getState()
+      const top = s.getViewportTop();
+      const bottom = top + s.getViewportHeight() - 1;
+      const sel = selection.getState();
       // Pass the LAST-scrolled direction (not dirRef) so the anchor guard is
       // bypassed after shiftAnchor has clamped anchor toward row 0. Using
       // lastScrolledDirRef (survives stop()) lets autoscroll resume after a
@@ -800,18 +776,10 @@ function useDragToScroll(
       // stuck true, the reason AUTOSCROLL_MAX_TICKS exists) still resets.
       // Safe: start() below re-records lastScrolledDirRef before its
       // early-return, so a mid-scroll reset here is instantly undone.
-      if (
-        !sel?.isDragging ||
-        (sel.scrolledOffAbove.length === 0 && sel.scrolledOffBelow.length === 0)
-      ) {
-        lastScrolledDirRef.current = 0
+      if (!sel?.isDragging || (sel.scrolledOffAbove.length === 0 && sel.scrolledOffBelow.length === 0)) {
+        lastScrolledDirRef.current = 0;
       }
-      const dir = dragScrollDirection(
-        sel,
-        top,
-        bottom,
-        lastScrolledDirRef.current,
-      )
+      const dir = dragScrollDirection(sel, top, bottom, lastScrolledDirRef.current);
       if (dir === 0) {
         // Blocked reversal: focus jumped to the opposite edge (off-window
         // drag return, fast flick). handleSelectionDrag already moved focus
@@ -819,26 +787,26 @@ function useDragToScroll(
         // now orphaned (holds rows on the wrong side). Clear it so
         // getSelectedText matches the visible highlight.
         if (lastScrolledDirRef.current !== 0 && sel?.focus) {
-          const want = sel.focus.row < top ? -1 : sel.focus.row > bottom ? 1 : 0
+          const want = sel.focus.row < top ? -1 : sel.focus.row > bottom ? 1 : 0;
           if (want !== 0 && want !== lastScrolledDirRef.current) {
-            sel.scrolledOffAbove = []
-            sel.scrolledOffBelow = []
-            sel.scrolledOffAboveSW = []
-            sel.scrolledOffBelowSW = []
-            lastScrolledDirRef.current = 0
+            sel.scrolledOffAbove = [];
+            sel.scrolledOffBelow = [];
+            sel.scrolledOffAboveSW = [];
+            sel.scrolledOffBelowSW = [];
+            lastScrolledDirRef.current = 0;
           }
         }
-        stop()
-      } else start(dir)
+        stop();
+      } else start(dir);
     }
 
-    const unsubscribe = selection.subscribe(check)
+    const unsubscribe = selection.subscribe(check);
     return () => {
-      unsubscribe()
-      stop()
-      lastScrolledDirRef.current = 0
-    }
-  }, [isActive, scrollRef, selection])
+      unsubscribe();
+      stop();
+      lastScrolledDirRef.current = 0;
+    };
+  }, [isActive, scrollRef, selection]);
 }
 
 /**
@@ -863,20 +831,20 @@ export function dragScrollDirection(
   bottom: number,
   alreadyScrollingDir: -1 | 0 | 1 = 0,
 ): -1 | 0 | 1 {
-  if (!sel?.isDragging || !sel.anchor || !sel.focus) return 0
-  const row = sel.focus.row
-  const want: -1 | 0 | 1 = row < top ? -1 : row > bottom ? 1 : 0
+  if (!sel?.isDragging || !sel.anchor || !sel.focus) return 0;
+  const row = sel.focus.row;
+  const want: -1 | 0 | 1 = row < top ? -1 : row > bottom ? 1 : 0;
   if (alreadyScrollingDir !== 0) {
     // Same-direction only. Focus on the opposite side, or back inside the
     // viewport, stops the scroll — captured rows stay in scrolledOffAbove/
     // Below but never scroll back on-screen, so getSelectedText is correct.
-    return want === alreadyScrollingDir ? want : 0
+    return want === alreadyScrollingDir ? want : 0;
   }
   // Anchor must be inside the viewport for us to own this drag. If the
   // user started selecting in the input box or header, autoscrolling the
   // message history is surprising and corrupts the anchor via shiftAnchor.
-  if (sel.anchor.row < top || sel.anchor.row > bottom) return 0
-  return want
+  if (sel.anchor.row < top || sel.anchor.row > bottom) return 0;
+  return want;
 }
 
 // Keyboard page jumps: scrollTo() writes scrollTop directly and clears
@@ -887,36 +855,36 @@ export function dragScrollDirection(
 // Target is relative to scrollTop+pendingDelta so a jump mid-wheel-burst
 // lands where the wheel was heading.
 export function jumpBy(s: ScrollBoxHandle, delta: number): boolean {
-  const max = Math.max(0, s.getScrollHeight() - s.getViewportHeight())
-  const target = s.getScrollTop() + s.getPendingDelta() + delta
+  const max = Math.max(0, s.getScrollHeight() - s.getViewportHeight());
+  const target = s.getScrollTop() + s.getPendingDelta() + delta;
   if (target >= max) {
     // Eager-write scrollTop so follow-scroll sees followDelta=0. Callers
     // that ran translateSelectionForJump already shifted; scrollToBottom()
     // alone would double-shift via the render-phase sticky follow.
-    s.scrollTo(max)
-    s.scrollToBottom()
-    return true
+    s.scrollTo(max);
+    s.scrollToBottom();
+    return true;
   }
-  s.scrollTo(Math.max(0, target))
-  return false
+  s.scrollTo(Math.max(0, target));
+  return false;
 }
 
 // Wheel-down past maxScroll re-enables sticky so wheeling at the bottom
 // naturally re-pins (matches typical chat-app behavior). Returns the
 // resulting sticky state so callers can propagate it.
 function scrollDown(s: ScrollBoxHandle, amount: number): boolean {
-  const max = Math.max(0, s.getScrollHeight() - s.getViewportHeight())
+  const max = Math.max(0, s.getScrollHeight() - s.getViewportHeight());
   // Include pendingDelta: scrollBy accumulates into pendingScrollDelta
   // without updating scrollTop, so getScrollTop() alone is stale within
   // a batch of wheel events. Without this, wheeling to the bottom never
   // re-enables sticky scroll.
-  const effectiveTop = s.getScrollTop() + s.getPendingDelta()
+  const effectiveTop = s.getScrollTop() + s.getPendingDelta();
   if (effectiveTop + amount >= max) {
-    s.scrollToBottom()
-    return true
+    s.scrollToBottom();
+    return true;
   }
-  s.scrollBy(amount)
-  return false
+  s.scrollBy(amount);
+  return false;
 }
 
 // Wheel-up past scrollTop=0 clamps via scrollTo(0), clearing
@@ -928,12 +896,12 @@ function scrollDown(s: ScrollBoxHandle, amount: number): boolean {
 export function scrollUp(s: ScrollBoxHandle, amount: number): void {
   // Include pendingDelta: scrollBy accumulates without updating scrollTop,
   // so getScrollTop() alone is stale within a batch of wheel events.
-  const effectiveTop = s.getScrollTop() + s.getPendingDelta()
+  const effectiveTop = s.getScrollTop() + s.getPendingDelta();
   if (effectiveTop - amount <= 0) {
-    s.scrollTo(0)
-    return
+    s.scrollTo(0);
+    return;
   }
-  s.scrollBy(-amount)
+  s.scrollBy(-amount);
 }
 
 export type ModalPagerAction =
@@ -944,7 +912,7 @@ export type ModalPagerAction =
   | 'fullPageUp'
   | 'fullPageDown'
   | 'top'
-  | 'bottom'
+  | 'bottom';
 
 /**
  * Maps a keystroke to a modal pager action. Exported for testing.
@@ -963,69 +931,66 @@ export type ModalPagerAction =
  */
 export function modalPagerAction(
   input: string,
-  key: Pick<
-    Key,
-    'ctrl' | 'meta' | 'shift' | 'upArrow' | 'downArrow' | 'home' | 'end'
-  >,
+  key: Pick<Key, 'ctrl' | 'meta' | 'shift' | 'upArrow' | 'downArrow' | 'home' | 'end'>,
 ): ModalPagerAction | null {
-  if (key.meta) return null
+  if (key.meta) return null;
   // Special keys first — arrows/home/end arrive with empty or junk input,
   // so these must be checked before any input-string logic. shift is
   // reserved for selection-extend (selectionFocusMoveForKey); ctrl+home/end
   // already has a useKeybindings route to scroll:top/bottom.
   if (!key.ctrl && !key.shift) {
-    if (key.upArrow) return 'lineUp'
-    if (key.downArrow) return 'lineDown'
-    if (key.home) return 'top'
-    if (key.end) return 'bottom'
+    if (key.upArrow) return 'lineUp';
+    if (key.downArrow) return 'lineDown';
+    if (key.home) return 'top';
+    if (key.end) return 'bottom';
   }
   if (key.ctrl) {
-    if (key.shift) return null
+    if (key.shift) return null;
     switch (input) {
       case 'u':
-        return 'halfPageUp'
+        return 'halfPageUp';
       case 'd':
-        return 'halfPageDown'
+        return 'halfPageDown';
       case 'b':
-        return 'fullPageUp'
+        return 'fullPageUp';
       case 'f':
-        return 'fullPageDown'
+        return 'fullPageDown';
       // emacs-style line scroll (less accepts both ctrl+n/p and ctrl+e/y).
       // Works during search nav — fine-adjust after a jump without
       // leaving modal. No !searchOpen gate on this useInput's isActive.
       case 'n':
-        return 'lineDown'
+        return 'lineDown';
       case 'p':
-        return 'lineUp'
+        return 'lineUp';
       default:
-        return null
+        return null;
     }
   }
   // Bare letters. Key-repeat batches: only act on uniform runs.
-  const c = input[0]
-  if (!c || input !== c.repeat(input.length)) return null
+  const c = input[0];
+  if (!c || input !== c.repeat(input.length)) return null;
   // kitty sends G as input='g' shift=true; legacy as 'G' shift=false.
   // Check BEFORE the shift-gate so both hit 'bottom'.
-  if (c === 'G' || (c === 'g' && key.shift)) return 'bottom'
-  if (key.shift) return null
+  if (c === 'G' || (c === 'g' && key.shift)) return 'bottom';
+  if (key.shift) return null;
   switch (c) {
     case 'g':
-      return 'top'
+      return 'top';
     // j/k re-added per Tom Mar 18 — reversal of Mar 16 removal. Works
     // during search nav (fine-adjust after n/N lands) since isModal is
     // independent of searchOpen.
     case 'j':
-      return 'lineDown'
+      return 'lineDown';
     case 'k':
-      return 'lineUp'
+      return 'lineUp';
     // less: space = page down, b = page up. ctrl+b already maps above;
     // bare b is the less-native version.
     case ' ':
-      return 'fullPageDown'
+      return 'fullPageDown';
     case 'b':
-      return 'fullPageUp'
+      return 'fullPageUp';
     default:
-      return null
+      return null;
   }
 }
 
@@ -1043,39 +1008,39 @@ export function applyModalPagerAction(
 ): boolean | null {
   switch (act) {
     case null:
-      return null
+      return null;
     case 'lineUp':
     case 'lineDown': {
-      const d = act === 'lineDown' ? 1 : -1
-      onBeforeJump(d)
-      return jumpBy(s, d)
+      const d = act === 'lineDown' ? 1 : -1;
+      onBeforeJump(d);
+      return jumpBy(s, d);
     }
     case 'halfPageUp':
     case 'halfPageDown': {
-      const half = Math.max(1, Math.floor(s.getViewportHeight() / 2))
-      const d = act === 'halfPageDown' ? half : -half
-      onBeforeJump(d)
-      return jumpBy(s, d)
+      const half = Math.max(1, Math.floor(s.getViewportHeight() / 2));
+      const d = act === 'halfPageDown' ? half : -half;
+      onBeforeJump(d);
+      return jumpBy(s, d);
     }
     case 'fullPageUp':
     case 'fullPageDown': {
-      const page = Math.max(1, s.getViewportHeight())
-      const d = act === 'fullPageDown' ? page : -page
-      onBeforeJump(d)
-      return jumpBy(s, d)
+      const page = Math.max(1, s.getViewportHeight());
+      const d = act === 'fullPageDown' ? page : -page;
+      onBeforeJump(d);
+      return jumpBy(s, d);
     }
     case 'top':
-      onBeforeJump(-(s.getScrollTop() + s.getPendingDelta()))
-      s.scrollTo(0)
-      return false
+      onBeforeJump(-(s.getScrollTop() + s.getPendingDelta()));
+      s.scrollTo(0);
+      return false;
     case 'bottom': {
-      const max = Math.max(0, s.getScrollHeight() - s.getViewportHeight())
-      onBeforeJump(max - (s.getScrollTop() + s.getPendingDelta()))
+      const max = Math.max(0, s.getScrollHeight() - s.getViewportHeight());
+      onBeforeJump(max - (s.getScrollTop() + s.getPendingDelta()));
       // Eager-write scrollTop before scrollToBottom — same double-shift
       // fix as scroll:bottom and jumpBy's max branch.
-      s.scrollTo(max)
-      s.scrollToBottom()
-      return true
+      s.scrollTo(max);
+      s.scrollToBottom();
+      return true;
     }
   }
 }
diff --git a/src/components/SearchBox.tsx b/src/components/SearchBox.tsx
index 532e18294..05ff79c08 100644
--- a/src/components/SearchBox.tsx
+++ b/src/components/SearchBox.tsx
@@ -1,2 +1,2 @@
 // Re-export from @anthropic/ink theme module
-export { SearchBox } from '@anthropic/ink'
+export { SearchBox } from '@anthropic/ink';
diff --git a/src/components/SessionBackgroundHint.tsx b/src/components/SessionBackgroundHint.tsx
index aa336afb0..d15c862f2 100644
--- a/src/components/SessionBackgroundHint.tsx
+++ b/src/components/SessionBackgroundHint.tsx
@@ -1,27 +1,20 @@
-import * as React from 'react'
-import { useCallback, useState } from 'react'
-import { useDoublePress } from '../hooks/useDoublePress.js'
-import { Box, Text } from '@anthropic/ink'
-import { useKeybinding } from '../keybindings/useKeybinding.js'
-import { useShortcutDisplay } from '../keybindings/useShortcutDisplay.js'
-import {
-  useAppState,
-  useAppStateStore,
-  useSetAppState,
-} from '../state/AppState.js'
-import {
-  backgroundAll,
-  hasForegroundTasks,
-} from '../tasks/LocalShellTask/LocalShellTask.js'
-import { getGlobalConfig, saveGlobalConfig } from '../utils/config.js'
-import { env } from '../utils/env.js'
-import { isEnvTruthy } from '../utils/envUtils.js'
-import { KeyboardShortcutHint } from '@anthropic/ink'
+import * as React from 'react';
+import { useCallback, useState } from 'react';
+import { useDoublePress } from '../hooks/useDoublePress.js';
+import { Box, Text } from '@anthropic/ink';
+import { useKeybinding } from '../keybindings/useKeybinding.js';
+import { useShortcutDisplay } from '../keybindings/useShortcutDisplay.js';
+import { useAppState, useAppStateStore, useSetAppState } from '../state/AppState.js';
+import { backgroundAll, hasForegroundTasks } from '../tasks/LocalShellTask/LocalShellTask.js';
+import { getGlobalConfig, saveGlobalConfig } from '../utils/config.js';
+import { env } from '../utils/env.js';
+import { isEnvTruthy } from '../utils/envUtils.js';
+import { KeyboardShortcutHint } from '@anthropic/ink';
 
 type Props = {
-  onBackgroundSession: () => void
-  isLoading: boolean
-}
+  onBackgroundSession: () => void;
+  isLoading: boolean;
+};
 
 /**
  * Shows a hint when user presses Ctrl+B to background the current session.
@@ -31,64 +24,53 @@ type Props = {
  * 1. isLoading is true (a query is in progress)
  * 2. No foreground tasks (bash/agent) are running (those take priority for Ctrl+B)
  */
-export function SessionBackgroundHint({
-  onBackgroundSession,
-  isLoading,
-}: Props): React.ReactElement | null {
-  const setAppState = useSetAppState()
-  const appStateStore = useAppStateStore()
+export function SessionBackgroundHint({ onBackgroundSession, isLoading }: Props): React.ReactElement | null {
+  const setAppState = useSetAppState();
+  const appStateStore = useAppStateStore();
 
-  const [showSessionHint, setShowSessionHint] = useState(false)
+  const [showSessionHint, setShowSessionHint] = useState(false);
 
   const handleDoublePress = useDoublePress(
     setShowSessionHint,
     onBackgroundSession,
     () => {}, // First press just shows the hint
-  )
+  );
 
   // Handler for task:background - prioritizes foreground tasks, falls back to session backgrounding
   // Skip all background functionality if background tasks are disabled
   const handleBackground = useCallback(() => {
     if (isEnvTruthy(process.env.CLAUDE_CODE_DISABLE_BACKGROUND_TASKS)) {
-      return
+      return;
     }
-    const state = appStateStore.getState()
+    const state = appStateStore.getState();
     if (hasForegroundTasks(state)) {
       // Existing behavior - background running bash/agent tasks
-      backgroundAll(() => appStateStore.getState(), setAppState)
+      backgroundAll(() => appStateStore.getState(), setAppState);
       if (!getGlobalConfig().hasUsedBackgroundTask) {
-        saveGlobalConfig(c =>
-          c.hasUsedBackgroundTask ? c : { ...c, hasUsedBackgroundTask: true },
-        )
+        saveGlobalConfig(c => (c.hasUsedBackgroundTask ? c : { ...c, hasUsedBackgroundTask: true }));
       }
-    } else if (
-      isEnvTruthy("false") &&
-      isLoading
-    ) {
+    } else if (isEnvTruthy('false') && isLoading) {
       // New behavior - double-press to background session (gated)
-      handleDoublePress()
+      handleDoublePress();
     }
-  }, [setAppState, appStateStore, isLoading, handleDoublePress])
+  }, [setAppState, appStateStore, isLoading, handleDoublePress]);
 
   // Only eat ctrl+b when there's something to background. Without this gate
   // the binding double-fires with readline backward-char at an idle prompt.
-  const hasForeground = useAppState(hasForegroundTasks)
-  const sessionBgEnabled = isEnvTruthy("false")
+  const hasForeground = useAppState(hasForegroundTasks);
+  const sessionBgEnabled = isEnvTruthy('false');
   useKeybinding('task:background', handleBackground, {
     context: 'Task',
     isActive: hasForeground || (sessionBgEnabled && isLoading),
-  })
+  });
 
   // Get the configured shortcut for task:background
-  const baseShortcut = useShortcutDisplay('task:background', 'Task', 'ctrl+b')
+  const baseShortcut = useShortcutDisplay('task:background', 'Task', 'ctrl+b');
   // In tmux, ctrl+b is the prefix key, so users need to press it twice to send ctrl+b
-  const shortcut =
-    env.terminal === 'tmux' && baseShortcut === 'ctrl+b'
-      ? 'ctrl+b ctrl+b'
-      : baseShortcut
+  const shortcut = env.terminal === 'tmux' && baseShortcut === 'ctrl+b' ? 'ctrl+b ctrl+b' : baseShortcut;
 
   if (!isLoading || !showSessionHint) {
-    return null
+    return null;
   }
 
   return (
@@ -97,5 +79,5 @@ export function SessionBackgroundHint({
         <KeyboardShortcutHint shortcut={shortcut} action="background" />
       </Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/SessionPreview.tsx b/src/components/SessionPreview.tsx
index 2e0f74b2d..f7449ab63 100644
--- a/src/components/SessionPreview.tsx
+++ b/src/components/SessionPreview.tsx
@@ -1,57 +1,49 @@
-import type { UUID } from 'crypto'
-import React, { useCallback } from 'react'
-import { Box, Text, Byline, KeyboardShortcutHint, LoadingState } from '@anthropic/ink'
-import { useKeybinding } from '../keybindings/useKeybinding.js'
-import { getAllBaseTools } from '../tools.js'
-import type { LogOption } from '../types/logs.js'
-import { formatRelativeTimeAgo } from '../utils/format.js'
-import {
-  getSessionIdFromLog,
-  isLiteLog,
-  loadFullLog,
-} from '../utils/sessionStorage.js'
-import { ConfigurableShortcutHint } from './ConfigurableShortcutHint.js'
-import { Messages } from './Messages.js'
+import type { UUID } from 'crypto';
+import React, { useCallback } from 'react';
+import { Box, Text, Byline, KeyboardShortcutHint, LoadingState } from '@anthropic/ink';
+import { useKeybinding } from '../keybindings/useKeybinding.js';
+import { getAllBaseTools } from '../tools.js';
+import type { LogOption } from '../types/logs.js';
+import { formatRelativeTimeAgo } from '../utils/format.js';
+import { getSessionIdFromLog, isLiteLog, loadFullLog } from '../utils/sessionStorage.js';
+import { ConfigurableShortcutHint } from './ConfigurableShortcutHint.js';
+import { Messages } from './Messages.js';
 
 type Props = {
-  log: LogOption
-  onExit: () => void
-  onSelect: (log: LogOption) => void
-}
+  log: LogOption;
+  onExit: () => void;
+  onSelect: (log: LogOption) => void;
+};
 
-export function SessionPreview({
-  log,
-  onExit,
-  onSelect,
-}: Props): React.ReactNode {
+export function SessionPreview({ log, onExit, onSelect }: Props): React.ReactNode {
   // fullLog holds the complete log with messages loaded.
   // The input `log` may be a "lite log" (empty messages array),
   // so we load the full messages on mount and store them here.
-  const [fullLog, setFullLog] = React.useState<LogOption | null>(null)
+  const [fullLog, setFullLog] = React.useState<LogOption | null>(null);
 
   // Load full messages if this is a lite log
   React.useEffect(() => {
-    setFullLog(null)
+    setFullLog(null);
     if (isLiteLog(log)) {
-      void loadFullLog(log).then(setFullLog)
+      void loadFullLog(log).then(setFullLog);
     }
-  }, [log])
+  }, [log]);
 
-  const isLoading = isLiteLog(log) && fullLog === null
-  const displayLog = fullLog ?? log
-  const conversationId = getSessionIdFromLog(displayLog) || ('' as UUID)
+  const isLoading = isLiteLog(log) && fullLog === null;
+  const displayLog = fullLog ?? log;
+  const conversationId = getSessionIdFromLog(displayLog) || ('' as UUID);
 
   // Get all base tools for preview (no permissions needed for read-only view)
-  const tools = getAllBaseTools()
+  const tools = getAllBaseTools();
 
   // Handle keyboard input via keybindings
-  useKeybinding('confirm:no', onExit, { context: 'Confirmation' })
+  useKeybinding('confirm:no', onExit, { context: 'Confirmation' });
 
   const handleSelect = useCallback(() => {
-    onSelect(fullLog ?? log)
-  }, [onSelect, fullLog, log])
+    onSelect(fullLog ?? log);
+  }, [onSelect, fullLog, log]);
 
-  useKeybinding('confirm:yes', handleSelect, { context: 'Confirmation' })
+  useKeybinding('confirm:yes', handleSelect, { context: 'Confirmation' });
 
   // Show loading state while fetching full log
   if (isLoading) {
@@ -60,16 +52,11 @@ export function SessionPreview({
         <LoadingState message="Loading session…" />
         <Text dimColor>
           <Byline>
-            <ConfigurableShortcutHint
-              action="confirm:no"
-              context="Confirmation"
-              fallback="Esc"
-              description="cancel"
-            />
+            <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="cancel" />
           </Byline>
         </Text>
       </Box>
-    )
+    );
   }
 
   return (
@@ -100,22 +87,16 @@ export function SessionPreview({
         paddingLeft={2}
       >
         <Text>
-          {formatRelativeTimeAgo(displayLog.modified)} ·{' '}
-          {displayLog.messageCount} messages
+          {formatRelativeTimeAgo(displayLog.modified)} · {displayLog.messageCount} messages
           {displayLog.gitBranch ? ` · ${displayLog.gitBranch}` : ''}
         </Text>
         <Text dimColor>
           <Byline>
             <KeyboardShortcutHint shortcut="Enter" action="resume" />
-            <ConfigurableShortcutHint
-              action="confirm:no"
-              context="Confirmation"
-              fallback="Esc"
-              description="cancel"
-            />
+            <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="cancel" />
           </Byline>
         </Text>
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/components/Settings/Config.tsx b/src/components/Settings/Config.tsx
index 4499fa056..f5aa8a588 100644
--- a/src/components/Settings/Config.tsx
+++ b/src/components/Settings/Config.tsx
@@ -1,27 +1,19 @@
 // biome-ignore-all assist/source/organizeImports: ANT-ONLY import markers must not be reordered
-import { feature } from 'bun:bundle'
-import { type KeyboardEvent, Box, Text, useTheme, useThemeSetting, useTerminalFocus } from '@anthropic/ink'
-import * as React from 'react'
-import { useState, useCallback } from 'react'
-import {
-  useKeybinding,
-  useKeybindings,
-} from '../../keybindings/useKeybinding.js'
-import figures from 'figures'
-import {
-  type GlobalConfig,
-  saveGlobalConfig,
-  getCurrentProjectConfig,
-  type OutputStyle,
-} from '../../utils/config.js'
-import { normalizeApiKeyForConfig } from '../../utils/authPortable.js'
+import { feature } from 'bun:bundle';
+import { type KeyboardEvent, Box, Text, useTheme, useThemeSetting, useTerminalFocus } from '@anthropic/ink';
+import * as React from 'react';
+import { useState, useCallback } from 'react';
+import { useKeybinding, useKeybindings } from '../../keybindings/useKeybinding.js';
+import figures from 'figures';
+import { type GlobalConfig, saveGlobalConfig, getCurrentProjectConfig, type OutputStyle } from '../../utils/config.js';
+import { normalizeApiKeyForConfig } from '../../utils/authPortable.js';
 import {
   getGlobalConfig,
   getAutoUpdaterDisabledReason,
   formatAutoUpdaterDisabledReason,
   getRemoteControlAtStartup,
-} from '../../utils/config.js'
-import chalk from 'chalk'
+} from '../../utils/config.js';
+import chalk from 'chalk';
 import {
   permissionModeTitle,
   permissionModeFromString,
@@ -31,74 +23,54 @@ import {
   PERMISSION_MODES,
   type ExternalPermissionMode,
   type PermissionMode,
-} from '../../utils/permissions/PermissionMode.js'
+} from '../../utils/permissions/PermissionMode.js';
 import {
   getAutoModeEnabledState,
   hasAutoModeOptInAnySource,
   transitionPlanAutoMode,
-} from '../../utils/permissions/permissionSetup.js'
-import { logError } from '../../utils/log.js'
+} from '../../utils/permissions/permissionSetup.js';
+import { logError } from '../../utils/log.js';
 import {
   logEvent,
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-} from 'src/services/analytics/index.js'
-import { isBridgeEnabled } from '../../bridge/bridgeEnabled.js'
-import { ThemePicker } from '../ThemePicker.js'
-import {
-  useAppState,
-  useSetAppState,
-  useAppStateStore,
-} from '../../state/AppState.js'
-import { ModelPicker } from '../ModelPicker.js'
-import {
-  modelDisplayString,
-  isOpus1mMergeEnabled,
-} from '../../utils/model/model.js'
-import { isBilledAsExtraUsage } from '../../utils/extraUsage.js'
-import { ClaudeMdExternalIncludesDialog } from '../ClaudeMdExternalIncludesDialog.js'
-import {
-  ChannelDowngradeDialog,
-  type ChannelDowngradeChoice,
-} from '../ChannelDowngradeDialog.js'
-import { Dialog } from '@anthropic/ink'
-import { Select } from '../CustomSelect/index.js'
-import { OutputStylePicker } from '../OutputStylePicker.js'
-import { LanguagePicker } from '../LanguagePicker.js'
+} from 'src/services/analytics/index.js';
+import { isBridgeEnabled } from '../../bridge/bridgeEnabled.js';
+import { ThemePicker } from '../ThemePicker.js';
+import { useAppState, useSetAppState, useAppStateStore } from '../../state/AppState.js';
+import { ModelPicker } from '../ModelPicker.js';
+import { modelDisplayString, isOpus1mMergeEnabled } from '../../utils/model/model.js';
+import { isBilledAsExtraUsage } from '../../utils/extraUsage.js';
+import { ClaudeMdExternalIncludesDialog } from '../ClaudeMdExternalIncludesDialog.js';
+import { ChannelDowngradeDialog, type ChannelDowngradeChoice } from '../ChannelDowngradeDialog.js';
+import { Dialog } from '@anthropic/ink';
+import { Select } from '../CustomSelect/index.js';
+import { OutputStylePicker } from '../OutputStylePicker.js';
+import { LanguagePicker } from '../LanguagePicker.js';
 import {
   type MemoryFileInfo,
   getExternalClaudeMdIncludes,
   getMemoryFiles,
   hasExternalClaudeMdIncludes,
-} from 'src/utils/claudemd.js'
-import { Byline, KeyboardShortcutHint, useTabHeaderFocus } from '@anthropic/ink'
-import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js'
-import { useIsInsideModal } from '../../context/modalContext.js'
-import { SearchBox } from '../SearchBox.js'
-import {
-  isSupportedTerminal,
-  hasAccessToIDEExtensionDiffFeature,
-} from '../../utils/ide.js'
-import {
-  getInitialSettings,
-  getSettingsForSource,
-  updateSettingsForSource,
-} from '../../utils/settings/settings.js'
-import { getUserMsgOptIn, setUserMsgOptIn } from '../../bootstrap/state.js'
-import { DEFAULT_OUTPUT_STYLE_NAME } from 'src/constants/outputStyles.js'
-import { isEnvTruthy, isRunningOnHomespace } from 'src/utils/envUtils.js'
-import type {
-  LocalJSXCommandContext,
-  CommandResultDisplay,
-} from '../../commands.js'
-import { getFeatureValue_CACHED_MAY_BE_STALE } from '../../services/analytics/growthbook.js'
-import { isAgentSwarmsEnabled } from '../../utils/agentSwarmsEnabled.js'
+} from 'src/utils/claudemd.js';
+import { Byline, KeyboardShortcutHint, useTabHeaderFocus } from '@anthropic/ink';
+import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js';
+import { useIsInsideModal } from '../../context/modalContext.js';
+import { SearchBox } from '../SearchBox.js';
+import { isSupportedTerminal, hasAccessToIDEExtensionDiffFeature } from '../../utils/ide.js';
+import { getInitialSettings, getSettingsForSource, updateSettingsForSource } from '../../utils/settings/settings.js';
+import { getUserMsgOptIn, setUserMsgOptIn } from '../../bootstrap/state.js';
+import { DEFAULT_OUTPUT_STYLE_NAME } from 'src/constants/outputStyles.js';
+import { isEnvTruthy, isRunningOnHomespace } from 'src/utils/envUtils.js';
+import type { LocalJSXCommandContext, CommandResultDisplay } from '../../commands.js';
+import { getFeatureValue_CACHED_MAY_BE_STALE } from '../../services/analytics/growthbook.js';
+import { isAgentSwarmsEnabled } from '../../utils/agentSwarmsEnabled.js';
 import {
   getCliTeammateModeOverride,
   clearCliTeammateModeOverride,
-} from '../../utils/swarm/backends/teammateModeSnapshot.js'
-import { getHardcodedTeammateModelFallback } from '../../utils/swarm/teammateModel.js'
-import { useSearchInput } from '../../hooks/useSearchInput.js'
-import { useTerminalSize } from '../../hooks/useTerminalSize.js'
+} from '../../utils/swarm/backends/teammateModeSnapshot.js';
+import { getHardcodedTeammateModelFallback } from '../../utils/swarm/teammateModel.js';
+import { useSearchInput } from '../../hooks/useSearchInput.js';
+import { useTerminalSize } from '../../hooks/useTerminalSize.js';
 import {
   clearFastModeCooldown,
   FAST_MODE_MODEL_DISPLAY,
@@ -106,50 +78,47 @@ import {
   isFastModeEnabled,
   getFastModeModel,
   isFastModeSupportedByModel,
-} from '../../utils/fastMode.js'
-import { isFullscreenEnvEnabled } from '../../utils/fullscreen.js'
+} from '../../utils/fastMode.js';
+import { isFullscreenEnvEnabled } from '../../utils/fullscreen.js';
 
 type Props = {
-  onClose: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-  context: LocalJSXCommandContext
-  setTabsHidden: (hidden: boolean) => void
-  onIsSearchModeChange?: (inSearchMode: boolean) => void
-  contentHeight?: number
-}
+  onClose: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+  context: LocalJSXCommandContext;
+  setTabsHidden: (hidden: boolean) => void;
+  onIsSearchModeChange?: (inSearchMode: boolean) => void;
+  contentHeight?: number;
+};
 
 type SettingBase =
   | {
-      id: string
-      label: string
+      id: string;
+      label: string;
     }
   | {
-      id: string
-      label: React.ReactNode
-      searchText: string
-    }
+      id: string;
+      label: React.ReactNode;
+      searchText: string;
+    };
 
 type Setting =
   | (SettingBase & {
-      value: boolean
-      onChange(value: boolean): void
-      type: 'boolean'
+      value: boolean;
+      onChange(value: boolean): void;
+      type: 'boolean';
     })
   | (SettingBase & {
-      value: string
-      options: string[]
-      onChange(value: string): void
-      type: 'enum'
+      value: string;
+      options: string[];
+      onChange(value: string): void;
+      type: 'enum';
     })
   | (SettingBase & {
       // For enums that are set by a custom component, we don't need to pass options,
       // but we still need a value to display in the top-level config menu
-      value: string
-      onChange(value: string): void
-      type: 'managedEnum'
-    })
+      value: string;
+      onChange(value: string): void;
+      type: 'managedEnum';
+    });
 
 type SubMenu =
   | 'Theme'
@@ -159,7 +128,7 @@ type SubMenu =
   | 'OutputStyle'
   | 'ChannelDowngrade'
   | 'Language'
-  | 'EnableAutoUpdates'
+  | 'EnableAutoUpdates';
 export function Config({
   onClose,
   context,
@@ -167,46 +136,42 @@ export function Config({
   onIsSearchModeChange,
   contentHeight,
 }: Props): React.ReactNode {
-  const { headerFocused, focusHeader } = useTabHeaderFocus()
-  const insideModal = useIsInsideModal()
-  const [, setTheme] = useTheme()
-  const themeSetting = useThemeSetting()
-  const [globalConfig, setGlobalConfig] = useState(getGlobalConfig())
-  const initialConfig = React.useRef(getGlobalConfig())
-  const [settingsData, setSettingsData] = useState(getInitialSettings())
-  const initialSettingsData = React.useRef(getInitialSettings())
+  const { headerFocused, focusHeader } = useTabHeaderFocus();
+  const insideModal = useIsInsideModal();
+  const [, setTheme] = useTheme();
+  const themeSetting = useThemeSetting();
+  const [globalConfig, setGlobalConfig] = useState(getGlobalConfig());
+  const initialConfig = React.useRef(getGlobalConfig());
+  const [settingsData, setSettingsData] = useState(getInitialSettings());
+  const initialSettingsData = React.useRef(getInitialSettings());
   const [currentOutputStyle, setCurrentOutputStyle] = useState<OutputStyle>(
     settingsData?.outputStyle || DEFAULT_OUTPUT_STYLE_NAME,
-  )
-  const initialOutputStyle = React.useRef(currentOutputStyle)
-  const [currentLanguage, setCurrentLanguage] = useState<string | undefined>(
-    settingsData?.language,
-  )
-  const initialLanguage = React.useRef(currentLanguage)
-  const [selectedIndex, setSelectedIndex] = useState(0)
-  const [scrollOffset, setScrollOffset] = useState(0)
-  const [isSearchMode, setIsSearchMode] = useState(true)
-  const isTerminalFocused = useTerminalFocus()
-  const { rows } = useTerminalSize()
+  );
+  const initialOutputStyle = React.useRef(currentOutputStyle);
+  const [currentLanguage, setCurrentLanguage] = useState<string | undefined>(settingsData?.language);
+  const initialLanguage = React.useRef(currentLanguage);
+  const [selectedIndex, setSelectedIndex] = useState(0);
+  const [scrollOffset, setScrollOffset] = useState(0);
+  const [isSearchMode, setIsSearchMode] = useState(true);
+  const isTerminalFocused = useTerminalFocus();
+  const { rows } = useTerminalSize();
   // contentHeight is set by Settings.tsx (same value passed to Tabs to fix
   // pane height across all tabs — prevents layout jank when switching).
   // Reserve ~10 rows for chrome (search box, gaps, footer, scroll hints).
   // Fallback calc for standalone rendering (tests).
-  const paneCap = contentHeight ?? Math.min(Math.floor(rows * 0.8), 30)
-  const maxVisible = Math.max(5, paneCap - 10)
-  const mainLoopModel = useAppState(s => s.mainLoopModel)
-  const verbose = useAppState(s => s.verbose)
-  const thinkingEnabled = useAppState(s => s.thinkingEnabled)
-  const isFastMode = useAppState(s =>
-    isFastModeEnabled() ? s.fastMode : false,
-  )
-  const promptSuggestionEnabled = useAppState(s => s.promptSuggestionEnabled)
+  const paneCap = contentHeight ?? Math.min(Math.floor(rows * 0.8), 30);
+  const maxVisible = Math.max(5, paneCap - 10);
+  const mainLoopModel = useAppState(s => s.mainLoopModel);
+  const verbose = useAppState(s => s.verbose);
+  const thinkingEnabled = useAppState(s => s.thinkingEnabled);
+  const isFastMode = useAppState(s => (isFastModeEnabled() ? s.fastMode : false));
+  const promptSuggestionEnabled = useAppState(s => s.promptSuggestionEnabled);
   // Show auto in the default-mode dropdown when the user has opted in OR the
   // config is fully 'enabled' — even if currently circuit-broken ('disabled'),
   // an opted-in user should still see it in settings (it's a temporary state).
   const showAutoInDefaultModePicker = feature('TRANSCRIPT_CLASSIFIER')
     ? hasAutoModeOptInAnySource() || getAutoModeEnabledState() === 'enabled'
-    : false
+    : false;
   // Chat/Transcript view picker is visible to entitled users (pass the GB
   // gate) even if they haven't opted in this session — it IS the persistent
   // opt-in. 'chat' written here is read at next startup by main.tsx which
@@ -217,28 +182,24 @@ export function Config({
       ? (
           require('@claude-code-best/builtin-tools/tools/BriefTool/BriefTool.js') as typeof import('@claude-code-best/builtin-tools/tools/BriefTool/BriefTool.js')
         ).isBriefEntitled()
-      : false
+      : false;
   /* eslint-enable @typescript-eslint/no-require-imports */
-  const setAppState = useSetAppState()
-  const [changes, setChanges] = useState<{ [key: string]: unknown }>({})
-  const initialThinkingEnabled = React.useRef(thinkingEnabled)
+  const setAppState = useSetAppState();
+  const [changes, setChanges] = useState<{ [key: string]: unknown }>({});
+  const initialThinkingEnabled = React.useRef(thinkingEnabled);
   // Per-source settings snapshots for revert-on-escape. getInitialSettings()
   // returns merged-across-sources which can't tell us what to delete vs
   // restore; per-source snapshots + updateSettingsForSource's
   // undefined-deletes-key semantics can. Lazy-init via useState (no setter) to
   // avoid reading settings files on every render — useRef evaluates its arg
   // eagerly even though only the first result is kept.
-  const [initialLocalSettings] = useState(() =>
-    getSettingsForSource('localSettings'),
-  )
-  const [initialUserSettings] = useState(() =>
-    getSettingsForSource('userSettings'),
-  )
-  const initialThemeSetting = React.useRef(themeSetting)
+  const [initialLocalSettings] = useState(() => getSettingsForSource('localSettings'));
+  const [initialUserSettings] = useState(() => getSettingsForSource('userSettings'));
+  const initialThemeSetting = React.useRef(themeSetting);
   // AppState fields Config may modify — snapshot once at mount.
-  const store = useAppStateStore()
+  const store = useAppStateStore();
   const [initialAppState] = useState(() => {
-    const s = store.getState()
+    const s = store.getState();
     return {
       mainLoopModel: s.mainLoopModel,
       mainLoopModelForSession: s.mainLoopModelForSession,
@@ -250,19 +211,19 @@ export function Config({
       replBridgeEnabled: s.replBridgeEnabled,
       replBridgeOutboundOnly: s.replBridgeOutboundOnly,
       settings: s.settings,
-    }
-  })
+    };
+  });
   // Bootstrap state snapshot — userMsgOptIn is outside AppState, so
   // revertChanges needs to restore it separately. Without this, cycling
   // defaultView to 'chat' then Escape leaves the tool active while the
   // display filter reverts — the exact ambient-activation behavior this
   // PR's entitlement/opt-in split is meant to prevent.
-  const [initialUserMsgOptIn] = useState(() => getUserMsgOptIn())
+  const [initialUserMsgOptIn] = useState(() => getUserMsgOptIn());
   // Set on first user-visible change; gates revertChanges() on Escape so
   // opening-then-closing doesn't trigger redundant disk writes.
-  const isDirty = React.useRef(false)
-  const [showThinkingWarning, setShowThinkingWarning] = useState(false)
-  const [showSubmenu, setShowSubmenu] = useState<SubMenu | null>(null)
+  const isDirty = React.useRef(false);
+  const [showThinkingWarning, setShowThinkingWarning] = useState(false);
+  const [showSubmenu, setShowSubmenu] = useState<SubMenu | null>(null);
   const {
     query: searchQuery,
     setQuery: setSearchQuery,
@@ -274,74 +235,65 @@ export function Config({
     // Ctrl+C/D must reach Settings' useExitOnCtrlCD; 'd' also avoids
     // double-action (delete-char + exit-pending).
     passthroughCtrlKeys: ['c', 'd'],
-  })
+  });
 
   // Tell the parent when Config's own Esc handler is active so Settings cedes
   // confirm:no. Only true when search mode owns the keyboard — not when the
   // tab header is focused (then Settings must handle Esc-to-close).
-  const ownsEsc = isSearchMode && !headerFocused
+  const ownsEsc = isSearchMode && !headerFocused;
   React.useEffect(() => {
-    onIsSearchModeChange?.(ownsEsc)
-  }, [ownsEsc, onIsSearchModeChange])
+    onIsSearchModeChange?.(ownsEsc);
+  }, [ownsEsc, onIsSearchModeChange]);
 
-  const isConnectedToIde = hasAccessToIDEExtensionDiffFeature(
-    context.options.mcpClients,
-  )
+  const isConnectedToIde = hasAccessToIDEExtensionDiffFeature(context.options.mcpClients);
 
-  const isFileCheckpointingAvailable = !isEnvTruthy(
-    process.env.CLAUDE_CODE_DISABLE_FILE_CHECKPOINTING,
-  )
+  const isFileCheckpointingAvailable = !isEnvTruthy(process.env.CLAUDE_CODE_DISABLE_FILE_CHECKPOINTING);
 
-  const memoryFiles = React.use(getMemoryFiles(true)) as MemoryFileInfo[]
-  const shouldShowExternalIncludesToggle =
-    hasExternalClaudeMdIncludes(memoryFiles)
+  const memoryFiles = React.use(getMemoryFiles(true)) as MemoryFileInfo[];
+  const shouldShowExternalIncludesToggle = hasExternalClaudeMdIncludes(memoryFiles);
 
-  const autoUpdaterDisabledReason = getAutoUpdaterDisabledReason()
+  const autoUpdaterDisabledReason = getAutoUpdaterDisabledReason();
 
   function onChangeMainModelConfig(value: string | null): void {
-    const previousModel = mainLoopModel
+    const previousModel = mainLoopModel;
     logEvent('tengu_config_model_changed', {
-      from_model:
-        previousModel as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      to_model:
-        value as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-    })
+      from_model: previousModel as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      to_model: value as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+    });
     setAppState(prev => ({
       ...prev,
       mainLoopModel: value,
       mainLoopModelForSession: null,
-    }))
+    }));
     setChanges(prev => {
       const valStr =
         modelDisplayString(value) +
-        (isBilledAsExtraUsage(value, false, isOpus1mMergeEnabled())
-          ? ' · Billed as extra usage'
-          : '')
+        (isBilledAsExtraUsage(value, false, isOpus1mMergeEnabled()) ? ' · Billed as extra usage' : '');
       if ('model' in prev) {
-        const { model, ...rest } = prev
-        return { ...rest, model: valStr }
+        const { model, ...rest } = prev;
+        return { ...rest, model: valStr };
       }
-      return { ...prev, model: valStr }
-    })
+      return { ...prev, model: valStr };
+    });
   }
 
   function onChangeVerbose(value: boolean): void {
     // Update the global config to persist the setting
-    saveGlobalConfig(current => ({ ...current, verbose: value }))
-    setGlobalConfig({ ...getGlobalConfig(), verbose: value })
+    saveGlobalConfig(current => ({ ...current, verbose: value }));
+    setGlobalConfig({ ...getGlobalConfig(), verbose: value });
 
     // Update the app state for immediate UI feedback
     setAppState(prev => ({
       ...prev,
       verbose: value,
-    }))
+    }));
     setChanges(prev => {
       if ('verbose' in prev) {
-        const { verbose, ...rest } = prev
-        return rest
+        const { verbose, ...rest } = prev;
+        return rest;
       }
-      return { ...prev, verbose: value }
-    })
+      return { ...prev, verbose: value };
+    });
   }
 
   // TODO: Add MCP servers
@@ -353,11 +305,11 @@ export function Config({
       value: globalConfig.autoCompactEnabled,
       type: 'boolean' as const,
       onChange(autoCompactEnabled: boolean) {
-        saveGlobalConfig(current => ({ ...current, autoCompactEnabled }))
-        setGlobalConfig({ ...getGlobalConfig(), autoCompactEnabled })
+        saveGlobalConfig(current => ({ ...current, autoCompactEnabled }));
+        setGlobalConfig({ ...getGlobalConfig(), autoCompactEnabled });
         logEvent('tengu_auto_compact_setting_changed', {
           enabled: autoCompactEnabled,
-        })
+        });
       },
     },
     {
@@ -368,15 +320,15 @@ export function Config({
       onChange(spinnerTipsEnabled: boolean) {
         updateSettingsForSource('localSettings', {
           spinnerTipsEnabled,
-        })
+        });
         // Update local state to reflect the change immediately
         setSettingsData(prev => ({
           ...prev,
           spinnerTipsEnabled,
-        }))
+        }));
         logEvent('tengu_tips_setting_changed', {
           enabled: spinnerTipsEnabled,
-        })
+        });
       },
     },
     {
@@ -387,19 +339,19 @@ export function Config({
       onChange(prefersReducedMotion: boolean) {
         updateSettingsForSource('localSettings', {
           prefersReducedMotion,
-        })
+        });
         setSettingsData(prev => ({
           ...prev,
           prefersReducedMotion,
-        }))
+        }));
         // Sync to AppState so components react immediately
         setAppState(prev => ({
           ...prev,
           settings: { ...prev.settings, prefersReducedMotion },
-        }))
+        }));
         logEvent('tengu_reduce_motion_setting_changed', {
           enabled: prefersReducedMotion,
-        })
+        });
       },
     },
     {
@@ -408,11 +360,11 @@ export function Config({
       value: thinkingEnabled ?? true,
       type: 'boolean' as const,
       onChange(enabled: boolean) {
-        setAppState(prev => ({ ...prev, thinkingEnabled: enabled }))
+        setAppState(prev => ({ ...prev, thinkingEnabled: enabled }));
         updateSettingsForSource('userSettings', {
           alwaysThinkingEnabled: enabled ? undefined : false,
-        })
-        logEvent('tengu_thinking_toggled', { enabled })
+        });
+        logEvent('tengu_thinking_toggled', { enabled });
       },
     },
     // Fast mode toggle (ant-only, eliminated from external builds)
@@ -424,28 +376,28 @@ export function Config({
             value: !!isFastMode,
             type: 'boolean' as const,
             onChange(enabled: boolean) {
-              clearFastModeCooldown()
+              clearFastModeCooldown();
               updateSettingsForSource('userSettings', {
                 fastMode: enabled ? true : undefined,
-              })
+              });
               if (enabled) {
                 setAppState(prev => ({
                   ...prev,
                   mainLoopModel: getFastModeModel(),
                   mainLoopModelForSession: null,
                   fastMode: true,
-                }))
+                }));
                 setChanges(prev => ({
                   ...prev,
                   model: getFastModeModel(),
                   'Fast mode': 'ON',
-                }))
+                }));
               } else {
                 setAppState(prev => ({
                   ...prev,
                   fastMode: false,
-                }))
-                setChanges(prev => ({ ...prev, 'Fast mode': 'OFF' }))
+                }));
+                setChanges(prev => ({ ...prev, 'Fast mode': 'OFF' }));
               }
             },
           },
@@ -462,10 +414,10 @@ export function Config({
               setAppState(prev => ({
                 ...prev,
                 promptSuggestionEnabled: enabled,
-              }))
+              }));
               updateSettingsForSource('userSettings', {
                 promptSuggestionEnabled: enabled ? undefined : false,
-              })
+              });
             },
           },
         ]
@@ -476,17 +428,19 @@ export function Config({
             id: 'poorMode',
             label: 'Poor mode (save tokens)',
             value: (() => {
-              const PoorMode = require('../../commands/poor/poorMode.js') as typeof import('../../commands/poor/poorMode.js')
-              return PoorMode.isPoorModeActive()
+              const PoorMode =
+                require('../../commands/poor/poorMode.js') as typeof import('../../commands/poor/poorMode.js');
+              return PoorMode.isPoorModeActive();
             })(),
             type: 'boolean' as const,
             onChange(enabled: boolean) {
-              const PoorMode = require('../../commands/poor/poorMode.js') as typeof import('../../commands/poor/poorMode.js')
-              PoorMode.setPoorMode(enabled)
+              const PoorMode =
+                require('../../commands/poor/poorMode.js') as typeof import('../../commands/poor/poorMode.js');
+              PoorMode.setPoorMode(enabled);
               setAppState(prev => ({
                 ...prev,
                 promptSuggestionEnabled: !enabled,
-              }))
+              }));
             },
           },
         ]
@@ -501,19 +455,19 @@ export function Config({
             type: 'boolean' as const,
             onChange(enabled: boolean) {
               saveGlobalConfig(current => {
-                if (current.speculationEnabled === enabled) return current
+                if (current.speculationEnabled === enabled) return current;
                 return {
                   ...current,
                   speculationEnabled: enabled,
-                }
-              })
+                };
+              });
               setGlobalConfig({
                 ...getGlobalConfig(),
                 speculationEnabled: enabled,
-              })
+              });
               logEvent('tengu_speculation_setting_changed', {
                 enabled,
-              })
+              });
             },
           },
         ]
@@ -529,14 +483,14 @@ export function Config({
               saveGlobalConfig(current => ({
                 ...current,
                 fileCheckpointingEnabled: enabled,
-              }))
+              }));
               setGlobalConfig({
                 ...getGlobalConfig(),
                 fileCheckpointingEnabled: enabled,
-              })
+              });
               logEvent('tengu_file_history_snapshots_setting_changed', {
                 enabled: enabled,
-              })
+              });
             },
           },
         ]
@@ -557,11 +511,11 @@ export function Config({
         saveGlobalConfig(current => ({
           ...current,
           terminalProgressBarEnabled,
-        }))
-        setGlobalConfig({ ...getGlobalConfig(), terminalProgressBarEnabled })
+        }));
+        setGlobalConfig({ ...getGlobalConfig(), terminalProgressBarEnabled });
         logEvent('tengu_terminal_progress_bar_setting_changed', {
           enabled: terminalProgressBarEnabled,
-        })
+        });
       },
     },
     ...(getFeatureValue_CACHED_MAY_BE_STALE('tengu_terminal_sidebar', false)
@@ -575,14 +529,14 @@ export function Config({
               saveGlobalConfig(current => ({
                 ...current,
                 showStatusInTerminalTab,
-              }))
+              }));
               setGlobalConfig({
                 ...getGlobalConfig(),
                 showStatusInTerminalTab,
-              })
+              });
               logEvent('tengu_terminal_tab_status_setting_changed', {
                 enabled: showStatusInTerminalTab,
-              })
+              });
             },
           },
         ]
@@ -593,11 +547,11 @@ export function Config({
       value: globalConfig.showTurnDuration,
       type: 'boolean' as const,
       onChange(showTurnDuration: boolean) {
-        saveGlobalConfig(current => ({ ...current, showTurnDuration }))
-        setGlobalConfig({ ...getGlobalConfig(), showTurnDuration })
+        saveGlobalConfig(current => ({ ...current, showTurnDuration }));
+        setGlobalConfig({ ...getGlobalConfig(), showTurnDuration });
         logEvent('tengu_show_turn_duration_setting_changed', {
           enabled: showTurnDuration,
-        })
+        });
       },
     },
     {
@@ -605,40 +559,31 @@ export function Config({
       label: 'Default permission mode',
       value: settingsData?.permissions?.defaultMode || 'default',
       options: (() => {
-        const priorityOrder: PermissionMode[] = ['default', 'plan']
-        const allModes: readonly PermissionMode[] = feature(
-          'TRANSCRIPT_CLASSIFIER',
-        )
+        const priorityOrder: PermissionMode[] = ['default', 'plan'];
+        const allModes: readonly PermissionMode[] = feature('TRANSCRIPT_CLASSIFIER')
           ? PERMISSION_MODES
-          : EXTERNAL_PERMISSION_MODES
-        const excluded: PermissionMode[] = ['bypassPermissions']
+          : EXTERNAL_PERMISSION_MODES;
+        const excluded: PermissionMode[] = ['bypassPermissions'];
         if (feature('TRANSCRIPT_CLASSIFIER') && !showAutoInDefaultModePicker) {
-          excluded.push('auto')
+          excluded.push('auto');
         }
-        return [
-          ...priorityOrder,
-          ...allModes.filter(
-            m => !priorityOrder.includes(m) && !excluded.includes(m),
-          ),
-        ]
+        return [...priorityOrder, ...allModes.filter(m => !priorityOrder.includes(m) && !excluded.includes(m))];
       })(),
       type: 'enum' as const,
       onChange(mode: string) {
-        const parsedMode = permissionModeFromString(mode)
+        const parsedMode = permissionModeFromString(mode);
         // Internal modes (e.g. auto) are stored directly
-        const validatedMode = isExternalPermissionMode(parsedMode)
-          ? toExternalPermissionMode(parsedMode)
-          : parsedMode
+        const validatedMode = isExternalPermissionMode(parsedMode) ? toExternalPermissionMode(parsedMode) : parsedMode;
         const result = updateSettingsForSource('userSettings', {
           permissions: {
             ...settingsData?.permissions,
             defaultMode: validatedMode as ExternalPermissionMode,
           },
-        })
+        });
 
         if (result.error) {
-          logError(result.error)
-          return
+          logError(result.error);
+          return;
         }
 
         // Update local state to reflect the change immediately.
@@ -651,15 +596,13 @@ export function Config({
             ...prev?.permissions,
             defaultMode: validatedMode as (typeof PERMISSION_MODES)[number],
           },
-        }))
+        }));
         // Track changes
-        setChanges(prev => ({ ...prev, defaultPermissionMode: mode }))
+        setChanges(prev => ({ ...prev, defaultPermissionMode: mode }));
         logEvent('tengu_config_changed', {
-          setting:
-            'defaultPermissionMode' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-          value:
-            mode as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        })
+          setting: 'defaultPermissionMode' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          value: mode as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        });
       },
     },
     ...(feature('TRANSCRIPT_CLASSIFIER') && showAutoInDefaultModePicker
@@ -667,30 +610,28 @@ export function Config({
           {
             id: 'useAutoModeDuringPlan',
             label: 'Use auto mode during plan',
-            value:
-              (settingsData as { useAutoModeDuringPlan?: boolean } | undefined)
-                ?.useAutoModeDuringPlan ?? true,
+            value: (settingsData as { useAutoModeDuringPlan?: boolean } | undefined)?.useAutoModeDuringPlan ?? true,
             type: 'boolean' as const,
             onChange(useAutoModeDuringPlan: boolean) {
               updateSettingsForSource('userSettings', {
                 useAutoModeDuringPlan,
-              })
+              });
               setSettingsData(prev => ({
                 ...prev,
                 useAutoModeDuringPlan,
-              }))
+              }));
               // Internal writes suppress the file watcher, so
               // applySettingsChange won't fire. Reconcile directly so
               // mid-plan toggles take effect immediately.
               setAppState(prev => {
-                const next = transitionPlanAutoMode(prev.toolPermissionContext)
-                if (next === prev.toolPermissionContext) return prev
-                return { ...prev, toolPermissionContext: next }
-              })
+                const next = transitionPlanAutoMode(prev.toolPermissionContext);
+                if (next === prev.toolPermissionContext) return prev;
+                return { ...prev, toolPermissionContext: next };
+              });
               setChanges(prev => ({
                 ...prev,
                 'Use auto mode during plan': useAutoModeDuringPlan,
-              }))
+              }));
             },
           },
         ]
@@ -701,11 +642,11 @@ export function Config({
       value: globalConfig.respectGitignore,
       type: 'boolean' as const,
       onChange(respectGitignore: boolean) {
-        saveGlobalConfig(current => ({ ...current, respectGitignore }))
-        setGlobalConfig({ ...getGlobalConfig(), respectGitignore })
+        saveGlobalConfig(current => ({ ...current, respectGitignore }));
+        setGlobalConfig({ ...getGlobalConfig(), respectGitignore });
         logEvent('tengu_respect_gitignore_setting_changed', {
           enabled: respectGitignore,
-        })
+        });
       },
     },
     {
@@ -714,15 +655,12 @@ export function Config({
       value: globalConfig.copyFullResponse,
       type: 'boolean' as const,
       onChange(copyFullResponse: boolean) {
-        saveGlobalConfig(current => ({ ...current, copyFullResponse }))
-        setGlobalConfig({ ...getGlobalConfig(), copyFullResponse })
+        saveGlobalConfig(current => ({ ...current, copyFullResponse }));
+        setGlobalConfig({ ...getGlobalConfig(), copyFullResponse });
         logEvent('tengu_config_changed', {
-          setting:
-            'copyFullResponse' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-          value: String(
-            copyFullResponse,
-          ) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        })
+          setting: 'copyFullResponse' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          value: String(copyFullResponse) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        });
       },
     },
     // Copy-on-select is only meaningful with in-app selection (fullscreen
@@ -735,15 +673,12 @@ export function Config({
             value: globalConfig.copyOnSelect ?? true,
             type: 'boolean' as const,
             onChange(copyOnSelect: boolean) {
-              saveGlobalConfig(current => ({ ...current, copyOnSelect }))
-              setGlobalConfig({ ...getGlobalConfig(), copyOnSelect })
+              saveGlobalConfig(current => ({ ...current, copyOnSelect }));
+              setGlobalConfig({ ...getGlobalConfig(), copyOnSelect });
               logEvent('tengu_config_changed', {
-                setting:
-                  'copyOnSelect' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-                value: String(
-                  copyOnSelect,
-                ) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-              })
+                setting: 'copyOnSelect' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+                value: String(copyOnSelect) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+              });
             },
           },
         ]
@@ -775,30 +710,19 @@ export function Config({
     },
     {
       id: 'notifChannel',
-      label:
-        feature('KAIROS') || feature('KAIROS_PUSH_NOTIFICATION')
-          ? 'Local notifications'
-          : 'Notifications',
+      label: feature('KAIROS') || feature('KAIROS_PUSH_NOTIFICATION') ? 'Local notifications' : 'Notifications',
       value: globalConfig.preferredNotifChannel,
-      options: [
-        'auto',
-        'iterm2',
-        'terminal_bell',
-        'iterm2_with_bell',
-        'kitty',
-        'ghostty',
-        'notifications_disabled',
-      ],
+      options: ['auto', 'iterm2', 'terminal_bell', 'iterm2_with_bell', 'kitty', 'ghostty', 'notifications_disabled'],
       type: 'enum',
       onChange(notifChannel: GlobalConfig['preferredNotifChannel']) {
         saveGlobalConfig(current => ({
           ...current,
           preferredNotifChannel: notifChannel,
-        }))
+        }));
         setGlobalConfig({
           ...getGlobalConfig(),
           preferredNotifChannel: notifChannel,
-        })
+        });
       },
     },
     ...(feature('KAIROS') || feature('KAIROS_PUSH_NOTIFICATION')
@@ -812,11 +736,11 @@ export function Config({
               saveGlobalConfig(current => ({
                 ...current,
                 taskCompleteNotifEnabled,
-              }))
+              }));
               setGlobalConfig({
                 ...getGlobalConfig(),
                 taskCompleteNotifEnabled,
-              })
+              });
             },
           },
           {
@@ -828,11 +752,11 @@ export function Config({
               saveGlobalConfig(current => ({
                 ...current,
                 inputNeededNotifEnabled,
-              }))
+              }));
               setGlobalConfig({
                 ...getGlobalConfig(),
                 inputNeededNotifEnabled,
-              })
+              });
             },
           },
           {
@@ -844,11 +768,11 @@ export function Config({
               saveGlobalConfig(current => ({
                 ...current,
                 agentPushNotifEnabled,
-              }))
+              }));
               setGlobalConfig({
                 ...getGlobalConfig(),
                 agentPushNotifEnabled,
-              })
+              });
             },
           },
         ]
@@ -868,34 +792,27 @@ export function Config({
             // 'default' means the setting is unset — currently resolves to
             // transcript (main.tsx falls through when defaultView !== 'chat').
             // String() narrows the conditional-schema-spread union to string.
-            value:
-              settingsData?.defaultView === undefined
-                ? 'default'
-                : String(settingsData.defaultView),
+            value: settingsData?.defaultView === undefined ? 'default' : String(settingsData.defaultView),
             options: ['transcript', 'chat', 'default'],
             type: 'enum' as const,
             onChange(selected: string) {
-              const defaultView =
-                selected === 'default'
-                  ? undefined
-                  : (selected as 'chat' | 'transcript')
-              updateSettingsForSource('localSettings', { defaultView })
-              setSettingsData(prev => ({ ...prev, defaultView }))
-              const nextBrief = defaultView === 'chat'
+              const defaultView = selected === 'default' ? undefined : (selected as 'chat' | 'transcript');
+              updateSettingsForSource('localSettings', { defaultView });
+              setSettingsData(prev => ({ ...prev, defaultView }));
+              const nextBrief = defaultView === 'chat';
               setAppState(prev => {
-                if (prev.isBriefOnly === nextBrief) return prev
-                return { ...prev, isBriefOnly: nextBrief }
-              })
+                if (prev.isBriefOnly === nextBrief) return prev;
+                return { ...prev, isBriefOnly: nextBrief };
+              });
               // Keep userMsgOptIn in sync so the tool list follows the view.
               // Two-way now (same as /brief) — accepting a cache invalidation
               // is better than leaving the tool on after switching away.
               // Reverted on Escape via initialUserMsgOptIn snapshot.
-              setUserMsgOptIn(nextBrief)
-              setChanges(prev => ({ ...prev, 'Default view': selected }))
+              setUserMsgOptIn(nextBrief);
+              setChanges(prev => ({ ...prev, 'Default view': selected }));
               logEvent('tengu_default_view_setting_changed', {
-                value: (defaultView ??
-                  'unset') as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-              })
+                value: (defaultView ?? 'unset') as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+              });
             },
           },
         ]
@@ -911,27 +828,23 @@ export function Config({
       id: 'editorMode',
       label: 'Editor mode',
       // Convert 'emacs' to 'normal' for backward compatibility
-      value:
-        globalConfig.editorMode === 'emacs'
-          ? 'normal'
-          : globalConfig.editorMode || 'normal',
+      value: globalConfig.editorMode === 'emacs' ? 'normal' : globalConfig.editorMode || 'normal',
       options: ['normal', 'vim'],
       type: 'enum',
       onChange(value: string) {
         saveGlobalConfig(current => ({
           ...current,
           editorMode: value as GlobalConfig['editorMode'],
-        }))
+        }));
         setGlobalConfig({
           ...getGlobalConfig(),
           editorMode: value as GlobalConfig['editorMode'],
-        })
+        });
 
         logEvent('tengu_editor_mode_changed', {
           mode: value as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-          source:
-            'config_panel' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        })
+          source: 'config_panel' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        });
       },
     },
     {
@@ -941,19 +854,19 @@ export function Config({
       type: 'boolean' as const,
       onChange(enabled: boolean) {
         saveGlobalConfig(current => {
-          if (current.prStatusFooterEnabled === enabled) return current
+          if (current.prStatusFooterEnabled === enabled) return current;
           return {
             ...current,
             prStatusFooterEnabled: enabled,
-          }
-        })
+          };
+        });
         setGlobalConfig({
           ...getGlobalConfig(),
           prStatusFooterEnabled: enabled,
-        })
+        });
         logEvent('tengu_pr_status_footer_setting_changed', {
           enabled,
-        })
+        });
       },
     },
     {
@@ -975,17 +888,16 @@ export function Config({
               saveGlobalConfig(current => ({
                 ...current,
                 diffTool: diffTool as GlobalConfig['diffTool'],
-              }))
+              }));
               setGlobalConfig({
                 ...getGlobalConfig(),
                 diffTool: diffTool as GlobalConfig['diffTool'],
-              })
+              });
 
               logEvent('tengu_diff_tool_changed', {
                 tool: diffTool as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-                source:
-                  'config_panel' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-              })
+                source: 'config_panel' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+              });
             },
           },
         ]
@@ -998,14 +910,13 @@ export function Config({
             value: globalConfig.autoConnectIde ?? false,
             type: 'boolean' as const,
             onChange(autoConnectIde: boolean) {
-              saveGlobalConfig(current => ({ ...current, autoConnectIde }))
-              setGlobalConfig({ ...getGlobalConfig(), autoConnectIde })
+              saveGlobalConfig(current => ({ ...current, autoConnectIde }));
+              setGlobalConfig({ ...getGlobalConfig(), autoConnectIde });
 
               logEvent('tengu_auto_connect_ide_changed', {
                 enabled: autoConnectIde,
-                source:
-                  'config_panel' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-              })
+                source: 'config_panel' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+              });
             },
           },
         ]
@@ -1021,14 +932,13 @@ export function Config({
               saveGlobalConfig(current => ({
                 ...current,
                 autoInstallIdeExtension,
-              }))
-              setGlobalConfig({ ...getGlobalConfig(), autoInstallIdeExtension })
+              }));
+              setGlobalConfig({ ...getGlobalConfig(), autoInstallIdeExtension });
 
               logEvent('tengu_auto_install_ide_extension_changed', {
                 enabled: autoInstallIdeExtension,
-                source:
-                  'config_panel' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-              })
+                source: 'config_panel' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+              });
             },
           },
         ]
@@ -1042,23 +952,21 @@ export function Config({
         saveGlobalConfig(current => ({
           ...current,
           claudeInChromeDefaultEnabled: enabled,
-        }))
+        }));
         setGlobalConfig({
           ...getGlobalConfig(),
           claudeInChromeDefaultEnabled: enabled,
-        })
+        });
         logEvent('tengu_claude_in_chrome_setting_changed', {
           enabled,
-        })
+        });
       },
     },
     // Teammate mode (only shown when agent swarms are enabled)
     ...(isAgentSwarmsEnabled()
       ? (() => {
-          const cliOverride = getCliTeammateModeOverride()
-          const label = cliOverride
-            ? `Teammate mode [overridden: ${cliOverride}]`
-            : 'Teammate mode'
+          const cliOverride = getCliTeammateModeOverride();
+          const label = cliOverride ? `Teammate mode [overridden: ${cliOverride}]` : 'Teammate mode';
           return [
             {
               id: 'teammateMode',
@@ -1067,38 +975,32 @@ export function Config({
               options: ['auto', 'tmux', 'in-process'],
               type: 'enum' as const,
               onChange(mode: string) {
-                if (
-                  mode !== 'auto' &&
-                  mode !== 'tmux' &&
-                  mode !== 'in-process'
-                ) {
-                  return
+                if (mode !== 'auto' && mode !== 'tmux' && mode !== 'in-process') {
+                  return;
                 }
                 // Clear CLI override and set new mode (pass mode to avoid race condition)
-                clearCliTeammateModeOverride(mode)
+                clearCliTeammateModeOverride(mode);
                 saveGlobalConfig(current => ({
                   ...current,
                   teammateMode: mode,
-                }))
+                }));
                 setGlobalConfig({
                   ...getGlobalConfig(),
                   teammateMode: mode,
-                })
+                });
                 logEvent('tengu_teammate_mode_changed', {
                   mode: mode as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-                })
+                });
               },
             },
             {
               id: 'teammateDefaultModel',
               label: 'Default teammate model',
-              value: teammateModelDisplayString(
-                globalConfig.teammateDefaultModel,
-              ),
+              value: teammateModelDisplayString(globalConfig.teammateDefaultModel),
               type: 'managedEnum' as const,
               onChange() {},
             },
-          ]
+          ];
         })()
       : []),
     // Remote at startup toggle — gated on build flag + GrowthBook + policy
@@ -1117,41 +1019,36 @@ export function Config({
               if (selected === 'default') {
                 // Unset the config key so it falls back to the platform default
                 saveGlobalConfig(current => {
-                  if (current.remoteControlAtStartup === undefined)
-                    return current
-                  const next = { ...current }
-                  delete next.remoteControlAtStartup
-                  return next
-                })
+                  if (current.remoteControlAtStartup === undefined) return current;
+                  const next = { ...current };
+                  delete next.remoteControlAtStartup;
+                  return next;
+                });
                 setGlobalConfig({
                   ...getGlobalConfig(),
                   remoteControlAtStartup: undefined,
-                })
+                });
               } else {
-                const enabled = selected === 'true'
+                const enabled = selected === 'true';
                 saveGlobalConfig(current => {
-                  if (current.remoteControlAtStartup === enabled) return current
-                  return { ...current, remoteControlAtStartup: enabled }
-                })
+                  if (current.remoteControlAtStartup === enabled) return current;
+                  return { ...current, remoteControlAtStartup: enabled };
+                });
                 setGlobalConfig({
                   ...getGlobalConfig(),
                   remoteControlAtStartup: enabled,
-                })
+                });
               }
               // Sync to AppState so useReplBridge reacts immediately
-              const resolved = getRemoteControlAtStartup()
+              const resolved = getRemoteControlAtStartup();
               setAppState(prev => {
-                if (
-                  prev.replBridgeEnabled === resolved &&
-                  !prev.replBridgeOutboundOnly
-                )
-                  return prev
+                if (prev.replBridgeEnabled === resolved && !prev.replBridgeOutboundOnly) return prev;
                 return {
                   ...prev,
                   replBridgeEnabled: resolved,
                   replBridgeOutboundOnly: false,
-                }
-              })
+                };
+              });
             },
           },
         ]
@@ -1162,11 +1059,11 @@ export function Config({
             id: 'showExternalIncludesDialog',
             label: 'External CLAUDE.md includes',
             value: (() => {
-              const projectConfig = getCurrentProjectConfig()
+              const projectConfig = getCurrentProjectConfig();
               if (projectConfig.hasClaudeMdExternalIncludesApproved) {
-                return 'true'
+                return 'true';
               } else {
-                return 'false'
+                return 'false';
               }
             })(),
             type: 'managedEnum' as const,
@@ -1182,10 +1079,7 @@ export function Config({
             id: 'apiKey',
             label: (
               <Text>
-                Use custom API key:{' '}
-                <Text bold>
-                  {normalizeApiKeyForConfig(process.env.ANTHROPIC_API_KEY)}
-                </Text>
+                Use custom API key: <Text bold>{normalizeApiKeyForConfig(process.env.ANTHROPIC_API_KEY)}</Text>
               </Text>
             ),
             searchText: 'Use custom API key',
@@ -1198,94 +1092,82 @@ export function Config({
             type: 'boolean' as const,
             onChange(useCustomKey: boolean) {
               saveGlobalConfig(current => {
-                const updated = { ...current }
+                const updated = { ...current };
                 if (!updated.customApiKeyResponses) {
                   updated.customApiKeyResponses = {
                     approved: [],
                     rejected: [],
-                  }
+                  };
                 }
                 if (!updated.customApiKeyResponses.approved) {
                   updated.customApiKeyResponses = {
                     ...updated.customApiKeyResponses,
                     approved: [],
-                  }
+                  };
                 }
                 if (!updated.customApiKeyResponses.rejected) {
                   updated.customApiKeyResponses = {
                     ...updated.customApiKeyResponses,
                     rejected: [],
-                  }
+                  };
                 }
                 if (process.env.ANTHROPIC_API_KEY) {
-                  const truncatedKey = normalizeApiKeyForConfig(
-                    process.env.ANTHROPIC_API_KEY,
-                  )
+                  const truncatedKey = normalizeApiKeyForConfig(process.env.ANTHROPIC_API_KEY);
                   if (useCustomKey) {
                     updated.customApiKeyResponses = {
                       ...updated.customApiKeyResponses,
                       approved: [
-                        ...(
-                          updated.customApiKeyResponses.approved ?? []
-                        ).filter(k => k !== truncatedKey),
+                        ...(updated.customApiKeyResponses.approved ?? []).filter(k => k !== truncatedKey),
                         truncatedKey,
                       ],
-                      rejected: (
-                        updated.customApiKeyResponses.rejected ?? []
-                      ).filter(k => k !== truncatedKey),
-                    }
+                      rejected: (updated.customApiKeyResponses.rejected ?? []).filter(k => k !== truncatedKey),
+                    };
                   } else {
                     updated.customApiKeyResponses = {
                       ...updated.customApiKeyResponses,
-                      approved: (
-                        updated.customApiKeyResponses.approved ?? []
-                      ).filter(k => k !== truncatedKey),
+                      approved: (updated.customApiKeyResponses.approved ?? []).filter(k => k !== truncatedKey),
                       rejected: [
-                        ...(
-                          updated.customApiKeyResponses.rejected ?? []
-                        ).filter(k => k !== truncatedKey),
+                        ...(updated.customApiKeyResponses.rejected ?? []).filter(k => k !== truncatedKey),
                         truncatedKey,
                       ],
-                    }
+                    };
                   }
                 }
-                return updated
-              })
-              setGlobalConfig(getGlobalConfig())
+                return updated;
+              });
+              setGlobalConfig(getGlobalConfig());
             },
           },
         ]
       : []),
-  ]
+  ];
 
   // Filter settings based on search query
   const filteredSettingsItems = React.useMemo(() => {
-    if (!searchQuery) return settingsItems
-    const lowerQuery = searchQuery.toLowerCase()
+    if (!searchQuery) return settingsItems;
+    const lowerQuery = searchQuery.toLowerCase();
     return settingsItems.filter(setting => {
-      if (setting.id.toLowerCase().includes(lowerQuery)) return true
-      const searchableText =
-        'searchText' in setting ? setting.searchText : setting.label
-      return searchableText.toLowerCase().includes(lowerQuery)
-    })
-  }, [settingsItems, searchQuery])
+      if (setting.id.toLowerCase().includes(lowerQuery)) return true;
+      const searchableText = 'searchText' in setting ? setting.searchText : setting.label;
+      return searchableText.toLowerCase().includes(lowerQuery);
+    });
+  }, [settingsItems, searchQuery]);
 
   // Adjust selected index when filtered list shrinks, and keep the selected
   // item visible when maxVisible changes (e.g., terminal resize).
   React.useEffect(() => {
     if (selectedIndex >= filteredSettingsItems.length) {
-      const newIndex = Math.max(0, filteredSettingsItems.length - 1)
-      setSelectedIndex(newIndex)
-      setScrollOffset(Math.max(0, newIndex - maxVisible + 1))
-      return
+      const newIndex = Math.max(0, filteredSettingsItems.length - 1);
+      setSelectedIndex(newIndex);
+      setScrollOffset(Math.max(0, newIndex - maxVisible + 1));
+      return;
     }
     setScrollOffset(prev => {
-      if (selectedIndex < prev) return selectedIndex
-      if (selectedIndex >= prev + maxVisible)
-        return selectedIndex - maxVisible + 1
-      return prev
-    })
-  }, [filteredSettingsItems.length, selectedIndex, maxVisible])
+      if (selectedIndex < prev) return selectedIndex;
+      if (selectedIndex >= prev + maxVisible) return selectedIndex - maxVisible + 1;
+      return prev;
+    });
+  }, [filteredSettingsItems.length, selectedIndex, maxVisible]);
 
   // Keep the selected item visible within the scroll window.
   // Called synchronously from navigation handlers to avoid a render frame
@@ -1293,13 +1175,13 @@ export function Config({
   const adjustScrollOffset = useCallback(
     (newIndex: number) => {
       setScrollOffset(prev => {
-        if (newIndex < prev) return newIndex
-        if (newIndex >= prev + maxVisible) return newIndex - maxVisible + 1
-        return prev
-      })
+        if (newIndex < prev) return newIndex;
+        if (newIndex >= prev + maxVisible) return newIndex - maxVisible + 1;
+        return prev;
+      });
     },
     [maxVisible],
-  )
+  );
 
   // Enter: keep all changes (already persisted by onChange handlers), close
   // with a summary of what changed.
@@ -1307,164 +1189,101 @@ export function Config({
     // Submenu handling: each submenu has its own Enter/Esc — don't close
     // the whole panel while one is open.
     if (showSubmenu !== null) {
-      return
+      return;
     }
     // Log any changes that were made
     // TODO: Make these proper messages
-    const formattedChanges: string[] = Object.entries(changes).map(
-      ([key, value]) => {
-        logEvent('tengu_config_changed', {
-          key: key as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-          value:
-            value as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        })
-        return `Set ${key} to ${chalk.bold(value)}`
-      },
-    )
+    const formattedChanges: string[] = Object.entries(changes).map(([key, value]) => {
+      logEvent('tengu_config_changed', {
+        key: key as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        value: value as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
+      return `Set ${key} to ${chalk.bold(value)}`;
+    });
     // Check for API key changes
     // On homespace, ANTHROPIC_API_KEY is preserved in process.env for child
     // processes but ignored by Claude Code itself (see auth.ts).
-    const effectiveApiKey = isRunningOnHomespace()
-      ? undefined
-      : process.env.ANTHROPIC_API_KEY
+    const effectiveApiKey = isRunningOnHomespace() ? undefined : process.env.ANTHROPIC_API_KEY;
     const initialUsingCustomKey = Boolean(
       effectiveApiKey &&
-        initialConfig.current.customApiKeyResponses?.approved?.includes(
-          normalizeApiKeyForConfig(effectiveApiKey),
-        ),
-    )
+        initialConfig.current.customApiKeyResponses?.approved?.includes(normalizeApiKeyForConfig(effectiveApiKey)),
+    );
     const currentUsingCustomKey = Boolean(
       effectiveApiKey &&
-        globalConfig.customApiKeyResponses?.approved?.includes(
-          normalizeApiKeyForConfig(effectiveApiKey),
-        ),
-    )
+        globalConfig.customApiKeyResponses?.approved?.includes(normalizeApiKeyForConfig(effectiveApiKey)),
+    );
     if (initialUsingCustomKey !== currentUsingCustomKey) {
-      formattedChanges.push(
-        `${currentUsingCustomKey ? 'Enabled' : 'Disabled'} custom API key`,
-      )
+      formattedChanges.push(`${currentUsingCustomKey ? 'Enabled' : 'Disabled'} custom API key`);
       logEvent('tengu_config_changed', {
         key: 'env.ANTHROPIC_API_KEY' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        value:
-          currentUsingCustomKey as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
+        value: currentUsingCustomKey as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
     }
     if (globalConfig.theme !== initialConfig.current.theme) {
-      formattedChanges.push(`Set theme to ${chalk.bold(globalConfig.theme)}`)
+      formattedChanges.push(`Set theme to ${chalk.bold(globalConfig.theme)}`);
     }
-    if (
-      globalConfig.preferredNotifChannel !==
-      initialConfig.current.preferredNotifChannel
-    ) {
-      formattedChanges.push(
-        `Set notifications to ${chalk.bold(globalConfig.preferredNotifChannel)}`,
-      )
+    if (globalConfig.preferredNotifChannel !== initialConfig.current.preferredNotifChannel) {
+      formattedChanges.push(`Set notifications to ${chalk.bold(globalConfig.preferredNotifChannel)}`);
     }
     if (currentOutputStyle !== initialOutputStyle.current) {
-      formattedChanges.push(
-        `Set output style to ${chalk.bold(currentOutputStyle)}`,
-      )
+      formattedChanges.push(`Set output style to ${chalk.bold(currentOutputStyle)}`);
     }
     if (currentLanguage !== initialLanguage.current) {
-      formattedChanges.push(
-        `Set response language to ${chalk.bold(currentLanguage ?? 'Default (English)')}`,
-      )
+      formattedChanges.push(`Set response language to ${chalk.bold(currentLanguage ?? 'Default (English)')}`);
     }
     if (globalConfig.editorMode !== initialConfig.current.editorMode) {
-      formattedChanges.push(
-        `Set editor mode to ${chalk.bold(globalConfig.editorMode || 'emacs')}`,
-      )
+      formattedChanges.push(`Set editor mode to ${chalk.bold(globalConfig.editorMode || 'emacs')}`);
     }
     if (globalConfig.diffTool !== initialConfig.current.diffTool) {
-      formattedChanges.push(
-        `Set diff tool to ${chalk.bold(globalConfig.diffTool)}`,
-      )
+      formattedChanges.push(`Set diff tool to ${chalk.bold(globalConfig.diffTool)}`);
     }
     if (globalConfig.autoConnectIde !== initialConfig.current.autoConnectIde) {
-      formattedChanges.push(
-        `${globalConfig.autoConnectIde ? 'Enabled' : 'Disabled'} auto-connect to IDE`,
-      )
+      formattedChanges.push(`${globalConfig.autoConnectIde ? 'Enabled' : 'Disabled'} auto-connect to IDE`);
     }
-    if (
-      globalConfig.autoInstallIdeExtension !==
-      initialConfig.current.autoInstallIdeExtension
-    ) {
+    if (globalConfig.autoInstallIdeExtension !== initialConfig.current.autoInstallIdeExtension) {
       formattedChanges.push(
         `${globalConfig.autoInstallIdeExtension ? 'Enabled' : 'Disabled'} auto-install IDE extension`,
-      )
+      );
     }
-    if (
-      globalConfig.autoCompactEnabled !==
-      initialConfig.current.autoCompactEnabled
-    ) {
-      formattedChanges.push(
-        `${globalConfig.autoCompactEnabled ? 'Enabled' : 'Disabled'} auto-compact`,
-      )
+    if (globalConfig.autoCompactEnabled !== initialConfig.current.autoCompactEnabled) {
+      formattedChanges.push(`${globalConfig.autoCompactEnabled ? 'Enabled' : 'Disabled'} auto-compact`);
     }
-    if (
-      globalConfig.respectGitignore !== initialConfig.current.respectGitignore
-    ) {
+    if (globalConfig.respectGitignore !== initialConfig.current.respectGitignore) {
       formattedChanges.push(
         `${globalConfig.respectGitignore ? 'Enabled' : 'Disabled'} respect .gitignore in file picker`,
-      )
+      );
     }
-    if (
-      globalConfig.copyFullResponse !== initialConfig.current.copyFullResponse
-    ) {
-      formattedChanges.push(
-        `${globalConfig.copyFullResponse ? 'Enabled' : 'Disabled'} always copy full response`,
-      )
+    if (globalConfig.copyFullResponse !== initialConfig.current.copyFullResponse) {
+      formattedChanges.push(`${globalConfig.copyFullResponse ? 'Enabled' : 'Disabled'} always copy full response`);
     }
     if (globalConfig.copyOnSelect !== initialConfig.current.copyOnSelect) {
-      formattedChanges.push(
-        `${globalConfig.copyOnSelect ? 'Enabled' : 'Disabled'} copy on select`,
-      )
+      formattedChanges.push(`${globalConfig.copyOnSelect ? 'Enabled' : 'Disabled'} copy on select`);
     }
-    if (
-      globalConfig.terminalProgressBarEnabled !==
-      initialConfig.current.terminalProgressBarEnabled
-    ) {
+    if (globalConfig.terminalProgressBarEnabled !== initialConfig.current.terminalProgressBarEnabled) {
       formattedChanges.push(
         `${globalConfig.terminalProgressBarEnabled ? 'Enabled' : 'Disabled'} terminal progress bar`,
-      )
+      );
     }
-    if (
-      globalConfig.showStatusInTerminalTab !==
-      initialConfig.current.showStatusInTerminalTab
-    ) {
-      formattedChanges.push(
-        `${globalConfig.showStatusInTerminalTab ? 'Enabled' : 'Disabled'} terminal tab status`,
-      )
+    if (globalConfig.showStatusInTerminalTab !== initialConfig.current.showStatusInTerminalTab) {
+      formattedChanges.push(`${globalConfig.showStatusInTerminalTab ? 'Enabled' : 'Disabled'} terminal tab status`);
     }
-    if (
-      globalConfig.showTurnDuration !== initialConfig.current.showTurnDuration
-    ) {
-      formattedChanges.push(
-        `${globalConfig.showTurnDuration ? 'Enabled' : 'Disabled'} turn duration`,
-      )
+    if (globalConfig.showTurnDuration !== initialConfig.current.showTurnDuration) {
+      formattedChanges.push(`${globalConfig.showTurnDuration ? 'Enabled' : 'Disabled'} turn duration`);
     }
-    if (
-      globalConfig.remoteControlAtStartup !==
-      initialConfig.current.remoteControlAtStartup
-    ) {
+    if (globalConfig.remoteControlAtStartup !== initialConfig.current.remoteControlAtStartup) {
       const remoteLabel =
         globalConfig.remoteControlAtStartup === undefined
           ? 'Reset Remote Control to default'
-          : `${globalConfig.remoteControlAtStartup ? 'Enabled' : 'Disabled'} Remote Control for all sessions`
-      formattedChanges.push(remoteLabel)
+          : `${globalConfig.remoteControlAtStartup ? 'Enabled' : 'Disabled'} Remote Control for all sessions`;
+      formattedChanges.push(remoteLabel);
     }
-    if (
-      settingsData?.autoUpdatesChannel !==
-      initialSettingsData.current?.autoUpdatesChannel
-    ) {
-      formattedChanges.push(
-        `Set auto-update channel to ${chalk.bold(settingsData?.autoUpdatesChannel ?? 'latest')}`,
-      )
+    if (settingsData?.autoUpdatesChannel !== initialSettingsData.current?.autoUpdatesChannel) {
+      formattedChanges.push(`Set auto-update channel to ${chalk.bold(settingsData?.autoUpdatesChannel ?? 'latest')}`);
     }
     if (formattedChanges.length > 0) {
-      onClose(formattedChanges.join('\n'))
+      onClose(formattedChanges.join('\n'));
     } else {
-      onClose('Config dialog dismissed', { display: 'system' })
+      onClose('Config dialog dismissed', { display: 'system' });
     }
   }, [
     showSubmenu,
@@ -1474,11 +1293,9 @@ export function Config({
     currentOutputStyle,
     currentLanguage,
     settingsData?.autoUpdatesChannel,
-    isFastModeEnabled()
-      ? (settingsData as Record<string, unknown> | undefined)?.fastMode
-      : undefined,
+    isFastModeEnabled() ? (settingsData as Record<string, unknown> | undefined)?.fastMode : undefined,
     onClose,
-  ])
+  ]);
 
   // Restore all state stores to their mount-time snapshots. Changes are
   // applied to disk/AppState immediately on toggle, so "cancel" means
@@ -1488,22 +1305,22 @@ export function Config({
     // config overwrite since setTheme internally calls saveGlobalConfig with
     // a partial update — we want the full snapshot to be the last write.
     if (themeSetting !== initialThemeSetting.current) {
-      setTheme(initialThemeSetting.current)
+      setTheme(initialThemeSetting.current);
     }
     // Global config: full overwrite from snapshot. saveGlobalConfig skips if
     // the returned ref equals current (test mode checks ref; prod writes to
     // disk but content is identical).
-    saveGlobalConfig(() => initialConfig.current)
+    saveGlobalConfig(() => initialConfig.current);
     // Settings files: restore each key Config may have touched. undefined
     // deletes the key (updateSettingsForSource customizer at settings.ts:368).
-    const il = initialLocalSettings
+    const il = initialLocalSettings;
     updateSettingsForSource('localSettings', {
       spinnerTipsEnabled: il?.spinnerTipsEnabled,
       prefersReducedMotion: il?.prefersReducedMotion,
       defaultView: il?.defaultView,
       outputStyle: il?.outputStyle,
-    })
-    const iu = initialUserSettings
+    });
+    const iu = initialUserSettings;
     updateSettingsForSource('userSettings', {
       alwaysThinkingEnabled: iu?.alwaysThinkingEnabled,
       fastMode: iu?.fastMode,
@@ -1513,9 +1330,7 @@ export function Config({
       language: iu?.language,
       ...(feature('TRANSCRIPT_CLASSIFIER')
         ? {
-            useAutoModeDuringPlan: (
-              iu as { useAutoModeDuringPlan?: boolean } | undefined
-            )?.useAutoModeDuringPlan,
+            useAutoModeDuringPlan: (iu as { useAutoModeDuringPlan?: boolean } | undefined)?.useAutoModeDuringPlan,
           }
         : {}),
       // ThemePicker's Ctrl+T writes this key directly — include it so the
@@ -1528,12 +1343,10 @@ export function Config({
       // Explicitly include defaultMode so undefined triggers the customizer's
       // delete path even when iu.permissions lacks that key.
       permissions:
-        iu?.permissions === undefined
-          ? undefined
-          : { ...iu.permissions, defaultMode: iu.permissions.defaultMode },
-    })
+        iu?.permissions === undefined ? undefined : { ...iu.permissions, defaultMode: iu.permissions.defaultMode },
+    });
     // AppState: batch-restore all possibly-touched fields.
-    const ia = initialAppState
+    const ia = initialAppState;
     setAppState(prev => ({
       ...prev,
       mainLoopModel: ia.mainLoopModel,
@@ -1549,12 +1362,12 @@ export function Config({
       // Reconcile auto-mode state after useAutoModeDuringPlan revert above —
       // the onChange handler may have activated/deactivated auto mid-plan.
       toolPermissionContext: transitionPlanAutoMode(prev.toolPermissionContext),
-    }))
+    }));
     // Bootstrap state: restore userMsgOptIn. Only touched by the defaultView
     // onChange above, so no feature() guard needed here (that path only
     // exists when showDefaultViewPicker is true).
     if (getUserMsgOptIn() !== initialUserMsgOptIn) {
-      setUserMsgOptIn(initialUserMsgOptIn)
+      setUserMsgOptIn(initialUserMsgOptIn);
     }
   }, [
     themeSetting,
@@ -1564,18 +1377,18 @@ export function Config({
     initialAppState,
     initialUserMsgOptIn,
     setAppState,
-  ])
+  ]);
 
   // Escape: revert all changes (if any) and close.
   const handleEscape = useCallback(() => {
     if (showSubmenu !== null) {
-      return
+      return;
     }
     if (isDirty.current) {
-      revertChanges()
+      revertChanges();
     }
-    onClose('Config dialog dismissed', { display: 'system' })
-  }, [showSubmenu, revertChanges, onClose])
+    onClose('Config dialog dismissed', { display: 'system' });
+  }, [showSubmenu, revertChanges, onClose]);
 
   // Disable when submenu is open so the submenu's Dialog handles ESC, and in
   // search mode so the onKeyDown handler (which clears-then-exits search)
@@ -1583,35 +1396,35 @@ export function Config({
   useKeybinding('confirm:no', handleEscape, {
     context: 'Settings',
     isActive: showSubmenu === null && !isSearchMode && !headerFocused,
-  })
+  });
   // Save-and-close fires on Enter only when not in search mode (Enter there
   // exits search to the list — see the isSearchMode branch in handleKeyDown).
   useKeybinding('settings:close', handleSaveAndClose, {
     context: 'Settings',
     isActive: showSubmenu === null && !isSearchMode && !headerFocused,
-  })
+  });
 
   // Settings navigation and toggle actions via configurable keybindings.
   // Only active when not in search mode and no submenu is open.
   const toggleSetting = useCallback(() => {
-    const setting = filteredSettingsItems[selectedIndex]
+    const setting = filteredSettingsItems[selectedIndex];
     if (!setting || !setting.onChange) {
-      return
+      return;
     }
 
     if (setting.type === 'boolean') {
-      isDirty.current = true
-      setting.onChange(!setting.value)
+      isDirty.current = true;
+      setting.onChange(!setting.value);
       if (setting.id === 'thinkingEnabled') {
-        const newValue = !setting.value
-        const backToInitial = newValue === initialThinkingEnabled.current
+        const newValue = !setting.value;
+        const backToInitial = newValue === initialThinkingEnabled.current;
         if (backToInitial) {
-          setShowThinkingWarning(false)
+          setShowThinkingWarning(false);
         } else if (context.messages.some(m => m.type === 'assistant')) {
-          setShowThinkingWarning(true)
+          setShowThinkingWarning(true);
         }
       }
-      return
+      return;
     }
 
     if (
@@ -1626,70 +1439,69 @@ export function Config({
       // completion callback, not here (submenu may be cancelled).
       switch (setting.id) {
         case 'theme':
-          setShowSubmenu('Theme')
-          setTabsHidden(true)
-          return
+          setShowSubmenu('Theme');
+          setTabsHidden(true);
+          return;
         case 'model':
-          setShowSubmenu('Model')
-          setTabsHidden(true)
-          return
+          setShowSubmenu('Model');
+          setTabsHidden(true);
+          return;
         case 'teammateDefaultModel':
-          setShowSubmenu('TeammateModel')
-          setTabsHidden(true)
-          return
+          setShowSubmenu('TeammateModel');
+          setTabsHidden(true);
+          return;
         case 'showExternalIncludesDialog':
-          setShowSubmenu('ExternalIncludes')
-          setTabsHidden(true)
-          return
+          setShowSubmenu('ExternalIncludes');
+          setTabsHidden(true);
+          return;
         case 'outputStyle':
-          setShowSubmenu('OutputStyle')
-          setTabsHidden(true)
-          return
+          setShowSubmenu('OutputStyle');
+          setTabsHidden(true);
+          return;
         case 'language':
-          setShowSubmenu('Language')
-          setTabsHidden(true)
-          return
+          setShowSubmenu('Language');
+          setTabsHidden(true);
+          return;
       }
     }
 
     if (setting.id === 'autoUpdatesChannel') {
       if (autoUpdaterDisabledReason) {
         // Auto-updates are disabled - show enable dialog instead
-        setShowSubmenu('EnableAutoUpdates')
-        setTabsHidden(true)
-        return
+        setShowSubmenu('EnableAutoUpdates');
+        setTabsHidden(true);
+        return;
       }
-      const currentChannel = settingsData?.autoUpdatesChannel ?? 'latest'
+      const currentChannel = settingsData?.autoUpdatesChannel ?? 'latest';
       if (currentChannel === 'latest') {
         // Switching to stable - show downgrade dialog
-        setShowSubmenu('ChannelDowngrade')
-        setTabsHidden(true)
+        setShowSubmenu('ChannelDowngrade');
+        setTabsHidden(true);
       } else {
         // Switching to latest - just do it and clear minimumVersion
-        isDirty.current = true
+        isDirty.current = true;
         updateSettingsForSource('userSettings', {
           autoUpdatesChannel: 'latest',
           minimumVersion: undefined,
-        })
+        });
         setSettingsData(prev => ({
           ...prev,
           autoUpdatesChannel: 'latest',
           minimumVersion: undefined,
-        }))
+        }));
         logEvent('tengu_autoupdate_channel_changed', {
-          channel:
-            'latest' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        })
+          channel: 'latest' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        });
       }
-      return
+      return;
     }
 
     if (setting.type === 'enum') {
-      isDirty.current = true
-      const currentIndex = setting.options.indexOf(setting.value)
-      const nextIndex = (currentIndex + 1) % setting.options.length
-      setting.onChange(setting.options[nextIndex]!)
-      return
+      isDirty.current = true;
+      const currentIndex = setting.options.indexOf(setting.value);
+      const nextIndex = (currentIndex + 1) % setting.options.length;
+      setting.onChange(setting.options[nextIndex]!);
+      return;
     }
   }, [
     autoUpdaterDisabledReason,
@@ -1697,17 +1509,14 @@ export function Config({
     selectedIndex,
     settingsData?.autoUpdatesChannel,
     setTabsHidden,
-  ])
+  ]);
 
   const moveSelection = (delta: -1 | 1): void => {
-    setShowThinkingWarning(false)
-    const newIndex = Math.max(
-      0,
-      Math.min(filteredSettingsItems.length - 1, selectedIndex + delta),
-    )
-    setSelectedIndex(newIndex)
-    adjustScrollOffset(newIndex)
-  }
+    setShowThinkingWarning(false);
+    const newIndex = Math.max(0, Math.min(filteredSettingsItems.length - 1, selectedIndex + delta));
+    setSelectedIndex(newIndex);
+    adjustScrollOffset(newIndex);
+  };
 
   useKeybindings(
     {
@@ -1716,11 +1525,11 @@ export function Config({
           // ↑ at top enters search mode so users can type-to-filter after
           // reaching the list boundary. Wheel-up (scroll:lineUp) clamps
           // instead — overshoot shouldn't move focus away from the list.
-          setShowThinkingWarning(false)
-          setIsSearchMode(true)
-          setScrollOffset(0)
+          setShowThinkingWarning(false);
+          setIsSearchMode(true);
+          setScrollOffset(0);
         } else {
-          moveSelection(-1)
+          moveSelection(-1);
         }
       },
       'select:next': () => moveSelection(1),
@@ -1732,92 +1541,79 @@ export function Config({
       'scroll:lineDown': () => moveSelection(1),
       'select:accept': toggleSetting,
       'settings:search': () => {
-        setIsSearchMode(true)
-        setSearchQuery('')
+        setIsSearchMode(true);
+        setSearchQuery('');
       },
     },
     {
       context: 'Settings',
       isActive: showSubmenu === null && !isSearchMode && !headerFocused,
     },
-  )
+  );
 
   // Combined key handling across search/list modes. Branch order mirrors
   // the original useInput gate priority: submenu and header short-circuit
   // first (their own handlers own input), then search vs. list.
   const handleKeyDown = useCallback(
     (e: KeyboardEvent) => {
-      if (showSubmenu !== null) return
-      if (headerFocused) return
+      if (showSubmenu !== null) return;
+      if (headerFocused) return;
       // Search mode: Esc clears then exits, Enter/↓ moves to the list.
       if (isSearchMode) {
         if (e.key === 'escape') {
-          e.preventDefault()
+          e.preventDefault();
           if (searchQuery.length > 0) {
-            setSearchQuery('')
+            setSearchQuery('');
           } else {
-            setIsSearchMode(false)
+            setIsSearchMode(false);
           }
-          return
+          return;
         }
         if (e.key === 'return' || e.key === 'down' || e.key === 'wheeldown') {
-          e.preventDefault()
-          setIsSearchMode(false)
-          setSelectedIndex(0)
-          setScrollOffset(0)
+          e.preventDefault();
+          setIsSearchMode(false);
+          setSelectedIndex(0);
+          setScrollOffset(0);
         }
-        return
+        return;
       }
       // List mode: left/right/tab cycle the selected option's value. These
       // keys used to switch tabs; now they only do so when the tab row is
       // explicitly focused (see headerFocused in Settings.tsx).
       if (e.key === 'left' || e.key === 'right' || e.key === 'tab') {
-        e.preventDefault()
-        toggleSetting()
-        return
+        e.preventDefault();
+        toggleSetting();
+        return;
       }
       // Fallback: printable characters (other than those bound to actions)
       // enter search mode. Carve out j/k// — useKeybindings (still on the
       // useInput path) consumes these via stopImmediatePropagation, but
       // onKeyDown dispatches independently so we must skip them explicitly.
-      if (e.ctrl || e.meta) return
-      if (e.key === 'j' || e.key === 'k' || e.key === '/') return
+      if (e.ctrl || e.meta) return;
+      if (e.key === 'j' || e.key === 'k' || e.key === '/') return;
       if (e.key.length === 1 && e.key !== ' ') {
-        e.preventDefault()
-        setIsSearchMode(true)
-        setSearchQuery(e.key)
+        e.preventDefault();
+        setIsSearchMode(true);
+        setSearchQuery(e.key);
       }
     },
-    [
-      showSubmenu,
-      headerFocused,
-      isSearchMode,
-      searchQuery,
-      setSearchQuery,
-      toggleSetting,
-    ],
-  )
+    [showSubmenu, headerFocused, isSearchMode, searchQuery, setSearchQuery, toggleSetting],
+  );
 
   return (
-    <Box
-      flexDirection="column"
-      width="100%"
-      tabIndex={0}
-      autoFocus
-      onKeyDown={handleKeyDown}
-    >
+    <Box flexDirection="column" width="100%" tabIndex={0} autoFocus onKeyDown={handleKeyDown}>
       {showSubmenu === 'Theme' ? (
         <>
           <ThemePicker
             onThemeSelect={setting => {
-              isDirty.current = true
-              setTheme(setting)
-              setShowSubmenu(null)
-              setTabsHidden(false)
+              isDirty.current = true;
+              setTheme(setting);
+              setShowSubmenu(null);
+              setTabsHidden(false);
             }}
             onCancel={() => {
-              setShowSubmenu(null)
-              setTabsHidden(false)
+              setShowSubmenu(null);
+              setTabsHidden(false);
             }}
             hideEscToCancel
             skipExitHandling={true} // Skip exit handling as Config already handles it
@@ -1841,20 +1637,18 @@ export function Config({
           <ModelPicker
             initial={mainLoopModel}
             onSelect={(model, _effort) => {
-              isDirty.current = true
-              onChangeMainModelConfig(model)
-              setShowSubmenu(null)
-              setTabsHidden(false)
+              isDirty.current = true;
+              onChangeMainModelConfig(model);
+              setShowSubmenu(null);
+              setTabsHidden(false);
             }}
             onCancel={() => {
-              setShowSubmenu(null)
-              setTabsHidden(false)
+              setShowSubmenu(null);
+              setTabsHidden(false);
             }}
             showFastModeNotice={
               isFastModeEnabled()
-                ? isFastMode &&
-                  isFastModeSupportedByModel(mainLoopModel) &&
-                  isFastModeAvailable()
+                ? isFastMode && isFastModeSupportedByModel(mainLoopModel) && isFastModeAvailable()
                 : false
             }
           />
@@ -1877,39 +1671,33 @@ export function Config({
             skipSettingsWrite
             headerText="Default model for newly spawned teammates. The leader can override via the tool call's model parameter."
             onSelect={(model, _effort) => {
-              setShowSubmenu(null)
-              setTabsHidden(false)
+              setShowSubmenu(null);
+              setTabsHidden(false);
               // First-open-then-Enter from unset: picker highlights "Default"
               // (initial=null) and confirming would write null, silently
               // switching Opus-fallback → follow-leader. Treat as no-op.
-              if (
-                globalConfig.teammateDefaultModel === undefined &&
-                model === null
-              ) {
-                return
+              if (globalConfig.teammateDefaultModel === undefined && model === null) {
+                return;
               }
-              isDirty.current = true
+              isDirty.current = true;
               saveGlobalConfig(current =>
-                current.teammateDefaultModel === model
-                  ? current
-                  : { ...current, teammateDefaultModel: model },
-              )
+                current.teammateDefaultModel === model ? current : { ...current, teammateDefaultModel: model },
+              );
               setGlobalConfig({
                 ...getGlobalConfig(),
                 teammateDefaultModel: model,
-              })
+              });
               setChanges(prev => ({
                 ...prev,
                 teammateDefaultModel: teammateModelDisplayString(model),
-              }))
+              }));
               logEvent('tengu_teammate_default_model_changed', {
-                model:
-                  model as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-              })
+                model: model as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+              });
             }}
             onCancel={() => {
-              setShowSubmenu(null)
-              setTabsHidden(false)
+              setShowSubmenu(null);
+              setTabsHidden(false);
             }}
           />
           <Text dimColor>
@@ -1928,8 +1716,8 @@ export function Config({
         <>
           <ClaudeMdExternalIncludesDialog
             onDone={() => {
-              setShowSubmenu(null)
-              setTabsHidden(false)
+              setShowSubmenu(null);
+              setTabsHidden(false);
             }}
             externalIncludes={getExternalClaudeMdIncludes(memoryFiles as MemoryFileInfo[])}
           />
@@ -1950,28 +1738,26 @@ export function Config({
           <OutputStylePicker
             initialStyle={currentOutputStyle}
             onComplete={style => {
-              isDirty.current = true
-              setCurrentOutputStyle(style ?? DEFAULT_OUTPUT_STYLE_NAME)
-              setShowSubmenu(null)
-              setTabsHidden(false)
+              isDirty.current = true;
+              setCurrentOutputStyle(style ?? DEFAULT_OUTPUT_STYLE_NAME);
+              setShowSubmenu(null);
+              setTabsHidden(false);
 
               // Save to local settings
               updateSettingsForSource('localSettings', {
                 outputStyle: style,
-              })
+              });
 
               void logEvent('tengu_output_style_changed', {
                 style: (style ??
                   DEFAULT_OUTPUT_STYLE_NAME) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-                source:
-                  'config_panel' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-                settings_source:
-                  'localSettings' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-              })
+                source: 'config_panel' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+                settings_source: 'localSettings' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+              });
             }}
             onCancel={() => {
-              setShowSubmenu(null)
-              setTabsHidden(false)
+              setShowSubmenu(null);
+              setTabsHidden(false);
             }}
           />
           <Text dimColor>
@@ -1991,37 +1777,30 @@ export function Config({
           <LanguagePicker
             initialLanguage={currentLanguage}
             onComplete={language => {
-              isDirty.current = true
-              setCurrentLanguage(language)
-              setShowSubmenu(null)
-              setTabsHidden(false)
+              isDirty.current = true;
+              setCurrentLanguage(language);
+              setShowSubmenu(null);
+              setTabsHidden(false);
 
               // Save to user settings
               updateSettingsForSource('userSettings', {
                 language,
-              })
+              });
 
               void logEvent('tengu_language_changed', {
-                language: (language ??
-                  'default') as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-                source:
-                  'config_panel' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-              })
+                language: (language ?? 'default') as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+                source: 'config_panel' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+              });
             }}
             onCancel={() => {
-              setShowSubmenu(null)
-              setTabsHidden(false)
+              setShowSubmenu(null);
+              setTabsHidden(false);
             }}
           />
           <Text dimColor>
             <Byline>
               <KeyboardShortcutHint shortcut="Enter" action="confirm" />
-              <ConfigurableShortcutHint
-                action="confirm:no"
-                context="Settings"
-                fallback="Esc"
-                description="cancel"
-              />
+              <ConfigurableShortcutHint action="confirm:no" context="Settings" fallback="Esc" description="cancel" />
             </Byline>
           </Text>
         </>
@@ -2029,8 +1808,8 @@ export function Config({
         <Dialog
           title="Enable Auto-Updates"
           onCancel={() => {
-            setShowSubmenu(null)
-            setTabsHidden(false)
+            setShowSubmenu(null);
+            setTabsHidden(false);
           }}
           hideBorder
           hideInputGuide
@@ -2043,10 +1822,7 @@ export function Config({
                   : 'Auto-updates are disabled in development builds.'}
               </Text>
               {autoUpdaterDisabledReason?.type === 'env' && (
-                <Text dimColor>
-                  Unset {autoUpdaterDisabledReason.envVar} to re-enable
-                  auto-updates.
-                </Text>
+                <Text dimColor>Unset {autoUpdaterDisabledReason.envVar} to re-enable auto-updates.</Text>
               )}
             </>
           ) : (
@@ -2062,29 +1838,28 @@ export function Config({
                 },
               ]}
               onChange={(channel: string) => {
-                isDirty.current = true
-                setShowSubmenu(null)
-                setTabsHidden(false)
+                isDirty.current = true;
+                setShowSubmenu(null);
+                setTabsHidden(false);
 
                 saveGlobalConfig(current => ({
                   ...current,
                   autoUpdates: true,
-                }))
-                setGlobalConfig({ ...getGlobalConfig(), autoUpdates: true })
+                }));
+                setGlobalConfig({ ...getGlobalConfig(), autoUpdates: true });
 
                 updateSettingsForSource('userSettings', {
                   autoUpdatesChannel: channel as 'latest' | 'stable',
                   minimumVersion: undefined,
-                })
+                });
                 setSettingsData(prev => ({
                   ...prev,
                   autoUpdatesChannel: channel as 'latest' | 'stable',
                   minimumVersion: undefined,
-                }))
+                }));
                 logEvent('tengu_autoupdate_enabled', {
-                  channel:
-                    channel as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-                })
+                  channel: channel as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+                });
               }}
             />
           )}
@@ -2093,46 +1868,41 @@ export function Config({
         <ChannelDowngradeDialog
           currentVersion={MACRO.VERSION}
           onChoice={(choice: ChannelDowngradeChoice) => {
-            setShowSubmenu(null)
-            setTabsHidden(false)
+            setShowSubmenu(null);
+            setTabsHidden(false);
 
             if (choice === 'cancel') {
               // User cancelled - don't change anything
-              return
+              return;
             }
 
-            isDirty.current = true
+            isDirty.current = true;
             // Switch to stable channel
             const newSettings: {
-              autoUpdatesChannel: 'stable'
-              minimumVersion?: string
+              autoUpdatesChannel: 'stable';
+              minimumVersion?: string;
             } = {
               autoUpdatesChannel: 'stable',
-            }
+            };
 
             if (choice === 'stay') {
               // User wants to stay on current version until stable catches up
-              newSettings.minimumVersion = MACRO.VERSION
+              newSettings.minimumVersion = MACRO.VERSION;
             }
 
-            updateSettingsForSource('userSettings', newSettings)
+            updateSettingsForSource('userSettings', newSettings);
             setSettingsData(prev => ({
               ...prev,
               ...newSettings,
-            }))
+            }));
             logEvent('tengu_autoupdate_channel_changed', {
-              channel:
-                'stable' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+              channel: 'stable' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
               minimum_version_set: choice === 'stay',
-            })
+            });
           }}
         />
       ) : (
-        <Box
-          flexDirection="column"
-          gap={1}
-          marginY={insideModal ? undefined : 1}
-        >
+        <Box flexDirection="column" gap={1} marginY={insideModal ? undefined : 1}>
           <SearchBox
             query={searchQuery}
             isFocused={isSearchMode && !headerFocused}
@@ -2152,98 +1922,57 @@ export function Config({
                     {figures.arrowUp} {scrollOffset} more above
                   </Text>
                 )}
-                {filteredSettingsItems
-                  .slice(scrollOffset, scrollOffset + maxVisible)
-                  .map((setting, i) => {
-                    const actualIndex = scrollOffset + i
-                    const isSelected =
-                      actualIndex === selectedIndex &&
-                      !headerFocused &&
-                      !isSearchMode
+                {filteredSettingsItems.slice(scrollOffset, scrollOffset + maxVisible).map((setting, i) => {
+                  const actualIndex = scrollOffset + i;
+                  const isSelected = actualIndex === selectedIndex && !headerFocused && !isSearchMode;
 
-                    return (
-                      <React.Fragment key={setting.id}>
-                        <Box>
-                          <Box width={44}>
-                            <Text color={isSelected ? 'suggestion' : undefined}>
-                              {isSelected ? figures.pointer : ' '}{' '}
-                              {setting.label}
-                            </Text>
-                          </Box>
-                          <Box key={isSelected ? 'selected' : 'unselected'}>
-                            {setting.type === 'boolean' ? (
-                              <>
-                                <Text
-                                  color={isSelected ? 'suggestion' : undefined}
-                                >
-                                  {setting.value.toString()}
-                                </Text>
-                                {showThinkingWarning &&
-                                  setting.id === 'thinkingEnabled' && (
-                                    <Text color="warning">
-                                      {' '}
-                                      Changing thinking mode mid-conversation
-                                      will increase latency and may reduce
-                                      quality.
-                                    </Text>
-                                  )}
-                              </>
-                            ) : setting.id === 'theme' ? (
-                              <Text
-                                color={isSelected ? 'suggestion' : undefined}
-                              >
-                                {THEME_LABELS[setting.value.toString()] ??
-                                  setting.value.toString()}
-                              </Text>
-                            ) : setting.id === 'notifChannel' ? (
-                              <Text
-                                color={isSelected ? 'suggestion' : undefined}
-                              >
-                                <NotifChannelLabel
-                                  value={setting.value.toString()}
-                                />
-                              </Text>
-                            ) : setting.id === 'defaultPermissionMode' ? (
-                              <Text
-                                color={isSelected ? 'suggestion' : undefined}
-                              >
-                                {permissionModeTitle(
-                                  setting.value as PermissionMode,
-                                )}
-                              </Text>
-                            ) : setting.id === 'autoUpdatesChannel' &&
-                              autoUpdaterDisabledReason ? (
-                              <Box flexDirection="column">
-                                <Text
-                                  color={isSelected ? 'suggestion' : undefined}
-                                >
-                                  disabled
-                                </Text>
-                                <Text dimColor>
-                                  (
-                                  {formatAutoUpdaterDisabledReason(
-                                    autoUpdaterDisabledReason,
-                                  )}
-                                  )
-                                </Text>
-                              </Box>
-                            ) : (
-                              <Text
-                                color={isSelected ? 'suggestion' : undefined}
-                              >
-                                {setting.value.toString()}
-                              </Text>
-                            )}
-                          </Box>
+                  return (
+                    <React.Fragment key={setting.id}>
+                      <Box>
+                        <Box width={44}>
+                          <Text color={isSelected ? 'suggestion' : undefined}>
+                            {isSelected ? figures.pointer : ' '} {setting.label}
+                          </Text>
                         </Box>
-                      </React.Fragment>
-                    )
-                  })}
+                        <Box key={isSelected ? 'selected' : 'unselected'}>
+                          {setting.type === 'boolean' ? (
+                            <>
+                              <Text color={isSelected ? 'suggestion' : undefined}>{setting.value.toString()}</Text>
+                              {showThinkingWarning && setting.id === 'thinkingEnabled' && (
+                                <Text color="warning">
+                                  {' '}
+                                  Changing thinking mode mid-conversation will increase latency and may reduce quality.
+                                </Text>
+                              )}
+                            </>
+                          ) : setting.id === 'theme' ? (
+                            <Text color={isSelected ? 'suggestion' : undefined}>
+                              {THEME_LABELS[setting.value.toString()] ?? setting.value.toString()}
+                            </Text>
+                          ) : setting.id === 'notifChannel' ? (
+                            <Text color={isSelected ? 'suggestion' : undefined}>
+                              <NotifChannelLabel value={setting.value.toString()} />
+                            </Text>
+                          ) : setting.id === 'defaultPermissionMode' ? (
+                            <Text color={isSelected ? 'suggestion' : undefined}>
+                              {permissionModeTitle(setting.value as PermissionMode)}
+                            </Text>
+                          ) : setting.id === 'autoUpdatesChannel' && autoUpdaterDisabledReason ? (
+                            <Box flexDirection="column">
+                              <Text color={isSelected ? 'suggestion' : undefined}>disabled</Text>
+                              <Text dimColor>({formatAutoUpdaterDisabledReason(autoUpdaterDisabledReason)})</Text>
+                            </Box>
+                          ) : (
+                            <Text color={isSelected ? 'suggestion' : undefined}>{setting.value.toString()}</Text>
+                          )}
+                        </Box>
+                      </Box>
+                    </React.Fragment>
+                  );
+                })}
                 {scrollOffset + maxVisible < filteredSettingsItems.length && (
                   <Text dimColor>
-                    {figures.arrowDown}{' '}
-                    {filteredSettingsItems.length - scrollOffset - maxVisible}{' '}
-                    more below
+                    {figures.arrowDown} {filteredSettingsItems.length - scrollOffset - maxVisible} more below
                   </Text>
                 )}
               </>
@@ -2254,12 +1983,7 @@ export function Config({
               <Byline>
                 <KeyboardShortcutHint shortcut="←/→ tab" action="switch" />
                 <KeyboardShortcutHint shortcut="↓" action="return" />
-                <ConfigurableShortcutHint
-                  action="confirm:no"
-                  context="Settings"
-                  fallback="Esc"
-                  description="close"
-                />
+                <ConfigurableShortcutHint action="confirm:no" context="Settings" fallback="Esc" description="close" />
               </Byline>
             </Text>
           ) : isSearchMode ? (
@@ -2268,12 +1992,7 @@ export function Config({
                 <Text>Type to filter</Text>
                 <KeyboardShortcutHint shortcut="Enter/↓" action="select" />
                 <KeyboardShortcutHint shortcut="↑" action="tabs" />
-                <ConfigurableShortcutHint
-                  action="confirm:no"
-                  context="Settings"
-                  fallback="Esc"
-                  description="clear"
-                />
+                <ConfigurableShortcutHint action="confirm:no" context="Settings" fallback="Esc" description="clear" />
               </Byline>
             </Text>
           ) : (
@@ -2297,27 +2016,22 @@ export function Config({
                   fallback="/"
                   description="search"
                 />
-                <ConfigurableShortcutHint
-                  action="confirm:no"
-                  context="Settings"
-                  fallback="Esc"
-                  description="cancel"
-                />
+                <ConfigurableShortcutHint action="confirm:no" context="Settings" fallback="Esc" description="cancel" />
               </Byline>
             </Text>
           )}
         </Box>
       )}
     </Box>
-  )
+  );
 }
 
 function teammateModelDisplayString(value: string | null | undefined): string {
   if (value === undefined) {
-    return modelDisplayString(getHardcodedTeammateModelFallback())
+    return modelDisplayString(getHardcodedTeammateModelFallback());
   }
-  if (value === null) return "Default (leader's model)"
-  return modelDisplayString(value)
+  if (value === null) return "Default (leader's model)";
+  return modelDisplayString(value);
 }
 
 const THEME_LABELS: Record<string, string> = {
@@ -2328,41 +2042,41 @@ const THEME_LABELS: Record<string, string> = {
   'light-daltonized': 'Light mode (colorblind-friendly)',
   'dark-ansi': 'Dark mode (ANSI colors only)',
   'light-ansi': 'Light mode (ANSI colors only)',
-}
+};
 
 function NotifChannelLabel({ value }: { value: string }): React.ReactNode {
   switch (value) {
     case 'auto':
-      return 'Auto'
+      return 'Auto';
     case 'iterm2':
       return (
         <Text>
           iTerm2 <Text dimColor>(OSC 9)</Text>
         </Text>
-      )
+      );
     case 'terminal_bell':
       return (
         <Text>
           Terminal Bell <Text dimColor>(\a)</Text>
         </Text>
-      )
+      );
     case 'kitty':
       return (
         <Text>
           Kitty <Text dimColor>(OSC 99)</Text>
         </Text>
-      )
+      );
     case 'ghostty':
       return (
         <Text>
           Ghostty <Text dimColor>(OSC 777)</Text>
         </Text>
-      )
+      );
     case 'iterm2_with_bell':
-      return 'iTerm2 w/ Bell'
+      return 'iTerm2 w/ Bell';
     case 'notifications_disabled':
-      return 'Disabled'
+      return 'Disabled';
     default:
-      return value
+      return value;
   }
 }
diff --git a/src/components/Settings/Settings.tsx b/src/components/Settings/Settings.tsx
index 5ac172891..5313e5d01 100644
--- a/src/components/Settings/Settings.tsx
+++ b/src/components/Settings/Settings.tsx
@@ -1,41 +1,28 @@
 // biome-ignore-all assist/source/organizeImports: ANT-ONLY import markers must not be reordered
-import * as React from 'react'
-import { Suspense, useState } from 'react'
-import { useKeybinding } from '../../keybindings/useKeybinding.js'
-import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js'
-import { useTerminalSize } from '../../hooks/useTerminalSize.js'
-import {
-  useIsInsideModal,
-  useModalOrTerminalSize,
-} from '../../context/modalContext.js'
-import { Pane, Tab, Tabs } from '@anthropic/ink'
-import { Status, buildDiagnostics } from './Status.js'
-import { Config } from './Config.js'
-import { Usage } from './Usage.js'
-import type {
-  LocalJSXCommandContext,
-  CommandResultDisplay,
-} from '../../commands.js'
+import * as React from 'react';
+import { Suspense, useState } from 'react';
+import { useKeybinding } from '../../keybindings/useKeybinding.js';
+import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js';
+import { useTerminalSize } from '../../hooks/useTerminalSize.js';
+import { useIsInsideModal, useModalOrTerminalSize } from '../../context/modalContext.js';
+import { Pane, Tab, Tabs } from '@anthropic/ink';
+import { Status, buildDiagnostics } from './Status.js';
+import { Config } from './Config.js';
+import { Usage } from './Usage.js';
+import type { LocalJSXCommandContext, CommandResultDisplay } from '../../commands.js';
 
 type Props = {
-  onClose: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-  context: LocalJSXCommandContext
-  defaultTab: 'Status' | 'Config' | 'Usage'
-}
+  onClose: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+  context: LocalJSXCommandContext;
+  defaultTab: 'Status' | 'Config' | 'Usage';
+};
 
-export function Settings({
-  onClose,
-  context,
-  defaultTab,
-}: Props): React.ReactNode {
-  const [selectedTab, setSelectedTab] = useState<string>(defaultTab)
-  const [tabsHidden, setTabsHidden] = useState(false)
+export function Settings({ onClose, context, defaultTab }: Props): React.ReactNode {
+  const [selectedTab, setSelectedTab] = useState<string>(defaultTab);
+  const [tabsHidden, setTabsHidden] = useState(false);
   // True while Config's own Esc handler is active (search mode with content
   // focused). Settings must cede Esc so search can clear/exit first.
-  const [configOwnsEsc, setConfigOwnsEsc] = useState(false)
+  const [configOwnsEsc, setConfigOwnsEsc] = useState(false);
   // Fixed content height so switching tabs doesn't shift the pane height.
   // Outside modals cap at min(80% viewport, 30). Inside a Modal the modal's
   // innerSize.rows IS the ScrollBox viewport — the 0.8 multiplier over-
@@ -45,40 +32,34 @@ export function Settings({
   // marginY={1} (2 rows) which is stripped inside modals → +2 to recover.
   // Then -2 for Tabs' header row + its marginTop=1. Plus +1 observed gap
   // from the paneCap-10 estimate being slightly generous. Net: rows + 1.
-  const insideModal = useIsInsideModal()
-  const { rows } = useModalOrTerminalSize(useTerminalSize())
-  const contentHeight = insideModal
-    ? rows + 1
-    : Math.max(15, Math.min(Math.floor(rows * 0.8), 30))
+  const insideModal = useIsInsideModal();
+  const { rows } = useModalOrTerminalSize(useTerminalSize());
+  const contentHeight = insideModal ? rows + 1 : Math.max(15, Math.min(Math.floor(rows * 0.8), 30));
   // Kick off diagnostics once when the pane opens. Status use()s this so
   // it resolves once per /config invocation — no re-fetch flash when
   // tabbing back to Status (Tab unmounts children when not selected).
-  const [diagnosticsPromise] = useState(() =>
-    buildDiagnostics().catch(() => []),
-  )
+  const [diagnosticsPromise] = useState(() => buildDiagnostics().catch(() => []));
 
-  useExitOnCtrlCDWithKeybindings()
+  useExitOnCtrlCDWithKeybindings();
 
   // Handle escape via keybinding - only when not in submenu
   const handleEscape = () => {
     // Don't handle escape when a submenu is showing (tabsHidden means submenu is open)
     // Let the submenu handle escape to return to the main menu
     if (tabsHidden) {
-      return
+      return;
     }
     // TODO: Update to "Settings" dialog once we define '/settings'.
-    onClose('Status dialog dismissed', { display: 'system' })
-  }
+    onClose('Status dialog dismissed', { display: 'system' });
+  };
 
   // Disable when submenu is open so the submenu's Dialog can handle ESC,
   // and when Config's search mode is active so its useInput handler
   // (clear query → exit search) processes Escape first.
   useKeybinding('confirm:no', handleEscape, {
     context: 'Settings',
-    isActive:
-      !tabsHidden &&
-      !(selectedTab === 'Config' && configOwnsEsc),
-  })
+    isActive: !tabsHidden && !(selectedTab === 'Config' && configOwnsEsc),
+  });
 
   const tabs = [
     <Tab key="status" title="Status">
@@ -98,7 +79,7 @@ export function Settings({
     <Tab key="usage" title="Usage">
       <Usage />
     </Tab>,
-  ]
+  ];
 
   return (
     <Pane color="permission">
@@ -119,5 +100,5 @@ export function Settings({
         {tabs}
       </Tabs>
     </Pane>
-  )
+  );
 }
diff --git a/src/components/Settings/Status.tsx b/src/components/Settings/Status.tsx
index acadfcc06..8c1771c9a 100644
--- a/src/components/Settings/Status.tsx
+++ b/src/components/Settings/Status.tsx
@@ -1,13 +1,13 @@
-import figures from 'figures'
-import * as React from 'react'
-import { Suspense, use } from 'react'
-import { getSessionId } from '../../bootstrap/state.js'
-import type { LocalJSXCommandContext } from '../../commands.js'
-import { useIsInsideModal } from '../../context/modalContext.js'
-import { Box, Text, useTheme } from '@anthropic/ink'
-import { type AppState, useAppState } from '../../state/AppState.js'
-import { getCwd } from '../../utils/cwd.js'
-import { getCurrentSessionTitle } from '../../utils/sessionStorage.js'
+import figures from 'figures';
+import * as React from 'react';
+import { Suspense, use } from 'react';
+import { getSessionId } from '../../bootstrap/state.js';
+import type { LocalJSXCommandContext } from '../../commands.js';
+import { useIsInsideModal } from '../../context/modalContext.js';
+import { Box, Text, useTheme } from '@anthropic/ink';
+import { type AppState, useAppState } from '../../state/AppState.js';
+import { getCwd } from '../../utils/cwd.js';
+import { getCurrentSessionTitle } from '../../utils/sessionStorage.js';
 import {
   buildAccountProperties,
   buildAPIProviderProperties,
@@ -21,19 +21,19 @@ import {
   type Diagnostic,
   getModelDisplayLabel,
   type Property,
-} from '../../utils/status.js'
-import type { ThemeName } from '../../utils/theme.js'
-import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js'
+} from '../../utils/status.js';
+import type { ThemeName } from '../../utils/theme.js';
+import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js';
 
 type Props = {
-  context: LocalJSXCommandContext
-  diagnosticsPromise: Promise<Diagnostic[]>
-}
+  context: LocalJSXCommandContext;
+  diagnosticsPromise: Promise<Diagnostic[]>;
+};
 
 function buildPrimarySection(): Property[] {
-  const sessionId = getSessionId()
-  const customTitle = getCurrentSessionTitle(sessionId)
-  const nameValue = customTitle ?? <Text dimColor>/rename to add a name</Text>
+  const sessionId = getSessionId();
+  const customTitle = getCurrentSessionTitle(sessionId);
+  const nameValue = customTitle ?? <Text dimColor>/rename to add a name</Text>;
 
   return [
     { label: 'Version', value: MACRO.VERSION },
@@ -42,7 +42,7 @@ function buildPrimarySection(): Property[] {
     { label: 'cwd', value: getCwd() },
     ...buildAccountProperties(),
     ...buildAPIProviderProperties(),
-  ]
+  ];
 }
 
 function buildSecondarySection({
@@ -51,24 +51,20 @@ function buildSecondarySection({
   theme,
   context,
 }: {
-  mainLoopModel: AppState['mainLoopModel']
-  mcp: AppState['mcp']
-  theme: ThemeName
-  context: LocalJSXCommandContext
+  mainLoopModel: AppState['mainLoopModel'];
+  mcp: AppState['mcp'];
+  theme: ThemeName;
+  context: LocalJSXCommandContext;
 }): Property[] {
-  const modelLabel = getModelDisplayLabel(mainLoopModel)
+  const modelLabel = getModelDisplayLabel(mainLoopModel);
 
   return [
     { label: 'Model', value: modelLabel },
-    ...buildIDEProperties(
-      mcp.clients,
-      context.options.ideInstallationStatus,
-      theme,
-    ),
+    ...buildIDEProperties(mcp.clients, context.options.ideInstallationStatus, theme),
     ...buildMcpProperties(mcp.clients, theme),
     ...buildSandboxProperties(),
     ...buildSettingSourcesProperties(),
-  ]
+  ];
 }
 
 export async function buildDiagnostics(): Promise<Diagnostic[]> {
@@ -76,14 +72,10 @@ export async function buildDiagnostics(): Promise<Diagnostic[]> {
     ...(await buildInstallationDiagnostics()),
     ...(await buildInstallationHealthDiagnostics()),
     ...(await buildMemoryDiagnostics()),
-  ]
+  ];
 }
 
-function PropertyValue({
-  value,
-}: {
-  value: Property['value']
-}): React.ReactNode {
+function PropertyValue({ value }: { value: Property['value'] }): React.ReactNode {
   if (Array.isArray(value)) {
     return (
       <Box flexWrap="wrap" columnGap={1} flexShrink={99}>
@@ -93,38 +85,32 @@ function PropertyValue({
               {item}
               {i < value.length - 1 ? ',' : ''}
             </Text>
-          )
+          );
         })}
       </Box>
-    )
+    );
   }
 
   if (typeof value === 'string') {
-    return <Text>{value}</Text>
+    return <Text>{value}</Text>;
   }
 
-  return value
+  return value;
 }
 
-export function Status({
-  context,
-  diagnosticsPromise,
-}: Props): React.ReactNode {
-  const mainLoopModel = useAppState(s => s.mainLoopModel)
-  const mcp = useAppState(s => s.mcp)
-  const [theme] = useTheme()
+export function Status({ context, diagnosticsPromise }: Props): React.ReactNode {
+  const mainLoopModel = useAppState(s => s.mainLoopModel);
+  const mcp = useAppState(s => s.mcp);
+  const [theme] = useTheme();
 
   // Sections are synchronous — compute in render so they're never empty.
   // diagnosticsPromise is created once in Settings.tsx so it resolves once
   // per pane invocation instead of re-fetching on every tab switch (Tab
   // unmounts children when not selected, which was causing the flash).
   const sections = React.useMemo(
-    () => [
-      buildPrimarySection(),
-      buildSecondarySection({ mainLoopModel, mcp, theme, context }),
-    ],
+    () => [buildPrimarySection(), buildSecondarySection({ mainLoopModel, mcp, theme, context })],
     [mainLoopModel, mcp, theme, context],
-  )
+  );
 
   // flexGrow so the "Esc to cancel" footer pins to the bottom of the
   // Modal's inner ScrollBox when content is short. The ScrollBox content
@@ -132,7 +118,7 @@ export function Status({
   // to match. Without it, short Status content floats at the top and the
   // footer sits mid-modal with 2-3 trailing blank rows below. Outside a
   // Modal (non-fullscreen), leave layout alone — no ScrollBox to fill.
-  const grow = useIsInsideModal() ? 1 : undefined
+  const grow = useIsInsideModal() ? 1 : undefined;
 
   return (
     <Box flexDirection="column" flexGrow={grow}>
@@ -156,37 +142,24 @@ export function Status({
         </Suspense>
       </Box>
       <Text dimColor>
-        <ConfigurableShortcutHint
-          action="confirm:no"
-          context="Settings"
-          fallback="Esc"
-          description="cancel"
-        />
+        <ConfigurableShortcutHint action="confirm:no" context="Settings" fallback="Esc" description="cancel" />
       </Text>
     </Box>
-  )
+  );
 }
 
-function Diagnostics({
-  promise,
-}: {
-  promise: Promise<Diagnostic[]>
-}): React.ReactNode {
-  const diagnostics = use(promise)
-  if (diagnostics.length === 0) return null
+function Diagnostics({ promise }: { promise: Promise<Diagnostic[]> }): React.ReactNode {
+  const diagnostics = use(promise);
+  if (diagnostics.length === 0) return null;
   return (
     <Box flexDirection="column" paddingBottom={1}>
       <Text bold>System Diagnostics</Text>
       {diagnostics.map((diagnostic, i) => (
         <Box key={i} flexDirection="row" gap={1} paddingX={1}>
           <Text color="error">{figures.warning}</Text>
-          {typeof diagnostic === 'string' ? (
-            <Text wrap="wrap">{diagnostic}</Text>
-          ) : (
-            diagnostic
-          )}
+          {typeof diagnostic === 'string' ? <Text wrap="wrap">{diagnostic}</Text> : diagnostic}
         </Box>
       ))}
     </Box>
-  )
+  );
 }
diff --git a/src/components/Settings/Usage.tsx b/src/components/Settings/Usage.tsx
index 403e050eb..a36553aeb 100644
--- a/src/components/Settings/Usage.tsx
+++ b/src/components/Settings/Usage.tsx
@@ -1,65 +1,51 @@
-import * as React from 'react'
-import { useEffect, useState } from 'react'
-import { extraUsage as extraUsageCommand } from 'src/commands/extra-usage/index.js'
-import { formatCost } from 'src/cost-tracker.js'
-import { getSubscriptionType } from 'src/utils/auth.js'
-import { useTerminalSize } from '../../hooks/useTerminalSize.js'
-import { Box, Text } from '@anthropic/ink'
-import { useKeybinding } from '../../keybindings/useKeybinding.js'
-import {
-  type ExtraUsage,
-  fetchUtilization,
-  type RateLimit,
-  type Utilization,
-} from '../../services/api/usage.js'
-import { formatResetText } from '../../utils/format.js'
-import { logError } from '../../utils/log.js'
-import { jsonStringify } from '../../utils/slowOperations.js'
-import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js'
-import { Byline, ProgressBar } from '@anthropic/ink'
-import {
-  isEligibleForOverageCreditGrant,
-  OverageCreditUpsell,
-} from '../LogoV2/OverageCreditUpsell.js'
+import * as React from 'react';
+import { useEffect, useState } from 'react';
+import { extraUsage as extraUsageCommand } from 'src/commands/extra-usage/index.js';
+import { formatCost } from 'src/cost-tracker.js';
+import { getSubscriptionType } from 'src/utils/auth.js';
+import { useTerminalSize } from '../../hooks/useTerminalSize.js';
+import { Box, Text } from '@anthropic/ink';
+import { useKeybinding } from '../../keybindings/useKeybinding.js';
+import { type ExtraUsage, fetchUtilization, type RateLimit, type Utilization } from '../../services/api/usage.js';
+import { formatResetText } from '../../utils/format.js';
+import { logError } from '../../utils/log.js';
+import { jsonStringify } from '../../utils/slowOperations.js';
+import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js';
+import { Byline, ProgressBar } from '@anthropic/ink';
+import { isEligibleForOverageCreditGrant, OverageCreditUpsell } from '../LogoV2/OverageCreditUpsell.js';
 
 type LimitBarProps = {
-  title: string
-  limit: RateLimit
-  maxWidth: number
-  showTimeInReset?: boolean
-  extraSubtext?: string
-}
+  title: string;
+  limit: RateLimit;
+  maxWidth: number;
+  showTimeInReset?: boolean;
+  extraSubtext?: string;
+};
 
-function LimitBar({
-  title,
-  limit,
-  maxWidth,
-  showTimeInReset = true,
-  extraSubtext,
-}: LimitBarProps): React.ReactNode {
-  const { utilization, resets_at } = limit
+function LimitBar({ title, limit, maxWidth, showTimeInReset = true, extraSubtext }: LimitBarProps): React.ReactNode {
+  const { utilization, resets_at } = limit;
   if (utilization === null) {
-    return null
+    return null;
   }
 
   // Calculate usage percentage
-  const usedText = `${Math.floor(utilization)}% used`
+  const usedText = `${Math.floor(utilization)}% used`;
 
-  let subtext: string | undefined
+  let subtext: string | undefined;
   if (resets_at) {
-    subtext = `Resets ${formatResetText(resets_at, true, showTimeInReset)}`
+    subtext = `Resets ${formatResetText(resets_at, true, showTimeInReset)}`;
   }
 
   if (extraSubtext) {
     if (subtext) {
-      subtext = `${extraSubtext} · ${subtext}`
+      subtext = `${extraSubtext} · ${subtext}`;
     } else {
-      subtext = extraSubtext
+      subtext = extraSubtext;
     }
   }
 
-  const maxBarWidth = 50
-  const usedLabelSpace = 12
+  const maxBarWidth = 50;
+  const usedLabelSpace = 12;
   if (maxWidth >= maxBarWidth + usedLabelSpace) {
     return (
       <Box flexDirection="column">
@@ -75,7 +61,7 @@ function LimitBar({
         </Box>
         {subtext && <Text dimColor>{subtext}</Text>}
       </Box>
-    )
+    );
   } else {
     return (
       <Box flexDirection="column">
@@ -96,52 +82,46 @@ function LimitBar({
         />
         <Text>{usedText}</Text>
       </Box>
-    )
+    );
   }
 }
 
 export function Usage(): React.ReactNode {
-  const [utilization, setUtilization] = useState<Utilization | null>(null)
-  const [error, setError] = useState<string | null>(null)
-  const [isLoading, setIsLoading] = useState(true)
-  const { columns } = useTerminalSize()
+  const [utilization, setUtilization] = useState<Utilization | null>(null);
+  const [error, setError] = useState<string | null>(null);
+  const [isLoading, setIsLoading] = useState(true);
+  const { columns } = useTerminalSize();
 
-  const availableWidth = columns - 2 // 2 for screen padding
-  const maxWidth = Math.min(availableWidth, 80)
+  const availableWidth = columns - 2; // 2 for screen padding
+  const maxWidth = Math.min(availableWidth, 80);
 
   const loadUtilization = React.useCallback(async () => {
-    setIsLoading(true)
-    setError(null)
+    setIsLoading(true);
+    setError(null);
     try {
-      const data = await fetchUtilization()
-      setUtilization(data)
+      const data = await fetchUtilization();
+      setUtilization(data);
     } catch (err) {
-      logError(err as Error)
-      const axiosError = err as { response?: { data?: unknown } }
-      const responseBody = axiosError.response?.data
-        ? jsonStringify(axiosError.response.data)
-        : undefined
-      setError(
-        responseBody
-          ? `Failed to load usage data: ${responseBody}`
-          : 'Failed to load usage data',
-      )
+      logError(err as Error);
+      const axiosError = err as { response?: { data?: unknown } };
+      const responseBody = axiosError.response?.data ? jsonStringify(axiosError.response.data) : undefined;
+      setError(responseBody ? `Failed to load usage data: ${responseBody}` : 'Failed to load usage data');
     } finally {
-      setIsLoading(false)
+      setIsLoading(false);
     }
-  }, [])
+  }, []);
 
   useEffect(() => {
-    void loadUtilization()
-  }, [loadUtilization])
+    void loadUtilization();
+  }, [loadUtilization]);
 
   useKeybinding(
     'settings:retry',
     () => {
-      void loadUtilization()
+      void loadUtilization();
     },
     { context: 'Settings', isActive: !!error && !isLoading },
-  )
+  );
 
   if (error) {
     return (
@@ -149,22 +129,12 @@ export function Usage(): React.ReactNode {
         <Text color="error">Error: {error}</Text>
         <Text dimColor>
           <Byline>
-            <ConfigurableShortcutHint
-              action="settings:retry"
-              context="Settings"
-              fallback="r"
-              description="retry"
-            />
-            <ConfigurableShortcutHint
-              action="confirm:no"
-              context="Settings"
-              fallback="Esc"
-              description="cancel"
-            />
+            <ConfigurableShortcutHint action="settings:retry" context="Settings" fallback="r" description="retry" />
+            <ConfigurableShortcutHint action="confirm:no" context="Settings" fallback="Esc" description="cancel" />
           </Byline>
         </Text>
       </Box>
-    )
+    );
   }
 
   if (!utilization) {
@@ -172,26 +142,18 @@ export function Usage(): React.ReactNode {
       <Box flexDirection="column" gap={1}>
         <Text dimColor>Loading usage data…</Text>
         <Text dimColor>
-          <ConfigurableShortcutHint
-            action="confirm:no"
-            context="Settings"
-            fallback="Esc"
-            description="cancel"
-          />
+          <ConfigurableShortcutHint action="confirm:no" context="Settings" fallback="Esc" description="cancel" />
         </Text>
       </Box>
-    )
+    );
   }
 
   // Only Max and Team plans have a Sonnet limit that differs from the weekly
   // limit (see rateLimitMessages.ts). For other plans the bar is redundant.
   // Show for null (unknown plan) to stay consistent with rateLimitMessages.ts,
   // which labels it "Sonnet limit" in that case.
-  const subscriptionType = getSubscriptionType()
-  const showSonnetBar =
-    subscriptionType === 'max' ||
-    subscriptionType === 'team' ||
-    subscriptionType === null
+  const subscriptionType = getSubscriptionType();
+  const showSonnetBar = subscriptionType === 'max' || subscriptionType === 'team' || subscriptionType === null;
 
   const limits = [
     {
@@ -210,65 +172,40 @@ export function Usage(): React.ReactNode {
           },
         ]
       : []),
-  ]
+  ];
 
   return (
     <Box flexDirection="column" gap={1} width="100%">
-      {limits.some(({ limit }) => limit) || (
-        <Text dimColor>/usage is only available for subscription plans.</Text>
-      )}
+      {limits.some(({ limit }) => limit) || <Text dimColor>/usage is only available for subscription plans.</Text>}
 
       {limits.map(
-        ({ title, limit }) =>
-          limit && (
-            <LimitBar
-              key={title}
-              title={title}
-              limit={limit}
-              maxWidth={maxWidth}
-            />
-          ),
+        ({ title, limit }) => limit && <LimitBar key={title} title={title} limit={limit} maxWidth={maxWidth} />,
       )}
 
-      {utilization.extra_usage && (
-        <ExtraUsageSection
-          extraUsage={utilization.extra_usage}
-          maxWidth={maxWidth}
-        />
-      )}
+      {utilization.extra_usage && <ExtraUsageSection extraUsage={utilization.extra_usage} maxWidth={maxWidth} />}
 
-      {isEligibleForOverageCreditGrant() && (
-        <OverageCreditUpsell maxWidth={maxWidth} />
-      )}
+      {isEligibleForOverageCreditGrant() && <OverageCreditUpsell maxWidth={maxWidth} />}
 
       <Text dimColor>
-        <ConfigurableShortcutHint
-          action="confirm:no"
-          context="Settings"
-          fallback="Esc"
-          description="cancel"
-        />
+        <ConfigurableShortcutHint action="confirm:no" context="Settings" fallback="Esc" description="cancel" />
       </Text>
     </Box>
-  )
+  );
 }
 
 type ExtraUsageSectionProps = {
-  extraUsage: ExtraUsage
-  maxWidth: number
-}
+  extraUsage: ExtraUsage;
+  maxWidth: number;
+};
 
-const EXTRA_USAGE_SECTION_TITLE = 'Extra usage'
+const EXTRA_USAGE_SECTION_TITLE = 'Extra usage';
 
-function ExtraUsageSection({
-  extraUsage,
-  maxWidth,
-}: ExtraUsageSectionProps): React.ReactNode {
-  const subscriptionType = getSubscriptionType()
-  const isProOrMax = subscriptionType === 'pro' || subscriptionType === 'max'
+function ExtraUsageSection({ extraUsage, maxWidth }: ExtraUsageSectionProps): React.ReactNode {
+  const subscriptionType = getSubscriptionType();
+  const isProOrMax = subscriptionType === 'pro' || subscriptionType === 'max';
   if (!isProOrMax) {
     // Only show to Pro and Max, consistent with claude.ai non-admin usage settings
-    return false
+    return false;
   }
 
   if (!extraUsage.is_enabled) {
@@ -278,10 +215,10 @@ function ExtraUsageSection({
           <Text bold>{EXTRA_USAGE_SECTION_TITLE}</Text>
           <Text dimColor>Extra usage not enabled · /extra-usage to enable</Text>
         </Box>
-      )
+      );
     }
 
-    return null
+    return null;
   }
 
   if (extraUsage.monthly_limit === null) {
@@ -290,20 +227,17 @@ function ExtraUsageSection({
         <Text bold>{EXTRA_USAGE_SECTION_TITLE}</Text>
         <Text dimColor>Unlimited</Text>
       </Box>
-    )
+    );
   }
 
-  if (
-    typeof extraUsage.used_credits !== 'number' ||
-    typeof extraUsage.utilization !== 'number'
-  ) {
-    return null
+  if (typeof extraUsage.used_credits !== 'number' || typeof extraUsage.utilization !== 'number') {
+    return null;
   }
 
-  const formattedUsedCredits = formatCost(extraUsage.used_credits / 100, 2)
-  const formattedMonthlyLimit = formatCost(extraUsage.monthly_limit / 100, 2)
-  const now = new Date()
-  const oneMonthReset = new Date(now.getFullYear(), now.getMonth() + 1, 1)
+  const formattedUsedCredits = formatCost(extraUsage.used_credits / 100, 2);
+  const formattedMonthlyLimit = formatCost(extraUsage.monthly_limit / 100, 2);
+  const now = new Date();
+  const oneMonthReset = new Date(now.getFullYear(), now.getMonth() + 1, 1);
 
   return (
     <LimitBar
@@ -317,5 +251,5 @@ function ExtraUsageSection({
       extraSubtext={`${formattedUsedCredits} / ${formattedMonthlyLimit} spent`}
       maxWidth={maxWidth}
     />
-  )
+  );
 }
diff --git a/src/components/Settings/src/commands/extra-usage/index.ts b/src/components/Settings/src/commands/extra-usage/index.ts
index 981d9a598..6bcb018f0 100644
--- a/src/components/Settings/src/commands/extra-usage/index.ts
+++ b/src/components/Settings/src/commands/extra-usage/index.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type extraUsage = any;
+export type extraUsage = any
diff --git a/src/components/Settings/src/constants/outputStyles.ts b/src/components/Settings/src/constants/outputStyles.ts
index 42c1edbfa..bd22fa5e4 100644
--- a/src/components/Settings/src/constants/outputStyles.ts
+++ b/src/components/Settings/src/constants/outputStyles.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type DEFAULT_OUTPUT_STYLE_NAME = any;
+export type DEFAULT_OUTPUT_STYLE_NAME = any
diff --git a/src/components/Settings/src/cost-tracker.ts b/src/components/Settings/src/cost-tracker.ts
index 135cea9b7..e5bd62225 100644
--- a/src/components/Settings/src/cost-tracker.ts
+++ b/src/components/Settings/src/cost-tracker.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type formatCost = any;
+export type formatCost = any
diff --git a/src/components/Settings/src/services/analytics/index.ts b/src/components/Settings/src/services/analytics/index.ts
index ce0a9a827..eca4493cf 100644
--- a/src/components/Settings/src/services/analytics/index.ts
+++ b/src/components/Settings/src/services/analytics/index.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type logEvent = any;
-export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any;
+export type logEvent = any
+export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any
diff --git a/src/components/Settings/src/utils/auth.ts b/src/components/Settings/src/utils/auth.ts
index d7b41ce38..4650ab01c 100644
--- a/src/components/Settings/src/utils/auth.ts
+++ b/src/components/Settings/src/utils/auth.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getSubscriptionType = any;
+export type getSubscriptionType = any
diff --git a/src/components/Settings/src/utils/claudemd.ts b/src/components/Settings/src/utils/claudemd.ts
index 1ebadee7b..cf6f52066 100644
--- a/src/components/Settings/src/utils/claudemd.ts
+++ b/src/components/Settings/src/utils/claudemd.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type getExternalClaudeMdIncludes = any;
-export type getMemoryFiles = any;
-export type hasExternalClaudeMdIncludes = any;
+export type getExternalClaudeMdIncludes = any
+export type getMemoryFiles = any
+export type hasExternalClaudeMdIncludes = any
diff --git a/src/components/Settings/src/utils/envUtils.ts b/src/components/Settings/src/utils/envUtils.ts
index 04dde7791..0ca4dbf6e 100644
--- a/src/components/Settings/src/utils/envUtils.ts
+++ b/src/components/Settings/src/utils/envUtils.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type isEnvTruthy = any;
-export type isRunningOnHomespace = any;
+export type isEnvTruthy = any
+export type isRunningOnHomespace = any
diff --git a/src/components/ShowInIDEPrompt.tsx b/src/components/ShowInIDEPrompt.tsx
index e522cc6ae..865f5db57 100644
--- a/src/components/ShowInIDEPrompt.tsx
+++ b/src/components/ShowInIDEPrompt.tsx
@@ -1,29 +1,29 @@
-import { basename, relative } from 'path'
-import React from 'react'
-import { Box, Text, Pane } from '@anthropic/ink'
-import { getCwd } from '../utils/cwd.js'
-import { isSupportedVSCodeTerminal } from '../utils/ide.js'
-import { Select } from './CustomSelect/index.js'
+import { basename, relative } from 'path';
+import React from 'react';
+import { Box, Text, Pane } from '@anthropic/ink';
+import { getCwd } from '../utils/cwd.js';
+import { isSupportedVSCodeTerminal } from '../utils/ide.js';
+import { Select } from './CustomSelect/index.js';
 import type {
   PermissionOption,
   PermissionOptionWithLabel,
-} from './permissions/FilePermissionDialog/permissionOptions.js'
+} from './permissions/FilePermissionDialog/permissionOptions.js';
 
 type Props<A> = {
-  filePath: string
-  input: A
-  onChange: (option: PermissionOption, args: A, feedback?: string) => void
-  options: PermissionOptionWithLabel[]
-  ideName: string
-  symlinkTarget?: string | null
-  rejectFeedback: string
-  acceptFeedback: string
-  setFocusedOption: (value: string) => void
-  onInputModeToggle: (value: string) => void
-  focusedOption: string
-  yesInputMode: boolean
-  noInputMode: boolean
-}
+  filePath: string;
+  input: A;
+  onChange: (option: PermissionOption, args: A, feedback?: string) => void;
+  options: PermissionOptionWithLabel[];
+  ideName: string;
+  symlinkTarget?: string | null;
+  rejectFeedback: string;
+  acceptFeedback: string;
+  setFocusedOption: (value: string) => void;
+  onInputModeToggle: (value: string) => void;
+  focusedOption: string;
+  yesInputMode: boolean;
+  noInputMode: boolean;
+};
 
 export function ShowInIDEPrompt<A>({
   onChange,
@@ -53,33 +53,30 @@ export function ShowInIDEPrompt<A>({
               : `Symlink target: ${symlinkTarget}`}
           </Text>
         )}
-        {isSupportedVSCodeTerminal() && (
-          <Text dimColor>Save file to continue…</Text>
-        )}
+        {isSupportedVSCodeTerminal() && <Text dimColor>Save file to continue…</Text>}
         <Box flexDirection="column">
           <Text>
-            Do you want to make this edit to{' '}
-            <Text bold>{basename(filePath)}</Text>?
+            Do you want to make this edit to <Text bold>{basename(filePath)}</Text>?
           </Text>
           <Select
             options={options}
             inlineDescriptions
             onChange={value => {
-              const selected = options.find(opt => opt.value === value)
+              const selected = options.find(opt => opt.value === value);
               if (selected) {
                 // For reject option
                 if (selected.option.type === 'reject') {
-                  const trimmedFeedback = rejectFeedback.trim()
-                  onChange(selected.option, input, trimmedFeedback || undefined)
-                  return
+                  const trimmedFeedback = rejectFeedback.trim();
+                  onChange(selected.option, input, trimmedFeedback || undefined);
+                  return;
                 }
                 // For accept-once option, pass accept feedback if present
                 if (selected.option.type === 'accept-once') {
-                  const trimmedFeedback = acceptFeedback.trim()
-                  onChange(selected.option, input, trimmedFeedback || undefined)
-                  return
+                  const trimmedFeedback = acceptFeedback.trim();
+                  onChange(selected.option, input, trimmedFeedback || undefined);
+                  return;
                 }
-                onChange(selected.option, input)
+                onChange(selected.option, input);
               }
             }}
             onCancel={() => onChange({ type: 'reject' }, input)}
@@ -90,12 +87,11 @@ export function ShowInIDEPrompt<A>({
         <Box marginTop={1}>
           <Text dimColor>
             Esc to cancel
-            {((focusedOption === 'yes' && !yesInputMode) ||
-              (focusedOption === 'no' && !noInputMode)) &&
+            {((focusedOption === 'yes' && !yesInputMode) || (focusedOption === 'no' && !noInputMode)) &&
               ' · Tab to amend'}
           </Text>
         </Box>
       </Box>
     </Pane>
-  )
+  );
 }
diff --git a/src/components/SkillImprovementSurvey.tsx b/src/components/SkillImprovementSurvey.tsx
index ad7b09147..7d9e7ae52 100644
--- a/src/components/SkillImprovementSurvey.tsx
+++ b/src/components/SkillImprovementSurvey.tsx
@@ -1,19 +1,19 @@
-import React, { useEffect, useRef } from 'react'
-import { BLACK_CIRCLE, BULLET_OPERATOR } from '../constants/figures.js'
-import { Box, Text } from '@anthropic/ink'
-import type { SkillUpdate } from '../utils/hooks/skillImprovement.js'
-import { normalizeFullWidthDigits } from '../utils/stringUtils.js'
-import { isValidResponseInput } from './FeedbackSurvey/FeedbackSurveyView.js'
-import type { FeedbackSurveyResponse } from './FeedbackSurvey/utils.js'
+import React, { useEffect, useRef } from 'react';
+import { BLACK_CIRCLE, BULLET_OPERATOR } from '../constants/figures.js';
+import { Box, Text } from '@anthropic/ink';
+import type { SkillUpdate } from '../utils/hooks/skillImprovement.js';
+import { normalizeFullWidthDigits } from '../utils/stringUtils.js';
+import { isValidResponseInput } from './FeedbackSurvey/FeedbackSurveyView.js';
+import type { FeedbackSurveyResponse } from './FeedbackSurvey/utils.js';
 
 type Props = {
-  isOpen: boolean
-  skillName: string
-  updates: SkillUpdate[]
-  handleSelect: (selected: FeedbackSurveyResponse) => void
-  inputValue: string
-  setInputValue: (value: string) => void
-}
+  isOpen: boolean;
+  skillName: string;
+  updates: SkillUpdate[];
+  handleSelect: (selected: FeedbackSurveyResponse) => void;
+  inputValue: string;
+  setInputValue: (value: string) => void;
+};
 
 export function SkillImprovementSurvey({
   isOpen,
@@ -24,12 +24,12 @@ export function SkillImprovementSurvey({
   setInputValue,
 }: Props): React.ReactNode {
   if (!isOpen) {
-    return null
+    return null;
   }
 
   // Hide the survey if the user is typing anything other than a survey response
   if (inputValue && !isValidResponseInput(inputValue)) {
-    return null
+    return null;
   }
 
   return (
@@ -40,22 +40,22 @@ export function SkillImprovementSurvey({
       inputValue={inputValue}
       setInputValue={setInputValue}
     />
-  )
+  );
 }
 
 type ViewProps = {
-  skillName: string
-  updates: SkillUpdate[]
-  onSelect: (option: FeedbackSurveyResponse) => void
-  inputValue: string
-  setInputValue: (value: string) => void
-}
+  skillName: string;
+  updates: SkillUpdate[];
+  onSelect: (option: FeedbackSurveyResponse) => void;
+  inputValue: string;
+  setInputValue: (value: string) => void;
+};
 
 // Only 1 (apply) and 0 (dismiss) are valid for this survey
-const VALID_INPUTS = ['0', '1'] as const
+const VALID_INPUTS = ['0', '1'] as const;
 
 function isValidInput(input: string): boolean {
-  return (VALID_INPUTS as readonly string[]).includes(input)
+  return (VALID_INPUTS as readonly string[]).includes(input);
 }
 
 function SkillImprovementSurveyView({
@@ -65,26 +65,24 @@ function SkillImprovementSurveyView({
   inputValue,
   setInputValue,
 }: ViewProps): React.ReactNode {
-  const initialInputValue = useRef(inputValue)
+  const initialInputValue = useRef(inputValue);
 
   useEffect(() => {
     if (inputValue !== initialInputValue.current) {
-      const lastChar = normalizeFullWidthDigits(inputValue.slice(-1))
+      const lastChar = normalizeFullWidthDigits(inputValue.slice(-1));
       if (isValidInput(lastChar)) {
-        setInputValue(inputValue.slice(0, -1))
+        setInputValue(inputValue.slice(0, -1));
         // Map: 1 = "good" (apply), 0 = "dismissed"
-        onSelect(lastChar === '1' ? 'good' : 'dismissed')
+        onSelect(lastChar === '1' ? 'good' : 'dismissed');
       }
     }
-  }, [inputValue, onSelect, setInputValue])
+  }, [inputValue, onSelect, setInputValue]);
 
   return (
     <Box flexDirection="column" marginTop={1}>
       <Box>
         <Text color="ansi:cyan">{BLACK_CIRCLE} </Text>
-        <Text bold>
-          Skill improvement suggested for &quot;{skillName}&quot;
-        </Text>
+        <Text bold>Skill improvement suggested for &quot;{skillName}&quot;</Text>
       </Box>
 
       <Box flexDirection="column" marginLeft={2}>
@@ -108,5 +106,5 @@ function SkillImprovementSurveyView({
         </Box>
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/components/Spinner.tsx b/src/components/Spinner.tsx
index c2ebc9b67..fd3ce07bc 100644
--- a/src/components/Spinner.tsx
+++ b/src/components/Spinner.tsx
@@ -1,68 +1,53 @@
 // biome-ignore-all assist/source/organizeImports: ANT-ONLY import markers must not be reordered
-import { Box, Text, stringWidth } from '@anthropic/ink'
-import * as React from 'react'
-import { useEffect, useMemo, useRef, useState } from 'react'
-import {
-  computeGlimmerIndex,
-  computeShimmerSegments,
-  SHIMMER_INTERVAL_MS,
-} from '../bridge/bridgeStatusUtil.js'
-import { feature } from 'bun:bundle'
-import { getKairosActive, getUserMsgOptIn } from '../bootstrap/state.js'
-import { getFeatureValue_CACHED_MAY_BE_STALE } from '../services/analytics/growthbook.js'
-import { isEnvTruthy } from '../utils/envUtils.js'
-import { count } from '../utils/array.js'
-import sample from 'lodash-es/sample.js'
-import {
-  formatDuration,
-  formatNumber,
-  formatSecondsShort,
-} from '../utils/format.js'
-import type { Theme } from 'src/utils/theme.js'
-import { activityManager } from '../utils/activityManager.js'
-import { getSpinnerVerbs } from '../constants/spinnerVerbs.js'
-import { MessageResponse } from './MessageResponse.js'
-import { TaskListV2 } from './TaskListV2.js'
-import { useTasksV2 } from '../hooks/useTasksV2.js'
-import type { Task } from '../utils/tasks.js'
-import { useAppState } from '../state/AppState.js'
-import { useTerminalSize } from '../hooks/useTerminalSize.js'
-import { getDefaultCharacters, type SpinnerMode } from './Spinner/index.js'
-import { SpinnerAnimationRow } from './Spinner/SpinnerAnimationRow.js'
-import { useSettings } from '../hooks/useSettings.js'
-import { isInProcessTeammateTask } from '../tasks/InProcessTeammateTask/types.js'
-import { isBackgroundTask } from '../tasks/types.js'
-import { getAllInProcessTeammateTasks } from '../tasks/InProcessTeammateTask/InProcessTeammateTask.js'
-import { getEffortSuffix } from '../utils/effort.js'
-import { getMainLoopModel } from '../utils/model/model.js'
-import { getViewedTeammateTask } from '../state/selectors.js'
-import { TEARDROP_ASTERISK } from '../constants/figures.js'
-import figures from 'figures'
-import {
-  getCurrentTurnTokenBudget,
-  getTurnOutputTokens,
-} from '../bootstrap/state.js'
+import { Box, Text, stringWidth } from '@anthropic/ink';
+import * as React from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
+import { computeGlimmerIndex, computeShimmerSegments, SHIMMER_INTERVAL_MS } from '../bridge/bridgeStatusUtil.js';
+import { feature } from 'bun:bundle';
+import { getKairosActive, getUserMsgOptIn } from '../bootstrap/state.js';
+import { getFeatureValue_CACHED_MAY_BE_STALE } from '../services/analytics/growthbook.js';
+import { isEnvTruthy } from '../utils/envUtils.js';
+import { count } from '../utils/array.js';
+import sample from 'lodash-es/sample.js';
+import { formatDuration, formatNumber, formatSecondsShort } from '../utils/format.js';
+import type { Theme } from 'src/utils/theme.js';
+import { activityManager } from '../utils/activityManager.js';
+import { getSpinnerVerbs } from '../constants/spinnerVerbs.js';
+import { MessageResponse } from './MessageResponse.js';
+import { TaskListV2 } from './TaskListV2.js';
+import { useTasksV2 } from '../hooks/useTasksV2.js';
+import type { Task } from '../utils/tasks.js';
+import { useAppState } from '../state/AppState.js';
+import { useTerminalSize } from '../hooks/useTerminalSize.js';
+import { getDefaultCharacters, type SpinnerMode } from './Spinner/index.js';
+import { SpinnerAnimationRow } from './Spinner/SpinnerAnimationRow.js';
+import { useSettings } from '../hooks/useSettings.js';
+import { isInProcessTeammateTask } from '../tasks/InProcessTeammateTask/types.js';
+import { isBackgroundTask } from '../tasks/types.js';
+import { getAllInProcessTeammateTasks } from '../tasks/InProcessTeammateTask/InProcessTeammateTask.js';
+import { getEffortSuffix } from '../utils/effort.js';
+import { getMainLoopModel } from '../utils/model/model.js';
+import { getViewedTeammateTask } from '../state/selectors.js';
+import { TEARDROP_ASTERISK } from '../constants/figures.js';
+import figures from 'figures';
+import { getCurrentTurnTokenBudget, getTurnOutputTokens } from '../bootstrap/state.js';
 
-import { TeammateSpinnerTree } from './Spinner/TeammateSpinnerTree.js'
-import { useAnimationFrame } from '@anthropic/ink'
-import { getGlobalConfig } from '../utils/config.js'
-export type { SpinnerMode } from './Spinner/index.js'
+import { TeammateSpinnerTree } from './Spinner/TeammateSpinnerTree.js';
+import { useAnimationFrame } from '@anthropic/ink';
+import { getGlobalConfig } from '../utils/config.js';
+export type { SpinnerMode } from './Spinner/index.js';
 
-const DEFAULT_CHARACTERS = getDefaultCharacters()
-
-const SPINNER_FRAMES = [
-  ...DEFAULT_CHARACTERS,
-  ...[...DEFAULT_CHARACTERS].reverse(),
-]
+const DEFAULT_CHARACTERS = getDefaultCharacters();
 
+const SPINNER_FRAMES = [...DEFAULT_CHARACTERS, ...[...DEFAULT_CHARACTERS].reverse()];
 
 type Props = {
-  mode: SpinnerMode
-  loadingStartTimeRef: React.RefObject<number>
-  totalPausedMsRef: React.RefObject<number>
-  pauseStartTimeRef: React.RefObject<number | null>
-  spinnerTip?: string
-  responseLengthRef: React.RefObject<number>
+  mode: SpinnerMode;
+  loadingStartTimeRef: React.RefObject<number>;
+  totalPausedMsRef: React.RefObject<number>;
+  pauseStartTimeRef: React.RefObject<number | null>;
+  spinnerTip?: string;
+  responseLengthRef: React.RefObject<number>;
   apiMetricsRef?: React.RefObject<
     Array<{
       ttftMs: number;
@@ -71,33 +56,32 @@ type Props = {
       responseLengthBaseline: number;
       endResponseLength: number;
     }>
-  >
-  overrideColor?: keyof Theme | null
-  overrideShimmerColor?: keyof Theme | null
-  overrideMessage?: string | null
-  spinnerSuffix?: string | null
-  verbose: boolean
-  hasActiveTools?: boolean
+  >;
+  overrideColor?: keyof Theme | null;
+  overrideShimmerColor?: keyof Theme | null;
+  overrideMessage?: string | null;
+  spinnerSuffix?: string | null;
+  verbose: boolean;
+  hasActiveTools?: boolean;
   /** Leader's turn has completed (no active query). Used to suppress stall-red spinner when only teammates are running. */
-  leaderIsIdle?: boolean
-}
+  leaderIsIdle?: boolean;
+};
 
 // Thin wrapper: branches on isBriefOnly so the two variants have independent
 // hook call chains. Without this split, toggling /brief mid-render would
 // violate Rules of Hooks (the inner variant calls ~10 more hooks).
 export function SpinnerWithVerb(props: Props): React.ReactNode {
-  const isBriefOnly = useAppState(s => s.isBriefOnly)
+  const isBriefOnly = useAppState(s => s.isBriefOnly);
   // REPL overrides isBriefOnly→false when viewing a teammate transcript
   // (see isBriefOnly={viewedTeammateTask ? false : isBriefOnly}). That
   // prop isn't threaded here, so replicate the gate from the store —
   // teammate view needs the real spinner (which shows teammate status).
-  const viewingAgentTaskId = useAppState(s => s.viewingAgentTaskId)
+  const viewingAgentTaskId = useAppState(s => s.viewingAgentTaskId);
   // Hoisted to mount-time — this component re-renders at animation framerate.
   const briefEnvEnabled =
     feature('KAIROS') || feature('KAIROS_BRIEF')
-      ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-        useMemo(() => isEnvTruthy(process.env.CLAUDE_CODE_BRIEF), [])
-      : false
+      ? useMemo(() => isEnvTruthy(process.env.CLAUDE_CODE_BRIEF), [])
+      : false;
 
   // Runtime gate mirrors isBriefEnabled() but inlined — importing from
   // BriefTool.ts would leak tool-name strings into external builds. Single
@@ -105,18 +89,14 @@ export function SpinnerWithVerb(props: Props): React.ReactNode {
   if (
     (feature('KAIROS') || feature('KAIROS_BRIEF')) &&
     (getKairosActive() ||
-      (getUserMsgOptIn() &&
-        (briefEnvEnabled ||
-          getFeatureValue_CACHED_MAY_BE_STALE('tengu_kairos_brief', false)))) &&
+      (getUserMsgOptIn() && (briefEnvEnabled || getFeatureValue_CACHED_MAY_BE_STALE('tengu_kairos_brief', false)))) &&
     isBriefOnly &&
     !viewingAgentTaskId
   ) {
-    return (
-      <BriefSpinner mode={props.mode} overrideMessage={props.overrideMessage} />
-    )
+    return <BriefSpinner mode={props.mode} overrideMessage={props.overrideMessage} />;
   }
 
-  return <SpinnerWithVerbInner {...props} />
+  return <SpinnerWithVerbInner {...props} />;
 }
 
 function SpinnerWithVerbInner({
@@ -134,8 +114,8 @@ function SpinnerWithVerbInner({
   hasActiveTools = false,
   leaderIsIdle = false,
 }: Props): React.ReactNode {
-  const settings = useSettings()
-  const reducedMotion = settings.prefersReducedMotion ?? false
+  const settings = useSettings();
+  const reducedMotion = settings.prefersReducedMotion ?? false;
 
   // NOTE: useAnimationFrame(50) lives in SpinnerAnimationRow, not here.
   // This component only re-renders when props or app state change —
@@ -143,114 +123,102 @@ function SpinnerWithVerbInner({
   // (frame, glimmer, stalled intensity, token counter, thinking shimmer,
   // elapsed-time timer) are computed inside the child.
 
-  const tasks = useAppState(s => s.tasks)
-  const viewingAgentTaskId = useAppState(s => s.viewingAgentTaskId)
-  const expandedView = useAppState(s => s.expandedView)
-  const showExpandedTodos = expandedView === 'tasks'
-  const showSpinnerTree = expandedView === 'teammates'
-  const selectedIPAgentIndex = useAppState(s => s.selectedIPAgentIndex)
-  const viewSelectionMode = useAppState(s => s.viewSelectionMode)
+  const tasks = useAppState(s => s.tasks);
+  const viewingAgentTaskId = useAppState(s => s.viewingAgentTaskId);
+  const expandedView = useAppState(s => s.expandedView);
+  const showExpandedTodos = expandedView === 'tasks';
+  const showSpinnerTree = expandedView === 'teammates';
+  const selectedIPAgentIndex = useAppState(s => s.selectedIPAgentIndex);
+  const viewSelectionMode = useAppState(s => s.viewSelectionMode);
   // Get foregrounded teammate (if viewing a teammate's transcript)
-  const foregroundedTeammate = viewingAgentTaskId
-    ? getViewedTeammateTask({ viewingAgentTaskId, tasks })
-    : undefined
-  const { columns } = useTerminalSize()
-  const tasksV2 = useTasksV2()
+  const foregroundedTeammate = viewingAgentTaskId ? getViewedTeammateTask({ viewingAgentTaskId, tasks }) : undefined;
+  const { columns } = useTerminalSize();
+  const tasksV2 = useTasksV2();
 
   // Track thinking status: 'thinking' | number (duration in ms) | null
   // Shows each state for minimum 2s to avoid UI jank
-  const [thinkingStatus, setThinkingStatus] = useState<
-    'thinking' | number | null
-  >(null)
-  const thinkingStartRef = useRef<number | null>(null)
+  const [thinkingStatus, setThinkingStatus] = useState<'thinking' | number | null>(null);
+  const thinkingStartRef = useRef<number | null>(null);
 
   useEffect(() => {
-    let showDurationTimer: ReturnType<typeof setTimeout> | null = null
-    let clearStatusTimer: ReturnType<typeof setTimeout> | null = null
+    let showDurationTimer: ReturnType<typeof setTimeout> | null = null;
+    let clearStatusTimer: ReturnType<typeof setTimeout> | null = null;
 
     if (mode === 'thinking') {
       // Started thinking
       if (thinkingStartRef.current === null) {
-        thinkingStartRef.current = Date.now()
-        setThinkingStatus('thinking')
+        thinkingStartRef.current = Date.now();
+        setThinkingStatus('thinking');
       }
     } else if (thinkingStartRef.current !== null) {
       // Stopped thinking - calculate duration and ensure 2s minimum display
-      const duration = Date.now() - thinkingStartRef.current
-      const elapsed = Date.now() - thinkingStartRef.current
-      const remainingThinkingTime = Math.max(0, 2000 - elapsed)
+      const duration = Date.now() - thinkingStartRef.current;
+      const elapsed = Date.now() - thinkingStartRef.current;
+      const remainingThinkingTime = Math.max(0, 2000 - elapsed);
 
-      thinkingStartRef.current = null
+      thinkingStartRef.current = null;
 
       // Show "thinking..." for remaining time if < 2s elapsed, then show duration
       const showDuration = (): void => {
-        setThinkingStatus(duration)
+        setThinkingStatus(duration);
         // Clear after 2s
-        clearStatusTimer = setTimeout(setThinkingStatus, 2000, null)
-      }
+        clearStatusTimer = setTimeout(setThinkingStatus, 2000, null);
+      };
 
       if (remainingThinkingTime > 0) {
-        showDurationTimer = setTimeout(showDuration, remainingThinkingTime)
+        showDurationTimer = setTimeout(showDuration, remainingThinkingTime);
       } else {
-        showDuration()
+        showDuration();
       }
     }
 
     return () => {
-      if (showDurationTimer) clearTimeout(showDurationTimer)
-      if (clearStatusTimer) clearTimeout(clearStatusTimer)
-    }
-  }, [mode])
+      if (showDurationTimer) clearTimeout(showDurationTimer);
+      if (clearStatusTimer) clearTimeout(clearStatusTimer);
+    };
+  }, [mode]);
 
   // Find the current in-progress task and next pending task
-  const currentTodo = tasksV2?.find(
-    task => task.status !== 'pending' && task.status !== 'completed',
-  )
-  const nextTask = findNextPendingTask(tasksV2)
+  const currentTodo = tasksV2?.find(task => task.status !== 'pending' && task.status !== 'completed');
+  const nextTask = findNextPendingTask(tasksV2);
 
   // Use useState with initializer to pick a random verb once on mount
-  const [randomVerb] = useState(() => sample(getSpinnerVerbs()))
+  const [randomVerb] = useState(() => sample(getSpinnerVerbs()));
 
   // Leader's own verb (always the leader's, regardless of who is foregrounded)
-  const leaderVerb =
-    overrideMessage ??
-    currentTodo?.activeForm ??
-    currentTodo?.subject ??
-    randomVerb
+  const leaderVerb = overrideMessage ?? currentTodo?.activeForm ?? currentTodo?.subject ?? randomVerb;
 
   const effectiveVerb =
     foregroundedTeammate && !foregroundedTeammate.isIdle
       ? (foregroundedTeammate.spinnerVerb ?? randomVerb)
-      : leaderVerb
-  const message = effectiveVerb + '…'
+      : leaderVerb;
+  const message = effectiveVerb + '…';
 
   // Track CLI activity when spinner is active
   useEffect(() => {
-    const operationId = 'spinner-' + mode
-    activityManager.startCLIActivity(operationId)
+    const operationId = 'spinner-' + mode;
+    activityManager.startCLIActivity(operationId);
     return () => {
-      activityManager.endCLIActivity(operationId)
-    }
-  }, [mode])
+      activityManager.endCLIActivity(operationId);
+    };
+  }, [mode]);
 
-  const effortValue = useAppState(s => s.effortValue)
-  const effortSuffix = getEffortSuffix(getMainLoopModel(), effortValue)
+  const effortValue = useAppState(s => s.effortValue);
+  const effortSuffix = getEffortSuffix(getMainLoopModel(), effortValue);
 
   // Check if any running in-process teammates exist (needed for both modes)
-  const runningTeammates = getAllInProcessTeammateTasks(tasks).filter(
-    t => t.status === 'running',
-  )
-  const hasRunningTeammates = runningTeammates.length > 0
-  const allIdle = hasRunningTeammates && runningTeammates.every(t => t.isIdle)
+  const runningTeammates = getAllInProcessTeammateTasks(tasks).filter(t => t.status === 'running');
+  const hasRunningTeammates = runningTeammates.length > 0;
+  const allIdle = hasRunningTeammates && runningTeammates.every(t => t.isIdle);
 
   // Gather aggregate token stats from all running swarm teammates
   // In spinner-tree mode, skip aggregation (teammates have their own lines in the tree)
-  let teammateTokens = 0
+  let teammateTokens = 0;
   if (!showSpinnerTree) {
     for (const task of Object.values(tasks)) {
       if (isInProcessTeammateTask(task) && task.status === 'running') {
         if (task.progress?.tokenCount) {
-          teammateTokens += task.progress.tokenCount
+          teammateTokens += task.progress.tokenCount;
         }
       }
     }
@@ -261,24 +229,22 @@ function SpinnerWithVerbInner({
   // a coarse 30s threshold.
   const elapsedSnapshot =
     pauseStartTimeRef.current !== null
-      ? pauseStartTimeRef.current -
-        loadingStartTimeRef.current -
-        totalPausedMsRef.current
-      : Date.now() - loadingStartTimeRef.current - totalPausedMsRef.current
+      ? pauseStartTimeRef.current - loadingStartTimeRef.current - totalPausedMsRef.current
+      : Date.now() - loadingStartTimeRef.current - totalPausedMsRef.current;
 
   // Leader token count for TeammateSpinnerTree — read raw (non-animated) from
   // the ref. The tree is only shown when teammates are running; teammate
   // progress updates to s.tasks trigger re-renders that keep this fresh.
-  const leaderTokenCount = Math.round(responseLengthRef.current / 4)
+  const leaderTokenCount = Math.round(responseLengthRef.current / 4);
 
-  const defaultColor: keyof Theme = 'claude'
-  const defaultShimmerColor = 'claudeShimmer'
-  const messageColor = overrideColor ?? defaultColor
-  const shimmerColor = overrideShimmerColor ?? defaultShimmerColor
+  const defaultColor: keyof Theme = 'claude';
+  const defaultShimmerColor = 'claudeShimmer';
+  const messageColor = overrideColor ?? defaultColor;
+  const shimmerColor = overrideShimmerColor ?? defaultShimmerColor;
 
   // TTFT display is gated to internal builds — apiMetricsRef was removed from
   // props during a refactor, so skip this until it's re-threaded.
-  let ttftText: string | null = null
+  let ttftText: string | null = null;
 
   // When leader is idle but teammates are running (and we're viewing the leader),
   // show a static dim idle display instead of the animated spinner — otherwise
@@ -302,14 +268,14 @@ function SpinnerWithVerbInner({
           />
         )}
       </Box>
-    )
+    );
   }
 
   // When viewing an idle teammate, show static idle display instead of animated spinner
   if (foregroundedTeammate?.isIdle) {
     const idleText = allIdle
       ? `${TEARDROP_ASTERISK} Worked for ${formatDuration(Date.now() - foregroundedTeammate.startTime)}`
-      : `${TEARDROP_ASTERISK} Idle`
+      : `${TEARDROP_ASTERISK} Idle`;
     return (
       <Box flexDirection="column" width="100%" alignItems="flex-start">
         <Box flexDirection="row" flexWrap="wrap" marginTop={1} width="100%">
@@ -326,17 +292,16 @@ function SpinnerWithVerbInner({
           />
         )}
       </Box>
-    )
+    );
   }
 
   // Time-based tip overrides: coarse thresholds so a stale ref read (we're
   // off the 50ms clock) is fine. Other triggers (mode change, setMessages)
   // cause re-renders that refresh this in practice.
-  let contextTipsActive = false
-  const tipsEnabled = settings.spinnerTipsEnabled !== false
-  const showClearTip = tipsEnabled && elapsedSnapshot > 1_800_000
-  const showBtwTip =
-    tipsEnabled && elapsedSnapshot > 30_000 && !getGlobalConfig().btwUseCount
+  let contextTipsActive = false;
+  const tipsEnabled = settings.spinnerTipsEnabled !== false;
+  const showClearTip = tipsEnabled && elapsedSnapshot > 1_800_000;
+  const showBtwTip = tipsEnabled && elapsedSnapshot > 30_000 && !getGlobalConfig().btwUseCount;
 
   const effectiveTip = contextTipsActive
     ? undefined
@@ -344,28 +309,22 @@ function SpinnerWithVerbInner({
       ? 'Use /clear to start fresh when switching topics and free up context'
       : showBtwTip && !nextTask
         ? "Use /btw to ask a quick side question without interrupting Claude's current work"
-        : spinnerTip
+        : spinnerTip;
 
   // Budget text (ant-only) — shown above the tip line
-  let budgetText: string | null = null
+  let budgetText: string | null = null;
   if (feature('TOKEN_BUDGET')) {
-    const budget = getCurrentTurnTokenBudget()
+    const budget = getCurrentTurnTokenBudget();
     if (budget !== null && budget > 0) {
-      const tokens = getTurnOutputTokens()
+      const tokens = getTurnOutputTokens();
       if (tokens >= budget) {
-        budgetText = `Target: ${formatNumber(tokens)} used (${formatNumber(budget)} min ${figures.tick})`
+        budgetText = `Target: ${formatNumber(tokens)} used (${formatNumber(budget)} min ${figures.tick})`;
       } else {
-        const pct = Math.round((tokens / budget) * 100)
-        const remaining = budget - tokens
-        const rate =
-          elapsedSnapshot > 5000 && tokens >= 2000
-            ? tokens / elapsedSnapshot
-            : 0
-        const eta =
-          rate > 0
-            ? ` \u00B7 ~${formatDuration(remaining / rate, { mostSignificantOnly: true })}`
-            : ''
-        budgetText = `Target: ${formatNumber(tokens)} / ${formatNumber(budget)} (${pct}%)${eta}`
+        const pct = Math.round((tokens / budget) * 100);
+        const remaining = budget - tokens;
+        const rate = elapsedSnapshot > 5000 && tokens >= 2000 ? tokens / elapsedSnapshot : 0;
+        const eta = rate > 0 ? ` \u00B7 ~${formatDuration(remaining / rate, { mostSignificantOnly: true })}` : '';
+        budgetText = `Target: ${formatNumber(tokens)} / ${formatNumber(budget)} (${pct}%)${eta}`;
       }
     }
   }
@@ -421,17 +380,13 @@ function SpinnerWithVerbInner({
           )}
           {(nextTask || effectiveTip) && (
             <MessageResponse>
-              <Text dimColor>
-                {nextTask
-                  ? `Next: ${nextTask.subject}`
-                  : `Tip: ${effectiveTip}`}
-              </Text>
+              <Text dimColor>{nextTask ? `Next: ${nextTask.subject}` : `Tip: ${effectiveTip}`}</Text>
             </MessageResponse>
           )}
         </Box>
       ) : null}
     </Box>
-  )
+  );
 }
 
 // Brief/assistant mode spinner: single status line. PromptInput drops its
@@ -444,71 +399,60 @@ function SpinnerWithVerbInner({
 // spinner, not over the spinner content. Paired with BriefIdleStatus which
 // keeps the same footprint when idle.
 type BriefSpinnerProps = {
-  mode: SpinnerMode
-  overrideMessage?: string | null
-}
+  mode: SpinnerMode;
+  overrideMessage?: string | null;
+};
 
-function BriefSpinner({
-  mode,
-  overrideMessage,
-}: BriefSpinnerProps): React.ReactNode {
-  const settings = useSettings()
-  const reducedMotion = settings.prefersReducedMotion ?? false
-  const [randomVerb] = useState(() => sample(getSpinnerVerbs()) ?? 'Working')
-  const verb = overrideMessage ?? randomVerb
-  const connStatus = useAppState(s => s.remoteConnectionStatus)
+function BriefSpinner({ mode, overrideMessage }: BriefSpinnerProps): React.ReactNode {
+  const settings = useSettings();
+  const reducedMotion = settings.prefersReducedMotion ?? false;
+  const [randomVerb] = useState(() => sample(getSpinnerVerbs()) ?? 'Working');
+  const verb = overrideMessage ?? randomVerb;
+  const connStatus = useAppState(s => s.remoteConnectionStatus);
 
   // Track CLI activity so OS/IDE "busy" indicators fire in brief mode too
   useEffect(() => {
-    const operationId = 'spinner-' + mode
-    activityManager.startCLIActivity(operationId)
+    const operationId = 'spinner-' + mode;
+    activityManager.startCLIActivity(operationId);
     return () => {
-      activityManager.endCLIActivity(operationId)
-    }
-  }, [mode])
+      activityManager.endCLIActivity(operationId);
+    };
+  }, [mode]);
 
   // Drive both dot cycle and shimmer from the shared clock. The viewport
   // ref is unused — the spinner unmounts on turn end so viewport-based
   // pausing isn't needed.
-  const [, time] = useAnimationFrame(reducedMotion ? null : 120)
+  const [, time] = useAnimationFrame(reducedMotion ? null : 120);
 
   // Local tasks + remote tasks are mutually exclusive (viewer mode has an
   // empty local AppState.tasks; local mode has remoteBackgroundTaskCount=0).
   // Summing avoids a mode branch.
-  const runningCount = useAppState(
-    s =>
-      count(Object.values(s.tasks), isBackgroundTask) +
-      s.remoteBackgroundTaskCount,
-  )
+  const runningCount = useAppState(s => count(Object.values(s.tasks), isBackgroundTask) + s.remoteBackgroundTaskCount);
 
   // Connection trouble overrides the verb — `claude assistant` is a pure viewer,
   // nothing useful is happening while the WS is down.
-  const showConnWarning =
-    connStatus === 'reconnecting' || connStatus === 'disconnected'
-  const connText =
-    connStatus === 'reconnecting' ? 'Reconnecting' : 'Disconnected'
+  const showConnWarning = connStatus === 'reconnecting' || connStatus === 'disconnected';
+  const connText = connStatus === 'reconnecting' ? 'Reconnecting' : 'Disconnected';
 
   // Dots padded to a fixed 3 columns so the right-aligned count doesn't
   // jitter as the cycle advances.
-  const dotFrame = Math.floor(time / 300) % 3
-  const dots = reducedMotion ? '…  ' : '.'.repeat(dotFrame + 1).padEnd(3)
+  const dotFrame = Math.floor(time / 300) % 3;
+  const dots = reducedMotion ? '…  ' : '.'.repeat(dotFrame + 1).padEnd(3);
 
   // Shimmer: reverse-sweep highlight across the verb. Skip for connection
   // warnings (shimmer reads as "working"; Reconnecting/Disconnected is not).
-  const verbWidth = useMemo(() => stringWidth(verb), [verb])
+  const verbWidth = useMemo(() => stringWidth(verb), [verb]);
   const glimmerIndex =
-    reducedMotion || showConnWarning
-      ? -100
-      : computeGlimmerIndex(Math.floor(time / SHIMMER_INTERVAL_MS), verbWidth)
-  const { before, shimmer, after } = computeShimmerSegments(verb, glimmerIndex)
+    reducedMotion || showConnWarning ? -100 : computeGlimmerIndex(Math.floor(time / SHIMMER_INTERVAL_MS), verbWidth);
+  const { before, shimmer, after } = computeShimmerSegments(verb, glimmerIndex);
 
-  const { columns } = useTerminalSize()
-  const rightText = runningCount > 0 ? `${runningCount} in background` : ''
+  const { columns } = useTerminalSize();
+  const rightText = runningCount > 0 ? `${runningCount} in background` : '';
   // Manual right-align via space padding — flexGrow spacers inside
   // FullscreenLayout's `main` slot don't resolve a width and caused the
   // diff engine to miss dot-frame updates.
-  const leftWidth = (showConnWarning ? stringWidth(connText) : verbWidth) + 3
-  const pad = Math.max(1, columns - 2 - leftWidth - stringWidth(rightText))
+  const leftWidth = (showConnWarning ? stringWidth(connText) : verbWidth) + 3;
+  const pad = Math.max(1, columns - 2 - leftWidth - stringWidth(rightText));
 
   return (
     <Box flexDirection="row" width="100%" marginTop={1} paddingLeft={2}>
@@ -529,7 +473,7 @@ function BriefSpinner({
         </>
       ) : null}
     </Box>
-  )
+  );
 }
 
 // Idle placeholder for brief mode. Same 2-row [blank, content] footprint
@@ -537,27 +481,18 @@ function BriefSpinner({
 // working/idle/disconnected. See BriefSpinner's comment for the
 // Notifications overlay coupling.
 export function BriefIdleStatus(): React.ReactNode {
-  const connStatus = useAppState(s => s.remoteConnectionStatus)
-  const runningCount = useAppState(
-    s =>
-      count(Object.values(s.tasks), isBackgroundTask) +
-      s.remoteBackgroundTaskCount,
-  )
-  const { columns } = useTerminalSize()
+  const connStatus = useAppState(s => s.remoteConnectionStatus);
+  const runningCount = useAppState(s => count(Object.values(s.tasks), isBackgroundTask) + s.remoteBackgroundTaskCount);
+  const { columns } = useTerminalSize();
 
-  const showConnWarning =
-    connStatus === 'reconnecting' || connStatus === 'disconnected'
-  const connText =
-    connStatus === 'reconnecting' ? 'Reconnecting…' : 'Disconnected'
-  const leftText = showConnWarning ? connText : ''
-  const rightText = runningCount > 0 ? `${runningCount} in background` : ''
+  const showConnWarning = connStatus === 'reconnecting' || connStatus === 'disconnected';
+  const connText = connStatus === 'reconnecting' ? 'Reconnecting…' : 'Disconnected';
+  const leftText = showConnWarning ? connText : '';
+  const rightText = runningCount > 0 ? `${runningCount} in background` : '';
 
-  if (!leftText && !rightText) return <Box height={2} />
+  if (!leftText && !rightText) return <Box height={2} />;
 
-  const pad = Math.max(
-    1,
-    columns - 2 - stringWidth(leftText) - stringWidth(rightText),
-  )
+  const pad = Math.max(1, columns - 2 - stringWidth(leftText) - stringWidth(rightText));
   return (
     <Box marginTop={1} paddingLeft={2}>
       <Text>
@@ -570,13 +505,13 @@ export function BriefIdleStatus(): React.ReactNode {
         ) : null}
       </Text>
     </Box>
-  )
+  );
 }
 
 export function Spinner(): React.ReactNode {
-  const settings = useSettings()
-  const reducedMotion = settings.prefersReducedMotion ?? false
-  const [ref, time] = useAnimationFrame(reducedMotion ? null : 120)
+  const settings = useSettings();
+  const reducedMotion = settings.prefersReducedMotion ?? false;
+  const [ref, time] = useAnimationFrame(reducedMotion ? null : 120);
 
   // Reduced motion: static dot instead of animated spinner
   if (reducedMotion) {
@@ -584,33 +519,27 @@ export function Spinner(): React.ReactNode {
       <Box ref={ref} flexWrap="wrap" height={1} width={2}>
         <Text color="text">●</Text>
       </Box>
-    )
+    );
   }
 
   // Derive frame from synced time - all spinners animate together
-  const frame = Math.floor(time / 120) % SPINNER_FRAMES.length
+  const frame = Math.floor(time / 120) % SPINNER_FRAMES.length;
 
   return (
     <Box ref={ref} flexWrap="wrap" height={1} width={2}>
       <Text color="text">{SPINNER_FRAMES[frame]}</Text>
     </Box>
-  )
+  );
 }
 
-
 function findNextPendingTask(tasks: Task[] | undefined): Task | undefined {
   if (!tasks) {
-    return undefined
+    return undefined;
   }
-  const pendingTasks = tasks.filter(t => t.status === 'pending')
+  const pendingTasks = tasks.filter(t => t.status === 'pending');
   if (pendingTasks.length === 0) {
-    return undefined
+    return undefined;
   }
-  const unresolvedIds = new Set(
-    tasks.filter(t => t.status !== 'completed').map(t => t.id),
-  )
-  return (
-    pendingTasks.find(t => !t.blockedBy.some(id => unresolvedIds.has(id))) ??
-    pendingTasks[0]
-  )
+  const unresolvedIds = new Set(tasks.filter(t => t.status !== 'completed').map(t => t.id));
+  return pendingTasks.find(t => !t.blockedBy.some(id => unresolvedIds.has(id))) ?? pendingTasks[0];
 }
diff --git a/src/components/Spinner/FlashingChar.tsx b/src/components/Spinner/FlashingChar.tsx
index bfb190999..407cd7d85 100644
--- a/src/components/Spinner/FlashingChar.tsx
+++ b/src/components/Spinner/FlashingChar.tsx
@@ -1,39 +1,32 @@
-import * as React from 'react'
-import { Text, useTheme } from '@anthropic/ink'
-import { getTheme, type Theme } from '../../utils/theme.js'
-import { interpolateColor, parseRGB, toRGBColor } from './utils.js'
+import * as React from 'react';
+import { Text, useTheme } from '@anthropic/ink';
+import { getTheme, type Theme } from '../../utils/theme.js';
+import { interpolateColor, parseRGB, toRGBColor } from './utils.js';
 
 type Props = {
-  char: string
-  flashOpacity: number
-  messageColor: keyof Theme
-  shimmerColor: keyof Theme
-}
+  char: string;
+  flashOpacity: number;
+  messageColor: keyof Theme;
+  shimmerColor: keyof Theme;
+};
 
-export function FlashingChar({
-  char,
-  flashOpacity,
-  messageColor,
-  shimmerColor,
-}: Props): React.ReactNode {
-  const [themeName] = useTheme()
-  const theme = getTheme(themeName)
+export function FlashingChar({ char, flashOpacity, messageColor, shimmerColor }: Props): React.ReactNode {
+  const [themeName] = useTheme();
+  const theme = getTheme(themeName);
 
-  const baseColorStr = theme[messageColor]
-  const shimmerColorStr = theme[shimmerColor]
+  const baseColorStr = theme[messageColor];
+  const shimmerColorStr = theme[shimmerColor];
 
-  const baseRGB = baseColorStr ? parseRGB(baseColorStr) : null
-  const shimmerRGB = shimmerColorStr ? parseRGB(shimmerColorStr) : null
+  const baseRGB = baseColorStr ? parseRGB(baseColorStr) : null;
+  const shimmerRGB = shimmerColorStr ? parseRGB(shimmerColorStr) : null;
 
   if (baseRGB && shimmerRGB) {
     // Smooth interpolation between colors
-    const interpolated = interpolateColor(baseRGB, shimmerRGB, flashOpacity)
-    return <Text color={toRGBColor(interpolated)}>{char}</Text>
+    const interpolated = interpolateColor(baseRGB, shimmerRGB, flashOpacity);
+    return <Text color={toRGBColor(interpolated)}>{char}</Text>;
   }
 
   // Fallback for ANSI themes: binary switch
-  const shouldUseShimmer = flashOpacity > 0.5
-  return (
-    <Text color={shouldUseShimmer ? shimmerColor : messageColor}>{char}</Text>
-  )
+  const shouldUseShimmer = flashOpacity > 0.5;
+  return <Text color={shouldUseShimmer ? shimmerColor : messageColor}>{char}</Text>;
 }
diff --git a/src/components/Spinner/GlimmerMessage.tsx b/src/components/Spinner/GlimmerMessage.tsx
index 9f8ee9265..b6528fe28 100644
--- a/src/components/Spinner/GlimmerMessage.tsx
+++ b/src/components/Spinner/GlimmerMessage.tsx
@@ -1,21 +1,21 @@
-import * as React from 'react'
-import { Text, stringWidth, useTheme } from '@anthropic/ink'
-import { getGraphemeSegmenter } from '../../utils/intl.js'
-import { getTheme, type Theme } from '../../utils/theme.js'
-import type { SpinnerMode } from './types.js'
-import { interpolateColor, parseRGB, toRGBColor } from './utils.js'
+import * as React from 'react';
+import { Text, stringWidth, useTheme } from '@anthropic/ink';
+import { getGraphemeSegmenter } from '../../utils/intl.js';
+import { getTheme, type Theme } from '../../utils/theme.js';
+import type { SpinnerMode } from './types.js';
+import { interpolateColor, parseRGB, toRGBColor } from './utils.js';
 
 type Props = {
-  message: string
-  mode: SpinnerMode
-  messageColor: keyof Theme
-  glimmerIndex: number
-  flashOpacity: number
-  shimmerColor: keyof Theme
-  stalledIntensity?: number
-}
+  message: string;
+  mode: SpinnerMode;
+  messageColor: keyof Theme;
+  glimmerIndex: number;
+  flashOpacity: number;
+  shimmerColor: keyof Theme;
+  stalledIntensity?: number;
+};
 
-const ERROR_RED = { r: 171, g: 43, b: 63 }
+const ERROR_RED = { r: 171, g: 43, b: 63 };
 
 export function GlimmerMessage({
   message,
@@ -26,83 +26,79 @@ export function GlimmerMessage({
   shimmerColor,
   stalledIntensity = 0,
 }: Props): React.ReactNode {
-  const [themeName] = useTheme()
-  const theme = getTheme(themeName)
+  const [themeName] = useTheme();
+  const theme = getTheme(themeName);
 
   // This component re-renders at 20fps (glimmerIndex changes every 50ms) but
   // message is stable within a turn. Precompute grapheme segmentation + widths
   // once per message instead of per frame. Measured -81% on the shimmer path.
   const { segments, messageWidth } = React.useMemo(() => {
-    const segs: { segment: string; width: number }[] = []
+    const segs: { segment: string; width: number }[] = [];
     for (const { segment } of getGraphemeSegmenter().segment(message)) {
-      segs.push({ segment, width: stringWidth(segment) })
+      segs.push({ segment, width: stringWidth(segment) });
     }
-    return { segments: segs, messageWidth: stringWidth(message) }
-  }, [message])
+    return { segments: segs, messageWidth: stringWidth(message) };
+  }, [message]);
 
-  if (!message) return null
+  if (!message) return null;
 
   // When stalled, show text that smoothly transitions to red
   if (stalledIntensity > 0) {
-    const baseColorStr = theme[messageColor]
-    const baseRGB = baseColorStr ? parseRGB(baseColorStr) : null
+    const baseColorStr = theme[messageColor];
+    const baseRGB = baseColorStr ? parseRGB(baseColorStr) : null;
 
     if (baseRGB) {
-      const interpolated = interpolateColor(
-        baseRGB,
-        ERROR_RED,
-        stalledIntensity,
-      )
-      const color = toRGBColor(interpolated)
+      const interpolated = interpolateColor(baseRGB, ERROR_RED, stalledIntensity);
+      const color = toRGBColor(interpolated);
       return (
         <>
           <Text color={color}>{message}</Text>
           <Text color={color}> </Text>
         </>
-      )
+      );
     }
 
     // Fallback for ANSI themes: use messageColor until fully stalled, then error
-    const color = stalledIntensity > 0.5 ? 'error' : messageColor
+    const color = stalledIntensity > 0.5 ? 'error' : messageColor;
     return (
       <>
         <Text color={color}>{message}</Text>
         <Text color={color}> </Text>
       </>
-    )
+    );
   }
 
   // tool-use mode: all chars flash with the same opacity, so render as a
   // single <Text> instead of N individual FlashingChar components.
   if (mode === 'tool-use') {
-    const baseColorStr = theme[messageColor]
-    const shimmerColorStr = theme[shimmerColor]
-    const baseRGB = baseColorStr ? parseRGB(baseColorStr) : null
-    const shimmerRGB = shimmerColorStr ? parseRGB(shimmerColorStr) : null
+    const baseColorStr = theme[messageColor];
+    const shimmerColorStr = theme[shimmerColor];
+    const baseRGB = baseColorStr ? parseRGB(baseColorStr) : null;
+    const shimmerRGB = shimmerColorStr ? parseRGB(shimmerColorStr) : null;
 
     if (baseRGB && shimmerRGB) {
-      const interpolated = interpolateColor(baseRGB, shimmerRGB, flashOpacity)
+      const interpolated = interpolateColor(baseRGB, shimmerRGB, flashOpacity);
       return (
         <>
           <Text color={toRGBColor(interpolated)}>{message}</Text>
           <Text color={messageColor}> </Text>
         </>
-      )
+      );
     }
 
-    const color = flashOpacity > 0.5 ? shimmerColor : messageColor
+    const color = flashOpacity > 0.5 ? shimmerColor : messageColor;
     return (
       <>
         <Text color={color}>{message}</Text>
         <Text color={messageColor}> </Text>
       </>
-    )
+    );
   }
 
   // Shimmer mode: only chars within ±1 of glimmerIndex need the shimmer
   // color. When glimmer is offscreen, render as a single <Text>.
-  const shimmerStart = glimmerIndex - 1
-  const shimmerEnd = glimmerIndex + 1
+  const shimmerStart = glimmerIndex - 1;
+  const shimmerEnd = glimmerIndex + 1;
 
   if (shimmerStart >= messageWidth || shimmerEnd < 0) {
     return (
@@ -110,24 +106,24 @@ export function GlimmerMessage({
         <Text color={messageColor}>{message}</Text>
         <Text color={messageColor}> </Text>
       </>
-    )
+    );
   }
 
   // Split into at most 3 segments by visual column position
-  const clampedStart = Math.max(0, shimmerStart)
-  let colPos = 0
-  let before = ''
-  let shim = ''
-  let after = ''
+  const clampedStart = Math.max(0, shimmerStart);
+  let colPos = 0;
+  let before = '';
+  let shim = '';
+  let after = '';
   for (const { segment, width } of segments) {
     if (colPos + width <= clampedStart) {
-      before += segment
+      before += segment;
     } else if (colPos > shimmerEnd) {
-      after += segment
+      after += segment;
     } else {
-      shim += segment
+      shim += segment;
     }
-    colPos += width
+    colPos += width;
   }
 
   return (
@@ -137,5 +133,5 @@ export function GlimmerMessage({
       {after && <Text color={messageColor}>{after}</Text>}
       <Text color={messageColor}> </Text>
     </>
-  )
+  );
 }
diff --git a/src/components/Spinner/ShimmerChar.tsx b/src/components/Spinner/ShimmerChar.tsx
index 0daa44c67..5e4ed5706 100644
--- a/src/components/Spinner/ShimmerChar.tsx
+++ b/src/components/Spinner/ShimmerChar.tsx
@@ -1,27 +1,19 @@
-import * as React from 'react'
-import { Text } from '@anthropic/ink'
-import type { Theme } from '../../utils/theme.js'
+import * as React from 'react';
+import { Text } from '@anthropic/ink';
+import type { Theme } from '../../utils/theme.js';
 
 type Props = {
-  char: string
-  index: number
-  glimmerIndex: number
-  messageColor: keyof Theme
-  shimmerColor: keyof Theme
-}
+  char: string;
+  index: number;
+  glimmerIndex: number;
+  messageColor: keyof Theme;
+  shimmerColor: keyof Theme;
+};
 
-export function ShimmerChar({
-  char,
-  index,
-  glimmerIndex,
-  messageColor,
-  shimmerColor,
-}: Props): React.ReactNode {
-  const isHighlighted = index === glimmerIndex
-  const isNearHighlight = Math.abs(index - glimmerIndex) === 1
-  const shouldUseShimmer = isHighlighted || isNearHighlight
+export function ShimmerChar({ char, index, glimmerIndex, messageColor, shimmerColor }: Props): React.ReactNode {
+  const isHighlighted = index === glimmerIndex;
+  const isNearHighlight = Math.abs(index - glimmerIndex) === 1;
+  const shouldUseShimmer = isHighlighted || isNearHighlight;
 
-  return (
-    <Text color={shouldUseShimmer ? shimmerColor : messageColor}>{char}</Text>
-  )
+  return <Text color={shouldUseShimmer ? shimmerColor : messageColor}>{char}</Text>;
 }
diff --git a/src/components/Spinner/SpinnerAnimationRow.tsx b/src/components/Spinner/SpinnerAnimationRow.tsx
index 57b8358f2..c2ad3dd76 100644
--- a/src/components/Spinner/SpinnerAnimationRow.tsx
+++ b/src/components/Spinner/SpinnerAnimationRow.tsx
@@ -1,66 +1,65 @@
-import figures from 'figures'
-import * as React from 'react'
-import { useMemo, useRef } from 'react'
-import { Box, Text, useAnimationFrame, stringWidth, Byline } from '@anthropic/ink'
-import { toInkColor } from '../../utils/ink.js'
-import type { InProcessTeammateTaskState } from '../../tasks/InProcessTeammateTask/types.js'
-import { formatDuration, formatNumber } from '../../utils/format.js'
+import figures from 'figures';
+import * as React from 'react';
+import { useMemo, useRef } from 'react';
+import { Box, Text, useAnimationFrame, stringWidth, Byline } from '@anthropic/ink';
+import { toInkColor } from '../../utils/ink.js';
+import type { InProcessTeammateTaskState } from '../../tasks/InProcessTeammateTask/types.js';
+import { formatDuration, formatNumber } from '../../utils/format.js';
 
-import type { Theme } from '../../utils/theme.js'
+import type { Theme } from '../../utils/theme.js';
 
-import { GlimmerMessage } from './GlimmerMessage.js'
-import { SpinnerGlyph } from './SpinnerGlyph.js'
-import type { SpinnerMode } from './types.js'
-import { useStalledAnimation } from './useStalledAnimation.js'
-import { interpolateColor, toRGBColor } from './utils.js'
+import { GlimmerMessage } from './GlimmerMessage.js';
+import { SpinnerGlyph } from './SpinnerGlyph.js';
+import type { SpinnerMode } from './types.js';
+import { useStalledAnimation } from './useStalledAnimation.js';
+import { interpolateColor, toRGBColor } from './utils.js';
 
-const SEP_WIDTH = stringWidth(' · ')
-const THINKING_BARE_WIDTH = stringWidth('thinking')
-const SHOW_TOKENS_AFTER_MS = 30_000
+const SEP_WIDTH = stringWidth(' · ');
+const THINKING_BARE_WIDTH = stringWidth('thinking');
+const SHOW_TOKENS_AFTER_MS = 30_000;
 
 // Thinking shimmer constants. Previously lived in a separate ThinkingShimmerText
 // component with its own useAnimationFrame(50) — inlined here to reuse our
 // existing 50ms clock and eliminate the redundant subscriber.
-const THINKING_INACTIVE = { r: 153, g: 153, b: 153 }
-const THINKING_INACTIVE_SHIMMER = { r: 185, g: 185, b: 185 }
-const THINKING_DELAY_MS = 3000
-const THINKING_GLOW_PERIOD_S = 2
+const THINKING_INACTIVE = { r: 153, g: 153, b: 153 };
+const THINKING_INACTIVE_SHIMMER = { r: 185, g: 185, b: 185 };
+const THINKING_DELAY_MS = 3000;
+const THINKING_GLOW_PERIOD_S = 2;
 
 export type SpinnerAnimationRowProps = {
   // Animation inputs
-  mode: SpinnerMode
-  reducedMotion: boolean
-  hasActiveTools: boolean
-  responseLengthRef: React.RefObject<number>
+  mode: SpinnerMode;
+  reducedMotion: boolean;
+  hasActiveTools: boolean;
+  responseLengthRef: React.RefObject<number>;
 
   // Message (stable within a turn)
-  message: string
-  messageColor: keyof Theme
-  shimmerColor: keyof Theme
-  overrideColor?: keyof Theme | null
+  message: string;
+  messageColor: keyof Theme;
+  shimmerColor: keyof Theme;
+  overrideColor?: keyof Theme | null;
 
   // Timer refs (stable references)
-  loadingStartTimeRef: React.RefObject<number>
-  totalPausedMsRef: React.RefObject<number>
-  pauseStartTimeRef: React.RefObject<number | null>
+  loadingStartTimeRef: React.RefObject<number>;
+  totalPausedMsRef: React.RefObject<number>;
+  pauseStartTimeRef: React.RefObject<number | null>;
 
   // Display flags
-  spinnerSuffix?: string | null
-  verbose: boolean
-  columns: number
+  spinnerSuffix?: string | null;
+  verbose: boolean;
+  columns: number;
 
   // Teammate-derived (computed by parent from tasks)
-  hasRunningTeammates: boolean
-  teammateTokens: number
-  foregroundedTeammate: InProcessTeammateTaskState | undefined
+  hasRunningTeammates: boolean;
+  teammateTokens: number;
+  foregroundedTeammate: InProcessTeammateTaskState | undefined;
   /** Leader's turn has completed. Suppresses stall-red since responseLengthRef/hasActiveTools track leader state only. */
-  leaderIsIdle?: boolean
+  leaderIsIdle?: boolean;
 
   // Thinking (state owned by parent, mode-dependent)
-  thinkingStatus: 'thinking' | number | null
-  effortSuffix: string
-
-}
+  thinkingStatus: 'thinking' | number | null;
+  effortSuffix: string;
+};
 
 /**
  * The 50ms-animated portion of SpinnerWithVerb. Owns useAnimationFrame(50)
@@ -94,30 +93,28 @@ export function SpinnerAnimationRow({
   thinkingStatus,
   effortSuffix,
 }: SpinnerAnimationRowProps): React.ReactNode {
-  const [viewportRef, time] = useAnimationFrame(reducedMotion ? null : 50)
+  const [viewportRef, time] = useAnimationFrame(reducedMotion ? null : 50);
 
   // === Elapsed time (wall-clock, derived from refs each frame) ===
-  const now = Date.now()
+  const now = Date.now();
   const elapsedTimeMs =
     pauseStartTimeRef.current !== null
-      ? pauseStartTimeRef.current -
-        loadingStartTimeRef.current -
-        totalPausedMsRef.current
-      : now - loadingStartTimeRef.current - totalPausedMsRef.current
+      ? pauseStartTimeRef.current - loadingStartTimeRef.current - totalPausedMsRef.current
+      : now - loadingStartTimeRef.current - totalPausedMsRef.current;
 
   // Track wall-clock turn start for teammates. While a swarm is running the
   // leader's elapsedTimeMs may jump around (new API calls reset
   // loadingStartTimeRef; pauses freeze it), so we anchor to the earliest
   // derived start seen so far. When no teammates are running this just tracks
   // derivedStart every frame, effectively resetting for the next swarm.
-  const derivedStart = now - elapsedTimeMs
-  const turnStartRef = useRef(derivedStart)
+  const derivedStart = now - elapsedTimeMs;
+  const turnStartRef = useRef(derivedStart);
   if (!hasRunningTeammates || derivedStart < turnStartRef.current) {
-    turnStartRef.current = derivedStart
+    turnStartRef.current = derivedStart;
   }
 
   // === Animation derivations from `time` ===
-  const currentResponseLength = responseLengthRef.current
+  const currentResponseLength = responseLengthRef.current;
 
   // Suppress stall detection when leader is idle — responseLengthRef and
   // hasActiveTools both track leader state. When viewing an active teammate
@@ -128,70 +125,59 @@ export function SpinnerAnimationRow({
     currentResponseLength,
     hasActiveTools || leaderIsIdle,
     reducedMotion,
-  )
+  );
 
-  const frame = reducedMotion ? 0 : Math.floor(time / 120)
+  const frame = reducedMotion ? 0 : Math.floor(time / 120);
 
-  const glimmerSpeed = mode === 'requesting' ? 50 : 200
+  const glimmerSpeed = mode === 'requesting' ? 50 : 200;
   // message is stable within a turn; stringWidth is expensive enough (Bun native
   // call per code point) to memoize explicitly across the 50ms loop.
-  const glimmerMessageWidth = useMemo(() => stringWidth(message), [message])
-  const cycleLength = glimmerMessageWidth + 20
-  const cyclePosition = Math.floor(time / glimmerSpeed)
+  const glimmerMessageWidth = useMemo(() => stringWidth(message), [message]);
+  const cycleLength = glimmerMessageWidth + 20;
+  const cyclePosition = Math.floor(time / glimmerSpeed);
   const glimmerIndex = reducedMotion
     ? -100
     : isStalled
       ? -100
       : mode === 'requesting'
         ? (cyclePosition % cycleLength) - 10
-        : glimmerMessageWidth + 10 - (cyclePosition % cycleLength)
+        : glimmerMessageWidth + 10 - (cyclePosition % cycleLength);
 
-  const flashOpacity = reducedMotion
-    ? 0
-    : mode === 'tool-use'
-      ? (Math.sin((time / 1000) * Math.PI) + 1) / 2
-      : 0
+  const flashOpacity = reducedMotion ? 0 : mode === 'tool-use' ? (Math.sin((time / 1000) * Math.PI) + 1) / 2 : 0;
 
   // === Token counter animation (smooth increment, driven by 50ms clock) ===
-  const tokenCounterRef = useRef(currentResponseLength)
+  const tokenCounterRef = useRef(currentResponseLength);
   if (reducedMotion) {
-    tokenCounterRef.current = currentResponseLength
+    tokenCounterRef.current = currentResponseLength;
   } else {
-    const gap = currentResponseLength - tokenCounterRef.current
+    const gap = currentResponseLength - tokenCounterRef.current;
     if (gap > 0) {
-      let increment
+      let increment;
       if (gap < 70) {
-        increment = 3
+        increment = 3;
       } else if (gap < 200) {
-        increment = Math.max(8, Math.ceil(gap * 0.15))
+        increment = Math.max(8, Math.ceil(gap * 0.15));
       } else {
-        increment = 50
+        increment = 50;
       }
-      tokenCounterRef.current = Math.min(
-        tokenCounterRef.current + increment,
-        currentResponseLength,
-      )
+      tokenCounterRef.current = Math.min(tokenCounterRef.current + increment, currentResponseLength);
     }
   }
-  const displayedResponseLength = tokenCounterRef.current
-  const leaderTokens = Math.round(displayedResponseLength / 4)
+  const displayedResponseLength = tokenCounterRef.current;
+  const leaderTokens = Math.round(displayedResponseLength / 4);
 
-  const effectiveElapsedMs = hasRunningTeammates
-    ? Math.max(elapsedTimeMs, now - turnStartRef.current)
-    : elapsedTimeMs
-  const timerText = formatDuration(effectiveElapsedMs)
-  const timerWidth = stringWidth(timerText)
+  const effectiveElapsedMs = hasRunningTeammates ? Math.max(elapsedTimeMs, now - turnStartRef.current) : elapsedTimeMs;
+  const timerText = formatDuration(effectiveElapsedMs);
+  const timerWidth = stringWidth(timerText);
 
   // === Token count (leader + teammates, or foregrounded teammate) ===
   const totalTokens =
     foregroundedTeammate && !foregroundedTeammate.isIdle
       ? (foregroundedTeammate.progress?.tokenCount ?? 0)
-      : leaderTokens + teammateTokens
-  const tokenCount = formatNumber(totalTokens)
-  const tokensText = hasRunningTeammates
-    ? `${tokenCount} tokens`
-    : `${figures.arrowDown} ${tokenCount} tokens`
-  const tokensWidth = stringWidth(tokensText)
+      : leaderTokens + teammateTokens;
+  const tokenCount = formatNumber(totalTokens);
+  const tokensText = hasRunningTeammates ? `${tokenCount} tokens` : `${figures.arrowDown} ${tokenCount} tokens`;
+  const tokensWidth = stringWidth(tokensText);
 
   // === Thinking text (may shrink to fit) ===
   let thinkingText =
@@ -199,68 +185,45 @@ export function SpinnerAnimationRow({
       ? `thinking${effortSuffix}`
       : typeof thinkingStatus === 'number'
         ? `thought for ${Math.max(1, Math.round(thinkingStatus / 1000))}s`
-        : null
-  let thinkingWidthValue = thinkingText ? stringWidth(thinkingText) : 0
+        : null;
+  let thinkingWidthValue = thinkingText ? stringWidth(thinkingText) : 0;
 
   // === Progressive width gating ===
-  const messageWidth = glimmerMessageWidth + 2
-  const sep = SEP_WIDTH
+  const messageWidth = glimmerMessageWidth + 2;
+  const sep = SEP_WIDTH;
 
-  const wantsThinking = thinkingStatus !== null
-  const wantsTimerAndTokens =
-    verbose || hasRunningTeammates || effectiveElapsedMs > SHOW_TOKENS_AFTER_MS
+  const wantsThinking = thinkingStatus !== null;
+  const wantsTimerAndTokens = verbose || hasRunningTeammates || effectiveElapsedMs > SHOW_TOKENS_AFTER_MS;
 
-  const availableSpace = columns - messageWidth - 5
+  const availableSpace = columns - messageWidth - 5;
 
-  let showThinking = wantsThinking && availableSpace > thinkingWidthValue
-  if (
-    !showThinking &&
-    wantsThinking &&
-    thinkingStatus === 'thinking' &&
-    effortSuffix
-  ) {
+  let showThinking = wantsThinking && availableSpace > thinkingWidthValue;
+  if (!showThinking && wantsThinking && thinkingStatus === 'thinking' && effortSuffix) {
     if (availableSpace > THINKING_BARE_WIDTH) {
-      thinkingText = 'thinking'
-      thinkingWidthValue = THINKING_BARE_WIDTH
-      showThinking = true
+      thinkingText = 'thinking';
+      thinkingWidthValue = THINKING_BARE_WIDTH;
+      showThinking = true;
     }
   }
-  const usedAfterThinking = showThinking ? thinkingWidthValue + sep : 0
+  const usedAfterThinking = showThinking ? thinkingWidthValue + sep : 0;
 
-  const showTimer =
-    wantsTimerAndTokens && availableSpace > usedAfterThinking + timerWidth
-  const usedAfterTimer = usedAfterThinking + (showTimer ? timerWidth + sep : 0)
+  const showTimer = wantsTimerAndTokens && availableSpace > usedAfterThinking + timerWidth;
+  const usedAfterTimer = usedAfterThinking + (showTimer ? timerWidth + sep : 0);
 
-  const showTokens =
-    wantsTimerAndTokens &&
-    totalTokens > 0 &&
-    availableSpace > usedAfterTimer + tokensWidth
+  const showTokens = wantsTimerAndTokens && totalTokens > 0 && availableSpace > usedAfterTimer + tokensWidth;
 
   const thinkingOnly =
-    showThinking &&
-    thinkingStatus === 'thinking' &&
-    !spinnerSuffix &&
-    !showTimer &&
-    !showTokens &&
-    true
+    showThinking && thinkingStatus === 'thinking' && !spinnerSuffix && !showTimer && !showTokens && true;
 
   // === Thinking shimmer color (formerly ThinkingShimmerText's own timer) ===
   // Same sine-wave opacity, but derived from our shared `time` instead of a
   // second useAnimationFrame(50) subscription.
-  const thinkingElapsedSec = (time - THINKING_DELAY_MS) / 1000
+  const thinkingElapsedSec = (time - THINKING_DELAY_MS) / 1000;
   const thinkingOpacity =
-    time < THINKING_DELAY_MS
-      ? 0
-      : (Math.sin((thinkingElapsedSec * Math.PI * 2) / THINKING_GLOW_PERIOD_S) +
-          1) /
-        2
+    time < THINKING_DELAY_MS ? 0 : (Math.sin((thinkingElapsedSec * Math.PI * 2) / THINKING_GLOW_PERIOD_S) + 1) / 2;
   const thinkingShimmerColor = toRGBColor(
-    interpolateColor(
-      THINKING_INACTIVE,
-      THINKING_INACTIVE_SHIMMER,
-      thinkingOpacity,
-    ),
-  )
+    interpolateColor(THINKING_INACTIVE, THINKING_INACTIVE_SHIMMER, thinkingOpacity),
+  );
 
   // === Build status parts ===
   const parts = [
@@ -299,15 +262,13 @@ export function SpinnerAnimationRow({
           ),
         ]
       : []),
-  ]
+  ];
 
   const status =
     foregroundedTeammate && !foregroundedTeammate.isIdle ? (
       <>
         <Text dimColor>(esc to interrupt </Text>
-        <Text color={toInkColor(foregroundedTeammate.identity.color)}>
-          {foregroundedTeammate.identity.agentName}
-        </Text>
+        <Text color={toInkColor(foregroundedTeammate.identity.color)}>{foregroundedTeammate.identity.agentName}</Text>
         <Text dimColor>)</Text>
       </>
     ) : !foregroundedTeammate && parts.length > 0 ? (
@@ -320,16 +281,10 @@ export function SpinnerAnimationRow({
           <Text dimColor>)</Text>
         </>
       )
-    ) : null
+    ) : null;
 
   return (
-    <Box
-      ref={viewportRef}
-      flexDirection="row"
-      flexWrap="wrap"
-      marginTop={1}
-      width="100%"
-    >
+    <Box ref={viewportRef} flexDirection="row" flexWrap="wrap" marginTop={1} width="100%">
       <SpinnerGlyph
         frame={frame}
         messageColor={messageColor}
@@ -348,7 +303,7 @@ export function SpinnerAnimationRow({
       />
       {status}
     </Box>
-  )
+  );
 }
 
 function SpinnerModeGlyph({ mode }: { mode: SpinnerMode }): React.ReactNode {
@@ -361,12 +316,12 @@ function SpinnerModeGlyph({ mode }: { mode: SpinnerMode }): React.ReactNode {
         <Box width={2}>
           <Text dimColor>{figures.arrowDown}</Text>
         </Box>
-      )
+      );
     case 'requesting':
       return (
         <Box width={2}>
           <Text dimColor>{figures.arrowUp}</Text>
         </Box>
-      )
+      );
   }
 }
diff --git a/src/components/Spinner/SpinnerGlyph.tsx b/src/components/Spinner/SpinnerGlyph.tsx
index d7db456db..fc7f75f60 100644
--- a/src/components/Spinner/SpinnerGlyph.tsx
+++ b/src/components/Spinner/SpinnerGlyph.tsx
@@ -1,31 +1,23 @@
-import * as React from 'react'
-import { Box, Text, useTheme } from '@anthropic/ink'
-import { getTheme, type Theme } from '../../utils/theme.js'
-import {
-  getDefaultCharacters,
-  interpolateColor,
-  parseRGB,
-  toRGBColor,
-} from './utils.js'
+import * as React from 'react';
+import { Box, Text, useTheme } from '@anthropic/ink';
+import { getTheme, type Theme } from '../../utils/theme.js';
+import { getDefaultCharacters, interpolateColor, parseRGB, toRGBColor } from './utils.js';
 
-const DEFAULT_CHARACTERS = getDefaultCharacters()
+const DEFAULT_CHARACTERS = getDefaultCharacters();
 
-const SPINNER_FRAMES = [
-  ...DEFAULT_CHARACTERS,
-  ...[...DEFAULT_CHARACTERS].reverse(),
-]
+const SPINNER_FRAMES = [...DEFAULT_CHARACTERS, ...[...DEFAULT_CHARACTERS].reverse()];
 
-const REDUCED_MOTION_DOT = '●'
-const REDUCED_MOTION_CYCLE_MS = 2000 // 2-second cycle: 1s visible, 1s dim
-const ERROR_RED = { r: 171, g: 43, b: 63 }
+const REDUCED_MOTION_DOT = '●';
+const REDUCED_MOTION_CYCLE_MS = 2000; // 2-second cycle: 1s visible, 1s dim
+const ERROR_RED = { r: 171, g: 43, b: 63 };
 
 type Props = {
-  frame: number
-  messageColor: keyof Theme
-  stalledIntensity?: number
-  reducedMotion?: boolean
-  time?: number
-}
+  frame: number;
+  messageColor: keyof Theme;
+  stalledIntensity?: number;
+  reducedMotion?: boolean;
+  time?: number;
+};
 
 export function SpinnerGlyph({
   frame,
@@ -34,53 +26,49 @@ export function SpinnerGlyph({
   reducedMotion = false,
   time = 0,
 }: Props): React.ReactNode {
-  const [themeName] = useTheme()
-  const theme = getTheme(themeName)
+  const [themeName] = useTheme();
+  const theme = getTheme(themeName);
 
   // Reduced motion: slowly flashing orange dot
   if (reducedMotion) {
-    const isDim = Math.floor(time / (REDUCED_MOTION_CYCLE_MS / 2)) % 2 === 1
+    const isDim = Math.floor(time / (REDUCED_MOTION_CYCLE_MS / 2)) % 2 === 1;
     return (
       <Box flexWrap="wrap" height={1} width={2}>
         <Text color={messageColor} dimColor={isDim}>
           {REDUCED_MOTION_DOT}
         </Text>
       </Box>
-    )
+    );
   }
 
-  const spinnerChar = SPINNER_FRAMES[frame % SPINNER_FRAMES.length]
+  const spinnerChar = SPINNER_FRAMES[frame % SPINNER_FRAMES.length];
 
   // Smoothly interpolate from current color to red when stalled
   if (stalledIntensity > 0) {
-    const baseColorStr = theme[messageColor]
-    const baseRGB = baseColorStr ? parseRGB(baseColorStr) : null
+    const baseColorStr = theme[messageColor];
+    const baseRGB = baseColorStr ? parseRGB(baseColorStr) : null;
 
     if (baseRGB) {
-      const interpolated = interpolateColor(
-        baseRGB,
-        ERROR_RED,
-        stalledIntensity,
-      )
+      const interpolated = interpolateColor(baseRGB, ERROR_RED, stalledIntensity);
       return (
         <Box flexWrap="wrap" height={1} width={2}>
           <Text color={toRGBColor(interpolated)}>{spinnerChar}</Text>
         </Box>
-      )
+      );
     }
 
     // Fallback for ANSI themes
-    const color = stalledIntensity > 0.5 ? 'error' : messageColor
+    const color = stalledIntensity > 0.5 ? 'error' : messageColor;
     return (
       <Box flexWrap="wrap" height={1} width={2}>
         <Text color={color}>{spinnerChar}</Text>
       </Box>
-    )
+    );
   }
 
   return (
     <Box flexWrap="wrap" height={1} width={2}>
       <Text color={messageColor}>{spinnerChar}</Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/Spinner/TeammateSpinnerLine.tsx b/src/components/Spinner/TeammateSpinnerLine.tsx
index 736623ce4..e7e73db21 100644
--- a/src/components/Spinner/TeammateSpinnerLine.tsx
+++ b/src/components/Spinner/TeammateSpinnerLine.tsx
@@ -1,66 +1,55 @@
-import figures from 'figures'
-import sample from 'lodash-es/sample.js'
-import * as React from 'react'
-import { useRef, useState } from 'react'
-import { getSpinnerVerbs } from '../../constants/spinnerVerbs.js'
-import { TURN_COMPLETION_VERBS } from '../../constants/turnCompletionVerbs.js'
-import { useElapsedTime } from '../../hooks/useElapsedTime.js'
-import { useTerminalSize } from '../../hooks/useTerminalSize.js'
-import { Box, Text, stringWidth } from '@anthropic/ink'
-import { toInkColor } from '../../utils/ink.js'
-import type { InProcessTeammateTaskState } from '../../tasks/InProcessTeammateTask/types.js'
-import { summarizeRecentActivities } from '../../utils/collapseReadSearch.js'
-import {
-  formatDuration,
-  formatNumber,
-  truncateToWidth,
-} from '../../utils/format.js'
+import figures from 'figures';
+import sample from 'lodash-es/sample.js';
+import * as React from 'react';
+import { useRef, useState } from 'react';
+import { getSpinnerVerbs } from '../../constants/spinnerVerbs.js';
+import { TURN_COMPLETION_VERBS } from '../../constants/turnCompletionVerbs.js';
+import { useElapsedTime } from '../../hooks/useElapsedTime.js';
+import { useTerminalSize } from '../../hooks/useTerminalSize.js';
+import { Box, Text, stringWidth } from '@anthropic/ink';
+import { toInkColor } from '../../utils/ink.js';
+import type { InProcessTeammateTaskState } from '../../tasks/InProcessTeammateTask/types.js';
+import { summarizeRecentActivities } from '../../utils/collapseReadSearch.js';
+import { formatDuration, formatNumber, truncateToWidth } from '../../utils/format.js';
 
-import { TEAMMATE_SELECT_HINT } from './teammateSelectHint.js'
+import { TEAMMATE_SELECT_HINT } from './teammateSelectHint.js';
 
 type Props = {
-  teammate: InProcessTeammateTaskState
-  isLast: boolean
-  isSelected?: boolean
-  isForegrounded?: boolean
-  allIdle?: boolean
-  showPreview?: boolean
-}
+  teammate: InProcessTeammateTaskState;
+  isLast: boolean;
+  isSelected?: boolean;
+  isForegrounded?: boolean;
+  allIdle?: boolean;
+  showPreview?: boolean;
+};
 
 /**
  * Extract the last 3 lines of content from a teammate's conversation.
  * Shows recent activity from any message type (user or assistant).
  */
-function getMessagePreview(
-  messages: InProcessTeammateTaskState['messages'],
-): string[] {
-  if (!messages?.length) return []
+function getMessagePreview(messages: InProcessTeammateTaskState['messages']): string[] {
+  if (!messages?.length) return [];
 
-  const allLines: string[] = []
-  const maxLineLength = 80
+  const allLines: string[] = [];
+  const maxLineLength = 80;
 
   // Collect lines from recent messages (newest first)
   for (let i = messages.length - 1; i >= 0 && allLines.length < 3; i--) {
-    const msg = messages[i]
+    const msg = messages[i];
     // Only process messages that have content (user/assistant messages)
-    if (
-      !msg ||
-      (msg.type !== 'user' && msg.type !== 'assistant') ||
-      !msg.message?.content?.length
-    ) {
-      continue
+    if (!msg || (msg.type !== 'user' && msg.type !== 'assistant') || !msg.message?.content?.length) {
+      continue;
     }
-    const content = msg.message.content
+    const content = msg.message.content;
 
     for (const block of content) {
-      if (allLines.length >= 3) break
-      if (!block || typeof block !== 'object') continue
+      if (allLines.length >= 3) break;
+      if (!block || typeof block !== 'object') continue;
 
       if ('type' in block && block.type === 'tool_use' && 'name' in block) {
         // Try to show meaningful info from tool input
-        const input =
-          'input' in block ? (block.input as Record<string, unknown>) : null
-        let toolLine = `Using ${block.name}…`
+        const input = 'input' in block ? (block.input as Record<string, unknown>) : null;
+        let toolLine = `Using ${block.name}…`;
         if (input) {
           // Look for common descriptive fields
           const desc =
@@ -68,28 +57,26 @@ function getMessagePreview(
             (input.prompt as string | undefined) ||
             (input.command as string | undefined) ||
             (input.query as string | undefined) ||
-            (input.pattern as string | undefined)
+            (input.pattern as string | undefined);
           if (desc) {
-            toolLine = desc.split('\n')[0] ?? toolLine
+            toolLine = desc.split('\n')[0] ?? toolLine;
           }
         }
-        allLines.push(truncateToWidth(toolLine, maxLineLength))
+        allLines.push(truncateToWidth(toolLine, maxLineLength));
       } else if ('type' in block && block.type === 'text' && 'text' in block) {
-        const textLines = (block.text as string)
-          .split('\n')
-          .filter(l => l.trim())
+        const textLines = (block.text as string).split('\n').filter(l => l.trim());
         // Take from end of text (most recent lines)
         for (let j = textLines.length - 1; j >= 0 && allLines.length < 3; j--) {
-          const line = textLines[j]
-          if (!line) continue
-          allLines.push(truncateToWidth(line, maxLineLength))
+          const line = textLines[j];
+          if (!line) continue;
+          allLines.push(truncateToWidth(line, maxLineLength));
         }
       }
     }
   }
 
   // Reverse so oldest of the 3 is first (reading order)
-  return allLines.reverse()
+  return allLines.reverse();
 }
 
 export function TeammateSpinnerLine({
@@ -100,135 +87,111 @@ export function TeammateSpinnerLine({
   allIdle,
   showPreview,
 }: Props): React.ReactNode {
-  const [randomVerb] = useState(
-    () => teammate.spinnerVerb ?? sample(getSpinnerVerbs()),
-  )
-  const [pastTenseVerb] = useState(
-    () => teammate.pastTenseVerb ?? sample(TURN_COMPLETION_VERBS),
-  )
-  const isHighlighted = isSelected || isForegrounded
-  const treeChar = isHighlighted ? (isLast ? '╘═' : '╞═') : isLast ? '└─' : '├─'
-  const nameColor = toInkColor(teammate.identity.color)
-  const { columns } = useTerminalSize()
+  const [randomVerb] = useState(() => teammate.spinnerVerb ?? sample(getSpinnerVerbs()));
+  const [pastTenseVerb] = useState(() => teammate.pastTenseVerb ?? sample(TURN_COMPLETION_VERBS));
+  const isHighlighted = isSelected || isForegrounded;
+  const treeChar = isHighlighted ? (isLast ? '╘═' : '╞═') : isLast ? '└─' : '├─';
+  const nameColor = toInkColor(teammate.identity.color);
+  const { columns } = useTerminalSize();
 
   // Track when teammate became idle (for "Idle for X..." display)
-  const idleStartRef = useRef<number | null>(null)
+  const idleStartRef = useRef<number | null>(null);
   // Freeze elapsed time when entering all-idle state
-  const frozenDurationRef = useRef<string | null>(null)
+  const frozenDurationRef = useRef<string | null>(null);
 
   // Track idle start time
   if (teammate.isIdle && idleStartRef.current === null) {
-    idleStartRef.current = Date.now()
+    idleStartRef.current = Date.now();
   } else if (!teammate.isIdle) {
-    idleStartRef.current = null
+    idleStartRef.current = null;
   }
 
   // Reset frozen duration when leaving all-idle state
   if (!allIdle && frozenDurationRef.current !== null) {
-    frozenDurationRef.current = null
+    frozenDurationRef.current = null;
   }
 
   // Get elapsed idle time (how long they've been idle) - for "Idle for X..." display
-  const idleElapsedTime = useElapsedTime(
-    idleStartRef.current ?? Date.now(),
-    teammate.isIdle && !allIdle,
-  )
+  const idleElapsedTime = useElapsedTime(idleStartRef.current ?? Date.now(), teammate.isIdle && !allIdle);
 
   // Freeze the duration when we first detect all idle
   // Use the teammate's actual work time (since task started) for the past-tense display
   if (allIdle && frozenDurationRef.current === null) {
     frozenDurationRef.current = formatDuration(
-      Math.max(
-        0,
-        Date.now() - teammate.startTime - (teammate.totalPausedMs ?? 0),
-      ),
-    )
+      Math.max(0, Date.now() - teammate.startTime - (teammate.totalPausedMs ?? 0)),
+    );
   }
 
   // Use frozen work duration when all idle, otherwise use idle elapsed time
   const displayTime = allIdle
     ? (frozenDurationRef.current ??
       (() => {
-        throw new Error(
-          `frozenDurationRef is null for idle teammate ${teammate.identity.agentName}`,
-        )
+        throw new Error(`frozenDurationRef is null for idle teammate ${teammate.identity.agentName}`);
       })())
-    : idleElapsedTime
+    : idleElapsedTime;
 
   // Layout: paddingLeft(3) + pointer(1) + space(1) + treeChar(2) + space(1) = 8 fixed chars
   // Then optionally: @name + ": " OR just ": "
   // Then: activity text + optional extras (stats, hints)
-  const basePrefix = 8
-  const fullAgentName = `@${teammate.identity.agentName}`
-  const fullNameWidth = stringWidth(fullAgentName)
+  const basePrefix = 8;
+  const fullAgentName = `@${teammate.identity.agentName}`;
+  const fullNameWidth = stringWidth(fullAgentName);
 
   // Get stats from progress
-  const toolUseCount = teammate.progress?.toolUseCount ?? 0
-  const tokenCount = teammate.progress?.tokenCount ?? 0
-  const statsText = ` · ${toolUseCount} tool ${toolUseCount === 1 ? 'use' : 'uses'} · ${formatNumber(tokenCount)} tokens`
-  const statsWidth = stringWidth(statsText)
-  const selectHintText = ` · ${TEAMMATE_SELECT_HINT}`
-  const selectHintWidth = stringWidth(selectHintText)
-  const viewHintText = ' · enter to view'
-  const viewHintWidth = stringWidth(viewHintText)
+  const toolUseCount = teammate.progress?.toolUseCount ?? 0;
+  const tokenCount = teammate.progress?.tokenCount ?? 0;
+  const statsText = ` · ${toolUseCount} tool ${toolUseCount === 1 ? 'use' : 'uses'} · ${formatNumber(tokenCount)} tokens`;
+  const statsWidth = stringWidth(statsText);
+  const selectHintText = ` · ${TEAMMATE_SELECT_HINT}`;
+  const selectHintWidth = stringWidth(selectHintText);
+  const viewHintText = ' · enter to view';
+  const viewHintWidth = stringWidth(viewHintText);
 
   // Progressive responsive layout:
   // Wide (80+): full name + activity + stats + hint
   // Medium (60-80): full name + activity
   // Narrow (<60): hide name, just show activity
-  const minActivityWidth = 25
+  const minActivityWidth = 25;
 
   // Hide name on narrow terminals (< 60 cols) or if there's not enough room
-  const spaceWithFullName = columns - basePrefix - fullNameWidth - 2
-  const showName = columns >= 60 && spaceWithFullName >= minActivityWidth
-  const nameWidth = showName ? fullNameWidth + 2 : 0 // +2 for ": " when name shown
-  const availableForActivity = columns - basePrefix - nameWidth
+  const spaceWithFullName = columns - basePrefix - fullNameWidth - 2;
+  const showName = columns >= 60 && spaceWithFullName >= minActivityWidth;
+  const nameWidth = showName ? fullNameWidth + 2 : 0; // +2 for ": " when name shown
+  const availableForActivity = columns - basePrefix - nameWidth;
 
   // Progressive hiding: view hint → select hint → stats
   // Stats always visible (dimmed when not selected); hints only when highlighted/selected
   const showViewHint =
-    isSelected &&
-    !isForegrounded &&
-    availableForActivity > viewHintWidth + statsWidth + minActivityWidth + 5
+    isSelected && !isForegrounded && availableForActivity > viewHintWidth + statsWidth + minActivityWidth + 5;
   const showSelectHint =
     isHighlighted &&
-    availableForActivity >
-      selectHintWidth +
-        (showViewHint ? viewHintWidth : 0) +
-        statsWidth +
-        minActivityWidth +
-        5
-  const showStats = availableForActivity > statsWidth + minActivityWidth + 5
+    availableForActivity > selectHintWidth + (showViewHint ? viewHintWidth : 0) + statsWidth + minActivityWidth + 5;
+  const showStats = availableForActivity > statsWidth + minActivityWidth + 5;
 
   // Activity text gets remaining space
   const extrasCost =
-    (showStats ? statsWidth : 0) +
-    (showSelectHint ? selectHintWidth : 0) +
-    (showViewHint ? viewHintWidth : 0)
-  const activityMaxWidth = Math.max(
-    minActivityWidth,
-    availableForActivity - extrasCost - 1,
-  )
+    (showStats ? statsWidth : 0) + (showSelectHint ? selectHintWidth : 0) + (showViewHint ? viewHintWidth : 0);
+  const activityMaxWidth = Math.max(minActivityWidth, availableForActivity - extrasCost - 1);
 
   // Format the activity text for active teammates, rolling up search/read ops
   const activityText = (() => {
-    const activities = teammate.progress?.recentActivities
+    const activities = teammate.progress?.recentActivities;
     if (activities && activities.length > 0) {
-      const summary = summarizeRecentActivities(activities)
-      if (summary) return truncateToWidth(summary, activityMaxWidth)
+      const summary = summarizeRecentActivities(activities);
+      if (summary) return truncateToWidth(summary, activityMaxWidth);
     }
-    const desc = teammate.progress?.lastActivity?.activityDescription
-    if (desc) return truncateToWidth(desc, activityMaxWidth)
-    return randomVerb
-  })()
+    const desc = teammate.progress?.lastActivity?.activityDescription;
+    if (desc) return truncateToWidth(desc, activityMaxWidth);
+    return randomVerb;
+  })();
 
   // Status rendering logic
   const renderStatus = (): React.ReactNode => {
     if (teammate.shutdownRequested) {
-      return <Text dimColor>[stopping]</Text>
+      return <Text dimColor>[stopping]</Text>;
     }
     if (teammate.awaitingPlanApproval) {
-      return <Text color="warning">[awaiting approval]</Text>
+      return <Text color="warning">[awaiting approval]</Text>;
     }
     if (teammate.isIdle) {
       if (allIdle) {
@@ -236,27 +199,23 @@ export function TeammateSpinnerLine({
           <Text dimColor>
             {pastTenseVerb} for {displayTime}
           </Text>
-        )
+        );
       }
-      return <Text dimColor>Idle for {idleElapsedTime}</Text>
+      return <Text dimColor>Idle for {idleElapsedTime}</Text>;
     }
     // Active - show spinner glyph + activity description (only when not highlighted;
     // when highlighted, the main spinner above already shows the verb)
     if (isHighlighted) {
-      return null
+      return null;
     }
-    return (
-      <Text dimColor>
-        {activityText?.endsWith('…') ? activityText : `${activityText}…`}
-      </Text>
-    )
-  }
+    return <Text dimColor>{activityText?.endsWith('…') ? activityText : `${activityText}…`}</Text>;
+  };
 
   // Get preview lines if enabled
-  const previewLines = showPreview ? getMessagePreview(teammate.messages) : []
+  const previewLines = showPreview ? getMessagePreview(teammate.messages) : [];
 
   // Tree continuation character for preview lines
-  const previewTreeChar = isLast ? '   ' : '│  '
+  const previewTreeChar = isLast ? '   ' : '│  ';
 
   return (
     <Box flexDirection="column">
@@ -267,19 +226,14 @@ export function TeammateSpinnerLine({
         </Text>
         <Text dimColor={!isSelected}>{treeChar} </Text>
         {/* Agent name: hidden on very narrow screens */}
-        {showName && (
-          <Text color={isSelected ? 'suggestion' : nameColor}>
-            @{teammate.identity.agentName}
-          </Text>
-        )}
+        {showName && <Text color={isSelected ? 'suggestion' : nameColor}>@{teammate.identity.agentName}</Text>}
         {showName && <Text dimColor={!isSelected}>: </Text>}
         {renderStatus()}
         {/* Stats: only shown when selected and terminal is wide enough */}
         {showStats && (
           <Text dimColor>
             {' '}
-            · {toolUseCount} tool {toolUseCount === 1 ? 'use' : 'uses'} ·{' '}
-            {formatNumber(tokenCount)} tokens
+            · {toolUseCount} tool {toolUseCount === 1 ? 'use' : 'uses'} · {formatNumber(tokenCount)} tokens
           </Text>
         )}
         {/* Hints: select hint when highlighted, view hint when selected but not foregrounded */}
@@ -295,5 +249,5 @@ export function TeammateSpinnerLine({
         </Box>
       ))}
     </Box>
-  )
+  );
 }
diff --git a/src/components/Spinner/TeammateSpinnerTree.tsx b/src/components/Spinner/TeammateSpinnerTree.tsx
index 8c297ed57..419bc96b9 100644
--- a/src/components/Spinner/TeammateSpinnerTree.tsx
+++ b/src/components/Spinner/TeammateSpinnerTree.tsx
@@ -1,23 +1,23 @@
-import figures from 'figures'
-import * as React from 'react'
-import { Box, Text, type TextProps } from '@anthropic/ink'
-import { useAppState } from '../../state/AppState.js'
-import { getRunningTeammatesSorted } from '../../tasks/InProcessTeammateTask/InProcessTeammateTask.js'
-import { formatNumber } from '../../utils/format.js'
-import { TeammateSpinnerLine } from './TeammateSpinnerLine.js'
-import { TEAMMATE_SELECT_HINT } from './teammateSelectHint.js'
+import figures from 'figures';
+import * as React from 'react';
+import { Box, Text, type TextProps } from '@anthropic/ink';
+import { useAppState } from '../../state/AppState.js';
+import { getRunningTeammatesSorted } from '../../tasks/InProcessTeammateTask/InProcessTeammateTask.js';
+import { formatNumber } from '../../utils/format.js';
+import { TeammateSpinnerLine } from './TeammateSpinnerLine.js';
+import { TEAMMATE_SELECT_HINT } from './teammateSelectHint.js';
 
 type Props = {
-  selectedIndex?: number
-  isInSelectionMode?: boolean
-  allIdle?: boolean
+  selectedIndex?: number;
+  isInSelectionMode?: boolean;
+  allIdle?: boolean;
   /** Leader's active verb (when leader is actively processing) */
-  leaderVerb?: string
+  leaderVerb?: string;
   /** Leader's token count (when leader is actively processing) */
-  leaderTokenCount?: number
+  leaderTokenCount?: number;
   /** Leader's idle status text (when leader is idle, e.g. "✻ Idle for 3s") */
-  leaderIdleText?: string
-}
+  leaderIdleText?: string;
+};
 
 export function TeammateSpinnerTree({
   selectedIndex,
@@ -27,72 +27,52 @@ export function TeammateSpinnerTree({
   leaderTokenCount,
   leaderIdleText,
 }: Props): React.ReactNode {
-  const tasks = useAppState(s => s.tasks)
-  const viewingAgentTaskId = useAppState(s => s.viewingAgentTaskId)
-  const showTeammateMessagePreview = useAppState(
-    s => s.showTeammateMessagePreview,
-  )
+  const tasks = useAppState(s => s.tasks);
+  const viewingAgentTaskId = useAppState(s => s.viewingAgentTaskId);
+  const showTeammateMessagePreview = useAppState(s => s.showTeammateMessagePreview);
 
-  const teammateTasks = getRunningTeammatesSorted(tasks)
+  const teammateTasks = getRunningTeammatesSorted(tasks);
 
   // Don't render if no running teammates
   if (teammateTasks.length === 0) {
-    return null
+    return null;
   }
 
   // Leader highlighting follows same pattern as teammates:
   // isHighlighted = isForegrounded || isSelected
-  const isLeaderForegrounded = viewingAgentTaskId === undefined
-  const isLeaderSelected = isInSelectionMode && selectedIndex === -1
-  const isLeaderHighlighted = isLeaderForegrounded || isLeaderSelected
-  const leaderColor: TextProps['color'] = 'cyan_FOR_SUBAGENTS_ONLY'
+  const isLeaderForegrounded = viewingAgentTaskId === undefined;
+  const isLeaderSelected = isInSelectionMode && selectedIndex === -1;
+  const isLeaderHighlighted = isLeaderForegrounded || isLeaderSelected;
+  const leaderColor: TextProps['color'] = 'cyan_FOR_SUBAGENTS_ONLY';
 
   // Is the "hide" row selected? (index === teammateCount in selection mode)
-  const isHideSelected =
-    isInSelectionMode === true && selectedIndex === teammateTasks.length
+  const isHideSelected = isInSelectionMode === true && selectedIndex === teammateTasks.length;
 
   return (
     <Box flexDirection="column" marginTop={1}>
       {/* Leader row - always visible, uses ┌─ to enclose the tree */}
       {
         <Box paddingLeft={3}>
-          <Text
-            color={isLeaderSelected ? 'suggestion' : undefined}
-            bold={isLeaderHighlighted}
-          >
+          <Text color={isLeaderSelected ? 'suggestion' : undefined} bold={isLeaderHighlighted}>
             {isLeaderSelected ? figures.pointer : ' '}
           </Text>
           <Text dimColor={!isLeaderHighlighted} bold={isLeaderHighlighted}>
             {isLeaderHighlighted ? '╒═' : '┌─'}{' '}
           </Text>
-          <Text
-            bold={isLeaderHighlighted}
-            color={isLeaderSelected ? 'suggestion' : leaderColor}
-          >
+          <Text bold={isLeaderHighlighted} color={isLeaderSelected ? 'suggestion' : leaderColor}>
             team-lead
           </Text>
           {/* When backgrounded and active: show spinner + verb */}
-          {!isLeaderForegrounded && leaderVerb && (
-            <Text dimColor>: {leaderVerb}…</Text>
-          )}
+          {!isLeaderForegrounded && leaderVerb && <Text dimColor>: {leaderVerb}…</Text>}
           {/* When backgrounded and idle: show idle text */}
-          {!isLeaderForegrounded && !leaderVerb && leaderIdleText && (
-            <Text dimColor>: {leaderIdleText}</Text>
-          )}
+          {!isLeaderForegrounded && !leaderVerb && leaderIdleText && <Text dimColor>: {leaderIdleText}</Text>}
           {/* Stats (tokens) - same dimColor logic as teammates */}
           {leaderTokenCount !== undefined && leaderTokenCount > 0 && (
-            <Text dimColor={!isLeaderHighlighted}>
-              {' '}
-              · {formatNumber(leaderTokenCount)} tokens
-            </Text>
+            <Text dimColor={!isLeaderHighlighted}> · {formatNumber(leaderTokenCount)} tokens</Text>
           )}
           {/* Hints - select hint when highlighted, view hint when selected but not foregrounded */}
-          {isLeaderHighlighted && (
-            <Text dimColor> · {TEAMMATE_SELECT_HINT}</Text>
-          )}
-          {isLeaderSelected && !isLeaderForegrounded && (
-            <Text dimColor> · enter to view</Text>
-          )}
+          {isLeaderHighlighted && <Text dimColor> · {TEAMMATE_SELECT_HINT}</Text>}
+          {isLeaderSelected && !isLeaderForegrounded && <Text dimColor> · enter to view</Text>}
         </Box>
       }
       {teammateTasks.map((teammate, index) => (
@@ -109,7 +89,7 @@ export function TeammateSpinnerTree({
       {/* Hide row - only visible during selection mode */}
       {isInSelectionMode && <HideRow isSelected={isHideSelected} />}
     </Box>
-  )
+  );
 }
 
 function HideRow({ isSelected }: { isSelected: boolean }): React.ReactNode {
@@ -126,5 +106,5 @@ function HideRow({ isSelected }: { isSelected: boolean }): React.ReactNode {
       </Text>
       {isSelected && <Text dimColor> · enter to collapse</Text>}
     </Box>
-  )
+  );
 }
diff --git a/src/components/Spinner/types.ts b/src/components/Spinner/types.ts
index 78a11f342..35409ec9a 100644
--- a/src/components/Spinner/types.ts
+++ b/src/components/Spinner/types.ts
@@ -1,3 +1,3 @@
 // Auto-generated stub — replace with real implementation
-export type SpinnerMode = any;
-export type RGBColor = any;
+export type SpinnerMode = any
+export type RGBColor = any
diff --git a/src/components/Stats.tsx b/src/components/Stats.tsx
index 1d20359f1..9ef8e0728 100644
--- a/src/components/Stats.tsx
+++ b/src/components/Stats.tsx
@@ -1,67 +1,66 @@
-import { feature } from 'bun:bundle'
-import { plot as asciichart } from 'asciichart'
-import chalk from 'chalk'
-import figures from 'figures'
-import React, {
-  Suspense,
-  use,
-  useCallback,
-  useEffect,
-  useMemo,
-  useState,
-} from 'react'
-import stripAnsi from 'strip-ansi'
-import type { CommandResultDisplay } from '../commands.js'
-import { useTerminalSize } from '../hooks/useTerminalSize.js'
+import { feature } from 'bun:bundle';
+import { plot as asciichart } from 'asciichart';
+import chalk from 'chalk';
+import figures from 'figures';
+import React, { Suspense, use, useCallback, useEffect, useMemo, useState } from 'react';
+import stripAnsi from 'strip-ansi';
+import type { CommandResultDisplay } from '../commands.js';
+import { useTerminalSize } from '../hooks/useTerminalSize.js';
 // eslint-disable-next-line custom-rules/prefer-use-keybindings -- raw j/k/arrow stats navigation
-import { Ansi, applyColor, Box, Text, useInput, stringWidth as getStringWidth, type Color, Pane, Tab, Tabs, useTabHeaderFocus } from '@anthropic/ink'
-import { useKeybinding } from '../keybindings/useKeybinding.js'
-import { getGlobalConfig } from '../utils/config.js'
-import { formatDuration, formatNumber } from '../utils/format.js'
-import { generateHeatmap } from '../utils/heatmap.js'
-import { renderModelName } from '../utils/model/model.js'
-import { copyAnsiToClipboard } from '../utils/screenshotClipboard.js'
+import {
+  Ansi,
+  applyColor,
+  Box,
+  Text,
+  useInput,
+  stringWidth as getStringWidth,
+  type Color,
+  Pane,
+  Tab,
+  Tabs,
+  useTabHeaderFocus,
+} from '@anthropic/ink';
+import { useKeybinding } from '../keybindings/useKeybinding.js';
+import { getGlobalConfig } from '../utils/config.js';
+import { formatDuration, formatNumber } from '../utils/format.js';
+import { generateHeatmap } from '../utils/heatmap.js';
+import { renderModelName } from '../utils/model/model.js';
+import { copyAnsiToClipboard } from '../utils/screenshotClipboard.js';
 import {
   aggregateClaudeCodeStatsForRange,
   type ClaudeCodeStats,
   type DailyModelTokens,
   type StatsDateRange,
-} from '../utils/stats.js'
-import { resolveThemeSetting } from '../utils/systemTheme.js'
-import { getTheme, themeColorToAnsi } from '../utils/theme.js'
-import { Spinner } from './Spinner.js'
+} from '../utils/stats.js';
+import { resolveThemeSetting } from '../utils/systemTheme.js';
+import { getTheme, themeColorToAnsi } from '../utils/theme.js';
+import { Spinner } from './Spinner.js';
 
 function formatPeakDay(dateStr: string): string {
-  const date = new Date(dateStr)
+  const date = new Date(dateStr);
   return date.toLocaleDateString('en-US', {
     month: 'short',
     day: 'numeric',
-  })
+  });
 }
 
 type Props = {
-  onClose: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-}
+  onClose: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+};
 
-type StatsResult =
-  | { type: 'success'; data: ClaudeCodeStats }
-  | { type: 'error'; message: string }
-  | { type: 'empty' }
+type StatsResult = { type: 'success'; data: ClaudeCodeStats } | { type: 'error'; message: string } | { type: 'empty' };
 
 const DATE_RANGE_LABELS: Record<StatsDateRange, string> = {
   '7d': 'Last 7 days',
   '30d': 'Last 30 days',
   all: 'All time',
-}
+};
 
-const DATE_RANGE_ORDER: StatsDateRange[] = ['all', '7d', '30d']
+const DATE_RANGE_ORDER: StatsDateRange[] = ['all', '7d', '30d'];
 
 function getNextDateRange(current: StatsDateRange): StatsDateRange {
-  const currentIndex = DATE_RANGE_ORDER.indexOf(current)
-  return DATE_RANGE_ORDER[(currentIndex + 1) % DATE_RANGE_ORDER.length]!
+  const currentIndex = DATE_RANGE_ORDER.indexOf(current);
+  return DATE_RANGE_ORDER[(currentIndex + 1) % DATE_RANGE_ORDER.length]!;
 }
 
 /**
@@ -72,20 +71,19 @@ function createAllTimeStatsPromise(): Promise<StatsResult> {
   return aggregateClaudeCodeStatsForRange('all')
     .then((data): StatsResult => {
       if (!data || data.totalSessions === 0) {
-        return { type: 'empty' }
+        return { type: 'empty' };
       }
-      return { type: 'success', data }
+      return { type: 'success', data };
     })
     .catch((err): StatsResult => {
-      const message =
-        err instanceof Error ? err.message : 'Failed to load stats'
-      return { type: 'error', message }
-    })
+      const message = err instanceof Error ? err.message : 'Failed to load stats';
+      return { type: 'error', message };
+    });
 }
 
 export function Stats({ onClose }: Props): React.ReactNode {
   // Always load all-time stats first (for heatmap)
-  const allTimePromise = useMemo(() => createAllTimeStatsPromise(), [])
+  const allTimePromise = useMemo(() => createAllTimeStatsPromise(), []);
 
   return (
     <Suspense
@@ -98,62 +96,57 @@ export function Stats({ onClose }: Props): React.ReactNode {
     >
       <StatsContent allTimePromise={allTimePromise} onClose={onClose} />
     </Suspense>
-  )
+  );
 }
 
 type StatsContentProps = {
-  allTimePromise: Promise<StatsResult>
-  onClose: Props['onClose']
-}
+  allTimePromise: Promise<StatsResult>;
+  onClose: Props['onClose'];
+};
 
 /**
  * Inner component that uses React 19's use() to read the stats promise.
  * Suspends while loading all-time stats, then handles date range changes without suspending.
  */
-function StatsContent({
-  allTimePromise,
-  onClose,
-}: StatsContentProps): React.ReactNode {
-  const allTimeResult = use(allTimePromise)
-  const [dateRange, setDateRange] = useState<StatsDateRange>('all')
-  const [statsCache, setStatsCache] = useState<
-    Partial<Record<StatsDateRange, ClaudeCodeStats>>
-  >({})
-  const [isLoadingFiltered, setIsLoadingFiltered] = useState(false)
-  const [activeTab, setActiveTab] = useState<'Overview' | 'Models'>('Overview')
-  const [copyStatus, setCopyStatus] = useState<string | null>(null)
+function StatsContent({ allTimePromise, onClose }: StatsContentProps): React.ReactNode {
+  const allTimeResult = use(allTimePromise);
+  const [dateRange, setDateRange] = useState<StatsDateRange>('all');
+  const [statsCache, setStatsCache] = useState<Partial<Record<StatsDateRange, ClaudeCodeStats>>>({});
+  const [isLoadingFiltered, setIsLoadingFiltered] = useState(false);
+  const [activeTab, setActiveTab] = useState<'Overview' | 'Models'>('Overview');
+  const [copyStatus, setCopyStatus] = useState<string | null>(null);
 
   // Load filtered stats when date range changes (with caching)
   useEffect(() => {
     if (dateRange === 'all') {
-      return
+      return;
     }
 
     // Already cached
     if (statsCache[dateRange]) {
-      return
+      return;
     }
 
-    let cancelled = false
-    setIsLoadingFiltered(true)
+    let cancelled = false;
+    setIsLoadingFiltered(true);
 
     aggregateClaudeCodeStatsForRange(dateRange)
       .then(data => {
         if (!cancelled) {
-          setStatsCache(prev => ({ ...prev, [dateRange]: data }))
-          setIsLoadingFiltered(false)
+          setStatsCache(prev => ({ ...prev, [dateRange]: data }));
+          setIsLoadingFiltered(false);
         }
       })
       .catch(() => {
         if (!cancelled) {
-          setIsLoadingFiltered(false)
+          setIsLoadingFiltered(false);
         }
-      })
+      });
 
     return () => {
-      cancelled = true
-    }
-  }, [dateRange, statsCache])
+      cancelled = true;
+    };
+  }, [dateRange, statsCache]);
 
   // Use cached stats for current range
   const displayStats =
@@ -161,54 +154,50 @@ function StatsContent({
       ? allTimeResult.type === 'success'
         ? allTimeResult.data
         : null
-      : (statsCache[dateRange] ??
-        (allTimeResult.type === 'success' ? allTimeResult.data : null))
+      : (statsCache[dateRange] ?? (allTimeResult.type === 'success' ? allTimeResult.data : null));
 
   // All-time stats for the heatmap (always use all-time)
-  const allTimeStats =
-    allTimeResult.type === 'success' ? allTimeResult.data : null
+  const allTimeStats = allTimeResult.type === 'success' ? allTimeResult.data : null;
 
   const handleClose = useCallback(() => {
-    onClose('Stats dialog dismissed', { display: 'system' })
-  }, [onClose])
+    onClose('Stats dialog dismissed', { display: 'system' });
+  }, [onClose]);
 
-  useKeybinding('confirm:no', handleClose, { context: 'Confirmation' })
+  useKeybinding('confirm:no', handleClose, { context: 'Confirmation' });
 
   useInput((input, key) => {
     // Handle ctrl+c and ctrl+d for closing
     if (key.ctrl && (input === 'c' || input === 'd')) {
-      onClose('Stats dialog dismissed', { display: 'system' })
+      onClose('Stats dialog dismissed', { display: 'system' });
     }
     // Track tab changes
     if (key.tab) {
-      setActiveTab(prev => (prev === 'Overview' ? 'Models' : 'Overview'))
+      setActiveTab(prev => (prev === 'Overview' ? 'Models' : 'Overview'));
     }
     // r to cycle date range
     if (input === 'r' && !key.ctrl && !key.meta) {
-      setDateRange(getNextDateRange(dateRange))
+      setDateRange(getNextDateRange(dateRange));
     }
     // Ctrl+S to copy screenshot to clipboard
     if (key.ctrl && input === 's' && displayStats) {
-      void handleScreenshot(displayStats, activeTab, setCopyStatus)
+      void handleScreenshot(displayStats, activeTab, setCopyStatus);
     }
-  })
+  });
 
   if (allTimeResult.type === 'error') {
     return (
       <Box marginTop={1}>
         <Text color="error">Failed to load stats: {allTimeResult.message}</Text>
       </Box>
-    )
+    );
   }
 
   if (allTimeResult.type === 'empty') {
     return (
       <Box marginTop={1}>
-        <Text color="warning">
-          No stats available yet. Start using Claude Code!
-        </Text>
+        <Text color="warning">No stats available yet. Start using Claude Code!</Text>
       </Box>
-    )
+    );
   }
 
   if (!displayStats || !allTimeStats) {
@@ -217,7 +206,7 @@ function StatsContent({
         <Spinner />
         <Text> Loading stats…</Text>
       </Box>
-    )
+    );
   }
 
   return (
@@ -233,11 +222,7 @@ function StatsContent({
             />
           </Tab>
           <Tab title="Models">
-            <ModelsTab
-              stats={displayStats}
-              dateRange={dateRange}
-              isLoading={isLoadingFiltered}
-            />
+            <ModelsTab stats={displayStats} dateRange={dateRange} isLoading={isLoadingFiltered} />
           </Tab>
         </Tabs>
       </Box>
@@ -248,15 +233,15 @@ function StatsContent({
         </Text>
       </Box>
     </Pane>
-  )
+  );
 }
 
 function DateRangeSelector({
   dateRange,
   isLoading,
 }: {
-  dateRange: StatsDateRange
-  isLoading: boolean
+  dateRange: StatsDateRange;
+  isLoading: boolean;
 }): React.ReactNode {
   return (
     <Box marginBottom={1} gap={1}>
@@ -276,7 +261,7 @@ function DateRangeSelector({
       </Box>
       {isLoading && <Spinner />}
     </Box>
-  )
+  );
 }
 
 function OverviewTab({
@@ -285,59 +270,48 @@ function OverviewTab({
   dateRange,
   isLoading,
 }: {
-  stats: ClaudeCodeStats
-  allTimeStats: ClaudeCodeStats
-  dateRange: StatsDateRange
-  isLoading: boolean
+  stats: ClaudeCodeStats;
+  allTimeStats: ClaudeCodeStats;
+  dateRange: StatsDateRange;
+  isLoading: boolean;
 }): React.ReactNode {
-  const { columns: terminalWidth } = useTerminalSize()
+  const { columns: terminalWidth } = useTerminalSize();
 
   // Calculate favorite model and total tokens
   const modelEntries = Object.entries(stats.modelUsage).sort(
-    ([, a], [, b]) =>
-      b.inputTokens + b.outputTokens - (a.inputTokens + a.outputTokens),
-  )
-  const favoriteModel = modelEntries[0]
-  const totalTokens = modelEntries.reduce(
-    (sum, [, usage]) => sum + usage.inputTokens + usage.outputTokens,
-    0,
-  )
+    ([, a], [, b]) => b.inputTokens + b.outputTokens - (a.inputTokens + a.outputTokens),
+  );
+  const favoriteModel = modelEntries[0];
+  const totalTokens = modelEntries.reduce((sum, [, usage]) => sum + usage.inputTokens + usage.outputTokens, 0);
 
   // Memoize the factoid so it doesn't change when switching tabs
-  const factoid = useMemo(
-    () => generateFunFactoid(stats, totalTokens),
-    [stats, totalTokens],
-  )
+  const factoid = useMemo(() => generateFunFactoid(stats, totalTokens), [stats, totalTokens]);
 
   // Calculate range days based on selected date range
-  const rangeDays =
-    dateRange === '7d' ? 7 : dateRange === '30d' ? 30 : stats.totalDays
+  const rangeDays = dateRange === '7d' ? 7 : dateRange === '30d' ? 30 : stats.totalDays;
 
   // Compute shot stats data (ant-only, gated by feature flag)
   let shotStatsData: {
-    avgShots: string
-    buckets: { label: string; count: number; pct: number }[]
-  } | null = null
+    avgShots: string;
+    buckets: { label: string; count: number; pct: number }[];
+  } | null = null;
   if (feature('SHOT_STATS') && stats.shotDistribution) {
-    const dist = stats.shotDistribution
-    const total = Object.values(dist).reduce((s, n) => s + n, 0)
+    const dist = stats.shotDistribution;
+    const total = Object.values(dist).reduce((s, n) => s + n, 0);
     if (total > 0) {
-      const totalShots = Object.entries(dist).reduce(
-        (s, [count, sessions]) => s + parseInt(count, 10) * sessions,
-        0,
-      )
+      const totalShots = Object.entries(dist).reduce((s, [count, sessions]) => s + parseInt(count, 10) * sessions, 0);
       const bucket = (min: number, max?: number) =>
         Object.entries(dist)
           .filter(([k]) => {
-            const n = parseInt(k, 10)
-            return n >= min && (max === undefined || n <= max)
+            const n = parseInt(k, 10);
+            return n >= min && (max === undefined || n <= max);
           })
-          .reduce((s, [, v]) => s + v, 0)
-      const pct = (n: number) => Math.round((n / total) * 100)
-      const b1 = bucket(1, 1)
-      const b2_5 = bucket(2, 5)
-      const b6_10 = bucket(6, 10)
-      const b11 = bucket(11)
+          .reduce((s, [, v]) => s + v, 0);
+      const pct = (n: number) => Math.round((n / total) * 100);
+      const b1 = bucket(1, 1);
+      const b2_5 = bucket(2, 5);
+      const b6_10 = bucket(6, 10);
+      const b11 = bucket(11);
       shotStatsData = {
         avgShots: (totalShots / total).toFixed(1),
         buckets: [
@@ -346,7 +320,7 @@ function OverviewTab({
           { label: '6\u201310 shot', count: b6_10, pct: pct(b6_10) },
           { label: '11+ shot', count: b11, pct: pct(b11) },
         ],
-      }
+      };
     }
   }
 
@@ -355,9 +329,7 @@ function OverviewTab({
       {/* Activity Heatmap - always shows all-time data */}
       {allTimeStats.dailyActivity.length > 0 && (
         <Box flexDirection="column" marginBottom={1}>
-          <Ansi>
-            {generateHeatmap(allTimeStats.dailyActivity, { terminalWidth })}
-          </Ansi>
+          <Ansi>{generateHeatmap(allTimeStats.dailyActivity, { terminalWidth })}</Ansi>
         </Box>
       )}
 
@@ -378,8 +350,7 @@ function OverviewTab({
         </Box>
         <Box flexDirection="column" width={28}>
           <Text wrap="truncate">
-            Total tokens:{' '}
-            <Text color="claude">{formatNumber(totalTokens)}</Text>
+            Total tokens: <Text color="claude">{formatNumber(totalTokens)}</Text>
           </Text>
         </Box>
       </Box>
@@ -388,17 +359,13 @@ function OverviewTab({
       <Box flexDirection="row" gap={4}>
         <Box flexDirection="column" width={28}>
           <Text wrap="truncate">
-            Sessions:{' '}
-            <Text color="claude">{formatNumber(stats.totalSessions)}</Text>
+            Sessions: <Text color="claude">{formatNumber(stats.totalSessions)}</Text>
           </Text>
         </Box>
         <Box flexDirection="column" width={28}>
           {stats.longestSession && (
             <Text wrap="truncate">
-              Longest session:{' '}
-              <Text color="claude">
-                {formatDuration(stats.longestSession.duration)}
-              </Text>
+              Longest session: <Text color="claude">{formatDuration(stats.longestSession.duration)}</Text>
             </Text>
           )}
         </Box>
@@ -428,8 +395,7 @@ function OverviewTab({
         <Box flexDirection="column" width={28}>
           {stats.peakActivityDay && (
             <Text wrap="truncate">
-              Most active day:{' '}
-              <Text color="claude">{formatPeakDay(stats.peakActivityDay)}</Text>
+              Most active day: <Text color="claude">{formatPeakDay(stats.peakActivityDay)}</Text>
             </Text>
           )}
         </Box>
@@ -445,19 +411,15 @@ function OverviewTab({
       </Box>
 
       {/* Speculation time saved (ant-only) */}
-      {process.env.USER_TYPE === 'ant' &&
-        stats.totalSpeculationTimeSavedMs > 0 && (
-          <Box flexDirection="row" gap={4}>
-            <Box flexDirection="column" width={28}>
-              <Text wrap="truncate">
-                Speculation saved:{' '}
-                <Text color="claude">
-                  {formatDuration(stats.totalSpeculationTimeSavedMs)}
-                </Text>
-              </Text>
-            </Box>
+      {process.env.USER_TYPE === 'ant' && stats.totalSpeculationTimeSavedMs > 0 && (
+        <Box flexDirection="row" gap={4}>
+          <Box flexDirection="column" width={28}>
+            <Text wrap="truncate">
+              Speculation saved: <Text color="claude">{formatDuration(stats.totalSpeculationTimeSavedMs)}</Text>
+            </Text>
           </Box>
-        )}
+        </Box>
+      )}
 
       {/* Shot stats (ant-only) */}
       {shotStatsData && (
@@ -468,15 +430,13 @@ function OverviewTab({
           <Box flexDirection="row" gap={4}>
             <Box flexDirection="column" width={28}>
               <Text wrap="truncate">
-                {shotStatsData.buckets[0]!.label}:{' '}
-                <Text color="claude">{shotStatsData.buckets[0]!.count}</Text>
+                {shotStatsData.buckets[0]!.label}: <Text color="claude">{shotStatsData.buckets[0]!.count}</Text>
                 <Text color="subtle"> ({shotStatsData.buckets[0]!.pct}%)</Text>
               </Text>
             </Box>
             <Box flexDirection="column" width={28}>
               <Text wrap="truncate">
-                {shotStatsData.buckets[1]!.label}:{' '}
-                <Text color="claude">{shotStatsData.buckets[1]!.count}</Text>
+                {shotStatsData.buckets[1]!.label}: <Text color="claude">{shotStatsData.buckets[1]!.count}</Text>
                 <Text color="subtle"> ({shotStatsData.buckets[1]!.pct}%)</Text>
               </Text>
             </Box>
@@ -484,15 +444,13 @@ function OverviewTab({
           <Box flexDirection="row" gap={4}>
             <Box flexDirection="column" width={28}>
               <Text wrap="truncate">
-                {shotStatsData.buckets[2]!.label}:{' '}
-                <Text color="claude">{shotStatsData.buckets[2]!.count}</Text>
+                {shotStatsData.buckets[2]!.label}: <Text color="claude">{shotStatsData.buckets[2]!.count}</Text>
                 <Text color="subtle"> ({shotStatsData.buckets[2]!.pct}%)</Text>
               </Text>
             </Box>
             <Box flexDirection="column" width={28}>
               <Text wrap="truncate">
-                {shotStatsData.buckets[3]!.label}:{' '}
-                <Text color="claude">{shotStatsData.buckets[3]!.count}</Text>
+                {shotStatsData.buckets[3]!.label}: <Text color="claude">{shotStatsData.buckets[3]!.count}</Text>
                 <Text color="subtle"> ({shotStatsData.buckets[3]!.pct}%)</Text>
               </Text>
             </Box>
@@ -500,8 +458,7 @@ function OverviewTab({
           <Box flexDirection="row" gap={4}>
             <Box flexDirection="column" width={28}>
               <Text wrap="truncate">
-                Avg/session:{' '}
-                <Text color="claude">{shotStatsData.avgShots}</Text>
+                Avg/session: <Text color="claude">{shotStatsData.avgShots}</Text>
               </Text>
             </Box>
           </Box>
@@ -515,7 +472,7 @@ function OverviewTab({
         </Box>
       )}
     </Box>
-  )
+  );
 }
 
 // Famous books and their approximate token counts (words * ~1.3)
@@ -545,7 +502,7 @@ const BOOK_COMPARISONS = [
   { name: 'The Count of Monte Cristo', tokens: 603000 },
   { name: 'Les Misérables', tokens: 689000 },
   { name: 'War and Peace', tokens: 730000 },
-]
+];
 
 // Time equivalents for session durations
 const TIME_COMPARISONS = [
@@ -559,48 +516,39 @@ const TIME_COMPARISONS = [
   { name: 'watching Titanic', minutes: 195 },
   { name: 'a transatlantic flight', minutes: 420 },
   { name: 'a full night of sleep', minutes: 480 },
-]
+];
 
-function generateFunFactoid(
-  stats: ClaudeCodeStats,
-  totalTokens: number,
-): string {
-  const factoids: string[] = []
+function generateFunFactoid(stats: ClaudeCodeStats, totalTokens: number): string {
+  const factoids: string[] = [];
 
   if (totalTokens > 0) {
-    const matchingBooks = BOOK_COMPARISONS.filter(
-      book => totalTokens >= book.tokens,
-    )
+    const matchingBooks = BOOK_COMPARISONS.filter(book => totalTokens >= book.tokens);
 
     for (const book of matchingBooks) {
-      const times = totalTokens / book.tokens
+      const times = totalTokens / book.tokens;
       if (times >= 2) {
-        factoids.push(
-          `You've used ~${Math.floor(times)}x more tokens than ${book.name}`,
-        )
+        factoids.push(`You've used ~${Math.floor(times)}x more tokens than ${book.name}`);
       } else {
-        factoids.push(`You've used the same number of tokens as ${book.name}`)
+        factoids.push(`You've used the same number of tokens as ${book.name}`);
       }
     }
   }
 
   if (stats.longestSession) {
-    const sessionMinutes = stats.longestSession.duration / (1000 * 60)
+    const sessionMinutes = stats.longestSession.duration / (1000 * 60);
     for (const comparison of TIME_COMPARISONS) {
-      const ratio = sessionMinutes / comparison.minutes
+      const ratio = sessionMinutes / comparison.minutes;
       if (ratio >= 2) {
-        factoids.push(
-          `Your longest session is ~${Math.floor(ratio)}x longer than ${comparison.name}`,
-        )
+        factoids.push(`Your longest session is ~${Math.floor(ratio)}x longer than ${comparison.name}`);
       }
     }
   }
 
   if (factoids.length === 0) {
-    return ''
+    return '';
   }
-  const randomIndex = Math.floor(Math.random() * factoids.length)
-  return factoids[randomIndex]!
+  const randomIndex = Math.floor(Math.random() * factoids.length);
+  return factoids[randomIndex]!;
 }
 
 function ModelsTab({
@@ -608,74 +556,62 @@ function ModelsTab({
   dateRange,
   isLoading,
 }: {
-  stats: ClaudeCodeStats
-  dateRange: StatsDateRange
-  isLoading: boolean
+  stats: ClaudeCodeStats;
+  dateRange: StatsDateRange;
+  isLoading: boolean;
 }): React.ReactNode {
-  const { headerFocused, focusHeader } = useTabHeaderFocus()
-  const [scrollOffset, setScrollOffset] = useState(0)
-  const { columns: terminalWidth } = useTerminalSize()
-  const VISIBLE_MODELS = 4 // Show 4 models at a time (2 per column)
+  const { headerFocused, focusHeader } = useTabHeaderFocus();
+  const [scrollOffset, setScrollOffset] = useState(0);
+  const { columns: terminalWidth } = useTerminalSize();
+  const VISIBLE_MODELS = 4; // Show 4 models at a time (2 per column)
 
   const modelEntries = Object.entries(stats.modelUsage).sort(
-    ([, a], [, b]) =>
-      b.inputTokens + b.outputTokens - (a.inputTokens + a.outputTokens),
-  )
+    ([, a], [, b]) => b.inputTokens + b.outputTokens - (a.inputTokens + a.outputTokens),
+  );
 
   // Handle scrolling with arrow keys
   useInput(
     (_input, key) => {
-      if (
-        key.downArrow &&
-        scrollOffset < modelEntries.length - VISIBLE_MODELS
-      ) {
-        setScrollOffset(prev =>
-          Math.min(prev + 2, modelEntries.length - VISIBLE_MODELS),
-        )
+      if (key.downArrow && scrollOffset < modelEntries.length - VISIBLE_MODELS) {
+        setScrollOffset(prev => Math.min(prev + 2, modelEntries.length - VISIBLE_MODELS));
       }
       if (key.upArrow) {
         if (scrollOffset > 0) {
-          setScrollOffset(prev => Math.max(prev - 2, 0))
+          setScrollOffset(prev => Math.max(prev - 2, 0));
         } else {
-          focusHeader()
+          focusHeader();
         }
       }
     },
     { isActive: !headerFocused },
-  )
+  );
 
   if (modelEntries.length === 0) {
     return (
       <Box>
         <Text color="subtle">No model usage data available</Text>
       </Box>
-    )
+    );
   }
 
-  const totalTokens = modelEntries.reduce(
-    (sum, [, usage]) => sum + usage.inputTokens + usage.outputTokens,
-    0,
-  )
+  const totalTokens = modelEntries.reduce((sum, [, usage]) => sum + usage.inputTokens + usage.outputTokens, 0);
 
   // Generate token usage chart - use terminal width for responsive sizing
   const chartOutput = generateTokenChart(
     stats.dailyModelTokens,
     modelEntries.map(([model]) => model),
     terminalWidth,
-  )
+  );
 
   // Get visible models and split into two columns
-  const visibleModels = modelEntries.slice(
-    scrollOffset,
-    scrollOffset + VISIBLE_MODELS,
-  )
-  const midpoint = Math.ceil(visibleModels.length / 2)
-  const leftModels = visibleModels.slice(0, midpoint)
-  const rightModels = visibleModels.slice(midpoint)
+  const visibleModels = modelEntries.slice(scrollOffset, scrollOffset + VISIBLE_MODELS);
+  const midpoint = Math.ceil(visibleModels.length / 2);
+  const leftModels = visibleModels.slice(0, midpoint);
+  const rightModels = visibleModels.slice(midpoint);
 
-  const canScrollUp = scrollOffset > 0
-  const canScrollDown = scrollOffset < modelEntries.length - VISIBLE_MODELS
-  const showScrollHint = modelEntries.length > VISIBLE_MODELS
+  const canScrollUp = scrollOffset > 0;
+  const canScrollDown = scrollOffset < modelEntries.length - VISIBLE_MODELS;
+  const showScrollHint = modelEntries.length > VISIBLE_MODELS;
 
   return (
     <Box flexDirection="column" marginTop={1}>
@@ -703,22 +639,12 @@ function ModelsTab({
       <Box flexDirection="row" gap={4}>
         <Box flexDirection="column" width={36}>
           {leftModels.map(([model, usage]) => (
-            <ModelEntry
-              key={model}
-              model={model}
-              usage={usage}
-              totalTokens={totalTokens}
-            />
+            <ModelEntry key={model} model={model} usage={usage} totalTokens={totalTokens} />
           ))}
         </Box>
         <Box flexDirection="column" width={36}>
           {rightModels.map(([model, usage]) => (
-            <ModelEntry
-              key={model}
-              model={model}
-              usage={usage}
-              totalTokens={totalTokens}
-            />
+            <ModelEntry key={model} model={model} usage={usage} totalTokens={totalTokens} />
           ))}
         </Box>
       </Box>
@@ -727,59 +653,52 @@ function ModelsTab({
       {showScrollHint && (
         <Box marginTop={1}>
           <Text color="subtle">
-            {canScrollUp ? figures.arrowUp : ' '}{' '}
-            {canScrollDown ? figures.arrowDown : ' '} {scrollOffset + 1}-
-            {Math.min(scrollOffset + VISIBLE_MODELS, modelEntries.length)} of{' '}
-            {modelEntries.length} models (↑↓ to scroll)
+            {canScrollUp ? figures.arrowUp : ' '} {canScrollDown ? figures.arrowDown : ' '} {scrollOffset + 1}-
+            {Math.min(scrollOffset + VISIBLE_MODELS, modelEntries.length)} of {modelEntries.length} models (↑↓ to
+            scroll)
           </Text>
         </Box>
       )}
     </Box>
-  )
+  );
 }
 
 type ModelEntryProps = {
-  model: string
+  model: string;
   usage: {
-    inputTokens: number
-    outputTokens: number
-    cacheReadInputTokens: number
-  }
-  totalTokens: number
-}
+    inputTokens: number;
+    outputTokens: number;
+    cacheReadInputTokens: number;
+  };
+  totalTokens: number;
+};
 
-function ModelEntry({
-  model,
-  usage,
-  totalTokens,
-}: ModelEntryProps): React.ReactNode {
-  const modelTokens = usage.inputTokens + usage.outputTokens
-  const percentage = ((modelTokens / totalTokens) * 100).toFixed(1)
+function ModelEntry({ model, usage, totalTokens }: ModelEntryProps): React.ReactNode {
+  const modelTokens = usage.inputTokens + usage.outputTokens;
+  const percentage = ((modelTokens / totalTokens) * 100).toFixed(1);
 
   return (
     <Box flexDirection="column">
       <Text>
-        {figures.bullet} <Text bold>{renderModelName(model)}</Text>{' '}
-        <Text color="subtle">({percentage}%)</Text>
+        {figures.bullet} <Text bold>{renderModelName(model)}</Text> <Text color="subtle">({percentage}%)</Text>
       </Text>
       <Text color="subtle">
-        {'  '}In: {formatNumber(usage.inputTokens)} · Out:{' '}
-        {formatNumber(usage.outputTokens)}
+        {'  '}In: {formatNumber(usage.inputTokens)} · Out: {formatNumber(usage.outputTokens)}
       </Text>
     </Box>
-  )
+  );
 }
 
 type ChartLegend = {
-  model: string
-  coloredBullet: string // Pre-colored bullet using chalk
-}
+  model: string;
+  coloredBullet: string; // Pre-colored bullet using chalk
+};
 
 type ChartOutput = {
-  chart: string
-  legend: ChartLegend[]
-  xAxisLabels: string
-}
+  chart: string;
+  legend: ChartLegend[];
+  xAxisLabels: string;
+};
 
 function generateTokenChart(
   dailyTokens: DailyModelTokens[],
@@ -787,131 +706,116 @@ function generateTokenChart(
   terminalWidth: number,
 ): ChartOutput | null {
   if (dailyTokens.length < 2 || models.length === 0) {
-    return null
+    return null;
   }
 
   // Y-axis labels take about 6 characters, plus some padding
   // Cap at ~52 to align with heatmap width (1 year of data)
-  const yAxisWidth = 7
-  const availableWidth = terminalWidth - yAxisWidth
-  const chartWidth = Math.min(52, Math.max(20, availableWidth))
+  const yAxisWidth = 7;
+  const availableWidth = terminalWidth - yAxisWidth;
+  const chartWidth = Math.min(52, Math.max(20, availableWidth));
 
   // Distribute data across the available chart width
-  let recentData: DailyModelTokens[]
+  let recentData: DailyModelTokens[];
   if (dailyTokens.length >= chartWidth) {
     // More data than space: take most recent N days
-    recentData = dailyTokens.slice(-chartWidth)
+    recentData = dailyTokens.slice(-chartWidth);
   } else {
     // Less data than space: expand by repeating each point
-    const repeatCount = Math.floor(chartWidth / dailyTokens.length)
-    recentData = []
+    const repeatCount = Math.floor(chartWidth / dailyTokens.length);
+    recentData = [];
     for (const day of dailyTokens) {
       for (let i = 0; i < repeatCount; i++) {
-        recentData.push(day)
+        recentData.push(day);
       }
     }
   }
 
   // Color palette for different models - use theme colors
-  const theme = getTheme(resolveThemeSetting(getGlobalConfig().theme))
-  const colors = [
-    themeColorToAnsi(theme.suggestion),
-    themeColorToAnsi(theme.success),
-    themeColorToAnsi(theme.warning),
-  ]
+  const theme = getTheme(resolveThemeSetting(getGlobalConfig().theme));
+  const colors = [themeColorToAnsi(theme.suggestion), themeColorToAnsi(theme.success), themeColorToAnsi(theme.warning)];
 
   // Prepare series data for each model
-  const series: number[][] = []
-  const legend: ChartLegend[] = []
+  const series: number[][] = [];
+  const legend: ChartLegend[] = [];
 
   // Only show top 3 models to keep chart readable
-  const topModels = models.slice(0, 3)
+  const topModels = models.slice(0, 3);
 
   for (let i = 0; i < topModels.length; i++) {
-    const model = topModels[i]!
-    const data = recentData.map(day => day.tokensByModel[model] || 0)
+    const model = topModels[i]!;
+    const data = recentData.map(day => day.tokensByModel[model] || 0);
 
     // Only include if there's actual data
     if (data.some(v => v > 0)) {
-      series.push(data)
+      series.push(data);
       // Use theme colors that match the chart
-      const bulletColors = [theme.suggestion, theme.success, theme.warning]
+      const bulletColors = [theme.suggestion, theme.success, theme.warning];
       legend.push({
         model: renderModelName(model),
-        coloredBullet: applyColor(
-          figures.bullet,
-          bulletColors[i % bulletColors.length] as Color,
-        ),
-      })
+        coloredBullet: applyColor(figures.bullet, bulletColors[i % bulletColors.length] as Color),
+      });
     }
   }
 
   if (series.length === 0) {
-    return null
+    return null;
   }
 
   const chart = asciichart(series, {
     height: 8,
     colors: colors.slice(0, series.length),
     format: (x: number) => {
-      let label: string
+      let label: string;
       if (x >= 1_000_000) {
-        label = (x / 1_000_000).toFixed(1) + 'M'
+        label = (x / 1_000_000).toFixed(1) + 'M';
       } else if (x >= 1_000) {
-        label = (x / 1_000).toFixed(0) + 'k'
+        label = (x / 1_000).toFixed(0) + 'k';
       } else {
-        label = x.toFixed(0)
+        label = x.toFixed(0);
       }
-      return label.padStart(6)
+      return label.padStart(6);
     },
-  })
+  });
 
   // Generate x-axis labels with dates
-  const xAxisLabels = generateXAxisLabels(
-    recentData,
-    recentData.length,
-    yAxisWidth,
-  )
+  const xAxisLabels = generateXAxisLabels(recentData, recentData.length, yAxisWidth);
 
-  return { chart, legend, xAxisLabels }
+  return { chart, legend, xAxisLabels };
 }
 
-function generateXAxisLabels(
-  data: DailyModelTokens[],
-  _chartWidth: number,
-  yAxisOffset: number,
-): string {
-  if (data.length === 0) return ''
+function generateXAxisLabels(data: DailyModelTokens[], _chartWidth: number, yAxisOffset: number): string {
+  if (data.length === 0) return '';
 
   // Show 3-4 date labels evenly spaced, but leave room for last label
-  const numLabels = Math.min(4, Math.max(2, Math.floor(data.length / 8)))
+  const numLabels = Math.min(4, Math.max(2, Math.floor(data.length / 8)));
   // Don't use the very last position - leave room for the label text
-  const usableLength = data.length - 6 // Reserve ~6 chars for last label (e.g., "Dec 7")
-  const step = Math.floor(usableLength / (numLabels - 1)) || 1
+  const usableLength = data.length - 6; // Reserve ~6 chars for last label (e.g., "Dec 7")
+  const step = Math.floor(usableLength / (numLabels - 1)) || 1;
 
-  const labelPositions: { pos: number; label: string }[] = []
+  const labelPositions: { pos: number; label: string }[] = [];
 
   for (let i = 0; i < numLabels; i++) {
-    const idx = Math.min(i * step, data.length - 1)
-    const date = new Date(data[idx]!.date)
+    const idx = Math.min(i * step, data.length - 1);
+    const date = new Date(data[idx]!.date);
     const label = date.toLocaleDateString('en-US', {
       month: 'short',
       day: 'numeric',
-    })
-    labelPositions.push({ pos: idx, label })
+    });
+    labelPositions.push({ pos: idx, label });
   }
 
   // Build the label string with proper spacing
-  let result = ' '.repeat(yAxisOffset)
-  let currentPos = 0
+  let result = ' '.repeat(yAxisOffset);
+  let currentPos = 0;
 
   for (const { pos, label } of labelPositions) {
-    const spaces = Math.max(1, pos - currentPos)
-    result += ' '.repeat(spaces) + label
-    currentPos = pos + label.length
+    const spaces = Math.max(1, pos - currentPos);
+    result += ' '.repeat(spaces) + label;
+    currentPos = pos + label.length;
   }
 
-  return result
+  return result;
 }
 
 // Screenshot functionality
@@ -920,110 +824,92 @@ async function handleScreenshot(
   activeTab: 'Overview' | 'Models',
   setStatus: (status: string | null) => void,
 ): Promise<void> {
-  setStatus('copying…')
+  setStatus('copying…');
 
-  const ansiText = renderStatsToAnsi(stats, activeTab)
-  const result = await copyAnsiToClipboard(ansiText)
+  const ansiText = renderStatsToAnsi(stats, activeTab);
+  const result = await copyAnsiToClipboard(ansiText);
 
-  setStatus(result.success ? 'copied!' : 'copy failed')
+  setStatus(result.success ? 'copied!' : 'copy failed');
 
   // Clear status after 2 seconds
-  setTimeout(setStatus, 2000, null)
+  setTimeout(setStatus, 2000, null);
 }
 
-function renderStatsToAnsi(
-  stats: ClaudeCodeStats,
-  activeTab: 'Overview' | 'Models',
-): string {
-  const lines: string[] = []
+function renderStatsToAnsi(stats: ClaudeCodeStats, activeTab: 'Overview' | 'Models'): string {
+  const lines: string[] = [];
 
   if (activeTab === 'Overview') {
-    lines.push(...renderOverviewToAnsi(stats))
+    lines.push(...renderOverviewToAnsi(stats));
   } else {
-    lines.push(...renderModelsToAnsi(stats))
+    lines.push(...renderModelsToAnsi(stats));
   }
 
   // Trim trailing empty lines
-  while (
-    lines.length > 0 &&
-    stripAnsi(lines[lines.length - 1]!).trim() === ''
-  ) {
-    lines.pop()
+  while (lines.length > 0 && stripAnsi(lines[lines.length - 1]!).trim() === '') {
+    lines.pop();
   }
 
   // Add "/stats" right-aligned on the last line
   if (lines.length > 0) {
-    const lastLine = lines[lines.length - 1]!
-    const lastLineLen = getStringWidth(lastLine)
+    const lastLine = lines[lines.length - 1]!;
+    const lastLineLen = getStringWidth(lastLine);
     // Use known content widths based on layout:
     // Overview: two-column stats = COL2_START(40) + COL2_LABEL_WIDTH(18) + max_value(~12) = 70
     // Models: chart width = 80
-    const contentWidth = activeTab === 'Overview' ? 70 : 80
-    const statsLabel = '/stats'
-    const padding = Math.max(2, contentWidth - lastLineLen - statsLabel.length)
-    lines[lines.length - 1] =
-      lastLine + ' '.repeat(padding) + chalk.gray(statsLabel)
+    const contentWidth = activeTab === 'Overview' ? 70 : 80;
+    const statsLabel = '/stats';
+    const padding = Math.max(2, contentWidth - lastLineLen - statsLabel.length);
+    lines[lines.length - 1] = lastLine + ' '.repeat(padding) + chalk.gray(statsLabel);
   }
 
-  return lines.join('\n')
+  return lines.join('\n');
 }
 
 function renderOverviewToAnsi(stats: ClaudeCodeStats): string[] {
-  const lines: string[] = []
-  const theme = getTheme(resolveThemeSetting(getGlobalConfig().theme))
-  const h = (text: string) => applyColor(text, theme.claude as Color)
+  const lines: string[] = [];
+  const theme = getTheme(resolveThemeSetting(getGlobalConfig().theme));
+  const h = (text: string) => applyColor(text, theme.claude as Color);
 
   // Two-column helper with fixed spacing
   // Column 1: label (18 chars) + value + padding to reach col 2
   // Column 2 starts at character position 40
-  const COL1_LABEL_WIDTH = 18
-  const COL2_START = 40
-  const COL2_LABEL_WIDTH = 18
+  const COL1_LABEL_WIDTH = 18;
+  const COL2_START = 40;
+  const COL2_LABEL_WIDTH = 18;
 
   const row = (l1: string, v1: string, l2: string, v2: string): string => {
     // Build column 1: label + value
-    const label1 = (l1 + ':').padEnd(COL1_LABEL_WIDTH)
-    const col1PlainLen = label1.length + v1.length
+    const label1 = (l1 + ':').padEnd(COL1_LABEL_WIDTH);
+    const col1PlainLen = label1.length + v1.length;
 
     // Calculate spaces needed between col1 value and col2 label
-    const spaceBetween = Math.max(2, COL2_START - col1PlainLen)
+    const spaceBetween = Math.max(2, COL2_START - col1PlainLen);
 
     // Build column 2: label + value
-    const label2 = (l2 + ':').padEnd(COL2_LABEL_WIDTH)
+    const label2 = (l2 + ':').padEnd(COL2_LABEL_WIDTH);
 
     // Assemble with colors applied to values only
-    return label1 + h(v1) + ' '.repeat(spaceBetween) + label2 + h(v2)
-  }
+    return label1 + h(v1) + ' '.repeat(spaceBetween) + label2 + h(v2);
+  };
 
   // Heatmap - use fixed width for screenshot (56 = 52 weeks + 4 for day labels)
   if (stats.dailyActivity.length > 0) {
-    lines.push(generateHeatmap(stats.dailyActivity, { terminalWidth: 56 }))
-    lines.push('')
+    lines.push(generateHeatmap(stats.dailyActivity, { terminalWidth: 56 }));
+    lines.push('');
   }
 
   // Calculate values
   const modelEntries = Object.entries(stats.modelUsage).sort(
-    ([, a], [, b]) =>
-      b.inputTokens + b.outputTokens - (a.inputTokens + a.outputTokens),
-  )
-  const favoriteModel = modelEntries[0]
-  const totalTokens = modelEntries.reduce(
-    (sum, [, usage]) => sum + usage.inputTokens + usage.outputTokens,
-    0,
-  )
+    ([, a], [, b]) => b.inputTokens + b.outputTokens - (a.inputTokens + a.outputTokens),
+  );
+  const favoriteModel = modelEntries[0];
+  const totalTokens = modelEntries.reduce((sum, [, usage]) => sum + usage.inputTokens + usage.outputTokens, 0);
 
   // Row 1: Favorite model | Total tokens
   if (favoriteModel) {
-    lines.push(
-      row(
-        'Favorite model',
-        renderModelName(favoriteModel[0]),
-        'Total tokens',
-        formatNumber(totalTokens),
-      ),
-    )
+    lines.push(row('Favorite model', renderModelName(favoriteModel[0]), 'Total tokens', formatNumber(totalTokens)));
   }
-  lines.push('')
+  lines.push('');
 
   // Row 2: Sessions | Longest session
   lines.push(
@@ -1031,149 +917,111 @@ function renderOverviewToAnsi(stats: ClaudeCodeStats): string[] {
       'Sessions',
       formatNumber(stats.totalSessions),
       'Longest session',
-      stats.longestSession
-        ? formatDuration(stats.longestSession.duration)
-        : 'N/A',
+      stats.longestSession ? formatDuration(stats.longestSession.duration) : 'N/A',
     ),
-  )
+  );
 
   // Row 3: Current streak | Longest streak
-  const currentStreakVal = `${stats.streaks.currentStreak} ${stats.streaks.currentStreak === 1 ? 'day' : 'days'}`
-  const longestStreakVal = `${stats.streaks.longestStreak} ${stats.streaks.longestStreak === 1 ? 'day' : 'days'}`
-  lines.push(
-    row('Current streak', currentStreakVal, 'Longest streak', longestStreakVal),
-  )
+  const currentStreakVal = `${stats.streaks.currentStreak} ${stats.streaks.currentStreak === 1 ? 'day' : 'days'}`;
+  const longestStreakVal = `${stats.streaks.longestStreak} ${stats.streaks.longestStreak === 1 ? 'day' : 'days'}`;
+  lines.push(row('Current streak', currentStreakVal, 'Longest streak', longestStreakVal));
 
   // Row 4: Active days | Peak hour
-  const activeDaysVal = `${stats.activeDays}/${stats.totalDays}`
+  const activeDaysVal = `${stats.activeDays}/${stats.totalDays}`;
   const peakHourVal =
-    stats.peakActivityHour !== null
-      ? `${stats.peakActivityHour}:00-${stats.peakActivityHour + 1}:00`
-      : 'N/A'
-  lines.push(row('Active days', activeDaysVal, 'Peak hour', peakHourVal))
+    stats.peakActivityHour !== null ? `${stats.peakActivityHour}:00-${stats.peakActivityHour + 1}:00` : 'N/A';
+  lines.push(row('Active days', activeDaysVal, 'Peak hour', peakHourVal));
 
   // Speculation time saved (ant-only)
-  if (
-    process.env.USER_TYPE === 'ant' &&
-    stats.totalSpeculationTimeSavedMs > 0
-  ) {
-    const label = 'Speculation saved:'.padEnd(COL1_LABEL_WIDTH)
-    lines.push(label + h(formatDuration(stats.totalSpeculationTimeSavedMs)))
+  if (process.env.USER_TYPE === 'ant' && stats.totalSpeculationTimeSavedMs > 0) {
+    const label = 'Speculation saved:'.padEnd(COL1_LABEL_WIDTH);
+    lines.push(label + h(formatDuration(stats.totalSpeculationTimeSavedMs)));
   }
 
   // Shot stats (ant-only)
   if (feature('SHOT_STATS') && stats.shotDistribution) {
-    const dist = stats.shotDistribution
-    const totalWithShots = Object.values(dist).reduce((s, n) => s + n, 0)
+    const dist = stats.shotDistribution;
+    const totalWithShots = Object.values(dist).reduce((s, n) => s + n, 0);
     if (totalWithShots > 0) {
-      const totalShots = Object.entries(dist).reduce(
-        (s, [count, sessions]) => s + parseInt(count, 10) * sessions,
-        0,
-      )
-      const avgShots = (totalShots / totalWithShots).toFixed(1)
+      const totalShots = Object.entries(dist).reduce((s, [count, sessions]) => s + parseInt(count, 10) * sessions, 0);
+      const avgShots = (totalShots / totalWithShots).toFixed(1);
       const bucket = (min: number, max?: number) =>
         Object.entries(dist)
           .filter(([k]) => {
-            const n = parseInt(k, 10)
-            return n >= min && (max === undefined || n <= max)
+            const n = parseInt(k, 10);
+            return n >= min && (max === undefined || n <= max);
           })
-          .reduce((s, [, v]) => s + v, 0)
-      const pct = (n: number) => Math.round((n / totalWithShots) * 100)
-      const fmtBucket = (count: number, p: number) => `${count} (${p}%)`
-      const b1 = bucket(1, 1)
-      const b2_5 = bucket(2, 5)
-      const b6_10 = bucket(6, 10)
-      const b11 = bucket(11)
-      lines.push('')
-      lines.push('Shot distribution')
-      lines.push(
-        row(
-          '1-shot',
-          fmtBucket(b1, pct(b1)),
-          '2\u20135 shot',
-          fmtBucket(b2_5, pct(b2_5)),
-        ),
-      )
-      lines.push(
-        row(
-          '6\u201310 shot',
-          fmtBucket(b6_10, pct(b6_10)),
-          '11+ shot',
-          fmtBucket(b11, pct(b11)),
-        ),
-      )
-      lines.push(`${'Avg/session:'.padEnd(COL1_LABEL_WIDTH)}${h(avgShots)}`)
+          .reduce((s, [, v]) => s + v, 0);
+      const pct = (n: number) => Math.round((n / totalWithShots) * 100);
+      const fmtBucket = (count: number, p: number) => `${count} (${p}%)`;
+      const b1 = bucket(1, 1);
+      const b2_5 = bucket(2, 5);
+      const b6_10 = bucket(6, 10);
+      const b11 = bucket(11);
+      lines.push('');
+      lines.push('Shot distribution');
+      lines.push(row('1-shot', fmtBucket(b1, pct(b1)), '2\u20135 shot', fmtBucket(b2_5, pct(b2_5))));
+      lines.push(row('6\u201310 shot', fmtBucket(b6_10, pct(b6_10)), '11+ shot', fmtBucket(b11, pct(b11))));
+      lines.push(`${'Avg/session:'.padEnd(COL1_LABEL_WIDTH)}${h(avgShots)}`);
     }
   }
 
-  lines.push('')
+  lines.push('');
 
   // Fun factoid
-  const factoid = generateFunFactoid(stats, totalTokens)
-  lines.push(h(factoid))
-  lines.push(chalk.gray(`Stats from the last ${stats.totalDays} days`))
+  const factoid = generateFunFactoid(stats, totalTokens);
+  lines.push(h(factoid));
+  lines.push(chalk.gray(`Stats from the last ${stats.totalDays} days`));
 
-  return lines
+  return lines;
 }
 
 function renderModelsToAnsi(stats: ClaudeCodeStats): string[] {
-  const lines: string[] = []
+  const lines: string[] = [];
 
   const modelEntries = Object.entries(stats.modelUsage).sort(
-    ([, a], [, b]) =>
-      b.inputTokens + b.outputTokens - (a.inputTokens + a.outputTokens),
-  )
+    ([, a], [, b]) => b.inputTokens + b.outputTokens - (a.inputTokens + a.outputTokens),
+  );
 
   if (modelEntries.length === 0) {
-    lines.push(chalk.gray('No model usage data available'))
-    return lines
+    lines.push(chalk.gray('No model usage data available'));
+    return lines;
   }
 
-  const favoriteModel = modelEntries[0]
-  const totalTokens = modelEntries.reduce(
-    (sum, [, usage]) => sum + usage.inputTokens + usage.outputTokens,
-    0,
-  )
+  const favoriteModel = modelEntries[0];
+  const totalTokens = modelEntries.reduce((sum, [, usage]) => sum + usage.inputTokens + usage.outputTokens, 0);
 
   // Generate chart if we have data - use fixed width for screenshot
   const chartOutput = generateTokenChart(
     stats.dailyModelTokens,
     modelEntries.map(([model]) => model),
     80, // Fixed width for screenshot
-  )
+  );
 
   if (chartOutput) {
-    lines.push(chalk.bold('Tokens per Day'))
-    lines.push(chartOutput.chart)
-    lines.push(chalk.gray(chartOutput.xAxisLabels))
+    lines.push(chalk.bold('Tokens per Day'));
+    lines.push(chartOutput.chart);
+    lines.push(chalk.gray(chartOutput.xAxisLabels));
     // Legend - use pre-colored bullets from chart output
-    const legendLine = chartOutput.legend
-      .map(item => `${item.coloredBullet} ${item.model}`)
-      .join(' · ')
-    lines.push(legendLine)
-    lines.push('')
+    const legendLine = chartOutput.legend.map(item => `${item.coloredBullet} ${item.model}`).join(' · ');
+    lines.push(legendLine);
+    lines.push('');
   }
 
   // Summary
   lines.push(
     `${figures.star} Favorite: ${chalk.magenta.bold(renderModelName(favoriteModel?.[0] || ''))} · ${figures.circle} Total: ${chalk.magenta(formatNumber(totalTokens))} tokens`,
-  )
-  lines.push('')
+  );
+  lines.push('');
 
   // Model breakdown - only show top 3 for screenshot
-  const topModels = modelEntries.slice(0, 3)
+  const topModels = modelEntries.slice(0, 3);
   for (const [model, usage] of topModels) {
-    const modelTokens = usage.inputTokens + usage.outputTokens
-    const percentage = ((modelTokens / totalTokens) * 100).toFixed(1)
-    lines.push(
-      `${figures.bullet} ${chalk.bold(renderModelName(model))} ${chalk.gray(`(${percentage}%)`)}`,
-    )
-    lines.push(
-      chalk.dim(
-        `  In: ${formatNumber(usage.inputTokens)} · Out: ${formatNumber(usage.outputTokens)}`,
-      ),
-    )
+    const modelTokens = usage.inputTokens + usage.outputTokens;
+    const percentage = ((modelTokens / totalTokens) * 100).toFixed(1);
+    lines.push(`${figures.bullet} ${chalk.bold(renderModelName(model))} ${chalk.gray(`(${percentage}%)`)}`);
+    lines.push(chalk.dim(`  In: ${formatNumber(usage.inputTokens)} · Out: ${formatNumber(usage.outputTokens)}`));
   }
 
-  return lines
+  return lines;
 }
diff --git a/src/components/StatusLine.tsx b/src/components/StatusLine.tsx
index b2f2c7c91..8ef1fa359 100644
--- a/src/components/StatusLine.tsx
+++ b/src/components/StatusLine.tsx
@@ -1,9 +1,9 @@
-import { feature } from 'bun:bundle'
-import * as React from 'react'
-import { memo, useCallback, useEffect, useRef } from 'react'
-import { logEvent } from 'src/services/analytics/index.js'
-import { useAppState, useSetAppState } from 'src/state/AppState.js'
-import type { PermissionMode } from 'src/utils/permissions/PermissionMode.js'
+import { feature } from 'bun:bundle';
+import * as React from 'react';
+import { memo, useCallback, useEffect, useRef } from 'react';
+import { logEvent } from 'src/services/analytics/index.js';
+import { useAppState, useSetAppState } from 'src/state/AppState.js';
+import type { PermissionMode } from 'src/utils/permissions/PermissionMode.js';
 import {
   getIsRemoteMode,
   getKairosActive,
@@ -11,9 +11,9 @@ import {
   getOriginalCwd,
   getSdkBetas,
   getSessionId,
-} from '../bootstrap/state.js'
-import { DEFAULT_OUTPUT_STYLE_NAME } from '../constants/outputStyles.js'
-import { useNotifications } from '../context/notifications.js'
+} from '../bootstrap/state.js';
+import { DEFAULT_OUTPUT_STYLE_NAME } from '../constants/outputStyles.js';
+import { useNotifications } from '../context/notifications.js';
 import {
   getTotalAPIDuration,
   getTotalCost,
@@ -22,45 +22,32 @@ import {
   getTotalLinesAdded,
   getTotalLinesRemoved,
   getTotalOutputTokens,
-} from '../cost-tracker.js'
-import { useMainLoopModel } from '../hooks/useMainLoopModel.js'
-import { type ReadonlySettings, useSettings } from '../hooks/useSettings.js'
-import { Ansi, Box, Text } from '@anthropic/ink'
-import { getRawUtilization } from '../services/claudeAiLimits.js'
-import type { Message } from '../types/message.js'
-import type { StatusLineCommandInput } from '../types/statusLine.js'
-import type { VimMode } from '../types/textInputTypes.js'
-import { checkHasTrustDialogAccepted } from '../utils/config.js'
-import {
-  calculateContextPercentages,
-  getContextWindowForModel,
-} from '../utils/context.js'
-import { getCwd } from '../utils/cwd.js'
-import { logForDebugging } from '../utils/debug.js'
-import { isFullscreenEnvEnabled } from '../utils/fullscreen.js'
-import {
-  createBaseHookInput,
-  executeStatusLineCommand,
-} from '../utils/hooks.js'
-import { getLastAssistantMessage } from '../utils/messages.js'
-import {
-  getRuntimeMainLoopModel,
-  type ModelName,
-  renderModelName,
-} from '../utils/model/model.js'
-import { getCurrentSessionTitle } from '../utils/sessionStorage.js'
-import {
-  doesMostRecentAssistantMessageExceed200k,
-  getCurrentUsage,
-} from '../utils/tokens.js'
-import { getCurrentWorktreeSession } from '../utils/worktree.js'
-import { isVimModeEnabled } from './PromptInput/utils.js'
+} from '../cost-tracker.js';
+import { useMainLoopModel } from '../hooks/useMainLoopModel.js';
+import { type ReadonlySettings, useSettings } from '../hooks/useSettings.js';
+import { Ansi, Box, Text } from '@anthropic/ink';
+import { getRawUtilization } from '../services/claudeAiLimits.js';
+import type { Message } from '../types/message.js';
+import type { StatusLineCommandInput } from '../types/statusLine.js';
+import type { VimMode } from '../types/textInputTypes.js';
+import { checkHasTrustDialogAccepted } from '../utils/config.js';
+import { calculateContextPercentages, getContextWindowForModel } from '../utils/context.js';
+import { getCwd } from '../utils/cwd.js';
+import { logForDebugging } from '../utils/debug.js';
+import { isFullscreenEnvEnabled } from '../utils/fullscreen.js';
+import { createBaseHookInput, executeStatusLineCommand } from '../utils/hooks.js';
+import { getLastAssistantMessage } from '../utils/messages.js';
+import { getRuntimeMainLoopModel, type ModelName, renderModelName } from '../utils/model/model.js';
+import { getCurrentSessionTitle } from '../utils/sessionStorage.js';
+import { doesMostRecentAssistantMessageExceed200k, getCurrentUsage } from '../utils/tokens.js';
+import { getCurrentWorktreeSession } from '../utils/worktree.js';
+import { isVimModeEnabled } from './PromptInput/utils.js';
 
 export function statusLineShouldDisplay(settings: ReadonlySettings): boolean {
   // Assistant mode: statusline fields (model, permission mode, cwd) reflect the
   // REPL/daemon process, not what the agent child is actually running. Hide it.
-  if (feature('KAIROS') && getKairosActive()) return false
-  return settings?.statusLine !== undefined
+  if (feature('KAIROS') && getKairosActive()) return false;
+  return settings?.statusLine !== undefined;
 }
 
 function buildStatusLineCommandInput(
@@ -72,28 +59,22 @@ function buildStatusLineCommandInput(
   mainLoopModel: ModelName,
   vimMode?: VimMode,
 ): StatusLineCommandInput {
-  const agentType = getMainThreadAgentType()
-  const worktreeSession = getCurrentWorktreeSession()
+  const agentType = getMainThreadAgentType();
+  const worktreeSession = getCurrentWorktreeSession();
   const runtimeModel = getRuntimeMainLoopModel({
     permissionMode,
     mainLoopModel,
     exceeds200kTokens,
-  })
-  const outputStyleName = settings?.outputStyle || DEFAULT_OUTPUT_STYLE_NAME
+  });
+  const outputStyleName = settings?.outputStyle || DEFAULT_OUTPUT_STYLE_NAME;
 
-  const currentUsage = getCurrentUsage(messages)
-  const contextWindowSize = getContextWindowForModel(
-    runtimeModel,
-    getSdkBetas(),
-  )
-  const contextPercentages = calculateContextPercentages(
-    currentUsage,
-    contextWindowSize,
-  )
+  const currentUsage = getCurrentUsage(messages);
+  const contextWindowSize = getContextWindowForModel(runtimeModel, getSdkBetas());
+  const contextPercentages = calculateContextPercentages(currentUsage, contextWindowSize);
 
-  const sessionId = getSessionId()
-  const sessionName = getCurrentSessionTitle(sessionId)
-  const rawUtil = getRawUtilization()
+  const sessionId = getSessionId();
+  const sessionName = getCurrentSessionTitle(sessionId);
+  const rawUtil = getRawUtilization();
   const rateLimits: StatusLineCommandInput['rate_limits'] = {
     ...(rawUtil.five_hour && {
       five_hour: {
@@ -107,7 +88,7 @@ function buildStatusLineCommandInput(
         resets_at: rawUtil.seven_day.resets_at,
       },
     }),
-  }
+  };
   return {
     ...createBaseHookInput(),
     ...(sessionName && { session_name: sessionName }),
@@ -167,97 +148,89 @@ function buildStatusLineCommandInput(
         original_branch: worktreeSession.originalBranch,
       },
     }),
-  }
+  };
 }
 
 type Props = {
   // messages stays behind a ref (read only in the debounced callback);
   // lastAssistantMessageId is the actual re-render trigger.
-  messagesRef: React.RefObject<Message[]>
-  lastAssistantMessageId: string | null
-  vimMode?: VimMode
-}
+  messagesRef: React.RefObject<Message[]>;
+  lastAssistantMessageId: string | null;
+  vimMode?: VimMode;
+};
 
 export function getLastAssistantMessageId(messages: Message[]): string | null {
-  return getLastAssistantMessage(messages)?.uuid ?? null
+  return getLastAssistantMessage(messages)?.uuid ?? null;
 }
 
-function StatusLineInner({
-  messagesRef,
-  lastAssistantMessageId,
-  vimMode,
-}: Props): React.ReactNode {
-  const abortControllerRef = useRef<AbortController | undefined>(undefined)
-  const permissionMode = useAppState(s => s.toolPermissionContext.mode)
-  const additionalWorkingDirectories = useAppState(
-    s => s.toolPermissionContext.additionalWorkingDirectories,
-  )
-  const statusLineText = useAppState(s => s.statusLineText)
-  const setAppState = useSetAppState()
-  const settings = useSettings()
-  const { addNotification } = useNotifications()
+function StatusLineInner({ messagesRef, lastAssistantMessageId, vimMode }: Props): React.ReactNode {
+  const abortControllerRef = useRef<AbortController | undefined>(undefined);
+  const permissionMode = useAppState(s => s.toolPermissionContext.mode);
+  const additionalWorkingDirectories = useAppState(s => s.toolPermissionContext.additionalWorkingDirectories);
+  const statusLineText = useAppState(s => s.statusLineText);
+  const setAppState = useSetAppState();
+  const settings = useSettings();
+  const { addNotification } = useNotifications();
   // AppState-sourced model — same source as API requests. getMainLoopModel()
   // re-reads settings.json on every call, so another session's /model write
   // would leak into this session's statusline (anthropics/claude-code#37596).
-  const mainLoopModel = useMainLoopModel()
+  const mainLoopModel = useMainLoopModel();
 
   // Keep latest values in refs for stable callback access
-  const settingsRef = useRef(settings)
-  settingsRef.current = settings
-  const vimModeRef = useRef(vimMode)
-  vimModeRef.current = vimMode
-  const permissionModeRef = useRef(permissionMode)
-  permissionModeRef.current = permissionMode
-  const addedDirsRef = useRef(additionalWorkingDirectories)
-  addedDirsRef.current = additionalWorkingDirectories
-  const mainLoopModelRef = useRef(mainLoopModel)
-  mainLoopModelRef.current = mainLoopModel
+  const settingsRef = useRef(settings);
+  settingsRef.current = settings;
+  const vimModeRef = useRef(vimMode);
+  vimModeRef.current = vimMode;
+  const permissionModeRef = useRef(permissionMode);
+  permissionModeRef.current = permissionMode;
+  const addedDirsRef = useRef(additionalWorkingDirectories);
+  addedDirsRef.current = additionalWorkingDirectories;
+  const mainLoopModelRef = useRef(mainLoopModel);
+  mainLoopModelRef.current = mainLoopModel;
 
   // Track previous state to detect changes and cache expensive calculations
   const previousStateRef = useRef<{
-    messageId: string | null
-    exceeds200kTokens: boolean
-    permissionMode: PermissionMode
-    vimMode: VimMode | undefined
-    mainLoopModel: ModelName
+    messageId: string | null;
+    exceeds200kTokens: boolean;
+    permissionMode: PermissionMode;
+    vimMode: VimMode | undefined;
+    mainLoopModel: ModelName;
   }>({
     messageId: null,
     exceeds200kTokens: false,
     permissionMode,
     vimMode,
     mainLoopModel,
-  })
+  });
 
   // Debounce timer ref
-  const debounceTimerRef = useRef<ReturnType<typeof setTimeout> | undefined>(
-    undefined,
-  )
+  const debounceTimerRef = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);
 
   // True when the next invocation should log its result (first run or after settings reload)
-  const logNextResultRef = useRef(true)
+  const logNextResultRef = useRef(true);
 
   // Stable update function — reads latest values from refs
   const doUpdate = useCallback(async () => {
     // Cancel any in-flight requests
-    abortControllerRef.current?.abort()
+    abortControllerRef.current?.abort();
 
-    const controller = new AbortController()
-    abortControllerRef.current = controller
+    const controller = new AbortController();
+    abortControllerRef.current = controller;
 
-    const msgs = messagesRef.current
+    const msgs = messagesRef.current;
 
-    const logResult = logNextResultRef.current
-    logNextResultRef.current = false
+    const logResult = logNextResultRef.current;
+    logNextResultRef.current = false;
 
     try {
-      let exceeds200kTokens = previousStateRef.current.exceeds200kTokens
+      let exceeds200kTokens = previousStateRef.current.exceeds200kTokens;
 
       // Only recalculate 200k check if messages changed
-      const currentMessageId = getLastAssistantMessageId(msgs)
+      const currentMessageId = getLastAssistantMessageId(msgs);
       if (currentMessageId !== previousStateRef.current.messageId) {
-        exceeds200kTokens = doesMostRecentAssistantMessageExceed200k(msgs)
-        previousStateRef.current.messageId = currentMessageId
-        previousStateRef.current.exceeds200kTokens = exceeds200kTokens
+        exceeds200kTokens = doesMostRecentAssistantMessageExceed200k(msgs);
+        previousStateRef.current.messageId = currentMessageId;
+        previousStateRef.current.exceeds200kTokens = exceeds200kTokens;
       }
 
       const statusInput = buildStatusLineCommandInput(
@@ -268,40 +241,35 @@ function StatusLineInner({
         Array.from(addedDirsRef.current.keys()),
         mainLoopModelRef.current,
         vimModeRef.current,
-      )
+      );
 
-      const text = await executeStatusLineCommand(
-        statusInput,
-        controller.signal,
-        undefined,
-        logResult,
-      )
+      const text = await executeStatusLineCommand(statusInput, controller.signal, undefined, logResult);
       if (!controller.signal.aborted) {
         setAppState(prev => {
-          if (prev.statusLineText === text) return prev
-          return { ...prev, statusLineText: text }
-        })
+          if (prev.statusLineText === text) return prev;
+          return { ...prev, statusLineText: text };
+        });
       }
     } catch {
       // Silently ignore errors in status line updates
     }
-  }, [messagesRef, setAppState])
+  }, [messagesRef, setAppState]);
 
   // Stable debounced schedule function — no deps, uses refs
   const scheduleUpdate = useCallback(() => {
     if (debounceTimerRef.current !== undefined) {
-      clearTimeout(debounceTimerRef.current)
+      clearTimeout(debounceTimerRef.current);
     }
     debounceTimerRef.current = setTimeout(
       (ref, doUpdate) => {
-        ref.current = undefined
-        void doUpdate()
+        ref.current = undefined;
+        void doUpdate();
       },
       300,
       debounceTimerRef,
       doUpdate,
-    )
-  }, [doUpdate])
+    );
+  }, [doUpdate]);
 
   // Only trigger update when assistant message, permission mode, vim mode, or model actually changes
   useEffect(() => {
@@ -313,45 +281,36 @@ function StatusLineInner({
     ) {
       // Don't update messageId here — let doUpdate handle it so
       // exceeds200kTokens is recalculated with the latest messages
-      previousStateRef.current.permissionMode = permissionMode
-      previousStateRef.current.vimMode = vimMode
-      previousStateRef.current.mainLoopModel = mainLoopModel
-      scheduleUpdate()
+      previousStateRef.current.permissionMode = permissionMode;
+      previousStateRef.current.vimMode = vimMode;
+      previousStateRef.current.mainLoopModel = mainLoopModel;
+      scheduleUpdate();
     }
-  }, [
-    lastAssistantMessageId,
-    permissionMode,
-    vimMode,
-    mainLoopModel,
-    scheduleUpdate,
-  ])
+  }, [lastAssistantMessageId, permissionMode, vimMode, mainLoopModel, scheduleUpdate]);
 
   // When the statusLine command changes (hot reload), log the next result
-  const statusLineCommand = settings?.statusLine?.command
-  const isFirstSettingsRender = useRef(true)
+  const statusLineCommand = settings?.statusLine?.command;
+  const isFirstSettingsRender = useRef(true);
   useEffect(() => {
     if (isFirstSettingsRender.current) {
-      isFirstSettingsRender.current = false
-      return
+      isFirstSettingsRender.current = false;
+      return;
     }
-    logNextResultRef.current = true
-    void doUpdate()
-  }, [statusLineCommand, doUpdate])
+    logNextResultRef.current = true;
+    void doUpdate();
+  }, [statusLineCommand, doUpdate]);
 
   // Separate effect for logging on mount
   useEffect(() => {
-    const statusLine = settings?.statusLine
+    const statusLine = settings?.statusLine;
     if (statusLine) {
       logEvent('tengu_status_line_mount', {
         command_length: statusLine.command.length,
         padding: statusLine.padding,
-      })
+      });
       // Log if status line is configured but disabled by disableAllHooks
       if (settings.disableAllHooks === true) {
-        logForDebugging(
-          'Status line is configured but disableAllHooks is true',
-          { level: 'warn' },
-        )
+        logForDebugging('Status line is configured but disableAllHooks is true', { level: 'warn' });
       }
       // executeStatusLineCommand (hooks.ts) returns undefined when trust is
       // blocked — statusLineText stays undefined forever, user sees nothing,
@@ -362,33 +321,28 @@ function StatusLineInner({
           text: 'statusline skipped · restart to fix',
           color: 'warning',
           priority: 'low',
-        })
-        logForDebugging(
-          'Status line command skipped: workspace trust not accepted',
-          { level: 'warn' },
-        )
+        });
+        logForDebugging('Status line command skipped: workspace trust not accepted', { level: 'warn' });
       }
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    // biome-ignore lint/correctness/useExhaustiveDependencies: intentional
-  }, []) // Only run once on mount - settings stable for initial logging
+  }, []); // Only run once on mount - settings stable for initial logging
 
   // Initial update on mount + cleanup on unmount
   useEffect(() => {
-    void doUpdate()
+    void doUpdate();
 
     return () => {
-      abortControllerRef.current?.abort()
+      abortControllerRef.current?.abort();
       if (debounceTimerRef.current !== undefined) {
-        clearTimeout(debounceTimerRef.current)
+        clearTimeout(debounceTimerRef.current);
       }
-    }
+    };
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    // biome-ignore lint/correctness/useExhaustiveDependencies: intentional
-  }, []) // Only run once on mount, not when doUpdate changes
+  }, []); // Only run once on mount, not when doUpdate changes
 
   // Get padding from settings or default to 0
-  const paddingX = settings?.statusLine?.padding ?? 0
+  const paddingX = settings?.statusLine?.padding ?? 0;
 
   // StatusLine must have stable height in fullscreen — the footer is
   // flexShrink:0 so a 0→1 row change when the command finishes steals
@@ -404,10 +358,10 @@ function StatusLineInner({
         <Text> </Text>
       ) : null}
     </Box>
-  )
+  );
 }
 
 // Parent (PromptInputFooter) re-renders on every setMessages, but StatusLine's
 // own props now only change when lastAssistantMessageId flips — memo keeps it
 // from being dragged along (previously ~18 no-prop-change renders per session).
-export const StatusLine = memo(StatusLineInner)
+export const StatusLine = memo(StatusLineInner);
diff --git a/src/components/StatusNotices.tsx b/src/components/StatusNotices.tsx
index c8e629885..b22a22559 100644
--- a/src/components/StatusNotices.tsx
+++ b/src/components/StatusNotices.tsx
@@ -1,43 +1,36 @@
-import * as React from 'react'
-import { use } from 'react'
-import { Box } from '@anthropic/ink'
-import type { AgentDefinitionsResult } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
-import { getMemoryFiles } from '../utils/claudemd.js'
-import { getGlobalConfig } from '../utils/config.js'
-import {
-  getActiveNotices,
-  type StatusNoticeContext,
-} from '../utils/statusNoticeDefinitions.js'
+import * as React from 'react';
+import { use } from 'react';
+import { Box } from '@anthropic/ink';
+import type { AgentDefinitionsResult } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js';
+import { getMemoryFiles } from '../utils/claudemd.js';
+import { getGlobalConfig } from '../utils/config.js';
+import { getActiveNotices, type StatusNoticeContext } from '../utils/statusNoticeDefinitions.js';
 
 type Props = {
-  agentDefinitions?: AgentDefinitionsResult
-}
+  agentDefinitions?: AgentDefinitionsResult;
+};
 
 /**
  * StatusNotices contains the information displayed to users at startup. We have
  * moved neutral or positive status to src/components/Status.tsx instead, which
  * users can access through /status.
  */
-export function StatusNotices({
-  agentDefinitions,
-}: Props = {}): React.ReactNode {
+export function StatusNotices({ agentDefinitions }: Props = {}): React.ReactNode {
   const context: StatusNoticeContext = {
     config: getGlobalConfig(),
     agentDefinitions,
     memoryFiles: use(getMemoryFiles()),
-  }
-  const activeNotices = getActiveNotices(context)
+  };
+  const activeNotices = getActiveNotices(context);
   if (activeNotices.length === 0) {
-    return null
+    return null;
   }
 
   return (
     <Box flexDirection="column" paddingLeft={1}>
       {activeNotices.map(notice => (
-        <React.Fragment key={notice.id}>
-          {notice.render(context)}
-        </React.Fragment>
+        <React.Fragment key={notice.id}>{notice.render(context)}</React.Fragment>
       ))}
     </Box>
-  )
+  );
 }
diff --git a/src/components/StructuredDiff.tsx b/src/components/StructuredDiff.tsx
index 890977701..d559cf797 100644
--- a/src/components/StructuredDiff.tsx
+++ b/src/components/StructuredDiff.tsx
@@ -1,22 +1,22 @@
-import type { StructuredPatchHunk } from 'diff'
-import * as React from 'react'
-import { memo } from 'react'
-import { useSettings } from '../hooks/useSettings.js'
-import { Box, NoSelect, RawAnsi, useTheme } from '@anthropic/ink'
-import { isFullscreenEnvEnabled } from '../utils/fullscreen.js'
-import sliceAnsi from '../utils/sliceAnsi.js'
-import { expectColorDiff } from './StructuredDiff/colorDiff.js'
-import { StructuredDiffFallback } from './StructuredDiff/Fallback.js'
+import type { StructuredPatchHunk } from 'diff';
+import * as React from 'react';
+import { memo } from 'react';
+import { useSettings } from '../hooks/useSettings.js';
+import { Box, NoSelect, RawAnsi, useTheme } from '@anthropic/ink';
+import { isFullscreenEnvEnabled } from '../utils/fullscreen.js';
+import sliceAnsi from '../utils/sliceAnsi.js';
+import { expectColorDiff } from './StructuredDiff/colorDiff.js';
+import { StructuredDiffFallback } from './StructuredDiff/Fallback.js';
 
 type Props = {
-  patch: StructuredPatchHunk
-  dim: boolean
-  filePath: string // File path for language detection
-  firstLine: string | null // First line of file for shebang detection
-  fileContent?: string // Full file content for syntax context (multiline strings, etc.)
-  width: number
-  skipHighlighting?: boolean // Skip syntax highlighting
-}
+  patch: StructuredPatchHunk;
+  dim: boolean;
+  filePath: string; // File path for language detection
+  firstLine: string | null; // First line of file for shebang detection
+  fileContent?: string; // Full file content for syntax context (multiline strings, etc.)
+  width: number;
+  skipHighlighting?: boolean; // Skip syntax highlighting
+};
 
 // REPL.tsx renders <Messages> at two disjoint tree positions (transcript
 // early-return vs prompt-mode nested in FullscreenLayout), so ctrl+o
@@ -30,29 +30,22 @@ type Props = {
 // reactivating the per-line <DiffLine> branch that PR #20378 had bypassed.
 // Caching the split here restores the O(1)-leaves-per-diff invariant.
 type CachedRender = {
-  lines: string[]
+  lines: string[];
   // Two RawAnsi columns replace what was N DiffLine rows. sliceAnsi work
   // moves from per-remount to cold-cache-only; parseToSpans is eliminated
   // entirely (RawAnsi bypasses Ansi parsing).
-  gutterWidth: number
-  gutters: string[] | null
-  contents: string[] | null
-}
-const RENDER_CACHE = new WeakMap<
-  StructuredPatchHunk,
-  Map<string, CachedRender>
->()
+  gutterWidth: number;
+  gutters: string[] | null;
+  contents: string[] | null;
+};
+const RENDER_CACHE = new WeakMap<StructuredPatchHunk, Map<string, CachedRender>>();
 
 // Gutter width matches the Rust module's layout: marker (1) + space +
 // right-aligned line number (max_digits) + space. Depends only on patch
 // identity (the WeakMap key), so it's cacheable alongside the NAPI output.
 function computeGutterWidth(patch: StructuredPatchHunk): number {
-  const maxLineNumber = Math.max(
-    patch.oldStart + patch.oldLines - 1,
-    patch.newStart + patch.newLines - 1,
-    1,
-  )
-  return maxLineNumber.toString().length + 3 // marker + 2 padding spaces
+  const maxLineNumber = Math.max(patch.oldStart + patch.oldLines - 1, patch.newStart + patch.newLines - 1, 1);
+  return maxLineNumber.toString().length + 3; // marker + 2 padding spaces
 }
 
 function renderColorDiff(
@@ -65,54 +58,49 @@ function renderColorDiff(
   dim: boolean,
   splitGutter: boolean,
 ): CachedRender | null {
-  const ColorDiff = expectColorDiff()
-  if (!ColorDiff) return null
+  const ColorDiff = expectColorDiff();
+  if (!ColorDiff) return null;
 
   // Defensive: if the gutter would eat the whole render width (narrow
   // terminal), skip the split. Rust already wraps to `width` so the
   // single-column output stays correct; we just lose noSelect. Without
   // this, sliceAnsi(line, gutterWidth) would return empty content and
   // RawAnsi(width<=0) is untested.
-  const rawGutterWidth = splitGutter ? computeGutterWidth(patch) : 0
-  const gutterWidth =
-    rawGutterWidth > 0 && rawGutterWidth < width ? rawGutterWidth : 0
+  const rawGutterWidth = splitGutter ? computeGutterWidth(patch) : 0;
+  const gutterWidth = rawGutterWidth > 0 && rawGutterWidth < width ? rawGutterWidth : 0;
 
-  const key = `${theme}|${width}|${dim ? 1 : 0}|${gutterWidth}|${firstLine ?? ''}|${filePath}`
+  const key = `${theme}|${width}|${dim ? 1 : 0}|${gutterWidth}|${firstLine ?? ''}|${filePath}`;
 
-  let perHunk = RENDER_CACHE.get(patch)
-  const hit = perHunk?.get(key)
-  if (hit) return hit
+  let perHunk = RENDER_CACHE.get(patch);
+  const hit = perHunk?.get(key);
+  if (hit) return hit;
 
-  const lines = new ColorDiff(patch, firstLine, filePath, fileContent).render(
-    theme,
-    width,
-    dim,
-  )
-  if (lines === null) return null
+  const lines = new ColorDiff(patch, firstLine, filePath, fileContent).render(theme, width, dim);
+  if (lines === null) return null;
 
   // Pre-split the gutter column once (cold-cache). sliceAnsi preserves
   // styles across the cut; the Rust module already pads the gutter to
   // gutterWidth so the narrow RawAnsi column's width matches its cells.
-  let gutters: string[] | null = null
-  let contents: string[] | null = null
+  let gutters: string[] | null = null;
+  let contents: string[] | null = null;
   if (gutterWidth > 0) {
-    gutters = lines.map(l => sliceAnsi(l, 0, gutterWidth))
-    contents = lines.map(l => sliceAnsi(l, gutterWidth))
+    gutters = lines.map(l => sliceAnsi(l, 0, gutterWidth));
+    contents = lines.map(l => sliceAnsi(l, gutterWidth));
   }
 
-  const entry: CachedRender = { lines, gutterWidth, gutters, contents }
+  const entry: CachedRender = { lines, gutterWidth, gutters, contents };
 
   if (!perHunk) {
-    perHunk = new Map()
-    RENDER_CACHE.set(patch, perHunk)
+    perHunk = new Map();
+    RENDER_CACHE.set(patch, perHunk);
   }
   // Cap the inner map: width is part of the key, so terminal resize while a
   // diff is visible accumulates a full render copy per distinct width. Four
   // variants (two widths × dim on/off) covers the steady state; beyond that
   // the user is actively resizing and old widths are stale.
-  if (perHunk.size >= 4) perHunk.clear()
-  perHunk.set(key, entry)
-  return entry
+  if (perHunk.size >= 4) perHunk.clear();
+  perHunk.set(key, entry);
+  return entry;
 }
 
 export const StructuredDiff = memo(function StructuredDiff({
@@ -124,44 +112,34 @@ export const StructuredDiff = memo(function StructuredDiff({
   width,
   skipHighlighting = false,
 }: Props): React.ReactNode {
-  const [theme] = useTheme()
-  const settings = useSettings()
-  const syntaxHighlightingDisabled =
-    settings.syntaxHighlightingDisabled ?? false
+  const [theme] = useTheme();
+  const settings = useSettings();
+  const syntaxHighlightingDisabled = settings.syntaxHighlightingDisabled ?? false;
 
   // Ensure width is at least 1 to prevent crashes in the Rust NAPI module
   // which expects u32 (can't handle negative numbers)
-  const safeWidth = Math.max(1, Math.floor(width))
+  const safeWidth = Math.max(1, Math.floor(width));
 
   // Only split out a noSelect gutter in fullscreen mode — terminal native
   // selection is used otherwise and noSelect is meaningless. Both branches
   // are now O(1) Yoga leaves per diff on remount (2 vs 1), so this gate
   // only saves cold-cache sliceAnsi work when fullscreen is off.
-  const splitGutter = isFullscreenEnvEnabled()
+  const splitGutter = isFullscreenEnvEnabled();
 
   const cached =
     skipHighlighting || syntaxHighlightingDisabled
       ? null
-      : renderColorDiff(
-          patch,
-          firstLine,
-          filePath,
-          fileContent ?? null,
-          theme,
-          safeWidth,
-          dim,
-          splitGutter,
-        )
+      : renderColorDiff(patch, firstLine, filePath, fileContent ?? null, theme, safeWidth, dim, splitGutter);
 
   if (!cached) {
     return (
       <Box>
         <StructuredDiffFallback patch={patch} dim={dim} width={width} />
       </Box>
-    )
+    );
   }
 
-  const { lines, gutterWidth, gutters, contents } = cached
+  const { lines, gutterWidth, gutters, contents } = cached;
 
   // Two-column layout: gutter (noSelect) + content. NoSelect marks the
   // Box's computed bounds non-selectable; RawAnsi's measure func sets
@@ -175,12 +153,12 @@ export const StructuredDiff = memo(function StructuredDiff({
         </NoSelect>
         <RawAnsi lines={contents} width={safeWidth - gutterWidth} />
       </Box>
-    )
+    );
   }
 
   return (
     <Box>
       <RawAnsi lines={lines} width={safeWidth} />
     </Box>
-  )
-})
+  );
+});
diff --git a/src/components/StructuredDiff/Fallback.tsx b/src/components/StructuredDiff/Fallback.tsx
index 0331a0ed5..bbe4de695 100644
--- a/src/components/StructuredDiff/Fallback.tsx
+++ b/src/components/StructuredDiff/Fallback.tsx
@@ -1,8 +1,8 @@
-import { diffWordsWithSpace, type StructuredPatchHunk } from 'diff'
-import * as React from 'react'
-import { useMemo } from 'react'
-import type { ThemeName } from 'src/utils/theme.js'
-import { Box, NoSelect, Text, stringWidth, useTheme, wrapText } from '@anthropic/ink'
+import { diffWordsWithSpace, type StructuredPatchHunk } from 'diff';
+import * as React from 'react';
+import { useMemo } from 'react';
+import type { ThemeName } from 'src/utils/theme.js';
+import { Box, NoSelect, Text, stringWidth, useTheme, wrapText } from '@anthropic/ink';
 
 /*
  * StructuredDiffFallback Component: Word-Level Diff Highlighting Example
@@ -44,50 +44,46 @@ import { Box, NoSelect, Text, stringWidth, useTheme, wrapText } from '@anthropic
 
 // Define DiffLine interface to be used throughout the file
 interface DiffLine {
-  code: string
-  type: 'add' | 'remove' | 'nochange'
-  i: number
-  originalCode: string
-  wordDiff?: boolean // Flag for word-level diffing
-  matchedLine?: DiffLine
+  code: string;
+  type: 'add' | 'remove' | 'nochange';
+  i: number;
+  originalCode: string;
+  wordDiff?: boolean; // Flag for word-level diffing
+  matchedLine?: DiffLine;
 }
 
 // Line object type for internal functions
 export interface LineObject {
-  code: string
-  i: number
-  type: 'add' | 'remove' | 'nochange'
-  originalCode: string
-  wordDiff?: boolean
-  matchedLine?: LineObject
+  code: string;
+  i: number;
+  type: 'add' | 'remove' | 'nochange';
+  originalCode: string;
+  wordDiff?: boolean;
+  matchedLine?: LineObject;
 }
 
 // Type for word-level diff parts
 interface DiffPart {
-  added?: boolean
-  removed?: boolean
-  value: string
+  added?: boolean;
+  removed?: boolean;
+  value: string;
 }
 
 type Props = {
-  patch: StructuredPatchHunk
-  dim: boolean
-  width: number
-}
+  patch: StructuredPatchHunk;
+  dim: boolean;
+  width: number;
+};
 
 // Threshold for when we show a full-line diff instead of word-level diffing
-const CHANGE_THRESHOLD = 0.4
+const CHANGE_THRESHOLD = 0.4;
 
-export function StructuredDiffFallback({
-  patch,
-  dim,
-  width,
-}: Props): React.ReactNode {
-  const [theme] = useTheme()
+export function StructuredDiffFallback({ patch, dim, width }: Props): React.ReactNode {
+  const [theme] = useTheme();
   const diff = useMemo(
     () => formatDiff(patch.lines, patch.oldStart, width, dim, theme),
     [patch.lines, patch.oldStart, width, dim, theme],
-  )
+  );
 
   return (
     <Box flexDirection="column" flexGrow={1}>
@@ -95,7 +91,7 @@ export function StructuredDiffFallback({
         <Box key={i}>{node}</Box>
       ))}
     </Box>
-  )
+  );
 }
 
 // Transform lines to line objects with type information
@@ -107,7 +103,7 @@ export function transformLinesToObjects(lines: string[]): LineObject[] {
         i: 0,
         type: 'add',
         originalCode: code.slice(1),
-      }
+      };
     }
     if (code.startsWith('-')) {
       return {
@@ -115,105 +111,102 @@ export function transformLinesToObjects(lines: string[]): LineObject[] {
         i: 0,
         type: 'remove',
         originalCode: code.slice(1),
-      }
+      };
     }
     return {
       code: code.slice(1),
       i: 0,
       type: 'nochange',
       originalCode: code.slice(1),
-    }
-  })
+    };
+  });
 }
 
 // Group adjacent add/remove lines for word-level diffing
 export function processAdjacentLines(lineObjects: LineObject[]): LineObject[] {
-  const processedLines: LineObject[] = []
-  let i = 0
+  const processedLines: LineObject[] = [];
+  let i = 0;
 
   while (i < lineObjects.length) {
-    const current = lineObjects[i]
+    const current = lineObjects[i];
     if (!current) {
-      i++
-      continue
+      i++;
+      continue;
     }
 
     // Find a sequence of remove followed by add (possible word-level diff candidates)
     if (current.type === 'remove') {
-      const removeLines: LineObject[] = [current]
-      let j = i + 1
+      const removeLines: LineObject[] = [current];
+      let j = i + 1;
 
       // Collect consecutive remove lines
       while (j < lineObjects.length && lineObjects[j]?.type === 'remove') {
-        const line = lineObjects[j]
+        const line = lineObjects[j];
         if (line) {
-          removeLines.push(line)
+          removeLines.push(line);
         }
-        j++
+        j++;
       }
 
       // Check if there are add lines following the remove lines
-      const addLines: LineObject[] = []
+      const addLines: LineObject[] = [];
       while (j < lineObjects.length && lineObjects[j]?.type === 'add') {
-        const line = lineObjects[j]
+        const line = lineObjects[j];
         if (line) {
-          addLines.push(line)
+          addLines.push(line);
         }
-        j++
+        j++;
       }
 
       // If we have both remove and add lines, perform word-level diffing
       if (removeLines.length > 0 && addLines.length > 0) {
         // For word diffing, we'll compare each pair of lines or the closest available match
-        const pairCount = Math.min(removeLines.length, addLines.length)
+        const pairCount = Math.min(removeLines.length, addLines.length);
 
         // Add paired lines with word diff info
         for (let k = 0; k < pairCount; k++) {
-          const removeLine = removeLines[k]
-          const addLine = addLines[k]
+          const removeLine = removeLines[k];
+          const addLine = addLines[k];
 
           if (removeLine && addLine) {
-            removeLine.wordDiff = true
-            addLine.wordDiff = true
+            removeLine.wordDiff = true;
+            addLine.wordDiff = true;
 
             // Store the matched pair for later word diffing
-            removeLine.matchedLine = addLine
-            addLine.matchedLine = removeLine
+            removeLine.matchedLine = addLine;
+            addLine.matchedLine = removeLine;
           }
         }
 
         // Add all remove lines (both paired and unpaired)
-        processedLines.push(...removeLines.filter(Boolean))
+        processedLines.push(...removeLines.filter(Boolean));
 
         // Then add all add lines (both paired and unpaired)
-        processedLines.push(...addLines.filter(Boolean))
+        processedLines.push(...addLines.filter(Boolean));
 
-        i = j // Skip all the lines we've processed
+        i = j; // Skip all the lines we've processed
       } else {
         // No matching add lines, just add the current remove line
-        processedLines.push(current)
-        i++
+        processedLines.push(current);
+        i++;
       }
     } else {
       // Not a remove line, just add it
-      processedLines.push(current)
-      i++
+      processedLines.push(current);
+      i++;
     }
   }
 
-  return processedLines
+  return processedLines;
 }
 
 // Calculate word-level diffs between two text strings
-export function calculateWordDiffs(
-  oldText: string,
-  newText: string,
-): DiffPart[] {
+export function calculateWordDiffs(oldText: string, newText: string): DiffPart[] {
   // Use diffWordsWithSpace instead of diffWords to preserve whitespace
   // This ensures spaces between tokens like > and { are preserved
-  const result = diffWordsWithSpace(oldText, newText, { ignoreCase: false })
+  const result = diffWordsWithSpace(oldText, newText, { ignoreCase: false });
 
-  return result
+  return result;
 }
 
 // Process word-level diffs with manual wrapping support
@@ -224,149 +217,120 @@ function generateWordDiffElements(
   dim: boolean,
   overrideTheme?: ThemeName,
 ): React.ReactNode[] | null {
-  const { type, i, wordDiff, matchedLine, originalCode } = item
+  const { type, i, wordDiff, matchedLine, originalCode } = item;
 
   if (!wordDiff || !matchedLine) {
-    return null // This function only handles word-level diff rendering
+    return null; // This function only handles word-level diff rendering
   }
 
-  const removedLineText =
-    type === 'remove' ? originalCode : matchedLine.originalCode
-  const addedLineText =
-    type === 'remove' ? matchedLine.originalCode : originalCode
+  const removedLineText = type === 'remove' ? originalCode : matchedLine.originalCode;
+  const addedLineText = type === 'remove' ? matchedLine.originalCode : originalCode;
 
-  const wordDiffs = calculateWordDiffs(removedLineText, addedLineText)
+  const wordDiffs = calculateWordDiffs(removedLineText, addedLineText);
 
   // Check if we should use word-level diffing
-  const totalLength = removedLineText.length + addedLineText.length
+  const totalLength = removedLineText.length + addedLineText.length;
   const changedLength = wordDiffs
     .filter(part => part.added || part.removed)
-    .reduce((sum, part) => sum + part.value.length, 0)
-  const changeRatio = changedLength / totalLength
+    .reduce((sum, part) => sum + part.value.length, 0);
+  const changeRatio = changedLength / totalLength;
 
   if (changeRatio > CHANGE_THRESHOLD || dim) {
-    return null // Fall back to standard rendering for major changes
+    return null; // Fall back to standard rendering for major changes
   }
 
   // Calculate available width for content
-  const diffPrefix = type === 'add' ? '+' : '-'
-  const diffPrefixWidth = diffPrefix.length
-  const availableContentWidth = Math.max(
-    1,
-    width - maxWidth - 1 - diffPrefixWidth,
-  )
+  const diffPrefix = type === 'add' ? '+' : '-';
+  const diffPrefixWidth = diffPrefix.length;
+  const availableContentWidth = Math.max(1, width - maxWidth - 1 - diffPrefixWidth);
 
   // Manually wrap the word diff parts with better space efficiency
-  const wrappedLines: { content: React.ReactNode[]; contentWidth: number }[] =
-    []
-  let currentLine: React.ReactNode[] = []
-  let currentLineWidth = 0
+  const wrappedLines: { content: React.ReactNode[]; contentWidth: number }[] = [];
+  let currentLine: React.ReactNode[] = [];
+  let currentLineWidth = 0;
 
   wordDiffs.forEach((part, partIndex) => {
     // Determine if this part should be shown for this line type
-    let shouldShow = false
-    let partBgColor: 'diffAddedWord' | 'diffRemovedWord' | undefined
+    let shouldShow = false;
+    let partBgColor: 'diffAddedWord' | 'diffRemovedWord' | undefined;
 
     if (type === 'add') {
       if (part.added) {
-        shouldShow = true
-        partBgColor = 'diffAddedWord'
+        shouldShow = true;
+        partBgColor = 'diffAddedWord';
       } else if (!part.removed) {
-        shouldShow = true
+        shouldShow = true;
       }
     } else if (type === 'remove') {
       if (part.removed) {
-        shouldShow = true
-        partBgColor = 'diffRemovedWord'
+        shouldShow = true;
+        partBgColor = 'diffRemovedWord';
       } else if (!part.added) {
-        shouldShow = true
+        shouldShow = true;
       }
     }
 
-    if (!shouldShow) return
+    if (!shouldShow) return;
 
     // Use wrapText to wrap this individual part if it's long
-    const partWrapped = wrapText(part.value, availableContentWidth, 'wrap')
-    const partLines = partWrapped.split('\n')
+    const partWrapped = wrapText(part.value, availableContentWidth, 'wrap');
+    const partLines = partWrapped.split('\n');
 
     partLines.forEach((partLine, lineIdx) => {
-      if (!partLine) return
+      if (!partLine) return;
 
       // Check if we need to start a new line
-      if (
-        lineIdx > 0 ||
-        currentLineWidth + stringWidth(partLine) > availableContentWidth
-      ) {
+      if (lineIdx > 0 || currentLineWidth + stringWidth(partLine) > availableContentWidth) {
         if (currentLine.length > 0) {
           wrappedLines.push({
             content: [...currentLine],
             contentWidth: currentLineWidth,
-          })
-          currentLine = []
-          currentLineWidth = 0
+          });
+          currentLine = [];
+          currentLineWidth = 0;
         }
       }
 
       currentLine.push(
-        <Text
-          key={`part-${partIndex}-${lineIdx}`}
-          backgroundColor={partBgColor}
-        >
+        <Text key={`part-${partIndex}-${lineIdx}`} backgroundColor={partBgColor}>
           {partLine}
         </Text>,
-      )
+      );
 
-      currentLineWidth += stringWidth(partLine)
-    })
-  })
+      currentLineWidth += stringWidth(partLine);
+    });
+  });
 
   if (currentLine.length > 0) {
-    wrappedLines.push({ content: currentLine, contentWidth: currentLineWidth })
+    wrappedLines.push({ content: currentLine, contentWidth: currentLineWidth });
   }
 
   // Render each wrapped line as a separate Text element
   return wrappedLines.map(({ content, contentWidth }, lineIndex) => {
-    const key = `${type}-${i}-${lineIndex}`
+    const key = `${type}-${i}-${lineIndex}`;
     const lineBgColor =
-      type === 'add'
-        ? dim
-          ? 'diffAddedDimmed'
-          : 'diffAdded'
-        : dim
-          ? 'diffRemovedDimmed'
-          : 'diffRemoved'
-    const lineNum = lineIndex === 0 ? i : undefined
-    const lineNumStr =
-      (lineNum !== undefined
-        ? lineNum.toString().padStart(maxWidth)
-        : ' '.repeat(maxWidth)) + ' '
+      type === 'add' ? (dim ? 'diffAddedDimmed' : 'diffAdded') : dim ? 'diffRemovedDimmed' : 'diffRemoved';
+    const lineNum = lineIndex === 0 ? i : undefined;
+    const lineNumStr = (lineNum !== undefined ? lineNum.toString().padStart(maxWidth) : ' '.repeat(maxWidth)) + ' ';
     // Calculate padding to fill the entire terminal width
-    const usedWidth = lineNumStr.length + diffPrefixWidth + contentWidth
-    const padding = Math.max(0, width - usedWidth)
+    const usedWidth = lineNumStr.length + diffPrefixWidth + contentWidth;
+    const padding = Math.max(0, width - usedWidth);
 
     return (
       <Box key={key} flexDirection="row">
         <NoSelect fromLeftEdge>
-          <Text
-            color={overrideTheme ? 'text' : undefined}
-            backgroundColor={lineBgColor}
-            dimColor={dim}
-          >
+          <Text color={overrideTheme ? 'text' : undefined} backgroundColor={lineBgColor} dimColor={dim}>
             {lineNumStr}
             {diffPrefix}
           </Text>
         </NoSelect>
-        <Text
-          color={overrideTheme ? 'text' : undefined}
-          backgroundColor={lineBgColor}
-          dimColor={dim}
-        >
+        <Text color={overrideTheme ? 'text' : undefined} backgroundColor={lineBgColor} dimColor={dim}>
           {content}
           {' '.repeat(padding)}
         </Text>
       </Box>
-    )
-  })
+    );
+  });
 }
 
 function formatDiff(
@@ -377,63 +341,51 @@ function formatDiff(
   overrideTheme?: ThemeName,
 ): React.ReactNode[] {
   // Ensure width is at least 1 to prevent rendering issues with very narrow terminals
-  const safeWidth = Math.max(1, Math.floor(width))
+  const safeWidth = Math.max(1, Math.floor(width));
 
   // Step 1: Transform lines to line objects with type information
-  const lineObjects = transformLinesToObjects(lines)
+  const lineObjects = transformLinesToObjects(lines);
 
   // Step 2: Group adjacent add/remove lines for word-level diffing
-  const processedLines = processAdjacentLines(lineObjects)
+  const processedLines = processAdjacentLines(lineObjects);
 
   // Step 3: Number the diff lines
-  const ls = numberDiffLines(processedLines, startingLineNumber)
+  const ls = numberDiffLines(processedLines, startingLineNumber);
 
   // Find max line number width for alignment
-  const maxLineNumber = Math.max(...ls.map(({ i }) => i), 0)
-  const maxWidth = Math.max(maxLineNumber.toString().length + 1, 0)
+  const maxLineNumber = Math.max(...ls.map(({ i }) => i), 0);
+  const maxWidth = Math.max(maxLineNumber.toString().length + 1, 0);
 
   // Step 4: Render formatting
   return ls.flatMap((item): React.ReactNode[] => {
-    const { type, code, i, wordDiff, matchedLine } = item
+    const { type, code, i, wordDiff, matchedLine } = item;
 
     // Handle word-level diffing for add/remove pairs
     if (wordDiff && matchedLine) {
-      const wordDiffElements = generateWordDiffElements(
-        item,
-        safeWidth,
-        maxWidth,
-        dim,
-        overrideTheme,
-      )
+      const wordDiffElements = generateWordDiffElements(item, safeWidth, maxWidth, dim, overrideTheme);
 
       // word-diff might refuse (e.g. due to lines being substantially different) in which
       // case we'll fall through to normal renderin gbelow
       if (wordDiffElements !== null) {
-        return wordDiffElements
+        return wordDiffElements;
       }
     }
 
     // Standard rendering for lines without word diffing or as fallback
     // Calculate available width accounting for line number + space + diff prefix
-    const diffPrefixWidth = 2 // "  " for unchanged, "+ " or "- " for changes
-    const availableContentWidth = Math.max(
-      1,
-      safeWidth - maxWidth - 1 - diffPrefixWidth,
-    ) // -1 for space after line number
-    const wrappedText = wrapText(code, availableContentWidth, 'wrap')
-    const wrappedLines = wrappedText.split('\n')
+    const diffPrefixWidth = 2; // "  " for unchanged, "+ " or "- " for changes
+    const availableContentWidth = Math.max(1, safeWidth - maxWidth - 1 - diffPrefixWidth); // -1 for space after line number
+    const wrappedText = wrapText(code, availableContentWidth, 'wrap');
+    const wrappedLines = wrappedText.split('\n');
 
     return wrappedLines.map((line, lineIndex) => {
-      const key = `${type}-${i}-${lineIndex}`
-      const lineNum = lineIndex === 0 ? i : undefined
-      const lineNumStr =
-        (lineNum !== undefined
-          ? lineNum.toString().padStart(maxWidth)
-          : ' '.repeat(maxWidth)) + ' '
-      const sigil = type === 'add' ? '+' : type === 'remove' ? '-' : ' '
+      const key = `${type}-${i}-${lineIndex}`;
+      const lineNum = lineIndex === 0 ? i : undefined;
+      const lineNumStr = (lineNum !== undefined ? lineNum.toString().padStart(maxWidth) : ' '.repeat(maxWidth)) + ' ';
+      const sigil = type === 'add' ? '+' : type === 'remove' ? '-' : ' ';
       // Calculate padding to fill the entire terminal width
-      const contentWidth = lineNumStr.length + 1 + stringWidth(line) // lineNum + sigil + code
-      const padding = Math.max(0, safeWidth - contentWidth)
+      const contentWidth = lineNumStr.length + 1 + stringWidth(line); // lineNum + sigil + code
+      const padding = Math.max(0, safeWidth - contentWidth);
 
       const bgColor =
         type === 'add'
@@ -444,7 +396,7 @@ function formatDiff(
             ? dim
               ? 'diffRemovedDimmed'
               : 'diffRemoved'
-            : undefined
+            : undefined;
 
       // Gutter (line number + sigil) is wrapped in <NoSelect> so fullscreen
       // text selection yields clean code. bgColor carries across both boxes
@@ -461,31 +413,24 @@ function formatDiff(
               {sigil}
             </Text>
           </NoSelect>
-          <Text
-            color={overrideTheme ? 'text' : undefined}
-            backgroundColor={bgColor}
-            dimColor={dim}
-          >
+          <Text color={overrideTheme ? 'text' : undefined} backgroundColor={bgColor} dimColor={dim}>
             {line}
             {' '.repeat(padding)}
           </Text>
         </Box>
-      )
-    })
-  })
+      );
+    });
+  });
 }
 
-export function numberDiffLines(
-  diff: LineObject[],
-  startLine: number,
-): DiffLine[] {
-  let i = startLine
-  const result: DiffLine[] = []
-  const queue = [...diff]
+export function numberDiffLines(diff: LineObject[], startLine: number): DiffLine[] {
+  let i = startLine;
+  const result: DiffLine[] = [];
+  const queue = [...diff];
 
   while (queue.length > 0) {
-    const current = queue.shift()!
-    const { code, type, originalCode, wordDiff, matchedLine } = current
+    const current = queue.shift()!;
+    const { code, type, originalCode, wordDiff, matchedLine } = current;
     const line = {
       code,
       type,
@@ -493,25 +438,25 @@ export function numberDiffLines(
       originalCode,
       wordDiff,
       matchedLine,
-    }
+    };
 
     // Update counters based on change type
     switch (type) {
       case 'nochange':
-        i++
-        result.push(line)
-        break
+        i++;
+        result.push(line);
+        break;
       case 'add':
-        i++
-        result.push(line)
-        break
+        i++;
+        result.push(line);
+        break;
       case 'remove': {
-        result.push(line)
-        let numRemoved = 0
+        result.push(line);
+        let numRemoved = 0;
         while (queue[0]?.type === 'remove') {
-          i++
-          const current = queue.shift()!
-          const { code, type, originalCode, wordDiff, matchedLine } = current
+          i++;
+          const current = queue.shift()!;
+          const { code, type, originalCode, wordDiff, matchedLine } = current;
           const line = {
             code,
             type,
@@ -519,15 +464,15 @@ export function numberDiffLines(
             originalCode,
             wordDiff,
             matchedLine,
-          }
-          result.push(line)
-          numRemoved++
+          };
+          result.push(line);
+          numRemoved++;
         }
-        i -= numRemoved
-        break
+        i -= numRemoved;
+        break;
       }
     }
   }
 
-  return result
+  return result;
 }
diff --git a/src/components/StructuredDiff/src/utils/theme.ts b/src/components/StructuredDiff/src/utils/theme.ts
index 62c7ea83c..b6a2857b7 100644
--- a/src/components/StructuredDiff/src/utils/theme.ts
+++ b/src/components/StructuredDiff/src/utils/theme.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type ThemeName = any;
+export type ThemeName = any
diff --git a/src/components/StructuredDiffList.tsx b/src/components/StructuredDiffList.tsx
index cfbedaecb..c6bf3798f 100644
--- a/src/components/StructuredDiffList.tsx
+++ b/src/components/StructuredDiffList.tsx
@@ -1,27 +1,20 @@
-import type { StructuredPatchHunk } from 'diff'
-import * as React from 'react'
-import { Box, NoSelect, Text } from '@anthropic/ink'
-import { intersperse } from '../utils/array.js'
-import { StructuredDiff } from './StructuredDiff.js'
+import type { StructuredPatchHunk } from 'diff';
+import * as React from 'react';
+import { Box, NoSelect, Text } from '@anthropic/ink';
+import { intersperse } from '../utils/array.js';
+import { StructuredDiff } from './StructuredDiff.js';
 
 type Props = {
-  hunks: StructuredPatchHunk[]
-  dim: boolean
-  width: number
-  filePath: string
-  firstLine: string | null
-  fileContent?: string
-}
+  hunks: StructuredPatchHunk[];
+  dim: boolean;
+  width: number;
+  filePath: string;
+  firstLine: string | null;
+  fileContent?: string;
+};
 
 /** Renders a list of diff hunks with ellipsis separators between them. */
-export function StructuredDiffList({
-  hunks,
-  dim,
-  width,
-  filePath,
-  firstLine,
-  fileContent,
-}: Props): React.ReactNode {
+export function StructuredDiffList({ hunks, dim, width, filePath, firstLine, fileContent }: Props): React.ReactNode {
   return intersperse(
     hunks.map(hunk => (
       <Box flexDirection="column" key={hunk.newStart}>
@@ -40,5 +33,5 @@ export function StructuredDiffList({
         <Text dimColor>...</Text>
       </NoSelect>
     ),
-  )
+  );
 }
diff --git a/src/components/TagTabs.tsx b/src/components/TagTabs.tsx
index f974bdad4..37e395c5a 100644
--- a/src/components/TagTabs.tsx
+++ b/src/components/TagTabs.tsx
@@ -1,45 +1,41 @@
-import React from 'react'
-import { Box, Text, stringWidth } from '@anthropic/ink'
-import { truncateToWidth } from '../utils/format.js'
+import React from 'react';
+import { Box, Text, stringWidth } from '@anthropic/ink';
+import { truncateToWidth } from '../utils/format.js';
 
 // Constants for width calculations - derived from actual rendered strings
-const ALL_TAB_LABEL = 'All'
-const TAB_PADDING = 2 // Space before and after tab text: " {tab} "
-const HASH_PREFIX_LENGTH = 1 // "#" prefix for non-All tabs
-const LEFT_ARROW_PREFIX = '← '
-const RIGHT_HINT_WITH_COUNT_PREFIX = '→'
-const RIGHT_HINT_SUFFIX = ' (tab to cycle)'
-const RIGHT_HINT_NO_COUNT = '(tab to cycle)'
-const MAX_OVERFLOW_DIGITS = 2 // Assume max 99 hidden tabs for width calculation
+const ALL_TAB_LABEL = 'All';
+const TAB_PADDING = 2; // Space before and after tab text: " {tab} "
+const HASH_PREFIX_LENGTH = 1; // "#" prefix for non-All tabs
+const LEFT_ARROW_PREFIX = '← ';
+const RIGHT_HINT_WITH_COUNT_PREFIX = '→';
+const RIGHT_HINT_SUFFIX = ' (tab to cycle)';
+const RIGHT_HINT_NO_COUNT = '(tab to cycle)';
+const MAX_OVERFLOW_DIGITS = 2; // Assume max 99 hidden tabs for width calculation
 
 // Computed widths
-const LEFT_ARROW_WIDTH = LEFT_ARROW_PREFIX.length + MAX_OVERFLOW_DIGITS + 1 // "← NN " with gap
+const LEFT_ARROW_WIDTH = LEFT_ARROW_PREFIX.length + MAX_OVERFLOW_DIGITS + 1; // "← NN " with gap
 const RIGHT_HINT_WIDTH_WITH_COUNT =
-  RIGHT_HINT_WITH_COUNT_PREFIX.length +
-  MAX_OVERFLOW_DIGITS +
-  RIGHT_HINT_SUFFIX.length // "→NN (tab to cycle)"
-const RIGHT_HINT_WIDTH_NO_COUNT = RIGHT_HINT_NO_COUNT.length
+  RIGHT_HINT_WITH_COUNT_PREFIX.length + MAX_OVERFLOW_DIGITS + RIGHT_HINT_SUFFIX.length; // "→NN (tab to cycle)"
+const RIGHT_HINT_WIDTH_NO_COUNT = RIGHT_HINT_NO_COUNT.length;
 
 type Props = {
-  tabs: string[]
-  selectedIndex: number
-  availableWidth: number
-  showAllProjects?: boolean
-}
+  tabs: string[];
+  selectedIndex: number;
+  availableWidth: number;
+  showAllProjects?: boolean;
+};
 
 /**
  * Calculate the display width of a tab
  */
 function getTabWidth(tab: string, maxWidth?: number): number {
   if (tab === ALL_TAB_LABEL) {
-    return ALL_TAB_LABEL.length + TAB_PADDING
+    return ALL_TAB_LABEL.length + TAB_PADDING;
   }
   // For non-All tabs: " #{tag} " but truncate tag if needed
-  const tagWidth = stringWidth(tab)
-  const effectiveTagWidth = maxWidth
-    ? Math.min(tagWidth, maxWidth - TAB_PADDING - HASH_PREFIX_LENGTH)
-    : tagWidth
-  return Math.max(0, effectiveTagWidth) + TAB_PADDING + HASH_PREFIX_LENGTH
+  const tagWidth = stringWidth(tab);
+  const effectiveTagWidth = maxWidth ? Math.min(tagWidth, maxWidth - TAB_PADDING - HASH_PREFIX_LENGTH) : tagWidth;
+  return Math.max(0, effectiveTagWidth) + TAB_PADDING + HASH_PREFIX_LENGTH;
 }
 
 /**
@@ -47,92 +43,78 @@ function getTabWidth(tab: string, maxWidth?: number): number {
  */
 function truncateTag(tag: string, maxWidth: number): string {
   // Available space for the tag text itself: maxWidth - " #" - " "
-  const availableForTag = maxWidth - TAB_PADDING - HASH_PREFIX_LENGTH
+  const availableForTag = maxWidth - TAB_PADDING - HASH_PREFIX_LENGTH;
   if (stringWidth(tag) <= availableForTag) {
-    return tag
+    return tag;
   }
   if (availableForTag <= 1) {
-    return tag.charAt(0)
+    return tag.charAt(0);
   }
-  return truncateToWidth(tag, availableForTag)
+  return truncateToWidth(tag, availableForTag);
 }
 
-export function TagTabs({
-  tabs,
-  selectedIndex,
-  availableWidth,
-  showAllProjects = false,
-}: Props): React.ReactNode {
-  const resumeLabel = showAllProjects ? 'Resume (All Projects)' : 'Resume'
-  const resumeLabelWidth = resumeLabel.length + 1 // +1 for gap
+export function TagTabs({ tabs, selectedIndex, availableWidth, showAllProjects = false }: Props): React.ReactNode {
+  const resumeLabel = showAllProjects ? 'Resume (All Projects)' : 'Resume';
+  const resumeLabelWidth = resumeLabel.length + 1; // +1 for gap
 
   // Calculate how much space we have for tabs (use worst-case hint width)
-  const rightHintWidth = Math.max(
-    RIGHT_HINT_WIDTH_WITH_COUNT,
-    RIGHT_HINT_WIDTH_NO_COUNT,
-  )
-  const maxTabsWidth = availableWidth - resumeLabelWidth - rightHintWidth - 2 // 2 for gaps
+  const rightHintWidth = Math.max(RIGHT_HINT_WIDTH_WITH_COUNT, RIGHT_HINT_WIDTH_NO_COUNT);
+  const maxTabsWidth = availableWidth - resumeLabelWidth - rightHintWidth - 2; // 2 for gaps
 
   // Clamp selectedIndex to valid range
-  const safeSelectedIndex = Math.max(
-    0,
-    Math.min(selectedIndex, tabs.length - 1),
-  )
+  const safeSelectedIndex = Math.max(0, Math.min(selectedIndex, tabs.length - 1));
 
   // Calculate width of each tab, with truncation for very long tags
-  const maxSingleTabWidth = Math.max(20, Math.floor(maxTabsWidth / 2)) // At least show half the space for one tab
-  const tabWidths = tabs.map(tab => getTabWidth(tab, maxSingleTabWidth))
+  const maxSingleTabWidth = Math.max(20, Math.floor(maxTabsWidth / 2)); // At least show half the space for one tab
+  const tabWidths = tabs.map(tab => getTabWidth(tab, maxSingleTabWidth));
 
   // Find a window of tabs that fits, centered around selectedIndex
-  let startIndex = 0
-  let endIndex = tabs.length
+  let startIndex = 0;
+  let endIndex = tabs.length;
 
   // Calculate total width of all tabs
-  const totalTabsWidth = tabWidths.reduce(
-    (sum, w, i) => sum + w + (i < tabWidths.length - 1 ? 1 : 0),
-    0,
-  ) // +1 for gaps between tabs
+  const totalTabsWidth = tabWidths.reduce((sum, w, i) => sum + w + (i < tabWidths.length - 1 ? 1 : 0), 0); // +1 for gaps between tabs
 
   if (totalTabsWidth > maxTabsWidth) {
     // Need to show a subset - account for left arrow when not at start
-    const effectiveMaxWidth = maxTabsWidth - LEFT_ARROW_WIDTH
+    const effectiveMaxWidth = maxTabsWidth - LEFT_ARROW_WIDTH;
 
     // Start with the selected tab
-    let windowWidth = tabWidths[safeSelectedIndex] ?? 0
-    startIndex = safeSelectedIndex
-    endIndex = safeSelectedIndex + 1
+    let windowWidth = tabWidths[safeSelectedIndex] ?? 0;
+    startIndex = safeSelectedIndex;
+    endIndex = safeSelectedIndex + 1;
 
     // Expand window to include more tabs
     while (startIndex > 0 || endIndex < tabs.length) {
-      const canExpandLeft = startIndex > 0
-      const canExpandRight = endIndex < tabs.length
+      const canExpandLeft = startIndex > 0;
+      const canExpandRight = endIndex < tabs.length;
 
       if (canExpandLeft) {
-        const leftWidth = (tabWidths[startIndex - 1] ?? 0) + 1 // +1 for gap
+        const leftWidth = (tabWidths[startIndex - 1] ?? 0) + 1; // +1 for gap
         if (windowWidth + leftWidth <= effectiveMaxWidth) {
-          startIndex--
-          windowWidth += leftWidth
-          continue
+          startIndex--;
+          windowWidth += leftWidth;
+          continue;
         }
       }
 
       if (canExpandRight) {
-        const rightWidth = (tabWidths[endIndex] ?? 0) + 1 // +1 for gap
+        const rightWidth = (tabWidths[endIndex] ?? 0) + 1; // +1 for gap
         if (windowWidth + rightWidth <= effectiveMaxWidth) {
-          endIndex++
-          windowWidth += rightWidth
-          continue
+          endIndex++;
+          windowWidth += rightWidth;
+          continue;
         }
       }
 
-      break
+      break;
     }
   }
 
-  const hiddenLeft = startIndex
-  const hiddenRight = tabs.length - endIndex
-  const visibleTabs = tabs.slice(startIndex, endIndex)
-  const visibleIndices = visibleTabs.map((_, i) => startIndex + i)
+  const hiddenLeft = startIndex;
+  const hiddenRight = tabs.length - endIndex;
+  const visibleTabs = tabs.slice(startIndex, endIndex);
+  const visibleIndices = visibleTabs.map((_, i) => startIndex + i);
 
   return (
     <Box flexDirection="row" gap={1}>
@@ -144,12 +126,9 @@ export function TagTabs({
         </Text>
       )}
       {visibleTabs.map((tab, i) => {
-        const actualIndex = visibleIndices[i]!
-        const isSelected = actualIndex === safeSelectedIndex
-        const displayText =
-          tab === ALL_TAB_LABEL
-            ? tab
-            : `#${truncateTag(tab, maxSingleTabWidth - TAB_PADDING)}`
+        const actualIndex = visibleIndices[i]!;
+        const isSelected = actualIndex === safeSelectedIndex;
+        const displayText = tab === ALL_TAB_LABEL ? tab : `#${truncateTag(tab, maxSingleTabWidth - TAB_PADDING)}`;
         return (
           <Text
             key={tab}
@@ -160,7 +139,7 @@ export function TagTabs({
             {' '}
             {displayText}{' '}
           </Text>
-        )
+        );
       })}
       {hiddenRight > 0 ? (
         <Text dimColor>
@@ -172,5 +151,5 @@ export function TagTabs({
         <Text dimColor>{RIGHT_HINT_NO_COUNT}</Text>
       )}
     </Box>
-  )
+  );
 }
diff --git a/src/components/TaskListV2.tsx b/src/components/TaskListV2.tsx
index d96126dec..9f92b4ff7 100644
--- a/src/components/TaskListV2.tsx
+++ b/src/components/TaskListV2.tsx
@@ -1,116 +1,108 @@
-import figures from 'figures'
-import * as React from 'react'
-import { useTerminalSize } from '../hooks/useTerminalSize.js'
-import { Box, Text, stringWidth } from '@anthropic/ink'
-import { useAppState } from '../state/AppState.js'
-import { isInProcessTeammateTask } from '../tasks/InProcessTeammateTask/types.js'
+import figures from 'figures';
+import * as React from 'react';
+import { useTerminalSize } from '../hooks/useTerminalSize.js';
+import { Box, Text, stringWidth } from '@anthropic/ink';
+import { useAppState } from '../state/AppState.js';
+import { isInProcessTeammateTask } from '../tasks/InProcessTeammateTask/types.js';
 import {
   AGENT_COLOR_TO_THEME_COLOR,
   type AgentColorName,
-} from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js'
-import { isAgentSwarmsEnabled } from '../utils/agentSwarmsEnabled.js'
-import { count } from '../utils/array.js'
-import { summarizeRecentActivities } from '../utils/collapseReadSearch.js'
-import { truncateToWidth } from '../utils/format.js'
-import { isTodoV2Enabled, type Task } from '../utils/tasks.js'
-import type { Theme } from '../utils/theme.js'
-import ThemedText from './design-system/ThemedText.js'
+} from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js';
+import { isAgentSwarmsEnabled } from '../utils/agentSwarmsEnabled.js';
+import { count } from '../utils/array.js';
+import { summarizeRecentActivities } from '../utils/collapseReadSearch.js';
+import { truncateToWidth } from '../utils/format.js';
+import { isTodoV2Enabled, type Task } from '../utils/tasks.js';
+import type { Theme } from '../utils/theme.js';
+import ThemedText from './design-system/ThemedText.js';
 
 type Props = {
-  tasks: Task[]
-  isStandalone?: boolean
-}
+  tasks: Task[];
+  isStandalone?: boolean;
+};
 
-const RECENT_COMPLETED_TTL_MS = 30_000
+const RECENT_COMPLETED_TTL_MS = 30_000;
 
 function byIdAsc(a: Task, b: Task): number {
-  const aNum = parseInt(a.id, 10)
-  const bNum = parseInt(b.id, 10)
+  const aNum = parseInt(a.id, 10);
+  const bNum = parseInt(b.id, 10);
   if (!isNaN(aNum) && !isNaN(bNum)) {
-    return aNum - bNum
+    return aNum - bNum;
   }
-  return a.id.localeCompare(b.id)
+  return a.id.localeCompare(b.id);
 }
 
-export function TaskListV2({
-  tasks,
-  isStandalone = false,
-}: Props): React.ReactNode {
-  const teamContext = useAppState(s => s.teamContext)
-  const appStateTasks = useAppState(s => s.tasks)
-  const [, forceUpdate] = React.useState(0)
-  const { rows, columns } = useTerminalSize()
+export function TaskListV2({ tasks, isStandalone = false }: Props): React.ReactNode {
+  const teamContext = useAppState(s => s.teamContext);
+  const appStateTasks = useAppState(s => s.tasks);
+  const [, forceUpdate] = React.useState(0);
+  const { rows, columns } = useTerminalSize();
 
   // Track when each task was last observed transitioning to completed
-  const completionTimestampsRef = React.useRef(new Map<string, number>())
-  const previousCompletedIdsRef = React.useRef<Set<string> | null>(null)
+  const completionTimestampsRef = React.useRef(new Map<string, number>());
+  const previousCompletedIdsRef = React.useRef<Set<string> | null>(null);
   if (previousCompletedIdsRef.current === null) {
-    previousCompletedIdsRef.current = new Set(
-      tasks.filter(t => t.status === 'completed').map(t => t.id),
-    )
+    previousCompletedIdsRef.current = new Set(tasks.filter(t => t.status === 'completed').map(t => t.id));
   }
-  const maxDisplay = rows <= 10 ? 0 : Math.min(10, Math.max(3, rows - 14))
+  const maxDisplay = rows <= 10 ? 0 : Math.min(10, Math.max(3, rows - 14));
 
   // Update completion timestamps: reset when a task transitions to completed
-  const currentCompletedIds = new Set(
-    tasks.filter(t => t.status === 'completed').map(t => t.id),
-  )
-  const now = Date.now()
+  const currentCompletedIds = new Set(tasks.filter(t => t.status === 'completed').map(t => t.id));
+  const now = Date.now();
   for (const id of currentCompletedIds) {
     if (!previousCompletedIdsRef.current.has(id)) {
-      completionTimestampsRef.current.set(id, now)
+      completionTimestampsRef.current.set(id, now);
     }
   }
   for (const id of completionTimestampsRef.current.keys()) {
     if (!currentCompletedIds.has(id)) {
-      completionTimestampsRef.current.delete(id)
+      completionTimestampsRef.current.delete(id);
     }
   }
-  previousCompletedIdsRef.current = currentCompletedIds
+  previousCompletedIdsRef.current = currentCompletedIds;
 
   // Schedule re-render when the next recent completion expires.
   // Depend on `tasks` so the timer is only reset when the task list changes,
   // not on every render (which was causing unnecessary work).
   React.useEffect(() => {
     if (completionTimestampsRef.current.size === 0) {
-      return
+      return;
     }
-    const currentNow = Date.now()
-    let earliestExpiry = Infinity
+    const currentNow = Date.now();
+    let earliestExpiry = Infinity;
     for (const ts of completionTimestampsRef.current.values()) {
-      const expiry = ts + RECENT_COMPLETED_TTL_MS
+      const expiry = ts + RECENT_COMPLETED_TTL_MS;
       if (expiry > currentNow && expiry < earliestExpiry) {
-        earliestExpiry = expiry
+        earliestExpiry = expiry;
       }
     }
     if (earliestExpiry === Infinity) {
-      return
+      return;
     }
     const timer = setTimeout(
       forceUpdate => forceUpdate((n: number) => n + 1),
       earliestExpiry - currentNow,
       forceUpdate,
-    )
-    return () => clearTimeout(timer)
-  }, [tasks])
+    );
+    return () => clearTimeout(timer);
+  }, [tasks]);
 
   if (!isTodoV2Enabled()) {
-    return null
+    return null;
   }
 
   if (tasks.length === 0) {
-    return null
+    return null;
   }
 
   // Build a map of teammate name -> theme color
-  const teammateColors: Record<string, keyof Theme> = {}
+  const teammateColors: Record<string, keyof Theme> = {};
   if (isAgentSwarmsEnabled() && teamContext?.teammates) {
     for (const teammate of Object.values(teamContext.teammates)) {
       if (teammate.color) {
-        const themeColor =
-          AGENT_COLOR_TO_THEME_COLOR[teammate.color as AgentColorName]
+        const themeColor = AGENT_COLOR_TO_THEME_COLOR[teammate.color as AgentColorName];
         if (themeColor) {
-          teammateColors[teammate.name] = themeColor
+          teammateColors[teammate.name] = themeColor;
         }
       }
     }
@@ -121,98 +113,88 @@ export function TaskListV2({
   // task owners match regardless of which format the model used.
   // Rolls up consecutive search/read tool uses into a compact summary.
   // Also track which teammates are still running (not shut down).
-  const teammateActivity: Record<string, string> = {}
-  const activeTeammates = new Set<string>()
+  const teammateActivity: Record<string, string> = {};
+  const activeTeammates = new Set<string>();
   if (isAgentSwarmsEnabled()) {
     for (const bgTask of Object.values(appStateTasks)) {
       if (isInProcessTeammateTask(bgTask) && bgTask.status === 'running') {
-        activeTeammates.add(bgTask.identity.agentName)
-        activeTeammates.add(bgTask.identity.agentId)
-        const activities = bgTask.progress?.recentActivities
+        activeTeammates.add(bgTask.identity.agentName);
+        activeTeammates.add(bgTask.identity.agentId);
+        const activities = bgTask.progress?.recentActivities;
         const desc =
-          (activities && summarizeRecentActivities(activities)) ??
-          bgTask.progress?.lastActivity?.activityDescription
+          (activities && summarizeRecentActivities(activities)) ?? bgTask.progress?.lastActivity?.activityDescription;
         if (desc) {
-          teammateActivity[bgTask.identity.agentName] = desc
-          teammateActivity[bgTask.identity.agentId] = desc
+          teammateActivity[bgTask.identity.agentName] = desc;
+          teammateActivity[bgTask.identity.agentId] = desc;
         }
       }
     }
   }
 
   // Get task counts for display
-  const completedCount = count(tasks, t => t.status === 'completed')
-  const pendingCount = count(tasks, t => t.status === 'pending')
-  const inProgressCount = tasks.length - completedCount - pendingCount
+  const completedCount = count(tasks, t => t.status === 'completed');
+  const pendingCount = count(tasks, t => t.status === 'pending');
+  const inProgressCount = tasks.length - completedCount - pendingCount;
   // Unresolved tasks (open or in_progress) block dependent tasks
-  const unresolvedTaskIds = new Set(
-    tasks.filter(t => t.status !== 'completed').map(t => t.id),
-  )
+  const unresolvedTaskIds = new Set(tasks.filter(t => t.status !== 'completed').map(t => t.id));
 
   // Check if we need to truncate
-  const needsTruncation = tasks.length > maxDisplay
+  const needsTruncation = tasks.length > maxDisplay;
 
-  let visibleTasks: Task[]
-  let hiddenTasks: Task[]
+  let visibleTasks: Task[];
+  let hiddenTasks: Task[];
 
   if (needsTruncation) {
     // Prioritize: recently completed (within 30s), in-progress, pending, older completed
-    const recentCompleted: Task[] = []
-    const olderCompleted: Task[] = []
+    const recentCompleted: Task[] = [];
+    const olderCompleted: Task[] = [];
     for (const task of tasks.filter(t => t.status === 'completed')) {
-      const ts = completionTimestampsRef.current.get(task.id)
+      const ts = completionTimestampsRef.current.get(task.id);
       if (ts && now - ts < RECENT_COMPLETED_TTL_MS) {
-        recentCompleted.push(task)
+        recentCompleted.push(task);
       } else {
-        olderCompleted.push(task)
+        olderCompleted.push(task);
       }
     }
-    recentCompleted.sort(byIdAsc)
-    olderCompleted.sort(byIdAsc)
-    const inProgress = tasks
-      .filter(t => t.status === 'in_progress')
-      .sort(byIdAsc)
+    recentCompleted.sort(byIdAsc);
+    olderCompleted.sort(byIdAsc);
+    const inProgress = tasks.filter(t => t.status === 'in_progress').sort(byIdAsc);
     const pending = tasks
       .filter(t => t.status === 'pending')
       .sort((a, b) => {
-        const aBlocked = a.blockedBy.some(id => unresolvedTaskIds.has(id))
-        const bBlocked = b.blockedBy.some(id => unresolvedTaskIds.has(id))
+        const aBlocked = a.blockedBy.some(id => unresolvedTaskIds.has(id));
+        const bBlocked = b.blockedBy.some(id => unresolvedTaskIds.has(id));
         if (aBlocked !== bBlocked) {
-          return aBlocked ? 1 : -1
+          return aBlocked ? 1 : -1;
         }
-        return byIdAsc(a, b)
-      })
+        return byIdAsc(a, b);
+      });
 
-    const prioritized = [
-      ...recentCompleted,
-      ...inProgress,
-      ...pending,
-      ...olderCompleted,
-    ]
-    visibleTasks = prioritized.slice(0, maxDisplay)
-    hiddenTasks = prioritized.slice(maxDisplay)
+    const prioritized = [...recentCompleted, ...inProgress, ...pending, ...olderCompleted];
+    visibleTasks = prioritized.slice(0, maxDisplay);
+    hiddenTasks = prioritized.slice(maxDisplay);
   } else {
     // No truncation needed — sort by ID for stable ordering
-    visibleTasks = [...tasks].sort(byIdAsc)
-    hiddenTasks = []
+    visibleTasks = [...tasks].sort(byIdAsc);
+    hiddenTasks = [];
   }
 
-  let hiddenSummary = ''
+  let hiddenSummary = '';
   if (hiddenTasks.length > 0) {
-    const parts: string[] = []
-    const hiddenPending = count(hiddenTasks, t => t.status === 'pending')
-    const hiddenInProgress = count(hiddenTasks, t => t.status === 'in_progress')
-    const hiddenCompleted = count(hiddenTasks, t => t.status === 'completed')
+    const parts: string[] = [];
+    const hiddenPending = count(hiddenTasks, t => t.status === 'pending');
+    const hiddenInProgress = count(hiddenTasks, t => t.status === 'in_progress');
+    const hiddenCompleted = count(hiddenTasks, t => t.status === 'completed');
     if (hiddenInProgress > 0) {
-      parts.push(`${hiddenInProgress} in progress`)
+      parts.push(`${hiddenInProgress} in progress`);
     }
     if (hiddenPending > 0) {
-      parts.push(`${hiddenPending} pending`)
+      parts.push(`${hiddenPending} pending`);
     }
     if (hiddenCompleted > 0) {
-      parts.push(`${hiddenCompleted} completed`)
+      parts.push(`${hiddenCompleted} completed`);
     }
-    hiddenSummary = ` … +${parts.join(', ')}`
+    hiddenSummary = ` … +${parts.join(', ')}`;
   }
 
   const content = (
@@ -230,7 +212,7 @@ export function TaskListV2({
       ))}
       {maxDisplay > 0 && hiddenSummary && <Text dimColor>{hiddenSummary}</Text>}
     </>
-  )
+  );
 
   if (isStandalone) {
     return (
@@ -253,85 +235,68 @@ export function TaskListV2({
         </Box>
         {content}
       </Box>
-    )
+    );
   }
 
-  return <Box flexDirection="column">{content}</Box>
+  return <Box flexDirection="column">{content}</Box>;
 }
 
 type TaskItemProps = {
-  task: Task
-  ownerColor?: keyof Theme
-  openBlockers: string[]
-  activity?: string
-  ownerActive: boolean
-  columns: number
-}
+  task: Task;
+  ownerColor?: keyof Theme;
+  openBlockers: string[];
+  activity?: string;
+  ownerActive: boolean;
+  columns: number;
+};
 
 function getTaskIcon(status: Task['status']): {
-  icon: string
-  color: keyof Theme | undefined
+  icon: string;
+  color: keyof Theme | undefined;
 } {
   switch (status) {
     case 'completed':
-      return { icon: figures.tick, color: 'success' }
+      return { icon: figures.tick, color: 'success' };
     case 'in_progress':
-      return { icon: figures.squareSmallFilled, color: 'claude' }
+      return { icon: figures.squareSmallFilled, color: 'claude' };
     case 'pending':
-      return { icon: figures.squareSmall, color: undefined }
+      return { icon: figures.squareSmall, color: undefined };
   }
 }
 
-function TaskItem({
-  task,
-  ownerColor,
-  openBlockers,
-  activity,
-  ownerActive,
-  columns,
-}: TaskItemProps): React.ReactNode {
-  const isCompleted = task.status === 'completed'
-  const isInProgress = task.status === 'in_progress'
-  const isBlocked = openBlockers.length > 0
+function TaskItem({ task, ownerColor, openBlockers, activity, ownerActive, columns }: TaskItemProps): React.ReactNode {
+  const isCompleted = task.status === 'completed';
+  const isInProgress = task.status === 'in_progress';
+  const isBlocked = openBlockers.length > 0;
 
-  const { icon, color } = getTaskIcon(task.status)
+  const { icon, color } = getTaskIcon(task.status);
 
-  const showActivity = isInProgress && !isBlocked && activity
+  const showActivity = isInProgress && !isBlocked && activity;
 
   // Responsive layout: hide owner on narrow screens (<60 cols)
   // Truncate subject based on available space
-  const showOwner = columns >= 60 && task.owner && ownerActive
-  const ownerWidth = showOwner ? stringWidth(` (@${task.owner})`) : 0
+  const showOwner = columns >= 60 && task.owner && ownerActive;
+  const ownerWidth = showOwner ? stringWidth(` (@${task.owner})`) : 0;
   // Account for: icon(2) + indentation(~8 when nested under spinner) + owner + safety
   // Use columns - 15 as a conservative estimate for nested layouts
-  const maxSubjectWidth = Math.max(15, columns - 15 - ownerWidth)
-  const displaySubject = truncateToWidth(task.subject, maxSubjectWidth)
+  const maxSubjectWidth = Math.max(15, columns - 15 - ownerWidth);
+  const displaySubject = truncateToWidth(task.subject, maxSubjectWidth);
 
   // Truncate activity for narrow screens
-  const maxActivityWidth = Math.max(15, columns - 15)
-  const displayActivity = activity
-    ? truncateToWidth(activity, maxActivityWidth)
-    : undefined
+  const maxActivityWidth = Math.max(15, columns - 15);
+  const displayActivity = activity ? truncateToWidth(activity, maxActivityWidth) : undefined;
 
   return (
     <Box flexDirection="column">
       <Box>
         <Text color={color}>{icon} </Text>
-        <Text
-          bold={isInProgress}
-          strikethrough={isCompleted}
-          dimColor={isCompleted || isBlocked}
-        >
+        <Text bold={isInProgress} strikethrough={isCompleted} dimColor={isCompleted || isBlocked}>
           {displaySubject}
         </Text>
         {showOwner && (
           <Text dimColor>
             {' ('}
-            {ownerColor ? (
-              <ThemedText color={ownerColor}>@{task.owner}</ThemedText>
-            ) : (
-              `@${task.owner}`
-            )}
+            {ownerColor ? <ThemedText color={ownerColor}>@{task.owner}</ThemedText> : `@${task.owner}`}
             {')'}
           </Text>
         )}
@@ -356,5 +321,5 @@ function TaskItem({
         </Box>
       )}
     </Box>
-  )
+  );
 }
diff --git a/src/components/TeammateViewHeader.tsx b/src/components/TeammateViewHeader.tsx
index 1613e7aca..5c92d0ba6 100644
--- a/src/components/TeammateViewHeader.tsx
+++ b/src/components/TeammateViewHeader.tsx
@@ -1,23 +1,23 @@
-import * as React from 'react'
-import { Box, Text, KeyboardShortcutHint } from '@anthropic/ink'
-import { toInkColor } from '../utils/ink.js'
-import { useAppState } from '../state/AppState.js'
-import { getViewedTeammateTask } from '../state/selectors.js'
+import * as React from 'react';
+import { Box, Text, KeyboardShortcutHint } from '@anthropic/ink';
+import { toInkColor } from '../utils/ink.js';
+import { useAppState } from '../state/AppState.js';
+import { getViewedTeammateTask } from '../state/selectors.js';
 
-import { OffscreenFreeze } from './OffscreenFreeze.js'
+import { OffscreenFreeze } from './OffscreenFreeze.js';
 
 /**
  * Header shown when viewing a teammate's transcript.
  * Displays teammate name (colored), task description, and exit hint.
  */
 export function TeammateViewHeader(): React.ReactNode {
-  const viewedTeammate = useAppState(s => getViewedTeammateTask(s))
+  const viewedTeammate = useAppState(s => getViewedTeammateTask(s));
 
   if (!viewedTeammate) {
-    return null
+    return null;
   }
 
-  const nameColor = toInkColor(viewedTeammate.identity.color)
+  const nameColor = toInkColor(viewedTeammate.identity.color);
 
   return (
     <OffscreenFreeze>
@@ -35,5 +35,5 @@ export function TeammateViewHeader(): React.ReactNode {
         <Text dimColor>{viewedTeammate.prompt}</Text>
       </Box>
     </OffscreenFreeze>
-  )
+  );
 }
diff --git a/src/components/TeleportError.tsx b/src/components/TeleportError.tsx
index 260f488d3..507512150 100644
--- a/src/components/TeleportError.tsx
+++ b/src/components/TeleportError.tsx
@@ -1,125 +1,106 @@
-import React, { useCallback, useEffect, useState } from 'react'
-import {
-  checkIsGitClean,
-  checkNeedsClaudeAiLogin,
-} from 'src/utils/background/remote/preconditions.js'
-import { gracefulShutdownSync } from 'src/utils/gracefulShutdown.js'
-import { Box, Text } from '@anthropic/ink'
-import { ConsoleOAuthFlow } from './ConsoleOAuthFlow.js'
-import { Select } from './CustomSelect/index.js'
-import { Dialog } from '@anthropic/ink'
-import { TeleportStash } from './TeleportStash.js'
+import React, { useCallback, useEffect, useState } from 'react';
+import { checkIsGitClean, checkNeedsClaudeAiLogin } from 'src/utils/background/remote/preconditions.js';
+import { gracefulShutdownSync } from 'src/utils/gracefulShutdown.js';
+import { Box, Text } from '@anthropic/ink';
+import { ConsoleOAuthFlow } from './ConsoleOAuthFlow.js';
+import { Select } from './CustomSelect/index.js';
+import { Dialog } from '@anthropic/ink';
+import { TeleportStash } from './TeleportStash.js';
 
-export type TeleportLocalErrorType = 'needsLogin' | 'needsGitStash'
+export type TeleportLocalErrorType = 'needsLogin' | 'needsGitStash';
 
 type TeleportErrorProps = {
-  onComplete: () => void
-  errorsToIgnore?: ReadonlySet<TeleportLocalErrorType>
-}
+  onComplete: () => void;
+  errorsToIgnore?: ReadonlySet<TeleportLocalErrorType>;
+};
 
 // Module-level sentinel so the default parameter has stable identity.
 // Previously `= new Set()` created a fresh Set every render, which put
 // a new object in checkErrors' deps and caused the mount effect to
 // re-fire on every render.
-const EMPTY_ERRORS_TO_IGNORE: ReadonlySet<TeleportLocalErrorType> = new Set()
+const EMPTY_ERRORS_TO_IGNORE: ReadonlySet<TeleportLocalErrorType> = new Set();
 
 export function TeleportError({
   onComplete,
   errorsToIgnore = EMPTY_ERRORS_TO_IGNORE,
 }: TeleportErrorProps): React.ReactNode {
-  const [currentError, setCurrentError] =
-    useState<TeleportLocalErrorType | null>(null)
-  const [isLoggingIn, setIsLoggingIn] = useState<boolean>(false)
+  const [currentError, setCurrentError] = useState<TeleportLocalErrorType | null>(null);
+  const [isLoggingIn, setIsLoggingIn] = useState<boolean>(false);
 
   // Check for errors on mount and when error resolution occurs
   const checkErrors = useCallback(async () => {
-    const currentErrors = await getTeleportErrors()
+    const currentErrors = await getTeleportErrors();
     const filteredErrors = new Set(
-      Array.from(currentErrors).filter(
-        (error: TeleportLocalErrorType) => !errorsToIgnore.has(error),
-      ),
-    )
+      Array.from(currentErrors).filter((error: TeleportLocalErrorType) => !errorsToIgnore.has(error)),
+    );
 
     // If no errors remain, call onComplete
     if (filteredErrors.size === 0) {
-      onComplete()
-      return
+      onComplete();
+      return;
     }
 
     // Set current error to handle (prioritize login over git)
     if (filteredErrors.has('needsLogin')) {
-      setCurrentError('needsLogin')
+      setCurrentError('needsLogin');
     } else if (filteredErrors.has('needsGitStash')) {
-      setCurrentError('needsGitStash')
+      setCurrentError('needsGitStash');
     }
-  }, [onComplete, errorsToIgnore])
+  }, [onComplete, errorsToIgnore]);
 
   // Check errors on mount
   useEffect(() => {
-    void checkErrors()
-  }, [checkErrors])
+    void checkErrors();
+  }, [checkErrors]);
 
   const onCancel = useCallback(() => {
-    gracefulShutdownSync(0)
-  }, [])
+    gracefulShutdownSync(0);
+  }, []);
 
   const handleLoginComplete = useCallback(() => {
-    setIsLoggingIn(false)
-    void checkErrors()
-  }, [checkErrors])
+    setIsLoggingIn(false);
+    void checkErrors();
+  }, [checkErrors]);
 
   const handleLoginWithClaudeAI = useCallback(() => {
-    setIsLoggingIn(true)
-  }, [setIsLoggingIn])
+    setIsLoggingIn(true);
+  }, [setIsLoggingIn]);
 
   const handleLoginDialogSelect = useCallback(
     (value: string) => {
       if (value === 'login') {
-        handleLoginWithClaudeAI()
+        handleLoginWithClaudeAI();
       } else {
         // User selected exit
-        onCancel()
+        onCancel();
       }
     },
     [handleLoginWithClaudeAI, onCancel],
-  )
+  );
 
   const handleStashComplete = useCallback(() => {
-    void checkErrors()
-  }, [checkErrors])
+    void checkErrors();
+  }, [checkErrors]);
 
   // Don't render anything if no current error (onComplete will be called)
   if (!currentError) {
-    return null
+    return null;
   }
 
   switch (currentError) {
     case 'needsGitStash':
-      return (
-        <TeleportStash
-          onStashAndContinue={handleStashComplete}
-          onCancel={onCancel}
-        />
-      )
+      return <TeleportStash onStashAndContinue={handleStashComplete} onCancel={onCancel} />;
 
     case 'needsLogin': {
       if (isLoggingIn) {
-        return (
-          <ConsoleOAuthFlow
-            onDone={handleLoginComplete}
-            mode="login"
-            forceLoginMethod="claudeai"
-          />
-        )
+        return <ConsoleOAuthFlow onDone={handleLoginComplete} mode="login" forceLoginMethod="claudeai" />;
       }
 
       return (
         <Dialog title="Log in to Claude" onCancel={onCancel}>
           <Box flexDirection="column">
             <Text dimColor>Teleport requires a Claude.ai account.</Text>
-            <Text dimColor>
-              Your Claude Pro/Max subscription will be used by Claude Code.
-            </Text>
+            <Text dimColor>Your Claude Pro/Max subscription will be used by Claude Code.</Text>
           </Box>
           <Select
             options={[
@@ -129,7 +110,7 @@ export function TeleportError({
             onChange={handleLoginDialogSelect}
           />
         </Dialog>
-      )
+      );
     }
   }
 }
@@ -138,22 +119,17 @@ export function TeleportError({
  * Gets current teleport errors that need to be resolved
  * @returns Set of teleport error types that need to be handled
  */
-export async function getTeleportErrors(): Promise<
-  Set<TeleportLocalErrorType>
-> {
-  const errors = new Set<TeleportLocalErrorType>()
+export async function getTeleportErrors(): Promise<Set<TeleportLocalErrorType>> {
+  const errors = new Set<TeleportLocalErrorType>();
 
-  const [needsLogin, isGitClean] = await Promise.all([
-    checkNeedsClaudeAiLogin(),
-    checkIsGitClean(),
-  ])
+  const [needsLogin, isGitClean] = await Promise.all([checkNeedsClaudeAiLogin(), checkIsGitClean()]);
 
   if (needsLogin) {
-    errors.add('needsLogin')
+    errors.add('needsLogin');
   }
   if (!isGitClean) {
-    errors.add('needsGitStash')
+    errors.add('needsGitStash');
   }
 
-  return errors
+  return errors;
 }
diff --git a/src/components/TeleportProgress.tsx b/src/components/TeleportProgress.tsx
index 6ecb4c7cf..42fc9bfec 100644
--- a/src/components/TeleportProgress.tsx
+++ b/src/components/TeleportProgress.tsx
@@ -1,39 +1,36 @@
-import figures from 'figures'
-import * as React from 'react'
-import { useState } from 'react'
-import type { Root } from '@anthropic/ink'
-import { Box, Text, useAnimationFrame } from '@anthropic/ink'
-import { AppStateProvider } from '../state/AppState.js'
+import figures from 'figures';
+import * as React from 'react';
+import { useState } from 'react';
+import type { Root } from '@anthropic/ink';
+import { Box, Text, useAnimationFrame } from '@anthropic/ink';
+import { AppStateProvider } from '../state/AppState.js';
 import {
   checkOutTeleportedSessionBranch,
   processMessagesForTeleportResume,
   type TeleportProgressStep,
   type TeleportResult,
   teleportResumeCodeSession,
-} from '../utils/teleport.js'
+} from '../utils/teleport.js';
 
 type Props = {
-  currentStep: TeleportProgressStep
-  sessionId?: string
-}
+  currentStep: TeleportProgressStep;
+  sessionId?: string;
+};
 
-const SPINNER_FRAMES = ['◐', '◓', '◑', '◒']
+const SPINNER_FRAMES = ['◐', '◓', '◑', '◒'];
 
 const STEPS: { key: TeleportProgressStep; label: string }[] = [
   { key: 'validating', label: 'Validating session' },
   { key: 'fetching_logs', label: 'Fetching session logs' },
   { key: 'fetching_branch', label: 'Getting branch info' },
   { key: 'checking_out', label: 'Checking out branch' },
-]
+];
 
-export function TeleportProgress({
-  currentStep,
-  sessionId,
-}: Props): React.ReactNode {
-  const [ref, time] = useAnimationFrame(100)
-  const frame = Math.floor(time / 100) % SPINNER_FRAMES.length
+export function TeleportProgress({ currentStep, sessionId }: Props): React.ReactNode {
+  const [ref, time] = useAnimationFrame(100);
+  const frame = Math.floor(time / 100) % SPINNER_FRAMES.length;
 
-  const currentStepIndex = STEPS.findIndex(s => s.key === currentStep)
+  const currentStepIndex = STEPS.findIndex(s => s.key === currentStep);
 
   return (
     <Box ref={ref} flexDirection="column" paddingX={1} paddingY={1}>
@@ -51,22 +48,22 @@ export function TeleportProgress({
 
       <Box flexDirection="column" marginLeft={2}>
         {STEPS.map((step, index) => {
-          const isComplete = index < currentStepIndex
-          const isCurrent = index === currentStepIndex
-          const isPending = index > currentStepIndex
+          const isComplete = index < currentStepIndex;
+          const isCurrent = index === currentStepIndex;
+          const isPending = index > currentStepIndex;
 
-          let icon: string
-          let color: string | undefined
+          let icon: string;
+          let color: string | undefined;
 
           if (isComplete) {
-            icon = figures.tick
-            color = 'green'
+            icon = figures.tick;
+            color = 'green';
           } else if (isCurrent) {
-            icon = SPINNER_FRAMES[frame]!
-            color = 'claude'
+            icon = SPINNER_FRAMES[frame]!;
+            color = 'claude';
           } else {
-            icon = figures.circle
-            color = undefined
+            icon = figures.circle;
+            color = undefined;
           }
 
           return (
@@ -80,43 +77,38 @@ export function TeleportProgress({
                 {step.label}
               </Text>
             </Box>
-          )
+          );
         })}
       </Box>
     </Box>
-  )
+  );
 }
 
 /**
  * Teleports to a remote session with progress UI rendered into the existing root.
  * Fetches the session, checks out the branch, and returns the result.
  */
-export async function teleportWithProgress(
-  root: Root,
-  sessionId: string,
-): Promise<TeleportResult> {
+export async function teleportWithProgress(root: Root, sessionId: string): Promise<TeleportResult> {
   // Capture the setState function from the rendered component
-  let setStep: (step: TeleportProgressStep) => void = () => {}
+  let setStep: (step: TeleportProgressStep) => void = () => {};
 
   function TeleportProgressWrapper(): React.ReactNode {
-    const [step, _setStep] = useState<TeleportProgressStep>('validating')
-    setStep = _setStep
-    return <TeleportProgress currentStep={step} sessionId={sessionId} />
+    const [step, _setStep] = useState<TeleportProgressStep>('validating');
+    setStep = _setStep;
+    return <TeleportProgress currentStep={step} sessionId={sessionId} />;
   }
 
   root.render(
     <AppStateProvider>
       <TeleportProgressWrapper />
     </AppStateProvider>,
-  )
+  );
 
-  const result = await teleportResumeCodeSession(sessionId, setStep)
-  setStep('checking_out')
-  const { branchName, branchError } = await checkOutTeleportedSessionBranch(
-    result.branch,
-  )
+  const result = await teleportResumeCodeSession(sessionId, setStep);
+  setStep('checking_out');
+  const { branchName, branchError } = await checkOutTeleportedSessionBranch(result.branch);
   return {
     messages: processMessagesForTeleportResume(result.log, branchError),
     branchName,
-  }
+  };
 }
diff --git a/src/components/TeleportRepoMismatchDialog.tsx b/src/components/TeleportRepoMismatchDialog.tsx
index 83e55bd90..eea01590b 100644
--- a/src/components/TeleportRepoMismatchDialog.tsx
+++ b/src/components/TeleportRepoMismatchDialog.tsx
@@ -1,20 +1,17 @@
-import React, { useCallback, useState } from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { getDisplayPath } from '../utils/file.js'
-import {
-  removePathFromRepo,
-  validateRepoAtPath,
-} from '../utils/githubRepoPathMapping.js'
-import { Select } from './CustomSelect/index.js'
-import { Dialog } from '@anthropic/ink'
-import { Spinner } from './Spinner.js'
+import React, { useCallback, useState } from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { getDisplayPath } from '../utils/file.js';
+import { removePathFromRepo, validateRepoAtPath } from '../utils/githubRepoPathMapping.js';
+import { Select } from './CustomSelect/index.js';
+import { Dialog } from '@anthropic/ink';
+import { Spinner } from './Spinner.js';
 
 type Props = {
-  targetRepo: string
-  initialPaths: string[]
-  onSelectPath: (path: string) => void
-  onCancel: () => void
-}
+  targetRepo: string;
+  initialPaths: string[];
+  onSelectPath: (path: string) => void;
+  onCancel: () => void;
+};
 
 export function TeleportRepoMismatchDialog({
   targetRepo,
@@ -22,39 +19,37 @@ export function TeleportRepoMismatchDialog({
   onSelectPath,
   onCancel,
 }: Props): React.ReactNode {
-  const [availablePaths, setAvailablePaths] = useState<string[]>(initialPaths)
-  const [errorMessage, setErrorMessage] = useState<string | null>(null)
-  const [validating, setValidating] = useState(false)
+  const [availablePaths, setAvailablePaths] = useState<string[]>(initialPaths);
+  const [errorMessage, setErrorMessage] = useState<string | null>(null);
+  const [validating, setValidating] = useState(false);
 
   const handleChange = useCallback(
     async (value: string): Promise<void> => {
       if (value === 'cancel') {
-        onCancel()
-        return
+        onCancel();
+        return;
       }
 
-      setValidating(true)
-      setErrorMessage(null)
+      setValidating(true);
+      setErrorMessage(null);
 
-      const isValid = await validateRepoAtPath(value, targetRepo)
+      const isValid = await validateRepoAtPath(value, targetRepo);
 
       if (isValid) {
-        onSelectPath(value)
-        return
+        onSelectPath(value);
+        return;
       }
 
       // Path is invalid - remove it from config and update state
-      removePathFromRepo(targetRepo, value)
-      const updatedPaths = availablePaths.filter(p => p !== value)
-      setAvailablePaths(updatedPaths)
-      setValidating(false)
+      removePathFromRepo(targetRepo, value);
+      const updatedPaths = availablePaths.filter(p => p !== value);
+      setAvailablePaths(updatedPaths);
+      setValidating(false);
 
-      setErrorMessage(
-        `${getDisplayPath(value)} no longer contains the correct repository. Select another path.`,
-      )
+      setErrorMessage(`${getDisplayPath(value)} no longer contains the correct repository. Select another path.`);
     },
     [targetRepo, availablePaths, onSelectPath, onCancel],
-  )
+  );
 
   const options = [
     ...availablePaths.map(path => ({
@@ -66,7 +61,7 @@ export function TeleportRepoMismatchDialog({
       value: path,
     })),
     { label: 'Cancel', value: 'cancel' },
-  ]
+  ];
 
   return (
     <Dialog title="Teleport to Repo" onCancel={onCancel} color="background">
@@ -85,20 +80,15 @@ export function TeleportRepoMismatchDialog({
               <Text> Validating repository…</Text>
             </Box>
           ) : (
-            <Select
-              options={options}
-              onChange={value => void handleChange(value)}
-            />
+            <Select options={options} onChange={value => void handleChange(value)} />
           )}
         </>
       ) : (
         <Box flexDirection="column" gap={1}>
           {errorMessage && <Text color="error">{errorMessage}</Text>}
-          <Text dimColor>
-            Run claude --teleport from a checkout of {targetRepo}
-          </Text>
+          <Text dimColor>Run claude --teleport from a checkout of {targetRepo}</Text>
         </Box>
       )}
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/TeleportResumeWrapper.tsx b/src/components/TeleportResumeWrapper.tsx
index 9a2a6261e..45a858f1e 100644
--- a/src/components/TeleportResumeWrapper.tsx
+++ b/src/components/TeleportResumeWrapper.tsx
@@ -1,25 +1,22 @@
-import React, { useEffect } from 'react'
+import React, { useEffect } from 'react';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from 'src/services/analytics/index.js'
-import type { TeleportRemoteResponse } from 'src/utils/conversationRecovery.js'
-import type { CodeSession } from 'src/utils/teleport/api.js'
-import {
-  type TeleportSource,
-  useTeleportResume,
-} from '../hooks/useTeleportResume.js'
-import { Box, Text } from '@anthropic/ink'
-import { useKeybinding } from '../keybindings/useKeybinding.js'
-import { ResumeTask } from './ResumeTask.js'
-import { Spinner } from './Spinner.js'
+} from 'src/services/analytics/index.js';
+import type { TeleportRemoteResponse } from 'src/utils/conversationRecovery.js';
+import type { CodeSession } from 'src/utils/teleport/api.js';
+import { type TeleportSource, useTeleportResume } from '../hooks/useTeleportResume.js';
+import { Box, Text } from '@anthropic/ink';
+import { useKeybinding } from '../keybindings/useKeybinding.js';
+import { ResumeTask } from './ResumeTask.js';
+import { Spinner } from './Spinner.js';
 
 interface TeleportResumeWrapperProps {
-  onComplete: (result: TeleportRemoteResponse) => void
-  onCancel: () => void
-  onError?: (error: string, formattedMessage?: string) => void
-  isEmbedded?: boolean
-  source: TeleportSource
+  onComplete: (result: TeleportRemoteResponse) => void;
+  onCancel: () => void;
+  onError?: (error: string, formattedMessage?: string) => void;
+  isEmbedded?: boolean;
+  source: TeleportSource;
 }
 
 /**
@@ -33,40 +30,38 @@ export function TeleportResumeWrapper({
   isEmbedded = false,
   source,
 }: TeleportResumeWrapperProps): React.ReactNode {
-  const { resumeSession, isResuming, error, selectedSession } =
-    useTeleportResume(source)
+  const { resumeSession, isResuming, error, selectedSession } = useTeleportResume(source);
 
   // Log when teleport flow starts (for funnel tracking)
   useEffect(() => {
     logEvent('tengu_teleport_started', {
-      source:
-        source as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-    })
-  }, [source])
+      source: source as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+    });
+  }, [source]);
 
   const handleSelect = async (session: CodeSession) => {
-    const result = await resumeSession(session)
+    const result = await resumeSession(session);
     if (result) {
-      onComplete(result)
+      onComplete(result);
     } else if (error) {
       // If there's an error handler provided, use it
       if (onError) {
-        onError(error.message, error.formattedMessage)
+        onError(error.message, error.formattedMessage);
       }
       // Otherwise the error will be displayed in the UI
     }
-  }
+  };
 
   const handleCancel = () => {
-    logEvent('tengu_teleport_cancelled', {})
-    onCancel()
-  }
+    logEvent('tengu_teleport_cancelled', {});
+    onCancel();
+  };
 
   // Allow Esc to dismiss the error state
   useKeybinding('app:interrupt', handleCancel, {
     context: 'Global',
     isActive: !!error && !onError,
-  })
+  });
 
   // Show loading spinner when resuming
   if (isResuming && selectedSession) {
@@ -78,7 +73,7 @@ export function TeleportResumeWrapper({
         </Box>
         <Text dimColor>Loading &quot;{selectedSession.title}&quot;…</Text>
       </Box>
-    )
+    );
   }
 
   // Show error if there was a problem resuming
@@ -95,14 +90,8 @@ export function TeleportResumeWrapper({
           </Text>
         </Box>
       </Box>
-    )
+    );
   }
 
-  return (
-    <ResumeTask
-      onSelect={handleSelect}
-      onCancel={handleCancel}
-      isEmbedded={isEmbedded}
-    />
-  )
+  return <ResumeTask onSelect={handleSelect} onCancel={handleCancel} isEmbedded={isEmbedded} />;
 }
diff --git a/src/components/TeleportStash.tsx b/src/components/TeleportStash.tsx
index bb60e45a4..f5b7b0bba 100644
--- a/src/components/TeleportStash.tsx
+++ b/src/components/TeleportStash.tsx
@@ -1,80 +1,74 @@
-import figures from 'figures'
-import React, { useEffect, useState } from 'react'
-import { Box, Text, Dialog } from '@anthropic/ink'
-import { logForDebugging } from '../utils/debug.js'
-import type { GitFileStatus } from '../utils/git.js'
-import { getFileStatus, stashToCleanState } from '../utils/git.js'
-import { Select } from './CustomSelect/index.js'
-import { Spinner } from './Spinner.js'
+import figures from 'figures';
+import React, { useEffect, useState } from 'react';
+import { Box, Text, Dialog } from '@anthropic/ink';
+import { logForDebugging } from '../utils/debug.js';
+import type { GitFileStatus } from '../utils/git.js';
+import { getFileStatus, stashToCleanState } from '../utils/git.js';
+import { Select } from './CustomSelect/index.js';
+import { Spinner } from './Spinner.js';
 
 type TeleportStashProps = {
-  onStashAndContinue: () => void
-  onCancel: () => void
-}
+  onStashAndContinue: () => void;
+  onCancel: () => void;
+};
 
-export function TeleportStash({
-  onStashAndContinue,
-  onCancel,
-}: TeleportStashProps): React.ReactNode {
-  const [gitFileStatus, setGitFileStatus] = useState<GitFileStatus | null>(null)
-  const changedFiles =
-    gitFileStatus !== null
-      ? [...gitFileStatus.tracked, ...gitFileStatus.untracked]
-      : []
-  const [loading, setLoading] = useState(true)
-  const [stashing, setStashing] = useState(false)
-  const [error, setError] = useState<string | null>(null)
+export function TeleportStash({ onStashAndContinue, onCancel }: TeleportStashProps): React.ReactNode {
+  const [gitFileStatus, setGitFileStatus] = useState<GitFileStatus | null>(null);
+  const changedFiles = gitFileStatus !== null ? [...gitFileStatus.tracked, ...gitFileStatus.untracked] : [];
+  const [loading, setLoading] = useState(true);
+  const [stashing, setStashing] = useState(false);
+  const [error, setError] = useState<string | null>(null);
 
   // Load changed files on mount
   useEffect(() => {
     const loadChangedFiles = async () => {
       try {
-        const fileStatus = await getFileStatus()
-        setGitFileStatus(fileStatus)
+        const fileStatus = await getFileStatus();
+        setGitFileStatus(fileStatus);
       } catch (err) {
-        const errorMessage = err instanceof Error ? err.message : String(err)
+        const errorMessage = err instanceof Error ? err.message : String(err);
         logForDebugging(`Error getting changed files: ${errorMessage}`, {
           level: 'error',
-        })
-        setError('Failed to get changed files')
+        });
+        setError('Failed to get changed files');
       } finally {
-        setLoading(false)
+        setLoading(false);
       }
-    }
+    };
 
-    void loadChangedFiles()
-  }, [])
+    void loadChangedFiles();
+  }, []);
 
   const handleStash = async () => {
-    setStashing(true)
+    setStashing(true);
     try {
-      logForDebugging('Stashing changes before teleport...')
-      const success = await stashToCleanState('Teleport auto-stash')
+      logForDebugging('Stashing changes before teleport...');
+      const success = await stashToCleanState('Teleport auto-stash');
 
       if (success) {
-        logForDebugging('Successfully stashed changes')
-        onStashAndContinue()
+        logForDebugging('Successfully stashed changes');
+        onStashAndContinue();
       } else {
-        setError('Failed to stash changes')
+        setError('Failed to stash changes');
       }
     } catch (err) {
-      const errorMessage = err instanceof Error ? err.message : String(err)
+      const errorMessage = err instanceof Error ? err.message : String(err);
       logForDebugging(`Error stashing changes: ${errorMessage}`, {
         level: 'error',
-      })
-      setError('Failed to stash changes')
+      });
+      setError('Failed to stash changes');
     } finally {
-      setStashing(false)
+      setStashing(false);
     }
-  }
+  };
 
   const handleSelectChange = (value: string) => {
     if (value === 'stash') {
-      void handleStash()
+      void handleStash();
     } else {
-      onCancel()
+      onCancel();
     }
-  }
+  };
 
   if (loading) {
     return (
@@ -84,7 +78,7 @@ export function TeleportStash({
           <Text> Checking git status{figures.ellipsis}</Text>
         </Box>
       </Box>
-    )
+    );
   }
 
   if (error) {
@@ -99,34 +93,28 @@ export function TeleportStash({
           <Text dimColor> to cancel</Text>
         </Box>
       </Box>
-    )
+    );
   }
 
-  const showFileCount = changedFiles.length > 8
+  const showFileCount = changedFiles.length > 8;
 
   return (
     <Dialog title="Working Directory Has Changes" onCancel={onCancel}>
-      <Text>
-        Teleport will switch git branches. The following changes were found:
-      </Text>
+      <Text>Teleport will switch git branches. The following changes were found:</Text>
 
       <Box flexDirection="column" paddingLeft={2}>
         {changedFiles.length > 0 ? (
           showFileCount ? (
             <Text>{changedFiles.length} files changed</Text>
           ) : (
-            changedFiles.map((file: string, index: number) => (
-              <Text key={index}>{file}</Text>
-            ))
+            changedFiles.map((file: string, index: number) => <Text key={index}>{file}</Text>)
           )
         ) : (
           <Text dimColor>No changes detected</Text>
         )}
       </Box>
 
-      <Text>
-        Would you like to stash these changes and continue with teleport?
-      </Text>
+      <Text>Would you like to stash these changes and continue with teleport?</Text>
 
       {stashing ? (
         <Box>
@@ -143,5 +131,5 @@ export function TeleportStash({
         />
       )}
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/TextInput.tsx b/src/components/TextInput.tsx
index 0e1308336..279edb0f6 100644
--- a/src/components/TextInput.tsx
+++ b/src/components/TextInput.tsx
@@ -1,100 +1,90 @@
-import { feature } from 'bun:bundle'
-import chalk from 'chalk'
-import React, { useMemo, useRef } from 'react'
-import { useVoiceState } from '../context/voice.js'
-import { useClipboardImageHint } from '../hooks/useClipboardImageHint.js'
-import { useSettings } from '../hooks/useSettings.js'
-import { useTextInput } from '../hooks/useTextInput.js'
-import { Box, color, useAnimationFrame, useTerminalFocus, useTheme } from '@anthropic/ink'
-import type { BaseTextInputProps } from '../types/textInputTypes.js'
-import { isEnvTruthy } from '../utils/envUtils.js'
-import type { TextHighlight } from '../utils/textHighlighting.js'
-import { BaseTextInput } from './BaseTextInput.js'
-import { hueToRgb } from './Spinner/utils.js'
+import { feature } from 'bun:bundle';
+import chalk from 'chalk';
+import React, { useMemo, useRef } from 'react';
+import { useVoiceState } from '../context/voice.js';
+import { useClipboardImageHint } from '../hooks/useClipboardImageHint.js';
+import { useSettings } from '../hooks/useSettings.js';
+import { useTextInput } from '../hooks/useTextInput.js';
+import { Box, color, useAnimationFrame, useTerminalFocus, useTheme } from '@anthropic/ink';
+import type { BaseTextInputProps } from '../types/textInputTypes.js';
+import { isEnvTruthy } from '../utils/envUtils.js';
+import type { TextHighlight } from '../utils/textHighlighting.js';
+import { BaseTextInput } from './BaseTextInput.js';
+import { hueToRgb } from './Spinner/utils.js';
 
 // Block characters for waveform bars: space (silent) + 8 rising block elements.
-const BARS = ' \u2581\u2582\u2583\u2584\u2585\u2586\u2587\u2588'
+const BARS = ' \u2581\u2582\u2583\u2584\u2585\u2586\u2587\u2588';
 
 // Mini waveform cursor width
-const CURSOR_WAVEFORM_WIDTH = 1
+const CURSOR_WAVEFORM_WIDTH = 1;
 
 // Smoothing factor (0 = instant, 1 = frozen). Applied as EMA to
 // smooth both rises and falls for a steady, non-jittery bar.
-const SMOOTH = 0.7
+const SMOOTH = 0.7;
 
 // Boost factor for audio levels — computeLevel normalizes with a
 // conservative divisor (rms/2000), so normal speech sits around
 // 0.3-0.5. This multiplier lets the bar use the full range.
-const LEVEL_BOOST = 1.8
+const LEVEL_BOOST = 1.8;
 
 // Raw audio level threshold (pre-boost) below which the cursor is
 // grey. computeLevel returns sqrt(rms/2000), so ambient mic noise
 // typically sits at 0.05-0.15. Speech starts around 0.2+.
-const SILENCE_THRESHOLD = 0.15
+const SILENCE_THRESHOLD = 0.15;
 
 export type Props = BaseTextInputProps & {
-  highlights?: TextHighlight[]
-}
+  highlights?: TextHighlight[];
+};
 
 export default function TextInput(props: Props): React.ReactNode {
-  const [theme] = useTheme()
-  const isTerminalFocused = useTerminalFocus()
+  const [theme] = useTheme();
+  const isTerminalFocused = useTerminalFocus();
   // Hoisted to mount-time — this component re-renders on every keystroke.
-  const accessibilityEnabled = useMemo(
-    () => isEnvTruthy(process.env.CLAUDE_CODE_ACCESSIBILITY),
-    [],
-  )
-  const settings = useSettings()
-  const reducedMotion = settings.prefersReducedMotion ?? false
+  const accessibilityEnabled = useMemo(() => isEnvTruthy(process.env.CLAUDE_CODE_ACCESSIBILITY), []);
+  const settings = useSettings();
+  const reducedMotion = settings.prefersReducedMotion ?? false;
 
   const voiceState = feature('VOICE_MODE')
-    ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-      useVoiceState(s => s.voiceState)
-    : ('idle' as const)
-  const isVoiceRecording = voiceState === 'recording'
+    ? useVoiceState(s => s.voiceState)
+    : ('idle' as const);
+  const isVoiceRecording = voiceState === 'recording';
 
   const audioLevels = feature('VOICE_MODE')
-    ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-      useVoiceState(s => s.voiceAudioLevels)
-    : []
-  const smoothedRef = useRef<number[]>(new Array(CURSOR_WAVEFORM_WIDTH).fill(0))
+    ? useVoiceState(s => s.voiceAudioLevels)
+    : [];
+  const smoothedRef = useRef<number[]>(new Array(CURSOR_WAVEFORM_WIDTH).fill(0));
 
-  const needsAnimation = isVoiceRecording && !reducedMotion
+  const needsAnimation = isVoiceRecording && !reducedMotion;
   const [animRef, animTime] = feature('VOICE_MODE')
-    ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-      useAnimationFrame(needsAnimation ? 50 : null)
-    : [() => {}, 0]
+    ? useAnimationFrame(needsAnimation ? 50 : null)
+    : [() => {}, 0];
 
   // Show hint when terminal regains focus and clipboard has an image
-  useClipboardImageHint(isTerminalFocused, !!props.onImagePaste)
+  useClipboardImageHint(isTerminalFocused, !!props.onImagePaste);
 
   // Cursor invert function: mini waveform during voice recording,
   // standard chalk.inverse otherwise. No warmup pulse — the ~120ms
   // warmup window is too short for a 1s-period pulse to register, and
   // driving TextInput re-renders at 50ms during warmup (while spaces
   // are simultaneously arriving every 30-80ms) causes visible stutter.
-  const canShowCursor = isTerminalFocused && !accessibilityEnabled
-  let invert: (text: string) => string
+  const canShowCursor = isTerminalFocused && !accessibilityEnabled;
+  let invert: (text: string) => string;
   if (!canShowCursor) {
-    invert = (text: string) => text
+    invert = (text: string) => text;
   } else if (isVoiceRecording && !reducedMotion) {
     // Single-bar waveform from the latest audio level
-    const smoothed = smoothedRef.current
-    const raw =
-      audioLevels.length > 0 ? (audioLevels[audioLevels.length - 1] ?? 0) : 0
-    const target = Math.min(raw * LEVEL_BOOST, 1)
-    smoothed[0] = (smoothed[0] ?? 0) * SMOOTH + target * (1 - SMOOTH)
-    const displayLevel = smoothed[0] ?? 0
-    const barIndex = Math.max(
-      1,
-      Math.min(Math.round(displayLevel * (BARS.length - 1)), BARS.length - 1),
-    )
-    const isSilent = raw < SILENCE_THRESHOLD
-    const hue = ((animTime / 1000) * 90) % 360
-    const { r, g, b } = isSilent ? { r: 128, g: 128, b: 128 } : hueToRgb(hue)
-    invert = () => chalk.rgb(r, g, b)(BARS[barIndex]!)
+    const smoothed = smoothedRef.current;
+    const raw = audioLevels.length > 0 ? (audioLevels[audioLevels.length - 1] ?? 0) : 0;
+    const target = Math.min(raw * LEVEL_BOOST, 1);
+    smoothed[0] = (smoothed[0] ?? 0) * SMOOTH + target * (1 - SMOOTH);
+    const displayLevel = smoothed[0] ?? 0;
+    const barIndex = Math.max(1, Math.min(Math.round(displayLevel * (BARS.length - 1)), BARS.length - 1));
+    const isSilent = raw < SILENCE_THRESHOLD;
+    const hue = ((animTime / 1000) * 90) % 360;
+    const { r, g, b } = isSilent ? { r: 128, g: 128, b: 128 } : hueToRgb(hue);
+    invert = () => chalk.rgb(r, g, b)(BARS[barIndex]!);
   } else {
-    invert = chalk.inverse
+    invert = chalk.inverse;
   }
 
   const textInputState = useTextInput({
@@ -117,15 +107,14 @@ export default function TextInput(props: Props): React.ReactNode {
     columns: props.columns,
     maxVisibleLines: props.maxVisibleLines,
     onImagePaste: props.onImagePaste,
-    disableCursorMovementForUpDownKeys:
-      props.disableCursorMovementForUpDownKeys,
+    disableCursorMovementForUpDownKeys: props.disableCursorMovementForUpDownKeys,
     disableEscapeDoublePress: props.disableEscapeDoublePress,
     externalOffset: props.cursorOffset,
     onOffsetChange: props.onChangeCursorOffset,
     inputFilter: props.inputFilter,
     inlineGhostText: props.inlineGhostText,
     dim: chalk.dim,
-  })
+  });
 
   return (
     <Box ref={animRef}>
@@ -138,5 +127,5 @@ export default function TextInput(props: Props): React.ReactNode {
         {...props}
       />
     </Box>
-  )
+  );
 }
diff --git a/src/components/ThemePicker.tsx b/src/components/ThemePicker.tsx
index 2c99fc455..60a2bde33 100644
--- a/src/components/ThemePicker.tsx
+++ b/src/components/ThemePicker.tsx
@@ -1,34 +1,31 @@
-import { feature } from 'bun:bundle'
-import * as React from 'react'
-import { useExitOnCtrlCDWithKeybindings } from '../hooks/useExitOnCtrlCDWithKeybindings.js'
-import { useTerminalSize } from '../hooks/useTerminalSize.js'
-import { Box, Text, usePreviewTheme, useTheme, useThemeSetting } from '@anthropic/ink'
-import { useRegisterKeybindingContext } from '../keybindings/KeybindingContext.js'
-import { useKeybinding } from '../keybindings/useKeybinding.js'
-import { useShortcutDisplay } from '../keybindings/useShortcutDisplay.js'
-import { useAppState, useSetAppState } from '../state/AppState.js'
-import { gracefulShutdown } from '../utils/gracefulShutdown.js'
-import { updateSettingsForSource } from '../utils/settings/settings.js'
-import type { ThemeSetting } from '../utils/theme.js'
-import { Select } from './CustomSelect/index.js'
-import { Byline, KeyboardShortcutHint } from '@anthropic/ink'
-import {
-  getColorModuleUnavailableReason,
-  getSyntaxTheme,
-} from './StructuredDiff/colorDiff.js'
-import { StructuredDiff } from './StructuredDiff.js'
+import { feature } from 'bun:bundle';
+import * as React from 'react';
+import { useExitOnCtrlCDWithKeybindings } from '../hooks/useExitOnCtrlCDWithKeybindings.js';
+import { useTerminalSize } from '../hooks/useTerminalSize.js';
+import { Box, Text, usePreviewTheme, useTheme, useThemeSetting } from '@anthropic/ink';
+import { useRegisterKeybindingContext } from '../keybindings/KeybindingContext.js';
+import { useKeybinding } from '../keybindings/useKeybinding.js';
+import { useShortcutDisplay } from '../keybindings/useShortcutDisplay.js';
+import { useAppState, useSetAppState } from '../state/AppState.js';
+import { gracefulShutdown } from '../utils/gracefulShutdown.js';
+import { updateSettingsForSource } from '../utils/settings/settings.js';
+import type { ThemeSetting } from '../utils/theme.js';
+import { Select } from './CustomSelect/index.js';
+import { Byline, KeyboardShortcutHint } from '@anthropic/ink';
+import { getColorModuleUnavailableReason, getSyntaxTheme } from './StructuredDiff/colorDiff.js';
+import { StructuredDiff } from './StructuredDiff.js';
 
 export type ThemePickerProps = {
-  onThemeSelect: (setting: ThemeSetting) => void
-  showIntroText?: boolean
-  helpText?: string
-  showHelpTextBelow?: boolean
-  hideEscToCancel?: boolean
+  onThemeSelect: (setting: ThemeSetting) => void;
+  showIntroText?: boolean;
+  helpText?: string;
+  showHelpTextBelow?: boolean;
+  hideEscToCancel?: boolean;
   /** Skip exit handling when running in a context that already has it (e.g., onboarding) */
-  skipExitHandling?: boolean
+  skipExitHandling?: boolean;
   /** Called when the user cancels (presses Escape). If skipExitHandling is true and this is provided, it will be called instead of just saving the preview. */
-  onCancel?: () => void
-}
+  onCancel?: () => void;
+};
 
 export function ThemePicker({
   onThemeSelect,
@@ -39,51 +36,41 @@ export function ThemePicker({
   skipExitHandling = false,
   onCancel: onCancelProp,
 }: ThemePickerProps): React.ReactNode {
-  const [theme] = useTheme()
-  const themeSetting = useThemeSetting()
-  const { columns } = useTerminalSize()
-  const colorModuleUnavailableReason = getColorModuleUnavailableReason()
-  const syntaxTheme =
-    colorModuleUnavailableReason === null ? getSyntaxTheme(theme) : null
-  const { setPreviewTheme, savePreview, cancelPreview } = usePreviewTheme()
-  const syntaxHighlightingDisabled =
-    useAppState(s => s.settings.syntaxHighlightingDisabled) ?? false
-  const setAppState = useSetAppState()
+  const [theme] = useTheme();
+  const themeSetting = useThemeSetting();
+  const { columns } = useTerminalSize();
+  const colorModuleUnavailableReason = getColorModuleUnavailableReason();
+  const syntaxTheme = colorModuleUnavailableReason === null ? getSyntaxTheme(theme) : null;
+  const { setPreviewTheme, savePreview, cancelPreview } = usePreviewTheme();
+  const syntaxHighlightingDisabled = useAppState(s => s.settings.syntaxHighlightingDisabled) ?? false;
+  const setAppState = useSetAppState();
 
   // Register ThemePicker context so its keybindings take precedence over Global
-  useRegisterKeybindingContext('ThemePicker')
+  useRegisterKeybindingContext('ThemePicker');
 
-  const syntaxToggleShortcut = useShortcutDisplay(
-    'theme:toggleSyntaxHighlighting',
-    'ThemePicker',
-    'ctrl+t',
-  )
+  const syntaxToggleShortcut = useShortcutDisplay('theme:toggleSyntaxHighlighting', 'ThemePicker', 'ctrl+t');
 
   useKeybinding(
     'theme:toggleSyntaxHighlighting',
     () => {
       if (colorModuleUnavailableReason === null) {
-        const newValue = !syntaxHighlightingDisabled
+        const newValue = !syntaxHighlightingDisabled;
         updateSettingsForSource('userSettings', {
           syntaxHighlightingDisabled: newValue,
-        })
+        });
         setAppState(prev => ({
           ...prev,
           settings: { ...prev.settings, syntaxHighlightingDisabled: newValue },
-        }))
+        }));
       }
     },
     { context: 'ThemePicker' },
-  )
+  );
   // Always call the hook to follow React rules, but conditionally assign the exit handler
-  const exitState = useExitOnCtrlCDWithKeybindings(
-    skipExitHandling ? () => {} : undefined,
-  )
+  const exitState = useExitOnCtrlCDWithKeybindings(skipExitHandling ? () => {} : undefined);
 
   const themeOptions: { label: string; value: ThemeSetting }[] = [
-    ...(feature('AUTO_THEME')
-      ? [{ label: 'Auto (match terminal)', value: 'auto' as const }]
-      : []),
+    ...(feature('AUTO_THEME') ? [{ label: 'Auto (match terminal)', value: 'auto' as const }] : []),
     { label: 'Dark mode', value: 'dark' },
     { label: 'Light mode', value: 'light' },
     {
@@ -102,7 +89,7 @@ export function ThemePicker({
       label: 'Light mode (ANSI colors only)',
       value: 'light-ansi',
     },
-  ]
+  ];
 
   const content = (
     <Box flexDirection="column" gap={1}>
@@ -115,29 +102,27 @@ export function ThemePicker({
           </Text>
         )}
         <Box flexDirection="column">
-          <Text bold>
-            Choose the text style that looks best with your terminal
-          </Text>
+          <Text bold>Choose the text style that looks best with your terminal</Text>
           {helpText && !showHelpTextBelow && <Text dimColor>{helpText}</Text>}
         </Box>
         <Select
           options={themeOptions}
           onFocus={setting => {
-            setPreviewTheme(setting as ThemeSetting)
+            setPreviewTheme(setting as ThemeSetting);
           }}
           onChange={(setting: string) => {
-            savePreview()
-            onThemeSelect(setting as ThemeSetting)
+            savePreview();
+            onThemeSelect(setting as ThemeSetting);
           }}
           onCancel={
             skipExitHandling
               ? () => {
-                  cancelPreview()
-                  onCancelProp?.()
+                  cancelPreview();
+                  onCancelProp?.();
                 }
               : async () => {
-                  cancelPreview()
-                  await gracefulShutdown(0)
+                  cancelPreview();
+                  await gracefulShutdown(0);
                 }
           }
           visibleOptionCount={themeOptions.length}
@@ -186,7 +171,7 @@ export function ThemePicker({
         </Text>
       </Box>
     </Box>
-  )
+  );
 
   // Only wrap in a box when not in onboarding
   if (!showIntroText) {
@@ -215,8 +200,8 @@ export function ThemePicker({
           )}
         </Box>
       </>
-    )
+    );
   }
 
-  return content
+  return content;
 }
diff --git a/src/components/ThinkingToggle.tsx b/src/components/ThinkingToggle.tsx
index da2a78687..a6d3e3802 100644
--- a/src/components/ThinkingToggle.tsx
+++ b/src/components/ThinkingToggle.tsx
@@ -1,29 +1,22 @@
-import * as React from 'react'
-import { useState } from 'react'
-import { useExitOnCtrlCDWithKeybindings } from 'src/hooks/useExitOnCtrlCDWithKeybindings.js'
-import { Box, Text } from '@anthropic/ink'
-import { useKeybinding } from '../keybindings/useKeybinding.js'
-import { ConfigurableShortcutHint } from './ConfigurableShortcutHint.js'
-import { Select } from './CustomSelect/index.js'
-import { Byline, KeyboardShortcutHint, Pane } from '@anthropic/ink'
+import * as React from 'react';
+import { useState } from 'react';
+import { useExitOnCtrlCDWithKeybindings } from 'src/hooks/useExitOnCtrlCDWithKeybindings.js';
+import { Box, Text } from '@anthropic/ink';
+import { useKeybinding } from '../keybindings/useKeybinding.js';
+import { ConfigurableShortcutHint } from './ConfigurableShortcutHint.js';
+import { Select } from './CustomSelect/index.js';
+import { Byline, KeyboardShortcutHint, Pane } from '@anthropic/ink';
 
 export type Props = {
-  currentValue: boolean
-  onSelect: (enabled: boolean) => void
-  onCancel?: () => void
-  isMidConversation?: boolean
-}
+  currentValue: boolean;
+  onSelect: (enabled: boolean) => void;
+  onCancel?: () => void;
+  isMidConversation?: boolean;
+};
 
-export function ThinkingToggle({
-  currentValue,
-  onSelect,
-  onCancel,
-  isMidConversation,
-}: Props): React.ReactNode {
-  const exitState = useExitOnCtrlCDWithKeybindings()
-  const [confirmationPending, setConfirmationPending] = useState<
-    boolean | null
-  >(null)
+export function ThinkingToggle({ currentValue, onSelect, onCancel, isMidConversation }: Props): React.ReactNode {
+  const exitState = useExitOnCtrlCDWithKeybindings();
+  const [confirmationPending, setConfirmationPending] = useState<boolean | null>(null);
 
   const options = [
     {
@@ -36,38 +29,38 @@ export function ThinkingToggle({
       label: 'Disabled',
       description: 'Claude will respond without extended thinking',
     },
-  ]
+  ];
 
   // Use configurable keybinding for ESC to cancel/go back
   useKeybinding(
     'confirm:no',
     () => {
       if (confirmationPending !== null) {
-        setConfirmationPending(null)
+        setConfirmationPending(null);
       } else {
-        onCancel?.()
+        onCancel?.();
       }
     },
     { context: 'Confirmation' },
-  )
+  );
 
   // Use configurable keybinding for Enter to confirm in confirmation mode
   useKeybinding(
     'confirm:yes',
     () => {
       if (confirmationPending !== null) {
-        onSelect(confirmationPending)
+        onSelect(confirmationPending);
       }
     },
     { context: 'Confirmation', isActive: confirmationPending !== null },
-  )
+  );
 
   function handleSelectChange(value: string): void {
-    const selected = value === 'true'
+    const selected = value === 'true';
     if (isMidConversation && selected !== currentValue) {
-      setConfirmationPending(selected)
+      setConfirmationPending(selected);
     } else {
-      onSelect(selected)
+      onSelect(selected);
     }
   }
 
@@ -84,9 +77,8 @@ export function ThinkingToggle({
         {confirmationPending !== null ? (
           <Box flexDirection="column" marginBottom={1} gap={1}>
             <Text color="warning">
-              Changing thinking mode mid-conversation will increase latency and
-              may reduce quality. For best results, set this at the start of a
-              session.
+              Changing thinking mode mid-conversation will increase latency and may reduce quality. For best results,
+              set this at the start of a session.
             </Text>
             <Text color="warning">Do you want to proceed?</Text>
           </Box>
@@ -109,25 +101,15 @@ export function ThinkingToggle({
         ) : confirmationPending !== null ? (
           <Byline>
             <KeyboardShortcutHint shortcut="Enter" action="confirm" />
-            <ConfigurableShortcutHint
-              action="confirm:no"
-              context="Confirmation"
-              fallback="Esc"
-              description="cancel"
-            />
+            <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="cancel" />
           </Byline>
         ) : (
           <Byline>
             <KeyboardShortcutHint shortcut="Enter" action="confirm" />
-            <ConfigurableShortcutHint
-              action="confirm:no"
-              context="Confirmation"
-              fallback="Esc"
-              description="exit"
-            />
+            <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="exit" />
           </Byline>
         )}
       </Text>
     </Pane>
-  )
+  );
 }
diff --git a/src/components/TokenWarning.tsx b/src/components/TokenWarning.tsx
index fe134c7ec..41fe004e6 100644
--- a/src/components/TokenWarning.tsx
+++ b/src/components/TokenWarning.tsx
@@ -1,20 +1,20 @@
-import { feature } from 'bun:bundle'
-import * as React from 'react'
-import { useSyncExternalStore } from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { getFeatureValue_CACHED_MAY_BE_STALE } from '../services/analytics/growthbook.js'
+import { feature } from 'bun:bundle';
+import * as React from 'react';
+import { useSyncExternalStore } from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { getFeatureValue_CACHED_MAY_BE_STALE } from '../services/analytics/growthbook.js';
 import {
   calculateTokenWarningState,
   getEffectiveContextWindowSize,
   isAutoCompactEnabled,
-} from '../services/compact/autoCompact.js'
-import { useCompactWarningSuppression } from '../services/compact/compactWarningHook.js'
-import { getUpgradeMessage } from '../utils/model/contextWindowUpgradeCheck.js'
+} from '../services/compact/autoCompact.js';
+import { useCompactWarningSuppression } from '../services/compact/compactWarningHook.js';
+import { getUpgradeMessage } from '../utils/model/contextWindowUpgradeCheck.js';
 
 type Props = {
-  tokenUsage: number
-  model: string
-}
+  tokenUsage: number;
+  model: string;
+};
 
 /**
  * Live collapse progress: "x / y summarized". Sub-component so
@@ -22,68 +22,62 @@ type Props = {
  * (hooks-in-conditionals would violate React rules). The parent only
  * renders this when feature('CONTEXT_COLLAPSE') + isContextCollapseEnabled().
  */
-function CollapseLabel({
-  upgradeMessage,
-}: {
-  upgradeMessage: string | null
-}): React.ReactNode {
+function CollapseLabel({ upgradeMessage }: { upgradeMessage: string | null }): React.ReactNode {
   /* eslint-disable @typescript-eslint/no-require-imports */
   const { getStats, subscribe } =
-    require('../services/contextCollapse/index.js') as typeof import('../services/contextCollapse/index.js')
+    require('../services/contextCollapse/index.js') as typeof import('../services/contextCollapse/index.js');
   /* eslint-enable @typescript-eslint/no-require-imports */
 
   // Snapshot must be referentially stable across calls when the
   // underlying counts haven't changed — returning a fresh object every
   // time would infinite-loop useSyncExternalStore. Encode as a string.
   const snapshot = useSyncExternalStore(subscribe, () => {
-    const s = getStats()
-    const idleWarn = s.health.emptySpawnWarningEmitted ? 1 : 0
-    return `${s.collapsedSpans}|${s.stagedSpans}|${s.health.totalErrors}|${s.health.totalEmptySpawns}|${idleWarn}`
-  })
+    const s = getStats();
+    const idleWarn = s.health.emptySpawnWarningEmitted ? 1 : 0;
+    return `${s.collapsedSpans}|${s.stagedSpans}|${s.health.totalErrors}|${s.health.totalEmptySpawns}|${idleWarn}`;
+  });
 
-  const [collapsed, staged, errors, emptySpawns, idleWarn] = snapshot
-    .split('|')
-    .map(Number) as [number, number, number, number, number]
-  const total = collapsed + staged
+  const [collapsed, staged, errors, emptySpawns, idleWarn] = snapshot.split('|').map(Number) as [
+    number,
+    number,
+    number,
+    number,
+    number,
+  ];
+  const total = collapsed + staged;
 
   // Show error indicator when ctx-agent is failing silently
   if (errors > 0 || idleWarn) {
-    const problem =
-      errors > 0
-        ? `collapse errors: ${errors}`
-        : `collapse idle (${emptySpawns} empty runs)`
+    const problem = errors > 0 ? `collapse errors: ${errors}` : `collapse idle (${emptySpawns} empty runs)`;
     return (
       <Text color="warning" wrap="truncate">
-        {total > 0
-          ? `${collapsed} / ${total} summarized \u00b7 ${problem}`
-          : problem}
+        {total > 0 ? `${collapsed} / ${total} summarized \u00b7 ${problem}` : problem}
       </Text>
-    )
+    );
   }
 
-  if (total === 0) return null
+  if (total === 0) return null;
 
-  const label = `${collapsed} / ${total} summarized`
+  const label = `${collapsed} / ${total} summarized`;
   return (
     <Text dimColor wrap="truncate">
       {upgradeMessage ? `${label} \u00b7 ${upgradeMessage}` : label}
     </Text>
-  )
+  );
 }
 
 export function TokenWarning({ tokenUsage, model }: Props): React.ReactNode {
-  const { percentLeft, isAboveWarningThreshold, isAboveErrorThreshold } =
-    calculateTokenWarningState(tokenUsage, model)
+  const { percentLeft, isAboveWarningThreshold, isAboveErrorThreshold } = calculateTokenWarningState(tokenUsage, model);
 
   // Use reactive hook to check if warning should be suppressed
-  const suppressWarning = useCompactWarningSuppression()
+  const suppressWarning = useCompactWarningSuppression();
 
   if (!isAboveWarningThreshold || suppressWarning) {
-    return null
+    return null;
   }
 
-  const showAutoCompactWarning = isAutoCompactEnabled()
-  const upgradeMessage = getUpgradeMessage('warning')
+  const showAutoCompactWarning = isAutoCompactEnabled();
+  const upgradeMessage = getUpgradeMessage('warning');
 
   // Reactive-only or context-collapse mode: proactive autocompact never
   // fires, so percentLeft's normal calculation (against the autocompact
@@ -92,29 +86,26 @@ export function TokenWarning({ tokenUsage, model }: Props): React.ReactNode {
   //
   // Each feature() block stands alone so the flag strings DCE from
   // external builds independently.
-  let displayPercentLeft = percentLeft
-  let reactiveOnlyMode = false
-  let collapseMode = false
+  let displayPercentLeft = percentLeft;
+  let reactiveOnlyMode = false;
+  let collapseMode = false;
   if (feature('REACTIVE_COMPACT')) {
     if (getFeatureValue_CACHED_MAY_BE_STALE('tengu_cobalt_raccoon', false)) {
-      reactiveOnlyMode = true
+      reactiveOnlyMode = true;
     }
   }
   if (feature('CONTEXT_COLLAPSE')) {
     /* eslint-disable @typescript-eslint/no-require-imports */
     const { isContextCollapseEnabled } =
-      require('../services/contextCollapse/index.js') as typeof import('../services/contextCollapse/index.js')
+      require('../services/contextCollapse/index.js') as typeof import('../services/contextCollapse/index.js');
     /* eslint-enable @typescript-eslint/no-require-imports */
     if (isContextCollapseEnabled()) {
-      collapseMode = true
+      collapseMode = true;
     }
   }
   if (reactiveOnlyMode || collapseMode) {
-    const effectiveWindow = getEffectiveContextWindowSize(model)
-    displayPercentLeft = Math.max(
-      0,
-      Math.round(((effectiveWindow - tokenUsage) / effectiveWindow) * 100),
-    )
+    const effectiveWindow = getEffectiveContextWindowSize(model);
+    displayPercentLeft = Math.max(0, Math.round(((effectiveWindow - tokenUsage) / effectiveWindow) * 100));
   }
 
   // Collapse mode: delegate to the subscribing sub-component so the
@@ -125,31 +116,26 @@ export function TokenWarning({ tokenUsage, model }: Props): React.ReactNode {
       <Box flexDirection="row">
         <CollapseLabel upgradeMessage={upgradeMessage} />
       </Box>
-    )
+    );
   }
 
   const autocompactLabel = reactiveOnlyMode
     ? `${100 - displayPercentLeft}% context used`
-    : `${displayPercentLeft}% until auto-compact`
+    : `${displayPercentLeft}% until auto-compact`;
 
   return (
     <Box flexDirection="row">
       {showAutoCompactWarning ? (
         <Text dimColor wrap="truncate">
-          {upgradeMessage
-            ? `${autocompactLabel} \u00b7 ${upgradeMessage}`
-            : autocompactLabel}
+          {upgradeMessage ? `${autocompactLabel} \u00b7 ${upgradeMessage}` : autocompactLabel}
         </Text>
       ) : (
-        <Text
-          color={isAboveErrorThreshold ? 'error' : 'warning'}
-          wrap="truncate"
-        >
+        <Text color={isAboveErrorThreshold ? 'error' : 'warning'} wrap="truncate">
           {upgradeMessage
             ? `Context low (${percentLeft}% remaining) \u00b7 ${upgradeMessage}`
             : `Context low (${percentLeft}% remaining) \u00b7 Run /compact to compact & continue`}
         </Text>
       )}
     </Box>
-  )
+  );
 }
diff --git a/src/components/ToolUseLoader.tsx b/src/components/ToolUseLoader.tsx
index de8fdb3c2..fe202575e 100644
--- a/src/components/ToolUseLoader.tsx
+++ b/src/components/ToolUseLoader.tsx
@@ -1,23 +1,19 @@
-import React from 'react'
-import { BLACK_CIRCLE } from '../constants/figures.js'
+import React from 'react';
+import { BLACK_CIRCLE } from '../constants/figures.js';
 
-import { Box, Text } from '@anthropic/ink'
-import { useBlink } from '../hooks/useBlink.js'
+import { Box, Text } from '@anthropic/ink';
+import { useBlink } from '../hooks/useBlink.js';
 
 type Props = {
-  isError: boolean
-  isUnresolved: boolean
-  shouldAnimate: boolean
-}
+  isError: boolean;
+  isUnresolved: boolean;
+  shouldAnimate: boolean;
+};
 
-export function ToolUseLoader({
-  isError,
-  isUnresolved,
-  shouldAnimate,
-}: Props): React.ReactNode {
-  const [ref, isBlinking] = useBlink(shouldAnimate)
+export function ToolUseLoader({ isError, isUnresolved, shouldAnimate }: Props): React.ReactNode {
+  const [ref, isBlinking] = useBlink(shouldAnimate);
 
-  const color = isUnresolved ? undefined : isError ? 'error' : 'success'
+  const color = isUnresolved ? undefined : isError ? 'error' : 'success';
 
   // WARNING: The code here and in AssistantToolUseMessage is particularly
   // sensitive to what *should* just be trivial refactorings. A `<dim>x</dim>`
@@ -30,10 +26,8 @@ export function ToolUseLoader({
   return (
     <Box ref={ref} minWidth={2}>
       <Text color={color} dimColor={isUnresolved}>
-        {!shouldAnimate || isBlinking || isError || !isUnresolved
-          ? BLACK_CIRCLE
-          : ' '}
+        {!shouldAnimate || isBlinking || isError || !isUnresolved ? BLACK_CIRCLE : ' '}
       </Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/TrustDialog/TrustDialog.tsx b/src/components/TrustDialog/TrustDialog.tsx
index e16384b53..4747a85ab 100644
--- a/src/components/TrustDialog/TrustDialog.tsx
+++ b/src/components/TrustDialog/TrustDialog.tsx
@@ -1,22 +1,19 @@
-import { homedir } from 'os'
-import React from 'react'
-import { logEvent } from 'src/services/analytics/index.js'
-import { setSessionTrustAccepted } from '../../bootstrap/state.js'
-import type { Command } from '../../commands.js'
-import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js'
-import { Box, Link, Text } from '@anthropic/ink'
-import { useKeybinding } from '../../keybindings/useKeybinding.js'
-import { getMcpConfigsByScope } from '../../services/mcp/config.js'
-import { BASH_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/BashTool/toolName.js'
-import {
-  checkHasTrustDialogAccepted,
-  saveCurrentProjectConfig,
-} from '../../utils/config.js'
-import { getCwd } from '../../utils/cwd.js'
-import { getFsImplementation } from '../../utils/fsOperations.js'
-import { gracefulShutdownSync } from '../../utils/gracefulShutdown.js'
-import { Select } from '../CustomSelect/index.js'
-import { PermissionDialog } from '../permissions/PermissionDialog.js'
+import { homedir } from 'os';
+import React from 'react';
+import { logEvent } from 'src/services/analytics/index.js';
+import { setSessionTrustAccepted } from '../../bootstrap/state.js';
+import type { Command } from '../../commands.js';
+import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js';
+import { Box, Link, Text } from '@anthropic/ink';
+import { useKeybinding } from '../../keybindings/useKeybinding.js';
+import { getMcpConfigsByScope } from '../../services/mcp/config.js';
+import { BASH_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/BashTool/toolName.js';
+import { checkHasTrustDialogAccepted, saveCurrentProjectConfig } from '../../utils/config.js';
+import { getCwd } from '../../utils/cwd.js';
+import { getFsImplementation } from '../../utils/fsOperations.js';
+import { gracefulShutdownSync } from '../../utils/gracefulShutdown.js';
+import { Select } from '../CustomSelect/index.js';
+import { PermissionDialog } from '../permissions/PermissionDialog.js';
 import {
   getApiKeyHelperSources,
   getAwsCommandsSources,
@@ -25,77 +22,67 @@ import {
   getGcpCommandsSources,
   getHooksSources,
   getOtelHeadersHelperSources,
-} from './utils.js'
+} from './utils.js';
 
 type Props = {
-  onDone(): void
-  commands?: Command[]
-}
+  onDone(): void;
+  commands?: Command[];
+};
 
 export function TrustDialog({ onDone, commands }: Props): React.ReactNode {
-  const { servers: projectServers } = getMcpConfigsByScope('project')
+  const { servers: projectServers } = getMcpConfigsByScope('project');
 
   // In all cases, we generally check only the project-level and
   // project-local-level settings, which we assume that users do not configure
   // directly compared to user-level settings.
 
   // Check for MCPs
-  const hasMcpServers = Object.keys(projectServers).length > 0
+  const hasMcpServers = Object.keys(projectServers).length > 0;
   // Check for hooks
-  const hooksSettingSources = getHooksSources()
-  const hasHooks = hooksSettingSources.length > 0
+  const hooksSettingSources = getHooksSources();
+  const hasHooks = hooksSettingSources.length > 0;
   // Check whether code execution is allowed in permissions and slash commands
-  const bashSettingSources = getBashPermissionSources()
+  const bashSettingSources = getBashPermissionSources();
   // Check for apiKeyHelper which executes arbitrary commands
-  const apiKeyHelperSources = getApiKeyHelperSources()
-  const hasApiKeyHelper = apiKeyHelperSources.length > 0
+  const apiKeyHelperSources = getApiKeyHelperSources();
+  const hasApiKeyHelper = apiKeyHelperSources.length > 0;
   // Check for AWS commands which execute arbitrary commands
-  const awsCommandsSources = getAwsCommandsSources()
-  const hasAwsCommands = awsCommandsSources.length > 0
+  const awsCommandsSources = getAwsCommandsSources();
+  const hasAwsCommands = awsCommandsSources.length > 0;
   // Check for GCP commands which execute arbitrary commands
-  const gcpCommandsSources = getGcpCommandsSources()
-  const hasGcpCommands = gcpCommandsSources.length > 0
+  const gcpCommandsSources = getGcpCommandsSources();
+  const hasGcpCommands = gcpCommandsSources.length > 0;
   // Check for otelHeadersHelper which executes arbitrary commands
-  const otelHeadersHelperSources = getOtelHeadersHelperSources()
-  const hasOtelHeadersHelper = otelHeadersHelperSources.length > 0
+  const otelHeadersHelperSources = getOtelHeadersHelperSources();
+  const hasOtelHeadersHelper = otelHeadersHelperSources.length > 0;
   // Check for dangerous environment variables (not in SAFE_ENV_VARS)
-  const dangerousEnvVarsSources = getDangerousEnvVarsSources()
-  const hasDangerousEnvVars = dangerousEnvVarsSources.length > 0
+  const dangerousEnvVarsSources = getDangerousEnvVarsSources();
+  const hasDangerousEnvVars = dangerousEnvVarsSources.length > 0;
 
   const hasSlashCommandBash =
     commands?.some(
       command =>
         command.type === 'prompt' &&
         command.loadedFrom === 'commands_DEPRECATED' &&
-        (command.source === 'projectSettings' ||
-          command.source === 'localSettings') &&
-        command.allowedTools?.some(
-          (tool: string) =>
-            tool === BASH_TOOL_NAME || tool.startsWith(BASH_TOOL_NAME + '('),
-        ),
-    ) ?? false
+        (command.source === 'projectSettings' || command.source === 'localSettings') &&
+        command.allowedTools?.some((tool: string) => tool === BASH_TOOL_NAME || tool.startsWith(BASH_TOOL_NAME + '(')),
+    ) ?? false;
 
   const hasSkillsBash =
     commands?.some(
       command =>
         command.type === 'prompt' &&
         (command.loadedFrom === 'skills' || command.loadedFrom === 'plugin') &&
-        (command.source === 'projectSettings' ||
-          command.source === 'localSettings' ||
-          command.source === 'plugin') &&
-        command.allowedTools?.some(
-          (tool: string) =>
-            tool === BASH_TOOL_NAME || tool.startsWith(BASH_TOOL_NAME + '('),
-        ),
-    ) ?? false
+        (command.source === 'projectSettings' || command.source === 'localSettings' || command.source === 'plugin') &&
+        command.allowedTools?.some((tool: string) => tool === BASH_TOOL_NAME || tool.startsWith(BASH_TOOL_NAME + '(')),
+    ) ?? false;
 
-  const hasAnyBashExecution =
-    bashSettingSources.length > 0 || hasSlashCommandBash || hasSkillsBash
+  const hasAnyBashExecution = bashSettingSources.length > 0 || hasSlashCommandBash || hasSkillsBash;
 
-  const hasTrustDialogAccepted = checkHasTrustDialogAccepted()
+  const hasTrustDialogAccepted = checkHasTrustDialogAccepted();
 
   React.useEffect(() => {
-    const isHomeDir = homedir() === getCwd()
+    const isHomeDir = homedir() === getCwd();
     logEvent('tengu_trust_dialog_shown', {
       isHomeDir,
       hasMcpServers,
@@ -106,7 +93,7 @@ export function TrustDialog({ onDone, commands }: Props): React.ReactNode {
       hasGcpCommands,
       hasOtelHeadersHelper,
       hasDangerousEnvVars,
-    })
+    });
   }, [
     hasMcpServers,
     hasHooks,
@@ -116,15 +103,15 @@ export function TrustDialog({ onDone, commands }: Props): React.ReactNode {
     hasGcpCommands,
     hasOtelHeadersHelper,
     hasDangerousEnvVars,
-  ])
+  ]);
 
   function onChange(value: 'enable_all' | 'exit') {
     if (value === 'exit') {
-      gracefulShutdownSync(1)
-      return
+      gracefulShutdownSync(1);
+      return;
     }
 
-    const isHomeDir = homedir() === getCwd()
+    const isHomeDir = homedir() === getCwd();
 
     logEvent('tengu_trust_dialog_accept', {
       isHomeDir,
@@ -136,18 +123,18 @@ export function TrustDialog({ onDone, commands }: Props): React.ReactNode {
       hasGcpCommands,
       hasOtelHeadersHelper,
       hasDangerousEnvVars,
-    })
+    });
 
     if (isHomeDir) {
       // For home directory, store trust in session memory only (not persisted to disk)
       // This allows hooks and other trust-requiring features to work during this session
       // while preserving the security intent of not permanently trusting home dir
-      setSessionTrustAccepted(true)
+      setSessionTrustAccepted(true);
     } else {
       saveCurrentProjectConfig(current => ({
         ...current,
         hasTrustDialogAccepted: true,
-      }))
+      }));
     }
 
     // Do NOT write MCP server settings here. handleMcpjsonServerApprovals in
@@ -155,7 +142,7 @@ export function TrustDialog({ onDone, commands }: Props): React.ReactNode {
     // UI. Writing enabledMcpjsonServers/enableAllProjectMcpServers here would
     // mark every server 'approved' and silently skip that dialog. See #15558.
 
-    onDone()
+    onDone();
   }
 
   // Default onExit is useApp().exit() → Ink.unmount(), which tears down the
@@ -164,48 +151,36 @@ export function TrustDialog({ onDone, commands }: Props): React.ReactNode {
   // so the default would hang the await forever. With keybinding
   // customization enabled, the chokidar watcher (persistent: true) keeps the
   // event loop alive and the process freezes. Explicitly exit 1 like "No".
-  const exitState = useExitOnCtrlCDWithKeybindings(() =>
-    gracefulShutdownSync(1),
-  )
+  const exitState = useExitOnCtrlCDWithKeybindings(() => gracefulShutdownSync(1));
 
   // Use configurable keybinding for ESC to cancel/exit
   useKeybinding(
     'confirm:no',
     () => {
-      gracefulShutdownSync(0)
+      gracefulShutdownSync(0);
     },
     { context: 'Confirmation' },
-  )
+  );
 
   // Automatically resolve the trust dialog if there is nothing to be shown.
   if (hasTrustDialogAccepted) {
-    setTimeout(onDone)
-    return null
+    setTimeout(onDone);
+    return null;
   }
 
   return (
-    <PermissionDialog
-      color="warning"
-      titleColor="warning"
-      title="Accessing workspace:"
-    >
+    <PermissionDialog color="warning" titleColor="warning" title="Accessing workspace:">
       <Box flexDirection="column" gap={1} paddingTop={1}>
         <Text bold>{getFsImplementation().cwd()}</Text>
 
         <Text>
-          Quick safety check: Is this a project you created or one you trust?
-          (Like your own code, a well-known open source project, or work from
-          your team). If not, take a moment to review what{"'"}s in this folder
-          first.
-        </Text>
-        <Text>
-          Claude Code{"'"}ll be able to read, edit, and execute files here.
+          Quick safety check: Is this a project you created or one you trust? (Like your own code, a well-known open
+          source project, or work from your team). If not, take a moment to review what{"'"}s in this folder first.
         </Text>
+        <Text>Claude Code{"'"}ll be able to read, edit, and execute files here.</Text>
 
         <Text dimColor>
-          <Link url="https://code.claude.com/docs/en/security">
-            Security guide
-          </Link>
+          <Link url="https://code.claude.com/docs/en/security">Security guide</Link>
         </Text>
 
         <Select
@@ -218,13 +193,9 @@ export function TrustDialog({ onDone, commands }: Props): React.ReactNode {
         />
 
         <Text dimColor>
-          {exitState.pending ? (
-            <>Press {exitState.keyName} again to exit</>
-          ) : (
-            <>Enter to confirm · Esc to cancel</>
-          )}
+          {exitState.pending ? <>Press {exitState.keyName} again to exit</> : <>Enter to confirm · Esc to cancel</>}
         </Text>
       </Box>
     </PermissionDialog>
-  )
+  );
 }
diff --git a/src/components/TrustDialog/src/services/analytics/index.ts b/src/components/TrustDialog/src/services/analytics/index.ts
index 60402f927..c095b5a65 100644
--- a/src/components/TrustDialog/src/services/analytics/index.ts
+++ b/src/components/TrustDialog/src/services/analytics/index.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type logEvent = any;
+export type logEvent = any
diff --git a/src/components/TrustDialog/src/utils/permissions/PermissionRule.ts b/src/components/TrustDialog/src/utils/permissions/PermissionRule.ts
index 349593ae4..6991af450 100644
--- a/src/components/TrustDialog/src/utils/permissions/PermissionRule.ts
+++ b/src/components/TrustDialog/src/utils/permissions/PermissionRule.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type PermissionRule = any;
+export type PermissionRule = any
diff --git a/src/components/TrustDialog/src/utils/settings/settings.ts b/src/components/TrustDialog/src/utils/settings/settings.ts
index 76099c0ec..64b7205a4 100644
--- a/src/components/TrustDialog/src/utils/settings/settings.ts
+++ b/src/components/TrustDialog/src/utils/settings/settings.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getSettingsForSource = any;
+export type getSettingsForSource = any
diff --git a/src/components/TrustDialog/src/utils/settings/types.ts b/src/components/TrustDialog/src/utils/settings/types.ts
index 2e9d3270c..6d1dcb1df 100644
--- a/src/components/TrustDialog/src/utils/settings/types.ts
+++ b/src/components/TrustDialog/src/utils/settings/types.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type SettingsJson = any;
+export type SettingsJson = any
diff --git a/src/components/ValidationErrorsList.tsx b/src/components/ValidationErrorsList.tsx
index 6620ab2fd..4e2878c36 100644
--- a/src/components/ValidationErrorsList.tsx
+++ b/src/components/ValidationErrorsList.tsx
@@ -1,134 +1,120 @@
-import setWith from 'lodash-es/setWith.js'
-import * as React from 'react'
-import { Box, Text, useTheme } from '@anthropic/ink'
-import type { ValidationError } from '../utils/settings/validation.js'
-import { type TreeNode, treeify } from '../utils/treeify.js'
+import setWith from 'lodash-es/setWith.js';
+import * as React from 'react';
+import { Box, Text, useTheme } from '@anthropic/ink';
+import type { ValidationError } from '../utils/settings/validation.js';
+import { type TreeNode, treeify } from '../utils/treeify.js';
 
 /**
  * Builds a nested tree structure from dot-notation paths
  * Uses lodash setWith to avoid automatic array creation
  */
 function buildNestedTree(errors: ValidationError[]): TreeNode {
-  const tree: TreeNode = {}
+  const tree: TreeNode = {};
 
   errors.forEach(error => {
     if (!error.path) {
       // Root level error - use empty string as key
-      tree[''] = error.message
-      return
+      tree[''] = error.message;
+      return;
     }
 
     // Try to enhance the path with meaningful values
-    const pathParts = error.path.split('.')
-    let modifiedPath = error.path
+    const pathParts = error.path.split('.');
+    let modifiedPath = error.path;
 
     // If we have an invalid value, try to make the path more readable
-    if (
-      error.invalidValue !== null &&
-      error.invalidValue !== undefined &&
-      pathParts.length > 0
-    ) {
-      const newPathParts: string[] = []
+    if (error.invalidValue !== null && error.invalidValue !== undefined && pathParts.length > 0) {
+      const newPathParts: string[] = [];
 
       for (let i = 0; i < pathParts.length; i++) {
-        const part = pathParts[i]
-        if (!part) continue
+        const part = pathParts[i];
+        if (!part) continue;
 
-        const numericPart = parseInt(part, 10)
+        const numericPart = parseInt(part, 10);
 
         // If this is a numeric index and it's the last part where we have the invalid value
         if (!isNaN(numericPart) && i === pathParts.length - 1) {
           // Format the value for display
-          let displayValue: string
+          let displayValue: string;
           if (typeof error.invalidValue === 'string') {
-            displayValue = `"${error.invalidValue}"`
+            displayValue = `"${error.invalidValue}"`;
           } else if (error.invalidValue === null) {
-            displayValue = 'null'
+            displayValue = 'null';
           } else if (error.invalidValue === undefined) {
-            displayValue = 'undefined'
+            displayValue = 'undefined';
           } else {
-            displayValue = String(error.invalidValue)
+            displayValue = String(error.invalidValue);
           }
 
-          newPathParts.push(displayValue)
+          newPathParts.push(displayValue);
         } else {
           // Keep other parts as-is
-          newPathParts.push(part)
+          newPathParts.push(part);
         }
       }
 
-      modifiedPath = newPathParts.join('.')
+      modifiedPath = newPathParts.join('.');
     }
 
-    setWith(tree, modifiedPath, error.message, Object)
-  })
+    setWith(tree, modifiedPath, error.message, Object);
+  });
 
-  return tree
+  return tree;
 }
 
 /**
  * Groups and displays validation errors using treeify with deduplication
  */
-export function ValidationErrorsList({
-  errors,
-}: {
-  errors: ValidationError[]
-}): React.ReactNode {
-  const [themeName] = useTheme()
+export function ValidationErrorsList({ errors }: { errors: ValidationError[] }): React.ReactNode {
+  const [themeName] = useTheme();
 
   if (errors.length === 0) {
-    return null
+    return null;
   }
 
   // Group errors by file
-  const errorsByFile = errors.reduce<Record<string, ValidationError[]>>(
-    (acc, error) => {
-      const file = error.file || '(file not specified)'
-      if (!acc[file]) {
-        acc[file] = []
-      }
-      acc[file]!.push(error)
-      return acc
-    },
-    {},
-  )
+  const errorsByFile = errors.reduce<Record<string, ValidationError[]>>((acc, error) => {
+    const file = error.file || '(file not specified)';
+    if (!acc[file]) {
+      acc[file] = [];
+    }
+    acc[file]!.push(error);
+    return acc;
+  }, {});
 
   // Sort files alphabetically
-  const sortedFiles = Object.keys(errorsByFile).sort()
+  const sortedFiles = Object.keys(errorsByFile).sort();
 
   return (
     <Box flexDirection="column">
       {sortedFiles.map(file => {
-        const fileErrors = errorsByFile[file] || []
+        const fileErrors = errorsByFile[file] || [];
 
         // Sort errors by path
         fileErrors.sort((a, b) => {
-          if (!a.path && b.path) return -1
-          if (a.path && !b.path) return 1
-          return (a.path || '').localeCompare(b.path || '')
-        })
+          if (!a.path && b.path) return -1;
+          if (a.path && !b.path) return 1;
+          return (a.path || '').localeCompare(b.path || '');
+        });
 
         // Build nested tree structure from error paths
-        const errorTree = buildNestedTree(fileErrors)
+        const errorTree = buildNestedTree(fileErrors);
 
         // Collect unique suggestion+docLink pairs
-        const suggestionPairs = new Map<
-          string,
-          { suggestion?: string; docLink?: string }
-        >()
+        const suggestionPairs = new Map<string, { suggestion?: string; docLink?: string }>();
 
         fileErrors.forEach(error => {
           if (error.suggestion || error.docLink) {
             // Create a key from suggestion+docLink combination
-            const key = `${error.suggestion || ''}|${error.docLink || ''}`
+            const key = `${error.suggestion || ''}|${error.docLink || ''}`;
             if (!suggestionPairs.has(key)) {
               suggestionPairs.set(key, {
                 suggestion: error.suggestion,
                 docLink: error.docLink,
-              })
+              });
             }
           }
-        })
+        });
 
         // Render the tree
         const treeOutput = treeify(errorTree, {
@@ -139,7 +125,7 @@ export function ValidationErrorsList({
             key: 'text',
             value: 'inactive',
           },
-        })
+        });
 
         return (
           <Box key={file} flexDirection="column">
@@ -151,11 +137,7 @@ export function ValidationErrorsList({
             {suggestionPairs.size > 0 && (
               <Box flexDirection="column" marginTop={1}>
                 {Array.from(suggestionPairs.values()).map((pair, index) => (
-                  <Box
-                    key={`suggestion-pair-${index}`}
-                    flexDirection="column"
-                    marginBottom={1}
-                  >
+                  <Box key={`suggestion-pair-${index}`} flexDirection="column" marginBottom={1}>
                     {pair.suggestion && (
                       <Text dimColor wrap="wrap">
                         {pair.suggestion}
@@ -171,8 +153,8 @@ export function ValidationErrorsList({
               </Box>
             )}
           </Box>
-        )
+        );
       })}
     </Box>
-  )
+  );
 }
diff --git a/src/components/VimTextInput.tsx b/src/components/VimTextInput.tsx
index 42dfa252e..9a3cb315e 100644
--- a/src/components/VimTextInput.tsx
+++ b/src/components/VimTextInput.tsx
@@ -1,22 +1,22 @@
-import chalk from 'chalk'
-import React from 'react'
-import { useClipboardImageHint } from '../hooks/useClipboardImageHint.js'
-import { useVimInput } from '../hooks/useVimInput.js'
-import { Box, color, useTerminalFocus, useTheme } from '@anthropic/ink'
-import type { VimTextInputProps } from '../types/textInputTypes.js'
-import type { TextHighlight } from '../utils/textHighlighting.js'
-import { BaseTextInput } from './BaseTextInput.js'
+import chalk from 'chalk';
+import React from 'react';
+import { useClipboardImageHint } from '../hooks/useClipboardImageHint.js';
+import { useVimInput } from '../hooks/useVimInput.js';
+import { Box, color, useTerminalFocus, useTheme } from '@anthropic/ink';
+import type { VimTextInputProps } from '../types/textInputTypes.js';
+import type { TextHighlight } from '../utils/textHighlighting.js';
+import { BaseTextInput } from './BaseTextInput.js';
 
 export type Props = VimTextInputProps & {
-  highlights?: TextHighlight[]
-}
+  highlights?: TextHighlight[];
+};
 
 export default function VimTextInput(props: Props): React.ReactNode {
-  const [theme] = useTheme()
-  const isTerminalFocused = useTerminalFocus()
+  const [theme] = useTheme();
+  const isTerminalFocused = useTerminalFocus();
 
   // Show hint when terminal regains focus and clipboard has an image
-  useClipboardImageHint(isTerminalFocused, !!props.onImagePaste)
+  useClipboardImageHint(isTerminalFocused, !!props.onImagePaste);
 
   const vimInputState = useVimInput({
     value: props.value,
@@ -38,23 +38,22 @@ export default function VimTextInput(props: Props): React.ReactNode {
     columns: props.columns,
     maxVisibleLines: props.maxVisibleLines,
     onImagePaste: props.onImagePaste,
-    disableCursorMovementForUpDownKeys:
-      props.disableCursorMovementForUpDownKeys,
+    disableCursorMovementForUpDownKeys: props.disableCursorMovementForUpDownKeys,
     disableEscapeDoublePress: props.disableEscapeDoublePress,
     externalOffset: props.cursorOffset,
     onOffsetChange: props.onChangeCursorOffset,
     inputFilter: props.inputFilter,
     onModeChange: props.onModeChange,
     onUndo: props.onUndo,
-  })
+  });
 
-  const { mode, setMode } = vimInputState
+  const { mode, setMode } = vimInputState;
 
   React.useEffect(() => {
     if (props.initialMode && props.initialMode !== mode) {
-      setMode(props.initialMode)
+      setMode(props.initialMode);
     }
-  }, [props.initialMode, mode, setMode])
+  }, [props.initialMode, mode, setMode]);
 
   return (
     <Box flexDirection="column">
@@ -65,5 +64,5 @@ export default function VimTextInput(props: Props): React.ReactNode {
         {...props}
       />
     </Box>
-  )
+  );
 }
diff --git a/src/components/VirtualMessageList.tsx b/src/components/VirtualMessageList.tsx
index 92b67764e..6b6ca4729 100644
--- a/src/components/VirtualMessageList.tsx
+++ b/src/components/VirtualMessageList.tsx
@@ -1,26 +1,18 @@
-import type { RefObject } from 'react'
-import * as React from 'react'
-import {
-  useCallback,
-  useContext,
-  useEffect,
-  useImperativeHandle,
-  useRef,
-  useState,
-  useSyncExternalStore,
-} from 'react'
-import { useVirtualScroll } from '../hooks/useVirtualScroll.js'
-import { Box, type DOMElement, type ScrollBoxHandle, type MatchPosition } from '@anthropic/ink'
-import { TextHoverColorContext } from './design-system/ThemedText.js'
-import { ScrollChromeContext } from './FullscreenLayout.js'
+import type { RefObject } from 'react';
+import * as React from 'react';
+import { useCallback, useContext, useEffect, useImperativeHandle, useRef, useState, useSyncExternalStore } from 'react';
+import { useVirtualScroll } from '../hooks/useVirtualScroll.js';
+import { Box, type DOMElement, type ScrollBoxHandle, type MatchPosition } from '@anthropic/ink';
+import { TextHoverColorContext } from './design-system/ThemedText.js';
+import { ScrollChromeContext } from './FullscreenLayout.js';
 
 // Rows of breathing room above the target when we scrollTo.
-const HEADROOM = 3
+const HEADROOM = 3;
 
-import { logForDebugging } from '../utils/debug.js'
-import { sleep } from '../utils/sleep.js'
-import { renderableSearchText } from '../utils/transcriptSearch.js'
-import type { RenderableMessage } from '../types/message.js'
+import { logForDebugging } from '../utils/debug.js';
+import { sleep } from '../utils/sleep.js';
+import { renderableSearchText } from '../utils/transcriptSearch.js';
+import type { RenderableMessage } from '../types/message.js';
 import {
   isNavigableMessage,
   type MessageActionsNav,
@@ -28,18 +20,18 @@ import {
   type NavigableMessage,
   stripSystemReminders,
   toolCallOf,
-} from './messageActions.js'
+} from './messageActions.js';
 
 // Fallback extractor: lower + cache here for callers without the
 // Messages.tsx tool-lookup path (tests, static contexts). Messages.tsx
 // provides its own lowering cache that also handles tool extractSearchText.
-const fallbackLowerCache = new WeakMap<RenderableMessage, string>()
+const fallbackLowerCache = new WeakMap<RenderableMessage, string>();
 function defaultExtractSearchText(msg: RenderableMessage): string {
-  const cached = fallbackLowerCache.get(msg)
-  if (cached !== undefined) return cached
-  const lowered = renderableSearchText(msg)
-  fallbackLowerCache.set(msg, lowered)
-  return lowered
+  const cached = fallbackLowerCache.get(msg);
+  if (cached !== undefined) return cached;
+  const lowered = renderableSearchText(msg);
+  fallbackLowerCache.set(msg, lowered);
+  return lowered;
 }
 
 export type StickyPrompt =
@@ -47,84 +39,84 @@ export type StickyPrompt =
   // Click sets this — header HIDES but padding stays collapsed (0) so
   // the content ❯ lands at screen row 0 instead of row 1. Cleared on
   // the next sticky-prompt compute (user scrolls again).
-  | 'clicked'
+  | 'clicked';
 
 /** Huge pasted prompts (cat file | claude) can be MBs. Header wraps into
  *  2 rows via overflow:hidden — this just bounds the React prop size. */
-const STICKY_TEXT_CAP = 500
+const STICKY_TEXT_CAP = 500;
 
 /** Imperative handle for transcript navigation. Methods compute matches
  *  HERE (renderableMessages indices are only valid inside this component —
  *  Messages.tsx filters and reorders, REPL can't compute externally). */
 export type JumpHandle = {
-  jumpToIndex: (i: number) => void
-  setSearchQuery: (q: string) => void
-  nextMatch: () => void
-  prevMatch: () => void
+  jumpToIndex: (i: number) => void;
+  setSearchQuery: (q: string) => void;
+  nextMatch: () => void;
+  prevMatch: () => void;
   /** Capture current scrollTop as the incsearch anchor. Typing jumps
    *  around as preview; 0-matches snaps back here. Enter/n/N never
    *  restore (they don't call setSearchQuery with empty). Next / call
    *  overwrites. */
-  setAnchor: () => void
+  setAnchor: () => void;
   /** Warm the search-text cache by extracting every message's text.
    *  Returns elapsed ms, or 0 if already warm (subsequent / in same
    *  transcript session). Yields before work so the caller can paint
    *  "indexing…" first. Caller shows "indexed in Xms" on resolve. */
-  warmSearchIndex: () => Promise<number>
+  warmSearchIndex: () => Promise<number>;
   /** Manual scroll (j/k/PgUp/wheel) exited the search context. Clear
    *  positions (yellow goes away, inverse highlights stay). Next n/N
    *  re-establishes via step()→jump(). Wired from ScrollKeybindingHandler's
    *  onScroll — only fires for keyboard/wheel, not programmatic scrollTo. */
-  disarmSearch: () => void
-}
+  disarmSearch: () => void;
+};
 
 type Props = {
-  messages: RenderableMessage[]
-  scrollRef: RefObject<ScrollBoxHandle | null>
+  messages: RenderableMessage[];
+  scrollRef: RefObject<ScrollBoxHandle | null>;
   /** Invalidates heightCache on change — cached heights from a different
    *  width are wrong (text rewrap → black screen on scroll-up after widen). */
-  columns: number
-  itemKey: (msg: RenderableMessage) => string
-  renderItem: (msg: RenderableMessage, index: number) => React.ReactNode
+  columns: number;
+  itemKey: (msg: RenderableMessage) => string;
+  renderItem: (msg: RenderableMessage, index: number) => React.ReactNode;
   /** Fires when a message Box is clicked (toggle per-message verbose). */
-  onItemClick?: (msg: RenderableMessage) => void
+  onItemClick?: (msg: RenderableMessage) => void;
   /** Per-item filter — suppress hover/click for messages where the verbose
    *  toggle does nothing (text, file edits, etc). Defaults to all-clickable. */
-  isItemClickable?: (msg: RenderableMessage) => boolean
+  isItemClickable?: (msg: RenderableMessage) => boolean;
   /** Expanded items get a persistent grey bg (not just on hover). */
-  isItemExpanded?: (msg: RenderableMessage) => boolean
+  isItemExpanded?: (msg: RenderableMessage) => boolean;
   /** PRE-LOWERED search text. Messages.tsx caches the lowered result
    *  once at warm time so setSearchQuery's per-keystroke loop does
    *  only indexOf (zero toLowerCase alloc). Falls back to a lowering
    *  wrapper on renderableSearchText for callers without the cache. */
-  extractSearchText?: (msg: RenderableMessage) => string
+  extractSearchText?: (msg: RenderableMessage) => string;
   /** Enable the sticky-prompt tracker. StickyTracker writes via
    *  ScrollChromeContext (not a callback prop) so state lives in
    *  FullscreenLayout instead of REPL. */
-  trackStickyPrompt?: boolean
-  selectedIndex?: number
+  trackStickyPrompt?: boolean;
+  selectedIndex?: number;
   /** Nav handle lives here because height measurement lives here. */
-  cursorNavRef?: React.Ref<MessageActionsNav>
-  setCursor?: (c: MessageActionsState | null) => void
-  jumpRef?: RefObject<JumpHandle | null>
+  cursorNavRef?: React.Ref<MessageActionsNav>;
+  setCursor?: (c: MessageActionsState | null) => void;
+  jumpRef?: RefObject<JumpHandle | null>;
   /** Fires when search matches change (query edit, n/N). current is
    *  1-based for "3/47" display; 0 means no matches. */
-  onSearchMatchesChange?: (count: number, current: number) => void
+  onSearchMatchesChange?: (count: number, current: number) => void;
   /** Paint existing DOM subtree to fresh Screen, scan. Element from the
    *  main tree (all providers). Message-relative positions (row 0 = el
    *  top). Works for any height — closes the tall-message gap. */
-  scanElement?: (el: DOMElement) => MatchPosition[]
+  scanElement?: (el: DOMElement) => MatchPosition[];
   /** Position-based CURRENT highlight. Positions known upfront (from
    *  scanElement), navigation = index arithmetic + scrollTo. rowOffset
    *  = message's current screen-top; positions stay stable. */
   setPositions?: (
     state: {
-      positions: MatchPosition[]
-      rowOffset: number
-      currentIdx: number
+      positions: MatchPosition[];
+      rowOffset: number;
+      currentIdx: number;
     } | null,
-  ) => void
-}
+  ) => void;
+};
 
 /**
  * Returns the text of a real user prompt, or null for anything else.
@@ -143,7 +135,7 @@ type Props = {
  * prompt that happened to get a reminder is rejected by the startsWith('<')
  * check. Shows up on `cc -c` resumes where memory-update reminders are dense.
  */
-const promptTextCache = new WeakMap<RenderableMessage, string | null>()
+const promptTextCache = new WeakMap<RenderableMessage, string | null>();
 
 function stickyPromptText(msg: RenderableMessage): string | null {
   // Cache keyed on message object — messages are append-only and don't
@@ -151,37 +143,39 @@ function stickyPromptText(msg: RenderableMessage): string | null {
   // per-scroll-tick) calls this 5-50+ times with the SAME messages every
   // tick; the system-reminder strip allocates a fresh string on each
   // parse. WeakMap self-GCs on compaction/clear (messages[] replaced).
-  const cached = promptTextCache.get(msg)
-  if (cached !== undefined) return cached
-  const result = computeStickyPromptText(msg)
-  promptTextCache.set(msg, result)
-  return result
+  const cached = promptTextCache.get(msg);
+  if (cached !== undefined) return cached;
+  const result = computeStickyPromptText(msg);
+  promptTextCache.set(msg, result);
+  return result;
 }
 
 function computeStickyPromptText(msg: RenderableMessage): string | null {
-  let raw: string | null = null
+  let raw: string | null = null;
   if (msg.type === 'user') {
-    if (msg.isMeta || msg.isVisibleInTranscriptOnly) return null
-    const block = (msg.message.content as Array<{ type: string; text?: string }>)[0]
-    if (block?.type !== 'text') return null
-    raw = block.text ?? null
+    if (msg.isMeta || msg.isVisibleInTranscriptOnly) return null;
+    const block = (msg.message.content as Array<{ type: string; text?: string }>)[0];
+    if (block?.type !== 'text') return null;
+    raw = block.text ?? null;
   } else if (
     msg.type === 'attachment' &&
     msg.attachment.type === 'queued_command' &&
     msg.attachment.commandMode !== 'task-notification' &&
     !msg.attachment.isMeta
   ) {
-    const p = msg.attachment.prompt
+    const p = msg.attachment.prompt;
     raw =
       typeof p === 'string'
         ? p
-        : (p as Array<{ type: string; text?: string }>).flatMap(b => (b.type === 'text' ? [b.text ?? ''] : [])).join('\n')
+        : (p as Array<{ type: string; text?: string }>)
+            .flatMap(b => (b.type === 'text' ? [b.text ?? ''] : []))
+            .join('\n');
   }
-  if (raw === null) return null
+  if (raw === null) return null;
 
-  const t = stripSystemReminders(raw)
-  if (t.startsWith('<') || t === '') return null
-  return t
+  const t = stripSystemReminders(raw);
+  if (t.startsWith('<') || t === '') return null;
+  return t;
 }
 
 /**
@@ -193,18 +187,18 @@ function computeStickyPromptText(msg: RenderableMessage): string | null {
  * a ref. Single-child column Box passes Yoga height through unchanged.
  */
 type VirtualItemProps = {
-  itemKey: string
-  msg: RenderableMessage
-  idx: number
-  measureRef: (key: string) => (el: DOMElement | null) => void
-  expanded: boolean | undefined
-  hovered: boolean
-  clickable: boolean
-  onClickK: (msg: RenderableMessage, cellIsBlank: boolean) => void
-  onEnterK: (k: string) => void
-  onLeaveK: (k: string) => void
-  renderItem: (msg: RenderableMessage, idx: number) => React.ReactNode
-}
+  itemKey: string;
+  msg: RenderableMessage;
+  idx: number;
+  measureRef: (key: string) => (el: DOMElement | null) => void;
+  expanded: boolean | undefined;
+  hovered: boolean;
+  clickable: boolean;
+  onClickK: (msg: RenderableMessage, cellIsBlank: boolean) => void;
+  onEnterK: (k: string) => void;
+  onLeaveK: (k: string) => void;
+  renderItem: (msg: RenderableMessage, idx: number) => React.ReactNode;
+};
 
 // Item wrapper with stable click handlers. The per-item closures were the
 // `operationNewArrowFunction` leafs → `FunctionExecutable::finalizeUnconditionally`
@@ -245,13 +239,11 @@ function VirtualItem({
       onMouseEnter={clickable ? () => onEnterK(k) : undefined}
       onMouseLeave={clickable ? () => onLeaveK(k) : undefined}
     >
-      <TextHoverColorContext.Provider
-        value={hovered && !expanded ? 'text' : undefined}
-      >
+      <TextHoverColorContext.Provider value={hovered && !expanded ? 'text' : undefined}>
         {renderItem(msg, idx)}
       </TextHoverColorContext.Provider>
     </Box>
-  )
+  );
 }
 
 export function VirtualMessageList({
@@ -277,23 +269,23 @@ export function VirtualMessageList({
   // the full string array on every commit allocates O(n) per message (~1MB
   // churn at 27k messages). Append-only delta push when the prefix matches;
   // fall back to full rebuild on compaction, /clear, or itemKey change.
-  const keysRef = useRef<string[]>([])
-  const prevMessagesRef = useRef<typeof messages>(messages)
-  const prevItemKeyRef = useRef(itemKey)
+  const keysRef = useRef<string[]>([]);
+  const prevMessagesRef = useRef<typeof messages>(messages);
+  const prevItemKeyRef = useRef(itemKey);
   if (
     prevItemKeyRef.current !== itemKey ||
     messages.length < keysRef.current.length ||
     messages[0] !== prevMessagesRef.current[0]
   ) {
-    keysRef.current = messages.map(m => itemKey(m))
+    keysRef.current = messages.map(m => itemKey(m));
   } else {
     for (let i = keysRef.current.length; i < messages.length; i++) {
-      keysRef.current.push(itemKey(messages[i]!))
+      keysRef.current.push(itemKey(messages[i]!));
     }
   }
-  prevMessagesRef.current = messages
-  prevItemKeyRef.current = itemKey
-  const keys = keysRef.current
+  prevMessagesRef.current = messages;
+  prevItemKeyRef.current = itemKey;
+  const keys = keysRef.current;
   const {
     range,
     topSpacer,
@@ -305,18 +297,18 @@ export function VirtualMessageList({
     getItemElement,
     getItemHeight,
     scrollToIndex,
-  } = useVirtualScroll(scrollRef, keys, columns)
-  const [start, end] = range
+  } = useVirtualScroll(scrollRef, keys, columns);
+  const [start, end] = range;
 
   // Unmeasured (undefined height) falls through — assume visible.
   const isVisible = useCallback(
     (i: number) => {
-      const h = getItemHeight(i)
-      if (h === 0) return false
-      return isNavigableMessage(messages[i]!)
+      const h = getItemHeight(i);
+      if (h === 0) return false;
+      return isNavigableMessage(messages[i]!);
     },
     [getItemHeight, messages],
-  )
+  );
   useImperativeHandle(cursorNavRef, (): MessageActionsNav => {
     const select = (m: NavigableMessage) =>
       setCursor?.({
@@ -324,32 +316,28 @@ export function VirtualMessageList({
         msgType: m.type as import('./messageActions.js').NavigableType,
         expanded: false,
         toolName: toolCallOf(m)?.name,
-      })
-    const selIdx = selectedIndex ?? -1
-    const scan = (
-      from: number,
-      dir: 1 | -1,
-      pred: (i: number) => boolean = isVisible,
-    ) => {
+      });
+    const selIdx = selectedIndex ?? -1;
+    const scan = (from: number, dir: 1 | -1, pred: (i: number) => boolean = isVisible) => {
       for (let i = from; i >= 0 && i < messages.length; i += dir) {
         if (pred(i)) {
-          select(messages[i]!)
-          return true
+          select(messages[i]!);
+          return true;
         }
       }
-      return false
-    }
-    const isUser = (i: number) => isVisible(i) && messages[i]!.type === 'user'
+      return false;
+    };
+    const isUser = (i: number) => isVisible(i) && messages[i]!.type === 'user';
     return {
       // Entry via shift+↑ = same semantic as in-cursor shift+↑ (prevUser).
       enterCursor: () => scan(messages.length - 1, -1, isUser),
       navigatePrev: () => scan(selIdx - 1, -1),
       navigateNext: () => {
-        if (scan(selIdx + 1, 1)) return
+        if (scan(selIdx + 1, 1)) return;
         // Past last visible → exit + repin. Last message's TOP is at viewport
         // top (selection-scroll effect); its BOTTOM may be below the fold.
-        scrollRef.current?.scrollToBottom()
-        setCursor?.(null)
+        scrollRef.current?.scrollToBottom();
+        setCursor?.(null);
       },
       // type:'user' only — queued_command attachments look like prompts but have no raw UserMessage to rewind to.
       navigatePrevUser: () => scan(selIdx - 1, -1, isUser),
@@ -357,8 +345,8 @@ export function VirtualMessageList({
       navigateTop: () => scan(0, 1),
       navigateBottom: () => scan(messages.length - 1, -1),
       getSelected: () => (selIdx >= 0 ? (messages[selIdx] ?? null) : null),
-    }
-  }, [messages, selectedIndex, setCursor, isVisible])
+    };
+  }, [messages, selectedIndex, setCursor, isVisible]);
   // Two-phase jump + search engine. Read-through-ref so the handle stays
   // stable across renders — offsets/messages identity changes every render,
   // can't go in useImperativeHandle deps without recreating the handle.
@@ -369,7 +357,7 @@ export function VirtualMessageList({
     getItemTop,
     messages,
     scrollToIndex,
-  })
+  });
   jumpState.current = {
     offsets,
     start,
@@ -377,52 +365,52 @@ export function VirtualMessageList({
     getItemTop,
     messages,
     scrollToIndex,
-  }
+  };
 
   // Keep cursor-selected message visible. offsets rebuilds every render
   // — as a bare dep this re-pinned on every mousewheel tick. Read through
   // jumpState instead; past-overscan jumps land via scrollToIndex, next
   // nav is precise.
   useEffect(() => {
-    if (selectedIndex === undefined) return
-    const s = jumpState.current
-    const el = s.getItemElement(selectedIndex)
+    if (selectedIndex === undefined) return;
+    const s = jumpState.current;
+    const el = s.getItemElement(selectedIndex);
     if (el) {
-      scrollRef.current?.scrollToElement(el, 1)
+      scrollRef.current?.scrollToElement(el, 1);
     } else {
-      s.scrollToIndex(selectedIndex)
+      s.scrollToIndex(selectedIndex);
     }
-  }, [selectedIndex, scrollRef])
+  }, [selectedIndex, scrollRef]);
 
   // Pending seek request. jump() sets this + bumps seekGen. The seek
   // effect fires post-paint (passive effect — after resetAfterCommit),
   // checks if target is mounted. Yes → scan+highlight. No → re-estimate
   // with a fresher anchor (start moved toward idx) and scrollTo again.
   const scanRequestRef = useRef<{
-    idx: number
-    wantLast: boolean
-    tries: number
-  } | null>(null)
+    idx: number;
+    wantLast: boolean;
+    tries: number;
+  } | null>(null);
   // Message-relative positions from scanElement. Row 0 = message top.
   // Stable across scroll — highlight computes rowOffset fresh. msgIdx
   // for computing rowOffset = getItemTop(msgIdx) - scrollTop.
   const elementPositions = useRef<{
-    msgIdx: number
-    positions: MatchPosition[]
-  }>({ msgIdx: -1, positions: [] })
+    msgIdx: number;
+    positions: MatchPosition[];
+  }>({ msgIdx: -1, positions: [] });
   // Wraparound guard. Auto-advance stops if ptr wraps back to here.
-  const startPtrRef = useRef(-1)
+  const startPtrRef = useRef(-1);
   // Phantom-burst cap. Resets on scan success.
-  const phantomBurstRef = useRef(0)
+  const phantomBurstRef = useRef(0);
   // One-deep queue: n/N arriving mid-seek gets stored (not dropped) and
   // fires after the seek completes. Holding n stays smooth without
   // queueing 30 jumps. Latest press overwrites — we want the direction
   // the user is going NOW, not where they were 10 keypresses ago.
-  const pendingStepRef = useRef<1 | -1 | 0>(0)
+  const pendingStepRef = useRef<1 | -1 | 0>(0);
   // step + highlight via ref so the seek effect reads latest without
   // closure-capture or deps churn.
-  const stepRef = useRef<(d: 1 | -1) => void>(() => {})
-  const highlightRef = useRef<(ord: number) => void>(() => {})
+  const stepRef = useRef<(d: 1 | -1) => void>(() => {});
+  const highlightRef = useRef<(ord: number) => void>(() => {});
   const searchState = useRef({
     matches: [] as number[], // deduplicated msg indices
     ptr: 0,
@@ -433,11 +421,11 @@ export function VirtualMessageList({
     // close enough for the badge; exact counts would need scanElement on
     // every matched message (~1-3ms × N). total = prefixSum[matches.length].
     prefixSum: [] as number[],
-  })
+  });
   // scrollTop at the moment / was pressed. Incsearch preview-jumps snap
   // back here when matches drop to 0. -1 = no anchor (before first /).
-  const searchAnchor = useRef(-1)
-  const indexWarmed = useRef(false)
+  const searchAnchor = useRef(-1);
+  const indexWarmed = useRef(false);
 
   // Scroll target for message i: land at MESSAGE TOP. est = top - HEADROOM
   // so lo = top - est = HEADROOM ≥ 0 (or lo = top if est clamped to 0).
@@ -446,8 +434,8 @@ export function VirtualMessageList({
   // (was a safety net for frac garbage — without frac, est IS the next
   // message's top, spam-n/N converges because message tops are ordered).
   function targetFor(i: number): number {
-    const top = jumpState.current.getItemTop(i)
-    return Math.max(0, top - HEADROOM)
+    const top = jumpState.current.getItemTop(i);
+    return Math.max(0, top - HEADROOM);
   }
 
   // Highlight positions[ord]. Positions are MESSAGE-RELATIVE (row 0 =
@@ -455,48 +443,48 @@ export function VirtualMessageList({
   // scrollTop fresh. If ord's position is off-viewport, scroll to bring
   // it in, recompute rowOffset. setPositions triggers overlay write.
   function highlight(ord: number): void {
-    const s = scrollRef.current
-    const { msgIdx, positions } = elementPositions.current
+    const s = scrollRef.current;
+    const { msgIdx, positions } = elementPositions.current;
     if (!s || positions.length === 0 || msgIdx < 0) {
-      setPositions?.(null)
-      return
+      setPositions?.(null);
+      return;
     }
-    const idx = Math.max(0, Math.min(ord, positions.length - 1))
-    const p = positions[idx]!
-    const top = jumpState.current.getItemTop(msgIdx)
+    const idx = Math.max(0, Math.min(ord, positions.length - 1));
+    const p = positions[idx]!;
+    const top = jumpState.current.getItemTop(msgIdx);
     // lo = item's position within scroll content (wrapper-relative).
     // viewportTop = where the scroll content starts on SCREEN (after
     // ScrollBox padding/border + any chrome above). Highlight writes to
     // screen-absolute, so rowOffset = viewportTop + lo. Observed: off-by-
     // 1+ without viewportTop (FullscreenLayout has paddingTop=1 on the
     // ScrollBox, plus any header above).
-    const vpTop = s.getViewportTop()
-    let lo = top - s.getScrollTop()
-    const vp = s.getViewportHeight()
-    let screenRow = vpTop + lo + p.row
+    const vpTop = s.getViewportTop();
+    let lo = top - s.getScrollTop();
+    const vp = s.getViewportHeight();
+    let screenRow = vpTop + lo + p.row;
     // Off viewport → scroll to bring it in (HEADROOM from top).
     // scrollTo commits sync; read-back after gives fresh lo.
     if (screenRow < vpTop || screenRow >= vpTop + vp) {
-      s.scrollTo(Math.max(0, top + p.row - HEADROOM))
-      lo = top - s.getScrollTop()
-      screenRow = vpTop + lo + p.row
+      s.scrollTo(Math.max(0, top + p.row - HEADROOM));
+      lo = top - s.getScrollTop();
+      screenRow = vpTop + lo + p.row;
     }
-    setPositions?.({ positions, rowOffset: vpTop + lo, currentIdx: idx })
+    setPositions?.({ positions, rowOffset: vpTop + lo, currentIdx: idx });
     // Badge: global current = sum of occurrences before this msg + ord+1.
     // prefixSum[ptr] is engine-counted (indexOf on extractSearchText);
     // may drift from render-count for ghost messages but close enough —
     // badge is a rough location hint, not a proof.
-    const st = searchState.current
-    const total = st.prefixSum.at(-1) ?? 0
-    const current = (st.prefixSum[st.ptr] ?? 0) + idx + 1
-    onSearchMatchesChange?.(total, current)
+    const st = searchState.current;
+    const total = st.prefixSum.at(-1) ?? 0;
+    const current = (st.prefixSum[st.ptr] ?? 0) + idx + 1;
+    onSearchMatchesChange?.(total, current);
     logForDebugging(
       `highlight(i=${msgIdx}, ord=${idx}/${positions.length}): ` +
         `pos={row:${p.row},col:${p.col}} lo=${lo} screenRow=${screenRow} ` +
         `badge=${current}/${total}`,
-    )
+    );
   }
-  highlightRef.current = highlight
+  highlightRef.current = highlight;
 
   // Seek effect. jump() sets scanRequestRef + scrollToIndex + bump.
   // bump → re-render → useVirtualScroll mounts the target (scrollToIndex
@@ -506,92 +494,92 @@ export function VirtualMessageList({
   //
   // Dep is ONLY seekGen — effect doesn't re-run on random renders
   // (onSearchMatchesChange churn during incsearch).
-  const [seekGen, setSeekGen] = useState(0)
-  const bumpSeek = useCallback(() => setSeekGen(g => g + 1), [])
+  const [seekGen, setSeekGen] = useState(0);
+  const bumpSeek = useCallback(() => setSeekGen(g => g + 1), []);
 
   useEffect(() => {
-    const req = scanRequestRef.current
-    if (!req) return
-    const { idx, wantLast, tries } = req
-    const s = scrollRef.current
-    if (!s) return
-    const { getItemElement, getItemTop, scrollToIndex } = jumpState.current
-    const el = getItemElement(idx)
-    const h = el?.yogaNode?.getComputedHeight() ?? 0
+    const req = scanRequestRef.current;
+    if (!req) return;
+    const { idx, wantLast, tries } = req;
+    const s = scrollRef.current;
+    if (!s) return;
+    const { getItemElement, getItemTop, scrollToIndex } = jumpState.current;
+    const el = getItemElement(idx);
+    const h = el?.yogaNode?.getComputedHeight() ?? 0;
 
     if (!el || h === 0) {
       // Not mounted after scrollToIndex. Shouldn't happen — scrollToIndex
       // guarantees mount by construction (scrollTop and topSpacer agree
       // via the same offsets value). Sanity: retry once, then skip.
       if (tries > 1) {
-        scanRequestRef.current = null
-        logForDebugging(`seek(i=${idx}): no mount after scrollToIndex, skip`)
-        stepRef.current(wantLast ? -1 : 1)
-        return
+        scanRequestRef.current = null;
+        logForDebugging(`seek(i=${idx}): no mount after scrollToIndex, skip`);
+        stepRef.current(wantLast ? -1 : 1);
+        return;
       }
-      scanRequestRef.current = { idx, wantLast, tries: tries + 1 }
-      scrollToIndex(idx)
-      bumpSeek()
-      return
+      scanRequestRef.current = { idx, wantLast, tries: tries + 1 };
+      scrollToIndex(idx);
+      bumpSeek();
+      return;
     }
 
-    scanRequestRef.current = null
+    scanRequestRef.current = null;
     // Precise scrollTo — scrollToIndex got us in the neighborhood
     // (item is mounted, maybe a few-dozen rows off due to overscan
     // estimate drift). Now land it at top-HEADROOM.
-    s.scrollTo(Math.max(0, getItemTop(idx) - HEADROOM))
-    const positions = scanElement?.(el) ?? []
-    elementPositions.current = { msgIdx: idx, positions }
-    logForDebugging(`seek(i=${idx} t=${tries}): ${positions.length} positions`)
+    s.scrollTo(Math.max(0, getItemTop(idx) - HEADROOM));
+    const positions = scanElement?.(el) ?? [];
+    elementPositions.current = { msgIdx: idx, positions };
+    logForDebugging(`seek(i=${idx} t=${tries}): ${positions.length} positions`);
     if (positions.length === 0) {
       // Phantom — engine matched, render didn't. Auto-advance.
       if (++phantomBurstRef.current > 20) {
-        phantomBurstRef.current = 0
-        return
+        phantomBurstRef.current = 0;
+        return;
       }
-      stepRef.current(wantLast ? -1 : 1)
-      return
+      stepRef.current(wantLast ? -1 : 1);
+      return;
     }
-    phantomBurstRef.current = 0
-    const ord = wantLast ? positions.length - 1 : 0
-    searchState.current.screenOrd = ord
-    startPtrRef.current = -1
-    highlightRef.current(ord)
-    const pending = pendingStepRef.current
+    phantomBurstRef.current = 0;
+    const ord = wantLast ? positions.length - 1 : 0;
+    searchState.current.screenOrd = ord;
+    startPtrRef.current = -1;
+    highlightRef.current(ord);
+    const pending = pendingStepRef.current;
     if (pending) {
-      pendingStepRef.current = 0
-      stepRef.current(pending)
+      pendingStepRef.current = 0;
+      stepRef.current(pending);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [seekGen])
+  }, [seekGen]);
 
   // Scroll to message i's top, arm scanPending. scan-effect reads fresh
   // screen next tick. wantLast: N-into-message — screenOrd = length-1.
   function jump(i: number, wantLast: boolean): void {
-    const s = scrollRef.current
-    if (!s) return
-    const js = jumpState.current
-    const { getItemElement, scrollToIndex } = js
+    const s = scrollRef.current;
+    if (!s) return;
+    const js = jumpState.current;
+    const { getItemElement, scrollToIndex } = js;
     // offsets is a Float64Array whose .length is the allocated buffer (only
     // grows) — messages.length is the logical item count.
-    if (i < 0 || i >= js.messages.length) return
+    if (i < 0 || i >= js.messages.length) return;
     // Clear stale highlight before scroll. Between now and the seek
     // effect's highlight, inverse-only from scan-highlight shows.
-    setPositions?.(null)
-    elementPositions.current = { msgIdx: -1, positions: [] }
-    scanRequestRef.current = { idx: i, wantLast, tries: 0 }
-    const el = getItemElement(i)
-    const h = el?.yogaNode?.getComputedHeight() ?? 0
+    setPositions?.(null);
+    elementPositions.current = { msgIdx: -1, positions: [] };
+    scanRequestRef.current = { idx: i, wantLast, tries: 0 };
+    const el = getItemElement(i);
+    const h = el?.yogaNode?.getComputedHeight() ?? 0;
     // Mounted → precise scrollTo. Unmounted → scrollToIndex mounts it
     // (scrollTop and topSpacer agree via the same offsets value — exact
     // by construction, no estimation). Seek effect does the precise
     // scrollTo after paint either way.
     if (el && h > 0) {
-      s.scrollTo(targetFor(i))
+      s.scrollTo(targetFor(i));
     } else {
-      scrollToIndex(i)
+      scrollToIndex(i);
     }
-    bumpSeek()
+    bumpSeek();
   }
 
   // Advance screenOrd within elementPositions. Exhausted → ptr advances,
@@ -599,175 +587,168 @@ export function VirtualMessageList({
   // jump) triggers auto-advance from scan-effect. Wraparound guard stops
   // if every message is a phantom.
   function step(delta: 1 | -1): void {
-    const st = searchState.current
-    const { matches, prefixSum } = st
-    const total = prefixSum.at(-1) ?? 0
-    if (matches.length === 0) return
+    const st = searchState.current;
+    const { matches, prefixSum } = st;
+    const total = prefixSum.at(-1) ?? 0;
+    if (matches.length === 0) return;
 
     // Seek in-flight — queue this press (one-deep, latest overwrites).
     // The seek effect fires it after highlight.
     if (scanRequestRef.current) {
-      pendingStepRef.current = delta
-      return
+      pendingStepRef.current = delta;
+      return;
     }
 
-    if (startPtrRef.current < 0) startPtrRef.current = st.ptr
+    if (startPtrRef.current < 0) startPtrRef.current = st.ptr;
 
-    const { positions } = elementPositions.current
-    const newOrd = st.screenOrd + delta
+    const { positions } = elementPositions.current;
+    const newOrd = st.screenOrd + delta;
     if (newOrd >= 0 && newOrd < positions.length) {
-      st.screenOrd = newOrd
-      highlight(newOrd) // updates badge internally
-      startPtrRef.current = -1
-      return
+      st.screenOrd = newOrd;
+      highlight(newOrd); // updates badge internally
+      startPtrRef.current = -1;
+      return;
     }
 
     // Exhausted visible. Advance ptr → jump → re-scan.
-    const ptr = (st.ptr + delta + matches.length) % matches.length
+    const ptr = (st.ptr + delta + matches.length) % matches.length;
     if (ptr === startPtrRef.current) {
-      setPositions?.(null)
-      startPtrRef.current = -1
-      logForDebugging(
-        `step: wraparound at ptr=${ptr}, all ${matches.length} msgs phantoms`,
-      )
-      return
+      setPositions?.(null);
+      startPtrRef.current = -1;
+      logForDebugging(`step: wraparound at ptr=${ptr}, all ${matches.length} msgs phantoms`);
+      return;
     }
-    st.ptr = ptr
-    st.screenOrd = 0 // resolved after scan (wantLast → length-1)
-    jump(matches[ptr]!, delta < 0)
+    st.ptr = ptr;
+    st.screenOrd = 0; // resolved after scan (wantLast → length-1)
+    jump(matches[ptr]!, delta < 0);
     // screenOrd will resolve after scan. Best-effort: prefixSum[ptr] + 0
     // for n (first pos), prefixSum[ptr+1] for N (last pos = count-1).
     // The scan-effect's highlight will be the real value; this is a
     // pre-scan placeholder so the badge updates immediately.
-    const placeholder =
-      delta < 0 ? (prefixSum[ptr + 1] ?? total) : prefixSum[ptr]! + 1
-    onSearchMatchesChange?.(total, placeholder)
+    const placeholder = delta < 0 ? (prefixSum[ptr + 1] ?? total) : prefixSum[ptr]! + 1;
+    onSearchMatchesChange?.(total, placeholder);
   }
-  stepRef.current = step
+  stepRef.current = step;
 
   useImperativeHandle(
     jumpRef,
     () => ({
       // Non-search jump (sticky header click, etc). No scan, no positions.
       jumpToIndex: (i: number) => {
-        const s = scrollRef.current
-        if (s) s.scrollTo(targetFor(i))
+        const s = scrollRef.current;
+        if (s) s.scrollTo(targetFor(i));
       },
       setSearchQuery: (q: string) => {
         // New search invalidates everything.
-        scanRequestRef.current = null
-        elementPositions.current = { msgIdx: -1, positions: [] }
-        startPtrRef.current = -1
-        setPositions?.(null)
-        const lq = q.toLowerCase()
+        scanRequestRef.current = null;
+        elementPositions.current = { msgIdx: -1, positions: [] };
+        startPtrRef.current = -1;
+        setPositions?.(null);
+        const lq = q.toLowerCase();
         // One entry per MESSAGE (deduplicated). Boolean "does this msg
         // contain the query". ~10ms for 9k messages with cached lowered.
-        const matches: number[] = []
+        const matches: number[] = [];
         // Per-message occurrence count → prefixSum for global current
         // index. Engine-counted (cheap indexOf loop); may differ from
         // render-count (scanElement) for ghost/phantom messages but close
         // enough for the badge. The badge is a rough location hint.
-        const prefixSum: number[] = [0]
+        const prefixSum: number[] = [0];
         if (lq) {
-          const msgs = jumpState.current.messages
+          const msgs = jumpState.current.messages;
           for (let i = 0; i < msgs.length; i++) {
-            const text = extractSearchText(msgs[i]!)
-            let pos = text.indexOf(lq)
-            let cnt = 0
+            const text = extractSearchText(msgs[i]!);
+            let pos = text.indexOf(lq);
+            let cnt = 0;
             while (pos >= 0) {
-              cnt++
-              pos = text.indexOf(lq, pos + lq.length)
+              cnt++;
+              pos = text.indexOf(lq, pos + lq.length);
             }
             if (cnt > 0) {
-              matches.push(i)
-              prefixSum.push(prefixSum.at(-1)! + cnt)
+              matches.push(i);
+              prefixSum.push(prefixSum.at(-1)! + cnt);
             }
           }
         }
-        const total = prefixSum.at(-1)!
+        const total = prefixSum.at(-1)!;
         // Nearest MESSAGE to the anchor. <= so ties go to later.
-        let ptr = 0
-        const s = scrollRef.current
-        const { offsets, start, getItemTop } = jumpState.current
-        const firstTop = getItemTop(start)
-        const origin = firstTop >= 0 ? firstTop - offsets[start]! : 0
+        let ptr = 0;
+        const s = scrollRef.current;
+        const { offsets, start, getItemTop } = jumpState.current;
+        const firstTop = getItemTop(start);
+        const origin = firstTop >= 0 ? firstTop - offsets[start]! : 0;
         if (matches.length > 0 && s) {
-          const curTop =
-            searchAnchor.current >= 0 ? searchAnchor.current : s.getScrollTop()
-          let best = Infinity
+          const curTop = searchAnchor.current >= 0 ? searchAnchor.current : s.getScrollTop();
+          let best = Infinity;
           for (let k = 0; k < matches.length; k++) {
-            const d = Math.abs(origin + offsets[matches[k]!]! - curTop)
+            const d = Math.abs(origin + offsets[matches[k]!]! - curTop);
             if (d <= best) {
-              best = d
-              ptr = k
+              best = d;
+              ptr = k;
             }
           }
           logForDebugging(
             `setSearchQuery('${q}'): ${matches.length} msgs · ptr=${ptr} ` +
               `msgIdx=${matches[ptr]} curTop=${curTop} origin=${origin}`,
-          )
+          );
         }
-        searchState.current = { matches, ptr, screenOrd: 0, prefixSum }
+        searchState.current = { matches, ptr, screenOrd: 0, prefixSum };
         if (matches.length > 0) {
           // wantLast=true: preview the LAST occurrence in the nearest
           // message. At sticky-bottom (common / entry), nearest is the
           // last msg; its last occurrence is closest to where the user
           // was — minimal view movement. n advances forward from there.
-          jump(matches[ptr]!, true)
+          jump(matches[ptr]!, true);
         } else if (searchAnchor.current >= 0 && s) {
           // /foob → 0 matches → snap back to anchor. less/vim incsearch.
-          s.scrollTo(searchAnchor.current)
+          s.scrollTo(searchAnchor.current);
         }
         // Global occurrence count + 1-based current. wantLast=true so the
         // scan will land on the last occurrence in matches[ptr]. Placeholder
         // = prefixSum[ptr+1] (count through this msg). highlight() updates
         // to the exact value after scan completes.
-        onSearchMatchesChange?.(
-          total,
-          matches.length > 0 ? (prefixSum[ptr + 1] ?? total) : 0,
-        )
+        onSearchMatchesChange?.(total, matches.length > 0 ? (prefixSum[ptr + 1] ?? total) : 0);
       },
       nextMatch: () => step(1),
       prevMatch: () => step(-1),
       setAnchor: () => {
-        const s = scrollRef.current
-        if (s) searchAnchor.current = s.getScrollTop()
+        const s = scrollRef.current;
+        if (s) searchAnchor.current = s.getScrollTop();
       },
       disarmSearch: () => {
         // Manual scroll invalidates screen-absolute positions.
-        setPositions?.(null)
-        scanRequestRef.current = null
-        elementPositions.current = { msgIdx: -1, positions: [] }
-        startPtrRef.current = -1
+        setPositions?.(null);
+        scanRequestRef.current = null;
+        elementPositions.current = { msgIdx: -1, positions: [] };
+        startPtrRef.current = -1;
       },
       warmSearchIndex: async () => {
-        if (indexWarmed.current) return 0
-        const msgs = jumpState.current.messages
-        const CHUNK = 500
-        let workMs = 0
-        const wallStart = performance.now()
+        if (indexWarmed.current) return 0;
+        const msgs = jumpState.current.messages;
+        const CHUNK = 500;
+        let workMs = 0;
+        const wallStart = performance.now();
         for (let i = 0; i < msgs.length; i += CHUNK) {
-          await sleep(0)
-          const t0 = performance.now()
-          const end = Math.min(i + CHUNK, msgs.length)
+          await sleep(0);
+          const t0 = performance.now();
+          const end = Math.min(i + CHUNK, msgs.length);
           for (let j = i; j < end; j++) {
-            extractSearchText(msgs[j]!)
+            extractSearchText(msgs[j]!);
           }
-          workMs += performance.now() - t0
+          workMs += performance.now() - t0;
         }
-        const wallMs = Math.round(performance.now() - wallStart)
+        const wallMs = Math.round(performance.now() - wallStart);
         logForDebugging(
           `warmSearchIndex: ${msgs.length} msgs · work=${Math.round(workMs)}ms wall=${wallMs}ms chunks=${Math.ceil(msgs.length / CHUNK)}`,
-        )
-        indexWarmed.current = true
-        return Math.round(workMs)
+        );
+        indexWarmed.current = true;
+        return Math.round(workMs);
       },
     }),
     // Closures over refs + callbacks. scrollRef stable; others are
     // useCallback([]) or prop-drilled from REPL (stable).
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [scrollRef],
-  )
+  );
 
   // StickyTracker goes AFTER the list content. It returns null (no DOM node)
   // so order shouldn't matter for layout — but putting it first means every
@@ -775,7 +756,7 @@ export function VirtualMessageList({
   // the sibling items (React walks children in order). After the items, it's
   // a leaf reconcile. Defensive: also avoids any Yoga child-index quirks if
   // the Ink reconciler ever materializes a placeholder for null returns.
-  const [hoveredKey, setHoveredKey] = useState<string | null>(null)
+  const [hoveredKey, setHoveredKey] = useState<string | null>(null);
   // Stable click/hover handlers — called with k, dispatch from a ref so
   // closure identity doesn't change per render. The per-item handler
   // closures (`e => ...`, `() => setHoveredKey(k)`) were the
@@ -785,31 +766,28 @@ export function VirtualMessageList({
   // scroll = 1800 short-lived closures/sec. With stable refs the item
   // wrapper props don't change → VirtualItem.memo bails for the ~35
   // unchanged items, only ~25 fresh items pay createElement cost.
-  const handlersRef = useRef({ onItemClick, setHoveredKey })
-  handlersRef.current = { onItemClick, setHoveredKey }
-  const onClickK = useCallback(
-    (msg: RenderableMessage, cellIsBlank: boolean) => {
-      const h = handlersRef.current
-      if (!cellIsBlank && h.onItemClick) h.onItemClick(msg)
-    },
-    [],
-  )
+  const handlersRef = useRef({ onItemClick, setHoveredKey });
+  handlersRef.current = { onItemClick, setHoveredKey };
+  const onClickK = useCallback((msg: RenderableMessage, cellIsBlank: boolean) => {
+    const h = handlersRef.current;
+    if (!cellIsBlank && h.onItemClick) h.onItemClick(msg);
+  }, []);
   const onEnterK = useCallback((k: string) => {
-    handlersRef.current.setHoveredKey(k)
-  }, [])
+    handlersRef.current.setHoveredKey(k);
+  }, []);
   const onLeaveK = useCallback((k: string) => {
-    handlersRef.current.setHoveredKey(prev => (prev === k ? null : prev))
-  }, [])
+    handlersRef.current.setHoveredKey(prev => (prev === k ? null : prev));
+  }, []);
 
   return (
     <>
       <Box ref={spacerRef} height={topSpacer} flexShrink={0} />
       {messages.slice(start, end).map((msg, i) => {
-        const idx = start + i
-        const k = keys[idx]!
-        const clickable = !!onItemClick && (isItemClickable?.(msg) ?? true)
-        const hovered = clickable && hoveredKey === k
-        const expanded = isItemExpanded?.(msg)
+        const idx = start + i;
+        const k = keys[idx]!;
+        const clickable = !!onItemClick && (isItemClickable?.(msg) ?? true);
+        const hovered = clickable && hoveredKey === k;
+        const expanded = isItemExpanded?.(msg);
         return (
           <VirtualItem
             key={k}
@@ -825,7 +803,7 @@ export function VirtualMessageList({
             onLeaveK={onLeaveK}
             renderItem={renderItem}
           />
-        )
+        );
       })}
       {bottomSpacer > 0 && <Box height={bottomSpacer} flexShrink={0} />}
       {trackStickyPrompt && (
@@ -840,10 +818,10 @@ export function VirtualMessageList({
         />
       )}
     </>
-  )
+  );
 }
 
-const NOOP_UNSUB = () => {}
+const NOOP_UNSUB = () => {};
 
 /**
  * Effect-only child that tracks the last user-prompt scrolled above the
@@ -873,38 +851,33 @@ function StickyTracker({
   getItemElement,
   scrollRef,
 }: {
-  messages: RenderableMessage[]
-  start: number
-  end: number
-  offsets: ArrayLike<number>
-  getItemTop: (index: number) => number
-  getItemElement: (index: number) => DOMElement | null
-  scrollRef: RefObject<ScrollBoxHandle | null>
+  messages: RenderableMessage[];
+  start: number;
+  end: number;
+  offsets: ArrayLike<number>;
+  getItemTop: (index: number) => number;
+  getItemElement: (index: number) => DOMElement | null;
+  scrollRef: RefObject<ScrollBoxHandle | null>;
 }): null {
-  const { setStickyPrompt } = useContext(ScrollChromeContext)
+  const { setStickyPrompt } = useContext(ScrollChromeContext);
   // Fine-grained subscription — snapshot is unquantized scrollTop+delta so
   // every scroll action (wheel tick, PgUp, drag) triggers a re-render of
   // THIS component only. Sticky bit folded into the sign so sticky→broken
   // also triggers (scrollToBottom sets sticky without moving scrollTop).
   const subscribe = useCallback(
-    (listener: () => void) =>
-      scrollRef.current?.subscribe(listener) ?? NOOP_UNSUB,
+    (listener: () => void) => scrollRef.current?.subscribe(listener) ?? NOOP_UNSUB,
     [scrollRef],
-  )
+  );
   useSyncExternalStore(subscribe, () => {
-    const s = scrollRef.current
-    if (!s) return NaN
-    const t = s.getScrollTop() + s.getPendingDelta()
-    return s.isSticky() ? -1 - t : t
-  })
+    const s = scrollRef.current;
+    if (!s) return NaN;
+    const t = s.getScrollTop() + s.getPendingDelta();
+    return s.isSticky() ? -1 - t : t;
+  });
 
   // Read live scroll state on every render.
-  const isSticky = scrollRef.current?.isSticky() ?? true
-  const target = Math.max(
-    0,
-    (scrollRef.current?.getScrollTop() ?? 0) +
-      (scrollRef.current?.getPendingDelta() ?? 0),
-  )
+  const isSticky = scrollRef.current?.isSticky() ?? true;
+  const target = Math.max(0, (scrollRef.current?.getScrollTop() ?? 0) + (scrollRef.current?.getPendingDelta() ?? 0));
 
   // Walk the mounted range to find the first item at-or-below the viewport
   // top. `range` is from the parent's coarse-quantum render (may be slightly
@@ -912,40 +885,39 @@ function StickyTracker({
   // directions. Items without a Yoga layout yet (newly mounted this frame)
   // are treated as at-or-below — they're somewhere in view, and assuming
   // otherwise would show a sticky for a prompt that's actually on screen.
-  let firstVisible = start
-  let firstVisibleTop = -1
+  let firstVisible = start;
+  let firstVisibleTop = -1;
   for (let i = end - 1; i >= start; i--) {
-    const top = getItemTop(i)
+    const top = getItemTop(i);
     if (top >= 0) {
-      if (top < target) break
-      firstVisibleTop = top
+      if (top < target) break;
+      firstVisibleTop = top;
     }
-    firstVisible = i
+    firstVisible = i;
   }
 
-  let idx = -1
-  let text: string | null = null
+  let idx = -1;
+  let text: string | null = null;
   if (firstVisible > 0 && !isSticky) {
     for (let i = firstVisible - 1; i >= 0; i--) {
-      const t = stickyPromptText(messages[i]!)
-      if (t === null) continue
+      const t = stickyPromptText(messages[i]!);
+      if (t === null) continue;
       // The prompt's wrapping Box top is above target (that's why it's in
       // the [0, firstVisible) range), but its ❯ is at top+1 (marginTop=1).
       // If the ❯ is at-or-below target, it's VISIBLE at viewport top —
       // showing the same text in the header would duplicate it. Happens
       // in the 1-row gap between Box top scrolling past and ❯ scrolling
       // past. Skip to the next-older prompt (its ❯ is definitely above).
-      const top = getItemTop(i)
-      if (top >= 0 && top + 1 >= target) continue
-      idx = i
-      text = t
-      break
+      const top = getItemTop(i);
+      if (top >= 0 && top + 1 >= target) continue;
+      idx = i;
+      text = t;
+      break;
     }
   }
 
-  const baseOffset =
-    firstVisibleTop >= 0 ? firstVisibleTop - offsets[firstVisible]! : 0
-  const estimate = idx >= 0 ? Math.max(0, baseOffset + offsets[idx]!) : -1
+  const baseOffset = firstVisibleTop >= 0 ? firstVisibleTop - offsets[firstVisible]! : 0;
+  const estimate = idx >= 0 ? Math.max(0, baseOffset + offsets[idx]!) : -1;
 
   // For click-jumps to items not yet mounted (user scrolled far past,
   // prompt is in the topSpacer). Click handler scrolls to the estimate
@@ -954,7 +926,7 @@ function StickyTracker({
   // reads el.yogaNode.getComputedTop() in the SAME calculateLayout pass
   // that produces scrollHeight) — no throttle race. Cap retries: a /clear
   // race could unmount the item mid-sequence.
-  const pending = useRef({ idx: -1, tries: 0 })
+  const pending = useRef({ idx: -1, tries: 0 });
   // Suppression state machine. The click handler arms; the onChange effect
   // consumes (armed→force) then fires-and-clears on the render AFTER that
   // (force→none). The force step poisons the dedup: after click, idx often
@@ -962,14 +934,14 @@ function StickyTracker({
   // without force the last.idx===idx guard would hold 'clicked' until the
   // user crossed a prompt boundary. Previously encoded in last.idx as
   // -1/-2/-3 which overlapped with real indices — too clever.
-  type Suppress = 'none' | 'armed' | 'force'
-  const suppress = useRef<Suppress>('none')
+  type Suppress = 'none' | 'armed' | 'force';
+  const suppress = useRef<Suppress>('none');
   // Dedup on idx only — estimate derives from firstVisibleTop which shifts
   // every scroll tick, so including it in the key made the guard dead
   // (setStickyPrompt fired a fresh {text,scrollTo} per-frame). The scrollTo
   // closure still captures the current estimate; it just doesn't need to
   // re-fire when only estimate moved.
-  const lastIdx = useRef(-1)
+  const lastIdx = useRef(-1);
 
   // setStickyPrompt effect FIRST — must see pending.idx before the
   // correction effect below clears it. On the estimate-fallback path, the
@@ -979,79 +951,79 @@ function StickyTracker({
   // header over 'clicked'.
   useEffect(() => {
     // Hold while two-phase correction is in flight.
-    if (pending.current.idx >= 0) return
+    if (pending.current.idx >= 0) return;
     if (suppress.current === 'armed') {
-      suppress.current = 'force'
-      return
+      suppress.current = 'force';
+      return;
     }
-    const force = suppress.current === 'force'
-    suppress.current = 'none'
-    if (!force && lastIdx.current === idx) return
-    lastIdx.current = idx
+    const force = suppress.current === 'force';
+    suppress.current = 'none';
+    if (!force && lastIdx.current === idx) return;
+    lastIdx.current = idx;
     if (text === null) {
-      setStickyPrompt(null)
-      return
+      setStickyPrompt(null);
+      return;
     }
     // First paragraph only (split on blank line) — a prompt like
     // "still seeing bugs:\n\n1. foo\n2. bar" previews as just the
     // lead-in. trimStart so a leading blank line (queued_command mid-
     // turn messages sometimes have one) doesn't find paraEnd at 0.
-    const trimmed = text.trimStart()
-    const paraEnd = trimmed.search(/\n\s*\n/)
+    const trimmed = text.trimStart();
+    const paraEnd = trimmed.search(/\n\s*\n/);
     const collapsed = (paraEnd >= 0 ? trimmed.slice(0, paraEnd) : trimmed)
       .slice(0, STICKY_TEXT_CAP)
       .replace(/\s+/g, ' ')
-      .trim()
+      .trim();
     if (collapsed === '') {
-      setStickyPrompt(null)
-      return
+      setStickyPrompt(null);
+      return;
     }
-    const capturedIdx = idx
-    const capturedEstimate = estimate
+    const capturedIdx = idx;
+    const capturedEstimate = estimate;
     setStickyPrompt({
       text: collapsed,
       scrollTo: () => {
         // Hide header, keep padding collapsed — FullscreenLayout's
         // 'clicked' sentinel → scrollBox_y=0 + pad=0 → viewportTop=0.
-        setStickyPrompt('clicked')
-        suppress.current = 'armed'
+        setStickyPrompt('clicked');
+        suppress.current = 'armed';
         // scrollToElement anchors by DOMElement ref, not a number:
         // render-node-to-output reads el.yogaNode.getComputedTop() at
         // paint time (same Yoga pass as scrollHeight). No staleness from
         // the throttled render — the ref is stable, the position read is
         // deferred. offset=1 = UserPromptMessage marginTop.
-        const el = getItemElement(capturedIdx)
+        const el = getItemElement(capturedIdx);
         if (el) {
-          scrollRef.current?.scrollToElement(el, 1)
+          scrollRef.current?.scrollToElement(el, 1);
         } else {
           // Not mounted (scrolled far past — in topSpacer). Jump to
           // estimate to mount it; correction effect re-anchors once it
           // appears. Estimate is DEFAULT_ESTIMATE-based — lands short.
-          scrollRef.current?.scrollTo(capturedEstimate)
-          pending.current = { idx: capturedIdx, tries: 0 }
+          scrollRef.current?.scrollTo(capturedEstimate);
+          pending.current = { idx: capturedIdx, tries: 0 };
         }
       },
-    })
+    });
     // No deps — must run every render. Suppression state lives in a ref
     // (not idx/estimate), so a deps-gated effect would never see it tick.
     // Body's own guards short-circuit when nothing changed.
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  })
+  });
 
   // Correction: for click-jumps to unmounted items. Click handler scrolled
   // to the estimate; this re-anchors by element once the item appears.
   // scrollToElement defers the Yoga read to paint time — deterministic.
   // SECOND so it clears pending AFTER the onChange gate above has seen it.
   useEffect(() => {
-    if (pending.current.idx < 0) return
-    const el = getItemElement(pending.current.idx)
+    if (pending.current.idx < 0) return;
+    const el = getItemElement(pending.current.idx);
     if (el) {
-      scrollRef.current?.scrollToElement(el, 1)
-      pending.current = { idx: -1, tries: 0 }
+      scrollRef.current?.scrollToElement(el, 1);
+      pending.current = { idx: -1, tries: 0 };
     } else if (++pending.current.tries > 5) {
-      pending.current = { idx: -1, tries: 0 }
+      pending.current = { idx: -1, tries: 0 };
     }
-  })
+  });
 
-  return null
+  return null;
 }
diff --git a/src/components/WorkflowMultiselectDialog.tsx b/src/components/WorkflowMultiselectDialog.tsx
index d5e1d5460..df53fda48 100644
--- a/src/components/WorkflowMultiselectDialog.tsx
+++ b/src/components/WorkflowMultiselectDialog.tsx
@@ -1,19 +1,19 @@
-import React, { useCallback, useState } from 'react'
-import type { Workflow } from '../commands/install-github-app/types.js'
-import type { ExitState } from '../hooks/useExitOnCtrlCDWithKeybindings.js'
-import { Box, Link, Text, Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink'
-import { ConfigurableShortcutHint } from './ConfigurableShortcutHint.js'
-import { SelectMulti } from './CustomSelect/SelectMulti.js'
+import React, { useCallback, useState } from 'react';
+import type { Workflow } from '../commands/install-github-app/types.js';
+import type { ExitState } from '../hooks/useExitOnCtrlCDWithKeybindings.js';
+import { Box, Link, Text, Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink';
+import { ConfigurableShortcutHint } from './ConfigurableShortcutHint.js';
+import { SelectMulti } from './CustomSelect/SelectMulti.js';
 
 type WorkflowOption = {
-  value: Workflow
-  label: string
-}
+  value: Workflow;
+  label: string;
+};
 
 type Props = {
-  onSubmit: (selectedWorkflows: Workflow[]) => void
-  defaultSelections: Workflow[]
-}
+  onSubmit: (selectedWorkflows: Workflow[]) => void;
+  defaultSelections: Workflow[];
+};
 
 const WORKFLOWS: WorkflowOption[] = [
   {
@@ -24,53 +24,45 @@ const WORKFLOWS: WorkflowOption[] = [
     value: 'claude-review' as const,
     label: 'Claude Code Review - Automated code review on new PRs',
   },
-]
+];
 
 function renderInputGuide(exitState: ExitState): React.ReactNode {
   if (exitState.pending) {
-    return <Text>Press {exitState.keyName} again to exit</Text>
+    return <Text>Press {exitState.keyName} again to exit</Text>;
   }
   return (
     <Byline>
       <KeyboardShortcutHint shortcut="↑↓" action="navigate" />
       <KeyboardShortcutHint shortcut="Space" action="toggle" />
       <KeyboardShortcutHint shortcut="Enter" action="confirm" />
-      <ConfigurableShortcutHint
-        action="confirm:no"
-        context="Confirmation"
-        fallback="Esc"
-        description="cancel"
-      />
+      <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="cancel" />
     </Byline>
-  )
+  );
 }
 
-export function WorkflowMultiselectDialog({
-  onSubmit,
-  defaultSelections,
-}: Props): React.ReactNode {
-  const [showError, setShowError] = useState(false)
+export function WorkflowMultiselectDialog({ onSubmit, defaultSelections }: Props): React.ReactNode {
+  const [showError, setShowError] = useState(false);
 
   const handleSubmit = useCallback(
     (selectedValues: Workflow[]) => {
       if (selectedValues.length === 0) {
-        setShowError(true)
-        return
+        setShowError(true);
+        return;
       }
-      setShowError(false)
-      onSubmit(selectedValues)
+      setShowError(false);
+      onSubmit(selectedValues);
     },
     [onSubmit],
-  )
+  );
 
   const handleChange = useCallback(() => {
-    setShowError(false)
-  }, [])
+    setShowError(false);
+  }, []);
 
   // Cancel just shows the error - user must select at least one workflow
   const handleCancel = useCallback(() => {
-    setShowError(true)
-  }, [])
+    setShowError(true);
+  }, []);
 
   return (
     <Dialog
@@ -102,11 +94,9 @@ export function WorkflowMultiselectDialog({
 
       {showError && (
         <Box>
-          <Text color="error">
-            You must select at least one workflow to continue
-          </Text>
+          <Text color="error">You must select at least one workflow to continue</Text>
         </Box>
       )}
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/WorktreeExitDialog.tsx b/src/components/WorktreeExitDialog.tsx
index 83ea8d554..6ae20dbb9 100644
--- a/src/components/WorktreeExitDialog.tsx
+++ b/src/components/WorktreeExitDialog.tsx
@@ -1,58 +1,43 @@
-import React, { useEffect, useState } from 'react'
-import type { CommandResultDisplay } from 'src/commands.js'
-import { logEvent } from 'src/services/analytics/index.js'
-import { logForDebugging } from 'src/utils/debug.js'
-import { Box, Text, Dialog } from '@anthropic/ink'
-import { execFileNoThrow } from '../utils/execFileNoThrow.js'
-import { getPlansDirectory } from '../utils/plans.js'
-import { setCwd } from '../utils/Shell.js'
-import {
-  cleanupWorktree,
-  getCurrentWorktreeSession,
-  keepWorktree,
-  killTmuxSession,
-} from '../utils/worktree.js'
-import { Select } from './CustomSelect/select.js'
-import { Spinner } from './Spinner.js'
+import React, { useEffect, useState } from 'react';
+import type { CommandResultDisplay } from 'src/commands.js';
+import { logEvent } from 'src/services/analytics/index.js';
+import { logForDebugging } from 'src/utils/debug.js';
+import { Box, Text, Dialog } from '@anthropic/ink';
+import { execFileNoThrow } from '../utils/execFileNoThrow.js';
+import { getPlansDirectory } from '../utils/plans.js';
+import { setCwd } from '../utils/Shell.js';
+import { cleanupWorktree, getCurrentWorktreeSession, keepWorktree, killTmuxSession } from '../utils/worktree.js';
+import { Select } from './CustomSelect/select.js';
+import { Spinner } from './Spinner.js';
 
 // Inline require breaks the cycle this file would otherwise close:
 // sessionStorage → commands → exit → ExitFlow → here. All call sites
 // are inside callbacks, so the lazy require never sees an undefined import.
 function recordWorktreeExit(): void {
   /* eslint-disable @typescript-eslint/no-require-imports */
-  ;(
-    require('../utils/sessionStorage.js') as typeof import('../utils/sessionStorage.js')
-  ).saveWorktreeState(null)
+  (require('../utils/sessionStorage.js') as typeof import('../utils/sessionStorage.js')).saveWorktreeState(null);
   /* eslint-enable @typescript-eslint/no-require-imports */
 }
 
 type Props = {
-  onDone: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-  onCancel?: () => void
-}
+  onDone: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+  onCancel?: () => void;
+};
 
-export function WorktreeExitDialog({
-  onDone,
-  onCancel,
-}: Props): React.ReactNode {
-  const [status, setStatus] = useState<
-    'loading' | 'asking' | 'keeping' | 'removing' | 'done'
-  >('loading')
-  const [changes, setChanges] = useState<string[]>([])
-  const [commitCount, setCommitCount] = useState<number>(0)
-  const [resultMessage, setResultMessage] = useState<string | undefined>()
-  const worktreeSession = getCurrentWorktreeSession()
+export function WorktreeExitDialog({ onDone, onCancel }: Props): React.ReactNode {
+  const [status, setStatus] = useState<'loading' | 'asking' | 'keeping' | 'removing' | 'done'>('loading');
+  const [changes, setChanges] = useState<string[]>([]);
+  const [commitCount, setCommitCount] = useState<number>(0);
+  const [resultMessage, setResultMessage] = useState<string | undefined>();
+  const worktreeSession = getCurrentWorktreeSession();
 
   useEffect(() => {
     async function loadChanges() {
-      let changeLines: string[] = []
-      const gitStatus = await execFileNoThrow('git', ['status', '--porcelain'])
+      let changeLines: string[] = [];
+      const gitStatus = await execFileNoThrow('git', ['status', '--porcelain']);
       if (gitStatus.stdout) {
-        changeLines = gitStatus.stdout.split('\n').filter(_ => _.trim() !== '')
-        setChanges(changeLines)
+        changeLines = gitStatus.stdout.split('\n').filter(_ => _.trim() !== '');
+        setChanges(changeLines);
       }
 
       // Check for commits to eject
@@ -62,140 +47,137 @@ export function WorktreeExitDialog({
           'rev-list',
           '--count',
           `${worktreeSession.originalHeadCommit}..HEAD`,
-        ])
-        const count = parseInt(commitsStr.trim()) || 0
-        setCommitCount(count)
+        ]);
+        const count = parseInt(commitsStr.trim(), 10) || 0;
+        setCommitCount(count);
 
         // If no changes and no commits, clean up silently
         if (changeLines.length === 0 && count === 0) {
-          setStatus('removing')
+          setStatus('removing');
           void cleanupWorktree()
             .then(() => {
-              process.chdir(worktreeSession.originalCwd)
-              setCwd(worktreeSession.originalCwd)
-              recordWorktreeExit()
-              getPlansDirectory.cache.clear?.()
-              setResultMessage('Worktree removed (no changes)')
+              process.chdir(worktreeSession.originalCwd);
+              setCwd(worktreeSession.originalCwd);
+              recordWorktreeExit();
+              getPlansDirectory.cache.clear?.();
+              setResultMessage('Worktree removed (no changes)');
             })
             .catch(error => {
               logForDebugging(`Failed to clean up worktree: ${error}`, {
                 level: 'error',
-              })
-              setResultMessage('Worktree cleanup failed, exiting anyway')
+              });
+              setResultMessage('Worktree cleanup failed, exiting anyway');
             })
             .then(() => {
-              setStatus('done')
-            })
-          return
+              setStatus('done');
+            });
+          return;
         } else {
-          setStatus('asking')
+          setStatus('asking');
         }
       }
     }
-    void loadChanges()
+    void loadChanges();
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    // biome-ignore lint/correctness/useExhaustiveDependencies: intentional
-  }, [worktreeSession])
+  }, [worktreeSession]);
 
   useEffect(() => {
     if (status === 'done') {
-      onDone(resultMessage)
+      onDone(resultMessage);
     }
-  }, [status, onDone, resultMessage])
+  }, [status, onDone, resultMessage]);
 
   if (!worktreeSession) {
-    onDone('No active worktree session found', { display: 'system' })
-    return null
+    onDone('No active worktree session found', { display: 'system' });
+    return null;
   }
 
   if (status === 'loading' || status === 'done') {
-    return null
+    return null;
   }
 
   async function handleSelect(value: string) {
-    if (!worktreeSession) return
+    if (!worktreeSession) return;
 
-    const hasTmux = Boolean(worktreeSession.tmuxSessionName)
+    const hasTmux = Boolean(worktreeSession.tmuxSessionName);
 
     if (value === 'keep' || value === 'keep-with-tmux') {
-      setStatus('keeping')
+      setStatus('keeping');
       logEvent('tengu_worktree_kept', {
         commits: commitCount,
         changed_files: changes.length,
-      })
-      await keepWorktree()
-      process.chdir(worktreeSession.originalCwd)
-      setCwd(worktreeSession.originalCwd)
-      recordWorktreeExit()
-      getPlansDirectory.cache.clear?.()
+      });
+      await keepWorktree();
+      process.chdir(worktreeSession.originalCwd);
+      setCwd(worktreeSession.originalCwd);
+      recordWorktreeExit();
+      getPlansDirectory.cache.clear?.();
       if (hasTmux) {
         setResultMessage(
           `Worktree kept. Your work is saved at ${worktreeSession.worktreePath} on branch ${worktreeSession.worktreeBranch}. Reattach to tmux session with: tmux attach -t ${worktreeSession.tmuxSessionName}`,
-        )
+        );
       } else {
         setResultMessage(
           `Worktree kept. Your work is saved at ${worktreeSession.worktreePath} on branch ${worktreeSession.worktreeBranch}`,
-        )
+        );
       }
-      setStatus('done')
+      setStatus('done');
     } else if (value === 'keep-kill-tmux') {
-      setStatus('keeping')
+      setStatus('keeping');
       logEvent('tengu_worktree_kept', {
         commits: commitCount,
         changed_files: changes.length,
-      })
+      });
       if (worktreeSession.tmuxSessionName) {
-        await killTmuxSession(worktreeSession.tmuxSessionName)
+        await killTmuxSession(worktreeSession.tmuxSessionName);
       }
-      await keepWorktree()
-      process.chdir(worktreeSession.originalCwd)
-      setCwd(worktreeSession.originalCwd)
-      recordWorktreeExit()
-      getPlansDirectory.cache.clear?.()
+      await keepWorktree();
+      process.chdir(worktreeSession.originalCwd);
+      setCwd(worktreeSession.originalCwd);
+      recordWorktreeExit();
+      getPlansDirectory.cache.clear?.();
       setResultMessage(
         `Worktree kept at ${worktreeSession.worktreePath} on branch ${worktreeSession.worktreeBranch}. Tmux session terminated.`,
-      )
-      setStatus('done')
+      );
+      setStatus('done');
     } else if (value === 'remove' || value === 'remove-with-tmux') {
-      setStatus('removing')
+      setStatus('removing');
       logEvent('tengu_worktree_removed', {
         commits: commitCount,
         changed_files: changes.length,
-      })
+      });
       if (worktreeSession.tmuxSessionName) {
-        await killTmuxSession(worktreeSession.tmuxSessionName)
+        await killTmuxSession(worktreeSession.tmuxSessionName);
       }
       try {
-        await cleanupWorktree()
-        process.chdir(worktreeSession.originalCwd)
-        setCwd(worktreeSession.originalCwd)
-        recordWorktreeExit()
-        getPlansDirectory.cache.clear?.()
+        await cleanupWorktree();
+        process.chdir(worktreeSession.originalCwd);
+        setCwd(worktreeSession.originalCwd);
+        recordWorktreeExit();
+        getPlansDirectory.cache.clear?.();
       } catch (error) {
         logForDebugging(`Failed to clean up worktree: ${error}`, {
           level: 'error',
-        })
-        setResultMessage('Worktree cleanup failed, exiting anyway')
-        setStatus('done')
-        return
+        });
+        setResultMessage('Worktree cleanup failed, exiting anyway');
+        setStatus('done');
+        return;
       }
-      const tmuxNote = hasTmux ? ' Tmux session terminated.' : ''
+      const tmuxNote = hasTmux ? ' Tmux session terminated.' : '';
       if (commitCount > 0 && changes.length > 0) {
         setResultMessage(
           `Worktree removed. ${commitCount} ${commitCount === 1 ? 'commit' : 'commits'} and uncommitted changes were discarded.${tmuxNote}`,
-        )
+        );
       } else if (commitCount > 0) {
         setResultMessage(
           `Worktree removed. ${commitCount} ${commitCount === 1 ? 'commit' : 'commits'} on ${worktreeSession.worktreeBranch} ${commitCount === 1 ? 'was' : 'were'} discarded.${tmuxNote}`,
-        )
+        );
       } else if (changes.length > 0) {
-        setResultMessage(
-          `Worktree removed. Uncommitted changes were discarded.${tmuxNote}`,
-        )
+        setResultMessage(`Worktree removed. Uncommitted changes were discarded.${tmuxNote}`);
       } else {
-        setResultMessage(`Worktree removed.${tmuxNote}`)
+        setResultMessage(`Worktree removed.${tmuxNote}`);
       }
-      setStatus('done')
+      setStatus('done');
     }
   }
 
@@ -205,7 +187,7 @@ export function WorktreeExitDialog({
         <Spinner />
         <Text>Keeping worktree…</Text>
       </Box>
-    )
+    );
   }
 
   if (status === 'removing') {
@@ -214,41 +196,38 @@ export function WorktreeExitDialog({
         <Spinner />
         <Text>Removing worktree…</Text>
       </Box>
-    )
+    );
   }
 
-  const branchName = worktreeSession.worktreeBranch
-  const hasUncommitted = changes.length > 0
-  const hasCommits = commitCount > 0
+  const branchName = worktreeSession.worktreeBranch;
+  const hasUncommitted = changes.length > 0;
+  const hasCommits = commitCount > 0;
 
-  let subtitle = ''
+  let subtitle = '';
   if (hasUncommitted && hasCommits) {
-    subtitle = `You have ${changes.length} uncommitted ${changes.length === 1 ? 'file' : 'files'} and ${commitCount} ${commitCount === 1 ? 'commit' : 'commits'} on ${branchName}. All will be lost if you remove.`
+    subtitle = `You have ${changes.length} uncommitted ${changes.length === 1 ? 'file' : 'files'} and ${commitCount} ${commitCount === 1 ? 'commit' : 'commits'} on ${branchName}. All will be lost if you remove.`;
   } else if (hasUncommitted) {
-    subtitle = `You have ${changes.length} uncommitted ${changes.length === 1 ? 'file' : 'files'}. These will be lost if you remove the worktree.`
+    subtitle = `You have ${changes.length} uncommitted ${changes.length === 1 ? 'file' : 'files'}. These will be lost if you remove the worktree.`;
   } else if (hasCommits) {
-    subtitle = `You have ${commitCount} ${commitCount === 1 ? 'commit' : 'commits'} on ${branchName}. The branch will be deleted if you remove the worktree.`
+    subtitle = `You have ${commitCount} ${commitCount === 1 ? 'commit' : 'commits'} on ${branchName}. The branch will be deleted if you remove the worktree.`;
   } else {
-    subtitle =
-      'You are working in a worktree. Keep it to continue working there, or remove it to clean up.'
+    subtitle = 'You are working in a worktree. Keep it to continue working there, or remove it to clean up.';
   }
 
   function handleCancel() {
     if (onCancel) {
       // Abort exit and return to the session
-      onCancel()
-      return
+      onCancel();
+      return;
     }
     // Fallback: treat Escape as "keep" if no onCancel provided
-    void handleSelect('keep')
+    void handleSelect('keep');
   }
 
   const removeDescription =
-    hasUncommitted || hasCommits
-      ? 'All changes and commits will be lost.'
-      : 'Clean up the worktree directory.'
+    hasUncommitted || hasCommits ? 'All changes and commits will be lost.' : 'Clean up the worktree directory.';
 
-  const hasTmuxSession = Boolean(worktreeSession.tmuxSessionName)
+  const hasTmuxSession = Boolean(worktreeSession.tmuxSessionName);
 
   const options = hasTmuxSession
     ? [
@@ -279,21 +258,13 @@ export function WorktreeExitDialog({
           value: 'remove',
           description: removeDescription,
         },
-      ]
+      ];
 
-  const defaultValue = hasTmuxSession ? 'keep-with-tmux' : 'keep'
+  const defaultValue = hasTmuxSession ? 'keep-with-tmux' : 'keep';
 
   return (
-    <Dialog
-      title="Exiting worktree session"
-      subtitle={subtitle}
-      onCancel={handleCancel}
-    >
-      <Select
-        defaultFocusValue={defaultValue}
-        options={options}
-        onChange={handleSelect}
-      />
+    <Dialog title="Exiting worktree session" subtitle={subtitle} onCancel={handleCancel}>
+      <Select defaultFocusValue={defaultValue} options={options} onChange={handleSelect} />
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/agents/AgentDetail.tsx b/src/components/agents/AgentDetail.tsx
index f27fe6360..fdb6727f4 100644
--- a/src/components/agents/AgentDetail.tsx
+++ b/src/components/agents/AgentDetail.tsx
@@ -1,74 +1,62 @@
-import figures from 'figures'
-import * as React from 'react'
-import { type KeyboardEvent, Box, Text } from '@anthropic/ink'
-import { useKeybinding } from '../../keybindings/useKeybinding.js'
-import type { Tools } from '../../Tool.js'
-import { getAgentColor } from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js'
-import { getMemoryScopeDisplay } from '@claude-code-best/builtin-tools/tools/AgentTool/agentMemory.js'
-import { resolveAgentTools } from '@claude-code-best/builtin-tools/tools/AgentTool/agentToolUtils.js'
-import {
-  type AgentDefinition,
-  isBuiltInAgent,
-} from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
-import { getAgentModelDisplay } from '../../utils/model/agent.js'
-import { Markdown } from '../Markdown.js'
-import { getActualRelativeAgentFilePath } from './agentFileUtils.js'
+import figures from 'figures';
+import * as React from 'react';
+import { type KeyboardEvent, Box, Text } from '@anthropic/ink';
+import { useKeybinding } from '../../keybindings/useKeybinding.js';
+import type { Tools } from '../../Tool.js';
+import { getAgentColor } from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js';
+import { getMemoryScopeDisplay } from '@claude-code-best/builtin-tools/tools/AgentTool/agentMemory.js';
+import { resolveAgentTools } from '@claude-code-best/builtin-tools/tools/AgentTool/agentToolUtils.js';
+import { type AgentDefinition, isBuiltInAgent } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js';
+import { getAgentModelDisplay } from '../../utils/model/agent.js';
+import { Markdown } from '../Markdown.js';
+import { getActualRelativeAgentFilePath } from './agentFileUtils.js';
 
 type Props = {
-  agent: AgentDefinition
-  tools: Tools
-  allAgents?: AgentDefinition[]
-  onBack: () => void
-}
+  agent: AgentDefinition;
+  tools: Tools;
+  allAgents?: AgentDefinition[];
+  onBack: () => void;
+};
 
 export function AgentDetail({ agent, tools, onBack }: Props): React.ReactNode {
-  const resolvedTools = resolveAgentTools(agent, tools, false)
-  const filePath = getActualRelativeAgentFilePath(agent)
-  const backgroundColor = getAgentColor(agent.agentType)
+  const resolvedTools = resolveAgentTools(agent, tools, false);
+  const filePath = getActualRelativeAgentFilePath(agent);
+  const backgroundColor = getAgentColor(agent.agentType);
 
   // Handle Esc to go back
-  useKeybinding('confirm:no', onBack, { context: 'Confirmation' })
+  useKeybinding('confirm:no', onBack, { context: 'Confirmation' });
 
   // Handle Enter to go back
   const handleKeyDown = (e: KeyboardEvent) => {
     if (e.key === 'return') {
-      e.preventDefault()
-      onBack()
+      e.preventDefault();
+      onBack();
     }
-  }
+  };
 
   function renderToolsList(): React.ReactNode {
     if (resolvedTools.hasWildcard) {
-      return <Text>All tools</Text>
+      return <Text>All tools</Text>;
     }
 
     if (!agent.tools || agent.tools.length === 0) {
-      return <Text>None</Text>
+      return <Text>None</Text>;
     }
 
     return (
       <>
-        {resolvedTools.validTools.length > 0 && (
-          <Text>{resolvedTools.validTools.join(', ')}</Text>
-        )}
+        {resolvedTools.validTools.length > 0 && <Text>{resolvedTools.validTools.join(', ')}</Text>}
         {resolvedTools.invalidTools.length > 0 && (
           <Text color="warning">
-            {figures.warning} Unrecognized:{' '}
-            {resolvedTools.invalidTools.join(', ')}
+            {figures.warning} Unrecognized: {resolvedTools.invalidTools.join(', ')}
           </Text>
         )}
       </>
-    )
+    );
   }
 
   return (
-    <Box
-      flexDirection="column"
-      gap={1}
-      tabIndex={0}
-      autoFocus
-      onKeyDown={handleKeyDown}
-    >
+    <Box flexDirection="column" gap={1} tabIndex={0} autoFocus onKeyDown={handleKeyDown}>
       <Text dimColor>{filePath}</Text>
 
       <Box flexDirection="column">
@@ -112,9 +100,7 @@ export function AgentDetail({ agent, tools, onBack }: Props): React.ReactNode {
       {agent.skills && agent.skills.length > 0 && (
         <Text>
           <Text bold>Skills</Text>:{' '}
-          {agent.skills.length > 10
-            ? `${agent.skills.length} skills`
-            : agent.skills.join(', ')}
+          {agent.skills.length > 10 ? `${agent.skills.length} skills` : agent.skills.join(', ')}
         </Text>
       )}
 
@@ -143,5 +129,5 @@ export function AgentDetail({ agent, tools, onBack }: Props): React.ReactNode {
         </>
       )}
     </Box>
-  )
+  );
 }
diff --git a/src/components/agents/AgentEditor.tsx b/src/components/agents/AgentEditor.tsx
index 6bdbb7ec3..639060048 100644
--- a/src/components/agents/AgentEditor.tsx
+++ b/src/components/agents/AgentEditor.tsx
@@ -1,87 +1,80 @@
-import chalk from 'chalk'
-import figures from 'figures'
-import * as React from 'react'
-import { useCallback, useMemo, useState } from 'react'
-import { useSetAppState } from 'src/state/AppState.js'
-import { type KeyboardEvent, Box, Text } from '@anthropic/ink'
-import { useKeybinding } from '../../keybindings/useKeybinding.js'
-import type { Tools } from '../../Tool.js'
+import chalk from 'chalk';
+import figures from 'figures';
+import * as React from 'react';
+import { useCallback, useMemo, useState } from 'react';
+import { useSetAppState } from 'src/state/AppState.js';
+import { type KeyboardEvent, Box, Text } from '@anthropic/ink';
+import { useKeybinding } from '../../keybindings/useKeybinding.js';
+import type { Tools } from '../../Tool.js';
 import {
   type AgentColorName,
   setAgentColor,
-} from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js'
+} from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js';
 import {
   type AgentDefinition,
   getActiveAgentsFromList,
   isCustomAgent,
   isPluginAgent,
-} from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
-import { editFileInEditor } from '../../utils/promptEditor.js'
-import { getActualAgentFilePath, updateAgentFile } from './agentFileUtils.js'
-import { ColorPicker } from './ColorPicker.js'
-import { ModelSelector } from './ModelSelector.js'
-import { ToolSelector } from './ToolSelector.js'
-import { getAgentSourceDisplayName } from './utils.js'
+} from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js';
+import { editFileInEditor } from '../../utils/promptEditor.js';
+import { getActualAgentFilePath, updateAgentFile } from './agentFileUtils.js';
+import { ColorPicker } from './ColorPicker.js';
+import { ModelSelector } from './ModelSelector.js';
+import { ToolSelector } from './ToolSelector.js';
+import { getAgentSourceDisplayName } from './utils.js';
 
 type Props = {
-  agent: AgentDefinition
-  tools: Tools
-  onSaved: (message: string) => void
-  onBack: () => void
-}
+  agent: AgentDefinition;
+  tools: Tools;
+  onSaved: (message: string) => void;
+  onBack: () => void;
+};
 
-type EditMode = 'menu' | 'edit-tools' | 'edit-color' | 'edit-model'
+type EditMode = 'menu' | 'edit-tools' | 'edit-color' | 'edit-model';
 
 type SaveChanges = {
-  tools?: string[]
-  color?: AgentColorName
-  model?: string
-}
+  tools?: string[];
+  color?: AgentColorName;
+  model?: string;
+};
 
-export function AgentEditor({
-  agent,
-  tools,
-  onSaved,
-  onBack,
-}: Props): React.ReactNode {
-  const setAppState = useSetAppState()
-  const [editMode, setEditMode] = useState<EditMode>('menu')
-  const [selectedMenuIndex, setSelectedMenuIndex] = useState(0)
-  const [error, setError] = useState<string | null>(null)
-  const [selectedColor, setSelectedColor] = useState<
-    AgentColorName | undefined
-  >(agent.color as AgentColorName | undefined)
+export function AgentEditor({ agent, tools, onSaved, onBack }: Props): React.ReactNode {
+  const setAppState = useSetAppState();
+  const [editMode, setEditMode] = useState<EditMode>('menu');
+  const [selectedMenuIndex, setSelectedMenuIndex] = useState(0);
+  const [error, setError] = useState<string | null>(null);
+  const [selectedColor, setSelectedColor] = useState<AgentColorName | undefined>(
+    agent.color as AgentColorName | undefined,
+  );
 
   const handleOpenInEditor = useCallback(async () => {
-    const filePath = getActualAgentFilePath(agent)
-    const result = await editFileInEditor(filePath)
+    const filePath = getActualAgentFilePath(agent);
+    const result = await editFileInEditor(filePath);
 
     if (result.error) {
-      setError(result.error)
+      setError(result.error);
     } else {
-      onSaved(
-        `Opened ${agent.agentType} in editor. If you made edits, restart to load the latest version.`,
-      )
+      onSaved(`Opened ${agent.agentType} in editor. If you made edits, restart to load the latest version.`);
     }
-  }, [agent, onSaved])
+  }, [agent, onSaved]);
 
   const handleSave = useCallback(
     async (changes: SaveChanges = {}) => {
-      const { tools: newTools, color: newColor, model: newModel } = changes
-      const finalColor = newColor ?? selectedColor
-      const hasToolsChanged = newTools !== undefined
-      const hasModelChanged = newModel !== undefined
-      const hasColorChanged = finalColor !== agent.color
+      const { tools: newTools, color: newColor, model: newModel } = changes;
+      const finalColor = newColor ?? selectedColor;
+      const hasToolsChanged = newTools !== undefined;
+      const hasModelChanged = newModel !== undefined;
+      const hasColorChanged = finalColor !== agent.color;
 
       if (!hasToolsChanged && !hasModelChanged && !hasColorChanged) {
-        return false
+        return false;
       }
 
       try {
         // Only custom/plugin agents can be edited
         // this is for type safety; the UI shouldn't allow editing otherwise
         if (!isCustomAgent(agent) && !isPluginAgent(agent)) {
-          return false
+          return false;
         }
 
         await updateAgentFile(
@@ -91,10 +84,10 @@ export function AgentEditor({
           agent.getSystemPrompt(),
           finalColor,
           newModel ?? agent.model,
-        )
+        );
 
         if (hasColorChanged && finalColor) {
-          setAgentColor(agent.agentType, finalColor)
+          setAgentColor(agent.agentType, finalColor);
         }
 
         setAppState(state => {
@@ -107,7 +100,7 @@ export function AgentEditor({
                   model: newModel ?? a.model,
                 }
               : a,
-          )
+          );
           return {
             ...state,
             agentDefinitions: {
@@ -115,18 +108,18 @@ export function AgentEditor({
               activeAgents: getActiveAgentsFromList(allAgents),
               allAgents,
             },
-          }
-        })
+          };
+        });
 
-        onSaved(`Updated agent: ${chalk.bold(agent.agentType)}`)
-        return true
+        onSaved(`Updated agent: ${chalk.bold(agent.agentType)}`);
+        return true;
       } catch (err) {
-        setError(err instanceof Error ? err.message : 'Failed to save agent')
-        return false
+        setError(err instanceof Error ? err.message : 'Failed to save agent');
+        return false;
       }
     },
     [agent, selectedColor, onSaved, setAppState],
-  )
+  );
 
   const menuItems = useMemo(
     () => [
@@ -136,53 +129,45 @@ export function AgentEditor({
       { label: 'Edit color', action: () => setEditMode('edit-color') },
     ],
     [handleOpenInEditor],
-  )
+  );
 
   const handleEscape = useCallback(() => {
-    setError(null)
+    setError(null);
     if (editMode === 'menu') {
-      onBack()
+      onBack();
     } else {
-      setEditMode('menu')
+      setEditMode('menu');
     }
-  }, [editMode, onBack])
+  }, [editMode, onBack]);
 
   const handleMenuKeyDown = useCallback(
     (e: KeyboardEvent) => {
       if (e.key === 'up') {
-        e.preventDefault()
-        setSelectedMenuIndex(index => Math.max(0, index - 1))
+        e.preventDefault();
+        setSelectedMenuIndex(index => Math.max(0, index - 1));
       } else if (e.key === 'down') {
-        e.preventDefault()
-        setSelectedMenuIndex(index => Math.min(menuItems.length - 1, index + 1))
+        e.preventDefault();
+        setSelectedMenuIndex(index => Math.min(menuItems.length - 1, index + 1));
       } else if (e.key === 'return') {
-        e.preventDefault()
-        const selectedItem = menuItems[selectedMenuIndex]
+        e.preventDefault();
+        const selectedItem = menuItems[selectedMenuIndex];
         if (selectedItem) {
-          void selectedItem.action()
+          void selectedItem.action();
         }
       }
     },
     [menuItems, selectedMenuIndex],
-  )
+  );
 
-  useKeybinding('confirm:no', handleEscape, { context: 'Confirmation' })
+  useKeybinding('confirm:no', handleEscape, { context: 'Confirmation' });
 
   const renderMenu = (): React.ReactNode => (
-    <Box
-      flexDirection="column"
-      tabIndex={0}
-      autoFocus
-      onKeyDown={handleMenuKeyDown}
-    >
+    <Box flexDirection="column" tabIndex={0} autoFocus onKeyDown={handleMenuKeyDown}>
       <Text dimColor>Source: {getAgentSourceDisplayName(agent.source)}</Text>
 
       <Box marginTop={1} flexDirection="column">
         {menuItems.map((item, index) => (
-          <Text
-            key={item.label}
-            color={index === selectedMenuIndex ? 'suggestion' : undefined}
-          >
+          <Text key={item.label} color={index === selectedMenuIndex ? 'suggestion' : undefined}>
             {index === selectedMenuIndex ? `${figures.pointer} ` : '  '}
             {item.label}
           </Text>
@@ -195,11 +180,11 @@ export function AgentEditor({
         </Box>
       )}
     </Box>
-  )
+  );
 
   switch (editMode) {
     case 'menu':
-      return renderMenu()
+      return renderMenu();
 
     case 'edit-tools':
       return (
@@ -207,39 +192,37 @@ export function AgentEditor({
           tools={tools}
           initialTools={agent.tools}
           onComplete={async finalTools => {
-            setEditMode('menu')
-            await handleSave({ tools: finalTools })
+            setEditMode('menu');
+            await handleSave({ tools: finalTools });
           }}
         />
-      )
+      );
 
     case 'edit-color':
       return (
         <ColorPicker
           agentName={agent.agentType}
-          currentColor={
-            selectedColor || (agent.color as AgentColorName) || 'automatic'
-          }
+          currentColor={selectedColor || (agent.color as AgentColorName) || 'automatic'}
           onConfirm={async color => {
-            setSelectedColor(color)
-            setEditMode('menu')
-            await handleSave({ color })
+            setSelectedColor(color);
+            setEditMode('menu');
+            await handleSave({ color });
           }}
         />
-      )
+      );
 
     case 'edit-model':
       return (
         <ModelSelector
           initialModel={agent.model}
           onComplete={async model => {
-            setEditMode('menu')
-            await handleSave({ model })
+            setEditMode('menu');
+            await handleSave({ model });
           }}
         />
-      )
+      );
 
     default:
-      return null
+      return null;
   }
 }
diff --git a/src/components/agents/AgentNavigationFooter.tsx b/src/components/agents/AgentNavigationFooter.tsx
index e52149f6a..c0b935e63 100644
--- a/src/components/agents/AgentNavigationFooter.tsx
+++ b/src/components/agents/AgentNavigationFooter.tsx
@@ -1,23 +1,19 @@
-import * as React from 'react'
-import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js'
-import { Box, Text } from '@anthropic/ink'
+import * as React from 'react';
+import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js';
+import { Box, Text } from '@anthropic/ink';
 
 type Props = {
-  instructions?: string
-}
+  instructions?: string;
+};
 
 export function AgentNavigationFooter({
   instructions = 'Press ↑↓ to navigate · Enter to select · Esc to go back',
 }: Props): React.ReactNode {
-  const exitState = useExitOnCtrlCDWithKeybindings()
+  const exitState = useExitOnCtrlCDWithKeybindings();
 
   return (
     <Box marginLeft={2}>
-      <Text dimColor>
-        {exitState.pending
-          ? `Press ${exitState.keyName} again to exit`
-          : instructions}
-      </Text>
+      <Text dimColor>{exitState.pending ? `Press ${exitState.keyName} again to exit` : instructions}</Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/agents/AgentsList.tsx b/src/components/agents/AgentsList.tsx
index 11b632daf..04e7240b2 100644
--- a/src/components/agents/AgentsList.tsx
+++ b/src/components/agents/AgentsList.tsx
@@ -1,52 +1,41 @@
-import figures from 'figures'
-import * as React from 'react'
-import type { SettingSource } from 'src/utils/settings/constants.js'
-import { type KeyboardEvent, Box, Text } from '@anthropic/ink'
-import type { ResolvedAgent } from '@claude-code-best/builtin-tools/tools/AgentTool/agentDisplay.js'
+import figures from 'figures';
+import * as React from 'react';
+import type { SettingSource } from 'src/utils/settings/constants.js';
+import { type KeyboardEvent, Box, Text } from '@anthropic/ink';
+import type { ResolvedAgent } from '@claude-code-best/builtin-tools/tools/AgentTool/agentDisplay.js';
 import {
   AGENT_SOURCE_GROUPS,
   compareAgentsByName,
   getOverrideSourceLabel,
   resolveAgentModelDisplay,
-} from '@claude-code-best/builtin-tools/tools/AgentTool/agentDisplay.js'
-import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
-import { count } from '../../utils/array.js'
-import { Dialog, Divider } from '@anthropic/ink'
-import { getAgentSourceDisplayName } from './utils.js'
+} from '@claude-code-best/builtin-tools/tools/AgentTool/agentDisplay.js';
+import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js';
+import { count } from '../../utils/array.js';
+import { Dialog, Divider } from '@anthropic/ink';
+import { getAgentSourceDisplayName } from './utils.js';
 
 type Props = {
-  source: SettingSource | 'all' | 'built-in' | 'plugin'
-  agents: ResolvedAgent[]
-  onBack: () => void
-  onSelect: (agent: AgentDefinition) => void
-  onCreateNew?: () => void
-  changes?: string[]
-}
+  source: SettingSource | 'all' | 'built-in' | 'plugin';
+  agents: ResolvedAgent[];
+  onBack: () => void;
+  onSelect: (agent: AgentDefinition) => void;
+  onCreateNew?: () => void;
+  changes?: string[];
+};
 
-export function AgentsList({
-  source,
-  agents,
-  onBack,
-  onSelect,
-  onCreateNew,
-  changes,
-}: Props): React.ReactNode {
-  const [selectedAgent, setSelectedAgent] =
-    React.useState<ResolvedAgent | null>(null)
-  const [isCreateNewSelected, setIsCreateNewSelected] = React.useState(true)
+export function AgentsList({ source, agents, onBack, onSelect, onCreateNew, changes }: Props): React.ReactNode {
+  const [selectedAgent, setSelectedAgent] = React.useState<ResolvedAgent | null>(null);
+  const [isCreateNewSelected, setIsCreateNewSelected] = React.useState(true);
 
   // Sort agents alphabetically by name within each source group
-  const sortedAgents = React.useMemo(
-    () => [...agents].sort(compareAgentsByName),
-    [agents],
-  )
+  const sortedAgents = React.useMemo(() => [...agents].sort(compareAgentsByName), [agents]);
 
   const getOverrideInfo = (agent: ResolvedAgent) => {
     return {
       isOverridden: !!agent.overriddenBy,
       overriddenBy: agent.overriddenBy || null,
-    }
-  }
+    };
+  };
 
   const renderCreateNewOption = () => {
     return (
@@ -54,26 +43,24 @@ export function AgentsList({
         <Text color={isCreateNewSelected ? 'suggestion' : undefined}>
           {isCreateNewSelected ? `${figures.pointer} ` : '  '}
         </Text>
-        <Text color={isCreateNewSelected ? 'suggestion' : undefined}>
-          Create new agent
-        </Text>
+        <Text color={isCreateNewSelected ? 'suggestion' : undefined}>Create new agent</Text>
       </Box>
-    )
-  }
+    );
+  };
 
   const renderAgent = (agent: ResolvedAgent) => {
-    const isBuiltIn = agent.source === 'built-in'
+    const isBuiltIn = agent.source === 'built-in';
     const isSelected =
       !isBuiltIn &&
       !isCreateNewSelected &&
       selectedAgent?.agentType === agent.agentType &&
-      selectedAgent?.source === agent.source
+      selectedAgent?.source === agent.source;
 
-    const { isOverridden, overriddenBy } = getOverrideInfo(agent)
-    const dimmed = isBuiltIn || isOverridden
-    const textColor = !isBuiltIn && isSelected ? 'suggestion' : undefined
+    const { isOverridden, overriddenBy } = getOverrideInfo(agent);
+    const dimmed = isBuiltIn || isOverridden;
+    const textColor = !isBuiltIn && isSelected ? 'suggestion' : undefined;
 
-    const resolvedModel = resolveAgentModelDisplay(agent)
+    const resolvedModel = resolveAgentModelDisplay(agent);
 
     return (
       <Box key={`${agent.agentType}-${agent.source}`}>
@@ -96,75 +83,64 @@ export function AgentsList({
           </Text>
         )}
         {overriddenBy && (
-          <Text
-            dimColor={!isSelected}
-            color={isSelected ? 'warning' : undefined}
-          >
+          <Text dimColor={!isSelected} color={isSelected ? 'warning' : undefined}>
             {' '}
             {figures.warning} shadowed by {getOverrideSourceLabel(overriddenBy)}
           </Text>
         )}
       </Box>
-    )
-  }
+    );
+  };
 
   const selectableAgentsInOrder = React.useMemo(() => {
-    const nonBuiltIn = sortedAgents.filter(a => a.source !== 'built-in')
+    const nonBuiltIn = sortedAgents.filter(a => a.source !== 'built-in');
     if (source === 'all') {
-      return AGENT_SOURCE_GROUPS.filter(g => g.source !== 'built-in').flatMap(
-        ({ source: groupSource }) =>
-          nonBuiltIn.filter(a => a.source === groupSource),
-      )
+      return AGENT_SOURCE_GROUPS.filter(g => g.source !== 'built-in').flatMap(({ source: groupSource }) =>
+        nonBuiltIn.filter(a => a.source === groupSource),
+      );
     }
-    return nonBuiltIn
-  }, [sortedAgents, source])
+    return nonBuiltIn;
+  }, [sortedAgents, source]);
 
   // Set initial selection
   React.useEffect(() => {
-    if (
-      !selectedAgent &&
-      !isCreateNewSelected &&
-      selectableAgentsInOrder.length > 0
-    ) {
+    if (!selectedAgent && !isCreateNewSelected && selectableAgentsInOrder.length > 0) {
       if (onCreateNew) {
-        setIsCreateNewSelected(true)
+        setIsCreateNewSelected(true);
       } else {
-        setSelectedAgent(selectableAgentsInOrder[0] || null)
+        setSelectedAgent(selectableAgentsInOrder[0] || null);
       }
     }
-  }, [selectableAgentsInOrder, selectedAgent, isCreateNewSelected, onCreateNew])
+  }, [selectableAgentsInOrder, selectedAgent, isCreateNewSelected, onCreateNew]);
 
   const handleKeyDown = (e: KeyboardEvent) => {
     if (e.key === 'return') {
-      e.preventDefault()
+      e.preventDefault();
       if (isCreateNewSelected && onCreateNew) {
-        onCreateNew()
+        onCreateNew();
       } else if (selectedAgent) {
-        onSelect(selectedAgent)
+        onSelect(selectedAgent);
       }
-      return
+      return;
     }
 
-    if (e.key !== 'up' && e.key !== 'down') return
-    e.preventDefault()
+    if (e.key !== 'up' && e.key !== 'down') return;
+    e.preventDefault();
 
     // Handle navigation with "Create New Agent" option
-    const hasCreateOption = !!onCreateNew
-    const totalItems =
-      selectableAgentsInOrder.length + (hasCreateOption ? 1 : 0)
+    const hasCreateOption = !!onCreateNew;
+    const totalItems = selectableAgentsInOrder.length + (hasCreateOption ? 1 : 0);
 
-    if (totalItems === 0) return
+    if (totalItems === 0) return;
 
     // Calculate current position in list (0 = create new, 1+ = agents)
-    let currentPosition = 0
+    let currentPosition = 0;
     if (!isCreateNewSelected && selectedAgent) {
       const agentIndex = selectableAgentsInOrder.findIndex(
-        a =>
-          a.agentType === selectedAgent.agentType &&
-          a.source === selectedAgent.source,
-      )
+        a => a.agentType === selectedAgent.agentType && a.source === selectedAgent.source,
+      );
       if (agentIndex >= 0) {
-        currentPosition = hasCreateOption ? agentIndex + 1 : agentIndex
+        currentPosition = hasCreateOption ? agentIndex + 1 : agentIndex;
       }
     }
 
@@ -176,26 +152,24 @@ export function AgentsList({
           : currentPosition - 1
         : currentPosition === totalItems - 1
           ? 0
-          : currentPosition + 1
+          : currentPosition + 1;
 
     // Update selection based on new position
     if (hasCreateOption && newPosition === 0) {
-      setIsCreateNewSelected(true)
-      setSelectedAgent(null)
+      setIsCreateNewSelected(true);
+      setSelectedAgent(null);
     } else {
-      const agentIndex = hasCreateOption ? newPosition - 1 : newPosition
-      const newAgent = selectableAgentsInOrder[agentIndex]
+      const agentIndex = hasCreateOption ? newPosition - 1 : newPosition;
+      const newAgent = selectableAgentsInOrder[agentIndex];
       if (newAgent) {
-        setIsCreateNewSelected(false)
-        setSelectedAgent(newAgent)
+        setIsCreateNewSelected(false);
+        setSelectedAgent(newAgent);
       }
     }
-  }
+  };
 
-  const renderBuiltInAgentsSection = (
-    title = 'Built-in (always available):',
-  ) => {
-    const builtInAgents = sortedAgents.filter(a => a.source === 'built-in')
+  const renderBuiltInAgentsSection = (title = 'Built-in (always available):') => {
+    const builtInAgents = sortedAgents.filter(a => a.source === 'built-in');
     return (
       <Box flexDirection="column" marginBottom={1} paddingLeft={2}>
         <Text bold dimColor>
@@ -203,13 +177,13 @@ export function AgentsList({
         </Text>
         {builtInAgents.map(renderAgent)}
       </Box>
-    )
-  }
+    );
+  };
 
   const renderAgentGroup = (title: string, groupAgents: ResolvedAgent[]) => {
-    if (!groupAgents.length) return null
+    if (!groupAgents.length) return null;
 
-    const folderPath = groupAgents[0]?.baseDir
+    const folderPath = groupAgents[0]?.baseDir;
 
     return (
       <Box flexDirection="column" marginBottom={1}>
@@ -221,55 +195,35 @@ export function AgentsList({
         </Box>
         {groupAgents.map(agent => renderAgent(agent))}
       </Box>
-    )
-  }
+    );
+  };
 
-  const sourceTitle = getAgentSourceDisplayName(source)
+  const sourceTitle = getAgentSourceDisplayName(source);
 
-  const builtInAgents = sortedAgents.filter(a => a.source === 'built-in')
+  const builtInAgents = sortedAgents.filter(a => a.source === 'built-in');
 
   const hasNoAgents =
-    !sortedAgents.length ||
-    (source !== 'built-in' && !sortedAgents.some(a => a.source !== 'built-in'))
+    !sortedAgents.length || (source !== 'built-in' && !sortedAgents.some(a => a.source !== 'built-in'));
 
   if (hasNoAgents) {
     return (
-      <Dialog
-        title={sourceTitle}
-        subtitle="No agents found"
-        onCancel={onBack}
-        hideInputGuide
-      >
-        <Box
-          flexDirection="column"
-          gap={1}
-          tabIndex={0}
-          autoFocus
-          onKeyDown={handleKeyDown}
-        >
+      <Dialog title={sourceTitle} subtitle="No agents found" onCancel={onBack} hideInputGuide>
+        <Box flexDirection="column" gap={1} tabIndex={0} autoFocus onKeyDown={handleKeyDown}>
           {onCreateNew && <Box>{renderCreateNewOption()}</Box>}
+          <Text dimColor>No agents found. Create specialized subagents that Claude can delegate to.</Text>
+          <Text dimColor>Each subagent has its own context window, custom system prompt, and specific tools.</Text>
           <Text dimColor>
-            No agents found. Create specialized subagents that Claude can
-            delegate to.
+            Try creating: Code Reviewer, Code Simplifier, Security Reviewer, Tech Lead, or UX Reviewer.
           </Text>
-          <Text dimColor>
-            Each subagent has its own context window, custom system prompt, and
-            specific tools.
-          </Text>
-          <Text dimColor>
-            Try creating: Code Reviewer, Code Simplifier, Security Reviewer,
-            Tech Lead, or UX Reviewer.
-          </Text>
-          {source !== 'built-in' &&
-            sortedAgents.some(a => a.source === 'built-in') && (
-              <>
-                <Divider />
-                {renderBuiltInAgentsSection()}
-              </>
-            )}
+          {source !== 'built-in' && sortedAgents.some(a => a.source === 'built-in') && (
+            <>
+              <Divider />
+              {renderBuiltInAgentsSection()}
+            </>
+          )}
         </Box>
       </Dialog>
-    )
+    );
   }
 
   return (
@@ -284,25 +238,18 @@ export function AgentsList({
           <Text dimColor>{changes[changes.length - 1]}</Text>
         </Box>
       )}
-      <Box
-        flexDirection="column"
-        tabIndex={0}
-        autoFocus
-        onKeyDown={handleKeyDown}
-      >
+      <Box flexDirection="column" tabIndex={0} autoFocus onKeyDown={handleKeyDown}>
         {onCreateNew && <Box marginBottom={1}>{renderCreateNewOption()}</Box>}
         {source === 'all' ? (
           <>
-            {AGENT_SOURCE_GROUPS.filter(g => g.source !== 'built-in').map(
-              ({ label, source: groupSource }) => (
-                <React.Fragment key={groupSource}>
-                  {renderAgentGroup(
-                    label,
-                    sortedAgents.filter(a => a.source === groupSource),
-                  )}
-                </React.Fragment>
-              ),
-            )}
+            {AGENT_SOURCE_GROUPS.filter(g => g.source !== 'built-in').map(({ label, source: groupSource }) => (
+              <React.Fragment key={groupSource}>
+                {renderAgentGroup(
+                  label,
+                  sortedAgents.filter(a => a.source === groupSource),
+                )}
+              </React.Fragment>
+            ))}
             {builtInAgents.length > 0 && (
               <Box flexDirection="column" marginBottom={1} paddingLeft={2}>
                 <Text dimColor>
@@ -323,9 +270,7 @@ export function AgentsList({
           </>
         ) : (
           <>
-            {sortedAgents
-              .filter(a => a.source !== 'built-in')
-              .map(agent => renderAgent(agent))}
+            {sortedAgents.filter(a => a.source !== 'built-in').map(agent => renderAgent(agent))}
             {sortedAgents.some(a => a.source === 'built-in') && (
               <>
                 <Divider />
@@ -336,5 +281,5 @@ export function AgentsList({
         )}
       </Box>
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/agents/AgentsMenu.tsx b/src/components/agents/AgentsMenu.tsx
index ce2e789ca..6804f8dad 100644
--- a/src/components/agents/AgentsMenu.tsx
+++ b/src/components/agents/AgentsMenu.tsx
@@ -1,62 +1,56 @@
-import chalk from 'chalk'
-import * as React from 'react'
-import { useCallback, useMemo, useState } from 'react'
-import type { SettingSource } from 'src/utils/settings/constants.js'
-import type { CommandResultDisplay } from '../../commands.js'
-import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js'
-import { useMergedTools } from '../../hooks/useMergedTools.js'
-import { Box, Text } from '@anthropic/ink'
-import { useAppState, useSetAppState } from '../../state/AppState.js'
-import type { Tools } from '../../Tool.js'
+import chalk from 'chalk';
+import * as React from 'react';
+import { useCallback, useMemo, useState } from 'react';
+import type { SettingSource } from 'src/utils/settings/constants.js';
+import type { CommandResultDisplay } from '../../commands.js';
+import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js';
+import { useMergedTools } from '../../hooks/useMergedTools.js';
+import { Box, Text } from '@anthropic/ink';
+import { useAppState, useSetAppState } from '../../state/AppState.js';
+import type { Tools } from '../../Tool.js';
 import {
   type ResolvedAgent,
   resolveAgentOverrides,
-} from '@claude-code-best/builtin-tools/tools/AgentTool/agentDisplay.js'
+} from '@claude-code-best/builtin-tools/tools/AgentTool/agentDisplay.js';
 import {
   type AgentDefinition,
   getActiveAgentsFromList,
-} from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
-import { toError } from '../../utils/errors.js'
-import { logError } from '../../utils/log.js'
-import { Select } from '../CustomSelect/select.js'
-import { Dialog } from '@anthropic/ink'
-import { AgentDetail } from './AgentDetail.js'
-import { AgentEditor } from './AgentEditor.js'
-import { AgentNavigationFooter } from './AgentNavigationFooter.js'
-import { AgentsList } from './AgentsList.js'
-import { deleteAgentFromFile } from './agentFileUtils.js'
-import { CreateAgentWizard } from './new-agent-creation/CreateAgentWizard.js'
-import type { ModeState } from './types.js'
+} from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js';
+import { toError } from '../../utils/errors.js';
+import { logError } from '../../utils/log.js';
+import { Select } from '../CustomSelect/select.js';
+import { Dialog } from '@anthropic/ink';
+import { AgentDetail } from './AgentDetail.js';
+import { AgentEditor } from './AgentEditor.js';
+import { AgentNavigationFooter } from './AgentNavigationFooter.js';
+import { AgentsList } from './AgentsList.js';
+import { deleteAgentFromFile } from './agentFileUtils.js';
+import { CreateAgentWizard } from './new-agent-creation/CreateAgentWizard.js';
+import type { ModeState } from './types.js';
 
 type Props = {
-  tools: Tools
-  onExit: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-}
+  tools: Tools;
+  onExit: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+};
 
 export function AgentsMenu({ tools, onExit }: Props): React.ReactNode {
   const [modeState, setModeState] = useState<ModeState>({
     mode: 'list-agents',
     source: 'all',
-  })
-  const agentDefinitions = useAppState(s => s.agentDefinitions)
-  const mcpTools = useAppState(s => s.mcp.tools)
-  const toolPermissionContext = useAppState(s => s.toolPermissionContext)
-  const setAppState = useSetAppState()
-  const { allAgents, activeAgents: agents } = agentDefinitions
-  const [changes, setChanges] = useState<string[]>([])
+  });
+  const agentDefinitions = useAppState(s => s.agentDefinitions);
+  const mcpTools = useAppState(s => s.mcp.tools);
+  const toolPermissionContext = useAppState(s => s.toolPermissionContext);
+  const setAppState = useSetAppState();
+  const { allAgents, activeAgents: agents } = agentDefinitions;
+  const [changes, setChanges] = useState<string[]>([]);
 
   // Get MCP tools from app state and merge with local tools
-  const mergedTools = useMergedTools(tools, mcpTools, toolPermissionContext)
+  const mergedTools = useMergedTools(tools, mcpTools, toolPermissionContext);
 
-  useExitOnCtrlCDWithKeybindings()
+  useExitOnCtrlCDWithKeybindings();
 
-  const agentsBySource: Record<
-    SettingSource | 'all' | 'built-in' | 'plugin',
-    AgentDefinition[]
-  > = useMemo(
+  const agentsBySource: Record<SettingSource | 'all' | 'built-in' | 'plugin', AgentDefinition[]> = useMemo(
     () => ({
       'built-in': allAgents.filter(a => a.source === 'built-in'),
       userSettings: allAgents.filter(a => a.source === 'userSettings'),
@@ -68,22 +62,21 @@ export function AgentsMenu({ tools, onExit }: Props): React.ReactNode {
       all: allAgents,
     }),
     [allAgents],
-  )
+  );
 
   const handleAgentCreated = useCallback((message: string) => {
-    setChanges(prev => [...prev, message])
-    setModeState({ mode: 'list-agents', source: 'all' })
-  }, [])
+    setChanges(prev => [...prev, message]);
+    setModeState({ mode: 'list-agents', source: 'all' });
+  }, []);
 
   const handleAgentDeleted = useCallback(
     async (agent: AgentDefinition) => {
       try {
-        await deleteAgentFromFile(agent)
+        await deleteAgentFromFile(agent);
         setAppState(state => {
           const allAgents = state.agentDefinitions.allAgents.filter(
-            a =>
-              !(a.agentType === agent.agentType && a.source === agent.source),
-          )
+            a => !(a.agentType === agent.agentType && a.source === agent.source),
+          );
           return {
             ...state,
             agentDefinitions: {
@@ -91,21 +84,18 @@ export function AgentsMenu({ tools, onExit }: Props): React.ReactNode {
               allAgents,
               activeAgents: getActiveAgentsFromList(allAgents),
             },
-          }
-        })
+          };
+        });
 
-        setChanges(prev => [
-          ...prev,
-          `Deleted agent: ${chalk.bold(agent.agentType)}`,
-        ])
+        setChanges(prev => [...prev, `Deleted agent: ${chalk.bold(agent.agentType)}`]);
         // Go back to the agents list after deletion
-        setModeState({ mode: 'list-agents', source: 'all' })
+        setModeState({ mode: 'list-agents', source: 'all' });
       } catch (error) {
-        logError(toError(error))
+        logError(toError(error));
       }
     },
     [setAppState],
-  )
+  );
 
   // Render based on mode
   switch (modeState.mode) {
@@ -121,11 +111,11 @@ export function AgentsMenu({ tools, onExit }: Props): React.ReactNode {
               ...agentsBySource['flagSettings'],
               ...agentsBySource['plugin'],
             ]
-          : agentsBySource[modeState.source]
+          : agentsBySource[modeState.source];
 
       // Resolve overrides and filter to the agents we want to show
-      const allResolved = resolveAgentOverrides(agentsToShow, agents)
-      const resolvedAgents: ResolvedAgent[] = allResolved
+      const allResolved = resolveAgentOverrides(agentsToShow, agents);
+      const resolvedAgents: ResolvedAgent[] = allResolved;
 
       return (
         <>
@@ -133,13 +123,10 @@ export function AgentsMenu({ tools, onExit }: Props): React.ReactNode {
             source={modeState.source}
             agents={resolvedAgents}
             onBack={() => {
-              const exitMessage =
-                changes.length > 0
-                  ? `Agent changes:\n${changes.join('\n')}`
-                  : undefined
+              const exitMessage = changes.length > 0 ? `Agent changes:\n${changes.join('\n')}` : undefined;
               onExit(exitMessage ?? 'Agents dialog dismissed', {
                 display: changes.length === 0 ? 'system' : undefined,
-              })
+              });
             }}
             onSelect={agent =>
               setModeState({
@@ -153,7 +140,7 @@ export function AgentsMenu({ tools, onExit }: Props): React.ReactNode {
           />
           <AgentNavigationFooter />
         </>
-      )
+      );
     }
 
     case 'create-agent':
@@ -164,21 +151,17 @@ export function AgentsMenu({ tools, onExit }: Props): React.ReactNode {
           onComplete={handleAgentCreated}
           onCancel={() => setModeState({ mode: 'list-agents', source: 'all' })}
         />
-      )
+      );
 
     case 'agent-menu': {
       // Always use fresh agent data
       const freshAgent = allAgents.find(
-        a =>
-          a.agentType === modeState.agent.agentType &&
-          a.source === modeState.agent.source,
-      )
-      const agentToUse = freshAgent || modeState.agent
+        a => a.agentType === modeState.agent.agentType && a.source === modeState.agent.source,
+      );
+      const agentToUse = freshAgent || modeState.agent;
 
       const isEditable =
-        agentToUse.source !== 'built-in' &&
-        agentToUse.source !== 'plugin' &&
-        agentToUse.source !== 'flagSettings'
+        agentToUse.source !== 'built-in' && agentToUse.source !== 'plugin' && agentToUse.source !== 'flagSettings';
       const menuItems = [
         { label: 'View agent', value: 'view' },
         ...(isEditable
@@ -188,7 +171,7 @@ export function AgentsMenu({ tools, onExit }: Props): React.ReactNode {
             ]
           : []),
         { label: 'Back', value: 'back' },
-      ]
+      ];
 
       const handleMenuSelect = (value: string): void => {
         switch (value) {
@@ -197,27 +180,27 @@ export function AgentsMenu({ tools, onExit }: Props): React.ReactNode {
               mode: 'view-agent',
               agent: agentToUse,
               previousMode: modeState.previousMode,
-            })
-            break
+            });
+            break;
           case 'edit':
             setModeState({
               mode: 'edit-agent',
               agent: agentToUse,
               previousMode: modeState,
-            })
-            break
+            });
+            break;
           case 'delete':
             setModeState({
               mode: 'delete-confirm',
               agent: agentToUse,
               previousMode: modeState,
-            })
-            break
+            });
+            break;
           case 'back':
-            setModeState(modeState.previousMode)
-            break
+            setModeState(modeState.previousMode);
+            break;
         }
-      }
+      };
 
       return (
         <>
@@ -241,17 +224,15 @@ export function AgentsMenu({ tools, onExit }: Props): React.ReactNode {
           </Dialog>
           <AgentNavigationFooter />
         </>
-      )
+      );
     }
 
     case 'view-agent': {
       // Always use fresh agent data from allAgents
       const freshAgent = allAgents.find(
-        a =>
-          a.agentType === modeState.agent.agentType &&
-          a.source === modeState.agent.source,
-      )
-      const agentToDisplay = freshAgent || modeState.agent
+        a => a.agentType === modeState.agent.agentType && a.source === modeState.agent.source,
+      );
+      const agentToDisplay = freshAgent || modeState.agent;
 
       return (
         <>
@@ -281,28 +262,26 @@ export function AgentsMenu({ tools, onExit }: Props): React.ReactNode {
           </Dialog>
           <AgentNavigationFooter instructions="Press Enter or Esc to go back" />
         </>
-      )
+      );
     }
 
     case 'delete-confirm': {
       const deleteOptions = [
         { label: 'Yes, delete', value: 'yes' },
         { label: 'No, cancel', value: 'no' },
-      ]
+      ];
 
       return (
         <>
           <Dialog
             title="Delete agent"
             onCancel={() => {
-              if ('previousMode' in modeState)
-                setModeState(modeState.previousMode)
+              if ('previousMode' in modeState) setModeState(modeState.previousMode);
             }}
             color="error"
           >
             <Text>
-              Are you sure you want to delete the agent{' '}
-              <Text bold>{modeState.agent.agentType}</Text>?
+              Are you sure you want to delete the agent <Text bold>{modeState.agent.agentType}</Text>?
             </Text>
             <Box marginTop={1}>
               <Text dimColor>Source: {modeState.agent.source}</Text>
@@ -312,16 +291,16 @@ export function AgentsMenu({ tools, onExit }: Props): React.ReactNode {
                 options={deleteOptions}
                 onChange={(value: string) => {
                   if (value === 'yes') {
-                    void handleAgentDeleted(modeState.agent)
+                    void handleAgentDeleted(modeState.agent);
                   } else {
                     if ('previousMode' in modeState) {
-                      setModeState(modeState.previousMode)
+                      setModeState(modeState.previousMode);
                     }
                   }
                 }}
                 onCancel={() => {
                   if ('previousMode' in modeState) {
-                    setModeState(modeState.previousMode)
+                    setModeState(modeState.previousMode);
                   }
                 }}
               />
@@ -329,17 +308,15 @@ export function AgentsMenu({ tools, onExit }: Props): React.ReactNode {
           </Dialog>
           <AgentNavigationFooter instructions="Press ↑↓ to navigate, Enter to select, Esc to cancel" />
         </>
-      )
+      );
     }
 
     case 'edit-agent': {
       // Always use fresh agent data
       const freshAgent = allAgents.find(
-        a =>
-          a.agentType === modeState.agent.agentType &&
-          a.source === modeState.agent.source,
-      )
-      const agentToEdit = freshAgent || modeState.agent
+        a => a.agentType === modeState.agent.agentType && a.source === modeState.agent.source,
+      );
+      const agentToEdit = freshAgent || modeState.agent;
 
       return (
         <>
@@ -352,18 +329,18 @@ export function AgentsMenu({ tools, onExit }: Props): React.ReactNode {
               agent={agentToEdit}
               tools={mergedTools}
               onSaved={message => {
-                handleAgentCreated(message)
-                setModeState(modeState.previousMode)
+                handleAgentCreated(message);
+                setModeState(modeState.previousMode);
               }}
               onBack={() => setModeState(modeState.previousMode)}
             />
           </Dialog>
           <AgentNavigationFooter />
         </>
-      )
+      );
     }
 
     default:
-      return null
+      return null;
   }
 }
diff --git a/src/components/agents/ColorPicker.tsx b/src/components/agents/ColorPicker.tsx
index 3e74ea8ca..67c7e6ca7 100644
--- a/src/components/agents/ColorPicker.tsx
+++ b/src/components/agents/ColorPicker.tsx
@@ -1,85 +1,65 @@
-import figures from 'figures'
-import React, { useState } from 'react'
-import type { KeyboardEvent } from '@anthropic/ink'
-import { Box, Text } from '@anthropic/ink'
+import figures from 'figures';
+import React, { useState } from 'react';
+import type { KeyboardEvent } from '@anthropic/ink';
+import { Box, Text } from '@anthropic/ink';
 import {
   AGENT_COLOR_TO_THEME_COLOR,
   AGENT_COLORS,
   type AgentColorName,
-} from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js'
-import { capitalize } from '../../utils/stringUtils.js'
+} from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js';
+import { capitalize } from '../../utils/stringUtils.js';
 
-type ColorOption = AgentColorName | 'automatic'
+type ColorOption = AgentColorName | 'automatic';
 
-const COLOR_OPTIONS: ColorOption[] = ['automatic', ...AGENT_COLORS]
+const COLOR_OPTIONS: ColorOption[] = ['automatic', ...AGENT_COLORS];
 
 type Props = {
-  agentName: string
-  currentColor?: AgentColorName | 'automatic'
-  onConfirm: (color: AgentColorName | undefined) => void
-}
+  agentName: string;
+  currentColor?: AgentColorName | 'automatic';
+  onConfirm: (color: AgentColorName | undefined) => void;
+};
 
-export function ColorPicker({
-  agentName,
-  currentColor = 'automatic',
-  onConfirm,
-}: Props): React.ReactNode {
-  const [selectedIndex, setSelectedIndex] = useState(
-    Math.max(
-      0,
-      COLOR_OPTIONS.findIndex(opt => opt === currentColor),
-    ),
-  )
+export function ColorPicker({ agentName, currentColor = 'automatic', onConfirm }: Props): React.ReactNode {
+  const [selectedIndex, setSelectedIndex] = useState(Math.max(0, COLOR_OPTIONS.indexOf(currentColor)));
 
   const handleKeyDown = (e: KeyboardEvent) => {
     if (e.key === 'up') {
-      e.preventDefault()
-      setSelectedIndex(prev => (prev > 0 ? prev - 1 : COLOR_OPTIONS.length - 1))
+      e.preventDefault();
+      setSelectedIndex(prev => (prev > 0 ? prev - 1 : COLOR_OPTIONS.length - 1));
     } else if (e.key === 'down') {
-      e.preventDefault()
-      setSelectedIndex(prev => (prev < COLOR_OPTIONS.length - 1 ? prev + 1 : 0))
+      e.preventDefault();
+      setSelectedIndex(prev => (prev < COLOR_OPTIONS.length - 1 ? prev + 1 : 0));
     } else if (e.key === 'return') {
-      e.preventDefault()
-      const selected = COLOR_OPTIONS[selectedIndex]
-      onConfirm(selected === 'automatic' ? undefined : selected)
+      e.preventDefault();
+      const selected = COLOR_OPTIONS[selectedIndex];
+      onConfirm(selected === 'automatic' ? undefined : selected);
     }
-  }
+  };
 
-  const selectedValue = COLOR_OPTIONS[selectedIndex]
+  const selectedValue = COLOR_OPTIONS[selectedIndex];
 
   return (
-    <Box
-      flexDirection="column"
-      gap={1}
-      tabIndex={0}
-      autoFocus
-      onKeyDown={handleKeyDown}
-    >
+    <Box flexDirection="column" gap={1} tabIndex={0} autoFocus onKeyDown={handleKeyDown}>
       <Box flexDirection="column">
         {COLOR_OPTIONS.map((option, index) => {
-          const isSelected = index === selectedIndex
+          const isSelected = index === selectedIndex;
 
           return (
             <Box key={option} flexDirection="row" gap={1}>
-              <Text color={isSelected ? 'suggestion' : undefined}>
-                {isSelected ? figures.pointer : ' '}
-              </Text>
+              <Text color={isSelected ? 'suggestion' : undefined}>{isSelected ? figures.pointer : ' '}</Text>
 
               {option === 'automatic' ? (
                 <Text bold={isSelected}>Automatic color</Text>
               ) : (
                 <Box gap={1}>
-                  <Text
-                    backgroundColor={AGENT_COLOR_TO_THEME_COLOR[option]}
-                    color="inverseText"
-                  >
+                  <Text backgroundColor={AGENT_COLOR_TO_THEME_COLOR[option]} color="inverseText">
                     {' '}
                   </Text>
                   <Text bold={isSelected}>{capitalize(option)}</Text>
                 </Box>
               )}
             </Box>
-          )
+          );
         })}
       </Box>
 
@@ -91,16 +71,12 @@ export function ColorPicker({
             @{agentName}{' '}
           </Text>
         ) : (
-          <Text
-            backgroundColor={AGENT_COLOR_TO_THEME_COLOR[selectedValue]}
-            color="inverseText"
-            bold
-          >
+          <Text backgroundColor={AGENT_COLOR_TO_THEME_COLOR[selectedValue]} color="inverseText" bold>
             {' '}
             @{agentName}{' '}
           </Text>
         )}
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/components/agents/ModelSelector.tsx b/src/components/agents/ModelSelector.tsx
index c3707d3fd..c2266a67c 100644
--- a/src/components/agents/ModelSelector.tsx
+++ b/src/components/agents/ModelSelector.tsx
@@ -1,21 +1,17 @@
-import * as React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { getAgentModelOptions } from '../../utils/model/agent.js'
-import { Select } from '../CustomSelect/select.js'
+import * as React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { getAgentModelOptions } from '../../utils/model/agent.js';
+import { Select } from '../CustomSelect/select.js';
 
 interface ModelSelectorProps {
-  initialModel?: string
-  onComplete: (model?: string) => void
-  onCancel?: () => void
+  initialModel?: string;
+  onComplete: (model?: string) => void;
+  onCancel?: () => void;
 }
 
-export function ModelSelector({
-  initialModel,
-  onComplete,
-  onCancel,
-}: ModelSelectorProps): React.ReactNode {
+export function ModelSelector({ initialModel, onComplete, onCancel }: ModelSelectorProps): React.ReactNode {
   const modelOptions = React.useMemo(() => {
-    const base = getAgentModelOptions()
+    const base = getAgentModelOptions();
     // If the agent's current model is a full ID (e.g. 'claude-opus-4-5') not
     // in the alias list, inject it as an option so it can round-trip through
     // confirm without being overwritten.
@@ -27,19 +23,17 @@ export function ModelSelector({
           description: 'Current model (custom ID)',
         },
         ...base,
-      ]
+      ];
     }
-    return base
-  }, [initialModel])
+    return base;
+  }, [initialModel]);
 
-  const defaultModel = initialModel ?? 'sonnet'
+  const defaultModel = initialModel ?? 'sonnet';
 
   return (
     <Box flexDirection="column">
       <Box marginBottom={1}>
-        <Text dimColor>
-          Model determines the agent&apos;s reasoning capabilities and speed.
-        </Text>
+        <Text dimColor>Model determines the agent&apos;s reasoning capabilities and speed.</Text>
       </Box>
       <Select
         options={modelOptions}
@@ -48,5 +42,5 @@ export function ModelSelector({
         onCancel={() => (onCancel ? onCancel() : onComplete(undefined))}
       />
     </Box>
-  )
+  );
 }
diff --git a/src/components/agents/SnapshotUpdateDialog.ts b/src/components/agents/SnapshotUpdateDialog.ts
index a23511b4d..dbcd2ebff 100644
--- a/src/components/agents/SnapshotUpdateDialog.ts
+++ b/src/components/agents/SnapshotUpdateDialog.ts
@@ -1,13 +1,16 @@
 // Auto-generated stub — replace with real implementation
-import type React from 'react';
-import type { AgentMemoryScope } from '@claude-code-best/builtin-tools/tools/AgentTool/agentMemory.js';
+import type React from 'react'
+import type { AgentMemoryScope } from '@claude-code-best/builtin-tools/tools/AgentTool/agentMemory.js'
 
-export {};
+export {}
 export const SnapshotUpdateDialog: React.FC<{
-  agentType: string;
-  scope: AgentMemoryScope;
-  snapshotTimestamp: string;
-  onComplete: (choice: 'merge' | 'keep' | 'replace') => void;
-  onCancel: () => void;
-}> = (() => null);
-export const buildMergePrompt: (agentType: string, scope: AgentMemoryScope) => string = (() => '');
+  agentType: string
+  scope: AgentMemoryScope
+  snapshotTimestamp: string
+  onComplete: (choice: 'merge' | 'keep' | 'replace') => void
+  onCancel: () => void
+}> = () => null
+export const buildMergePrompt: (
+  agentType: string,
+  scope: AgentMemoryScope,
+) => string = () => ''
diff --git a/src/components/agents/ToolSelector.tsx b/src/components/agents/ToolSelector.tsx
index 8fc4b4730..33089bbba 100644
--- a/src/components/agents/ToolSelector.tsx
+++ b/src/components/agents/ToolSelector.tsx
@@ -1,52 +1,52 @@
-import figures from 'figures'
-import React, { useCallback, useMemo, useState } from 'react'
-import { mcpInfoFromString } from 'src/services/mcp/mcpStringUtils.js'
-import { isMcpTool } from 'src/services/mcp/utils.js'
-import type { Tool, Tools } from 'src/Tool.js'
-import { filterToolsForAgent } from '@claude-code-best/builtin-tools/tools/AgentTool/agentToolUtils.js'
-import { AGENT_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/AgentTool/constants.js'
-import { BashTool } from '@claude-code-best/builtin-tools/tools/BashTool/BashTool.js'
-import { ExitPlanModeV2Tool } from '@claude-code-best/builtin-tools/tools/ExitPlanModeTool/ExitPlanModeV2Tool.js'
-import { FileEditTool } from '@claude-code-best/builtin-tools/tools/FileEditTool/FileEditTool.js'
-import { FileReadTool } from '@claude-code-best/builtin-tools/tools/FileReadTool/FileReadTool.js'
-import { FileWriteTool } from '@claude-code-best/builtin-tools/tools/FileWriteTool/FileWriteTool.js'
-import { GlobTool } from '@claude-code-best/builtin-tools/tools/GlobTool/GlobTool.js'
-import { GrepTool } from '@claude-code-best/builtin-tools/tools/GrepTool/GrepTool.js'
-import { ListMcpResourcesTool } from '@claude-code-best/builtin-tools/tools/ListMcpResourcesTool/ListMcpResourcesTool.js'
-import { NotebookEditTool } from '@claude-code-best/builtin-tools/tools/NotebookEditTool/NotebookEditTool.js'
-import { ReadMcpResourceTool } from '@claude-code-best/builtin-tools/tools/ReadMcpResourceTool/ReadMcpResourceTool.js'
-import { TaskOutputTool } from '@claude-code-best/builtin-tools/tools/TaskOutputTool/TaskOutputTool.js'
-import { TaskStopTool } from '@claude-code-best/builtin-tools/tools/TaskStopTool/TaskStopTool.js'
-import { TodoWriteTool } from '@claude-code-best/builtin-tools/tools/TodoWriteTool/TodoWriteTool.js'
-import { TungstenTool } from '@claude-code-best/builtin-tools/tools/TungstenTool/TungstenTool.js'
-import { WebFetchTool } from '@claude-code-best/builtin-tools/tools/WebFetchTool/WebFetchTool.js'
-import { WebSearchTool } from '@claude-code-best/builtin-tools/tools/WebSearchTool/WebSearchTool.js'
-import { type KeyboardEvent, Box, Text } from '@anthropic/ink'
-import { useKeybinding } from '../../keybindings/useKeybinding.js'
-import { count } from '../../utils/array.js'
-import { plural } from '../../utils/stringUtils.js'
-import { Divider } from '@anthropic/ink'
+import figures from 'figures';
+import React, { useCallback, useMemo, useState } from 'react';
+import { mcpInfoFromString } from 'src/services/mcp/mcpStringUtils.js';
+import { isMcpTool } from 'src/services/mcp/utils.js';
+import type { Tool, Tools } from 'src/Tool.js';
+import { filterToolsForAgent } from '@claude-code-best/builtin-tools/tools/AgentTool/agentToolUtils.js';
+import { AGENT_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/AgentTool/constants.js';
+import { BashTool } from '@claude-code-best/builtin-tools/tools/BashTool/BashTool.js';
+import { ExitPlanModeV2Tool } from '@claude-code-best/builtin-tools/tools/ExitPlanModeTool/ExitPlanModeV2Tool.js';
+import { FileEditTool } from '@claude-code-best/builtin-tools/tools/FileEditTool/FileEditTool.js';
+import { FileReadTool } from '@claude-code-best/builtin-tools/tools/FileReadTool/FileReadTool.js';
+import { FileWriteTool } from '@claude-code-best/builtin-tools/tools/FileWriteTool/FileWriteTool.js';
+import { GlobTool } from '@claude-code-best/builtin-tools/tools/GlobTool/GlobTool.js';
+import { GrepTool } from '@claude-code-best/builtin-tools/tools/GrepTool/GrepTool.js';
+import { ListMcpResourcesTool } from '@claude-code-best/builtin-tools/tools/ListMcpResourcesTool/ListMcpResourcesTool.js';
+import { NotebookEditTool } from '@claude-code-best/builtin-tools/tools/NotebookEditTool/NotebookEditTool.js';
+import { ReadMcpResourceTool } from '@claude-code-best/builtin-tools/tools/ReadMcpResourceTool/ReadMcpResourceTool.js';
+import { TaskOutputTool } from '@claude-code-best/builtin-tools/tools/TaskOutputTool/TaskOutputTool.js';
+import { TaskStopTool } from '@claude-code-best/builtin-tools/tools/TaskStopTool/TaskStopTool.js';
+import { TodoWriteTool } from '@claude-code-best/builtin-tools/tools/TodoWriteTool/TodoWriteTool.js';
+import { TungstenTool } from '@claude-code-best/builtin-tools/tools/TungstenTool/TungstenTool.js';
+import { WebFetchTool } from '@claude-code-best/builtin-tools/tools/WebFetchTool/WebFetchTool.js';
+import { WebSearchTool } from '@claude-code-best/builtin-tools/tools/WebSearchTool/WebSearchTool.js';
+import { type KeyboardEvent, Box, Text } from '@anthropic/ink';
+import { useKeybinding } from '../../keybindings/useKeybinding.js';
+import { count } from '../../utils/array.js';
+import { plural } from '../../utils/stringUtils.js';
+import { Divider } from '@anthropic/ink';
 
 type Props = {
-  tools: Tools
-  initialTools: string[] | undefined
-  onComplete: (selectedTools: string[] | undefined) => void
-  onCancel?: () => void
-}
+  tools: Tools;
+  initialTools: string[] | undefined;
+  onComplete: (selectedTools: string[] | undefined) => void;
+  onCancel?: () => void;
+};
 
 type ToolBucket = {
-  name: string
-  toolNames: Set<string>
-  isMcp?: boolean
-}
+  name: string;
+  toolNames: Set<string>;
+  isMcp?: boolean;
+};
 
 type ToolBuckets = {
-  READ_ONLY: ToolBucket
-  EDIT: ToolBucket
-  EXECUTION: ToolBucket
-  MCP: ToolBucket
-  OTHER: ToolBucket
-}
+  READ_ONLY: ToolBucket;
+  EDIT: ToolBucket;
+  EXECUTION: ToolBucket;
+  MCP: ToolBucket;
+  OTHER: ToolBucket;
+};
 
 function getToolBuckets(): ToolBuckets {
   return {
@@ -68,19 +68,12 @@ function getToolBuckets(): ToolBuckets {
     },
     EDIT: {
       name: 'Edit tools',
-      toolNames: new Set([
-        FileEditTool.name,
-        FileWriteTool.name,
-        NotebookEditTool.name,
-      ]),
+      toolNames: new Set([FileEditTool.name, FileWriteTool.name, NotebookEditTool.name]),
     },
     EXECUTION: {
       name: 'Execution tools',
       toolNames: new Set(
-        [
-          BashTool.name,
-          process.env.USER_TYPE === 'ant' ? TungstenTool.name : undefined,
-        ].filter(n => n !== undefined),
+        [BashTool.name, process.env.USER_TYPE === 'ant' ? TungstenTool.name : undefined].filter(n => n !== undefined),
       ),
     },
     MCP: {
@@ -92,148 +85,133 @@ function getToolBuckets(): ToolBuckets {
       name: 'Other tools',
       toolNames: new Set(), // Dynamic - catch-all for uncategorized tools
     },
-  }
+  };
 }
 
 // Helper to get MCP server buckets dynamically
 function getMcpServerBuckets(tools: Tools): Array<{
-  serverName: string
-  tools: Tools
+  serverName: string;
+  tools: Tools;
 }> {
-  const serverMap = new Map<string, Tool[]>()
+  const serverMap = new Map<string, Tool[]>();
 
   tools.forEach(tool => {
     if (isMcpTool(tool)) {
-      const mcpInfo = mcpInfoFromString(tool.name)
+      const mcpInfo = mcpInfoFromString(tool.name);
       if (mcpInfo?.serverName) {
-        const existing = serverMap.get(mcpInfo.serverName) || []
-        existing.push(tool)
-        serverMap.set(mcpInfo.serverName, existing)
+        const existing = serverMap.get(mcpInfo.serverName) || [];
+        existing.push(tool);
+        serverMap.set(mcpInfo.serverName, existing);
       }
     }
-  })
+  });
 
   return Array.from(serverMap.entries())
     .map(([serverName, tools]) => ({ serverName, tools }))
-    .sort((a, b) => a.serverName.localeCompare(b.serverName))
+    .sort((a, b) => a.serverName.localeCompare(b.serverName));
 }
 
-export function ToolSelector({
-  tools,
-  initialTools,
-  onComplete,
-  onCancel,
-}: Props): React.ReactNode {
+export function ToolSelector({ tools, initialTools, onComplete, onCancel }: Props): React.ReactNode {
   // Filter tools for custom agents
-  const customAgentTools = useMemo(
-    () => filterToolsForAgent({ tools, isBuiltIn: false, isAsync: false }),
-    [tools],
-  )
+  const customAgentTools = useMemo(() => filterToolsForAgent({ tools, isBuiltIn: false, isAsync: false }), [tools]);
 
   // Expand wildcard or undefined to explicit tool list for internal state
   const expandedInitialTools =
-    !initialTools || initialTools.includes('*')
-      ? customAgentTools.map(t => t.name)
-      : initialTools
+    !initialTools || initialTools.includes('*') ? customAgentTools.map(t => t.name) : initialTools;
 
-  const [selectedTools, setSelectedTools] =
-    useState<string[]>(expandedInitialTools)
-  const [focusIndex, setFocusIndex] = useState(0)
-  const [showIndividualTools, setShowIndividualTools] = useState(false)
+  const [selectedTools, setSelectedTools] = useState<string[]>(expandedInitialTools);
+  const [focusIndex, setFocusIndex] = useState(0);
+  const [showIndividualTools, setShowIndividualTools] = useState(false);
 
   // Filter selectedTools to only include tools that currently exist
   // This handles MCP tools that disconnect while selected
   const validSelectedTools = useMemo(() => {
-    const toolNames = new Set(customAgentTools.map(t => t.name))
-    return selectedTools.filter(name => toolNames.has(name))
-  }, [selectedTools, customAgentTools])
+    const toolNames = new Set(customAgentTools.map(t => t.name));
+    return selectedTools.filter(name => toolNames.has(name));
+  }, [selectedTools, customAgentTools]);
 
-  const selectedSet = new Set(validSelectedTools)
-  const isAllSelected =
-    validSelectedTools.length === customAgentTools.length &&
-    customAgentTools.length > 0
+  const selectedSet = new Set(validSelectedTools);
+  const isAllSelected = validSelectedTools.length === customAgentTools.length && customAgentTools.length > 0;
 
   const handleToggleTool = (toolName: string) => {
-    if (!toolName) return
+    if (!toolName) return;
 
     setSelectedTools(current =>
-      current.includes(toolName)
-        ? current.filter(t => t !== toolName)
-        : [...current, toolName],
-    )
-  }
+      current.includes(toolName) ? current.filter(t => t !== toolName) : [...current, toolName],
+    );
+  };
 
   const handleToggleTools = (toolNames: string[], select: boolean) => {
     setSelectedTools(current => {
       if (select) {
-        const toolsToAdd = toolNames.filter(t => !current.includes(t))
-        return [...current, ...toolsToAdd]
+        const toolsToAdd = toolNames.filter(t => !current.includes(t));
+        return [...current, ...toolsToAdd];
       } else {
-        return current.filter(t => !toolNames.includes(t))
+        return current.filter(t => !toolNames.includes(t));
       }
-    })
-  }
+    });
+  };
 
   const handleConfirm = () => {
     // Convert to undefined if all tools are selected (for cleaner file format)
-    const allToolNames = customAgentTools.map(t => t.name)
+    const allToolNames = customAgentTools.map(t => t.name);
     const areAllToolsSelected =
       validSelectedTools.length === allToolNames.length &&
-      allToolNames.every(name => validSelectedTools.includes(name))
-    const finalTools = areAllToolsSelected ? undefined : validSelectedTools
+      allToolNames.every(name => validSelectedTools.includes(name));
+    const finalTools = areAllToolsSelected ? undefined : validSelectedTools;
 
-    onComplete(finalTools)
-  }
+    onComplete(finalTools);
+  };
 
   // Group tools by bucket
   const toolsByBucket = useMemo(() => {
-    const toolBuckets = getToolBuckets()
+    const toolBuckets = getToolBuckets();
     const buckets = {
       readOnly: [] as Tool[],
       edit: [] as Tool[],
       execution: [] as Tool[],
       mcp: [] as Tool[],
       other: [] as Tool[],
-    }
+    };
 
     customAgentTools.forEach(tool => {
       // Check if it's an MCP tool first
       if (isMcpTool(tool)) {
-        buckets.mcp.push(tool)
+        buckets.mcp.push(tool);
       } else if (toolBuckets.READ_ONLY.toolNames.has(tool.name)) {
-        buckets.readOnly.push(tool)
+        buckets.readOnly.push(tool);
       } else if (toolBuckets.EDIT.toolNames.has(tool.name)) {
-        buckets.edit.push(tool)
+        buckets.edit.push(tool);
       } else if (toolBuckets.EXECUTION.toolNames.has(tool.name)) {
-        buckets.execution.push(tool)
+        buckets.execution.push(tool);
       } else if (tool.name !== AGENT_TOOL_NAME) {
         // Catch-all for uncategorized tools (except Task)
-        buckets.other.push(tool)
+        buckets.other.push(tool);
       }
-    })
+    });
 
-    return buckets
-  }, [customAgentTools])
+    return buckets;
+  }, [customAgentTools]);
 
   const createBucketToggleAction = (bucketTools: Tool[]) => {
-    const selected = count(bucketTools, t => selectedSet.has(t.name))
-    const needsSelection = selected < bucketTools.length
+    const selected = count(bucketTools, t => selectedSet.has(t.name));
+    const needsSelection = selected < bucketTools.length;
 
     return () => {
-      const toolNames = bucketTools.map(t => t.name)
-      handleToggleTools(toolNames, needsSelection)
-    }
-  }
+      const toolNames = bucketTools.map(t => t.name);
+      handleToggleTools(toolNames, needsSelection);
+    };
+  };
 
   // Build navigable items (no separators)
   const navigableItems: Array<{
-    id: string
-    label: string
-    action: () => void
-    isContinue?: boolean
-    isToggle?: boolean
-    isHeader?: boolean
-  }> = []
+    id: string;
+    label: string;
+    action: () => void;
+    isContinue?: boolean;
+    isToggle?: boolean;
+    isHeader?: boolean;
+  }> = [];
 
   // Continue button
   navigableItems.push({
@@ -241,20 +219,20 @@ export function ToolSelector({
     label: 'Continue',
     action: handleConfirm,
     isContinue: true,
-  })
+  });
 
   // All tools
   navigableItems.push({
     id: 'bucket-all',
     label: `${isAllSelected ? figures.checkboxOn : figures.checkboxOff} All tools`,
     action: () => {
-      const allToolNames = customAgentTools.map(t => t.name)
-      handleToggleTools(allToolNames, !isAllSelected)
+      const allToolNames = customAgentTools.map(t => t.name);
+      handleToggleTools(allToolNames, !isAllSelected);
     },
-  })
+  });
 
   // Create bucket menu items
-  const toolBuckets = getToolBuckets()
+  const toolBuckets = getToolBuckets();
   const bucketConfigs = [
     {
       id: 'bucket-readonly',
@@ -281,43 +259,38 @@ export function ToolSelector({
       name: toolBuckets.OTHER.name,
       tools: toolsByBucket.other,
     },
-  ]
+  ];
 
   bucketConfigs.forEach(({ id, name, tools: bucketTools }) => {
-    if (bucketTools.length === 0) return
+    if (bucketTools.length === 0) return;
 
-    const selected = count(bucketTools, t => selectedSet.has(t.name))
-    const isFullySelected = selected === bucketTools.length
+    const selected = count(bucketTools, t => selectedSet.has(t.name));
+    const isFullySelected = selected === bucketTools.length;
 
     navigableItems.push({
       id,
       label: `${isFullySelected ? figures.checkboxOn : figures.checkboxOff} ${name}`,
       action: createBucketToggleAction(bucketTools),
-    })
-  })
+    });
+  });
 
   // Toggle button for individual tools
-  const toggleButtonIndex = navigableItems.length
+  const toggleButtonIndex = navigableItems.length;
   navigableItems.push({
     id: 'toggle-individual',
-    label: showIndividualTools
-      ? 'Hide advanced options'
-      : 'Show advanced options',
+    label: showIndividualTools ? 'Hide advanced options' : 'Show advanced options',
     action: () => {
-      setShowIndividualTools(!showIndividualTools)
+      setShowIndividualTools(!showIndividualTools);
       // If hiding tools and focus is on an individual tool, move focus to toggle button
       if (showIndividualTools && focusIndex > toggleButtonIndex) {
-        setFocusIndex(toggleButtonIndex)
+        setFocusIndex(toggleButtonIndex);
       }
     },
     isToggle: true,
-  })
+  });
 
   // Memoize MCP server buckets (must be outside conditional for hooks rules)
-  const mcpServerBuckets = useMemo(
-    () => getMcpServerBuckets(customAgentTools),
-    [customAgentTools],
-  )
+  const mcpServerBuckets = useMemo(() => getMcpServerBuckets(customAgentTools), [customAgentTools]);
 
   // Individual tools (only if expanded)
   if (showIndividualTools) {
@@ -328,21 +301,21 @@ export function ToolSelector({
         label: 'MCP Servers:',
         action: () => {}, // No action - just a header
         isHeader: true,
-      })
+      });
 
       mcpServerBuckets.forEach(({ serverName, tools: serverTools }) => {
-        const selected = count(serverTools, t => selectedSet.has(t.name))
-        const isFullySelected = selected === serverTools.length
+        const selected = count(serverTools, t => selectedSet.has(t.name));
+        const isFullySelected = selected === serverTools.length;
 
         navigableItems.push({
           id: `mcp-server-${serverName}`,
           label: `${isFullySelected ? figures.checkboxOn : figures.checkboxOff} ${serverName} (${serverTools.length} ${plural(serverTools.length, 'tool')})`,
           action: () => {
-            const toolNames = serverTools.map(t => t.name)
-            handleToggleTools(toolNames, !isFullySelected)
+            const toolNames = serverTools.map(t => t.name);
+            handleToggleTools(toolNames, !isFullySelected);
           },
-        })
-      })
+        });
+      });
 
       // Add separator header before individual tools
       navigableItems.push({
@@ -350,79 +323,65 @@ export function ToolSelector({
         label: 'Individual Tools:',
         action: () => {},
         isHeader: true,
-      })
+      });
     }
 
     // Add individual tools
     customAgentTools.forEach(tool => {
-      let displayName = tool.name
+      let displayName = tool.name;
       if (tool.name.startsWith('mcp__')) {
-        const mcpInfo = mcpInfoFromString(tool.name)
-        displayName = mcpInfo
-          ? `${mcpInfo.toolName} (${mcpInfo.serverName})`
-          : tool.name
+        const mcpInfo = mcpInfoFromString(tool.name);
+        displayName = mcpInfo ? `${mcpInfo.toolName} (${mcpInfo.serverName})` : tool.name;
       }
 
       navigableItems.push({
         id: `tool-${tool.name}`,
         label: `${selectedSet.has(tool.name) ? figures.checkboxOn : figures.checkboxOff} ${displayName}`,
         action: () => handleToggleTool(tool.name),
-      })
-    })
+      });
+    });
   }
 
   const handleCancel = useCallback(() => {
     if (onCancel) {
-      onCancel()
+      onCancel();
     } else {
-      onComplete(initialTools)
+      onComplete(initialTools);
     }
-  }, [onCancel, onComplete, initialTools])
+  }, [onCancel, onComplete, initialTools]);
 
-  useKeybinding('confirm:no', handleCancel, { context: 'Confirmation' })
+  useKeybinding('confirm:no', handleCancel, { context: 'Confirmation' });
 
   const handleKeyDown = (e: KeyboardEvent) => {
     if (e.key === 'return') {
-      e.preventDefault()
-      const item = navigableItems[focusIndex]
+      e.preventDefault();
+      const item = navigableItems[focusIndex];
       if (item && !item.isHeader) {
-        item.action()
+        item.action();
       }
     } else if (e.key === 'up') {
-      e.preventDefault()
-      let newIndex = focusIndex - 1
+      e.preventDefault();
+      let newIndex = focusIndex - 1;
       // Skip headers when navigating up
       while (newIndex > 0 && navigableItems[newIndex]?.isHeader) {
-        newIndex--
+        newIndex--;
       }
-      setFocusIndex(Math.max(0, newIndex))
+      setFocusIndex(Math.max(0, newIndex));
     } else if (e.key === 'down') {
-      e.preventDefault()
-      let newIndex = focusIndex + 1
+      e.preventDefault();
+      let newIndex = focusIndex + 1;
       // Skip headers when navigating down
-      while (
-        newIndex < navigableItems.length - 1 &&
-        navigableItems[newIndex]?.isHeader
-      ) {
-        newIndex++
+      while (newIndex < navigableItems.length - 1 && navigableItems[newIndex]?.isHeader) {
+        newIndex++;
       }
-      setFocusIndex(Math.min(navigableItems.length - 1, newIndex))
+      setFocusIndex(Math.min(navigableItems.length - 1, newIndex));
     }
-  }
+  };
 
   return (
-    <Box
-      flexDirection="column"
-      marginTop={1}
-      tabIndex={0}
-      autoFocus
-      onKeyDown={handleKeyDown}
-    >
+    <Box flexDirection="column" marginTop={1} tabIndex={0} autoFocus onKeyDown={handleKeyDown}>
       {/* Render Continue button */}
-      <Text
-        color={focusIndex === 0 ? 'suggestion' : undefined}
-        bold={focusIndex === 0}
-      >
+      <Text color={focusIndex === 0 ? 'suggestion' : undefined} bold={focusIndex === 0}>
         {focusIndex === 0 ? `${figures.pointer} ` : '  '}[ Continue ]
       </Text>
 
@@ -431,9 +390,9 @@ export function ToolSelector({
 
       {/* Render all navigable items except Continue (which is at index 0) */}
       {navigableItems.slice(1).map((item, index) => {
-        const isCurrentlyFocused = index + 1 === focusIndex
-        const isToggleButton = item.isToggle
-        const isHeader = item.isHeader
+        const isCurrentlyFocused = index + 1 === focusIndex;
+        const isToggleButton = item.isToggle;
+        const isHeader = item.isHeader;
 
         return (
           <React.Fragment key={item.id}>
@@ -444,34 +403,22 @@ export function ToolSelector({
             {isHeader && index > 0 && <Box marginTop={1} />}
 
             <Text
-              color={
-                isHeader
-                  ? undefined
-                  : isCurrentlyFocused
-                    ? 'suggestion'
-                    : undefined
-              }
+              color={isHeader ? undefined : isCurrentlyFocused ? 'suggestion' : undefined}
               dimColor={isHeader}
               bold={isToggleButton && isCurrentlyFocused}
             >
-              {isHeader
-                ? ''
-                : isCurrentlyFocused
-                  ? `${figures.pointer} `
-                  : '  '}
+              {isHeader ? '' : isCurrentlyFocused ? `${figures.pointer} ` : '  '}
               {isToggleButton ? `[ ${item.label} ]` : item.label}
             </Text>
           </React.Fragment>
-        )
+        );
       })}
 
       <Box marginTop={1} flexDirection="column">
         <Text dimColor>
-          {isAllSelected
-            ? 'All tools selected'
-            : `${selectedSet.size} of ${customAgentTools.length} tools selected`}
+          {isAllSelected ? 'All tools selected' : `${selectedSet.size} of ${customAgentTools.length} tools selected`}
         </Text>
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/components/agents/generateAgent.ts b/src/components/agents/generateAgent.ts
index 801601d4b..3137967e2 100644
--- a/src/components/agents/generateAgent.ts
+++ b/src/components/agents/generateAgent.ts
@@ -164,7 +164,9 @@ export async function generateAgent(
     },
   })
 
-  const textBlocks = (Array.isArray(response.message.content) ? response.message.content : []).filter(
+  const textBlocks = (
+    Array.isArray(response.message.content) ? response.message.content : []
+  ).filter(
     (block): block is ContentBlock & { type: 'text' } => block.type === 'text',
   )
   const responseText = textBlocks.map(block => block.text).join('\n')
diff --git a/src/components/agents/new-agent-creation/CreateAgentWizard.tsx b/src/components/agents/new-agent-creation/CreateAgentWizard.tsx
index fa6ed6816..61e6f19b8 100644
--- a/src/components/agents/new-agent-creation/CreateAgentWizard.tsx
+++ b/src/components/agents/new-agent-creation/CreateAgentWizard.tsx
@@ -1,35 +1,30 @@
-import React, { type ReactNode } from 'react'
-import { isAutoMemoryEnabled } from '../../../memdir/paths.js'
-import type { Tools } from '../../../Tool.js'
-import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
-import { WizardProvider } from '../../wizard/index.js'
-import type { WizardStepComponent } from '../../wizard/types.js'
-import type { AgentWizardData } from './types.js'
-import { ColorStep } from './wizard-steps/ColorStep.js'
-import { ConfirmStepWrapper } from './wizard-steps/ConfirmStepWrapper.js'
-import { DescriptionStep } from './wizard-steps/DescriptionStep.js'
-import { GenerateStep } from './wizard-steps/GenerateStep.js'
-import { LocationStep } from './wizard-steps/LocationStep.js'
-import { MemoryStep } from './wizard-steps/MemoryStep.js'
-import { MethodStep } from './wizard-steps/MethodStep.js'
-import { ModelStep } from './wizard-steps/ModelStep.js'
-import { PromptStep } from './wizard-steps/PromptStep.js'
-import { ToolsStep } from './wizard-steps/ToolsStep.js'
-import { TypeStep } from './wizard-steps/TypeStep.js'
+import React, { type ReactNode } from 'react';
+import { isAutoMemoryEnabled } from '../../../memdir/paths.js';
+import type { Tools } from '../../../Tool.js';
+import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js';
+import { WizardProvider } from '../../wizard/index.js';
+import type { WizardStepComponent } from '../../wizard/types.js';
+import type { AgentWizardData } from './types.js';
+import { ColorStep } from './wizard-steps/ColorStep.js';
+import { ConfirmStepWrapper } from './wizard-steps/ConfirmStepWrapper.js';
+import { DescriptionStep } from './wizard-steps/DescriptionStep.js';
+import { GenerateStep } from './wizard-steps/GenerateStep.js';
+import { LocationStep } from './wizard-steps/LocationStep.js';
+import { MemoryStep } from './wizard-steps/MemoryStep.js';
+import { MethodStep } from './wizard-steps/MethodStep.js';
+import { ModelStep } from './wizard-steps/ModelStep.js';
+import { PromptStep } from './wizard-steps/PromptStep.js';
+import { ToolsStep } from './wizard-steps/ToolsStep.js';
+import { TypeStep } from './wizard-steps/TypeStep.js';
 
 type Props = {
-  tools: Tools
-  existingAgents: AgentDefinition[]
-  onComplete: (message: string) => void
-  onCancel: () => void
-}
+  tools: Tools;
+  existingAgents: AgentDefinition[];
+  onComplete: (message: string) => void;
+  onCancel: () => void;
+};
 
-export function CreateAgentWizard({
-  tools,
-  existingAgents,
-  onComplete,
-  onCancel,
-}: Props): ReactNode {
+export function CreateAgentWizard({ tools, existingAgents, onComplete, onCancel }: Props): ReactNode {
   // Create step components with props
   const steps: WizardStepComponent[] = [
     LocationStep, // 0
@@ -43,14 +38,8 @@ export function CreateAgentWizard({
     ColorStep, // 8
     // MemoryStep is conditionally included based on GrowthBook gate
     ...(isAutoMemoryEnabled() ? [MemoryStep] : []),
-    () => (
-      <ConfirmStepWrapper
-        tools={tools}
-        existingAgents={existingAgents}
-        onComplete={onComplete}
-      />
-    ),
-  ]
+    () => <ConfirmStepWrapper tools={tools} existingAgents={existingAgents} onComplete={onComplete} />,
+  ];
 
   return (
     <WizardProvider<AgentWizardData>
@@ -64,5 +53,5 @@ export function CreateAgentWizard({
       title="Create new agent"
       showStepCounter={false}
     />
-  )
+  );
 }
diff --git a/src/components/agents/new-agent-creation/types.ts b/src/components/agents/new-agent-creation/types.ts
index a592768c1..5dad63c6c 100644
--- a/src/components/agents/new-agent-creation/types.ts
+++ b/src/components/agents/new-agent-creation/types.ts
@@ -1,2 +1,2 @@
 // Auto-generated stub — replace with real implementation
-export type AgentWizardData = any;
+export type AgentWizardData = any
diff --git a/src/components/agents/new-agent-creation/wizard-steps/ColorStep.tsx b/src/components/agents/new-agent-creation/wizard-steps/ColorStep.tsx
index e28133a38..67ce1f103 100644
--- a/src/components/agents/new-agent-creation/wizard-steps/ColorStep.tsx
+++ b/src/components/agents/new-agent-creation/wizard-steps/ColorStep.tsx
@@ -1,19 +1,18 @@
-import React, { type ReactNode } from 'react'
-import { Box, Byline, KeyboardShortcutHint } from '@anthropic/ink'
-import { useKeybinding } from '../../../../keybindings/useKeybinding.js'
-import type { AgentColorName } from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js'
-import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js'
-import { useWizard } from '../../../wizard/index.js'
-import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js'
-import { ColorPicker } from '../../ColorPicker.js'
-import type { AgentWizardData } from '../types.js'
+import React, { type ReactNode } from 'react';
+import { Box, Byline, KeyboardShortcutHint } from '@anthropic/ink';
+import { useKeybinding } from '../../../../keybindings/useKeybinding.js';
+import type { AgentColorName } from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js';
+import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js';
+import { useWizard } from '../../../wizard/index.js';
+import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js';
+import { ColorPicker } from '../../ColorPicker.js';
+import type { AgentWizardData } from '../types.js';
 
 export function ColorStep(): ReactNode {
-  const { goNext, goBack, updateWizardData, wizardData } =
-    useWizard<AgentWizardData>()
+  const { goNext, goBack, updateWizardData, wizardData } = useWizard<AgentWizardData>();
 
   // Handle escape key - ColorPicker handles its own escape internally
-  useKeybinding('confirm:no', goBack, { context: 'Confirmation' })
+  useKeybinding('confirm:no', goBack, { context: 'Confirmation' });
 
   const handleConfirm = (color?: string): void => {
     updateWizardData({
@@ -24,15 +23,13 @@ export function ColorStep(): ReactNode {
         whenToUse: wizardData.whenToUse!,
         getSystemPrompt: () => wizardData.systemPrompt!,
         tools: wizardData.selectedTools,
-        ...(wizardData.selectedModel
-          ? { model: wizardData.selectedModel }
-          : {}),
+        ...(wizardData.selectedModel ? { model: wizardData.selectedModel } : {}),
         ...(color ? { color: color as AgentColorName } : {}),
         source: wizardData.location!,
       },
-    })
-    goNext()
-  }
+    });
+    goNext();
+  };
 
   return (
     <WizardDialogLayout
@@ -41,22 +38,13 @@ export function ColorStep(): ReactNode {
         <Byline>
           <KeyboardShortcutHint shortcut="↑↓" action="navigate" />
           <KeyboardShortcutHint shortcut="Enter" action="select" />
-          <ConfigurableShortcutHint
-            action="confirm:no"
-            context="Confirmation"
-            fallback="Esc"
-            description="go back"
-          />
+          <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="go back" />
         </Byline>
       }
     >
       <Box>
-        <ColorPicker
-          agentName={wizardData.agentType || 'agent'}
-          currentColor="automatic"
-          onConfirm={handleConfirm}
-        />
+        <ColorPicker agentName={wizardData.agentType || 'agent'} currentColor="automatic" onConfirm={handleConfirm} />
       </Box>
     </WizardDialogLayout>
-  )
+  );
 }
diff --git a/src/components/agents/new-agent-creation/wizard-steps/ConfirmStep.tsx b/src/components/agents/new-agent-creation/wizard-steps/ConfirmStep.tsx
index cbe284991..60d2ff7b3 100644
--- a/src/components/agents/new-agent-creation/wizard-steps/ConfirmStep.tsx
+++ b/src/components/agents/new-agent-creation/wizard-steps/ConfirmStep.tsx
@@ -1,69 +1,63 @@
-import React, { type ReactNode } from 'react'
-import { type KeyboardEvent, Box, Byline, KeyboardShortcutHint, Text } from '@anthropic/ink'
-import { useKeybinding } from '../../../../keybindings/useKeybinding.js'
-import { isAutoMemoryEnabled } from '../../../../memdir/paths.js'
-import type { Tools } from '../../../../Tool.js'
-import { getMemoryScopeDisplay } from '@claude-code-best/builtin-tools/tools/AgentTool/agentMemory.js'
-import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
-import { truncateToWidth } from '../../../../utils/format.js'
-import { getAgentModelDisplay } from '../../../../utils/model/agent.js'
-import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js'
-import { useWizard } from '../../../wizard/index.js'
-import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js'
-import { getNewRelativeAgentFilePath } from '../../agentFileUtils.js'
-import { validateAgent } from '../../validateAgent.js'
-import type { AgentWizardData } from '../types.js'
+import React, { type ReactNode } from 'react';
+import { type KeyboardEvent, Box, Byline, KeyboardShortcutHint, Text } from '@anthropic/ink';
+import { useKeybinding } from '../../../../keybindings/useKeybinding.js';
+import { isAutoMemoryEnabled } from '../../../../memdir/paths.js';
+import type { Tools } from '../../../../Tool.js';
+import { getMemoryScopeDisplay } from '@claude-code-best/builtin-tools/tools/AgentTool/agentMemory.js';
+import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js';
+import { truncateToWidth } from '../../../../utils/format.js';
+import { getAgentModelDisplay } from '../../../../utils/model/agent.js';
+import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js';
+import { useWizard } from '../../../wizard/index.js';
+import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js';
+import { getNewRelativeAgentFilePath } from '../../agentFileUtils.js';
+import { validateAgent } from '../../validateAgent.js';
+import type { AgentWizardData } from '../types.js';
 
 type Props = {
-  tools: Tools
-  existingAgents: AgentDefinition[]
-  onSave: () => void
-  onSaveAndEdit: () => void
-  error?: string | null
-}
+  tools: Tools;
+  existingAgents: AgentDefinition[];
+  onSave: () => void;
+  onSaveAndEdit: () => void;
+  error?: string | null;
+};
 
-export function ConfirmStep({
-  tools,
-  existingAgents,
-  onSave,
-  onSaveAndEdit,
-  error,
-}: Props): ReactNode {
-  const { goBack, wizardData } = useWizard<AgentWizardData>()
+export function ConfirmStep({ tools, existingAgents, onSave, onSaveAndEdit, error }: Props): ReactNode {
+  const { goBack, wizardData } = useWizard<AgentWizardData>();
 
-  useKeybinding('confirm:no', goBack, { context: 'Confirmation' })
+  useKeybinding('confirm:no', goBack, { context: 'Confirmation' });
 
   const handleKeyDown = (e: KeyboardEvent) => {
     if (e.key === 's' || e.key === 'return') {
-      e.preventDefault()
-      onSave()
+      e.preventDefault();
+      onSave();
     } else if (e.key === 'e') {
-      e.preventDefault()
-      onSaveAndEdit()
+      e.preventDefault();
+      onSaveAndEdit();
     }
-  }
+  };
 
-  const agent = wizardData.finalAgent!
-  const validation = validateAgent(agent, tools, existingAgents)
+  const agent = wizardData.finalAgent!;
+  const validation = validateAgent(agent, tools, existingAgents);
 
-  const systemPromptPreview = truncateToWidth(agent.getSystemPrompt(), 240)
-  const whenToUsePreview = truncateToWidth(agent.whenToUse, 240)
+  const systemPromptPreview = truncateToWidth(agent.getSystemPrompt(), 240);
+  const whenToUsePreview = truncateToWidth(agent.whenToUse, 240);
 
   const getToolsDisplay = (toolNames: string[] | undefined): string => {
     // undefined means "all tools" per PR semantic
-    if (toolNames === undefined) return 'All tools'
-    if (toolNames.length === 0) return 'None'
-    if (toolNames.length === 1) return toolNames[0] || 'None'
-    if (toolNames.length === 2) return toolNames.join(' and ')
-    return `${toolNames.slice(0, -1).join(', ')}, and ${toolNames[toolNames.length - 1]}`
-  }
+    if (toolNames === undefined) return 'All tools';
+    if (toolNames.length === 0) return 'None';
+    if (toolNames.length === 1) return toolNames[0] || 'None';
+    if (toolNames.length === 2) return toolNames.join(' and ');
+    return `${toolNames.slice(0, -1).join(', ')}, and ${toolNames[toolNames.length - 1]}`;
+  };
 
   // Compute memory display outside JSX
   const memoryDisplayElement = isAutoMemoryEnabled() ? (
     <Text>
       <Text bold>Memory</Text>: {getMemoryScopeDisplay(agent.memory)}
     </Text>
-  ) : null
+  ) : null;
 
   return (
     <WizardDialogLayout
@@ -72,21 +66,11 @@ export function ConfirmStep({
         <Byline>
           <KeyboardShortcutHint shortcut="s/Enter" action="save" />
           <KeyboardShortcutHint shortcut="e" action="edit in your editor" />
-          <ConfigurableShortcutHint
-            action="confirm:no"
-            context="Confirmation"
-            fallback="Esc"
-            description="cancel"
-          />
+          <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="cancel" />
         </Byline>
       }
     >
-      <Box
-        flexDirection="column"
-        tabIndex={0}
-        autoFocus
-        onKeyDown={handleKeyDown}
-      >
+      <Box flexDirection="column" tabIndex={0} autoFocus onKeyDown={handleKeyDown}>
         <Text>
           <Text bold>Name</Text>: {agent.agentType}
         </Text>
@@ -155,11 +139,10 @@ export function ConfirmStep({
 
         <Box marginTop={2}>
           <Text color="success">
-            Press <Text bold>s</Text> or <Text bold>Enter</Text> to save,{' '}
-            <Text bold>e</Text> to save and edit
+            Press <Text bold>s</Text> or <Text bold>Enter</Text> to save, <Text bold>e</Text> to save and edit
           </Text>
         </Box>
       </Box>
     </WizardDialogLayout>
-  )
+  );
 }
diff --git a/src/components/agents/new-agent-creation/wizard-steps/ConfirmStepWrapper.tsx b/src/components/agents/new-agent-creation/wizard-steps/ConfirmStepWrapper.tsx
index b1e391e7f..66a5c711f 100644
--- a/src/components/agents/new-agent-creation/wizard-steps/ConfirmStepWrapper.tsx
+++ b/src/components/agents/new-agent-creation/wizard-steps/ConfirmStepWrapper.tsx
@@ -1,37 +1,33 @@
-import chalk from 'chalk'
-import React, { type ReactNode, useCallback, useState } from 'react'
+import chalk from 'chalk';
+import React, { type ReactNode, useCallback, useState } from 'react';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from 'src/services/analytics/index.js'
-import { useSetAppState } from 'src/state/AppState.js'
-import type { Tools } from '../../../../Tool.js'
-import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
-import { getActiveAgentsFromList } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
-import { editFileInEditor } from '../../../../utils/promptEditor.js'
-import { useWizard } from '../../../wizard/index.js'
-import { getNewAgentFilePath, saveAgentToFile } from '../../agentFileUtils.js'
-import type { AgentWizardData } from '../types.js'
-import { ConfirmStep } from './ConfirmStep.js'
+} from 'src/services/analytics/index.js';
+import { useSetAppState } from 'src/state/AppState.js';
+import type { Tools } from '../../../../Tool.js';
+import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js';
+import { getActiveAgentsFromList } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js';
+import { editFileInEditor } from '../../../../utils/promptEditor.js';
+import { useWizard } from '../../../wizard/index.js';
+import { getNewAgentFilePath, saveAgentToFile } from '../../agentFileUtils.js';
+import type { AgentWizardData } from '../types.js';
+import { ConfirmStep } from './ConfirmStep.js';
 
 type Props = {
-  tools: Tools
-  existingAgents: AgentDefinition[]
-  onComplete: (message: string) => void
-}
+  tools: Tools;
+  existingAgents: AgentDefinition[];
+  onComplete: (message: string) => void;
+};
 
-export function ConfirmStepWrapper({
-  tools,
-  existingAgents,
-  onComplete,
-}: Props): ReactNode {
-  const { wizardData } = useWizard<AgentWizardData>()
-  const [saveError, setSaveError] = useState<string | null>(null)
-  const setAppState = useSetAppState()
+export function ConfirmStepWrapper({ tools, existingAgents, onComplete }: Props): ReactNode {
+  const { wizardData } = useWizard<AgentWizardData>();
+  const [saveError, setSaveError] = useState<string | null>(null);
+  const setAppState = useSetAppState();
 
   const saveAgent = useCallback(
     async (openInEditor: boolean): Promise<void> => {
-      if (!wizardData?.finalAgent) return
+      if (!wizardData?.finalAgent) return;
 
       try {
         await saveAgentToFile(
@@ -44,14 +40,12 @@ export function ConfirmStepWrapper({
           wizardData.finalAgent.color,
           wizardData.finalAgent.model,
           wizardData.finalAgent.memory,
-        )
+        );
 
         setAppState(state => {
-          if (!wizardData.finalAgent) return state
+          if (!wizardData.finalAgent) return state;
 
-          const allAgents = state.agentDefinitions.allAgents.concat(
-            wizardData.finalAgent,
-          )
+          const allAgents = state.agentDefinitions.allAgents.concat(wizardData.finalAgent);
           return {
             ...state,
             agentDefinitions: {
@@ -59,15 +53,15 @@ export function ConfirmStepWrapper({
               activeAgents: getActiveAgentsFromList(allAgents),
               allAgents,
             },
-          }
-        })
+          };
+        });
 
         if (openInEditor) {
           const filePath = getNewAgentFilePath({
             source: wizardData.location!,
             agentType: wizardData.finalAgent.agentType,
-          })
-          await editFileInEditor(filePath)
+          });
+          await editFileInEditor(filePath);
         }
 
         logEvent('tengu_agent_created', {
@@ -80,25 +74,23 @@ export function ConfirmStepWrapper({
           has_memory: !!wizardData.finalAgent.memory,
           memory_scope: wizardData.finalAgent.memory ?? 'none',
           ...(openInEditor ? { opened_in_editor: true } : {}),
-        } as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS)
+        } as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS);
 
         const message = openInEditor
           ? `Created agent: ${chalk.bold(wizardData.finalAgent.agentType)} and opened in editor. ` +
             `If you made edits, restart to load the latest version.`
-          : `Created agent: ${chalk.bold(wizardData.finalAgent.agentType)}`
-        onComplete(message)
+          : `Created agent: ${chalk.bold(wizardData.finalAgent.agentType)}`;
+        onComplete(message);
       } catch (err) {
-        setSaveError(
-          err instanceof Error ? err.message : 'Failed to save agent',
-        )
+        setSaveError(err instanceof Error ? err.message : 'Failed to save agent');
       }
     },
     [wizardData, onComplete, setAppState],
-  )
+  );
 
-  const handleSave = useCallback(() => saveAgent(false), [saveAgent])
+  const handleSave = useCallback(() => saveAgent(false), [saveAgent]);
 
-  const handleSaveAndEdit = useCallback(() => saveAgent(true), [saveAgent])
+  const handleSaveAndEdit = useCallback(() => saveAgent(true), [saveAgent]);
 
   return (
     <ConfirmStep
@@ -108,5 +100,5 @@ export function ConfirmStepWrapper({
       onSaveAndEdit={handleSaveAndEdit}
       error={saveError}
     />
-  )
+  );
 }
diff --git a/src/components/agents/new-agent-creation/wizard-steps/DescriptionStep.tsx b/src/components/agents/new-agent-creation/wizard-steps/DescriptionStep.tsx
index 50a0d0590..bfb838805 100644
--- a/src/components/agents/new-agent-creation/wizard-steps/DescriptionStep.tsx
+++ b/src/components/agents/new-agent-creation/wizard-steps/DescriptionStep.tsx
@@ -1,46 +1,45 @@
-import React, { type ReactNode, useCallback, useState } from 'react'
-import { Box, Byline, KeyboardShortcutHint, Text } from '@anthropic/ink'
-import { useKeybinding } from '../../../../keybindings/useKeybinding.js'
-import { editPromptInEditor } from '../../../../utils/promptEditor.js'
-import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js'
-import TextInput from '../../../TextInput.js'
-import { useWizard } from '../../../wizard/index.js'
-import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js'
-import type { AgentWizardData } from '../types.js'
+import React, { type ReactNode, useCallback, useState } from 'react';
+import { Box, Byline, KeyboardShortcutHint, Text } from '@anthropic/ink';
+import { useKeybinding } from '../../../../keybindings/useKeybinding.js';
+import { editPromptInEditor } from '../../../../utils/promptEditor.js';
+import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js';
+import TextInput from '../../../TextInput.js';
+import { useWizard } from '../../../wizard/index.js';
+import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js';
+import type { AgentWizardData } from '../types.js';
 
 export function DescriptionStep(): ReactNode {
-  const { goNext, goBack, updateWizardData, wizardData } =
-    useWizard<AgentWizardData>()
-  const [whenToUse, setWhenToUse] = useState(wizardData.whenToUse || '')
-  const [cursorOffset, setCursorOffset] = useState(whenToUse.length)
-  const [error, setError] = useState<string | null>(null)
+  const { goNext, goBack, updateWizardData, wizardData } = useWizard<AgentWizardData>();
+  const [whenToUse, setWhenToUse] = useState(wizardData.whenToUse || '');
+  const [cursorOffset, setCursorOffset] = useState(whenToUse.length);
+  const [error, setError] = useState<string | null>(null);
 
   // Handle escape key - use Settings context so 'n' key doesn't cancel (allows typing 'n' in input)
-  useKeybinding('confirm:no', goBack, { context: 'Settings' })
+  useKeybinding('confirm:no', goBack, { context: 'Settings' });
 
   const handleExternalEditor = useCallback(async () => {
-    const result = await editPromptInEditor(whenToUse)
+    const result = await editPromptInEditor(whenToUse);
     if (result.content !== null) {
-      setWhenToUse(result.content)
-      setCursorOffset(result.content.length)
+      setWhenToUse(result.content);
+      setCursorOffset(result.content.length);
     }
-  }, [whenToUse])
+  }, [whenToUse]);
 
   useKeybinding('chat:externalEditor', handleExternalEditor, {
     context: 'Chat',
-  })
+  });
 
   const handleSubmit = (value: string): void => {
-    const trimmedValue = value.trim()
+    const trimmedValue = value.trim();
     if (!trimmedValue) {
-      setError('Description is required')
-      return
+      setError('Description is required');
+      return;
     }
 
-    setError(null)
-    updateWizardData({ whenToUse: trimmedValue })
-    goNext()
-  }
+    setError(null);
+    updateWizardData({ whenToUse: trimmedValue });
+    goNext();
+  };
 
   return (
     <WizardDialogLayout
@@ -55,12 +54,7 @@ export function DescriptionStep(): ReactNode {
             fallback="ctrl+g"
             description="open in editor"
           />
-          <ConfigurableShortcutHint
-            action="confirm:no"
-            context="Settings"
-            fallback="Esc"
-            description="go back"
-          />
+          <ConfigurableShortcutHint action="confirm:no" context="Settings" fallback="Esc" description="go back" />
         </Byline>
       }
     >
@@ -88,5 +82,5 @@ export function DescriptionStep(): ReactNode {
         )}
       </Box>
     </WizardDialogLayout>
-  )
+  );
 }
diff --git a/src/components/agents/new-agent-creation/wizard-steps/GenerateStep.tsx b/src/components/agents/new-agent-creation/wizard-steps/GenerateStep.tsx
index 1e0b88512..9200e239b 100644
--- a/src/components/agents/new-agent-creation/wizard-steps/GenerateStep.tsx
+++ b/src/components/agents/new-agent-creation/wizard-steps/GenerateStep.tsx
@@ -1,56 +1,55 @@
-import { APIUserAbortError } from '@anthropic-ai/sdk'
-import React, { type ReactNode, useCallback, useRef, useState } from 'react'
-import { useMainLoopModel } from '../../../../hooks/useMainLoopModel.js'
-import { Box, Byline, Text } from '@anthropic/ink'
-import { useKeybinding } from '../../../../keybindings/useKeybinding.js'
-import { createAbortController } from '../../../../utils/abortController.js'
-import { editPromptInEditor } from '../../../../utils/promptEditor.js'
-import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js'
-import { Spinner } from '../../../Spinner.js'
-import TextInput from '../../../TextInput.js'
-import { useWizard } from '../../../wizard/index.js'
-import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js'
-import { generateAgent } from '../../generateAgent.js'
-import type { AgentWizardData } from '../types.js'
+import { APIUserAbortError } from '@anthropic-ai/sdk';
+import React, { type ReactNode, useCallback, useRef, useState } from 'react';
+import { useMainLoopModel } from '../../../../hooks/useMainLoopModel.js';
+import { Box, Byline, Text } from '@anthropic/ink';
+import { useKeybinding } from '../../../../keybindings/useKeybinding.js';
+import { createAbortController } from '../../../../utils/abortController.js';
+import { editPromptInEditor } from '../../../../utils/promptEditor.js';
+import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js';
+import { Spinner } from '../../../Spinner.js';
+import TextInput from '../../../TextInput.js';
+import { useWizard } from '../../../wizard/index.js';
+import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js';
+import { generateAgent } from '../../generateAgent.js';
+import type { AgentWizardData } from '../types.js';
 
 export function GenerateStep(): ReactNode {
-  const { updateWizardData, goBack, goToStep, wizardData } =
-    useWizard<AgentWizardData>()
-  const [prompt, setPrompt] = useState(wizardData.generationPrompt || '')
-  const [isGenerating, setIsGenerating] = useState(false)
-  const [error, setError] = useState<string | null>(null)
-  const [cursorOffset, setCursorOffset] = useState(prompt.length)
-  const model = useMainLoopModel()
-  const abortControllerRef = useRef<AbortController | null>(null)
+  const { updateWizardData, goBack, goToStep, wizardData } = useWizard<AgentWizardData>();
+  const [prompt, setPrompt] = useState(wizardData.generationPrompt || '');
+  const [isGenerating, setIsGenerating] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const [cursorOffset, setCursorOffset] = useState(prompt.length);
+  const model = useMainLoopModel();
+  const abortControllerRef = useRef<AbortController | null>(null);
 
   // Cancel generation when escape pressed during generation
   const handleCancelGeneration = useCallback(() => {
     if (abortControllerRef.current) {
-      abortControllerRef.current.abort()
-      abortControllerRef.current = null
-      setIsGenerating(false)
-      setError('Generation cancelled')
+      abortControllerRef.current.abort();
+      abortControllerRef.current = null;
+      setIsGenerating(false);
+      setError('Generation cancelled');
     }
-  }, [])
+  }, []);
 
   // Use Settings context so 'n' key doesn't cancel (allows typing 'n' in prompt input)
   useKeybinding('confirm:no', handleCancelGeneration, {
     context: 'Settings',
     isActive: isGenerating,
-  })
+  });
 
   const handleExternalEditor = useCallback(async () => {
-    const result = await editPromptInEditor(prompt)
+    const result = await editPromptInEditor(prompt);
     if (result.content !== null) {
-      setPrompt(result.content)
-      setCursorOffset(result.content.length)
+      setPrompt(result.content);
+      setCursorOffset(result.content.length);
     }
-  }, [prompt])
+  }, [prompt]);
 
   useKeybinding('chat:externalEditor', handleExternalEditor, {
     context: 'Chat',
     isActive: !isGenerating,
-  })
+  });
 
   // Go back when escape pressed while not generating
   const handleGoBack = useCallback(() => {
@@ -61,43 +60,38 @@ export function GenerateStep(): ReactNode {
       whenToUse: '',
       generatedAgent: undefined,
       wasGenerated: false,
-    })
-    setPrompt('')
-    setError(null)
-    goBack()
-  }, [updateWizardData, goBack])
+    });
+    setPrompt('');
+    setError(null);
+    goBack();
+  }, [updateWizardData, goBack]);
 
   // Use Settings context so 'n' key doesn't cancel (allows typing 'n' in prompt input)
   useKeybinding('confirm:no', handleGoBack, {
     context: 'Settings',
     isActive: !isGenerating,
-  })
+  });
 
   const handleGenerate = async (): Promise<void> => {
-    const trimmedPrompt = prompt.trim()
+    const trimmedPrompt = prompt.trim();
     if (!trimmedPrompt) {
-      setError('Please describe what the agent should do')
-      return
+      setError('Please describe what the agent should do');
+      return;
     }
 
-    setError(null)
-    setIsGenerating(true)
+    setError(null);
+    setIsGenerating(true);
     updateWizardData({
       generationPrompt: trimmedPrompt,
       isGenerating: true,
-    })
+    });
 
     // Create abort controller for this generation
-    const controller = createAbortController()
-    abortControllerRef.current = controller
+    const controller = createAbortController();
+    abortControllerRef.current = controller;
 
     try {
-      const generated = await generateAgent(
-        trimmedPrompt,
-        model,
-        [],
-        controller.signal,
-      )
+      const generated = await generateAgent(trimmedPrompt, model, [], controller.signal);
 
       updateWizardData({
         agentType: generated.identifier,
@@ -106,41 +100,32 @@ export function GenerateStep(): ReactNode {
         generatedAgent: generated,
         isGenerating: false,
         wasGenerated: true,
-      })
+      });
 
       // Skip directly to ToolsStep (index 6) - matching original flow
-      goToStep(6)
+      goToStep(6);
     } catch (err) {
       // Don't show error if it was cancelled (already set in escape handler)
       if (err instanceof APIUserAbortError) {
         // User cancelled - no error to show
-      } else if (
-        err instanceof Error &&
-        !err.message.includes('No assistant message found')
-      ) {
-        setError(err.message || 'Failed to generate agent')
+      } else if (err instanceof Error && !err.message.includes('No assistant message found')) {
+        setError(err.message || 'Failed to generate agent');
       }
-      updateWizardData({ isGenerating: false })
+      updateWizardData({ isGenerating: false });
     } finally {
-      setIsGenerating(false)
-      abortControllerRef.current = null
+      setIsGenerating(false);
+      abortControllerRef.current = null;
     }
-  }
+  };
 
-  const subtitle =
-    'Describe what this agent should do and when it should be used (be comprehensive for best results)'
+  const subtitle = 'Describe what this agent should do and when it should be used (be comprehensive for best results)';
 
   if (isGenerating) {
     return (
       <WizardDialogLayout
         subtitle={subtitle}
         footerText={
-          <ConfigurableShortcutHint
-            action="confirm:no"
-            context="Settings"
-            fallback="Esc"
-            description="cancel"
-          />
+          <ConfigurableShortcutHint action="confirm:no" context="Settings" fallback="Esc" description="cancel" />
         }
       >
         <Box flexDirection="row" alignItems="center">
@@ -148,7 +133,7 @@ export function GenerateStep(): ReactNode {
           <Text color="suggestion"> Generating agent from description...</Text>
         </Box>
       </WizardDialogLayout>
-    )
+    );
   }
 
   return (
@@ -156,24 +141,14 @@ export function GenerateStep(): ReactNode {
       subtitle={subtitle}
       footerText={
         <Byline>
-          <ConfigurableShortcutHint
-            action="confirm:yes"
-            context="Confirmation"
-            fallback="Enter"
-            description="submit"
-          />
+          <ConfigurableShortcutHint action="confirm:yes" context="Confirmation" fallback="Enter" description="submit" />
           <ConfigurableShortcutHint
             action="chat:externalEditor"
             context="Chat"
             fallback="ctrl+g"
             description="open in editor"
           />
-          <ConfigurableShortcutHint
-            action="confirm:no"
-            context="Settings"
-            fallback="Esc"
-            description="go back"
-          />
+          <ConfigurableShortcutHint action="confirm:no" context="Settings" fallback="Esc" description="go back" />
         </Byline>
       }
     >
@@ -196,5 +171,5 @@ export function GenerateStep(): ReactNode {
         />
       </Box>
     </WizardDialogLayout>
-  )
+  );
 }
diff --git a/src/components/agents/new-agent-creation/wizard-steps/LocationStep.tsx b/src/components/agents/new-agent-creation/wizard-steps/LocationStep.tsx
index d846cb39b..88a455586 100644
--- a/src/components/agents/new-agent-creation/wizard-steps/LocationStep.tsx
+++ b/src/components/agents/new-agent-creation/wizard-steps/LocationStep.tsx
@@ -1,14 +1,14 @@
-import React, { type ReactNode } from 'react'
-import { Box, Byline, KeyboardShortcutHint } from '@anthropic/ink'
-import type { SettingSource } from '../../../../utils/settings/constants.js'
-import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js'
-import { Select } from '../../../CustomSelect/select.js'
-import { useWizard } from '../../../wizard/index.js'
-import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js'
-import type { AgentWizardData } from '../types.js'
+import React, { type ReactNode } from 'react';
+import { Box, Byline, KeyboardShortcutHint } from '@anthropic/ink';
+import type { SettingSource } from '../../../../utils/settings/constants.js';
+import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js';
+import { Select } from '../../../CustomSelect/select.js';
+import { useWizard } from '../../../wizard/index.js';
+import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js';
+import type { AgentWizardData } from '../types.js';
 
 export function LocationStep(): ReactNode {
-  const { goNext, updateWizardData, cancel } = useWizard<AgentWizardData>()
+  const { goNext, updateWizardData, cancel } = useWizard<AgentWizardData>();
 
   const locationOptions = [
     {
@@ -19,7 +19,7 @@ export function LocationStep(): ReactNode {
       label: 'Personal (~/.claude/agents/)',
       value: 'userSettings' as SettingSource,
     },
-  ]
+  ];
 
   return (
     <WizardDialogLayout
@@ -28,12 +28,7 @@ export function LocationStep(): ReactNode {
         <Byline>
           <KeyboardShortcutHint shortcut="↑↓" action="navigate" />
           <KeyboardShortcutHint shortcut="Enter" action="select" />
-          <ConfigurableShortcutHint
-            action="confirm:no"
-            context="Confirmation"
-            fallback="Esc"
-            description="cancel"
-          />
+          <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="cancel" />
         </Byline>
       }
     >
@@ -42,12 +37,12 @@ export function LocationStep(): ReactNode {
           key="location-select"
           options={locationOptions}
           onChange={(value: string) => {
-            updateWizardData({ location: value as SettingSource })
-            goNext()
+            updateWizardData({ location: value as SettingSource });
+            goNext();
           }}
           onCancel={() => cancel()}
         />
       </Box>
     </WizardDialogLayout>
-  )
+  );
 }
diff --git a/src/components/agents/new-agent-creation/wizard-steps/MemoryStep.tsx b/src/components/agents/new-agent-creation/wizard-steps/MemoryStep.tsx
index 317e304d0..4c0aaa678 100644
--- a/src/components/agents/new-agent-creation/wizard-steps/MemoryStep.tsx
+++ b/src/components/agents/new-agent-creation/wizard-steps/MemoryStep.tsx
@@ -1,29 +1,28 @@
-import React, { type ReactNode } from 'react'
-import { Box, Byline, KeyboardShortcutHint } from '@anthropic/ink'
-import { useKeybinding } from '../../../../keybindings/useKeybinding.js'
-import { isAutoMemoryEnabled } from '../../../../memdir/paths.js'
+import React, { type ReactNode } from 'react';
+import { Box, Byline, KeyboardShortcutHint } from '@anthropic/ink';
+import { useKeybinding } from '../../../../keybindings/useKeybinding.js';
+import { isAutoMemoryEnabled } from '../../../../memdir/paths.js';
 import {
   type AgentMemoryScope,
   loadAgentMemoryPrompt,
-} from '@claude-code-best/builtin-tools/tools/AgentTool/agentMemory.js'
-import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js'
-import { Select } from '../../../CustomSelect/select.js'
-import { useWizard } from '../../../wizard/index.js'
-import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js'
-import type { AgentWizardData } from '../types.js'
+} from '@claude-code-best/builtin-tools/tools/AgentTool/agentMemory.js';
+import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js';
+import { Select } from '../../../CustomSelect/select.js';
+import { useWizard } from '../../../wizard/index.js';
+import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js';
+import type { AgentWizardData } from '../types.js';
 
 type MemoryOption = {
-  label: string
-  value: AgentMemoryScope | 'none'
-}
+  label: string;
+  value: AgentMemoryScope | 'none';
+};
 
 export function MemoryStep(): ReactNode {
-  const { goNext, goBack, updateWizardData, wizardData } =
-    useWizard<AgentWizardData>()
+  const { goNext, goBack, updateWizardData, wizardData } = useWizard<AgentWizardData>();
 
-  useKeybinding('confirm:no', goBack, { context: 'Confirmation' })
+  useKeybinding('confirm:no', goBack, { context: 'Confirmation' });
 
-  const isUserScope = wizardData.location === 'userSettings'
+  const isUserScope = wizardData.location === 'userSettings';
 
   // Build options with the recommended default first, then alternatives
   // The recommended scope matches the agent's location (project agent → project memory, user agent → user memory)
@@ -45,11 +44,11 @@ export function MemoryStep(): ReactNode {
         { label: 'None (no persistent memory)', value: 'none' },
         { label: 'User scope (~/.claude/agent-memory/)', value: 'user' },
         { label: 'Local scope (.claude/agent-memory-local/)', value: 'local' },
-      ]
+      ];
 
   const handleSelect = (value: string): void => {
-    const memory = value === 'none' ? undefined : (value as AgentMemoryScope)
-    const agentType = wizardData.finalAgent?.agentType
+    const memory = value === 'none' ? undefined : (value as AgentMemoryScope);
+    const agentType = wizardData.finalAgent?.agentType;
     updateWizardData({
       selectedMemory: memory,
       // Update finalAgent with memory and rewire getSystemPrompt to include memory loading.
@@ -60,16 +59,13 @@ export function MemoryStep(): ReactNode {
             memory,
             getSystemPrompt:
               isAutoMemoryEnabled() && memory && agentType
-                ? () =>
-                    wizardData.systemPrompt! +
-                    '\n\n' +
-                    loadAgentMemoryPrompt(agentType, memory)
+                ? () => wizardData.systemPrompt! + '\n\n' + loadAgentMemoryPrompt(agentType, memory)
                 : () => wizardData.systemPrompt!,
           }
         : undefined,
-    })
-    goNext()
-  }
+    });
+    goNext();
+  };
 
   return (
     <WizardDialogLayout
@@ -78,23 +74,13 @@ export function MemoryStep(): ReactNode {
         <Byline>
           <KeyboardShortcutHint shortcut="↑↓" action="navigate" />
           <KeyboardShortcutHint shortcut="Enter" action="select" />
-          <ConfigurableShortcutHint
-            action="confirm:no"
-            context="Confirmation"
-            fallback="Esc"
-            description="go back"
-          />
+          <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="go back" />
         </Byline>
       }
     >
       <Box>
-        <Select
-          key="memory-select"
-          options={memoryOptions}
-          onChange={handleSelect}
-          onCancel={goBack}
-        />
+        <Select key="memory-select" options={memoryOptions} onChange={handleSelect} onCancel={goBack} />
       </Box>
     </WizardDialogLayout>
-  )
+  );
 }
diff --git a/src/components/agents/new-agent-creation/wizard-steps/MethodStep.tsx b/src/components/agents/new-agent-creation/wizard-steps/MethodStep.tsx
index 552c20d1c..9a1277872 100644
--- a/src/components/agents/new-agent-creation/wizard-steps/MethodStep.tsx
+++ b/src/components/agents/new-agent-creation/wizard-steps/MethodStep.tsx
@@ -1,14 +1,13 @@
-import React, { type ReactNode } from 'react'
-import { Box, Byline, KeyboardShortcutHint } from '@anthropic/ink'
-import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js'
-import { Select } from '../../../CustomSelect/select.js'
-import { useWizard } from '../../../wizard/index.js'
-import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js'
-import type { AgentWizardData } from '../types.js'
+import React, { type ReactNode } from 'react';
+import { Box, Byline, KeyboardShortcutHint } from '@anthropic/ink';
+import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js';
+import { Select } from '../../../CustomSelect/select.js';
+import { useWizard } from '../../../wizard/index.js';
+import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js';
+import type { AgentWizardData } from '../types.js';
 
 export function MethodStep(): ReactNode {
-  const { goNext, goBack, updateWizardData, goToStep } =
-    useWizard<AgentWizardData>()
+  const { goNext, goBack, updateWizardData, goToStep } = useWizard<AgentWizardData>();
 
   const methodOptions = [
     {
@@ -19,7 +18,7 @@ export function MethodStep(): ReactNode {
       label: 'Manual configuration',
       value: 'manual',
     },
-  ]
+  ];
 
   return (
     <WizardDialogLayout
@@ -28,12 +27,7 @@ export function MethodStep(): ReactNode {
         <Byline>
           <KeyboardShortcutHint shortcut="↑↓" action="navigate" />
           <KeyboardShortcutHint shortcut="Enter" action="select" />
-          <ConfigurableShortcutHint
-            action="confirm:no"
-            context="Confirmation"
-            fallback="Esc"
-            description="go back"
-          />
+          <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="go back" />
         </Byline>
       }
     >
@@ -42,22 +36,22 @@ export function MethodStep(): ReactNode {
           key="method-select"
           options={methodOptions}
           onChange={(value: string) => {
-            const method = value as 'generate' | 'manual'
+            const method = value as 'generate' | 'manual';
             updateWizardData({
               method,
               wasGenerated: method === 'generate',
-            })
+            });
 
             // Dynamic navigation based on method
             if (method === 'generate') {
-              goNext() // Go to GenerateStep (index 2)
+              goNext(); // Go to GenerateStep (index 2)
             } else {
-              goToStep(3) // Skip to TypeStep (index 3)
+              goToStep(3); // Skip to TypeStep (index 3)
             }
           }}
           onCancel={() => goBack()}
         />
       </Box>
     </WizardDialogLayout>
-  )
+  );
 }
diff --git a/src/components/agents/new-agent-creation/wizard-steps/ModelStep.tsx b/src/components/agents/new-agent-creation/wizard-steps/ModelStep.tsx
index a92ecde4a..f68028705 100644
--- a/src/components/agents/new-agent-creation/wizard-steps/ModelStep.tsx
+++ b/src/components/agents/new-agent-creation/wizard-steps/ModelStep.tsx
@@ -1,19 +1,18 @@
-import React, { type ReactNode } from 'react'
-import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js'
-import { Byline, KeyboardShortcutHint } from '@anthropic/ink'
-import { useWizard } from '../../../wizard/index.js'
-import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js'
-import { ModelSelector } from '../../ModelSelector.js'
-import type { AgentWizardData } from '../types.js'
+import React, { type ReactNode } from 'react';
+import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js';
+import { Byline, KeyboardShortcutHint } from '@anthropic/ink';
+import { useWizard } from '../../../wizard/index.js';
+import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js';
+import { ModelSelector } from '../../ModelSelector.js';
+import type { AgentWizardData } from '../types.js';
 
 export function ModelStep(): ReactNode {
-  const { goNext, goBack, updateWizardData, wizardData } =
-    useWizard<AgentWizardData>()
+  const { goNext, goBack, updateWizardData, wizardData } = useWizard<AgentWizardData>();
 
   const handleComplete = (model?: string): void => {
-    updateWizardData({ selectedModel: model })
-    goNext()
-  }
+    updateWizardData({ selectedModel: model });
+    goNext();
+  };
 
   return (
     <WizardDialogLayout
@@ -22,20 +21,11 @@ export function ModelStep(): ReactNode {
         <Byline>
           <KeyboardShortcutHint shortcut="↑↓" action="navigate" />
           <KeyboardShortcutHint shortcut="Enter" action="select" />
-          <ConfigurableShortcutHint
-            action="confirm:no"
-            context="Confirmation"
-            fallback="Esc"
-            description="go back"
-          />
+          <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="go back" />
         </Byline>
       }
     >
-      <ModelSelector
-        initialModel={wizardData.selectedModel}
-        onComplete={handleComplete}
-        onCancel={goBack}
-      />
+      <ModelSelector initialModel={wizardData.selectedModel} onComplete={handleComplete} onCancel={goBack} />
     </WizardDialogLayout>
-  )
+  );
 }
diff --git a/src/components/agents/new-agent-creation/wizard-steps/PromptStep.tsx b/src/components/agents/new-agent-creation/wizard-steps/PromptStep.tsx
index c1e1f5260..562e75c6f 100644
--- a/src/components/agents/new-agent-creation/wizard-steps/PromptStep.tsx
+++ b/src/components/agents/new-agent-creation/wizard-steps/PromptStep.tsx
@@ -1,48 +1,45 @@
-import React, { type ReactNode, useCallback, useState } from 'react'
-import { Box, Byline, KeyboardShortcutHint, Text } from '@anthropic/ink'
-import { useKeybinding } from '../../../../keybindings/useKeybinding.js'
-import { editPromptInEditor } from '../../../../utils/promptEditor.js'
-import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js'
-import TextInput from '../../../TextInput.js'
-import { useWizard } from '../../../wizard/index.js'
-import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js'
-import type { AgentWizardData } from '../types.js'
+import React, { type ReactNode, useCallback, useState } from 'react';
+import { Box, Byline, KeyboardShortcutHint, Text } from '@anthropic/ink';
+import { useKeybinding } from '../../../../keybindings/useKeybinding.js';
+import { editPromptInEditor } from '../../../../utils/promptEditor.js';
+import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js';
+import TextInput from '../../../TextInput.js';
+import { useWizard } from '../../../wizard/index.js';
+import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js';
+import type { AgentWizardData } from '../types.js';
 
 export function PromptStep(): ReactNode {
-  const { goNext, goBack, updateWizardData, wizardData } =
-    useWizard<AgentWizardData>()
-  const [systemPrompt, setSystemPrompt] = useState(
-    wizardData.systemPrompt || '',
-  )
-  const [cursorOffset, setCursorOffset] = useState(systemPrompt.length)
-  const [error, setError] = useState<string | null>(null)
+  const { goNext, goBack, updateWizardData, wizardData } = useWizard<AgentWizardData>();
+  const [systemPrompt, setSystemPrompt] = useState(wizardData.systemPrompt || '');
+  const [cursorOffset, setCursorOffset] = useState(systemPrompt.length);
+  const [error, setError] = useState<string | null>(null);
 
   // Handle escape key - use Settings context so 'n' key doesn't cancel (allows typing 'n' in input)
-  useKeybinding('confirm:no', goBack, { context: 'Settings' })
+  useKeybinding('confirm:no', goBack, { context: 'Settings' });
 
   const handleExternalEditor = useCallback(async () => {
-    const result = await editPromptInEditor(systemPrompt)
+    const result = await editPromptInEditor(systemPrompt);
     if (result.content !== null) {
-      setSystemPrompt(result.content)
-      setCursorOffset(result.content.length)
+      setSystemPrompt(result.content);
+      setCursorOffset(result.content.length);
     }
-  }, [systemPrompt])
+  }, [systemPrompt]);
 
   useKeybinding('chat:externalEditor', handleExternalEditor, {
     context: 'Chat',
-  })
+  });
 
   const handleSubmit = (): void => {
-    const trimmedPrompt = systemPrompt.trim()
+    const trimmedPrompt = systemPrompt.trim();
     if (!trimmedPrompt) {
-      setError('System prompt is required')
-      return
+      setError('System prompt is required');
+      return;
     }
 
-    setError(null)
-    updateWizardData({ systemPrompt: trimmedPrompt })
-    goNext()
-  }
+    setError(null);
+    updateWizardData({ systemPrompt: trimmedPrompt });
+    goNext();
+  };
 
   return (
     <WizardDialogLayout
@@ -57,12 +54,7 @@ export function PromptStep(): ReactNode {
             fallback="ctrl+g"
             description="open in editor"
           />
-          <ConfigurableShortcutHint
-            action="confirm:no"
-            context="Settings"
-            fallback="Esc"
-            description="go back"
-          />
+          <ConfigurableShortcutHint action="confirm:no" context="Settings" fallback="Esc" description="go back" />
         </Byline>
       }
     >
@@ -91,5 +83,5 @@ export function PromptStep(): ReactNode {
         )}
       </Box>
     </WizardDialogLayout>
-  )
+  );
 }
diff --git a/src/components/agents/new-agent-creation/wizard-steps/ToolsStep.tsx b/src/components/agents/new-agent-creation/wizard-steps/ToolsStep.tsx
index 19a8360c4..c885d6ee0 100644
--- a/src/components/agents/new-agent-creation/wizard-steps/ToolsStep.tsx
+++ b/src/components/agents/new-agent-creation/wizard-steps/ToolsStep.tsx
@@ -1,28 +1,27 @@
-import React, { type ReactNode } from 'react'
-import type { Tools } from '../../../../Tool.js'
-import { Byline, KeyboardShortcutHint } from '@anthropic/ink'
-import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js'
-import { useWizard } from '../../../wizard/index.js'
-import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js'
-import { ToolSelector } from '../../ToolSelector.js'
-import type { AgentWizardData } from '../types.js'
+import React, { type ReactNode } from 'react';
+import type { Tools } from '../../../../Tool.js';
+import { Byline, KeyboardShortcutHint } from '@anthropic/ink';
+import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js';
+import { useWizard } from '../../../wizard/index.js';
+import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js';
+import { ToolSelector } from '../../ToolSelector.js';
+import type { AgentWizardData } from '../types.js';
 
 type Props = {
-  tools: Tools
-}
+  tools: Tools;
+};
 
 export function ToolsStep({ tools }: Props): ReactNode {
-  const { goNext, goBack, updateWizardData, wizardData } =
-    useWizard<AgentWizardData>()
+  const { goNext, goBack, updateWizardData, wizardData } = useWizard<AgentWizardData>();
 
   const handleComplete = (selectedTools: string[] | undefined): void => {
-    updateWizardData({ selectedTools })
-    goNext()
-  }
+    updateWizardData({ selectedTools });
+    goNext();
+  };
 
   // Pass through undefined to preserve "all tools" semantic
   // ToolSelector will expand it internally for display purposes
-  const initialTools = wizardData.selectedTools
+  const initialTools = wizardData.selectedTools;
 
   return (
     <WizardDialogLayout
@@ -31,21 +30,11 @@ export function ToolsStep({ tools }: Props): ReactNode {
         <Byline>
           <KeyboardShortcutHint shortcut="Enter" action="toggle selection" />
           <KeyboardShortcutHint shortcut="↑↓" action="navigate" />
-          <ConfigurableShortcutHint
-            action="confirm:no"
-            context="Confirmation"
-            fallback="Esc"
-            description="go back"
-          />
+          <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="go back" />
         </Byline>
       }
     >
-      <ToolSelector
-        tools={tools}
-        initialTools={initialTools}
-        onComplete={handleComplete}
-        onCancel={goBack}
-      />
+      <ToolSelector tools={tools} initialTools={initialTools} onComplete={handleComplete} onCancel={goBack} />
     </WizardDialogLayout>
-  )
+  );
 }
diff --git a/src/components/agents/new-agent-creation/wizard-steps/TypeStep.tsx b/src/components/agents/new-agent-creation/wizard-steps/TypeStep.tsx
index 59f8fb8da..7e203e195 100644
--- a/src/components/agents/new-agent-creation/wizard-steps/TypeStep.tsx
+++ b/src/components/agents/new-agent-creation/wizard-steps/TypeStep.tsx
@@ -1,42 +1,41 @@
-import React, { type ReactNode, useState } from 'react'
-import { Box, Byline, KeyboardShortcutHint, Text } from '@anthropic/ink'
-import { useKeybinding } from '../../../../keybindings/useKeybinding.js'
-import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
-import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js'
-import TextInput from '../../../TextInput.js'
-import { useWizard } from '../../../wizard/index.js'
-import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js'
-import { validateAgentType } from '../../validateAgent.js'
-import type { AgentWizardData } from '../types.js'
+import React, { type ReactNode, useState } from 'react';
+import { Box, Byline, KeyboardShortcutHint, Text } from '@anthropic/ink';
+import { useKeybinding } from '../../../../keybindings/useKeybinding.js';
+import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js';
+import { ConfigurableShortcutHint } from '../../../ConfigurableShortcutHint.js';
+import TextInput from '../../../TextInput.js';
+import { useWizard } from '../../../wizard/index.js';
+import { WizardDialogLayout } from '../../../wizard/WizardDialogLayout.js';
+import { validateAgentType } from '../../validateAgent.js';
+import type { AgentWizardData } from '../types.js';
 
 type Props = {
-  existingAgents: AgentDefinition[]
-}
+  existingAgents: AgentDefinition[];
+};
 
 export function TypeStep(_props: Props): ReactNode {
-  const { goNext, goBack, updateWizardData, wizardData } =
-    useWizard<AgentWizardData>()
-  const [agentType, setAgentType] = useState(wizardData.agentType || '')
-  const [error, setError] = useState<string | null>(null)
-  const [cursorOffset, setCursorOffset] = useState(agentType.length)
+  const { goNext, goBack, updateWizardData, wizardData } = useWizard<AgentWizardData>();
+  const [agentType, setAgentType] = useState(wizardData.agentType || '');
+  const [error, setError] = useState<string | null>(null);
+  const [cursorOffset, setCursorOffset] = useState(agentType.length);
 
   // Handle escape key - Go back to MethodStep
   // Use Settings context so 'n' key doesn't cancel (allows typing 'n' in input)
-  useKeybinding('confirm:no', goBack, { context: 'Settings' })
+  useKeybinding('confirm:no', goBack, { context: 'Settings' });
 
   const handleSubmit = (value: string): void => {
-    const trimmedValue = value.trim()
-    const validationError = validateAgentType(trimmedValue)
+    const trimmedValue = value.trim();
+    const validationError = validateAgentType(trimmedValue);
 
     if (validationError) {
-      setError(validationError)
-      return
+      setError(validationError);
+      return;
     }
 
-    setError(null)
-    updateWizardData({ agentType: trimmedValue })
-    goNext()
-  }
+    setError(null);
+    updateWizardData({ agentType: trimmedValue });
+    goNext();
+  };
 
   return (
     <WizardDialogLayout
@@ -45,12 +44,7 @@ export function TypeStep(_props: Props): ReactNode {
         <Byline>
           <KeyboardShortcutHint shortcut="Type" action="enter text" />
           <KeyboardShortcutHint shortcut="Enter" action="continue" />
-          <ConfigurableShortcutHint
-            action="confirm:no"
-            context="Settings"
-            fallback="Esc"
-            description="go back"
-          />
+          <ConfigurableShortcutHint action="confirm:no" context="Settings" fallback="Esc" description="go back" />
         </Byline>
       }
     >
@@ -77,5 +71,5 @@ export function TypeStep(_props: Props): ReactNode {
         )}
       </Box>
     </WizardDialogLayout>
-  )
+  );
 }
diff --git a/src/components/agents/new-agent-creation/wizard-steps/src/services/analytics/index.ts b/src/components/agents/new-agent-creation/wizard-steps/src/services/analytics/index.ts
index 142e7b6f5..2e0f796da 100644
--- a/src/components/agents/new-agent-creation/wizard-steps/src/services/analytics/index.ts
+++ b/src/components/agents/new-agent-creation/wizard-steps/src/services/analytics/index.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any;
-export type logEvent = any;
+export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any
+export type logEvent = any
diff --git a/src/components/agents/new-agent-creation/wizard-steps/src/state/AppState.ts b/src/components/agents/new-agent-creation/wizard-steps/src/state/AppState.ts
index 93788b82c..aed7070f4 100644
--- a/src/components/agents/new-agent-creation/wizard-steps/src/state/AppState.ts
+++ b/src/components/agents/new-agent-creation/wizard-steps/src/state/AppState.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useSetAppState = any;
+export type useSetAppState = any
diff --git a/src/components/agents/src/Tool.ts b/src/components/agents/src/Tool.ts
index 03b2b7ee7..c9f919389 100644
--- a/src/components/agents/src/Tool.ts
+++ b/src/components/agents/src/Tool.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type Tool = any;
-export type Tools = any;
-export type getEmptyToolPermissionContext = any;
+export type Tool = any
+export type Tools = any
+export type getEmptyToolPermissionContext = any
diff --git a/src/components/agents/src/context.ts b/src/components/agents/src/context.ts
index 3ce849ca0..c6b74d50b 100644
--- a/src/components/agents/src/context.ts
+++ b/src/components/agents/src/context.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getUserContext = any;
+export type getUserContext = any
diff --git a/src/components/agents/src/services/api/claude.ts b/src/components/agents/src/services/api/claude.ts
index b02c1424c..d4410ae92 100644
--- a/src/components/agents/src/services/api/claude.ts
+++ b/src/components/agents/src/services/api/claude.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type queryModelWithoutStreaming = any;
+export type queryModelWithoutStreaming = any
diff --git a/src/components/agents/src/services/mcp/mcpStringUtils.ts b/src/components/agents/src/services/mcp/mcpStringUtils.ts
index 6813ff192..cb1ed7faa 100644
--- a/src/components/agents/src/services/mcp/mcpStringUtils.ts
+++ b/src/components/agents/src/services/mcp/mcpStringUtils.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type mcpInfoFromString = any;
+export type mcpInfoFromString = any
diff --git a/src/components/agents/src/services/mcp/utils.ts b/src/components/agents/src/services/mcp/utils.ts
index 3bd1bb388..e5a1d80cd 100644
--- a/src/components/agents/src/services/mcp/utils.ts
+++ b/src/components/agents/src/services/mcp/utils.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type isMcpTool = any;
+export type isMcpTool = any
diff --git a/src/components/agents/src/state/AppState.ts b/src/components/agents/src/state/AppState.ts
index 93788b82c..aed7070f4 100644
--- a/src/components/agents/src/state/AppState.ts
+++ b/src/components/agents/src/state/AppState.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useSetAppState = any;
+export type useSetAppState = any
diff --git a/src/components/agents/src/tools/AgentTool/agentToolUtils.ts b/src/components/agents/src/tools/AgentTool/agentToolUtils.ts
index 1a95f5b3f..5f12f5850 100644
--- a/src/components/agents/src/tools/AgentTool/agentToolUtils.ts
+++ b/src/components/agents/src/tools/AgentTool/agentToolUtils.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type filterToolsForAgent = any;
+export type filterToolsForAgent = any
diff --git a/src/components/agents/src/tools/AgentTool/constants.ts b/src/components/agents/src/tools/AgentTool/constants.ts
index c5969e5de..a835a0b7e 100644
--- a/src/components/agents/src/tools/AgentTool/constants.ts
+++ b/src/components/agents/src/tools/AgentTool/constants.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type AGENT_TOOL_NAME = any;
+export type AGENT_TOOL_NAME = any
diff --git a/src/components/agents/src/tools/BashTool/BashTool.ts b/src/components/agents/src/tools/BashTool/BashTool.ts
index 7a3ea3cc5..0e57d5e17 100644
--- a/src/components/agents/src/tools/BashTool/BashTool.ts
+++ b/src/components/agents/src/tools/BashTool/BashTool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type BashTool = any;
+export type BashTool = any
diff --git a/src/components/agents/src/tools/ExitPlanModeTool/ExitPlanModeV2Tool.ts b/src/components/agents/src/tools/ExitPlanModeTool/ExitPlanModeV2Tool.ts
index f9708d2b3..1e7971d36 100644
--- a/src/components/agents/src/tools/ExitPlanModeTool/ExitPlanModeV2Tool.ts
+++ b/src/components/agents/src/tools/ExitPlanModeTool/ExitPlanModeV2Tool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type ExitPlanModeV2Tool = any;
+export type ExitPlanModeV2Tool = any
diff --git a/src/components/agents/src/tools/FileEditTool/FileEditTool.ts b/src/components/agents/src/tools/FileEditTool/FileEditTool.ts
index 0d3bc60eb..5493abf9c 100644
--- a/src/components/agents/src/tools/FileEditTool/FileEditTool.ts
+++ b/src/components/agents/src/tools/FileEditTool/FileEditTool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type FileEditTool = any;
+export type FileEditTool = any
diff --git a/src/components/agents/src/tools/FileReadTool/FileReadTool.ts b/src/components/agents/src/tools/FileReadTool/FileReadTool.ts
index b9ca41b17..70baab50b 100644
--- a/src/components/agents/src/tools/FileReadTool/FileReadTool.ts
+++ b/src/components/agents/src/tools/FileReadTool/FileReadTool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type FileReadTool = any;
+export type FileReadTool = any
diff --git a/src/components/agents/src/tools/FileWriteTool/FileWriteTool.ts b/src/components/agents/src/tools/FileWriteTool/FileWriteTool.ts
index 9417a7a94..8e268cd91 100644
--- a/src/components/agents/src/tools/FileWriteTool/FileWriteTool.ts
+++ b/src/components/agents/src/tools/FileWriteTool/FileWriteTool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type FileWriteTool = any;
+export type FileWriteTool = any
diff --git a/src/components/agents/src/tools/GlobTool/GlobTool.ts b/src/components/agents/src/tools/GlobTool/GlobTool.ts
index a411d3dd7..72e6f2921 100644
--- a/src/components/agents/src/tools/GlobTool/GlobTool.ts
+++ b/src/components/agents/src/tools/GlobTool/GlobTool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type GlobTool = any;
+export type GlobTool = any
diff --git a/src/components/agents/src/tools/GrepTool/GrepTool.ts b/src/components/agents/src/tools/GrepTool/GrepTool.ts
index 0ed073688..286c5fba1 100644
--- a/src/components/agents/src/tools/GrepTool/GrepTool.ts
+++ b/src/components/agents/src/tools/GrepTool/GrepTool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type GrepTool = any;
+export type GrepTool = any
diff --git a/src/components/agents/src/tools/ListMcpResourcesTool/ListMcpResourcesTool.ts b/src/components/agents/src/tools/ListMcpResourcesTool/ListMcpResourcesTool.ts
index 17b103d50..3f8f2791c 100644
--- a/src/components/agents/src/tools/ListMcpResourcesTool/ListMcpResourcesTool.ts
+++ b/src/components/agents/src/tools/ListMcpResourcesTool/ListMcpResourcesTool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type ListMcpResourcesTool = any;
+export type ListMcpResourcesTool = any
diff --git a/src/components/agents/src/tools/NotebookEditTool/NotebookEditTool.ts b/src/components/agents/src/tools/NotebookEditTool/NotebookEditTool.ts
index 9ebe8c2b0..8eaf1f324 100644
--- a/src/components/agents/src/tools/NotebookEditTool/NotebookEditTool.ts
+++ b/src/components/agents/src/tools/NotebookEditTool/NotebookEditTool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type NotebookEditTool = any;
+export type NotebookEditTool = any
diff --git a/src/components/agents/src/tools/ReadMcpResourceTool/ReadMcpResourceTool.ts b/src/components/agents/src/tools/ReadMcpResourceTool/ReadMcpResourceTool.ts
index bee0f9bdd..fd8bd82ca 100644
--- a/src/components/agents/src/tools/ReadMcpResourceTool/ReadMcpResourceTool.ts
+++ b/src/components/agents/src/tools/ReadMcpResourceTool/ReadMcpResourceTool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type ReadMcpResourceTool = any;
+export type ReadMcpResourceTool = any
diff --git a/src/components/agents/src/tools/TaskOutputTool/TaskOutputTool.ts b/src/components/agents/src/tools/TaskOutputTool/TaskOutputTool.ts
index f77e9dbfb..2d6a1a350 100644
--- a/src/components/agents/src/tools/TaskOutputTool/TaskOutputTool.ts
+++ b/src/components/agents/src/tools/TaskOutputTool/TaskOutputTool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type TaskOutputTool = any;
+export type TaskOutputTool = any
diff --git a/src/components/agents/src/tools/TaskStopTool/TaskStopTool.ts b/src/components/agents/src/tools/TaskStopTool/TaskStopTool.ts
index 0a069d4d0..685c2f8c2 100644
--- a/src/components/agents/src/tools/TaskStopTool/TaskStopTool.ts
+++ b/src/components/agents/src/tools/TaskStopTool/TaskStopTool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type TaskStopTool = any;
+export type TaskStopTool = any
diff --git a/src/components/agents/src/tools/TodoWriteTool/TodoWriteTool.ts b/src/components/agents/src/tools/TodoWriteTool/TodoWriteTool.ts
index ce5e439e1..6ead1f314 100644
--- a/src/components/agents/src/tools/TodoWriteTool/TodoWriteTool.ts
+++ b/src/components/agents/src/tools/TodoWriteTool/TodoWriteTool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type TodoWriteTool = any;
+export type TodoWriteTool = any
diff --git a/src/components/agents/src/tools/TungstenTool/TungstenTool.ts b/src/components/agents/src/tools/TungstenTool/TungstenTool.ts
index e86bbfbe8..c61a7a267 100644
--- a/src/components/agents/src/tools/TungstenTool/TungstenTool.ts
+++ b/src/components/agents/src/tools/TungstenTool/TungstenTool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type TungstenTool = any;
+export type TungstenTool = any
diff --git a/src/components/agents/src/tools/WebFetchTool/WebFetchTool.ts b/src/components/agents/src/tools/WebFetchTool/WebFetchTool.ts
index 97d4995f7..aa70bb126 100644
--- a/src/components/agents/src/tools/WebFetchTool/WebFetchTool.ts
+++ b/src/components/agents/src/tools/WebFetchTool/WebFetchTool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type WebFetchTool = any;
+export type WebFetchTool = any
diff --git a/src/components/agents/src/tools/WebSearchTool/WebSearchTool.ts b/src/components/agents/src/tools/WebSearchTool/WebSearchTool.ts
index 606345335..c8c2f94ed 100644
--- a/src/components/agents/src/tools/WebSearchTool/WebSearchTool.ts
+++ b/src/components/agents/src/tools/WebSearchTool/WebSearchTool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type WebSearchTool = any;
+export type WebSearchTool = any
diff --git a/src/components/agents/src/utils/api.ts b/src/components/agents/src/utils/api.ts
index d5a1bbc37..4b86d59b0 100644
--- a/src/components/agents/src/utils/api.ts
+++ b/src/components/agents/src/utils/api.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type prependUserContext = any;
+export type prependUserContext = any
diff --git a/src/components/agents/src/utils/messages.ts b/src/components/agents/src/utils/messages.ts
index 4c11a77c9..8a50620c6 100644
--- a/src/components/agents/src/utils/messages.ts
+++ b/src/components/agents/src/utils/messages.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type createUserMessage = any;
-export type normalizeMessagesForAPI = any;
+export type createUserMessage = any
+export type normalizeMessagesForAPI = any
diff --git a/src/components/agents/src/utils/model/model.ts b/src/components/agents/src/utils/model/model.ts
index abf3bce15..2221a4237 100644
--- a/src/components/agents/src/utils/model/model.ts
+++ b/src/components/agents/src/utils/model/model.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type ModelName = any;
+export type ModelName = any
diff --git a/src/components/agents/src/utils/settings/constants.ts b/src/components/agents/src/utils/settings/constants.ts
index 48b2b5a37..d9bf6f5a5 100644
--- a/src/components/agents/src/utils/settings/constants.ts
+++ b/src/components/agents/src/utils/settings/constants.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type SettingSource = any;
-export type getSettingSourceName = any;
+export type SettingSource = any
+export type getSettingSourceName = any
diff --git a/src/components/agents/src/utils/settings/managedPath.ts b/src/components/agents/src/utils/settings/managedPath.ts
index 1214f262c..f987221c1 100644
--- a/src/components/agents/src/utils/settings/managedPath.ts
+++ b/src/components/agents/src/utils/settings/managedPath.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getManagedFilePath = any;
+export type getManagedFilePath = any
diff --git a/src/components/design-system/Byline.tsx b/src/components/design-system/Byline.tsx
index eefab18cf..8e79e66b4 100644
--- a/src/components/design-system/Byline.tsx
+++ b/src/components/design-system/Byline.tsx
@@ -1 +1 @@
-export { Byline } from '@anthropic/ink'
+export { Byline } from '@anthropic/ink';
diff --git a/src/components/design-system/Dialog.tsx b/src/components/design-system/Dialog.tsx
index bb531183c..ff05ef396 100644
--- a/src/components/design-system/Dialog.tsx
+++ b/src/components/design-system/Dialog.tsx
@@ -1 +1 @@
-export { Dialog } from '@anthropic/ink'
+export { Dialog } from '@anthropic/ink';
diff --git a/src/components/design-system/Divider.tsx b/src/components/design-system/Divider.tsx
index a5b7f0e88..3ec1c0cf0 100644
--- a/src/components/design-system/Divider.tsx
+++ b/src/components/design-system/Divider.tsx
@@ -1 +1 @@
-export { Divider } from '@anthropic/ink'
+export { Divider } from '@anthropic/ink';
diff --git a/src/components/design-system/FuzzyPicker.tsx b/src/components/design-system/FuzzyPicker.tsx
index c034335e9..3ca71160c 100644
--- a/src/components/design-system/FuzzyPicker.tsx
+++ b/src/components/design-system/FuzzyPicker.tsx
@@ -1 +1 @@
-export { FuzzyPicker } from '@anthropic/ink'
+export { FuzzyPicker } from '@anthropic/ink';
diff --git a/src/components/design-system/KeyboardShortcutHint.tsx b/src/components/design-system/KeyboardShortcutHint.tsx
index ad61f636f..77955b0cb 100644
--- a/src/components/design-system/KeyboardShortcutHint.tsx
+++ b/src/components/design-system/KeyboardShortcutHint.tsx
@@ -1 +1 @@
-export { KeyboardShortcutHint } from '@anthropic/ink'
+export { KeyboardShortcutHint } from '@anthropic/ink';
diff --git a/src/components/design-system/ListItem.tsx b/src/components/design-system/ListItem.tsx
index f309c9975..ff051fbb9 100644
--- a/src/components/design-system/ListItem.tsx
+++ b/src/components/design-system/ListItem.tsx
@@ -1 +1 @@
-export { ListItem } from '@anthropic/ink'
+export { ListItem } from '@anthropic/ink';
diff --git a/src/components/design-system/LoadingState.tsx b/src/components/design-system/LoadingState.tsx
index 71dbdaa40..c382e7964 100644
--- a/src/components/design-system/LoadingState.tsx
+++ b/src/components/design-system/LoadingState.tsx
@@ -1 +1 @@
-export { LoadingState } from '@anthropic/ink'
+export { LoadingState } from '@anthropic/ink';
diff --git a/src/components/design-system/Pane.tsx b/src/components/design-system/Pane.tsx
index 12eb3ed55..3160b1138 100644
--- a/src/components/design-system/Pane.tsx
+++ b/src/components/design-system/Pane.tsx
@@ -1 +1 @@
-export { Pane } from '@anthropic/ink'
+export { Pane } from '@anthropic/ink';
diff --git a/src/components/design-system/ProgressBar.tsx b/src/components/design-system/ProgressBar.tsx
index 6aacc6129..31f9a6e5f 100644
--- a/src/components/design-system/ProgressBar.tsx
+++ b/src/components/design-system/ProgressBar.tsx
@@ -1 +1 @@
-export { ProgressBar } from '@anthropic/ink'
+export { ProgressBar } from '@anthropic/ink';
diff --git a/src/components/design-system/Ratchet.tsx b/src/components/design-system/Ratchet.tsx
index 5aaab3289..1283ac9e1 100644
--- a/src/components/design-system/Ratchet.tsx
+++ b/src/components/design-system/Ratchet.tsx
@@ -1 +1 @@
-export { Ratchet } from '@anthropic/ink'
+export { Ratchet } from '@anthropic/ink';
diff --git a/src/components/design-system/StatusIcon.tsx b/src/components/design-system/StatusIcon.tsx
index 962ea1ba6..05e75b564 100644
--- a/src/components/design-system/StatusIcon.tsx
+++ b/src/components/design-system/StatusIcon.tsx
@@ -1 +1 @@
-export { StatusIcon } from '@anthropic/ink'
+export { StatusIcon } from '@anthropic/ink';
diff --git a/src/components/design-system/Tabs.tsx b/src/components/design-system/Tabs.tsx
index e11de0a6b..01433ba1d 100644
--- a/src/components/design-system/Tabs.tsx
+++ b/src/components/design-system/Tabs.tsx
@@ -1 +1 @@
-export { Tab, Tabs, useTabHeaderFocus, useTabsWidth } from '@anthropic/ink'
+export { Tab, Tabs, useTabHeaderFocus, useTabsWidth } from '@anthropic/ink';
diff --git a/src/components/design-system/ThemeProvider.tsx b/src/components/design-system/ThemeProvider.tsx
index 9d9bc9f66..db5b2a52f 100644
--- a/src/components/design-system/ThemeProvider.tsx
+++ b/src/components/design-system/ThemeProvider.tsx
@@ -1 +1 @@
-export { ThemeProvider, usePreviewTheme, useTheme, useThemeSetting } from '@anthropic/ink'
+export { ThemeProvider, usePreviewTheme, useTheme, useThemeSetting } from '@anthropic/ink';
diff --git a/src/components/design-system/ThemedBox.tsx b/src/components/design-system/ThemedBox.tsx
index 30059f318..f40832612 100644
--- a/src/components/design-system/ThemedBox.tsx
+++ b/src/components/design-system/ThemedBox.tsx
@@ -1 +1 @@
-export { Box as default } from '@anthropic/ink'
+export { Box as default } from '@anthropic/ink';
diff --git a/src/components/design-system/ThemedText.tsx b/src/components/design-system/ThemedText.tsx
index 792f0da4b..4d2204f1c 100644
--- a/src/components/design-system/ThemedText.tsx
+++ b/src/components/design-system/ThemedText.tsx
@@ -1 +1 @@
-export { Text as default, TextHoverColorContext } from '@anthropic/ink'
+export { Text as default, TextHoverColorContext } from '@anthropic/ink';
diff --git a/src/components/diff/DiffDetailView.tsx b/src/components/diff/DiffDetailView.tsx
index 43fb442fc..5e8e6ce66 100644
--- a/src/components/diff/DiffDetailView.tsx
+++ b/src/components/diff/DiffDetailView.tsx
@@ -1,21 +1,21 @@
-import type { StructuredPatchHunk } from 'diff'
-import { resolve } from 'path'
-import React, { useMemo } from 'react'
-import { useTerminalSize } from '../../hooks/useTerminalSize.js'
-import { Box, Text } from '@anthropic/ink'
-import { getCwd } from '../../utils/cwd.js'
-import { readFileSafe } from '../../utils/file.js'
-import { Divider } from '@anthropic/ink'
-import { StructuredDiff } from '../StructuredDiff.js'
+import type { StructuredPatchHunk } from 'diff';
+import { resolve } from 'path';
+import React, { useMemo } from 'react';
+import { useTerminalSize } from '../../hooks/useTerminalSize.js';
+import { Box, Text } from '@anthropic/ink';
+import { getCwd } from '../../utils/cwd.js';
+import { readFileSafe } from '../../utils/file.js';
+import { Divider } from '@anthropic/ink';
+import { StructuredDiff } from '../StructuredDiff.js';
 
 type Props = {
-  filePath: string
-  hunks: StructuredPatchHunk[]
-  isLargeFile?: boolean
-  isBinary?: boolean
-  isTruncated?: boolean
-  isUntracked?: boolean
-}
+  filePath: string;
+  hunks: StructuredPatchHunk[];
+  isLargeFile?: boolean;
+  isBinary?: boolean;
+  isTruncated?: boolean;
+  isUntracked?: boolean;
+};
 
 /**
  * Displays the diff content for a single file.
@@ -30,21 +30,21 @@ export function DiffDetailView({
   isTruncated,
   isUntracked,
 }: Props): React.ReactNode {
-  const { columns } = useTerminalSize()
+  const { columns } = useTerminalSize();
 
   // Read file content for syntax detection and multiline construct handling.
   // Only computed when this component is rendered (detail view mode).
   const { firstLine, fileContent } = useMemo(() => {
     if (!filePath) {
-      return { firstLine: null, fileContent: undefined }
+      return { firstLine: null, fileContent: undefined };
     }
-    const fullPath = resolve(getCwd(), filePath)
-    const content = readFileSafe(fullPath)
+    const fullPath = resolve(getCwd(), filePath);
+    const content = readFileSafe(fullPath);
     return {
       firstLine: content?.split('\n')[0] ?? null,
       fileContent: content ?? undefined,
-    }
-  }, [filePath])
+    };
+  }, [filePath]);
 
   // Handle untracked files
   if (isUntracked) {
@@ -64,7 +64,7 @@ export function DiffDetailView({
           </Text>
         </Box>
       </Box>
-    )
+    );
   }
 
   // Handle binary files
@@ -81,7 +81,7 @@ export function DiffDetailView({
           </Text>
         </Box>
       </Box>
-    )
+    );
   }
 
   // Handle large files
@@ -98,11 +98,11 @@ export function DiffDetailView({
           </Text>
         </Box>
       </Box>
-    )
+    );
   }
 
-  const outerPaddingX = 1
-  const outerBorderWidth = 1
+  const outerPaddingX = 1;
+  const outerBorderWidth = 1;
 
   return (
     <Box flexDirection="column" width="100%">
@@ -136,5 +136,5 @@ export function DiffDetailView({
         </Text>
       )}
     </Box>
-  )
+  );
 }
diff --git a/src/components/diff/DiffDialog.tsx b/src/components/diff/DiffDialog.tsx
index 3f6757b66..a0608bba5 100644
--- a/src/components/diff/DiffDialog.tsx
+++ b/src/components/diff/DiffDialog.tsx
@@ -1,29 +1,26 @@
-import type { StructuredPatchHunk } from 'diff'
-import React, { useEffect, useMemo, useRef, useState } from 'react'
-import type { CommandResultDisplay } from '../../commands.js'
-import { useRegisterOverlay } from '../../context/overlayContext.js'
-import { type DiffData, useDiffData } from '../../hooks/useDiffData.js'
-import { type TurnDiff, useTurnDiffs } from '../../hooks/useTurnDiffs.js'
-import { Box, Text } from '@anthropic/ink'
-import { useKeybindings } from '../../keybindings/useKeybinding.js'
-import { useShortcutDisplay } from '../../keybindings/useShortcutDisplay.js'
-import type { Message } from '../../types/message.js'
-import { plural } from '../../utils/stringUtils.js'
-import { Byline, Dialog } from '@anthropic/ink'
-import { DiffDetailView } from './DiffDetailView.js'
-import { DiffFileList } from './DiffFileList.js'
+import type { StructuredPatchHunk } from 'diff';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
+import type { CommandResultDisplay } from '../../commands.js';
+import { useRegisterOverlay } from '../../context/overlayContext.js';
+import { type DiffData, useDiffData } from '../../hooks/useDiffData.js';
+import { type TurnDiff, useTurnDiffs } from '../../hooks/useTurnDiffs.js';
+import { Box, Text } from '@anthropic/ink';
+import { useKeybindings } from '../../keybindings/useKeybinding.js';
+import { useShortcutDisplay } from '../../keybindings/useShortcutDisplay.js';
+import type { Message } from '../../types/message.js';
+import { plural } from '../../utils/stringUtils.js';
+import { Byline, Dialog } from '@anthropic/ink';
+import { DiffDetailView } from './DiffDetailView.js';
+import { DiffFileList } from './DiffFileList.js';
 
 type Props = {
-  messages: Message[]
-  onDone: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-}
+  messages: Message[];
+  onDone: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+};
 
-type ViewMode = 'list' | 'detail'
+type ViewMode = 'list' | 'detail';
 
-type DiffSource = { type: 'current' } | { type: 'turn'; turn: TurnDiff }
+type DiffSource = { type: 'current' } | { type: 'turn'; turn: TurnDiff };
 
 function turnDiffToDiffData(turn: TurnDiff): DiffData {
   const files = Array.from(turn.files.values())
@@ -36,11 +33,11 @@ function turnDiffToDiffData(turn: TurnDiff): DiffData {
       isTruncated: false,
       isNewFile: f.isNewFile,
     }))
-    .sort((a, b) => a.path.localeCompare(b.path))
+    .sort((a, b) => a.path.localeCompare(b.path));
 
-  const hunks = new Map<string, StructuredPatchHunk[]>()
+  const hunks = new Map<string, StructuredPatchHunk[]>();
   for (const f of turn.files.values()) {
-    hunks.set(f.filePath, f.hunks)
+    hunks.set(f.filePath, f.hunks);
   }
 
   return {
@@ -52,56 +49,53 @@ function turnDiffToDiffData(turn: TurnDiff): DiffData {
     files,
     hunks,
     loading: false,
-  }
+  };
 }
 
 export function DiffDialog({ messages, onDone }: Props): React.ReactNode {
-  const gitDiffData = useDiffData()
-  const turnDiffs = useTurnDiffs(messages)
+  const gitDiffData = useDiffData();
+  const turnDiffs = useTurnDiffs(messages);
 
-  const [viewMode, setViewMode] = useState<ViewMode>('list')
-  const [selectedIndex, setSelectedIndex] = useState<number>(0)
-  const [sourceIndex, setSourceIndex] = useState<number>(0)
+  const [viewMode, setViewMode] = useState<ViewMode>('list');
+  const [selectedIndex, setSelectedIndex] = useState<number>(0);
+  const [sourceIndex, setSourceIndex] = useState<number>(0);
 
   const sources: DiffSource[] = useMemo(
-    () => [
-      { type: 'current' },
-      ...turnDiffs.map((turn): DiffSource => ({ type: 'turn', turn })),
-    ],
+    () => [{ type: 'current' }, ...turnDiffs.map((turn): DiffSource => ({ type: 'turn', turn }))],
     [turnDiffs],
-  )
+  );
 
-  const currentSource = sources[sourceIndex]
-  const currentTurn = currentSource?.type === 'turn' ? currentSource.turn : null
+  const currentSource = sources[sourceIndex];
+  const currentTurn = currentSource?.type === 'turn' ? currentSource.turn : null;
 
   const diffData = useMemo((): DiffData => {
-    return currentTurn ? turnDiffToDiffData(currentTurn) : gitDiffData
-  }, [currentTurn, gitDiffData])
+    return currentTurn ? turnDiffToDiffData(currentTurn) : gitDiffData;
+  }, [currentTurn, gitDiffData]);
 
-  const selectedFile = diffData.files[selectedIndex]
+  const selectedFile = diffData.files[selectedIndex];
   const selectedHunks = useMemo(() => {
-    return selectedFile ? diffData.hunks.get(selectedFile.path) || [] : []
-  }, [selectedFile, diffData.hunks])
+    return selectedFile ? diffData.hunks.get(selectedFile.path) || [] : [];
+  }, [selectedFile, diffData.hunks]);
 
   // Clamp sourceIndex when sources shrink (e.g., conversation rewind)
   useEffect(() => {
     if (sourceIndex >= sources.length) {
-      setSourceIndex(Math.max(0, sources.length - 1))
+      setSourceIndex(Math.max(0, sources.length - 1));
     }
-  }, [sources.length, sourceIndex])
+  }, [sources.length, sourceIndex]);
 
   // Reset file selection when source changes
-  const prevSourceIndex = useRef(sourceIndex)
+  const prevSourceIndex = useRef(sourceIndex);
   useEffect(() => {
     if (prevSourceIndex.current !== sourceIndex) {
-      setSelectedIndex(0)
-      prevSourceIndex.current = sourceIndex
+      setSelectedIndex(0);
+      prevSourceIndex.current = sourceIndex;
     }
-  }, [sourceIndex])
+  }, [sourceIndex]);
 
   // Register as modal overlay so Chat keybindings and CancelRequestHandler
   // are disabled while DiffDialog is showing
-  useRegisterOverlay('diff-dialog')
+  useRegisterOverlay('diff-dialog');
 
   // Diff dialog navigation keybindings
   // View-mode dependent: left/right arrows have different behavior based on mode
@@ -118,64 +112,55 @@ export function DiffDialog({ messages, onDone }: Props): React.ReactNode {
       // Left arrow: in detail mode goes back, in list mode switches source
       'diff:previousSource': () => {
         if (viewMode === 'detail') {
-          setViewMode('list')
+          setViewMode('list');
         } else if (viewMode === 'list' && sources.length > 1) {
-          setSourceIndex(prev => Math.max(0, prev - 1))
+          setSourceIndex(prev => Math.max(0, prev - 1));
         }
       },
       'diff:nextSource': () => {
         if (viewMode === 'list' && sources.length > 1) {
-          setSourceIndex(prev => Math.min(sources.length - 1, prev + 1))
+          setSourceIndex(prev => Math.min(sources.length - 1, prev + 1));
         }
       },
       'diff:back': () => {
         if (viewMode === 'detail') {
-          setViewMode('list')
+          setViewMode('list');
         }
       },
       'diff:viewDetails': () => {
         if (viewMode === 'list' && selectedFile) {
-          setViewMode('detail')
+          setViewMode('detail');
         }
       },
       'diff:previousFile': () => {
         if (viewMode === 'list') {
-          setSelectedIndex(prev => Math.max(0, prev - 1))
+          setSelectedIndex(prev => Math.max(0, prev - 1));
         }
       },
       'diff:nextFile': () => {
         if (viewMode === 'list') {
-          setSelectedIndex(prev =>
-            Math.min(diffData.files.length - 1, prev + 1),
-          )
+          setSelectedIndex(prev => Math.min(diffData.files.length - 1, prev + 1));
         }
       },
     },
     { context: 'DiffDialog' },
-  )
+  );
 
   const subtitle = diffData.stats ? (
     <Text dimColor>
-      {diffData.stats.filesCount} {plural(diffData.stats.filesCount, 'file')}{' '}
-      changed
-      {diffData.stats.linesAdded > 0 && (
-        <Text color="diffAddedWord"> +{diffData.stats.linesAdded}</Text>
-      )}
-      {diffData.stats.linesRemoved > 0 && (
-        <Text color="diffRemovedWord"> -{diffData.stats.linesRemoved}</Text>
-      )}
+      {diffData.stats.filesCount} {plural(diffData.stats.filesCount, 'file')} changed
+      {diffData.stats.linesAdded > 0 && <Text color="diffAddedWord"> +{diffData.stats.linesAdded}</Text>}
+      {diffData.stats.linesRemoved > 0 && <Text color="diffRemovedWord"> -{diffData.stats.linesRemoved}</Text>}
     </Text>
-  ) : null
+  ) : null;
 
   // Build header based on current source
-  const headerTitle = currentTurn
-    ? `Turn ${currentTurn.turnIndex}`
-    : 'Uncommitted changes'
+  const headerTitle = currentTurn ? `Turn ${currentTurn.turnIndex}` : 'Uncommitted changes';
   const headerSubtitle = currentTurn
     ? currentTurn.userPromptPreview
       ? `"${currentTurn.userPromptPreview}"`
       : ''
-    : '(git diff HEAD)'
+    : '(git diff HEAD)';
 
   // Source selector pills
   const sourceSelector =
@@ -183,43 +168,34 @@ export function DiffDialog({ messages, onDone }: Props): React.ReactNode {
       <Box>
         {sourceIndex > 0 && <Text dimColor>◀ </Text>}
         {sources.map((source, i) => {
-          const isSelected = i === sourceIndex
-          const label =
-            source.type === 'current' ? 'Current' : `T${source.turn.turnIndex}`
+          const isSelected = i === sourceIndex;
+          const label = source.type === 'current' ? 'Current' : `T${source.turn.turnIndex}`;
           return (
             <Text key={i} dimColor={!isSelected} bold={isSelected}>
               {i > 0 ? ' · ' : ''}
               {label}
             </Text>
-          )
+          );
         })}
         {sourceIndex < sources.length - 1 && <Text dimColor> ▶</Text>}
       </Box>
-    ) : null
+    ) : null;
 
-  const dismissShortcut = useShortcutDisplay(
-    'diff:dismiss',
-    'DiffDialog',
-    'esc',
-  )
+  const dismissShortcut = useShortcutDisplay('diff:dismiss', 'DiffDialog', 'esc');
   // Determine the appropriate message when no files are shown
   const emptyMessage = (() => {
     if (diffData.loading) {
-      return 'Loading diff…'
+      return 'Loading diff…';
     }
     if (currentTurn) {
-      return 'No file changes in this turn'
+      return 'No file changes in this turn';
     }
     // Check if we have stats but no files (too many files case)
-    if (
-      diffData.stats &&
-      diffData.stats.filesCount > 0 &&
-      diffData.files.length === 0
-    ) {
-      return 'Too many files to display details'
+    if (diffData.stats && diffData.stats.filesCount > 0 && diffData.files.length === 0) {
+      return 'Too many files to display details';
     }
-    return 'Working tree is clean'
-  })()
+    return 'Working tree is clean';
+  })();
 
   // Build title with header subtitle inline
   const title = (
@@ -227,14 +203,14 @@ export function DiffDialog({ messages, onDone }: Props): React.ReactNode {
       {headerTitle}
       {headerSubtitle && <Text dimColor> {headerSubtitle}</Text>}
     </Text>
-  )
+  );
 
   // Handle cancel/dismiss - in detail mode goes back, in list mode dismisses
   function handleCancel(): void {
     if (viewMode === 'detail') {
-      setViewMode('list')
+      setViewMode('list');
     } else {
-      onDone('Diff dialog dismissed', { display: 'system' })
+      onDone('Diff dialog dismissed', { display: 'system' });
     }
   }
 
@@ -284,5 +260,5 @@ export function DiffDialog({ messages, onDone }: Props): React.ReactNode {
         </Box>
       )}
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/diff/DiffFileList.tsx b/src/components/diff/DiffFileList.tsx
index ef498925b..15055a6ac 100644
--- a/src/components/diff/DiffFileList.tsx
+++ b/src/components/diff/DiffFileList.tsx
@@ -1,61 +1,57 @@
-import figures from 'figures'
-import React, { useMemo } from 'react'
-import type { DiffFile } from '../../hooks/useDiffData.js'
-import { useTerminalSize } from '../../hooks/useTerminalSize.js'
-import { Box, Text } from '@anthropic/ink'
-import { truncateStartToWidth } from '../../utils/format.js'
-import { plural } from '../../utils/stringUtils.js'
+import figures from 'figures';
+import React, { useMemo } from 'react';
+import type { DiffFile } from '../../hooks/useDiffData.js';
+import { useTerminalSize } from '../../hooks/useTerminalSize.js';
+import { Box, Text } from '@anthropic/ink';
+import { truncateStartToWidth } from '../../utils/format.js';
+import { plural } from '../../utils/stringUtils.js';
 
-const MAX_VISIBLE_FILES = 5
+const MAX_VISIBLE_FILES = 5;
 
 type Props = {
-  files: DiffFile[]
-  selectedIndex: number
-}
+  files: DiffFile[];
+  selectedIndex: number;
+};
 
 export function DiffFileList({ files, selectedIndex }: Props): React.ReactNode {
-  const { columns } = useTerminalSize()
+  const { columns } = useTerminalSize();
 
   // Calculate scroll window - must be before early return for hooks rules
   const { startIndex, endIndex } = useMemo(() => {
     if (files.length === 0 || files.length <= MAX_VISIBLE_FILES) {
-      return { startIndex: 0, endIndex: files.length }
+      return { startIndex: 0, endIndex: files.length };
     }
 
     // Keep selected item roughly in the middle
-    let start = Math.max(0, selectedIndex - Math.floor(MAX_VISIBLE_FILES / 2))
-    let end = start + MAX_VISIBLE_FILES
+    let start = Math.max(0, selectedIndex - Math.floor(MAX_VISIBLE_FILES / 2));
+    let end = start + MAX_VISIBLE_FILES;
 
     // Adjust if we're at the end
     if (end > files.length) {
-      end = files.length
-      start = Math.max(0, end - MAX_VISIBLE_FILES)
+      end = files.length;
+      start = Math.max(0, end - MAX_VISIBLE_FILES);
     }
 
-    return { startIndex: start, endIndex: end }
-  }, [files.length, selectedIndex])
+    return { startIndex: start, endIndex: end };
+  }, [files.length, selectedIndex]);
 
   if (files.length === 0) {
-    return <Text dimColor>No changed files</Text>
+    return <Text dimColor>No changed files</Text>;
   }
 
-  const visibleFiles = files.slice(startIndex, endIndex)
-  const hasMoreAbove = startIndex > 0
-  const hasMoreBelow = endIndex < files.length
-  const needsPagination = files.length > MAX_VISIBLE_FILES
+  const visibleFiles = files.slice(startIndex, endIndex);
+  const hasMoreAbove = startIndex > 0;
+  const hasMoreBelow = endIndex < files.length;
+  const needsPagination = files.length > MAX_VISIBLE_FILES;
 
-  const statsWidth = 16
-  const pointerWidth = 3
-  const maxPathWidth = Math.max(20, columns - statsWidth - pointerWidth - 4)
+  const statsWidth = 16;
+  const pointerWidth = 3;
+  const maxPathWidth = Math.max(20, columns - statsWidth - pointerWidth - 4);
 
   return (
     <Box flexDirection="column">
       {needsPagination && (
-        <Text dimColor>
-          {hasMoreAbove
-            ? ` ↑ ${startIndex} more ${plural(startIndex, 'file')}`
-            : ' '}
-        </Text>
+        <Text dimColor>{hasMoreAbove ? ` ↑ ${startIndex} more ${plural(startIndex, 'file')}` : ' '}</Text>
       )}
       {visibleFiles.map((file, index) => (
         <FileItem
@@ -67,13 +63,11 @@ export function DiffFileList({ files, selectedIndex }: Props): React.ReactNode {
       ))}
       {needsPagination && (
         <Text dimColor>
-          {hasMoreBelow
-            ? ` ↓ ${files.length - endIndex} more ${plural(files.length - endIndex, 'file')}`
-            : ' '}
+          {hasMoreBelow ? ` ↓ ${files.length - endIndex} more ${plural(files.length - endIndex, 'file')}` : ' '}
         </Text>
       )}
     </Box>
-  )
+  );
 }
 
 function FileItem({
@@ -81,57 +75,47 @@ function FileItem({
   isSelected,
   maxPathWidth,
 }: {
-  file: DiffFile
-  isSelected: boolean
-  maxPathWidth: number
+  file: DiffFile;
+  isSelected: boolean;
+  maxPathWidth: number;
 }): React.ReactNode {
-  const displayPath = truncateStartToWidth(file.path, maxPathWidth)
+  const displayPath = truncateStartToWidth(file.path, maxPathWidth);
 
-  const pointer = isSelected ? figures.pointer + ' ' : '  '
-  const line = `${pointer}${displayPath}`
+  const pointer = isSelected ? figures.pointer + ' ' : '  ';
+  const line = `${pointer}${displayPath}`;
 
   return (
     <Box flexDirection="row">
-      <Text
-        bold={isSelected}
-        color={isSelected ? 'background' : undefined}
-        inverse={isSelected}
-      >
+      <Text bold={isSelected} color={isSelected ? 'background' : undefined} inverse={isSelected}>
         {line}
       </Text>
       <Box flexGrow={1} />
       <FileStats file={file} isSelected={isSelected} />
     </Box>
-  )
+  );
 }
 
-function FileStats({
-  file,
-  isSelected,
-}: {
-  file: DiffFile
-  isSelected: boolean
-}): React.ReactNode {
+function FileStats({ file, isSelected }: { file: DiffFile; isSelected: boolean }): React.ReactNode {
   if (file.isUntracked) {
     return (
       <Text dimColor={!isSelected} italic>
         untracked
       </Text>
-    )
+    );
   }
   if (file.isBinary) {
     return (
       <Text dimColor={!isSelected} italic>
         Binary file
       </Text>
-    )
+    );
   }
   if (file.isLargeFile) {
     return (
       <Text dimColor={!isSelected} italic>
         Large file modified
       </Text>
-    )
+    );
   }
   // Normal or truncated file - show line counts
   return (
@@ -149,5 +133,5 @@ function FileStats({
       )}
       {file.isTruncated && <Text dimColor={!isSelected}> (truncated)</Text>}
     </Text>
-  )
+  );
 }
diff --git a/src/components/grove/Grove.tsx b/src/components/grove/Grove.tsx
index 938971b99..8c8d19050 100644
--- a/src/components/grove/Grove.tsx
+++ b/src/components/grove/Grove.tsx
@@ -1,9 +1,9 @@
-import React, { useEffect, useState } from 'react'
+import React, { useEffect, useState } from 'react';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from 'src/services/analytics/index.js'
-import { Box, Link, Text, useInput } from '@anthropic/ink'
+} from 'src/services/analytics/index.js';
+import { Box, Link, Text, useInput } from '@anthropic/ink';
 import {
   type AccountSettings,
   calculateShouldShowGrove,
@@ -12,22 +12,17 @@ import {
   getGroveSettings,
   markGroveNoticeViewed,
   updateGroveSettings,
-} from '../../services/api/grove.js'
-import { Select } from '../CustomSelect/index.js'
-import { Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink'
+} from '../../services/api/grove.js';
+import { Select } from '../CustomSelect/index.js';
+import { Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink';
 
-export type GroveDecision =
-  | 'accept_opt_in'
-  | 'accept_opt_out'
-  | 'defer'
-  | 'escape'
-  | 'skip_rendering'
+export type GroveDecision = 'accept_opt_in' | 'accept_opt_out' | 'defer' | 'escape' | 'skip_rendering';
 
 type Props = {
-  showIfAlreadyViewed: boolean
-  location: 'settings' | 'policy_update_modal' | 'onboarding'
-  onDone(decision: GroveDecision): void
-}
+  showIfAlreadyViewed: boolean;
+  location: 'settings' | 'policy_update_modal' | 'onboarding';
+  onDone(decision: GroveDecision): void;
+};
 
 const NEW_TERMS_ASCII = ` _____________
  |          \\  \\
@@ -39,15 +34,14 @@ const NEW_TERMS_ASCII = ` _____________
  |  ----------  |
  |  ----------  |
  |              |
- |______________|`
+ |______________|`;
 
 function GracePeriodContentBody(): React.ReactNode {
   return (
     <>
       <Text>
-        An update to our Consumer Terms and Privacy Policy will take effect on{' '}
-        <Text bold>October 8, 2025</Text>. You can accept the updated terms
-        today.
+        An update to our Consumer Terms and Privacy Policy will take effect on <Text bold>October 8, 2025</Text>. You
+        can accept the updated terms today.
       </Text>
 
       <Box flexDirection="column">
@@ -58,12 +52,8 @@ function GracePeriodContentBody(): React.ReactNode {
             <Text>· </Text>
             <Text bold>You can help improve Claude </Text>
             <Text>
-              — Allow the use of your chats and coding sessions to train and
-              improve Anthropic AI models. Change anytime in your Privacy
-              Settings (
-              <Link
-                url={'https://claude.ai/settings/data-privacy-controls'}
-              ></Link>
+              — Allow the use of your chats and coding sessions to train and improve Anthropic AI models. Change anytime
+              in your Privacy Settings (<Link url={'https://claude.ai/settings/data-privacy-controls'}></Link>
               ).
             </Text>
           </Text>
@@ -73,24 +63,19 @@ function GracePeriodContentBody(): React.ReactNode {
             <Text>· </Text>
             <Text bold>Updates to data retention </Text>
             <Text>
-              — To help us improve our AI models and safety protections,
-              we&apos;re extending data retention to 5 years.
+              — To help us improve our AI models and safety protections, we&apos;re extending data retention to 5 years.
             </Text>
           </Text>
         </Box>
       </Box>
 
       <Text>
-        Learn more (
-        <Link
-          url={'https://www.anthropic.com/news/updates-to-our-consumer-terms'}
-        ></Link>
-        ) or read the updated Consumer Terms (
-        <Link url={'https://anthropic.com/legal/terms'}></Link>) and Privacy
-        Policy (<Link url={'https://anthropic.com/legal/privacy'}></Link>)
+        Learn more (<Link url={'https://www.anthropic.com/news/updates-to-our-consumer-terms'}></Link>) or read the
+        updated Consumer Terms (<Link url={'https://anthropic.com/legal/terms'}></Link>) and Privacy Policy (
+        <Link url={'https://anthropic.com/legal/privacy'}></Link>)
       </Text>
     </>
-  )
+  );
 }
 
 function PostGracePeriodContentBody(): React.ReactNode {
@@ -104,8 +89,8 @@ function PostGracePeriodContentBody(): React.ReactNode {
         <Box flexDirection="column">
           <Text bold>Help improve Claude</Text>
           <Text>
-            Allow the use of your chats and coding sessions to train and improve
-            Anthropic AI models. You can change this anytime in Privacy Settings
+            Allow the use of your chats and coding sessions to train and improve Anthropic AI models. You can change
+            this anytime in Privacy Settings
           </Text>
           <Link url={'https://claude.ai/settings/data-privacy-controls'}></Link>
         </Box>
@@ -113,122 +98,101 @@ function PostGracePeriodContentBody(): React.ReactNode {
         <Box flexDirection="column">
           <Text bold>How this affects data retention</Text>
           <Text>
-            Turning ON the improve Claude setting extends data retention from 30
-            days to 5 years. Turning it OFF keeps the default 30-day data
-            retention. Delete data anytime.
+            Turning ON the improve Claude setting extends data retention from 30 days to 5 years. Turning it OFF keeps
+            the default 30-day data retention. Delete data anytime.
           </Text>
         </Box>
       </Box>
 
       <Text>
-        Learn more (
-        <Link
-          url={'https://www.anthropic.com/news/updates-to-our-consumer-terms'}
-        ></Link>
-        ) or read the updated Consumer Terms (
-        <Link url={'https://anthropic.com/legal/terms'}></Link>) and Privacy
-        Policy (<Link url={'https://anthropic.com/legal/privacy'}></Link>)
+        Learn more (<Link url={'https://www.anthropic.com/news/updates-to-our-consumer-terms'}></Link>) or read the
+        updated Consumer Terms (<Link url={'https://anthropic.com/legal/terms'}></Link>) and Privacy Policy (
+        <Link url={'https://anthropic.com/legal/privacy'}></Link>)
       </Text>
     </>
-  )
+  );
 }
 
-export function GroveDialog({
-  showIfAlreadyViewed,
-  location,
-  onDone,
-}: Props): React.ReactNode {
-  const [shouldShowDialog, setShouldShowDialog] = useState<boolean | null>(null)
-  const [groveConfig, setGroveConfig] = useState<GroveConfig | null>(null)
+export function GroveDialog({ showIfAlreadyViewed, location, onDone }: Props): React.ReactNode {
+  const [shouldShowDialog, setShouldShowDialog] = useState<boolean | null>(null);
+  const [groveConfig, setGroveConfig] = useState<GroveConfig | null>(null);
 
   useEffect(() => {
     async function checkGroveSettings() {
-      const [settingsResult, configResult] = await Promise.all([
-        getGroveSettings(),
-        getGroveNoticeConfig(),
-      ])
+      const [settingsResult, configResult] = await Promise.all([getGroveSettings(), getGroveNoticeConfig()]);
 
       // Extract config data if successful, otherwise null
-      const config = configResult.success ? configResult.data : null
-      setGroveConfig(config)
+      const config = configResult.success ? configResult.data : null;
+      setGroveConfig(config);
 
       // Determine if we should show the dialog (returns false on API failure)
-      const shouldShow = calculateShouldShowGrove(
-        settingsResult,
-        configResult,
-        showIfAlreadyViewed,
-      )
+      const shouldShow = calculateShouldShowGrove(settingsResult, configResult, showIfAlreadyViewed);
 
-      setShouldShowDialog(shouldShow)
+      setShouldShowDialog(shouldShow);
       // If we shouldn't show the dialog, immediately call onDone
       if (!shouldShow) {
-        onDone('skip_rendering')
-        return
+        onDone('skip_rendering');
+        return;
       }
       // Mark as viewed every time we show the dialog (for reminder frequency tracking)
-      void markGroveNoticeViewed()
+      void markGroveNoticeViewed();
       // Log that the Grove policy dialog was shown
       logEvent('tengu_grove_policy_viewed', {
-        location:
-          location as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        dismissable:
-          config?.notice_is_grace_period as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
+        location: location as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        dismissable: config?.notice_is_grace_period as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
     }
 
-    void checkGroveSettings()
-  }, [showIfAlreadyViewed, location, onDone])
+    void checkGroveSettings();
+  }, [showIfAlreadyViewed, location, onDone]);
 
   // Loading state
   if (shouldShowDialog === null) {
-    return null
+    return null;
   }
 
   // User has already set preferences, don't show dialog
   if (!shouldShowDialog) {
-    return null
+    return null;
   }
 
-  async function onChange(
-    value: 'accept_opt_in' | 'accept_opt_out' | 'defer' | 'escape',
-  ) {
+  async function onChange(value: 'accept_opt_in' | 'accept_opt_out' | 'defer' | 'escape') {
     switch (value) {
       case 'accept_opt_in': {
-        await updateGroveSettings(true)
+        await updateGroveSettings(true);
         logEvent('tengu_grove_policy_submitted', {
           state: true,
           dismissable:
             groveConfig?.notice_is_grace_period as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        })
-        break
+        });
+        break;
       }
       case 'accept_opt_out': {
-        await updateGroveSettings(false)
+        await updateGroveSettings(false);
         logEvent('tengu_grove_policy_submitted', {
           state: false,
           dismissable:
             groveConfig?.notice_is_grace_period as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        })
-        break
+        });
+        break;
       }
       case 'defer':
         logEvent('tengu_grove_policy_dismissed', {
           state: true,
-        })
-        break
+        });
+        break;
       case 'escape':
-        logEvent('tengu_grove_policy_escaped', {})
-        break
+        logEvent('tengu_grove_policy_escaped', {});
+        break;
     }
 
-    onDone(value)
+    onDone(value);
   }
 
   const acceptOptions = groveConfig?.domain_excluded
     ? [
         {
-          label:
-            'Accept terms · Help improve Claude: OFF (for emails with your domain)',
+          label: 'Accept terms · Help improve Claude: OFF (for emails with your domain)',
           value: 'accept_opt_out',
         },
       ]
@@ -241,14 +205,14 @@ export function GroveDialog({
           label: 'Accept terms · Help improve Claude: OFF',
           value: 'accept_opt_out',
         },
-      ]
+      ];
 
   function handleCancel(): void {
     if (groveConfig?.notice_is_grace_period) {
-      void onChange('defer')
-      return
+      void onChange('defer');
+      return;
     }
-    void onChange('escape')
+    void onChange('escape');
   }
 
   return (
@@ -269,11 +233,7 @@ export function GroveDialog({
     >
       <Box flexDirection="row">
         <Box flexDirection="column" gap={1} flexGrow={1}>
-          {groveConfig?.notice_is_grace_period ? (
-            <GracePeriodContentBody />
-          ) : (
-            <PostGracePeriodContentBody />
-          )}
+          {groveConfig?.notice_is_grace_period ? <GracePeriodContentBody /> : <PostGracePeriodContentBody />}
         </Box>
         <Box flexShrink={0}>
           <Text color="professionalBlue">{NEW_TERMS_ASCII}</Text>
@@ -290,53 +250,47 @@ export function GroveDialog({
           options={[
             ...acceptOptions,
             // Only show "Not now" if in grace period
-            ...(groveConfig?.notice_is_grace_period
-              ? [{ label: 'Not now', value: 'defer' }]
-              : []),
+            ...(groveConfig?.notice_is_grace_period ? [{ label: 'Not now', value: 'defer' }] : []),
           ]}
-          onChange={value =>
-            onChange(value as 'accept_opt_in' | 'accept_opt_out' | 'defer')
-          }
+          onChange={value => onChange(value as 'accept_opt_in' | 'accept_opt_out' | 'defer')}
           onCancel={handleCancel}
         />
       </Box>
     </Dialog>
-  )
+  );
 }
 
 type PrivacySettingsDialogProps = {
-  settings: AccountSettings
-  domainExcluded?: boolean
-  onDone(): void
-}
+  settings: AccountSettings;
+  domainExcluded?: boolean;
+  onDone(): void;
+};
 
 export function PrivacySettingsDialog({
   settings,
   domainExcluded,
   onDone,
 }: PrivacySettingsDialogProps): React.ReactNode {
-  const [groveEnabled, setGroveEnabled] = useState(settings.grove_enabled)
+  const [groveEnabled, setGroveEnabled] = useState(settings.grove_enabled);
 
   React.useEffect(() => {
-    logEvent('tengu_grove_privacy_settings_viewed', {})
-  }, [])
+    logEvent('tengu_grove_privacy_settings_viewed', {});
+  }, []);
 
   useInput(async (input, key) => {
     // Toggle the setting when enter/tab/space is pressed
     if (!domainExcluded && (key.tab || key.return || input === ' ')) {
-      const newValue = !groveEnabled
-      setGroveEnabled(newValue)
-      await updateGroveSettings(newValue)
+      const newValue = !groveEnabled;
+      setGroveEnabled(newValue);
+      await updateGroveSettings(newValue);
     }
-  })
+  });
 
-  let valueComponent = <Text color="error">false</Text>
+  let valueComponent = <Text color="error">false</Text>;
   if (domainExcluded) {
-    valueComponent = (
-      <Text color="error">false (for emails with your domain)</Text>
-    )
+    valueComponent = <Text color="error">false (for emails with your domain)</Text>;
   } else if (groveEnabled) {
-    valueComponent = <Text color="success">true</Text>
+    valueComponent = <Text color="success">true</Text>;
   }
 
   return (
@@ -369,5 +323,5 @@ export function PrivacySettingsDialog({
         <Box>{valueComponent}</Box>
       </Box>
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/grove/src/services/analytics/index.ts b/src/components/grove/src/services/analytics/index.ts
index 142e7b6f5..2e0f796da 100644
--- a/src/components/grove/src/services/analytics/index.ts
+++ b/src/components/grove/src/services/analytics/index.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any;
-export type logEvent = any;
+export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any
+export type logEvent = any
diff --git a/src/components/hooks/HooksConfigMenu.tsx b/src/components/hooks/HooksConfigMenu.tsx
index f59ced979..27fb524db 100644
--- a/src/components/hooks/HooksConfigMenu.tsx
+++ b/src/components/hooks/HooksConfigMenu.tsx
@@ -10,153 +10,126 @@
  * command-type hooks and duplicating the settings.json editing surface
  * in-menu for all four types would be a maintenance burden.
  */
-import * as React from 'react'
-import { useCallback, useMemo, useState } from 'react'
-import type { HookEvent } from 'src/entrypoints/agentSdkTypes.js'
-import { useAppState, useAppStateStore } from 'src/state/AppState.js'
-import type { CommandResultDisplay } from '../../commands.js'
-import { useSettingsChange } from '../../hooks/useSettingsChange.js'
-import { Box, Text } from '@anthropic/ink'
-import { useKeybinding } from '../../keybindings/useKeybinding.js'
+import * as React from 'react';
+import { useCallback, useMemo, useState } from 'react';
+import type { HookEvent } from 'src/entrypoints/agentSdkTypes.js';
+import { useAppState, useAppStateStore } from 'src/state/AppState.js';
+import type { CommandResultDisplay } from '../../commands.js';
+import { useSettingsChange } from '../../hooks/useSettingsChange.js';
+import { Box, Text } from '@anthropic/ink';
+import { useKeybinding } from '../../keybindings/useKeybinding.js';
 import {
   getHookEventMetadata,
   getHooksForMatcher,
   getMatcherMetadata,
   getSortedMatchersForEvent,
   groupHooksByEventAndMatcher,
-} from '../../utils/hooks/hooksConfigManager.js'
-import type { IndividualHookConfig } from '../../utils/hooks/hooksSettings.js'
-import {
-  getSettings_DEPRECATED,
-  getSettingsForSource,
-} from '../../utils/settings/settings.js'
-import { plural } from '../../utils/stringUtils.js'
-import { Dialog } from '@anthropic/ink'
-import { SelectEventMode } from './SelectEventMode.js'
-import { SelectHookMode } from './SelectHookMode.js'
-import { SelectMatcherMode } from './SelectMatcherMode.js'
-import { ViewHookMode } from './ViewHookMode.js'
+} from '../../utils/hooks/hooksConfigManager.js';
+import type { IndividualHookConfig } from '../../utils/hooks/hooksSettings.js';
+import { getSettings_DEPRECATED, getSettingsForSource } from '../../utils/settings/settings.js';
+import { plural } from '../../utils/stringUtils.js';
+import { Dialog } from '@anthropic/ink';
+import { SelectEventMode } from './SelectEventMode.js';
+import { SelectHookMode } from './SelectHookMode.js';
+import { SelectMatcherMode } from './SelectMatcherMode.js';
+import { ViewHookMode } from './ViewHookMode.js';
 
 type Props = {
-  toolNames: string[]
-  onExit: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-}
+  toolNames: string[];
+  onExit: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+};
 
 type ModeState =
   | { mode: 'select-event' }
   | { mode: 'select-matcher'; event: HookEvent }
   | { mode: 'select-hook'; event: HookEvent; matcher: string }
-  | { mode: 'view-hook'; event: HookEvent; hook: IndividualHookConfig }
+  | { mode: 'view-hook'; event: HookEvent; hook: IndividualHookConfig };
 
 export function HooksConfigMenu({ toolNames, onExit }: Props): React.ReactNode {
   const [modeState, setModeState] = useState<ModeState>({
     mode: 'select-event',
-  })
+  });
   // Cache whether hooks are disabled by policy settings.
   // getSettingsForSource() is expensive (file read + JSON parse + validation),
   // so we compute it once on mount and only re-compute when policy settings change.
   // Short-circuit evaluation ensures we skip the expensive check when hooks aren't disabled.
   const [disabledByPolicy, setDisabledByPolicy] = useState(() => {
-    const settings = getSettings_DEPRECATED()
-    const hooksDisabled = settings?.disableAllHooks === true
-    return (
-      hooksDisabled &&
-      getSettingsForSource('policySettings')?.disableAllHooks === true
-    )
-  })
+    const settings = getSettings_DEPRECATED();
+    const hooksDisabled = settings?.disableAllHooks === true;
+    return hooksDisabled && getSettingsForSource('policySettings')?.disableAllHooks === true;
+  });
 
   // Check if hooks are restricted to managed-only by policy
   const [restrictedByPolicy, setRestrictedByPolicy] = useState(() => {
-    return (
-      getSettingsForSource('policySettings')?.allowManagedHooksOnly === true
-    )
-  })
+    return getSettingsForSource('policySettings')?.allowManagedHooksOnly === true;
+  });
 
   // Update cached values when policy settings change
   useSettingsChange(source => {
     if (source === 'policySettings') {
-      const settings = getSettings_DEPRECATED()
-      const hooksDisabled = settings?.disableAllHooks === true
-      setDisabledByPolicy(
-        hooksDisabled &&
-          getSettingsForSource('policySettings')?.disableAllHooks === true,
-      )
-      setRestrictedByPolicy(
-        getSettingsForSource('policySettings')?.allowManagedHooksOnly === true,
-      )
+      const settings = getSettings_DEPRECATED();
+      const hooksDisabled = settings?.disableAllHooks === true;
+      setDisabledByPolicy(hooksDisabled && getSettingsForSource('policySettings')?.disableAllHooks === true);
+      setRestrictedByPolicy(getSettingsForSource('policySettings')?.allowManagedHooksOnly === true);
     }
-  })
+  });
 
   // Extract commonly used values from modeState for convenience
-  const mode = modeState.mode
-  const selectedEvent = 'event' in modeState ? modeState.event : 'PreToolUse'
-  const selectedMatcher = 'matcher' in modeState ? modeState.matcher : null
+  const mode = modeState.mode;
+  const selectedEvent = 'event' in modeState ? modeState.event : 'PreToolUse';
+  const selectedMatcher = 'matcher' in modeState ? modeState.matcher : null;
 
-  const mcp = useAppState(s => s.mcp)
-  const appStateStore = useAppStateStore()
-  const combinedToolNames = useMemo(
-    () => [...toolNames, ...mcp.tools.map(tool => tool.name)],
-    [toolNames, mcp.tools],
-  )
+  const mcp = useAppState(s => s.mcp);
+  const appStateStore = useAppStateStore();
+  const combinedToolNames = useMemo(() => [...toolNames, ...mcp.tools.map(tool => tool.name)], [toolNames, mcp.tools]);
 
   const hooksByEventAndMatcher = useMemo(
-    () =>
-      groupHooksByEventAndMatcher(appStateStore.getState(), combinedToolNames),
+    () => groupHooksByEventAndMatcher(appStateStore.getState(), combinedToolNames),
     [combinedToolNames, appStateStore],
-  )
+  );
 
   const sortedMatchersForSelectedEvent = useMemo(
     () => getSortedMatchersForEvent(hooksByEventAndMatcher, selectedEvent),
     [hooksByEventAndMatcher, selectedEvent],
-  )
+  );
 
   const hooksForSelectedMatcher = useMemo(
-    () =>
-      getHooksForMatcher(
-        hooksByEventAndMatcher,
-        selectedEvent,
-        selectedMatcher,
-      ),
+    () => getHooksForMatcher(hooksByEventAndMatcher, selectedEvent, selectedMatcher),
     [hooksByEventAndMatcher, selectedEvent, selectedMatcher],
-  )
+  );
 
   // Handler for exiting the dialog
   const handleExit = useCallback(() => {
-    onExit('Hooks dialog dismissed', { display: 'system' })
-  }, [onExit])
+    onExit('Hooks dialog dismissed', { display: 'system' });
+  }, [onExit]);
 
   // Escape handling for select-event mode - exit the menu
   useKeybinding('confirm:no', handleExit, {
     context: 'Confirmation',
     isActive: mode === 'select-event',
-  })
+  });
 
   // Escape handling for select-matcher mode - go to select-event
   useKeybinding(
     'confirm:no',
     () => {
-      setModeState({ mode: 'select-event' })
+      setModeState({ mode: 'select-event' });
     },
     {
       context: 'Confirmation',
       isActive: mode === 'select-matcher',
     },
-  )
+  );
 
   // Escape handling for select-hook mode - go to select-matcher or select-event
   useKeybinding(
     'confirm:no',
     () => {
       if ('event' in modeState) {
-        if (
-          getMatcherMetadata(modeState.event, combinedToolNames) !== undefined
-        ) {
-          setModeState({ mode: 'select-matcher', event: modeState.event })
+        if (getMatcherMetadata(modeState.event, combinedToolNames) !== undefined) {
+          setModeState({ mode: 'select-matcher', event: modeState.event });
         } else {
-          setModeState({ mode: 'select-event' })
+          setModeState({ mode: 'select-event' });
         }
       }
     },
@@ -164,85 +137,73 @@ export function HooksConfigMenu({ toolNames, onExit }: Props): React.ReactNode {
       context: 'Confirmation',
       isActive: mode === 'select-hook',
     },
-  )
+  );
 
   // Escape handling for view-hook mode - go to select-hook
   useKeybinding(
     'confirm:no',
     () => {
       if (modeState.mode === 'view-hook') {
-        const { event, hook } = modeState
+        const { event, hook } = modeState;
         setModeState({
           mode: 'select-hook',
           event,
           matcher: hook.matcher || '',
-        })
+        });
       }
     },
     {
       context: 'Confirmation',
       isActive: mode === 'view-hook',
     },
-  )
+  );
 
-  const hookEventMetadata = getHookEventMetadata(combinedToolNames)
+  const hookEventMetadata = getHookEventMetadata(combinedToolNames);
 
   // Check if hooks are disabled
-  const settings = getSettings_DEPRECATED()
-  const hooksDisabled = settings?.disableAllHooks === true
+  const settings = getSettings_DEPRECATED();
+  const hooksDisabled = settings?.disableAllHooks === true;
 
   // Count hooks per event for the event-selection view, and the total.
   const { hooksByEvent, totalHooksCount } = useMemo(() => {
-    const byEvent: Partial<Record<HookEvent, number>> = {}
-    let total = 0
+    const byEvent: Partial<Record<HookEvent, number>> = {};
+    let total = 0;
     for (const [event, matchers] of Object.entries(hooksByEventAndMatcher)) {
-      const eventCount = Object.values(matchers).reduce(
-        (sum, hooks) => sum + hooks.length,
-        0,
-      )
-      byEvent[event as HookEvent] = eventCount
-      total += eventCount
+      const eventCount = Object.values(matchers).reduce((sum, hooks) => sum + hooks.length, 0);
+      byEvent[event as HookEvent] = eventCount;
+      total += eventCount;
     }
-    return { hooksByEvent: byEvent, totalHooksCount: total }
-  }, [hooksByEventAndMatcher])
+    return { hooksByEvent: byEvent, totalHooksCount: total };
+  }, [hooksByEventAndMatcher]);
 
   // If hooks are disabled, show an informational screen.
   // The menu is read-only, so we don't offer a re-enable button —
   // users can edit settings.json or ask Claude instead.
   if (hooksDisabled) {
     return (
-      <Dialog
-        title="Hook Configuration - Disabled"
-        onCancel={handleExit}
-        inputGuide={() => <Text>Esc to close</Text>}
-      >
+      <Dialog title="Hook Configuration - Disabled" onCancel={handleExit} inputGuide={() => <Text>Esc to close</Text>}>
         <Box flexDirection="column" gap={1}>
           <Box flexDirection="column">
             <Text>
               All hooks are currently <Text bold>disabled</Text>
-              {disabledByPolicy && ' by a managed settings file'}. You have{' '}
-              <Text bold>{totalHooksCount}</Text> configured{' '}
-              {plural(totalHooksCount, 'hook')} that{' '}
-              {plural(totalHooksCount, 'is', 'are')} not running.
+              {disabledByPolicy && ' by a managed settings file'}. You have <Text bold>{totalHooksCount}</Text>{' '}
+              configured {plural(totalHooksCount, 'hook')} that {plural(totalHooksCount, 'is', 'are')} not running.
             </Text>
             <Box marginTop={1}>
               <Text dimColor>When hooks are disabled:</Text>
             </Box>
             <Text dimColor>· No hook commands will execute</Text>
             <Text dimColor>· StatusLine will not be displayed</Text>
-            <Text dimColor>
-              · Tool operations will proceed without hook validation
-            </Text>
+            <Text dimColor>· Tool operations will proceed without hook validation</Text>
           </Box>
           {!disabledByPolicy && (
             <Text dimColor>
-              To re-enable hooks, remove &quot;disableAllHooks&quot; from
-              settings.json or ask Claude.
+              To re-enable hooks, remove &quot;disableAllHooks&quot; from settings.json or ask Claude.
             </Text>
           )}
         </Box>
       </Dialog>
-    )
+    );
   }
 
   switch (modeState.mode) {
@@ -255,14 +216,14 @@ export function HooksConfigMenu({ toolNames, onExit }: Props): React.ReactNode {
           restrictedByPolicy={restrictedByPolicy}
           onSelectEvent={event => {
             if (getMatcherMetadata(event, combinedToolNames) !== undefined) {
-              setModeState({ mode: 'select-matcher', event })
+              setModeState({ mode: 'select-matcher', event });
             } else {
-              setModeState({ mode: 'select-hook', event, matcher: '' })
+              setModeState({ mode: 'select-hook', event, matcher: '' });
             }
           }}
           onCancel={handleExit}
         />
-      )
+      );
     case 'select-matcher':
       return (
         <SelectMatcherMode
@@ -275,13 +236,13 @@ export function HooksConfigMenu({ toolNames, onExit }: Props): React.ReactNode {
               mode: 'select-hook',
               event: modeState.event,
               matcher,
-            })
+            });
           }}
           onCancel={() => {
-            setModeState({ mode: 'select-event' })
+            setModeState({ mode: 'select-event' });
           }}
         />
-      )
+      );
     case 'select-hook':
       return (
         <SelectHookMode
@@ -294,40 +255,35 @@ export function HooksConfigMenu({ toolNames, onExit }: Props): React.ReactNode {
               mode: 'view-hook',
               event: modeState.event,
               hook,
-            })
+            });
           }}
           onCancel={() => {
             // Go back to matcher selection or event selection
-            if (
-              getMatcherMetadata(modeState.event, combinedToolNames) !==
-              undefined
-            ) {
+            if (getMatcherMetadata(modeState.event, combinedToolNames) !== undefined) {
               setModeState({
                 mode: 'select-matcher',
                 event: modeState.event,
-              })
+              });
             } else {
-              setModeState({ mode: 'select-event' })
+              setModeState({ mode: 'select-event' });
             }
           }}
         />
-      )
+      );
     case 'view-hook':
       return (
         <ViewHookMode
           selectedHook={modeState.hook}
-          eventSupportsMatcher={
-            getMatcherMetadata(modeState.event, combinedToolNames) !== undefined
-          }
+          eventSupportsMatcher={getMatcherMetadata(modeState.event, combinedToolNames) !== undefined}
           onCancel={() => {
-            const { event, hook } = modeState
+            const { event, hook } = modeState;
             setModeState({
               mode: 'select-hook',
               event,
               matcher: hook.matcher || '',
-            })
+            });
           }}
         />
-      )
+      );
   }
 }
diff --git a/src/components/hooks/PromptDialog.tsx b/src/components/hooks/PromptDialog.tsx
index 2bca1ceb4..f8869b851 100644
--- a/src/components/hooks/PromptDialog.tsx
+++ b/src/components/hooks/PromptDialog.tsx
@@ -1,49 +1,41 @@
-import * as React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { useKeybinding } from '../../keybindings/useKeybinding.js'
-import type { PromptRequest } from '../../types/hooks.js'
-import { Select } from '../CustomSelect/select.js'
-import { PermissionDialog } from '../permissions/PermissionDialog.js'
+import * as React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { useKeybinding } from '../../keybindings/useKeybinding.js';
+import type { PromptRequest } from '../../types/hooks.js';
+import { Select } from '../CustomSelect/select.js';
+import { PermissionDialog } from '../permissions/PermissionDialog.js';
 
 type Props = {
-  title: string
-  toolInputSummary?: string | null
-  request: PromptRequest
-  onRespond: (key: string) => void
-  onAbort: () => void
-}
+  title: string;
+  toolInputSummary?: string | null;
+  request: PromptRequest;
+  onRespond: (key: string) => void;
+  onAbort: () => void;
+};
 
-export function PromptDialog({
-  title,
-  toolInputSummary,
-  request,
-  onRespond,
-  onAbort,
-}: Props): React.ReactNode {
-  useKeybinding('app:interrupt', onAbort, { isActive: true })
+export function PromptDialog({ title, toolInputSummary, request, onRespond, onAbort }: Props): React.ReactNode {
+  useKeybinding('app:interrupt', onAbort, { isActive: true });
 
   const options = request.options.map(opt => ({
     label: opt.label,
     value: opt.key,
     description: opt.description,
-  }))
+  }));
 
   return (
     <PermissionDialog
       title={title}
       subtitle={request.message}
-      titleRight={
-        toolInputSummary ? <Text dimColor>{toolInputSummary}</Text> : undefined
-      }
+      titleRight={toolInputSummary ? <Text dimColor>{toolInputSummary}</Text> : undefined}
     >
       <Box flexDirection="column" paddingY={1}>
         <Select
           options={options}
           onChange={value => {
-            onRespond(value)
+            onRespond(value);
           }}
         />
       </Box>
     </PermissionDialog>
-  )
+  );
 }
diff --git a/src/components/hooks/SelectEventMode.tsx b/src/components/hooks/SelectEventMode.tsx
index c232f745a..0da0c48d9 100644
--- a/src/components/hooks/SelectEventMode.tsx
+++ b/src/components/hooks/SelectEventMode.tsx
@@ -7,23 +7,23 @@
  * edit settings.json directly or ask Claude.
  */
 
-import figures from 'figures'
-import * as React from 'react'
-import type { HookEvent } from 'src/entrypoints/agentSdkTypes.js'
-import type { HookEventMetadata } from 'src/utils/hooks/hooksConfigManager.js'
-import { Box, Link, Text } from '@anthropic/ink'
-import { plural } from '../../utils/stringUtils.js'
-import { Select } from '../CustomSelect/select.js'
-import { Dialog } from '@anthropic/ink'
+import figures from 'figures';
+import * as React from 'react';
+import type { HookEvent } from 'src/entrypoints/agentSdkTypes.js';
+import type { HookEventMetadata } from 'src/utils/hooks/hooksConfigManager.js';
+import { Box, Link, Text } from '@anthropic/ink';
+import { plural } from '../../utils/stringUtils.js';
+import { Select } from '../CustomSelect/select.js';
+import { Dialog } from '@anthropic/ink';
 
 type Props = {
-  hookEventMetadata: Record<HookEvent, HookEventMetadata>
-  hooksByEvent: Partial<Record<HookEvent, number>>
-  totalHooksCount: number
-  restrictedByPolicy: boolean
-  onSelectEvent: (event: HookEvent) => void
-  onCancel: () => void
-}
+  hookEventMetadata: Record<HookEvent, HookEventMetadata>;
+  hooksByEvent: Partial<Record<HookEvent, number>>;
+  totalHooksCount: number;
+  restrictedByPolicy: boolean;
+  onSelectEvent: (event: HookEvent) => void;
+  onCancel: () => void;
+};
 
 export function SelectEventMode({
   hookEventMetadata,
@@ -33,28 +33,24 @@ export function SelectEventMode({
   onSelectEvent,
   onCancel,
 }: Props): React.ReactNode {
-  const subtitle = `${totalHooksCount} ${plural(totalHooksCount, 'hook')} configured`
+  const subtitle = `${totalHooksCount} ${plural(totalHooksCount, 'hook')} configured`;
 
   return (
     <Dialog title="Hooks" subtitle={subtitle} onCancel={onCancel}>
       <Box flexDirection="column" gap={1}>
         {restrictedByPolicy && (
           <Box flexDirection="column">
-            <Text color="suggestion">
-              {figures.info} Hooks Restricted by Policy
-            </Text>
+            <Text color="suggestion">{figures.info} Hooks Restricted by Policy</Text>
             <Text dimColor>
-              Only hooks from managed settings can run. User-defined hooks from
-              ~/.claude/settings.json, .claude/settings.json, and
-              .claude/settings.local.json are blocked.
+              Only hooks from managed settings can run. User-defined hooks from ~/.claude/settings.json,
+              .claude/settings.json, and .claude/settings.local.json are blocked.
             </Text>
           </Box>
         )}
 
         <Box flexDirection="column">
           <Text dimColor>
-            {figures.info} This menu is read-only. To add or modify hooks, edit
-            settings.json directly or ask Claude.{' '}
+            {figures.info} This menu is read-only. To add or modify hooks, edit settings.json directly or ask Claude.{' '}
             <Link url="https://code.claude.com/docs/en/hooks">Learn more</Link>
           </Text>
         </Box>
@@ -62,29 +58,27 @@ export function SelectEventMode({
         <Box flexDirection="column">
           <Select
             onChange={value => {
-              onSelectEvent(value as HookEvent)
+              onSelectEvent(value as HookEvent);
             }}
             onCancel={onCancel}
-            options={Object.entries(hookEventMetadata).map(
-              ([name, metadata]) => {
-                const count = hooksByEvent[name as HookEvent] || 0
-                return {
-                  label:
-                    count > 0 ? (
-                      <Text>
-                        {name} <Text color="suggestion">({count})</Text>
-                      </Text>
-                    ) : (
-                      name
-                    ),
-                  value: name,
-                  description: metadata.summary,
-                }
-              },
-            )}
+            options={Object.entries(hookEventMetadata).map(([name, metadata]) => {
+              const count = hooksByEvent[name as HookEvent] || 0;
+              return {
+                label:
+                  count > 0 ? (
+                    <Text>
+                      {name} <Text color="suggestion">({count})</Text>
+                    </Text>
+                  ) : (
+                    name
+                  ),
+                value: name,
+                description: metadata.summary,
+              };
+            })}
           />
         </Box>
       </Box>
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/hooks/SelectHookMode.tsx b/src/components/hooks/SelectHookMode.tsx
index b27195b14..e846dbdb9 100644
--- a/src/components/hooks/SelectHookMode.tsx
+++ b/src/components/hooks/SelectHookMode.tsx
@@ -5,26 +5,26 @@
  * and selecting a hook shows its read-only details instead of a delete
  * confirmation.
  */
-import * as React from 'react'
-import type { HookEvent } from 'src/entrypoints/agentSdkTypes.js'
-import type { HookEventMetadata } from 'src/utils/hooks/hooksConfigManager.js'
-import { Box, Text } from '@anthropic/ink'
+import * as React from 'react';
+import type { HookEvent } from 'src/entrypoints/agentSdkTypes.js';
+import type { HookEventMetadata } from 'src/utils/hooks/hooksConfigManager.js';
+import { Box, Text } from '@anthropic/ink';
 import {
   getHookDisplayText,
   hookSourceHeaderDisplayString,
   type IndividualHookConfig,
-} from '../../utils/hooks/hooksSettings.js'
-import { Select } from '../CustomSelect/select.js'
-import { Dialog } from '@anthropic/ink'
+} from '../../utils/hooks/hooksSettings.js';
+import { Select } from '../CustomSelect/select.js';
+import { Dialog } from '@anthropic/ink';
 
 type Props = {
-  selectedEvent: HookEvent
-  selectedMatcher: string | null
-  hooksForSelectedMatcher: IndividualHookConfig[]
-  hookEventMetadata: HookEventMetadata
-  onSelect: (hook: IndividualHookConfig) => void
-  onCancel: () => void
-}
+  selectedEvent: HookEvent;
+  selectedMatcher: string | null;
+  hooksForSelectedMatcher: IndividualHookConfig[];
+  hookEventMetadata: HookEventMetadata;
+  onSelect: (hook: IndividualHookConfig) => void;
+  onCancel: () => void;
+};
 
 export function SelectHookMode({
   selectedEvent,
@@ -37,7 +37,7 @@ export function SelectHookMode({
   const title =
     hookEventMetadata.matcherMetadata !== undefined
       ? `${selectedEvent} - Matcher: ${selectedMatcher || '(all)'}`
-      : selectedEvent
+      : selectedEvent;
 
   if (hooksForSelectedMatcher.length === 0) {
     return (
@@ -49,20 +49,14 @@ export function SelectHookMode({
       >
         <Box flexDirection="column" gap={1}>
           <Text dimColor>No hooks configured for this event.</Text>
-          <Text dimColor>
-            To add hooks, edit settings.json directly or ask Claude.
-          </Text>
+          <Text dimColor>To add hooks, edit settings.json directly or ask Claude.</Text>
         </Box>
       </Dialog>
-    )
+    );
   }
 
   return (
-    <Dialog
-      title={title}
-      subtitle={hookEventMetadata.description}
-      onCancel={onCancel}
-    >
+    <Dialog title={title} subtitle={hookEventMetadata.description} onCancel={onCancel}>
       <Box flexDirection="column">
         <Select
           options={hooksForSelectedMatcher.map((hook, index) => ({
@@ -74,15 +68,15 @@ export function SelectHookMode({
                 : hookSourceHeaderDisplayString(hook.source),
           }))}
           onChange={value => {
-            const index = parseInt(value, 10)
-            const hook = hooksForSelectedMatcher[index]
+            const index = parseInt(value, 10);
+            const hook = hooksForSelectedMatcher[index];
             if (hook) {
-              onSelect(hook)
+              onSelect(hook);
             }
           }}
           onCancel={onCancel}
         />
       </Box>
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/hooks/SelectMatcherMode.tsx b/src/components/hooks/SelectMatcherMode.tsx
index c82987f02..88e137ab2 100644
--- a/src/components/hooks/SelectMatcherMode.tsx
+++ b/src/components/hooks/SelectMatcherMode.tsx
@@ -4,35 +4,32 @@
  * The /hooks menu is read-only: this view no longer offers "add new matcher"
  * and simply lets the user drill into each matcher to see its hooks.
  */
-import * as React from 'react'
-import type { HookEvent } from 'src/entrypoints/agentSdkTypes.js'
-import { Box, Text } from '@anthropic/ink'
+import * as React from 'react';
+import type { HookEvent } from 'src/entrypoints/agentSdkTypes.js';
+import { Box, Text } from '@anthropic/ink';
 import {
   type HookSource,
   hookSourceInlineDisplayString,
   type IndividualHookConfig,
-} from '../../utils/hooks/hooksSettings.js'
-import { plural } from '../../utils/stringUtils.js'
-import { Select } from '../CustomSelect/select.js'
-import { Dialog } from '@anthropic/ink'
+} from '../../utils/hooks/hooksSettings.js';
+import { plural } from '../../utils/stringUtils.js';
+import { Select } from '../CustomSelect/select.js';
+import { Dialog } from '@anthropic/ink';
 
 type MatcherWithSource = {
-  matcher: string
-  sources: HookSource[]
-  hookCount: number
-}
+  matcher: string;
+  sources: HookSource[];
+  hookCount: number;
+};
 
 type Props = {
-  selectedEvent: HookEvent
-  matchersForSelectedEvent: string[]
-  hooksByEventAndMatcher: Record<
-    HookEvent,
-    Record<string, IndividualHookConfig[]>
-  >
-  eventDescription: string
-  onSelect: (matcher: string) => void
-  onCancel: () => void
-}
+  selectedEvent: HookEvent;
+  matchersForSelectedEvent: string[];
+  hooksByEventAndMatcher: Record<HookEvent, Record<string, IndividualHookConfig[]>>;
+  eventDescription: string;
+  onSelect: (matcher: string) => void;
+  onCancel: () => void;
+};
 
 export function SelectMatcherMode({
   selectedEvent,
@@ -45,15 +42,15 @@ export function SelectMatcherMode({
   // Group matchers with their sources (already sorted by priority in parent)
   const matchersWithSources: MatcherWithSource[] = React.useMemo(() => {
     return matchersForSelectedEvent.map(matcher => {
-      const hooks = hooksByEventAndMatcher[selectedEvent]?.[matcher] || []
-      const sources = Array.from(new Set(hooks.map(h => h.source)))
+      const hooks = hooksByEventAndMatcher[selectedEvent]?.[matcher] || [];
+      const sources = Array.from(new Set(hooks.map(h => h.source)));
       return {
         matcher,
         sources,
         hookCount: hooks.length,
-      }
-    })
-  }, [matchersForSelectedEvent, hooksByEventAndMatcher, selectedEvent])
+      };
+    });
+  }, [matchersForSelectedEvent, hooksByEventAndMatcher, selectedEvent]);
 
   if (matchersForSelectedEvent.length === 0) {
     return (
@@ -65,39 +62,31 @@ export function SelectMatcherMode({
       >
         <Box flexDirection="column" gap={1}>
           <Text dimColor>No hooks configured for this event.</Text>
-          <Text dimColor>
-            To add hooks, edit settings.json directly or ask Claude.
-          </Text>
+          <Text dimColor>To add hooks, edit settings.json directly or ask Claude.</Text>
         </Box>
       </Dialog>
-    )
+    );
   }
 
   return (
-    <Dialog
-      title={`${selectedEvent} - Matchers`}
-      subtitle={eventDescription}
-      onCancel={onCancel}
-    >
+    <Dialog title={`${selectedEvent} - Matchers`} subtitle={eventDescription} onCancel={onCancel}>
       <Box flexDirection="column">
         <Select
           options={matchersWithSources.map(item => {
-            const sourceText = item.sources
-              .map(hookSourceInlineDisplayString)
-              .join(', ')
-            const matcherLabel = item.matcher || '(all)'
+            const sourceText = item.sources.map(hookSourceInlineDisplayString).join(', ');
+            const matcherLabel = item.matcher || '(all)';
             return {
               label: `[${sourceText}] ${matcherLabel}`,
               value: item.matcher,
               description: `${item.hookCount} ${plural(item.hookCount, 'hook')}`,
-            }
+            };
           })}
           onChange={value => {
-            onSelect(value)
+            onSelect(value);
           }}
           onCancel={onCancel}
         />
       </Box>
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/hooks/ViewHookMode.tsx b/src/components/hooks/ViewHookMode.tsx
index b79c09cca..baf0765f8 100644
--- a/src/components/hooks/ViewHookMode.tsx
+++ b/src/components/hooks/ViewHookMode.tsx
@@ -4,31 +4,20 @@
  * The /hooks menu is read-only; this view replaces the former delete-hook
  * confirmation screen and directs users to settings.json or Claude for edits.
  */
-import * as React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import {
-  hookSourceDescriptionDisplayString,
-  type IndividualHookConfig,
-} from '../../utils/hooks/hooksSettings.js'
-import { Dialog } from '@anthropic/ink'
+import * as React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { hookSourceDescriptionDisplayString, type IndividualHookConfig } from '../../utils/hooks/hooksSettings.js';
+import { Dialog } from '@anthropic/ink';
 
 type Props = {
-  selectedHook: IndividualHookConfig
-  eventSupportsMatcher: boolean
-  onCancel: () => void
-}
+  selectedHook: IndividualHookConfig;
+  eventSupportsMatcher: boolean;
+  onCancel: () => void;
+};
 
-export function ViewHookMode({
-  selectedHook,
-  eventSupportsMatcher,
-  onCancel,
-}: Props): React.ReactNode {
+export function ViewHookMode({ selectedHook, eventSupportsMatcher, onCancel }: Props): React.ReactNode {
   return (
-    <Dialog
-      title="Hook details"
-      onCancel={onCancel}
-      inputGuide={() => <Text>Esc to go back</Text>}
-    >
+    <Dialog title="Hook details" onCancel={onCancel} inputGuide={() => <Text>Esc to go back</Text>}>
       <Box flexDirection="column" gap={1}>
         <Box flexDirection="column">
           <Text>
@@ -43,10 +32,7 @@ export function ViewHookMode({
             Type: <Text bold>{selectedHook.config.type}</Text>
           </Text>
           <Text>
-            Source:{' '}
-            <Text dimColor>
-              {hookSourceDescriptionDisplayString(selectedHook.source)}
-            </Text>
+            Source: <Text dimColor>{hookSourceDescriptionDisplayString(selectedHook.source)}</Text>
           </Text>
           {selectedHook.pluginName && (
             <Text>
@@ -56,29 +42,19 @@ export function ViewHookMode({
         </Box>
         <Box flexDirection="column">
           <Text dimColor>{getContentFieldLabel(selectedHook.config)}:</Text>
-          <Box
-            borderStyle="round"
-            borderDimColor
-            paddingLeft={1}
-            paddingRight={1}
-          >
+          <Box borderStyle="round" borderDimColor paddingLeft={1} paddingRight={1}>
             <Text>{getContentFieldValue(selectedHook.config)}</Text>
           </Box>
         </Box>
-        {'statusMessage' in selectedHook.config &&
-          selectedHook.config.statusMessage && (
-            <Text>
-              Status message:{' '}
-              <Text dimColor>{selectedHook.config.statusMessage}</Text>
-            </Text>
-          )}
-        <Text dimColor>
-          To modify or remove this hook, edit settings.json directly or ask
-          Claude to help.
-        </Text>
+        {'statusMessage' in selectedHook.config && selectedHook.config.statusMessage && (
+          <Text>
+            Status message: <Text dimColor>{selectedHook.config.statusMessage}</Text>
+          </Text>
+        )}
+        <Text dimColor>To modify or remove this hook, edit settings.json directly or ask Claude to help.</Text>
       </Box>
     </Dialog>
-  )
+  );
 }
 
 /**
@@ -88,13 +64,13 @@ export function ViewHookMode({
 function getContentFieldLabel(config: IndividualHookConfig['config']): string {
   switch (config.type) {
     case 'command':
-      return 'Command'
+      return 'Command';
     case 'prompt':
-      return 'Prompt'
+      return 'Prompt';
     case 'agent':
-      return 'Prompt'
+      return 'Prompt';
     case 'http':
-      return 'URL'
+      return 'URL';
   }
 }
 
@@ -105,12 +81,12 @@ function getContentFieldLabel(config: IndividualHookConfig['config']): string {
 function getContentFieldValue(config: IndividualHookConfig['config']): string {
   switch (config.type) {
     case 'command':
-      return config.command
+      return config.command;
     case 'prompt':
-      return config.prompt
+      return config.prompt;
     case 'agent':
-      return config.prompt
+      return config.prompt;
     case 'http':
-      return config.url
+      return config.url;
   }
 }
diff --git a/src/components/hooks/src/entrypoints/agentSdkTypes.ts b/src/components/hooks/src/entrypoints/agentSdkTypes.ts
index 2ad98a3ad..0d880a5cf 100644
--- a/src/components/hooks/src/entrypoints/agentSdkTypes.ts
+++ b/src/components/hooks/src/entrypoints/agentSdkTypes.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type HookEvent = any;
+export type HookEvent = any
diff --git a/src/components/hooks/src/state/AppState.ts b/src/components/hooks/src/state/AppState.ts
index cbb9746b4..9fe15ddad 100644
--- a/src/components/hooks/src/state/AppState.ts
+++ b/src/components/hooks/src/state/AppState.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type useAppState = any;
-export type useAppStateStore = any;
+export type useAppState = any
+export type useAppStateStore = any
diff --git a/src/components/hooks/src/utils/hooks/hooksConfigManager.ts b/src/components/hooks/src/utils/hooks/hooksConfigManager.ts
index 33a2e63cc..3cc873ba8 100644
--- a/src/components/hooks/src/utils/hooks/hooksConfigManager.ts
+++ b/src/components/hooks/src/utils/hooks/hooksConfigManager.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type HookEventMetadata = any;
+export type HookEventMetadata = any
diff --git a/src/components/mcp/CapabilitiesSection.tsx b/src/components/mcp/CapabilitiesSection.tsx
index dd0033382..cf44bca95 100644
--- a/src/components/mcp/CapabilitiesSection.tsx
+++ b/src/components/mcp/CapabilitiesSection.tsx
@@ -1,35 +1,33 @@
-import React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { Byline } from '@anthropic/ink'
+import React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { Byline } from '@anthropic/ink';
 
 type Props = {
-  serverToolsCount: number
-  serverPromptsCount: number
-  serverResourcesCount: number
-}
+  serverToolsCount: number;
+  serverPromptsCount: number;
+  serverResourcesCount: number;
+};
 
 export function CapabilitiesSection({
   serverToolsCount,
   serverPromptsCount,
   serverResourcesCount,
 }: Props): React.ReactNode {
-  const capabilities = []
+  const capabilities = [];
   if (serverToolsCount > 0) {
-    capabilities.push('tools')
+    capabilities.push('tools');
   }
   if (serverResourcesCount > 0) {
-    capabilities.push('resources')
+    capabilities.push('resources');
   }
   if (serverPromptsCount > 0) {
-    capabilities.push('prompts')
+    capabilities.push('prompts');
   }
 
   return (
     <Box>
       <Text bold>Capabilities: </Text>
-      <Text color="text">
-        {capabilities.length > 0 ? <Byline>{capabilities}</Byline> : 'none'}
-      </Text>
+      <Text color="text">{capabilities.length > 0 ? <Byline>{capabilities}</Byline> : 'none'}</Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/mcp/ElicitationDialog.tsx b/src/components/mcp/ElicitationDialog.tsx
index c93003106..8470e494c 100644
--- a/src/components/mcp/ElicitationDialog.tsx
+++ b/src/components/mcp/ElicitationDialog.tsx
@@ -3,17 +3,17 @@ import type {
   ElicitRequestURLParams,
   ElicitResult,
   PrimitiveSchemaDefinition,
-} from '@modelcontextprotocol/sdk/types.js'
-import figures from 'figures'
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { useRegisterOverlay } from '../../context/overlayContext.js'
-import { useNotifyAfterTimeout } from '../../hooks/useNotifyAfterTimeout.js'
-import { useTerminalSize } from '../../hooks/useTerminalSize.js'
+} from '@modelcontextprotocol/sdk/types.js';
+import figures from 'figures';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useRegisterOverlay } from '../../context/overlayContext.js';
+import { useNotifyAfterTimeout } from '../../hooks/useNotifyAfterTimeout.js';
+import { useTerminalSize } from '../../hooks/useTerminalSize.js';
 // eslint-disable-next-line custom-rules/prefer-use-keybindings -- raw text input for elicitation form
-import { Box, Text, useInput } from '@anthropic/ink'
-import { useKeybinding } from '../../keybindings/useKeybinding.js'
-import type { ElicitationRequestEvent } from '../../services/mcp/elicitationHandler.js'
-import { openBrowser } from '../../utils/browser.js'
+import { Box, Text, useInput } from '@anthropic/ink';
+import { useKeybinding } from '../../keybindings/useKeybinding.js';
+import type { ElicitationRequestEvent } from '../../services/mcp/elicitationHandler.js';
+import { openBrowser } from '../../utils/browser.js';
 import {
   getEnumLabel,
   getEnumValues,
@@ -24,37 +24,28 @@ import {
   isMultiSelectEnumSchema,
   validateElicitationInput,
   validateElicitationInputAsync,
-} from '../../utils/mcp/elicitationValidation.js'
-import { plural } from '../../utils/stringUtils.js'
-import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js'
-import { Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink'
-import TextInput from '../TextInput.js'
+} from '../../utils/mcp/elicitationValidation.js';
+import { plural } from '../../utils/stringUtils.js';
+import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js';
+import { Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink';
+import TextInput from '../TextInput.js';
 
 type Props = {
-  event: ElicitationRequestEvent
-  onResponse: (
-    action: ElicitResult['action'],
-    content?: ElicitResult['content'],
-  ) => void
+  event: ElicitationRequestEvent;
+  onResponse: (action: ElicitResult['action'], content?: ElicitResult['content']) => void;
   /** Called when the phase 2 waiting state is dismissed (URL elicitations only). */
-  onWaitingDismiss?: (action: 'dismiss' | 'retry' | 'cancel') => void
-}
+  onWaitingDismiss?: (action: 'dismiss' | 'retry' | 'cancel') => void;
+};
 
-const isTextField = (s: PrimitiveSchemaDefinition) =>
-  ['string', 'number', 'integer'].includes(s.type)
+const isTextField = (s: PrimitiveSchemaDefinition) => ['string', 'number', 'integer'].includes(s.type);
 
-const RESOLVING_SPINNER_CHARS =
-  '\u280B\u2819\u2839\u2838\u283C\u2834\u2826\u2827\u2807\u280F'
-const advanceSpinnerFrame = (f: number) =>
-  (f + 1) % RESOLVING_SPINNER_CHARS.length
+const RESOLVING_SPINNER_CHARS = '\u280B\u2819\u2839\u2838\u283C\u2834\u2826\u2827\u2807\u280F';
+const advanceSpinnerFrame = (f: number) => (f + 1) % RESOLVING_SPINNER_CHARS.length;
 
 /** Timer callback for enumTypeaheadRef — module-scope to avoid closure capture. */
-function resetTypeahead(ta: {
-  buffer: string
-  timer: ReturnType<typeof setTimeout> | undefined
-}): void {
-  ta.buffer = ''
-  ta.timer = undefined
+function resetTypeahead(ta: { buffer: string; timer: ReturnType<typeof setTimeout> | undefined }): void {
+  ta.buffer = '';
+  ta.timer = undefined;
 }
 
 /**
@@ -68,23 +59,20 @@ function resetTypeahead(ta: {
  * column alignment here (other checkbox states are width-1 glyphs).
  */
 function ResolvingSpinner(): React.ReactNode {
-  const [frame, setFrame] = useState(0)
+  const [frame, setFrame] = useState(0);
   useEffect(() => {
-    const timer = setInterval(setFrame, 80, advanceSpinnerFrame)
-    return () => clearInterval(timer)
-  }, [])
-  return <Text color="warning">{RESOLVING_SPINNER_CHARS[frame]}</Text>
+    const timer = setInterval(setFrame, 80, advanceSpinnerFrame);
+    return () => clearInterval(timer);
+  }, []);
+  return <Text color="warning">{RESOLVING_SPINNER_CHARS[frame]}</Text>;
 }
 
 /** Format an ISO date/datetime for display, keeping the ISO value for submission. */
-function formatDateDisplay(
-  isoValue: string,
-  schema: PrimitiveSchemaDefinition,
-): string {
+function formatDateDisplay(isoValue: string, schema: PrimitiveSchemaDefinition): string {
   try {
-    const date = new Date(isoValue)
-    if (Number.isNaN(date.getTime())) return isoValue
-    const format = 'format' in schema ? schema.format : undefined
+    const date = new Date(isoValue);
+    if (Number.isNaN(date.getTime())) return isoValue;
+    const format = 'format' in schema ? schema.format : undefined;
     if (format === 'date-time') {
       return date.toLocaleDateString('en-US', {
         weekday: 'short',
@@ -94,160 +82,122 @@ function formatDateDisplay(
         hour: 'numeric',
         minute: '2-digit',
         timeZoneName: 'short',
-      })
+      });
     }
     // date-only: parse as local date to avoid timezone shift
-    const parts = isoValue.split('-')
+    const parts = isoValue.split('-');
     if (parts.length === 3) {
-      const local = new Date(
-        Number(parts[0]),
-        Number(parts[1]) - 1,
-        Number(parts[2]),
-      )
+      const local = new Date(Number(parts[0]), Number(parts[1]) - 1, Number(parts[2]));
       return local.toLocaleDateString('en-US', {
         weekday: 'short',
         year: 'numeric',
         month: 'short',
         day: 'numeric',
-      })
+      });
     }
-    return isoValue
+    return isoValue;
   } catch {
-    return isoValue
+    return isoValue;
   }
 }
 
-export function ElicitationDialog({
-  event,
-  onResponse,
-  onWaitingDismiss,
-}: Props): React.ReactNode {
+export function ElicitationDialog({ event, onResponse, onWaitingDismiss }: Props): React.ReactNode {
   if (event.params.mode === 'url') {
-    return (
-      <ElicitationURLDialog
-        event={event}
-        onResponse={onResponse}
-        onWaitingDismiss={onWaitingDismiss}
-      />
-    )
+    return <ElicitationURLDialog event={event} onResponse={onResponse} onWaitingDismiss={onWaitingDismiss} />;
   }
 
-  return <ElicitationFormDialog event={event} onResponse={onResponse} />
+  return <ElicitationFormDialog event={event} onResponse={onResponse} />;
 }
 
 function ElicitationFormDialog({
   event,
   onResponse,
 }: {
-  event: ElicitationRequestEvent
-  onResponse: Props['onResponse']
+  event: ElicitationRequestEvent;
+  onResponse: Props['onResponse'];
 }): React.ReactNode {
-  const { serverName, signal } = event
-  const request = event.params as ElicitRequestFormParams
-  const { message, requestedSchema } = request
-  const hasFields = Object.keys(requestedSchema.properties).length > 0
-  const [focusedButton, setFocusedButton] = useState<
-    'accept' | 'decline' | null
-  >(hasFields ? null : 'accept')
-  const [formValues, setFormValues] = useState<
-    Record<string, string | number | boolean | string[]>
-  >(() => {
-    const initialValues: Record<string, string | number | boolean | string[]> =
-      {}
+  const { serverName, signal } = event;
+  const request = event.params as ElicitRequestFormParams;
+  const { message, requestedSchema } = request;
+  const hasFields = Object.keys(requestedSchema.properties).length > 0;
+  const [focusedButton, setFocusedButton] = useState<'accept' | 'decline' | null>(hasFields ? null : 'accept');
+  const [formValues, setFormValues] = useState<Record<string, string | number | boolean | string[]>>(() => {
+    const initialValues: Record<string, string | number | boolean | string[]> = {};
     if (requestedSchema.properties) {
-      for (const [propName, propSchema] of Object.entries(
-        requestedSchema.properties,
-      )) {
+      for (const [propName, propSchema] of Object.entries(requestedSchema.properties)) {
         if (typeof propSchema === 'object' && propSchema !== null) {
           if (propSchema.default !== undefined) {
-            initialValues[propName] = propSchema.default
+            initialValues[propName] = propSchema.default;
           }
         }
       }
     }
-    return initialValues
-  })
+    return initialValues;
+  });
 
-  const [validationErrors, setValidationErrors] = useState<
-    Record<string, string>
-  >(() => {
-    const initialErrors: Record<string, string> = {}
-    for (const [propName, propSchema] of Object.entries(
-      requestedSchema.properties,
-    )) {
+  const [validationErrors, setValidationErrors] = useState<Record<string, string>>(() => {
+    const initialErrors: Record<string, string> = {};
+    for (const [propName, propSchema] of Object.entries(requestedSchema.properties)) {
       if (isTextField(propSchema) && propSchema?.default !== undefined) {
-        const validation = validateElicitationInput(
-          String(propSchema.default),
-          propSchema,
-        )
+        const validation = validateElicitationInput(String(propSchema.default), propSchema);
         if (!validation.isValid && validation.error) {
-          initialErrors[propName] = validation.error
+          initialErrors[propName] = validation.error;
         }
       }
     }
-    return initialErrors
-  })
+    return initialErrors;
+  });
 
   useEffect(() => {
-    if (!signal) return
+    if (!signal) return;
 
     const handleAbort = () => {
-      onResponse('cancel')
-    }
+      onResponse('cancel');
+    };
 
     if (signal.aborted) {
-      handleAbort()
-      return
+      handleAbort();
+      return;
     }
 
-    signal.addEventListener('abort', handleAbort)
+    signal.addEventListener('abort', handleAbort);
     return () => {
-      signal.removeEventListener('abort', handleAbort)
-    }
-  }, [signal, onResponse])
+      signal.removeEventListener('abort', handleAbort);
+    };
+  }, [signal, onResponse]);
 
   const schemaFields = useMemo(() => {
-    const requiredFields = requestedSchema.required ?? []
+    const requiredFields = requestedSchema.required ?? [];
     return Object.entries(requestedSchema.properties).map(([name, schema]) => ({
       name,
       schema,
       isRequired: requiredFields.includes(name),
-    }))
-  }, [requestedSchema])
+    }));
+  }, [requestedSchema]);
 
-  const [currentFieldIndex, setCurrentFieldIndex] = useState<
-    number | undefined
-  >(hasFields ? 0 : undefined)
+  const [currentFieldIndex, setCurrentFieldIndex] = useState<number | undefined>(hasFields ? 0 : undefined);
   const [textInputValue, setTextInputValue] = useState(() => {
     // Initialize from the first field's value if it's a text field
-    const firstField = schemaFields[0]
+    const firstField = schemaFields[0];
     if (firstField && isTextField(firstField.schema)) {
-      const val = formValues[firstField.name]
-      if (val === undefined) return ''
-      return String(val)
+      const val = formValues[firstField.name];
+      if (val === undefined) return '';
+      return String(val);
     }
-    return ''
-  })
-  const [textInputCursorOffset, setTextInputCursorOffset] = useState(
-    textInputValue.length,
-  )
-  const [resolvingFields, setResolvingFields] = useState<Set<string>>(
-    () => new Set(),
-  )
+    return '';
+  });
+  const [textInputCursorOffset, setTextInputCursorOffset] = useState(textInputValue.length);
+  const [resolvingFields, setResolvingFields] = useState<Set<string>>(() => new Set());
   // Accordion state (shared by multi-select and single-select enum)
-  const [expandedAccordion, setExpandedAccordion] = useState<
-    string | undefined
-  >()
-  const [accordionOptionIndex, setAccordionOptionIndex] = useState(0)
+  const [expandedAccordion, setExpandedAccordion] = useState<string | undefined>();
+  const [accordionOptionIndex, setAccordionOptionIndex] = useState(0);
 
-  const dateDebounceRef = useRef<ReturnType<typeof setTimeout> | undefined>(
-    undefined,
-  )
-  const resolveAbortRef = useRef<Map<string, AbortController>>(new Map())
+  const dateDebounceRef = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);
+  const resolveAbortRef = useRef<Map<string, AbortController>>(new Map());
   const enumTypeaheadRef = useRef({
     buffer: '',
     timer: undefined as ReturnType<typeof setTimeout> | undefined,
-  })
+  });
 
   // Clear pending debounce/typeahead timers and abort in-flight async
   // validations on unmount so they don't fire against an unmounted component
@@ -255,103 +205,84 @@ function ElicitationFormDialog({
   useEffect(
     () => () => {
       if (dateDebounceRef.current !== undefined) {
-        clearTimeout(dateDebounceRef.current)
+        clearTimeout(dateDebounceRef.current);
       }
-      const ta = enumTypeaheadRef.current
+      const ta = enumTypeaheadRef.current;
       if (ta.timer !== undefined) {
-        clearTimeout(ta.timer)
+        clearTimeout(ta.timer);
       }
       for (const controller of resolveAbortRef.current.values()) {
-        controller.abort()
+        controller.abort();
       }
-      resolveAbortRef.current.clear()
+      resolveAbortRef.current.clear();
     },
     [],
-  )
+  );
 
-  const { columns, rows } = useTerminalSize()
+  const { columns, rows } = useTerminalSize();
 
-  const currentField =
-    currentFieldIndex !== undefined
-      ? schemaFields[currentFieldIndex]
-      : undefined
+  const currentField = currentFieldIndex !== undefined ? schemaFields[currentFieldIndex] : undefined;
   const currentFieldIsText =
-    currentField !== undefined &&
-    isTextField(currentField.schema) &&
-    !isEnumSchema(currentField.schema)
+    currentField !== undefined && isTextField(currentField.schema) && !isEnumSchema(currentField.schema);
 
   // Text fields are always in edit mode when focused — no Enter-to-edit step.
-  const isEditingTextField = currentFieldIsText && !focusedButton
+  const isEditingTextField = currentFieldIsText && !focusedButton;
 
-  useRegisterOverlay('elicitation')
-  useNotifyAfterTimeout('Claude Code needs your input', 'elicitation_dialog')
+  useRegisterOverlay('elicitation');
+  useNotifyAfterTimeout('Claude Code needs your input', 'elicitation_dialog');
 
   // Sync textInputValue when the focused field changes
   const syncTextInput = useCallback(
     (fieldIndex: number | undefined) => {
       if (fieldIndex === undefined) {
-        setTextInputValue('')
-        setTextInputCursorOffset(0)
-        return
+        setTextInputValue('');
+        setTextInputCursorOffset(0);
+        return;
       }
-      const field = schemaFields[fieldIndex]
+      const field = schemaFields[fieldIndex];
       if (field && isTextField(field.schema) && !isEnumSchema(field.schema)) {
-        const val = formValues[field.name]
-        const text = val !== undefined ? String(val) : ''
-        setTextInputValue(text)
-        setTextInputCursorOffset(text.length)
+        const val = formValues[field.name];
+        const text = val !== undefined ? String(val) : '';
+        setTextInputValue(text);
+        setTextInputCursorOffset(text.length);
       }
     },
     [schemaFields, formValues],
-  )
+  );
 
-  function validateMultiSelect(
-    fieldName: string,
-    schema: PrimitiveSchemaDefinition,
-  ) {
-    if (!isMultiSelectEnumSchema(schema)) return
-    const selected = (formValues[fieldName] as string[] | undefined) ?? []
-    const fieldRequired =
-      schemaFields.find(f => f.name === fieldName)?.isRequired ?? false
-    const min = schema.minItems
-    const max = schema.maxItems
+  function validateMultiSelect(fieldName: string, schema: PrimitiveSchemaDefinition) {
+    if (!isMultiSelectEnumSchema(schema)) return;
+    const selected = (formValues[fieldName] as string[] | undefined) ?? [];
+    const fieldRequired = schemaFields.find(f => f.name === fieldName)?.isRequired ?? false;
+    const min = schema.minItems;
+    const max = schema.maxItems;
     // Skip minItems check when field is optional and unset
-    if (
-      min !== undefined &&
-      selected.length < min &&
-      (selected.length > 0 || fieldRequired)
-    ) {
-      updateValidationError(
-        fieldName,
-        `Select at least ${min} ${plural(min, 'item')}`,
-      )
+    if (min !== undefined && selected.length < min && (selected.length > 0 || fieldRequired)) {
+      updateValidationError(fieldName, `Select at least ${min} ${plural(min, 'item')}`);
     } else if (max !== undefined && selected.length > max) {
-      updateValidationError(
-        fieldName,
-        `Select at most ${max} ${plural(max, 'item')}`,
-      )
+      updateValidationError(fieldName, `Select at most ${max} ${plural(max, 'item')}`);
     } else {
-      updateValidationError(fieldName)
+      updateValidationError(fieldName);
     }
   }
 
   function handleNavigation(direction: 'up' | 'down'): void {
     // Collapse accordion and validate on navigate away
     if (currentField && isMultiSelectEnumSchema(currentField.schema)) {
-      validateMultiSelect(currentField.name, currentField.schema)
-      setExpandedAccordion(undefined)
+      validateMultiSelect(currentField.name, currentField.schema);
+      setExpandedAccordion(undefined);
     } else if (currentField && isEnumSchema(currentField.schema)) {
-      setExpandedAccordion(undefined)
+      setExpandedAccordion(undefined);
     }
 
     // Commit current text field before navigating away
     if (isEditingTextField && currentField) {
-      commitTextField(currentField.name, currentField.schema, textInputValue)
+      commitTextField(currentField.name, currentField.schema, textInputValue);
 
       // Cancel any pending debounce — we're resolving now on navigate-away
       if (dateDebounceRef.current !== undefined) {
-        clearTimeout(dateDebounceRef.current)
-        dateDebounceRef.current = undefined
+        clearTimeout(dateDebounceRef.current);
+        dateDebounceRef.current = undefined;
       }
 
       // For date/datetime fields that failed sync validation, try async NL parsing
@@ -360,196 +291,160 @@ function ElicitationFormDialog({
         textInputValue.trim() !== '' &&
         validationErrors[currentField.name]
       ) {
-        resolveFieldAsync(
-          currentField.name,
-          currentField.schema,
-          textInputValue,
-        )
+        resolveFieldAsync(currentField.name, currentField.schema, textInputValue);
       }
     }
 
     // Fields + accept + decline
-    const itemCount = schemaFields.length + 2
+    const itemCount = schemaFields.length + 2;
     const index =
       currentFieldIndex ??
       (focusedButton === 'accept'
         ? schemaFields.length
         : focusedButton === 'decline'
           ? schemaFields.length + 1
-          : undefined)
-    const nextIndex =
-      index !== undefined
-        ? (index + (direction === 'up' ? itemCount - 1 : 1)) % itemCount
-        : 0
+          : undefined);
+    const nextIndex = index !== undefined ? (index + (direction === 'up' ? itemCount - 1 : 1)) % itemCount : 0;
     if (nextIndex < schemaFields.length) {
-      setCurrentFieldIndex(nextIndex)
-      setFocusedButton(null)
-      syncTextInput(nextIndex)
+      setCurrentFieldIndex(nextIndex);
+      setFocusedButton(null);
+      syncTextInput(nextIndex);
     } else {
-      setCurrentFieldIndex(undefined)
-      setFocusedButton(nextIndex === schemaFields.length ? 'accept' : 'decline')
-      setTextInputValue('')
+      setCurrentFieldIndex(undefined);
+      setFocusedButton(nextIndex === schemaFields.length ? 'accept' : 'decline');
+      setTextInputValue('');
     }
   }
 
-  function setField(
-    fieldName: string,
-    value: number | string | boolean | string[] | undefined,
-  ) {
+  function setField(fieldName: string, value: number | string | boolean | string[] | undefined) {
     setFormValues(prev => {
-      const next = { ...prev }
+      const next = { ...prev };
       if (value === undefined) {
-        delete next[fieldName]
+        delete next[fieldName];
       } else {
-        next[fieldName] = value
+        next[fieldName] = value;
       }
-      return next
-    })
+      return next;
+    });
     // Clear "required" error when a value is provided
-    if (
-      value !== undefined &&
-      validationErrors[fieldName] === 'This field is required'
-    ) {
-      updateValidationError(fieldName)
+    if (value !== undefined && validationErrors[fieldName] === 'This field is required') {
+      updateValidationError(fieldName);
     }
   }
 
   function updateValidationError(fieldName: string, error?: string) {
     setValidationErrors(prev => {
-      const next = { ...prev }
+      const next = { ...prev };
       if (error) {
-        next[fieldName] = error
+        next[fieldName] = error;
       } else {
-        delete next[fieldName]
+        delete next[fieldName];
       }
-      return next
-    })
+      return next;
+    });
   }
 
   function unsetField(fieldName: string) {
-    if (!fieldName) return
-    setField(fieldName, undefined)
-    updateValidationError(fieldName)
-    setTextInputValue('')
-    setTextInputCursorOffset(0)
+    if (!fieldName) return;
+    setField(fieldName, undefined);
+    updateValidationError(fieldName);
+    setTextInputValue('');
+    setTextInputCursorOffset(0);
   }
 
-  function commitTextField(
-    fieldName: string,
-    schema: PrimitiveSchemaDefinition,
-    value: string,
-  ) {
-    const trimmedValue = value.trim()
+  function commitTextField(fieldName: string, schema: PrimitiveSchemaDefinition, value: string) {
+    const trimmedValue = value.trim();
 
     // Empty input for non-plain-string types means unset
-    if (
-      trimmedValue === '' &&
-      (schema.type !== 'string' ||
-        ('format' in schema && schema.format !== undefined))
-    ) {
-      unsetField(fieldName)
-      return
+    if (trimmedValue === '' && (schema.type !== 'string' || ('format' in schema && schema.format !== undefined))) {
+      unsetField(fieldName);
+      return;
     }
 
     if (trimmedValue === '') {
       // Empty plain string — keep or unset depending on whether it was set
       if (formValues[fieldName] !== undefined) {
-        setField(fieldName, '')
+        setField(fieldName, '');
       }
-      return
+      return;
     }
 
-    const validation = validateElicitationInput(value, schema)
-    setField(fieldName, validation.isValid ? validation.value : value)
-    updateValidationError(
-      fieldName,
-      validation.isValid ? undefined : validation.error,
-    )
+    const validation = validateElicitationInput(value, schema);
+    setField(fieldName, validation.isValid ? validation.value : value);
+    updateValidationError(fieldName, validation.isValid ? undefined : validation.error);
   }
 
-  function resolveFieldAsync(
-    fieldName: string,
-    schema: PrimitiveSchemaDefinition,
-    rawValue: string,
-  ) {
-    if (!signal) return
+  function resolveFieldAsync(fieldName: string, schema: PrimitiveSchemaDefinition, rawValue: string) {
+    if (!signal) return;
 
     // Abort any existing resolution for this field
-    const existing = resolveAbortRef.current.get(fieldName)
+    const existing = resolveAbortRef.current.get(fieldName);
     if (existing) {
-      existing.abort()
+      existing.abort();
     }
 
-    const controller = new AbortController()
-    resolveAbortRef.current.set(fieldName, controller)
+    const controller = new AbortController();
+    resolveAbortRef.current.set(fieldName, controller);
 
-    setResolvingFields(prev => new Set(prev).add(fieldName))
+    setResolvingFields(prev => new Set(prev).add(fieldName));
 
-    void validateElicitationInputAsync(
-      rawValue,
-      schema,
-      controller.signal,
-    ).then(
+    void validateElicitationInputAsync(rawValue, schema, controller.signal).then(
       result => {
-        resolveAbortRef.current.delete(fieldName)
+        resolveAbortRef.current.delete(fieldName);
         setResolvingFields(prev => {
-          const next = new Set(prev)
-          next.delete(fieldName)
-          return next
-        })
-        if (controller.signal.aborted) return
+          const next = new Set(prev);
+          next.delete(fieldName);
+          return next;
+        });
+        if (controller.signal.aborted) return;
 
         if (result.isValid) {
-          setField(fieldName, result.value)
-          updateValidationError(fieldName)
+          setField(fieldName, result.value);
+          updateValidationError(fieldName);
           // Update the text input if we're still on this field
-          const isoText = String(result.value)
+          const isoText = String(result.value);
           setTextInputValue(prev => {
             // Only replace if the field is still showing the raw input
             if (prev === rawValue) {
-              setTextInputCursorOffset(isoText.length)
-              return isoText
+              setTextInputCursorOffset(isoText.length);
+              return isoText;
             }
-            return prev
-          })
+            return prev;
+          });
         } else {
           // Keep raw text, show validation error
-          updateValidationError(fieldName, result.error)
+          updateValidationError(fieldName, result.error);
         }
       },
       () => {
-        resolveAbortRef.current.delete(fieldName)
+        resolveAbortRef.current.delete(fieldName);
         setResolvingFields(prev => {
-          const next = new Set(prev)
-          next.delete(fieldName)
-          return next
-        })
+          const next = new Set(prev);
+          next.delete(fieldName);
+          return next;
+        });
       },
-    )
+    );
   }
 
   function handleTextInputChange(newValue: string) {
-    setTextInputValue(newValue)
+    setTextInputValue(newValue);
     // Commit immediately on each keystroke (sync validation)
     if (currentField) {
-      commitTextField(currentField.name, currentField.schema, newValue)
+      commitTextField(currentField.name, currentField.schema, newValue);
 
       // For date/datetime fields, debounce async NL parsing after 2s of inactivity
       if (dateDebounceRef.current !== undefined) {
-        clearTimeout(dateDebounceRef.current)
-        dateDebounceRef.current = undefined
+        clearTimeout(dateDebounceRef.current);
+        dateDebounceRef.current = undefined;
       }
-      if (
-        isDateTimeSchema(currentField.schema) &&
-        newValue.trim() !== '' &&
-        validationErrors[currentField.name]
-      ) {
-        const fieldName = currentField.name
-        const schema = currentField.schema
+      if (isDateTimeSchema(currentField.schema) && newValue.trim() !== '' && validationErrors[currentField.name]) {
+        const fieldName = currentField.name;
+        const schema = currentField.schema;
         dateDebounceRef.current = setTimeout(
           (dateDebounceRef, resolveFieldAsync, fieldName, schema, newValue) => {
-            dateDebounceRef.current = undefined
-            resolveFieldAsync(fieldName, schema, newValue)
+            dateDebounceRef.current = undefined;
+            resolveFieldAsync(fieldName, schema, newValue);
           },
           2000,
           dateDebounceRef,
@@ -557,13 +452,13 @@ function ElicitationFormDialog({
           fieldName,
           schema,
           newValue,
-        )
+        );
       }
     }
   }
 
   function handleTextInputSubmit() {
-    handleNavigation('down')
+    handleNavigation('down');
   }
 
   /**
@@ -571,17 +466,13 @@ function ElicitationFormDialog({
    * call `onMatch` with the index of the first label that prefix-matches.
    * Shared by boolean y/n, enum accordion, and multi-select accordion.
    */
-  function runTypeahead(
-    char: string,
-    labels: string[],
-    onMatch: (index: number) => void,
-  ) {
-    const ta = enumTypeaheadRef.current
-    if (ta.timer !== undefined) clearTimeout(ta.timer)
-    ta.buffer += char.toLowerCase()
-    ta.timer = setTimeout(resetTypeahead, 2000, ta)
-    const match = labels.findIndex(l => l.startsWith(ta.buffer))
-    if (match !== -1) onMatch(match)
+  function runTypeahead(char: string, labels: string[], onMatch: (index: number) => void) {
+    const ta = enumTypeaheadRef.current;
+    if (ta.timer !== undefined) clearTimeout(ta.timer);
+    ta.buffer += char.toLowerCase();
+    ta.timer = setTimeout(resetTypeahead, 2000, ta);
+    const match = labels.findIndex(l => l.startsWith(ta.buffer));
+    if (match !== -1) onMatch(match);
   }
 
   // Esc while a field is focused: cancel the dialog.
@@ -592,316 +483,287 @@ function ElicitationFormDialog({
     () => {
       // For text fields, revert uncommitted changes first
       if (isEditingTextField && currentField) {
-        const val = formValues[currentField.name]
-        setTextInputValue(val !== undefined ? String(val) : '')
-        setTextInputCursorOffset(0)
+        const val = formValues[currentField.name];
+        setTextInputValue(val !== undefined ? String(val) : '');
+        setTextInputCursorOffset(0);
       }
-      onResponse('cancel')
+      onResponse('cancel');
     },
     {
       context: 'Settings',
       isActive: !!currentField && !focusedButton && !expandedAccordion,
     },
-  )
+  );
 
   useInput(
     (_input, key) => {
       // Text fields handle their own character input; we only intercept
       // navigation keys and backspace-on-empty here.
-      if (
-        isEditingTextField &&
-        !key.upArrow &&
-        !key.downArrow &&
-        !key.return &&
-        !key.backspace
-      ) {
-        return
+      if (isEditingTextField && !key.upArrow && !key.downArrow && !key.return && !key.backspace) {
+        return;
       }
 
       // Expanded multi-select accordion
-      if (
-        expandedAccordion &&
-        currentField &&
-        isMultiSelectEnumSchema(currentField.schema)
-      ) {
-        const msSchema = currentField.schema
-        const msValues = getMultiSelectValues(msSchema)
-        const selected = (formValues[currentField.name] as string[]) ?? []
+      if (expandedAccordion && currentField && isMultiSelectEnumSchema(currentField.schema)) {
+        const msSchema = currentField.schema;
+        const msValues = getMultiSelectValues(msSchema);
+        const selected = (formValues[currentField.name] as string[]) ?? [];
 
         if (key.leftArrow || key.escape) {
-          setExpandedAccordion(undefined)
-          validateMultiSelect(currentField.name, msSchema)
-          return
+          setExpandedAccordion(undefined);
+          validateMultiSelect(currentField.name, msSchema);
+          return;
         }
         if (key.upArrow) {
           if (accordionOptionIndex === 0) {
-            setExpandedAccordion(undefined)
-            validateMultiSelect(currentField.name, msSchema)
+            setExpandedAccordion(undefined);
+            validateMultiSelect(currentField.name, msSchema);
           } else {
-            setAccordionOptionIndex(accordionOptionIndex - 1)
+            setAccordionOptionIndex(accordionOptionIndex - 1);
           }
-          return
+          return;
         }
         if (key.downArrow) {
           if (accordionOptionIndex >= msValues.length - 1) {
-            setExpandedAccordion(undefined)
-            handleNavigation('down')
+            setExpandedAccordion(undefined);
+            handleNavigation('down');
           } else {
-            setAccordionOptionIndex(accordionOptionIndex + 1)
+            setAccordionOptionIndex(accordionOptionIndex + 1);
           }
-          return
+          return;
         }
         if (_input === ' ') {
-          const optionValue = msValues[accordionOptionIndex]
+          const optionValue = msValues[accordionOptionIndex];
           if (optionValue !== undefined) {
             const newSelected = selected.includes(optionValue)
               ? selected.filter(v => v !== optionValue)
-              : [...selected, optionValue]
-            const newValue = newSelected.length > 0 ? newSelected : undefined
-            setField(currentField.name, newValue)
-            const min = msSchema.minItems
-            const max = msSchema.maxItems
-            if (
-              min !== undefined &&
-              newSelected.length < min &&
-              (newSelected.length > 0 || currentField.isRequired)
-            ) {
-              updateValidationError(
-                currentField.name,
-                `Select at least ${min} ${plural(min, 'item')}`,
-              )
+              : [...selected, optionValue];
+            const newValue = newSelected.length > 0 ? newSelected : undefined;
+            setField(currentField.name, newValue);
+            const min = msSchema.minItems;
+            const max = msSchema.maxItems;
+            if (min !== undefined && newSelected.length < min && (newSelected.length > 0 || currentField.isRequired)) {
+              updateValidationError(currentField.name, `Select at least ${min} ${plural(min, 'item')}`);
             } else if (max !== undefined && newSelected.length > max) {
-              updateValidationError(
-                currentField.name,
-                `Select at most ${max} ${plural(max, 'item')}`,
-              )
+              updateValidationError(currentField.name, `Select at most ${max} ${plural(max, 'item')}`);
             } else {
-              updateValidationError(currentField.name)
+              updateValidationError(currentField.name);
             }
           }
-          return
+          return;
         }
         if (key.return) {
           // Check (not toggle) the focused item, then collapse and advance
-          const optionValue = msValues[accordionOptionIndex]
+          const optionValue = msValues[accordionOptionIndex];
           if (optionValue !== undefined && !selected.includes(optionValue)) {
-            setField(currentField.name, [...selected, optionValue])
+            setField(currentField.name, [...selected, optionValue]);
           }
-          setExpandedAccordion(undefined)
-          handleNavigation('down')
-          return
+          setExpandedAccordion(undefined);
+          handleNavigation('down');
+          return;
         }
         if (_input) {
-          const labels = msValues.map(v =>
-            getMultiSelectLabel(msSchema, v).toLowerCase(),
-          )
-          runTypeahead(_input, labels, setAccordionOptionIndex)
-          return
+          const labels = msValues.map(v => getMultiSelectLabel(msSchema, v).toLowerCase());
+          runTypeahead(_input, labels, setAccordionOptionIndex);
+          return;
         }
-        return
+        return;
       }
 
       // Expanded single-select enum accordion
-      if (
-        expandedAccordion &&
-        currentField &&
-        isEnumSchema(currentField.schema)
-      ) {
-        const enumSchema = currentField.schema
-        const enumValues = getEnumValues(enumSchema)
+      if (expandedAccordion && currentField && isEnumSchema(currentField.schema)) {
+        const enumSchema = currentField.schema;
+        const enumValues = getEnumValues(enumSchema);
 
         if (key.leftArrow || key.escape) {
-          setExpandedAccordion(undefined)
-          return
+          setExpandedAccordion(undefined);
+          return;
         }
         if (key.upArrow) {
           if (accordionOptionIndex === 0) {
-            setExpandedAccordion(undefined)
+            setExpandedAccordion(undefined);
           } else {
-            setAccordionOptionIndex(accordionOptionIndex - 1)
+            setAccordionOptionIndex(accordionOptionIndex - 1);
           }
-          return
+          return;
         }
         if (key.downArrow) {
           if (accordionOptionIndex >= enumValues.length - 1) {
-            setExpandedAccordion(undefined)
-            handleNavigation('down')
+            setExpandedAccordion(undefined);
+            handleNavigation('down');
           } else {
-            setAccordionOptionIndex(accordionOptionIndex + 1)
+            setAccordionOptionIndex(accordionOptionIndex + 1);
           }
-          return
+          return;
         }
         // Space: select and collapse
         if (_input === ' ') {
-          const optionValue = enumValues[accordionOptionIndex]
+          const optionValue = enumValues[accordionOptionIndex];
           if (optionValue !== undefined) {
-            setField(currentField.name, optionValue)
+            setField(currentField.name, optionValue);
           }
-          setExpandedAccordion(undefined)
-          return
+          setExpandedAccordion(undefined);
+          return;
         }
         // Enter: select, collapse, and move to next field
         if (key.return) {
-          const optionValue = enumValues[accordionOptionIndex]
+          const optionValue = enumValues[accordionOptionIndex];
           if (optionValue !== undefined) {
-            setField(currentField.name, optionValue)
+            setField(currentField.name, optionValue);
           }
-          setExpandedAccordion(undefined)
-          handleNavigation('down')
-          return
+          setExpandedAccordion(undefined);
+          handleNavigation('down');
+          return;
         }
         if (_input) {
-          const labels = enumValues.map(v =>
-            getEnumLabel(enumSchema, v).toLowerCase(),
-          )
-          runTypeahead(_input, labels, setAccordionOptionIndex)
-          return
+          const labels = enumValues.map(v => getEnumLabel(enumSchema, v).toLowerCase());
+          runTypeahead(_input, labels, setAccordionOptionIndex);
+          return;
         }
-        return
+        return;
       }
 
       // Accept / Decline buttons
       if (key.return && focusedButton === 'accept') {
         if (validateRequired() && Object.keys(validationErrors).length === 0) {
-          onResponse('accept', formValues)
+          onResponse('accept', formValues);
         } else {
           // Show "required" validation errors on missing fields
-          const requiredFields = requestedSchema.required || []
+          const requiredFields = requestedSchema.required || [];
           for (const fieldName of requiredFields) {
             if (formValues[fieldName] === undefined) {
-              updateValidationError(fieldName, 'This field is required')
+              updateValidationError(fieldName, 'This field is required');
             }
           }
           const firstBadIndex = schemaFields.findIndex(
             f =>
-              (requiredFields.includes(f.name) &&
-                formValues[f.name] === undefined) ||
+              (requiredFields.includes(f.name) && formValues[f.name] === undefined) ||
               validationErrors[f.name] !== undefined,
-          )
+          );
           if (firstBadIndex !== -1) {
-            setCurrentFieldIndex(firstBadIndex)
-            setFocusedButton(null)
-            syncTextInput(firstBadIndex)
+            setCurrentFieldIndex(firstBadIndex);
+            setFocusedButton(null);
+            syncTextInput(firstBadIndex);
           }
         }
-        return
+        return;
       }
 
       if (key.return && focusedButton === 'decline') {
-        onResponse('decline')
-        return
+        onResponse('decline');
+        return;
       }
 
       // Up/Down navigation
       if (key.upArrow || key.downArrow) {
         // Reset enum typeahead when leaving a field
-        const ta = enumTypeaheadRef.current
-        ta.buffer = ''
+        const ta = enumTypeaheadRef.current;
+        ta.buffer = '';
         if (ta.timer !== undefined) {
-          clearTimeout(ta.timer)
-          ta.timer = undefined
+          clearTimeout(ta.timer);
+          ta.timer = undefined;
         }
-        handleNavigation(key.upArrow ? 'up' : 'down')
-        return
+        handleNavigation(key.upArrow ? 'up' : 'down');
+        return;
       }
 
       // Left/Right to switch between Accept and Decline buttons
       if (focusedButton && (key.leftArrow || key.rightArrow)) {
-        setFocusedButton(focusedButton === 'accept' ? 'decline' : 'accept')
-        return
+        setFocusedButton(focusedButton === 'accept' ? 'decline' : 'accept');
+        return;
       }
 
-      if (!currentField) return
-      const { schema, name } = currentField
-      const value = formValues[name]
+      if (!currentField) return;
+      const { schema, name } = currentField;
+      const value = formValues[name];
 
       // Boolean: Space to toggle, Enter to move on
       if (schema.type === 'boolean') {
         if (_input === ' ') {
-          setField(name, value === undefined ? true : !value)
-          return
+          setField(name, value === undefined ? true : !value);
+          return;
         }
         if (key.return) {
-          handleNavigation('down')
-          return
+          handleNavigation('down');
+          return;
         }
         if (key.backspace && value !== undefined) {
-          unsetField(name)
-          return
+          unsetField(name);
+          return;
         }
         // y/n typeahead
         if (_input && !key.return) {
-          runTypeahead(_input, ['yes', 'no'], i => setField(name, i === 0))
-          return
+          runTypeahead(_input, ['yes', 'no'], i => setField(name, i === 0));
+          return;
         }
-        return
+        return;
       }
 
       // Enum or multi-select (collapsed) — accordion style
       if (isEnumSchema(schema) || isMultiSelectEnumSchema(schema)) {
         if (key.return) {
-          handleNavigation('down')
-          return
+          handleNavigation('down');
+          return;
         }
         if (key.backspace && value !== undefined) {
-          unsetField(name)
-          return
+          unsetField(name);
+          return;
         }
         // Compute option labels + initial focus index for rightArrow expand.
         // Single-select focuses on the current value; multi-select starts at 0.
-        let labels: string[]
-        let startIdx = 0
+        let labels: string[];
+        let startIdx = 0;
         if (isEnumSchema(schema)) {
-          const vals = getEnumValues(schema)
-          labels = vals.map(v => getEnumLabel(schema, v).toLowerCase())
+          const vals = getEnumValues(schema);
+          labels = vals.map(v => getEnumLabel(schema, v).toLowerCase());
           if (value !== undefined) {
-            startIdx = Math.max(0, vals.indexOf(value as string))
+            startIdx = Math.max(0, vals.indexOf(value as string));
           }
         } else {
-          const vals = getMultiSelectValues(schema)
-          labels = vals.map(v => getMultiSelectLabel(schema, v).toLowerCase())
+          const vals = getMultiSelectValues(schema);
+          labels = vals.map(v => getMultiSelectLabel(schema, v).toLowerCase());
         }
         if (key.rightArrow) {
-          setExpandedAccordion(name)
-          setAccordionOptionIndex(startIdx)
-          return
+          setExpandedAccordion(name);
+          setAccordionOptionIndex(startIdx);
+          return;
         }
         // Typeahead: expand and jump to matching option
         if (_input && !key.leftArrow) {
           runTypeahead(_input, labels, i => {
-            setExpandedAccordion(name)
-            setAccordionOptionIndex(i)
-          })
-          return
+            setExpandedAccordion(name);
+            setAccordionOptionIndex(i);
+          });
+          return;
         }
-        return
+        return;
       }
 
       // Backspace: text fields when empty
       if (key.backspace) {
         if (isEditingTextField && textInputValue === '') {
-          unsetField(name)
-          return
+          unsetField(name);
+          return;
         }
       }
 
       // Text field Enter is handled by TextInput's onSubmit
     },
     { isActive: true },
-  )
+  );
 
   function validateRequired(): boolean {
-    const requiredFields = requestedSchema.required || []
+    const requiredFields = requestedSchema.required || [];
     for (const fieldName of requiredFields) {
-      const value = formValues[fieldName]
+      const value = formValues[fieldName];
       if (value === undefined || value === null || value === '') {
-        return false
+        return false;
       }
       if (Array.isArray(value) && value.length === 0) {
-        return false
+        return false;
       }
     }
-    return true
+    return true;
   }
 
   // Scroll windowing: compute visible field range
@@ -913,32 +775,29 @@ function ElicitationFormDialog({
   // To generalize: track per-field height (3 for collapsed, N+3 for
   // expanded multi-select) and compute a pixel-budget window instead
   // of a simple item-count window.
-  const LINES_PER_FIELD = 3
-  const DIALOG_OVERHEAD = 14
-  const maxVisibleFields = Math.max(
-    2,
-    Math.floor((rows - DIALOG_OVERHEAD) / LINES_PER_FIELD),
-  )
+  const LINES_PER_FIELD = 3;
+  const DIALOG_OVERHEAD = 14;
+  const maxVisibleFields = Math.max(2, Math.floor((rows - DIALOG_OVERHEAD) / LINES_PER_FIELD));
 
   const scrollWindow = useMemo(() => {
-    const total = schemaFields.length
+    const total = schemaFields.length;
     if (total <= maxVisibleFields) {
-      return { start: 0, end: total }
+      return { start: 0, end: total };
     }
     // When buttons are focused (currentFieldIndex undefined), pin to end
-    const focusIdx = currentFieldIndex ?? total - 1
-    let start = Math.max(0, focusIdx - Math.floor(maxVisibleFields / 2))
-    const end = Math.min(start + maxVisibleFields, total)
+    const focusIdx = currentFieldIndex ?? total - 1;
+    let start = Math.max(0, focusIdx - Math.floor(maxVisibleFields / 2));
+    const end = Math.min(start + maxVisibleFields, total);
     // Adjust start if we hit the bottom
-    start = Math.max(0, end - maxVisibleFields)
-    return { start, end }
-  }, [schemaFields.length, maxVisibleFields, currentFieldIndex])
+    start = Math.max(0, end - maxVisibleFields);
+    return { start, end };
+  }, [schemaFields.length, maxVisibleFields, currentFieldIndex]);
 
-  const hasFieldsAbove = scrollWindow.start > 0
-  const hasFieldsBelow = scrollWindow.end < schemaFields.length
+  const hasFieldsAbove = scrollWindow.start > 0;
+  const hasFieldsBelow = scrollWindow.end < schemaFields.length;
 
   function renderFormFields(): React.ReactNode {
-    if (!schemaFields.length) return null
+    if (!schemaFields.length) return null;
 
     return (
       <Box flexDirection="column">
@@ -949,271 +808,237 @@ function ElicitationFormDialog({
             </Text>
           </Box>
         )}
-        {schemaFields
-          .slice(scrollWindow.start, scrollWindow.end)
-          .map((field, visibleIdx) => {
-            const index = scrollWindow.start + visibleIdx
-            const { name, schema, isRequired } = field
-            const isActive = index === currentFieldIndex && !focusedButton
-            const value = formValues[name]
-            const hasValue =
-              value !== undefined && (!Array.isArray(value) || value.length > 0)
-            const error = validationErrors[name]
+        {schemaFields.slice(scrollWindow.start, scrollWindow.end).map((field, visibleIdx) => {
+          const index = scrollWindow.start + visibleIdx;
+          const { name, schema, isRequired } = field;
+          const isActive = index === currentFieldIndex && !focusedButton;
+          const value = formValues[name];
+          const hasValue = value !== undefined && (!Array.isArray(value) || value.length > 0);
+          const error = validationErrors[name];
 
-            // Checkbox: spinner → ⚠ error → ✔ set → * required → space
-            const isResolving = resolvingFields.has(name)
-            const checkbox = isResolving ? (
-              <ResolvingSpinner />
-            ) : error ? (
-              <Text color="error">{figures.warning}</Text>
-            ) : hasValue ? (
-              <Text color="success" dimColor={!isActive}>
-                {figures.tick}
-              </Text>
-            ) : isRequired ? (
-              <Text color="error">*</Text>
-            ) : (
-              <Text> </Text>
-            )
+          // Checkbox: spinner → ⚠ error → ✔ set → * required → space
+          const isResolving = resolvingFields.has(name);
+          const checkbox = isResolving ? (
+            <ResolvingSpinner />
+          ) : error ? (
+            <Text color="error">{figures.warning}</Text>
+          ) : hasValue ? (
+            <Text color="success" dimColor={!isActive}>
+              {figures.tick}
+            </Text>
+          ) : isRequired ? (
+            <Text color="error">*</Text>
+          ) : (
+            <Text> </Text>
+          );
 
-            // Selection color matches field status
-            const selectionColor = error
-              ? 'error'
-              : hasValue
-                ? 'success'
-                : isRequired
-                  ? 'error'
-                  : 'suggestion'
+          // Selection color matches field status
+          const selectionColor = error ? 'error' : hasValue ? 'success' : isRequired ? 'error' : 'suggestion';
 
-            const activeColor = isActive ? selectionColor : undefined
+          const activeColor = isActive ? selectionColor : undefined;
 
-            const label = (
-              <Text color={activeColor} bold={isActive}>
-                {schema.title || name}
-              </Text>
-            )
+          const label = (
+            <Text color={activeColor} bold={isActive}>
+              {schema.title || name}
+            </Text>
+          );
 
-            // Render the value portion based on field type
-            let valueContent: React.ReactNode
-            let accordionContent: React.ReactNode = null
+          // Render the value portion based on field type
+          let valueContent: React.ReactNode;
+          let accordionContent: React.ReactNode = null;
 
-            if (isMultiSelectEnumSchema(schema)) {
-              const msValues = getMultiSelectValues(schema)
-              const selected = (value as string[] | undefined) ?? []
-              const isExpanded = expandedAccordion === name && isActive
+          if (isMultiSelectEnumSchema(schema)) {
+            const msValues = getMultiSelectValues(schema);
+            const selected = (value as string[] | undefined) ?? [];
+            const isExpanded = expandedAccordion === name && isActive;
 
-              if (isExpanded) {
-                valueContent = <Text dimColor>{figures.triangleDownSmall}</Text>
-                accordionContent = (
-                  <Box flexDirection="column" marginLeft={6}>
-                    {msValues.map((optVal, optIdx) => {
-                      const optLabel = getMultiSelectLabel(schema, optVal)
-                      const isChecked = selected.includes(optVal)
-                      const isFocused = optIdx === accordionOptionIndex
-                      return (
-                        <Box key={optVal} gap={1}>
-                          <Text color="suggestion">
-                            {isFocused ? figures.pointer : ' '}
-                          </Text>
-                          <Text color={isChecked ? 'success' : undefined}>
-                            {isChecked
-                              ? figures.checkboxOn
-                              : figures.checkboxOff}
-                          </Text>
-                          <Text
-                            color={isFocused ? 'suggestion' : undefined}
-                            bold={isFocused}
-                          >
-                            {optLabel}
-                          </Text>
-                        </Box>
-                      )
-                    })}
-                  </Box>
-                )
-              } else {
-                // Collapsed: ▸ arrow then comma-joined selected items
-                const arrow = isActive ? (
-                  <Text dimColor>{figures.triangleRightSmall} </Text>
-                ) : null
-                if (selected.length > 0) {
-                  const displayLabels = selected.map(v =>
-                    getMultiSelectLabel(schema, v),
-                  )
-                  valueContent = (
-                    <Text>
-                      {arrow}
-                      <Text color={activeColor} bold={isActive}>
-                        {displayLabels.join(', ')}
-                      </Text>
-                    </Text>
-                  )
-                } else {
-                  valueContent = (
-                    <Text>
-                      {arrow}
-                      <Text dimColor italic>
-                        not set
-                      </Text>
-                    </Text>
-                  )
-                }
-              }
-            } else if (isEnumSchema(schema)) {
-              const enumValues = getEnumValues(schema)
-              const isExpanded = expandedAccordion === name && isActive
-
-              if (isExpanded) {
-                valueContent = <Text dimColor>{figures.triangleDownSmall}</Text>
-                accordionContent = (
-                  <Box flexDirection="column" marginLeft={6}>
-                    {enumValues.map((optVal, optIdx) => {
-                      const optLabel = getEnumLabel(schema, optVal)
-                      const isSelected = value === optVal
-                      const isFocused = optIdx === accordionOptionIndex
-                      return (
-                        <Box key={optVal} gap={1}>
-                          <Text color="suggestion">
-                            {isFocused ? figures.pointer : ' '}
-                          </Text>
-                          <Text color={isSelected ? 'success' : undefined}>
-                            {isSelected ? figures.radioOn : figures.radioOff}
-                          </Text>
-                          <Text
-                            color={isFocused ? 'suggestion' : undefined}
-                            bold={isFocused}
-                          >
-                            {optLabel}
-                          </Text>
-                        </Box>
-                      )
-                    })}
-                  </Box>
-                )
-              } else {
-                // Collapsed: ▸ arrow then current value
-                const arrow = isActive ? (
-                  <Text dimColor>{figures.triangleRightSmall} </Text>
-                ) : null
-                if (hasValue) {
-                  valueContent = (
-                    <Text>
-                      {arrow}
-                      <Text color={activeColor} bold={isActive}>
-                        {getEnumLabel(schema, value as string)}
-                      </Text>
-                    </Text>
-                  )
-                } else {
-                  valueContent = (
-                    <Text>
-                      {arrow}
-                      <Text dimColor italic>
-                        not set
-                      </Text>
-                    </Text>
-                  )
-                }
-              }
-            } else if (schema.type === 'boolean') {
-              if (isActive) {
-                valueContent = hasValue ? (
-                  <Text color={activeColor} bold>
-                    {value ? figures.checkboxOn : figures.checkboxOff}
-                  </Text>
-                ) : (
-                  <Text dimColor>{figures.checkboxOff}</Text>
-                )
-              } else {
-                valueContent = hasValue ? (
-                  <Text>
-                    {value ? figures.checkboxOn : figures.checkboxOff}
-                  </Text>
-                ) : (
-                  <Text dimColor italic>
-                    not set
-                  </Text>
-                )
-              }
-            } else if (isTextField(schema)) {
-              if (isActive) {
+            if (isExpanded) {
+              valueContent = <Text dimColor>{figures.triangleDownSmall}</Text>;
+              accordionContent = (
+                <Box flexDirection="column" marginLeft={6}>
+                  {msValues.map((optVal, optIdx) => {
+                    const optLabel = getMultiSelectLabel(schema, optVal);
+                    const isChecked = selected.includes(optVal);
+                    const isFocused = optIdx === accordionOptionIndex;
+                    return (
+                      <Box key={optVal} gap={1}>
+                        <Text color="suggestion">{isFocused ? figures.pointer : ' '}</Text>
+                        <Text color={isChecked ? 'success' : undefined}>
+                          {isChecked ? figures.checkboxOn : figures.checkboxOff}
+                        </Text>
+                        <Text color={isFocused ? 'suggestion' : undefined} bold={isFocused}>
+                          {optLabel}
+                        </Text>
+                      </Box>
+                    );
+                  })}
+                </Box>
+              );
+            } else {
+              // Collapsed: ▸ arrow then comma-joined selected items
+              const arrow = isActive ? <Text dimColor>{figures.triangleRightSmall} </Text> : null;
+              if (selected.length > 0) {
+                const displayLabels = selected.map(v => getMultiSelectLabel(schema, v));
                 valueContent = (
-                  <TextInput
-                    value={textInputValue}
-                    onChange={handleTextInputChange}
-                    onSubmit={handleTextInputSubmit}
-                    placeholder={`Type something\u{2026}`}
-                    columns={Math.min(columns - 20, 60)}
-                    cursorOffset={textInputCursorOffset}
-                    onChangeCursorOffset={setTextInputCursorOffset}
-                    focus
-                    showCursor
-                  />
-                )
-              } else {
-                const displayValue =
-                  hasValue && isDateTimeSchema(schema)
-                    ? formatDateDisplay(String(value), schema)
-                    : String(value)
-                valueContent = hasValue ? (
-                  <Text>{displayValue}</Text>
-                ) : (
-                  <Text dimColor italic>
-                    not set
+                  <Text>
+                    {arrow}
+                    <Text color={activeColor} bold={isActive}>
+                      {displayLabels.join(', ')}
+                    </Text>
                   </Text>
-                )
+                );
+              } else {
+                valueContent = (
+                  <Text>
+                    {arrow}
+                    <Text dimColor italic>
+                      not set
+                    </Text>
+                  </Text>
+                );
               }
+            }
+          } else if (isEnumSchema(schema)) {
+            const enumValues = getEnumValues(schema);
+            const isExpanded = expandedAccordion === name && isActive;
+
+            if (isExpanded) {
+              valueContent = <Text dimColor>{figures.triangleDownSmall}</Text>;
+              accordionContent = (
+                <Box flexDirection="column" marginLeft={6}>
+                  {enumValues.map((optVal, optIdx) => {
+                    const optLabel = getEnumLabel(schema, optVal);
+                    const isSelected = value === optVal;
+                    const isFocused = optIdx === accordionOptionIndex;
+                    return (
+                      <Box key={optVal} gap={1}>
+                        <Text color="suggestion">{isFocused ? figures.pointer : ' '}</Text>
+                        <Text color={isSelected ? 'success' : undefined}>
+                          {isSelected ? figures.radioOn : figures.radioOff}
+                        </Text>
+                        <Text color={isFocused ? 'suggestion' : undefined} bold={isFocused}>
+                          {optLabel}
+                        </Text>
+                      </Box>
+                    );
+                  })}
+                </Box>
+              );
+            } else {
+              // Collapsed: ▸ arrow then current value
+              const arrow = isActive ? <Text dimColor>{figures.triangleRightSmall} </Text> : null;
+              if (hasValue) {
+                valueContent = (
+                  <Text>
+                    {arrow}
+                    <Text color={activeColor} bold={isActive}>
+                      {getEnumLabel(schema, value as string)}
+                    </Text>
+                  </Text>
+                );
+              } else {
+                valueContent = (
+                  <Text>
+                    {arrow}
+                    <Text dimColor italic>
+                      not set
+                    </Text>
+                  </Text>
+                );
+              }
+            }
+          } else if (schema.type === 'boolean') {
+            if (isActive) {
+              valueContent = hasValue ? (
+                <Text color={activeColor} bold>
+                  {value ? figures.checkboxOn : figures.checkboxOff}
+                </Text>
+              ) : (
+                <Text dimColor>{figures.checkboxOff}</Text>
+              );
             } else {
               valueContent = hasValue ? (
-                <Text>{String(value)}</Text>
+                <Text>{value ? figures.checkboxOn : figures.checkboxOff}</Text>
               ) : (
                 <Text dimColor italic>
                   not set
                 </Text>
-              )
+              );
             }
+          } else if (isTextField(schema)) {
+            if (isActive) {
+              valueContent = (
+                <TextInput
+                  value={textInputValue}
+                  onChange={handleTextInputChange}
+                  onSubmit={handleTextInputSubmit}
+                  placeholder={`Type something\u{2026}`}
+                  columns={Math.min(columns - 20, 60)}
+                  cursorOffset={textInputCursorOffset}
+                  onChangeCursorOffset={setTextInputCursorOffset}
+                  focus
+                  showCursor
+                />
+              );
+            } else {
+              const displayValue =
+                hasValue && isDateTimeSchema(schema) ? formatDateDisplay(String(value), schema) : String(value);
+              valueContent = hasValue ? (
+                <Text>{displayValue}</Text>
+              ) : (
+                <Text dimColor italic>
+                  not set
+                </Text>
+              );
+            }
+          } else {
+            valueContent = hasValue ? (
+              <Text>{String(value)}</Text>
+            ) : (
+              <Text dimColor italic>
+                not set
+              </Text>
+            );
+          }
 
-            return (
-              <Box key={name} flexDirection="column">
-                <Box gap={1}>
-                  <Text color={selectionColor}>
-                    {isActive ? figures.pointer : ' '}
-                  </Text>
-                  {checkbox}
-                  <Box>
-                    {label}
-                    <Text color={activeColor}>: </Text>
-                    {valueContent}
-                  </Box>
-                </Box>
-                {accordionContent}
-                {schema.description && (
-                  <Box marginLeft={6}>
-                    <Text dimColor>{schema.description}</Text>
-                  </Box>
-                )}
-                <Box marginLeft={6} height={1}>
-                  {error ? (
-                    <Text color="error" italic>
-                      {error}
-                    </Text>
-                  ) : (
-                    <Text> </Text>
-                  )}
+          return (
+            <Box key={name} flexDirection="column">
+              <Box gap={1}>
+                <Text color={selectionColor}>{isActive ? figures.pointer : ' '}</Text>
+                {checkbox}
+                <Box>
+                  {label}
+                  <Text color={activeColor}>: </Text>
+                  {valueContent}
                 </Box>
               </Box>
-            )
-          })}
+              {accordionContent}
+              {schema.description && (
+                <Box marginLeft={6}>
+                  <Text dimColor>{schema.description}</Text>
+                </Box>
+              )}
+              <Box marginLeft={6} height={1}>
+                {error ? (
+                  <Text color="error" italic>
+                    {error}
+                  </Text>
+                ) : (
+                  <Text> </Text>
+                )}
+              </Box>
+            </Box>
+          );
+        })}
         {hasFieldsBelow && (
           <Box marginLeft={2}>
             <Text dimColor>
-              {figures.arrowDown} {schemaFields.length - scrollWindow.end} more
-              below
+              {figures.arrowDown} {schemaFields.length - scrollWindow.end} more below
             </Text>
           </Box>
         )}
       </Box>
-    )
+    );
   }
 
   return (
@@ -1228,16 +1053,9 @@ function ElicitationFormDialog({
           <Text>Press {exitState.keyName} again to exit</Text>
         ) : (
           <Byline>
-            <ConfigurableShortcutHint
-              action="confirm:no"
-              context="Confirmation"
-              fallback="Esc"
-              description="cancel"
-            />
+            <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="cancel" />
             <KeyboardShortcutHint shortcut="↑↓" action="navigate" />
-            {currentField && (
-              <KeyboardShortcutHint shortcut="Backspace" action="unset" />
-            )}
+            {currentField && <KeyboardShortcutHint shortcut="Backspace" action="unset" />}
             {currentField && currentField.schema.type === 'boolean' && (
               <KeyboardShortcutHint shortcut="Space" action="toggle" />
             )}
@@ -1262,9 +1080,7 @@ function ElicitationFormDialog({
       <Box flexDirection="column">
         {renderFormFields()}
         <Box>
-          <Text color="success">
-            {focusedButton === 'accept' ? figures.pointer : ' '}
-          </Text>
+          <Text color="success">{focusedButton === 'accept' ? figures.pointer : ' '}</Text>
           <Text
             bold={focusedButton === 'accept'}
             color={focusedButton === 'accept' ? 'success' : undefined}
@@ -1272,9 +1088,7 @@ function ElicitationFormDialog({
           >
             {' Accept  '}
           </Text>
-          <Text color="error">
-            {focusedButton === 'decline' ? figures.pointer : ' '}
-          </Text>
+          <Text color="error">{focusedButton === 'decline' ? figures.pointer : ' '}</Text>
           <Text
             bold={focusedButton === 'decline'}
             color={focusedButton === 'decline' ? 'error' : undefined}
@@ -1285,7 +1099,7 @@ function ElicitationFormDialog({
         </Box>
       </Box>
     </Dialog>
-  )
+  );
 }
 
 function ElicitationURLDialog({
@@ -1293,120 +1107,111 @@ function ElicitationURLDialog({
   onResponse,
   onWaitingDismiss,
 }: {
-  event: ElicitationRequestEvent
-  onResponse: Props['onResponse']
-  onWaitingDismiss: Props['onWaitingDismiss']
+  event: ElicitationRequestEvent;
+  onResponse: Props['onResponse'];
+  onWaitingDismiss: Props['onWaitingDismiss'];
 }): React.ReactNode {
-  const { serverName, signal, waitingState } = event
-  const urlParams = event.params as ElicitRequestURLParams
-  const { message, url } = urlParams
-  const [phase, setPhase] = useState<'prompt' | 'waiting'>('prompt')
-  const phaseRef = useRef<'prompt' | 'waiting'>('prompt')
-  const [focusedButton, setFocusedButton] = useState<
-    'accept' | 'decline' | 'open' | 'action' | 'cancel'
-  >('accept')
-  const showCancel = waitingState?.showCancel ?? false
+  const { serverName, signal, waitingState } = event;
+  const urlParams = event.params as ElicitRequestURLParams;
+  const { message, url } = urlParams;
+  const [phase, setPhase] = useState<'prompt' | 'waiting'>('prompt');
+  const phaseRef = useRef<'prompt' | 'waiting'>('prompt');
+  const [focusedButton, setFocusedButton] = useState<'accept' | 'decline' | 'open' | 'action' | 'cancel'>('accept');
+  const showCancel = waitingState?.showCancel ?? false;
 
-  useNotifyAfterTimeout(
-    'Claude Code needs your input',
-    'elicitation_url_dialog',
-  )
-  useRegisterOverlay('elicitation-url')
+  useNotifyAfterTimeout('Claude Code needs your input', 'elicitation_url_dialog');
+  useRegisterOverlay('elicitation-url');
 
   // Keep refs in sync for use in abort handler (avoids re-registering listener)
-  phaseRef.current = phase
-  const onWaitingDismissRef = useRef(onWaitingDismiss)
-  onWaitingDismissRef.current = onWaitingDismiss
+  phaseRef.current = phase;
+  const onWaitingDismissRef = useRef(onWaitingDismiss);
+  onWaitingDismissRef.current = onWaitingDismiss;
 
   useEffect(() => {
     const handleAbort = () => {
       if (phaseRef.current === 'waiting') {
-        onWaitingDismissRef.current?.('cancel')
+        onWaitingDismissRef.current?.('cancel');
       } else {
-        onResponse('cancel')
+        onResponse('cancel');
       }
-    }
+    };
     if (signal.aborted) {
-      handleAbort()
-      return
+      handleAbort();
+      return;
     }
-    signal.addEventListener('abort', handleAbort)
-    return () => signal.removeEventListener('abort', handleAbort)
-  }, [signal, onResponse])
+    signal.addEventListener('abort', handleAbort);
+    return () => signal.removeEventListener('abort', handleAbort);
+  }, [signal, onResponse]);
 
   // Parse URL to highlight the domain
-  let domain = ''
-  let urlBeforeDomain = ''
-  let urlAfterDomain = ''
+  let domain = '';
+  let urlBeforeDomain = '';
+  let urlAfterDomain = '';
   try {
-    const parsed = new URL(url)
-    domain = parsed.hostname
-    const domainStart = url.indexOf(domain)
-    urlBeforeDomain = url.slice(0, domainStart)
-    urlAfterDomain = url.slice(domainStart + domain.length)
+    const parsed = new URL(url);
+    domain = parsed.hostname;
+    const domainStart = url.indexOf(domain);
+    urlBeforeDomain = url.slice(0, domainStart);
+    urlAfterDomain = url.slice(domainStart + domain.length);
   } catch {
-    domain = url
+    domain = url;
   }
 
   // Auto-dismiss when the server sends a completion notification (sets completed flag)
   useEffect(() => {
     if (phase === 'waiting' && event.completed) {
-      onWaitingDismiss?.(showCancel ? 'retry' : 'dismiss')
+      onWaitingDismiss?.(showCancel ? 'retry' : 'dismiss');
     }
-  }, [phase, event.completed, onWaitingDismiss, showCancel])
+  }, [phase, event.completed, onWaitingDismiss, showCancel]);
 
   const handleAccept = useCallback(() => {
-    void openBrowser(url)
-    onResponse('accept')
-    setPhase('waiting')
-    phaseRef.current = 'waiting'
-    setFocusedButton('open')
-  }, [onResponse, url])
+    void openBrowser(url);
+    onResponse('accept');
+    setPhase('waiting');
+    phaseRef.current = 'waiting';
+    setFocusedButton('open');
+  }, [onResponse, url]);
 
   // eslint-disable-next-line custom-rules/prefer-use-keybindings -- raw input for button navigation
   useInput((_input, key) => {
     if (phase === 'prompt') {
       if (key.leftArrow || key.rightArrow) {
-        setFocusedButton(prev => (prev === 'accept' ? 'decline' : 'accept'))
-        return
+        setFocusedButton(prev => (prev === 'accept' ? 'decline' : 'accept'));
+        return;
       }
       if (key.return) {
         if (focusedButton === 'accept') {
-          handleAccept()
+          handleAccept();
         } else {
-          onResponse('decline')
+          onResponse('decline');
         }
       }
     } else {
       // waiting phase — cycle through buttons
-      type ButtonName = 'accept' | 'decline' | 'open' | 'action' | 'cancel'
-      const waitingButtons: readonly ButtonName[] = showCancel
-        ? ['open', 'action', 'cancel']
-        : ['open', 'action']
+      type ButtonName = 'accept' | 'decline' | 'open' | 'action' | 'cancel';
+      const waitingButtons: readonly ButtonName[] = showCancel ? ['open', 'action', 'cancel'] : ['open', 'action'];
       if (key.leftArrow || key.rightArrow) {
         setFocusedButton(prev => {
-          const idx = waitingButtons.indexOf(prev)
-          const delta = key.rightArrow ? 1 : -1
-          return waitingButtons[
-            (idx + delta + waitingButtons.length) % waitingButtons.length
-          ]!
-        })
-        return
+          const idx = waitingButtons.indexOf(prev);
+          const delta = key.rightArrow ? 1 : -1;
+          return waitingButtons[(idx + delta + waitingButtons.length) % waitingButtons.length]!;
+        });
+        return;
       }
       if (key.return) {
         if (focusedButton === 'open') {
-          void openBrowser(url)
+          void openBrowser(url);
         } else if (focusedButton === 'cancel') {
-          onWaitingDismiss?.('cancel')
+          onWaitingDismiss?.('cancel');
         } else {
-          onWaitingDismiss?.(showCancel ? 'retry' : 'dismiss')
+          onWaitingDismiss?.(showCancel ? 'retry' : 'dismiss');
         }
       }
     }
-  })
+  });
 
   if (phase === 'waiting') {
-    const actionLabel = waitingState?.actionLabel ?? 'Continue without waiting'
+    const actionLabel = waitingState?.actionLabel ?? 'Continue without waiting';
     return (
       <Dialog
         title={`MCP server \u201c${serverName}\u201d \u2014 waiting for completion`}
@@ -1444,9 +1249,7 @@ function ElicitationURLDialog({
             </Text>
           </Box>
           <Box>
-            <Text color="success">
-              {focusedButton === 'open' ? figures.pointer : ' '}
-            </Text>
+            <Text color="success">{focusedButton === 'open' ? figures.pointer : ' '}</Text>
             <Text
               bold={focusedButton === 'open'}
               color={focusedButton === 'open' ? 'success' : undefined}
@@ -1454,9 +1257,7 @@ function ElicitationURLDialog({
             >
               {' Reopen URL  '}
             </Text>
-            <Text color="success">
-              {focusedButton === 'action' ? figures.pointer : ' '}
-            </Text>
+            <Text color="success">{focusedButton === 'action' ? figures.pointer : ' '}</Text>
             <Text
               bold={focusedButton === 'action'}
               color={focusedButton === 'action' ? 'success' : undefined}
@@ -1467,9 +1268,7 @@ function ElicitationURLDialog({
             {showCancel && (
               <>
                 <Text> </Text>
-                <Text color="error">
-                  {focusedButton === 'cancel' ? figures.pointer : ' '}
-                </Text>
+                <Text color="error">{focusedButton === 'cancel' ? figures.pointer : ' '}</Text>
                 <Text
                   bold={focusedButton === 'cancel'}
                   color={focusedButton === 'cancel' ? 'error' : undefined}
@@ -1482,7 +1281,7 @@ function ElicitationURLDialog({
           </Box>
         </Box>
       </Dialog>
-    )
+    );
   }
 
   return (
@@ -1497,12 +1296,7 @@ function ElicitationURLDialog({
           <Text>Press {exitState.keyName} again to exit</Text>
         ) : (
           <Byline>
-            <ConfigurableShortcutHint
-              action="confirm:no"
-              context="Confirmation"
-              fallback="Esc"
-              description="cancel"
-            />
+            <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="cancel" />
             <KeyboardShortcutHint shortcut="\u2190\u2192" action="switch" />
           </Byline>
         )
@@ -1517,9 +1311,7 @@ function ElicitationURLDialog({
           </Text>
         </Box>
         <Box>
-          <Text color="success">
-            {focusedButton === 'accept' ? figures.pointer : ' '}
-          </Text>
+          <Text color="success">{focusedButton === 'accept' ? figures.pointer : ' '}</Text>
           <Text
             bold={focusedButton === 'accept'}
             color={focusedButton === 'accept' ? 'success' : undefined}
@@ -1527,9 +1319,7 @@ function ElicitationURLDialog({
           >
             {' Accept  '}
           </Text>
-          <Text color="error">
-            {focusedButton === 'decline' ? figures.pointer : ' '}
-          </Text>
+          <Text color="error">{focusedButton === 'decline' ? figures.pointer : ' '}</Text>
           <Text
             bold={focusedButton === 'decline'}
             color={focusedButton === 'decline' ? 'error' : undefined}
@@ -1540,5 +1330,5 @@ function ElicitationURLDialog({
         </Box>
       </Box>
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/mcp/MCPAgentServerMenu.tsx b/src/components/mcp/MCPAgentServerMenu.tsx
index 913dee9bb..190dbbb85 100644
--- a/src/components/mcp/MCPAgentServerMenu.tsx
+++ b/src/components/mcp/MCPAgentServerMenu.tsx
@@ -1,106 +1,86 @@
-import figures from 'figures'
-import React, { useCallback, useEffect, useRef, useState } from 'react'
-import type { CommandResultDisplay } from '../../commands.js'
-import { Box, color, Link, Text, useTheme } from '@anthropic/ink'
-import { useKeybinding } from '../../keybindings/useKeybinding.js'
-import {
-  AuthenticationCancelledError,
-  performMCPOAuthFlow,
-} from '../../services/mcp/auth.js'
-import { capitalize } from '../../utils/stringUtils.js'
-import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js'
-import { Select } from '../CustomSelect/index.js'
-import { Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink'
-import { Spinner } from '../Spinner.js'
-import type { AgentMcpServerInfo } from './types.js'
+import figures from 'figures';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import type { CommandResultDisplay } from '../../commands.js';
+import { Box, color, Link, Text, useTheme } from '@anthropic/ink';
+import { useKeybinding } from '../../keybindings/useKeybinding.js';
+import { AuthenticationCancelledError, performMCPOAuthFlow } from '../../services/mcp/auth.js';
+import { capitalize } from '../../utils/stringUtils.js';
+import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js';
+import { Select } from '../CustomSelect/index.js';
+import { Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink';
+import { Spinner } from '../Spinner.js';
+import type { AgentMcpServerInfo } from './types.js';
 
 type Props = {
-  agentServer: AgentMcpServerInfo
-  onCancel: () => void
-  onComplete?: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-}
+  agentServer: AgentMcpServerInfo;
+  onCancel: () => void;
+  onComplete?: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+};
 
 /**
  * Menu for agent-specific MCP servers.
  * These servers are defined in agent frontmatter and only connect when the agent runs.
  * For HTTP/SSE servers, this allows pre-authentication before using the agent.
  */
-export function MCPAgentServerMenu({
-  agentServer,
-  onCancel,
-  onComplete,
-}: Props): React.ReactNode {
-  const [theme] = useTheme()
-  const [isAuthenticating, setIsAuthenticating] = useState(false)
-  const [error, setError] = useState<string | null>(null)
-  const [authorizationUrl, setAuthorizationUrl] = useState<string | null>(null)
-  const authAbortControllerRef = useRef<AbortController | null>(null)
+export function MCPAgentServerMenu({ agentServer, onCancel, onComplete }: Props): React.ReactNode {
+  const [theme] = useTheme();
+  const [isAuthenticating, setIsAuthenticating] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const [authorizationUrl, setAuthorizationUrl] = useState<string | null>(null);
+  const authAbortControllerRef = useRef<AbortController | null>(null);
 
   // Abort OAuth flow on unmount so the callback server is closed even if a
   // parent component's Esc handler navigates away before ours fires.
-  useEffect(() => () => authAbortControllerRef.current?.abort(), [])
+  useEffect(() => () => authAbortControllerRef.current?.abort(), []);
 
   // Handle ESC to cancel authentication flow
   const handleEscCancel = useCallback(() => {
     if (isAuthenticating) {
-      authAbortControllerRef.current?.abort()
-      authAbortControllerRef.current = null
-      setIsAuthenticating(false)
-      setAuthorizationUrl(null)
+      authAbortControllerRef.current?.abort();
+      authAbortControllerRef.current = null;
+      setIsAuthenticating(false);
+      setAuthorizationUrl(null);
     }
-  }, [isAuthenticating])
+  }, [isAuthenticating]);
 
   useKeybinding('confirm:no', handleEscCancel, {
     context: 'Confirmation',
     isActive: isAuthenticating,
-  })
+  });
 
   const handleAuthenticate = useCallback(async () => {
     if (!agentServer.needsAuth || !agentServer.url) {
-      return
+      return;
     }
 
-    setIsAuthenticating(true)
-    setError(null)
+    setIsAuthenticating(true);
+    setError(null);
 
-    const controller = new AbortController()
-    authAbortControllerRef.current = controller
+    const controller = new AbortController();
+    authAbortControllerRef.current = controller;
 
     try {
       // Create a temporary config for OAuth
       const tempConfig = {
         type: agentServer.transport as 'http' | 'sse',
         url: agentServer.url,
-      }
+      };
 
-      await performMCPOAuthFlow(
-        agentServer.name,
-        tempConfig,
-        setAuthorizationUrl,
-        controller.signal,
-      )
+      await performMCPOAuthFlow(agentServer.name, tempConfig, setAuthorizationUrl, controller.signal);
 
-      onComplete?.(
-        `Authentication successful for ${agentServer.name}. The server will connect when the agent runs.`,
-      )
+      onComplete?.(`Authentication successful for ${agentServer.name}. The server will connect when the agent runs.`);
     } catch (err) {
       // Don't show error if it was a cancellation
-      if (
-        err instanceof Error &&
-        !(err instanceof AuthenticationCancelledError)
-      ) {
-        setError(err.message)
+      if (err instanceof Error && !(err instanceof AuthenticationCancelledError)) {
+        setError(err.message);
       }
     } finally {
-      setIsAuthenticating(false)
-      authAbortControllerRef.current = null
+      setIsAuthenticating(false);
+      authAbortControllerRef.current = null;
     }
-  }, [agentServer, onComplete])
+  }, [agentServer, onComplete]);
 
-  const capitalizedServerName = capitalize(String(agentServer.name))
+  const capitalizedServerName = capitalize(String(agentServer.name));
 
   if (isAuthenticating) {
     return (
@@ -112,42 +92,34 @@ export function MCPAgentServerMenu({
         </Box>
         {authorizationUrl && (
           <Box flexDirection="column">
-            <Text dimColor>
-              If your browser doesn&apos;t open automatically, copy this URL
-              manually:
-            </Text>
+            <Text dimColor>If your browser doesn&apos;t open automatically, copy this URL manually:</Text>
             <Link url={authorizationUrl} />
           </Box>
         )}
         <Box marginLeft={3}>
           <Text dimColor>
             Return here after authenticating in your browser.{' '}
-            <ConfigurableShortcutHint
-              action="confirm:no"
-              context="Confirmation"
-              fallback="Esc"
-              description="go back"
-            />
+            <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="go back" />
           </Text>
         </Box>
       </Box>
-    )
+    );
   }
 
-  const menuOptions = []
+  const menuOptions = [];
 
   // Only show authenticate option for HTTP/SSE servers
   if (agentServer.needsAuth) {
     menuOptions.push({
       label: agentServer.isAuthenticated ? 'Re-authenticate' : 'Authenticate',
       value: 'auth',
-    })
+    });
   }
 
   menuOptions.push({
     label: 'Back',
     value: 'back',
-  })
+  });
 
   return (
     <Dialog
@@ -161,12 +133,7 @@ export function MCPAgentServerMenu({
           <Byline>
             <KeyboardShortcutHint shortcut="↑↓" action="navigate" />
             <KeyboardShortcutHint shortcut="Enter" action="confirm" />
-            <ConfigurableShortcutHint
-              action="confirm:no"
-              context="Confirmation"
-              fallback="Esc"
-              description="go back"
-            />
+            <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="go back" />
           </Byline>
         )
       }
@@ -198,10 +165,7 @@ export function MCPAgentServerMenu({
 
         <Box marginTop={1}>
           <Text bold>Status: </Text>
-          <Text>
-            {color('inactive', theme)(figures.radioOff)} not connected
-            (agent-only)
-          </Text>
+          <Text>{color('inactive', theme)(figures.radioOff)} not connected (agent-only)</Text>
         </Box>
 
         {agentServer.needsAuth && (
@@ -210,10 +174,7 @@ export function MCPAgentServerMenu({
             {agentServer.isAuthenticated ? (
               <Text>{color('success', theme)(figures.tick)} authenticated</Text>
             ) : (
-              <Text>
-                {color('warning', theme)(figures.triangleUpOutline)} may need
-                authentication
-              </Text>
+              <Text>{color('warning', theme)(figures.triangleUpOutline)} may need authentication</Text>
             )}
           </Box>
         )}
@@ -235,16 +196,16 @@ export function MCPAgentServerMenu({
           onChange={async value => {
             switch (value) {
               case 'auth':
-                await handleAuthenticate()
-                break
+                await handleAuthenticate();
+                break;
               case 'back':
-                onCancel()
-                break
+                onCancel();
+                break;
             }
           }}
           onCancel={onCancel}
         />
       </Box>
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/mcp/MCPListPanel.tsx b/src/components/mcp/MCPListPanel.tsx
index 365599284..4902e51c7 100644
--- a/src/components/mcp/MCPListPanel.tsx
+++ b/src/components/mcp/MCPListPanel.tsx
@@ -1,72 +1,67 @@
-import figures from 'figures'
-import React, { useCallback, useState } from 'react'
-import type { CommandResultDisplay } from '../../commands.js'
-import { Box, color, Link, Text, useTheme } from '@anthropic/ink'
-import { useKeybindings } from '../../keybindings/useKeybinding.js'
-import type { ConfigScope } from '../../services/mcp/types.js'
-import { describeMcpConfigFilePath } from '../../services/mcp/utils.js'
-import { isDebugMode } from '../../utils/debug.js'
-import { plural } from '../../utils/stringUtils.js'
-import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js'
-import { Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink'
-import { McpParsingWarnings } from './McpParsingWarnings.js'
-import type { AgentMcpServerInfo, ServerInfo } from './types.js'
+import figures from 'figures';
+import React, { useCallback, useState } from 'react';
+import type { CommandResultDisplay } from '../../commands.js';
+import { Box, color, Link, Text, useTheme } from '@anthropic/ink';
+import { useKeybindings } from '../../keybindings/useKeybinding.js';
+import type { ConfigScope } from '../../services/mcp/types.js';
+import { describeMcpConfigFilePath } from '../../services/mcp/utils.js';
+import { isDebugMode } from '../../utils/debug.js';
+import { plural } from '../../utils/stringUtils.js';
+import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js';
+import { Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink';
+import { McpParsingWarnings } from './McpParsingWarnings.js';
+import type { AgentMcpServerInfo, ServerInfo } from './types.js';
 
 type Props = {
-  servers: ServerInfo[]
-  agentServers?: AgentMcpServerInfo[]
-  onSelectServer: (server: ServerInfo) => void
-  onSelectAgentServer?: (agentServer: AgentMcpServerInfo) => void
-  onComplete: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-  defaultTab?: string
-}
+  servers: ServerInfo[];
+  agentServers?: AgentMcpServerInfo[];
+  onSelectServer: (server: ServerInfo) => void;
+  onSelectAgentServer?: (agentServer: AgentMcpServerInfo) => void;
+  onComplete: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+  defaultTab?: string;
+};
 
 type SelectableItem =
   | { type: 'server'; server: ServerInfo }
-  | { type: 'agent-server'; agentServer: AgentMcpServerInfo }
+  | { type: 'agent-server'; agentServer: AgentMcpServerInfo };
 
 // Define scope order for display (constant, outside component)
 // 'dynamic' (built-in) is rendered separately at the end
-const SCOPE_ORDER: ConfigScope[] = ['project', 'local', 'user', 'enterprise']
+const SCOPE_ORDER: ConfigScope[] = ['project', 'local', 'user', 'enterprise'];
 
 // Get scope heading parts (label is bold, path is grey)
 function getScopeHeading(scope: ConfigScope): { label: string; path?: string } {
   switch (scope) {
     case 'project':
-      return { label: 'Project MCPs', path: describeMcpConfigFilePath(scope) }
+      return { label: 'Project MCPs', path: describeMcpConfigFilePath(scope) };
     case 'user':
-      return { label: 'User MCPs', path: describeMcpConfigFilePath(scope) }
+      return { label: 'User MCPs', path: describeMcpConfigFilePath(scope) };
     case 'local':
-      return { label: 'Local MCPs', path: describeMcpConfigFilePath(scope) }
+      return { label: 'Local MCPs', path: describeMcpConfigFilePath(scope) };
     case 'enterprise':
-      return { label: 'Enterprise MCPs' }
+      return { label: 'Enterprise MCPs' };
     case 'dynamic':
-      return { label: 'Built-in MCPs', path: 'always available' }
+      return { label: 'Built-in MCPs', path: 'always available' };
     default:
-      return { label: scope }
+      return { label: scope };
   }
 }
 
 // Group servers by scope
-function groupServersByScope(
-  serverList: ServerInfo[],
-): Map<ConfigScope, ServerInfo[]> {
-  const groups = new Map<ConfigScope, ServerInfo[]>()
+function groupServersByScope(serverList: ServerInfo[]): Map<ConfigScope, ServerInfo[]> {
+  const groups = new Map<ConfigScope, ServerInfo[]>();
   for (const server of serverList) {
-    const scope = server.scope
+    const scope = server.scope;
     if (!groups.has(scope)) {
-      groups.set(scope, [])
+      groups.set(scope, []);
     }
-    groups.get(scope)!.push(server)
+    groups.get(scope)!.push(server);
   }
   // Sort servers within each group alphabetically
   for (const [, groupServers] of groups) {
-    groupServers.sort((a, b) => a.name.localeCompare(b.name))
+    groupServers.sort((a, b) => a.name.localeCompare(b.name));
   }
-  return groups
+  return groups;
 }
 
 export function MCPListPanel({
@@ -76,177 +71,151 @@ export function MCPListPanel({
   onSelectAgentServer,
   onComplete,
 }: Props): React.ReactNode {
-  const [theme] = useTheme()
-  const [selectedIndex, setSelectedIndex] = useState(0)
+  const [theme] = useTheme();
+  const [selectedIndex, setSelectedIndex] = useState(0);
 
   // Non-claudeai servers grouped by scope
   const serversByScope = React.useMemo(() => {
-    const regularServers = servers.filter(
-      s => s.client.config.type !== 'claudeai-proxy',
-    )
-    return groupServersByScope(regularServers)
-  }, [servers])
+    const regularServers = servers.filter(s => s.client.config.type !== 'claudeai-proxy');
+    return groupServersByScope(regularServers);
+  }, [servers]);
 
   const claudeAiServers = React.useMemo(
-    () =>
-      servers
-        .filter(s => s.client.config.type === 'claudeai-proxy')
-        .sort((a, b) => a.name.localeCompare(b.name)),
+    () => servers.filter(s => s.client.config.type === 'claudeai-proxy').sort((a, b) => a.name.localeCompare(b.name)),
     [servers],
-  )
+  );
 
   // Built-in (dynamic) servers - rendered last
   const dynamicServers = React.useMemo(
-    () =>
-      (serversByScope.get('dynamic') ?? []).sort((a, b) =>
-        a.name.localeCompare(b.name),
-      ),
+    () => (serversByScope.get('dynamic') ?? []).sort((a, b) => a.name.localeCompare(b.name)),
     [serversByScope],
-  )
+  );
 
   // Pre-compute dynamic heading for render
-  const dynamicHeading = getScopeHeading('dynamic')
+  const dynamicHeading = getScopeHeading('dynamic');
 
   // Build flat list of selectable items in display order
   const selectableItems = React.useMemo(() => {
-    const items: SelectableItem[] = []
+    const items: SelectableItem[] = [];
     for (const scope of SCOPE_ORDER) {
-      const scopeServers = serversByScope.get(scope) ?? []
+      const scopeServers = serversByScope.get(scope) ?? [];
       for (const server of scopeServers) {
-        items.push({ type: 'server', server })
+        items.push({ type: 'server', server });
       }
     }
     for (const server of claudeAiServers) {
-      items.push({ type: 'server', server })
+      items.push({ type: 'server', server });
     }
     for (const agentServer of agentServers) {
-      items.push({ type: 'agent-server', agentServer })
+      items.push({ type: 'agent-server', agentServer });
     }
     // Dynamic (built-in) servers come last
     for (const server of dynamicServers) {
-      items.push({ type: 'server', server })
+      items.push({ type: 'server', server });
     }
-    return items
-  }, [serversByScope, claudeAiServers, agentServers, dynamicServers])
+    return items;
+  }, [serversByScope, claudeAiServers, agentServers, dynamicServers]);
 
   const handleCancel = useCallback((): void => {
     onComplete('MCP dialog dismissed', {
       display: 'system',
-    })
-  }, [onComplete])
+    });
+  }, [onComplete]);
 
   const handleSelect = useCallback((): void => {
-    const item = selectableItems[selectedIndex]
-    if (!item) return
+    const item = selectableItems[selectedIndex];
+    if (!item) return;
     if (item.type === 'server') {
-      onSelectServer(item.server)
+      onSelectServer(item.server);
     } else if (item.type === 'agent-server' && onSelectAgentServer) {
-      onSelectAgentServer(item.agentServer)
+      onSelectAgentServer(item.agentServer);
     }
-  }, [selectableItems, selectedIndex, onSelectServer, onSelectAgentServer])
+  }, [selectableItems, selectedIndex, onSelectServer, onSelectAgentServer]);
 
   // Use configurable keybindings for navigation and selection
   useKeybindings(
     {
-      'confirm:previous': () =>
-        setSelectedIndex(prev =>
-          prev === 0 ? selectableItems.length - 1 : prev - 1,
-        ),
-      'confirm:next': () =>
-        setSelectedIndex(prev =>
-          prev === selectableItems.length - 1 ? 0 : prev + 1,
-        ),
+      'confirm:previous': () => setSelectedIndex(prev => (prev === 0 ? selectableItems.length - 1 : prev - 1)),
+      'confirm:next': () => setSelectedIndex(prev => (prev === selectableItems.length - 1 ? 0 : prev + 1)),
       'confirm:yes': handleSelect,
       'confirm:no': handleCancel,
     },
     { context: 'Confirmation' },
-  )
+  );
 
   // Build index lookup for each server
   const getServerIndex = (server: ServerInfo): number => {
-    return selectableItems.findIndex(
-      item => item.type === 'server' && item.server === server,
-    )
-  }
+    return selectableItems.findIndex(item => item.type === 'server' && item.server === server);
+  };
 
   const getAgentServerIndex = (agentServer: AgentMcpServerInfo): number => {
-    return selectableItems.findIndex(
-      item => item.type === 'agent-server' && item.agentServer === agentServer,
-    )
-  }
+    return selectableItems.findIndex(item => item.type === 'agent-server' && item.agentServer === agentServer);
+  };
 
-  const debugMode = isDebugMode()
-  const hasFailedClients = servers.some(s => s.client.type === 'failed')
+  const debugMode = isDebugMode();
+  const hasFailedClients = servers.some(s => s.client.type === 'failed');
 
   if (servers.length === 0 && agentServers.length === 0) {
-    return null
+    return null;
   }
 
   const renderServerItem = (server: ServerInfo): React.ReactNode => {
-    const index = getServerIndex(server)
-    const isSelected = selectedIndex === index
-    let statusIcon = ''
-    let statusText = ''
+    const index = getServerIndex(server);
+    const isSelected = selectedIndex === index;
+    let statusIcon = '';
+    let statusText = '';
 
     if (server.client.type === 'disabled') {
-      statusIcon = color('inactive', theme)(figures.radioOff)
-      statusText = 'disabled'
+      statusIcon = color('inactive', theme)(figures.radioOff);
+      statusText = 'disabled';
     } else if (server.client.type === 'connected') {
-      statusIcon = color('success', theme)(figures.tick)
-      statusText = 'connected'
+      statusIcon = color('success', theme)(figures.tick);
+      statusText = 'connected';
     } else if (server.client.type === 'pending') {
-      statusIcon = color('inactive', theme)(figures.radioOff)
-      const { reconnectAttempt, maxReconnectAttempts } = server.client
+      statusIcon = color('inactive', theme)(figures.radioOff);
+      const { reconnectAttempt, maxReconnectAttempts } = server.client;
       if (reconnectAttempt && maxReconnectAttempts) {
-        statusText = `reconnecting (${reconnectAttempt}/${maxReconnectAttempts})…`
+        statusText = `reconnecting (${reconnectAttempt}/${maxReconnectAttempts})…`;
       } else {
-        statusText = 'connecting…'
+        statusText = 'connecting…';
       }
     } else if (server.client.type === 'needs-auth') {
-      statusIcon = color('warning', theme)(figures.triangleUpOutline)
-      statusText = 'needs authentication'
+      statusIcon = color('warning', theme)(figures.triangleUpOutline);
+      statusText = 'needs authentication';
     } else {
-      statusIcon = color('error', theme)(figures.cross)
-      statusText = 'failed'
+      statusIcon = color('error', theme)(figures.cross);
+      statusText = 'failed';
     }
 
     return (
       <Box key={`${server.name}-${index}`}>
-        <Text color={isSelected ? 'suggestion' : undefined}>
-          {isSelected ? `${figures.pointer} ` : '  '}
-        </Text>
+        <Text color={isSelected ? 'suggestion' : undefined}>{isSelected ? `${figures.pointer} ` : '  '}</Text>
         <Text color={isSelected ? 'suggestion' : undefined}>{server.name}</Text>
         <Text dimColor={!isSelected}> · {statusIcon} </Text>
         <Text dimColor={!isSelected}>{statusText}</Text>
       </Box>
-    )
-  }
+    );
+  };
 
-  const renderAgentServerItem = (
-    agentServer: AgentMcpServerInfo,
-  ): React.ReactNode => {
-    const index = getAgentServerIndex(agentServer)
-    const isSelected = selectedIndex === index
+  const renderAgentServerItem = (agentServer: AgentMcpServerInfo): React.ReactNode => {
+    const index = getAgentServerIndex(agentServer);
+    const isSelected = selectedIndex === index;
     const statusIcon = agentServer.needsAuth
       ? color('warning', theme)(figures.triangleUpOutline)
-      : color('inactive', theme)(figures.radioOff)
-    const statusText = agentServer.needsAuth ? 'may need auth' : 'agent-only'
+      : color('inactive', theme)(figures.radioOff);
+    const statusText = agentServer.needsAuth ? 'may need auth' : 'agent-only';
 
     return (
       <Box key={`agent-${agentServer.name}-${index}`}>
-        <Text color={isSelected ? 'suggestion' : undefined}>
-          {isSelected ? `${figures.pointer} ` : '  '}
-        </Text>
-        <Text color={isSelected ? 'suggestion' : undefined}>
-          {agentServer.name}
-        </Text>
+        <Text color={isSelected ? 'suggestion' : undefined}>{isSelected ? `${figures.pointer} ` : '  '}</Text>
+        <Text color={isSelected ? 'suggestion' : undefined}>{agentServer.name}</Text>
         <Text dimColor={!isSelected}> · {statusIcon} </Text>
         <Text dimColor={!isSelected}>{statusText}</Text>
       </Box>
-    )
-  }
+    );
+  };
 
-  const totalServers = servers.length + agentServers.length
+  const totalServers = servers.length + agentServers.length;
 
   return (
     <Box flexDirection="column">
@@ -261,9 +230,9 @@ export function MCPListPanel({
         <Box flexDirection="column">
           {/* Regular servers grouped by scope */}
           {SCOPE_ORDER.map(scope => {
-            const scopeServers = serversByScope.get(scope)
-            if (!scopeServers || scopeServers.length === 0) return null
-            const heading = getScopeHeading(scope)
+            const scopeServers = serversByScope.get(scope);
+            if (!scopeServers || scopeServers.length === 0) return null;
+            const heading = getScopeHeading(scope);
             return (
               <Box key={scope} flexDirection="column" marginBottom={1}>
                 <Box paddingLeft={2}>
@@ -272,7 +241,7 @@ export function MCPListPanel({
                 </Box>
                 {scopeServers.map(server => renderServerItem(server))}
               </Box>
-            )
+            );
           })}
 
           {/* Claude.ai servers section */}
@@ -292,18 +261,16 @@ export function MCPListPanel({
                 <Text bold>Agent MCPs</Text>
               </Box>
               {/* Group servers by source agent */}
-              {[...new Set(agentServers.flatMap(s => s.sourceAgents))].map(
-                agentName => (
-                  <Box key={agentName} flexDirection="column" marginTop={1}>
-                    <Box paddingLeft={2}>
-                      <Text dimColor>@{agentName}</Text>
-                    </Box>
-                    {agentServers
-                      .filter(s => s.sourceAgents.includes(agentName))
-                      .map(agentServer => renderAgentServerItem(agentServer))}
+              {[...new Set(agentServers.flatMap(s => s.sourceAgents))].map(agentName => (
+                <Box key={agentName} flexDirection="column" marginTop={1}>
+                  <Box paddingLeft={2}>
+                    <Text dimColor>@{agentName}</Text>
                   </Box>
-                ),
-              )}
+                  {agentServers
+                    .filter(s => s.sourceAgents.includes(agentName))
+                    .map(agentServer => renderAgentServerItem(agentServer))}
+                </Box>
+              ))}
             </Box>
           )}
 
@@ -312,9 +279,7 @@ export function MCPListPanel({
             <Box flexDirection="column" marginBottom={1}>
               <Box paddingLeft={2}>
                 <Text bold>{dynamicHeading.label}</Text>
-                {dynamicHeading.path && (
-                  <Text dimColor> ({dynamicHeading.path})</Text>
-                )}
+                {dynamicHeading.path && <Text dimColor> ({dynamicHeading.path})</Text>}
               </Box>
               {dynamicServers.map(server => renderServerItem(server))}
             </Box>
@@ -324,16 +289,11 @@ export function MCPListPanel({
           <Box flexDirection="column">
             {hasFailedClients && (
               <Text dimColor>
-                {debugMode
-                  ? '※ Error logs shown inline with --debug'
-                  : '※ Run claude --debug to see error logs'}
+                {debugMode ? '※ Error logs shown inline with --debug' : '※ Run claude --debug to see error logs'}
               </Text>
             )}
             <Text dimColor>
-              <Link url="https://code.claude.com/docs/en/mcp">
-                https://code.claude.com/docs/en/mcp
-              </Link>{' '}
-              for help
+              <Link url="https://code.claude.com/docs/en/mcp">https://code.claude.com/docs/en/mcp</Link> for help
             </Text>
           </Box>
         </Box>
@@ -345,15 +305,10 @@ export function MCPListPanel({
           <Byline>
             <KeyboardShortcutHint shortcut="↑↓" action="navigate" />
             <KeyboardShortcutHint shortcut="Enter" action="confirm" />
-            <ConfigurableShortcutHint
-              action="confirm:no"
-              context="Confirmation"
-              fallback="Esc"
-              description="cancel"
-            />
+            <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="cancel" />
           </Byline>
         </Text>
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/components/mcp/MCPReconnect.tsx b/src/components/mcp/MCPReconnect.tsx
index 496edaf2f..3dc1c43c9 100644
--- a/src/components/mcp/MCPReconnect.tsx
+++ b/src/components/mcp/MCPReconnect.tsx
@@ -1,28 +1,22 @@
-import figures from 'figures'
-import React, { useEffect, useState } from 'react'
-import type { CommandResultDisplay } from '../../commands.js'
-import { Box, color, Text, useTheme } from '@anthropic/ink'
-import { useMcpReconnect } from '../../services/mcp/MCPConnectionManager.js'
-import { useAppStateStore } from '../../state/AppState.js'
-import { Spinner } from '../Spinner.js'
+import figures from 'figures';
+import React, { useEffect, useState } from 'react';
+import type { CommandResultDisplay } from '../../commands.js';
+import { Box, color, Text, useTheme } from '@anthropic/ink';
+import { useMcpReconnect } from '../../services/mcp/MCPConnectionManager.js';
+import { useAppStateStore } from '../../state/AppState.js';
+import { Spinner } from '../Spinner.js';
 
 type Props = {
-  serverName: string
-  onComplete: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-}
+  serverName: string;
+  onComplete: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+};
 
-export function MCPReconnect({
-  serverName,
-  onComplete,
-}: Props): React.ReactNode {
-  const [theme] = useTheme()
-  const store = useAppStateStore()
-  const reconnectMcpServer = useMcpReconnect()
-  const [isReconnecting, setIsReconnecting] = useState(true)
-  const [error, setError] = useState<string | null>(null)
+export function MCPReconnect({ serverName, onComplete }: Props): React.ReactNode {
+  const [theme] = useTheme();
+  const store = useAppStateStore();
+  const reconnectMcpServer = useMcpReconnect();
+  const [isReconnecting, setIsReconnecting] = useState(true);
+  const [error, setError] = useState<string | null>(null);
 
   useEffect(() => {
     async function attemptReconnect() {
@@ -30,50 +24,46 @@ export function MCPReconnect({
         // Check if server exists. Read via store.getState() instead of a
         // reactive selector so this effect does not re-fire when
         // reconnectMcpServer updates mcp.clients via onConnectionAttempt.
-        const server = store
-          .getState()
-          .mcp.clients.find(c => c.name === serverName)
+        const server = store.getState().mcp.clients.find(c => c.name === serverName);
         if (!server) {
-          setError(`MCP server "${serverName}" not found`)
-          setIsReconnecting(false)
-          onComplete(`MCP server "${serverName}" not found`)
-          return
+          setError(`MCP server "${serverName}" not found`);
+          setIsReconnecting(false);
+          onComplete(`MCP server "${serverName}" not found`);
+          return;
         }
 
         // Attempt reconnection
-        const result = await reconnectMcpServer(serverName)
+        const result = await reconnectMcpServer(serverName);
 
         switch (result.client.type) {
           case 'connected':
-            setIsReconnecting(false)
-            onComplete(`Successfully reconnected to ${serverName}`)
-            break
+            setIsReconnecting(false);
+            onComplete(`Successfully reconnected to ${serverName}`);
+            break;
           case 'needs-auth':
-            setError(`${serverName} requires authentication`)
-            setIsReconnecting(false)
-            onComplete(
-              `${serverName} requires authentication. Use /mcp to authenticate.`,
-            )
-            break
+            setError(`${serverName} requires authentication`);
+            setIsReconnecting(false);
+            onComplete(`${serverName} requires authentication. Use /mcp to authenticate.`);
+            break;
           case 'pending':
           case 'failed':
           case 'disabled':
-            setError(`Failed to reconnect to ${serverName}`)
-            setIsReconnecting(false)
-            onComplete(`Failed to reconnect to ${serverName}`)
-            break
+            setError(`Failed to reconnect to ${serverName}`);
+            setIsReconnecting(false);
+            onComplete(`Failed to reconnect to ${serverName}`);
+            break;
         }
       } catch (err) {
         // Only catch actual errors (like server not found)
-        const errorMessage = err instanceof Error ? err.message : String(err)
-        setError(errorMessage)
-        setIsReconnecting(false)
-        onComplete(`Error: ${errorMessage}`)
+        const errorMessage = err instanceof Error ? err.message : String(err);
+        setError(errorMessage);
+        setIsReconnecting(false);
+        onComplete(`Error: ${errorMessage}`);
       }
     }
 
-    void attemptReconnect()
-  }, [serverName, reconnectMcpServer, store, onComplete])
+    void attemptReconnect();
+  }, [serverName, reconnectMcpServer, store, onComplete]);
 
   if (isReconnecting) {
     return (
@@ -86,7 +76,7 @@ export function MCPReconnect({
           <Text> Establishing connection to MCP server</Text>
         </Box>
       </Box>
-    )
+    );
   }
 
   if (error) {
@@ -98,8 +88,8 @@ export function MCPReconnect({
         </Box>
         <Text dimColor>Error: {error}</Text>
       </Box>
-    )
+    );
   }
 
-  return null
+  return null;
 }
diff --git a/src/components/mcp/MCPRemoteServerMenu.tsx b/src/components/mcp/MCPRemoteServerMenu.tsx
index 41665860e..090316b73 100644
--- a/src/components/mcp/MCPRemoteServerMenu.tsx
+++ b/src/components/mcp/MCPRemoteServerMenu.tsx
@@ -1,67 +1,50 @@
-import figures from 'figures'
-import React, { useEffect, useRef, useState } from 'react'
+import figures from 'figures';
+import React, { useEffect, useRef, useState } from 'react';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from 'src/services/analytics/index.js'
-import type { CommandResultDisplay } from '../../commands.js'
-import { getOauthConfig } from '../../constants/oauth.js'
-import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js'
-import { useTerminalSize } from '../../hooks/useTerminalSize.js'
-import { setClipboard } from '@anthropic/ink'
+} from 'src/services/analytics/index.js';
+import type { CommandResultDisplay } from '../../commands.js';
+import { getOauthConfig } from '../../constants/oauth.js';
+import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js';
+import { useTerminalSize } from '../../hooks/useTerminalSize.js';
+import { setClipboard } from '@anthropic/ink';
 // eslint-disable-next-line custom-rules/prefer-use-keybindings -- raw j/k/arrow menu navigation
-import { Box, color, Link, Text, useInput, useTheme } from '@anthropic/ink'
-import { useKeybinding } from '../../keybindings/useKeybinding.js'
-import {
-  AuthenticationCancelledError,
-  performMCPOAuthFlow,
-  revokeServerTokens,
-} from '../../services/mcp/auth.js'
-import { clearServerCache } from '../../services/mcp/client.js'
-import {
-  useMcpReconnect,
-  useMcpToggleEnabled,
-} from '../../services/mcp/MCPConnectionManager.js'
+import { Box, color, Link, Text, useInput, useTheme } from '@anthropic/ink';
+import { useKeybinding } from '../../keybindings/useKeybinding.js';
+import { AuthenticationCancelledError, performMCPOAuthFlow, revokeServerTokens } from '../../services/mcp/auth.js';
+import { clearServerCache } from '../../services/mcp/client.js';
+import { useMcpReconnect, useMcpToggleEnabled } from '../../services/mcp/MCPConnectionManager.js';
 import {
   describeMcpConfigFilePath,
   excludeCommandsByServer,
   excludeResourcesByServer,
   excludeToolsByServer,
   filterMcpPromptsByServer,
-} from '../../services/mcp/utils.js'
-import { useAppState, useSetAppState } from '../../state/AppState.js'
-import { getOauthAccountInfo } from '../../utils/auth.js'
-import { openBrowser } from '../../utils/browser.js'
-import { errorMessage } from '../../utils/errors.js'
-import { logMCPDebug } from '../../utils/log.js'
-import { capitalize } from '../../utils/stringUtils.js'
-import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js'
-import { Select } from '../CustomSelect/index.js'
-import { Byline, KeyboardShortcutHint } from '@anthropic/ink'
-import { Spinner } from '../Spinner.js'
-import TextInput from '../TextInput.js'
-import { CapabilitiesSection } from './CapabilitiesSection.js'
-import type {
-  ClaudeAIServerInfo,
-  HTTPServerInfo,
-  SSEServerInfo,
-} from './types.js'
-import {
-  handleReconnectError,
-  handleReconnectResult,
-} from './utils/reconnectHelpers.js'
+} from '../../services/mcp/utils.js';
+import { useAppState, useSetAppState } from '../../state/AppState.js';
+import { getOauthAccountInfo } from '../../utils/auth.js';
+import { openBrowser } from '../../utils/browser.js';
+import { errorMessage } from '../../utils/errors.js';
+import { logMCPDebug } from '../../utils/log.js';
+import { capitalize } from '../../utils/stringUtils.js';
+import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js';
+import { Select } from '../CustomSelect/index.js';
+import { Byline, KeyboardShortcutHint } from '@anthropic/ink';
+import { Spinner } from '../Spinner.js';
+import TextInput from '../TextInput.js';
+import { CapabilitiesSection } from './CapabilitiesSection.js';
+import type { ClaudeAIServerInfo, HTTPServerInfo, SSEServerInfo } from './types.js';
+import { handleReconnectError, handleReconnectResult } from './utils/reconnectHelpers.js';
 
 type Props = {
-  server: SSEServerInfo | HTTPServerInfo | ClaudeAIServerInfo
-  serverToolsCount: number
-  onViewTools: () => void
-  onCancel: () => void
-  onComplete?: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-  borderless?: boolean
-}
+  server: SSEServerInfo | HTTPServerInfo | ClaudeAIServerInfo;
+  serverToolsCount: number;
+  onViewTools: () => void;
+  onCancel: () => void;
+  onComplete?: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+  borderless?: boolean;
+};
 
 export function MCPRemoteServerMenu({
   server,
@@ -71,37 +54,27 @@ export function MCPRemoteServerMenu({
   onComplete,
   borderless = false,
 }: Props): React.ReactNode {
-  const [theme] = useTheme()
-  const exitState = useExitOnCtrlCDWithKeybindings()
-  const { columns: terminalColumns } = useTerminalSize()
-  const [isAuthenticating, setIsAuthenticating] = React.useState(false)
-  const [error, setError] = React.useState<string | null>(null)
-  const mcp = useAppState(s => s.mcp)
-  const setAppState = useSetAppState()
-  const [authorizationUrl, setAuthorizationUrl] = React.useState<string | null>(
-    null,
-  )
-  const [isReconnecting, setIsReconnecting] = useState(false)
-  const authAbortControllerRef = useRef<AbortController | null>(null)
-  const [isClaudeAIAuthenticating, setIsClaudeAIAuthenticating] =
-    useState(false)
-  const [claudeAIAuthUrl, setClaudeAIAuthUrl] = useState<string | null>(null)
-  const [isClaudeAIClearingAuth, setIsClaudeAIClearingAuth] = useState(false)
-  const [claudeAIClearAuthUrl, setClaudeAIClearAuthUrl] = useState<
-    string | null
-  >(null)
-  const [claudeAIClearAuthBrowserOpened, setClaudeAIClearAuthBrowserOpened] =
-    useState(false)
-  const [urlCopied, setUrlCopied] = useState(false)
-  const copyTimeoutRef = useRef<ReturnType<typeof setTimeout> | undefined>(
-    undefined,
-  )
-  const unmountedRef = useRef(false)
-  const [callbackUrlInput, setCallbackUrlInput] = useState('')
-  const [callbackUrlCursorOffset, setCallbackUrlCursorOffset] = useState(0)
-  const [manualCallbackSubmit, setManualCallbackSubmit] = useState<
-    ((url: string) => void) | null
-  >(null)
+  const [theme] = useTheme();
+  const exitState = useExitOnCtrlCDWithKeybindings();
+  const { columns: terminalColumns } = useTerminalSize();
+  const [isAuthenticating, setIsAuthenticating] = React.useState(false);
+  const [error, setError] = React.useState<string | null>(null);
+  const mcp = useAppState(s => s.mcp);
+  const setAppState = useSetAppState();
+  const [authorizationUrl, setAuthorizationUrl] = React.useState<string | null>(null);
+  const [isReconnecting, setIsReconnecting] = useState(false);
+  const authAbortControllerRef = useRef<AbortController | null>(null);
+  const [isClaudeAIAuthenticating, setIsClaudeAIAuthenticating] = useState(false);
+  const [claudeAIAuthUrl, setClaudeAIAuthUrl] = useState<string | null>(null);
+  const [isClaudeAIClearingAuth, setIsClaudeAIClearingAuth] = useState(false);
+  const [claudeAIClearAuthUrl, setClaudeAIClearAuthUrl] = useState<string | null>(null);
+  const [claudeAIClearAuthBrowserOpened, setClaudeAIClearAuthBrowserOpened] = useState(false);
+  const [urlCopied, setUrlCopied] = useState(false);
+  const copyTimeoutRef = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);
+  const unmountedRef = useRef(false);
+  const [callbackUrlInput, setCallbackUrlInput] = useState('');
+  const [callbackUrlCursorOffset, setCallbackUrlCursorOffset] = useState(0);
+  const [manualCallbackSubmit, setManualCallbackSubmit] = useState<((url: string) => void) | null>(null);
 
   // If the component unmounts mid-auth (e.g. a parent component's Esc handler
   // navigates away before ours fires), abort the OAuth flow so the callback
@@ -111,70 +84,63 @@ export function MCPRemoteServerMenu({
   // schedule a new timer after unmount.
   useEffect(
     () => () => {
-      unmountedRef.current = true
-      authAbortControllerRef.current?.abort()
+      unmountedRef.current = true;
+      authAbortControllerRef.current?.abort();
       if (copyTimeoutRef.current !== undefined) {
-        clearTimeout(copyTimeoutRef.current)
+        clearTimeout(copyTimeoutRef.current);
       }
     },
     [],
-  )
+  );
 
   // A server is effectively authenticated if:
   // 1. It has OAuth tokens (server.isAuthenticated), OR
   // 2. It's connected and has tools (meaning it's working via some auth mechanism)
   const isEffectivelyAuthenticated =
-    server.isAuthenticated ||
-    (server.client.type === 'connected' && serverToolsCount > 0)
+    server.isAuthenticated || (server.client.type === 'connected' && serverToolsCount > 0);
 
-  const reconnectMcpServer = useMcpReconnect()
+  const reconnectMcpServer = useMcpReconnect();
 
   const handleClaudeAIAuthComplete = React.useCallback(async () => {
-    setIsClaudeAIAuthenticating(false)
-    setClaudeAIAuthUrl(null)
-    setIsReconnecting(true)
+    setIsClaudeAIAuthenticating(false);
+    setClaudeAIAuthUrl(null);
+    setIsReconnecting(true);
     try {
-      const result = await reconnectMcpServer(server.name)
-      const success = result.client.type === 'connected'
-      logEvent('tengu_claudeai_mcp_auth_completed', { success })
+      const result = await reconnectMcpServer(server.name);
+      const success = result.client.type === 'connected';
+      logEvent('tengu_claudeai_mcp_auth_completed', { success });
       if (success) {
-        onComplete?.(`Authentication successful. Connected to ${server.name}.`)
+        onComplete?.(`Authentication successful. Connected to ${server.name}.`);
       } else if (result.client.type === 'needs-auth') {
         onComplete?.(
           'Authentication successful, but server still requires authentication. You may need to manually restart Claude Code.',
-        )
+        );
       } else {
         onComplete?.(
           'Authentication successful, but server reconnection failed. You may need to manually restart Claude Code for the changes to take effect.',
-        )
+        );
       }
     } catch (err) {
-      logEvent('tengu_claudeai_mcp_auth_completed', { success: false })
-      onComplete?.(handleReconnectError(err, server.name))
+      logEvent('tengu_claudeai_mcp_auth_completed', { success: false });
+      onComplete?.(handleReconnectError(err, server.name));
     } finally {
-      setIsReconnecting(false)
+      setIsReconnecting(false);
     }
-  }, [reconnectMcpServer, server.name, onComplete])
+  }, [reconnectMcpServer, server.name, onComplete]);
 
   const handleClaudeAIClearAuthComplete = React.useCallback(async () => {
     await clearServerCache(server.name, {
       ...server.config,
       scope: server.scope,
-    })
+    });
 
     setAppState(prev => {
       const newClients = prev.mcp.clients.map(c =>
         c.name === server.name ? { ...c, type: 'needs-auth' as const } : c,
-      )
-      const newTools = excludeToolsByServer(prev.mcp.tools, server.name)
-      const newCommands = excludeCommandsByServer(
-        prev.mcp.commands,
-        server.name,
-      )
-      const newResources = excludeResourcesByServer(
-        prev.mcp.resources,
-        server.name,
-      )
+      );
+      const newTools = excludeToolsByServer(prev.mcp.tools, server.name);
+      const newCommands = excludeCommandsByServer(prev.mcp.commands, server.name);
+      const newResources = excludeResourcesByServer(prev.mcp.resources, server.name);
 
       return {
         ...prev,
@@ -185,176 +151,155 @@ export function MCPRemoteServerMenu({
           commands: newCommands,
           resources: newResources,
         },
-      }
-    })
+      };
+    });
 
-    logEvent('tengu_claudeai_mcp_clear_auth_completed', {})
-    onComplete?.(`Disconnected from ${server.name}.`)
-    setIsClaudeAIClearingAuth(false)
-    setClaudeAIClearAuthUrl(null)
-    setClaudeAIClearAuthBrowserOpened(false)
-  }, [server.name, server.config, server.scope, setAppState, onComplete])
+    logEvent('tengu_claudeai_mcp_clear_auth_completed', {});
+    onComplete?.(`Disconnected from ${server.name}.`);
+    setIsClaudeAIClearingAuth(false);
+    setClaudeAIClearAuthUrl(null);
+    setClaudeAIClearAuthBrowserOpened(false);
+  }, [server.name, server.config, server.scope, setAppState, onComplete]);
 
   // Escape to cancel authentication flow
   useKeybinding(
     'confirm:no',
     () => {
-      authAbortControllerRef.current?.abort()
-      authAbortControllerRef.current = null
-      setIsAuthenticating(false)
-      setAuthorizationUrl(null)
+      authAbortControllerRef.current?.abort();
+      authAbortControllerRef.current = null;
+      setIsAuthenticating(false);
+      setAuthorizationUrl(null);
     },
     {
       context: 'Confirmation',
       isActive: isAuthenticating,
     },
-  )
+  );
 
   // Escape to cancel Claude AI authentication
   useKeybinding(
     'confirm:no',
     () => {
-      setIsClaudeAIAuthenticating(false)
-      setClaudeAIAuthUrl(null)
+      setIsClaudeAIAuthenticating(false);
+      setClaudeAIAuthUrl(null);
     },
     {
       context: 'Confirmation',
       isActive: isClaudeAIAuthenticating,
     },
-  )
+  );
 
   // Escape to cancel Claude AI clear auth
   useKeybinding(
     'confirm:no',
     () => {
-      setIsClaudeAIClearingAuth(false)
-      setClaudeAIClearAuthUrl(null)
-      setClaudeAIClearAuthBrowserOpened(false)
+      setIsClaudeAIClearingAuth(false);
+      setClaudeAIClearAuthUrl(null);
+      setClaudeAIClearAuthBrowserOpened(false);
     },
     {
       context: 'Confirmation',
       isActive: isClaudeAIClearingAuth,
     },
-  )
+  );
 
   // Return key handling for authentication flows and 'c' to copy URL
   useInput((input, key) => {
     if (key.return && isClaudeAIAuthenticating) {
-      void handleClaudeAIAuthComplete()
+      void handleClaudeAIAuthComplete();
     }
     if (key.return && isClaudeAIClearingAuth) {
       if (claudeAIClearAuthBrowserOpened) {
-        void handleClaudeAIClearAuthComplete()
+        void handleClaudeAIClearAuthComplete();
       } else {
         // First Enter: open the browser
-        const connectorsUrl = `${getOauthConfig().CLAUDE_AI_ORIGIN}/settings/connectors`
-        setClaudeAIClearAuthUrl(connectorsUrl)
-        setClaudeAIClearAuthBrowserOpened(true)
-        void openBrowser(connectorsUrl)
+        const connectorsUrl = `${getOauthConfig().CLAUDE_AI_ORIGIN}/settings/connectors`;
+        setClaudeAIClearAuthUrl(connectorsUrl);
+        setClaudeAIClearAuthBrowserOpened(true);
+        void openBrowser(connectorsUrl);
       }
     }
     if (input === 'c' && !urlCopied) {
-      const urlToCopy =
-        authorizationUrl || claudeAIAuthUrl || claudeAIClearAuthUrl
+      const urlToCopy = authorizationUrl || claudeAIAuthUrl || claudeAIClearAuthUrl;
       if (urlToCopy) {
         void setClipboard(urlToCopy).then(raw => {
-          if (unmountedRef.current) return
-          if (raw) process.stdout.write(raw)
-          setUrlCopied(true)
+          if (unmountedRef.current) return;
+          if (raw) process.stdout.write(raw);
+          setUrlCopied(true);
           if (copyTimeoutRef.current !== undefined) {
-            clearTimeout(copyTimeoutRef.current)
+            clearTimeout(copyTimeoutRef.current);
           }
-          copyTimeoutRef.current = setTimeout(setUrlCopied, 2000, false)
-        })
+          copyTimeoutRef.current = setTimeout(setUrlCopied, 2000, false);
+        });
       }
     }
-  })
+  });
 
-  const capitalizedServerName = capitalize(String(server.name))
+  const capitalizedServerName = capitalize(String(server.name));
 
   // Count MCP prompts for this server (skills are shown in /skills, not here)
-  const serverCommandsCount = filterMcpPromptsByServer(
-    mcp.commands,
-    server.name,
-  ).length
+  const serverCommandsCount = filterMcpPromptsByServer(mcp.commands, server.name).length;
 
-  const toggleMcpServer = useMcpToggleEnabled()
+  const toggleMcpServer = useMcpToggleEnabled();
 
   const handleClaudeAIAuth = React.useCallback(async () => {
-    const claudeAiBaseUrl = getOauthConfig().CLAUDE_AI_ORIGIN
-    const accountInfo = getOauthAccountInfo()
-    const orgUuid = accountInfo?.organizationUuid
+    const claudeAiBaseUrl = getOauthConfig().CLAUDE_AI_ORIGIN;
+    const accountInfo = getOauthAccountInfo();
+    const orgUuid = accountInfo?.organizationUuid;
 
-    let authUrl: string
-    if (
-      orgUuid &&
-      server.config.type === 'claudeai-proxy' &&
-      server.config.id
-    ) {
+    let authUrl: string;
+    if (orgUuid && server.config.type === 'claudeai-proxy' && server.config.id) {
       // Use the direct auth URL with org and server IDs
       // Replace 'mcprs' prefix with 'mcpsrv' if present
-      const serverId = server.config.id.startsWith('mcprs')
-        ? 'mcpsrv' + server.config.id.slice(5)
-        : server.config.id
-      const productSurface = encodeURIComponent(
-        process.env.CLAUDE_CODE_ENTRYPOINT || 'cli',
-      )
-      authUrl = `${claudeAiBaseUrl}/api/organizations/${orgUuid}/mcp/start-auth/${serverId}?product_surface=${productSurface}`
+      const serverId = server.config.id.startsWith('mcprs') ? 'mcpsrv' + server.config.id.slice(5) : server.config.id;
+      const productSurface = encodeURIComponent(process.env.CLAUDE_CODE_ENTRYPOINT || 'cli');
+      authUrl = `${claudeAiBaseUrl}/api/organizations/${orgUuid}/mcp/start-auth/${serverId}?product_surface=${productSurface}`;
     } else {
       // Fall back to settings/connectors if we don't have the required IDs
-      authUrl = `${claudeAiBaseUrl}/settings/connectors`
+      authUrl = `${claudeAiBaseUrl}/settings/connectors`;
     }
 
-    setClaudeAIAuthUrl(authUrl)
-    setIsClaudeAIAuthenticating(true)
-    logEvent('tengu_claudeai_mcp_auth_started', {})
-    await openBrowser(authUrl)
-  }, [server.config])
+    setClaudeAIAuthUrl(authUrl);
+    setIsClaudeAIAuthenticating(true);
+    logEvent('tengu_claudeai_mcp_auth_started', {});
+    await openBrowser(authUrl);
+  }, [server.config]);
 
   const handleClaudeAIClearAuth = React.useCallback(() => {
-    setIsClaudeAIClearingAuth(true)
-    logEvent('tengu_claudeai_mcp_clear_auth_started', {})
-  }, [])
+    setIsClaudeAIClearingAuth(true);
+    logEvent('tengu_claudeai_mcp_clear_auth_started', {});
+  }, []);
 
   const handleToggleEnabled = React.useCallback(async () => {
-    const wasEnabled = server.client.type !== 'disabled'
+    const wasEnabled = server.client.type !== 'disabled';
 
     try {
-      await toggleMcpServer(server.name)
+      await toggleMcpServer(server.name);
 
       if (server.config.type === 'claudeai-proxy') {
         logEvent('tengu_claudeai_mcp_toggle', {
           new_state: (wasEnabled
             ? 'disabled'
             : 'enabled') as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        })
+        });
       }
 
       // Return to the server list so user can continue managing other servers
-      onCancel()
+      onCancel();
     } catch (err) {
-      const action = wasEnabled ? 'disable' : 'enable'
-      onComplete?.(
-        `Failed to ${action} MCP server '${server.name}': ${errorMessage(err)}`,
-      )
+      const action = wasEnabled ? 'disable' : 'enable';
+      onComplete?.(`Failed to ${action} MCP server '${server.name}': ${errorMessage(err)}`);
     }
-  }, [
-    server.client.type,
-    server.config.type,
-    server.name,
-    toggleMcpServer,
-    onCancel,
-    onComplete,
-  ])
+  }, [server.client.type, server.config.type, server.name, toggleMcpServer, onCancel, onComplete]);
 
   const handleAuthenticate = React.useCallback(async () => {
-    if (server.config.type === 'claudeai-proxy') return
+    if (server.config.type === 'claudeai-proxy') return;
 
-    setIsAuthenticating(true)
-    setError(null)
+    setIsAuthenticating(true);
+    setError(null);
 
-    const controller = new AbortController()
-    authAbortControllerRef.current = controller
+    const controller = new AbortController();
+    authAbortControllerRef.current = controller;
 
     try {
       // Revoke existing tokens if re-authenticating, but preserve step-up
@@ -362,97 +307,75 @@ export function MCPRemoteServerMenu({
       if (server.isAuthenticated && server.config) {
         await revokeServerTokens(server.name, server.config, {
           preserveStepUpState: true,
-        })
+        });
       }
 
       if (server.config) {
-        await performMCPOAuthFlow(
-          server.name,
-          server.config,
-          setAuthorizationUrl,
-          controller.signal,
-          {
-            onWaitingForCallback: submit => {
-              setManualCallbackSubmit(() => submit)
-            },
+        await performMCPOAuthFlow(server.name, server.config, setAuthorizationUrl, controller.signal, {
+          onWaitingForCallback: submit => {
+            setManualCallbackSubmit(() => submit);
           },
-        )
+        });
 
         logEvent('tengu_mcp_auth_config_authenticate', {
           wasAuthenticated: server.isAuthenticated,
-        })
+        });
 
-        const result = await reconnectMcpServer(server.name)
+        const result = await reconnectMcpServer(server.name);
 
         if (result.client.type === 'connected') {
           const message = isEffectivelyAuthenticated
             ? `Authentication successful. Reconnected to ${server.name}.`
-            : `Authentication successful. Connected to ${server.name}.`
-          onComplete?.(message)
+            : `Authentication successful. Connected to ${server.name}.`;
+          onComplete?.(message);
         } else if (result.client.type === 'needs-auth') {
           onComplete?.(
             'Authentication successful, but server still requires authentication. You may need to manually restart Claude Code.',
-          )
+          );
         } else {
           // result.client.type === 'failed'
-          logMCPDebug(server.name, `Reconnection failed after authentication`)
+          logMCPDebug(server.name, `Reconnection failed after authentication`);
           onComplete?.(
             'Authentication successful, but server reconnection failed. You may need to manually restart Claude Code for the changes to take effect.',
-          )
+          );
         }
       }
     } catch (err) {
       // Don't show error if it was a cancellation
-      if (
-        err instanceof Error &&
-        !(err instanceof AuthenticationCancelledError)
-      ) {
-        setError(err.message)
+      if (err instanceof Error && !(err instanceof AuthenticationCancelledError)) {
+        setError(err.message);
       }
     } finally {
-      setIsAuthenticating(false)
-      authAbortControllerRef.current = null
-      setManualCallbackSubmit(null)
-      setCallbackUrlInput('')
+      setIsAuthenticating(false);
+      authAbortControllerRef.current = null;
+      setManualCallbackSubmit(null);
+      setCallbackUrlInput('');
     }
-  }, [
-    server.isAuthenticated,
-    server.config,
-    server.name,
-    onComplete,
-    reconnectMcpServer,
-    isEffectivelyAuthenticated,
-  ])
+  }, [server.isAuthenticated, server.config, server.name, onComplete, reconnectMcpServer, isEffectivelyAuthenticated]);
 
   const handleClearAuth = async () => {
-    if (server.config.type === 'claudeai-proxy') return
+    if (server.config.type === 'claudeai-proxy') return;
 
     if (server.config) {
       // First revoke the authentication tokens and clear all auth state
-      await revokeServerTokens(server.name, server.config)
-      logEvent('tengu_mcp_auth_config_clear', {})
+      await revokeServerTokens(server.name, server.config);
+      logEvent('tengu_mcp_auth_config_clear', {});
 
       // Disconnect the client and clear the cache
       await clearServerCache(server.name, {
         ...server.config,
         scope: server.scope,
-      })
+      });
 
       // Update app state to remove the disconnected server's tools, commands, and resources
       setAppState(prev => {
         const newClients = prev.mcp.clients.map(c =>
           // 'failed' is a misnomer here, but we don't really differentiate between "not connected" and "failed" at the moment
           c.name === server.name ? { ...c, type: 'failed' as const } : c,
-        )
-        const newTools = excludeToolsByServer(prev.mcp.tools, server.name)
-        const newCommands = excludeCommandsByServer(
-          prev.mcp.commands,
-          server.name,
-        )
-        const newResources = excludeResourcesByServer(
-          prev.mcp.resources,
-          server.name,
-        )
+        );
+        const newTools = excludeToolsByServer(prev.mcp.tools, server.name);
+        const newCommands = excludeCommandsByServer(prev.mcp.commands, server.name);
+        const newResources = excludeResourcesByServer(prev.mcp.resources, server.name);
 
         return {
           ...prev,
@@ -463,12 +386,12 @@ export function MCPRemoteServerMenu({
             commands: newCommands,
             resources: newResources,
           },
-        }
-      })
+        };
+      });
 
-      onComplete?.(`Authentication cleared for ${server.name}.`)
+      onComplete?.(`Authentication cleared for ${server.name}.`);
     }
-  }
+  };
 
   if (isAuthenticating) {
     // XAA: silent exchange (cached id_token → no browser), so don't claim
@@ -477,7 +400,7 @@ export function MCPRemoteServerMenu({
     const authCopy =
       server.config.type !== 'claudeai-proxy' && server.config.oauth?.xaa
         ? ' Authenticating via your identity provider'
-        : ' A browser window will open for authentication'
+        : ' A browser window will open for authentication';
     return (
       <Box flexDirection="column" gap={1} padding={1}>
         <Text color="claude">Authenticating with {server.name}…</Text>
@@ -488,10 +411,7 @@ export function MCPRemoteServerMenu({
         {authorizationUrl && (
           <Box flexDirection="column">
             <Box>
-              <Text dimColor>
-                If your browser doesn&apos;t open automatically, copy this URL
-                manually{' '}
-              </Text>
+              <Text dimColor>If your browser doesn&apos;t open automatically, copy this URL manually </Text>
               {urlCopied ? (
                 <Text color="success">(Copied!)</Text>
               ) : (
@@ -506,8 +426,7 @@ export function MCPRemoteServerMenu({
         {isAuthenticating && authorizationUrl && manualCallbackSubmit && (
           <Box flexDirection="column" marginTop={1}>
             <Text dimColor>
-              If the redirect page shows a connection error, paste the URL from
-              your browser&apos;s address bar:
+              If the redirect page shows a connection error, paste the URL from your browser&apos;s address bar:
             </Text>
             <Box>
               <Text dimColor>URL {'>'} </Text>
@@ -515,8 +434,8 @@ export function MCPRemoteServerMenu({
                 value={callbackUrlInput}
                 onChange={setCallbackUrlInput}
                 onSubmit={(value: string) => {
-                  manualCallbackSubmit(value.trim())
-                  setCallbackUrlInput('')
+                  manualCallbackSubmit(value.trim());
+                  setCallbackUrlInput('');
                 }}
                 cursorOffset={callbackUrlCursorOffset}
                 onChangeCursorOffset={setCallbackUrlCursorOffset}
@@ -526,13 +445,10 @@ export function MCPRemoteServerMenu({
           </Box>
         )}
         <Box marginLeft={3}>
-          <Text dimColor>
-            Return here after authenticating in your browser. Press Esc to go
-            back.
-          </Text>
+          <Text dimColor>Return here after authenticating in your browser. Press Esc to go back.</Text>
         </Box>
       </Box>
-    )
+    );
   }
 
   if (isClaudeAIAuthenticating) {
@@ -546,10 +462,7 @@ export function MCPRemoteServerMenu({
         {claudeAIAuthUrl && (
           <Box flexDirection="column">
             <Box>
-              <Text dimColor>
-                If your browser doesn&apos;t open automatically, copy this URL
-                manually{' '}
-              </Text>
+              <Text dimColor>If your browser doesn&apos;t open automatically, copy this URL manually </Text>
               {urlCopied ? (
                 <Text color="success">(Copied!)</Text>
               ) : (
@@ -566,16 +479,11 @@ export function MCPRemoteServerMenu({
             Press <Text bold>Enter</Text> after authenticating in your browser.
           </Text>
           <Text dimColor italic>
-            <ConfigurableShortcutHint
-              action="confirm:no"
-              context="Confirmation"
-              fallback="Esc"
-              description="back"
-            />
+            <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="back" />
           </Text>
         </Box>
       </Box>
-    )
+    );
   }
 
   if (isClaudeAIClearingAuth) {
@@ -584,17 +492,11 @@ export function MCPRemoteServerMenu({
         <Text color="claude">Clear authentication for {server.name}</Text>
         {claudeAIClearAuthBrowserOpened ? (
           <>
-            <Text>
-              Find the MCP server in the browser and click
-              &quot;Disconnect&quot;.
-            </Text>
+            <Text>Find the MCP server in the browser and click &quot;Disconnect&quot;.</Text>
             {claudeAIClearAuthUrl && (
               <Box flexDirection="column">
                 <Box>
-                  <Text dimColor>
-                    If your browser didn&apos;t open automatically, copy this
-                    URL manually{' '}
-                  </Text>
+                  <Text dimColor>If your browser didn&apos;t open automatically, copy this URL manually </Text>
                   {urlCopied ? (
                     <Text color="success">(Copied!)</Text>
                   ) : (
@@ -623,8 +525,7 @@ export function MCPRemoteServerMenu({
         ) : (
           <>
             <Text>
-              This will open claude.ai in the browser. Find the MCP server in
-              the list and click &quot;Disconnect&quot;.
+              This will open claude.ai in the browser. Find the MCP server in the list and click &quot;Disconnect&quot;.
             </Text>
             <Box marginLeft={3} flexDirection="column">
               <Text color="permission">
@@ -642,7 +543,7 @@ export function MCPRemoteServerMenu({
           </>
         )}
       </Box>
-    )
+    );
   }
 
   if (isReconnecting) {
@@ -657,24 +558,24 @@ export function MCPRemoteServerMenu({
         </Box>
         <Text dimColor>This may take a few moments.</Text>
       </Box>
-    )
+    );
   }
 
-  const menuOptions = []
+  const menuOptions = [];
 
   // If server is disabled, show Enable first as the primary action
   if (server.client.type === 'disabled') {
     menuOptions.push({
       label: 'Enable',
       value: 'toggle-enabled',
-    })
+    });
   }
 
   if (server.client.type === 'connected' && serverToolsCount > 0) {
     menuOptions.push({
       label: 'View tools',
       value: 'tools',
-    })
+    });
   }
 
   if (server.config.type === 'claudeai-proxy') {
@@ -682,30 +583,30 @@ export function MCPRemoteServerMenu({
       menuOptions.push({
         label: 'Clear authentication',
         value: 'claudeai-clear-auth',
-      })
+      });
     } else if (server.client.type !== 'disabled') {
       menuOptions.push({
         label: 'Authenticate',
         value: 'claudeai-auth',
-      })
+      });
     }
   } else {
     if (isEffectivelyAuthenticated) {
       menuOptions.push({
         label: 'Re-authenticate',
         value: 'reauth',
-      })
+      });
       menuOptions.push({
         label: 'Clear authentication',
         value: 'clear-auth',
-      })
+      });
     }
 
     if (!isEffectivelyAuthenticated) {
       menuOptions.push({
         label: 'Authenticate',
         value: 'auth',
-      })
+      });
     }
   }
 
@@ -714,12 +615,12 @@ export function MCPRemoteServerMenu({
       menuOptions.push({
         label: 'Reconnect',
         value: 'reconnectMcpServer',
-      })
+      });
     }
     menuOptions.push({
       label: 'Disable',
       value: 'toggle-enabled',
-    })
+    });
   }
 
   // If there are no other options, add a back option so Select handles escape
@@ -727,16 +628,12 @@ export function MCPRemoteServerMenu({
     menuOptions.push({
       label: 'Back',
       value: 'back',
-    })
+    });
   }
 
   return (
     <Box flexDirection="column">
-      <Box
-        flexDirection="column"
-        paddingX={1}
-        borderStyle={borderless ? undefined : 'round'}
-      >
+      <Box flexDirection="column" paddingX={1} borderStyle={borderless ? undefined : 'round'}>
         <Box marginBottom={1}>
           <Text bold>{capitalizedServerName} MCP Server</Text>
         </Box>
@@ -754,10 +651,7 @@ export function MCPRemoteServerMenu({
                 <Text> connecting…</Text>
               </>
             ) : server.client.type === 'needs-auth' ? (
-              <Text>
-                {color('warning', theme)(figures.triangleUpOutline)} needs
-                authentication
-              </Text>
+              <Text>{color('warning', theme)(figures.triangleUpOutline)} needs authentication</Text>
             ) : (
               <Text>{color('error', theme)(figures.cross)} failed</Text>
             )}
@@ -767,13 +661,9 @@ export function MCPRemoteServerMenu({
             <Box>
               <Text bold>Auth: </Text>
               {isEffectivelyAuthenticated ? (
-                <Text>
-                  {color('success', theme)(figures.tick)} authenticated
-                </Text>
+                <Text>{color('success', theme)(figures.tick)} authenticated</Text>
               ) : (
-                <Text>
-                  {color('error', theme)(figures.cross)} not authenticated
-                </Text>
+                <Text>{color('error', theme)(figures.cross)} not authenticated</Text>
               )}
             </Box>
           )}
@@ -817,52 +707,49 @@ export function MCPRemoteServerMenu({
               onChange={async value => {
                 switch (value) {
                   case 'tools':
-                    onViewTools()
-                    break
+                    onViewTools();
+                    break;
                   case 'auth':
                   case 'reauth':
-                    await handleAuthenticate()
-                    break
+                    await handleAuthenticate();
+                    break;
                   case 'clear-auth':
-                    await handleClearAuth()
-                    break
+                    await handleClearAuth();
+                    break;
                   case 'claudeai-auth':
-                    await handleClaudeAIAuth()
-                    break
+                    await handleClaudeAIAuth();
+                    break;
                   case 'claudeai-clear-auth':
-                    handleClaudeAIClearAuth()
-                    break
+                    handleClaudeAIClearAuth();
+                    break;
                   case 'reconnectMcpServer':
-                    setIsReconnecting(true)
+                    setIsReconnecting(true);
                     try {
-                      const result = await reconnectMcpServer(server.name)
+                      const result = await reconnectMcpServer(server.name);
                       if (server.config.type === 'claudeai-proxy') {
                         logEvent('tengu_claudeai_mcp_reconnect', {
                           success: result.client.type === 'connected',
-                        })
+                        });
                       }
-                      const { message } = handleReconnectResult(
-                        result,
-                        server.name,
-                      )
-                      onComplete?.(message)
+                      const { message } = handleReconnectResult(result, server.name);
+                      onComplete?.(message);
                     } catch (err) {
                       if (server.config.type === 'claudeai-proxy') {
                         logEvent('tengu_claudeai_mcp_reconnect', {
                           success: false,
-                        })
+                        });
                       }
-                      onComplete?.(handleReconnectError(err, server.name))
+                      onComplete?.(handleReconnectError(err, server.name));
                     } finally {
-                      setIsReconnecting(false)
+                      setIsReconnecting(false);
                     }
-                    break
+                    break;
                   case 'toggle-enabled':
-                    await handleToggleEnabled()
-                    break
+                    await handleToggleEnabled();
+                    break;
                   case 'back':
-                    onCancel()
-                    break
+                    onCancel();
+                    break;
                 }
               }}
               onCancel={onCancel}
@@ -879,16 +766,11 @@ export function MCPRemoteServerMenu({
             <Byline>
               <KeyboardShortcutHint shortcut="↑↓" action="navigate" />
               <KeyboardShortcutHint shortcut="Enter" action="select" />
-              <ConfigurableShortcutHint
-                action="confirm:no"
-                context="Confirmation"
-                fallback="Esc"
-                description="back"
-              />
+              <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="back" />
             </Byline>
           )}
         </Text>
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/components/mcp/MCPSettings.tsx b/src/components/mcp/MCPSettings.tsx
index b350bf91e..3203d5b28 100644
--- a/src/components/mcp/MCPSettings.tsx
+++ b/src/components/mcp/MCPSettings.tsx
@@ -1,92 +1,79 @@
-import React, { useEffect, useMemo } from 'react'
-import type { CommandResultDisplay } from '../../commands.js'
-import { ClaudeAuthProvider } from '../../services/mcp/auth.js'
+import React, { useEffect, useMemo } from 'react';
+import type { CommandResultDisplay } from '../../commands.js';
+import { ClaudeAuthProvider } from '../../services/mcp/auth.js';
 import type {
   McpClaudeAIProxyServerConfig,
   McpHTTPServerConfig,
   McpSSEServerConfig,
   McpStdioServerConfig,
-} from '../../services/mcp/types.js'
-import {
-  extractAgentMcpServers,
-  filterToolsByServer,
-} from '../../services/mcp/utils.js'
-import { useAppState } from '../../state/AppState.js'
-import { getSessionIngressAuthToken } from '../../utils/sessionIngressAuth.js'
-import { MCPAgentServerMenu } from './MCPAgentServerMenu.js'
-import { MCPListPanel } from './MCPListPanel.js'
-import { MCPRemoteServerMenu } from './MCPRemoteServerMenu.js'
-import { MCPStdioServerMenu } from './MCPStdioServerMenu.js'
-import { MCPToolDetailView } from './MCPToolDetailView.js'
-import { MCPToolListView } from './MCPToolListView.js'
-import type { AgentMcpServerInfo, MCPViewState, ServerInfo } from './types.js'
+} from '../../services/mcp/types.js';
+import { extractAgentMcpServers, filterToolsByServer } from '../../services/mcp/utils.js';
+import { useAppState } from '../../state/AppState.js';
+import { getSessionIngressAuthToken } from '../../utils/sessionIngressAuth.js';
+import { MCPAgentServerMenu } from './MCPAgentServerMenu.js';
+import { MCPListPanel } from './MCPListPanel.js';
+import { MCPRemoteServerMenu } from './MCPRemoteServerMenu.js';
+import { MCPStdioServerMenu } from './MCPStdioServerMenu.js';
+import { MCPToolDetailView } from './MCPToolDetailView.js';
+import { MCPToolListView } from './MCPToolListView.js';
+import type { AgentMcpServerInfo, MCPViewState, ServerInfo } from './types.js';
 
 type Props = {
-  onComplete: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-}
+  onComplete: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+};
 
 export function MCPSettings({ onComplete }: Props): React.ReactNode {
-  const mcp = useAppState(s => s.mcp)
-  const agentDefinitions = useAppState(s => s.agentDefinitions)
-  const mcpClients = mcp.clients
+  const mcp = useAppState(s => s.mcp);
+  const agentDefinitions = useAppState(s => s.agentDefinitions);
+  const mcpClients = mcp.clients;
   const [viewState, setViewState] = React.useState<MCPViewState>({
     type: 'list',
-  })
-  const [servers, setServers] = React.useState<ServerInfo[]>([])
+  });
+  const [servers, setServers] = React.useState<ServerInfo[]>([]);
 
   // Extract agent-specific MCP servers from agent definitions
   const agentMcpServers = useMemo(
     () => extractAgentMcpServers(agentDefinitions.allAgents),
     [agentDefinitions.allAgents],
-  )
+  );
 
   const filteredClients = React.useMemo(
-    () =>
-      mcpClients
-        .filter(client => client.name !== 'ide')
-        .sort((a, b) => a.name.localeCompare(b.name)),
+    () => mcpClients.filter(client => client.name !== 'ide').sort((a, b) => a.name.localeCompare(b.name)),
     [mcpClients],
-  )
+  );
 
   React.useEffect(() => {
-    let cancelled = false
+    let cancelled = false;
     async function prepareServers() {
       const serverInfos = await Promise.all(
         filteredClients.map(async client => {
-          const scope = client.config.scope
-          const isSSE = client.config.type === 'sse'
-          const isHTTP = client.config.type === 'http'
-          const isClaudeAIProxy = client.config.type === 'claudeai-proxy'
-          let isAuthenticated: boolean | undefined = undefined
+          const scope = client.config.scope;
+          const isSSE = client.config.type === 'sse';
+          const isHTTP = client.config.type === 'http';
+          const isClaudeAIProxy = client.config.type === 'claudeai-proxy';
+          let isAuthenticated: boolean | undefined;
 
           if (isSSE || isHTTP) {
             const authProvider = new ClaudeAuthProvider(
               client.name,
               client.config as McpSSEServerConfig | McpHTTPServerConfig,
-            )
-            const tokens = await authProvider.tokens()
+            );
+            const tokens = await authProvider.tokens();
             // Server is authenticated if:
             // 1. It has OAuth tokens, OR
             // 2. It's connected via session auth (has session token and is connected), OR
             // 3. It's connected and has tools (meaning it's working, regardless of auth method)
-            const hasSessionAuth =
-              getSessionIngressAuthToken() !== null &&
-              client.type === 'connected'
+            const hasSessionAuth = getSessionIngressAuthToken() !== null && client.type === 'connected';
             const hasToolsAndConnected =
-              client.type === 'connected' &&
-              filterToolsByServer(mcp.tools, client.name).length > 0
-            isAuthenticated =
-              Boolean(tokens) || hasSessionAuth || hasToolsAndConnected
+              client.type === 'connected' && filterToolsByServer(mcp.tools, client.name).length > 0;
+            isAuthenticated = Boolean(tokens) || hasSessionAuth || hasToolsAndConnected;
           }
 
           const baseInfo = {
             name: client.name,
             client,
             scope,
-          }
+          };
 
           if (isClaudeAIProxy) {
             return {
@@ -94,59 +81,54 @@ export function MCPSettings({ onComplete }: Props): React.ReactNode {
               transport: 'claudeai-proxy' as const,
               isAuthenticated: false,
               config: client.config as McpClaudeAIProxyServerConfig,
-            }
+            };
           } else if (isSSE) {
             return {
               ...baseInfo,
               transport: 'sse' as const,
               isAuthenticated,
               config: client.config as McpSSEServerConfig,
-            }
+            };
           } else if (isHTTP) {
             return {
               ...baseInfo,
               transport: 'http' as const,
               isAuthenticated,
               config: client.config as McpHTTPServerConfig,
-            }
+            };
           } else {
             return {
               ...baseInfo,
               transport: 'stdio' as const,
               config: client.config as McpStdioServerConfig,
-            }
+            };
           }
         }),
-      )
+      );
 
-      if (cancelled) return
-      setServers(serverInfos)
+      if (cancelled) return;
+      setServers(serverInfos);
     }
 
-    void prepareServers()
+    void prepareServers();
     return () => {
-      cancelled = true
-    }
-  }, [filteredClients, mcp.tools])
+      cancelled = true;
+    };
+  }, [filteredClients, mcp.tools]);
 
   useEffect(() => {
     if (servers.length === 0 && filteredClients.length > 0) {
       // Still loading
-      return
+      return;
     }
 
     // Only show "no servers" message if no regular servers AND no agent servers
     if (servers.length === 0 && agentMcpServers.length === 0) {
       onComplete(
         'No MCP servers configured. Please run /doctor if this is unexpected. Otherwise, run `claude mcp --help` or visit https://code.claude.com/docs/en/mcp to learn more.',
-      )
+      );
     }
-  }, [
-    servers.length,
-    filteredClients.length,
-    agentMcpServers.length,
-    onComplete,
-  ])
+  }, [servers.length, filteredClients.length, agentMcpServers.length, onComplete]);
 
   switch (viewState.type) {
     case 'list':
@@ -154,49 +136,40 @@ export function MCPSettings({ onComplete }: Props): React.ReactNode {
         <MCPListPanel
           servers={servers}
           agentServers={agentMcpServers}
-          onSelectServer={server =>
-            setViewState({ type: 'server-menu', server })
-          }
+          onSelectServer={server => setViewState({ type: 'server-menu', server })}
           onSelectAgentServer={(agentServer: AgentMcpServerInfo) =>
             setViewState({ type: 'agent-server-menu', agentServer })
           }
           onComplete={onComplete}
           defaultTab={viewState.defaultTab}
         />
-      )
+      );
 
     case 'server-menu': {
-      const serverTools = filterToolsByServer(mcp.tools, viewState.server.name)
+      const serverTools = filterToolsByServer(mcp.tools, viewState.server.name);
 
-      const defaultTab =
-        viewState.server.transport === 'claudeai-proxy'
-          ? 'claude.ai'
-          : 'Claude Code'
+      const defaultTab = viewState.server.transport === 'claudeai-proxy' ? 'claude.ai' : 'Claude Code';
 
       if (viewState.server.transport === 'stdio') {
         return (
           <MCPStdioServerMenu
             server={viewState.server}
             serverToolsCount={serverTools.length}
-            onViewTools={() =>
-              setViewState({ type: 'server-tools', server: viewState.server })
-            }
+            onViewTools={() => setViewState({ type: 'server-tools', server: viewState.server })}
             onCancel={() => setViewState({ type: 'list', defaultTab })}
             onComplete={onComplete}
           />
-        )
+        );
       } else {
         return (
           <MCPRemoteServerMenu
             server={viewState.server}
             serverToolsCount={serverTools.length}
-            onViewTools={() =>
-              setViewState({ type: 'server-tools', server: viewState.server })
-            }
+            onViewTools={() => setViewState({ type: 'server-tools', server: viewState.server })}
             onCancel={() => setViewState({ type: 'list', defaultTab })}
             onComplete={onComplete}
           />
-        )
+        );
       }
     }
 
@@ -211,28 +184,24 @@ export function MCPSettings({ onComplete }: Props): React.ReactNode {
               toolIndex: index,
             })
           }
-          onBack={() =>
-            setViewState({ type: 'server-menu', server: viewState.server })
-          }
+          onBack={() => setViewState({ type: 'server-menu', server: viewState.server })}
         />
-      )
+      );
 
     case 'server-tool-detail': {
-      const serverTools = filterToolsByServer(mcp.tools, viewState.server.name)
-      const tool = serverTools[viewState.toolIndex]
+      const serverTools = filterToolsByServer(mcp.tools, viewState.server.name);
+      const tool = serverTools[viewState.toolIndex];
       if (!tool) {
-        setViewState({ type: 'server-tools', server: viewState.server })
-        return null
+        setViewState({ type: 'server-tools', server: viewState.server });
+        return null;
       }
       return (
         <MCPToolDetailView
           tool={tool}
           server={viewState.server}
-          onBack={() =>
-            setViewState({ type: 'server-tools', server: viewState.server })
-          }
+          onBack={() => setViewState({ type: 'server-tools', server: viewState.server })}
         />
-      )
+      );
     }
 
     case 'agent-server-menu':
@@ -242,6 +211,6 @@ export function MCPSettings({ onComplete }: Props): React.ReactNode {
           onCancel={() => setViewState({ type: 'list', defaultTab: 'Agents' })}
           onComplete={onComplete}
         />
-      )
+      );
   }
 }
diff --git a/src/components/mcp/MCPStdioServerMenu.tsx b/src/components/mcp/MCPStdioServerMenu.tsx
index 4132cdfe7..5f74239ac 100644
--- a/src/components/mcp/MCPStdioServerMenu.tsx
+++ b/src/components/mcp/MCPStdioServerMenu.tsx
@@ -1,42 +1,30 @@
-import figures from 'figures'
-import React, { useState } from 'react'
-import type { CommandResultDisplay } from '../../commands.js'
-import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js'
-import { Box, color, Text, useTheme } from '@anthropic/ink'
-import { getMcpConfigByName } from '../../services/mcp/config.js'
-import {
-  useMcpReconnect,
-  useMcpToggleEnabled,
-} from '../../services/mcp/MCPConnectionManager.js'
-import {
-  describeMcpConfigFilePath,
-  filterMcpPromptsByServer,
-} from '../../services/mcp/utils.js'
-import { useAppState } from '../../state/AppState.js'
-import { errorMessage } from '../../utils/errors.js'
-import { capitalize } from '../../utils/stringUtils.js'
-import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js'
-import { Select } from '../CustomSelect/index.js'
-import { Byline, KeyboardShortcutHint } from '@anthropic/ink'
-import { Spinner } from '../Spinner.js'
-import { CapabilitiesSection } from './CapabilitiesSection.js'
-import type { StdioServerInfo } from './types.js'
-import {
-  handleReconnectError,
-  handleReconnectResult,
-} from './utils/reconnectHelpers.js'
+import figures from 'figures';
+import React, { useState } from 'react';
+import type { CommandResultDisplay } from '../../commands.js';
+import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js';
+import { Box, color, Text, useTheme } from '@anthropic/ink';
+import { getMcpConfigByName } from '../../services/mcp/config.js';
+import { useMcpReconnect, useMcpToggleEnabled } from '../../services/mcp/MCPConnectionManager.js';
+import { describeMcpConfigFilePath, filterMcpPromptsByServer } from '../../services/mcp/utils.js';
+import { useAppState } from '../../state/AppState.js';
+import { errorMessage } from '../../utils/errors.js';
+import { capitalize } from '../../utils/stringUtils.js';
+import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js';
+import { Select } from '../CustomSelect/index.js';
+import { Byline, KeyboardShortcutHint } from '@anthropic/ink';
+import { Spinner } from '../Spinner.js';
+import { CapabilitiesSection } from './CapabilitiesSection.js';
+import type { StdioServerInfo } from './types.js';
+import { handleReconnectError, handleReconnectResult } from './utils/reconnectHelpers.js';
 
 type Props = {
-  server: StdioServerInfo
-  serverToolsCount: number
-  onViewTools: () => void
-  onCancel: () => void
-  onComplete: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-  borderless?: boolean
-}
+  server: StdioServerInfo;
+  serverToolsCount: number;
+  onViewTools: () => void;
+  onCancel: () => void;
+  onComplete: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+  borderless?: boolean;
+};
 
 export function MCPStdioServerMenu({
   server,
@@ -46,44 +34,39 @@ export function MCPStdioServerMenu({
   onComplete,
   borderless = false,
 }: Props): React.ReactNode {
-  const [theme] = useTheme()
-  const exitState = useExitOnCtrlCDWithKeybindings()
-  const mcp = useAppState(s => s.mcp)
-  const reconnectMcpServer = useMcpReconnect()
-  const toggleMcpServer = useMcpToggleEnabled()
-  const [isReconnecting, setIsReconnecting] = useState(false)
+  const [theme] = useTheme();
+  const exitState = useExitOnCtrlCDWithKeybindings();
+  const mcp = useAppState(s => s.mcp);
+  const reconnectMcpServer = useMcpReconnect();
+  const toggleMcpServer = useMcpToggleEnabled();
+  const [isReconnecting, setIsReconnecting] = useState(false);
 
   const handleToggleEnabled = React.useCallback(async () => {
-    const wasEnabled = server.client.type !== 'disabled'
+    const wasEnabled = server.client.type !== 'disabled';
 
     try {
-      await toggleMcpServer(server.name)
+      await toggleMcpServer(server.name);
       // Return to the server list so user can continue managing other servers
-      onCancel()
+      onCancel();
     } catch (err) {
-      const action = wasEnabled ? 'disable' : 'enable'
-      onComplete(
-        `Failed to ${action} MCP server '${server.name}': ${errorMessage(err)}`,
-      )
+      const action = wasEnabled ? 'disable' : 'enable';
+      onComplete(`Failed to ${action} MCP server '${server.name}': ${errorMessage(err)}`);
     }
-  }, [server.client.type, server.name, toggleMcpServer, onCancel, onComplete])
+  }, [server.client.type, server.name, toggleMcpServer, onCancel, onComplete]);
 
-  const capitalizedServerName = capitalize(String(server.name))
+  const capitalizedServerName = capitalize(String(server.name));
 
   // Count MCP prompts for this server (skills are shown in /skills, not here)
-  const serverCommandsCount = filterMcpPromptsByServer(
-    mcp.commands,
-    server.name,
-  ).length
+  const serverCommandsCount = filterMcpPromptsByServer(mcp.commands, server.name).length;
 
-  const menuOptions = []
+  const menuOptions = [];
 
   // Only show "View tools" if server is not disabled and has tools
   if (server.client.type !== 'disabled' && serverToolsCount > 0) {
     menuOptions.push({
       label: 'View tools',
       value: 'tools',
-    })
+    });
   }
 
   // Only show reconnect option if the server is not disabled
@@ -91,20 +74,20 @@ export function MCPStdioServerMenu({
     menuOptions.push({
       label: 'Reconnect',
       value: 'reconnectMcpServer',
-    })
+    });
   }
 
   menuOptions.push({
     label: server.client.type !== 'disabled' ? 'Disable' : 'Enable',
     value: 'toggle-enabled',
-  })
+  });
 
   // If there are no other options, add a back option so Select handles escape
   if (menuOptions.length === 0) {
     menuOptions.push({
       label: 'Back',
       value: 'back',
-    })
+    });
   }
 
   if (isReconnecting) {
@@ -119,16 +102,12 @@ export function MCPStdioServerMenu({
         </Box>
         <Text dimColor>This may take a few moments.</Text>
       </Box>
-    )
+    );
   }
 
   return (
     <Box flexDirection="column">
-      <Box
-        flexDirection="column"
-        paddingX={1}
-        borderStyle={borderless ? undefined : 'round'}
-      >
+      <Box flexDirection="column" paddingX={1} borderStyle={borderless ? undefined : 'round'}>
         <Box marginBottom={1}>
           <Text bold>{capitalizedServerName} MCP Server</Text>
         </Box>
@@ -164,11 +143,7 @@ export function MCPStdioServerMenu({
 
           <Box>
             <Text bold>Config location: </Text>
-            <Text dimColor>
-              {describeMcpConfigFilePath(
-                getMcpConfigByName(server.name)?.scope ?? 'dynamic',
-              )}
-            </Text>
+            <Text dimColor>{describeMcpConfigFilePath(getMcpConfigByName(server.name)?.scope ?? 'dynamic')}</Text>
           </Box>
 
           {server.client.type === 'connected' && (
@@ -193,25 +168,22 @@ export function MCPStdioServerMenu({
               options={menuOptions}
               onChange={async value => {
                 if (value === 'tools') {
-                  onViewTools()
+                  onViewTools();
                 } else if (value === 'reconnectMcpServer') {
-                  setIsReconnecting(true)
+                  setIsReconnecting(true);
                   try {
-                    const result = await reconnectMcpServer(server.name)
-                    const { message } = handleReconnectResult(
-                      result,
-                      server.name,
-                    )
-                    onComplete?.(message)
+                    const result = await reconnectMcpServer(server.name);
+                    const { message } = handleReconnectResult(result, server.name);
+                    onComplete?.(message);
                   } catch (err) {
-                    onComplete?.(handleReconnectError(err, server.name))
+                    onComplete?.(handleReconnectError(err, server.name));
                   } finally {
-                    setIsReconnecting(false)
+                    setIsReconnecting(false);
                   }
                 } else if (value === 'toggle-enabled') {
-                  await handleToggleEnabled()
+                  await handleToggleEnabled();
                 } else if (value === 'back') {
-                  onCancel()
+                  onCancel();
                 }
               }}
               onCancel={onCancel}
@@ -228,16 +200,11 @@ export function MCPStdioServerMenu({
             <Byline>
               <KeyboardShortcutHint shortcut="↑↓" action="navigate" />
               <KeyboardShortcutHint shortcut="Enter" action="select" />
-              <ConfigurableShortcutHint
-                action="confirm:no"
-                context="Confirmation"
-                fallback="Esc"
-                description="back"
-              />
+              <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="back" />
             </Byline>
           )}
         </Text>
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/components/mcp/MCPToolDetailView.tsx b/src/components/mcp/MCPToolDetailView.tsx
index 6b0b60173..99939b352 100644
--- a/src/components/mcp/MCPToolDetailView.tsx
+++ b/src/components/mcp/MCPToolDetailView.tsx
@@ -1,36 +1,27 @@
-import React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import {
-  extractMcpToolDisplayName,
-  getMcpDisplayName,
-} from '../../services/mcp/mcpStringUtils.js'
-import type { Tool } from '../../Tool.js'
-import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js'
-import { Dialog } from '@anthropic/ink'
-import type { ServerInfo } from './types.js'
+import React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { extractMcpToolDisplayName, getMcpDisplayName } from '../../services/mcp/mcpStringUtils.js';
+import type { Tool } from '../../Tool.js';
+import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js';
+import { Dialog } from '@anthropic/ink';
+import type { ServerInfo } from './types.js';
 
 type Props = {
-  tool: Tool
-  server: ServerInfo
-  onBack: () => void
-}
+  tool: Tool;
+  server: ServerInfo;
+  onBack: () => void;
+};
 
-export function MCPToolDetailView({
-  tool,
-  server,
-  onBack,
-}: Props): React.ReactNode {
-  const [toolDescription, setToolDescription] = React.useState<string>('')
+export function MCPToolDetailView({ tool, server, onBack }: Props): React.ReactNode {
+  const [toolDescription, setToolDescription] = React.useState<string>('');
 
-  const toolName = getMcpDisplayName(tool.name, server.name)
-  const fullDisplayName = tool.userFacingName
-    ? tool.userFacingName({})
-    : toolName
-  const displayName = extractMcpToolDisplayName(fullDisplayName)
+  const toolName = getMcpDisplayName(tool.name, server.name);
+  const fullDisplayName = tool.userFacingName ? tool.userFacingName({}) : toolName;
+  const displayName = extractMcpToolDisplayName(fullDisplayName);
 
-  const isReadOnly = tool.isReadOnly?.({}) ?? false
-  const isDestructive = tool.isDestructive?.({}) ?? false
-  const isOpenWorld = tool.isOpenWorld?.({}) ?? false
+  const isReadOnly = tool.isReadOnly?.({}) ?? false;
+  const isDestructive = tool.isDestructive?.({}) ?? false;
+  const isOpenWorld = tool.isOpenWorld?.({}) ?? false;
 
   React.useEffect(() => {
     async function loadDescription() {
@@ -49,14 +40,14 @@ export function MCPToolDetailView({
             },
             tools: [],
           },
-        )
-        setToolDescription(desc)
+        );
+        setToolDescription(desc);
       } catch {
-        setToolDescription('Failed to load description')
+        setToolDescription('Failed to load description');
       }
     }
-    void loadDescription()
-  }, [tool])
+    void loadDescription();
+  }, [tool]);
 
   const titleContent = (
     <>
@@ -65,7 +56,7 @@ export function MCPToolDetailView({
       {isDestructive && <Text color="error"> [destructive]</Text>}
       {isOpenWorld && <Text dimColor> [open-world]</Text>}
     </>
-  )
+  );
 
   return (
     <Dialog
@@ -76,12 +67,7 @@ export function MCPToolDetailView({
         exitState.pending ? (
           <Text>Press {exitState.keyName} again to exit</Text>
         ) : (
-          <ConfigurableShortcutHint
-            action="confirm:no"
-            context="Confirmation"
-            fallback="Esc"
-            description="go back"
-          />
+          <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="go back" />
         )
       }
     >
@@ -109,34 +95,26 @@ export function MCPToolDetailView({
             <Box flexDirection="column" marginTop={1}>
               <Text bold>Parameters:</Text>
               <Box marginLeft={2} flexDirection="column">
-                {Object.entries(tool.inputJSONSchema.properties).map(
-                  ([key, value]) => {
-                    const required = tool.inputJSONSchema?.required as
-                      | string[]
-                      | undefined
-                    const isRequired = required?.includes(key)
-                    return (
-                      <Text key={key}>
-                        • {key}
-                        {isRequired && <Text dimColor> (required)</Text>}:{' '}
-                        <Text dimColor>
-                          {typeof value === 'object' && value && 'type' in value
-                            ? String(value.type)
-                            : 'unknown'}
-                        </Text>
-                        {typeof value === 'object' &&
-                          value &&
-                          'description' in value && (
-                            <Text dimColor> - {String(value.description)}</Text>
-                          )}
+                {Object.entries(tool.inputJSONSchema.properties).map(([key, value]) => {
+                  const required = tool.inputJSONSchema?.required as string[] | undefined;
+                  const isRequired = required?.includes(key);
+                  return (
+                    <Text key={key}>
+                      • {key}
+                      {isRequired && <Text dimColor> (required)</Text>}:{' '}
+                      <Text dimColor>
+                        {typeof value === 'object' && value && 'type' in value ? String(value.type) : 'unknown'}
                       </Text>
-                    )
-                  },
-                )}
+                      {typeof value === 'object' && value && 'description' in value && (
+                        <Text dimColor> - {String(value.description)}</Text>
+                      )}
+                    </Text>
+                  );
+                })}
               </Box>
             </Box>
           )}
       </Box>
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/mcp/MCPToolListView.tsx b/src/components/mcp/MCPToolListView.tsx
index ad3eb3695..703af905c 100644
--- a/src/components/mcp/MCPToolListView.tsx
+++ b/src/components/mcp/MCPToolListView.tsx
@@ -1,64 +1,51 @@
-import React from 'react'
-import { Text } from '@anthropic/ink'
-import {
-  extractMcpToolDisplayName,
-  getMcpDisplayName,
-} from '../../services/mcp/mcpStringUtils.js'
-import { filterToolsByServer } from '../../services/mcp/utils.js'
-import { useAppState } from '../../state/AppState.js'
-import type { Tool } from '../../Tool.js'
-import { plural } from '../../utils/stringUtils.js'
-import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js'
-import { Select } from '../CustomSelect/index.js'
-import { Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink'
-import type { ServerInfo } from './types.js'
+import React from 'react';
+import { Text } from '@anthropic/ink';
+import { extractMcpToolDisplayName, getMcpDisplayName } from '../../services/mcp/mcpStringUtils.js';
+import { filterToolsByServer } from '../../services/mcp/utils.js';
+import { useAppState } from '../../state/AppState.js';
+import type { Tool } from '../../Tool.js';
+import { plural } from '../../utils/stringUtils.js';
+import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js';
+import { Select } from '../CustomSelect/index.js';
+import { Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink';
+import type { ServerInfo } from './types.js';
 
 type Props = {
-  server: ServerInfo
-  onSelectTool: (tool: Tool, index: number) => void
-  onBack: () => void
-}
+  server: ServerInfo;
+  onSelectTool: (tool: Tool, index: number) => void;
+  onBack: () => void;
+};
 
-export function MCPToolListView({
-  server,
-  onSelectTool,
-  onBack,
-}: Props): React.ReactNode {
-  const mcpTools = useAppState(s => s.mcp.tools)
+export function MCPToolListView({ server, onSelectTool, onBack }: Props): React.ReactNode {
+  const mcpTools = useAppState(s => s.mcp.tools);
 
   const serverTools = React.useMemo(() => {
-    if (server.client.type !== 'connected') return []
-    return filterToolsByServer(mcpTools, server.name)
-  }, [server, mcpTools])
+    if (server.client.type !== 'connected') return [];
+    return filterToolsByServer(mcpTools, server.name);
+  }, [server, mcpTools]);
 
   const toolOptions = serverTools.map((tool, index) => {
-    const toolName = getMcpDisplayName(tool.name, server.name)
-    const fullDisplayName = tool.userFacingName
-      ? tool.userFacingName({})
-      : toolName
+    const toolName = getMcpDisplayName(tool.name, server.name);
+    const fullDisplayName = tool.userFacingName ? tool.userFacingName({}) : toolName;
     // Extract just the tool display name without server prefix
-    const displayName = extractMcpToolDisplayName(fullDisplayName)
+    const displayName = extractMcpToolDisplayName(fullDisplayName);
 
-    const isReadOnly = tool.isReadOnly?.({}) ?? false
-    const isDestructive = tool.isDestructive?.({}) ?? false
-    const isOpenWorld = tool.isOpenWorld?.({}) ?? false
+    const isReadOnly = tool.isReadOnly?.({}) ?? false;
+    const isDestructive = tool.isDestructive?.({}) ?? false;
+    const isOpenWorld = tool.isOpenWorld?.({}) ?? false;
 
-    const annotations = []
-    if (isReadOnly) annotations.push('read-only')
-    if (isDestructive) annotations.push('destructive')
-    if (isOpenWorld) annotations.push('open-world')
+    const annotations = [];
+    if (isReadOnly) annotations.push('read-only');
+    if (isDestructive) annotations.push('destructive');
+    if (isOpenWorld) annotations.push('open-world');
 
     return {
       label: displayName,
       value: index.toString(),
       description: annotations.length > 0 ? annotations.join(', ') : undefined,
-      descriptionColor: isDestructive
-        ? 'error'
-        : isReadOnly
-          ? 'success'
-          : undefined,
-    }
-  })
+      descriptionColor: isDestructive ? 'error' : isReadOnly ? 'success' : undefined,
+    };
+  });
 
   return (
     <Dialog
@@ -72,12 +59,7 @@ export function MCPToolListView({
           <Byline>
             <KeyboardShortcutHint shortcut="↑↓" action="navigate" />
             <KeyboardShortcutHint shortcut="Enter" action="select" />
-            <ConfigurableShortcutHint
-              action="confirm:no"
-              context="Confirmation"
-              fallback="Esc"
-              description="back"
-            />
+            <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="back" />
           </Byline>
         )
       }
@@ -88,15 +70,15 @@ export function MCPToolListView({
         <Select
           options={toolOptions}
           onChange={value => {
-            const index = parseInt(value)
-            const tool = serverTools[index]
+            const index = parseInt(value, 10);
+            const tool = serverTools[index];
             if (tool) {
-              onSelectTool(tool, index)
+              onSelectTool(tool, index);
             }
           }}
           onCancel={onBack}
         />
       )}
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/mcp/McpParsingWarnings.tsx b/src/components/mcp/McpParsingWarnings.tsx
index c50946a91..e86ee599a 100644
--- a/src/components/mcp/McpParsingWarnings.tsx
+++ b/src/components/mcp/McpParsingWarnings.tsx
@@ -1,36 +1,31 @@
-import React, { useMemo } from 'react'
-import { getMcpConfigsByScope } from 'src/services/mcp/config.js'
-import type { ConfigScope } from 'src/services/mcp/types.js'
-import {
-  describeMcpConfigFilePath,
-  getScopeLabel,
-} from 'src/services/mcp/utils.js'
-import type { ValidationError } from 'src/utils/settings/validation.js'
-import { Box, Link, Text } from '@anthropic/ink'
+import React, { useMemo } from 'react';
+import { getMcpConfigsByScope } from 'src/services/mcp/config.js';
+import type { ConfigScope } from 'src/services/mcp/types.js';
+import { describeMcpConfigFilePath, getScopeLabel } from 'src/services/mcp/utils.js';
+import type { ValidationError } from 'src/utils/settings/validation.js';
+import { Box, Link, Text } from '@anthropic/ink';
 
 function McpConfigErrorSection({
   scope,
   parsingErrors,
   warnings,
 }: {
-  scope: ConfigScope
-  parsingErrors: ValidationError[]
-  warnings: ValidationError[]
+  scope: ConfigScope;
+  parsingErrors: ValidationError[];
+  warnings: ValidationError[];
 }): React.ReactNode {
-  const hasErrors = parsingErrors.length > 0
-  const hasWarnings = warnings.length > 0
+  const hasErrors = parsingErrors.length > 0;
+  const hasWarnings = warnings.length > 0;
 
   if (!hasErrors && !hasWarnings) {
-    return null
+    return null;
   }
 
   return (
     <Box flexDirection="column" marginTop={1}>
       <Box>
         {(hasErrors || hasWarnings) && (
-          <Text color={hasErrors ? 'error' : 'warning'}>
-            [{hasErrors ? 'Failed to parse' : 'Contains warnings'}]{' '}
-          </Text>
+          <Text color={hasErrors ? 'error' : 'warning'}>[{hasErrors ? 'Failed to parse' : 'Contains warnings'}] </Text>
         )}
         <Text>{getScopeLabel(scope)}</Text>
       </Box>
@@ -40,7 +35,7 @@ function McpConfigErrorSection({
       </Box>
       <Box marginLeft={1} flexDirection="column">
         {parsingErrors.map((error, i) => {
-          const serverName = error.mcpErrorMetadata?.serverName
+          const serverName = error.mcpErrorMetadata?.serverName;
           return (
             <Box key={`error-${i}`}>
               <Text>
@@ -54,10 +49,10 @@ function McpConfigErrorSection({
                 </Text>
               </Text>
             </Box>
-          )
+          );
         })}
         {warnings.map((warning, i) => {
-          const serverName = warning.mcpErrorMetadata?.serverName
+          const serverName = warning.mcpErrorMetadata?.serverName;
 
           return (
             <Box key={`warning-${i}`}>
@@ -67,18 +62,16 @@ function McpConfigErrorSection({
                 <Text dimColor>
                   {' '}
                   {serverName && `[${serverName}] `}
-                  {warning.path && warning.path !== ''
-                    ? `${warning.path}: `
-                    : ''}
+                  {warning.path && warning.path !== '' ? `${warning.path}: ` : ''}
                   {warning.message}
                 </Text>
               </Text>
             </Box>
-          )
+          );
         })}
       </Box>
     </Box>
-  )
+  );
 }
 
 export function McpParsingWarnings(): React.ReactNode {
@@ -92,21 +85,17 @@ export function McpParsingWarnings(): React.ReactNode {
         { scope: 'local', config: getMcpConfigsByScope('local') },
         { scope: 'enterprise', config: getMcpConfigsByScope('enterprise') },
       ] satisfies Array<{
-        scope: ConfigScope
-        config: { errors: ValidationError[] }
+        scope: ConfigScope;
+        config: { errors: ValidationError[] };
       }>,
     [],
-  )
+  );
 
-  const hasParsingErrors = scopes.some(
-    ({ config }) => filterErrors(config.errors, 'fatal').length > 0,
-  )
-  const hasWarnings = scopes.some(
-    ({ config }) => filterErrors(config.errors, 'warning').length > 0,
-  )
+  const hasParsingErrors = scopes.some(({ config }) => filterErrors(config.errors, 'fatal').length > 0);
+  const hasWarnings = scopes.some(({ config }) => filterErrors(config.errors, 'warning').length > 0);
 
   if (!hasParsingErrors && !hasWarnings) {
-    return null
+    return null;
   }
 
   return (
@@ -115,9 +104,7 @@ export function McpParsingWarnings(): React.ReactNode {
       <Box marginTop={1}>
         <Text dimColor>
           For help configuring MCP servers, see:{' '}
-          <Link url="https://code.claude.com/docs/en/mcp">
-            https://code.claude.com/docs/en/mcp
-          </Link>
+          <Link url="https://code.claude.com/docs/en/mcp">https://code.claude.com/docs/en/mcp</Link>
         </Text>
       </Box>
       {scopes.map(({ scope, config }) => (
@@ -136,12 +123,9 @@ export function McpParsingWarnings(): React.ReactNode {
        * - Approved / disabled status of servers
        */}
     </Box>
-  )
+  );
 }
 
-function filterErrors(
-  errors: ValidationError[],
-  severity: 'fatal' | 'warning',
-): ValidationError[] {
-  return errors.filter(e => e.mcpErrorMetadata?.severity === severity)
+function filterErrors(errors: ValidationError[], severity: 'fatal' | 'warning'): ValidationError[] {
+  return errors.filter(e => e.mcpErrorMetadata?.severity === severity);
 }
diff --git a/src/components/mcp/src/services/analytics/index.ts b/src/components/mcp/src/services/analytics/index.ts
index 142e7b6f5..2e0f796da 100644
--- a/src/components/mcp/src/services/analytics/index.ts
+++ b/src/components/mcp/src/services/analytics/index.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any;
-export type logEvent = any;
+export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any
+export type logEvent = any
diff --git a/src/components/mcp/src/services/mcp/config.ts b/src/components/mcp/src/services/mcp/config.ts
index 05cc41c4c..a9189cc08 100644
--- a/src/components/mcp/src/services/mcp/config.ts
+++ b/src/components/mcp/src/services/mcp/config.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getMcpConfigsByScope = any;
+export type getMcpConfigsByScope = any
diff --git a/src/components/mcp/src/services/mcp/types.ts b/src/components/mcp/src/services/mcp/types.ts
index f604edd2e..11f265958 100644
--- a/src/components/mcp/src/services/mcp/types.ts
+++ b/src/components/mcp/src/services/mcp/types.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type ConfigScope = any;
+export type ConfigScope = any
diff --git a/src/components/mcp/src/services/mcp/utils.ts b/src/components/mcp/src/services/mcp/utils.ts
index e6cf8a737..1f6122d82 100644
--- a/src/components/mcp/src/services/mcp/utils.ts
+++ b/src/components/mcp/src/services/mcp/utils.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type describeMcpConfigFilePath = any;
-export type getScopeLabel = any;
+export type describeMcpConfigFilePath = any
+export type getScopeLabel = any
diff --git a/src/components/mcp/src/utils/settings/validation.ts b/src/components/mcp/src/utils/settings/validation.ts
index 6ed579a6a..6c0d4406c 100644
--- a/src/components/mcp/src/utils/settings/validation.ts
+++ b/src/components/mcp/src/utils/settings/validation.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type ValidationError = any;
+export type ValidationError = any
diff --git a/src/components/mcp/types.ts b/src/components/mcp/types.ts
index cd22d6bf2..19a79d3ab 100644
--- a/src/components/mcp/types.ts
+++ b/src/components/mcp/types.ts
@@ -1,8 +1,8 @@
 // Auto-generated stub — replace with real implementation
-export type ServerInfo = any;
-export type AgentMcpServerInfo = any;
-export type MCPViewState = any;
-export type StdioServerInfo = any;
-export type ClaudeAIServerInfo = any;
-export type HTTPServerInfo = any;
-export type SSEServerInfo = any;
+export type ServerInfo = any
+export type AgentMcpServerInfo = any
+export type MCPViewState = any
+export type StdioServerInfo = any
+export type ClaudeAIServerInfo = any
+export type HTTPServerInfo = any
+export type SSEServerInfo = any
diff --git a/src/components/mcp/utils/reconnectHelpers.tsx b/src/components/mcp/utils/reconnectHelpers.tsx
index cf7459804..bf9b9a6ed 100644
--- a/src/components/mcp/utils/reconnectHelpers.tsx
+++ b/src/components/mcp/utils/reconnectHelpers.tsx
@@ -1,13 +1,10 @@
-import type { Command } from '../../../commands.js'
-import type {
-  MCPServerConnection,
-  ServerResource,
-} from '../../../services/mcp/types.js'
-import type { Tool } from '../../../Tool.js'
+import type { Command } from '../../../commands.js';
+import type { MCPServerConnection, ServerResource } from '../../../services/mcp/types.js';
+import type { Tool } from '../../../Tool.js';
 
 export interface ReconnectResult {
-  message: string
-  success: boolean
+  message: string;
+  success: boolean;
 }
 
 /**
@@ -15,10 +12,10 @@ export interface ReconnectResult {
  */
 export function handleReconnectResult(
   result: {
-    client: MCPServerConnection
-    tools: Tool[]
-    commands: Command[]
-    resources?: ServerResource[]
+    client: MCPServerConnection;
+    tools: Tool[];
+    commands: Command[];
+    resources?: ServerResource[];
   },
   serverName: string,
 ): ReconnectResult {
@@ -27,35 +24,32 @@ export function handleReconnectResult(
       return {
         message: `Reconnected to ${serverName}.`,
         success: true,
-      }
+      };
 
     case 'needs-auth':
       return {
         message: `${serverName} requires authentication. Use the 'Authenticate' option.`,
         success: false,
-      }
+      };
 
     case 'failed':
       return {
         message: `Failed to reconnect to ${serverName}.`,
         success: false,
-      }
+      };
 
     default:
       return {
         message: `Unknown result when reconnecting to ${serverName}.`,
         success: false,
-      }
+      };
   }
 }
 
 /**
  * Handles errors from reconnect attempts
  */
-export function handleReconnectError(
-  error: unknown,
-  serverName: string,
-): string {
-  const errorMessage = error instanceof Error ? error.message : String(error)
-  return `Error reconnecting to ${serverName}: ${errorMessage}`
+export function handleReconnectError(error: unknown, serverName: string): string {
+  const errorMessage = error instanceof Error ? error.message : String(error);
+  return `Error reconnecting to ${serverName}: ${errorMessage}`;
 }
diff --git a/src/components/memory/MemoryFileSelector.tsx b/src/components/memory/MemoryFileSelector.tsx
index 62d1f0d5b..90a5beca8 100644
--- a/src/components/memory/MemoryFileSelector.tsx
+++ b/src/components/memory/MemoryFileSelector.tsx
@@ -1,72 +1,65 @@
-import { feature } from 'bun:bundle'
-import chalk from 'chalk'
-import { mkdir } from 'fs/promises'
-import { join } from 'path'
-import * as React from 'react'
-import { use, useEffect, useState } from 'react'
-import { getOriginalCwd } from '../../bootstrap/state.js'
-import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js'
-import { Box, Text, ListItem } from '@anthropic/ink'
-import { useKeybinding } from '../../keybindings/useKeybinding.js'
-import { getAutoMemPath, isAutoMemoryEnabled } from '../../memdir/paths.js'
-import { logEvent } from '../../services/analytics/index.js'
-import { isAutoDreamEnabled } from '../../services/autoDream/config.js'
-import { readLastConsolidatedAt } from '../../services/autoDream/consolidationLock.js'
-import { useAppState } from '../../state/AppState.js'
-import { getAgentMemoryDir } from '@claude-code-best/builtin-tools/tools/AgentTool/agentMemory.js'
-import { openPath } from '../../utils/browser.js'
-import { getMemoryFiles, type MemoryFileInfo } from '../../utils/claudemd.js'
-import { getClaudeConfigHomeDir } from '../../utils/envUtils.js'
-import { getDisplayPath } from '../../utils/file.js'
-import { formatRelativeTimeAgo } from '../../utils/format.js'
-import { projectIsInGitRepo } from '../../utils/memory/versions.js'
-import { updateSettingsForSource } from '../../utils/settings/settings.js'
-import { Select } from '../CustomSelect/index.js'
+import { feature } from 'bun:bundle';
+import chalk from 'chalk';
+import { mkdir } from 'fs/promises';
+import { join } from 'path';
+import * as React from 'react';
+import { use, useEffect, useState } from 'react';
+import { getOriginalCwd } from '../../bootstrap/state.js';
+import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js';
+import { Box, Text, ListItem } from '@anthropic/ink';
+import { useKeybinding } from '../../keybindings/useKeybinding.js';
+import { getAutoMemPath, isAutoMemoryEnabled } from '../../memdir/paths.js';
+import { logEvent } from '../../services/analytics/index.js';
+import { isAutoDreamEnabled } from '../../services/autoDream/config.js';
+import { readLastConsolidatedAt } from '../../services/autoDream/consolidationLock.js';
+import { useAppState } from '../../state/AppState.js';
+import { getAgentMemoryDir } from '@claude-code-best/builtin-tools/tools/AgentTool/agentMemory.js';
+import { openPath } from '../../utils/browser.js';
+import { getMemoryFiles, type MemoryFileInfo } from '../../utils/claudemd.js';
+import { getClaudeConfigHomeDir } from '../../utils/envUtils.js';
+import { getDisplayPath } from '../../utils/file.js';
+import { formatRelativeTimeAgo } from '../../utils/format.js';
+import { projectIsInGitRepo } from '../../utils/memory/versions.js';
+import { updateSettingsForSource } from '../../utils/settings/settings.js';
+import { Select } from '../CustomSelect/index.js';
 
 /* eslint-disable @typescript-eslint/no-require-imports */
 const teamMemPaths = feature('TEAMMEM')
   ? (require('../../memdir/teamMemPaths.js') as typeof import('../../memdir/teamMemPaths.js'))
-  : null
+  : null;
 /* eslint-enable @typescript-eslint/no-require-imports */
 
 interface ExtendedMemoryFileInfo extends MemoryFileInfo {
-  isNested?: boolean
-  exists: boolean
+  isNested?: boolean;
+  exists: boolean;
 }
 
 // Remember last selected path
-let lastSelectedPath: string | undefined
+let lastSelectedPath: string | undefined;
 
-const OPEN_FOLDER_PREFIX = '__open_folder__'
+const OPEN_FOLDER_PREFIX = '__open_folder__';
 
 type Props = {
-  onSelect: (path: string) => void
-  onCancel: () => void
-}
+  onSelect: (path: string) => void;
+  onCancel: () => void;
+};
 
-export function MemoryFileSelector({
-  onSelect,
-  onCancel,
-}: Props): React.ReactNode {
-  const existingMemoryFiles = use(getMemoryFiles()) as MemoryFileInfo[]
+export function MemoryFileSelector({ onSelect, onCancel }: Props): React.ReactNode {
+  const existingMemoryFiles = use(getMemoryFiles()) as MemoryFileInfo[];
 
   // Create entries for User and Project CLAUDE.md even if they don't exist
-  const userMemoryPath = join(getClaudeConfigHomeDir(), 'CLAUDE.md')
-  const projectMemoryPath = join(getOriginalCwd(), 'CLAUDE.md')
+  const userMemoryPath = join(getClaudeConfigHomeDir(), 'CLAUDE.md');
+  const projectMemoryPath = join(getOriginalCwd(), 'CLAUDE.md');
 
   // Check if these are already in the existing files
-  const hasUserMemory = existingMemoryFiles.some(f => f.path === userMemoryPath)
-  const hasProjectMemory = existingMemoryFiles.some(
-    f => f.path === projectMemoryPath,
-  )
+  const hasUserMemory = existingMemoryFiles.some(f => f.path === userMemoryPath);
+  const hasProjectMemory = existingMemoryFiles.some(f => f.path === projectMemoryPath);
 
   // Filter out AutoMem/TeamMem entrypoints: these are MEMORY.md files, and
   // /memory already surfaces "Open auto-memory folder" / "Open team memory
   // folder" options below. Listing the entrypoint file separately is redundant.
   const allMemoryFiles: ExtendedMemoryFileInfo[] = [
-    ...existingMemoryFiles
-      .filter(f => f.type !== 'AutoMem' && f.type !== 'TeamMem')
-      .map(f => ({ ...f, exists: true })),
+    ...existingMemoryFiles.filter(f => f.type !== 'AutoMem' && f.type !== 'TeamMem').map(f => ({ ...f, exists: true })),
     // Add User memory if it doesn't exist
     ...(hasUserMemory
       ? []
@@ -89,86 +82,74 @@ export function MemoryFileSelector({
             exists: false,
           },
         ]),
-  ]
+  ];
 
-  const depths = new Map<string, number>()
+  const depths = new Map<string, number>();
 
   // Create options for the select component
   const memoryOptions = allMemoryFiles.map(file => {
-    const displayPath = getDisplayPath(file.path)
-    const existsLabel = file.exists ? '' : ' (new)'
+    const displayPath = getDisplayPath(file.path);
+    const existsLabel = file.exists ? '' : ' (new)';
 
     // Calculate depth based on parent
-    const depth = file.parent ? (depths.get(file.parent) ?? 0) + 1 : 0
-    depths.set(file.path, depth)
-    const indent = depth > 0 ? '  '.repeat(depth - 1) : ''
+    const depth = file.parent ? (depths.get(file.parent) ?? 0) + 1 : 0;
+    depths.set(file.path, depth);
+    const indent = depth > 0 ? '  '.repeat(depth - 1) : '';
 
     // Format label based on type
-    let label: string
-    if (
-      file.type === 'User' &&
-      !file.isNested &&
-      file.path === userMemoryPath
-    ) {
-      label = `User memory`
-    } else if (
-      file.type === 'Project' &&
-      !file.isNested &&
-      file.path === projectMemoryPath
-    ) {
-      label = `Project memory`
+    let label: string;
+    if (file.type === 'User' && !file.isNested && file.path === userMemoryPath) {
+      label = `User memory`;
+    } else if (file.type === 'Project' && !file.isNested && file.path === projectMemoryPath) {
+      label = `Project memory`;
     } else if (depth > 0) {
       // For child nodes (imported files), show indented with L
-      label = `${indent}L ${displayPath}${existsLabel}`
+      label = `${indent}L ${displayPath}${existsLabel}`;
     } else {
       // For other memory files, just show the path
-      label = `${displayPath}`
+      label = `${displayPath}`;
     }
 
     // Create description based on type - keep the original descriptions for built-in types
-    let description: string
-    const isGit = projectIsInGitRepo(getOriginalCwd())
+    let description: string;
+    const isGit = projectIsInGitRepo(getOriginalCwd());
 
     if (file.type === 'User' && !file.isNested) {
-      description = 'Saved in ~/.claude/CLAUDE.md'
-    } else if (
-      file.type === 'Project' &&
-      !file.isNested &&
-      file.path === projectMemoryPath
-    ) {
-      description = `${isGit ? 'Checked in at' : 'Saved in'} ./CLAUDE.md`
+      description = 'Saved in ~/.claude/CLAUDE.md';
+    } else if (file.type === 'Project' && !file.isNested && file.path === projectMemoryPath) {
+      description = `${isGit ? 'Checked in at' : 'Saved in'} ./CLAUDE.md`;
     } else if (file.parent) {
       // For imported files (with @-import)
-      description = '@-imported'
+      description = '@-imported';
     } else if (file.isNested) {
       // For nested files (dynamically loaded)
-      description = 'dynamically loaded'
+      description = 'dynamically loaded';
     } else {
-      description = ''
+      description = '';
     }
 
     return {
       label,
       value: file.path,
       description,
-    }
-  })
+    };
+  });
 
   // Add "Open folder" options for auto-memory and agent memory directories
   const folderOptions: Array<{
-    label: string
-    value: string
-    description: string
-  }> = []
+    label: string;
+    value: string;
+    description: string;
+  }> = [];
 
-  const agentDefinitions = useAppState(s => s.agentDefinitions)
+  const agentDefinitions = useAppState(s => s.agentDefinitions);
   if (isAutoMemoryEnabled()) {
     // Always show auto-memory folder option
     folderOptions.push({
       label: 'Open auto-memory folder',
       value: `${OPEN_FOLDER_PREFIX}${getAutoMemPath()}`,
       description: '',
-    })
+    });
 
     // Team memory directly below auto-memory (team dir is a subdir of auto dir)
     if (feature('TEAMMEM') && teamMemPaths!.isTeamMemoryEnabled()) {
@@ -176,52 +157,49 @@ export function MemoryFileSelector({
         label: 'Open team memory folder',
         value: `${OPEN_FOLDER_PREFIX}${teamMemPaths!.getTeamMemPath()}`,
         description: '',
-      })
+      });
     }
 
     // Add agent memory folders for agents that have memory configured
     for (const agent of agentDefinitions.activeAgents) {
       if (agent.memory) {
-        const agentDir = getAgentMemoryDir(agent.agentType, agent.memory)
+        const agentDir = getAgentMemoryDir(agent.agentType, agent.memory);
         folderOptions.push({
           label: `Open ${chalk.bold(agent.agentType)} agent memory`,
           value: `${OPEN_FOLDER_PREFIX}${agentDir}`,
           description: `${agent.memory} scope`,
-        })
+        });
       }
     }
   }
 
-  memoryOptions.push(...folderOptions)
+  memoryOptions.push(...folderOptions);
 
   // Initialize with last selected path if it's still in the options, otherwise use first option
   const initialPath =
-    lastSelectedPath &&
-    memoryOptions.some(opt => opt.value === lastSelectedPath)
+    lastSelectedPath && memoryOptions.some(opt => opt.value === lastSelectedPath)
       ? lastSelectedPath
-      : memoryOptions[0]?.value || ''
+      : memoryOptions[0]?.value || '';
 
   // Toggle state (local copy of settings so the UI updates immediately)
-  const [autoMemoryOn, setAutoMemoryOn] = useState(isAutoMemoryEnabled)
-  const [autoDreamOn, setAutoDreamOn] = useState(isAutoDreamEnabled)
+  const [autoMemoryOn, setAutoMemoryOn] = useState(isAutoMemoryEnabled);
+  const [autoDreamOn, setAutoDreamOn] = useState(isAutoDreamEnabled);
 
   // Dream row is only meaningful when auto-memory is on (dream consolidates
   // that dir). Snapshot at mount so the row doesn't vanish mid-navigation
   // if the user toggles auto-memory off.
-  const [showDreamRow] = useState(isAutoMemoryEnabled)
+  const [showDreamRow] = useState(isAutoMemoryEnabled);
 
   // Dream status: prefer live task state (this session fired it), fall back
   // to the cross-process lock mtime.
   const isDreamRunning = useAppState(s =>
-    Object.values(s.tasks).some(
-      t => t.type === 'dream' && t.status === 'running',
-    ),
-  )
-  const [lastDreamAt, setLastDreamAt] = useState<number | null>(null)
+    Object.values(s.tasks).some(t => t.type === 'dream' && t.status === 'running'),
+  );
+  const [lastDreamAt, setLastDreamAt] = useState<number | null>(null);
   useEffect(() => {
-    if (!showDreamRow) return
-    void readLastConsolidatedAt().then(setLastDreamAt)
-  }, [showDreamRow, isDreamRunning])
+    if (!showDreamRow) return;
+    void readLastConsolidatedAt().then(setLastDreamAt);
+  }, [showDreamRow, isDreamRunning]);
 
   const dreamStatus = isDreamRunning
     ? 'running'
@@ -229,55 +207,53 @@ export function MemoryFileSelector({
       ? '' // stat in flight
       : lastDreamAt === 0
         ? 'never'
-        : `last ran ${formatRelativeTimeAgo(new Date(lastDreamAt))}`
+        : `last ran ${formatRelativeTimeAgo(new Date(lastDreamAt))}`;
 
   // null = Select has focus, 0 = auto-memory, 1 = auto-dream (if showDreamRow)
-  const [focusedToggle, setFocusedToggle] = useState<number | null>(null)
-  const toggleFocused = focusedToggle !== null
-  const lastToggleIndex = showDreamRow ? 1 : 0
+  const [focusedToggle, setFocusedToggle] = useState<number | null>(null);
+  const toggleFocused = focusedToggle !== null;
+  const lastToggleIndex = showDreamRow ? 1 : 0;
 
   function handleToggleAutoMemory(): void {
-    const newValue = !autoMemoryOn
-    updateSettingsForSource('userSettings', { autoMemoryEnabled: newValue })
-    setAutoMemoryOn(newValue)
-    logEvent('tengu_auto_memory_toggled', { enabled: newValue })
+    const newValue = !autoMemoryOn;
+    updateSettingsForSource('userSettings', { autoMemoryEnabled: newValue });
+    setAutoMemoryOn(newValue);
+    logEvent('tengu_auto_memory_toggled', { enabled: newValue });
   }
 
   function handleToggleAutoDream(): void {
-    const newValue = !autoDreamOn
-    updateSettingsForSource('userSettings', { autoDreamEnabled: newValue })
-    setAutoDreamOn(newValue)
-    logEvent('tengu_auto_dream_toggled', { enabled: newValue })
+    const newValue = !autoDreamOn;
+    updateSettingsForSource('userSettings', { autoDreamEnabled: newValue });
+    setAutoDreamOn(newValue);
+    logEvent('tengu_auto_dream_toggled', { enabled: newValue });
   }
 
-  useExitOnCtrlCDWithKeybindings()
+  useExitOnCtrlCDWithKeybindings();
 
-  useKeybinding('confirm:no', onCancel, { context: 'Confirmation' })
+  useKeybinding('confirm:no', onCancel, { context: 'Confirmation' });
 
   useKeybinding(
     'confirm:yes',
     () => {
-      if (focusedToggle === 0) handleToggleAutoMemory()
-      else if (focusedToggle === 1) handleToggleAutoDream()
+      if (focusedToggle === 0) handleToggleAutoMemory();
+      else if (focusedToggle === 1) handleToggleAutoDream();
     },
     { context: 'Confirmation', isActive: toggleFocused },
-  )
+  );
   useKeybinding(
     'select:next',
     () => {
-      setFocusedToggle(prev =>
-        prev !== null && prev < lastToggleIndex ? prev + 1 : null,
-      )
+      setFocusedToggle(prev => (prev !== null && prev < lastToggleIndex ? prev + 1 : null));
     },
     { context: 'Select', isActive: toggleFocused },
-  )
+  );
   useKeybinding(
     'select:previous',
     () => {
-      setFocusedToggle(prev => (prev !== null && prev > 0 ? prev - 1 : prev))
+      setFocusedToggle(prev => (prev !== null && prev > 0 ? prev - 1 : prev));
     },
     { context: 'Select', isActive: toggleFocused },
-  )
+  );
 
   return (
     <Box flexDirection="column" width="100%">
@@ -290,9 +266,7 @@ export function MemoryFileSelector({
             <Text color={focusedToggle === 1 ? 'suggestion' : undefined}>
               Auto-dream: {autoDreamOn ? 'on' : 'off'}
               {dreamStatus && <Text dimColor> · {dreamStatus}</Text>}
-              {!isDreamRunning && autoDreamOn && (
-                <Text dimColor> · /dream to run</Text>
-              )}
+              {!isDreamRunning && autoDreamOn && <Text dimColor> · /dream to run</Text>}
             </Text>
           </ListItem>
         )}
@@ -304,20 +278,20 @@ export function MemoryFileSelector({
         isDisabled={toggleFocused}
         onChange={value => {
           if (value.startsWith(OPEN_FOLDER_PREFIX)) {
-            const folderPath = value.slice(OPEN_FOLDER_PREFIX.length)
+            const folderPath = value.slice(OPEN_FOLDER_PREFIX.length);
             // Ensure folder exists before opening (idempotent; swallow
             // permission errors to match previous behavior)
             void mkdir(folderPath, { recursive: true })
               .catch(() => {})
-              .then(() => openPath(folderPath))
-            return
+              .then(() => openPath(folderPath));
+            return;
           }
-          lastSelectedPath = value // Remember the selection
-          onSelect(value)
+          lastSelectedPath = value; // Remember the selection
+          onSelect(value);
         }}
         onCancel={onCancel}
         onUpFromFirstItem={() => setFocusedToggle(lastToggleIndex)}
       />
     </Box>
-  )
+  );
 }
diff --git a/src/components/memory/MemoryUpdateNotification.tsx b/src/components/memory/MemoryUpdateNotification.tsx
index 5e2db19b7..bdae1d2e8 100644
--- a/src/components/memory/MemoryUpdateNotification.tsx
+++ b/src/components/memory/MemoryUpdateNotification.tsx
@@ -1,42 +1,32 @@
-import { homedir } from 'os'
-import { relative } from 'path'
-import React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { getCwd } from '../../utils/cwd.js'
+import { homedir } from 'os';
+import { relative } from 'path';
+import React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { getCwd } from '../../utils/cwd.js';
 
 export function getRelativeMemoryPath(path: string): string {
-  const homeDir = homedir()
-  const cwd = getCwd()
+  const homeDir = homedir();
+  const cwd = getCwd();
 
   // Calculate relative paths
-  const relativeToHome = path.startsWith(homeDir)
-    ? '~' + path.slice(homeDir.length)
-    : null
+  const relativeToHome = path.startsWith(homeDir) ? '~' + path.slice(homeDir.length) : null;
 
-  const relativeToCwd = path.startsWith(cwd) ? './' + relative(cwd, path) : null
+  const relativeToCwd = path.startsWith(cwd) ? './' + relative(cwd, path) : null;
 
   // Return the shorter path, or absolute if neither is applicable
   if (relativeToHome && relativeToCwd) {
-    return relativeToHome.length <= relativeToCwd.length
-      ? relativeToHome
-      : relativeToCwd
+    return relativeToHome.length <= relativeToCwd.length ? relativeToHome : relativeToCwd;
   }
 
-  return relativeToHome || relativeToCwd || path
+  return relativeToHome || relativeToCwd || path;
 }
 
-export function MemoryUpdateNotification({
-  memoryPath,
-}: {
-  memoryPath: string
-}): React.ReactNode {
-  const displayPath = getRelativeMemoryPath(memoryPath)
+export function MemoryUpdateNotification({ memoryPath }: { memoryPath: string }): React.ReactNode {
+  const displayPath = getRelativeMemoryPath(memoryPath);
 
   return (
     <Box flexDirection="column" flexGrow={1}>
-      <Text color="text">
-        Memory updated in {displayPath} · /memory to edit
-      </Text>
+      <Text color="text">Memory updated in {displayPath} · /memory to edit</Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/messageActions.tsx b/src/components/messageActions.tsx
index 098aff640..d8e509afd 100644
--- a/src/components/messageActions.tsx
+++ b/src/components/messageActions.tsx
@@ -1,25 +1,30 @@
-import figures from 'figures'
-import type { RefObject } from 'react'
-import React, { useCallback, useMemo, useRef } from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { useKeybindings } from '../keybindings/useKeybinding.js'
-import { logEvent } from '../services/analytics/index.js'
-import type {
-  NormalizedUserMessage,
-  RenderableMessage,
-} from '../types/message.js'
-import { isEmptyMessageText, SYNTHETIC_MESSAGES } from '../utils/messages.js'
+import figures from 'figures';
+import type { RefObject } from 'react';
+import React, { useCallback, useMemo, useRef } from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { useKeybindings } from '../keybindings/useKeybinding.js';
+import { logEvent } from '../services/analytics/index.js';
+import type { NormalizedUserMessage, RenderableMessage } from '../types/message.js';
+import { isEmptyMessageText, SYNTHETIC_MESSAGES } from '../utils/messages.js';
 
 // Helper type: narrow the first element of MessageContent to a block with known shape.
 // MessageContent = string | ContentBlockParam[] | ContentBlock[], so indexing gives
 // string | ContentBlockParam | ContentBlock which doesn't expose .type/.text directly.
-type ContentBlock = { type: string; text?: string; name?: string; input?: unknown; id?: string; content?: unknown; [key: string]: unknown }
+type ContentBlock = {
+  type: string;
+  text?: string;
+  name?: string;
+  input?: unknown;
+  id?: string;
+  content?: unknown;
+  [key: string]: unknown;
+};
 const firstBlock = (content: unknown): ContentBlock | undefined => {
-  if (!Array.isArray(content)) return undefined
-  const b = content[0]
-  if (b == null || typeof b === 'string') return undefined
-  return b as ContentBlock
-}
+  if (!Array.isArray(content)) return undefined;
+  const b = content[0];
+  if (b == null || typeof b === 'string') return undefined;
+  return b as ContentBlock;
+};
 
 const NAVIGABLE_TYPES = [
   'user',
@@ -28,41 +33,35 @@ const NAVIGABLE_TYPES = [
   'collapsed_read_search',
   'system',
   'attachment',
-] as const
-export type NavigableType = (typeof NAVIGABLE_TYPES)[number]
+] as const;
+export type NavigableType = (typeof NAVIGABLE_TYPES)[number];
 
-export type NavigableOf<T extends NavigableType> = Extract<
-  RenderableMessage,
-  { type: T }
->
-export type NavigableMessage = RenderableMessage
+export type NavigableOf<T extends NavigableType> = Extract<RenderableMessage, { type: T }>;
+export type NavigableMessage = RenderableMessage;
 
 // Tier-2 blocklist (tier-1 is height > 0) — things that render but aren't actionable.
 export function isNavigableMessage(msg: NavigableMessage): boolean {
   switch (msg.type) {
     case 'assistant': {
-      const b = firstBlock(msg.message.content)
+      const b = firstBlock(msg.message.content);
       // Text responses (minus AssistantTextMessage's return-null cases — tier-1
       // misses unmeasured virtual items), or tool calls with extractable input.
       return (
-        (b?.type === 'text' &&
-          !isEmptyMessageText(b.text!) &&
-          !SYNTHETIC_MESSAGES.has(b.text!)) ||
+        (b?.type === 'text' && !isEmptyMessageText(b.text!) && !SYNTHETIC_MESSAGES.has(b.text!)) ||
         (b?.type === 'tool_use' && b.name! in PRIMARY_INPUT)
-      )
+      );
     }
     case 'user': {
-      if (msg.isMeta || msg.isCompactSummary) return false
-      const b = firstBlock(msg.message.content)
-      if (b?.type !== 'text') return false
+      if (msg.isMeta || msg.isCompactSummary) return false;
+      const b = firstBlock(msg.message.content);
+      if (b?.type !== 'text') return false;
       // Interrupt etc. — synthetic, not user-authored.
-      if (SYNTHETIC_MESSAGES.has(b.text!)) return false
+      if (SYNTHETIC_MESSAGES.has(b.text!)) return false;
       // Same filter as VirtualMessageList sticky-prompt: XML-wrapped (command
       // expansions, bash-stdout, etc.) aren't real prompts.
-      return !stripSystemReminders(b.text!).startsWith('<')
+      return !stripSystemReminders(b.text!).startsWith('<');
     }
     case 'system':
-      // biome-ignore lint/nursery/useExhaustiveSwitchCases: blocklist — fallthrough return-true is the design
       switch (msg.subtype) {
         case 'api_metrics':
         case 'stop_hook_summary':
@@ -71,31 +70,30 @@ export function isNavigableMessage(msg: NavigableMessage): boolean {
         case 'agents_killed':
         case 'away_summary':
         case 'thinking':
-          return false
+          return false;
       }
-      return true
+      return true;
     case 'grouped_tool_use':
     case 'collapsed_read_search':
-      return true
+      return true;
     case 'attachment':
       switch (msg.attachment.type) {
         case 'queued_command':
         case 'diagnostics':
         case 'hook_blocking_error':
         case 'hook_error_during_execution':
-          return true
+          return true;
       }
-      return false
+      return false;
   }
-  return false
+  return false;
 }
 
 type PrimaryInput = {
-  label: string
-  extract: (input: Record<string, unknown>) => string | undefined
-}
-const str = (k: string) => (i: Record<string, unknown>) =>
-  typeof i[k] === 'string' ? i[k] : undefined
+  label: string;
+  extract: (input: Record<string, unknown>) => string | undefined;
+};
+const str = (k: string) => (i: Record<string, unknown>) => (typeof i[k] === 'string' ? i[k] : undefined);
 const PRIMARY_INPUT: Record<string, PrimaryInput> = {
   Read: { label: 'path', extract: str('file_path') },
   Edit: { label: 'path', extract: str('file_path') },
@@ -110,55 +108,45 @@ const PRIMARY_INPUT: Record<string, PrimaryInput> = {
   Agent: { label: 'prompt', extract: str('prompt') },
   Tmux: {
     label: 'command',
-    extract: i =>
-      Array.isArray(i.args) ? `tmux ${i.args.join(' ')}` : undefined,
+    extract: i => (Array.isArray(i.args) ? `tmux ${i.args.join(' ')}` : undefined),
   },
-}
+};
 
 // Only AgentTool has renderGroupedToolUse — Edit/Bash/etc. stay as assistant tool_use blocks.
-export function toolCallOf(
-  msg: NavigableMessage,
-): { name: string; input: Record<string, unknown> } | undefined {
+export function toolCallOf(msg: NavigableMessage): { name: string; input: Record<string, unknown> } | undefined {
   if (msg.type === 'assistant') {
-    const b = firstBlock(msg.message.content)
-    if (b?.type === 'tool_use')
-      return { name: b.name!, input: b.input as Record<string, unknown> }
+    const b = firstBlock(msg.message.content);
+    if (b?.type === 'tool_use') return { name: b.name!, input: b.input as Record<string, unknown> };
   }
   if (msg.type === 'grouped_tool_use') {
-    const b = firstBlock(msg.messages[0]?.message.content)
-    if (b?.type === 'tool_use')
-      return { name: msg.toolName, input: b.input as Record<string, unknown> }
+    const b = firstBlock(msg.messages[0]?.message.content);
+    if (b?.type === 'tool_use') return { name: msg.toolName, input: b.input as Record<string, unknown> };
   }
-  return undefined
+  return undefined;
 }
 
 export type MessageActionCaps = {
-  copy: (text: string) => void
-  edit: (msg: NormalizedUserMessage) => Promise<void>
-}
+  copy: (text: string) => void;
+  edit: (msg: NormalizedUserMessage) => Promise<void>;
+};
 
 // Identity builder — preserves tuple type so `run`'s param narrows (array literal widens without this).
 function action<const T extends NavigableType, const K extends string>(a: {
-  key: K
-  label: string | ((s: MessageActionsState) => string)
-  types: readonly T[]
-  applies?: (s: MessageActionsState) => boolean
-  stays?: true
-  run: (m: NavigableOf<T>, caps: MessageActionCaps) => void
+  key: K;
+  label: string | ((s: MessageActionsState) => string);
+  types: readonly T[];
+  applies?: (s: MessageActionsState) => boolean;
+  stays?: true;
+  run: (m: NavigableOf<T>, caps: MessageActionCaps) => void;
 }) {
-  return a
+  return a;
 }
 
 export const MESSAGE_ACTIONS = [
   action({
     key: 'enter',
     label: s => (s.expanded ? 'collapse' : 'expand'),
-    types: [
-      'grouped_tool_use',
-      'collapsed_read_search',
-      'attachment',
-      'system',
-    ],
+    types: ['grouped_tool_use', 'collapsed_read_search', 'attachment', 'system'],
     stays: true,
     // Empty — `stays` handled inline by dispatch.
     run: () => {},
@@ -182,48 +170,43 @@ export const MESSAGE_ACTIONS = [
     types: ['grouped_tool_use', 'assistant'],
     applies: s => s.toolName != null && s.toolName in PRIMARY_INPUT,
     run: (m, c) => {
-      const tc = toolCallOf(m)
-      if (!tc) return
-      const val = PRIMARY_INPUT[tc.name]?.extract(tc.input)
-      if (val) c.copy(val)
+      const tc = toolCallOf(m);
+      if (!tc) return;
+      const val = PRIMARY_INPUT[tc.name]?.extract(tc.input);
+      if (val) c.copy(val);
     },
   }),
-] as const
+] as const;
 
-function isApplicable(
-  a: (typeof MESSAGE_ACTIONS)[number],
-  c: MessageActionsState,
-): boolean {
-  if (!(a.types as readonly string[]).includes(c.msgType)) return false
-  return !a.applies || a.applies(c)
+function isApplicable(a: (typeof MESSAGE_ACTIONS)[number], c: MessageActionsState): boolean {
+  if (!(a.types as readonly string[]).includes(c.msgType)) return false;
+  return !a.applies || a.applies(c);
 }
 
 export type MessageActionsState = {
-  uuid: string
-  msgType: NavigableType
-  expanded: boolean
-  toolName?: string
-}
+  uuid: string;
+  msgType: NavigableType;
+  expanded: boolean;
+  toolName?: string;
+};
 
 export type MessageActionsNav = {
-  enterCursor: () => void
-  navigatePrev: () => void
-  navigateNext: () => void
-  navigatePrevUser: () => void
-  navigateNextUser: () => void
-  navigateTop: () => void
-  navigateBottom: () => void
-  getSelected: () => NavigableMessage | null
-}
+  enterCursor: () => void;
+  navigatePrev: () => void;
+  navigateNext: () => void;
+  navigatePrevUser: () => void;
+  navigateNextUser: () => void;
+  navigateTop: () => void;
+  navigateBottom: () => void;
+  getSelected: () => NavigableMessage | null;
+};
 
-export const MessageActionsSelectedContext = React.createContext(false)
-export const InVirtualListContext = React.createContext(false)
+export const MessageActionsSelectedContext = React.createContext(false);
+export const InVirtualListContext = React.createContext(false);
 
 // bg must go on the Box that HAS marginTop (margin stays outside paint) — that's inside each consumer.
 export function useSelectedMessageBg(): 'messageActionsBackground' | undefined {
-  return React.useContext(MessageActionsSelectedContext)
-    ? 'messageActionsBackground'
-    : undefined
+  return React.useContext(MessageActionsSelectedContext) ? 'messageActionsBackground' : undefined;
 }
 
 // Can't call useKeybindings here — hook runs outside <KeybindingSetup> provider. Returns handlers instead.
@@ -233,14 +216,14 @@ export function useMessageActions(
   navRef: RefObject<MessageActionsNav | null>,
   caps: MessageActionCaps,
 ): {
-  enter: () => void
-  handlers: Record<string, () => void>
+  enter: () => void;
+  handlers: Record<string, () => void>;
 } {
   // Refs keep handlers stable — no useKeybindings re-register per message append.
-  const cursorRef = useRef(cursor)
-  cursorRef.current = cursor
-  const capsRef = useRef(caps)
-  capsRef.current = caps
+  const cursorRef = useRef(cursor);
+  cursorRef.current = cursor;
+  const capsRef = useRef(caps);
+  capsRef.current = caps;
 
   const handlers = useMemo(() => {
     const h: Record<string, () => void> = {
@@ -250,40 +233,36 @@ export function useMessageActions(
       'messageActions:nextUser': () => navRef.current?.navigateNextUser(),
       'messageActions:top': () => navRef.current?.navigateTop(),
       'messageActions:bottom': () => navRef.current?.navigateBottom(),
-      'messageActions:escape': () =>
-        setCursor(c => (c?.expanded ? { ...c, expanded: false } : null)),
+      'messageActions:escape': () => setCursor(c => (c?.expanded ? { ...c, expanded: false } : null)),
       // ctrl+c skips the collapse step — from expanded-during-streaming, two-stage
       // would mean 3 presses to interrupt (collapse→null→cancel).
       'messageActions:ctrlc': () => setCursor(null),
-    }
+    };
     for (const key of new Set(MESSAGE_ACTIONS.map(a => a.key))) {
       h[`messageActions:${key}`] = () => {
-        const c = cursorRef.current
-        if (!c) return
-        const a = MESSAGE_ACTIONS.find(a => a.key === key && isApplicable(a, c))
-        if (!a) return
+        const c = cursorRef.current;
+        if (!c) return;
+        const a = MESSAGE_ACTIONS.find(a => a.key === key && isApplicable(a, c));
+        if (!a) return;
         if (a.stays) {
-          setCursor(c => (c ? { ...c, expanded: !c.expanded } : null))
-          return
+          setCursor(c => (c ? { ...c, expanded: !c.expanded } : null));
+          return;
         }
-        const m = navRef.current?.getSelected()
-        if (!m) return
-        ;(a.run as (m: NavigableMessage, c: MessageActionCaps) => void)(
-          m,
-          capsRef.current,
-        )
-        setCursor(null)
-      }
+        const m = navRef.current?.getSelected();
+        if (!m) return;
+        (a.run as (m: NavigableMessage, c: MessageActionCaps) => void)(m, capsRef.current);
+        setCursor(null);
+      };
     }
-    return h
-  }, [setCursor, navRef])
+    return h;
+  }, [setCursor, navRef]);
 
   const enter = useCallback(() => {
-    logEvent('tengu_message_actions_enter', {})
-    navRef.current?.enterCursor()
-  }, [navRef])
+    logEvent('tengu_message_actions_enter', {});
+    navRef.current?.enterCursor();
+  }, [navRef]);
 
-  return { enter, handlers }
+  return { enter, handlers };
 }
 
 // Must mount inside <KeybindingSetup>.
@@ -291,34 +270,22 @@ export function MessageActionsKeybindings({
   handlers,
   isActive,
 }: {
-  handlers: Record<string, () => void>
-  isActive: boolean
+  handlers: Record<string, () => void>;
+  isActive: boolean;
 }): null {
-  useKeybindings(handlers, { context: 'MessageActions', isActive })
-  return null
+  useKeybindings(handlers, { context: 'MessageActions', isActive });
+  return null;
 }
 
 // borderTop-only Box matches PromptInput's ─── line for stable footer height.
-export function MessageActionsBar({
-  cursor,
-}: {
-  cursor: MessageActionsState
-}): React.ReactNode {
-  const applicable = MESSAGE_ACTIONS.filter(a => isApplicable(a, cursor))
+export function MessageActionsBar({ cursor }: { cursor: MessageActionsState }): React.ReactNode {
+  const applicable = MESSAGE_ACTIONS.filter(a => isApplicable(a, cursor));
   return (
     <Box flexDirection="column" flexShrink={0} paddingY={1}>
-      <Box
-        borderStyle="single"
-        borderTop
-        borderBottom={false}
-        borderLeft={false}
-        borderRight={false}
-        borderDimColor
-      />
+      <Box borderStyle="single" borderTop borderBottom={false} borderLeft={false} borderRight={false} borderDimColor />
       <Box paddingX={2} paddingY={1}>
         {applicable.map((a, i) => {
-          const label =
-            typeof a.label === 'function' ? a.label(cursor) : a.label
+          const label = typeof a.label === 'function' ? a.label(cursor) : a.label;
           return (
             <React.Fragment key={a.key}>
               {i > 0 && <Text dimColor> · </Text>}
@@ -328,7 +295,7 @@ export function MessageActionsBar({
               </Text>
               <Text dimColor> {label}</Text>
             </React.Fragment>
-          )
+          );
         })}
         <Text dimColor> · </Text>
         <Text bold dimColor={false}>
@@ -342,68 +309,68 @@ export function MessageActionsBar({
         <Text dimColor> back</Text>
       </Box>
     </Box>
-  )
+  );
 }
 
 export function stripSystemReminders(text: string): string {
-  const CLOSE = '</system-reminder>'
-  let t = text.trimStart()
+  const CLOSE = '</system-reminder>';
+  let t = text.trimStart();
   while (t.startsWith('<system-reminder>')) {
-    const end = t.indexOf(CLOSE)
-    if (end < 0) break
-    t = t.slice(end + CLOSE.length).trimStart()
+    const end = t.indexOf(CLOSE);
+    if (end < 0) break;
+    t = t.slice(end + CLOSE.length).trimStart();
   }
-  return t
+  return t;
 }
 
 export function copyTextOf(msg: NavigableMessage): string {
   switch (msg.type) {
     case 'user': {
-      const b = firstBlock(msg.message.content)
-      return b?.type === 'text' ? stripSystemReminders(b.text!) : ''
+      const b = firstBlock(msg.message.content);
+      return b?.type === 'text' ? stripSystemReminders(b.text!) : '';
     }
     case 'assistant': {
-      const b = firstBlock(msg.message.content)
-      if (b?.type === 'text') return b.text!
-      const tc = toolCallOf(msg)
-      return tc ? (PRIMARY_INPUT[tc.name]?.extract(tc.input) ?? '') : ''
+      const b = firstBlock(msg.message.content);
+      if (b?.type === 'text') return b.text!;
+      const tc = toolCallOf(msg);
+      return tc ? (PRIMARY_INPUT[tc.name]?.extract(tc.input) ?? '') : '';
     }
     case 'grouped_tool_use':
-      return msg.results.map(toolResultText).filter(Boolean).join('\n\n')
+      return msg.results.map(toolResultText).filter(Boolean).join('\n\n');
     case 'collapsed_read_search':
       return msg.messages
         .flatMap(m =>
-          m.type === 'user'
-            ? [toolResultText(m)]
-            : m.type === 'grouped_tool_use'
-              ? m.results.map(toolResultText)
-              : [],
+          m.type === 'user' ? [toolResultText(m)] : m.type === 'grouped_tool_use' ? m.results.map(toolResultText) : [],
         )
         .filter(Boolean)
-        .join('\n\n')
+        .join('\n\n');
     case 'system':
-      if ('content' in msg) return String(msg.content)
-      if ('error' in msg) return String(msg.error)
-      return String(msg.subtype ?? '')
+      if ('content' in msg) return String(msg.content);
+      if ('error' in msg) return String(msg.error);
+      return String(msg.subtype ?? '');
     case 'attachment': {
-      const a = msg.attachment
+      const a = msg.attachment;
       if (a.type === 'queued_command') {
-        const p = (a as { prompt?: unknown }).prompt
+        const p = (a as { prompt?: unknown }).prompt;
         return typeof p === 'string'
           ? p
-          : (p as Array<{ type: string; text?: string }>).flatMap(b => (b.type === 'text' ? [b.text ?? ''] : [])).join('\n')
+          : (p as Array<{ type: string; text?: string }>)
+              .flatMap(b => (b.type === 'text' ? [b.text ?? ''] : []))
+              .join('\n');
       }
-      return `[${a.type}]`
+      return `[${a.type}]`;
     }
   }
-  return ''
+  return '';
 }
 
 function toolResultText(r: NormalizedUserMessage): string {
-  const b = firstBlock(r.message.content)
-  if (b?.type !== 'tool_result') return ''
-  const c = b.content
-  if (typeof c === 'string') return c
-  if (!c) return ''
-  return (c as Array<{ type: string; text?: string }>).flatMap(x => (x.type === 'text' ? [x.text ?? ''] : [])).join('\n')
+  const b = firstBlock(r.message.content);
+  if (b?.type !== 'tool_result') return '';
+  const c = b.content;
+  if (typeof c === 'string') return c;
+  if (!c) return '';
+  return (c as Array<{ type: string; text?: string }>)
+    .flatMap(x => (x.type === 'text' ? [x.text ?? ''] : []))
+    .join('\n');
 }
diff --git a/src/components/messages/AdvisorMessage.tsx b/src/components/messages/AdvisorMessage.tsx
index 890e52405..9ae157e4a 100644
--- a/src/components/messages/AdvisorMessage.tsx
+++ b/src/components/messages/AdvisorMessage.tsx
@@ -1,22 +1,22 @@
-import figures from 'figures'
-import React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import type { AdvisorBlock } from '../../utils/advisor.js'
-import { renderModelName } from '../../utils/model/model.js'
-import { jsonStringify } from '../../utils/slowOperations.js'
-import { CtrlOToExpand } from '../CtrlOToExpand.js'
-import { MessageResponse } from '../MessageResponse.js'
-import { ToolUseLoader } from '../ToolUseLoader.js'
+import figures from 'figures';
+import React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import type { AdvisorBlock } from '../../utils/advisor.js';
+import { renderModelName } from '../../utils/model/model.js';
+import { jsonStringify } from '../../utils/slowOperations.js';
+import { CtrlOToExpand } from '../CtrlOToExpand.js';
+import { MessageResponse } from '../MessageResponse.js';
+import { ToolUseLoader } from '../ToolUseLoader.js';
 
 type Props = {
-  block: AdvisorBlock
-  addMargin: boolean
-  resolvedToolUseIDs: Set<string>
-  erroredToolUseIDs: Set<string>
-  shouldAnimate: boolean
-  verbose: boolean
-  advisorModel?: string
-}
+  block: AdvisorBlock;
+  addMargin: boolean;
+  resolvedToolUseIDs: Set<string>;
+  erroredToolUseIDs: Set<string>;
+  shouldAnimate: boolean;
+  verbose: boolean;
+  advisorModel?: string;
+};
 
 export function AdvisorMessage({
   block,
@@ -28,10 +28,7 @@ export function AdvisorMessage({
   advisorModel,
 }: Props): React.ReactNode {
   if (block.type === 'server_tool_use') {
-    const input =
-      block.input && Object.keys(block.input).length > 0
-        ? jsonStringify(block.input)
-        : null
+    const input = block.input && Object.keys(block.input).length > 0 ? jsonStringify(block.input) : null;
     return (
       <Box marginTop={addMargin ? 1 : 0} paddingRight={2} flexDirection="row">
         <ToolUseLoader
@@ -40,46 +37,34 @@ export function AdvisorMessage({
           isError={erroredToolUseIDs.has(block.id)}
         />
         <Text bold>Advising</Text>
-        {advisorModel ? (
-          <Text dimColor> using {renderModelName(advisorModel)}</Text>
-        ) : null}
+        {advisorModel ? <Text dimColor> using {renderModelName(advisorModel)}</Text> : null}
         {input ? <Text dimColor> · {input}</Text> : null}
       </Box>
-    )
+    );
   }
 
-  let body: React.ReactNode
+  let body: React.ReactNode;
   switch (block.content.type) {
     case 'advisor_tool_result_error':
-      body = (
-        <Text color="error">
-          Advisor unavailable ({block.content.error_code})
-        </Text>
-      )
-      break
+      body = <Text color="error">Advisor unavailable ({block.content.error_code})</Text>;
+      break;
     case 'advisor_result':
       body = verbose ? (
         <Text dimColor>{block.content.text}</Text>
       ) : (
         <Text dimColor>
-          {figures.tick} Advisor has reviewed the conversation and will apply
-          the feedback <CtrlOToExpand />
+          {figures.tick} Advisor has reviewed the conversation and will apply the feedback <CtrlOToExpand />
         </Text>
-      )
-      break
+      );
+      break;
     case 'advisor_redacted_result':
-      body = (
-        <Text dimColor>
-          {figures.tick} Advisor has reviewed the conversation and will apply
-          the feedback
-        </Text>
-      )
-      break
+      body = <Text dimColor>{figures.tick} Advisor has reviewed the conversation and will apply the feedback</Text>;
+      break;
   }
 
   return (
     <Box paddingRight={2}>
       <MessageResponse>{body}</MessageResponse>
     </Box>
-  )
+  );
 }
diff --git a/src/components/messages/AssistantRedactedThinkingMessage.tsx b/src/components/messages/AssistantRedactedThinkingMessage.tsx
index 4d825701d..d3da7429c 100644
--- a/src/components/messages/AssistantRedactedThinkingMessage.tsx
+++ b/src/components/messages/AssistantRedactedThinkingMessage.tsx
@@ -1,18 +1,16 @@
-import React from 'react'
-import { Box, Text } from '@anthropic/ink'
+import React from 'react';
+import { Box, Text } from '@anthropic/ink';
 
 type Props = {
-  addMargin: boolean
-}
+  addMargin: boolean;
+};
 
-export function AssistantRedactedThinkingMessage({
-  addMargin = false,
-}: Props): React.ReactNode {
+export function AssistantRedactedThinkingMessage({ addMargin = false }: Props): React.ReactNode {
   return (
     <Box marginTop={addMargin ? 1 : 0}>
       <Text dimColor italic>
         ✻ Thinking…
       </Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/messages/AssistantTextMessage.tsx b/src/components/messages/AssistantTextMessage.tsx
index 56ffa054e..bed210b67 100644
--- a/src/components/messages/AssistantTextMessage.tsx
+++ b/src/components/messages/AssistantTextMessage.tsx
@@ -1,9 +1,9 @@
-import type { TextBlockParam } from '@anthropic-ai/sdk/resources/index.mjs'
-import React, { useContext } from 'react'
-import { ERROR_MESSAGE_USER_ABORT } from 'src/services/compact/compact.js'
-import { isRateLimitErrorMessage } from 'src/services/rateLimitMessages.js'
-import { BLACK_CIRCLE } from '../../constants/figures.js'
-import { Box, NoSelect, Text } from '@anthropic/ink'
+import type { TextBlockParam } from '@anthropic-ai/sdk/resources/index.mjs';
+import React, { useContext } from 'react';
+import { ERROR_MESSAGE_USER_ABORT } from 'src/services/compact/compact.js';
+import { isRateLimitErrorMessage } from 'src/services/rateLimitMessages.js';
+import { BLACK_CIRCLE } from '../../constants/figures.js';
+import { Box, NoSelect, Text } from '@anthropic/ink';
 import {
   API_ERROR_MESSAGE_PREFIX,
   API_TIMEOUT_ERROR_MESSAGE,
@@ -16,50 +16,40 @@ import {
   PROMPT_TOO_LONG_ERROR_MESSAGE,
   startsWithApiErrorPrefix,
   TOKEN_REVOKED_ERROR_MESSAGE,
-} from '../../services/api/errors.js'
-import {
-  isEmptyMessageText,
-  NO_RESPONSE_REQUESTED,
-} from '../../utils/messages.js'
-import { getUpgradeMessage } from '../../utils/model/contextWindowUpgradeCheck.js'
-import {
-  getDefaultSonnetModel,
-  renderModelName,
-} from '../../utils/model/model.js'
-import { isMacOsKeychainLocked } from '../../utils/secureStorage/macOsKeychainStorage.js'
-import { CtrlOToExpand } from '../CtrlOToExpand.js'
-import { InterruptedByUser } from '../InterruptedByUser.js'
-import { Markdown } from '../Markdown.js'
-import { MessageResponse } from '../MessageResponse.js'
-import { MessageActionsSelectedContext } from '../messageActions.js'
-import { RateLimitMessage } from './RateLimitMessage.js'
+} from '../../services/api/errors.js';
+import { isEmptyMessageText, NO_RESPONSE_REQUESTED } from '../../utils/messages.js';
+import { getUpgradeMessage } from '../../utils/model/contextWindowUpgradeCheck.js';
+import { getDefaultSonnetModel, renderModelName } from '../../utils/model/model.js';
+import { isMacOsKeychainLocked } from '../../utils/secureStorage/macOsKeychainStorage.js';
+import { CtrlOToExpand } from '../CtrlOToExpand.js';
+import { InterruptedByUser } from '../InterruptedByUser.js';
+import { Markdown } from '../Markdown.js';
+import { MessageResponse } from '../MessageResponse.js';
+import { MessageActionsSelectedContext } from '../messageActions.js';
+import { RateLimitMessage } from './RateLimitMessage.js';
 
-const MAX_API_ERROR_CHARS = 1000
+const MAX_API_ERROR_CHARS = 1000;
 
 type Props = {
-  param: TextBlockParam
-  addMargin: boolean
-  shouldShowDot: boolean
-  verbose: boolean
-  width?: number | string
-  onOpenRateLimitOptions?: () => void
-}
+  param: TextBlockParam;
+  addMargin: boolean;
+  shouldShowDot: boolean;
+  verbose: boolean;
+  width?: number | string;
+  onOpenRateLimitOptions?: () => void;
+};
 
 function InvalidApiKeyMessage(): React.ReactNode {
-  const isKeychainLocked = isMacOsKeychainLocked()
+  const isKeychainLocked = isMacOsKeychainLocked();
 
   return (
     <MessageResponse>
       <Box flexDirection="column">
         <Text color="error">{INVALID_API_KEY_ERROR_MESSAGE}</Text>
-        {isKeychainLocked && (
-          <Text dimColor>
-            · Run in another terminal: security unlock-keychain
-          </Text>
-        )}
+        {isKeychainLocked && <Text dimColor>· Run in another terminal: security unlock-keychain</Text>}
       </Box>
     </MessageResponse>
-  )
+  );
 }
 
 export function AssistantTextMessage({
@@ -69,30 +59,25 @@ export function AssistantTextMessage({
   verbose,
   onOpenRateLimitOptions,
 }: Props): React.ReactNode {
-  const isSelected = useContext(MessageActionsSelectedContext)
+  const isSelected = useContext(MessageActionsSelectedContext);
   if (isEmptyMessageText(text)) {
-    return null
+    return null;
   }
 
   // Handle all rate limit error messages from getRateLimitErrorMessage
   // Use the exported function to avoid fragile string coupling
   if (isRateLimitErrorMessage(text)) {
-    return (
-      <RateLimitMessage
-        text={text}
-        onOpenRateLimitOptions={onOpenRateLimitOptions}
-      />
-    )
+    return <RateLimitMessage text={text} onOpenRateLimitOptions={onOpenRateLimitOptions} />;
   }
 
   switch (text) {
     // Local JSX commands don't need a response, but we still want Claude to see them
     // Tool results render their own interrupt messages
     case NO_RESPONSE_REQUESTED:
-      return null
+      return null;
 
     case PROMPT_TOO_LONG_ERROR_MESSAGE: {
-      const upgradeHint = getUpgradeMessage('warning')
+      const upgradeHint = getUpgradeMessage('warning');
       return (
         <MessageResponse height={1}>
           <Text color="error">
@@ -100,28 +85,27 @@ export function AssistantTextMessage({
             {upgradeHint ? ` · ${upgradeHint}` : ''}
           </Text>
         </MessageResponse>
-      )
+      );
     }
 
     case CREDIT_BALANCE_TOO_LOW_ERROR_MESSAGE:
       return (
         <MessageResponse height={1}>
           <Text color="error">
-            Credit balance too low &middot; Add funds:
-            https://platform.claude.com/settings/billing
+            Credit balance too low &middot; Add funds: https://platform.claude.com/settings/billing
           </Text>
         </MessageResponse>
-      )
+      );
 
     case INVALID_API_KEY_ERROR_MESSAGE:
-      return <InvalidApiKeyMessage />
+      return <InvalidApiKeyMessage />;
 
     case INVALID_API_KEY_ERROR_MESSAGE_EXTERNAL:
       return (
         <MessageResponse height={1}>
           <Text color="error">{INVALID_API_KEY_ERROR_MESSAGE_EXTERNAL}</Text>
         </MessageResponse>
-      )
+      );
 
     case ORG_DISABLED_ERROR_MESSAGE_ENV_KEY:
     case ORG_DISABLED_ERROR_MESSAGE_ENV_KEY_WITH_OAUTH:
@@ -129,45 +113,37 @@ export function AssistantTextMessage({
         <MessageResponse>
           <Text color="error">{text}</Text>
         </MessageResponse>
-      )
+      );
 
     case TOKEN_REVOKED_ERROR_MESSAGE:
       return (
         <MessageResponse height={1}>
           <Text color="error">{TOKEN_REVOKED_ERROR_MESSAGE}</Text>
         </MessageResponse>
-      )
+      );
 
     case API_TIMEOUT_ERROR_MESSAGE:
       return (
         <MessageResponse height={1}>
           <Text color="error">
             {API_TIMEOUT_ERROR_MESSAGE}
-            {process.env.API_TIMEOUT_MS && (
-              <>
-                {' '}
-                (API_TIMEOUT_MS={process.env.API_TIMEOUT_MS}ms, try increasing
-                it)
-              </>
-            )}
+            {process.env.API_TIMEOUT_MS && <> (API_TIMEOUT_MS={process.env.API_TIMEOUT_MS}ms, try increasing it)</>}
           </Text>
         </MessageResponse>
-      )
+      );
 
     case CUSTOM_OFF_SWITCH_MESSAGE:
       return (
         <MessageResponse>
           <Box flexDirection="column" gap={1}>
-            <Text color="error">
-              We are experiencing high demand for Opus 4.
-            </Text>
+            <Text color="error">We are experiencing high demand for Opus 4.</Text>
             <Text>
-              To continue immediately, use /model to switch to{' '}
-              {renderModelName(getDefaultSonnetModel())} and continue coding.
+              To continue immediately, use /model to switch to {renderModelName(getDefaultSonnetModel())} and continue
+              coding.
             </Text>
           </Box>
         </MessageResponse>
-      )
+      );
 
     // TODO: Move this to a user turn
     case ERROR_MESSAGE_USER_ABORT:
@@ -175,11 +151,11 @@ export function AssistantTextMessage({
         <MessageResponse height={1}>
           <InterruptedByUser />
         </MessageResponse>
-      )
+      );
 
     default:
       if (startsWithApiErrorPrefix(text)) {
-        const truncated = !verbose && text.length > MAX_API_ERROR_CHARS
+        const truncated = !verbose && text.length > MAX_API_ERROR_CHARS;
         return (
           <MessageResponse>
             <Box flexDirection="column">
@@ -193,7 +169,7 @@ export function AssistantTextMessage({
               {truncated && <CtrlOToExpand />}
             </Box>
           </MessageResponse>
-        )
+        );
       }
       return (
         <Box
@@ -207,9 +183,7 @@ export function AssistantTextMessage({
           <Box flexDirection="row">
             {shouldShowDot && (
               <NoSelect fromLeftEdge minWidth={2}>
-                <Text color={isSelected ? 'suggestion' : 'text'}>
-                  {BLACK_CIRCLE}
-                </Text>
+                <Text color={isSelected ? 'suggestion' : 'text'}>{BLACK_CIRCLE}</Text>
               </NoSelect>
             )}
             <Box flexDirection="column">
@@ -217,6 +191,6 @@ export function AssistantTextMessage({
             </Box>
           </Box>
         </Box>
-      )
+      );
   }
 }
diff --git a/src/components/messages/AssistantThinkingMessage.tsx b/src/components/messages/AssistantThinkingMessage.tsx
index 979f75637..e57d2dd21 100644
--- a/src/components/messages/AssistantThinkingMessage.tsx
+++ b/src/components/messages/AssistantThinkingMessage.tsx
@@ -1,24 +1,18 @@
-import type {
-  ThinkingBlock,
-  ThinkingBlockParam,
-} from '@anthropic-ai/sdk/resources/index.mjs'
-import React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { CtrlOToExpand } from '../CtrlOToExpand.js'
-import { Markdown } from '../Markdown.js'
+import type { ThinkingBlock, ThinkingBlockParam } from '@anthropic-ai/sdk/resources/index.mjs';
+import React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { CtrlOToExpand } from '../CtrlOToExpand.js';
+import { Markdown } from '../Markdown.js';
 
 type Props = {
   // Accept either full ThinkingBlock/ThinkingBlockParam or a minimal shape with just type and thinking
-  param:
-    | ThinkingBlock
-    | ThinkingBlockParam
-    | { type: 'thinking'; thinking: string }
-  addMargin: boolean
-  isTranscriptMode: boolean
-  verbose: boolean
+  param: ThinkingBlock | ThinkingBlockParam | { type: 'thinking'; thinking: string };
+  addMargin: boolean;
+  isTranscriptMode: boolean;
+  verbose: boolean;
   /** When true, hide this thinking block entirely (used for past thinking in transcript mode) */
-  hideInTranscript?: boolean
-}
+  hideInTranscript?: boolean;
+};
 
 export function AssistantThinkingMessage({
   param: { thinking },
@@ -28,15 +22,15 @@ export function AssistantThinkingMessage({
   hideInTranscript = false,
 }: Props): React.ReactNode {
   if (!thinking) {
-    return null
+    return null;
   }
 
   if (hideInTranscript) {
-    return null
+    return null;
   }
 
-  const shouldShowFullThinking = isTranscriptMode || verbose
-  const label = '∴ Thinking'
+  const shouldShowFullThinking = isTranscriptMode || verbose;
+  const label = '∴ Thinking';
 
   if (!shouldShowFullThinking) {
     return (
@@ -45,16 +39,11 @@ export function AssistantThinkingMessage({
           {label} <CtrlOToExpand />
         </Text>
       </Box>
-    )
+    );
   }
 
   return (
-    <Box
-      flexDirection="column"
-      gap={1}
-      marginTop={addMargin ? 1 : 0}
-      width="100%"
-    >
+    <Box flexDirection="column" gap={1} marginTop={addMargin ? 1 : 0} width="100%">
       <Text dimColor italic>
         {label}…
       </Text>
@@ -62,5 +51,5 @@ export function AssistantThinkingMessage({
         <Markdown dimColor>{thinking}</Markdown>
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/components/messages/AssistantToolUseMessage.tsx b/src/components/messages/AssistantToolUseMessage.tsx
index 6c87e1705..f9e86a4da 100644
--- a/src/components/messages/AssistantToolUseMessage.tsx
+++ b/src/components/messages/AssistantToolUseMessage.tsx
@@ -1,41 +1,36 @@
-import type { ToolUseBlockParam } from '@anthropic-ai/sdk/resources/index.mjs'
-import React, { useMemo } from 'react'
-import { useTerminalSize } from 'src/hooks/useTerminalSize.js'
-import type { ThemeName } from 'src/utils/theme.js'
-import type { Command } from '../../commands.js'
-import { BLACK_CIRCLE } from '../../constants/figures.js'
-import { Box, Text, stringWidth, useTheme } from '@anthropic/ink'
-import { useAppStateMaybeOutsideOfProvider } from '../../state/AppState.js'
-import {
-  findToolByName,
-  type Tool,
-  type ToolProgressData,
-  type Tools,
-} from '../../Tool.js'
-import type { ProgressMessage } from '../../types/message.js'
-import { useIsClassifierChecking } from '../../utils/classifierApprovalsHook.js'
-import { logError } from '../../utils/log.js'
-import type { buildMessageLookups } from '../../utils/messages.js'
-import { MessageResponse } from '../MessageResponse.js'
-import { useSelectedMessageBg } from '../messageActions.js'
-import { SentryErrorBoundary } from '../SentryErrorBoundary.js'
-import { ToolUseLoader } from '../ToolUseLoader.js'
-import { HookProgressMessage } from './HookProgressMessage.js'
+import type { ToolUseBlockParam } from '@anthropic-ai/sdk/resources/index.mjs';
+import React, { useMemo } from 'react';
+import { useTerminalSize } from 'src/hooks/useTerminalSize.js';
+import type { ThemeName } from 'src/utils/theme.js';
+import type { Command } from '../../commands.js';
+import { BLACK_CIRCLE } from '../../constants/figures.js';
+import { Box, Text, stringWidth, useTheme } from '@anthropic/ink';
+import { useAppStateMaybeOutsideOfProvider } from '../../state/AppState.js';
+import { findToolByName, type Tool, type ToolProgressData, type Tools } from '../../Tool.js';
+import type { ProgressMessage } from '../../types/message.js';
+import { useIsClassifierChecking } from '../../utils/classifierApprovalsHook.js';
+import { logError } from '../../utils/log.js';
+import type { buildMessageLookups } from '../../utils/messages.js';
+import { MessageResponse } from '../MessageResponse.js';
+import { useSelectedMessageBg } from '../messageActions.js';
+import { SentryErrorBoundary } from '../SentryErrorBoundary.js';
+import { ToolUseLoader } from '../ToolUseLoader.js';
+import { HookProgressMessage } from './HookProgressMessage.js';
 
 type Props = {
-  param: ToolUseBlockParam
-  addMargin: boolean
-  tools: Tools
-  commands: Command[]
-  verbose: boolean
-  inProgressToolUseIDs: Set<string>
-  progressMessagesForMessage: ProgressMessage[]
-  shouldAnimate: boolean
-  shouldShowDot: boolean
-  inProgressToolCallCount?: number
-  lookups: ReturnType<typeof buildMessageLookups>
-  isTranscriptMode?: boolean
-}
+  param: ToolUseBlockParam;
+  addMargin: boolean;
+  tools: Tools;
+  commands: Command[];
+  verbose: boolean;
+  inProgressToolUseIDs: Set<string>;
+  progressMessagesForMessage: ProgressMessage[];
+  shouldAnimate: boolean;
+  shouldShowDot: boolean;
+  inProgressToolCallCount?: number;
+  lookups: ReturnType<typeof buildMessageLookups>;
+  isTranscriptMode?: boolean;
+};
 
 export function AssistantToolUseMessage({
   param,
@@ -51,29 +46,21 @@ export function AssistantToolUseMessage({
   lookups,
   isTranscriptMode,
 }: Props): React.ReactNode {
-  const terminalSize = useTerminalSize()
-  const [theme] = useTheme()
-  const bg = useSelectedMessageBg()
-  const pendingWorkerRequest = useAppStateMaybeOutsideOfProvider(
-    state => state.pendingWorkerRequest,
-  )
-  const isClassifierCheckingRaw = useIsClassifierChecking(param.id)
-  const permissionMode = useAppStateMaybeOutsideOfProvider(
-    state => state.toolPermissionContext.mode,
-  )
+  const terminalSize = useTerminalSize();
+  const [theme] = useTheme();
+  const bg = useSelectedMessageBg();
+  const pendingWorkerRequest = useAppStateMaybeOutsideOfProvider(state => state.pendingWorkerRequest);
+  const isClassifierCheckingRaw = useIsClassifierChecking(param.id);
+  const permissionMode = useAppStateMaybeOutsideOfProvider(state => state.toolPermissionContext.mode);
   // strippedDangerousRules is set by stripDangerousPermissionsForAutoMode
   // (even to {}) whenever auto is active, and cleared by restoreDangerousPermissions
   // on deactivation — a reliable proxy for isAutoModeActive() during plan.
   // prePlanMode would be stale after transitionPlanAutoMode deactivates mid-plan.
   const hasStrippedRules = useAppStateMaybeOutsideOfProvider(
     state => !!state.toolPermissionContext.strippedDangerousRules,
-  )
-  const isAutoClassifier =
-    permissionMode === 'auto' || (permissionMode === 'plan' && hasStrippedRules)
-  const isClassifierChecking =
-    process.env.USER_TYPE === 'ant' &&
-    isClassifierCheckingRaw &&
-    permissionMode !== 'auto'
+  );
+  const isAutoClassifier = permissionMode === 'auto' || (permissionMode === 'plan' && hasStrippedRules);
+  const isClassifierChecking = process.env.USER_TYPE === 'ant' && isClassifierCheckingRaw && permissionMode !== 'auto';
 
   // Memoize on param identity (stable — from the persisted message object).
   // Zod safeParse allocates per call, and some tools' userFacingName()
@@ -81,47 +68,34 @@ export function AssistantToolUseMessage({
   // this, ~50 bash messages × shell-quote-per-render pushed transition
   // render past the shimmer tick → abort → infinite retry (#21605).
   const parsed = useMemo(() => {
-    if (!tools) return null
-    const tool = findToolByName(tools, param.name)
-    if (!tool) return null
-    const input = tool.inputSchema.safeParse(param.input)
-    const data = input.success ? input.data : undefined
+    if (!tools) return null;
+    const tool = findToolByName(tools, param.name);
+    if (!tool) return null;
+    const input = tool.inputSchema.safeParse(param.input);
+    const data = input.success ? input.data : undefined;
     return {
       tool,
       input,
       userFacingToolName: tool.userFacingName(data),
-      userFacingToolNameBackgroundColor:
-        tool.userFacingNameBackgroundColor?.(data),
+      userFacingToolNameBackgroundColor: tool.userFacingNameBackgroundColor?.(data),
       isTransparentWrapper: tool.isTransparentWrapper?.() ?? false,
-    }
-  }, [tools, param])
+    };
+  }, [tools, param]);
 
   if (!parsed) {
     // Guard against undefined tools (required prop) or unknown tool name
-    logError(
-      new Error(
-        tools
-          ? `Tool ${param.name} not found`
-          : `Tools array is undefined for tool ${param.name}`,
-      ),
-    )
-    return null
+    logError(new Error(tools ? `Tool ${param.name} not found` : `Tools array is undefined for tool ${param.name}`));
+    return null;
   }
 
-  const {
-    tool,
-    input,
-    userFacingToolName,
-    userFacingToolNameBackgroundColor,
-    isTransparentWrapper,
-  } = parsed
+  const { tool, input, userFacingToolName, userFacingToolNameBackgroundColor, isTransparentWrapper } = parsed;
 
-  const isResolved = lookups.resolvedToolUseIDs.has(param.id)
-  const isQueued = !inProgressToolUseIDs.has(param.id) && !isResolved
-  const isWaitingForPermission = pendingWorkerRequest?.toolUseId === param.id
+  const isResolved = lookups.resolvedToolUseIDs.has(param.id);
+  const isQueued = !inProgressToolUseIDs.has(param.id) && !isResolved;
+  const isWaitingForPermission = pendingWorkerRequest?.toolUseId === param.id;
 
   if (isTransparentWrapper) {
-    if (isQueued || isResolved) return null
+    if (isQueued || isResolved) return null;
     return (
       <Box flexDirection="column" width="100%" backgroundColor={bg}>
         {renderToolUseProgressMessage(
@@ -134,18 +108,18 @@ export function AssistantToolUseMessage({
           terminalSize,
         )}
       </Box>
-    )
+    );
   }
 
   if (userFacingToolName === '') {
-    return null
+    return null;
   }
 
   const renderedToolUseMessage = input.success
     ? renderToolUseMessage(tool, input.data, { theme, verbose, commands })
-    : null
+    : null;
   if (renderedToolUseMessage === null) {
-    return null
+    return null;
   }
 
   return (
@@ -157,11 +131,7 @@ export function AssistantToolUseMessage({
       backgroundColor={bg}
     >
       <Box flexDirection="column">
-        <Box
-          flexDirection="row"
-          flexWrap="nowrap"
-          minWidth={stringWidth(userFacingToolName) + (shouldShowDot ? 2 : 0)}
-        >
+        <Box flexDirection="row" flexWrap="nowrap" minWidth={stringWidth(userFacingToolName) + (shouldShowDot ? 2 : 0)}>
           {shouldShowDot &&
             (isQueued ? (
               <Box minWidth={2}>
@@ -182,9 +152,7 @@ export function AssistantToolUseMessage({
               bold
               wrap="truncate-end"
               backgroundColor={userFacingToolNameBackgroundColor}
-              color={
-                userFacingToolNameBackgroundColor ? 'inverseText' : undefined
-              }
+              color={userFacingToolNameBackgroundColor ? 'inverseText' : undefined}
             >
               {userFacingToolName}
             </Text>
@@ -195,18 +163,14 @@ export function AssistantToolUseMessage({
             </Box>
           )}
           {/* Render tool-specific tags (timeout, model, resume ID, etc.) */}
-          {input.success &&
-            tool.renderToolUseTag &&
-            tool.renderToolUseTag(input.data)}
+          {input.success && tool.renderToolUseTag && tool.renderToolUseTag(input.data)}
         </Box>
         {!isResolved &&
           !isQueued &&
           (isClassifierChecking ? (
             <MessageResponse height={1}>
               <Text dimColor>
-                {isAutoClassifier
-                  ? 'Auto classifier checking\u2026'
-                  : 'Bash classifier checking\u2026'}
+                {isAutoClassifier ? 'Auto classifier checking\u2026' : 'Bash classifier checking\u2026'}
               </Text>
             </MessageResponse>
           ) : isWaitingForPermission ? (
@@ -231,29 +195,23 @@ export function AssistantToolUseMessage({
         {!isResolved && isQueued && renderToolUseQueuedMessage(tool)}
       </Box>
     </Box>
-  )
+  );
 }
 
 function renderToolUseMessage(
   tool: Tool,
   input: unknown,
-  {
-    theme,
-    verbose,
-    commands,
-  }: { theme: ThemeName; verbose: boolean; commands: Command[] },
+  { theme, verbose, commands }: { theme: ThemeName; verbose: boolean; commands: Command[] },
 ): React.ReactNode {
   try {
-    const parsed = tool.inputSchema.safeParse(input)
+    const parsed = tool.inputSchema.safeParse(input);
     if (!parsed.success) {
-      return ''
+      return '';
     }
-    return tool.renderToolUseMessage(parsed.data, { theme, verbose, commands })
+    return tool.renderToolUseMessage(parsed.data, { theme, verbose, commands });
   } catch (error) {
-    logError(
-      new Error(`Error rendering tool use message for ${tool.name}: ${error}`),
-    )
-    return ''
+    logError(new Error(`Error rendering tool use message for ${tool.name}: ${error}`));
+    return '';
   }
 }
 
@@ -268,16 +226,15 @@ function renderToolUseProgressMessage(
     inProgressToolCallCount,
     isTranscriptMode,
   }: {
-    verbose: boolean
-    inProgressToolCallCount?: number
-    isTranscriptMode?: boolean
+    verbose: boolean;
+    inProgressToolCallCount?: number;
+    isTranscriptMode?: boolean;
   },
   terminalSize: { columns: number; rows: number },
 ): React.ReactNode {
   const toolProgressMessages = progressMessagesForMessage.filter(
-    (msg): msg is ProgressMessage<ToolProgressData> =>
-      (msg.data as Record<string, unknown>).type !== 'hook_progress',
-  )
+    (msg): msg is ProgressMessage<ToolProgressData> => (msg.data as Record<string, unknown>).type !== 'hook_progress',
+  );
   try {
     const toolMessages =
       tool.renderToolUseProgressMessage?.(toolProgressMessages, {
@@ -286,7 +243,7 @@ function renderToolUseProgressMessage(
         terminalSize,
         inProgressToolCallCount: inProgressToolCallCount ?? 1,
         isTranscriptMode,
-      }) ?? null
+      }) ?? null;
     return (
       <>
         <SentryErrorBoundary>
@@ -300,26 +257,18 @@ function renderToolUseProgressMessage(
         </SentryErrorBoundary>
         {toolMessages}
       </>
-    )
+    );
   } catch (error) {
-    logError(
-      new Error(
-        `Error rendering tool use progress message for ${tool.name}: ${error}`,
-      ),
-    )
-    return null
+    logError(new Error(`Error rendering tool use progress message for ${tool.name}: ${error}`));
+    return null;
   }
 }
 
 function renderToolUseQueuedMessage(tool: Tool): React.ReactNode {
   try {
-    return tool.renderToolUseQueuedMessage?.()
+    return tool.renderToolUseQueuedMessage?.();
   } catch (error) {
-    logError(
-      new Error(
-        `Error rendering tool use queued message for ${tool.name}: ${error}`,
-      ),
-    )
-    return null
+    logError(new Error(`Error rendering tool use queued message for ${tool.name}: ${error}`));
+    return null;
   }
 }
diff --git a/src/components/messages/AttachmentMessage.tsx b/src/components/messages/AttachmentMessage.tsx
index 7e7f30111..503103bfe 100644
--- a/src/components/messages/AttachmentMessage.tsx
+++ b/src/components/messages/AttachmentMessage.tsx
@@ -1,90 +1,78 @@
 // biome-ignore-all assist/source/organizeImports: ANT-ONLY import markers must not be reordered
-import React, { useMemo } from 'react'
-import { Ansi, Box, Text } from '@anthropic/ink'
-import { FilePathLink } from '../FilePathLink.js'
-import { toInkColor } from '../../utils/ink.js'
-import type { Attachment } from 'src/utils/attachments.js'
-import type { NullRenderingAttachmentType } from './nullRenderingAttachments.js'
-import { useAppState } from '../../state/AppState.js'
-import { getDisplayPath } from 'src/utils/file.js'
-import { formatFileSize } from 'src/utils/format.js'
-import { MessageResponse } from '../MessageResponse.js'
-import { basename, sep } from 'path'
-import { UserTextMessage } from './UserTextMessage.js'
-import { DiagnosticsDisplay } from '../DiagnosticsDisplay.js'
-import { getContentText } from 'src/utils/messages.js'
-import type { Theme } from 'src/utils/theme.js'
-import { UserImageMessage } from './UserImageMessage.js'
+import React, { useMemo } from 'react';
+import { Ansi, Box, Text } from '@anthropic/ink';
+import { FilePathLink } from '../FilePathLink.js';
+import { toInkColor } from '../../utils/ink.js';
+import type { Attachment } from 'src/utils/attachments.js';
+import type { NullRenderingAttachmentType } from './nullRenderingAttachments.js';
+import { useAppState } from '../../state/AppState.js';
+import { getDisplayPath } from 'src/utils/file.js';
+import { formatFileSize } from 'src/utils/format.js';
+import { MessageResponse } from '../MessageResponse.js';
+import { basename, sep } from 'path';
+import { UserTextMessage } from './UserTextMessage.js';
+import { DiagnosticsDisplay } from '../DiagnosticsDisplay.js';
+import { getContentText } from 'src/utils/messages.js';
+import type { Theme } from 'src/utils/theme.js';
+import { UserImageMessage } from './UserImageMessage.js';
 
-import { jsonParse } from '../../utils/slowOperations.js'
-import { plural } from '../../utils/stringUtils.js'
-import { isEnvTruthy } from '../../utils/envUtils.js'
-import { isAgentSwarmsEnabled } from '../../utils/agentSwarmsEnabled.js'
-import {
-  tryRenderPlanApprovalMessage,
-  formatTeammateMessageContent,
-} from './PlanApprovalMessage.js'
-import { BLACK_CIRCLE } from '../../constants/figures.js'
-import { TeammateMessageContent } from './UserTeammateMessage.js'
-import { isShutdownApproved } from '../../utils/teammateMailbox.js'
-import { CtrlOToExpand } from '../CtrlOToExpand.js'
+import { jsonParse } from '../../utils/slowOperations.js';
+import { plural } from '../../utils/stringUtils.js';
+import { isEnvTruthy } from '../../utils/envUtils.js';
+import { isAgentSwarmsEnabled } from '../../utils/agentSwarmsEnabled.js';
+import { tryRenderPlanApprovalMessage, formatTeammateMessageContent } from './PlanApprovalMessage.js';
+import { BLACK_CIRCLE } from '../../constants/figures.js';
+import { TeammateMessageContent } from './UserTeammateMessage.js';
+import { isShutdownApproved } from '../../utils/teammateMailbox.js';
+import { CtrlOToExpand } from '../CtrlOToExpand.js';
 
-import { feature } from 'bun:bundle'
-import { useSelectedMessageBg } from '../messageActions.js'
+import { feature } from 'bun:bundle';
+import { useSelectedMessageBg } from '../messageActions.js';
 
 type Props = {
-  addMargin: boolean
-  attachment: Attachment
-  verbose: boolean
-  isTranscriptMode?: boolean
-}
+  addMargin: boolean;
+  attachment: Attachment;
+  verbose: boolean;
+  isTranscriptMode?: boolean;
+};
 
-export function AttachmentMessage({
-  attachment,
-  addMargin,
-  verbose,
-  isTranscriptMode,
-}: Props): React.ReactNode {
-  const bg = useSelectedMessageBg()
+export function AttachmentMessage({ attachment, addMargin, verbose, isTranscriptMode }: Props): React.ReactNode {
+  const bg = useSelectedMessageBg();
   // Hoisted to mount-time — per-message component, re-renders on every scroll.
   const isDemoEnv = feature('EXPERIMENTAL_SKILL_SEARCH')
-    ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-      useMemo(() => isEnvTruthy(process.env.IS_DEMO), [])
-    : false
+    ? useMemo(() => isEnvTruthy(process.env.IS_DEMO), [])
+    : false;
   // Handle teammate_mailbox BEFORE switch
   if (isAgentSwarmsEnabled() && attachment.type === 'teammate_mailbox') {
     // Filter out idle notifications BEFORE counting - they are hidden in the UI
     // so showing them in the count would be confusing ("2 messages in mailbox:" with nothing shown)
     const visibleMessages = attachment.messages.filter(msg => {
       if (isShutdownApproved(msg.text)) {
-        return false
+        return false;
       }
       try {
-        const parsed = jsonParse(msg.text)
-        return (
-          parsed?.type !== 'idle_notification' &&
-          parsed?.type !== 'teammate_terminated'
-        )
+        const parsed = jsonParse(msg.text);
+        return parsed?.type !== 'idle_notification' && parsed?.type !== 'teammate_terminated';
       } catch {
-        return true // Non-JSON messages are visible
+        return true; // Non-JSON messages are visible
       }
-    })
+    });
 
     if (visibleMessages.length === 0) {
-      return null
+      return null;
     }
     return (
       <Box flexDirection="column">
         {visibleMessages.map((msg, idx) => {
           // Try to parse as JSON for task_assignment messages
           let parsedMsg: {
-            type?: string
-            taskId?: string
-            subject?: string
-            assignedBy?: string
-          } | null = null
+            type?: string;
+            taskId?: string;
+            subject?: string;
+            assignedBy?: string;
+          } | null = null;
           try {
-            parsedMsg = jsonParse(msg.text)
+            parsedMsg = jsonParse(msg.text);
           } catch {
             // Not JSON, treat as plain text
           }
@@ -98,26 +86,20 @@ export function AttachmentMessage({
                 <Text> - {parsedMsg.subject}</Text>
                 <Text dimColor> (from {parsedMsg.assignedBy || msg.from})</Text>
               </Box>
-            )
+            );
           }
 
           // Note: idle_notification messages already filtered out above
 
           // Try to render as plan approval message (request or response)
-          const planApprovalElement = tryRenderPlanApprovalMessage(
-            msg.text,
-            msg.from,
-          )
+          const planApprovalElement = tryRenderPlanApprovalMessage(msg.text, msg.from);
           if (planApprovalElement) {
-            return (
-              <React.Fragment key={idx}>{planApprovalElement}</React.Fragment>
-            )
+            return <React.Fragment key={idx}>{planApprovalElement}</React.Fragment>;
           }
 
           // Plain text message - sender header with chevron, truncated content
-          const inkColor = toInkColor(msg.color)
-          const formattedContent =
-            formatTeammateMessageContent(msg.text) ?? msg.text
+          const inkColor = toInkColor(msg.color);
+          const formattedContent = formatTeammateMessageContent(msg.text) ?? msg.text;
           return (
             <TeammateMessageContent
               key={idx}
@@ -127,10 +109,10 @@ export function AttachmentMessage({
               summary={msg.summary}
               isTranscriptMode={isTranscriptMode}
             />
-          )
+          );
         })}
       </Box>
-    )
+    );
   }
 
   // skill_discovery rendered here (not in the switch) so the 'skill_discovery'
@@ -138,25 +120,22 @@ export function AttachmentMessage({
   // be conditionally eliminated; an if-body can.
   if (feature('EXPERIMENTAL_SKILL_SEARCH')) {
     if (attachment.type === 'skill_discovery') {
-      if (attachment.skills.length === 0) return null
+      if (attachment.skills.length === 0) return null;
       // Ant users get shortIds inline so they can /skill-feedback while the
       // turn is still fresh. External users (when this un-gates) just see
       // names — shortId is undefined outside ant builds anyway.
-      const names = attachment.skills
-        .map(s => (s.shortId ? `${s.name} [${s.shortId}]` : s.name))
-        .join(', ')
-      const firstId = attachment.skills[0]?.shortId
+      const names = attachment.skills.map(s => (s.shortId ? `${s.name} [${s.shortId}]` : s.name)).join(', ');
+      const firstId = attachment.skills[0]?.shortId;
       const hint =
         process.env.USER_TYPE === 'ant' && !isDemoEnv && firstId
           ? ` · /skill-feedback ${firstId} 1=wrong 2=noisy 3=good [comment]`
-          : ''
+          : '';
       return (
         <Line>
-          <Text bold>{attachment.skills.length}</Text> relevant{' '}
-          {plural(attachment.skills.length, 'skill')}: {names}
+          <Text bold>{attachment.skills.length}</Text> relevant {plural(attachment.skills.length, 'skill')}: {names}
           {hint && <Text dimColor>{hint}</Text>}
         </Line>
-      )
+      );
     }
   }
 
@@ -167,23 +146,22 @@ export function AttachmentMessage({
         <Line>
           Listed directory <Text bold>{attachment.displayPath + sep}</Text>
         </Line>
-      )
+      );
     case 'file':
     case 'already_read_file':
       if (attachment.content.type === 'notebook') {
         return (
           <Line>
-            Read <Text bold>{attachment.displayPath}</Text> (
-            {attachment.content.file.cells.length} cells)
+            Read <Text bold>{attachment.displayPath}</Text> ({attachment.content.file.cells.length} cells)
           </Line>
-        )
+        );
       }
       if (attachment.content.type === 'file_unchanged') {
         return (
           <Line>
             Read <Text bold>{attachment.displayPath}</Text> (unchanged)
           </Line>
-        )
+        );
       }
       return (
         <Line>
@@ -193,46 +171,39 @@ export function AttachmentMessage({
             : formatFileSize(attachment.content.file.originalSize)}
           )
         </Line>
-      )
+      );
     case 'compact_file_reference':
       return (
         <Line>
           Referenced file <Text bold>{attachment.displayPath}</Text>
         </Line>
-      )
+      );
     case 'pdf_reference':
       return (
         <Line>
-          Referenced PDF <Text bold>{attachment.displayPath}</Text> (
-          {attachment.pageCount} pages)
+          Referenced PDF <Text bold>{attachment.displayPath}</Text> ({attachment.pageCount} pages)
         </Line>
-      )
+      );
     case 'selected_lines_in_ide':
       return (
         <Line>
-          ⧉ Selected{' '}
-          <Text bold>{attachment.lineEnd - attachment.lineStart + 1}</Text>{' '}
-          lines from <Text bold>{attachment.displayPath}</Text> in{' '}
-          {attachment.ideName}
+          ⧉ Selected <Text bold>{attachment.lineEnd - attachment.lineStart + 1}</Text> lines from{' '}
+          <Text bold>{attachment.displayPath}</Text> in {attachment.ideName}
         </Line>
-      )
+      );
     case 'nested_memory':
       return (
         <Line>
           Loaded <Text bold>{attachment.displayPath}</Text>
         </Line>
-      )
+      );
     case 'relevant_memories':
       // Usually absorbed into a CollapsedReadSearchGroup (collapseReadSearch.ts)
       // so this only renders when the preceding tool was non-collapsible (Edit,
       // Write) and no group was open. Match CollapsedReadSearchContent's style:
       // 2-space gutter, dim text, count only — filenames/content in ctrl+o.
       return (
-        <Box
-          flexDirection="column"
-          marginTop={addMargin ? 1 : 0}
-          backgroundColor={bg}
-        >
+        <Box flexDirection="column" marginTop={addMargin ? 1 : 0} backgroundColor={bg}>
           <Box flexDirection="row">
             <Box minWidth={2} />
             <Text dimColor>
@@ -251,9 +222,7 @@ export function AttachmentMessage({
               <Box key={m.path} flexDirection="column">
                 <MessageResponse>
                   <Text dimColor>
-                    <FilePathLink filePath={m.path}>
-                      {basename(m.path)}
-                    </FilePathLink>
+                    <FilePathLink filePath={m.path}>{basename(m.path)}</FilePathLink>
                   </Text>
                 </MessageResponse>
                 {isTranscriptMode && (
@@ -266,9 +235,9 @@ export function AttachmentMessage({
               </Box>
             ))}
         </Box>
-      )
+      );
     case 'dynamic_skill': {
-      const skillCount = attachment.skillNames.length
+      const skillCount = attachment.skillNames.length;
       return (
         <Line>
           Loaded{' '}
@@ -277,37 +246,32 @@ export function AttachmentMessage({
           </Text>{' '}
           from <Text bold>{attachment.displayPath}</Text>
         </Line>
-      )
+      );
     }
     case 'skill_listing': {
       if (attachment.isInitial) {
-        return null
+        return null;
       }
       return (
         <Line>
-          <Text bold>{attachment.skillCount}</Text>{' '}
-          {plural(attachment.skillCount, 'skill')} available
+          <Text bold>{attachment.skillCount}</Text> {plural(attachment.skillCount, 'skill')} available
         </Line>
-      )
+      );
     }
     case 'agent_listing_delta': {
       if (attachment.isInitial || attachment.addedTypes.length === 0) {
-        return null
+        return null;
       }
-      const count = attachment.addedTypes.length
+      const count = attachment.addedTypes.length;
       return (
         <Line>
           <Text bold>{count}</Text> agent {plural(count, 'type')} available
         </Line>
-      )
+      );
     }
     case 'queued_command': {
-      const text =
-        typeof attachment.prompt === 'string'
-          ? attachment.prompt
-          : getContentText(attachment.prompt) || ''
-      const hasImages =
-        attachment.imagePasteIds && attachment.imagePasteIds.length > 0
+      const text = typeof attachment.prompt === 'string' ? attachment.prompt : getContentText(attachment.prompt) || '';
+      const hasImages = attachment.imagePasteIds && attachment.imagePasteIds.length > 0;
       return (
         <Box flexDirection="column">
           <UserTextMessage
@@ -316,141 +280,113 @@ export function AttachmentMessage({
             verbose={verbose}
             isTranscriptMode={isTranscriptMode}
           />
-          {hasImages &&
-            attachment.imagePasteIds?.map(id => (
-              <UserImageMessage key={id} imageId={id} />
-            ))}
+          {hasImages && attachment.imagePasteIds?.map(id => <UserImageMessage key={id} imageId={id} />)}
         </Box>
-      )
+      );
     }
     case 'plan_file_reference':
-      return (
-        <Line>
-          Plan file referenced ({getDisplayPath(attachment.planFilePath)})
-        </Line>
-      )
+      return <Line>Plan file referenced ({getDisplayPath(attachment.planFilePath)})</Line>;
     case 'invoked_skills': {
       if (attachment.skills.length === 0) {
-        return null
+        return null;
       }
-      const skillNames = attachment.skills.map(s => s.name).join(', ')
-      return <Line>Skills restored ({skillNames})</Line>
+      const skillNames = attachment.skills.map(s => s.name).join(', ');
+      return <Line>Skills restored ({skillNames})</Line>;
     }
     case 'diagnostics':
-      return <DiagnosticsDisplay attachment={attachment} verbose={verbose} />
+      return <DiagnosticsDisplay attachment={attachment} verbose={verbose} />;
     case 'mcp_resource':
       return (
         <Line>
-          Read MCP resource <Text bold>{attachment.name}</Text> from{' '}
-          {attachment.server}
+          Read MCP resource <Text bold>{attachment.name}</Text> from {attachment.server}
         </Line>
-      )
+      );
     case 'command_permissions':
       // The skill success message is rendered by SkillTool's renderToolResultMessage,
       // so we don't render anything here to avoid duplicate messages.
-      return null
+      return null;
     case 'async_hook_response': {
       // SessionStart hook completions are only shown in verbose mode
       if (attachment.hookEvent === 'SessionStart' && !verbose) {
-        return null
+        return null;
       }
       // Generally hide async hook completion messages unless in verbose mode
       if (!verbose && !isTranscriptMode) {
-        return null
+        return null;
       }
       return (
         <Line>
           Async hook <Text bold>{attachment.hookEvent}</Text> completed
         </Line>
-      )
+      );
     }
     case 'hook_blocking_error': {
       // Stop hooks are rendered as a summary in SystemStopHookSummaryMessage
-      if (
-        attachment.hookEvent === 'Stop' ||
-        attachment.hookEvent === 'SubagentStop'
-      ) {
-        return null
+      if (attachment.hookEvent === 'Stop' || attachment.hookEvent === 'SubagentStop') {
+        return null;
       }
       // Show stderr to the user so they can understand why the hook blocked
-      const stderr = attachment.blockingError.blockingError.trim()
+      const stderr = attachment.blockingError.blockingError.trim();
       return (
         <>
-          <Line color="error">
-            {attachment.hookName} hook returned blocking error
-          </Line>
+          <Line color="error">{attachment.hookName} hook returned blocking error</Line>
           {stderr ? <Line color="error">{stderr}</Line> : null}
         </>
-      )
+      );
     }
     case 'hook_non_blocking_error': {
       // Stop hooks are rendered as a summary in SystemStopHookSummaryMessage
-      if (
-        attachment.hookEvent === 'Stop' ||
-        attachment.hookEvent === 'SubagentStop'
-      ) {
-        return null
+      if (attachment.hookEvent === 'Stop' || attachment.hookEvent === 'SubagentStop') {
+        return null;
       }
       // Full hook output is logged to debug log via hookEvents.ts
-      return <Line color="error">{attachment.hookName} hook error</Line>
+      return <Line color="error">{attachment.hookName} hook error</Line>;
     }
     case 'hook_error_during_execution':
       // Stop hooks are rendered as a summary in SystemStopHookSummaryMessage
-      if (
-        attachment.hookEvent === 'Stop' ||
-        attachment.hookEvent === 'SubagentStop'
-      ) {
-        return null
+      if (attachment.hookEvent === 'Stop' || attachment.hookEvent === 'SubagentStop') {
+        return null;
       }
       // Full hook output is logged to debug log via hookEvents.ts
-      return <Line>{attachment.hookName} hook warning</Line>
+      return <Line>{attachment.hookName} hook warning</Line>;
     case 'hook_success':
       // Full hook output is logged to debug log via hookEvents.ts
-      return null
+      return null;
     case 'hook_stopped_continuation':
       // Stop hooks are rendered as a summary in SystemStopHookSummaryMessage
-      if (
-        attachment.hookEvent === 'Stop' ||
-        attachment.hookEvent === 'SubagentStop'
-      ) {
-        return null
+      if (attachment.hookEvent === 'Stop' || attachment.hookEvent === 'SubagentStop') {
+        return null;
       }
       return (
         <Line color="warning">
           {attachment.hookName} hook stopped continuation: {attachment.message}
         </Line>
-      )
+      );
     case 'hook_system_message':
       return (
         <Line>
           {attachment.hookName} says: {attachment.content}
         </Line>
-      )
+      );
     case 'hook_permission_decision': {
-      const action = attachment.decision === 'allow' ? 'Allowed' : 'Denied'
+      const action = attachment.decision === 'allow' ? 'Allowed' : 'Denied';
       return (
         <Line>
           {action} by <Text bold>{attachment.hookEvent}</Text> hook
         </Line>
-      )
+      );
     }
     case 'task_status':
-      return <TaskStatusMessage attachment={attachment} />
+      return <TaskStatusMessage attachment={attachment} />;
     case 'teammate_shutdown_batch':
       return (
-        <Box
-          flexDirection="row"
-          width="100%"
-          marginTop={1}
-          backgroundColor={bg}
-        >
+        <Box flexDirection="row" width="100%" marginTop={1} backgroundColor={bg}>
           <Text dimColor>{BLACK_CIRCLE} </Text>
           <Text dimColor>
-            {attachment.count} {plural(attachment.count, 'teammate')} shut down
-            gracefully
+            {attachment.count} {plural(attachment.count, 'teammate')} shut down gracefully
           </Text>
         </Box>
-      )
+      );
     default:
       // Exhaustiveness: every type reaching here must be in NULL_RENDERING_TYPES.
       // If TS errors, a new Attachment type was added without a case above AND
@@ -461,44 +397,32 @@ export function AttachmentMessage({
       // skill_discovery and teammate_mailbox are handled BEFORE the switch in
       // runtime-gated blocks (feature() / isAgentSwarmsEnabled()) that TS can't
       // narrow through — excluded here via type union (compile-time only, no emit).
-      attachment.type satisfies
-        | NullRenderingAttachmentType
-        | 'skill_discovery'
-        | 'teammate_mailbox'
-        | 'bagel_console'
-      return null
+      attachment.type satisfies NullRenderingAttachmentType | 'skill_discovery' | 'teammate_mailbox' | 'bagel_console';
+      return null;
   }
 }
 
-type TaskStatusAttachment = Extract<Attachment, { type: 'task_status' }>
+type TaskStatusAttachment = Extract<Attachment, { type: 'task_status' }>;
 
-function TaskStatusMessage({
-  attachment,
-}: {
-  attachment: TaskStatusAttachment
-}): React.ReactNode {
+function TaskStatusMessage({ attachment }: { attachment: TaskStatusAttachment }): React.ReactNode {
   // For ants, killed task status is shown in the CoordinatorTaskPanel.
   // Don't render it again in the chat.
   if (process.env.USER_TYPE === 'ant' && attachment.status === 'killed') {
-    return null
+    return null;
   }
 
   // Only access teammate-specific code when swarms are enabled.
   // TeammateTaskStatus subscribes to AppState; by gating the mount we
   // avoid adding a store listener for every non-teammate attachment.
   if (isAgentSwarmsEnabled() && attachment.taskType === 'in_process_teammate') {
-    return <TeammateTaskStatus attachment={attachment} />
+    return <TeammateTaskStatus attachment={attachment} />;
   }
 
-  return <GenericTaskStatus attachment={attachment} />
+  return <GenericTaskStatus attachment={attachment} />;
 }
 
-function GenericTaskStatus({
-  attachment,
-}: {
-  attachment: TaskStatusAttachment
-}): React.ReactNode {
-  const bg = useSelectedMessageBg()
+function GenericTaskStatus({ attachment }: { attachment: TaskStatusAttachment }): React.ReactNode {
+  const bg = useSelectedMessageBg();
   const statusText =
     attachment.status === 'completed'
       ? 'completed in background'
@@ -506,7 +430,7 @@ function GenericTaskStatus({
         ? 'stopped'
         : attachment.status === 'running'
           ? 'still running in background'
-          : attachment.status
+          : attachment.status;
   return (
     <Box flexDirection="row" width="100%" marginTop={1} backgroundColor={bg}>
       <Text dimColor>{BLACK_CIRCLE} </Text>
@@ -514,26 +438,19 @@ function GenericTaskStatus({
         Task &quot;<Text bold>{attachment.description}</Text>&quot; {statusText}
       </Text>
     </Box>
-  )
+  );
 }
 
-function TeammateTaskStatus({
-  attachment,
-}: {
-  attachment: TaskStatusAttachment
-}): React.ReactNode {
-  const bg = useSelectedMessageBg()
+function TeammateTaskStatus({ attachment }: { attachment: TaskStatusAttachment }): React.ReactNode {
+  const bg = useSelectedMessageBg();
   // Narrow selector: only re-render when this specific task changes.
-  const task = useAppState(s => s.tasks[attachment.taskId])
+  const task = useAppState(s => s.tasks[attachment.taskId]);
   if (task?.type !== 'in_process_teammate') {
     // Fall through to generic rendering (task not yet in store, or wrong type)
-    return <GenericTaskStatus attachment={attachment} />
+    return <GenericTaskStatus attachment={attachment} />;
   }
-  const agentColor = toInkColor(task.identity.color)
-  const statusText =
-    attachment.status === 'completed'
-      ? 'shut down gracefully'
-      : attachment.status
+  const agentColor = toInkColor(task.identity.color);
+  const statusText = attachment.status === 'completed' ? 'shut down gracefully' : attachment.status;
   return (
     <Box flexDirection="row" width="100%" marginTop={1} backgroundColor={bg}>
       <Text dimColor>{BLACK_CIRCLE} </Text>
@@ -545,7 +462,7 @@ function TeammateTaskStatus({
         {statusText}
       </Text>
     </Box>
-  )
+  );
 }
 // We allow setting dimColor to false here to help work around the dim-bold bug.
 // https://github.com/chalk/chalk/issues/290
@@ -554,11 +471,11 @@ function Line({
   children,
   color,
 }: {
-  dimColor?: boolean
-  children: React.ReactNode
-  color?: keyof Theme
+  dimColor?: boolean;
+  children: React.ReactNode;
+  color?: keyof Theme;
 }): React.ReactNode {
-  const bg = useSelectedMessageBg()
+  const bg = useSelectedMessageBg();
   return (
     <Box backgroundColor={bg}>
       <MessageResponse>
@@ -567,5 +484,5 @@ function Line({
         </Text>
       </MessageResponse>
     </Box>
-  )
+  );
 }
diff --git a/src/components/messages/CollapsedReadSearchContent.tsx b/src/components/messages/CollapsedReadSearchContent.tsx
index 1176eafbb..3d00c6bc6 100644
--- a/src/components/messages/CollapsedReadSearchContent.tsx
+++ b/src/components/messages/CollapsedReadSearchContent.tsx
@@ -1,47 +1,44 @@
-import { feature } from 'bun:bundle'
-import { basename } from 'path'
-import React, { useRef } from 'react'
-import { useMinDisplayTime } from '../../hooks/useMinDisplayTime.js'
-import { Ansi, Box, Text, useTheme } from '@anthropic/ink'
-import { findToolByName, type Tools } from '../../Tool.js'
-import { getReplPrimitiveTools } from '@claude-code-best/builtin-tools/tools/REPLTool/primitiveTools.js'
-import type {
-  CollapsedReadSearchGroup,
-  NormalizedAssistantMessage,
-} from '../../types/message.js'
-import { uniq } from '../../utils/array.js'
-import { getToolUseIdsFromCollapsedGroup } from '../../utils/collapseReadSearch.js'
-import { getDisplayPath } from '../../utils/file.js'
-import { formatDuration, formatSecondsShort } from '../../utils/format.js'
-import { isFullscreenEnvEnabled } from '../../utils/fullscreen.js'
-import type { buildMessageLookups } from '../../utils/messages.js'
-import type { ThemeName } from '../../utils/theme.js'
-import { CtrlOToExpand } from '../CtrlOToExpand.js'
-import { useSelectedMessageBg } from '../messageActions.js'
-import { PrBadge } from '../PrBadge.js'
-import { ToolUseLoader } from '../ToolUseLoader.js'
+import { feature } from 'bun:bundle';
+import { basename } from 'path';
+import React, { useRef } from 'react';
+import { useMinDisplayTime } from '../../hooks/useMinDisplayTime.js';
+import { Ansi, Box, Text, useTheme } from '@anthropic/ink';
+import { findToolByName, type Tools } from '../../Tool.js';
+import { getReplPrimitiveTools } from '@claude-code-best/builtin-tools/tools/REPLTool/primitiveTools.js';
+import type { CollapsedReadSearchGroup, NormalizedAssistantMessage } from '../../types/message.js';
+import { uniq } from '../../utils/array.js';
+import { getToolUseIdsFromCollapsedGroup } from '../../utils/collapseReadSearch.js';
+import { getDisplayPath } from '../../utils/file.js';
+import { formatDuration, formatSecondsShort } from '../../utils/format.js';
+import { isFullscreenEnvEnabled } from '../../utils/fullscreen.js';
+import type { buildMessageLookups } from '../../utils/messages.js';
+import type { ThemeName } from '../../utils/theme.js';
+import { CtrlOToExpand } from '../CtrlOToExpand.js';
+import { useSelectedMessageBg } from '../messageActions.js';
+import { PrBadge } from '../PrBadge.js';
+import { ToolUseLoader } from '../ToolUseLoader.js';
 
 /* eslint-disable @typescript-eslint/no-require-imports */
 const teamMemCollapsed = feature('TEAMMEM')
   ? (require('./teamMemCollapsed.js') as typeof import('./teamMemCollapsed.js'))
-  : null
+  : null;
 /* eslint-enable @typescript-eslint/no-require-imports */
 
 // Hold each ⤿ hint for a minimum duration so fast-completing tool calls
 // (bash commands, file reads, search patterns) are actually readable instead
 // of flickering past in a single frame.
-const MIN_HINT_DISPLAY_MS = 700
+const MIN_HINT_DISPLAY_MS = 700;
 
 type Props = {
-  message: CollapsedReadSearchGroup
-  inProgressToolUseIDs: Set<string>
-  shouldAnimate: boolean
-  verbose: boolean
-  tools: Tools
-  lookups: ReturnType<typeof buildMessageLookups>
+  message: CollapsedReadSearchGroup;
+  inProgressToolUseIDs: Set<string>;
+  shouldAnimate: boolean;
+  verbose: boolean;
+  tools: Tools;
+  lookups: ReturnType<typeof buildMessageLookups>;
   /** True if this is the currently active collapsed group (last one, still loading) */
-  isActiveGroup?: boolean
-}
+  isActiveGroup?: boolean;
+};
 
 /** Render a single tool use in verbose mode */
 function VerboseToolUse({
@@ -52,52 +49,38 @@ function VerboseToolUse({
   shouldAnimate,
   theme,
 }: {
-  content: { type: 'tool_use'; id: string; name: string; input: unknown }
-  tools: Tools
-  lookups: ReturnType<typeof buildMessageLookups>
-  inProgressToolUseIDs: Set<string>
-  shouldAnimate: boolean
-  theme: ThemeName
+  content: { type: 'tool_use'; id: string; name: string; input: unknown };
+  tools: Tools;
+  lookups: ReturnType<typeof buildMessageLookups>;
+  inProgressToolUseIDs: Set<string>;
+  shouldAnimate: boolean;
+  theme: ThemeName;
 }): React.ReactNode {
-  const bg = useSelectedMessageBg()
+  const bg = useSelectedMessageBg();
   // Same REPL-primitive fallback as getToolSearchOrReadInfo — REPL mode strips
   // these from the execution tools list, but virtual messages still need them
   // to render in verbose mode.
-  const tool =
-    findToolByName(tools, content.name) ??
-    findToolByName(getReplPrimitiveTools(), content.name)
-  if (!tool) return null
+  const tool = findToolByName(tools, content.name) ?? findToolByName(getReplPrimitiveTools(), content.name);
+  if (!tool) return null;
 
-  const isResolved = lookups.resolvedToolUseIDs.has(content.id)
-  const isError = lookups.erroredToolUseIDs.has(content.id)
-  const isInProgress = inProgressToolUseIDs.has(content.id)
+  const isResolved = lookups.resolvedToolUseIDs.has(content.id);
+  const isError = lookups.erroredToolUseIDs.has(content.id);
+  const isInProgress = inProgressToolUseIDs.has(content.id);
 
-  const resultMsg = lookups.toolResultByToolUseID.get(content.id)
-  const rawToolResult =
-    resultMsg?.type === 'user' ? resultMsg.toolUseResult : undefined
-  const parsedOutput = tool.outputSchema?.safeParse(rawToolResult)
-  const toolResult = parsedOutput?.success ? parsedOutput.data : undefined
+  const resultMsg = lookups.toolResultByToolUseID.get(content.id);
+  const rawToolResult = resultMsg?.type === 'user' ? resultMsg.toolUseResult : undefined;
+  const parsedOutput = tool.outputSchema?.safeParse(rawToolResult);
+  const toolResult = parsedOutput?.success ? parsedOutput.data : undefined;
 
-  const parsedInput = tool.inputSchema.safeParse(content.input)
-  const input = parsedInput.success ? parsedInput.data : undefined
-  const userFacingName = tool.userFacingName(input)
-  const toolUseMessage = input
-    ? tool.renderToolUseMessage(input, { theme, verbose: true })
-    : null
+  const parsedInput = tool.inputSchema.safeParse(content.input);
+  const input = parsedInput.success ? parsedInput.data : undefined;
+  const userFacingName = tool.userFacingName(input);
+  const toolUseMessage = input ? tool.renderToolUseMessage(input, { theme, verbose: true }) : null;
 
   return (
-    <Box
-      key={content.id}
-      flexDirection="column"
-      marginTop={1}
-      backgroundColor={bg}
-    >
+    <Box key={content.id} flexDirection="column" marginTop={1} backgroundColor={bg}>
       <Box flexDirection="row">
-        <ToolUseLoader
-          shouldAnimate={shouldAnimate && isInProgress}
-          isUnresolved={!isResolved}
-          isError={isError}
-        />
+        <ToolUseLoader shouldAnimate={shouldAnimate && isInProgress} isUnresolved={!isResolved} isError={isError} />
         <Text>
           <Text bold>{userFacingName}</Text>
           {toolUseMessage && <Text>({toolUseMessage})</Text>}
@@ -114,7 +97,7 @@ function VerboseToolUse({
         </Box>
       )}
     </Box>
-  )
+  );
 }
 
 export function CollapsedReadSearchContent({
@@ -126,7 +109,7 @@ export function CollapsedReadSearchContent({
   lookups,
   isActiveGroup,
 }: Props): React.ReactNode {
-  const bg = useSelectedMessageBg()
+  const bg = useSelectedMessageBg();
   const {
     searchCount: rawSearchCount,
     readCount: rawReadCount,
@@ -136,49 +119,35 @@ export function CollapsedReadSearchContent({
     memoryReadCount,
     memoryWriteCount,
     messages: groupMessages,
-  } = message
-  const [theme] = useTheme()
-  const toolUseIds = getToolUseIdsFromCollapsedGroup(message)
-  const anyError = toolUseIds.some(id => lookups.erroredToolUseIDs.has(id))
-  const hasMemoryOps =
-    memorySearchCount > 0 || memoryReadCount > 0 || memoryWriteCount > 0
-  const hasTeamMemoryOps = feature('TEAMMEM')
-    ? teamMemCollapsed!.checkHasTeamMemOps(message)
-    : false
+  } = message;
+  const [theme] = useTheme();
+  const toolUseIds = getToolUseIdsFromCollapsedGroup(message);
+  const anyError = toolUseIds.some(id => lookups.erroredToolUseIDs.has(id));
+  const hasMemoryOps = memorySearchCount > 0 || memoryReadCount > 0 || memoryWriteCount > 0;
+  const hasTeamMemoryOps = feature('TEAMMEM') ? teamMemCollapsed!.checkHasTeamMemOps(message) : false;
 
   // Track the max seen counts so they only ever increase. The debounce timer
   // causes extra re-renders at arbitrary times; during a brief "invisible window"
   // in the streaming executor the group count can dip, which causes jitter.
-  const maxReadCountRef = useRef(0)
-  const maxSearchCountRef = useRef(0)
-  const maxListCountRef = useRef(0)
-  const maxMcpCountRef = useRef(0)
-  const maxBashCountRef = useRef(0)
-  maxReadCountRef.current = Math.max(maxReadCountRef.current, rawReadCount)
-  maxSearchCountRef.current = Math.max(
-    maxSearchCountRef.current,
-    rawSearchCount,
-  )
-  maxListCountRef.current = Math.max(maxListCountRef.current, rawListCount)
-  maxMcpCountRef.current = Math.max(
-    maxMcpCountRef.current,
-    message.mcpCallCount ?? 0,
-  )
-  maxBashCountRef.current = Math.max(
-    maxBashCountRef.current,
-    message.bashCount ?? 0,
-  )
-  const readCount = maxReadCountRef.current
-  const searchCount = maxSearchCountRef.current
-  const listCount = maxListCountRef.current
-  const mcpCallCount = maxMcpCountRef.current
+  const maxReadCountRef = useRef(0);
+  const maxSearchCountRef = useRef(0);
+  const maxListCountRef = useRef(0);
+  const maxMcpCountRef = useRef(0);
+  const maxBashCountRef = useRef(0);
+  maxReadCountRef.current = Math.max(maxReadCountRef.current, rawReadCount);
+  maxSearchCountRef.current = Math.max(maxSearchCountRef.current, rawSearchCount);
+  maxListCountRef.current = Math.max(maxListCountRef.current, rawListCount);
+  maxMcpCountRef.current = Math.max(maxMcpCountRef.current, message.mcpCallCount ?? 0);
+  maxBashCountRef.current = Math.max(maxBashCountRef.current, message.bashCount ?? 0);
+  const readCount = maxReadCountRef.current;
+  const searchCount = maxSearchCountRef.current;
+  const listCount = maxListCountRef.current;
+  const mcpCallCount = maxMcpCountRef.current;
   // Subtract commands surfaced as "Committed …" / "Created PR …" so the
   // same command isn't counted twice. gitOpBashCount is read live (no max-ref
   // needed — it's 0 until results arrive, then only grows).
-  const gitOpBashCount = message.gitOpBashCount ?? 0
-  const bashCount = isFullscreenEnvEnabled()
-    ? Math.max(0, maxBashCountRef.current - gitOpBashCount)
-    : 0
+  const gitOpBashCount = message.gitOpBashCount ?? 0;
+  const bashCount = isFullscreenEnvEnabled() ? Math.max(0, maxBashCountRef.current - gitOpBashCount) : 0;
 
   const hasNonMemoryOps =
     searchCount > 0 ||
@@ -187,18 +156,16 @@ export function CollapsedReadSearchContent({
     replCount > 0 ||
     mcpCallCount > 0 ||
     bashCount > 0 ||
-    gitOpBashCount > 0
+    gitOpBashCount > 0;
 
-  const readPaths = message.readFilePaths
-  const searchArgs = message.searchArgs
-  let incomingHint = message.latestDisplayHint
+  const readPaths = message.readFilePaths;
+  const searchArgs = message.searchArgs;
+  let incomingHint = message.latestDisplayHint;
   if (incomingHint === undefined) {
-    const lastSearchRaw = searchArgs?.at(-1)
-    const lastSearch =
-      lastSearchRaw !== undefined ? `"${lastSearchRaw}"` : undefined
-    const lastRead = readPaths?.at(-1)
-    incomingHint =
-      lastRead !== undefined ? getDisplayPath(lastRead) : lastSearch
+    const lastSearchRaw = searchArgs?.at(-1);
+    const lastSearch = lastSearchRaw !== undefined ? `"${lastSearchRaw}"` : undefined;
+    const lastRead = readPaths?.at(-1);
+    incomingHint = lastRead !== undefined ? getDisplayPath(lastRead) : lastSearch;
   }
 
   // Active REPL calls emit repl_tool_call progress with the current inner
@@ -206,41 +173,43 @@ export function CollapsedReadSearchContent({
   // so this is the only source of a live hint during execution.
   if (isActiveGroup) {
     for (const id of toolUseIds) {
-      if (!inProgressToolUseIDs.has(id)) continue
-      const latest = lookups.progressMessagesByToolUseID.get(id)?.at(-1)?.data as Record<string, unknown> | undefined
+      if (!inProgressToolUseIDs.has(id)) continue;
+      const latest = lookups.progressMessagesByToolUseID.get(id)?.at(-1)?.data as Record<string, unknown> | undefined;
       if (latest?.type === 'repl_tool_call' && latest.phase === 'start') {
         const input = latest.toolInput as {
-          command?: string
-          pattern?: string
-          file_path?: string
-        }
+          command?: string;
+          pattern?: string;
+          file_path?: string;
+        };
         incomingHint =
           input.file_path ??
           (input.pattern ? `"${input.pattern}"` : undefined) ??
           input.command ??
-          (latest.toolName as string | undefined)
+          (latest.toolName as string | undefined);
       }
     }
   }
 
-  const displayedHint = useMinDisplayTime(incomingHint, MIN_HINT_DISPLAY_MS)
+  const displayedHint = useMinDisplayTime(incomingHint, MIN_HINT_DISPLAY_MS);
 
   // In verbose mode, render each tool use with its 1-line result summary
   if (verbose) {
-    const toolUses: NormalizedAssistantMessage[] = []
+    const toolUses: NormalizedAssistantMessage[] = [];
     for (const msg of groupMessages) {
       if (msg.type === 'assistant') {
-        toolUses.push(msg)
+        toolUses.push(msg);
       } else if (msg.type === 'grouped_tool_use') {
-        toolUses.push(...msg.messages)
+        toolUses.push(...msg.messages);
       }
     }
 
     return (
       <Box flexDirection="column">
         {toolUses.map(msg => {
-          const content = (msg.message.content as Array<{ type: string; id?: string; name?: string; input?: unknown }>)[0]
-          if (content?.type !== 'tool_use') return null
+          const content = (
+            msg.message.content as Array<{ type: string; id?: string; name?: string; input?: unknown }>
+          )[0];
+          if (content?.type !== 'tool_use') return null;
           return (
             <VerboseToolUse
               key={content.id!}
@@ -251,13 +220,12 @@ export function CollapsedReadSearchContent({
               shouldAnimate={shouldAnimate}
               theme={theme}
             />
-          )
+          );
         })}
         {message.hookInfos && message.hookInfos.length > 0 && (
           <>
             <Text dimColor>
-              {'  ⎿  '}Ran {message.hookCount} PreToolUse{' '}
-              {message.hookCount === 1 ? 'hook' : 'hooks'} (
+              {'  ⎿  '}Ran {message.hookCount} PreToolUse {message.hookCount === 1 ? 'hook' : 'hooks'} (
               {formatSecondsShort(message.hookTotalMs ?? 0)})
             </Text>
             {message.hookInfos.map((info, idx) => (
@@ -281,7 +249,7 @@ export function CollapsedReadSearchContent({
           </Box>
         ))}
       </Box>
-    )
+    );
   }
 
   // Non-verbose mode: Show counts with blinking grey dot while active, green dot when finalized
@@ -290,81 +258,71 @@ export function CollapsedReadSearchContent({
   // Defensive: If all counts are 0, don't render the collapsed group
   // This shouldn't happen in normal operation, but handles edge cases
   if (!hasMemoryOps && !hasTeamMemoryOps && !hasNonMemoryOps) {
-    return null
+    return null;
   }
 
   // Find the slowest in-progress shell command in this group. BashTool yields
   // progress every second but the collapsed renderer never showed it — long
   // commands (npm install, tests) looked frozen. Shown after 2s so fast
   // commands stay clean; the ticking counter reassures that slow ones aren't stuck.
-  let shellProgressSuffix = ''
+  let shellProgressSuffix = '';
   if (isFullscreenEnvEnabled() && isActiveGroup) {
-    let elapsed: number | undefined
-    let lines = 0
+    let elapsed: number | undefined;
+    let lines = 0;
     for (const id of toolUseIds) {
-      if (!inProgressToolUseIDs.has(id)) continue
-      const data = lookups.progressMessagesByToolUseID.get(id)?.at(-1)?.data as Record<string, unknown> | undefined
-      if (
-        data?.type !== 'bash_progress' &&
-        data?.type !== 'powershell_progress'
-      ) {
-        continue
+      if (!inProgressToolUseIDs.has(id)) continue;
+      const data = lookups.progressMessagesByToolUseID.get(id)?.at(-1)?.data as Record<string, unknown> | undefined;
+      if (data?.type !== 'bash_progress' && data?.type !== 'powershell_progress') {
+        continue;
       }
-      const elapsedSec = data.elapsedTimeSeconds as number | undefined
-      const totalLines = data.totalLines as number | undefined
+      const elapsedSec = data.elapsedTimeSeconds as number | undefined;
+      const totalLines = data.totalLines as number | undefined;
       if (elapsed === undefined || (elapsedSec ?? 0) > elapsed) {
-        elapsed = elapsedSec
-        lines = totalLines ?? 0
+        elapsed = elapsedSec;
+        lines = totalLines ?? 0;
       }
     }
     if (elapsed !== undefined && elapsed >= 2) {
-      const time = formatDuration(elapsed * 1000)
-      shellProgressSuffix =
-        lines > 0
-          ? ` (${time} · ${lines} ${lines === 1 ? 'line' : 'lines'})`
-          : ` (${time})`
+      const time = formatDuration(elapsed * 1000);
+      shellProgressSuffix = lines > 0 ? ` (${time} · ${lines} ${lines === 1 ? 'line' : 'lines'})` : ` (${time})`;
     }
   }
 
   // Build non-memory parts first (search, read, repl, mcp, bash) — these render
   // before memory so the line reads "Ran 3 bash commands, recalled 1 memory".
-  const nonMemParts: React.ReactNode[] = []
+  const nonMemParts: React.ReactNode[] = [];
 
   // Git operations lead the line — they're the load-bearing outcome.
   function pushPart(key: string, verb: string, body: React.ReactNode): void {
-    const isFirst = nonMemParts.length === 0
-    if (!isFirst) nonMemParts.push(<Text key={`comma-${key}`}>, </Text>)
+    const isFirst = nonMemParts.length === 0;
+    if (!isFirst) nonMemParts.push(<Text key={`comma-${key}`}>, </Text>);
     nonMemParts.push(
       <Text key={key}>
         {isFirst ? verb[0]!.toUpperCase() + verb.slice(1) : verb} {body}
       </Text>,
-    )
+    );
   }
   if (isFullscreenEnvEnabled() && message.commits?.length) {
     const byKind = {
       committed: 'committed',
       amended: 'amended commit',
       'cherry-picked': 'cherry-picked',
-    }
+    };
     for (const kind of ['committed', 'amended', 'cherry-picked'] as const) {
-      const shas = message.commits.filter(c => c.kind === kind).map(c => c.sha)
+      const shas = message.commits.filter(c => c.kind === kind).map(c => c.sha);
       if (shas.length) {
-        pushPart(kind, byKind[kind], <Text bold>{shas.join(', ')}</Text>)
+        pushPart(kind, byKind[kind], <Text bold>{shas.join(', ')}</Text>);
       }
     }
   }
   if (isFullscreenEnvEnabled() && message.pushes?.length) {
-    const branches = uniq(message.pushes.map(p => p.branch))
-    pushPart('push', 'pushed to', <Text bold>{branches.join(', ')}</Text>)
+    const branches = uniq(message.pushes.map(p => p.branch));
+    pushPart('push', 'pushed to', <Text bold>{branches.join(', ')}</Text>);
   }
   if (isFullscreenEnvEnabled() && message.branches?.length) {
-    const byAction = { merged: 'merged', rebased: 'rebased onto' }
+    const byAction = { merged: 'merged', rebased: 'rebased onto' };
     for (const b of message.branches) {
-      pushPart(
-        `br-${b.action}-${b.ref}`,
-        byAction[b.action],
-        <Text bold>{b.ref}</Text>,
-      )
+      pushPart(`br-${b.action}-${b.ref}`, byAction[b.action], <Text bold>{b.ref}</Text>);
     }
   }
   if (isFullscreenEnvEnabled() && message.prs?.length) {
@@ -375,108 +333,79 @@ export function CollapsedReadSearchContent({
       commented: 'commented on',
       closed: 'closed',
       ready: 'marked ready',
-    }
+    };
     for (const pr of message.prs) {
       pushPart(
         `pr-${pr.action}-${pr.number}`,
         verbs[pr.action],
-        pr.url ? (
-          <PrBadge number={pr.number} url={pr.url} bold />
-        ) : (
-          <Text bold>PR #{pr.number}</Text>
-        ),
-      )
+        pr.url ? <PrBadge number={pr.number} url={pr.url} bold /> : <Text bold>PR #{pr.number}</Text>,
+      );
     }
   }
 
   if (searchCount > 0) {
-    const isFirst = nonMemParts.length === 0
+    const isFirst = nonMemParts.length === 0;
     const searchVerb = isActiveGroup
       ? isFirst
         ? 'Searching for'
         : 'searching for'
       : isFirst
         ? 'Searched for'
-        : 'searched for'
+        : 'searched for';
     if (!isFirst) {
-      nonMemParts.push(<Text key="comma-s">, </Text>)
+      nonMemParts.push(<Text key="comma-s">, </Text>);
     }
     nonMemParts.push(
       <Text key="search">
-        {searchVerb} <Text bold>{searchCount}</Text>{' '}
-        {searchCount === 1 ? 'pattern' : 'patterns'}
+        {searchVerb} <Text bold>{searchCount}</Text> {searchCount === 1 ? 'pattern' : 'patterns'}
       </Text>,
-    )
+    );
   }
 
   if (readCount > 0) {
-    const isFirst = nonMemParts.length === 0
-    const readVerb = isActiveGroup
-      ? isFirst
-        ? 'Reading'
-        : 'reading'
-      : isFirst
-        ? 'Read'
-        : 'read'
+    const isFirst = nonMemParts.length === 0;
+    const readVerb = isActiveGroup ? (isFirst ? 'Reading' : 'reading') : isFirst ? 'Read' : 'read';
     if (!isFirst) {
-      nonMemParts.push(<Text key="comma-r">, </Text>)
+      nonMemParts.push(<Text key="comma-r">, </Text>);
     }
     nonMemParts.push(
       <Text key="read">
-        {readVerb} <Text bold>{readCount}</Text>{' '}
-        {readCount === 1 ? 'file' : 'files'}
+        {readVerb} <Text bold>{readCount}</Text> {readCount === 1 ? 'file' : 'files'}
       </Text>,
-    )
+    );
   }
 
   if (listCount > 0) {
-    const isFirst = nonMemParts.length === 0
-    const listVerb = isActiveGroup
-      ? isFirst
-        ? 'Listing'
-        : 'listing'
-      : isFirst
-        ? 'Listed'
-        : 'listed'
+    const isFirst = nonMemParts.length === 0;
+    const listVerb = isActiveGroup ? (isFirst ? 'Listing' : 'listing') : isFirst ? 'Listed' : 'listed';
     if (!isFirst) {
-      nonMemParts.push(<Text key="comma-l">, </Text>)
+      nonMemParts.push(<Text key="comma-l">, </Text>);
     }
     nonMemParts.push(
       <Text key="list">
-        {listVerb} <Text bold>{listCount}</Text>{' '}
-        {listCount === 1 ? 'directory' : 'directories'}
+        {listVerb} <Text bold>{listCount}</Text> {listCount === 1 ? 'directory' : 'directories'}
       </Text>,
-    )
+    );
   }
 
   if (replCount > 0) {
-    const replVerb = isActiveGroup ? "REPL'ing" : "REPL'd"
+    const replVerb = isActiveGroup ? "REPL'ing" : "REPL'd";
     if (nonMemParts.length > 0) {
-      nonMemParts.push(<Text key="comma-repl">, </Text>)
+      nonMemParts.push(<Text key="comma-repl">, </Text>);
     }
     nonMemParts.push(
       <Text key="repl">
-        {replVerb} <Text bold>{replCount}</Text>{' '}
-        {replCount === 1 ? 'time' : 'times'}
+        {replVerb} <Text bold>{replCount}</Text> {replCount === 1 ? 'time' : 'times'}
       </Text>,
-    )
+    );
   }
 
   if (mcpCallCount > 0) {
-    const serverLabel =
-      message.mcpServerNames
-        ?.map(n => n.replace(/^claude\.ai /, ''))
-        .join(', ') || 'MCP'
-    const isFirst = nonMemParts.length === 0
-    const verb = isActiveGroup
-      ? isFirst
-        ? 'Querying'
-        : 'querying'
-      : isFirst
-        ? 'Queried'
-        : 'queried'
+    const serverLabel = message.mcpServerNames?.map(n => n.replace(/^claude\.ai /, '')).join(', ') || 'MCP';
+    const isFirst = nonMemParts.length === 0;
+    const verb = isActiveGroup ? (isFirst ? 'Querying' : 'querying') : isFirst ? 'Queried' : 'queried';
     if (!isFirst) {
-      nonMemParts.push(<Text key="comma-mcp">, </Text>)
+      nonMemParts.push(<Text key="comma-mcp">, </Text>);
     }
     nonMemParts.push(
       <Text key="mcp">
@@ -488,96 +417,65 @@ export function CollapsedReadSearchContent({
           </>
         )}
       </Text>,
-    )
+    );
   }
 
   if (isFullscreenEnvEnabled() && bashCount > 0) {
-    const isFirst = nonMemParts.length === 0
-    const verb = isActiveGroup
-      ? isFirst
-        ? 'Running'
-        : 'running'
-      : isFirst
-        ? 'Ran'
-        : 'ran'
+    const isFirst = nonMemParts.length === 0;
+    const verb = isActiveGroup ? (isFirst ? 'Running' : 'running') : isFirst ? 'Ran' : 'ran';
     if (!isFirst) {
-      nonMemParts.push(<Text key="comma-bash">, </Text>)
+      nonMemParts.push(<Text key="comma-bash">, </Text>);
     }
     nonMemParts.push(
       <Text key="bash">
-        {verb} <Text bold>{bashCount}</Text> bash{' '}
-        {bashCount === 1 ? 'command' : 'commands'}
+        {verb} <Text bold>{bashCount}</Text> bash {bashCount === 1 ? 'command' : 'commands'}
       </Text>,
-    )
+    );
   }
 
   // Build memory parts (auto-memory) — rendered after nonMemParts
-  const hasPrecedingNonMem = nonMemParts.length > 0
-  const memParts: React.ReactNode[] = []
+  const hasPrecedingNonMem = nonMemParts.length > 0;
+  const memParts: React.ReactNode[] = [];
 
   if (memoryReadCount > 0) {
-    const isFirst = !hasPrecedingNonMem && memParts.length === 0
-    const verb = isActiveGroup
-      ? isFirst
-        ? 'Recalling'
-        : 'recalling'
-      : isFirst
-        ? 'Recalled'
-        : 'recalled'
+    const isFirst = !hasPrecedingNonMem && memParts.length === 0;
+    const verb = isActiveGroup ? (isFirst ? 'Recalling' : 'recalling') : isFirst ? 'Recalled' : 'recalled';
     if (!isFirst) {
-      memParts.push(<Text key="comma-mr">, </Text>)
+      memParts.push(<Text key="comma-mr">, </Text>);
     }
     memParts.push(
       <Text key="mem-read">
-        {verb} <Text bold>{memoryReadCount}</Text>{' '}
-        {memoryReadCount === 1 ? 'memory' : 'memories'}
+        {verb} <Text bold>{memoryReadCount}</Text> {memoryReadCount === 1 ? 'memory' : 'memories'}
       </Text>,
-    )
+    );
   }
 
   if (memorySearchCount > 0) {
-    const isFirst = !hasPrecedingNonMem && memParts.length === 0
-    const verb = isActiveGroup
-      ? isFirst
-        ? 'Searching'
-        : 'searching'
-      : isFirst
-        ? 'Searched'
-        : 'searched'
+    const isFirst = !hasPrecedingNonMem && memParts.length === 0;
+    const verb = isActiveGroup ? (isFirst ? 'Searching' : 'searching') : isFirst ? 'Searched' : 'searched';
     if (!isFirst) {
-      memParts.push(<Text key="comma-ms">, </Text>)
+      memParts.push(<Text key="comma-ms">, </Text>);
     }
-    memParts.push(<Text key="mem-search">{`${verb} memories`}</Text>)
+    memParts.push(<Text key="mem-search">{`${verb} memories`}</Text>);
   }
 
   if (memoryWriteCount > 0) {
-    const isFirst = !hasPrecedingNonMem && memParts.length === 0
-    const verb = isActiveGroup
-      ? isFirst
-        ? 'Writing'
-        : 'writing'
-      : isFirst
-        ? 'Wrote'
-        : 'wrote'
+    const isFirst = !hasPrecedingNonMem && memParts.length === 0;
+    const verb = isActiveGroup ? (isFirst ? 'Writing' : 'writing') : isFirst ? 'Wrote' : 'wrote';
     if (!isFirst) {
-      memParts.push(<Text key="comma-mw">, </Text>)
+      memParts.push(<Text key="comma-mw">, </Text>);
     }
     memParts.push(
       <Text key="mem-write">
-        {verb} <Text bold>{memoryWriteCount}</Text>{' '}
-        {memoryWriteCount === 1 ? 'memory' : 'memories'}
+        {verb} <Text bold>{memoryWriteCount}</Text> {memoryWriteCount === 1 ? 'memory' : 'memories'}
       </Text>,
-    )
+    );
   }
 
   return (
     <Box flexDirection="column" marginTop={1} backgroundColor={bg}>
       <Box flexDirection="row">
-        {isActiveGroup ? (
-          <ToolUseLoader shouldAnimate isUnresolved isError={anyError} />
-        ) : (
-          <Box minWidth={2} />
-        )}
+        {isActiveGroup ? <ToolUseLoader shouldAnimate isUnresolved isError={anyError} /> : <Box minWidth={2} />}
         <Text dimColor={!isActiveGroup}>
           {nonMemParts}
           {memParts}
@@ -611,11 +509,10 @@ export function CollapsedReadSearchContent({
       )}
       {message.hookTotalMs !== undefined && message.hookTotalMs > 0 && (
         <Text dimColor>
-          {'  ⎿  '}Ran {message.hookCount} PreToolUse{' '}
-          {message.hookCount === 1 ? 'hook' : 'hooks'} (
+          {'  ⎿  '}Ran {message.hookCount} PreToolUse {message.hookCount === 1 ? 'hook' : 'hooks'} (
           {formatSecondsShort(message.hookTotalMs)})
         </Text>
       )}
     </Box>
-  )
+  );
 }
diff --git a/src/components/messages/CompactBoundaryMessage.tsx b/src/components/messages/CompactBoundaryMessage.tsx
index 54033b23e..36c16067a 100644
--- a/src/components/messages/CompactBoundaryMessage.tsx
+++ b/src/components/messages/CompactBoundaryMessage.tsx
@@ -1,19 +1,13 @@
-import * as React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { useShortcutDisplay } from '../../keybindings/useShortcutDisplay.js'
+import * as React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { useShortcutDisplay } from '../../keybindings/useShortcutDisplay.js';
 
 export function CompactBoundaryMessage(): React.ReactNode {
-  const historyShortcut = useShortcutDisplay(
-    'app:toggleTranscript',
-    'Global',
-    'ctrl+o',
-  )
+  const historyShortcut = useShortcutDisplay('app:toggleTranscript', 'Global', 'ctrl+o');
 
   return (
     <Box marginY={1}>
-      <Text dimColor>
-        ✻ Conversation compacted ({historyShortcut} for history)
-      </Text>
+      <Text dimColor>✻ Conversation compacted ({historyShortcut} for history)</Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/messages/GroupedToolUseContent.tsx b/src/components/messages/GroupedToolUseContent.tsx
index 4f9d96e26..06899e415 100644
--- a/src/components/messages/GroupedToolUseContent.tsx
+++ b/src/components/messages/GroupedToolUseContent.tsx
@@ -1,23 +1,16 @@
-import type {
-  ToolResultBlockParam,
-  ToolUseBlockParam,
-} from '@anthropic-ai/sdk/resources/messages/messages.mjs'
-import * as React from 'react'
-import {
-  filterToolProgressMessages,
-  findToolByName,
-  type Tools,
-} from '../../Tool.js'
-import type { GroupedToolUseMessage } from '../../types/message.js'
-import type { buildMessageLookups } from '../../utils/messages.js'
+import type { ToolResultBlockParam, ToolUseBlockParam } from '@anthropic-ai/sdk/resources/messages/messages.mjs';
+import * as React from 'react';
+import { filterToolProgressMessages, findToolByName, type Tools } from '../../Tool.js';
+import type { GroupedToolUseMessage } from '../../types/message.js';
+import type { buildMessageLookups } from '../../utils/messages.js';
 
 type Props = {
-  message: GroupedToolUseMessage
-  tools: Tools
-  lookups: ReturnType<typeof buildMessageLookups>
-  inProgressToolUseIDs: Set<string>
-  shouldAnimate: boolean
-}
+  message: GroupedToolUseMessage;
+  tools: Tools;
+  lookups: ReturnType<typeof buildMessageLookups>;
+  inProgressToolUseIDs: Set<string>;
+  shouldAnimate: boolean;
+};
 
 export function GroupedToolUseContent({
   message,
@@ -26,48 +19,43 @@ export function GroupedToolUseContent({
   inProgressToolUseIDs,
   shouldAnimate,
 }: Props): React.ReactNode {
-  const tool = findToolByName(tools, message.toolName)
+  const tool = findToolByName(tools, message.toolName);
   if (!tool?.renderGroupedToolUse) {
-    return null
+    return null;
   }
 
   // Build a map from tool_use_id to result data
-  const resultsByToolUseId = new Map<
-    string,
-    { param: ToolResultBlockParam; output: unknown }
-  >()
+  const resultsByToolUseId = new Map<string, { param: ToolResultBlockParam; output: unknown }>();
   for (const resultMsg of message.results) {
     for (const _content of resultMsg.message?.content ?? []) {
-      const content = _content as unknown as Record<string, unknown>
+      const content = _content as unknown as Record<string, unknown>;
       if (content.type === 'tool_result') {
         resultsByToolUseId.set(content.tool_use_id as string, {
           param: content as unknown as ToolResultBlockParam,
           output: resultMsg.toolUseResult,
-        })
+        });
       }
     }
   }
 
   const toolUsesData = message.messages.map(msg => {
-    const _content = (msg.message?.content ?? [])[0] as unknown as Record<string, unknown>
-    const id = _content.id as string
-    const result = resultsByToolUseId.get(id)
+    const _content = (msg.message?.content ?? [])[0] as unknown as Record<string, unknown>;
+    const id = _content.id as string;
+    const result = resultsByToolUseId.get(id);
     return {
       param: _content as unknown as ToolUseBlockParam,
       isResolved: lookups.resolvedToolUseIDs.has(id),
       isError: lookups.erroredToolUseIDs.has(id),
       isInProgress: inProgressToolUseIDs.has(id),
-      progressMessages: filterToolProgressMessages(
-        lookups.progressMessagesByToolUseID.get(id) ?? [],
-      ),
+      progressMessages: filterToolProgressMessages(lookups.progressMessagesByToolUseID.get(id) ?? []),
       result,
-    }
-  })
+    };
+  });
 
-  const anyInProgress = toolUsesData.some(d => d.isInProgress)
+  const anyInProgress = toolUsesData.some(d => d.isInProgress);
 
   return tool.renderGroupedToolUse(toolUsesData, {
     shouldAnimate: shouldAnimate && anyInProgress,
     tools,
-  })
+  });
 }
diff --git a/src/components/messages/HighlightedThinkingText.tsx b/src/components/messages/HighlightedThinkingText.tsx
index 14c61ff09..4b7a353c0 100644
--- a/src/components/messages/HighlightedThinkingText.tsx
+++ b/src/components/messages/HighlightedThinkingText.tsx
@@ -1,35 +1,27 @@
-import figures from 'figures'
-import * as React from 'react'
-import { useContext } from 'react'
-import { useQueuedMessage } from '../../context/QueuedMessageContext.js'
-import { Box, Text } from '@anthropic/ink'
-import { formatBriefTimestamp } from '../../utils/formatBriefTimestamp.js'
-import {
-  findThinkingTriggerPositions,
-  getRainbowColor,
-  isUltrathinkEnabled,
-} from '../../utils/thinking.js'
-import { MessageActionsSelectedContext } from '../messageActions.js'
+import figures from 'figures';
+import * as React from 'react';
+import { useContext } from 'react';
+import { useQueuedMessage } from '../../context/QueuedMessageContext.js';
+import { Box, Text } from '@anthropic/ink';
+import { formatBriefTimestamp } from '../../utils/formatBriefTimestamp.js';
+import { findThinkingTriggerPositions, getRainbowColor, isUltrathinkEnabled } from '../../utils/thinking.js';
+import { MessageActionsSelectedContext } from '../messageActions.js';
 
 type Props = {
-  text: string
-  useBriefLayout?: boolean
-  timestamp?: string
-}
+  text: string;
+  useBriefLayout?: boolean;
+  timestamp?: string;
+};
 
-export function HighlightedThinkingText({
-  text,
-  useBriefLayout,
-  timestamp,
-}: Props): React.ReactNode {
+export function HighlightedThinkingText({ text, useBriefLayout, timestamp }: Props): React.ReactNode {
   // Brief/assistant mode: chat-style "You" label instead of the ❯ highlight.
   // Parent drops its backgroundColor when this is true, so no grey shows
   // through. No manual wrap needed — Ink wraps inside the parent Box.
-  const isQueued = useQueuedMessage()?.isQueued ?? false
-  const isSelected = useContext(MessageActionsSelectedContext)
-  const pointerColor = isSelected ? 'suggestion' : 'subtle'
+  const isQueued = useQueuedMessage()?.isQueued ?? false;
+  const isSelected = useContext(MessageActionsSelectedContext);
+  const pointerColor = isSelected ? 'suggestion' : 'subtle';
   if (useBriefLayout) {
-    const ts = timestamp ? formatBriefTimestamp(timestamp) : ''
+    const ts = timestamp ? formatBriefTimestamp(timestamp) : '';
     return (
       <Box flexDirection="column" paddingLeft={2}>
         <Box flexDirection="row">
@@ -38,12 +30,10 @@ export function HighlightedThinkingText({
         </Box>
         <Text color={isQueued ? 'subtle' : 'text'}>{text}</Text>
       </Box>
-    )
+    );
   }
 
-  const triggers = isUltrathinkEnabled()
-    ? findThinkingTriggerPositions(text)
-    : []
+  const triggers = isUltrathinkEnabled() ? findThinkingTriggerPositions(text) : [];
 
   if (triggers.length === 0) {
     return (
@@ -51,35 +41,35 @@ export function HighlightedThinkingText({
         <Text color={pointerColor}>{figures.pointer} </Text>
         <Text color="text">{text}</Text>
       </Text>
-    )
+    );
   }
 
   // Static rainbow (no shimmer — transcript messages don't animate)
-  const parts: React.ReactNode[] = []
-  let cursor = 0
+  const parts: React.ReactNode[] = [];
+  let cursor = 0;
   for (const t of triggers) {
     if (t.start > cursor) {
       parts.push(
         <Text key={`plain-${cursor}`} color="text">
           {text.slice(cursor, t.start)}
         </Text>,
-      )
+      );
     }
     for (let i = t.start; i < t.end; i++) {
       parts.push(
         <Text key={`rb-${i}`} color={getRainbowColor(i - t.start)}>
           {text[i]}
         </Text>,
-      )
+      );
     }
-    cursor = t.end
+    cursor = t.end;
   }
   if (cursor < text.length) {
     parts.push(
       <Text key={`plain-${cursor}`} color="text">
         {text.slice(cursor)}
       </Text>,
-    )
+    );
   }
 
   return (
@@ -87,5 +77,5 @@ export function HighlightedThinkingText({
       <Text color={pointerColor}>{figures.pointer} </Text>
       {parts}
     </Text>
-  )
+  );
 }
diff --git a/src/components/messages/HookProgressMessage.tsx b/src/components/messages/HookProgressMessage.tsx
index 68b1bd2d1..c916a5729 100644
--- a/src/components/messages/HookProgressMessage.tsx
+++ b/src/components/messages/HookProgressMessage.tsx
@@ -1,29 +1,22 @@
-import * as React from 'react'
-import type { HookEvent } from 'src/entrypoints/agentSdkTypes.js'
-import type { buildMessageLookups } from 'src/utils/messages.js'
-import { Box, Text } from '@anthropic/ink'
-import { MessageResponse } from '../MessageResponse.js'
+import * as React from 'react';
+import type { HookEvent } from 'src/entrypoints/agentSdkTypes.js';
+import type { buildMessageLookups } from 'src/utils/messages.js';
+import { Box, Text } from '@anthropic/ink';
+import { MessageResponse } from '../MessageResponse.js';
 
 type Props = {
-  hookEvent: HookEvent
-  lookups: ReturnType<typeof buildMessageLookups>
-  toolUseID: string
-  verbose: boolean
-  isTranscriptMode?: boolean
-}
+  hookEvent: HookEvent;
+  lookups: ReturnType<typeof buildMessageLookups>;
+  toolUseID: string;
+  verbose: boolean;
+  isTranscriptMode?: boolean;
+};
 
-export function HookProgressMessage({
-  hookEvent,
-  lookups,
-  toolUseID,
-  isTranscriptMode,
-}: Props): React.ReactNode {
-  const inProgressHookCount =
-    lookups.inProgressHookCounts.get(toolUseID)?.get(hookEvent) ?? 0
-  const resolvedHookCount =
-    lookups.resolvedHookCounts.get(toolUseID)?.get(hookEvent) ?? 0
+export function HookProgressMessage({ hookEvent, lookups, toolUseID, isTranscriptMode }: Props): React.ReactNode {
+  const inProgressHookCount = lookups.inProgressHookCounts.get(toolUseID)?.get(hookEvent) ?? 0;
+  const resolvedHookCount = lookups.resolvedHookCounts.get(toolUseID)?.get(hookEvent) ?? 0;
   if (inProgressHookCount === 0) {
-    return null
+    return null;
   }
 
   if (hookEvent === 'PreToolUse' || hookEvent === 'PostToolUse') {
@@ -37,20 +30,18 @@ export function HookProgressMessage({
             <Text dimColor bold>
               {hookEvent}
             </Text>
-            <Text dimColor>
-              {inProgressHookCount === 1 ? ' hook' : ' hooks'} ran
-            </Text>
+            <Text dimColor>{inProgressHookCount === 1 ? ' hook' : ' hooks'} ran</Text>
           </Box>
         </MessageResponse>
-      )
+      );
     }
     // Outside transcript mode, hide — completion info is shown via
     // async_hook_response attachments instead.
-    return null
+    return null;
   }
 
   if (resolvedHookCount === inProgressHookCount) {
-    return null
+    return null;
   }
 
   return (
@@ -63,5 +54,5 @@ export function HookProgressMessage({
         <Text dimColor>{inProgressHookCount === 1 ? ' hook…' : ' hooks…'}</Text>
       </Box>
     </MessageResponse>
-  )
+  );
 }
diff --git a/src/components/messages/PlanApprovalMessage.tsx b/src/components/messages/PlanApprovalMessage.tsx
index bb0a582dd..cf6f61af7 100644
--- a/src/components/messages/PlanApprovalMessage.tsx
+++ b/src/components/messages/PlanApprovalMessage.tsx
@@ -1,7 +1,7 @@
-import * as React from 'react'
-import { Markdown } from '../../components/Markdown.js'
-import { Box, Text } from '@anthropic/ink'
-import { jsonParse } from '../../utils/slowOperations.js'
+import * as React from 'react';
+import { Markdown } from '../../components/Markdown.js';
+import { Box, Text } from '@anthropic/ink';
+import { jsonParse } from '../../utils/slowOperations.js';
 import {
   type IdleNotificationMessage,
   isIdleNotification,
@@ -9,29 +9,22 @@ import {
   isPlanApprovalResponse,
   type PlanApprovalRequestMessage,
   type PlanApprovalResponseMessage,
-} from '../../utils/teammateMailbox.js'
-import { getShutdownMessageSummary } from './ShutdownMessage.js'
-import { getTaskAssignmentSummary } from './TaskAssignmentMessage.js'
+} from '../../utils/teammateMailbox.js';
+import { getShutdownMessageSummary } from './ShutdownMessage.js';
+import { getTaskAssignmentSummary } from './TaskAssignmentMessage.js';
 
 type PlanApprovalRequestProps = {
-  request: PlanApprovalRequestMessage
-}
+  request: PlanApprovalRequestMessage;
+};
 
 /**
  * Renders a plan approval request with a planMode-colored border,
  * showing the plan content and instructions for approving/rejecting.
  */
-export function PlanApprovalRequestDisplay({
-  request,
-}: PlanApprovalRequestProps): React.ReactNode {
+export function PlanApprovalRequestDisplay({ request }: PlanApprovalRequestProps): React.ReactNode {
   return (
     <Box flexDirection="column" marginY={1}>
-      <Box
-        borderStyle="round"
-        borderColor="planMode"
-        flexDirection="column"
-        paddingX={1}
-      >
+      <Box borderStyle="round" borderColor="planMode" flexDirection="column" paddingX={1}>
         <Box marginBottom={1}>
           <Text color="planMode" bold>
             Plan Approval Request from {request.from}
@@ -51,56 +44,38 @@ export function PlanApprovalRequestDisplay({
         <Text dimColor>Plan file: {request.planFilePath}</Text>
       </Box>
     </Box>
-  )
+  );
 }
 
 type PlanApprovalResponseProps = {
-  response: PlanApprovalResponseMessage
-  senderName: string
-}
+  response: PlanApprovalResponseMessage;
+  senderName: string;
+};
 
 /**
  * Renders a plan approval response with a success (green) or error (red) border.
  */
-export function PlanApprovalResponseDisplay({
-  response,
-  senderName,
-}: PlanApprovalResponseProps): React.ReactNode {
+export function PlanApprovalResponseDisplay({ response, senderName }: PlanApprovalResponseProps): React.ReactNode {
   if (response.approved) {
     return (
       <Box flexDirection="column" marginY={1}>
-        <Box
-          borderStyle="round"
-          borderColor="success"
-          flexDirection="column"
-          paddingX={1}
-          paddingY={1}
-        >
+        <Box borderStyle="round" borderColor="success" flexDirection="column" paddingX={1} paddingY={1}>
           <Box>
             <Text color="success" bold>
               ✓ Plan Approved by {senderName}
             </Text>
           </Box>
           <Box marginTop={1}>
-            <Text>
-              You can now proceed with implementation. Your plan mode
-              restrictions have been lifted.
-            </Text>
+            <Text>You can now proceed with implementation. Your plan mode restrictions have been lifted.</Text>
           </Box>
         </Box>
       </Box>
-    )
+    );
   }
 
   return (
     <Box flexDirection="column" marginY={1}>
-      <Box
-        borderStyle="round"
-        borderColor="error"
-        flexDirection="column"
-        paddingX={1}
-        paddingY={1}
-      >
+      <Box borderStyle="round" borderColor="error" flexDirection="column" paddingX={1} paddingY={1}>
         <Box>
           <Text color="error" bold>
             ✗ Plan Rejected by {senderName}
@@ -119,40 +94,29 @@ export function PlanApprovalResponseDisplay({
           </Box>
         )}
         <Box marginTop={1}>
-          <Text dimColor>
-            Please revise your plan based on the feedback and call ExitPlanMode
-            again.
-          </Text>
+          <Text dimColor>Please revise your plan based on the feedback and call ExitPlanMode again.</Text>
         </Box>
       </Box>
     </Box>
-  )
+  );
 }
 
 /**
  * Try to parse and render a plan approval message from raw content.
  * Returns the rendered component if it's a plan approval message, null otherwise.
  */
-export function tryRenderPlanApprovalMessage(
-  content: string,
-  senderName: string,
-): React.ReactNode | null {
-  const request = isPlanApprovalRequest(content)
+export function tryRenderPlanApprovalMessage(content: string, senderName: string): React.ReactNode | null {
+  const request = isPlanApprovalRequest(content);
   if (request) {
-    return <PlanApprovalRequestDisplay request={request} />
+    return <PlanApprovalRequestDisplay request={request} />;
   }
 
-  const response = isPlanApprovalResponse(content)
+  const response = isPlanApprovalResponse(content);
   if (response) {
-    return (
-      <PlanApprovalResponseDisplay
-        response={response}
-        senderName={senderName}
-      />
-    )
+    return <PlanApprovalResponseDisplay response={response} senderName={senderName} />;
   }
 
-  return null
+  return null;
 }
 
 /**
@@ -161,36 +125,36 @@ export function tryRenderPlanApprovalMessage(
  * Returns null if the content is not a plan approval message.
  */
 function getPlanApprovalSummary(content: string): string | null {
-  const request = isPlanApprovalRequest(content)
+  const request = isPlanApprovalRequest(content);
   if (request) {
-    return `[Plan Approval Request from ${request.from}]`
+    return `[Plan Approval Request from ${request.from}]`;
   }
 
-  const response = isPlanApprovalResponse(content)
+  const response = isPlanApprovalResponse(content);
   if (response) {
     if (response.approved) {
-      return '[Plan Approved] You can now proceed with implementation'
+      return '[Plan Approved] You can now proceed with implementation';
     } else {
-      return `[Plan Rejected] ${response.feedback || 'Please revise your plan'}`
+      return `[Plan Rejected] ${response.feedback || 'Please revise your plan'}`;
     }
   }
 
-  return null
+  return null;
 }
 
 /**
  * Get a brief summary text for an idle notification.
  */
 function getIdleNotificationSummary(msg: IdleNotificationMessage): string {
-  const parts: string[] = ['Agent idle']
+  const parts: string[] = ['Agent idle'];
   if (msg.completedTaskId) {
-    const status = msg.completedStatus || 'completed'
-    parts.push(`Task ${msg.completedTaskId} ${status}`)
+    const status = msg.completedStatus || 'completed';
+    parts.push(`Task ${msg.completedTaskId} ${status}`);
   }
   if (msg.summary) {
-    parts.push(`Last DM: ${msg.summary}`)
+    parts.push(`Last DM: ${msg.summary}`);
   }
-  return parts.join(' · ')
+  return parts.join(' · ');
 }
 
 /**
@@ -199,35 +163,35 @@ function getIdleNotificationSummary(msg: IdleNotificationMessage): string {
  * Otherwise returns the original content.
  */
 export function formatTeammateMessageContent(content: string): string {
-  const planSummary = getPlanApprovalSummary(content)
+  const planSummary = getPlanApprovalSummary(content);
   if (planSummary) {
-    return planSummary
+    return planSummary;
   }
 
-  const shutdownSummary = getShutdownMessageSummary(content)
+  const shutdownSummary = getShutdownMessageSummary(content);
   if (shutdownSummary) {
-    return shutdownSummary
+    return shutdownSummary;
   }
 
-  const idleMsg = isIdleNotification(content)
+  const idleMsg = isIdleNotification(content);
   if (idleMsg) {
-    return getIdleNotificationSummary(idleMsg)
+    return getIdleNotificationSummary(idleMsg);
   }
 
-  const taskAssignmentSummary = getTaskAssignmentSummary(content)
+  const taskAssignmentSummary = getTaskAssignmentSummary(content);
   if (taskAssignmentSummary) {
-    return taskAssignmentSummary
+    return taskAssignmentSummary;
   }
 
   // Check for teammate_terminated message
   try {
-    const parsed = jsonParse(content) as { type?: string; message?: string }
+    const parsed = jsonParse(content) as { type?: string; message?: string };
     if (parsed?.type === 'teammate_terminated' && parsed.message) {
-      return parsed.message
+      return parsed.message;
     }
   } catch {
     // Not JSON
   }
 
-  return content
+  return content;
 }
diff --git a/src/components/messages/RateLimitMessage.tsx b/src/components/messages/RateLimitMessage.tsx
index 8ec18da7e..c30b1795c 100644
--- a/src/components/messages/RateLimitMessage.tsx
+++ b/src/components/messages/RateLimitMessage.tsx
@@ -1,24 +1,20 @@
-import React, { useEffect, useMemo, useState } from 'react'
-import { extraUsage } from 'src/commands/extra-usage/index.js'
-import { Box, Text } from '@anthropic/ink'
-import { useClaudeAiLimits } from 'src/services/claudeAiLimitsHook.js'
-import { shouldProcessMockLimits } from 'src/services/rateLimitMocking.js' // Used for /mock-limits command
-import {
-  getRateLimitTier,
-  getSubscriptionType,
-  isClaudeAISubscriber,
-} from 'src/utils/auth.js'
-import { hasClaudeAiBillingAccess } from 'src/utils/billing.js'
-import { MessageResponse } from '../MessageResponse.js'
+import React, { useEffect, useMemo, useState } from 'react';
+import { extraUsage } from 'src/commands/extra-usage/index.js';
+import { Box, Text } from '@anthropic/ink';
+import { useClaudeAiLimits } from 'src/services/claudeAiLimitsHook.js';
+import { shouldProcessMockLimits } from 'src/services/rateLimitMocking.js'; // Used for /mock-limits command
+import { getRateLimitTier, getSubscriptionType, isClaudeAISubscriber } from 'src/utils/auth.js';
+import { hasClaudeAiBillingAccess } from 'src/utils/billing.js';
+import { MessageResponse } from '../MessageResponse.js';
 
 type UpsellParams = {
-  shouldShowUpsell: boolean
-  isMax20x: boolean
-  isExtraUsageCommandEnabled: boolean
-  shouldAutoOpenRateLimitOptionsMenu: boolean
-  isTeamOrEnterprise: boolean
-  hasBillingAccess: boolean
-}
+  shouldShowUpsell: boolean;
+  isMax20x: boolean;
+  isExtraUsageCommandEnabled: boolean;
+  shouldAutoOpenRateLimitOptionsMenu: boolean;
+  isTeamOrEnterprise: boolean;
+  hasBillingAccess: boolean;
+};
 
 export function getUpsellMessage({
   shouldShowUpsell,
@@ -28,79 +24,69 @@ export function getUpsellMessage({
   isTeamOrEnterprise,
   hasBillingAccess,
 }: UpsellParams): string | null {
-  if (!shouldShowUpsell) return null
+  if (!shouldShowUpsell) return null;
 
   if (isMax20x) {
     if (isExtraUsageCommandEnabled) {
-      return '/extra-usage to finish what you\u2019re working on.'
+      return '/extra-usage to finish what you\u2019re working on.';
     }
-    return '/login to switch to an API usage-billed account.'
+    return '/login to switch to an API usage-billed account.';
   }
 
   if (shouldAutoOpenRateLimitOptionsMenu) {
-    return 'Opening your options\u2026'
+    return 'Opening your options\u2026';
   }
 
   if (!isTeamOrEnterprise && !isExtraUsageCommandEnabled) {
-    return '/upgrade to increase your usage limit.'
+    return '/upgrade to increase your usage limit.';
   }
 
   if (isTeamOrEnterprise) {
-    if (!isExtraUsageCommandEnabled) return null
+    if (!isExtraUsageCommandEnabled) return null;
 
     if (hasBillingAccess) {
-      return '/extra-usage to finish what you\u2019re working on.'
+      return '/extra-usage to finish what you\u2019re working on.';
     }
 
-    return '/extra-usage to request more usage from your admin.'
+    return '/extra-usage to request more usage from your admin.';
   }
 
-  return '/upgrade or /extra-usage to finish what you\u2019re working on.'
+  return '/upgrade or /extra-usage to finish what you\u2019re working on.';
 }
 
 type RateLimitMessageProps = {
-  text: string
-  onOpenRateLimitOptions?: () => void
-}
+  text: string;
+  onOpenRateLimitOptions?: () => void;
+};
 
-export function RateLimitMessage({
-  text,
-  onOpenRateLimitOptions,
-}: RateLimitMessageProps): React.ReactNode {
-  const subscriptionType = getSubscriptionType()
-  const rateLimitTier = getRateLimitTier()
-  const isTeamOrEnterprise =
-    subscriptionType === 'team' || subscriptionType === 'enterprise'
-  const isMax20x = rateLimitTier === 'default_claude_max_20x'
+export function RateLimitMessage({ text, onOpenRateLimitOptions }: RateLimitMessageProps): React.ReactNode {
+  const subscriptionType = getSubscriptionType();
+  const rateLimitTier = getRateLimitTier();
+  const isTeamOrEnterprise = subscriptionType === 'team' || subscriptionType === 'enterprise';
+  const isMax20x = rateLimitTier === 'default_claude_max_20x';
   // Always show upsell when using /mock-limits command, otherwise show for subscribers
-  const shouldShowUpsell = shouldProcessMockLimits() || isClaudeAISubscriber()
+  const shouldShowUpsell = shouldProcessMockLimits() || isClaudeAISubscriber();
 
-  const canSeeRateLimitOptionsUpsell = shouldShowUpsell && !isMax20x
+  const canSeeRateLimitOptionsUpsell = shouldShowUpsell && !isMax20x;
 
-  const [hasOpenedInteractiveMenu, setHasOpenedInteractiveMenu] =
-    useState(false)
+  const [hasOpenedInteractiveMenu, setHasOpenedInteractiveMenu] = useState(false);
 
   // Check actual rate limit status - only auto-open if user is currently rate limited
   // AND we've verified this with the API (resetsAt is only set after API response).
   // This prevents false alerts when resuming sessions with old rate limit messages.
-  const claudeAiLimits = useClaudeAiLimits()
+  const claudeAiLimits = useClaudeAiLimits();
   const isCurrentlyRateLimited =
-    claudeAiLimits.status === 'rejected' &&
-    claudeAiLimits.resetsAt !== undefined &&
-    !claudeAiLimits.isUsingOverage
+    claudeAiLimits.status === 'rejected' && claudeAiLimits.resetsAt !== undefined && !claudeAiLimits.isUsingOverage;
 
   const shouldAutoOpenRateLimitOptionsMenu =
-    canSeeRateLimitOptionsUpsell &&
-    !hasOpenedInteractiveMenu &&
-    isCurrentlyRateLimited &&
-    onOpenRateLimitOptions
+    canSeeRateLimitOptionsUpsell && !hasOpenedInteractiveMenu && isCurrentlyRateLimited && onOpenRateLimitOptions;
 
   useEffect(() => {
     if (shouldAutoOpenRateLimitOptionsMenu) {
-      setHasOpenedInteractiveMenu(true)
-      onOpenRateLimitOptions()
+      setHasOpenedInteractiveMenu(true);
+      onOpenRateLimitOptions();
     }
-  }, [shouldAutoOpenRateLimitOptionsMenu, onOpenRateLimitOptions])
+  }, [shouldAutoOpenRateLimitOptionsMenu, onOpenRateLimitOptions]);
 
   const upsell = useMemo(() => {
     const message = getUpsellMessage({
@@ -110,15 +96,10 @@ export function RateLimitMessage({
       shouldAutoOpenRateLimitOptionsMenu: !!shouldAutoOpenRateLimitOptionsMenu,
       isTeamOrEnterprise,
       hasBillingAccess: hasClaudeAiBillingAccess(),
-    })
-    if (!message) return null
-    return <Text dimColor>{message}</Text>
-  }, [
-    shouldShowUpsell,
-    isMax20x,
-    isTeamOrEnterprise,
-    shouldAutoOpenRateLimitOptionsMenu,
-  ])
+    });
+    if (!message) return null;
+    return <Text dimColor>{message}</Text>;
+  }, [shouldShowUpsell, isMax20x, isTeamOrEnterprise, shouldAutoOpenRateLimitOptionsMenu]);
 
   return (
     <MessageResponse>
@@ -127,5 +108,5 @@ export function RateLimitMessage({
         {hasOpenedInteractiveMenu ? null : upsell}
       </Box>
     </MessageResponse>
-  )
+  );
 }
diff --git a/src/components/messages/ShutdownMessage.tsx b/src/components/messages/ShutdownMessage.tsx
index 6f0dcbd97..539bd7998 100644
--- a/src/components/messages/ShutdownMessage.tsx
+++ b/src/components/messages/ShutdownMessage.tsx
@@ -1,32 +1,24 @@
-import * as React from 'react'
-import { Box, Text } from '@anthropic/ink'
+import * as React from 'react';
+import { Box, Text } from '@anthropic/ink';
 import {
   isShutdownApproved,
   isShutdownRejected,
   isShutdownRequest,
   type ShutdownRejectedMessage,
   type ShutdownRequestMessage,
-} from '../../utils/teammateMailbox.js'
+} from '../../utils/teammateMailbox.js';
 
 type ShutdownRequestProps = {
-  request: ShutdownRequestMessage
-}
+  request: ShutdownRequestMessage;
+};
 
 /**
  * Renders a shutdown request with a warning-colored border.
  */
-export function ShutdownRequestDisplay({
-  request,
-}: ShutdownRequestProps): React.ReactNode {
+export function ShutdownRequestDisplay({ request }: ShutdownRequestProps): React.ReactNode {
   return (
     <Box flexDirection="column" marginY={1}>
-      <Box
-        borderStyle="round"
-        borderColor="warning"
-        flexDirection="column"
-        paddingX={1}
-        paddingY={1}
-      >
+      <Box borderStyle="round" borderColor="warning" flexDirection="column" paddingX={1} paddingY={1}>
         <Box marginBottom={1}>
           <Text color="warning" bold>
             Shutdown request from {request.from}
@@ -39,28 +31,20 @@ export function ShutdownRequestDisplay({
         )}
       </Box>
     </Box>
-  )
+  );
 }
 
 type ShutdownRejectedProps = {
-  response: ShutdownRejectedMessage
-}
+  response: ShutdownRejectedMessage;
+};
 
 /**
  * Renders a shutdown rejected message with a subtle (grey) border.
  */
-export function ShutdownRejectedDisplay({
-  response,
-}: ShutdownRejectedProps): React.ReactNode {
+export function ShutdownRejectedDisplay({ response }: ShutdownRejectedProps): React.ReactNode {
   return (
     <Box flexDirection="column" marginY={1}>
-      <Box
-        borderStyle="round"
-        borderColor="subtle"
-        flexDirection="column"
-        paddingX={1}
-        paddingY={1}
-      >
+      <Box borderStyle="round" borderColor="subtle" flexDirection="column" paddingX={1} paddingY={1}>
         <Text color="subtle" bold>
           Shutdown rejected by {response.from}
         </Text>
@@ -75,39 +59,34 @@ export function ShutdownRejectedDisplay({
           <Text>Reason: {response.reason}</Text>
         </Box>
         <Box marginTop={1}>
-          <Text dimColor>
-            Teammate is continuing to work. You may request shutdown again
-            later.
-          </Text>
+          <Text dimColor>Teammate is continuing to work. You may request shutdown again later.</Text>
         </Box>
       </Box>
     </Box>
-  )
+  );
 }
 
 /**
  * Try to parse and render a shutdown message from raw content.
  * Returns the rendered component if it's a shutdown message, null otherwise.
  */
-export function tryRenderShutdownMessage(
-  content: string,
-): React.ReactNode | null {
-  const request = isShutdownRequest(content)
+export function tryRenderShutdownMessage(content: string): React.ReactNode | null {
+  const request = isShutdownRequest(content);
   if (request) {
-    return <ShutdownRequestDisplay request={request} />
+    return <ShutdownRequestDisplay request={request} />;
   }
 
   // Shutdown approved is handled inline by the caller — skip it here
   if (isShutdownApproved(content)) {
-    return null
+    return null;
   }
 
-  const rejected = isShutdownRejected(content)
+  const rejected = isShutdownRejected(content);
   if (rejected) {
-    return <ShutdownRejectedDisplay response={rejected} />
+    return <ShutdownRejectedDisplay response={rejected} />;
   }
 
-  return null
+  return null;
 }
 
 /**
@@ -116,20 +95,20 @@ export function tryRenderShutdownMessage(
  * Returns null if the content is not a shutdown message.
  */
 export function getShutdownMessageSummary(content: string): string | null {
-  const request = isShutdownRequest(content)
+  const request = isShutdownRequest(content);
   if (request) {
-    return `[Shutdown Request from ${request.from}]${request.reason ? ` ${request.reason}` : ''}`
+    return `[Shutdown Request from ${request.from}]${request.reason ? ` ${request.reason}` : ''}`;
   }
 
-  const approved = isShutdownApproved(content)
+  const approved = isShutdownApproved(content);
   if (approved) {
-    return `[Shutdown Approved] ${approved.from} is now exiting`
+    return `[Shutdown Approved] ${approved.from} is now exiting`;
   }
 
-  const rejected = isShutdownRejected(content)
+  const rejected = isShutdownRejected(content);
   if (rejected) {
-    return `[Shutdown Rejected] ${rejected.from}: ${rejected.reason}`
+    return `[Shutdown Rejected] ${rejected.from}: ${rejected.reason}`;
   }
 
-  return null
+  return null;
 }
diff --git a/src/components/messages/SnipBoundaryMessage.ts b/src/components/messages/SnipBoundaryMessage.ts
index 898e2d09c..87592f151 100644
--- a/src/components/messages/SnipBoundaryMessage.ts
+++ b/src/components/messages/SnipBoundaryMessage.ts
@@ -1,3 +1,4 @@
 // Auto-generated stub — replace with real implementation
-export {};
-export const SnipBoundaryMessage: (props: Record<string, unknown>) => null = () => null;
+export {}
+export const SnipBoundaryMessage: (props: Record<string, unknown>) => null =
+  () => null
diff --git a/src/components/messages/SystemAPIErrorMessage.tsx b/src/components/messages/SystemAPIErrorMessage.tsx
index 4efa74750..8572848c7 100644
--- a/src/components/messages/SystemAPIErrorMessage.tsx
+++ b/src/components/messages/SystemAPIErrorMessage.tsx
@@ -1,68 +1,55 @@
-import * as React from 'react'
-import { useState } from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { formatAPIError } from 'src/services/api/errorUtils.js'
-import type { SystemAPIErrorMessage } from 'src/types/message.js'
-import { useInterval } from 'usehooks-ts'
-import { CtrlOToExpand } from '../CtrlOToExpand.js'
-import { MessageResponse } from '../MessageResponse.js'
+import * as React from 'react';
+import { useState } from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { formatAPIError } from 'src/services/api/errorUtils.js';
+import type { SystemAPIErrorMessage } from 'src/types/message.js';
+import { useInterval } from 'usehooks-ts';
+import { CtrlOToExpand } from '../CtrlOToExpand.js';
+import { MessageResponse } from '../MessageResponse.js';
 
-const MAX_API_ERROR_CHARS = 1000
+const MAX_API_ERROR_CHARS = 1000;
 
 type Props = {
-  message: SystemAPIErrorMessage
-  verbose: boolean
-}
+  message: SystemAPIErrorMessage;
+  verbose: boolean;
+};
 
 export function SystemAPIErrorMessage({
   message: { retryAttempt, error, retryInMs, maxRetries },
   verbose,
 }: Props): React.ReactNode {
-  const _retryAttempt = retryAttempt as number
-  const _retryInMs = retryInMs as number
-  const _maxRetries = maxRetries as number
-  const _error = error as Parameters<typeof formatAPIError>[0]
+  const _retryAttempt = retryAttempt as number;
+  const _retryInMs = retryInMs as number;
+  const _maxRetries = maxRetries as number;
+  const _error = error as Parameters<typeof formatAPIError>[0];
   // Hidden for early retries on external builds to avoid noise. Compute before
   // useInterval so we never register a timer that just drives a null render.
-  const hidden = process.env.USER_TYPE === 'external' && _retryAttempt < 4
+  const hidden = process.env.USER_TYPE === 'external' && _retryAttempt < 4;
 
-  const [countdownMs, setCountdownMs] = useState(0)
-  const done = countdownMs >= _retryInMs
-  useInterval(
-    () => setCountdownMs(ms => ms + 1000),
-    hidden || done ? null : 1000,
-  )
+  const [countdownMs, setCountdownMs] = useState(0);
+  const done = countdownMs >= _retryInMs;
+  useInterval(() => setCountdownMs(ms => ms + 1000), hidden || done ? null : 1000);
 
   if (hidden) {
-    return null
+    return null;
   }
 
-  const retryInSecondsLive = Math.max(
-    0,
-    Math.round((_retryInMs - countdownMs) / 1000),
-  )
+  const retryInSecondsLive = Math.max(0, Math.round((_retryInMs - countdownMs) / 1000));
 
-  const formatted = formatAPIError(_error)
-  const truncated = !verbose && formatted.length > MAX_API_ERROR_CHARS
+  const formatted = formatAPIError(_error);
+  const truncated = !verbose && formatted.length > MAX_API_ERROR_CHARS;
 
   return (
     <MessageResponse>
       <Box flexDirection="column">
-        <Text color="error">
-          {truncated
-            ? formatted.slice(0, MAX_API_ERROR_CHARS) + '…'
-            : formatted}
-        </Text>
+        <Text color="error">{truncated ? formatted.slice(0, MAX_API_ERROR_CHARS) + '…' : formatted}</Text>
         {truncated && <CtrlOToExpand />}
         <Text dimColor>
-          Retrying in {retryInSecondsLive}{' '}
-          {retryInSecondsLive === 1 ? 'second' : 'seconds'}… (attempt{' '}
-          {_retryAttempt}/{_maxRetries})
-          {process.env.API_TIMEOUT_MS
-            ? ` · API_TIMEOUT_MS=${process.env.API_TIMEOUT_MS}ms, try increasing it`
-            : ''}
+          Retrying in {retryInSecondsLive} {retryInSecondsLive === 1 ? 'second' : 'seconds'}… (attempt {_retryAttempt}/
+          {_maxRetries})
+          {process.env.API_TIMEOUT_MS ? ` · API_TIMEOUT_MS=${process.env.API_TIMEOUT_MS}ms, try increasing it` : ''}
         </Text>
       </Box>
     </MessageResponse>
-  )
+  );
 }
diff --git a/src/components/messages/SystemTextMessage.tsx b/src/components/messages/SystemTextMessage.tsx
index 443e91313..2d2fb067b 100644
--- a/src/components/messages/SystemTextMessage.tsx
+++ b/src/components/messages/SystemTextMessage.tsx
@@ -1,27 +1,21 @@
 // biome-ignore-all assist/source/organizeImports: ANT-ONLY import markers must not be reordered
-import { Box, Link, Text, type TextProps } from '@anthropic/ink'
-import { FilePathLink } from '../FilePathLink.js'
-import { feature } from 'bun:bundle'
-import * as React from 'react'
-import { useState } from 'react'
-import sample from 'lodash-es/sample.js'
-import {
-  BLACK_CIRCLE,
-  REFERENCE_MARK,
-  TEARDROP_ASTERISK,
-} from '../../constants/figures.js'
-import figures from 'figures'
-import { basename } from 'path'
-import { MessageResponse } from '../MessageResponse.js'
+import { Box, Link, Text, type TextProps } from '@anthropic/ink';
+import { FilePathLink } from '../FilePathLink.js';
+import { feature } from 'bun:bundle';
+import * as React from 'react';
+import { useState } from 'react';
+import sample from 'lodash-es/sample.js';
+import { BLACK_CIRCLE, REFERENCE_MARK, TEARDROP_ASTERISK } from '../../constants/figures.js';
+import figures from 'figures';
+import { basename } from 'path';
+import { MessageResponse } from '../MessageResponse.js';
 
-import { openPath } from '../../utils/browser.js'
+import { openPath } from '../../utils/browser.js';
 /* eslint-disable @typescript-eslint/no-require-imports */
-const teamMemSaved = feature('TEAMMEM')
-  ? (require('./teamMemSaved.js') as typeof import('./teamMemSaved.js'))
-  : null
+const teamMemSaved = feature('TEAMMEM') ? (require('./teamMemSaved.js') as typeof import('./teamMemSaved.js')) : null;
 /* eslint-enable @typescript-eslint/no-require-imports */
-import { TURN_COMPLETION_VERBS } from '../../constants/turnCompletionVerbs.js'
-import { useTerminalSize } from '../../hooks/useTerminalSize.js'
+import { TURN_COMPLETION_VERBS } from '../../constants/turnCompletionVerbs.js';
+import { useTerminalSize } from '../../hooks/useTerminalSize.js';
 import type {
   SystemMessage,
   SystemStopHookSummaryMessage,
@@ -29,87 +23,68 @@ import type {
   SystemTurnDurationMessage,
   SystemThinkingMessage,
   SystemMemorySavedMessage,
-} from '../../types/message.js'
-import { SystemAPIErrorMessage } from './SystemAPIErrorMessage.js'
-import {
-  formatDuration,
-  formatNumber,
-  formatSecondsShort,
-} from '../../utils/format.js'
-import { getGlobalConfig } from '../../utils/config.js'
-import ThemedText from '../design-system/ThemedText.js'
-import { CtrlOToExpand } from '../CtrlOToExpand.js'
-import { useAppStateStore } from '../../state/AppState.js'
-import { isBackgroundTask, type TaskState } from '../../tasks/types.js'
-import { getPillLabel } from '../../tasks/pillLabel.js'
-import { useSelectedMessageBg } from '../messageActions.js'
+} from '../../types/message.js';
+import { SystemAPIErrorMessage } from './SystemAPIErrorMessage.js';
+import { formatDuration, formatNumber, formatSecondsShort } from '../../utils/format.js';
+import { getGlobalConfig } from '../../utils/config.js';
+import ThemedText from '../design-system/ThemedText.js';
+import { CtrlOToExpand } from '../CtrlOToExpand.js';
+import { useAppStateStore } from '../../state/AppState.js';
+import { isBackgroundTask, type TaskState } from '../../tasks/types.js';
+import { getPillLabel } from '../../tasks/pillLabel.js';
+import { useSelectedMessageBg } from '../messageActions.js';
 
 type Props = {
-  message: SystemMessage
-  addMargin: boolean
-  verbose: boolean
-  isTranscriptMode?: boolean
-}
+  message: SystemMessage;
+  addMargin: boolean;
+  verbose: boolean;
+  isTranscriptMode?: boolean;
+};
 
-export function SystemTextMessage({
-  message,
-  addMargin,
-  verbose,
-  isTranscriptMode,
-}: Props): React.ReactNode {
-  const bg = useSelectedMessageBg()
+export function SystemTextMessage({ message, addMargin, verbose, isTranscriptMode }: Props): React.ReactNode {
+  const bg = useSelectedMessageBg();
   // Turn duration messages are always shown in grey
   if (message.subtype === 'turn_duration') {
-    return <TurnDurationMessage message={message} addMargin={addMargin} />
+    return <TurnDurationMessage message={message} addMargin={addMargin} />;
   }
 
   if (message.subtype === 'memory_saved') {
-    return <MemorySavedMessage message={message} addMargin={addMargin} />
+    return <MemorySavedMessage message={message} addMargin={addMargin} />;
   }
 
   if (message.subtype === 'away_summary') {
     return (
-      <Box
-        flexDirection="row"
-        marginTop={addMargin ? 1 : 0}
-        backgroundColor={bg}
-        width="100%"
-      >
+      <Box flexDirection="row" marginTop={addMargin ? 1 : 0} backgroundColor={bg} width="100%">
         <Box minWidth={2}>
           <Text dimColor>{REFERENCE_MARK}</Text>
         </Box>
         <Text dimColor>{String(message.content ?? '')}</Text>
       </Box>
-    )
+    );
   }
 
   // Agents killed confirmation
   if (message.subtype === 'agents_killed') {
     return (
-      <Box
-        flexDirection="row"
-        marginTop={addMargin ? 1 : 0}
-        backgroundColor={bg}
-        width="100%"
-      >
+      <Box flexDirection="row" marginTop={addMargin ? 1 : 0} backgroundColor={bg} width="100%">
         <Box minWidth={2}>
           <Text color="error">{BLACK_CIRCLE}</Text>
         </Box>
         <Text dimColor>All background agents stopped</Text>
       </Box>
-    )
+    );
   }
 
   // Thinking messages are subtle, like turn duration (ant-only)
   if (message.subtype === 'thinking') {
     if (process.env.USER_TYPE === 'ant') {
-      return <ThinkingMessage message={message} addMargin={addMargin} />
+      return <ThinkingMessage message={message} addMargin={addMargin} />;
     }
-    return null
+    return null;
   }
 
   if (message.subtype === 'bridge_status') {
-    return <BridgeStatusMessage message={message} addMargin={addMargin} />
+    return <BridgeStatusMessage message={message} addMargin={addMargin} />;
   }
 
   if (message.subtype === 'scheduled_task_fire') {
@@ -119,7 +94,7 @@ export function SystemTextMessage({
           {TEARDROP_ASTERISK} {String(message.content ?? '')}
         </Text>
       </Box>
-    )
+    );
   }
 
   if (message.subtype === 'permission_retry') {
@@ -129,18 +104,18 @@ export function SystemTextMessage({
         <Text>Allowed </Text>
         <Text bold>{(message.commands as string[]).join(', ')}</Text>
       </Box>
-    )
+    );
   }
 
   // Stop hook summaries should always be visible
-  const isStopHookSummary = message.subtype === 'stop_hook_summary'
+  const isStopHookSummary = message.subtype === 'stop_hook_summary';
 
   if (!isStopHookSummary && !verbose && message.level === 'info') {
-    return null
+    return null;
   }
 
   if (message.subtype === 'api_error') {
-    return <SystemAPIErrorMessage message={message} verbose={verbose} />
+    return <SystemAPIErrorMessage message={message} verbose={verbose} />;
   }
 
   if (message.subtype === 'stop_hook_summary') {
@@ -151,14 +126,14 @@ export function SystemTextMessage({
         verbose={verbose}
         isTranscriptMode={isTranscriptMode}
       />
-    )
+    );
   }
 
-  const content = message.content
+  const content = message.content;
   // In case the event doesn't have a content
   // validation, so content can be undefined at runtime despite the types.
   if (typeof content !== 'string') {
-    return null
+    return null;
   }
   return (
     <Box flexDirection="row" width="100%">
@@ -170,7 +145,7 @@ export function SystemTextMessage({
         dimColor={message.level === 'info'}
       />
     </Box>
-  )
+  );
 }
 
 function StopHookSummaryMessage({
@@ -179,83 +154,64 @@ function StopHookSummaryMessage({
   verbose,
   isTranscriptMode,
 }: {
-  message: SystemStopHookSummaryMessage
-  addMargin: boolean
-  verbose: boolean
-  isTranscriptMode?: boolean
+  message: SystemStopHookSummaryMessage;
+  addMargin: boolean;
+  verbose: boolean;
+  isTranscriptMode?: boolean;
 }): React.ReactNode {
-  const bg = useSelectedMessageBg()
-  const {
-    hookCount,
-    hookInfos,
-  } = message
-  const hookErrors = (message.hookErrors ?? []) as string[]
-  const preventedContinuation = message.preventedContinuation as boolean | undefined
-  const stopReason = message.stopReason as string | undefined
-  const { columns } = useTerminalSize()
+  const bg = useSelectedMessageBg();
+  const { hookCount, hookInfos } = message;
+  const hookErrors = (message.hookErrors ?? []) as string[];
+  const preventedContinuation = message.preventedContinuation as boolean | undefined;
+  const stopReason = message.stopReason as string | undefined;
+  const { columns } = useTerminalSize();
 
   // Prefer wall-clock time when available (hooks run in parallel)
-  const totalDurationMs =
-    message.totalDurationMs ??
-    hookInfos.reduce((sum, h) => sum + (h.durationMs ?? 0), 0)
-  const isAnt = process.env.USER_TYPE === 'ant'
+  const totalDurationMs = message.totalDurationMs ?? hookInfos.reduce((sum, h) => sum + (h.durationMs ?? 0), 0);
+  const isAnt = process.env.USER_TYPE === 'ant';
 
   // Only show summary if there are errors or continuation was prevented
   // For ants: also show when hooks took > 500ms
   // Non-stop hooks (e.g. PreToolUse) are pre-filtered by the caller
   if (hookErrors.length === 0 && !preventedContinuation && !message.hookLabel) {
     if (!isAnt || totalDurationMs < HOOK_TIMING_DISPLAY_THRESHOLD_MS) {
-      return null
+      return null;
     }
   }
 
-  const totalStr =
-    isAnt && totalDurationMs > 0
-      ? ` (${formatSecondsShort(totalDurationMs)})`
-      : ''
+  const totalStr = isAnt && totalDurationMs > 0 ? ` (${formatSecondsShort(totalDurationMs)})` : '';
   // Non-stop hooks (e.g. PreToolUse) render as a child line without bullet
   if (message.hookLabel) {
     return (
       <Box flexDirection="column" width="100%">
         <Text dimColor>
-          {'  ⎿  '}Ran {hookCount} {message.hookLabel}{' '}
-          {hookCount === 1 ? 'hook' : 'hooks'}
+          {'  ⎿  '}Ran {hookCount} {message.hookLabel} {hookCount === 1 ? 'hook' : 'hooks'}
           {totalStr}
         </Text>
         {isTranscriptMode &&
           hookInfos.map((info, idx) => {
             const durationStr =
-              isAnt && info.durationMs !== undefined
-                ? ` (${formatSecondsShort(info.durationMs)})`
-                : ''
+              isAnt && info.durationMs !== undefined ? ` (${formatSecondsShort(info.durationMs)})` : '';
             return (
               <Text key={`cmd-${idx}`} dimColor>
                 {'     ⎿ '}
-                {info.command === 'prompt'
-                  ? `prompt: ${info.promptText || ''}`
-                  : info.command}
+                {info.command === 'prompt' ? `prompt: ${info.promptText || ''}` : info.command}
                 {durationStr}
               </Text>
-            )
+            );
           })}
       </Box>
-    )
+    );
   }
 
   return (
-    <Box
-      flexDirection="row"
-      marginTop={addMargin ? 1 : 0}
-      backgroundColor={bg}
-      width="100%"
-    >
+    <Box flexDirection="row" marginTop={addMargin ? 1 : 0} backgroundColor={bg} width="100%">
       <Box minWidth={2}>
         <Text>{BLACK_CIRCLE}</Text>
       </Box>
       <Box flexDirection="column" width={columns - 10}>
         <Text>
-          Ran <Text bold>{hookCount}</Text> {message.hookLabel ?? 'stop'}{' '}
-          {hookCount === 1 ? 'hook' : 'hooks'}
+          Ran <Text bold>{hookCount}</Text> {message.hookLabel ?? 'stop'} {hookCount === 1 ? 'hook' : 'hooks'}
           {totalStr}
           {!verbose && hookInfos.length > 0 && (
             <>
@@ -268,18 +224,14 @@ function StopHookSummaryMessage({
           hookInfos.length > 0 &&
           hookInfos.map((info, idx) => {
             const durationStr =
-              isAnt && info.durationMs !== undefined
-                ? ` (${formatSecondsShort(info.durationMs)})`
-                : ''
+              isAnt && info.durationMs !== undefined ? ` (${formatSecondsShort(info.durationMs)})` : '';
             return (
               <Text key={`cmd-${idx}`} dimColor>
                 ⎿ &nbsp;
-                {info.command === 'prompt'
-                  ? `prompt: ${info.promptText || ''}`
-                  : info.command}
+                {info.command === 'prompt' ? `prompt: ${info.promptText || ''}` : info.command}
                 {durationStr}
               </Text>
-            )
+            );
           })}
         {preventedContinuation && stopReason && (
           <Text>
@@ -296,7 +248,7 @@ function StopHookSummaryMessage({
           ))}
       </Box>
     </Box>
-  )
+  );
 }
 
 function SystemTextMessageInner({
@@ -306,22 +258,17 @@ function SystemTextMessageInner({
   color,
   dimColor,
 }: {
-  content: string
-  addMargin: boolean
-  dot: boolean
-  color?: TextProps['color']
-  dimColor?: boolean
+  content: string;
+  addMargin: boolean;
+  dot: boolean;
+  color?: TextProps['color'];
+  dimColor?: boolean;
 }): React.ReactNode {
-  const { columns } = useTerminalSize()
-  const bg = useSelectedMessageBg()
+  const { columns } = useTerminalSize();
+  const bg = useSelectedMessageBg();
 
   return (
-    <Box
-      flexDirection="row"
-      marginTop={addMargin ? 1 : 0}
-      backgroundColor={bg}
-      width="100%"
-    >
+    <Box flexDirection="row" marginTop={addMargin ? 1 : 0} backgroundColor={bg} width="100%">
       {dot && (
         <Box minWidth={2}>
           <Text color={color} dimColor={dimColor}>
@@ -335,95 +282,79 @@ function SystemTextMessageInner({
         </Text>
       </Box>
     </Box>
-  )
+  );
 }
 
 function TurnDurationMessage({
   message,
   addMargin,
 }: {
-  message: SystemTurnDurationMessage
-  addMargin: boolean
+  message: SystemTurnDurationMessage;
+  addMargin: boolean;
 }): React.ReactNode {
-  const bg = useSelectedMessageBg()
-  const [verb] = useState(() => sample(TURN_COMPLETION_VERBS) ?? 'Worked')
-  const store = useAppStateStore()
+  const bg = useSelectedMessageBg();
+  const [verb] = useState(() => sample(TURN_COMPLETION_VERBS) ?? 'Worked');
+  const store = useAppStateStore();
   const [backgroundTaskSummary] = useState(() => {
-    const tasks = store.getState().tasks
-    const running = (Object.values(tasks ?? {}) as TaskState[]).filter(
-      isBackgroundTask,
-    )
-    return running.length > 0 ? getPillLabel(running) : null
-  })
+    const tasks = store.getState().tasks;
+    const running = (Object.values(tasks ?? {}) as TaskState[]).filter(isBackgroundTask);
+    return running.length > 0 ? getPillLabel(running) : null;
+  });
 
-  const showTurnDuration = getGlobalConfig().showTurnDuration ?? true
+  const showTurnDuration = getGlobalConfig().showTurnDuration ?? true;
 
-  const duration = formatDuration(message.durationMs as number)
-  const hasBudget = message.budgetLimit !== undefined
+  const duration = formatDuration(message.durationMs as number);
+  const hasBudget = message.budgetLimit !== undefined;
   const budgetSuffix = (() => {
-    if (!hasBudget) return ''
-    const tokens = message.budgetTokens as number
-    const limit = message.budgetLimit as number
+    if (!hasBudget) return '';
+    const tokens = message.budgetTokens as number;
+    const limit = message.budgetLimit as number;
     const usage =
       tokens >= limit
         ? `${formatNumber(tokens)} used (${formatNumber(limit)} min ${figures.tick})`
-        : `${formatNumber(tokens)} / ${formatNumber(limit)} (${Math.round((tokens / limit) * 100)}%)`
+        : `${formatNumber(tokens)} / ${formatNumber(limit)} (${Math.round((tokens / limit) * 100)}%)`;
     const nudges =
       (message.budgetNudges as number) > 0
         ? ` \u00B7 ${message.budgetNudges as number} ${(message.budgetNudges as number) === 1 ? 'nudge' : 'nudges'}`
-        : ''
-    return `${showTurnDuration ? ' \u00B7 ' : ''}${usage}${nudges}`
-  })()
+        : '';
+    return `${showTurnDuration ? ' \u00B7 ' : ''}${usage}${nudges}`;
+  })();
 
   if (!showTurnDuration && !hasBudget) {
-    return null
+    return null;
   }
 
   return (
-    <Box
-      flexDirection="row"
-      marginTop={addMargin ? 1 : 0}
-      backgroundColor={bg}
-      width="100%"
-    >
+    <Box flexDirection="row" marginTop={addMargin ? 1 : 0} backgroundColor={bg} width="100%">
       <Box minWidth={2}>
         <Text dimColor>{TEARDROP_ASTERISK}</Text>
       </Box>
       <Text dimColor>
         {showTurnDuration && `${verb} for ${duration}`}
         {budgetSuffix}
-        {backgroundTaskSummary &&
-          ` \u00B7 ${backgroundTaskSummary} still running`}
+        {backgroundTaskSummary && ` \u00B7 ${backgroundTaskSummary} still running`}
       </Text>
     </Box>
-  )
+  );
 }
 
 function MemorySavedMessage({
   message,
   addMargin,
 }: {
-  message: SystemMemorySavedMessage
-  addMargin: boolean
+  message: SystemMemorySavedMessage;
+  addMargin: boolean;
 }): React.ReactNode {
-  const bg = useSelectedMessageBg()
-  const writtenPaths = (message.writtenPaths ?? []) as string[]
-  const team = feature('TEAMMEM')
-    ? teamMemSaved!.teamMemSavedPart(message)
-    : null
-  const privateCount = writtenPaths.length - (team?.count ?? 0)
+  const bg = useSelectedMessageBg();
+  const writtenPaths = (message.writtenPaths ?? []) as string[];
+  const team = feature('TEAMMEM') ? teamMemSaved!.teamMemSavedPart(message) : null;
+  const privateCount = writtenPaths.length - (team?.count ?? 0);
   const parts = [
-    privateCount > 0
-      ? `${privateCount} ${privateCount === 1 ? 'memory' : 'memories'}`
-      : null,
+    privateCount > 0 ? `${privateCount} ${privateCount === 1 ? 'memory' : 'memories'}` : null,
     team?.segment as React.ReactNode,
-  ].filter(Boolean)
+  ].filter(Boolean);
   return (
-    <Box
-      flexDirection="column"
-      marginTop={addMargin ? 1 : 0}
-      backgroundColor={bg}
-    >
+    <Box flexDirection="column" marginTop={addMargin ? 1 : 0} backgroundColor={bg}>
       <Box flexDirection="row">
         <Box minWidth={2}>
           <Text dimColor>{BLACK_CIRCLE}</Text>
@@ -436,75 +367,60 @@ function MemorySavedMessage({
         <MemoryFileRow key={p} path={p} />
       ))}
     </Box>
-  )
+  );
 }
 
 function MemoryFileRow({ path }: { path: string }): React.ReactNode {
-  const [hover, setHover] = useState(false)
+  const [hover, setHover] = useState(false);
   return (
     <MessageResponse>
-      <Box
-        onClick={() => void openPath(path)}
-        onMouseEnter={() => setHover(true)}
-        onMouseLeave={() => setHover(false)}
-      >
+      <Box onClick={() => void openPath(path)} onMouseEnter={() => setHover(true)} onMouseLeave={() => setHover(false)}>
         <Text dimColor={!hover} underline={hover}>
           <FilePathLink filePath={path}>{basename(path)}</FilePathLink>
         </Text>
       </Box>
     </MessageResponse>
-  )
+  );
 }
 
 function ThinkingMessage({
   message,
   addMargin,
 }: {
-  message: SystemThinkingMessage
-  addMargin: boolean
+  message: SystemThinkingMessage;
+  addMargin: boolean;
 }): React.ReactNode {
-  const bg = useSelectedMessageBg()
+  const bg = useSelectedMessageBg();
   return (
-    <Box
-      flexDirection="row"
-      marginTop={addMargin ? 1 : 0}
-      backgroundColor={bg}
-      width="100%"
-    >
+    <Box flexDirection="row" marginTop={addMargin ? 1 : 0} backgroundColor={bg} width="100%">
       <Box minWidth={2}>
         <Text dimColor>{TEARDROP_ASTERISK}</Text>
       </Box>
       <Text dimColor>{String(message.content ?? '')}</Text>
     </Box>
-  )
+  );
 }
 
 function BridgeStatusMessage({
   message,
   addMargin,
 }: {
-  message: SystemBridgeStatusMessage
-  addMargin: boolean
+  message: SystemBridgeStatusMessage;
+  addMargin: boolean;
 }): React.ReactNode {
-  const bg = useSelectedMessageBg()
-  const url = message.url as string
-  const upgradeNudge = message.upgradeNudge as string | undefined
+  const bg = useSelectedMessageBg();
+  const url = message.url as string;
+  const upgradeNudge = message.upgradeNudge as string | undefined;
   return (
-    <Box
-      flexDirection="row"
-      marginTop={addMargin ? 1 : 0}
-      backgroundColor={bg}
-      width={999}
-    >
+    <Box flexDirection="row" marginTop={addMargin ? 1 : 0} backgroundColor={bg} width={999}>
       <Box minWidth={2} />
       <Box flexDirection="column">
         <Text>
-          <ThemedText color="suggestion">/remote-control</ThemedText> is active.
-          Code in CLI or at
+          <ThemedText color="suggestion">/remote-control</ThemedText> is active. Code in CLI or at
         </Text>
         <Link url={url}>{url}</Link>
         {upgradeNudge && <Text dimColor>⎿ {upgradeNudge}</Text>}
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/components/messages/TaskAssignmentMessage.tsx b/src/components/messages/TaskAssignmentMessage.tsx
index 146068a4f..f81544de6 100644
--- a/src/components/messages/TaskAssignmentMessage.tsx
+++ b/src/components/messages/TaskAssignmentMessage.tsx
@@ -1,13 +1,10 @@
-import * as React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import {
-  isTaskAssignment,
-  type TaskAssignmentMessage,
-} from '../../utils/teammateMailbox.js'
+import * as React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { isTaskAssignment, type TaskAssignmentMessage } from '../../utils/teammateMailbox.js';
 
 type Props = {
-  assignment: TaskAssignmentMessage
-}
+  assignment: TaskAssignmentMessage;
+};
 
 /**
  * Renders a task assignment with a cyan border (team-related color).
@@ -15,13 +12,7 @@ type Props = {
 export function TaskAssignmentDisplay({ assignment }: Props): React.ReactNode {
   return (
     <Box flexDirection="column" marginY={1}>
-      <Box
-        borderStyle="round"
-        borderColor="cyan_FOR_SUBAGENTS_ONLY"
-        flexDirection="column"
-        paddingX={1}
-        paddingY={1}
-      >
+      <Box borderStyle="round" borderColor="cyan_FOR_SUBAGENTS_ONLY" flexDirection="column" paddingX={1} paddingY={1}>
         <Box marginBottom={1}>
           <Text color="cyan_FOR_SUBAGENTS_ONLY" bold>
             Task #{assignment.taskId} assigned by {assignment.assignedBy}
@@ -37,29 +28,27 @@ export function TaskAssignmentDisplay({ assignment }: Props): React.ReactNode {
         )}
       </Box>
     </Box>
-  )
+  );
 }
 
 /**
  * Try to parse and render a task assignment message from raw content.
  */
-export function tryRenderTaskAssignmentMessage(
-  content: string,
-): React.ReactNode | null {
-  const assignment = isTaskAssignment(content)
+export function tryRenderTaskAssignmentMessage(content: string): React.ReactNode | null {
+  const assignment = isTaskAssignment(content);
   if (assignment) {
-    return <TaskAssignmentDisplay assignment={assignment} />
+    return <TaskAssignmentDisplay assignment={assignment} />;
   }
-  return null
+  return null;
 }
 
 /**
  * Get a brief summary text for a task assignment message.
  */
 export function getTaskAssignmentSummary(content: string): string | null {
-  const assignment = isTaskAssignment(content)
+  const assignment = isTaskAssignment(content);
   if (assignment) {
-    return `[Task Assigned] #${assignment.taskId} - ${assignment.subject}`
+    return `[Task Assigned] #${assignment.taskId} - ${assignment.subject}`;
   }
-  return null
+  return null;
 }
diff --git a/src/components/messages/UserAgentNotificationMessage.tsx b/src/components/messages/UserAgentNotificationMessage.tsx
index 8bf906bea..f3ecb1f3a 100644
--- a/src/components/messages/UserAgentNotificationMessage.tsx
+++ b/src/components/messages/UserAgentNotificationMessage.tsx
@@ -1,36 +1,33 @@
-import type { TextBlockParam } from '@anthropic-ai/sdk/resources/index.mjs'
-import * as React from 'react'
-import { BLACK_CIRCLE } from '../../constants/figures.js'
-import { Box, Text, type TextProps } from '@anthropic/ink'
-import { extractTag } from '../../utils/messages.js'
+import type { TextBlockParam } from '@anthropic-ai/sdk/resources/index.mjs';
+import * as React from 'react';
+import { BLACK_CIRCLE } from '../../constants/figures.js';
+import { Box, Text, type TextProps } from '@anthropic/ink';
+import { extractTag } from '../../utils/messages.js';
 
 type Props = {
-  addMargin: boolean
-  param: TextBlockParam
-}
+  addMargin: boolean;
+  param: TextBlockParam;
+};
 
 function getStatusColor(status: string | null): TextProps['color'] {
   switch (status) {
     case 'completed':
-      return 'success'
+      return 'success';
     case 'failed':
-      return 'error'
+      return 'error';
     case 'killed':
-      return 'warning'
+      return 'warning';
     default:
-      return 'text'
+      return 'text';
   }
 }
 
-export function UserAgentNotificationMessage({
-  addMargin,
-  param: { text },
-}: Props): React.ReactNode {
-  const summary = extractTag(text, 'summary')
-  if (!summary) return null
+export function UserAgentNotificationMessage({ addMargin, param: { text } }: Props): React.ReactNode {
+  const summary = extractTag(text, 'summary');
+  if (!summary) return null;
 
-  const status = extractTag(text, 'status')
-  const color = getStatusColor(status)
+  const status = extractTag(text, 'status');
+  const color = getStatusColor(status);
 
   return (
     <Box marginTop={addMargin ? 1 : 0}>
@@ -38,5 +35,5 @@ export function UserAgentNotificationMessage({
         <Text color={color}>{BLACK_CIRCLE}</Text> {summary}
       </Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/messages/UserBashInputMessage.tsx b/src/components/messages/UserBashInputMessage.tsx
index 42e40df75..3b2efe8d6 100644
--- a/src/components/messages/UserBashInputMessage.tsx
+++ b/src/components/messages/UserBashInputMessage.tsx
@@ -1,20 +1,17 @@
-import type { TextBlockParam } from '@anthropic-ai/sdk/resources/index.mjs'
-import * as React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { extractTag } from '../../utils/messages.js'
+import type { TextBlockParam } from '@anthropic-ai/sdk/resources/index.mjs';
+import * as React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { extractTag } from '../../utils/messages.js';
 
 type Props = {
-  addMargin: boolean
-  param: TextBlockParam
-}
+  addMargin: boolean;
+  param: TextBlockParam;
+};
 
-export function UserBashInputMessage({
-  param: { text },
-  addMargin,
-}: Props): React.ReactNode {
-  const input = extractTag(text, 'bash-input')
+export function UserBashInputMessage({ param: { text }, addMargin }: Props): React.ReactNode {
+  const input = extractTag(text, 'bash-input');
   if (!input) {
-    return null
+    return null;
   }
   return (
     <Box
@@ -26,5 +23,5 @@ export function UserBashInputMessage({
       <Text color="bashBorder">! </Text>
       <Text color="text">{input}</Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/messages/UserBashOutputMessage.tsx b/src/components/messages/UserBashOutputMessage.tsx
index 1e9afc537..797b0a9f6 100644
--- a/src/components/messages/UserBashOutputMessage.tsx
+++ b/src/components/messages/UserBashOutputMessage.tsx
@@ -1,20 +1,12 @@
-import * as React from 'react'
-import BashToolResultMessage from '@claude-code-best/builtin-tools/tools/BashTool/BashToolResultMessage.js'
-import { extractTag } from '../../utils/messages.js'
+import * as React from 'react';
+import BashToolResultMessage from '@claude-code-best/builtin-tools/tools/BashTool/BashToolResultMessage.js';
+import { extractTag } from '../../utils/messages.js';
 
-export function UserBashOutputMessage({
-  content,
-  verbose,
-}: {
-  content: string
-  verbose?: boolean
-}): React.ReactNode {
-  const rawStdout = extractTag(content, 'bash-stdout') ?? ''
+export function UserBashOutputMessage({ content, verbose }: { content: string; verbose?: boolean }): React.ReactNode {
+  const rawStdout = extractTag(content, 'bash-stdout') ?? '';
   // Unwrap <persisted-output> if present — keep the inner content (file path +
   // preview) for the user; the wrapper tag itself is model-facing signaling.
-  const stdout = extractTag(rawStdout, 'persisted-output') ?? rawStdout
-  const stderr = extractTag(content, 'bash-stderr') ?? ''
-  return (
-    <BashToolResultMessage content={{ stdout, stderr }} verbose={!!verbose} />
-  )
+  const stdout = extractTag(rawStdout, 'persisted-output') ?? rawStdout;
+  const stderr = extractTag(content, 'bash-stderr') ?? '';
+  return <BashToolResultMessage content={{ stdout, stderr }} verbose={!!verbose} />;
 }
diff --git a/src/components/messages/UserChannelMessage.tsx b/src/components/messages/UserChannelMessage.tsx
index a37f05c8c..63d028366 100644
--- a/src/components/messages/UserChannelMessage.tsx
+++ b/src/components/messages/UserChannelMessage.tsx
@@ -1,42 +1,37 @@
-import type { TextBlockParam } from '@anthropic-ai/sdk/resources/index.mjs'
-import * as React from 'react'
-import { CHANNEL_ARROW } from '../../constants/figures.js'
-import { CHANNEL_TAG } from '../../constants/xml.js'
-import { Box, Text } from '@anthropic/ink'
-import { truncateToWidth } from '../../utils/format.js'
+import type { TextBlockParam } from '@anthropic-ai/sdk/resources/index.mjs';
+import * as React from 'react';
+import { CHANNEL_ARROW } from '../../constants/figures.js';
+import { CHANNEL_TAG } from '../../constants/xml.js';
+import { Box, Text } from '@anthropic/ink';
+import { truncateToWidth } from '../../utils/format.js';
 
 type Props = {
-  addMargin: boolean
-  param: TextBlockParam
-}
+  addMargin: boolean;
+  param: TextBlockParam;
+};
 
 // <channel source="..." user="..." chat_id="...">content</channel>
 // source is always first (wrapChannelMessage writes it), user is optional.
-const CHANNEL_RE = new RegExp(
-  `<${CHANNEL_TAG}\\s+source="([^"]+)"([^>]*)>\\n?([\\s\\S]*?)\\n?</${CHANNEL_TAG}>`,
-)
-const USER_ATTR_RE = /\buser="([^"]+)"/
+const CHANNEL_RE = new RegExp(`<${CHANNEL_TAG}\\s+source="([^"]+)"([^>]*)>\\n?([\\s\\S]*?)\\n?</${CHANNEL_TAG}>`);
+const USER_ATTR_RE = /\buser="([^"]+)"/;
 
 // Plugin-provided servers get names like plugin:slack-channel:slack via
 // addPluginScopeToServers — show just the leaf. Matches the suffix-match
 // logic in isServerInChannels.
 function displayServerName(name: string): string {
-  const i = name.lastIndexOf(':')
-  return i === -1 ? name : name.slice(i + 1)
+  const i = name.lastIndexOf(':');
+  return i === -1 ? name : name.slice(i + 1);
 }
 
-const TRUNCATE_AT = 60
+const TRUNCATE_AT = 60;
 
-export function UserChannelMessage({
-  addMargin,
-  param: { text },
-}: Props): React.ReactNode {
-  const m = CHANNEL_RE.exec(text)
-  if (!m) return null
-  const [, source, attrs, content] = m
-  const user = USER_ATTR_RE.exec(attrs ?? '')?.[1]
-  const body = (content ?? '').trim().replace(/\s+/g, ' ')
-  const truncated = truncateToWidth(body, TRUNCATE_AT)
+export function UserChannelMessage({ addMargin, param: { text } }: Props): React.ReactNode {
+  const m = CHANNEL_RE.exec(text);
+  if (!m) return null;
+  const [, source, attrs, content] = m;
+  const user = USER_ATTR_RE.exec(attrs ?? '')?.[1];
+  const body = (content ?? '').trim().replace(/\s+/g, ' ');
+  const truncated = truncateToWidth(body, TRUNCATE_AT);
   return (
     <Box marginTop={addMargin ? 1 : 0}>
       <Text>
@@ -48,5 +43,5 @@ export function UserChannelMessage({
         {truncated}
       </Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/messages/UserCommandMessage.tsx b/src/components/messages/UserCommandMessage.tsx
index 1c9502c32..9998b8d7b 100644
--- a/src/components/messages/UserCommandMessage.tsx
+++ b/src/components/messages/UserCommandMessage.tsx
@@ -1,25 +1,22 @@
-import type { TextBlockParam } from '@anthropic-ai/sdk/resources/index.mjs'
-import figures from 'figures'
-import * as React from 'react'
-import { COMMAND_MESSAGE_TAG } from '../../constants/xml.js'
-import { Box, Text } from '@anthropic/ink'
-import { extractTag } from '../../utils/messages.js'
+import type { TextBlockParam } from '@anthropic-ai/sdk/resources/index.mjs';
+import figures from 'figures';
+import * as React from 'react';
+import { COMMAND_MESSAGE_TAG } from '../../constants/xml.js';
+import { Box, Text } from '@anthropic/ink';
+import { extractTag } from '../../utils/messages.js';
 
 type Props = {
-  addMargin: boolean
-  param: TextBlockParam
-}
+  addMargin: boolean;
+  param: TextBlockParam;
+};
 
-export function UserCommandMessage({
-  addMargin,
-  param: { text },
-}: Props): React.ReactNode {
-  const commandMessage = extractTag(text, COMMAND_MESSAGE_TAG)
-  const args = extractTag(text, 'command-args')
-  const isSkillFormat = extractTag(text, 'skill-format') === 'true'
+export function UserCommandMessage({ addMargin, param: { text } }: Props): React.ReactNode {
+  const commandMessage = extractTag(text, COMMAND_MESSAGE_TAG);
+  const args = extractTag(text, 'command-args');
+  const isSkillFormat = extractTag(text, 'skill-format') === 'true';
 
   if (!commandMessage) {
-    return null
+    return null;
   }
 
   // Skills use "Skill(name)" format
@@ -36,22 +33,17 @@ export function UserCommandMessage({
           <Text color="text">Skill({commandMessage})</Text>
         </Text>
       </Box>
-    )
+    );
   }
 
   // Slash command format: show as "❯ /command args"
-  const content = `/${[commandMessage, args].filter(Boolean).join(' ')}`
+  const content = `/${[commandMessage, args].filter(Boolean).join(' ')}`;
   return (
-    <Box
-      flexDirection="column"
-      marginTop={addMargin ? 1 : 0}
-      backgroundColor="userMessageBackground"
-      paddingRight={1}
-    >
+    <Box flexDirection="column" marginTop={addMargin ? 1 : 0} backgroundColor="userMessageBackground" paddingRight={1}>
       <Text>
         <Text color="subtle">{figures.pointer} </Text>
         <Text color="text">{content}</Text>
       </Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/messages/UserCrossSessionMessage.ts b/src/components/messages/UserCrossSessionMessage.ts
index 5b86d7802..1d9677b3d 100644
--- a/src/components/messages/UserCrossSessionMessage.ts
+++ b/src/components/messages/UserCrossSessionMessage.ts
@@ -1,3 +1,4 @@
 // Auto-generated stub — replace with real implementation
-export {};
-export const UserCrossSessionMessage: (props: Record<string, unknown>) => null = () => null;
+export {}
+export const UserCrossSessionMessage: (props: Record<string, unknown>) => null =
+  () => null
diff --git a/src/components/messages/UserForkBoilerplateMessage.ts b/src/components/messages/UserForkBoilerplateMessage.ts
index 8d79de68f..c45f71de9 100644
--- a/src/components/messages/UserForkBoilerplateMessage.ts
+++ b/src/components/messages/UserForkBoilerplateMessage.ts
@@ -1,3 +1,5 @@
 // Auto-generated stub — replace with real implementation
-export {};
-export const UserForkBoilerplateMessage: (props: Record<string, unknown>) => null = () => null;
+export {}
+export const UserForkBoilerplateMessage: (
+  props: Record<string, unknown>,
+) => null = () => null
diff --git a/src/components/messages/UserGitHubWebhookMessage.ts b/src/components/messages/UserGitHubWebhookMessage.ts
index 6ed1e016f..0bd63f9a5 100644
--- a/src/components/messages/UserGitHubWebhookMessage.ts
+++ b/src/components/messages/UserGitHubWebhookMessage.ts
@@ -1,3 +1,5 @@
 // Auto-generated stub — replace with real implementation
-export {};
-export const UserGitHubWebhookMessage: (props: Record<string, unknown>) => null = () => null;
+export {}
+export const UserGitHubWebhookMessage: (
+  props: Record<string, unknown>,
+) => null = () => null
diff --git a/src/components/messages/UserImageMessage.tsx b/src/components/messages/UserImageMessage.tsx
index ca960d59c..bdebf9110 100644
--- a/src/components/messages/UserImageMessage.tsx
+++ b/src/components/messages/UserImageMessage.tsx
@@ -1,13 +1,13 @@
-import * as React from 'react'
-import { pathToFileURL } from 'url'
-import { Box, Link, supportsHyperlinks, Text } from '@anthropic/ink'
-import { getStoredImagePath } from '../../utils/imageStore.js'
-import { MessageResponse } from '../MessageResponse.js'
+import * as React from 'react';
+import { pathToFileURL } from 'url';
+import { Box, Link, supportsHyperlinks, Text } from '@anthropic/ink';
+import { getStoredImagePath } from '../../utils/imageStore.js';
+import { MessageResponse } from '../MessageResponse.js';
 
 type Props = {
-  imageId?: number
-  addMargin?: boolean
-}
+  imageId?: number;
+  addMargin?: boolean;
+};
 
 /**
  * Renders an image attachment in user messages.
@@ -15,12 +15,9 @@ type Props = {
  * Uses MessageResponse styling to appear connected to the message above,
  * unless addMargin is true (image starts a new user turn without text).
  */
-export function UserImageMessage({
-  imageId,
-  addMargin,
-}: Props): React.ReactNode {
-  const label = imageId ? `[Image #${imageId}]` : '[Image]'
-  const imagePath = imageId ? getStoredImagePath(imageId) : null
+export function UserImageMessage({ imageId, addMargin }: Props): React.ReactNode {
+  const label = imageId ? `[Image #${imageId}]` : '[Image]';
+  const imagePath = imageId ? getStoredImagePath(imageId) : null;
 
   const content =
     imagePath && supportsHyperlinks() ? (
@@ -29,13 +26,13 @@ export function UserImageMessage({
       </Link>
     ) : (
       <Text>{label}</Text>
-    )
+    );
 
   // When this image starts a new user turn (no text before it),
   // show with margin instead of the connected line style
   if (addMargin) {
-    return <Box marginTop={1}>{content}</Box>
+    return <Box marginTop={1}>{content}</Box>;
   }
 
-  return <MessageResponse>{content}</MessageResponse>
+  return <MessageResponse>{content}</MessageResponse>;
 }
diff --git a/src/components/messages/UserLocalCommandOutputMessage.tsx b/src/components/messages/UserLocalCommandOutputMessage.tsx
index 3467686b4..72e6302ef 100644
--- a/src/components/messages/UserLocalCommandOutputMessage.tsx
+++ b/src/components/messages/UserLocalCommandOutputMessage.tsx
@@ -1,44 +1,39 @@
-import * as React from 'react'
-import { DIAMOND_FILLED, DIAMOND_OPEN } from '../../constants/figures.js'
-import { NO_CONTENT_MESSAGE } from '../../constants/messages.js'
-import { Box, Text } from '@anthropic/ink'
-import { extractTag } from '../../utils/messages.js'
-import { Markdown } from '../Markdown.js'
-import { MessageResponse } from '../MessageResponse.js'
+import * as React from 'react';
+import { DIAMOND_FILLED, DIAMOND_OPEN } from '../../constants/figures.js';
+import { NO_CONTENT_MESSAGE } from '../../constants/messages.js';
+import { Box, Text } from '@anthropic/ink';
+import { extractTag } from '../../utils/messages.js';
+import { Markdown } from '../Markdown.js';
+import { MessageResponse } from '../MessageResponse.js';
 
 type Props = {
-  content: string
-}
+  content: string;
+};
 
-export function UserLocalCommandOutputMessage({
-  content,
-}: Props): React.ReactNode {
-  const stdout = extractTag(content, 'local-command-stdout')
-  const stderr = extractTag(content, 'local-command-stderr')
+export function UserLocalCommandOutputMessage({ content }: Props): React.ReactNode {
+  const stdout = extractTag(content, 'local-command-stdout');
+  const stderr = extractTag(content, 'local-command-stderr');
   if (!stdout && !stderr) {
     return (
       <MessageResponse>
         <Text dimColor>{NO_CONTENT_MESSAGE}</Text>
       </MessageResponse>
-    )
+    );
   }
 
-  const lines: React.ReactNode[] = []
+  const lines: React.ReactNode[] = [];
   if (stdout?.trim()) {
-    lines.push(<IndentedContent key="stdout">{stdout.trim()}</IndentedContent>)
+    lines.push(<IndentedContent key="stdout">{stdout.trim()}</IndentedContent>);
   }
   if (stderr?.trim()) {
-    lines.push(<IndentedContent key="stderr">{stderr.trim()}</IndentedContent>)
+    lines.push(<IndentedContent key="stderr">{stderr.trim()}</IndentedContent>);
   }
-  return lines
+  return lines;
 }
 
 function IndentedContent({ children }: { children: string }): React.ReactNode {
-  if (
-    children.startsWith(`${DIAMOND_OPEN} `) ||
-    children.startsWith(`${DIAMOND_FILLED} `)
-  ) {
-    return <CloudLaunchContent>{children}</CloudLaunchContent>
+  if (children.startsWith(`${DIAMOND_OPEN} `) || children.startsWith(`${DIAMOND_FILLED} `)) {
+    return <CloudLaunchContent>{children}</CloudLaunchContent>;
   }
   return (
     <Box flexDirection="row">
@@ -47,21 +42,17 @@ function IndentedContent({ children }: { children: string }): React.ReactNode {
         <Markdown>{children}</Markdown>
       </Box>
     </Box>
-  )
+  );
 }
 
-function CloudLaunchContent({
-  children,
-}: {
-  children: string
-}): React.ReactNode {
-  const diamond = children[0]!
-  const nl = children.indexOf('\n')
-  const header = nl === -1 ? children.slice(2) : children.slice(2, nl)
-  const rest = nl === -1 ? '' : children.slice(nl + 1).trim()
-  const sep = header.indexOf(' · ')
-  const label = sep === -1 ? header : header.slice(0, sep)
-  const suffix = sep === -1 ? '' : header.slice(sep)
+function CloudLaunchContent({ children }: { children: string }): React.ReactNode {
+  const diamond = children[0]!;
+  const nl = children.indexOf('\n');
+  const header = nl === -1 ? children.slice(2) : children.slice(2, nl);
+  const rest = nl === -1 ? '' : children.slice(nl + 1).trim();
+  const sep = header.indexOf(' · ');
+  const label = sep === -1 ? header : header.slice(0, sep);
+  const suffix = sep === -1 ? '' : header.slice(sep);
   return (
     <Box flexDirection="column">
       <Text>
@@ -76,5 +67,5 @@ function CloudLaunchContent({
         </Box>
       )}
     </Box>
-  )
+  );
 }
diff --git a/src/components/messages/UserMemoryInputMessage.tsx b/src/components/messages/UserMemoryInputMessage.tsx
index cbdfdcd5d..b60fdfc3b 100644
--- a/src/components/messages/UserMemoryInputMessage.tsx
+++ b/src/components/messages/UserMemoryInputMessage.tsx
@@ -1,28 +1,25 @@
-import sample from 'lodash-es/sample.js'
-import * as React from 'react'
-import { useMemo } from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { extractTag } from '../../utils/messages.js'
-import { MessageResponse } from '../MessageResponse.js'
+import sample from 'lodash-es/sample.js';
+import * as React from 'react';
+import { useMemo } from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { extractTag } from '../../utils/messages.js';
+import { MessageResponse } from '../MessageResponse.js';
 
 function getSavingMessage(): string {
-  return sample(['Got it.', 'Good to know.', 'Noted.'])
+  return sample(['Got it.', 'Good to know.', 'Noted.']);
 }
 
 type Props = {
-  addMargin: boolean
-  text: string
-}
+  addMargin: boolean;
+  text: string;
+};
 
-export function UserMemoryInputMessage({
-  text,
-  addMargin,
-}: Props): React.ReactNode {
-  const input = extractTag(text, 'user-memory-input')
-  const savingText = useMemo(() => getSavingMessage(), [])
+export function UserMemoryInputMessage({ text, addMargin }: Props): React.ReactNode {
+  const input = extractTag(text, 'user-memory-input');
+  const savingText = useMemo(() => getSavingMessage(), []);
 
   if (!input) {
-    return null
+    return null;
   }
 
   return (
@@ -40,5 +37,5 @@ export function UserMemoryInputMessage({
         <Text dimColor>{savingText}</Text>
       </MessageResponse>
     </Box>
-  )
+  );
 }
diff --git a/src/components/messages/UserPlanMessage.tsx b/src/components/messages/UserPlanMessage.tsx
index 30f2b369b..603b11fc9 100644
--- a/src/components/messages/UserPlanMessage.tsx
+++ b/src/components/messages/UserPlanMessage.tsx
@@ -1,24 +1,15 @@
-import * as React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { Markdown } from '../Markdown.js'
+import * as React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { Markdown } from '../Markdown.js';
 
 type Props = {
-  addMargin: boolean
-  planContent: string
-}
+  addMargin: boolean;
+  planContent: string;
+};
 
-export function UserPlanMessage({
-  addMargin,
-  planContent,
-}: Props): React.ReactNode {
+export function UserPlanMessage({ addMargin, planContent }: Props): React.ReactNode {
   return (
-    <Box
-      flexDirection="column"
-      borderStyle="round"
-      borderColor="planMode"
-      marginTop={addMargin ? 1 : 0}
-      paddingX={1}
-    >
+    <Box flexDirection="column" borderStyle="round" borderColor="planMode" marginTop={addMargin ? 1 : 0} paddingX={1}>
       <Box marginBottom={1}>
         <Text bold color="planMode">
           Plan to implement
@@ -26,5 +17,5 @@ export function UserPlanMessage({
       </Box>
       <Markdown>{planContent}</Markdown>
     </Box>
-  )
+  );
 }
diff --git a/src/components/messages/UserPromptMessage.tsx b/src/components/messages/UserPromptMessage.tsx
index 00f201368..6f1f17802 100644
--- a/src/components/messages/UserPromptMessage.tsx
+++ b/src/components/messages/UserPromptMessage.tsx
@@ -1,22 +1,22 @@
-import { feature } from 'bun:bundle'
-import type { TextBlockParam } from '@anthropic-ai/sdk/resources/index.mjs'
-import React, { useContext, useMemo } from 'react'
-import { getKairosActive, getUserMsgOptIn } from '../../bootstrap/state.js'
-import { Box } from '@anthropic/ink'
-import { getFeatureValue_CACHED_MAY_BE_STALE } from '../../services/analytics/growthbook.js'
-import { useAppState } from '../../state/AppState.js'
-import { isEnvTruthy } from '../../utils/envUtils.js'
-import { logError } from '../../utils/log.js'
-import { countCharInString } from '../../utils/stringUtils.js'
-import { MessageActionsSelectedContext } from '../messageActions.js'
-import { HighlightedThinkingText } from './HighlightedThinkingText.js'
+import { feature } from 'bun:bundle';
+import type { TextBlockParam } from '@anthropic-ai/sdk/resources/index.mjs';
+import React, { useContext, useMemo } from 'react';
+import { getKairosActive, getUserMsgOptIn } from '../../bootstrap/state.js';
+import { Box } from '@anthropic/ink';
+import { getFeatureValue_CACHED_MAY_BE_STALE } from '../../services/analytics/growthbook.js';
+import { useAppState } from '../../state/AppState.js';
+import { isEnvTruthy } from '../../utils/envUtils.js';
+import { logError } from '../../utils/log.js';
+import { countCharInString } from '../../utils/stringUtils.js';
+import { MessageActionsSelectedContext } from '../messageActions.js';
+import { HighlightedThinkingText } from './HighlightedThinkingText.js';
 
 type Props = {
-  addMargin: boolean
-  param: TextBlockParam
-  isTranscriptMode?: boolean
-  timestamp?: string
-}
+  addMargin: boolean;
+  param: TextBlockParam;
+  isTranscriptMode?: boolean;
+  timestamp?: string;
+};
 
 // Hard cap on displayed prompt text. Piping large files via stdin
 // (e.g. `cat 11k-line-file | claude`) creates a single user message whose
@@ -26,16 +26,11 @@ type Props = {
 // avoids this via <Static> (print-and-forget to terminal scrollback).
 // Head+tail because `{ cat file; echo prompt; } | claude` puts the user's
 // actual question at the end.
-const MAX_DISPLAY_CHARS = 10_000
-const TRUNCATE_HEAD_CHARS = 2_500
-const TRUNCATE_TAIL_CHARS = 2_500
+const MAX_DISPLAY_CHARS = 10_000;
+const TRUNCATE_HEAD_CHARS = 2_500;
+const TRUNCATE_TAIL_CHARS = 2_500;
 
-export function UserPromptMessage({
-  addMargin,
-  param: { text },
-  isTranscriptMode,
-  timestamp,
-}: Props): React.ReactNode {
+export function UserPromptMessage({ addMargin, param: { text }, isTranscriptMode, timestamp }: Props): React.ReactNode {
   // REPL.tsx passes isBriefOnly={viewedTeammateTask ? false : isBriefOnly}
   // but that prop isn't threaded this deep — replicate the override by
   // reading viewingAgentTaskId directly. Computed here (not in the child)
@@ -50,63 +45,48 @@ export function UserPromptMessage({
   // external builds.
   const isBriefOnly =
     feature('KAIROS') || feature('KAIROS_BRIEF')
-      ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-        useAppState(s => s.isBriefOnly)
-      : false
+      ? useAppState(s => s.isBriefOnly)
+      : false;
   const viewingAgentTaskId =
     feature('KAIROS') || feature('KAIROS_BRIEF')
-      ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-        useAppState(s => s.viewingAgentTaskId)
-      : null
+      ? useAppState(s => s.viewingAgentTaskId)
+      : null;
   // Hoisted to mount-time — per-message component, re-renders on every scroll.
   const briefEnvEnabled =
     feature('KAIROS') || feature('KAIROS_BRIEF')
-      ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-        useMemo(() => isEnvTruthy(process.env.CLAUDE_CODE_BRIEF), [])
-      : false
+      ? useMemo(() => isEnvTruthy(process.env.CLAUDE_CODE_BRIEF), [])
+      : false;
   const useBriefLayout =
     feature('KAIROS') || feature('KAIROS_BRIEF')
       ? (getKairosActive() ||
           (getUserMsgOptIn() &&
-            (briefEnvEnabled ||
-              getFeatureValue_CACHED_MAY_BE_STALE(
-                'tengu_kairos_brief',
-                false,
-              )))) &&
+            (briefEnvEnabled || getFeatureValue_CACHED_MAY_BE_STALE('tengu_kairos_brief', false)))) &&
         isBriefOnly &&
         !isTranscriptMode &&
         !viewingAgentTaskId
-      : false
+      : false;
 
   // Truncate before the early return so the hook order is stable.
   const displayText = useMemo(() => {
-    if (text.length <= MAX_DISPLAY_CHARS) return text
-    const head = text.slice(0, TRUNCATE_HEAD_CHARS)
-    const tail = text.slice(-TRUNCATE_TAIL_CHARS)
-    const hiddenLines =
-      countCharInString(text, '\n', TRUNCATE_HEAD_CHARS) -
-      countCharInString(tail, '\n')
-    return `${head}\n… +${hiddenLines} lines …\n${tail}`
-  }, [text])
+    if (text.length <= MAX_DISPLAY_CHARS) return text;
+    const head = text.slice(0, TRUNCATE_HEAD_CHARS);
+    const tail = text.slice(-TRUNCATE_TAIL_CHARS);
+    const hiddenLines = countCharInString(text, '\n', TRUNCATE_HEAD_CHARS) - countCharInString(tail, '\n');
+    return `${head}\n… +${hiddenLines} lines …\n${tail}`;
+  }, [text]);
 
-  const isSelected = useContext(MessageActionsSelectedContext)
+  const isSelected = useContext(MessageActionsSelectedContext);
 
   if (!text) {
-    logError(new Error('No content found in user prompt message'))
-    return null
+    logError(new Error('No content found in user prompt message'));
+    return null;
   }
 
   return (
     <Box
       flexDirection="column"
       marginTop={addMargin ? 1 : 0}
-      backgroundColor={
-        isSelected
-          ? 'messageActionsBackground'
-          : useBriefLayout
-            ? undefined
-            : 'userMessageBackground'
-      }
+      backgroundColor={isSelected ? 'messageActionsBackground' : useBriefLayout ? undefined : 'userMessageBackground'}
       paddingRight={useBriefLayout ? 0 : 1}
     >
       <HighlightedThinkingText
@@ -115,5 +95,5 @@ export function UserPromptMessage({
         timestamp={useBriefLayout ? timestamp : undefined}
       />
     </Box>
-  )
+  );
 }
diff --git a/src/components/messages/UserResourceUpdateMessage.tsx b/src/components/messages/UserResourceUpdateMessage.tsx
index ec0f5a2ac..29b363b3e 100644
--- a/src/components/messages/UserResourceUpdateMessage.tsx
+++ b/src/components/messages/UserResourceUpdateMessage.tsx
@@ -1,91 +1,83 @@
-import type { TextBlockParam } from '@anthropic-ai/sdk/resources/index.mjs'
-import * as React from 'react'
-import { REFRESH_ARROW } from '../../constants/figures.js'
-import { Box, Text } from '@anthropic/ink'
+import type { TextBlockParam } from '@anthropic-ai/sdk/resources/index.mjs';
+import * as React from 'react';
+import { REFRESH_ARROW } from '../../constants/figures.js';
+import { Box, Text } from '@anthropic/ink';
 
 type Props = {
-  addMargin: boolean
-  param: TextBlockParam
-}
+  addMargin: boolean;
+  param: TextBlockParam;
+};
 
 type ParsedUpdate = {
-  kind: 'resource' | 'polling'
-  server: string
+  kind: 'resource' | 'polling';
+  server: string;
   /** URI for resource updates, tool name for polling updates */
-  target: string
-  reason?: string
-}
+  target: string;
+  reason?: string;
+};
 
 // Parse resource and polling updates from XML format
 function parseUpdates(text: string): ParsedUpdate[] {
-  const updates: ParsedUpdate[] = []
+  const updates: ParsedUpdate[] = [];
 
   // Match <mcp-resource-update server="..." uri="...">
   const resourceRegex =
-    /<mcp-resource-update\s+server="([^"]+)"\s+uri="([^"]+)"[^>]*>(?:[\s\S]*?<reason>([^<]+)<\/reason>)?/g
-  let match
+    /<mcp-resource-update\s+server="([^"]+)"\s+uri="([^"]+)"[^>]*>(?:[\s\S]*?<reason>([^<]+)<\/reason>)?/g;
+  let match;
   while ((match = resourceRegex.exec(text)) !== null) {
     updates.push({
       kind: 'resource',
       server: match[1] ?? '',
       target: match[2] ?? '',
       reason: match[3],
-    })
+    });
   }
 
   // Match <mcp-polling-update type="tool" server="..." tool="...">
   const pollingRegex =
-    /<mcp-polling-update\s+type="([^"]+)"\s+server="([^"]+)"\s+tool="([^"]+)"[^>]*>(?:[\s\S]*?<reason>([^<]+)<\/reason>)?/g
+    /<mcp-polling-update\s+type="([^"]+)"\s+server="([^"]+)"\s+tool="([^"]+)"[^>]*>(?:[\s\S]*?<reason>([^<]+)<\/reason>)?/g;
   while ((match = pollingRegex.exec(text)) !== null) {
     updates.push({
       kind: 'polling',
       server: match[2] ?? '',
       target: match[3] ?? '',
       reason: match[4],
-    })
+    });
   }
 
-  return updates
+  return updates;
 }
 
 // Format URI for display - show just the meaningful part
 function formatUri(uri: string): string {
   // For file:// URIs, show just the filename
   if (uri.startsWith('file://')) {
-    const path = uri.slice(7)
-    const parts = path.split('/')
-    return parts[parts.length - 1] || path
+    const path = uri.slice(7);
+    const parts = path.split('/');
+    return parts[parts.length - 1] || path;
   }
   // For other URIs, show the whole thing but truncated
   if (uri.length > 40) {
-    return uri.slice(0, 39) + '\u2026'
+    return uri.slice(0, 39) + '\u2026';
   }
-  return uri
+  return uri;
 }
 
-export function UserResourceUpdateMessage({
-  addMargin,
-  param: { text },
-}: Props): React.ReactNode {
-  const updates = parseUpdates(text)
-  if (updates.length === 0) return null
+export function UserResourceUpdateMessage({ addMargin, param: { text } }: Props): React.ReactNode {
+  const updates = parseUpdates(text);
+  if (updates.length === 0) return null;
 
   return (
     <Box flexDirection="column" marginTop={addMargin ? 1 : 0}>
       {updates.map((update, i) => (
         <Box key={i}>
           <Text>
-            <Text color="success">{REFRESH_ARROW}</Text>{' '}
-            <Text dimColor>{update.server}:</Text>{' '}
-            <Text color="suggestion">
-              {update.kind === 'resource'
-                ? formatUri(update.target)
-                : update.target}
-            </Text>
+            <Text color="success">{REFRESH_ARROW}</Text> <Text dimColor>{update.server}:</Text>{' '}
+            <Text color="suggestion">{update.kind === 'resource' ? formatUri(update.target) : update.target}</Text>
             {update.reason && <Text dimColor> · {update.reason}</Text>}
           </Text>
         </Box>
       ))}
     </Box>
-  )
+  );
 }
diff --git a/src/components/messages/UserTeammateMessage.tsx b/src/components/messages/UserTeammateMessage.tsx
index e75256abc..c7b3cc2ce 100644
--- a/src/components/messages/UserTeammateMessage.tsx
+++ b/src/components/messages/UserTeammateMessage.tsx
@@ -1,34 +1,34 @@
-import type { TextBlockParam } from '@anthropic-ai/sdk/resources/index.mjs'
-import figures from 'figures'
-import * as React from 'react'
-import { TEAMMATE_MESSAGE_TAG } from '../../constants/xml.js'
-import { Ansi, Box, Text, type TextProps } from '@anthropic/ink'
-import { toInkColor } from '../../utils/ink.js'
+import type { TextBlockParam } from '@anthropic-ai/sdk/resources/index.mjs';
+import figures from 'figures';
+import * as React from 'react';
+import { TEAMMATE_MESSAGE_TAG } from '../../constants/xml.js';
+import { Ansi, Box, Text, type TextProps } from '@anthropic/ink';
+import { toInkColor } from '../../utils/ink.js';
 
-import { jsonParse } from '../../utils/slowOperations.js'
-import { isShutdownApproved } from '../../utils/teammateMailbox.js'
-import { MessageResponse } from '../MessageResponse.js'
-import { tryRenderPlanApprovalMessage } from './PlanApprovalMessage.js'
-import { tryRenderShutdownMessage } from './ShutdownMessage.js'
-import { tryRenderTaskAssignmentMessage } from './TaskAssignmentMessage.js'
+import { jsonParse } from '../../utils/slowOperations.js';
+import { isShutdownApproved } from '../../utils/teammateMailbox.js';
+import { MessageResponse } from '../MessageResponse.js';
+import { tryRenderPlanApprovalMessage } from './PlanApprovalMessage.js';
+import { tryRenderShutdownMessage } from './ShutdownMessage.js';
+import { tryRenderTaskAssignmentMessage } from './TaskAssignmentMessage.js';
 
 type Props = {
-  addMargin: boolean
-  param: TextBlockParam
-  isTranscriptMode?: boolean
-}
+  addMargin: boolean;
+  param: TextBlockParam;
+  isTranscriptMode?: boolean;
+};
 
 type ParsedMessage = {
-  teammateId: string
-  content: string
-  color?: string
-  summary?: string
-}
+  teammateId: string;
+  content: string;
+  color?: string;
+  summary?: string;
+};
 
 const TEAMMATE_MSG_REGEX = new RegExp(
   `<${TEAMMATE_MESSAGE_TAG}\\s+teammate_id="([^"]+)"(?:\\s+color="([^"]+)")?(?:\\s+summary="([^"]+)")?>\\n?([\\s\\S]*?)\\n?<\\/${TEAMMATE_MESSAGE_TAG}>`,
   'g',
-)
+);
 
 /**
  * Parse all teammate messages from XML format:
@@ -36,7 +36,7 @@ const TEAMMATE_MSG_REGEX = new RegExp(
  * Supports multiple messages in a single text block.
  */
 function parseTeammateMessages(text: string): ParsedMessage[] {
-  const messages: ParsedMessage[] = []
+  const messages: ParsedMessage[] = [];
   // Use matchAll to find all matches (this is a RegExp method, not child_process)
   for (const match of text.matchAll(TEAMMATE_MSG_REGEX)) {
     if (match[1] && match[4]) {
@@ -45,114 +45,97 @@ function parseTeammateMessages(text: string): ParsedMessage[] {
         color: match[2], // may be undefined
         summary: match[3], // may be undefined
         content: match[4].trim(),
-      })
+      });
     }
   }
 
-  return messages
+  return messages;
 }
 
 function getDisplayName(teammateId: string): string {
   if (teammateId === 'leader') {
-    return 'leader'
+    return 'leader';
   }
-  return teammateId
+  return teammateId;
 }
 
-export function UserTeammateMessage({
-  addMargin,
-  param: { text },
-  isTranscriptMode,
-}: Props): React.ReactNode {
+export function UserTeammateMessage({ addMargin, param: { text }, isTranscriptMode }: Props): React.ReactNode {
   const messages = parseTeammateMessages(text).filter(msg => {
     // Pre-filter shutdown lifecycle messages to avoid empty wrapper
     // Box elements creating blank lines between model turns
     if (isShutdownApproved(msg.content)) {
-      return false
+      return false;
     }
     try {
-      const parsed = jsonParse(msg.content)
-      if (parsed?.type === 'teammate_terminated') return false
+      const parsed = jsonParse(msg.content);
+      if (parsed?.type === 'teammate_terminated') return false;
     } catch {
       // Not JSON, keep the message
     }
-    return true
-  })
+    return true;
+  });
   if (messages.length === 0) {
-    return null
+    return null;
   }
 
   return (
     <Box flexDirection="column" marginTop={addMargin ? 1 : 0} width="100%">
       {messages.map((msg, index) => {
-        const inkColor = toInkColor(msg.color)
-        const displayName = getDisplayName(msg.teammateId)
+        const inkColor = toInkColor(msg.color);
+        const displayName = getDisplayName(msg.teammateId);
 
         // Try to render as plan approval message (request or response)
-        const planApprovalElement = tryRenderPlanApprovalMessage(
-          msg.content,
-          displayName,
-        )
+        const planApprovalElement = tryRenderPlanApprovalMessage(msg.content, displayName);
         if (planApprovalElement) {
-          return (
-            <React.Fragment key={index}>{planApprovalElement}</React.Fragment>
-          )
+          return <React.Fragment key={index}>{planApprovalElement}</React.Fragment>;
         }
 
         // Try to render as shutdown message (request or rejected)
-        const shutdownElement = tryRenderShutdownMessage(msg.content)
+        const shutdownElement = tryRenderShutdownMessage(msg.content);
         if (shutdownElement) {
-          return <React.Fragment key={index}>{shutdownElement}</React.Fragment>
+          return <React.Fragment key={index}>{shutdownElement}</React.Fragment>;
         }
 
         // Try to render as task assignment message
-        const taskAssignmentElement = tryRenderTaskAssignmentMessage(
-          msg.content,
-        )
+        const taskAssignmentElement = tryRenderTaskAssignmentMessage(msg.content);
         if (taskAssignmentElement) {
-          return (
-            <React.Fragment key={index}>{taskAssignmentElement}</React.Fragment>
-          )
+          return <React.Fragment key={index}>{taskAssignmentElement}</React.Fragment>;
         }
 
         // Try to parse as structured JSON message
-        let parsedIdleNotification: { type?: string } | null = null
+        let parsedIdleNotification: { type?: string } | null = null;
         try {
-          parsedIdleNotification = jsonParse(msg.content)
+          parsedIdleNotification = jsonParse(msg.content);
         } catch {
           // Not JSON
         }
 
         // Hide idle notifications - they are processed silently
         if (parsedIdleNotification?.type === 'idle_notification') {
-          return null
+          return null;
         }
 
         // Task completed notification - show which task was completed
         if (parsedIdleNotification?.type === 'task_completed') {
           const taskCompleted = parsedIdleNotification as {
-            type: string
-            from: string
-            taskId: string
-            taskSubject?: string
-          }
+            type: string;
+            from: string;
+            taskId: string;
+            taskSubject?: string;
+          };
           return (
             <Box key={index} flexDirection="column" marginTop={1}>
-              <Text
-                color={inkColor}
-              >{`@${displayName}${figures.pointer}`}</Text>
+              <Text color={inkColor}>{`@${displayName}${figures.pointer}`}</Text>
               <MessageResponse>
                 <Text color="success">✓</Text>
                 <Text>
                   {' '}
                   Completed task #{taskCompleted.taskId}
-                  {taskCompleted.taskSubject && (
-                    <Text dimColor> ({taskCompleted.taskSubject})</Text>
-                  )}
+                  {taskCompleted.taskSubject && <Text dimColor> ({taskCompleted.taskSubject})</Text>}
                 </Text>
               </MessageResponse>
             </Box>
-          )
+          );
         }
 
         // Default: plain text message (truncated)
@@ -165,19 +148,19 @@ export function UserTeammateMessage({
             summary={msg.summary}
             isTranscriptMode={isTranscriptMode}
           />
-        )
+        );
       })}
     </Box>
-  )
+  );
 }
 
 type TeammateMessageContentProps = {
-  displayName: string
-  inkColor: TextProps['color']
-  content: string
-  summary?: string
-  isTranscriptMode?: boolean
-}
+  displayName: string;
+  inkColor: TextProps['color'];
+  content: string;
+  summary?: string;
+  isTranscriptMode?: boolean;
+};
 
 export function TeammateMessageContent({
   displayName,
@@ -200,5 +183,5 @@ export function TeammateMessageContent({
         </Box>
       )}
     </Box>
-  )
+  );
 }
diff --git a/src/components/messages/UserTextMessage.tsx b/src/components/messages/UserTextMessage.tsx
index 73ef3929d..e8798884c 100644
--- a/src/components/messages/UserTextMessage.tsx
+++ b/src/components/messages/UserTextMessage.tsx
@@ -1,41 +1,37 @@
-import { feature } from 'bun:bundle'
-import type { TextBlockParam } from '@anthropic-ai/sdk/resources/index.mjs'
-import * as React from 'react'
-import { NO_CONTENT_MESSAGE } from '../../constants/messages.js'
+import { feature } from 'bun:bundle';
+import type { TextBlockParam } from '@anthropic-ai/sdk/resources/index.mjs';
+import * as React from 'react';
+import { NO_CONTENT_MESSAGE } from '../../constants/messages.js';
 import {
   COMMAND_MESSAGE_TAG,
   LOCAL_COMMAND_CAVEAT_TAG,
   TASK_NOTIFICATION_TAG,
   TEAMMATE_MESSAGE_TAG,
   TICK_TAG,
-} from '../../constants/xml.js'
-import { isAgentSwarmsEnabled } from '../../utils/agentSwarmsEnabled.js'
-import {
-  extractTag,
-  INTERRUPT_MESSAGE,
-  INTERRUPT_MESSAGE_FOR_TOOL_USE,
-} from '../../utils/messages.js'
-import { InterruptedByUser } from '../InterruptedByUser.js'
-import { MessageResponse } from '../MessageResponse.js'
-import { UserAgentNotificationMessage } from './UserAgentNotificationMessage.js'
-import { UserBashInputMessage } from './UserBashInputMessage.js'
-import { UserBashOutputMessage } from './UserBashOutputMessage.js'
-import { UserCommandMessage } from './UserCommandMessage.js'
-import { UserLocalCommandOutputMessage } from './UserLocalCommandOutputMessage.js'
-import { UserMemoryInputMessage } from './UserMemoryInputMessage.js'
-import { UserPlanMessage } from './UserPlanMessage.js'
-import { UserPromptMessage } from './UserPromptMessage.js'
-import { UserResourceUpdateMessage } from './UserResourceUpdateMessage.js'
-import { UserTeammateMessage } from './UserTeammateMessage.js'
+} from '../../constants/xml.js';
+import { isAgentSwarmsEnabled } from '../../utils/agentSwarmsEnabled.js';
+import { extractTag, INTERRUPT_MESSAGE, INTERRUPT_MESSAGE_FOR_TOOL_USE } from '../../utils/messages.js';
+import { InterruptedByUser } from '../InterruptedByUser.js';
+import { MessageResponse } from '../MessageResponse.js';
+import { UserAgentNotificationMessage } from './UserAgentNotificationMessage.js';
+import { UserBashInputMessage } from './UserBashInputMessage.js';
+import { UserBashOutputMessage } from './UserBashOutputMessage.js';
+import { UserCommandMessage } from './UserCommandMessage.js';
+import { UserLocalCommandOutputMessage } from './UserLocalCommandOutputMessage.js';
+import { UserMemoryInputMessage } from './UserMemoryInputMessage.js';
+import { UserPlanMessage } from './UserPlanMessage.js';
+import { UserPromptMessage } from './UserPromptMessage.js';
+import { UserResourceUpdateMessage } from './UserResourceUpdateMessage.js';
+import { UserTeammateMessage } from './UserTeammateMessage.js';
 
 type Props = {
-  addMargin: boolean
-  param: TextBlockParam
-  verbose: boolean
-  planContent?: string
-  isTranscriptMode?: boolean
-  timestamp?: string
-}
+  addMargin: boolean;
+  param: TextBlockParam;
+  verbose: boolean;
+  planContent?: string;
+  isTranscriptMode?: boolean;
+  timestamp?: string;
+};
 
 export function UserTextMessage({
   addMargin,
@@ -46,49 +42,40 @@ export function UserTextMessage({
   timestamp,
 }: Props): React.ReactNode {
   if (param.text.trim() === NO_CONTENT_MESSAGE) {
-    return null
+    return null;
   }
 
   // Plan to implement message (cleared context flow)
   if (planContent) {
-    return <UserPlanMessage addMargin={addMargin} planContent={planContent} />
+    return <UserPlanMessage addMargin={addMargin} planContent={planContent} />;
   }
 
   if (extractTag(param.text, TICK_TAG)) {
-    return null
+    return null;
   }
 
   // Hide synthetic caveat messages (should be filtered by isMeta, this is defensive)
   if (param.text.includes(`<${LOCAL_COMMAND_CAVEAT_TAG}>`)) {
-    return null
+    return null;
   }
 
   // Show bash output
-  if (
-    param.text.startsWith('<bash-stdout') ||
-    param.text.startsWith('<bash-stderr')
-  ) {
-    return <UserBashOutputMessage content={param.text} verbose={verbose} />
+  if (param.text.startsWith('<bash-stdout') || param.text.startsWith('<bash-stderr')) {
+    return <UserBashOutputMessage content={param.text} verbose={verbose} />;
   }
 
   // Show command output
-  if (
-    param.text.startsWith('<local-command-stdout') ||
-    param.text.startsWith('<local-command-stderr')
-  ) {
-    return <UserLocalCommandOutputMessage content={param.text} />
+  if (param.text.startsWith('<local-command-stdout') || param.text.startsWith('<local-command-stderr')) {
+    return <UserLocalCommandOutputMessage content={param.text} />;
   }
 
   // Handle interruption messages specially
-  if (
-    param.text === INTERRUPT_MESSAGE ||
-    param.text === INTERRUPT_MESSAGE_FOR_TOOL_USE
-  ) {
+  if (param.text === INTERRUPT_MESSAGE || param.text === INTERRUPT_MESSAGE_FOR_TOOL_USE) {
     return (
       <MessageResponse height={1}>
         <InterruptedByUser />
       </MessageResponse>
-    )
+    );
   }
 
   // GitHub webhook events (check_run, review comments, pushes) delivered via
@@ -101,51 +88,39 @@ export function UserTextMessage({
     if (param.text.startsWith('<github-webhook-activity>')) {
       /* eslint-disable @typescript-eslint/no-require-imports */
       const { UserGitHubWebhookMessage } =
-        require('./UserGitHubWebhookMessage.js') as typeof import('./UserGitHubWebhookMessage.js')
+        require('./UserGitHubWebhookMessage.js') as typeof import('./UserGitHubWebhookMessage.js');
       /* eslint-enable @typescript-eslint/no-require-imports */
-      return <UserGitHubWebhookMessage addMargin={addMargin} param={param} />
+      return <UserGitHubWebhookMessage addMargin={addMargin} param={param} />;
     }
   }
 
   // Bash inputs!
   if (param.text.includes('<bash-input>')) {
-    return <UserBashInputMessage addMargin={addMargin} param={param} />
+    return <UserBashInputMessage addMargin={addMargin} param={param} />;
   }
 
   // Slash commands/
   if (param.text.includes(`<${COMMAND_MESSAGE_TAG}>`)) {
-    return <UserCommandMessage addMargin={addMargin} param={param} />
+    return <UserCommandMessage addMargin={addMargin} param={param} />;
   }
 
   if (param.text.includes('<user-memory-input>')) {
-    return <UserMemoryInputMessage addMargin={addMargin} text={param.text} />
+    return <UserMemoryInputMessage addMargin={addMargin} text={param.text} />;
   }
 
   // Teammate messages - only check when swarms enabled
-  if (
-    isAgentSwarmsEnabled() &&
-    param.text.includes(`<${TEAMMATE_MESSAGE_TAG}`)
-  ) {
-    return (
-      <UserTeammateMessage
-        addMargin={addMargin}
-        param={param}
-        isTranscriptMode={isTranscriptMode}
-      />
-    )
+  if (isAgentSwarmsEnabled() && param.text.includes(`<${TEAMMATE_MESSAGE_TAG}`)) {
+    return <UserTeammateMessage addMargin={addMargin} param={param} isTranscriptMode={isTranscriptMode} />;
   }
 
   // Task notifications (agent completions, bash completions, etc.)
   if (param.text.includes(`<${TASK_NOTIFICATION_TAG}`)) {
-    return <UserAgentNotificationMessage addMargin={addMargin} param={param} />
+    return <UserAgentNotificationMessage addMargin={addMargin} param={param} />;
   }
 
   // MCP resource and polling update notifications
-  if (
-    param.text.includes('<mcp-resource-update') ||
-    param.text.includes('<mcp-polling-update')
-  ) {
-    return <UserResourceUpdateMessage addMargin={addMargin} param={param} />
+  if (param.text.includes('<mcp-resource-update') || param.text.includes('<mcp-polling-update')) {
+    return <UserResourceUpdateMessage addMargin={addMargin} param={param} />;
   }
 
   // Fork child's first message: collapse the rules/format boilerplate, show
@@ -155,9 +130,9 @@ export function UserTextMessage({
     if (param.text.includes('<fork-boilerplate>')) {
       /* eslint-disable @typescript-eslint/no-require-imports */
       const { UserForkBoilerplateMessage } =
-        require('./UserForkBoilerplateMessage.js') as typeof import('./UserForkBoilerplateMessage.js')
+        require('./UserForkBoilerplateMessage.js') as typeof import('./UserForkBoilerplateMessage.js');
       /* eslint-enable @typescript-eslint/no-require-imports */
-      return <UserForkBoilerplateMessage addMargin={addMargin} param={param} />
+      return <UserForkBoilerplateMessage addMargin={addMargin} param={param} />;
     }
   }
 
@@ -168,9 +143,9 @@ export function UserTextMessage({
     if (param.text.includes('<cross-session-message')) {
       /* eslint-disable @typescript-eslint/no-require-imports */
       const { UserCrossSessionMessage } =
-        require('./UserCrossSessionMessage.js') as typeof import('./UserCrossSessionMessage.js')
+        require('./UserCrossSessionMessage.js') as typeof import('./UserCrossSessionMessage.js');
       /* eslint-enable @typescript-eslint/no-require-imports */
-      return <UserCrossSessionMessage addMargin={addMargin} param={param} />
+      return <UserCrossSessionMessage addMargin={addMargin} param={param} />;
     }
   }
 
@@ -178,20 +153,14 @@ export function UserTextMessage({
   if (feature('KAIROS') || feature('KAIROS_CHANNELS')) {
     if (param.text.includes('<channel source="')) {
       /* eslint-disable @typescript-eslint/no-require-imports */
-      const { UserChannelMessage } =
-        require('./UserChannelMessage.js') as typeof import('./UserChannelMessage.js')
+      const { UserChannelMessage } = require('./UserChannelMessage.js') as typeof import('./UserChannelMessage.js');
       /* eslint-enable @typescript-eslint/no-require-imports */
-      return <UserChannelMessage addMargin={addMargin} param={param} />
+      return <UserChannelMessage addMargin={addMargin} param={param} />;
     }
   }
 
   // User prompts>
   return (
-    <UserPromptMessage
-      addMargin={addMargin}
-      param={param}
-      isTranscriptMode={isTranscriptMode}
-      timestamp={timestamp}
-    />
-  )
+    <UserPromptMessage addMargin={addMargin} param={param} isTranscriptMode={isTranscriptMode} timestamp={timestamp} />
+  );
 }
diff --git a/src/components/messages/UserToolResultMessage/RejectedPlanMessage.tsx b/src/components/messages/UserToolResultMessage/RejectedPlanMessage.tsx
index ec2130230..2a01fc615 100644
--- a/src/components/messages/UserToolResultMessage/RejectedPlanMessage.tsx
+++ b/src/components/messages/UserToolResultMessage/RejectedPlanMessage.tsx
@@ -1,11 +1,11 @@
-import * as React from 'react'
-import { Markdown } from 'src/components/Markdown.js'
-import { MessageResponse } from 'src/components/MessageResponse.js'
-import { Box, Text } from '@anthropic/ink'
+import * as React from 'react';
+import { Markdown } from 'src/components/Markdown.js';
+import { MessageResponse } from 'src/components/MessageResponse.js';
+import { Box, Text } from '@anthropic/ink';
 
 type Props = {
-  plan: string
-}
+  plan: string;
+};
 
 export function RejectedPlanMessage({ plan }: Props): React.ReactNode {
   return (
@@ -23,5 +23,5 @@ export function RejectedPlanMessage({ plan }: Props): React.ReactNode {
         </Box>
       </Box>
     </MessageResponse>
-  )
+  );
 }
diff --git a/src/components/messages/UserToolResultMessage/RejectedToolUseMessage.tsx b/src/components/messages/UserToolResultMessage/RejectedToolUseMessage.tsx
index 5764a4e17..c78c2760b 100644
--- a/src/components/messages/UserToolResultMessage/RejectedToolUseMessage.tsx
+++ b/src/components/messages/UserToolResultMessage/RejectedToolUseMessage.tsx
@@ -1,11 +1,11 @@
-import * as React from 'react'
-import { Text } from '@anthropic/ink'
-import { MessageResponse } from '../../MessageResponse.js'
+import * as React from 'react';
+import { Text } from '@anthropic/ink';
+import { MessageResponse } from '../../MessageResponse.js';
 
 export function RejectedToolUseMessage(): React.ReactNode {
   return (
     <MessageResponse height={1}>
       <Text dimColor>Tool use rejected</Text>
     </MessageResponse>
-  )
+  );
 }
diff --git a/src/components/messages/UserToolResultMessage/UserToolCanceledMessage.tsx b/src/components/messages/UserToolResultMessage/UserToolCanceledMessage.tsx
index cb8f242eb..a0f719523 100644
--- a/src/components/messages/UserToolResultMessage/UserToolCanceledMessage.tsx
+++ b/src/components/messages/UserToolResultMessage/UserToolCanceledMessage.tsx
@@ -1,11 +1,11 @@
-import * as React from 'react'
-import { InterruptedByUser } from 'src/components/InterruptedByUser.js'
-import { MessageResponse } from 'src/components/MessageResponse.js'
+import * as React from 'react';
+import { InterruptedByUser } from 'src/components/InterruptedByUser.js';
+import { MessageResponse } from 'src/components/MessageResponse.js';
 
 export function UserToolCanceledMessage(): React.ReactNode {
   return (
     <MessageResponse height={1}>
       <InterruptedByUser />
     </MessageResponse>
-  )
+  );
 }
diff --git a/src/components/messages/UserToolResultMessage/UserToolErrorMessage.tsx b/src/components/messages/UserToolResultMessage/UserToolErrorMessage.tsx
index a178e8e34..fb96f5ac7 100644
--- a/src/components/messages/UserToolResultMessage/UserToolErrorMessage.tsx
+++ b/src/components/messages/UserToolResultMessage/UserToolErrorMessage.tsx
@@ -1,34 +1,30 @@
-import { feature } from 'bun:bundle'
-import type { ToolResultBlockParam } from '@anthropic-ai/sdk/resources/index.mjs'
-import * as React from 'react'
-import { BULLET_OPERATOR } from '../../../constants/figures.js'
-import { Text } from '@anthropic/ink'
-import {
-  filterToolProgressMessages,
-  type Tool,
-  type Tools,
-} from '../../../Tool.js'
-import type { ProgressMessage } from '../../../types/message.js'
+import { feature } from 'bun:bundle';
+import type { ToolResultBlockParam } from '@anthropic-ai/sdk/resources/index.mjs';
+import * as React from 'react';
+import { BULLET_OPERATOR } from '../../../constants/figures.js';
+import { Text } from '@anthropic/ink';
+import { filterToolProgressMessages, type Tool, type Tools } from '../../../Tool.js';
+import type { ProgressMessage } from '../../../types/message.js';
 import {
   INTERRUPT_MESSAGE_FOR_TOOL_USE,
   isClassifierDenial,
   PLAN_REJECTION_PREFIX,
   REJECT_MESSAGE_WITH_REASON_PREFIX,
-} from '../../../utils/messages.js'
-import { FallbackToolUseErrorMessage } from '../../FallbackToolUseErrorMessage.js'
-import { InterruptedByUser } from '../../InterruptedByUser.js'
-import { MessageResponse } from '../../MessageResponse.js'
-import { RejectedPlanMessage } from './RejectedPlanMessage.js'
-import { RejectedToolUseMessage } from './RejectedToolUseMessage.js'
+} from '../../../utils/messages.js';
+import { FallbackToolUseErrorMessage } from '../../FallbackToolUseErrorMessage.js';
+import { InterruptedByUser } from '../../InterruptedByUser.js';
+import { MessageResponse } from '../../MessageResponse.js';
+import { RejectedPlanMessage } from './RejectedPlanMessage.js';
+import { RejectedToolUseMessage } from './RejectedToolUseMessage.js';
 
 type Props = {
-  progressMessagesForMessage: ProgressMessage[]
-  tool?: Tool // undefined when resuming an old conversation that uses an old tool
-  tools: Tools
-  param: ToolResultBlockParam
-  verbose: boolean
-  isTranscriptMode?: boolean
-}
+  progressMessagesForMessage: ProgressMessage[];
+  tool?: Tool; // undefined when resuming an old conversation that uses an old tool
+  tools: Tools;
+  param: ToolResultBlockParam;
+  verbose: boolean;
+  isTranscriptMode?: boolean;
+};
 
 export function UserToolErrorMessage({
   progressMessagesForMessage,
@@ -38,58 +34,38 @@ export function UserToolErrorMessage({
   verbose,
   isTranscriptMode,
 }: Props): React.ReactNode {
-  if (
-    typeof param.content === 'string' &&
-    param.content.includes(INTERRUPT_MESSAGE_FOR_TOOL_USE)
-  ) {
+  if (typeof param.content === 'string' && param.content.includes(INTERRUPT_MESSAGE_FOR_TOOL_USE)) {
     return (
       <MessageResponse height={1}>
         <InterruptedByUser />
       </MessageResponse>
-    )
+    );
   }
 
-  if (
-    typeof param.content === 'string' &&
-    param.content.startsWith(PLAN_REJECTION_PREFIX)
-  ) {
+  if (typeof param.content === 'string' && param.content.startsWith(PLAN_REJECTION_PREFIX)) {
     // Extract the plan content from the error message
-    const planContent = param.content.substring(PLAN_REJECTION_PREFIX.length)
-    return <RejectedPlanMessage plan={planContent} />
+    const planContent = param.content.substring(PLAN_REJECTION_PREFIX.length);
+    return <RejectedPlanMessage plan={planContent} />;
   }
 
-  if (
-    typeof param.content === 'string' &&
-    param.content.startsWith(REJECT_MESSAGE_WITH_REASON_PREFIX)
-  ) {
-    return <RejectedToolUseMessage />
+  if (typeof param.content === 'string' && param.content.startsWith(REJECT_MESSAGE_WITH_REASON_PREFIX)) {
+    return <RejectedToolUseMessage />;
   }
 
-  if (
-    feature('TRANSCRIPT_CLASSIFIER') &&
-    typeof param.content === 'string' &&
-    isClassifierDenial(param.content)
-  ) {
+  if (feature('TRANSCRIPT_CLASSIFIER') && typeof param.content === 'string' && isClassifierDenial(param.content)) {
     return (
       <MessageResponse height={1}>
-        <Text dimColor>
-          Denied by auto mode classifier {BULLET_OPERATOR} /feedback if
-          incorrect
-        </Text>
+        <Text dimColor>Denied by auto mode classifier {BULLET_OPERATOR} /feedback if incorrect</Text>
       </MessageResponse>
-    )
+    );
   }
 
   return (
     tool?.renderToolUseErrorMessage?.(param.content, {
-      progressMessagesForMessage: filterToolProgressMessages(
-        progressMessagesForMessage,
-      ),
+      progressMessagesForMessage: filterToolProgressMessages(progressMessagesForMessage),
       tools,
       verbose,
       isTranscriptMode,
-    }) ?? (
-      <FallbackToolUseErrorMessage result={param.content} verbose={verbose} />
-    )
-  )
+    }) ?? <FallbackToolUseErrorMessage result={param.content} verbose={verbose} />
+  );
 }
diff --git a/src/components/messages/UserToolResultMessage/UserToolRejectMessage.tsx b/src/components/messages/UserToolResultMessage/UserToolRejectMessage.tsx
index c53d81e6d..5f92ec193 100644
--- a/src/components/messages/UserToolResultMessage/UserToolRejectMessage.tsx
+++ b/src/components/messages/UserToolResultMessage/UserToolRejectMessage.tsx
@@ -1,25 +1,21 @@
-import * as React from 'react'
-import { useTerminalSize } from '../../../hooks/useTerminalSize.js'
-import { useTheme } from '@anthropic/ink'
-import {
-  filterToolProgressMessages,
-  type Tool,
-  type Tools,
-} from '../../../Tool.js'
-import type { ProgressMessage } from '../../../types/message.js'
-import type { buildMessageLookups } from '../../../utils/messages.js'
-import { FallbackToolUseRejectedMessage } from '../../FallbackToolUseRejectedMessage.js'
+import * as React from 'react';
+import { useTerminalSize } from '../../../hooks/useTerminalSize.js';
+import { useTheme } from '@anthropic/ink';
+import { filterToolProgressMessages, type Tool, type Tools } from '../../../Tool.js';
+import type { ProgressMessage } from '../../../types/message.js';
+import type { buildMessageLookups } from '../../../utils/messages.js';
+import { FallbackToolUseRejectedMessage } from '../../FallbackToolUseRejectedMessage.js';
 
 type Props = {
-  input: { [key: string]: unknown }
-  progressMessagesForMessage: ProgressMessage[]
-  style?: 'condensed'
-  tool?: Tool
-  tools: Tools
-  lookups: ReturnType<typeof buildMessageLookups>
-  verbose: boolean
-  isTranscriptMode?: boolean
-}
+  input: { [key: string]: unknown };
+  progressMessagesForMessage: ProgressMessage[];
+  style?: 'condensed';
+  tool?: Tool;
+  tools: Tools;
+  lookups: ReturnType<typeof buildMessageLookups>;
+  verbose: boolean;
+  isTranscriptMode?: boolean;
+};
 
 export function UserToolRejectMessage({
   input,
@@ -30,16 +26,16 @@ export function UserToolRejectMessage({
   verbose,
   isTranscriptMode,
 }: Props): React.ReactNode {
-  const { columns } = useTerminalSize()
-  const [theme] = useTheme()
+  const { columns } = useTerminalSize();
+  const [theme] = useTheme();
 
   if (!tool || !tool.renderToolUseRejectedMessage) {
-    return <FallbackToolUseRejectedMessage />
+    return <FallbackToolUseRejectedMessage />;
   }
 
-  const parsedInput = tool.inputSchema.safeParse(input)
+  const parsedInput = tool.inputSchema.safeParse(input);
   if (!parsedInput.success) {
-    return <FallbackToolUseRejectedMessage />
+    return <FallbackToolUseRejectedMessage />;
   }
 
   return (
@@ -48,12 +44,10 @@ export function UserToolRejectMessage({
       messages: [],
       tools,
       verbose,
-      progressMessagesForMessage: filterToolProgressMessages(
-        progressMessagesForMessage,
-      ),
+      progressMessagesForMessage: filterToolProgressMessages(progressMessagesForMessage),
       style,
       theme,
       isTranscriptMode,
     }) ?? <FallbackToolUseRejectedMessage />
-  )
+  );
 }
diff --git a/src/components/messages/UserToolResultMessage/UserToolResultMessage.tsx b/src/components/messages/UserToolResultMessage/UserToolResultMessage.tsx
index abd7a8fce..841e9b8f8 100644
--- a/src/components/messages/UserToolResultMessage/UserToolResultMessage.tsx
+++ b/src/components/messages/UserToolResultMessage/UserToolResultMessage.tsx
@@ -1,33 +1,30 @@
-import type { ToolResultBlockParam } from '@anthropic-ai/sdk/resources/index.mjs'
-import * as React from 'react'
-import type { Tools } from '../../../Tool.js'
-import type {
-  NormalizedUserMessage,
-  ProgressMessage,
-} from '../../../types/message.js'
+import type { ToolResultBlockParam } from '@anthropic-ai/sdk/resources/index.mjs';
+import * as React from 'react';
+import type { Tools } from '../../../Tool.js';
+import type { NormalizedUserMessage, ProgressMessage } from '../../../types/message.js';
 import {
   type buildMessageLookups,
   CANCEL_MESSAGE,
   INTERRUPT_MESSAGE_FOR_TOOL_USE,
   REJECT_MESSAGE,
-} from '../../../utils/messages.js'
-import { UserToolCanceledMessage } from './UserToolCanceledMessage.js'
-import { UserToolErrorMessage } from './UserToolErrorMessage.js'
-import { UserToolRejectMessage } from './UserToolRejectMessage.js'
-import { UserToolSuccessMessage } from './UserToolSuccessMessage.js'
-import { useGetToolFromMessages } from './utils.js'
+} from '../../../utils/messages.js';
+import { UserToolCanceledMessage } from './UserToolCanceledMessage.js';
+import { UserToolErrorMessage } from './UserToolErrorMessage.js';
+import { UserToolRejectMessage } from './UserToolRejectMessage.js';
+import { UserToolSuccessMessage } from './UserToolSuccessMessage.js';
+import { useGetToolFromMessages } from './utils.js';
 
 type Props = {
-  param: ToolResultBlockParam
-  message: NormalizedUserMessage
-  lookups: ReturnType<typeof buildMessageLookups>
-  progressMessagesForMessage: ProgressMessage[]
-  style?: 'condensed'
-  tools: Tools
-  verbose: boolean
-  width: number | string
-  isTranscriptMode?: boolean
-}
+  param: ToolResultBlockParam;
+  message: NormalizedUserMessage;
+  lookups: ReturnType<typeof buildMessageLookups>;
+  progressMessagesForMessage: ProgressMessage[];
+  style?: 'condensed';
+  tools: Tools;
+  verbose: boolean;
+  width: number | string;
+  isTranscriptMode?: boolean;
+};
 
 export function UserToolResultMessage({
   param,
@@ -40,21 +37,17 @@ export function UserToolResultMessage({
   width,
   isTranscriptMode,
 }: Props): React.ReactNode {
-  const toolUse = useGetToolFromMessages(param.tool_use_id, tools, lookups)
+  const toolUse = useGetToolFromMessages(param.tool_use_id, tools, lookups);
   if (!toolUse) {
-    return null
+    return null;
+  }
+
+  if (typeof param.content === 'string' && param.content.startsWith(CANCEL_MESSAGE)) {
+    return <UserToolCanceledMessage />;
   }
 
   if (
-    typeof param.content === 'string' &&
-    param.content.startsWith(CANCEL_MESSAGE)
-  ) {
-    return <UserToolCanceledMessage />
-  }
-
-  if (
-    (typeof param.content === 'string' &&
-      param.content.startsWith(REJECT_MESSAGE)) ||
+    (typeof param.content === 'string' && param.content.startsWith(REJECT_MESSAGE)) ||
     param.content === INTERRUPT_MESSAGE_FOR_TOOL_USE
   ) {
     return (
@@ -68,7 +61,7 @@ export function UserToolResultMessage({
         verbose={verbose}
         isTranscriptMode={isTranscriptMode}
       />
-    )
+    );
   }
 
   if (param.is_error) {
@@ -81,7 +74,7 @@ export function UserToolResultMessage({
         verbose={verbose}
         isTranscriptMode={isTranscriptMode}
       />
-    )
+    );
   }
 
   return (
@@ -97,5 +90,5 @@ export function UserToolResultMessage({
       width={width}
       isTranscriptMode={isTranscriptMode}
     />
-  )
+  );
 }
diff --git a/src/components/messages/UserToolResultMessage/UserToolSuccessMessage.tsx b/src/components/messages/UserToolResultMessage/UserToolSuccessMessage.tsx
index ffb8e23d5..b3036cd2a 100644
--- a/src/components/messages/UserToolResultMessage/UserToolSuccessMessage.tsx
+++ b/src/components/messages/UserToolResultMessage/UserToolSuccessMessage.tsx
@@ -1,39 +1,32 @@
-import { feature } from 'bun:bundle'
-import figures from 'figures'
-import * as React from 'react'
-import { SentryErrorBoundary } from 'src/components/SentryErrorBoundary.js'
-import { Box, Text, useTheme } from '@anthropic/ink'
-import { useAppState } from '../../../state/AppState.js'
-import {
-  filterToolProgressMessages,
-  type Tool,
-  type Tools,
-} from '../../../Tool.js'
-import type {
-  NormalizedUserMessage,
-  ProgressMessage,
-} from '../../../types/message.js'
+import { feature } from 'bun:bundle';
+import figures from 'figures';
+import * as React from 'react';
+import { SentryErrorBoundary } from 'src/components/SentryErrorBoundary.js';
+import { Box, Text, useTheme } from '@anthropic/ink';
+import { useAppState } from '../../../state/AppState.js';
+import { filterToolProgressMessages, type Tool, type Tools } from '../../../Tool.js';
+import type { NormalizedUserMessage, ProgressMessage } from '../../../types/message.js';
 import {
   deleteClassifierApproval,
   getClassifierApproval,
   getYoloClassifierApproval,
-} from '../../../utils/classifierApprovals.js'
-import type { buildMessageLookups } from '../../../utils/messages.js'
-import { MessageResponse } from '../../MessageResponse.js'
-import { HookProgressMessage } from '../HookProgressMessage.js'
+} from '../../../utils/classifierApprovals.js';
+import type { buildMessageLookups } from '../../../utils/messages.js';
+import { MessageResponse } from '../../MessageResponse.js';
+import { HookProgressMessage } from '../HookProgressMessage.js';
 
 type Props = {
-  message: NormalizedUserMessage
-  lookups: ReturnType<typeof buildMessageLookups>
-  toolUseID: string
-  progressMessagesForMessage: ProgressMessage[]
-  style?: 'condensed'
-  tool?: Tool
-  tools: Tools
-  verbose: boolean
-  width: number | string
-  isTranscriptMode?: boolean
-}
+  message: NormalizedUserMessage;
+  lookups: ReturnType<typeof buildMessageLookups>;
+  toolUseID: string;
+  progressMessagesForMessage: ProgressMessage[];
+  style?: 'condensed';
+  tool?: Tool;
+  tools: Tools;
+  verbose: boolean;
+  width: number | string;
+  isTranscriptMode?: boolean;
+};
 
 export function UserToolSuccessMessage({
   message,
@@ -47,74 +40,62 @@ export function UserToolSuccessMessage({
   width,
   isTranscriptMode,
 }: Props): React.ReactNode {
-  const [theme] = useTheme()
+  const [theme] = useTheme();
   // Hook stays inside feature() ternary so external builds don't pay a
   // per-scrollback-message store subscription — same pattern as
   // UserPromptMessage.tsx.
   const isBriefOnly =
     feature('KAIROS') || feature('KAIROS_BRIEF')
-      ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-        useAppState(s => s.isBriefOnly)
-      : false
+      ? useAppState(s => s.isBriefOnly)
+      : false;
 
   // Capture classifier approval once on mount, then delete from Map to prevent linear growth.
   // useState lazy initializer ensures the value persists across re-renders.
-  const [classifierRule] = React.useState(() =>
-    getClassifierApproval(toolUseID),
-  )
-  const [yoloReason] = React.useState(() =>
-    getYoloClassifierApproval(toolUseID),
-  )
+  const [classifierRule] = React.useState(() => getClassifierApproval(toolUseID));
+  const [yoloReason] = React.useState(() => getYoloClassifierApproval(toolUseID));
   React.useEffect(() => {
-    deleteClassifierApproval(toolUseID)
-  }, [toolUseID])
+    deleteClassifierApproval(toolUseID);
+  }, [toolUseID]);
 
   if (!message.toolUseResult || !tool) {
-    return null
+    return null;
   }
 
   // Resumed transcripts deserialize toolUseResult via raw JSON.parse with no
   // validation (parseJSONL). A partial/corrupt/old-format result crashes
   // renderToolResultMessage on first field access (anthropics/claude-code#39817).
   // Validate against outputSchema before rendering — mirrors CollapsedReadSearchContent.
-  const parsedOutput = tool.outputSchema?.safeParse(message.toolUseResult)
+  const parsedOutput = tool.outputSchema?.safeParse(message.toolUseResult);
   if (parsedOutput && !parsedOutput.success) {
-    return null
+    return null;
   }
-  const toolResult = parsedOutput?.data ?? message.toolUseResult
+  const toolResult = parsedOutput?.data ?? message.toolUseResult;
 
   const renderedMessage =
-    tool.renderToolResultMessage?.(
-      toolResult as never,
-      filterToolProgressMessages(progressMessagesForMessage),
-      {
-        style,
-        theme,
-        tools,
-        verbose,
-        isTranscriptMode,
-        isBriefOnly,
-        input: lookups.toolUseByToolUseID.get(toolUseID)?.input,
-      },
-    ) ?? null
+    tool.renderToolResultMessage?.(toolResult as never, filterToolProgressMessages(progressMessagesForMessage), {
+      style,
+      theme,
+      tools,
+      verbose,
+      isTranscriptMode,
+      isBriefOnly,
+      input: lookups.toolUseByToolUseID.get(toolUseID)?.input,
+    }) ?? null;
 
   // Don't render anything if the tool result message is null
   if (renderedMessage === null) {
-    return null
+    return null;
   }
 
   // Tools that return '' from userFacingName opt out of tool chrome and
   // render like plain assistant text. Skip the tool-result width constraint
   // so MarkdownTable's SAFETY_MARGIN=4 (tuned for the assistant-text 2-col
   // dot gutter) holds — otherwise tables wrap their box-drawing chars.
-  const rendersAsAssistantText = tool.userFacingName(undefined) === ''
+  const rendersAsAssistantText = tool.userFacingName(undefined) === '';
 
   return (
     <Box flexDirection="column">
-      <Box
-        flexDirection="column"
-        width={rendersAsAssistantText ? undefined : width}
-      >
+      <Box flexDirection="column" width={rendersAsAssistantText ? undefined : width}>
         {renderedMessage}
         {feature('BASH_CLASSIFIER')
           ? classifierRule && (
@@ -145,5 +126,5 @@ export function UserToolSuccessMessage({
         />
       </SentryErrorBoundary>
     </Box>
-  )
+  );
 }
diff --git a/src/components/messages/UserToolResultMessage/src/components/InterruptedByUser.ts b/src/components/messages/UserToolResultMessage/src/components/InterruptedByUser.ts
index b98ac191d..c26df5d69 100644
--- a/src/components/messages/UserToolResultMessage/src/components/InterruptedByUser.ts
+++ b/src/components/messages/UserToolResultMessage/src/components/InterruptedByUser.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type InterruptedByUser = any;
+export type InterruptedByUser = any
diff --git a/src/components/messages/UserToolResultMessage/src/components/Markdown.ts b/src/components/messages/UserToolResultMessage/src/components/Markdown.ts
index 44bbabff4..395cc4df0 100644
--- a/src/components/messages/UserToolResultMessage/src/components/Markdown.ts
+++ b/src/components/messages/UserToolResultMessage/src/components/Markdown.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type Markdown = any;
+export type Markdown = any
diff --git a/src/components/messages/UserToolResultMessage/src/components/MessageResponse.ts b/src/components/messages/UserToolResultMessage/src/components/MessageResponse.ts
index cc1c024e1..89ad6892a 100644
--- a/src/components/messages/UserToolResultMessage/src/components/MessageResponse.ts
+++ b/src/components/messages/UserToolResultMessage/src/components/MessageResponse.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type MessageResponse = any;
+export type MessageResponse = any
diff --git a/src/components/messages/UserToolResultMessage/src/components/SentryErrorBoundary.ts b/src/components/messages/UserToolResultMessage/src/components/SentryErrorBoundary.ts
index 6c2e95bfc..821c77dd7 100644
--- a/src/components/messages/UserToolResultMessage/src/components/SentryErrorBoundary.ts
+++ b/src/components/messages/UserToolResultMessage/src/components/SentryErrorBoundary.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type SentryErrorBoundary = any;
+export type SentryErrorBoundary = any
diff --git a/src/components/messages/UserToolResultMessage/utils.tsx b/src/components/messages/UserToolResultMessage/utils.tsx
index 4eeeb8004..c566cb357 100644
--- a/src/components/messages/UserToolResultMessage/utils.tsx
+++ b/src/components/messages/UserToolResultMessage/utils.tsx
@@ -1,7 +1,7 @@
-import type { ToolUseBlockParam } from '@anthropic-ai/sdk/resources/index.mjs'
-import { useMemo } from 'react'
-import { findToolByName, type Tool, type Tools } from '../../../Tool.js'
-import type { buildMessageLookups } from '../../../utils/messages.js'
+import type { ToolUseBlockParam } from '@anthropic-ai/sdk/resources/index.mjs';
+import { useMemo } from 'react';
+import { findToolByName, type Tool, type Tools } from '../../../Tool.js';
+import type { buildMessageLookups } from '../../../utils/messages.js';
 
 export function useGetToolFromMessages(
   toolUseID: string,
@@ -9,14 +9,14 @@ export function useGetToolFromMessages(
   lookups: ReturnType<typeof buildMessageLookups>,
 ): { tool: Tool; toolUse: ToolUseBlockParam } | null {
   return useMemo(() => {
-    const toolUse = lookups.toolUseByToolUseID.get(toolUseID)
+    const toolUse = lookups.toolUseByToolUseID.get(toolUseID);
     if (!toolUse) {
-      return null
+      return null;
     }
-    const tool = findToolByName(tools, toolUse.name)
+    const tool = findToolByName(tools, toolUse.name);
     if (!tool) {
-      return null
+      return null;
     }
-    return { tool, toolUse }
-  }, [toolUseID, lookups, tools])
+    return { tool, toolUse };
+  }, [toolUseID, lookups, tools]);
 }
diff --git a/src/components/messages/nullRenderingAttachments.ts b/src/components/messages/nullRenderingAttachments.ts
index 31709f5fe..b463b1a23 100644
--- a/src/components/messages/nullRenderingAttachments.ts
+++ b/src/components/messages/nullRenderingAttachments.ts
@@ -63,6 +63,8 @@ export function isNullRenderingAttachment(
 ): boolean {
   return (
     msg.type === 'attachment' &&
-    NULL_RENDERING_ATTACHMENT_TYPES.has(msg.attachment!.type as Attachment['type'])
+    NULL_RENDERING_ATTACHMENT_TYPES.has(
+      msg.attachment!.type as Attachment['type'],
+    )
   )
 }
diff --git a/src/components/messages/src/commands/extra-usage/index.ts b/src/components/messages/src/commands/extra-usage/index.ts
index 981d9a598..6bcb018f0 100644
--- a/src/components/messages/src/commands/extra-usage/index.ts
+++ b/src/components/messages/src/commands/extra-usage/index.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type extraUsage = any;
+export type extraUsage = any
diff --git a/src/components/messages/src/entrypoints/agentSdkTypes.ts b/src/components/messages/src/entrypoints/agentSdkTypes.ts
index 2ad98a3ad..0d880a5cf 100644
--- a/src/components/messages/src/entrypoints/agentSdkTypes.ts
+++ b/src/components/messages/src/entrypoints/agentSdkTypes.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type HookEvent = any;
+export type HookEvent = any
diff --git a/src/components/messages/src/hooks/useTerminalSize.ts b/src/components/messages/src/hooks/useTerminalSize.ts
index 4a0ef3ea3..fdaf2e999 100644
--- a/src/components/messages/src/hooks/useTerminalSize.ts
+++ b/src/components/messages/src/hooks/useTerminalSize.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useTerminalSize = any;
+export type useTerminalSize = any
diff --git a/src/components/messages/src/ink.ts b/src/components/messages/src/ink.ts
index 51d6eb4b7..7371bcca6 100644
--- a/src/components/messages/src/ink.ts
+++ b/src/components/messages/src/ink.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type Box = any;
-export type Text = any;
+export type Box = any
+export type Text = any
diff --git a/src/components/messages/src/services/api/errorUtils.ts b/src/components/messages/src/services/api/errorUtils.ts
index b931a01ac..716d87177 100644
--- a/src/components/messages/src/services/api/errorUtils.ts
+++ b/src/components/messages/src/services/api/errorUtils.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type formatAPIError = any;
+export type formatAPIError = any
diff --git a/src/components/messages/src/services/claudeAiLimitsHook.ts b/src/components/messages/src/services/claudeAiLimitsHook.ts
index 617852958..162891d0a 100644
--- a/src/components/messages/src/services/claudeAiLimitsHook.ts
+++ b/src/components/messages/src/services/claudeAiLimitsHook.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useClaudeAiLimits = any;
+export type useClaudeAiLimits = any
diff --git a/src/components/messages/src/services/compact/compact.ts b/src/components/messages/src/services/compact/compact.ts
index 628b299f4..6f05abdb5 100644
--- a/src/components/messages/src/services/compact/compact.ts
+++ b/src/components/messages/src/services/compact/compact.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type ERROR_MESSAGE_USER_ABORT = any;
+export type ERROR_MESSAGE_USER_ABORT = any
diff --git a/src/components/messages/src/services/rateLimitMessages.ts b/src/components/messages/src/services/rateLimitMessages.ts
index 3bad4ecc1..9f2222768 100644
--- a/src/components/messages/src/services/rateLimitMessages.ts
+++ b/src/components/messages/src/services/rateLimitMessages.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type isRateLimitErrorMessage = any;
+export type isRateLimitErrorMessage = any
diff --git a/src/components/messages/src/services/rateLimitMocking.ts b/src/components/messages/src/services/rateLimitMocking.ts
index dcb1004a0..063f78c26 100644
--- a/src/components/messages/src/services/rateLimitMocking.ts
+++ b/src/components/messages/src/services/rateLimitMocking.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type shouldProcessMockLimits = any;
+export type shouldProcessMockLimits = any
diff --git a/src/components/messages/src/types/message.ts b/src/components/messages/src/types/message.ts
index 0e8a93593..fe4a8d239 100644
--- a/src/components/messages/src/types/message.ts
+++ b/src/components/messages/src/types/message.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type SystemAPIErrorMessage = any;
+export type SystemAPIErrorMessage = any
diff --git a/src/components/messages/src/utils/attachments.ts b/src/components/messages/src/utils/attachments.ts
index 69d3ceac5..52714a0e6 100644
--- a/src/components/messages/src/utils/attachments.ts
+++ b/src/components/messages/src/utils/attachments.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type Attachment = any;
+export type Attachment = any
diff --git a/src/components/messages/src/utils/auth.ts b/src/components/messages/src/utils/auth.ts
index 4a25a2f83..bd7582a9e 100644
--- a/src/components/messages/src/utils/auth.ts
+++ b/src/components/messages/src/utils/auth.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type getRateLimitTier = any;
-export type getSubscriptionType = any;
-export type isClaudeAISubscriber = any;
+export type getRateLimitTier = any
+export type getSubscriptionType = any
+export type isClaudeAISubscriber = any
diff --git a/src/components/messages/src/utils/billing.ts b/src/components/messages/src/utils/billing.ts
index fd3cae2d7..de39042b1 100644
--- a/src/components/messages/src/utils/billing.ts
+++ b/src/components/messages/src/utils/billing.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type hasClaudeAiBillingAccess = any;
+export type hasClaudeAiBillingAccess = any
diff --git a/src/components/messages/src/utils/file.ts b/src/components/messages/src/utils/file.ts
index 74475b437..86769d40f 100644
--- a/src/components/messages/src/utils/file.ts
+++ b/src/components/messages/src/utils/file.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getDisplayPath = any;
+export type getDisplayPath = any
diff --git a/src/components/messages/src/utils/format.ts b/src/components/messages/src/utils/format.ts
index 0fcc3e5ee..b13a3d1c7 100644
--- a/src/components/messages/src/utils/format.ts
+++ b/src/components/messages/src/utils/format.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type formatFileSize = any;
+export type formatFileSize = any
diff --git a/src/components/messages/src/utils/messages.ts b/src/components/messages/src/utils/messages.ts
index f552071d2..6f917b58f 100644
--- a/src/components/messages/src/utils/messages.ts
+++ b/src/components/messages/src/utils/messages.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type buildMessageLookups = any;
-export type getContentText = any;
+export type buildMessageLookups = any
+export type getContentText = any
diff --git a/src/components/messages/src/utils/theme.ts b/src/components/messages/src/utils/theme.ts
index 6c2dc45a6..849f6973b 100644
--- a/src/components/messages/src/utils/theme.ts
+++ b/src/components/messages/src/utils/theme.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type ThemeName = any;
-export type Theme = any;
+export type ThemeName = any
+export type Theme = any
diff --git a/src/components/messages/teamMemCollapsed.tsx b/src/components/messages/teamMemCollapsed.tsx
index eaa9219ab..adfb3c385 100644
--- a/src/components/messages/teamMemCollapsed.tsx
+++ b/src/components/messages/teamMemCollapsed.tsx
@@ -1,6 +1,6 @@
-import React from 'react'
-import { Text } from '@anthropic/ink'
-import type { CollapsedReadSearchGroup } from '../../types/message.js'
+import React from 'react';
+import { Text } from '@anthropic/ink';
+import type { CollapsedReadSearchGroup } from '../../types/message.js';
 
 /**
  * Plain function (not a React component) so the React Compiler won't
@@ -12,7 +12,7 @@ export function checkHasTeamMemOps(message: CollapsedReadSearchGroup): boolean {
     (message.teamMemorySearchCount ?? 0) > 0 ||
     (message.teamMemoryReadCount ?? 0) > 0 ||
     (message.teamMemoryWriteCount ?? 0) > 0
-  )
+  );
 }
 
 /**
@@ -25,74 +25,54 @@ export function TeamMemCountParts({
   isActiveGroup,
   hasPrecedingParts,
 }: {
-  message: CollapsedReadSearchGroup
-  isActiveGroup: boolean | undefined
-  hasPrecedingParts: boolean
+  message: CollapsedReadSearchGroup;
+  isActiveGroup: boolean | undefined;
+  hasPrecedingParts: boolean;
 }): React.ReactNode {
-  const tmReadCount = message.teamMemoryReadCount ?? 0
-  const tmSearchCount = message.teamMemorySearchCount ?? 0
-  const tmWriteCount = message.teamMemoryWriteCount ?? 0
+  const tmReadCount = message.teamMemoryReadCount ?? 0;
+  const tmSearchCount = message.teamMemorySearchCount ?? 0;
+  const tmWriteCount = message.teamMemoryWriteCount ?? 0;
 
   if (tmReadCount === 0 && tmSearchCount === 0 && tmWriteCount === 0) {
-    return null
+    return null;
   }
 
-  const nodes: React.ReactNode[] = []
-  let count = hasPrecedingParts ? 1 : 0
+  const nodes: React.ReactNode[] = [];
+  let count = hasPrecedingParts ? 1 : 0;
 
   if (tmReadCount > 0) {
-    const verb = isActiveGroup
-      ? count === 0
-        ? 'Recalling'
-        : 'recalling'
-      : count === 0
-        ? 'Recalled'
-        : 'recalled'
+    const verb = isActiveGroup ? (count === 0 ? 'Recalling' : 'recalling') : count === 0 ? 'Recalled' : 'recalled';
     if (count > 0) {
-      nodes.push(<Text key="comma-tmr">, </Text>)
+      nodes.push(<Text key="comma-tmr">, </Text>);
     }
     nodes.push(
       <Text key="team-mem-read">
-        {verb} <Text bold>{tmReadCount}</Text> team{' '}
-        {tmReadCount === 1 ? 'memory' : 'memories'}
+        {verb} <Text bold>{tmReadCount}</Text> team {tmReadCount === 1 ? 'memory' : 'memories'}
       </Text>,
-    )
-    count++
+    );
+    count++;
   }
 
   if (tmSearchCount > 0) {
-    const verb = isActiveGroup
-      ? count === 0
-        ? 'Searching'
-        : 'searching'
-      : count === 0
-        ? 'Searched'
-        : 'searched'
+    const verb = isActiveGroup ? (count === 0 ? 'Searching' : 'searching') : count === 0 ? 'Searched' : 'searched';
     if (count > 0) {
-      nodes.push(<Text key="comma-tms">, </Text>)
+      nodes.push(<Text key="comma-tms">, </Text>);
     }
-    nodes.push(<Text key="team-mem-search">{`${verb} team memories`}</Text>)
-    count++
+    nodes.push(<Text key="team-mem-search">{`${verb} team memories`}</Text>);
+    count++;
   }
 
   if (tmWriteCount > 0) {
-    const verb = isActiveGroup
-      ? count === 0
-        ? 'Writing'
-        : 'writing'
-      : count === 0
-        ? 'Wrote'
-        : 'wrote'
+    const verb = isActiveGroup ? (count === 0 ? 'Writing' : 'writing') : count === 0 ? 'Wrote' : 'wrote';
     if (count > 0) {
-      nodes.push(<Text key="comma-tmw">, </Text>)
+      nodes.push(<Text key="comma-tmw">, </Text>);
     }
     nodes.push(
       <Text key="team-mem-write">
-        {verb} <Text bold>{tmWriteCount}</Text> team{' '}
-        {tmWriteCount === 1 ? 'memory' : 'memories'}
+        {verb} <Text bold>{tmWriteCount}</Text> team {tmWriteCount === 1 ? 'memory' : 'memories'}
       </Text>,
-    )
+    );
   }
 
-  return <>{nodes}</>
+  return <>{nodes}</>;
 }
diff --git a/src/components/permissions/AskUserQuestionPermissionRequest/AskUserQuestionPermissionRequest.tsx b/src/components/permissions/AskUserQuestionPermissionRequest/AskUserQuestionPermissionRequest.tsx
index c19bce214..f366a2a8a 100644
--- a/src/components/permissions/AskUserQuestionPermissionRequest/AskUserQuestionPermissionRequest.tsx
+++ b/src/components/permissions/AskUserQuestionPermissionRequest/AskUserQuestionPermissionRequest.tsx
@@ -1,73 +1,50 @@
-import type {
-  Base64ImageSource,
-  ImageBlockParam,
-} from '@anthropic-ai/sdk/resources/messages.mjs'
-import React, {
-  Suspense,
-  use,
-  useCallback,
-  useMemo,
-  useRef,
-  useState,
-} from 'react'
-import { useSettings } from '../../../hooks/useSettings.js'
-import { useTerminalSize } from '../../../hooks/useTerminalSize.js'
-import { stringWidth, useTheme } from '@anthropic/ink'
-import { useKeybindings } from '../../../keybindings/useKeybinding.js'
+import type { Base64ImageSource, ImageBlockParam } from '@anthropic-ai/sdk/resources/messages.mjs';
+import React, { Suspense, use, useCallback, useMemo, useRef, useState } from 'react';
+import { useSettings } from '../../../hooks/useSettings.js';
+import { useTerminalSize } from '../../../hooks/useTerminalSize.js';
+import { stringWidth, useTheme } from '@anthropic/ink';
+import { useKeybindings } from '../../../keybindings/useKeybinding.js';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from '../../../services/analytics/index.js'
-import { useAppState } from '../../../state/AppState.js'
-import type { Question } from '@claude-code-best/builtin-tools/tools/AskUserQuestionTool/AskUserQuestionTool.js'
-import { AskUserQuestionTool } from '@claude-code-best/builtin-tools/tools/AskUserQuestionTool/AskUserQuestionTool.js'
-import {
-  type CliHighlight,
-  getCliHighlightPromise,
-} from '../../../utils/cliHighlight.js'
-import type { PastedContent } from '../../../utils/config.js'
-import type { ImageDimensions } from '../../../utils/imageResizer.js'
-import { maybeResizeAndDownsampleImageBlock } from '../../../utils/imageResizer.js'
-import { cacheImagePath, storeImage } from '../../../utils/imageStore.js'
-import { logError } from '../../../utils/log.js'
-import { applyMarkdown } from '../../../utils/markdown.js'
-import { isPlanModeInterviewPhaseEnabled } from '../../../utils/planModeV2.js'
-import { getPlanFilePath } from '../../../utils/plans.js'
-import type { PermissionRequestProps } from '../PermissionRequest.js'
-import { QuestionView } from './QuestionView.js'
-import { SubmitQuestionsView } from './SubmitQuestionsView.js'
-import { useMultipleChoiceState } from './use-multiple-choice-state.js'
+} from '../../../services/analytics/index.js';
+import { useAppState } from '../../../state/AppState.js';
+import type { Question } from '@claude-code-best/builtin-tools/tools/AskUserQuestionTool/AskUserQuestionTool.js';
+import { AskUserQuestionTool } from '@claude-code-best/builtin-tools/tools/AskUserQuestionTool/AskUserQuestionTool.js';
+import { type CliHighlight, getCliHighlightPromise } from '../../../utils/cliHighlight.js';
+import type { PastedContent } from '../../../utils/config.js';
+import type { ImageDimensions } from '../../../utils/imageResizer.js';
+import { maybeResizeAndDownsampleImageBlock } from '../../../utils/imageResizer.js';
+import { cacheImagePath, storeImage } from '../../../utils/imageStore.js';
+import { logError } from '../../../utils/log.js';
+import { applyMarkdown } from '../../../utils/markdown.js';
+import { isPlanModeInterviewPhaseEnabled } from '../../../utils/planModeV2.js';
+import { getPlanFilePath } from '../../../utils/plans.js';
+import type { PermissionRequestProps } from '../PermissionRequest.js';
+import { QuestionView } from './QuestionView.js';
+import { SubmitQuestionsView } from './SubmitQuestionsView.js';
+import { useMultipleChoiceState } from './use-multiple-choice-state.js';
 
-const MIN_CONTENT_HEIGHT = 12
-const MIN_CONTENT_WIDTH = 40
+const MIN_CONTENT_HEIGHT = 12;
+const MIN_CONTENT_WIDTH = 40;
 // Lines used by chrome around the content area (nav bar, title, footer, help text, etc.)
-const CONTENT_CHROME_OVERHEAD = 15
+const CONTENT_CHROME_OVERHEAD = 15;
 
-export function AskUserQuestionPermissionRequest(
-  props: PermissionRequestProps,
-): React.ReactNode {
-  const settings = useSettings()
+export function AskUserQuestionPermissionRequest(props: PermissionRequestProps): React.ReactNode {
+  const settings = useSettings();
   if (settings.syntaxHighlightingDisabled) {
-    return <AskUserQuestionPermissionRequestBody {...props} highlight={null} />
+    return <AskUserQuestionPermissionRequestBody {...props} highlight={null} />;
   }
   return (
-    <Suspense
-      fallback={
-        <AskUserQuestionPermissionRequestBody {...props} highlight={null} />
-      }
-    >
+    <Suspense fallback={<AskUserQuestionPermissionRequestBody {...props} highlight={null} />}>
       <AskUserQuestionWithHighlight {...props} />
     </Suspense>
-  )
+  );
 }
 
-function AskUserQuestionWithHighlight(
-  props: PermissionRequestProps,
-): React.ReactNode {
-  const highlight = use(getCliHighlightPromise())
-  return (
-    <AskUserQuestionPermissionRequestBody {...props} highlight={highlight} />
-  )
+function AskUserQuestionWithHighlight(props: PermissionRequestProps): React.ReactNode {
+  const highlight = use(getCliHighlightPromise());
+  return <AskUserQuestionPermissionRequestBody {...props} highlight={highlight} />;
 }
 
 function AskUserQuestionPermissionRequestBody({
@@ -76,7 +53,7 @@ function AskUserQuestionPermissionRequestBody({
   onReject,
   highlight,
 }: PermissionRequestProps & {
-  highlight: CliHighlight | null
+  highlight: CliHighlight | null;
 }): React.ReactNode {
   // Memoize parse result: safeParse returns a new object (and new `questions`
   // array) on every call. Without this, the render-body ref writes below make
@@ -85,103 +62,81 @@ function AskUserQuestionPermissionRequestBody({
   // useMemo (which runs applyMarkdown over every preview) never hits its cache.
   // `toolUseConfirm.input` is stable for the dialog's lifetime (this tool
   // returns `behavior: 'ask'` directly and never goes through the classifier).
-  const result = useMemo(
-    () => AskUserQuestionTool.inputSchema.safeParse(toolUseConfirm.input),
-    [toolUseConfirm.input],
-  )
-  const questions = result.success ? result.data.questions || [] : []
-  const { rows: terminalRows } = useTerminalSize()
-  const [theme] = useTheme()
+  const result = useMemo(() => AskUserQuestionTool.inputSchema.safeParse(toolUseConfirm.input), [toolUseConfirm.input]);
+  const questions = result.success ? result.data.questions || [] : [];
+  const { rows: terminalRows } = useTerminalSize();
+  const [theme] = useTheme();
 
   // Calculate consistent content dimensions across all questions to prevent layout shifts.
   // globalContentHeight represents the total height of the content area below the nav/title,
   // INCLUDING footer and help text, so all views (questions, previews, submit) match.
   const { globalContentHeight, globalContentWidth } = useMemo(() => {
-    let maxHeight = 0
-    let maxWidth = 0
+    let maxHeight = 0;
+    let maxWidth = 0;
 
     // Footer (divider + "Chat about this" + optional plan) + help text ≈ 7 lines
-    const FOOTER_HELP_LINES = 7
+    const FOOTER_HELP_LINES = 7;
 
     // Cap at terminal height minus chrome overhead, but ensure at least MIN_CONTENT_HEIGHT
-    const maxAllowedHeight = Math.max(
-      MIN_CONTENT_HEIGHT,
-      terminalRows - CONTENT_CHROME_OVERHEAD,
-    )
+    const maxAllowedHeight = Math.max(MIN_CONTENT_HEIGHT, terminalRows - CONTENT_CHROME_OVERHEAD);
 
     // PREVIEW_OVERHEAD matches the constant in PreviewQuestionView.tsx — lines
     // used by non-preview elements within the content area (margins, borders,
     // notes, footer, help text). Used here to cap preview content so that
     // globalContentHeight reflects the *truncated* height, not the raw height.
-    const PREVIEW_OVERHEAD = 11
+    const PREVIEW_OVERHEAD = 11;
 
     for (const q of questions) {
-      const hasPreview = q.options.some(opt => opt.preview)
+      const hasPreview = q.options.some(opt => opt.preview);
 
       if (hasPreview) {
         // Compute the max preview content lines that would actually display
         // after truncation, matching the logic in PreviewQuestionView.
-        const maxPreviewContentLines = Math.max(
-          1,
-          maxAllowedHeight - PREVIEW_OVERHEAD,
-        )
+        const maxPreviewContentLines = Math.max(1, maxAllowedHeight - PREVIEW_OVERHEAD);
 
         // For preview questions, total = side-by-side height + footer/help
         // Side-by-side = max(left panel, right panel)
         // Right panel = preview box (content + borders + truncation indicator) + notes
-        let maxPreviewBoxHeight = 0
+        let maxPreviewBoxHeight = 0;
         for (const opt of q.options) {
           if (opt.preview) {
             // Measure the *rendered* markdown (same transform as PreviewBox) so
             // that line counts and widths match what will actually be displayed.
             // applyMarkdown removes code fence markers, bold/italic syntax, etc.
-            const rendered = applyMarkdown(opt.preview, theme, highlight)
-            const previewLines = rendered.split('\n')
-            const isTruncated = previewLines.length > maxPreviewContentLines
-            const displayedLines = isTruncated
-              ? maxPreviewContentLines
-              : previewLines.length
+            const rendered = applyMarkdown(opt.preview, theme, highlight);
+            const previewLines = rendered.split('\n');
+            const isTruncated = previewLines.length > maxPreviewContentLines;
+            const displayedLines = isTruncated ? maxPreviewContentLines : previewLines.length;
             // Preview box: displayed content + truncation indicator + 2 borders
-            maxPreviewBoxHeight = Math.max(
-              maxPreviewBoxHeight,
-              displayedLines + (isTruncated ? 1 : 0) + 2,
-            )
+            maxPreviewBoxHeight = Math.max(maxPreviewBoxHeight, displayedLines + (isTruncated ? 1 : 0) + 2);
             for (const line of previewLines) {
-              maxWidth = Math.max(maxWidth, stringWidth(line))
+              maxWidth = Math.max(maxWidth, stringWidth(line));
             }
           }
         }
         // Right panel: preview box + notes (2 lines with margin)
-        const rightPanelHeight = maxPreviewBoxHeight + 2
+        const rightPanelHeight = maxPreviewBoxHeight + 2;
         // Left panel: options + description
-        const leftPanelHeight = q.options.length + 2
-        const sideByHeight = Math.max(leftPanelHeight, rightPanelHeight)
-        maxHeight = Math.max(maxHeight, sideByHeight + FOOTER_HELP_LINES)
+        const leftPanelHeight = q.options.length + 2;
+        const sideByHeight = Math.max(leftPanelHeight, rightPanelHeight);
+        maxHeight = Math.max(maxHeight, sideByHeight + FOOTER_HELP_LINES);
       } else {
         // For regular questions: options + "Other" + footer/help
-        maxHeight = Math.max(
-          maxHeight,
-          q.options.length + 3 + FOOTER_HELP_LINES,
-        )
+        maxHeight = Math.max(maxHeight, q.options.length + 3 + FOOTER_HELP_LINES);
       }
     }
 
     return {
-      globalContentHeight: Math.min(
-        Math.max(maxHeight, MIN_CONTENT_HEIGHT),
-        maxAllowedHeight,
-      ),
+      globalContentHeight: Math.min(Math.max(maxHeight, MIN_CONTENT_HEIGHT), maxAllowedHeight),
       globalContentWidth: Math.max(maxWidth, MIN_CONTENT_WIDTH),
-    }
-  }, [questions, terminalRows, theme, highlight])
-  const metadataSource = result.success
-    ? result.data.metadata?.source
-    : undefined
+    };
+  }, [questions, terminalRows, theme, highlight]);
+  const metadataSource = result.success ? result.data.metadata?.source : undefined;
 
   const [pastedContentsByQuestion, setPastedContentsByQuestion] = useState<
     Record<string, Record<number, PastedContent>>
-  >({})
-  const nextPasteIdRef = useRef(0)
+  >({});
+  const nextPasteIdRef = useRef(0);
 
   function onImagePaste(
     questionText: string,
@@ -191,7 +146,7 @@ function AskUserQuestionPermissionRequestBody({
     dimensions?: ImageDimensions,
     _sourcePath?: string,
   ) {
-    const pasteId = nextPasteIdRef.current++
+    const pasteId = nextPasteIdRef.current++;
     const newContent: PastedContent = {
       id: pasteId,
       type: 'image',
@@ -199,34 +154,32 @@ function AskUserQuestionPermissionRequestBody({
       mediaType: mediaType || 'image/png',
       filename: filename || 'Pasted image',
       dimensions,
-    }
-    cacheImagePath(newContent)
-    void storeImage(newContent)
+    };
+    cacheImagePath(newContent);
+    void storeImage(newContent);
     setPastedContentsByQuestion(prev => ({
       ...prev,
       [questionText]: { ...(prev[questionText] ?? {}), [pasteId]: newContent },
-    }))
+    }));
   }
 
   const onRemoveImage = useCallback((questionText: string, id: number) => {
     setPastedContentsByQuestion(prev => {
-      const questionContents = { ...(prev[questionText] ?? {}) }
-      delete questionContents[id]
-      return { ...prev, [questionText]: questionContents }
-    })
-  }, [])
+      const questionContents = { ...(prev[questionText] ?? {}) };
+      delete questionContents[id];
+      return { ...prev, [questionText]: questionContents };
+    });
+  }, []);
 
   const allImageAttachments = Object.values(pastedContentsByQuestion)
     .flatMap(contents => Object.values(contents))
-    .filter(c => c.type === 'image')
+    .filter(c => c.type === 'image');
 
-  const toolPermissionContextMode = useAppState(
-    s => s.toolPermissionContext.mode,
-  )
-  const isInPlanMode = toolPermissionContextMode === 'plan'
-  const planFilePath = isInPlanMode ? getPlanFilePath() : undefined
+  const toolPermissionContextMode = useAppState(s => s.toolPermissionContext.mode);
+  const isInPlanMode = toolPermissionContextMode === 'plan';
+  const planFilePath = isInPlanMode ? getPlanFilePath() : undefined;
 
-  const state = useMultipleChoiceState()
+  const state = useMultipleChoiceState();
   const {
     currentQuestionIndex,
     answers,
@@ -237,165 +190,120 @@ function AskUserQuestionPermissionRequestBody({
     updateQuestionState,
     setAnswer,
     setTextInputMode,
-  } = state
+  } = state;
 
-  const currentQuestion =
-    currentQuestionIndex < (questions?.length || 0)
-      ? questions?.[currentQuestionIndex]
-      : null
+  const currentQuestion = currentQuestionIndex < (questions?.length || 0) ? questions?.[currentQuestionIndex] : null;
 
-  const isInSubmitView = currentQuestionIndex === (questions?.length || 0)
-  const allQuestionsAnswered =
-    questions?.every((q: Question) => q?.question && !!answers[q.question]) ??
-    false
+  const isInSubmitView = currentQuestionIndex === (questions?.length || 0);
+  const allQuestionsAnswered = questions?.every((q: Question) => q?.question && !!answers[q.question]) ?? false;
 
   // Hide submit tab when there's only one question and it's single-select (auto-submit scenario)
-  const hideSubmitTab = questions.length === 1 && !questions[0]?.multiSelect
+  const hideSubmitTab = questions.length === 1 && !questions[0]?.multiSelect;
 
   const handleCancel = useCallback(() => {
     // Log rejection with metadata source if present
     if (metadataSource) {
       logEvent('tengu_ask_user_question_rejected', {
-        source:
-          metadataSource as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        source: metadataSource as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
         questionCount: questions.length,
         isInPlanMode,
-        interviewPhaseEnabled:
-          isInPlanMode && isPlanModeInterviewPhaseEnabled(),
-      })
+        interviewPhaseEnabled: isInPlanMode && isPlanModeInterviewPhaseEnabled(),
+      });
     }
-    onDone()
-    onReject()
-    toolUseConfirm.onReject()
-  }, [
-    onDone,
-    onReject,
-    toolUseConfirm,
-    metadataSource,
-    questions.length,
-    isInPlanMode,
-  ])
+    onDone();
+    onReject();
+    toolUseConfirm.onReject();
+  }, [onDone, onReject, toolUseConfirm, metadataSource, questions.length, isInPlanMode]);
 
   const handleRespondToClaude = useCallback(async () => {
     const questionsWithAnswers = questions
       .map((q: Question) => {
-        const answer = answers[q.question]
+        const answer = answers[q.question];
         if (answer) {
-          return `- "${q.question}"\n  Answer: ${answer}`
+          return `- "${q.question}"\n  Answer: ${answer}`;
         }
-        return `- "${q.question}"\n  (No answer provided)`
+        return `- "${q.question}"\n  (No answer provided)`;
       })
-      .join('\n')
+      .join('\n');
 
     const feedback = `The user wants to clarify these questions.
     This means they may have additional information, context or questions for you.
     Take their response into account and then reformulate the questions if appropriate.
     Start by asking them what they would like to clarify.
 
-    Questions asked:\n${questionsWithAnswers}`
+    Questions asked:\n${questionsWithAnswers}`;
 
     if (metadataSource) {
       logEvent('tengu_ask_user_question_respond_to_claude', {
-        source:
-          metadataSource as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        source: metadataSource as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
         questionCount: questions.length,
         isInPlanMode,
-        interviewPhaseEnabled:
-          isInPlanMode && isPlanModeInterviewPhaseEnabled(),
-      })
+        interviewPhaseEnabled: isInPlanMode && isPlanModeInterviewPhaseEnabled(),
+      });
     }
 
-    const imageBlocks = await convertImagesToBlocks(allImageAttachments)
+    const imageBlocks = await convertImagesToBlocks(allImageAttachments);
 
-    onDone()
-    toolUseConfirm.onReject(
-      feedback,
-      imageBlocks && imageBlocks.length > 0 ? imageBlocks : undefined,
-    )
-  }, [
-    questions,
-    answers,
-    onDone,
-    toolUseConfirm,
-    metadataSource,
-    isInPlanMode,
-    allImageAttachments,
-  ])
+    onDone();
+    toolUseConfirm.onReject(feedback, imageBlocks && imageBlocks.length > 0 ? imageBlocks : undefined);
+  }, [questions, answers, onDone, toolUseConfirm, metadataSource, isInPlanMode, allImageAttachments]);
 
   const handleFinishPlanInterview = useCallback(async () => {
     const questionsWithAnswers = questions
       .map((q: Question) => {
-        const answer = answers[q.question]
+        const answer = answers[q.question];
         if (answer) {
-          return `- "${q.question}"\n  Answer: ${answer}`
+          return `- "${q.question}"\n  Answer: ${answer}`;
         }
-        return `- "${q.question}"\n  (No answer provided)`
+        return `- "${q.question}"\n  (No answer provided)`;
       })
-      .join('\n')
+      .join('\n');
 
     const feedback = `The user has indicated they have provided enough answers for the plan interview.
 Stop asking clarifying questions and proceed to finish the plan with the information you have.
 
-Questions asked and answers provided:\n${questionsWithAnswers}`
+Questions asked and answers provided:\n${questionsWithAnswers}`;
 
     if (metadataSource) {
       logEvent('tengu_ask_user_question_finish_plan_interview', {
-        source:
-          metadataSource as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        source: metadataSource as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
         questionCount: questions.length,
         isInPlanMode,
-        interviewPhaseEnabled:
-          isInPlanMode && isPlanModeInterviewPhaseEnabled(),
-      })
+        interviewPhaseEnabled: isInPlanMode && isPlanModeInterviewPhaseEnabled(),
+      });
     }
 
-    const imageBlocks = await convertImagesToBlocks(allImageAttachments)
+    const imageBlocks = await convertImagesToBlocks(allImageAttachments);
 
-    onDone()
-    toolUseConfirm.onReject(
-      feedback,
-      imageBlocks && imageBlocks.length > 0 ? imageBlocks : undefined,
-    )
-  }, [
-    questions,
-    answers,
-    onDone,
-    toolUseConfirm,
-    metadataSource,
-    isInPlanMode,
-    allImageAttachments,
-  ])
+    onDone();
+    toolUseConfirm.onReject(feedback, imageBlocks && imageBlocks.length > 0 ? imageBlocks : undefined);
+  }, [questions, answers, onDone, toolUseConfirm, metadataSource, isInPlanMode, allImageAttachments]);
 
   const submitAnswers = useCallback(
     async (answersToSubmit: Record<string, string>) => {
       // Log acceptance with metadata source if present
       if (metadataSource) {
         logEvent('tengu_ask_user_question_accepted', {
-          source:
-            metadataSource as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          source: metadataSource as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
           questionCount: questions.length,
           answerCount: Object.keys(answersToSubmit).length,
           isInPlanMode,
-          interviewPhaseEnabled:
-            isInPlanMode && isPlanModeInterviewPhaseEnabled(),
-        })
+          interviewPhaseEnabled: isInPlanMode && isPlanModeInterviewPhaseEnabled(),
+        });
       }
       // Build annotations from questionStates (e.g., selected preview, user notes)
-      const annotations: Record<string, { preview?: string; notes?: string }> =
-        {}
+      const annotations: Record<string, { preview?: string; notes?: string }> = {};
       for (const q of questions) {
-        const answer = answersToSubmit[q.question]
-        const notes = questionStates[q.question]?.textInputValue
+        const answer = answersToSubmit[q.question];
+        const notes = questionStates[q.question]?.textInputValue;
         // Find the selected option's preview content
-        const selectedOption = answer
-          ? q.options.find(opt => opt.label === answer)
-          : undefined
-        const preview = selectedOption?.preview
+        const selectedOption = answer ? q.options.find(opt => opt.label === answer) : undefined;
+        const preview = selectedOption?.preview;
         if (preview || notes?.trim()) {
           annotations[q.question] = {
             ...(preview && { preview }),
             ...(notes?.trim() && { notes: notes.trim() }),
-          }
+          };
         }
       }
 
@@ -403,110 +311,86 @@ Questions asked and answers provided:\n${questionsWithAnswers}`
         ...toolUseConfirm.input,
         answers: answersToSubmit,
         ...(Object.keys(annotations).length > 0 && { annotations }),
-      }
+      };
 
-      const contentBlocks = await convertImagesToBlocks(allImageAttachments)
+      const contentBlocks = await convertImagesToBlocks(allImageAttachments);
 
-      onDone()
+      onDone();
       toolUseConfirm.onAllow(
         updatedInput,
         [],
         undefined,
         contentBlocks && contentBlocks.length > 0 ? contentBlocks : undefined,
-      )
+      );
     },
-    [
-      toolUseConfirm,
-      onDone,
-      metadataSource,
-      questions,
-      questionStates,
-      isInPlanMode,
-      allImageAttachments,
-    ],
-  )
+    [toolUseConfirm, onDone, metadataSource, questions, questionStates, isInPlanMode, allImageAttachments],
+  );
 
   const handleQuestionAnswer = useCallback(
-    (
-      questionText: string,
-      label: string | string[],
-      textInput?: string,
-      shouldAdvance: boolean = true,
-    ) => {
-      let answer: string
-      const isMultiSelect = Array.isArray(label)
+    (questionText: string, label: string | string[], textInput?: string, shouldAdvance: boolean = true) => {
+      let answer: string;
+      const isMultiSelect = Array.isArray(label);
       if (isMultiSelect) {
-        answer = label.join(', ')
+        answer = label.join(', ');
       } else {
         if (textInput) {
-          const questionImages = Object.values(
-            pastedContentsByQuestion[questionText] ?? {},
-          ).filter(c => c.type === 'image')
-          answer =
-            questionImages.length > 0
-              ? `${textInput} (Image attached)`
-              : textInput
+          const questionImages = Object.values(pastedContentsByQuestion[questionText] ?? {}).filter(
+            c => c.type === 'image',
+          );
+          answer = questionImages.length > 0 ? `${textInput} (Image attached)` : textInput;
         } else if (label === '__other__') {
           // Image-only submission — check if this question has images
-          const questionImages = Object.values(
-            pastedContentsByQuestion[questionText] ?? {},
-          ).filter(c => c.type === 'image')
-          answer = questionImages.length > 0 ? '(Image attached)' : label
+          const questionImages = Object.values(pastedContentsByQuestion[questionText] ?? {}).filter(
+            c => c.type === 'image',
+          );
+          answer = questionImages.length > 0 ? '(Image attached)' : label;
         } else {
-          answer = label
+          answer = label;
         }
       }
 
       // For single-select with only one question, auto-submit instead of showing review screen
-      const isSingleQuestion = questions.length === 1
+      const isSingleQuestion = questions.length === 1;
       if (!isMultiSelect && isSingleQuestion && shouldAdvance) {
         const updatedAnswers = {
           ...answers,
           [questionText]: answer,
-        }
-        void submitAnswers(updatedAnswers).catch(logError)
-        return
+        };
+        void submitAnswers(updatedAnswers).catch(logError);
+        return;
       }
 
-      setAnswer(questionText, answer, shouldAdvance)
+      setAnswer(questionText, answer, shouldAdvance);
     },
-    [
-      setAnswer,
-      questions.length,
-      answers,
-      submitAnswers,
-      pastedContentsByQuestion,
-    ],
-  )
+    [setAnswer, questions.length, answers, submitAnswers, pastedContentsByQuestion],
+  );
 
   function handleFinalResponse(value: 'submit' | 'cancel'): void {
     if (value === 'cancel') {
-      handleCancel()
-      return
+      handleCancel();
+      return;
     }
 
     if (value === 'submit') {
-      void submitAnswers(answers).catch(logError)
+      void submitAnswers(answers).catch(logError);
     }
   }
 
   // When submit tab is hidden, don't allow navigating past the last question
-  const maxIndex = hideSubmitTab
-    ? (questions?.length || 1) - 1
-    : questions?.length || 0
+  const maxIndex = hideSubmitTab ? (questions?.length || 1) - 1 : questions?.length || 0;
 
   // Bounded navigation callbacks for question tabs
   const handleTabPrev = useCallback(() => {
     if (currentQuestionIndex > 0) {
-      prevQuestion()
+      prevQuestion();
     }
-  }, [currentQuestionIndex, prevQuestion])
+  }, [currentQuestionIndex, prevQuestion]);
 
   const handleTabNext = useCallback(() => {
     if (currentQuestionIndex < maxIndex) {
-      nextQuestion()
+      nextQuestion();
     }
-  }, [currentQuestionIndex, maxIndex, nextQuestion])
+  }, [currentQuestionIndex, maxIndex, nextQuestion]);
 
   // Use keybindings system for question navigation (left/right arrows, tab/shift+tab)
   // Raw useInput doesn't work because the keybinding system resolves left/right arrows
@@ -519,7 +403,7 @@ Questions asked and answers provided:\n${questionsWithAnswers}`
       'tabs:next': handleTabNext,
     },
     { context: 'Tabs', isActive: !(isInTextInput && !isInSubmitView) },
-  )
+  );
 
   if (currentQuestion) {
     return (
@@ -544,22 +428,13 @@ Questions asked and answers provided:\n${questionsWithAnswers}`
           onRespondToClaude={handleRespondToClaude}
           onFinishPlanInterview={handleFinishPlanInterview}
           onImagePaste={(base64, mediaType, filename, dims, path) =>
-            onImagePaste(
-              currentQuestion.question,
-              base64,
-              mediaType,
-              filename,
-              dims,
-              path,
-            )
-          }
-          pastedContents={
-            pastedContentsByQuestion[currentQuestion.question] ?? {}
+            onImagePaste(currentQuestion.question, base64, mediaType, filename, dims, path)
           }
+          pastedContents={pastedContentsByQuestion[currentQuestion.question] ?? {}}
           onRemoveImage={id => onRemoveImage(currentQuestion.question, id)}
         />
       </>
-    )
+    );
   }
 
   if (isInSubmitView) {
@@ -575,30 +450,27 @@ Questions asked and answers provided:\n${questionsWithAnswers}`
           onFinalResponse={handleFinalResponse}
         />
       </>
-    )
+    );
   }
 
   // This should never be reached
-  return null
+  return null;
 }
 
-async function convertImagesToBlocks(
-  images: PastedContent[],
-): Promise<ImageBlockParam[] | undefined> {
-  if (images.length === 0) return undefined
+async function convertImagesToBlocks(images: PastedContent[]): Promise<ImageBlockParam[] | undefined> {
+  if (images.length === 0) return undefined;
   return Promise.all(
     images.map(async img => {
       const block: ImageBlockParam = {
         type: 'image',
         source: {
           type: 'base64',
-          media_type: (img.mediaType ||
-            'image/png') as Base64ImageSource['media_type'],
+          media_type: (img.mediaType || 'image/png') as Base64ImageSource['media_type'],
           data: img.content,
         },
-      }
-      const resized = await maybeResizeAndDownsampleImageBlock(block)
-      return resized.block
+      };
+      const resized = await maybeResizeAndDownsampleImageBlock(block);
+      return resized.block;
     }),
-  )
+  );
 }
diff --git a/src/components/permissions/AskUserQuestionPermissionRequest/PreviewBox.tsx b/src/components/permissions/AskUserQuestionPermissionRequest/PreviewBox.tsx
index 686f2f4c9..1e1b5ce65 100644
--- a/src/components/permissions/AskUserQuestionPermissionRequest/PreviewBox.tsx
+++ b/src/components/permissions/AskUserQuestionPermissionRequest/PreviewBox.tsx
@@ -1,27 +1,24 @@
-import React, { Suspense, use, useMemo } from 'react'
-import { useSettings } from '../../../hooks/useSettings.js'
-import { useTerminalSize } from '../../../hooks/useTerminalSize.js'
-import { Ansi, Box, Text, stringWidth, useTheme } from '@anthropic/ink'
-import {
-  type CliHighlight,
-  getCliHighlightPromise,
-} from '../../../utils/cliHighlight.js'
-import { applyMarkdown } from '../../../utils/markdown.js'
-import sliceAnsi from '../../../utils/sliceAnsi.js'
+import React, { Suspense, use, useMemo } from 'react';
+import { useSettings } from '../../../hooks/useSettings.js';
+import { useTerminalSize } from '../../../hooks/useTerminalSize.js';
+import { Ansi, Box, Text, stringWidth, useTheme } from '@anthropic/ink';
+import { type CliHighlight, getCliHighlightPromise } from '../../../utils/cliHighlight.js';
+import { applyMarkdown } from '../../../utils/markdown.js';
+import sliceAnsi from '../../../utils/sliceAnsi.js';
 
 type PreviewBoxProps = {
   /** The preview content to display. Markdown is rendered with syntax highlighting
    * for code blocks (```ts, ```py, etc.). Also supports plain multi-line text. */
-  content: string
+  content: string;
   /** Maximum number of lines to display before truncating. @default 20 */
-  maxLines?: number
+  maxLines?: number;
   /** Minimum height (in lines) for the preview box. Content will be padded if shorter. */
-  minHeight?: number
+  minHeight?: number;
   /** Minimum width for the preview box. @default 40 */
-  minWidth?: number
+  minWidth?: number;
   /** Maximum width available for this box (e.g., the container width). */
-  maxWidth?: number
-}
+  maxWidth?: number;
+};
 
 const BOX_CHARS = {
   topLeft: '┌',
@@ -32,7 +29,7 @@ const BOX_CHARS = {
   vertical: '│',
   teeLeft: '├',
   teeRight: '┤',
-}
+};
 
 /**
  * A bordered monospace box for displaying preview content.
@@ -40,20 +37,20 @@ const BOX_CHARS = {
  * The parent component should pass maxLines based on its available height budget.
  */
 export function PreviewBox(props: PreviewBoxProps): React.ReactNode {
-  const settings = useSettings()
+  const settings = useSettings();
   if (settings.syntaxHighlightingDisabled) {
-    return <PreviewBoxBody {...props} highlight={null} />
+    return <PreviewBoxBody {...props} highlight={null} />;
   }
   return (
     <Suspense fallback={<PreviewBoxBody {...props} highlight={null} />}>
       <PreviewBoxWithHighlight {...props} />
     </Suspense>
-  )
+  );
 }
 
 function PreviewBoxWithHighlight(props: PreviewBoxProps): React.ReactNode {
-  const highlight = use(getCliHighlightPromise())
-  return <PreviewBoxBody {...props} highlight={highlight} />
+  const highlight = use(getCliHighlightPromise());
+  return <PreviewBoxBody {...props} highlight={highlight} />;
 }
 
 function PreviewBoxBody({
@@ -64,65 +61,51 @@ function PreviewBoxBody({
   maxWidth,
   highlight,
 }: PreviewBoxProps & { highlight: CliHighlight | null }): React.ReactNode {
-  const { columns: terminalWidth } = useTerminalSize()
-  const [theme] = useTheme()
-  const effectiveMaxWidth = maxWidth ?? terminalWidth - 4
+  const { columns: terminalWidth } = useTerminalSize();
+  const [theme] = useTheme();
+  const effectiveMaxWidth = maxWidth ?? terminalWidth - 4;
 
   // Use provided maxLines, or a reasonable default
-  const effectiveMaxLines = maxLines ?? 20
+  const effectiveMaxLines = maxLines ?? 20;
 
   // Render markdown with syntax highlighting for code blocks. applyMarkdown
   // returns an ANSI-styled string (bold, colors, etc.) that we split into
   // lines. stringWidth and sliceAnsi below correctly handle ANSI codes.
-  const rendered = useMemo(
-    () => applyMarkdown(content, theme, highlight),
-    [content, theme, highlight],
-  )
-  const contentLines = rendered.split('\n')
-  const isTruncated = contentLines.length > effectiveMaxLines
+  const rendered = useMemo(() => applyMarkdown(content, theme, highlight), [content, theme, highlight]);
+  const contentLines = rendered.split('\n');
+  const isTruncated = contentLines.length > effectiveMaxLines;
 
   // Truncate to effectiveMaxLines
-  const truncatedLines = isTruncated
-    ? contentLines.slice(0, effectiveMaxLines)
-    : contentLines
+  const truncatedLines = isTruncated ? contentLines.slice(0, effectiveMaxLines) : contentLines;
 
   // Pad content with empty lines if shorter than minHeight, but never exceed
   // the truncation limit — otherwise padding undoes the truncation
-  const effectiveMinHeight = Math.min(minHeight ?? 0, effectiveMaxLines)
-  const paddingNeeded = Math.max(
-    0,
-    effectiveMinHeight - truncatedLines.length - (isTruncated ? 1 : 0),
-  )
-  const lines =
-    paddingNeeded > 0
-      ? [...truncatedLines, ...Array<string>(paddingNeeded).fill('')]
-      : truncatedLines
+  const effectiveMinHeight = Math.min(minHeight ?? 0, effectiveMaxLines);
+  const paddingNeeded = Math.max(0, effectiveMinHeight - truncatedLines.length - (isTruncated ? 1 : 0));
+  const lines = paddingNeeded > 0 ? [...truncatedLines, ...Array<string>(paddingNeeded).fill('')] : truncatedLines;
 
   // Calculate content width (max visual line width, handling unicode/emoji/CJK)
-  const contentWidth = Math.max(
-    minWidth,
-    ...lines.map(line => stringWidth(line)),
-  )
+  const contentWidth = Math.max(minWidth, ...lines.map(line => stringWidth(line)));
   // Add 2 for border padding, cap at the container width to prevent line wrapping
-  const boxWidth = Math.min(contentWidth + 4, effectiveMaxWidth)
-  const innerWidth = boxWidth - 4 // Account for borders and padding
+  const boxWidth = Math.min(contentWidth + 4, effectiveMaxWidth);
+  const innerWidth = boxWidth - 4; // Account for borders and padding
 
   // Render top border
-  const topBorder = `${BOX_CHARS.topLeft}${BOX_CHARS.horizontal.repeat(boxWidth - 2)}${BOX_CHARS.topRight}`
+  const topBorder = `${BOX_CHARS.topLeft}${BOX_CHARS.horizontal.repeat(boxWidth - 2)}${BOX_CHARS.topRight}`;
 
   // Render bottom border
-  const bottomBorder = `${BOX_CHARS.bottomLeft}${BOX_CHARS.horizontal.repeat(boxWidth - 2)}${BOX_CHARS.bottomRight}`
+  const bottomBorder = `${BOX_CHARS.bottomLeft}${BOX_CHARS.horizontal.repeat(boxWidth - 2)}${BOX_CHARS.bottomRight}`;
 
   // Build the truncation separator bar (e.g. ├─── ✂ ─── 42 lines hidden ──────┤)
   const truncationBar = isTruncated
     ? (() => {
-        const hiddenCount = contentLines.length - effectiveMaxLines
-        const label = `${BOX_CHARS.horizontal.repeat(3)} \u2702 ${BOX_CHARS.horizontal.repeat(3)} ${hiddenCount} lines hidden `
-        const labelWidth = stringWidth(label)
-        const fillWidth = Math.max(0, boxWidth - 2 - labelWidth)
-        return `${BOX_CHARS.teeLeft}${label}${BOX_CHARS.horizontal.repeat(fillWidth)}${BOX_CHARS.teeRight}`
+        const hiddenCount = contentLines.length - effectiveMaxLines;
+        const label = `${BOX_CHARS.horizontal.repeat(3)} \u2702 ${BOX_CHARS.horizontal.repeat(3)} ${hiddenCount} lines hidden `;
+        const labelWidth = stringWidth(label);
+        const fillWidth = Math.max(0, boxWidth - 2 - labelWidth);
+        return `${BOX_CHARS.teeLeft}${label}${BOX_CHARS.horizontal.repeat(fillWidth)}${BOX_CHARS.teeRight}`;
       })()
-    : null
+    : null;
 
   return (
     <Box flexDirection="column">
@@ -131,12 +114,9 @@ function PreviewBoxBody({
       {lines.map((line, index) => {
         // Pad or truncate line to fit inner width (using visual width for unicode/emoji/CJK).
         // sliceAnsi handles ANSI escape codes correctly; stringWidth strips them before measuring.
-        const lineWidth = stringWidth(line)
-        const displayLine =
-          lineWidth > innerWidth ? sliceAnsi(line, 0, innerWidth) : line
-        const padding = ' '.repeat(
-          Math.max(0, innerWidth - stringWidth(displayLine)),
-        )
+        const lineWidth = stringWidth(line);
+        const displayLine = lineWidth > innerWidth ? sliceAnsi(line, 0, innerWidth) : line;
+        const padding = ' '.repeat(Math.max(0, innerWidth - stringWidth(displayLine)));
 
         return (
           <Box key={index} flexDirection="row">
@@ -146,12 +126,12 @@ function PreviewBoxBody({
               {padding} {BOX_CHARS.vertical}
             </Text>
           </Box>
-        )
+        );
       })}
 
       {truncationBar && <Text color="warning">{truncationBar}</Text>}
 
       <Text dimColor>{bottomBorder}</Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/permissions/AskUserQuestionPermissionRequest/PreviewQuestionView.tsx b/src/components/permissions/AskUserQuestionPermissionRequest/PreviewQuestionView.tsx
index bea9bb103..a8f526bb1 100644
--- a/src/components/permissions/AskUserQuestionPermissionRequest/PreviewQuestionView.tsx
+++ b/src/components/permissions/AskUserQuestionPermissionRequest/PreviewQuestionView.tsx
@@ -1,50 +1,38 @@
-import figures from 'figures'
-import React, { useCallback, useMemo, useRef, useState } from 'react'
-import { useTerminalSize } from '../../../hooks/useTerminalSize.js'
-import { type KeyboardEvent, Box, Text } from '@anthropic/ink'
-import {
-  useKeybinding,
-  useKeybindings,
-} from '../../../keybindings/useKeybinding.js'
-import { useAppState } from '../../../state/AppState.js'
-import type { Question } from '@claude-code-best/builtin-tools/tools/AskUserQuestionTool/AskUserQuestionTool.js'
-import { getExternalEditor } from '../../../utils/editor.js'
-import { toIDEDisplayName } from '../../../utils/ide.js'
-import { editPromptInEditor } from '../../../utils/promptEditor.js'
-import { Divider } from '@anthropic/ink'
-import TextInput from '../../TextInput.js'
-import { PermissionRequestTitle } from '../PermissionRequestTitle.js'
-import { PreviewBox } from './PreviewBox.js'
-import { QuestionNavigationBar } from './QuestionNavigationBar.js'
-import type { QuestionState } from './use-multiple-choice-state.js'
+import figures from 'figures';
+import React, { useCallback, useMemo, useRef, useState } from 'react';
+import { useTerminalSize } from '../../../hooks/useTerminalSize.js';
+import { type KeyboardEvent, Box, Text } from '@anthropic/ink';
+import { useKeybinding, useKeybindings } from '../../../keybindings/useKeybinding.js';
+import { useAppState } from '../../../state/AppState.js';
+import type { Question } from '@claude-code-best/builtin-tools/tools/AskUserQuestionTool/AskUserQuestionTool.js';
+import { getExternalEditor } from '../../../utils/editor.js';
+import { toIDEDisplayName } from '../../../utils/ide.js';
+import { editPromptInEditor } from '../../../utils/promptEditor.js';
+import { Divider } from '@anthropic/ink';
+import TextInput from '../../TextInput.js';
+import { PermissionRequestTitle } from '../PermissionRequestTitle.js';
+import { PreviewBox } from './PreviewBox.js';
+import { QuestionNavigationBar } from './QuestionNavigationBar.js';
+import type { QuestionState } from './use-multiple-choice-state.js';
 
 type Props = {
-  question: Question
-  questions: Question[]
-  currentQuestionIndex: number
-  answers: Record<string, string>
-  questionStates: Record<string, QuestionState>
-  hideSubmitTab?: boolean
-  minContentHeight?: number
-  minContentWidth?: number
-  onUpdateQuestionState: (
-    questionText: string,
-    updates: Partial<QuestionState>,
-    isMultiSelect: boolean,
-  ) => void
-  onAnswer: (
-    questionText: string,
-    label: string | string[],
-    textInput?: string,
-    shouldAdvance?: boolean,
-  ) => void
-  onTextInputFocus: (isInInput: boolean) => void
-  onCancel: () => void
-  onTabPrev?: () => void
-  onTabNext?: () => void
-  onRespondToClaude: () => void
-  onFinishPlanInterview: () => void
-}
+  question: Question;
+  questions: Question[];
+  currentQuestionIndex: number;
+  answers: Record<string, string>;
+  questionStates: Record<string, QuestionState>;
+  hideSubmitTab?: boolean;
+  minContentHeight?: number;
+  minContentWidth?: number;
+  onUpdateQuestionState: (questionText: string, updates: Partial<QuestionState>, isMultiSelect: boolean) => void;
+  onAnswer: (questionText: string, label: string | string[], textInput?: string, shouldAdvance?: boolean) => void;
+  onTextInputFocus: (isInInput: boolean) => void;
+  onCancel: () => void;
+  onTabPrev?: () => void;
+  onTabNext?: () => void;
+  onRespondToClaude: () => void;
+  onFinishPlanInterview: () => void;
+};
 
 /**
  * A side-by-side question view for questions with preview content.
@@ -68,93 +56,82 @@ export function PreviewQuestionView({
   onRespondToClaude,
   onFinishPlanInterview,
 }: Props): React.ReactNode {
-  const isInPlanMode = useAppState(s => s.toolPermissionContext.mode) === 'plan'
-  const [isFooterFocused, setIsFooterFocused] = useState(false)
-  const [footerIndex, setFooterIndex] = useState(0)
-  const [isInNotesInput, setIsInNotesInput] = useState(false)
-  const [cursorOffset, setCursorOffset] = useState(0)
+  const isInPlanMode = useAppState(s => s.toolPermissionContext.mode) === 'plan';
+  const [isFooterFocused, setIsFooterFocused] = useState(false);
+  const [footerIndex, setFooterIndex] = useState(0);
+  const [isInNotesInput, setIsInNotesInput] = useState(false);
+  const [cursorOffset, setCursorOffset] = useState(0);
 
-  const editor = getExternalEditor()
-  const editorName = editor ? toIDEDisplayName(editor) : null
+  const editor = getExternalEditor();
+  const editorName = editor ? toIDEDisplayName(editor) : null;
 
-  const questionText = question.question
-  const questionState = questionStates[questionText]
+  const questionText = question.question;
+  const questionState = questionStates[questionText];
 
   // Only real options — no "Other" for preview questions
-  const allOptions = question.options
+  const allOptions = question.options;
 
   // Track which option is focused (for preview display)
-  const [focusedIndex, setFocusedIndex] = useState(0)
+  const [focusedIndex, setFocusedIndex] = useState(0);
 
   // Reset focusedIndex when navigating to a different question
-  const prevQuestionText = useRef(questionText)
+  const prevQuestionText = useRef(questionText);
   if (prevQuestionText.current !== questionText) {
-    prevQuestionText.current = questionText
-    const selected = questionState?.selectedValue as string | undefined
-    const idx = selected
-      ? allOptions.findIndex(opt => opt.label === selected)
-      : -1
-    setFocusedIndex(idx >= 0 ? idx : 0)
+    prevQuestionText.current = questionText;
+    const selected = questionState?.selectedValue as string | undefined;
+    const idx = selected ? allOptions.findIndex(opt => opt.label === selected) : -1;
+    setFocusedIndex(idx >= 0 ? idx : 0);
   }
 
-  const focusedOption = allOptions[focusedIndex]
-  const selectedValue = questionState?.selectedValue as string | undefined
-  const notesValue = questionState?.textInputValue || ''
+  const focusedOption = allOptions[focusedIndex];
+  const selectedValue = questionState?.selectedValue as string | undefined;
+  const notesValue = questionState?.textInputValue || '';
 
   const handleSelectOption = useCallback(
     (index: number) => {
-      const option = allOptions[index]
-      if (!option) return
+      const option = allOptions[index];
+      if (!option) return;
 
-      setFocusedIndex(index)
-      onUpdateQuestionState(
-        questionText,
-        { selectedValue: option.label },
-        false,
-      )
+      setFocusedIndex(index);
+      onUpdateQuestionState(questionText, { selectedValue: option.label }, false);
 
-      onAnswer(questionText, option.label)
+      onAnswer(questionText, option.label);
     },
     [allOptions, questionText, onUpdateQuestionState, onAnswer],
-  )
+  );
 
   const handleNavigate = useCallback(
     (direction: 'up' | 'down' | number) => {
-      if (isInNotesInput) return
+      if (isInNotesInput) return;
 
-      let newIndex: number
+      let newIndex: number;
       if (typeof direction === 'number') {
-        newIndex = direction
+        newIndex = direction;
       } else if (direction === 'up') {
-        newIndex = focusedIndex > 0 ? focusedIndex - 1 : focusedIndex
+        newIndex = focusedIndex > 0 ? focusedIndex - 1 : focusedIndex;
       } else {
-        newIndex =
-          focusedIndex < allOptions.length - 1 ? focusedIndex + 1 : focusedIndex
+        newIndex = focusedIndex < allOptions.length - 1 ? focusedIndex + 1 : focusedIndex;
       }
 
       if (newIndex >= 0 && newIndex < allOptions.length) {
-        setFocusedIndex(newIndex)
+        setFocusedIndex(newIndex);
       }
     },
     [focusedIndex, allOptions.length, isInNotesInput],
-  )
+  );
 
   // Handle ctrl+g to open external editor for notes
   useKeybinding(
     'chat:externalEditor',
     async () => {
-      const currentValue = questionState?.textInputValue || ''
-      const result = await editPromptInEditor(currentValue)
+      const currentValue = questionState?.textInputValue || '';
+      const result = await editPromptInEditor(currentValue);
       if (result.content !== null && result.content !== currentValue) {
-        onUpdateQuestionState(
-          questionText,
-          { textInputValue: result.content },
-          false,
-        )
+        onUpdateQuestionState(questionText, { textInputValue: result.content }, false);
       }
     },
     { context: 'Chat', isActive: isInNotesInput && !!editor },
-  )
+  );
 
   // Handle left/right arrow and tab for question navigation.
   // This must be in the child component (not just the parent) because child useInput
@@ -167,25 +144,25 @@ export function PreviewQuestionView({
       'tabs:next': () => onTabNext?.(),
     },
     { context: 'Tabs', isActive: !isInNotesInput && !isFooterFocused },
-  )
+  );
 
   // Re-submit the answer (plain label) when exiting notes input.
   // Notes are stored in questionStates and collected at submit time via annotations.
   const handleNotesExit = useCallback(() => {
-    setIsInNotesInput(false)
-    onTextInputFocus(false)
+    setIsInNotesInput(false);
+    onTextInputFocus(false);
     if (selectedValue) {
-      onAnswer(questionText, selectedValue)
+      onAnswer(questionText, selectedValue);
     }
-  }, [selectedValue, questionText, onAnswer, onTextInputFocus])
+  }, [selectedValue, questionText, onAnswer, onTextInputFocus]);
 
   const handleDownFromPreview = useCallback(() => {
-    setIsFooterFocused(true)
-  }, [])
+    setIsFooterFocused(true);
+  }, []);
 
   const handleUpFromFooter = useCallback(() => {
-    setIsFooterFocused(false)
-  }, [])
+    setIsFooterFocused(false);
+  }, []);
 
   // Handle keyboard input for option/footer/notes navigation.
   // Always active — the handler routes internally based on isFooterFocused/isInNotesInput.
@@ -193,79 +170,79 @@ export function PreviewQuestionView({
     (e: KeyboardEvent) => {
       if (isFooterFocused) {
         if (e.key === 'up' || (e.ctrl && e.key === 'p')) {
-          e.preventDefault()
+          e.preventDefault();
           if (footerIndex === 0) {
-            handleUpFromFooter()
+            handleUpFromFooter();
           } else {
-            setFooterIndex(0)
+            setFooterIndex(0);
           }
-          return
+          return;
         }
 
         if (e.key === 'down' || (e.ctrl && e.key === 'n')) {
-          e.preventDefault()
+          e.preventDefault();
           if (isInPlanMode && footerIndex === 0) {
-            setFooterIndex(1)
+            setFooterIndex(1);
           }
-          return
+          return;
         }
 
         if (e.key === 'return') {
-          e.preventDefault()
+          e.preventDefault();
           if (footerIndex === 0) {
-            onRespondToClaude()
+            onRespondToClaude();
           } else {
-            onFinishPlanInterview()
+            onFinishPlanInterview();
           }
-          return
+          return;
         }
 
         if (e.key === 'escape') {
-          e.preventDefault()
-          onCancel()
+          e.preventDefault();
+          onCancel();
         }
-        return
+        return;
       }
 
       if (isInNotesInput) {
         // In notes input mode, handle escape to exit back to option navigation
         if (e.key === 'escape') {
-          e.preventDefault()
-          handleNotesExit()
+          e.preventDefault();
+          handleNotesExit();
         }
-        return
+        return;
       }
 
       // Handle option navigation (vertical)
       if (e.key === 'up' || (e.ctrl && e.key === 'p')) {
-        e.preventDefault()
+        e.preventDefault();
         if (focusedIndex > 0) {
-          handleNavigate('up')
+          handleNavigate('up');
         }
       } else if (e.key === 'down' || (e.ctrl && e.key === 'n')) {
-        e.preventDefault()
+        e.preventDefault();
         if (focusedIndex === allOptions.length - 1) {
           // At bottom of options, go to footer
-          handleDownFromPreview()
+          handleDownFromPreview();
         } else {
-          handleNavigate('down')
+          handleNavigate('down');
         }
       } else if (e.key === 'return') {
-        e.preventDefault()
-        handleSelectOption(focusedIndex)
+        e.preventDefault();
+        handleSelectOption(focusedIndex);
       } else if (e.key === 'n' && !e.ctrl && !e.meta) {
         // Press 'n' to focus the notes input
-        e.preventDefault()
-        setIsInNotesInput(true)
-        onTextInputFocus(true)
+        e.preventDefault();
+        setIsInNotesInput(true);
+        onTextInputFocus(true);
       } else if (e.key === 'escape') {
-        e.preventDefault()
-        onCancel()
+        e.preventDefault();
+        onCancel();
       } else if (e.key.length === 1 && e.key >= '1' && e.key <= '9') {
-        e.preventDefault()
-        const idx = parseInt(e.key, 10) - 1
+        e.preventDefault();
+        const idx = parseInt(e.key, 10) - 1;
         if (idx < allOptions.length) {
-          handleNavigate(idx)
+          handleNavigate(idx);
         }
       }
     },
@@ -286,15 +263,15 @@ export function PreviewQuestionView({
       onCancel,
       onTextInputFocus,
     ],
-  )
+  );
 
-  const previewContent = focusedOption?.preview || null
+  const previewContent = focusedOption?.preview || null;
 
   // The right panel's available width is terminal minus the left panel and gap.
-  const LEFT_PANEL_WIDTH = 30
-  const GAP = 4
-  const { columns } = useTerminalSize()
-  const previewMaxWidth = columns - LEFT_PANEL_WIDTH - GAP
+  const LEFT_PANEL_WIDTH = 30;
+  const GAP = 4;
+  const { columns } = useTerminalSize();
+  const previewMaxWidth = columns - LEFT_PANEL_WIDTH - GAP;
 
   // Lines used within the content area that aren't preview content:
   // 1: marginTop on side-by-side box
@@ -304,26 +281,18 @@ export function PreviewQuestionView({
   // 1: "Chat about this" line
   // 1: plan mode line (may or may not show)
   // 2: help text (marginTop=1 + text)
-  const PREVIEW_OVERHEAD = 11
+  const PREVIEW_OVERHEAD = 11;
 
   // Compute the max lines available for preview content from the parent's
   // height budget to prevent terminal overflow. We do NOT pad shorter options
   // to match the tallest — the outer box's minHeight handles cross-question
   // layout consistency, and within-question shifts are acceptable.
   const previewMaxLines = useMemo(() => {
-    return minContentHeight
-      ? Math.max(1, minContentHeight - PREVIEW_OVERHEAD)
-      : undefined
-  }, [minContentHeight])
+    return minContentHeight ? Math.max(1, minContentHeight - PREVIEW_OVERHEAD) : undefined;
+  }, [minContentHeight]);
 
   return (
-    <Box
-      flexDirection="column"
-      marginTop={1}
-      tabIndex={0}
-      autoFocus
-      onKeyDown={handleKeyDown}
-    >
+    <Box flexDirection="column" marginTop={1} tabIndex={0} autoFocus onKeyDown={handleKeyDown}>
       <Divider color="inactive" />
       <Box flexDirection="column" paddingTop={0}>
         <QuestionNavigationBar
@@ -340,33 +309,20 @@ export function PreviewQuestionView({
             {/* Left panel: vertical option list */}
             <Box flexDirection="column" width={30}>
               {allOptions.map((option, index) => {
-                const isFocused = focusedIndex === index
-                const isSelected = selectedValue === option.label
+                const isFocused = focusedIndex === index;
+                const isSelected = selectedValue === option.label;
 
                 return (
                   <Box key={option.label} flexDirection="row">
-                    {isFocused ? (
-                      <Text color="suggestion">{figures.pointer}</Text>
-                    ) : (
-                      <Text> </Text>
-                    )}
+                    {isFocused ? <Text color="suggestion">{figures.pointer}</Text> : <Text> </Text>}
                     <Text dimColor> {index + 1}.</Text>
-                    <Text
-                      color={
-                        isSelected
-                          ? 'success'
-                          : isFocused
-                            ? 'suggestion'
-                            : undefined
-                      }
-                      bold={isFocused}
-                    >
+                    <Text color={isSelected ? 'success' : isFocused ? 'suggestion' : undefined} bold={isFocused}>
                       {' '}
                       {option.label}
                     </Text>
                     {isSelected && <Text color="success"> {figures.tick}</Text>}
                   </Box>
-                )
+                );
               })}
             </Box>
 
@@ -385,11 +341,7 @@ export function PreviewQuestionView({
                     value={notesValue}
                     placeholder="Add notes on this design…"
                     onChange={value => {
-                      onUpdateQuestionState(
-                        questionText,
-                        { textInputValue: value },
-                        false,
-                      )
+                      onUpdateQuestionState(questionText, { textInputValue: value }, false);
                     }}
                     onSubmit={handleNotesExit}
                     onExit={handleNotesExit}
@@ -417,15 +369,7 @@ export function PreviewQuestionView({
               ) : (
                 <Text> </Text>
               )}
-              <Text
-                color={
-                  isFooterFocused && footerIndex === 0
-                    ? 'suggestion'
-                    : undefined
-                }
-              >
-                Chat about this
-              </Text>
+              <Text color={isFooterFocused && footerIndex === 0 ? 'suggestion' : undefined}>Chat about this</Text>
             </Box>
             {isInPlanMode && (
               <Box flexDirection="row" gap={1}>
@@ -434,13 +378,7 @@ export function PreviewQuestionView({
                 ) : (
                   <Text> </Text>
                 )}
-                <Text
-                  color={
-                    isFooterFocused && footerIndex === 1
-                      ? 'suggestion'
-                      : undefined
-                  }
-                >
+                <Text color={isFooterFocused && footerIndex === 1 ? 'suggestion' : undefined}>
                   Skip interview and plan immediately
                 </Text>
               </Box>
@@ -448,17 +386,13 @@ export function PreviewQuestionView({
           </Box>
           <Box marginTop={1}>
             <Text color="inactive" dimColor>
-              Enter to select · {figures.arrowUp}/{figures.arrowDown} to
-              navigate · n to add notes
+              Enter to select · {figures.arrowUp}/{figures.arrowDown} to navigate · n to add notes
               {questions.length > 1 && <> · Tab to switch questions</>}
-              {isInNotesInput && editorName && (
-                <> · ctrl+g to edit in {editorName}</>
-              )}{' '}
-              · Esc to cancel
+              {isInNotesInput && editorName && <> · ctrl+g to edit in {editorName}</>} · Esc to cancel
             </Text>
           </Box>
         </Box>
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/components/permissions/AskUserQuestionPermissionRequest/QuestionNavigationBar.tsx b/src/components/permissions/AskUserQuestionPermissionRequest/QuestionNavigationBar.tsx
index c30b584f9..dc274b524 100644
--- a/src/components/permissions/AskUserQuestionPermissionRequest/QuestionNavigationBar.tsx
+++ b/src/components/permissions/AskUserQuestionPermissionRequest/QuestionNavigationBar.tsx
@@ -1,16 +1,16 @@
-import figures from 'figures'
-import React, { useMemo } from 'react'
-import { useTerminalSize } from '../../../hooks/useTerminalSize.js'
-import { Box, Text, stringWidth } from '@anthropic/ink'
-import type { Question } from '@claude-code-best/builtin-tools/tools/AskUserQuestionTool/AskUserQuestionTool.js'
-import { truncateToWidth } from '../../../utils/format.js'
+import figures from 'figures';
+import React, { useMemo } from 'react';
+import { useTerminalSize } from '../../../hooks/useTerminalSize.js';
+import { Box, Text, stringWidth } from '@anthropic/ink';
+import type { Question } from '@claude-code-best/builtin-tools/tools/AskUserQuestionTool/AskUserQuestionTool.js';
+import { truncateToWidth } from '../../../utils/format.js';
 
 type Props = {
-  questions: Question[]
-  currentQuestionIndex: number
-  answers: Record<string, string>
-  hideSubmitTab?: boolean
-}
+  questions: Question[];
+  currentQuestionIndex: number;
+  answers: Record<string, string>;
+  hideSubmitTab?: boolean;
+};
 
 export function QuestionNavigationBar({
   questions,
@@ -18,94 +18,80 @@ export function QuestionNavigationBar({
   answers,
   hideSubmitTab = false,
 }: Props): React.ReactNode {
-  const { columns } = useTerminalSize()
+  const { columns } = useTerminalSize();
 
   // Calculate the display text for each tab based on available width
   const tabDisplayTexts = useMemo(() => {
     // Calculate fixed width elements
-    const leftArrow = '← '
-    const rightArrow = ' →'
-    const submitText = hideSubmitTab ? '' : ` ${figures.tick} Submit `
-    const checkboxWidth = 2 // checkbox + space
-    const paddingPerTab = 2 // space before and after each tab text
+    const leftArrow = '← ';
+    const rightArrow = ' →';
+    const submitText = hideSubmitTab ? '' : ` ${figures.tick} Submit `;
+    const checkboxWidth = 2; // checkbox + space
+    const paddingPerTab = 2; // space before and after each tab text
 
-    const fixedWidth =
-      stringWidth(leftArrow) + stringWidth(rightArrow) + stringWidth(submitText)
+    const fixedWidth = stringWidth(leftArrow) + stringWidth(rightArrow) + stringWidth(submitText);
 
     // Available width for all question tabs
-    const availableForTabs = columns - fixedWidth
+    const availableForTabs = columns - fixedWidth;
 
     if (availableForTabs <= 0) {
       // Terminal too narrow, fallback to minimal display
       return questions.map((q: Question, index: number) => {
-        const header = q?.header || `Q${index + 1}`
-        return index === currentQuestionIndex ? header.slice(0, 3) : ''
-      })
+        const header = q?.header || `Q${index + 1}`;
+        return index === currentQuestionIndex ? header.slice(0, 3) : '';
+      });
     }
 
     // Calculate ideal width for each tab (checkbox + padding + text)
-    const tabHeaders = questions.map(
-      (q: Question, index: number) => q?.header || `Q${index + 1}`,
-    )
-    const idealWidths = tabHeaders.map(
-      header => checkboxWidth + paddingPerTab + stringWidth(header),
-    )
+    const tabHeaders = questions.map((q: Question, index: number) => q?.header || `Q${index + 1}`);
+    const idealWidths = tabHeaders.map(header => checkboxWidth + paddingPerTab + stringWidth(header));
 
     // Calculate total ideal width
-    const totalIdealWidth = idealWidths.reduce((sum, w) => sum + w, 0)
+    const totalIdealWidth = idealWidths.reduce((sum, w) => sum + w, 0);
 
     // If everything fits, use full headers
     if (totalIdealWidth <= availableForTabs) {
-      return tabHeaders
+      return tabHeaders;
     }
 
     // Need to truncate - prioritize current tab
-    const currentHeader = tabHeaders[currentQuestionIndex] || ''
-    const currentIdealWidth =
-      checkboxWidth + paddingPerTab + stringWidth(currentHeader)
+    const currentHeader = tabHeaders[currentQuestionIndex] || '';
+    const currentIdealWidth = checkboxWidth + paddingPerTab + stringWidth(currentHeader);
 
     // Minimum width for other tabs (checkbox + padding + 1 char + ellipsis)
-    const minWidthPerTab = checkboxWidth + paddingPerTab + 2 // "X…"
+    const minWidthPerTab = checkboxWidth + paddingPerTab + 2; // "X…"
 
     // Calculate space for current tab (try to show full text)
-    const currentTabWidth = Math.min(currentIdealWidth, availableForTabs / 2)
-    const remainingWidth = availableForTabs - currentTabWidth
+    const currentTabWidth = Math.min(currentIdealWidth, availableForTabs / 2);
+    const remainingWidth = availableForTabs - currentTabWidth;
 
     // Calculate space for other tabs
-    const otherTabCount = questions.length - 1
-    const widthPerOtherTab = Math.max(
-      minWidthPerTab,
-      Math.floor(remainingWidth / Math.max(otherTabCount, 1)),
-    )
+    const otherTabCount = questions.length - 1;
+    const widthPerOtherTab = Math.max(minWidthPerTab, Math.floor(remainingWidth / Math.max(otherTabCount, 1)));
 
     return tabHeaders.map((header, index) => {
       if (index === currentQuestionIndex) {
         // Current tab - show as much as possible
-        const maxTextWidth = currentTabWidth - checkboxWidth - paddingPerTab
-        return truncateToWidth(header, maxTextWidth)
+        const maxTextWidth = currentTabWidth - checkboxWidth - paddingPerTab;
+        return truncateToWidth(header, maxTextWidth);
       } else {
         // Other tabs - truncate to fit
-        const maxTextWidth = widthPerOtherTab - checkboxWidth - paddingPerTab
-        return truncateToWidth(header, maxTextWidth)
+        const maxTextWidth = widthPerOtherTab - checkboxWidth - paddingPerTab;
+        return truncateToWidth(header, maxTextWidth);
       }
-    })
-  }, [questions, currentQuestionIndex, columns, hideSubmitTab])
+    });
+  }, [questions, currentQuestionIndex, columns, hideSubmitTab]);
 
-  const hideArrows = questions.length === 1 && hideSubmitTab
+  const hideArrows = questions.length === 1 && hideSubmitTab;
 
   return (
     <Box flexDirection="row" marginBottom={1}>
-      {!hideArrows && (
-        <Text color={currentQuestionIndex === 0 ? 'inactive' : undefined}>
-          ←{' '}
-        </Text>
-      )}
+      {!hideArrows && <Text color={currentQuestionIndex === 0 ? 'inactive' : undefined}>← </Text>}
       {questions.map((q: Question, index: number) => {
-        const isSelected = index === currentQuestionIndex
-        const isAnswered = q?.question && !!answers[q.question]
-        const checkbox = isAnswered ? figures.checkboxOn : figures.checkboxOff
-        const displayText =
-          tabDisplayTexts[index] || q?.header || `Q${index + 1}`
+        const isSelected = index === currentQuestionIndex;
+        const isAnswered = q?.question && !!answers[q.question];
+        const checkbox = isAnswered ? figures.checkboxOn : figures.checkboxOff;
+        const displayText = tabDisplayTexts[index] || q?.header || `Q${index + 1}`;
 
         return (
           <Box key={q?.question || `question-${index}`}>
@@ -121,7 +107,7 @@ export function QuestionNavigationBar({
               </Text>
             )}
           </Box>
-        )
+        );
       })}
       {!hideSubmitTab && (
         <Box key="submit">
@@ -135,16 +121,7 @@ export function QuestionNavigationBar({
           )}
         </Box>
       )}
-      {!hideArrows && (
-        <Text
-          color={
-            currentQuestionIndex === questions.length ? 'inactive' : undefined
-          }
-        >
-          {' '}
-          →
-        </Text>
-      )}
+      {!hideArrows && <Text color={currentQuestionIndex === questions.length ? 'inactive' : undefined}> →</Text>}
     </Box>
-  )
+  );
 }
diff --git a/src/components/permissions/AskUserQuestionPermissionRequest/QuestionView.tsx b/src/components/permissions/AskUserQuestionPermissionRequest/QuestionView.tsx
index 7fc9e6a6f..f3c6cd24a 100644
--- a/src/components/permissions/AskUserQuestionPermissionRequest/QuestionView.tsx
+++ b/src/components/permissions/AskUserQuestionPermissionRequest/QuestionView.tsx
@@ -1,67 +1,54 @@
-import figures from 'figures'
-import React, { useCallback, useState } from 'react'
-import { type KeyboardEvent, Box, Text } from '@anthropic/ink'
-import { useAppState } from '../../../state/AppState.js'
+import figures from 'figures';
+import React, { useCallback, useState } from 'react';
+import { type KeyboardEvent, Box, Text } from '@anthropic/ink';
+import { useAppState } from '../../../state/AppState.js';
 import type {
   Question,
   QuestionOption,
-} from '@claude-code-best/builtin-tools/tools/AskUserQuestionTool/AskUserQuestionTool.js'
-import type { PastedContent } from '../../../utils/config.js'
-import { getExternalEditor } from '../../../utils/editor.js'
-import { toIDEDisplayName } from '../../../utils/ide.js'
-import type { ImageDimensions } from '../../../utils/imageResizer.js'
-import { editPromptInEditor } from '../../../utils/promptEditor.js'
-import {
-  type OptionWithDescription,
-  Select,
-  SelectMulti,
-} from '../../CustomSelect/index.js'
-import { Divider } from '@anthropic/ink'
-import { FilePathLink } from '../../FilePathLink.js'
+} from '@claude-code-best/builtin-tools/tools/AskUserQuestionTool/AskUserQuestionTool.js';
+import type { PastedContent } from '../../../utils/config.js';
+import { getExternalEditor } from '../../../utils/editor.js';
+import { toIDEDisplayName } from '../../../utils/ide.js';
+import type { ImageDimensions } from '../../../utils/imageResizer.js';
+import { editPromptInEditor } from '../../../utils/promptEditor.js';
+import { type OptionWithDescription, Select, SelectMulti } from '../../CustomSelect/index.js';
+import { Divider } from '@anthropic/ink';
+import { FilePathLink } from '../../FilePathLink.js';
 
-import { PermissionRequestTitle } from '../PermissionRequestTitle.js'
-import { PreviewQuestionView } from './PreviewQuestionView.js'
-import { QuestionNavigationBar } from './QuestionNavigationBar.js'
-import type { QuestionState } from './use-multiple-choice-state.js'
+import { PermissionRequestTitle } from '../PermissionRequestTitle.js';
+import { PreviewQuestionView } from './PreviewQuestionView.js';
+import { QuestionNavigationBar } from './QuestionNavigationBar.js';
+import type { QuestionState } from './use-multiple-choice-state.js';
 
 type Props = {
-  question: Question
-  questions: Question[]
-  currentQuestionIndex: number
-  answers: Record<string, string>
-  questionStates: Record<string, QuestionState>
-  hideSubmitTab?: boolean
-  planFilePath?: string
-  pastedContents?: Record<number, PastedContent>
-  minContentHeight?: number
-  minContentWidth?: number
-  onUpdateQuestionState: (
-    questionText: string,
-    updates: Partial<QuestionState>,
-    isMultiSelect: boolean,
-  ) => void
-  onAnswer: (
-    questionText: string,
-    label: string | string[],
-    textInput?: string,
-    shouldAdvance?: boolean,
-  ) => void
-  onTextInputFocus: (isInInput: boolean) => void
-  onCancel: () => void
-  onSubmit: () => void
-  onTabPrev?: () => void
-  onTabNext?: () => void
-  onRespondToClaude: () => void
-  onFinishPlanInterview: () => void
+  question: Question;
+  questions: Question[];
+  currentQuestionIndex: number;
+  answers: Record<string, string>;
+  questionStates: Record<string, QuestionState>;
+  hideSubmitTab?: boolean;
+  planFilePath?: string;
+  pastedContents?: Record<number, PastedContent>;
+  minContentHeight?: number;
+  minContentWidth?: number;
+  onUpdateQuestionState: (questionText: string, updates: Partial<QuestionState>, isMultiSelect: boolean) => void;
+  onAnswer: (questionText: string, label: string | string[], textInput?: string, shouldAdvance?: boolean) => void;
+  onTextInputFocus: (isInInput: boolean) => void;
+  onCancel: () => void;
+  onSubmit: () => void;
+  onTabPrev?: () => void;
+  onTabNext?: () => void;
+  onRespondToClaude: () => void;
+  onFinishPlanInterview: () => void;
   onImagePaste?: (
     base64Image: string,
     mediaType?: string,
     filename?: string,
     dimensions?: ImageDimensions,
     sourcePath?: string,
-  ) => void
-  onRemoveImage?: (id: number) => void
-}
+  ) => void;
+  onRemoveImage?: (id: number) => void;
+};
 
 export function QuestionView({
   question,
@@ -86,67 +73,67 @@ export function QuestionView({
   pastedContents,
   onRemoveImage,
 }: Props): React.ReactNode {
-  const isInPlanMode = useAppState(s => s.toolPermissionContext.mode) === 'plan'
-  const [isFooterFocused, setIsFooterFocused] = useState(false)
-  const [footerIndex, setFooterIndex] = useState(0)
-  const [isOtherFocused, setIsOtherFocused] = useState(false)
+  const isInPlanMode = useAppState(s => s.toolPermissionContext.mode) === 'plan';
+  const [isFooterFocused, setIsFooterFocused] = useState(false);
+  const [footerIndex, setFooterIndex] = useState(0);
+  const [isOtherFocused, setIsOtherFocused] = useState(false);
 
-  const editor = getExternalEditor()
-  const editorName = editor ? toIDEDisplayName(editor) : null
+  const editor = getExternalEditor();
+  const editorName = editor ? toIDEDisplayName(editor) : null;
 
   const handleFocus = useCallback(
     (value: string) => {
-      const isOther = value === '__other__'
-      setIsOtherFocused(isOther)
-      onTextInputFocus(isOther)
+      const isOther = value === '__other__';
+      setIsOtherFocused(isOther);
+      onTextInputFocus(isOther);
     },
     [onTextInputFocus],
-  )
+  );
 
   const handleDownFromLastItem = useCallback(() => {
-    setIsFooterFocused(true)
-  }, [])
+    setIsFooterFocused(true);
+  }, []);
 
   const handleUpFromFooter = useCallback(() => {
-    setIsFooterFocused(false)
-  }, [])
+    setIsFooterFocused(false);
+  }, []);
 
   // Handle keyboard input when footer is focused
   const handleKeyDown = useCallback(
     (e: KeyboardEvent) => {
-      if (!isFooterFocused) return
+      if (!isFooterFocused) return;
 
       if (e.key === 'up' || (e.ctrl && e.key === 'p')) {
-        e.preventDefault()
+        e.preventDefault();
         if (footerIndex === 0) {
-          handleUpFromFooter()
+          handleUpFromFooter();
         } else {
-          setFooterIndex(0)
+          setFooterIndex(0);
         }
-        return
+        return;
       }
 
       if (e.key === 'down' || (e.ctrl && e.key === 'n')) {
-        e.preventDefault()
+        e.preventDefault();
         if (isInPlanMode && footerIndex === 0) {
-          setFooterIndex(1)
+          setFooterIndex(1);
         }
-        return
+        return;
       }
 
       if (e.key === 'return') {
-        e.preventDefault()
+        e.preventDefault();
         if (footerIndex === 0) {
-          onRespondToClaude()
+          onRespondToClaude();
         } else {
-          onFinishPlanInterview()
+          onFinishPlanInterview();
         }
-        return
+        return;
       }
 
       if (e.key === 'escape') {
-        e.preventDefault()
-        onCancel()
+        e.preventDefault();
+        onCancel();
       }
     },
     [
@@ -158,37 +145,31 @@ export function QuestionView({
       onFinishPlanInterview,
       onCancel,
     ],
-  )
+  );
 
-  const textOptions: OptionWithDescription<string>[] = question.options.map(
-    (opt: QuestionOption) => ({
-      type: 'text' as const,
-      value: opt.label,
-      label: opt.label,
-      description: opt.description,
-    }),
-  )
+  const textOptions: OptionWithDescription<string>[] = question.options.map((opt: QuestionOption) => ({
+    type: 'text' as const,
+    value: opt.label,
+    label: opt.label,
+    description: opt.description,
+  }));
 
-  const questionText = question.question
-  const questionState = questionStates[questionText]
+  const questionText = question.question;
+  const questionState = questionStates[questionText];
 
   const handleOpenEditor = useCallback(
     async (currentValue: string, setValue: (value: string) => void) => {
-      const result = await editPromptInEditor(currentValue)
+      const result = await editPromptInEditor(currentValue);
 
       if (result.content !== null && result.content !== currentValue) {
         // Update the Select's internal state for immediate UI update
-        setValue(result.content)
+        setValue(result.content);
         // Also update the question state for persistence
-        onUpdateQuestionState(
-          questionText,
-          { textInputValue: result.content },
-          question.multiSelect ?? false,
-        )
+        onUpdateQuestionState(questionText, { textInputValue: result.content }, question.multiSelect ?? false);
       }
     },
     [questionText, onUpdateQuestionState, question.multiSelect],
-  )
+  );
 
   const otherOption: OptionWithDescription<string> = {
     type: 'input' as const,
@@ -197,20 +178,15 @@ export function QuestionView({
     placeholder: question.multiSelect ? 'Type something' : 'Type something.',
     initialValue: questionState?.textInputValue ?? '',
     onChange: (value: string) => {
-      onUpdateQuestionState(
-        questionText,
-        { textInputValue: value },
-        question.multiSelect ?? false,
-      )
+      onUpdateQuestionState(questionText, { textInputValue: value }, question.multiSelect ?? false);
     },
-  }
+  };
 
-  const options = [...textOptions, otherOption]
+  const options = [...textOptions, otherOption];
 
   // Check if any option has a preview and it's not multi-select
   // Previews only supported for single-select questions
-  const hasAnyPreview =
-    !question.multiSelect && question.options.some(opt => opt.preview)
+  const hasAnyPreview = !question.multiSelect && question.options.some(opt => opt.preview);
 
   // Delegate to PreviewQuestionView for carousel-style preview mode
   if (hasAnyPreview) {
@@ -233,17 +209,11 @@ export function QuestionView({
         onRespondToClaude={onRespondToClaude}
         onFinishPlanInterview={onFinishPlanInterview}
       />
-    )
+    );
   }
 
   return (
-    <Box
-      flexDirection="column"
-      marginTop={0}
-      tabIndex={0}
-      autoFocus
-      onKeyDown={handleKeyDown}
-    >
+    <Box flexDirection="column" marginTop={0} tabIndex={0} autoFocus onKeyDown={handleKeyDown}>
       {isInPlanMode && planFilePath && (
         <Box flexDirection="column" gap={0}>
           <Divider color="inactive" />
@@ -270,32 +240,18 @@ export function QuestionView({
               <SelectMulti
                 key={question.question}
                 options={options}
-                defaultValue={
-                  questionStates[question.question]?.selectedValue as
-                    | string[]
-                    | undefined
-                }
+                defaultValue={questionStates[question.question]?.selectedValue as string[] | undefined}
                 onChange={(values: string[]) => {
-                  onUpdateQuestionState(
-                    questionText,
-                    { selectedValue: values },
-                    true,
-                  )
+                  onUpdateQuestionState(questionText, { selectedValue: values }, true);
                   const textInput = values.includes('__other__')
                     ? questionStates[questionText]?.textInputValue
-                    : undefined
-                  const finalValues = values
-                    .filter(v => v !== '__other__')
-                    .concat(textInput ? [textInput] : [])
-                  onAnswer(questionText, finalValues, undefined, false)
+                    : undefined;
+                  const finalValues = values.filter(v => v !== '__other__').concat(textInput ? [textInput] : []);
+                  onAnswer(questionText, finalValues, undefined, false);
                 }}
                 onFocus={handleFocus}
                 onCancel={onCancel}
-                submitButtonText={
-                  currentQuestionIndex === questions.length - 1
-                    ? 'Submit'
-                    : 'Next'
-                }
+                submitButtonText={currentQuestionIndex === questions.length - 1 ? 'Submit' : 'Next'}
                 onSubmit={onSubmit}
                 onDownFromLastItem={handleDownFromLastItem}
                 isDisabled={isFooterFocused}
@@ -308,22 +264,11 @@ export function QuestionView({
               <Select
                 key={question.question}
                 options={options}
-                defaultValue={
-                  questionStates[question.question]?.selectedValue as
-                    | string
-                    | undefined
-                }
+                defaultValue={questionStates[question.question]?.selectedValue as string | undefined}
                 onChange={(value: string) => {
-                  onUpdateQuestionState(
-                    questionText,
-                    { selectedValue: value },
-                    false,
-                  )
-                  const textInput =
-                    value === '__other__'
-                      ? questionStates[questionText]?.textInputValue
-                      : undefined
-                  onAnswer(questionText, value, textInput)
+                  onUpdateQuestionState(questionText, { selectedValue: value }, false);
+                  const textInput = value === '__other__' ? questionStates[questionText]?.textInputValue : undefined;
+                  onAnswer(questionText, value, textInput);
                 }}
                 onFocus={handleFocus}
                 onCancel={onCancel}
@@ -346,13 +291,7 @@ export function QuestionView({
               ) : (
                 <Text> </Text>
               )}
-              <Text
-                color={
-                  isFooterFocused && footerIndex === 0
-                    ? 'suggestion'
-                    : undefined
-                }
-              >
+              <Text color={isFooterFocused && footerIndex === 0 ? 'suggestion' : undefined}>
                 {options.length + 1}. Chat about this
               </Text>
             </Box>
@@ -363,13 +302,7 @@ export function QuestionView({
                 ) : (
                   <Text> </Text>
                 )}
-                <Text
-                  color={
-                    isFooterFocused && footerIndex === 1
-                      ? 'suggestion'
-                      : undefined
-                  }
-                >
+                <Text color={isFooterFocused && footerIndex === 1 ? 'suggestion' : undefined}>
                   {options.length + 2}. Skip interview and plan immediately
                 </Text>
               </Box>
@@ -385,14 +318,11 @@ export function QuestionView({
               ) : (
                 'Tab/Arrow keys to navigate'
               )}
-              {isOtherFocused && editorName && (
-                <> · ctrl+g to edit in {editorName}</>
-              )}{' '}
-              · Esc to cancel
+              {isOtherFocused && editorName && <> · ctrl+g to edit in {editorName}</>} · Esc to cancel
             </Text>
           </Box>
         </Box>
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/components/permissions/AskUserQuestionPermissionRequest/SubmitQuestionsView.tsx b/src/components/permissions/AskUserQuestionPermissionRequest/SubmitQuestionsView.tsx
index 8bb6757b8..2864c14d4 100644
--- a/src/components/permissions/AskUserQuestionPermissionRequest/SubmitQuestionsView.tsx
+++ b/src/components/permissions/AskUserQuestionPermissionRequest/SubmitQuestionsView.tsx
@@ -1,23 +1,23 @@
-import figures from 'figures'
-import React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import type { Question } from '@claude-code-best/builtin-tools/tools/AskUserQuestionTool/AskUserQuestionTool.js'
-import type { PermissionDecision } from '../../../utils/permissions/PermissionResult.js'
-import { Select } from '../../CustomSelect/index.js'
-import { Divider } from '@anthropic/ink'
-import { PermissionRequestTitle } from '../PermissionRequestTitle.js'
-import { PermissionRuleExplanation } from '../PermissionRuleExplanation.js'
-import { QuestionNavigationBar } from './QuestionNavigationBar.js'
+import figures from 'figures';
+import React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import type { Question } from '@claude-code-best/builtin-tools/tools/AskUserQuestionTool/AskUserQuestionTool.js';
+import type { PermissionDecision } from '../../../utils/permissions/PermissionResult.js';
+import { Select } from '../../CustomSelect/index.js';
+import { Divider } from '@anthropic/ink';
+import { PermissionRequestTitle } from '../PermissionRequestTitle.js';
+import { PermissionRuleExplanation } from '../PermissionRuleExplanation.js';
+import { QuestionNavigationBar } from './QuestionNavigationBar.js';
 
 type Props = {
-  questions: Question[]
-  currentQuestionIndex: number
-  answers: Record<string, string>
-  allQuestionsAnswered: boolean
-  permissionResult: PermissionDecision
-  minContentHeight?: number
-  onFinalResponse: (value: 'submit' | 'cancel') => void
-}
+  questions: Question[];
+  currentQuestionIndex: number;
+  answers: Record<string, string>;
+  allQuestionsAnswered: boolean;
+  permissionResult: PermissionDecision;
+  minContentHeight?: number;
+  onFinalResponse: (value: 'submit' | 'cancel') => void;
+};
 
 export function SubmitQuestionsView({
   questions,
@@ -31,24 +31,13 @@ export function SubmitQuestionsView({
   return (
     <Box flexDirection="column" marginTop={1}>
       <Divider color="inactive" />
-      <Box
-        flexDirection="column"
-        borderTop
-        borderColor="inactive"
-        paddingTop={0}
-      >
-        <QuestionNavigationBar
-          questions={questions}
-          currentQuestionIndex={currentQuestionIndex}
-          answers={answers}
-        />
+      <Box flexDirection="column" borderTop borderColor="inactive" paddingTop={0}>
+        <QuestionNavigationBar questions={questions} currentQuestionIndex={currentQuestionIndex} answers={answers} />
         <PermissionRequestTitle title="Review your answers" color="text" />
         <Box flexDirection="column" marginTop={1} minHeight={minContentHeight}>
           {!allQuestionsAnswered && (
             <Box marginBottom={1}>
-              <Text color="warning">
-                {figures.warning} You have not answered all questions
-              </Text>
+              <Text color="warning">{figures.warning} You have not answered all questions</Text>
             </Box>
           )}
           {Object.keys(answers).length > 0 && (
@@ -56,14 +45,10 @@ export function SubmitQuestionsView({
               {questions
                 .filter((q: Question) => q?.question && answers[q.question])
                 .map((q: Question) => {
-                  const answer = answers[q?.question]
+                  const answer = answers[q?.question];
 
                   return (
-                    <Box
-                      key={q?.question || 'answer'}
-                      flexDirection="column"
-                      marginLeft={1}
-                    >
+                    <Box key={q?.question || 'answer'} flexDirection="column" marginLeft={1}>
                       <Text>
                         {figures.bullet} {q?.question || 'Question'}
                       </Text>
@@ -73,15 +58,12 @@ export function SubmitQuestionsView({
                         </Text>
                       </Box>
                     </Box>
-                  )
+                  );
                 })}
             </Box>
           )}
 
-          <PermissionRuleExplanation
-            permissionResult={permissionResult}
-            toolType="tool"
-          />
+          <PermissionRuleExplanation permissionResult={permissionResult} toolType="tool" />
           <Text color="inactive">Ready to submit your answers?</Text>
           <Box marginTop={1}>
             <Select
@@ -100,5 +82,5 @@ export function SubmitQuestionsView({
         </Box>
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/components/permissions/BashPermissionRequest/BashPermissionRequest.tsx b/src/components/permissions/BashPermissionRequest/BashPermissionRequest.tsx
index e37dba10c..0f036d93a 100644
--- a/src/components/permissions/BashPermissionRequest/BashPermissionRequest.tsx
+++ b/src/components/permissions/BashPermissionRequest/BashPermissionRequest.tsx
@@ -1,51 +1,48 @@
-import { feature } from 'bun:bundle'
-import figures from 'figures'
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { Box, Text, useTheme } from '@anthropic/ink'
-import { useKeybinding } from '../../../keybindings/useKeybinding.js'
-import { getFeatureValue_CACHED_MAY_BE_STALE } from '../../../services/analytics/growthbook.js'
+import { feature } from 'bun:bundle';
+import figures from 'figures';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { Box, Text, useTheme } from '@anthropic/ink';
+import { useKeybinding } from '../../../keybindings/useKeybinding.js';
+import { getFeatureValue_CACHED_MAY_BE_STALE } from '../../../services/analytics/growthbook.js';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from '../../../services/analytics/index.js'
-import { sanitizeToolNameForAnalytics } from '../../../services/analytics/metadata.js'
-import { useAppState } from '../../../state/AppState.js'
-import { BashTool } from '@claude-code-best/builtin-tools/tools/BashTool/BashTool.js'
+} from '../../../services/analytics/index.js';
+import { sanitizeToolNameForAnalytics } from '../../../services/analytics/metadata.js';
+import { useAppState } from '../../../state/AppState.js';
+import { BashTool } from '@claude-code-best/builtin-tools/tools/BashTool/BashTool.js';
 import {
   getFirstWordPrefix,
   getSimpleCommandPrefix,
-} from '@claude-code-best/builtin-tools/tools/BashTool/bashPermissions.js'
-import { getDestructiveCommandWarning } from '@claude-code-best/builtin-tools/tools/BashTool/destructiveCommandWarning.js'
-import { parseSedEditCommand } from '@claude-code-best/builtin-tools/tools/BashTool/sedEditParser.js'
-import { shouldUseSandbox } from '@claude-code-best/builtin-tools/tools/BashTool/shouldUseSandbox.js'
-import { getCompoundCommandPrefixesStatic } from '../../../utils/bash/prefix.js'
+} from '@claude-code-best/builtin-tools/tools/BashTool/bashPermissions.js';
+import { getDestructiveCommandWarning } from '@claude-code-best/builtin-tools/tools/BashTool/destructiveCommandWarning.js';
+import { parseSedEditCommand } from '@claude-code-best/builtin-tools/tools/BashTool/sedEditParser.js';
+import { shouldUseSandbox } from '@claude-code-best/builtin-tools/tools/BashTool/shouldUseSandbox.js';
+import { getCompoundCommandPrefixesStatic } from '../../../utils/bash/prefix.js';
 import {
   createPromptRuleContent,
   generateGenericDescription,
   getBashPromptAllowDescriptions,
   isClassifierPermissionsEnabled,
-} from '../../../utils/permissions/bashClassifier.js'
-import { extractRules } from '../../../utils/permissions/PermissionUpdate.js'
-import type { PermissionUpdate } from '../../../utils/permissions/PermissionUpdateSchema.js'
-import { SandboxManager } from '../../../utils/sandbox/sandbox-adapter.js'
-import { Select } from '../../CustomSelect/select.js'
-import { ShimmerChar } from '../../Spinner/ShimmerChar.js'
-import { useShimmerAnimation } from '../../Spinner/useShimmerAnimation.js'
-import { type UnaryEvent, usePermissionRequestLogging } from '../hooks.js'
-import { PermissionDecisionDebugInfo } from '../PermissionDecisionDebugInfo.js'
-import { PermissionDialog } from '../PermissionDialog.js'
-import {
-  PermissionExplainerContent,
-  usePermissionExplainerUI,
-} from '../PermissionExplanation.js'
-import type { PermissionRequestProps } from '../PermissionRequest.js'
-import { PermissionRuleExplanation } from '../PermissionRuleExplanation.js'
-import { SedEditPermissionRequest } from '../SedEditPermissionRequest/SedEditPermissionRequest.js'
-import { useShellPermissionFeedback } from '../useShellPermissionFeedback.js'
-import { logUnaryPermissionEvent } from '../utils.js'
-import { bashToolUseOptions } from './bashToolUseOptions.js'
+} from '../../../utils/permissions/bashClassifier.js';
+import { extractRules } from '../../../utils/permissions/PermissionUpdate.js';
+import type { PermissionUpdate } from '../../../utils/permissions/PermissionUpdateSchema.js';
+import { SandboxManager } from '../../../utils/sandbox/sandbox-adapter.js';
+import { Select } from '../../CustomSelect/select.js';
+import { ShimmerChar } from '../../Spinner/ShimmerChar.js';
+import { useShimmerAnimation } from '../../Spinner/useShimmerAnimation.js';
+import { type UnaryEvent, usePermissionRequestLogging } from '../hooks.js';
+import { PermissionDecisionDebugInfo } from '../PermissionDecisionDebugInfo.js';
+import { PermissionDialog } from '../PermissionDialog.js';
+import { PermissionExplainerContent, usePermissionExplainerUI } from '../PermissionExplanation.js';
+import type { PermissionRequestProps } from '../PermissionRequest.js';
+import { PermissionRuleExplanation } from '../PermissionRuleExplanation.js';
+import { SedEditPermissionRequest } from '../SedEditPermissionRequest/SedEditPermissionRequest.js';
+import { useShellPermissionFeedback } from '../useShellPermissionFeedback.js';
+import { logUnaryPermissionEvent } from '../utils.js';
+import { bashToolUseOptions } from './bashToolUseOptions.js';
 
-const CHECKING_TEXT = 'Attempting to auto-approve\u2026'
+const CHECKING_TEXT = 'Attempting to auto-approve\u2026';
 
 // Isolates the 20fps shimmer clock from BashPermissionRequestInner. Before this
 // extraction, useShimmerAnimation lived inside the 535-line Inner body, so every
@@ -54,11 +51,7 @@ const CHECKING_TEXT = 'Attempting to auto-approve\u2026'
 // has a Compiler bailout (see below), so nothing was auto-memoized — the full
 // JSX tree was reconstructed 20-60 times per classifier check.
 function ClassifierCheckingSubtitle(): React.ReactNode {
-  const [ref, glimmerIndex] = useShimmerAnimation(
-    'requesting',
-    CHECKING_TEXT,
-    false,
-  )
+  const [ref, glimmerIndex] = useShimmerAnimation('requesting', CHECKING_TEXT, false);
   return (
     <Box ref={ref}>
       <Text>
@@ -74,28 +67,17 @@ function ClassifierCheckingSubtitle(): React.ReactNode {
         ))}
       </Text>
     </Box>
-  )
+  );
 }
 
-export function BashPermissionRequest(
-  props: PermissionRequestProps,
-): React.ReactNode {
-  const {
-    toolUseConfirm,
-    toolUseContext,
-    onDone,
-    onReject,
-    verbose,
-    workerBadge,
-  } = props
+export function BashPermissionRequest(props: PermissionRequestProps): React.ReactNode {
+  const { toolUseConfirm, toolUseContext, onDone, onReject, verbose, workerBadge } = props;
 
-  const { command, description } = BashTool.inputSchema.parse(
-    toolUseConfirm.input,
-  )
+  const { command, description } = BashTool.inputSchema.parse(toolUseConfirm.input);
 
   // Detect sed in-place edit commands and delegate to SedEditPermissionRequest
   // This renders sed edits like file edits with a diff view
-  const sedInfo = parseSedEditCommand(command)
+  const sedInfo = parseSedEditCommand(command);
 
   if (sedInfo) {
     return (
@@ -108,7 +90,7 @@ export function BashPermissionRequest(
         workerBadge={workerBadge}
         sedInfo={sedInfo}
       />
-    )
+    );
   }
 
   // Regular bash command - render with hooks
@@ -123,7 +105,7 @@ export function BashPermissionRequest(
       command={command}
       description={description}
     />
-  )
+  );
 }
 
 // Inner component that uses hooks - only called for non-MCP CLI commands
@@ -137,17 +119,17 @@ function BashPermissionRequestInner({
   command,
   description,
 }: PermissionRequestProps & {
-  command: string
-  description?: string
+  command: string;
+  description?: string;
 }): React.ReactNode {
-  const [theme] = useTheme()
-  const toolPermissionContext = useAppState(s => s.toolPermissionContext)
+  const [theme] = useTheme();
+  const toolPermissionContext = useAppState(s => s.toolPermissionContext);
   const explainerState = usePermissionExplainerUI({
     toolName: toolUseConfirm.tool.name,
     toolInput: toolUseConfirm.input,
     toolDescription: toolUseConfirm.description,
     messages: toolUseContext.messages,
-  })
+  });
   const {
     yesInputMode,
     noInputMode,
@@ -166,33 +148,28 @@ function BashPermissionRequestInner({
     onDone,
     onReject,
     explainerVisible: explainerState.visible,
-  })
-  const [showPermissionDebug, setShowPermissionDebug] = useState(false)
-  const [classifierDescription, setClassifierDescription] = useState(
-    description || '',
-  )
+  });
+  const [showPermissionDebug, setShowPermissionDebug] = useState(false);
+  const [classifierDescription, setClassifierDescription] = useState(description || '');
   // Track whether the initial description (from prop or async generation) was empty.
   // Once we receive a non-empty description, this stays false.
-  const [
-    initialClassifierDescriptionEmpty,
-    setInitialClassifierDescriptionEmpty,
-  ] = useState(!description?.trim())
+  const [initialClassifierDescriptionEmpty, setInitialClassifierDescriptionEmpty] = useState(!description?.trim());
 
   // Asynchronously generate a generic description for the classifier
   useEffect(() => {
-    if (!isClassifierPermissionsEnabled()) return
+    if (!isClassifierPermissionsEnabled()) return;
 
-    const abortController = new AbortController()
+    const abortController = new AbortController();
     generateGenericDescription(command, description, abortController.signal)
       .then(generic => {
         if (generic && !abortController.signal.aborted) {
-          setClassifierDescription(generic)
-          setInitialClassifierDescriptionEmpty(false)
+          setClassifierDescription(generic);
+          setInitialClassifierDescriptionEmpty(false);
         }
       })
-      .catch(() => {}) // Keep original on error
-    return () => abortController.abort()
-  }, [command, description])
+      .catch(() => {}); // Keep original on error
+    return () => abortController.abort();
+  }, [command, description]);
 
   // GH#11380: For compound commands (cd src && git status && npm test), the
   // backend already computed correct per-subcommand suggestions via tree-sitter
@@ -208,8 +185,7 @@ function BashPermissionRequestInner({
   // from the backend rule. When compound with 2+ rules, editablePrefix stays
   // undefined so bashToolUseOptions falls through to yes-apply-suggestions,
   // which saves all per-subcommand rules atomically.
-  const isCompound =
-    toolUseConfirm.permissionResult.decisionReason?.type === 'subcommandResults'
+  const isCompound = toolUseConfirm.permissionResult.decisionReason?.type === 'subcommandResults';
 
   // Editable prefix — initialize synchronously with the best prefix we can
   // extract without tree-sitter, then refine via tree-sitter for compound
@@ -219,52 +195,44 @@ function BashPermissionRequestInner({
   //
   // Lazy initializer: this runs regex + split on every render if left in
   // the render body; it's only needed for initial state.
-  const [editablePrefix, setEditablePrefix] = useState<string | undefined>(
-    () => {
-      if (isCompound) {
-        // Backend suggestion is the source of truth for compound commands.
-        // Single rule → seed the editable input so the user can refine it.
-        // Multiple/zero rules → undefined → yes-apply-suggestions handles it.
-        const backendBashRules = extractRules(
-          'suggestions' in toolUseConfirm.permissionResult
-            ? toolUseConfirm.permissionResult.suggestions
-            : undefined,
-        ).filter(r => r.toolName === BashTool.name && r.ruleContent)
-        return backendBashRules.length === 1
-          ? backendBashRules[0]!.ruleContent
-          : undefined
-      }
-      const two = getSimpleCommandPrefix(command)
-      if (two) return `${two}:*`
-      const one = getFirstWordPrefix(command)
-      if (one) return `${one}:*`
-      return command
-    },
-  )
-  const hasUserEditedPrefix = useRef(false)
+  const [editablePrefix, setEditablePrefix] = useState<string | undefined>(() => {
+    if (isCompound) {
+      // Backend suggestion is the source of truth for compound commands.
+      // Single rule → seed the editable input so the user can refine it.
+      // Multiple/zero rules → undefined → yes-apply-suggestions handles it.
+      const backendBashRules = extractRules(
+        'suggestions' in toolUseConfirm.permissionResult ? toolUseConfirm.permissionResult.suggestions : undefined,
+      ).filter(r => r.toolName === BashTool.name && r.ruleContent);
+      return backendBashRules.length === 1 ? backendBashRules[0]!.ruleContent : undefined;
+    }
+    const two = getSimpleCommandPrefix(command);
+    if (two) return `${two}:*`;
+    const one = getFirstWordPrefix(command);
+    if (one) return `${one}:*`;
+    return command;
+  });
+  const hasUserEditedPrefix = useRef(false);
   const onEditablePrefixChange = useCallback((value: string) => {
-    hasUserEditedPrefix.current = true
-    setEditablePrefix(value)
-  }, [])
+    hasUserEditedPrefix.current = true;
+    setEditablePrefix(value);
+  }, []);
   useEffect(() => {
     // Skip async refinement for compound commands — the backend already ran
     // the full per-subcommand analysis and its suggestion is correct.
-    if (isCompound) return
-    let cancelled = false
-    getCompoundCommandPrefixesStatic(command, subcmd =>
-      BashTool.isReadOnly({ command: subcmd }),
-    )
+    if (isCompound) return;
+    let cancelled = false;
+    getCompoundCommandPrefixesStatic(command, subcmd => BashTool.isReadOnly({ command: subcmd }))
       .then(prefixes => {
-        if (cancelled || hasUserEditedPrefix.current) return
+        if (cancelled || hasUserEditedPrefix.current) return;
         if (prefixes.length > 0) {
-          setEditablePrefix(`${prefixes[0]}:*`)
+          setEditablePrefix(`${prefixes[0]}:*`);
         }
       })
-      .catch(() => {}) // Keep sync prefix on tree-sitter failure
+      .catch(() => {}); // Keep sync prefix on tree-sitter failure
     return () => {
-      cancelled = true
-    }
-  }, [command, isCompound])
+      cancelled = true;
+    };
+  }, [command, isCompound]);
 
   // Track whether classifier check was ever in progress (persists after completion).
   // classifierCheckInProgress is set once at queue-push time (interactiveHandler)
@@ -272,10 +240,8 @@ function BashPermissionRequestInner({
   // sufficient — no latch/ref needed. The feature() ternary keeps the property
   // read out of external builds (forbidden-string check).
   const [classifierWasChecking] = useState(
-    feature('BASH_CLASSIFIER')
-      ? !!toolUseConfirm.classifierCheckInProgress
-      : false,
-  )
+    feature('BASH_CLASSIFIER') ? !!toolUseConfirm.classifierCheckInProgress : false,
+  );
 
   // These derive solely from the tool input (fixed for the dialog lifetime).
   // The shimmer clock used to live in this component and re-render it at 20fps
@@ -284,39 +250,30 @@ function BashPermissionRequestInner({
   // prove side-effect freedom), so this useMemo still guards against any
   // re-render source (e.g. Inner state updates). Same pattern as PR#20730.
   const { destructiveWarning, sandboxingEnabled, isSandboxed } = useMemo(() => {
-    const destructiveWarning = getFeatureValue_CACHED_MAY_BE_STALE(
-      'tengu_destructive_command_warning',
-      false,
-    )
+    const destructiveWarning = getFeatureValue_CACHED_MAY_BE_STALE('tengu_destructive_command_warning', false)
       ? getDestructiveCommandWarning(command)
-      : null
+      : null;
 
-    const sandboxingEnabled = SandboxManager.isSandboxingEnabled()
-    const isSandboxed =
-      sandboxingEnabled && shouldUseSandbox(toolUseConfirm.input)
+    const sandboxingEnabled = SandboxManager.isSandboxingEnabled();
+    const isSandboxed = sandboxingEnabled && shouldUseSandbox(toolUseConfirm.input);
 
-    return { destructiveWarning, sandboxingEnabled, isSandboxed }
-  }, [command, toolUseConfirm.input])
+    return { destructiveWarning, sandboxingEnabled, isSandboxed };
+  }, [command, toolUseConfirm.input]);
 
-  const unaryEvent = useMemo<UnaryEvent>(
-    () => ({ completion_type: 'tool_use_single', language_name: 'none' }),
-    [],
-  )
+  const unaryEvent = useMemo<UnaryEvent>(() => ({ completion_type: 'tool_use_single', language_name: 'none' }), []);
 
-  usePermissionRequestLogging(toolUseConfirm, unaryEvent)
+  usePermissionRequestLogging(toolUseConfirm, unaryEvent);
 
   const existingAllowDescriptions = useMemo(
     () => getBashPromptAllowDescriptions(toolPermissionContext),
     [toolPermissionContext],
-  )
+  );
 
   const options = useMemo(
     () =>
       bashToolUseOptions({
         suggestions:
-          toolUseConfirm.permissionResult.behavior === 'ask'
-            ? toolUseConfirm.permissionResult.suggestions
-            : undefined,
+          toolUseConfirm.permissionResult.behavior === 'ask' ? toolUseConfirm.permissionResult.suggestions : undefined,
         decisionReason: toolUseConfirm.permissionResult.decisionReason,
         onRejectFeedbackChange: setRejectFeedback,
         onAcceptFeedbackChange: setAcceptFeedback,
@@ -339,26 +296,24 @@ function BashPermissionRequestInner({
       editablePrefix,
       onEditablePrefixChange,
     ],
-  )
+  );
 
   // Toggle permission debug info with keybinding
   const handleToggleDebug = useCallback(() => {
-    setShowPermissionDebug(prev => !prev)
-  }, [])
+    setShowPermissionDebug(prev => !prev);
+  }, []);
   useKeybinding('permission:toggleDebug', handleToggleDebug, {
     context: 'Confirmation',
-  })
+  });
 
   // Allow Esc to dismiss the checkmark after auto-approval
   const handleDismissCheckmark = useCallback(() => {
-    toolUseConfirm.onDismissCheckmark?.()
-  }, [toolUseConfirm])
+    toolUseConfirm.onDismissCheckmark?.();
+  }, [toolUseConfirm]);
   useKeybinding('confirm:no', handleDismissCheckmark, {
     context: 'Confirmation',
-    isActive: feature('BASH_CLASSIFIER')
-      ? !!toolUseConfirm.classifierAutoApproved
-      : false,
-  })
+    isActive: feature('BASH_CLASSIFIER') ? !!toolUseConfirm.classifierAutoApproved : false,
+  });
 
   function onSelect(value: string) {
     // Map options to numeric values for analytics (strings not allowed in logEvent)
@@ -367,7 +322,7 @@ function BashPermissionRequestInner({
       'yes-apply-suggestions': 2,
       'yes-prefix-edited': 2,
       no: 3,
-    }
+    };
     if (feature('BASH_CLASSIFIER')) {
       optionIndex = {
         yes: 1,
@@ -375,22 +330,22 @@ function BashPermissionRequestInner({
         'yes-prefix-edited': 2,
         'yes-classifier-reviewed': 3,
         no: 4,
-      }
+      };
     }
     logEvent('tengu_permission_request_option_selected', {
       option_index: optionIndex[value],
       explainer_visible: explainerState.visible,
-    })
+    });
 
     const toolNameForAnalytics = sanitizeToolNameForAnalytics(
       toolUseConfirm.tool.name,
-    ) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS
+    ) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS;
 
     if (value === 'yes-prefix-edited') {
-      const trimmedPrefix = (editablePrefix ?? '').trim()
-      logUnaryPermissionEvent('tool_use_single', toolUseConfirm, 'accept')
+      const trimmedPrefix = (editablePrefix ?? '').trim();
+      logUnaryPermissionEvent('tool_use_single', toolUseConfirm, 'accept');
       if (!trimmedPrefix) {
-        toolUseConfirm.onAllow(toolUseConfirm.input, [])
+        toolUseConfirm.onAllow(toolUseConfirm.input, []);
       } else {
         const prefixUpdates: PermissionUpdate[] = [
           {
@@ -404,18 +359,18 @@ function BashPermissionRequestInner({
             behavior: 'allow',
             destination: 'localSettings',
           },
-        ]
-        toolUseConfirm.onAllow(toolUseConfirm.input, prefixUpdates)
+        ];
+        toolUseConfirm.onAllow(toolUseConfirm.input, prefixUpdates);
       }
-      onDone()
-      return
+      onDone();
+      return;
     }
 
     if (feature('BASH_CLASSIFIER') && value === 'yes-classifier-reviewed') {
-      const trimmedDescription = classifierDescription.trim()
-      logUnaryPermissionEvent('tool_use_single', toolUseConfirm, 'accept')
+      const trimmedDescription = classifierDescription.trim();
+      logUnaryPermissionEvent('tool_use_single', toolUseConfirm, 'accept');
       if (!trimmedDescription) {
-        toolUseConfirm.onAllow(toolUseConfirm.input, [])
+        toolUseConfirm.onAllow(toolUseConfirm.input, []);
       } else {
         const permissionUpdates: PermissionUpdate[] = [
           {
@@ -429,17 +384,17 @@ function BashPermissionRequestInner({
             behavior: 'allow',
             destination: 'session',
           },
-        ]
-        toolUseConfirm.onAllow(toolUseConfirm.input, permissionUpdates)
+        ];
+        toolUseConfirm.onAllow(toolUseConfirm.input, permissionUpdates);
       }
-      onDone()
-      return
+      onDone();
+      return;
     }
 
     switch (value) {
       case 'yes': {
-        const trimmedFeedback = acceptFeedback.trim()
-        logUnaryPermissionEvent('tool_use_single', toolUseConfirm, 'accept')
+        const trimmedFeedback = acceptFeedback.trim();
+        logUnaryPermissionEvent('tool_use_single', toolUseConfirm, 'accept');
         // Log accept submission with feedback context
         logEvent('tengu_accept_submitted', {
           toolName: toolNameForAnalytics,
@@ -447,28 +402,22 @@ function BashPermissionRequestInner({
           has_instructions: !!trimmedFeedback,
           instructions_length: trimmedFeedback.length,
           entered_feedback_mode: yesFeedbackModeEntered,
-        })
-        toolUseConfirm.onAllow(
-          toolUseConfirm.input,
-          [],
-          trimmedFeedback || undefined,
-        )
-        onDone()
-        break
+        });
+        toolUseConfirm.onAllow(toolUseConfirm.input, [], trimmedFeedback || undefined);
+        onDone();
+        break;
       }
       case 'yes-apply-suggestions': {
-        logUnaryPermissionEvent('tool_use_single', toolUseConfirm, 'accept')
+        logUnaryPermissionEvent('tool_use_single', toolUseConfirm, 'accept');
         // Extract suggestions if present (works for both 'ask' and 'passthrough' behaviors)
         const permissionUpdates =
-          'suggestions' in toolUseConfirm.permissionResult
-            ? toolUseConfirm.permissionResult.suggestions || []
-            : []
-        toolUseConfirm.onAllow(toolUseConfirm.input, permissionUpdates)
-        onDone()
-        break
+          'suggestions' in toolUseConfirm.permissionResult ? toolUseConfirm.permissionResult.suggestions || [] : [];
+        toolUseConfirm.onAllow(toolUseConfirm.input, permissionUpdates);
+        onDone();
+        break;
       }
       case 'no': {
-        const trimmedFeedback = rejectFeedback.trim()
+        const trimmedFeedback = rejectFeedback.trim();
 
         // Log reject submission with feedback context
         logEvent('tengu_reject_submitted', {
@@ -477,11 +426,11 @@ function BashPermissionRequestInner({
           has_instructions: !!trimmedFeedback,
           instructions_length: trimmedFeedback.length,
           entered_feedback_mode: noFeedbackModeEntered,
-        })
+        });
 
         // Process rejection (with or without feedback)
-        handleReject(trimmedFeedback || undefined)
-        break
+        handleReject(trimmedFeedback || undefined);
+        break;
       }
     }
   }
@@ -503,16 +452,12 @@ function BashPermissionRequestInner({
     ) : classifierWasChecking ? (
       <Text dimColor>Requires manual approval</Text>
     ) : undefined
-  ) : undefined
+  ) : undefined;
 
   return (
     <PermissionDialog
       workerBadge={workerBadge}
-      title={
-        sandboxingEnabled && !isSandboxed
-          ? 'Bash command (unsandboxed)'
-          : 'Bash command'
-      }
+      title={sandboxingEnabled && !isSandboxed ? 'Bash command (unsandboxed)' : 'Bash command'}
       subtitle={classifierSubtitle}
     >
       <Box flexDirection="column" paddingX={2} paddingY={1}>
@@ -522,20 +467,12 @@ function BashPermissionRequestInner({
             { theme, verbose: true }, // always show the full command
           )}
         </Text>
-        {!explainerState.visible && (
-          <Text dimColor>{toolUseConfirm.description}</Text>
-        )}
-        <PermissionExplainerContent
-          visible={explainerState.visible}
-          promise={explainerState.promise}
-        />
+        {!explainerState.visible && <Text dimColor>{toolUseConfirm.description}</Text>}
+        <PermissionExplainerContent visible={explainerState.visible} promise={explainerState.promise} />
       </Box>
       {showPermissionDebug ? (
         <>
-          <PermissionDecisionDebugInfo
-            permissionResult={toolUseConfirm.permissionResult}
-            toolName="Bash"
-          />
+          <PermissionDecisionDebugInfo permissionResult={toolUseConfirm.permissionResult} toolName="Bash" />
           {toolUseContext.options.debug && (
             <Box justifyContent="flex-end" marginTop={1}>
               <Text dimColor>Ctrl-D to hide debug info</Text>
@@ -545,31 +482,18 @@ function BashPermissionRequestInner({
       ) : (
         <>
           <Box flexDirection="column">
-            <PermissionRuleExplanation
-              permissionResult={toolUseConfirm.permissionResult}
-              toolType="command"
-            />
+            <PermissionRuleExplanation permissionResult={toolUseConfirm.permissionResult} toolType="command" />
             {destructiveWarning && (
               <Box marginBottom={1}>
                 <Text
                   color="warning"
-                  dimColor={
-                    feature('BASH_CLASSIFIER')
-                      ? toolUseConfirm.classifierAutoApproved
-                      : false
-                  }
+                  dimColor={feature('BASH_CLASSIFIER') ? toolUseConfirm.classifierAutoApproved : false}
                 >
                   {destructiveWarning}
                 </Text>
               </Box>
             )}
-            <Text
-              dimColor={
-                feature('BASH_CLASSIFIER')
-                  ? toolUseConfirm.classifierAutoApproved
-                  : false
-              }
-            >
+            <Text dimColor={feature('BASH_CLASSIFIER') ? toolUseConfirm.classifierAutoApproved : false}>
               Do you want to proceed?
             </Text>
             <Select
@@ -580,11 +504,7 @@ function BashPermissionRequestInner({
                     : options
                   : options
               }
-              isDisabled={
-                feature('BASH_CLASSIFIER')
-                  ? toolUseConfirm.classifierAutoApproved
-                  : false
-              }
+              isDisabled={feature('BASH_CLASSIFIER') ? toolUseConfirm.classifierAutoApproved : false}
               inlineDescriptions
               onChange={onSelect}
               onCancel={() => handleReject()}
@@ -595,18 +515,14 @@ function BashPermissionRequestInner({
           <Box justifyContent="space-between" marginTop={1}>
             <Text dimColor>
               Esc to cancel
-              {((focusedOption === 'yes' && !yesInputMode) ||
-                (focusedOption === 'no' && !noInputMode)) &&
+              {((focusedOption === 'yes' && !yesInputMode) || (focusedOption === 'no' && !noInputMode)) &&
                 ' · Tab to amend'}
-              {explainerState.enabled &&
-                ` · ctrl+e to ${explainerState.visible ? 'hide' : 'explain'}`}
+              {explainerState.enabled && ` · ctrl+e to ${explainerState.visible ? 'hide' : 'explain'}`}
             </Text>
-            {toolUseContext.options.debug && (
-              <Text dimColor>Ctrl+d to show debug info</Text>
-            )}
+            {toolUseContext.options.debug && <Text dimColor>Ctrl+d to show debug info</Text>}
           </Box>
         </>
       )}
     </PermissionDialog>
-  )
+  );
 }
diff --git a/src/components/permissions/BashPermissionRequest/bashToolUseOptions.tsx b/src/components/permissions/BashPermissionRequest/bashToolUseOptions.tsx
index b6a073ad0..7a485ad9a 100644
--- a/src/components/permissions/BashPermissionRequest/bashToolUseOptions.tsx
+++ b/src/components/permissions/BashPermissionRequest/bashToolUseOptions.tsx
@@ -1,41 +1,35 @@
-import { BASH_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/BashTool/toolName.js'
-import { extractOutputRedirections } from '../../../utils/bash/commands.js'
-import { isClassifierPermissionsEnabled } from '../../../utils/permissions/bashClassifier.js'
-import type { PermissionDecisionReason } from '../../../utils/permissions/PermissionResult.js'
-import type { PermissionUpdate } from '../../../utils/permissions/PermissionUpdateSchema.js'
-import { shouldShowAlwaysAllowOptions } from '../../../utils/permissions/permissionsLoader.js'
-import type { OptionWithDescription } from '../../CustomSelect/select.js'
-import { generateShellSuggestionsLabel } from '../shellPermissionHelpers.js'
+import { BASH_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/BashTool/toolName.js';
+import { extractOutputRedirections } from '../../../utils/bash/commands.js';
+import { isClassifierPermissionsEnabled } from '../../../utils/permissions/bashClassifier.js';
+import type { PermissionDecisionReason } from '../../../utils/permissions/PermissionResult.js';
+import type { PermissionUpdate } from '../../../utils/permissions/PermissionUpdateSchema.js';
+import { shouldShowAlwaysAllowOptions } from '../../../utils/permissions/permissionsLoader.js';
+import type { OptionWithDescription } from '../../CustomSelect/select.js';
+import { generateShellSuggestionsLabel } from '../shellPermissionHelpers.js';
 
 export type BashToolUseOption =
   | 'yes'
   | 'yes-apply-suggestions'
   | 'yes-prefix-edited'
   | 'yes-classifier-reviewed'
-  | 'no'
+  | 'no';
 
 /**
  * Check if a description already exists in the allow list.
  * Compares lowercase and trailing-whitespace-trimmed versions.
  */
-function descriptionAlreadyExists(
-  description: string,
-  existingDescriptions: string[],
-): boolean {
-  const normalized = description.toLowerCase().trimEnd()
-  return existingDescriptions.some(
-    existing => existing.toLowerCase().trimEnd() === normalized,
-  )
+function descriptionAlreadyExists(description: string, existingDescriptions: string[]): boolean {
+  const normalized = description.toLowerCase().trimEnd();
+  return existingDescriptions.some(existing => existing.toLowerCase().trimEnd() === normalized);
 }
 
 /**
  * Strip output redirections so filenames don't show as commands in the label.
  */
 function stripBashRedirections(command: string): string {
-  const { commandWithoutRedirections, redirections } =
-    extractOutputRedirections(command)
+  const { commandWithoutRedirections, redirections } = extractOutputRedirections(command);
   // Only use stripped version if there were actual redirections
-  return redirections.length > 0 ? commandWithoutRedirections : command
+  return redirections.length > 0 ? commandWithoutRedirections : command;
 }
 
 export function bashToolUseOptions({
@@ -52,23 +46,23 @@ export function bashToolUseOptions({
   editablePrefix,
   onEditablePrefixChange,
 }: {
-  suggestions?: PermissionUpdate[]
-  decisionReason?: PermissionDecisionReason
-  onRejectFeedbackChange: (value: string) => void
-  onAcceptFeedbackChange: (value: string) => void
-  onClassifierDescriptionChange?: (value: string) => void
-  classifierDescription?: string
+  suggestions?: PermissionUpdate[];
+  decisionReason?: PermissionDecisionReason;
+  onRejectFeedbackChange: (value: string) => void;
+  onAcceptFeedbackChange: (value: string) => void;
+  onClassifierDescriptionChange?: (value: string) => void;
+  classifierDescription?: string;
   /** Whether the initial classifier description was empty. When true, hides the option. */
-  initialClassifierDescriptionEmpty?: boolean
-  existingAllowDescriptions?: string[]
-  yesInputMode?: boolean
-  noInputMode?: boolean
+  initialClassifierDescriptionEmpty?: boolean;
+  existingAllowDescriptions?: string[];
+  yesInputMode?: boolean;
+  noInputMode?: boolean;
   /** Editable prefix rule content (e.g., "npm run:*"). When set, replaces Haiku-based suggestions. */
-  editablePrefix?: string
+  editablePrefix?: string;
   /** Callback when the user edits the prefix value. */
-  onEditablePrefixChange?: (value: string) => void
+  onEditablePrefixChange?: (value: string) => void;
 }): OptionWithDescription<BashToolUseOption>[] {
-  const options: OptionWithDescription<BashToolUseOption>[] = []
+  const options: OptionWithDescription<BashToolUseOption>[] = [];
 
   if (yesInputMode) {
     options.push({
@@ -78,12 +72,12 @@ export function bashToolUseOptions({
       placeholder: 'and tell Claude what to do next',
       onChange: onAcceptFeedbackChange,
       allowEmptySubmitToCancel: true,
-    })
+    });
   } else {
     options.push({
       label: 'Yes',
       value: 'yes',
-    })
+    });
   }
 
   // Only show "always allow" options when not restricted by allowManagedPermissionRulesOnly
@@ -93,17 +87,9 @@ export function bashToolUseOptions({
     // don't contain non-Bash items (addDirectories, Read rules) that
     // the editable prefix can't represent.
     const hasNonBashSuggestions = suggestions.some(
-      s =>
-        s.type === 'addDirectories' ||
-        (s.type === 'addRules' &&
-          s.rules?.some(r => r.toolName !== BASH_TOOL_NAME)),
-    )
-    if (
-      editablePrefix !== undefined &&
-      onEditablePrefixChange &&
-      !hasNonBashSuggestions &&
-      suggestions.length > 0
-    ) {
+      s => s.type === 'addDirectories' || (s.type === 'addRules' && s.rules?.some(r => r.toolName !== BASH_TOOL_NAME)),
+    );
+    if (editablePrefix !== undefined && onEditablePrefixChange && !hasNonBashSuggestions && suggestions.length > 0) {
       options.push({
         type: 'input',
         label: 'Yes, and don\u2019t ask again for',
@@ -115,19 +101,15 @@ export function bashToolUseOptions({
         showLabelWithValue: true,
         labelValueSeparator: ': ',
         resetCursorOnUpdate: true,
-      })
+      });
     } else if (suggestions.length > 0) {
-      const label = generateShellSuggestionsLabel(
-        suggestions,
-        BASH_TOOL_NAME,
-        stripBashRedirections,
-      )
+      const label = generateShellSuggestionsLabel(suggestions, BASH_TOOL_NAME, stripBashRedirections);
 
       if (label) {
         options.push({
           label,
           value: 'yes-apply-suggestions',
-        })
+        });
       }
     }
 
@@ -137,19 +119,14 @@ export function bashToolUseOptions({
     // (prompt-based rules don't help when the server-side classifier triggers first).
     // Skip when the editable prefix option is already shown — they serve the
     // same role and having two identical-looking "don't ask again" inputs is confusing.
-    const editablePrefixShown = options.some(
-      o => o.value === 'yes-prefix-edited',
-    )
+    const editablePrefixShown = options.some(o => o.value === 'yes-prefix-edited');
     if (
       process.env.USER_TYPE === 'ant' &&
       !editablePrefixShown &&
       isClassifierPermissionsEnabled() &&
       onClassifierDescriptionChange &&
       !initialClassifierDescriptionEmpty &&
-      !descriptionAlreadyExists(
-        classifierDescription ?? '',
-        existingAllowDescriptions,
-      ) &&
+      !descriptionAlreadyExists(classifierDescription ?? '', existingAllowDescriptions) &&
       decisionReason?.type !== 'classifier'
     ) {
       options.push({
@@ -163,7 +140,7 @@ export function bashToolUseOptions({
         showLabelWithValue: true,
         labelValueSeparator: ': ',
         resetCursorOnUpdate: true,
-      })
+      });
     }
   }
 
@@ -175,13 +152,13 @@ export function bashToolUseOptions({
       placeholder: 'and tell Claude what to do differently',
       onChange: onRejectFeedbackChange,
       allowEmptySubmitToCancel: true,
-    })
+    });
   } else {
     options.push({
       label: 'No',
       value: 'no',
-    })
+    });
   }
 
-  return options
+  return options;
 }
diff --git a/src/components/permissions/ComputerUseApproval/ComputerUseApproval.tsx b/src/components/permissions/ComputerUseApproval/ComputerUseApproval.tsx
index 6eecf1be3..9e554b5a3 100644
--- a/src/components/permissions/ComputerUseApproval/ComputerUseApproval.tsx
+++ b/src/components/permissions/ComputerUseApproval/ComputerUseApproval.tsx
@@ -1,29 +1,26 @@
-import { getSentinelCategory } from '@ant/computer-use-mcp/sentinelApps'
-import type {
-  CuPermissionRequest,
-  CuPermissionResponse,
-} from '@ant/computer-use-mcp/types'
-import { DEFAULT_GRANT_FLAGS } from '@ant/computer-use-mcp/types'
-import figures from 'figures'
-import * as React from 'react'
-import { useMemo, useState } from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { execFileNoThrow } from '../../../utils/execFileNoThrow.js'
-import { plural } from '../../../utils/stringUtils.js'
-import type { OptionWithDescription } from '../../CustomSelect/select.js'
-import { Select } from '../../CustomSelect/select.js'
-import { Dialog } from '@anthropic/ink'
+import { getSentinelCategory } from '@ant/computer-use-mcp/sentinelApps';
+import type { CuPermissionRequest, CuPermissionResponse } from '@ant/computer-use-mcp/types';
+import { DEFAULT_GRANT_FLAGS } from '@ant/computer-use-mcp/types';
+import figures from 'figures';
+import * as React from 'react';
+import { useMemo, useState } from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { execFileNoThrow } from '../../../utils/execFileNoThrow.js';
+import { plural } from '../../../utils/stringUtils.js';
+import type { OptionWithDescription } from '../../CustomSelect/select.js';
+import { Select } from '../../CustomSelect/select.js';
+import { Dialog } from '@anthropic/ink';
 
 type ComputerUseApprovalProps = {
-  request: CuPermissionRequest
-  onDone: (response: CuPermissionResponse) => void
-}
+  request: CuPermissionRequest;
+  onDone: (response: CuPermissionResponse) => void;
+};
 
 const DENY_ALL_RESPONSE: CuPermissionResponse = {
   granted: [],
   denied: [],
   flags: DEFAULT_GRANT_FLAGS,
-}
+};
 
 /**
  * Two-panel dispatcher. When `request.tccState` is present, macOS permissions
@@ -31,74 +28,64 @@ const DENY_ALL_RESPONSE: CuPermissionResponse = {
  * irrelevant — show a TCC panel that opens System Settings. Otherwise show the
  * app allowlist + grant-flags panel.
  */
-export function ComputerUseApproval({
-  request,
-  onDone,
-}: ComputerUseApprovalProps): React.ReactNode {
+export function ComputerUseApproval({ request, onDone }: ComputerUseApprovalProps): React.ReactNode {
   return request.tccState ? (
-    <ComputerUseTccPanel
-      tccState={request.tccState}
-      onDone={() => onDone(DENY_ALL_RESPONSE)}
-    />
+    <ComputerUseTccPanel tccState={request.tccState} onDone={() => onDone(DENY_ALL_RESPONSE)} />
   ) : (
     <ComputerUseAppListPanel request={request} onDone={onDone} />
-  )
+  );
 }
 
 // ── TCC panel ─────────────────────────────────────────────────────────────
 
-type TccOption = 'open_accessibility' | 'open_screen_recording' | 'retry'
+type TccOption = 'open_accessibility' | 'open_screen_recording' | 'retry';
 
 function ComputerUseTccPanel({
   tccState,
   onDone,
 }: {
-  tccState: NonNullable<CuPermissionRequest['tccState']>
-  onDone: () => void
+  tccState: NonNullable<CuPermissionRequest['tccState']>;
+  onDone: () => void;
 }): React.ReactNode {
   const options = useMemo<OptionWithDescription<TccOption>[]>(() => {
-    const opts: OptionWithDescription<TccOption>[] = []
+    const opts: OptionWithDescription<TccOption>[] = [];
     if (!tccState.accessibility) {
       opts.push({
         label: 'Open System Settings → Accessibility',
         value: 'open_accessibility',
-      })
+      });
     }
     if (!tccState.screenRecording) {
       opts.push({
         label: 'Open System Settings → Screen Recording',
         value: 'open_screen_recording',
-      })
+      });
     }
-    opts.push({ label: 'Try again', value: 'retry' })
-    return opts
-  }, [tccState.accessibility, tccState.screenRecording])
+    opts.push({ label: 'Try again', value: 'retry' });
+    return opts;
+  }, [tccState.accessibility, tccState.screenRecording]);
 
   function onChange(value: TccOption): void {
     switch (value) {
       case 'open_accessibility':
         void execFileNoThrow(
           'open',
-          [
-            'x-apple.systempreferences:com.apple.preference.security?Privacy_Accessibility',
-          ],
+          ['x-apple.systempreferences:com.apple.preference.security?Privacy_Accessibility'],
           { useCwd: false },
-        )
-        return
+        );
+        return;
       case 'open_screen_recording':
         void execFileNoThrow(
           'open',
-          [
-            'x-apple.systempreferences:com.apple.preference.security?Privacy_ScreenCapture',
-          ],
+          ['x-apple.systempreferences:com.apple.preference.security?Privacy_ScreenCapture'],
           { useCwd: false },
-        )
-        return
+        );
+        return;
       case 'retry':
         // Resolve with deny-all — the model re-calls request_access, which
         // re-checks TCC and renders the app list if now granted.
-        onDone()
-        return
+        onDone();
+        return;
     }
   }
 
@@ -107,69 +94,47 @@ function ComputerUseTccPanel({
       <Box flexDirection="column" paddingX={1} paddingY={1} gap={1}>
         <Box flexDirection="column">
           <Text>
-            Accessibility:{' '}
-            {tccState.accessibility
-              ? `${figures.tick} granted`
-              : `${figures.cross} not granted`}
+            Accessibility: {tccState.accessibility ? `${figures.tick} granted` : `${figures.cross} not granted`}
           </Text>
           <Text>
-            Screen Recording:{' '}
-            {tccState.screenRecording
-              ? `${figures.tick} granted`
-              : `${figures.cross} not granted`}
+            Screen Recording: {tccState.screenRecording ? `${figures.tick} granted` : `${figures.cross} not granted`}
           </Text>
         </Box>
         <Text dimColor>
-          Grant the missing permissions in System Settings, then select
-          &quot;Try again&quot;. macOS may require you to restart Claude Code
-          after granting Screen Recording.
+          Grant the missing permissions in System Settings, then select &quot;Try again&quot;. macOS may require you to
+          restart Claude Code after granting Screen Recording.
         </Text>
         <Select options={options} onChange={onChange} onCancel={onDone} />
       </Box>
     </Dialog>
-  )
+  );
 }
 
 // ── App allowlist panel ───────────────────────────────────────────────────
 
-type AppListOption = 'allow_all' | 'deny'
+type AppListOption = 'allow_all' | 'deny';
 
-const SENTINEL_WARNING: Record<
-  NonNullable<ReturnType<typeof getSentinelCategory>>,
-  string
-> = {
+const SENTINEL_WARNING: Record<NonNullable<ReturnType<typeof getSentinelCategory>>, string> = {
   shell: 'equivalent to shell access',
   filesystem: 'can read/write any file',
   system_settings: 'can change system settings',
-}
+};
 
-function ComputerUseAppListPanel({
-  request,
-  onDone,
-}: ComputerUseApprovalProps): React.ReactNode {
+function ComputerUseAppListPanel({ request, onDone }: ComputerUseApprovalProps): React.ReactNode {
   // Pre-check every resolved, not-yet-granted app. Sentinels stay checked
   // too — the warning text is the signal, not an unchecked box.
   // Per-item toggles are a follow-up; for now every resolved app is granted
   // when the user accepts. `setChecked` is unused until then.
   const [checked] = useState<ReadonlySet<string>>(
-    () =>
-      new Set(
-        request.apps.flatMap(a =>
-          a.resolved && !a.alreadyGranted ? [a.resolved.bundleId] : [],
-        ),
-      ),
-  )
+    () => new Set(request.apps.flatMap(a => (a.resolved && !a.alreadyGranted ? [a.resolved.bundleId] : []))),
+  );
 
-  type FlagKey = keyof typeof DEFAULT_GRANT_FLAGS
-  const ALL_FLAG_KEYS: FlagKey[] = [
-    'clipboardRead',
-    'clipboardWrite',
-    'systemKeyCombos',
-  ]
+  type FlagKey = keyof typeof DEFAULT_GRANT_FLAGS;
+  const ALL_FLAG_KEYS: FlagKey[] = ['clipboardRead', 'clipboardWrite', 'systemKeyCombos'];
   const requestedFlagKeys = useMemo(
     (): FlagKey[] => ALL_FLAG_KEYS.filter(k => request.requestedFlags[k]),
     [request.requestedFlags],
-  )
+  );
 
   const options = useMemo<OptionWithDescription<AppListOption>[]>(
     () => [
@@ -187,14 +152,14 @@ function ComputerUseAppListPanel({
       },
     ],
     [checked.size],
-  )
+  );
 
   function respond(allow: boolean): void {
     if (!allow) {
-      onDone(DENY_ALL_RESPONSE)
-      return
+      onDone(DENY_ALL_RESPONSE);
+      return;
     }
-    const now = Date.now()
+    const now = Date.now();
     const granted = request.apps.flatMap(a =>
       a.resolved && checked.has(a.resolved.bundleId)
         ? [
@@ -205,60 +170,52 @@ function ComputerUseAppListPanel({
             },
           ]
         : [],
-    )
+    );
     const denied = request.apps
       .filter(a => !a.resolved || !checked.has(a.resolved.bundleId))
       .map(a => ({
         bundleId: a.resolved?.bundleId ?? a.requestedName,
-        reason: a.resolved
-          ? ('user_denied' as const)
-          : ('not_installed' as const),
-      }))
+        reason: a.resolved ? ('user_denied' as const) : ('not_installed' as const),
+      }));
     // Grant all requested flags on allow — per-flag toggles are a follow-up.
     const flags = {
       ...DEFAULT_GRANT_FLAGS,
       ...Object.fromEntries(requestedFlagKeys.map(k => [k, true] as const)),
-    }
-    onDone({ granted, denied, flags })
+    };
+    onDone({ granted, denied, flags });
   }
 
   return (
-    <Dialog
-      title="Computer Use wants to control these apps"
-      onCancel={() => respond(false)}
-    >
+    <Dialog title="Computer Use wants to control these apps" onCancel={() => respond(false)}>
       <Box flexDirection="column" paddingX={1} paddingY={1} gap={1}>
         {request.reason ? <Text dimColor>{request.reason}</Text> : null}
 
         <Box flexDirection="column">
           {request.apps.map(a => {
-            const resolved = a.resolved
+            const resolved = a.resolved;
             if (!resolved) {
               return (
                 <Text key={a.requestedName} dimColor>
                   {'  '}
-                  {figures.circle} {a.requestedName}{' '}
-                  <Text dimColor>(not installed)</Text>
+                  {figures.circle} {a.requestedName} <Text dimColor>(not installed)</Text>
                 </Text>
-              )
+              );
             }
             if (a.alreadyGranted) {
               return (
                 <Text key={resolved.bundleId} dimColor>
                   {'  '}
-                  {figures.tick} {resolved.displayName}{' '}
-                  <Text dimColor>(already granted)</Text>
+                  {figures.tick} {resolved.displayName} <Text dimColor>(already granted)</Text>
                 </Text>
-              )
+              );
             }
-            const sentinel = getSentinelCategory(resolved.bundleId)
-            const isChecked = checked.has(resolved.bundleId)
+            const sentinel = getSentinelCategory(resolved.bundleId);
+            const isChecked = checked.has(resolved.bundleId);
             return (
               <Box key={resolved.bundleId} flexDirection="column">
                 <Text>
                   {'  '}
-                  {isChecked ? figures.circleFilled : figures.circle}{' '}
-                  {resolved.displayName}
+                  {isChecked ? figures.circleFilled : figures.circle} {resolved.displayName}
                 </Text>
                 {sentinel ? (
                   <Text bold>
@@ -267,7 +224,7 @@ function ComputerUseAppListPanel({
                   </Text>
                 ) : null}
               </Box>
-            )
+            );
           })}
         </Box>
 
@@ -284,18 +241,12 @@ function ComputerUseAppListPanel({
 
         {request.willHide && request.willHide.length > 0 ? (
           <Text dimColor>
-            {request.willHide.length} other{' '}
-            {plural(request.willHide.length, 'app')} will be hidden while Claude
-            works.
+            {request.willHide.length} other {plural(request.willHide.length, 'app')} will be hidden while Claude works.
           </Text>
         ) : null}
 
-        <Select
-          options={options}
-          onChange={v => respond(v === 'allow_all')}
-          onCancel={() => respond(false)}
-        />
+        <Select options={options} onChange={v => respond(v === 'allow_all')} onCancel={() => respond(false)} />
       </Box>
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/permissions/EnterPlanModePermissionRequest/EnterPlanModePermissionRequest.tsx b/src/components/permissions/EnterPlanModePermissionRequest/EnterPlanModePermissionRequest.tsx
index 9922f1680..3df45df7d 100644
--- a/src/components/permissions/EnterPlanModePermissionRequest/EnterPlanModePermissionRequest.tsx
+++ b/src/components/permissions/EnterPlanModePermissionRequest/EnterPlanModePermissionRequest.tsx
@@ -1,15 +1,15 @@
-import React from 'react'
-import { handlePlanModeTransition } from '../../../bootstrap/state.js'
-import { Box, Text } from '@anthropic/ink'
+import React from 'react';
+import { handlePlanModeTransition } from '../../../bootstrap/state.js';
+import { Box, Text } from '@anthropic/ink';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from '../../../services/analytics/index.js'
-import { useAppState } from '../../../state/AppState.js'
-import { isPlanModeInterviewPhaseEnabled } from '../../../utils/planModeV2.js'
-import { Select } from '../../CustomSelect/index.js'
-import { PermissionDialog } from '../PermissionDialog.js'
-import type { PermissionRequestProps } from '../PermissionRequest.js'
+} from '../../../services/analytics/index.js';
+import { useAppState } from '../../../state/AppState.js';
+import { isPlanModeInterviewPhaseEnabled } from '../../../utils/planModeV2.js';
+import { Select } from '../../CustomSelect/index.js';
+import { PermissionDialog } from '../PermissionDialog.js';
+import type { PermissionRequestProps } from '../PermissionRequest.js';
 
 export function EnterPlanModePermissionRequest({
   toolUseConfirm,
@@ -17,40 +17,28 @@ export function EnterPlanModePermissionRequest({
   onReject,
   workerBadge,
 }: PermissionRequestProps): React.ReactNode {
-  const toolPermissionContextMode = useAppState(
-    s => s.toolPermissionContext.mode,
-  )
+  const toolPermissionContextMode = useAppState(s => s.toolPermissionContext.mode);
 
   function handleResponse(value: 'yes' | 'no'): void {
     if (value === 'yes') {
       logEvent('tengu_plan_enter', {
         interviewPhaseEnabled: isPlanModeInterviewPhaseEnabled(),
-        entryMethod:
-          'tool' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
-      handlePlanModeTransition(toolPermissionContextMode, 'plan')
-      onDone()
-      toolUseConfirm.onAllow({}, [
-        { type: 'setMode', mode: 'plan', destination: 'session' },
-      ])
+        entryMethod: 'tool' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
+      handlePlanModeTransition(toolPermissionContextMode, 'plan');
+      onDone();
+      toolUseConfirm.onAllow({}, [{ type: 'setMode', mode: 'plan', destination: 'session' }]);
     } else {
-      onDone()
-      onReject()
-      toolUseConfirm.onReject()
+      onDone();
+      onReject();
+      toolUseConfirm.onReject();
     }
   }
 
   return (
-    <PermissionDialog
-      color="planMode"
-      title="Enter plan mode?"
-      workerBadge={workerBadge}
-    >
+    <PermissionDialog color="planMode" title="Enter plan mode?" workerBadge={workerBadge}>
       <Box flexDirection="column" marginTop={1} paddingX={1}>
-        <Text>
-          Claude wants to enter plan mode to explore and design an
-          implementation approach.
-        </Text>
+        <Text>Claude wants to enter plan mode to explore and design an implementation approach.</Text>
 
         <Box marginTop={1} flexDirection="column">
           <Text dimColor>In plan mode, Claude will:</Text>
@@ -61,9 +49,7 @@ export function EnterPlanModePermissionRequest({
         </Box>
 
         <Box marginTop={1}>
-          <Text dimColor>
-            No code changes will be made until you approve the plan.
-          </Text>
+          <Text dimColor>No code changes will be made until you approve the plan.</Text>
         </Box>
 
         <Box marginTop={1}>
@@ -78,5 +64,5 @@ export function EnterPlanModePermissionRequest({
         </Box>
       </Box>
     </PermissionDialog>
-  )
+  );
 }
diff --git a/src/components/permissions/ExitPlanModePermissionRequest/ExitPlanModePermissionRequest.tsx b/src/components/permissions/ExitPlanModePermissionRequest/ExitPlanModePermissionRequest.tsx
index 796ffeeec..a07f0a2b3 100644
--- a/src/components/permissions/ExitPlanModePermissionRequest/ExitPlanModePermissionRequest.tsx
+++ b/src/components/permissions/ExitPlanModePermissionRequest/ExitPlanModePermissionRequest.tsx
@@ -1,24 +1,13 @@
-import { feature } from 'bun:bundle'
-import type { UUID } from 'crypto'
-import figures from 'figures'
-import React, {
-  useCallback,
-  useEffect,
-  useLayoutEffect,
-  useMemo,
-  useRef,
-  useState,
-} from 'react'
-import { useNotifications } from 'src/context/notifications.js'
+import { feature } from 'bun:bundle';
+import type { UUID } from 'crypto';
+import figures from 'figures';
+import React, { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
+import { useNotifications } from 'src/context/notifications.js';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from 'src/services/analytics/index.js'
-import {
-  useAppState,
-  useAppStateStore,
-  useSetAppState,
-} from 'src/state/AppState.js'
+} from 'src/services/analytics/index.js';
+import { useAppState, useAppStateStore, useSetAppState } from 'src/state/AppState.js';
 import {
   getSdkBetas,
   getSessionId,
@@ -26,81 +15,63 @@ import {
   setHasExitedPlanMode,
   setNeedsAutoModeExitAttachment,
   setNeedsPlanModeExitAttachment,
-} from '../../../bootstrap/state.js'
-import { generateSessionName } from '../../../commands/rename/generateSessionName.js'
-import { launchUltraplan } from '../../../commands/ultraplan.js'
-import { type KeyboardEvent, Box, Text } from '@anthropic/ink'
-import type { AppState } from '../../../state/AppStateStore.js'
-import { AGENT_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/AgentTool/constants.js'
-import { EXIT_PLAN_MODE_V2_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/ExitPlanModeTool/constants.js'
-import type { AllowedPrompt } from '@claude-code-best/builtin-tools/tools/ExitPlanModeTool/ExitPlanModeV2Tool.js'
-import { TEAM_CREATE_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/TeamCreateTool/constants.js'
-import { isAgentSwarmsEnabled } from '../../../utils/agentSwarmsEnabled.js'
-import {
-  calculateContextPercentages,
-  getContextWindowForModel,
-} from '../../../utils/context.js'
-import { getExternalEditor } from '../../../utils/editor.js'
-import { getDisplayPath } from '../../../utils/file.js'
-import { toIDEDisplayName } from '../../../utils/ide.js'
-import { logError } from '../../../utils/log.js'
-import { enqueuePendingNotification } from '../../../utils/messageQueueManager.js'
-import { createUserMessage } from '../../../utils/messages.js'
-import {
-  getMainLoopModel,
-  getRuntimeMainLoopModel,
-} from '../../../utils/model/model.js'
+} from '../../../bootstrap/state.js';
+import { generateSessionName } from '../../../commands/rename/generateSessionName.js';
+import { launchUltraplan } from '../../../commands/ultraplan.js';
+import { type KeyboardEvent, Box, Text } from '@anthropic/ink';
+import type { AppState } from '../../../state/AppStateStore.js';
+import { AGENT_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/AgentTool/constants.js';
+import { EXIT_PLAN_MODE_V2_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/ExitPlanModeTool/constants.js';
+import type { AllowedPrompt } from '@claude-code-best/builtin-tools/tools/ExitPlanModeTool/ExitPlanModeV2Tool.js';
+import { TEAM_CREATE_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/TeamCreateTool/constants.js';
+import { isAgentSwarmsEnabled } from '../../../utils/agentSwarmsEnabled.js';
+import { calculateContextPercentages, getContextWindowForModel } from '../../../utils/context.js';
+import { getExternalEditor } from '../../../utils/editor.js';
+import { getDisplayPath } from '../../../utils/file.js';
+import { toIDEDisplayName } from '../../../utils/ide.js';
+import { logError } from '../../../utils/log.js';
+import { enqueuePendingNotification } from '../../../utils/messageQueueManager.js';
+import { createUserMessage } from '../../../utils/messages.js';
+import { getMainLoopModel, getRuntimeMainLoopModel } from '../../../utils/model/model.js';
 import {
   createPromptRuleContent,
   isClassifierPermissionsEnabled,
   PROMPT_PREFIX,
-} from '../../../utils/permissions/bashClassifier.js'
-import {
-  type PermissionMode,
-  toExternalPermissionMode,
-} from '../../../utils/permissions/PermissionMode.js'
-import type { PermissionUpdate } from '../../../utils/permissions/PermissionUpdateSchema.js'
+} from '../../../utils/permissions/bashClassifier.js';
+import { type PermissionMode, toExternalPermissionMode } from '../../../utils/permissions/PermissionMode.js';
+import type { PermissionUpdate } from '../../../utils/permissions/PermissionUpdateSchema.js';
 import {
   isAutoModeGateEnabled,
   restoreDangerousPermissions,
   stripDangerousPermissionsForAutoMode,
-} from '../../../utils/permissions/permissionSetup.js'
-import {
-  getPewterLedgerVariant,
-  isPlanModeInterviewPhaseEnabled,
-} from '../../../utils/planModeV2.js'
-import { getPlan, getPlanFilePath } from '../../../utils/plans.js'
-import {
-  editFileInEditor,
-  editPromptInEditor,
-} from '../../../utils/promptEditor.js'
+} from '../../../utils/permissions/permissionSetup.js';
+import { getPewterLedgerVariant, isPlanModeInterviewPhaseEnabled } from '../../../utils/planModeV2.js';
+import { getPlan, getPlanFilePath } from '../../../utils/plans.js';
+import { editFileInEditor, editPromptInEditor } from '../../../utils/promptEditor.js';
 import {
   getCurrentSessionTitle,
   getTranscriptPath,
   saveAgentName,
   saveCustomTitle,
-} from '../../../utils/sessionStorage.js'
-import { getSettings_DEPRECATED } from '../../../utils/settings/settings.js'
-import { type OptionWithDescription, Select } from '../../CustomSelect/index.js'
-import { Markdown } from '../../Markdown.js'
-import { PermissionDialog } from '../PermissionDialog.js'
-import type { PermissionRequestProps } from '../PermissionRequest.js'
-import { PermissionRuleExplanation } from '../PermissionRuleExplanation.js'
+} from '../../../utils/sessionStorage.js';
+import { getSettings_DEPRECATED } from '../../../utils/settings/settings.js';
+import { type OptionWithDescription, Select } from '../../CustomSelect/index.js';
+import { Markdown } from '../../Markdown.js';
+import { PermissionDialog } from '../PermissionDialog.js';
+import type { PermissionRequestProps } from '../PermissionRequest.js';
+import { PermissionRuleExplanation } from '../PermissionRuleExplanation.js';
 
 /* eslint-disable @typescript-eslint/no-require-imports */
 const autoModeStateModule = feature('TRANSCRIPT_CLASSIFIER')
   ? (require('../../../utils/permissions/autoModeState.js') as typeof import('../../../utils/permissions/autoModeState.js'))
-  : null
+  : null;
 
-import type {
-  Base64ImageSource,
-  ImageBlockParam,
-} from '@anthropic-ai/sdk/resources/messages.mjs'
+import type { Base64ImageSource, ImageBlockParam } from '@anthropic-ai/sdk/resources/messages.mjs';
 /* eslint-enable @typescript-eslint/no-require-imports */
-import type { PastedContent } from '../../../utils/config.js'
-import type { ImageDimensions } from '../../../utils/imageResizer.js'
-import { maybeResizeAndDownsampleImageBlock } from '../../../utils/imageResizer.js'
-import { cacheImagePath, storeImage } from '../../../utils/imageStore.js'
+import type { PastedContent } from '../../../utils/config.js';
+import type { ImageDimensions } from '../../../utils/imageResizer.js';
+import { maybeResizeAndDownsampleImageBlock } from '../../../utils/imageResizer.js';
+import { cacheImagePath, storeImage } from '../../../utils/imageStore.js';
 
 type ResponseValue =
   | 'yes-bypass-permissions'
@@ -110,30 +81,23 @@ type ResponseValue =
   | 'yes-resume-auto-mode'
   | 'yes-auto-clear-context'
   | 'ultraplan'
-  | 'no'
+  | 'no';
 
 /**
  * Build permission updates for plan approval, including prompt-based rules if provided.
  * Prompt-based rules are only added when classifier permissions are enabled (Ant-only).
  */
-export function buildPermissionUpdates(
-  mode: PermissionMode,
-  allowedPrompts?: AllowedPrompt[],
-): PermissionUpdate[] {
+export function buildPermissionUpdates(mode: PermissionMode, allowedPrompts?: AllowedPrompt[]): PermissionUpdate[] {
   const updates: PermissionUpdate[] = [
     {
       type: 'setMode',
       mode: toExternalPermissionMode(mode),
       destination: 'session',
     },
-  ]
+  ];
 
   // Add prompt-based permission rules if provided (Ant-only feature)
-  if (
-    isClassifierPermissionsEnabled() &&
-    allowedPrompts &&
-    allowedPrompts.length > 0
-  ) {
+  if (isClassifierPermissionsEnabled() && allowedPrompts && allowedPrompts.length > 0) {
     updates.push({
       type: 'addRules',
       rules: allowedPrompts.map(p => ({
@@ -142,10 +106,10 @@ export function buildPermissionUpdates(
       })),
       behavior: 'allow',
       destination: 'session',
-    })
+    });
   }
 
-  return updates
+  return updates;
 }
 
 /**
@@ -158,16 +122,13 @@ export function autoNameSessionFromPlan(
   setAppState: (updater: (prev: AppState) => AppState) => void,
   isClearContext: boolean,
 ): void {
-  if (
-    isSessionPersistenceDisabled() ||
-    getSettings_DEPRECATED()?.cleanupPeriodDays === 0
-  ) {
-    return
+  if (isSessionPersistenceDisabled() || getSettings_DEPRECATED()?.cleanupPeriodDays === 0) {
+    return;
   }
   // On clear-context, the current session is about to be abandoned — its
   // title (which may have been set by a PRIOR auto-name) is irrelevant.
   // Checking it would make the feature self-defeating after first use.
-  if (!isClearContext && getCurrentSessionTitle(getSessionId())) return
+  if (!isClearContext && getCurrentSessionTitle(getSessionId())) return;
   void generateSessionName(
     // generateSessionName tail-slices to the last 1000 chars (correct for
     // conversations, where recency matters). Plans front-load the goal and
@@ -179,20 +140,20 @@ export function autoNameSessionFromPlan(
       // On clear-context acceptance, regenerateSessionId() has run by now —
       // this intentionally names the NEW execution session. Do not "fix" by
       // capturing sessionId once; that would name the abandoned planning session.
-      if (!name || getCurrentSessionTitle(getSessionId())) return
-      const sessionId = getSessionId() as UUID
-      const fullPath = getTranscriptPath()
-      await saveCustomTitle(sessionId, name, fullPath, 'auto')
-      await saveAgentName(sessionId, name, fullPath, 'auto')
+      if (!name || getCurrentSessionTitle(getSessionId())) return;
+      const sessionId = getSessionId() as UUID;
+      const fullPath = getTranscriptPath();
+      await saveCustomTitle(sessionId, name, fullPath, 'auto');
+      await saveAgentName(sessionId, name, fullPath, 'auto');
       setAppState(prev => {
-        if (prev.standaloneAgentContext?.name === name) return prev
+        if (prev.standaloneAgentContext?.name === name) return prev;
         return {
           ...prev,
           standaloneAgentContext: { ...prev.standaloneAgentContext, name },
-        }
-      })
+        };
+      });
     })
-    .catch(logError)
+    .catch(logError);
 }
 
 export function ExitPlanModePermissionRequest({
@@ -202,54 +163,44 @@ export function ExitPlanModePermissionRequest({
   workerBadge,
   setStickyFooter,
 }: PermissionRequestProps): React.ReactNode {
-  const toolPermissionContext = useAppState(s => s.toolPermissionContext)
-  const setAppState = useSetAppState()
-  const store = useAppStateStore()
-  const { addNotification } = useNotifications()
+  const toolPermissionContext = useAppState(s => s.toolPermissionContext);
+  const setAppState = useSetAppState();
+  const store = useAppStateStore();
+  const { addNotification } = useNotifications();
   // Feedback text from the 'No' option's input. Threaded through onAllow as
   // acceptFeedback when the user approves — lets users annotate the plan
   // ("also update the README") without a reject+re-plan round-trip.
-  const [planFeedback, setPlanFeedback] = useState('')
-  const [pastedContents, setPastedContents] = useState<
-    Record<number, PastedContent>
-  >({})
-  const nextPasteIdRef = useRef(0)
+  const [planFeedback, setPlanFeedback] = useState('');
+  const [pastedContents, setPastedContents] = useState<Record<number, PastedContent>>({});
+  const nextPasteIdRef = useRef(0);
 
-  const showClearContext =
-    useAppState(s => s.settings.showClearContextOnPlanAccept) ?? false
-  const ultraplanSessionUrl = useAppState(s => s.ultraplanSessionUrl)
-  const ultraplanLaunching = useAppState(s => s.ultraplanLaunching)
+  const showClearContext = useAppState(s => s.settings.showClearContextOnPlanAccept) ?? false;
+  const ultraplanSessionUrl = useAppState(s => s.ultraplanSessionUrl);
+  const ultraplanLaunching = useAppState(s => s.ultraplanLaunching);
   // Hide the Ultraplan button while a session is active or launching —
   // selecting it would dismiss the dialog and reject locally before
   // launchUltraplan can notice the session exists and return "already polling".
   // feature() must sit directly in an if/ternary (bun:bundle DCE constraint).
-  const showUltraplan = feature('ULTRAPLAN')
-    ? !ultraplanSessionUrl && !ultraplanLaunching
-    : false
-  const usage = toolUseConfirm.assistantMessage.message.usage
-  const { mode, isAutoModeAvailable, isBypassPermissionsModeAvailable } =
-    toolPermissionContext
+  const showUltraplan = feature('ULTRAPLAN') ? !ultraplanSessionUrl && !ultraplanLaunching : false;
+  const usage = toolUseConfirm.assistantMessage.message.usage;
+  const { mode, isAutoModeAvailable, isBypassPermissionsModeAvailable } = toolPermissionContext;
   const options = useMemo(
     () =>
       buildPlanApprovalOptions({
         showClearContext,
         showUltraplan,
         usedPercent: showClearContext
-          ? getContextUsedPercent(usage as { input_tokens: number; cache_creation_input_tokens?: number; cache_read_input_tokens?: number }, mode)
+          ? getContextUsedPercent(
+              usage as { input_tokens: number; cache_creation_input_tokens?: number; cache_read_input_tokens?: number },
+              mode,
+            )
           : null,
         isAutoModeAvailable,
         isBypassPermissionsModeAvailable,
         onFeedbackChange: setPlanFeedback,
       }),
-    [
-      showClearContext,
-      showUltraplan,
-      usage,
-      mode,
-      isAutoModeAvailable,
-      isBypassPermissionsModeAvailable,
-    ],
-  )
+    [showClearContext, showUltraplan, usage, mode, isAutoModeAvailable, isBypassPermissionsModeAvailable],
+  );
 
   function onImagePaste(
     base64Image: string,
@@ -258,7 +209,7 @@ export function ExitPlanModePermissionRequest({
     dimensions?: ImageDimensions,
     _sourcePath?: string,
   ) {
-    const pasteId = nextPasteIdRef.current++
+    const pasteId = nextPasteIdRef.current++;
     const newContent: PastedContent = {
       id: pasteId,
       type: 'image',
@@ -266,129 +217,117 @@ export function ExitPlanModePermissionRequest({
       mediaType: mediaType || 'image/png',
       filename: filename || 'Pasted image',
       dimensions,
-    }
-    cacheImagePath(newContent)
-    void storeImage(newContent)
-    setPastedContents(prev => ({ ...prev, [pasteId]: newContent }))
+    };
+    cacheImagePath(newContent);
+    void storeImage(newContent);
+    setPastedContents(prev => ({ ...prev, [pasteId]: newContent }));
   }
 
   const onRemoveImage = useCallback((id: number) => {
     setPastedContents(prev => {
-      const next = { ...prev }
-      delete next[id]
-      return next
-    })
-  }, [])
+      const next = { ...prev };
+      delete next[id];
+      return next;
+    });
+  }, []);
 
-  const imageAttachments = Object.values(pastedContents).filter(
-    c => c.type === 'image',
-  )
-  const hasImages = imageAttachments.length > 0
+  const imageAttachments = Object.values(pastedContents).filter(c => c.type === 'image');
+  const hasImages = imageAttachments.length > 0;
 
   // TODO: Delete the branch after moving to V2
   // Use tool name to detect V2 instead of checking input.plan, because PR #10394
   // injects plan content into input.plan for hooks/SDK, which broke the old detection
   // (see issue #10878)
-  const isV2 = toolUseConfirm.tool.name === EXIT_PLAN_MODE_V2_TOOL_NAME
-  const inputPlan = isV2
-    ? undefined
-    : (toolUseConfirm.input.plan as string | undefined)
-  const planFilePath = isV2 ? getPlanFilePath() : undefined
+  const isV2 = toolUseConfirm.tool.name === EXIT_PLAN_MODE_V2_TOOL_NAME;
+  const inputPlan = isV2 ? undefined : (toolUseConfirm.input.plan as string | undefined);
+  const planFilePath = isV2 ? getPlanFilePath() : undefined;
 
   // Extract allowed prompts requested by the plan (Ant-only feature)
-  const allowedPrompts = toolUseConfirm.input.allowedPrompts as
-    | AllowedPrompt[]
-    | undefined
+  const allowedPrompts = toolUseConfirm.input.allowedPrompts as AllowedPrompt[] | undefined;
 
   // Get the raw plan to check if it's empty
-  const rawPlan = inputPlan ?? getPlan()
-  const isEmpty = !rawPlan || rawPlan.trim() === ''
+  const rawPlan = inputPlan ?? getPlan();
+  const isEmpty = !rawPlan || rawPlan.trim() === '';
 
   // Capture the variant once on mount. GrowthBook reads from a disk cache
   // so the value is stable across a single planning session. undefined =
   // control arm. The variant is a fixed 3-value enum of short literals,
   // not user input.
   const [planStructureVariant] = useState(
-    () =>
-      (getPewterLedgerVariant() ??
-        undefined) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-  )
+    () => (getPewterLedgerVariant() ?? undefined) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+  );
 
   const [currentPlan, setCurrentPlan] = useState(() => {
-    if (inputPlan) return inputPlan
-    const plan = getPlan()
-    return (
-      plan ?? 'No plan found. Please write your plan to the plan file first.'
-    )
-  })
-  const [showSaveMessage, setShowSaveMessage] = useState(false)
+    if (inputPlan) return inputPlan;
+    const plan = getPlan();
+    return plan ?? 'No plan found. Please write your plan to the plan file first.';
+  });
+  const [showSaveMessage, setShowSaveMessage] = useState(false);
   // Track Ctrl+G local edits so updatedInput can include the plan (the tool
   // only echoes the plan in tool_result when input.plan is set — otherwise
   // the model already has it in context from writing the plan file).
-  const [planEditedLocally, setPlanEditedLocally] = useState(false)
+  const [planEditedLocally, setPlanEditedLocally] = useState(false);
 
   // Auto-hide save message after 5 seconds
   useEffect(() => {
     if (showSaveMessage) {
-      const timer = setTimeout(setShowSaveMessage, 5000, false)
-      return () => clearTimeout(timer)
+      const timer = setTimeout(setShowSaveMessage, 5000, false);
+      return () => clearTimeout(timer);
     }
-  }, [showSaveMessage])
+  }, [showSaveMessage]);
 
   // Handle Ctrl+G to edit plan in $EDITOR, Shift+Tab for auto-accept edits
   const handleKeyDown = (e: KeyboardEvent): void => {
     if (e.ctrl && e.key === 'g') {
-      e.preventDefault()
-      logEvent('tengu_plan_external_editor_used', {})
+      e.preventDefault();
+      logEvent('tengu_plan_external_editor_used', {});
 
       void (async () => {
         if (isV2 && planFilePath) {
-          const result = await editFileInEditor(planFilePath)
+          const result = await editFileInEditor(planFilePath);
           if (result.error) {
             addNotification({
               key: 'external-editor-error',
               text: result.error,
               color: 'warning',
               priority: 'high',
-            })
+            });
           }
           if (result.content !== null) {
-            if (result.content !== currentPlan) setPlanEditedLocally(true)
-            setCurrentPlan(result.content)
-            setShowSaveMessage(true)
+            if (result.content !== currentPlan) setPlanEditedLocally(true);
+            setCurrentPlan(result.content);
+            setShowSaveMessage(true);
           }
         } else {
-          const result = await editPromptInEditor(currentPlan)
+          const result = await editPromptInEditor(currentPlan);
           if (result.error) {
             addNotification({
               key: 'external-editor-error',
               text: result.error,
               color: 'warning',
               priority: 'high',
-            })
+            });
           }
           if (result.content !== null && result.content !== currentPlan) {
-            setCurrentPlan(result.content)
-            setShowSaveMessage(true)
+            setCurrentPlan(result.content);
+            setShowSaveMessage(true);
           }
         }
-      })()
-      return
+      })();
+      return;
     }
 
     // Shift+Tab immediately selects "auto-accept edits"
     if (e.shift && e.key === 'tab') {
-      e.preventDefault()
-      void handleResponse(
-        showClearContext ? 'yes-accept-edits' : 'yes-accept-edits-keep-context',
-      )
-      return
+      e.preventDefault();
+      void handleResponse(showClearContext ? 'yes-accept-edits' : 'yes-accept-edits-keep-context');
+      return;
     }
-  }
+  };
 
   async function handleResponse(value: ResponseValue): Promise<void> {
-    const trimmedFeedback = planFeedback.trim()
-    const acceptFeedback = trimmedFeedback || undefined
+    const trimmedFeedback = planFeedback.trim();
+    const acceptFeedback = trimmedFeedback || undefined;
 
     // Ultraplan: reject locally, teleport the plan to CCR as a seed draft.
     // Dialog dismisses immediately so the query loop unblocks; the teleport
@@ -396,16 +335,13 @@ export function ExitPlanModePermissionRequest({
     if (value === 'ultraplan') {
       logEvent('tengu_plan_exit', {
         planLengthChars: currentPlan.length,
-        outcome:
-          'ultraplan' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        outcome: 'ultraplan' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
         interviewPhaseEnabled: isPlanModeInterviewPhaseEnabled(),
         planStructureVariant,
-      })
-      onDone()
-      onReject()
-      toolUseConfirm.onReject(
-        'Plan being refined via Ultraplan — please wait for the result.',
-      )
+      });
+      onDone();
+      onReject();
+      toolUseConfirm.onReject('Plan being refined via Ultraplan — please wait for the result.');
       void launchUltraplan({
         blurb: '',
         seedPlan: currentPlan,
@@ -413,86 +349,72 @@ export function ExitPlanModePermissionRequest({
         setAppState: store.setState,
         signal: new AbortController().signal,
       })
-        .then(msg =>
-          enqueuePendingNotification({ value: msg, mode: 'task-notification' }),
-        )
-        .catch(logError)
-      return
+        .then(msg => enqueuePendingNotification({ value: msg, mode: 'task-notification' }))
+        .catch(logError);
+      return;
     }
 
     // V1: pass plan in input. V2: plan is on disk, but if the user edited it
     // via Ctrl+G we pass it through so the tool echoes the edit in tool_result
     // (otherwise the model never sees the user's changes).
-    const updatedInput = isV2 && !planEditedLocally ? {} : { plan: currentPlan }
+    const updatedInput = isV2 && !planEditedLocally ? {} : { plan: currentPlan };
 
     // If auto was active during plan (from auto mode or opt-in) and NOT going
     // to auto, deactivate auto + restore permissions + fire exit attachment.
     if (feature('TRANSCRIPT_CLASSIFIER')) {
       const goingToAuto =
-        (value === 'yes-resume-auto-mode' ||
-          value === 'yes-auto-clear-context') &&
-        isAutoModeGateEnabled()
+        (value === 'yes-resume-auto-mode' || value === 'yes-auto-clear-context') && isAutoModeGateEnabled();
       // isAutoModeActive() is the authoritative signal — prePlanMode/
       // strippedDangerousRules are stale after transitionPlanAutoMode
       // deactivates mid-plan (would cause duplicate exit attachment).
-      const autoWasUsedDuringPlan =
-        autoModeStateModule?.isAutoModeActive() ?? false
+      const autoWasUsedDuringPlan = autoModeStateModule?.isAutoModeActive() ?? false;
       if (value !== 'no' && !goingToAuto && autoWasUsedDuringPlan) {
-        autoModeStateModule?.setAutoModeActive(false)
-        setNeedsAutoModeExitAttachment(true)
+        autoModeStateModule?.setAutoModeActive(false);
+        setNeedsAutoModeExitAttachment(true);
         setAppState(prev => ({
           ...prev,
           toolPermissionContext: {
             ...restoreDangerousPermissions(prev.toolPermissionContext),
             prePlanMode: undefined,
           },
-        }))
+        }));
       }
     }
 
     // Clear-context options: set pending plan implementation and reject the dialog
     // The REPL will handle context clear and trigger a fresh query
     // Keep-context options skip this block and go through the normal flow below
-    const isResumeAutoOption = feature('TRANSCRIPT_CLASSIFIER')
-      ? value === 'yes-resume-auto-mode'
-      : false
+    const isResumeAutoOption = feature('TRANSCRIPT_CLASSIFIER') ? value === 'yes-resume-auto-mode' : false;
     const isKeepContextOption =
-      value === 'yes-accept-edits-keep-context' ||
-      value === 'yes-default-keep-context' ||
-      isResumeAutoOption
+      value === 'yes-accept-edits-keep-context' || value === 'yes-default-keep-context' || isResumeAutoOption;
 
     if (value !== 'no') {
-      autoNameSessionFromPlan(currentPlan, setAppState, !isKeepContextOption)
+      autoNameSessionFromPlan(currentPlan, setAppState, !isKeepContextOption);
     }
 
     if (value !== 'no' && !isKeepContextOption) {
       // Determine the permission mode based on the selected option
-      let mode: PermissionMode = 'default'
+      let mode: PermissionMode = 'default';
       if (value === 'yes-bypass-permissions') {
-        mode = 'bypassPermissions'
+        mode = 'bypassPermissions';
       } else if (value === 'yes-accept-edits') {
-        mode = 'acceptEdits'
-      } else if (
-        feature('TRANSCRIPT_CLASSIFIER') &&
-        value === 'yes-auto-clear-context' &&
-        isAutoModeGateEnabled()
-      ) {
+        mode = 'acceptEdits';
+      } else if (feature('TRANSCRIPT_CLASSIFIER') && value === 'yes-auto-clear-context' && isAutoModeGateEnabled()) {
         // REPL's processInitialMessage handles stripDangerousPermissions + mode,
         // but does NOT set autoModeActive. Gate-off falls through to 'default'.
-        mode = 'auto'
-        autoModeStateModule?.setAutoModeActive(true)
+        mode = 'auto';
+        autoModeStateModule?.setAutoModeActive(true);
       }
 
       // Log plan exit event
       logEvent('tengu_plan_exit', {
         planLengthChars: currentPlan.length,
-        outcome:
-          value as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        outcome: value as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
         clearContext: true,
         interviewPhaseEnabled: isPlanModeInterviewPhaseEnabled(),
         planStructureVariant,
         hasFeedback: !!acceptFeedback,
-      })
+      });
 
       // Set initial message - REPL will handle context clear and fresh query
       // Add verification instruction if the feature is enabled
@@ -500,19 +422,17 @@ export function ExitPlanModePermissionRequest({
       const verificationInstruction =
         undefined === 'true'
           ? `\n\nIMPORTANT: When you have finished implementing the plan, you MUST call the "VerifyPlanExecution" tool directly (NOT the ${AGENT_TOOL_NAME} tool or an agent) to trigger background verification.`
-          : ''
+          : '';
 
       // Capture the transcript path before context is cleared (session ID will be regenerated)
-      const transcriptPath = getTranscriptPath()
-      const transcriptHint = `\n\nIf you need specific details from before exiting plan mode (like exact code snippets, error messages, or content you generated), read the full transcript at: ${transcriptPath}`
+      const transcriptPath = getTranscriptPath();
+      const transcriptHint = `\n\nIf you need specific details from before exiting plan mode (like exact code snippets, error messages, or content you generated), read the full transcript at: ${transcriptPath}`;
 
       const teamHint = isAgentSwarmsEnabled()
         ? `\n\nIf this plan can be broken down into multiple independent tasks, consider using the ${TEAM_CREATE_TOOL_NAME} tool to create a team and parallelize the work.`
-        : ''
+        : '';
 
-      const feedbackSuffix = acceptFeedback
-        ? `\n\nUser feedback on this plan: ${acceptFeedback}`
-        : ''
+      const feedbackSuffix = acceptFeedback ? `\n\nUser feedback on this plan: ${acceptFeedback}` : '';
 
       setAppState(prev => ({
         ...prev,
@@ -527,37 +447,32 @@ export function ExitPlanModePermissionRequest({
           mode,
           allowedPrompts,
         },
-      }))
+      }));
 
-      setHasExitedPlanMode(true)
-      onDone()
-      onReject()
+      setHasExitedPlanMode(true);
+      onDone();
+      onReject();
       // Reject the tool use to unblock the query loop
       // The REPL will see pendingInitialQuery and trigger fresh query
-      toolUseConfirm.onReject()
-      return
+      toolUseConfirm.onReject();
+      return;
     }
 
     // Handle auto keep-context option — needs special handling because
     // buildPermissionUpdates maps auto to 'default' via toExternalPermissionMode.
     // We set the mode directly via setAppState and sync the bootstrap state.
-    if (
-      feature('TRANSCRIPT_CLASSIFIER') &&
-      value === 'yes-resume-auto-mode' &&
-      isAutoModeGateEnabled()
-    ) {
+    if (feature('TRANSCRIPT_CLASSIFIER') && value === 'yes-resume-auto-mode' && isAutoModeGateEnabled()) {
       logEvent('tengu_plan_exit', {
         planLengthChars: currentPlan.length,
-        outcome:
-          value as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        outcome: value as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
         clearContext: false,
         interviewPhaseEnabled: isPlanModeInterviewPhaseEnabled(),
         planStructureVariant,
         hasFeedback: !!acceptFeedback,
-      })
-      setHasExitedPlanMode(true)
-      setNeedsPlanModeExitAttachment(true)
-      autoModeStateModule?.setAutoModeActive(true)
+      });
+      setHasExitedPlanMode(true);
+      setNeedsPlanModeExitAttachment(true);
+      autoModeStateModule?.setAutoModeActive(true);
       setAppState(prev => ({
         ...prev,
         toolPermissionContext: stripDangerousPermissionsForAutoMode({
@@ -565,10 +480,10 @@ export function ExitPlanModePermissionRequest({
           mode: 'auto',
           prePlanMode: undefined,
         }),
-      }))
-      onDone()
-      toolUseConfirm.onAllow(updatedInput, [], acceptFeedback)
-      return
+      }));
+      onDone();
+      toolUseConfirm.onAllow(updatedInput, [], acceptFeedback);
+      return;
     }
 
     // Handle keep-context options (goes through normal onAllow flow)
@@ -577,80 +492,66 @@ export function ExitPlanModePermissionRequest({
     // Without this fallback the function would return without resolving the
     // dialog, leaving the query loop blocked and safety state corrupted.
     const keepContextModes: Record<string, PermissionMode> = {
-      'yes-accept-edits-keep-context':
-        toolPermissionContext.isBypassPermissionsModeAvailable
-          ? 'bypassPermissions'
-          : 'acceptEdits',
+      'yes-accept-edits-keep-context': toolPermissionContext.isBypassPermissionsModeAvailable
+        ? 'bypassPermissions'
+        : 'acceptEdits',
       'yes-default-keep-context': 'default',
-      ...(feature('TRANSCRIPT_CLASSIFIER')
-        ? { 'yes-resume-auto-mode': 'default' as const }
-        : {}),
-    }
-    const keepContextMode = keepContextModes[value]
+      ...(feature('TRANSCRIPT_CLASSIFIER') ? { 'yes-resume-auto-mode': 'default' as const } : {}),
+    };
+    const keepContextMode = keepContextModes[value];
     if (keepContextMode) {
       logEvent('tengu_plan_exit', {
         planLengthChars: currentPlan.length,
-        outcome:
-          value as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        outcome: value as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
         clearContext: false,
         interviewPhaseEnabled: isPlanModeInterviewPhaseEnabled(),
         planStructureVariant,
         hasFeedback: !!acceptFeedback,
-      })
-      setHasExitedPlanMode(true)
-      setNeedsPlanModeExitAttachment(true)
-      onDone()
-      toolUseConfirm.onAllow(
-        updatedInput,
-        buildPermissionUpdates(keepContextMode, allowedPrompts),
-        acceptFeedback,
-      )
-      return
+      });
+      setHasExitedPlanMode(true);
+      setNeedsPlanModeExitAttachment(true);
+      onDone();
+      toolUseConfirm.onAllow(updatedInput, buildPermissionUpdates(keepContextMode, allowedPrompts), acceptFeedback);
+      return;
     }
 
     // Handle standard approval options
     const standardModes: Record<string, PermissionMode> = {
       'yes-bypass-permissions': 'bypassPermissions',
       'yes-accept-edits': 'acceptEdits',
-    }
-    const standardMode = standardModes[value]
+    };
+    const standardMode = standardModes[value];
     if (standardMode) {
       logEvent('tengu_plan_exit', {
         planLengthChars: currentPlan.length,
-        outcome:
-          value as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        outcome: value as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
         interviewPhaseEnabled: isPlanModeInterviewPhaseEnabled(),
         planStructureVariant,
         hasFeedback: !!acceptFeedback,
-      })
-      setHasExitedPlanMode(true)
-      setNeedsPlanModeExitAttachment(true)
-      onDone()
-      toolUseConfirm.onAllow(
-        updatedInput,
-        buildPermissionUpdates(standardMode, allowedPrompts),
-        acceptFeedback,
-      )
-      return
+      });
+      setHasExitedPlanMode(true);
+      setNeedsPlanModeExitAttachment(true);
+      onDone();
+      toolUseConfirm.onAllow(updatedInput, buildPermissionUpdates(standardMode, allowedPrompts), acceptFeedback);
+      return;
     }
 
     // Handle 'no' - stay in plan mode
     if (value === 'no') {
       if (!trimmedFeedback && !hasImages) {
         // No feedback yet - user is still on the input field
-        return
+        return;
       }
 
       logEvent('tengu_plan_exit', {
         planLengthChars: currentPlan.length,
-        outcome:
-          'no' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        outcome: 'no' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
         interviewPhaseEnabled: isPlanModeInterviewPhaseEnabled(),
         planStructureVariant,
-      })
+      });
 
       // Convert pasted images to ImageBlockParam[] with resizing
-      let imageBlocks: ImageBlockParam[] | undefined
+      let imageBlocks: ImageBlockParam[] | undefined;
       if (hasImages) {
         imageBlocks = await Promise.all(
           imageAttachments.map(async img => {
@@ -658,28 +559,27 @@ export function ExitPlanModePermissionRequest({
               type: 'image',
               source: {
                 type: 'base64',
-                media_type: (img.mediaType ||
-                  'image/png') as Base64ImageSource['media_type'],
+                media_type: (img.mediaType || 'image/png') as Base64ImageSource['media_type'],
                 data: img.content,
               },
-            }
-            const resized = await maybeResizeAndDownsampleImageBlock(block)
-            return resized.block
+            };
+            const resized = await maybeResizeAndDownsampleImageBlock(block);
+            return resized.block;
           }),
-        )
+        );
       }
 
-      onDone()
-      onReject()
+      onDone();
+      onReject();
       toolUseConfirm.onReject(
         trimmedFeedback || (hasImages ? '(See attached image)' : undefined),
         imageBlocks && imageBlocks.length > 0 ? imageBlocks : undefined,
-      )
+      );
     }
   }
 
-  const editor = getExternalEditor()
-  const editorName = editor ? toIDEDisplayName(editor) : null
+  const editor = getExternalEditor();
+  const editorName = editor ? toIDEDisplayName(editor) : null;
 
   // Sticky footer: when setStickyFooter is provided (fullscreen mode), the
   // Select options render in FullscreenLayout's `bottom` slot so they stay
@@ -687,24 +587,23 @@ export function ExitPlanModePermissionRequest({
   // wrapped in a ref so the JSX (set once per options/images change) can call
   // the latest closure without re-registering on every keystroke. React
   // reconciles the sticky-footer Select by type, preserving focus/input state.
-  const handleResponseRef = useRef(handleResponse)
-  handleResponseRef.current = handleResponse
-  const handleCancelRef = useRef<() => void>(undefined)
+  const handleResponseRef = useRef(handleResponse);
+  handleResponseRef.current = handleResponse;
+  const handleCancelRef = useRef<() => void>(undefined);
   handleCancelRef.current = () => {
     logEvent('tengu_plan_exit', {
       planLengthChars: currentPlan.length,
-      outcome:
-        'no' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      outcome: 'no' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
       interviewPhaseEnabled: isPlanModeInterviewPhaseEnabled(),
       planStructureVariant,
-    })
-    onDone()
-    onReject()
-    toolUseConfirm.onReject()
-  }
-  const useStickyFooter = !isEmpty && !!setStickyFooter
+    });
+    onDone();
+    onReject();
+    toolUseConfirm.onReject();
+  };
+  const useStickyFooter = !isEmpty && !!setStickyFooter;
   useLayoutEffect(() => {
-    if (!useStickyFooter) return
+    if (!useStickyFooter) return;
     setStickyFooter(
       <Box
         flexDirection="column"
@@ -732,9 +631,7 @@ export function ExitPlanModePermissionRequest({
             <Text bold dimColor>
               {editorName}
             </Text>
-            {isV2 && planFilePath && (
-              <Text dimColor> · {getDisplayPath(planFilePath)}</Text>
-            )}
+            {isV2 && planFilePath && <Text dimColor> · {getDisplayPath(planFilePath)}</Text>}
             {showSaveMessage && (
               <>
                 <Text dimColor>{' · '}</Text>
@@ -744,20 +641,11 @@ export function ExitPlanModePermissionRequest({
           </Box>
         )}
       </Box>,
-    )
-    return () => setStickyFooter(null)
+    );
+    return () => setStickyFooter(null);
     // onImagePaste/onRemoveImage are stable (useCallback/useRef-backed above)
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [
-    useStickyFooter,
-    setStickyFooter,
-    options,
-    pastedContents,
-    editorName,
-    isV2,
-    planFilePath,
-    showSaveMessage,
-  ])
+  }, [useStickyFooter, setStickyFooter, options, pastedContents, editorName, isV2, planFilePath, showSaveMessage]);
 
   // Simplified UI for empty plans
   if (isEmpty) {
@@ -765,52 +653,43 @@ export function ExitPlanModePermissionRequest({
       if (value === 'yes') {
         logEvent('tengu_plan_exit', {
           planLengthChars: 0,
-          outcome:
-            'yes-default' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          outcome: 'yes-default' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
           interviewPhaseEnabled: isPlanModeInterviewPhaseEnabled(),
           planStructureVariant,
-        })
+        });
         if (feature('TRANSCRIPT_CLASSIFIER')) {
-          const autoWasUsedDuringPlan =
-            autoModeStateModule?.isAutoModeActive() ?? false
+          const autoWasUsedDuringPlan = autoModeStateModule?.isAutoModeActive() ?? false;
           if (autoWasUsedDuringPlan) {
-            autoModeStateModule?.setAutoModeActive(false)
-            setNeedsAutoModeExitAttachment(true)
+            autoModeStateModule?.setAutoModeActive(false);
+            setNeedsAutoModeExitAttachment(true);
             setAppState(prev => ({
               ...prev,
               toolPermissionContext: {
                 ...restoreDangerousPermissions(prev.toolPermissionContext),
                 prePlanMode: undefined,
               },
-            }))
+            }));
           }
         }
-        setHasExitedPlanMode(true)
-        setNeedsPlanModeExitAttachment(true)
-        onDone()
-        toolUseConfirm.onAllow({}, [
-          { type: 'setMode', mode: 'default', destination: 'session' },
-        ])
+        setHasExitedPlanMode(true);
+        setNeedsPlanModeExitAttachment(true);
+        onDone();
+        toolUseConfirm.onAllow({}, [{ type: 'setMode', mode: 'default', destination: 'session' }]);
       } else {
         logEvent('tengu_plan_exit', {
           planLengthChars: 0,
-          outcome:
-            'no' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          outcome: 'no' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
           interviewPhaseEnabled: isPlanModeInterviewPhaseEnabled(),
           planStructureVariant,
-        })
-        onDone()
-        onReject()
-        toolUseConfirm.onReject()
+        });
+        onDone();
+        onReject();
+        toolUseConfirm.onReject();
       }
     }
 
     return (
-      <PermissionDialog
-        color="planMode"
-        title="Exit plan mode?"
-        workerBadge={workerBadge}
-      >
+      <PermissionDialog color="planMode" title="Exit plan mode?" workerBadge={workerBadge}>
         <Box flexDirection="column" paddingX={1} marginTop={1}>
           <Text>Claude wants to exit plan mode</Text>
           <Box marginTop={1}>
@@ -823,35 +702,24 @@ export function ExitPlanModePermissionRequest({
               onCancel={() => {
                 logEvent('tengu_plan_exit', {
                   planLengthChars: 0,
-                  outcome:
-                    'no' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+                  outcome: 'no' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
                   interviewPhaseEnabled: isPlanModeInterviewPhaseEnabled(),
                   planStructureVariant,
-                })
-                onDone()
-                onReject()
-                toolUseConfirm.onReject()
+                });
+                onDone();
+                onReject();
+                toolUseConfirm.onReject();
               }}
             />
           </Box>
         </Box>
       </PermissionDialog>
-    )
+    );
   }
 
   return (
-    <Box
-      flexDirection="column"
-      tabIndex={0}
-      autoFocus
-      onKeyDown={handleKeyDown}
-    >
-      <PermissionDialog
-        color="planMode"
-        title="Ready to code?"
-        innerPaddingX={0}
-        workerBadge={workerBadge}
-      >
+    <Box flexDirection="column" tabIndex={0} autoFocus onKeyDown={handleKeyDown}>
+      <PermissionDialog color="planMode" title="Ready to code?" innerPaddingX={0} workerBadge={workerBadge}>
         <Box flexDirection="column" marginTop={1}>
           <Box paddingX={1} flexDirection="column">
             <Text>Here is Claude&apos;s plan:</Text>
@@ -870,28 +738,20 @@ export function ExitPlanModePermissionRequest({
             <Markdown>{currentPlan}</Markdown>
           </Box>
           <Box flexDirection="column" paddingX={1}>
-            <PermissionRuleExplanation
-              permissionResult={toolUseConfirm.permissionResult}
-              toolType="tool"
-            />
-            {isClassifierPermissionsEnabled() &&
-              allowedPrompts &&
-              allowedPrompts.length > 0 && (
-                <Box flexDirection="column" marginBottom={1}>
-                  <Text bold>Requested permissions:</Text>
-                  {allowedPrompts.map((p, i) => (
-                    <Text key={i} dimColor>
-                      {'  '}· {p.tool}({PROMPT_PREFIX} {p.prompt})
-                    </Text>
-                  ))}
-                </Box>
-              )}
+            <PermissionRuleExplanation permissionResult={toolUseConfirm.permissionResult} toolType="tool" />
+            {isClassifierPermissionsEnabled() && allowedPrompts && allowedPrompts.length > 0 && (
+              <Box flexDirection="column" marginBottom={1}>
+                <Text bold>Requested permissions:</Text>
+                {allowedPrompts.map((p, i) => (
+                  <Text key={i} dimColor>
+                    {'  '}· {p.tool}({PROMPT_PREFIX} {p.prompt})
+                  </Text>
+                ))}
+              </Box>
+            )}
             {!useStickyFooter && (
               <>
-                <Text dimColor>
-                  Claude has written up a plan and is ready to execute. Would
-                  you like to proceed?
-                </Text>
+                <Text dimColor>Claude has written up a plan and is ready to execute. Would you like to proceed?</Text>
                 <Box marginTop={1}>
                   <Select
                     options={options}
@@ -914,9 +774,7 @@ export function ExitPlanModePermissionRequest({
             <Text bold dimColor>
               {editorName}
             </Text>
-            {isV2 && planFilePath && (
-              <Text dimColor> · {getDisplayPath(planFilePath)}</Text>
-            )}
+            {isV2 && planFilePath && <Text dimColor> · {getDisplayPath(planFilePath)}</Text>}
           </Box>
           {showSaveMessage && (
             <Box>
@@ -927,7 +785,7 @@ export function ExitPlanModePermissionRequest({
         </Box>
       )}
     </Box>
-  )
+  );
 }
 
 /** @internal Exported for testing. */
@@ -939,32 +797,32 @@ export function buildPlanApprovalOptions({
   isBypassPermissionsModeAvailable,
   onFeedbackChange,
 }: {
-  showClearContext: boolean
-  showUltraplan: boolean
-  usedPercent: number | null
-  isAutoModeAvailable: boolean | undefined
-  isBypassPermissionsModeAvailable: boolean | undefined
-  onFeedbackChange: (v: string) => void
+  showClearContext: boolean;
+  showUltraplan: boolean;
+  usedPercent: number | null;
+  isAutoModeAvailable: boolean | undefined;
+  isBypassPermissionsModeAvailable: boolean | undefined;
+  onFeedbackChange: (v: string) => void;
 }): OptionWithDescription<ResponseValue>[] {
-  const options: OptionWithDescription<ResponseValue>[] = []
-  const usedLabel = usedPercent !== null ? ` (${usedPercent}% used)` : ''
+  const options: OptionWithDescription<ResponseValue>[] = [];
+  const usedLabel = usedPercent !== null ? ` (${usedPercent}% used)` : '';
 
   if (showClearContext) {
     if (feature('TRANSCRIPT_CLASSIFIER') && isAutoModeAvailable) {
       options.push({
         label: `Yes, clear context${usedLabel} and use auto mode`,
         value: 'yes-auto-clear-context',
-      })
+      });
     } else if (isBypassPermissionsModeAvailable) {
       options.push({
         label: `Yes, clear context${usedLabel} and bypass permissions`,
         value: 'yes-bypass-permissions',
-      })
+      });
     } else {
       options.push({
         label: `Yes, clear context${usedLabel} and auto-accept edits`,
         value: 'yes-accept-edits',
-      })
+      });
     }
   }
 
@@ -973,29 +831,29 @@ export function buildPlanApprovalOptions({
     options.push({
       label: 'Yes, and use auto mode',
       value: 'yes-resume-auto-mode',
-    })
+    });
   } else if (isBypassPermissionsModeAvailable) {
     options.push({
       label: 'Yes, and bypass permissions',
       value: 'yes-accept-edits-keep-context',
-    })
+    });
   } else {
     options.push({
       label: 'Yes, auto-accept edits',
       value: 'yes-accept-edits-keep-context',
-    })
+    });
   }
 
   options.push({
     label: 'Yes, manually approve edits',
     value: 'yes-default-keep-context',
-  })
+  });
 
   if (showUltraplan) {
     options.push({
       label: 'No, refine with Ultraplan on Claude Code on the web',
       value: 'ultraplan',
-    })
+    });
   }
 
   options.push({
@@ -1005,31 +863,28 @@ export function buildPlanApprovalOptions({
     placeholder: 'Tell Claude what to change',
     description: 'shift+tab to approve with this feedback',
     onChange: onFeedbackChange,
-  })
+  });
 
-  return options
+  return options;
 }
 
 function getContextUsedPercent(
   usage:
     | {
-        input_tokens: number
-        cache_creation_input_tokens?: number | null
-        cache_read_input_tokens?: number | null
+        input_tokens: number;
+        cache_creation_input_tokens?: number | null;
+        cache_read_input_tokens?: number | null;
       }
     | undefined,
   permissionMode: PermissionMode,
 ): number | null {
-  if (!usage) return null
+  if (!usage) return null;
   const runtimeModel = getRuntimeMainLoopModel({
     permissionMode,
     mainLoopModel: getMainLoopModel(),
     exceeds200kTokens: false,
-  })
-  const contextWindowSize = getContextWindowForModel(
-    runtimeModel,
-    getSdkBetas(),
-  )
+  });
+  const contextWindowSize = getContextWindowForModel(runtimeModel, getSdkBetas());
   const { used } = calculateContextPercentages(
     {
       input_tokens: usage.input_tokens,
@@ -1037,6 +892,6 @@ function getContextUsedPercent(
       cache_read_input_tokens: usage.cache_read_input_tokens ?? 0,
     },
     contextWindowSize,
-  )
-  return used
+  );
+  return used;
 }
diff --git a/src/components/permissions/ExitPlanModePermissionRequest/src/context/notifications.ts b/src/components/permissions/ExitPlanModePermissionRequest/src/context/notifications.ts
index 82956e65a..603737bb5 100644
--- a/src/components/permissions/ExitPlanModePermissionRequest/src/context/notifications.ts
+++ b/src/components/permissions/ExitPlanModePermissionRequest/src/context/notifications.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useNotifications = any;
+export type useNotifications = any
diff --git a/src/components/permissions/ExitPlanModePermissionRequest/src/services/analytics/index.ts b/src/components/permissions/ExitPlanModePermissionRequest/src/services/analytics/index.ts
index 142e7b6f5..2e0f796da 100644
--- a/src/components/permissions/ExitPlanModePermissionRequest/src/services/analytics/index.ts
+++ b/src/components/permissions/ExitPlanModePermissionRequest/src/services/analytics/index.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any;
-export type logEvent = any;
+export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any
+export type logEvent = any
diff --git a/src/components/permissions/ExitPlanModePermissionRequest/src/state/AppState.ts b/src/components/permissions/ExitPlanModePermissionRequest/src/state/AppState.ts
index f1e2aa661..80730fcb1 100644
--- a/src/components/permissions/ExitPlanModePermissionRequest/src/state/AppState.ts
+++ b/src/components/permissions/ExitPlanModePermissionRequest/src/state/AppState.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type useAppState = any;
-export type useAppStateStore = any;
-export type useSetAppState = any;
+export type useAppState = any
+export type useAppStateStore = any
+export type useSetAppState = any
diff --git a/src/components/permissions/FallbackPermissionRequest.tsx b/src/components/permissions/FallbackPermissionRequest.tsx
index 12bb4ef7d..e80af35ec 100644
--- a/src/components/permissions/FallbackPermissionRequest.tsx
+++ b/src/components/permissions/FallbackPermissionRequest.tsx
@@ -1,22 +1,18 @@
-import React, { useCallback, useMemo } from 'react'
-import { getOriginalCwd } from '../../bootstrap/state.js'
-import { Box, Text, useTheme } from '@anthropic/ink'
-import { sanitizeToolNameForAnalytics } from '../../services/analytics/metadata.js'
-import { env } from '../../utils/env.js'
-import { shouldShowAlwaysAllowOptions } from '../../utils/permissions/permissionsLoader.js'
-import { truncateToLines } from '../../utils/stringUtils.js'
-import { logUnaryEvent } from '../../utils/unaryLogging.js'
-import { type UnaryEvent, usePermissionRequestLogging } from './hooks.js'
-import { PermissionDialog } from './PermissionDialog.js'
-import {
-  PermissionPrompt,
-  type PermissionPromptOption,
-  type ToolAnalyticsContext,
-} from './PermissionPrompt.js'
-import type { PermissionRequestProps } from './PermissionRequest.js'
-import { PermissionRuleExplanation } from './PermissionRuleExplanation.js'
+import React, { useCallback, useMemo } from 'react';
+import { getOriginalCwd } from '../../bootstrap/state.js';
+import { Box, Text, useTheme } from '@anthropic/ink';
+import { sanitizeToolNameForAnalytics } from '../../services/analytics/metadata.js';
+import { env } from '../../utils/env.js';
+import { shouldShowAlwaysAllowOptions } from '../../utils/permissions/permissionsLoader.js';
+import { truncateToLines } from '../../utils/stringUtils.js';
+import { logUnaryEvent } from '../../utils/unaryLogging.js';
+import { type UnaryEvent, usePermissionRequestLogging } from './hooks.js';
+import { PermissionDialog } from './PermissionDialog.js';
+import { PermissionPrompt, type PermissionPromptOption, type ToolAnalyticsContext } from './PermissionPrompt.js';
+import type { PermissionRequestProps } from './PermissionRequest.js';
+import { PermissionRuleExplanation } from './PermissionRuleExplanation.js';
 
-type FallbackOptionValue = 'yes' | 'yes-dont-ask-again' | 'no'
+type FallbackOptionValue = 'yes' | 'yes-dont-ask-again' | 'no';
 
 export function FallbackPermissionRequest({
   toolUseConfirm,
@@ -25,14 +21,12 @@ export function FallbackPermissionRequest({
   verbose: _verbose,
   workerBadge,
 }: PermissionRequestProps): React.ReactNode {
-  const [theme] = useTheme()
+  const [theme] = useTheme();
   // TODO: Avoid these special cases
-  const originalUserFacingName = toolUseConfirm.tool.userFacingName(
-    toolUseConfirm.input as never,
-  )
+  const originalUserFacingName = toolUseConfirm.tool.userFacingName(toolUseConfirm.input as never);
   const userFacingName = originalUserFacingName.endsWith(' (MCP)')
     ? originalUserFacingName.slice(0, -6)
-    : originalUserFacingName
+    : originalUserFacingName;
 
   const unaryEvent = useMemo<UnaryEvent>(
     () => ({
@@ -40,9 +34,9 @@ export function FallbackPermissionRequest({
       language_name: 'none',
     }),
     [],
-  )
+  );
 
-  usePermissionRequestLogging(toolUseConfirm, unaryEvent)
+  usePermissionRequestLogging(toolUseConfirm, unaryEvent);
 
   const handleSelect = useCallback(
     (value: FallbackOptionValue, feedback?: string) => {
@@ -56,10 +50,10 @@ export function FallbackPermissionRequest({
               message_id: toolUseConfirm.assistantMessage.message.id!,
               platform: env.platform,
             },
-          })
-          toolUseConfirm.onAllow(toolUseConfirm.input, [], feedback)
-          onDone()
-          break
+          });
+          toolUseConfirm.onAllow(toolUseConfirm.input, [], feedback);
+          onDone();
+          break;
         case 'yes-dont-ask-again': {
           void logUnaryEvent({
             completion_type: 'tool_use_single',
@@ -69,7 +63,7 @@ export function FallbackPermissionRequest({
               message_id: toolUseConfirm.assistantMessage.message.id!,
               platform: env.platform,
             },
-          })
+          });
 
           toolUseConfirm.onAllow(toolUseConfirm.input, [
             {
@@ -82,9 +76,9 @@ export function FallbackPermissionRequest({
               behavior: 'allow',
               destination: 'localSettings',
             },
-          ])
-          onDone()
-          break
+          ]);
+          onDone();
+          break;
         }
         case 'no':
           void logUnaryEvent({
@@ -95,15 +89,15 @@ export function FallbackPermissionRequest({
               message_id: toolUseConfirm.assistantMessage.message.id!,
               platform: env.platform,
             },
-          })
-          toolUseConfirm.onReject(feedback)
-          onReject()
-          onDone()
-          break
+          });
+          toolUseConfirm.onReject(feedback);
+          onReject();
+          onDone();
+          break;
       }
     },
     [toolUseConfirm, onDone, onReject],
-  )
+  );
 
   const handleCancel = useCallback(() => {
     void logUnaryEvent({
@@ -114,14 +108,14 @@ export function FallbackPermissionRequest({
         message_id: toolUseConfirm.assistantMessage.message.id!,
         platform: env.platform,
       },
-    })
-    toolUseConfirm.onReject()
-    onReject()
-    onDone()
-  }, [toolUseConfirm, onDone, onReject])
+    });
+    toolUseConfirm.onReject();
+    onReject();
+    onDone();
+  }, [toolUseConfirm, onDone, onReject]);
 
-  const originalCwd = getOriginalCwd()
-  const showAlwaysAllowOptions = shouldShowAlwaysAllowOptions()
+  const originalCwd = getOriginalCwd();
+  const showAlwaysAllowOptions = shouldShowAlwaysAllowOptions();
   const options = useMemo((): PermissionPromptOption<FallbackOptionValue>[] => {
     const result: PermissionPromptOption<FallbackOptionValue>[] = [
       {
@@ -129,28 +123,28 @@ export function FallbackPermissionRequest({
         value: 'yes',
         feedbackConfig: { type: 'accept' },
       },
-    ]
+    ];
 
     if (showAlwaysAllowOptions) {
       result.push({
         label: (
           <Text>
-            Yes, and don&apos;t ask again for <Text bold>{userFacingName}</Text>{' '}
-            commands in <Text bold>{originalCwd}</Text>
+            Yes, and don&apos;t ask again for <Text bold>{userFacingName}</Text> commands in{' '}
+            <Text bold>{originalCwd}</Text>
           </Text>
         ),
         value: 'yes-dont-ask-again',
-      })
+      });
     }
 
     result.push({
       label: 'No',
       value: 'no',
       feedbackConfig: { type: 'reject' },
-    })
+    });
 
-    return result
-  }, [userFacingName, originalCwd, showAlwaysAllowOptions])
+    return result;
+  }, [userFacingName, originalCwd, showAlwaysAllowOptions]);
 
   const toolAnalyticsContext = useMemo(
     (): ToolAnalyticsContext => ({
@@ -158,32 +152,21 @@ export function FallbackPermissionRequest({
       isMcp: toolUseConfirm.tool.isMcp ?? false,
     }),
     [toolUseConfirm.tool.name, toolUseConfirm.tool.isMcp],
-  )
+  );
 
   return (
     <PermissionDialog title="Tool use" workerBadge={workerBadge}>
       <Box flexDirection="column" paddingX={2} paddingY={1}>
         <Text>
           {userFacingName}(
-          {toolUseConfirm.tool.renderToolUseMessage(
-            toolUseConfirm.input as never,
-            { theme, verbose: true },
-          )}
-          )
-          {originalUserFacingName.endsWith(' (MCP)') ? (
-            <Text dimColor> (MCP)</Text>
-          ) : (
-            ''
-          )}
+          {toolUseConfirm.tool.renderToolUseMessage(toolUseConfirm.input as never, { theme, verbose: true })})
+          {originalUserFacingName.endsWith(' (MCP)') ? <Text dimColor> (MCP)</Text> : ''}
         </Text>
         <Text dimColor>{truncateToLines(toolUseConfirm.description, 3)}</Text>
       </Box>
 
       <Box flexDirection="column">
-        <PermissionRuleExplanation
-          permissionResult={toolUseConfirm.permissionResult}
-          toolType="tool"
-        />
+        <PermissionRuleExplanation permissionResult={toolUseConfirm.permissionResult} toolType="tool" />
         <PermissionPrompt
           options={options}
           onSelect={handleSelect}
@@ -192,5 +175,5 @@ export function FallbackPermissionRequest({
         />
       </Box>
     </PermissionDialog>
-  )
+  );
 }
diff --git a/src/components/permissions/FileEditPermissionRequest/FileEditPermissionRequest.tsx b/src/components/permissions/FileEditPermissionRequest/FileEditPermissionRequest.tsx
index 42d558664..b6544cdeb 100644
--- a/src/components/permissions/FileEditPermissionRequest/FileEditPermissionRequest.tsx
+++ b/src/components/permissions/FileEditPermissionRequest/FileEditPermissionRequest.tsx
@@ -1,51 +1,44 @@
-import { basename, relative } from 'path'
-import React from 'react'
-import { FileEditToolDiff } from 'src/components/FileEditToolDiff.js'
-import { getCwd } from 'src/utils/cwd.js'
-import type { z } from 'zod/v4'
-import { Text } from '@anthropic/ink'
-import { FileEditTool } from '@claude-code-best/builtin-tools/tools/FileEditTool/FileEditTool.js'
-import { FilePermissionDialog } from '../FilePermissionDialog/FilePermissionDialog.js'
+import { basename, relative } from 'path';
+import React from 'react';
+import { FileEditToolDiff } from 'src/components/FileEditToolDiff.js';
+import { getCwd } from 'src/utils/cwd.js';
+import type { z } from 'zod/v4';
+import { Text } from '@anthropic/ink';
+import { FileEditTool } from '@claude-code-best/builtin-tools/tools/FileEditTool/FileEditTool.js';
+import { FilePermissionDialog } from '../FilePermissionDialog/FilePermissionDialog.js';
 import {
   createSingleEditDiffConfig,
   type FileEdit,
   type IDEDiffSupport,
-} from '../FilePermissionDialog/ideDiffConfig.js'
-import type { PermissionRequestProps } from '../PermissionRequest.js'
+} from '../FilePermissionDialog/ideDiffConfig.js';
+import type { PermissionRequestProps } from '../PermissionRequest.js';
 
-type FileEditInput = z.infer<typeof FileEditTool.inputSchema>
+type FileEditInput = z.infer<typeof FileEditTool.inputSchema>;
 
 const ideDiffSupport: IDEDiffSupport<FileEditInput> = {
   getConfig: (input: FileEditInput) =>
-    createSingleEditDiffConfig(
-      input.file_path,
-      input.old_string,
-      input.new_string,
-      input.replace_all,
-    ),
+    createSingleEditDiffConfig(input.file_path, input.old_string, input.new_string, input.replace_all),
   applyChanges: (input: FileEditInput, modifiedEdits: FileEdit[]) => {
-    const firstEdit = modifiedEdits[0]
+    const firstEdit = modifiedEdits[0];
     if (firstEdit) {
       return {
         ...input,
         old_string: firstEdit.old_string,
         new_string: firstEdit.new_string,
         replace_all: firstEdit.replace_all,
-      }
+      };
     }
-    return input
+    return input;
   },
-}
+};
 
-export function FileEditPermissionRequest(
-  props: PermissionRequestProps,
-): React.ReactNode {
+export function FileEditPermissionRequest(props: PermissionRequestProps): React.ReactNode {
   const parseInput = (input: unknown): FileEditInput => {
-    return FileEditTool.inputSchema.parse(input)
-  }
+    return FileEditTool.inputSchema.parse(input);
+  };
 
-  const parsed = parseInput(props.toolUseConfirm.input)
-  const { file_path, old_string, new_string, replace_all } = parsed
+  const parsed = parseInput(props.toolUseConfirm.input);
+  const { file_path, old_string, new_string, replace_all } = parsed;
 
   return (
     <FilePermissionDialog
@@ -58,16 +51,13 @@ export function FileEditPermissionRequest(
       subtitle={relative(getCwd(), file_path)}
       question={
         <Text>
-          Do you want to make this edit to{' '}
-          <Text bold>{basename(file_path)}</Text>?
+          Do you want to make this edit to <Text bold>{basename(file_path)}</Text>?
         </Text>
       }
       content={
         <FileEditToolDiff
           file_path={file_path}
-          edits={[
-            { old_string, new_string, replace_all: replace_all || false },
-          ]}
+          edits={[{ old_string, new_string, replace_all: replace_all || false }]}
         />
       }
       path={file_path}
@@ -75,5 +65,5 @@ export function FileEditPermissionRequest(
       parseInput={parseInput}
       ideDiffSupport={ideDiffSupport}
     />
-  )
+  );
 }
diff --git a/src/components/permissions/FileEditPermissionRequest/src/components/FileEditToolDiff.ts b/src/components/permissions/FileEditPermissionRequest/src/components/FileEditToolDiff.ts
index d6d114f60..8b1551f7d 100644
--- a/src/components/permissions/FileEditPermissionRequest/src/components/FileEditToolDiff.ts
+++ b/src/components/permissions/FileEditPermissionRequest/src/components/FileEditToolDiff.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type FileEditToolDiff = any;
+export type FileEditToolDiff = any
diff --git a/src/components/permissions/FileEditPermissionRequest/src/utils/cwd.ts b/src/components/permissions/FileEditPermissionRequest/src/utils/cwd.ts
index 76c192ed8..4bd56a824 100644
--- a/src/components/permissions/FileEditPermissionRequest/src/utils/cwd.ts
+++ b/src/components/permissions/FileEditPermissionRequest/src/utils/cwd.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getCwd = any;
+export type getCwd = any
diff --git a/src/components/permissions/FilePermissionDialog/FilePermissionDialog.tsx b/src/components/permissions/FilePermissionDialog/FilePermissionDialog.tsx
index 58ac9b118..a9a4c7ffa 100644
--- a/src/components/permissions/FilePermissionDialog/FilePermissionDialog.tsx
+++ b/src/components/permissions/FilePermissionDialog/FilePermissionDialog.tsx
@@ -1,60 +1,51 @@
-import { relative } from 'path'
-import React, { useMemo } from 'react'
-import { useDiffInIDE } from '../../../hooks/useDiffInIDE.js'
-import { Box, Text } from '@anthropic/ink'
-import type { ToolUseContext } from '../../../Tool.js'
-import { getLanguageName } from '../../../utils/cliHighlight.js'
-import { getCwd } from '../../../utils/cwd.js'
-import {
-  getFsImplementation,
-  safeResolvePath,
-} from '../../../utils/fsOperations.js'
-import { expandPath } from '../../../utils/path.js'
-import type { CompletionType } from '../../../utils/unaryLogging.js'
-import { Select } from '../../CustomSelect/index.js'
-import { ShowInIDEPrompt } from '../../ShowInIDEPrompt.js'
-import { usePermissionRequestLogging } from '../hooks.js'
-import { PermissionDialog } from '../PermissionDialog.js'
-import type { ToolUseConfirm } from '../PermissionRequest.js'
-import type { WorkerBadgeProps } from '../WorkerBadge.js'
-import type { IDEDiffSupport } from './ideDiffConfig.js'
-import type {
-  FileOperationType,
-  PermissionOption,
-} from './permissionOptions.js'
-import {
-  type ToolInput,
-  useFilePermissionDialog,
-} from './useFilePermissionDialog.js'
+import { relative } from 'path';
+import React, { useMemo } from 'react';
+import { useDiffInIDE } from '../../../hooks/useDiffInIDE.js';
+import { Box, Text } from '@anthropic/ink';
+import type { ToolUseContext } from '../../../Tool.js';
+import { getLanguageName } from '../../../utils/cliHighlight.js';
+import { getCwd } from '../../../utils/cwd.js';
+import { getFsImplementation, safeResolvePath } from '../../../utils/fsOperations.js';
+import { expandPath } from '../../../utils/path.js';
+import type { CompletionType } from '../../../utils/unaryLogging.js';
+import { Select } from '../../CustomSelect/index.js';
+import { ShowInIDEPrompt } from '../../ShowInIDEPrompt.js';
+import { usePermissionRequestLogging } from '../hooks.js';
+import { PermissionDialog } from '../PermissionDialog.js';
+import type { ToolUseConfirm } from '../PermissionRequest.js';
+import type { WorkerBadgeProps } from '../WorkerBadge.js';
+import type { IDEDiffSupport } from './ideDiffConfig.js';
+import type { FileOperationType, PermissionOption } from './permissionOptions.js';
+import { type ToolInput, useFilePermissionDialog } from './useFilePermissionDialog.js';
 
 export type FilePermissionDialogProps<T extends ToolInput = ToolInput> = {
   // Required props from PermissionRequestProps
-  toolUseConfirm: ToolUseConfirm
-  toolUseContext: ToolUseContext
-  onDone: () => void
-  onReject: () => void
+  toolUseConfirm: ToolUseConfirm;
+  toolUseContext: ToolUseContext;
+  onDone: () => void;
+  onReject: () => void;
 
   // Dialog customization
-  title: string
-  subtitle?: React.ReactNode
-  question?: string | React.ReactNode
-  content?: React.ReactNode // Can be general content or diff component
+  title: string;
+  subtitle?: React.ReactNode;
+  question?: string | React.ReactNode;
+  content?: React.ReactNode; // Can be general content or diff component
 
   // Logging
-  completionType?: CompletionType
-  languageName?: string // override — derived from path when omitted
+  completionType?: CompletionType;
+  languageName?: string; // override — derived from path when omitted
 
   // File/directory operations
-  path: string | null
-  parseInput: (input: unknown) => T
-  operationType?: FileOperationType
+  path: string | null;
+  parseInput: (input: unknown) => T;
+  operationType?: FileOperationType;
 
   // IDE diff support
-  ideDiffSupport?: IDEDiffSupport<T>
+  ideDiffSupport?: IDEDiffSupport<T>;
 
   // Worker badge for teammate permission requests
-  workerBadge: WorkerBadgeProps | undefined
-}
+  workerBadge: WorkerBadgeProps | undefined;
+};
 
 export function FilePermissionDialog<T extends ToolInput = ToolInput>({
   toolUseConfirm,
@@ -80,28 +71,28 @@ export function FilePermissionDialog<T extends ToolInput = ToolInput>({
   const languageName = useMemo(
     () => languageNameOverride ?? (path ? getLanguageName(path) : 'none'),
     [languageNameOverride, path],
-  )
+  );
   const unaryEvent = useMemo(
     () => ({
       completion_type: completionType,
       language_name: languageName,
     }),
     [completionType, languageName],
-  )
-  usePermissionRequestLogging(toolUseConfirm, unaryEvent)
+  );
+  usePermissionRequestLogging(toolUseConfirm, unaryEvent);
 
   const symlinkTarget = useMemo(() => {
     if (!path || operationType === 'read') {
-      return null
+      return null;
     }
-    const expandedPath = expandPath(path)
-    const fs = getFsImplementation()
-    const { resolvedPath, isSymlink } = safeResolvePath(fs, expandedPath)
+    const expandedPath = expandPath(path);
+    const fs = getFsImplementation();
+    const { resolvedPath, isSymlink } = safeResolvePath(fs, expandedPath);
     if (isSymlink) {
-      return resolvedPath
+      return resolvedPath;
     }
-    return null
-  }, [path, operationType])
+    return null;
+  }, [path, operationType]);
 
   const fileDialogResult = useFilePermissionDialog({
     filePath: path || '',
@@ -112,7 +103,7 @@ export function FilePermissionDialog<T extends ToolInput = ToolInput>({
     onReject,
     parseInput,
     operationType,
-  })
+  });
 
   // Use file dialog results for options
   const {
@@ -124,22 +115,19 @@ export function FilePermissionDialog<T extends ToolInput = ToolInput>({
     focusedOption,
     yesInputMode,
     noInputMode,
-  } = fileDialogResult
+  } = fileDialogResult;
 
   // Parse input using the provided parser
-  const parsedInput = parseInput(toolUseConfirm.input)
+  const parsedInput = parseInput(toolUseConfirm.input);
 
   // Set up IDE diff support if enabled. Memoized: getConfig may do disk I/O
   // (FileWrite's getConfig calls readFileSync for the old-content diff).
   // Keyed on the raw input — parseInput is a pure Zod parse whose result
   // depends only on toolUseConfirm.input.
   const ideDiffConfig = useMemo(
-    () =>
-      ideDiffSupport
-        ? ideDiffSupport.getConfig(parseInput(toolUseConfirm.input))
-        : null,
+    () => (ideDiffSupport ? ideDiffSupport.getConfig(parseInput(toolUseConfirm.input)) : null),
     [ideDiffSupport, toolUseConfirm.input],
-  )
+  );
 
   // Create diff params based on whether IDE diff is available
   const diffParams = ideDiffConfig
@@ -147,19 +135,16 @@ export function FilePermissionDialog<T extends ToolInput = ToolInput>({
         onChange: (
           option: PermissionOption,
           input: {
-            file_path: string
+            file_path: string;
             edits: Array<{
-              old_string: string
-              new_string: string
-              replace_all?: boolean
-            }>
+              old_string: string;
+              new_string: string;
+              replace_all?: boolean;
+            }>;
           },
         ) => {
-          const transformedInput = ideDiffSupport!.applyChanges(
-            parsedInput,
-            input.edits,
-          )
-          fileDialogResult.onChange(option, transformedInput)
+          const transformedInput = ideDiffSupport!.applyChanges(parsedInput, input.edits);
+          fileDialogResult.onChange(option, transformedInput);
         },
         toolUseContext,
         filePath: ideDiffConfig.filePath,
@@ -176,21 +161,19 @@ export function FilePermissionDialog<T extends ToolInput = ToolInput>({
         filePath: '',
         edits: [],
         editMode: 'single' as const,
-      }
+      };
 
-  const { closeTabInIDE, showingDiffInIDE, ideName } = useDiffInIDE(diffParams)
+  const { closeTabInIDE, showingDiffInIDE, ideName } = useDiffInIDE(diffParams);
 
   const onChange = (option: PermissionOption, feedback?: string) => {
-    closeTabInIDE?.()
-    fileDialogResult.onChange(option, parsedInput, feedback?.trim())
-  }
+    closeTabInIDE?.();
+    fileDialogResult.onChange(option, parsedInput, feedback?.trim());
+  };
 
   if (showingDiffInIDE && ideDiffConfig && path) {
     return (
       <ShowInIDEPrompt
-        onChange={(option: PermissionOption, _input, feedback?: string) =>
-          onChange(option, feedback)
-        }
+        onChange={(option: PermissionOption, _input, feedback?: string) => onChange(option, feedback)}
         options={options}
         filePath={path}
         input={parsedInput}
@@ -204,11 +187,10 @@ export function FilePermissionDialog<T extends ToolInput = ToolInput>({
         yesInputMode={yesInputMode}
         noInputMode={noInputMode}
       />
-    )
+    );
   }
 
-  const isSymlinkOutsideCwd =
-    symlinkTarget != null && relative(getCwd(), symlinkTarget).startsWith('..')
+  const isSymlinkOutsideCwd = symlinkTarget != null && relative(getCwd(), symlinkTarget).startsWith('..');
 
   const symlinkWarning = symlinkTarget ? (
     <Box paddingX={1} marginBottom={1}>
@@ -218,16 +200,11 @@ export function FilePermissionDialog<T extends ToolInput = ToolInput>({
           : `Symlink target: ${symlinkTarget}`}
       </Text>
     </Box>
-  ) : null
+  ) : null;
 
   return (
     <>
-      <PermissionDialog
-        title={title}
-        subtitle={subtitle}
-        innerPaddingX={0}
-        workerBadge={workerBadge}
-      >
+      <PermissionDialog title={title} subtitle={subtitle} innerPaddingX={0} workerBadge={workerBadge}>
         {symlinkWarning}
         {content}
         <Box flexDirection="column" paddingX={1}>
@@ -236,21 +213,21 @@ export function FilePermissionDialog<T extends ToolInput = ToolInput>({
             options={options}
             inlineDescriptions
             onChange={value => {
-              const selected = options.find(opt => opt.value === value)
+              const selected = options.find(opt => opt.value === value);
               if (selected) {
                 // For reject option
                 if (selected.option.type === 'reject') {
-                  const trimmedFeedback = rejectFeedback.trim()
-                  onChange(selected.option, trimmedFeedback || undefined)
-                  return
+                  const trimmedFeedback = rejectFeedback.trim();
+                  onChange(selected.option, trimmedFeedback || undefined);
+                  return;
                 }
                 // For accept-once option, pass accept feedback if present
                 if (selected.option.type === 'accept-once') {
-                  const trimmedFeedback = acceptFeedback.trim()
-                  onChange(selected.option, trimmedFeedback || undefined)
-                  return
+                  const trimmedFeedback = acceptFeedback.trim();
+                  onChange(selected.option, trimmedFeedback || undefined);
+                  return;
                 }
-                onChange(selected.option)
+                onChange(selected.option);
               }
             }}
             onCancel={() => onChange({ type: 'reject' })}
@@ -262,11 +239,10 @@ export function FilePermissionDialog<T extends ToolInput = ToolInput>({
       <Box paddingX={1} marginTop={1}>
         <Text dimColor>
           Esc to cancel
-          {((focusedOption === 'yes' && !yesInputMode) ||
-            (focusedOption === 'no' && !noInputMode)) &&
+          {((focusedOption === 'yes' && !yesInputMode) || (focusedOption === 'no' && !noInputMode)) &&
             ' · Tab to amend'}
         </Text>
       </Box>
     </>
-  )
+  );
 }
diff --git a/src/components/permissions/FilePermissionDialog/permissionOptions.tsx b/src/components/permissions/FilePermissionDialog/permissionOptions.tsx
index 3709a6502..e67e64434 100644
--- a/src/components/permissions/FilePermissionDialog/permissionOptions.tsx
+++ b/src/components/permissions/FilePermissionDialog/permissionOptions.tsx
@@ -1,37 +1,31 @@
-import { homedir } from 'os'
-import { basename, join, sep } from 'path'
-import React, { type ReactNode } from 'react'
-import { getOriginalCwd } from '../../../bootstrap/state.js'
-import { Text } from '@anthropic/ink'
-import { getShortcutDisplay } from '../../../keybindings/shortcutFormat.js'
-import type { ToolPermissionContext } from '../../../Tool.js'
-import { expandPath, getDirectoryForPath } from '../../../utils/path.js'
-import {
-  normalizeCaseForComparison,
-  pathInAllowedWorkingPath,
-} from '../../../utils/permissions/filesystem.js'
-import type { OptionWithDescription } from '../../CustomSelect/select.js'
+import { homedir } from 'os';
+import { basename, join, sep } from 'path';
+import React, { type ReactNode } from 'react';
+import { getOriginalCwd } from '../../../bootstrap/state.js';
+import { Text } from '@anthropic/ink';
+import { getShortcutDisplay } from '../../../keybindings/shortcutFormat.js';
+import type { ToolPermissionContext } from '../../../Tool.js';
+import { expandPath, getDirectoryForPath } from '../../../utils/path.js';
+import { normalizeCaseForComparison, pathInAllowedWorkingPath } from '../../../utils/permissions/filesystem.js';
+import type { OptionWithDescription } from '../../CustomSelect/select.js';
 /**
  * Check if a path is within the project's .claude/ folder.
  * This is used to determine whether to show the special ".claude folder" permission option.
  */
 export function isInClaudeFolder(filePath: string): boolean {
-  const absolutePath = expandPath(filePath)
-  const claudeFolderPath = expandPath(`${getOriginalCwd()}/.claude`)
+  const absolutePath = expandPath(filePath);
+  const claudeFolderPath = expandPath(`${getOriginalCwd()}/.claude`);
 
   // Check if the path is within the project's .claude folder
-  const normalizedAbsolutePath = normalizeCaseForComparison(absolutePath)
-  const normalizedClaudeFolderPath =
-    normalizeCaseForComparison(claudeFolderPath)
+  const normalizedAbsolutePath = normalizeCaseForComparison(absolutePath);
+  const normalizedClaudeFolderPath = normalizeCaseForComparison(claudeFolderPath);
 
   // Path must start with the .claude folder path (and be inside it, not just the folder itself)
   return (
-    normalizedAbsolutePath.startsWith(
-      normalizedClaudeFolderPath + sep.toLowerCase(),
-    ) ||
+    normalizedAbsolutePath.startsWith(normalizedClaudeFolderPath + sep.toLowerCase()) ||
     // Also match case where sep is / on posix systems
     normalizedAbsolutePath.startsWith(normalizedClaudeFolderPath + '/')
-  )
+  );
 }
 
 /**
@@ -40,32 +34,28 @@ export function isInClaudeFolder(filePath: string): boolean {
  * for files in the user's home directory.
  */
 export function isInGlobalClaudeFolder(filePath: string): boolean {
-  const absolutePath = expandPath(filePath)
-  const globalClaudeFolderPath = join(homedir(), '.claude')
+  const absolutePath = expandPath(filePath);
+  const globalClaudeFolderPath = join(homedir(), '.claude');
 
-  const normalizedAbsolutePath = normalizeCaseForComparison(absolutePath)
-  const normalizedGlobalClaudeFolderPath = normalizeCaseForComparison(
-    globalClaudeFolderPath,
-  )
+  const normalizedAbsolutePath = normalizeCaseForComparison(absolutePath);
+  const normalizedGlobalClaudeFolderPath = normalizeCaseForComparison(globalClaudeFolderPath);
 
   return (
-    normalizedAbsolutePath.startsWith(
-      normalizedGlobalClaudeFolderPath + sep.toLowerCase(),
-    ) ||
+    normalizedAbsolutePath.startsWith(normalizedGlobalClaudeFolderPath + sep.toLowerCase()) ||
     normalizedAbsolutePath.startsWith(normalizedGlobalClaudeFolderPath + '/')
-  )
+  );
 }
 
 export type PermissionOption =
   | { type: 'accept-once' }
   | { type: 'accept-session'; scope?: 'claude-folder' | 'global-claude-folder' }
-  | { type: 'reject' }
+  | { type: 'reject' };
 
 export type PermissionOptionWithLabel = OptionWithDescription<string> & {
-  option: PermissionOption
-}
+  option: PermissionOption;
+};
 
-export type FileOperationType = 'read' | 'write' | 'create'
+export type FileOperationType = 'read' | 'write' | 'create';
 
 export function getFilePermissionOptions({
   filePath,
@@ -76,20 +66,16 @@ export function getFilePermissionOptions({
   yesInputMode = false,
   noInputMode = false,
 }: {
-  filePath: string
-  toolPermissionContext: ToolPermissionContext
-  operationType?: FileOperationType
-  onRejectFeedbackChange?: (value: string) => void
-  onAcceptFeedbackChange?: (value: string) => void
-  yesInputMode?: boolean
-  noInputMode?: boolean
+  filePath: string;
+  toolPermissionContext: ToolPermissionContext;
+  operationType?: FileOperationType;
+  onRejectFeedbackChange?: (value: string) => void;
+  onAcceptFeedbackChange?: (value: string) => void;
+  yesInputMode?: boolean;
+  noInputMode?: boolean;
 }): PermissionOptionWithLabel[] {
-  const options: PermissionOptionWithLabel[] = []
-  const modeCycleShortcut = getShortcutDisplay(
-    'chat:cycleMode',
-    'Chat',
-    'shift+tab',
-  )
+  const options: PermissionOptionWithLabel[] = [];
+  const modeCycleShortcut = getShortcutDisplay('chat:cycleMode', 'Chat', 'shift+tab');
 
   // When in input mode, show input field
   if (yesInputMode && onAcceptFeedbackChange) {
@@ -101,23 +87,20 @@ export function getFilePermissionOptions({
       onChange: onAcceptFeedbackChange,
       allowEmptySubmitToCancel: true,
       option: { type: 'accept-once' },
-    })
+    });
   } else {
     options.push({
       label: 'Yes',
       value: 'yes',
       option: { type: 'accept-once' },
-    })
+    });
   }
 
-  const inAllowedPath = pathInAllowedWorkingPath(
-    filePath,
-    toolPermissionContext,
-  )
+  const inAllowedPath = pathInAllowedWorkingPath(filePath, toolPermissionContext);
 
   // Check if this is a .claude/ folder path (project or global)
-  const inClaudeFolder = isInClaudeFolder(filePath)
-  const inGlobalClaudeFolder = isInGlobalClaudeFolder(filePath)
+  const inClaudeFolder = isInClaudeFolder(filePath);
+  const inGlobalClaudeFolder = isInGlobalClaudeFolder(filePath);
 
   // Option 2: For .claude/ folder, show special option instead of generic session option
   // Note: Session-level options are always shown since they only affect in-memory state,
@@ -131,42 +114,40 @@ export function getFilePermissionOptions({
         type: 'accept-session',
         scope: inGlobalClaudeFolder ? 'global-claude-folder' : 'claude-folder',
       },
-    })
+    });
   } else {
     // Option 2: Allow all changes/reads during session
-    let sessionLabel: ReactNode
+    let sessionLabel: ReactNode;
 
     if (inAllowedPath) {
       // Inside working directory
       if (operationType === 'read') {
-        sessionLabel = 'Yes, during this session'
+        sessionLabel = 'Yes, during this session';
       } else {
         sessionLabel = (
           <Text>
-            Yes, allow all edits during this session{' '}
-            <Text bold>({modeCycleShortcut})</Text>
+            Yes, allow all edits during this session <Text bold>({modeCycleShortcut})</Text>
           </Text>
-        )
+        );
       }
     } else {
       // Outside working directory - include directory name
-      const dirPath = getDirectoryForPath(filePath)
-      const dirName = basename(dirPath) || 'this directory'
+      const dirPath = getDirectoryForPath(filePath);
+      const dirName = basename(dirPath) || 'this directory';
 
       if (operationType === 'read') {
         sessionLabel = (
           <Text>
-            Yes, allow reading from <Text bold>{dirName}/</Text> during this
-            session
+            Yes, allow reading from <Text bold>{dirName}/</Text> during this session
           </Text>
-        )
+        );
       } else {
         sessionLabel = (
           <Text>
-            Yes, allow all edits in <Text bold>{dirName}/</Text> during this
-            session <Text bold>({modeCycleShortcut})</Text>
+            Yes, allow all edits in <Text bold>{dirName}/</Text> during this session{' '}
+            <Text bold>({modeCycleShortcut})</Text>
           </Text>
-        )
+        );
       }
     }
 
@@ -174,7 +155,7 @@ export function getFilePermissionOptions({
       label: sessionLabel,
       value: 'yes-session',
       option: { type: 'accept-session' },
-    })
+    });
   }
 
   // When in input mode, show input field for reject
@@ -187,15 +168,15 @@ export function getFilePermissionOptions({
       onChange: onRejectFeedbackChange,
       allowEmptySubmitToCancel: true,
       option: { type: 'reject' },
-    })
+    });
   } else {
     // Not in input mode - simple option
     options.push({
       label: 'No',
       value: 'no',
       option: { type: 'reject' },
-    })
+    });
   }
 
-  return options
+  return options;
 }
diff --git a/src/components/permissions/FilePermissionDialog/src/state/AppState.ts b/src/components/permissions/FilePermissionDialog/src/state/AppState.ts
index 3c93608d8..ff8a9db6a 100644
--- a/src/components/permissions/FilePermissionDialog/src/state/AppState.ts
+++ b/src/components/permissions/FilePermissionDialog/src/state/AppState.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useAppState = any;
+export type useAppState = any
diff --git a/src/components/permissions/FileWritePermissionRequest/FileWritePermissionRequest.tsx b/src/components/permissions/FileWritePermissionRequest/FileWritePermissionRequest.tsx
index f6146f705..b4d42a634 100644
--- a/src/components/permissions/FileWritePermissionRequest/FileWritePermissionRequest.tsx
+++ b/src/components/permissions/FileWritePermissionRequest/FileWritePermissionRequest.tsx
@@ -1,30 +1,30 @@
-import { basename, relative } from 'path'
-import React, { useMemo } from 'react'
-import type { z } from 'zod/v4'
-import { Text } from '@anthropic/ink'
-import { FileWriteTool } from '@claude-code-best/builtin-tools/tools/FileWriteTool/FileWriteTool.js'
-import { getCwd } from '../../../utils/cwd.js'
-import { isENOENT } from '../../../utils/errors.js'
-import { readFileSync } from '../../../utils/fileRead.js'
-import { FilePermissionDialog } from '../FilePermissionDialog/FilePermissionDialog.js'
+import { basename, relative } from 'path';
+import React, { useMemo } from 'react';
+import type { z } from 'zod/v4';
+import { Text } from '@anthropic/ink';
+import { FileWriteTool } from '@claude-code-best/builtin-tools/tools/FileWriteTool/FileWriteTool.js';
+import { getCwd } from '../../../utils/cwd.js';
+import { isENOENT } from '../../../utils/errors.js';
+import { readFileSync } from '../../../utils/fileRead.js';
+import { FilePermissionDialog } from '../FilePermissionDialog/FilePermissionDialog.js';
 import {
   createSingleEditDiffConfig,
   type FileEdit,
   type IDEDiffSupport,
-} from '../FilePermissionDialog/ideDiffConfig.js'
-import type { PermissionRequestProps } from '../PermissionRequest.js'
-import { FileWriteToolDiff } from './FileWriteToolDiff.js'
+} from '../FilePermissionDialog/ideDiffConfig.js';
+import type { PermissionRequestProps } from '../PermissionRequest.js';
+import { FileWriteToolDiff } from './FileWriteToolDiff.js';
 
-type FileWriteToolInput = z.infer<typeof FileWriteTool.inputSchema>
+type FileWriteToolInput = z.infer<typeof FileWriteTool.inputSchema>;
 
 const ideDiffSupport: IDEDiffSupport<FileWriteToolInput> = {
   getConfig: (input: FileWriteToolInput) => {
-    let oldContent: string
+    let oldContent: string;
     try {
-      oldContent = readFileSync(input.file_path)
+      oldContent = readFileSync(input.file_path);
     } catch (e) {
-      if (!isENOENT(e)) throw e
-      oldContent = ''
+      if (!isENOENT(e)) throw e;
+      oldContent = '';
     }
 
     return createSingleEditDiffConfig(
@@ -32,43 +32,41 @@ const ideDiffSupport: IDEDiffSupport<FileWriteToolInput> = {
       oldContent,
       input.content,
       false, // For file writes, we replace the entire content
-    )
+    );
   },
   applyChanges: (input: FileWriteToolInput, modifiedEdits: FileEdit[]) => {
-    const firstEdit = modifiedEdits[0]
+    const firstEdit = modifiedEdits[0];
     if (firstEdit) {
       return {
         ...input,
         content: firstEdit.new_string,
-      }
+      };
     }
-    return input
+    return input;
   },
-}
+};
 
-export function FileWritePermissionRequest(
-  props: PermissionRequestProps,
-): React.ReactNode {
+export function FileWritePermissionRequest(props: PermissionRequestProps): React.ReactNode {
   const parseInput = (input: unknown): FileWriteToolInput => {
-    return FileWriteTool.inputSchema.parse(input)
-  }
+    return FileWriteTool.inputSchema.parse(input);
+  };
 
-  const parsed = parseInput(props.toolUseConfirm.input)
-  const { file_path, content } = parsed
+  const parsed = parseInput(props.toolUseConfirm.input);
+  const { file_path, content } = parsed;
 
   // Single read drives both UI text ("Create" vs "Overwrite") and the diff
   // shown by FileWriteToolDiff — avoids a redundant existsSync stat that would
   // block first-mount commit on slow/networked filesystems.
   const { fileExists, oldContent } = useMemo(() => {
     try {
-      return { fileExists: true, oldContent: readFileSync(file_path) }
+      return { fileExists: true, oldContent: readFileSync(file_path) };
     } catch (e) {
-      if (!isENOENT(e)) throw e
-      return { fileExists: false, oldContent: '' }
+      if (!isENOENT(e)) throw e;
+      return { fileExists: false, oldContent: '' };
     }
-  }, [file_path])
+  }, [file_path]);
 
-  const actionText = fileExists ? 'overwrite' : 'create'
+  const actionText = fileExists ? 'overwrite' : 'create';
 
   return (
     <FilePermissionDialog
@@ -85,17 +83,12 @@ export function FileWritePermissionRequest(
         </Text>
       }
       content={
-        <FileWriteToolDiff
-          file_path={file_path}
-          content={content}
-          fileExists={fileExists}
-          oldContent={oldContent}
-        />
+        <FileWriteToolDiff file_path={file_path} content={content} fileExists={fileExists} oldContent={oldContent} />
       }
       path={file_path}
       completionType="write_file_single"
       parseInput={parseInput}
       ideDiffSupport={ideDiffSupport}
     />
-  )
+  );
 }
diff --git a/src/components/permissions/FileWritePermissionRequest/FileWriteToolDiff.tsx b/src/components/permissions/FileWritePermissionRequest/FileWriteToolDiff.tsx
index 38084661f..54b1e1d3f 100644
--- a/src/components/permissions/FileWritePermissionRequest/FileWriteToolDiff.tsx
+++ b/src/components/permissions/FileWritePermissionRequest/FileWriteToolDiff.tsx
@@ -1,29 +1,24 @@
-import * as React from 'react'
-import { useMemo } from 'react'
-import { useTerminalSize } from '../../../hooks/useTerminalSize.js'
-import { Box, NoSelect, Text } from '@anthropic/ink'
-import { intersperse } from '../../../utils/array.js'
-import { getPatchForDisplay } from '../../../utils/diff.js'
-import { HighlightedCode } from '../../HighlightedCode.js'
-import { StructuredDiff } from '../../StructuredDiff.js'
+import * as React from 'react';
+import { useMemo } from 'react';
+import { useTerminalSize } from '../../../hooks/useTerminalSize.js';
+import { Box, NoSelect, Text } from '@anthropic/ink';
+import { intersperse } from '../../../utils/array.js';
+import { getPatchForDisplay } from '../../../utils/diff.js';
+import { HighlightedCode } from '../../HighlightedCode.js';
+import { StructuredDiff } from '../../StructuredDiff.js';
 
 type Props = {
-  file_path: string
-  content: string
-  fileExists: boolean
-  oldContent: string
-}
+  file_path: string;
+  content: string;
+  fileExists: boolean;
+  oldContent: string;
+};
 
-export function FileWriteToolDiff({
-  file_path,
-  content,
-  fileExists,
-  oldContent,
-}: Props): React.ReactNode {
-  const { columns } = useTerminalSize()
+export function FileWriteToolDiff({ file_path, content, fileExists, oldContent }: Props): React.ReactNode {
+  const { columns } = useTerminalSize();
   const hunks = useMemo(() => {
     if (!fileExists) {
-      return null
+      return null;
     }
     return getPatchForDisplay({
       filePath: file_path,
@@ -35,11 +30,11 @@ export function FileWriteToolDiff({
           replace_all: false,
         },
       ],
-    })
-  }, [fileExists, file_path, oldContent, content])
+    });
+  }, [fileExists, file_path, oldContent, content]);
 
-  const firstLine = content.split('\n')[0] ?? null
-  const paddingX = 1
+  const firstLine = content.split('\n')[0] ?? null;
+  const paddingX = 1;
 
   return (
     <Box flexDirection="column">
@@ -71,12 +66,9 @@ export function FileWriteToolDiff({
             ),
           )
         ) : (
-          <HighlightedCode
-            code={content || '(No content)'}
-            filePath={file_path}
-          />
+          <HighlightedCode code={content || '(No content)'} filePath={file_path} />
         )}
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/components/permissions/FilesystemPermissionRequest/FilesystemPermissionRequest.tsx b/src/components/permissions/FilesystemPermissionRequest/FilesystemPermissionRequest.tsx
index 67828f563..ec3b6d893 100644
--- a/src/components/permissions/FilesystemPermissionRequest/FilesystemPermissionRequest.tsx
+++ b/src/components/permissions/FilesystemPermissionRequest/FilesystemPermissionRequest.tsx
@@ -1,23 +1,20 @@
-import React from 'react'
-import { Box, Text, useTheme } from '@anthropic/ink'
-import { FallbackPermissionRequest } from '../FallbackPermissionRequest.js'
-import { FilePermissionDialog } from '../FilePermissionDialog/FilePermissionDialog.js'
-import type { ToolInput } from '../FilePermissionDialog/useFilePermissionDialog.js'
-import type {
-  PermissionRequestProps,
-  ToolUseConfirm,
-} from '../PermissionRequest.js'
+import React from 'react';
+import { Box, Text, useTheme } from '@anthropic/ink';
+import { FallbackPermissionRequest } from '../FallbackPermissionRequest.js';
+import { FilePermissionDialog } from '../FilePermissionDialog/FilePermissionDialog.js';
+import type { ToolInput } from '../FilePermissionDialog/useFilePermissionDialog.js';
+import type { PermissionRequestProps, ToolUseConfirm } from '../PermissionRequest.js';
 
 function pathFromToolUse(toolUseConfirm: ToolUseConfirm): string | null {
-  const tool = toolUseConfirm.tool
+  const tool = toolUseConfirm.tool;
   if ('getPath' in tool && typeof tool.getPath === 'function') {
     try {
-      return tool.getPath(toolUseConfirm.input)
+      return tool.getPath(toolUseConfirm.input);
     } catch {
-      return null
+      return null;
     }
   }
-  return null
+  return null;
 }
 
 export function FilesystemPermissionRequest({
@@ -28,20 +25,18 @@ export function FilesystemPermissionRequest({
   toolUseContext,
   workerBadge,
 }: PermissionRequestProps): React.ReactNode {
-  const [theme] = useTheme()
-  const path = pathFromToolUse(toolUseConfirm)
-  const userFacingName = toolUseConfirm.tool.userFacingName(
-    toolUseConfirm.input as never,
-  )
+  const [theme] = useTheme();
+  const path = pathFromToolUse(toolUseConfirm);
+  const userFacingName = toolUseConfirm.tool.userFacingName(toolUseConfirm.input as never);
 
-  const isReadOnly = toolUseConfirm.tool.isReadOnly(toolUseConfirm.input)
-  const userFacingReadOrEdit = isReadOnly ? 'Read' : 'Edit'
+  const isReadOnly = toolUseConfirm.tool.isReadOnly(toolUseConfirm.input);
+  const userFacingReadOrEdit = isReadOnly ? 'Read' : 'Edit';
 
   // Use simple singular form - the actual operation details are shown in content
-  const title = `${userFacingReadOrEdit} file`
+  const title = `${userFacingReadOrEdit} file`;
 
   // Simple pass-through parser since we don't need to transform the input
-  const parseInput = (input: unknown): ToolInput => input as ToolInput
+  const parseInput = (input: unknown): ToolInput => input as ToolInput;
 
   // Fall back to generic permission request if no path is found
   if (!path) {
@@ -54,22 +49,17 @@ export function FilesystemPermissionRequest({
         verbose={verbose}
         workerBadge={workerBadge}
       />
-    )
+    );
   }
 
   // Render tool use message content
   const content = (
     <Box flexDirection="column" paddingX={2} paddingY={1}>
       <Text>
-        {userFacingName}(
-        {toolUseConfirm.tool.renderToolUseMessage(
-          toolUseConfirm.input as never,
-          { theme, verbose },
-        )}
-        )
+        {userFacingName}({toolUseConfirm.tool.renderToolUseMessage(toolUseConfirm.input as never, { theme, verbose })})
       </Text>
     </Box>
-  )
+  );
 
   return (
     <FilePermissionDialog
@@ -85,5 +75,5 @@ export function FilesystemPermissionRequest({
       operationType={isReadOnly ? 'read' : 'write'}
       completionType="tool_use_single"
     />
-  )
+  );
 }
diff --git a/src/components/permissions/MonitorPermissionRequest/MonitorPermissionRequest.tsx b/src/components/permissions/MonitorPermissionRequest/MonitorPermissionRequest.tsx
index 0041f3d6e..61cc7a786 100644
--- a/src/components/permissions/MonitorPermissionRequest/MonitorPermissionRequest.tsx
+++ b/src/components/permissions/MonitorPermissionRequest/MonitorPermissionRequest.tsx
@@ -1,19 +1,16 @@
-import React, { useCallback, useMemo } from 'react'
-import { Box, Text, useTheme } from '@anthropic/ink'
-import { getTheme } from '../../../utils/theme.js'
-import { env } from '../../../utils/env.js'
-import { shouldShowAlwaysAllowOptions } from '../../../utils/permissions/permissionsLoader.js'
-import { truncateToLines } from '../../../utils/stringUtils.js'
-import { logUnaryEvent } from '../../../utils/unaryLogging.js'
-import { PermissionDialog } from '../PermissionDialog.js'
-import {
-  PermissionPrompt,
-  type PermissionPromptOption,
-} from '../PermissionPrompt.js'
-import type { PermissionRequestProps } from '../PermissionRequest.js'
-import { PermissionRuleExplanation } from '../PermissionRuleExplanation.js'
+import React, { useCallback, useMemo } from 'react';
+import { Box, Text, useTheme } from '@anthropic/ink';
+import { getTheme } from '../../../utils/theme.js';
+import { env } from '../../../utils/env.js';
+import { shouldShowAlwaysAllowOptions } from '../../../utils/permissions/permissionsLoader.js';
+import { truncateToLines } from '../../../utils/stringUtils.js';
+import { logUnaryEvent } from '../../../utils/unaryLogging.js';
+import { PermissionDialog } from '../PermissionDialog.js';
+import { PermissionPrompt, type PermissionPromptOption } from '../PermissionPrompt.js';
+import type { PermissionRequestProps } from '../PermissionRequest.js';
+import { PermissionRuleExplanation } from '../PermissionRuleExplanation.js';
 
-type OptionValue = 'yes' | 'yes-dont-ask-again' | 'no'
+type OptionValue = 'yes' | 'yes-dont-ask-again' | 'no';
 
 /**
  * Permission request UI for the MonitorTool. Asks the user to confirm
@@ -26,18 +23,15 @@ export function MonitorPermissionRequest({
   onReject,
   workerBadge,
 }: PermissionRequestProps): React.ReactNode {
-  const [themeName] = useTheme()
-  const theme = getTheme(themeName)
+  const [themeName] = useTheme();
+  const theme = getTheme(themeName);
 
   const input = toolUseConfirm.input as {
-    command: string
-    description: string
-  }
+    command: string;
+    description: string;
+  };
 
-  const showAlwaysAllowOptions = useMemo(
-    () => shouldShowAlwaysAllowOptions(),
-    [],
-  )
+  const showAlwaysAllowOptions = useMemo(() => shouldShowAlwaysAllowOptions(), []);
 
   const options: PermissionPromptOption<OptionValue>[] = useMemo(() => {
     const opts: PermissionPromptOption<OptionValue>[] = [
@@ -46,25 +40,24 @@ export function MonitorPermissionRequest({
         value: 'yes',
         feedbackConfig: { type: 'accept' as const },
       },
-    ]
+    ];
     if (showAlwaysAllowOptions) {
       opts.push({
         label: (
           <Text>
-            Yes, and don{'\u2019'}t ask again for{' '}
-            <Text bold>{toolUseConfirm.tool.name}</Text> commands
+            Yes, and don{'\u2019'}t ask again for <Text bold>{toolUseConfirm.tool.name}</Text> commands
           </Text>
         ),
         value: 'yes-dont-ask-again',
-      })
+      });
     }
     opts.push({
       label: 'No',
       value: 'no',
       feedbackConfig: { type: 'reject' as const },
-    })
-    return opts
-  }, [showAlwaysAllowOptions, toolUseConfirm.tool.name])
+    });
+    return opts;
+  }, [showAlwaysAllowOptions, toolUseConfirm.tool.name]);
 
   const handleSelect = useCallback(
     (value: OptionValue, feedback?: string) => {
@@ -78,10 +71,10 @@ export function MonitorPermissionRequest({
               message_id: toolUseConfirm.assistantMessage.message.id ?? '',
               platform: env.platform,
             },
-          })
-          toolUseConfirm.onAllow(toolUseConfirm.input, [], feedback)
-          onDone()
-          break
+          });
+          toolUseConfirm.onAllow(toolUseConfirm.input, [], feedback);
+          onDone();
+          break;
         case 'yes-dont-ask-again':
           logUnaryEvent({
             completion_type: 'tool_use_single',
@@ -91,7 +84,7 @@ export function MonitorPermissionRequest({
               message_id: toolUseConfirm.assistantMessage.message.id ?? '',
               platform: env.platform,
             },
-          })
+          });
           toolUseConfirm.onAllow(toolUseConfirm.input, [
             {
               type: 'addRules',
@@ -99,9 +92,9 @@ export function MonitorPermissionRequest({
               behavior: 'allow',
               destination: 'localSettings',
             },
-          ])
-          onDone()
-          break
+          ]);
+          onDone();
+          break;
         case 'no':
           logUnaryEvent({
             completion_type: 'tool_use_single',
@@ -111,15 +104,15 @@ export function MonitorPermissionRequest({
               message_id: toolUseConfirm.assistantMessage.message.id ?? '',
               platform: env.platform,
             },
-          })
-          toolUseConfirm.onReject(feedback)
-          onReject()
-          onDone()
-          break
+          });
+          toolUseConfirm.onReject(feedback);
+          onReject();
+          onDone();
+          break;
       }
     },
     [toolUseConfirm, onDone, onReject],
-  )
+  );
 
   const handleCancel = useCallback(() => {
     logUnaryEvent({
@@ -130,36 +123,24 @@ export function MonitorPermissionRequest({
         message_id: toolUseConfirm.assistantMessage.message.id ?? '',
         platform: env.platform,
       },
-    })
-    toolUseConfirm.onReject()
-    onReject()
-    onDone()
-  }, [toolUseConfirm, onDone, onReject])
+    });
+    toolUseConfirm.onReject();
+    onReject();
+    onDone();
+  }, [toolUseConfirm, onDone, onReject]);
 
   return (
-    <PermissionDialog
-      title="Monitor"
-      workerBadge={workerBadge}
-    >
+    <PermissionDialog title="Monitor" workerBadge={workerBadge}>
       <Box flexDirection="column" gap={1}>
         <Box flexDirection="column">
           <Text bold color={theme.permission as any}>
             {input.description}
           </Text>
-          <Text dimColor>
-            {truncateToLines(input.command, 5)}
-          </Text>
+          <Text dimColor>{truncateToLines(input.command, 5)}</Text>
         </Box>
-        <PermissionRuleExplanation
-          permissionResult={toolUseConfirm.permissionResult}
-          toolType="command"
-        />
-        <PermissionPrompt<OptionValue>
-          options={options}
-          onSelect={handleSelect}
-          onCancel={handleCancel}
-        />
+        <PermissionRuleExplanation permissionResult={toolUseConfirm.permissionResult} toolType="command" />
+        <PermissionPrompt<OptionValue> options={options} onSelect={handleSelect} onCancel={handleCancel} />
       </Box>
     </PermissionDialog>
-  )
+  );
 }
diff --git a/src/components/permissions/NotebookEditPermissionRequest/NotebookEditPermissionRequest.tsx b/src/components/permissions/NotebookEditPermissionRequest/NotebookEditPermissionRequest.tsx
index ab2c94393..072ba2c00 100644
--- a/src/components/permissions/NotebookEditPermissionRequest/NotebookEditPermissionRequest.tsx
+++ b/src/components/permissions/NotebookEditPermissionRequest/NotebookEditPermissionRequest.tsx
@@ -1,47 +1,41 @@
-import { basename } from 'path'
-import React from 'react'
-import type { z } from 'zod/v4'
-import { Text } from '@anthropic/ink'
-import { NotebookEditTool } from '@claude-code-best/builtin-tools/tools/NotebookEditTool/NotebookEditTool.js'
-import { logError } from '../../../utils/log.js'
-import { FilePermissionDialog } from '../FilePermissionDialog/FilePermissionDialog.js'
-import type { PermissionRequestProps } from '../PermissionRequest.js'
-import { NotebookEditToolDiff } from './NotebookEditToolDiff.js'
+import { basename } from 'path';
+import React from 'react';
+import type { z } from 'zod/v4';
+import { Text } from '@anthropic/ink';
+import { NotebookEditTool } from '@claude-code-best/builtin-tools/tools/NotebookEditTool/NotebookEditTool.js';
+import { logError } from '../../../utils/log.js';
+import { FilePermissionDialog } from '../FilePermissionDialog/FilePermissionDialog.js';
+import type { PermissionRequestProps } from '../PermissionRequest.js';
+import { NotebookEditToolDiff } from './NotebookEditToolDiff.js';
 
-type NotebookEditInput = z.infer<typeof NotebookEditTool.inputSchema>
+type NotebookEditInput = z.infer<typeof NotebookEditTool.inputSchema>;
 
-export function NotebookEditPermissionRequest(
-  props: PermissionRequestProps,
-): React.ReactNode {
+export function NotebookEditPermissionRequest(props: PermissionRequestProps): React.ReactNode {
   const parseInput = (input: unknown): NotebookEditInput => {
-    const result = NotebookEditTool.inputSchema.safeParse(input)
+    const result = NotebookEditTool.inputSchema.safeParse(input);
     if (!result.success) {
-      logError(
-        new Error(
-          `Failed to parse notebook edit input: ${result.error.message}`,
-        ),
-      )
+      logError(new Error(`Failed to parse notebook edit input: ${result.error.message}`));
       // Return a default value to avoid crashing
       return {
         notebook_path: '',
         new_source: '',
         cell_id: '',
-      } as NotebookEditInput
+      } as NotebookEditInput;
     }
-    return result.data
-  }
+    return result.data;
+  };
 
-  const parsed = parseInput(props.toolUseConfirm.input)
-  const { notebook_path, edit_mode, cell_type } = parsed
+  const parsed = parseInput(props.toolUseConfirm.input);
+  const { notebook_path, edit_mode, cell_type } = parsed;
 
-  const language = cell_type === 'markdown' ? 'markdown' : 'python'
+  const language = cell_type === 'markdown' ? 'markdown' : 'python';
 
   const editTypeText =
     edit_mode === 'insert'
       ? 'insert this cell into'
       : edit_mode === 'delete'
         ? 'delete this cell from'
-        : 'make this edit to'
+        : 'make this edit to';
 
   return (
     <FilePermissionDialog
@@ -53,8 +47,7 @@ export function NotebookEditPermissionRequest(
       title="Edit notebook"
       question={
         <Text>
-          Do you want to {editTypeText}{' '}
-          <Text bold>{basename(notebook_path)}</Text>?
+          Do you want to {editTypeText} <Text bold>{basename(notebook_path)}</Text>?
         </Text>
       }
       content={
@@ -73,5 +66,5 @@ export function NotebookEditPermissionRequest(
       languageName={language}
       parseInput={parseInput}
     />
-  )
+  );
 }
diff --git a/src/components/permissions/NotebookEditPermissionRequest/NotebookEditToolDiff.tsx b/src/components/permissions/NotebookEditPermissionRequest/NotebookEditToolDiff.tsx
index 023f8c6bf..3e554412a 100644
--- a/src/components/permissions/NotebookEditPermissionRequest/NotebookEditToolDiff.tsx
+++ b/src/components/permissions/NotebookEditPermissionRequest/NotebookEditToolDiff.tsx
@@ -1,41 +1,37 @@
-import { relative } from 'path'
-import * as React from 'react'
-import { Suspense, use, useMemo } from 'react'
-import { Box, NoSelect, Text } from '@anthropic/ink'
-import type {
-  NotebookCell,
-  NotebookCellType,
-  NotebookContent,
-} from '../../../types/notebook.js'
-import { intersperse } from '../../../utils/array.js'
-import { getCwd } from '../../../utils/cwd.js'
-import { getPatchForDisplay } from '../../../utils/diff.js'
-import { getFsImplementation } from '../../../utils/fsOperations.js'
-import { safeParseJSON } from '../../../utils/json.js'
-import { parseCellId } from '../../../utils/notebook.js'
-import { HighlightedCode } from '../../HighlightedCode.js'
-import { StructuredDiff } from '../../StructuredDiff.js'
+import { relative } from 'path';
+import * as React from 'react';
+import { Suspense, use, useMemo } from 'react';
+import { Box, NoSelect, Text } from '@anthropic/ink';
+import type { NotebookCell, NotebookCellType, NotebookContent } from '../../../types/notebook.js';
+import { intersperse } from '../../../utils/array.js';
+import { getCwd } from '../../../utils/cwd.js';
+import { getPatchForDisplay } from '../../../utils/diff.js';
+import { getFsImplementation } from '../../../utils/fsOperations.js';
+import { safeParseJSON } from '../../../utils/json.js';
+import { parseCellId } from '../../../utils/notebook.js';
+import { HighlightedCode } from '../../HighlightedCode.js';
+import { StructuredDiff } from '../../StructuredDiff.js';
 
 type Props = {
-  notebook_path: string
-  cell_id: string | undefined
-  new_source: string
-  cell_type?: NotebookCellType
-  edit_mode?: string
-  verbose: boolean
-  width: number
-}
+  notebook_path: string;
+  cell_id: string | undefined;
+  new_source: string;
+  cell_type?: NotebookCellType;
+  edit_mode?: string;
+  verbose: boolean;
+  width: number;
+};
 
 type InnerProps = {
-  notebook_path: string
-  cell_id: string | undefined
-  new_source: string
-  cell_type?: NotebookCellType
-  edit_mode?: string
-  verbose: boolean
-  width: number
-  promise: Promise<NotebookContent | null>
-}
+  notebook_path: string;
+  cell_id: string | undefined;
+  new_source: string;
+  cell_type?: NotebookCellType;
+  edit_mode?: string;
+  verbose: boolean;
+  width: number;
+  promise: Promise<NotebookContent | null>;
+};
 
 export function NotebookEditToolDiff(props: Props): React.ReactNode {
   // Create a promise that never rejects so we can handle errors inline.
@@ -47,13 +43,13 @@ export function NotebookEditToolDiff(props: Props): React.ReactNode {
         .then(content => safeParseJSON(content) as NotebookContent | null)
         .catch(() => null),
     [props.notebook_path],
-  )
+  );
 
   return (
     <Suspense fallback={null}>
       <NotebookEditToolDiffInner {...props} promise={notebookDataPromise} />
     </Suspense>
-  )
+  );
 }
 
 function NotebookEditToolDiffInner({
@@ -66,30 +62,30 @@ function NotebookEditToolDiffInner({
   width,
   promise,
 }: InnerProps): React.ReactNode {
-  const notebookData = use(promise)
+  const notebookData = use(promise);
 
   const oldSource = useMemo(() => {
     if (!notebookData || !cell_id) {
-      return ''
+      return '';
     }
-    const cellIndex = parseCellId(cell_id)
+    const cellIndex = parseCellId(cell_id);
     if (cellIndex !== undefined) {
       if (notebookData.cells[cellIndex]) {
-        const source = notebookData.cells[cellIndex].source
-        return Array.isArray(source) ? source.join('') : source
+        const source = notebookData.cells[cellIndex].source;
+        return Array.isArray(source) ? source.join('') : source;
       }
-      return ''
+      return '';
     }
-    const cell = notebookData.cells.find((cell: NotebookCell) => cell.id === cell_id)
+    const cell = notebookData.cells.find((cell: NotebookCell) => cell.id === cell_id);
     if (!cell) {
-      return ''
+      return '';
     }
-    return Array.isArray(cell.source) ? cell.source.join('') : cell.source
-  }, [notebookData, cell_id])
+    return Array.isArray(cell.source) ? cell.source.join('') : cell.source;
+  }, [notebookData, cell_id]);
 
   const hunks = useMemo(() => {
     if (!notebookData || edit_mode === 'insert' || edit_mode === 'delete') {
-      return null
+      return null;
     }
     // Create a "fake" file content with just the cell source
     // This allows us to use the regular diff mechanism
@@ -104,28 +100,26 @@ function NotebookEditToolDiffInner({
         },
       ],
       ignoreWhitespace: false,
-    })
-  }, [notebookData, notebook_path, oldSource, new_source, edit_mode])
+    });
+  }, [notebookData, notebook_path, oldSource, new_source, edit_mode]);
 
-  let editTypeDescription: string
+  let editTypeDescription: string;
   switch (edit_mode) {
     case 'insert':
-      editTypeDescription = 'Insert new cell'
-      break
+      editTypeDescription = 'Insert new cell';
+      break;
     case 'delete':
-      editTypeDescription = 'Delete cell'
-      break
+      editTypeDescription = 'Delete cell';
+      break;
     default:
-      editTypeDescription = 'Replace cell contents'
+      editTypeDescription = 'Replace cell contents';
   }
 
   return (
     <Box flexDirection="column">
       <Box borderStyle="round" flexDirection="column" paddingX={1}>
         <Box paddingBottom={1} flexDirection="column">
-          <Text bold>
-            {verbose ? notebook_path : relative(getCwd(), notebook_path)}
-          </Text>
+          <Text bold>{verbose ? notebook_path : relative(getCwd(), notebook_path)}</Text>
           <Text dimColor>
             {editTypeDescription} for cell {cell_id}
             {cell_type ? ` (${cell_type})` : ''}
@@ -137,10 +131,7 @@ function NotebookEditToolDiffInner({
           </Box>
         ) : edit_mode === 'insert' ? (
           <Box flexDirection="column" paddingLeft={2}>
-            <HighlightedCode
-              code={new_source}
-              filePath={cell_type === 'markdown' ? 'file.md' : notebook_path}
-            />
+            <HighlightedCode code={new_source} filePath={cell_type === 'markdown' ? 'file.md' : notebook_path} />
           </Box>
         ) : hunks ? (
           intersperse(
@@ -162,12 +153,9 @@ function NotebookEditToolDiffInner({
             ),
           )
         ) : (
-          <HighlightedCode
-            code={new_source}
-            filePath={cell_type === 'markdown' ? 'file.md' : notebook_path}
-          />
+          <HighlightedCode code={new_source} filePath={cell_type === 'markdown' ? 'file.md' : notebook_path} />
         )}
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/components/permissions/PermissionDecisionDebugInfo.tsx b/src/components/permissions/PermissionDecisionDebugInfo.tsx
index fbbaf6b18..67716ac55 100644
--- a/src/components/permissions/PermissionDecisionDebugInfo.tsx
+++ b/src/components/permissions/PermissionDecisionDebugInfo.tsx
@@ -1,111 +1,95 @@
-import { feature } from 'bun:bundle'
-import chalk from 'chalk'
-import figures from 'figures'
-import React, { useMemo } from 'react'
-import { Ansi, Box, color, Text, useTheme } from '@anthropic/ink'
-import { useAppState } from '../../state/AppState.js'
-import type { PermissionMode } from '../../utils/permissions/PermissionMode.js'
-import { permissionModeTitle } from '../../utils/permissions/PermissionMode.js'
-import type {
-  PermissionDecision,
-  PermissionDecisionReason,
-} from '../../utils/permissions/PermissionResult.js'
-import { extractRules } from '../../utils/permissions/PermissionUpdate.js'
-import type { PermissionUpdate } from '../../utils/permissions/PermissionUpdateSchema.js'
-import { permissionRuleValueToString } from '../../utils/permissions/permissionRuleParser.js'
-import { detectUnreachableRules } from '../../utils/permissions/shadowedRuleDetection.js'
-import { SandboxManager } from '../../utils/sandbox/sandbox-adapter.js'
-import { getSettingSourceDisplayNameLowercase } from '../../utils/settings/constants.js'
+import { feature } from 'bun:bundle';
+import chalk from 'chalk';
+import figures from 'figures';
+import React, { useMemo } from 'react';
+import { Ansi, Box, color, Text, useTheme } from '@anthropic/ink';
+import { useAppState } from '../../state/AppState.js';
+import type { PermissionMode } from '../../utils/permissions/PermissionMode.js';
+import { permissionModeTitle } from '../../utils/permissions/PermissionMode.js';
+import type { PermissionDecision, PermissionDecisionReason } from '../../utils/permissions/PermissionResult.js';
+import { extractRules } from '../../utils/permissions/PermissionUpdate.js';
+import type { PermissionUpdate } from '../../utils/permissions/PermissionUpdateSchema.js';
+import { permissionRuleValueToString } from '../../utils/permissions/permissionRuleParser.js';
+import { detectUnreachableRules } from '../../utils/permissions/shadowedRuleDetection.js';
+import { SandboxManager } from '../../utils/sandbox/sandbox-adapter.js';
+import { getSettingSourceDisplayNameLowercase } from '../../utils/settings/constants.js';
 
 type PermissionDecisionInfoItemProps = {
-  title?: string
-  decisionReason: PermissionDecisionReason
-}
+  title?: string;
+  decisionReason: PermissionDecisionReason;
+};
 
 function decisionReasonDisplayString(
   decisionReason: PermissionDecisionReason & {
-    type: Exclude<PermissionDecisionReason['type'], 'subcommandResults'>
+    type: Exclude<PermissionDecisionReason['type'], 'subcommandResults'>;
   },
 ): string {
-  if (
-    (feature('BASH_CLASSIFIER') || feature('TRANSCRIPT_CLASSIFIER')) &&
-    decisionReason.type === 'classifier'
-  ) {
-    return `${chalk.bold(decisionReason.classifier)} classifier: ${decisionReason.reason}`
+  if ((feature('BASH_CLASSIFIER') || feature('TRANSCRIPT_CLASSIFIER')) && decisionReason.type === 'classifier') {
+    return `${chalk.bold(decisionReason.classifier)} classifier: ${decisionReason.reason}`;
   }
   switch (decisionReason.type) {
     case 'rule':
-      return `${chalk.bold(permissionRuleValueToString(decisionReason.rule.ruleValue))} rule from ${getSettingSourceDisplayNameLowercase(decisionReason.rule.source)}`
+      return `${chalk.bold(permissionRuleValueToString(decisionReason.rule.ruleValue))} rule from ${getSettingSourceDisplayNameLowercase(decisionReason.rule.source)}`;
     case 'mode':
-      return `${permissionModeTitle(decisionReason.mode)} mode`
+      return `${permissionModeTitle(decisionReason.mode)} mode`;
     case 'sandboxOverride':
-      return 'Requires permission to bypass sandbox'
+      return 'Requires permission to bypass sandbox';
     case 'workingDir':
-      return decisionReason.reason
+      return decisionReason.reason;
     case 'safetyCheck':
     case 'other':
-      return decisionReason.reason
+      return decisionReason.reason;
     case 'permissionPromptTool':
-      return `${chalk.bold(decisionReason.permissionPromptToolName)} permission prompt tool`
+      return `${chalk.bold(decisionReason.permissionPromptToolName)} permission prompt tool`;
     case 'hook':
       return decisionReason.reason
         ? `${chalk.bold(decisionReason.hookName)} hook: ${decisionReason.reason}`
-        : `${chalk.bold(decisionReason.hookName)} hook`
+        : `${chalk.bold(decisionReason.hookName)} hook`;
     case 'asyncAgent':
-      return decisionReason.reason
+      return decisionReason.reason;
     default:
-      return ''
+      return '';
   }
 }
 
-function PermissionDecisionInfoItem({
-  title,
-  decisionReason,
-}: PermissionDecisionInfoItemProps): React.ReactNode {
-  const [theme] = useTheme()
+function PermissionDecisionInfoItem({ title, decisionReason }: PermissionDecisionInfoItemProps): React.ReactNode {
+  const [theme] = useTheme();
 
   function formatDecisionReason(): React.ReactNode {
     switch (decisionReason.type) {
       case 'subcommandResults':
         return (
           <Box flexDirection="column">
-            {Array.from(decisionReason.reasons.entries()).map(
-              ([subcommand, result]) => {
-                const icon =
-                  result.behavior === 'allow'
-                    ? color('success', theme)(figures.tick)
-                    : color('error', theme)(figures.cross)
-                return (
-                  <Box flexDirection="column" key={subcommand}>
+            {Array.from(decisionReason.reasons.entries()).map(([subcommand, result]) => {
+              const icon =
+                result.behavior === 'allow'
+                  ? color('success', theme)(figures.tick)
+                  : color('error', theme)(figures.cross);
+              return (
+                <Box flexDirection="column" key={subcommand}>
+                  <Text>
+                    {icon} {subcommand}
+                  </Text>
+                  {result.decisionReason !== undefined && result.decisionReason.type !== 'subcommandResults' && (
                     <Text>
-                      {icon} {subcommand}
+                      <Text dimColor>
+                        {'  '}⎿{'  '}
+                      </Text>
+                      <Ansi>{decisionReasonDisplayString(result.decisionReason)}</Ansi>
                     </Text>
-                    {result.decisionReason !== undefined &&
-                      result.decisionReason.type !== 'subcommandResults' && (
-                        <Text>
-                          <Text dimColor>
-                            {'  '}⎿{'  '}
-                          </Text>
-                          <Ansi>
-                            {decisionReasonDisplayString(result.decisionReason)}
-                          </Ansi>
-                        </Text>
-                      )}
-                    {result.behavior === 'ask' && (
-                      <SuggestedRules suggestions={result.suggestions} />
-                    )}
-                  </Box>
-                )
-              },
-            )}
+                  )}
+                  {result.behavior === 'ask' && <SuggestedRules suggestions={result.suggestions} />}
+                </Box>
+              );
+            })}
           </Box>
-        )
+        );
       default:
         return (
           <Text>
             <Ansi>{decisionReasonDisplayString(decisionReason)}</Ansi>
           </Text>
-        )
+        );
     }
   }
 
@@ -114,65 +98,54 @@ function PermissionDecisionInfoItem({
       {title && <Text>{title}</Text>}
       {formatDecisionReason()}
     </Box>
-  )
+  );
 }
 
-function SuggestedRules({
-  suggestions,
-}: {
-  suggestions: PermissionUpdate[] | undefined
-}): React.ReactNode {
-  const rules = extractRules(suggestions)
-  if (rules.length === 0) return null
+function SuggestedRules({ suggestions }: { suggestions: PermissionUpdate[] | undefined }): React.ReactNode {
+  const rules = extractRules(suggestions);
+  if (rules.length === 0) return null;
   return (
     <Text>
       <Text dimColor>
         {'  '}⎿{'  '}
       </Text>
-      Suggested rules:{' '}
-      <Ansi>
-        {rules
-          .map(rule => chalk.bold(permissionRuleValueToString(rule)))
-          .join(', ')}
-      </Ansi>
+      Suggested rules: <Ansi>{rules.map(rule => chalk.bold(permissionRuleValueToString(rule))).join(', ')}</Ansi>
     </Text>
-  )
+  );
 }
 
 type Props = {
-  permissionResult: PermissionDecision
-  toolName?: string // Filter unreachable rules to this tool
-}
+  permissionResult: PermissionDecision;
+  toolName?: string; // Filter unreachable rules to this tool
+};
 
 // Helper function to extract directories from permission updates
 function extractDirectories(updates: PermissionUpdate[] | undefined): string[] {
-  if (!updates) return []
+  if (!updates) return [];
 
   return updates.flatMap(update => {
     switch (update.type) {
       case 'addDirectories':
-        return update.directories
+        return update.directories;
       default:
-        return []
+        return [];
     }
-  })
+  });
 }
 
 // Helper function to extract mode from permission updates
-function extractMode(
-  updates: PermissionUpdate[] | undefined,
-): PermissionMode | undefined {
-  if (!updates) return undefined
-  const update = updates.findLast(u => u.type === 'setMode')
-  return update?.type === 'setMode' ? update.mode : undefined
+function extractMode(updates: PermissionUpdate[] | undefined): PermissionMode | undefined {
+  if (!updates) return undefined;
+  const update = updates.findLast(u => u.type === 'setMode');
+  return update?.type === 'setMode' ? update.mode : undefined;
 }
 
 function SuggestionDisplay({
   suggestions,
   width,
 }: {
-  suggestions: PermissionUpdate[] | undefined
-  width: number
+  suggestions: PermissionUpdate[] | undefined;
+  width: number;
 }): React.ReactNode {
   if (!suggestions || suggestions.length === 0) {
     return (
@@ -182,12 +155,12 @@ function SuggestionDisplay({
         </Box>
         <Text>None</Text>
       </Box>
-    )
+    );
   }
 
-  const rules = extractRules(suggestions)
-  const directories = extractDirectories(suggestions)
-  const mode = extractMode(suggestions)
+  const rules = extractRules(suggestions);
+  const directories = extractDirectories(suggestions);
+  const mode = extractMode(suggestions);
 
   // If nothing to display, show None
   if (rules.length === 0 && directories.length === 0 && !mode) {
@@ -198,7 +171,7 @@ function SuggestionDisplay({
         </Box>
         <Text>None</Text>
       </Box>
-    )
+    );
   }
 
   return (
@@ -252,28 +225,23 @@ function SuggestionDisplay({
         </Box>
       )}
     </Box>
-  )
+  );
 }
 
-export function PermissionDecisionDebugInfo({
-  permissionResult,
-  toolName,
-}: Props): React.ReactNode {
-  const toolPermissionContext = useAppState(s => s.toolPermissionContext)
-  const decisionReason = permissionResult.decisionReason
-  const suggestions =
-    'suggestions' in permissionResult ? permissionResult.suggestions : undefined
+export function PermissionDecisionDebugInfo({ permissionResult, toolName }: Props): React.ReactNode {
+  const toolPermissionContext = useAppState(s => s.toolPermissionContext);
+  const decisionReason = permissionResult.decisionReason;
+  const suggestions = 'suggestions' in permissionResult ? permissionResult.suggestions : undefined;
 
   const unreachableRules = useMemo(() => {
     const sandboxAutoAllowEnabled =
-      SandboxManager.isSandboxingEnabled() &&
-      SandboxManager.isAutoAllowBashIfSandboxedEnabled()
+      SandboxManager.isSandboxingEnabled() && SandboxManager.isAutoAllowBashIfSandboxedEnabled();
     const all = detectUnreachableRules(toolPermissionContext, {
       sandboxAutoAllowEnabled,
-    })
+    });
 
     // Get the suggested rules from the permission result
-    const suggestedRules = extractRules(suggestions)
+    const suggestedRules = extractRules(suggestions);
 
     // Filter to rules that match any of the suggested rules
     // A rule matches if it has the same toolName and ruleContent
@@ -281,21 +249,20 @@ export function PermissionDecisionDebugInfo({
       return all.filter(u =>
         suggestedRules.some(
           suggested =>
-            suggested.toolName === u.rule.ruleValue.toolName &&
-            suggested.ruleContent === u.rule.ruleValue.ruleContent,
+            suggested.toolName === u.rule.ruleValue.toolName && suggested.ruleContent === u.rule.ruleValue.ruleContent,
         ),
-      )
+      );
     }
 
     // Fallback: filter by tool name if specified
     if (toolName) {
-      return all.filter(u => u.rule.ruleValue.toolName === toolName)
+      return all.filter(u => u.rule.ruleValue.toolName === toolName);
     }
 
-    return all
-  }, [toolPermissionContext, toolName, suggestions])
+    return all;
+  }, [toolPermissionContext, toolName, suggestions]);
 
-  const WIDTH = 10
+  const WIDTH = 10;
 
   return (
     <Box flexDirection="column">
@@ -331,9 +298,7 @@ export function PermissionDecisionDebugInfo({
           </Text>
           {unreachableRules.map((u, i) => (
             <Box key={i} flexDirection="column" marginLeft={2}>
-              <Text color="warning">
-                {permissionRuleValueToString(u.rule.ruleValue)}
-              </Text>
+              <Text color="warning">{permissionRuleValueToString(u.rule.ruleValue)}</Text>
               <Text dimColor>
                 {'  '}
                 {u.reason}
@@ -346,5 +311,5 @@ export function PermissionDecisionDebugInfo({
         </Box>
       )}
     </Box>
-  )
+  );
 }
diff --git a/src/components/permissions/PermissionDialog.tsx b/src/components/permissions/PermissionDialog.tsx
index 40e99f50f..86877cc6d 100644
--- a/src/components/permissions/PermissionDialog.tsx
+++ b/src/components/permissions/PermissionDialog.tsx
@@ -1,19 +1,19 @@
-import * as React from 'react'
-import { Box } from '@anthropic/ink'
-import type { Theme } from '../../utils/theme.js'
-import { PermissionRequestTitle } from './PermissionRequestTitle.js'
-import type { WorkerBadgeProps } from './WorkerBadge.js'
+import * as React from 'react';
+import { Box } from '@anthropic/ink';
+import type { Theme } from '../../utils/theme.js';
+import { PermissionRequestTitle } from './PermissionRequestTitle.js';
+import type { WorkerBadgeProps } from './WorkerBadge.js';
 
 type Props = {
-  title: string
-  subtitle?: React.ReactNode
-  color?: keyof Theme
-  titleColor?: keyof Theme
-  innerPaddingX?: number
-  workerBadge?: WorkerBadgeProps
-  titleRight?: React.ReactNode
-  children: React.ReactNode
-}
+  title: string;
+  subtitle?: React.ReactNode;
+  color?: keyof Theme;
+  titleColor?: keyof Theme;
+  innerPaddingX?: number;
+  workerBadge?: WorkerBadgeProps;
+  titleRight?: React.ReactNode;
+  children: React.ReactNode;
+};
 
 export function PermissionDialog({
   title,
@@ -37,12 +37,7 @@ export function PermissionDialog({
     >
       <Box paddingX={1} flexDirection="column">
         <Box justifyContent="space-between">
-          <PermissionRequestTitle
-            title={title}
-            subtitle={subtitle}
-            color={titleColor}
-            workerBadge={workerBadge}
-          />
+          <PermissionRequestTitle title={title} subtitle={subtitle} color={titleColor} workerBadge={workerBadge} />
           {titleRight}
         </Box>
       </Box>
@@ -50,5 +45,5 @@ export function PermissionDialog({
         {children}
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/components/permissions/PermissionExplanation.tsx b/src/components/permissions/PermissionExplanation.tsx
index 367fc7ccb..d08d31070 100644
--- a/src/components/permissions/PermissionExplanation.tsx
+++ b/src/components/permissions/PermissionExplanation.tsx
@@ -1,25 +1,21 @@
-import React, { Suspense, use, useState } from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { useKeybinding } from '../../keybindings/useKeybinding.js'
-import { logEvent } from '../../services/analytics/index.js'
-import type { Message } from '../../types/message.js'
+import React, { Suspense, use, useState } from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { useKeybinding } from '../../keybindings/useKeybinding.js';
+import { logEvent } from '../../services/analytics/index.js';
+import type { Message } from '../../types/message.js';
 import {
   generatePermissionExplanation,
   isPermissionExplainerEnabled,
   type PermissionExplanation as PermissionExplanationType,
   type RiskLevel,
-} from '../../utils/permissions/permissionExplainer.js'
-import { ShimmerChar } from '../Spinner/ShimmerChar.js'
-import { useShimmerAnimation } from '../Spinner/useShimmerAnimation.js'
+} from '../../utils/permissions/permissionExplainer.js';
+import { ShimmerChar } from '../Spinner/ShimmerChar.js';
+import { useShimmerAnimation } from '../Spinner/useShimmerAnimation.js';
 
-const LOADING_MESSAGE = 'Loading explanation…'
+const LOADING_MESSAGE = 'Loading explanation…';
 
 function ShimmerLoadingText(): React.ReactNode {
-  const [ref, glimmerIndex] = useShimmerAnimation(
-    'responding',
-    LOADING_MESSAGE,
-    false,
-  )
+  const [ref, glimmerIndex] = useShimmerAnimation('responding', LOADING_MESSAGE, false);
 
   return (
     <Box ref={ref}>
@@ -36,58 +32,56 @@ function ShimmerLoadingText(): React.ReactNode {
         ))}
       </Text>
     </Box>
-  )
+  );
 }
 
 function getRiskColor(riskLevel: RiskLevel): 'success' | 'warning' | 'error' {
   switch (riskLevel) {
     case 'LOW':
-      return 'success'
+      return 'success';
     case 'MEDIUM':
-      return 'warning'
+      return 'warning';
     case 'HIGH':
-      return 'error'
+      return 'error';
   }
 }
 
 function getRiskLabel(riskLevel: RiskLevel): string {
   switch (riskLevel) {
     case 'LOW':
-      return 'Low risk'
+      return 'Low risk';
     case 'MEDIUM':
-      return 'Med risk'
+      return 'Med risk';
     case 'HIGH':
-      return 'High risk'
+      return 'High risk';
   }
 }
 
 type PermissionExplanationProps = {
-  toolName: string
-  toolInput: unknown
-  toolDescription?: string
-  messages?: Message[]
-}
+  toolName: string;
+  toolInput: unknown;
+  toolDescription?: string;
+  messages?: Message[];
+};
 
 type ExplainerState = {
-  visible: boolean
-  enabled: boolean
-  promise: Promise<PermissionExplanationType | null> | null
-}
+  visible: boolean;
+  enabled: boolean;
+  promise: Promise<PermissionExplanationType | null> | null;
+};
 
 /**
  * Creates an explanation promise that never rejects.
  * Errors are caught and returned as null.
  */
-function createExplanationPromise(
-  props: PermissionExplanationProps,
-): Promise<PermissionExplanationType | null> {
+function createExplanationPromise(props: PermissionExplanationProps): Promise<PermissionExplanationType | null> {
   return generatePermissionExplanation({
     toolName: props.toolName,
     toolInput: props.toolInput,
     toolDescription: props.toolDescription,
     messages: props.messages,
     signal: new AbortController().signal, // Won't abort - request is fast enough
-  }).catch(() => null)
+  }).catch(() => null);
 }
 
 /**
@@ -95,50 +89,43 @@ function createExplanationPromise(
  * Creates the fetch promise lazily (only when user hits Ctrl+E)
  * to avoid consuming tokens for explanations users never view.
  */
-export function usePermissionExplainerUI(
-  props: PermissionExplanationProps,
-): ExplainerState {
-  const enabled = isPermissionExplainerEnabled()
-  const [visible, setVisible] = useState(false)
-  const [promise, setPromise] =
-    useState<Promise<PermissionExplanationType | null> | null>(null)
+export function usePermissionExplainerUI(props: PermissionExplanationProps): ExplainerState {
+  const enabled = isPermissionExplainerEnabled();
+  const [visible, setVisible] = useState(false);
+  const [promise, setPromise] = useState<Promise<PermissionExplanationType | null> | null>(null);
 
   // Use keybinding for ctrl+e toggle (configurable via keybindings.json)
   useKeybinding(
     'confirm:toggleExplanation',
     () => {
       if (!visible) {
-        logEvent('tengu_permission_explainer_shortcut_used', {})
+        logEvent('tengu_permission_explainer_shortcut_used', {});
         // Only create the promise on first toggle (lazy loading)
         if (!promise) {
-          setPromise(createExplanationPromise(props))
+          setPromise(createExplanationPromise(props));
         }
       }
-      setVisible(v => !v)
+      setVisible(v => !v);
     },
     { context: 'Confirmation', isActive: enabled },
-  )
+  );
 
-  return { visible, enabled, promise }
+  return { visible, enabled, promise };
 }
 
 /**
  * Inner component that uses React 19's use() to read the promise.
  * Suspends while loading, returns null on error.
  */
-function ExplanationResult({
-  promise,
-}: {
-  promise: Promise<PermissionExplanationType | null>
-}): React.ReactNode {
-  const explanation = use(promise)
+function ExplanationResult({ promise }: { promise: Promise<PermissionExplanationType | null> }): React.ReactNode {
+  const explanation = use(promise);
 
   if (!explanation) {
     return (
       <Box marginTop={1}>
         <Text dimColor>Explanation unavailable</Text>
       </Box>
-    )
+    );
   }
 
   return (
@@ -149,14 +136,12 @@ function ExplanationResult({
       </Box>
       <Box marginTop={1}>
         <Text>
-          <Text color={getRiskColor(explanation.riskLevel)}>
-            {getRiskLabel(explanation.riskLevel)}:
-          </Text>
+          <Text color={getRiskColor(explanation.riskLevel)}>{getRiskLabel(explanation.riskLevel)}:</Text>
           <Text> {explanation.risk}</Text>
         </Text>
       </Box>
     </Box>
-  )
+  );
 }
 
 /**
@@ -166,11 +151,11 @@ export function PermissionExplainerContent({
   visible,
   promise,
 }: {
-  visible: boolean
-  promise: Promise<PermissionExplanationType | null> | null
+  visible: boolean;
+  promise: Promise<PermissionExplanationType | null> | null;
 }): React.ReactNode {
   if (!visible || !promise) {
-    return null
+    return null;
   }
 
   return (
@@ -183,5 +168,5 @@ export function PermissionExplainerContent({
     >
       <ExplanationResult promise={promise} />
     </Suspense>
-  )
+  );
 }
diff --git a/src/components/permissions/PermissionPrompt.tsx b/src/components/permissions/PermissionPrompt.tsx
index 0e16fad25..84b7bd1c3 100644
--- a/src/components/permissions/PermissionPrompt.tsx
+++ b/src/components/permissions/PermissionPrompt.tsx
@@ -1,43 +1,43 @@
-import React, { type ReactNode, useCallback, useMemo, useState } from 'react'
-import { Box, Text } from '@anthropic/ink'
-import type { KeybindingAction } from '../../keybindings/types.js'
-import { useKeybindings } from '../../keybindings/useKeybinding.js'
+import React, { type ReactNode, useCallback, useMemo, useState } from 'react';
+import { Box, Text } from '@anthropic/ink';
+import type { KeybindingAction } from '../../keybindings/types.js';
+import { useKeybindings } from '../../keybindings/useKeybinding.js';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from '../../services/analytics/index.js'
-import { useSetAppState } from '../../state/AppState.js'
-import { type OptionWithDescription, Select } from '../CustomSelect/select.js'
+} from '../../services/analytics/index.js';
+import { useSetAppState } from '../../state/AppState.js';
+import { type OptionWithDescription, Select } from '../CustomSelect/select.js';
 
-export type FeedbackType = 'accept' | 'reject'
+export type FeedbackType = 'accept' | 'reject';
 
 export type PermissionPromptOption<T extends string> = {
-  value: T
-  label: ReactNode
+  value: T;
+  label: ReactNode;
   feedbackConfig?: {
-    type: FeedbackType
-    placeholder?: string
-  }
-  keybinding?: KeybindingAction
-}
+    type: FeedbackType;
+    placeholder?: string;
+  };
+  keybinding?: KeybindingAction;
+};
 
 export type ToolAnalyticsContext = {
-  toolName: string
-  isMcp: boolean
-}
+  toolName: string;
+  isMcp: boolean;
+};
 
 export type PermissionPromptProps<T extends string> = {
-  options: PermissionPromptOption<T>[]
-  onSelect: (value: T, feedback?: string) => void
-  onCancel?: () => void
-  question?: string | ReactNode
-  toolAnalyticsContext?: ToolAnalyticsContext
-}
+  options: PermissionPromptOption<T>[];
+  onSelect: (value: T, feedback?: string) => void;
+  onCancel?: () => void;
+  question?: string | ReactNode;
+  toolAnalyticsContext?: ToolAnalyticsContext;
+};
 
 const DEFAULT_PLACEHOLDERS: Record<FeedbackType, string> = {
   accept: 'tell Claude what to do next',
   reject: 'tell Claude what to do differently',
-}
+};
 
 /**
  * Shared component for permission prompts with optional feedback input.
@@ -56,44 +56,41 @@ export function PermissionPrompt<T extends string>({
   question = 'Do you want to proceed?',
   toolAnalyticsContext,
 }: PermissionPromptProps<T>): React.ReactNode {
-  const setAppState = useSetAppState()
-  const [acceptFeedback, setAcceptFeedback] = useState('')
-  const [rejectFeedback, setRejectFeedback] = useState('')
-  const [acceptInputMode, setAcceptInputMode] = useState(false)
-  const [rejectInputMode, setRejectInputMode] = useState(false)
-  const [focusedValue, setFocusedValue] = useState<T | null>(null)
+  const setAppState = useSetAppState();
+  const [acceptFeedback, setAcceptFeedback] = useState('');
+  const [rejectFeedback, setRejectFeedback] = useState('');
+  const [acceptInputMode, setAcceptInputMode] = useState(false);
+  const [rejectInputMode, setRejectInputMode] = useState(false);
+  const [focusedValue, setFocusedValue] = useState<T | null>(null);
   // Track whether user ever entered feedback mode (persists after collapse)
-  const [acceptFeedbackModeEntered, setAcceptFeedbackModeEntered] =
-    useState(false)
-  const [rejectFeedbackModeEntered, setRejectFeedbackModeEntered] =
-    useState(false)
+  const [acceptFeedbackModeEntered, setAcceptFeedbackModeEntered] = useState(false);
+  const [rejectFeedbackModeEntered, setRejectFeedbackModeEntered] = useState(false);
 
   // Find which option is focused and whether it has feedback config
-  const focusedOption = options.find(opt => opt.value === focusedValue)
-  const focusedFeedbackType = focusedOption?.feedbackConfig?.type
+  const focusedOption = options.find(opt => opt.value === focusedValue);
+  const focusedFeedbackType = focusedOption?.feedbackConfig?.type;
 
   // Show Tab hint when focused on a feedback-enabled option that's not already in input mode
   const showTabHint =
-    (focusedFeedbackType === 'accept' && !acceptInputMode) ||
-    (focusedFeedbackType === 'reject' && !rejectInputMode)
+    (focusedFeedbackType === 'accept' && !acceptInputMode) || (focusedFeedbackType === 'reject' && !rejectInputMode);
 
   // Transform options to Select-compatible format
   const selectOptions = useMemo((): OptionWithDescription<T>[] => {
     return options.map(opt => {
-      const { value, label, feedbackConfig } = opt
+      const { value, label, feedbackConfig } = opt;
 
       // No feedback config = simple option
       if (!feedbackConfig) {
         return {
           label,
           value,
-        }
+        };
       }
 
-      const { type, placeholder } = feedbackConfig
-      const isInputMode = type === 'accept' ? acceptInputMode : rejectInputMode
-      const onChange = type === 'accept' ? setAcceptFeedback : setRejectFeedback
-      const defaultPlaceholder = DEFAULT_PLACEHOLDERS[type]
+      const { type, placeholder } = feedbackConfig;
+      const isInputMode = type === 'accept' ? acceptInputMode : rejectInputMode;
+      const onChange = type === 'accept' ? setAcceptFeedback : setRejectFeedback;
+      const defaultPlaceholder = DEFAULT_PLACEHOLDERS[type];
 
       // When in input mode, show input field
       if (isInputMode) {
@@ -104,93 +101,86 @@ export function PermissionPrompt<T extends string>({
           placeholder: placeholder ?? defaultPlaceholder,
           onChange,
           allowEmptySubmitToCancel: true,
-        }
+        };
       }
 
       // Not in input mode - show simple option
       return {
         label,
         value,
-      }
-    })
-  }, [options, acceptInputMode, rejectInputMode])
+      };
+    });
+  }, [options, acceptInputMode, rejectInputMode]);
 
   // Handle Tab key to toggle input mode
   const handleInputModeToggle = useCallback(
     (value: T) => {
-      const option = options.find(opt => opt.value === value)
-      if (!option?.feedbackConfig) return
+      const option = options.find(opt => opt.value === value);
+      if (!option?.feedbackConfig) return;
 
-      const { type } = option.feedbackConfig
+      const { type } = option.feedbackConfig;
       const analyticsProps = {
-        toolName:
-          toolAnalyticsContext?.toolName as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        toolName: toolAnalyticsContext?.toolName as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
         isMcp: toolAnalyticsContext?.isMcp ?? false,
-      }
+      };
 
       if (type === 'accept') {
         if (acceptInputMode) {
-          setAcceptInputMode(false)
-          logEvent('tengu_accept_feedback_mode_collapsed', analyticsProps)
+          setAcceptInputMode(false);
+          logEvent('tengu_accept_feedback_mode_collapsed', analyticsProps);
         } else {
-          setAcceptInputMode(true)
-          setAcceptFeedbackModeEntered(true)
-          logEvent('tengu_accept_feedback_mode_entered', analyticsProps)
+          setAcceptInputMode(true);
+          setAcceptFeedbackModeEntered(true);
+          logEvent('tengu_accept_feedback_mode_entered', analyticsProps);
         }
       } else if (type === 'reject') {
         if (rejectInputMode) {
-          setRejectInputMode(false)
-          logEvent('tengu_reject_feedback_mode_collapsed', analyticsProps)
+          setRejectInputMode(false);
+          logEvent('tengu_reject_feedback_mode_collapsed', analyticsProps);
         } else {
-          setRejectInputMode(true)
-          setRejectFeedbackModeEntered(true)
-          logEvent('tengu_reject_feedback_mode_entered', analyticsProps)
+          setRejectInputMode(true);
+          setRejectFeedbackModeEntered(true);
+          logEvent('tengu_reject_feedback_mode_entered', analyticsProps);
         }
       }
     },
     [options, acceptInputMode, rejectInputMode, toolAnalyticsContext],
-  )
+  );
 
   // Handle selection
   const handleSelect = useCallback(
     (value: T) => {
-      const option = options.find(opt => opt.value === value)
-      if (!option) return
+      const option = options.find(opt => opt.value === value);
+      if (!option) return;
 
       // Get feedback if applicable
-      let feedback: string | undefined
+      let feedback: string | undefined;
       if (option.feedbackConfig) {
-        const rawFeedback =
-          option.feedbackConfig.type === 'accept'
-            ? acceptFeedback
-            : rejectFeedback
-        const trimmedFeedback = rawFeedback.trim()
+        const rawFeedback = option.feedbackConfig.type === 'accept' ? acceptFeedback : rejectFeedback;
+        const trimmedFeedback = rawFeedback.trim();
 
         if (trimmedFeedback) {
-          feedback = trimmedFeedback
+          feedback = trimmedFeedback;
         }
 
         // Log accept/reject submission with feedback context
         const analyticsProps = {
-          toolName:
-            toolAnalyticsContext?.toolName as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          toolName: toolAnalyticsContext?.toolName as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
           isMcp: toolAnalyticsContext?.isMcp ?? false,
           has_instructions: !!trimmedFeedback,
           instructions_length: trimmedFeedback?.length ?? 0,
           entered_feedback_mode:
-            option.feedbackConfig.type === 'accept'
-              ? acceptFeedbackModeEntered
-              : rejectFeedbackModeEntered,
-        }
+            option.feedbackConfig.type === 'accept' ? acceptFeedbackModeEntered : rejectFeedbackModeEntered,
+        };
 
         if (option.feedbackConfig.type === 'accept') {
-          logEvent('tengu_accept_submitted', analyticsProps)
+          logEvent('tengu_accept_submitted', analyticsProps);
         } else if (option.feedbackConfig.type === 'reject') {
-          logEvent('tengu_reject_submitted', analyticsProps)
+          logEvent('tengu_reject_submitted', analyticsProps);
         }
       }
 
-      onSelect(value, feedback)
+      onSelect(value, feedback);
     },
     [
       options,
@@ -201,24 +191,24 @@ export function PermissionPrompt<T extends string>({
       acceptFeedbackModeEntered,
       rejectFeedbackModeEntered,
     ],
-  )
+  );
 
   // Register keybinding handlers for options that have a keybinding set
   const keybindingHandlers = useMemo(() => {
-    const handlers: Record<string, () => void> = {}
+    const handlers: Record<string, () => void> = {};
     for (const opt of options) {
       if (opt.keybinding) {
-        handlers[opt.keybinding] = () => handleSelect(opt.value)
+        handlers[opt.keybinding] = () => handleSelect(opt.value);
       }
     }
-    return handlers
-  }, [options, handleSelect])
+    return handlers;
+  }, [options, handleSelect]);
 
-  useKeybindings(keybindingHandlers, { context: 'Confirmation' })
+  useKeybindings(keybindingHandlers, { context: 'Confirmation' });
 
   // Handle cancel (Esc)
   const handleCancel = useCallback(() => {
-    logEvent('tengu_permission_request_escape', {})
+    logEvent('tengu_permission_request_escape', {});
     // Increment escape count for attribution tracking
     setAppState(prev => ({
       ...prev,
@@ -226,9 +216,9 @@ export function PermissionPrompt<T extends string>({
         ...prev.attribution,
         escapeCount: prev.attribution.escapeCount + 1,
       },
-    }))
-    onCancel?.()
-  }, [onCancel, setAppState])
+    }));
+    onCancel?.();
+  }, [onCancel, setAppState]);
 
   return (
     <Box flexDirection="column">
@@ -240,22 +230,14 @@ export function PermissionPrompt<T extends string>({
         onCancel={handleCancel}
         onFocus={value => {
           // Reset input mode when navigating away, but only if no text typed
-          const newOption = options.find(opt => opt.value === value)
-          if (
-            newOption?.feedbackConfig?.type !== 'accept' &&
-            acceptInputMode &&
-            !acceptFeedback.trim()
-          ) {
-            setAcceptInputMode(false)
+          const newOption = options.find(opt => opt.value === value);
+          if (newOption?.feedbackConfig?.type !== 'accept' && acceptInputMode && !acceptFeedback.trim()) {
+            setAcceptInputMode(false);
           }
-          if (
-            newOption?.feedbackConfig?.type !== 'reject' &&
-            rejectInputMode &&
-            !rejectFeedback.trim()
-          ) {
-            setRejectInputMode(false)
+          if (newOption?.feedbackConfig?.type !== 'reject' && rejectInputMode && !rejectFeedback.trim()) {
+            setRejectInputMode(false);
           }
-          setFocusedValue(value)
+          setFocusedValue(value);
         }}
         onInputModeToggle={handleInputModeToggle}
       />
@@ -263,5 +245,5 @@ export function PermissionPrompt<T extends string>({
         <Text dimColor>Esc to cancel{showTabHint && ' · Tab to amend'}</Text>
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/components/permissions/PermissionRequest.tsx b/src/components/permissions/PermissionRequest.tsx
index a08f78519..6182624e8 100644
--- a/src/components/permissions/PermissionRequest.tsx
+++ b/src/components/permissions/PermissionRequest.tsx
@@ -1,125 +1,123 @@
-import { feature } from 'bun:bundle'
-import * as React from 'react'
-import { EnterPlanModeTool } from '@claude-code-best/builtin-tools/tools/EnterPlanModeTool/EnterPlanModeTool.js'
-import { ExitPlanModeV2Tool } from '@claude-code-best/builtin-tools/tools/ExitPlanModeTool/ExitPlanModeV2Tool.js'
-import { useNotifyAfterTimeout } from '../../hooks/useNotifyAfterTimeout.js'
-import { useKeybinding } from '../../keybindings/useKeybinding.js'
-import type { AnyObject, Tool, ToolUseContext } from '../../Tool.js'
-import { AskUserQuestionTool } from '@claude-code-best/builtin-tools/tools/AskUserQuestionTool/AskUserQuestionTool.js'
-import { BashTool } from '@claude-code-best/builtin-tools/tools/BashTool/BashTool.js'
-import { FileEditTool } from '@claude-code-best/builtin-tools/tools/FileEditTool/FileEditTool.js'
-import { FileReadTool } from '@claude-code-best/builtin-tools/tools/FileReadTool/FileReadTool.js'
-import { FileWriteTool } from '@claude-code-best/builtin-tools/tools/FileWriteTool/FileWriteTool.js'
-import { GlobTool } from '@claude-code-best/builtin-tools/tools/GlobTool/GlobTool.js'
-import { GrepTool } from '@claude-code-best/builtin-tools/tools/GrepTool/GrepTool.js'
-import { NotebookEditTool } from '@claude-code-best/builtin-tools/tools/NotebookEditTool/NotebookEditTool.js'
-import { PowerShellTool } from '@claude-code-best/builtin-tools/tools/PowerShellTool/PowerShellTool.js'
-import { SkillTool } from '@claude-code-best/builtin-tools/tools/SkillTool/SkillTool.js'
-import { WebFetchTool } from '@claude-code-best/builtin-tools/tools/WebFetchTool/WebFetchTool.js'
-import type { AssistantMessage } from '../../types/message.js'
-import type { PermissionDecision } from '../../utils/permissions/PermissionResult.js'
-import { AskUserQuestionPermissionRequest } from './AskUserQuestionPermissionRequest/AskUserQuestionPermissionRequest.js'
-import { BashPermissionRequest } from './BashPermissionRequest/BashPermissionRequest.js'
-import { EnterPlanModePermissionRequest } from './EnterPlanModePermissionRequest/EnterPlanModePermissionRequest.js'
-import { ExitPlanModePermissionRequest } from './ExitPlanModePermissionRequest/ExitPlanModePermissionRequest.js'
-import { FallbackPermissionRequest } from './FallbackPermissionRequest.js'
-import { FileEditPermissionRequest } from './FileEditPermissionRequest/FileEditPermissionRequest.js'
-import { FilesystemPermissionRequest } from './FilesystemPermissionRequest/FilesystemPermissionRequest.js'
-import { FileWritePermissionRequest } from './FileWritePermissionRequest/FileWritePermissionRequest.js'
-import { NotebookEditPermissionRequest } from './NotebookEditPermissionRequest/NotebookEditPermissionRequest.js'
-import { PowerShellPermissionRequest } from './PowerShellPermissionRequest/PowerShellPermissionRequest.js'
-import { SkillPermissionRequest } from './SkillPermissionRequest/SkillPermissionRequest.js'
-import { WebFetchPermissionRequest } from './WebFetchPermissionRequest/WebFetchPermissionRequest.js'
+import { feature } from 'bun:bundle';
+import * as React from 'react';
+import { EnterPlanModeTool } from '@claude-code-best/builtin-tools/tools/EnterPlanModeTool/EnterPlanModeTool.js';
+import { ExitPlanModeV2Tool } from '@claude-code-best/builtin-tools/tools/ExitPlanModeTool/ExitPlanModeV2Tool.js';
+import { useNotifyAfterTimeout } from '../../hooks/useNotifyAfterTimeout.js';
+import { useKeybinding } from '../../keybindings/useKeybinding.js';
+import type { AnyObject, Tool, ToolUseContext } from '../../Tool.js';
+import { AskUserQuestionTool } from '@claude-code-best/builtin-tools/tools/AskUserQuestionTool/AskUserQuestionTool.js';
+import { BashTool } from '@claude-code-best/builtin-tools/tools/BashTool/BashTool.js';
+import { FileEditTool } from '@claude-code-best/builtin-tools/tools/FileEditTool/FileEditTool.js';
+import { FileReadTool } from '@claude-code-best/builtin-tools/tools/FileReadTool/FileReadTool.js';
+import { FileWriteTool } from '@claude-code-best/builtin-tools/tools/FileWriteTool/FileWriteTool.js';
+import { GlobTool } from '@claude-code-best/builtin-tools/tools/GlobTool/GlobTool.js';
+import { GrepTool } from '@claude-code-best/builtin-tools/tools/GrepTool/GrepTool.js';
+import { NotebookEditTool } from '@claude-code-best/builtin-tools/tools/NotebookEditTool/NotebookEditTool.js';
+import { PowerShellTool } from '@claude-code-best/builtin-tools/tools/PowerShellTool/PowerShellTool.js';
+import { SkillTool } from '@claude-code-best/builtin-tools/tools/SkillTool/SkillTool.js';
+import { WebFetchTool } from '@claude-code-best/builtin-tools/tools/WebFetchTool/WebFetchTool.js';
+import type { AssistantMessage } from '../../types/message.js';
+import type { PermissionDecision } from '../../utils/permissions/PermissionResult.js';
+import { AskUserQuestionPermissionRequest } from './AskUserQuestionPermissionRequest/AskUserQuestionPermissionRequest.js';
+import { BashPermissionRequest } from './BashPermissionRequest/BashPermissionRequest.js';
+import { EnterPlanModePermissionRequest } from './EnterPlanModePermissionRequest/EnterPlanModePermissionRequest.js';
+import { ExitPlanModePermissionRequest } from './ExitPlanModePermissionRequest/ExitPlanModePermissionRequest.js';
+import { FallbackPermissionRequest } from './FallbackPermissionRequest.js';
+import { FileEditPermissionRequest } from './FileEditPermissionRequest/FileEditPermissionRequest.js';
+import { FilesystemPermissionRequest } from './FilesystemPermissionRequest/FilesystemPermissionRequest.js';
+import { FileWritePermissionRequest } from './FileWritePermissionRequest/FileWritePermissionRequest.js';
+import { NotebookEditPermissionRequest } from './NotebookEditPermissionRequest/NotebookEditPermissionRequest.js';
+import { PowerShellPermissionRequest } from './PowerShellPermissionRequest/PowerShellPermissionRequest.js';
+import { SkillPermissionRequest } from './SkillPermissionRequest/SkillPermissionRequest.js';
+import { WebFetchPermissionRequest } from './WebFetchPermissionRequest/WebFetchPermissionRequest.js';
 
 /* eslint-disable @typescript-eslint/no-require-imports */
 const ReviewArtifactTool = feature('REVIEW_ARTIFACT')
   ? (
       require('@claude-code-best/builtin-tools/tools/ReviewArtifactTool/ReviewArtifactTool.js') as typeof import('@claude-code-best/builtin-tools/tools/ReviewArtifactTool/ReviewArtifactTool.js')
     ).ReviewArtifactTool
-  : null
+  : null;
 
 const ReviewArtifactPermissionRequest = feature('REVIEW_ARTIFACT')
   ? (
       require('./ReviewArtifactPermissionRequest/ReviewArtifactPermissionRequest.js') as typeof import('./ReviewArtifactPermissionRequest/ReviewArtifactPermissionRequest.js')
     ).ReviewArtifactPermissionRequest
-  : null
+  : null;
 
 const WorkflowTool = feature('WORKFLOW_SCRIPTS')
   ? (
       require('@claude-code-best/builtin-tools/tools/WorkflowTool/WorkflowTool.js') as typeof import('@claude-code-best/builtin-tools/tools/WorkflowTool/WorkflowTool.js')
     ).WorkflowTool
-  : null
+  : null;
 
 const WorkflowPermissionRequest = feature('WORKFLOW_SCRIPTS')
   ? (
       require('@claude-code-best/builtin-tools/tools/WorkflowTool/WorkflowPermissionRequest.js') as typeof import('@claude-code-best/builtin-tools/tools/WorkflowTool/WorkflowPermissionRequest.js')
     ).WorkflowPermissionRequest
-  : null
+  : null;
 
 const MonitorTool = feature('MONITOR_TOOL')
   ? (
       require('@claude-code-best/builtin-tools/tools/MonitorTool/MonitorTool.js') as typeof import('@claude-code-best/builtin-tools/tools/MonitorTool/MonitorTool.js')
     ).MonitorTool
-  : null
+  : null;
 
 const MonitorPermissionRequest = feature('MONITOR_TOOL')
   ? (
       require('./MonitorPermissionRequest/MonitorPermissionRequest.js') as typeof import('./MonitorPermissionRequest/MonitorPermissionRequest.js')
     ).MonitorPermissionRequest
-  : null
+  : null;
 
-import type { ContentBlockParam } from '@anthropic-ai/sdk/resources/messages.mjs'
+import type { ContentBlockParam } from '@anthropic-ai/sdk/resources/messages.mjs';
 /* eslint-enable @typescript-eslint/no-require-imports */
-import type { z } from 'zod/v4'
-import type { PermissionUpdate } from '../../utils/permissions/PermissionUpdateSchema.js'
-import type { WorkerBadgeProps } from './WorkerBadge.js'
+import type { z } from 'zod/v4';
+import type { PermissionUpdate } from '../../utils/permissions/PermissionUpdateSchema.js';
+import type { WorkerBadgeProps } from './WorkerBadge.js';
 
-function permissionComponentForTool(
-  tool: Tool,
-): React.ComponentType<PermissionRequestProps> {
+function permissionComponentForTool(tool: Tool): React.ComponentType<PermissionRequestProps> {
   switch (tool) {
     case FileEditTool:
-      return FileEditPermissionRequest
+      return FileEditPermissionRequest;
     case FileWriteTool:
-      return FileWritePermissionRequest
+      return FileWritePermissionRequest;
     case BashTool:
-      return BashPermissionRequest
+      return BashPermissionRequest;
     case PowerShellTool:
-      return PowerShellPermissionRequest
+      return PowerShellPermissionRequest;
     case ReviewArtifactTool:
-      return ReviewArtifactPermissionRequest ?? FallbackPermissionRequest
+      return ReviewArtifactPermissionRequest ?? FallbackPermissionRequest;
     case WebFetchTool:
-      return WebFetchPermissionRequest
+      return WebFetchPermissionRequest;
     case NotebookEditTool:
-      return NotebookEditPermissionRequest
+      return NotebookEditPermissionRequest;
     case ExitPlanModeV2Tool:
-      return ExitPlanModePermissionRequest
+      return ExitPlanModePermissionRequest;
     case EnterPlanModeTool:
-      return EnterPlanModePermissionRequest
+      return EnterPlanModePermissionRequest;
     case SkillTool:
-      return SkillPermissionRequest
+      return SkillPermissionRequest;
     case AskUserQuestionTool:
-      return AskUserQuestionPermissionRequest
+      return AskUserQuestionPermissionRequest;
     case WorkflowTool:
-      return WorkflowPermissionRequest ?? FallbackPermissionRequest
+      return WorkflowPermissionRequest ?? FallbackPermissionRequest;
     case MonitorTool:
-      return MonitorPermissionRequest ?? FallbackPermissionRequest
+      return MonitorPermissionRequest ?? FallbackPermissionRequest;
     case GlobTool:
     case GrepTool:
     case FileReadTool:
-      return FilesystemPermissionRequest
+      return FilesystemPermissionRequest;
     default:
-      return FallbackPermissionRequest
+      return FallbackPermissionRequest;
   }
 }
 
 export type PermissionRequestProps<Input extends AnyObject = AnyObject> = {
-  toolUseConfirm: ToolUseConfirm<Input>
-  toolUseContext: ToolUseContext
-  onDone(): void
-  onReject(): void
-  verbose: boolean
-  workerBadge: WorkerBadgeProps | undefined
+  toolUseConfirm: ToolUseConfirm<Input>;
+  toolUseContext: ToolUseContext;
+  onDone(): void;
+  onReject(): void;
+  verbose: boolean;
+  workerBadge: WorkerBadgeProps | undefined;
   /**
    * Register JSX to render in a sticky footer below the scrollable area.
    * Fullscreen mode only (non-fullscreen has no sticky area — terminal
@@ -131,65 +129,60 @@ export type PermissionRequestProps<Input extends AnyObject = AnyObject> = {
    * to avoid stale closures (React reconciles the JSX, preserving Select's
    * internal focus/input state).
    */
-  setStickyFooter?: (jsx: React.ReactNode | null) => void
-}
+  setStickyFooter?: (jsx: React.ReactNode | null) => void;
+};
 
 export type ToolUseConfirm<Input extends AnyObject = AnyObject> = {
-  assistantMessage: AssistantMessage
-  tool: Tool<Input>
-  description: string
-  input: z.infer<Input>
-  toolUseContext: ToolUseContext
-  toolUseID: string
-  permissionResult: PermissionDecision
-  permissionPromptStartTimeMs: number
+  assistantMessage: AssistantMessage;
+  tool: Tool<Input>;
+  description: string;
+  input: z.infer<Input>;
+  toolUseContext: ToolUseContext;
+  toolUseID: string;
+  permissionResult: PermissionDecision;
+  permissionPromptStartTimeMs: number;
   /**
    * Called when user interacts with the permission dialog (e.g., arrow keys, tab, typing).
    * This prevents async auto-approval mechanisms (like the bash classifier) from
    * dismissing the dialog while the user is actively engaging with it.
    */
-  classifierCheckInProgress?: boolean
-  classifierAutoApproved?: boolean
-  classifierMatchedRule?: string
-  workerBadge?: WorkerBadgeProps
-  onUserInteraction(): void
-  onAbort(): void
-  onDismissCheckmark?(): void
+  classifierCheckInProgress?: boolean;
+  classifierAutoApproved?: boolean;
+  classifierMatchedRule?: string;
+  workerBadge?: WorkerBadgeProps;
+  onUserInteraction(): void;
+  onAbort(): void;
+  onDismissCheckmark?(): void;
   onAllow(
     updatedInput: z.infer<Input>,
     permissionUpdates: PermissionUpdate[],
     feedback?: string,
     contentBlocks?: ContentBlockParam[],
-  ): void
-  onReject(feedback?: string, contentBlocks?: ContentBlockParam[]): void
-  recheckPermission(): Promise<void>
-}
+  ): void;
+  onReject(feedback?: string, contentBlocks?: ContentBlockParam[]): void;
+  recheckPermission(): Promise<void>;
+};
 
 function getNotificationMessage(toolUseConfirm: ToolUseConfirm): string {
-  const toolName = toolUseConfirm.tool.userFacingName(
-    toolUseConfirm.input as never,
-  )
+  const toolName = toolUseConfirm.tool.userFacingName(toolUseConfirm.input as never);
 
   if (toolUseConfirm.tool === ExitPlanModeV2Tool) {
-    return 'Claude Code needs your approval for the plan'
+    return 'Claude Code needs your approval for the plan';
   }
 
   if (toolUseConfirm.tool === EnterPlanModeTool) {
-    return 'Claude Code wants to enter plan mode'
+    return 'Claude Code wants to enter plan mode';
   }
 
-  if (
-    feature('REVIEW_ARTIFACT') &&
-    toolUseConfirm.tool === ReviewArtifactTool
-  ) {
-    return 'Claude needs your approval for a review artifact'
+  if (feature('REVIEW_ARTIFACT') && toolUseConfirm.tool === ReviewArtifactTool) {
+    return 'Claude needs your approval for a review artifact';
   }
 
   if (!toolName || toolName.trim() === '') {
-    return 'Claude Code needs your attention'
+    return 'Claude Code needs your attention';
   }
 
-  return `Claude needs your permission to use ${toolName}`
+  return `Claude needs your permission to use ${toolName}`;
 }
 
 // TODO: Move this to Tool.renderPermissionRequest
@@ -206,17 +199,17 @@ export function PermissionRequest({
   useKeybinding(
     'app:interrupt',
     () => {
-      onDone()
-      onReject()
-      toolUseConfirm.onReject()
+      onDone();
+      onReject();
+      toolUseConfirm.onReject();
     },
     { context: 'Confirmation' },
-  )
+  );
 
-  const notificationMessage = getNotificationMessage(toolUseConfirm)
-  useNotifyAfterTimeout(notificationMessage, 'permission_prompt')
+  const notificationMessage = getNotificationMessage(toolUseConfirm);
+  useNotifyAfterTimeout(notificationMessage, 'permission_prompt');
 
-  const PermissionComponent = permissionComponentForTool(toolUseConfirm.tool)
+  const PermissionComponent = permissionComponentForTool(toolUseConfirm.tool);
 
   return (
     <PermissionComponent
@@ -228,5 +221,5 @@ export function PermissionRequest({
       workerBadge={workerBadge}
       setStickyFooter={setStickyFooter}
     />
-  )
+  );
 }
diff --git a/src/components/permissions/PermissionRequestTitle.tsx b/src/components/permissions/PermissionRequestTitle.tsx
index eafa1f71f..a3ea135ff 100644
--- a/src/components/permissions/PermissionRequestTitle.tsx
+++ b/src/components/permissions/PermissionRequestTitle.tsx
@@ -1,21 +1,16 @@
-import * as React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import type { Theme } from '../../utils/theme.js'
-import type { WorkerBadgeProps } from './WorkerBadge.js'
+import * as React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import type { Theme } from '../../utils/theme.js';
+import type { WorkerBadgeProps } from './WorkerBadge.js';
 
 type Props = {
-  title: string
-  subtitle?: React.ReactNode
-  color?: keyof Theme
-  workerBadge?: WorkerBadgeProps
-}
+  title: string;
+  subtitle?: React.ReactNode;
+  color?: keyof Theme;
+  workerBadge?: WorkerBadgeProps;
+};
 
-export function PermissionRequestTitle({
-  title,
-  subtitle,
-  color = 'permission',
-  workerBadge,
-}: Props): React.ReactNode {
+export function PermissionRequestTitle({ title, subtitle, color = 'permission', workerBadge }: Props): React.ReactNode {
   return (
     <Box flexDirection="column">
       <Box flexDirection="row" gap={1}>
@@ -37,5 +32,5 @@ export function PermissionRequestTitle({
           subtitle
         ))}
     </Box>
-  )
+  );
 }
diff --git a/src/components/permissions/PermissionRuleExplanation.tsx b/src/components/permissions/PermissionRuleExplanation.tsx
index 3ed14a120..d2f4d8696 100644
--- a/src/components/permissions/PermissionRuleExplanation.tsx
+++ b/src/components/permissions/PermissionRuleExplanation.tsx
@@ -1,50 +1,44 @@
-import { feature } from 'bun:bundle'
-import chalk from 'chalk'
-import React from 'react'
-import { Ansi, Box, Text } from '@anthropic/ink'
-import ThemedText from '../design-system/ThemedText.js'
-import { useAppState } from '../../state/AppState.js'
-import type {
-  PermissionDecision,
-  PermissionDecisionReason,
-} from '../../utils/permissions/PermissionResult.js'
-import { permissionRuleValueToString } from '../../utils/permissions/permissionRuleParser.js'
-import type { Theme } from '../../utils/theme.js'
+import { feature } from 'bun:bundle';
+import chalk from 'chalk';
+import React from 'react';
+import { Ansi, Box, Text } from '@anthropic/ink';
+import ThemedText from '../design-system/ThemedText.js';
+import { useAppState } from '../../state/AppState.js';
+import type { PermissionDecision, PermissionDecisionReason } from '../../utils/permissions/PermissionResult.js';
+import { permissionRuleValueToString } from '../../utils/permissions/permissionRuleParser.js';
+import type { Theme } from '../../utils/theme.js';
 
 export type PermissionRuleExplanationProps = {
-  permissionResult: PermissionDecision
-  toolType: 'tool' | 'command' | 'edit' | 'read'
-}
+  permissionResult: PermissionDecision;
+  toolType: 'tool' | 'command' | 'edit' | 'read';
+};
 
 type DecisionReasonStrings = {
-  reasonString: string
-  configString?: string
+  reasonString: string;
+  configString?: string;
   /** When set, reasonString is plain text rendered with this theme color instead of <Ansi>. */
-  themeColor?: keyof Theme
-}
+  themeColor?: keyof Theme;
+};
 
 function stringsForDecisionReason(
   reason: PermissionDecisionReason | undefined,
   toolType: 'tool' | 'command' | 'edit' | 'read',
 ): DecisionReasonStrings | null {
   if (!reason) {
-    return null
+    return null;
   }
-  if (
-    (feature('BASH_CLASSIFIER') || feature('TRANSCRIPT_CLASSIFIER')) &&
-    reason.type === 'classifier'
-  ) {
+  if ((feature('BASH_CLASSIFIER') || feature('TRANSCRIPT_CLASSIFIER')) && reason.type === 'classifier') {
     if (reason.classifier === 'auto-mode') {
       return {
         reasonString: `Auto mode classifier requires confirmation for this ${toolType}.\n${reason.reason}`,
         configString: undefined,
         themeColor: 'error',
-      }
+      };
     }
     return {
       reasonString: `Classifier ${chalk.bold(reason.classifier)} requires confirmation for this ${toolType}.\n${reason.reason}`,
       configString: undefined,
-    }
+    };
   }
   switch (reason.type) {
     case 'rule':
@@ -52,34 +46,29 @@ function stringsForDecisionReason(
         reasonString: `Permission rule ${chalk.bold(
           permissionRuleValueToString(reason.rule.ruleValue),
         )} requires confirmation for this ${toolType}.`,
-        configString:
-          reason.rule.source === 'policySettings'
-            ? undefined
-            : '/permissions to update rules',
-      }
+        configString: reason.rule.source === 'policySettings' ? undefined : '/permissions to update rules',
+      };
     case 'hook': {
-      const hookReasonString = reason.reason ? `:\n${reason.reason}` : '.'
-      const sourceLabel = reason.hookSource
-        ? ` ${chalk.dim(`[${reason.hookSource}]`)}`
-        : ''
+      const hookReasonString = reason.reason ? `:\n${reason.reason}` : '.';
+      const sourceLabel = reason.hookSource ? ` ${chalk.dim(`[${reason.hookSource}]`)}` : '';
       return {
         reasonString: `Hook ${chalk.bold(reason.hookName)} requires confirmation for this ${toolType}${hookReasonString}${sourceLabel}`,
         configString: '/hooks to update',
-      }
+      };
     }
     case 'safetyCheck':
     case 'other':
       return {
         reasonString: reason.reason,
         configString: undefined,
-      }
+      };
     case 'workingDir':
       return {
         reasonString: reason.reason,
         configString: '/permissions to update rules',
-      }
+      };
     default:
-      return null
+      return null;
   }
 }
 
@@ -87,21 +76,15 @@ export function PermissionRuleExplanation({
   permissionResult,
   toolType,
 }: PermissionRuleExplanationProps): React.ReactNode {
-  const permissionMode = useAppState(s => s.toolPermissionContext.mode)
-  const strings = stringsForDecisionReason(
-    permissionResult?.decisionReason,
-    toolType,
-  )
+  const permissionMode = useAppState(s => s.toolPermissionContext.mode);
+  const strings = stringsForDecisionReason(permissionResult?.decisionReason, toolType);
   if (!strings) {
-    return null
+    return null;
   }
 
   const themeColor =
     strings.themeColor ??
-    (permissionResult?.decisionReason?.type === 'hook' &&
-    permissionMode === 'auto'
-      ? 'warning'
-      : undefined)
+    (permissionResult?.decisionReason?.type === 'hook' && permissionMode === 'auto' ? 'warning' : undefined);
 
   return (
     <Box marginBottom={1} flexDirection="column">
@@ -114,5 +97,5 @@ export function PermissionRuleExplanation({
       )}
       {strings.configString && <Text dimColor>{strings.configString}</Text>}
     </Box>
-  )
+  );
 }
diff --git a/src/components/permissions/PowerShellPermissionRequest/PowerShellPermissionRequest.tsx b/src/components/permissions/PowerShellPermissionRequest/PowerShellPermissionRequest.tsx
index 3aec521d5..538d75314 100644
--- a/src/components/permissions/PowerShellPermissionRequest/PowerShellPermissionRequest.tsx
+++ b/src/components/permissions/PowerShellPermissionRequest/PowerShellPermissionRequest.tsx
@@ -1,48 +1,40 @@
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { Box, Text, useTheme } from '@anthropic/ink'
-import { useKeybinding } from '../../../keybindings/useKeybinding.js'
-import { getFeatureValue_CACHED_MAY_BE_STALE } from '../../../services/analytics/growthbook.js'
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { Box, Text, useTheme } from '@anthropic/ink';
+import { useKeybinding } from '../../../keybindings/useKeybinding.js';
+import { getFeatureValue_CACHED_MAY_BE_STALE } from '../../../services/analytics/growthbook.js';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from '../../../services/analytics/index.js'
-import { sanitizeToolNameForAnalytics } from '../../../services/analytics/metadata.js'
-import { getDestructiveCommandWarning } from '@claude-code-best/builtin-tools/tools/PowerShellTool/destructiveCommandWarning.js'
-import { PowerShellTool } from '@claude-code-best/builtin-tools/tools/PowerShellTool/PowerShellTool.js'
-import { isAllowlistedCommand } from '@claude-code-best/builtin-tools/tools/PowerShellTool/readOnlyValidation.js'
-import type { PermissionUpdate } from '../../../utils/permissions/PermissionUpdateSchema.js'
-import { getCompoundCommandPrefixesStatic } from '../../../utils/powershell/staticPrefix.js'
-import { Select } from '../../CustomSelect/select.js'
-import { type UnaryEvent, usePermissionRequestLogging } from '../hooks.js'
-import { PermissionDecisionDebugInfo } from '../PermissionDecisionDebugInfo.js'
-import { PermissionDialog } from '../PermissionDialog.js'
-import {
-  PermissionExplainerContent,
-  usePermissionExplainerUI,
-} from '../PermissionExplanation.js'
-import type { PermissionRequestProps } from '../PermissionRequest.js'
-import { PermissionRuleExplanation } from '../PermissionRuleExplanation.js'
-import { useShellPermissionFeedback } from '../useShellPermissionFeedback.js'
-import { logUnaryPermissionEvent } from '../utils.js'
-import { powershellToolUseOptions } from './powershellToolUseOptions.js'
+} from '../../../services/analytics/index.js';
+import { sanitizeToolNameForAnalytics } from '../../../services/analytics/metadata.js';
+import { getDestructiveCommandWarning } from '@claude-code-best/builtin-tools/tools/PowerShellTool/destructiveCommandWarning.js';
+import { PowerShellTool } from '@claude-code-best/builtin-tools/tools/PowerShellTool/PowerShellTool.js';
+import { isAllowlistedCommand } from '@claude-code-best/builtin-tools/tools/PowerShellTool/readOnlyValidation.js';
+import type { PermissionUpdate } from '../../../utils/permissions/PermissionUpdateSchema.js';
+import { getCompoundCommandPrefixesStatic } from '../../../utils/powershell/staticPrefix.js';
+import { Select } from '../../CustomSelect/select.js';
+import { type UnaryEvent, usePermissionRequestLogging } from '../hooks.js';
+import { PermissionDecisionDebugInfo } from '../PermissionDecisionDebugInfo.js';
+import { PermissionDialog } from '../PermissionDialog.js';
+import { PermissionExplainerContent, usePermissionExplainerUI } from '../PermissionExplanation.js';
+import type { PermissionRequestProps } from '../PermissionRequest.js';
+import { PermissionRuleExplanation } from '../PermissionRuleExplanation.js';
+import { useShellPermissionFeedback } from '../useShellPermissionFeedback.js';
+import { logUnaryPermissionEvent } from '../utils.js';
+import { powershellToolUseOptions } from './powershellToolUseOptions.js';
 
-export function PowerShellPermissionRequest(
-  props: PermissionRequestProps,
-): React.ReactNode {
-  const { toolUseConfirm, toolUseContext, onDone, onReject, workerBadge } =
-    props
+export function PowerShellPermissionRequest(props: PermissionRequestProps): React.ReactNode {
+  const { toolUseConfirm, toolUseContext, onDone, onReject, workerBadge } = props;
 
-  const { command, description } = PowerShellTool.inputSchema.parse(
-    toolUseConfirm.input,
-  )
+  const { command, description } = PowerShellTool.inputSchema.parse(toolUseConfirm.input);
 
-  const [theme] = useTheme()
+  const [theme] = useTheme();
   const explainerState = usePermissionExplainerUI({
     toolName: toolUseConfirm.tool.name,
     toolInput: toolUseConfirm.input,
     toolDescription: toolUseConfirm.description,
     messages: toolUseContext.messages,
-  })
+  });
   const {
     yesInputMode,
     noInputMode,
@@ -61,15 +53,12 @@ export function PowerShellPermissionRequest(
     onDone,
     onReject,
     explainerVisible: explainerState.visible,
-  })
-  const destructiveWarning = getFeatureValue_CACHED_MAY_BE_STALE(
-    'tengu_destructive_command_warning',
-    false,
-  )
+  });
+  const destructiveWarning = getFeatureValue_CACHED_MAY_BE_STALE('tengu_destructive_command_warning', false)
     ? getDestructiveCommandWarning(command)
-    : null
+    : null;
 
-  const [showPermissionDebug, setShowPermissionDebug] = useState(false)
+  const [showPermissionDebug, setShowPermissionDebug] = useState(false);
 
   // Editable prefix — compute static prefix locally (no LLM call).
   // Initialize synchronously to the raw command for single-line commands so
@@ -82,49 +71,42 @@ export function PowerShellPermissionRequest(
   // auto-allowed (read-only).
   const [editablePrefix, setEditablePrefix] = useState<string | undefined>(
     command.includes('\n') ? undefined : command,
-  )
-  const hasUserEditedPrefix = useRef(false)
+  );
+  const hasUserEditedPrefix = useRef(false);
   useEffect(() => {
-    let cancelled = false
+    let cancelled = false;
     // Filter receives ParsedCommandElement — isAllowlistedCommand works from
     // element.name/nameType/args directly. isReadOnlyCommand(text) would need
     // to reparse (pwsh.exe spawn per subcommand) and returns false without the
     // full parsed AST, making the filter a no-op.
-    getCompoundCommandPrefixesStatic(command, element =>
-      isAllowlistedCommand(element, element.text),
-    )
+    getCompoundCommandPrefixesStatic(command, element => isAllowlistedCommand(element, element.text))
       .then(prefixes => {
-        if (cancelled || hasUserEditedPrefix.current) return
+        if (cancelled || hasUserEditedPrefix.current) return;
         if (prefixes.length > 0) {
-          setEditablePrefix(`${prefixes[0]}:*`)
+          setEditablePrefix(`${prefixes[0]}:*`);
         }
       })
-      .catch(() => {})
+      .catch(() => {});
     return () => {
-      cancelled = true
-    }
+      cancelled = true;
+    };
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [command])
+  }, [command]);
 
   const onEditablePrefixChange = useCallback((value: string) => {
-    hasUserEditedPrefix.current = true
-    setEditablePrefix(value)
-  }, [])
+    hasUserEditedPrefix.current = true;
+    setEditablePrefix(value);
+  }, []);
 
-  const unaryEvent = useMemo<UnaryEvent>(
-    () => ({ completion_type: 'tool_use_single', language_name: 'none' }),
-    [],
-  )
+  const unaryEvent = useMemo<UnaryEvent>(() => ({ completion_type: 'tool_use_single', language_name: 'none' }), []);
 
-  usePermissionRequestLogging(toolUseConfirm, unaryEvent)
+  usePermissionRequestLogging(toolUseConfirm, unaryEvent);
 
   const options = useMemo(
     () =>
       powershellToolUseOptions({
         suggestions:
-          toolUseConfirm.permissionResult.behavior === 'ask'
-            ? toolUseConfirm.permissionResult.suggestions
-            : undefined,
+          toolUseConfirm.permissionResult.behavior === 'ask' ? toolUseConfirm.permissionResult.suggestions : undefined,
         onRejectFeedbackChange: setRejectFeedback,
         onAcceptFeedbackChange: setAcceptFeedback,
         yesInputMode,
@@ -132,22 +114,16 @@ export function PowerShellPermissionRequest(
         editablePrefix,
         onEditablePrefixChange,
       }),
-    [
-      toolUseConfirm,
-      yesInputMode,
-      noInputMode,
-      editablePrefix,
-      onEditablePrefixChange,
-    ],
-  )
+    [toolUseConfirm, yesInputMode, noInputMode, editablePrefix, onEditablePrefixChange],
+  );
 
   // Toggle permission debug info with keybinding
   const handleToggleDebug = useCallback(() => {
-    setShowPermissionDebug(prev => !prev)
-  }, [])
+    setShowPermissionDebug(prev => !prev);
+  }, []);
   useKeybinding('permission:toggleDebug', handleToggleDebug, {
     context: 'Confirmation',
-  })
+  });
 
   function onSelect(value: string) {
     // Map options to numeric values for analytics (strings not allowed in logEvent)
@@ -156,21 +132,21 @@ export function PowerShellPermissionRequest(
       'yes-apply-suggestions': 2,
       'yes-prefix-edited': 2,
       no: 3,
-    }
+    };
     logEvent('tengu_permission_request_option_selected', {
       option_index: optionIndex[value],
       explainer_visible: explainerState.visible,
-    })
+    });
 
     const toolNameForAnalytics = sanitizeToolNameForAnalytics(
       toolUseConfirm.tool.name,
-    ) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS
+    ) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS;
 
     if (value === 'yes-prefix-edited') {
-      const trimmedPrefix = (editablePrefix ?? '').trim()
-      logUnaryPermissionEvent('tool_use_single', toolUseConfirm, 'accept')
+      const trimmedPrefix = (editablePrefix ?? '').trim();
+      logUnaryPermissionEvent('tool_use_single', toolUseConfirm, 'accept');
       if (!trimmedPrefix) {
-        toolUseConfirm.onAllow(toolUseConfirm.input, [])
+        toolUseConfirm.onAllow(toolUseConfirm.input, []);
       } else {
         const prefixUpdates: PermissionUpdate[] = [
           {
@@ -184,17 +160,17 @@ export function PowerShellPermissionRequest(
             behavior: 'allow',
             destination: 'localSettings',
           },
-        ]
-        toolUseConfirm.onAllow(toolUseConfirm.input, prefixUpdates)
+        ];
+        toolUseConfirm.onAllow(toolUseConfirm.input, prefixUpdates);
       }
-      onDone()
-      return
+      onDone();
+      return;
     }
 
     switch (value) {
       case 'yes': {
-        const trimmedFeedback = acceptFeedback.trim()
-        logUnaryPermissionEvent('tool_use_single', toolUseConfirm, 'accept')
+        const trimmedFeedback = acceptFeedback.trim();
+        logUnaryPermissionEvent('tool_use_single', toolUseConfirm, 'accept');
         // Log accept submission with feedback context
         logEvent('tengu_accept_submitted', {
           toolName: toolNameForAnalytics,
@@ -202,28 +178,22 @@ export function PowerShellPermissionRequest(
           has_instructions: !!trimmedFeedback,
           instructions_length: trimmedFeedback.length,
           entered_feedback_mode: yesFeedbackModeEntered,
-        })
-        toolUseConfirm.onAllow(
-          toolUseConfirm.input,
-          [],
-          trimmedFeedback || undefined,
-        )
-        onDone()
-        break
+        });
+        toolUseConfirm.onAllow(toolUseConfirm.input, [], trimmedFeedback || undefined);
+        onDone();
+        break;
       }
       case 'yes-apply-suggestions': {
-        logUnaryPermissionEvent('tool_use_single', toolUseConfirm, 'accept')
+        logUnaryPermissionEvent('tool_use_single', toolUseConfirm, 'accept');
         // Extract suggestions if present (works for both 'ask' and 'passthrough' behaviors)
         const permissionUpdates =
-          'suggestions' in toolUseConfirm.permissionResult
-            ? toolUseConfirm.permissionResult.suggestions || []
-            : []
-        toolUseConfirm.onAllow(toolUseConfirm.input, permissionUpdates)
-        onDone()
-        break
+          'suggestions' in toolUseConfirm.permissionResult ? toolUseConfirm.permissionResult.suggestions || [] : [];
+        toolUseConfirm.onAllow(toolUseConfirm.input, permissionUpdates);
+        onDone();
+        break;
       }
       case 'no': {
-        const trimmedFeedback = rejectFeedback.trim()
+        const trimmedFeedback = rejectFeedback.trim();
 
         // Log reject submission with feedback context
         logEvent('tengu_reject_submitted', {
@@ -232,11 +202,11 @@ export function PowerShellPermissionRequest(
           has_instructions: !!trimmedFeedback,
           instructions_length: trimmedFeedback.length,
           entered_feedback_mode: noFeedbackModeEntered,
-        })
+        });
 
         // Process rejection (with or without feedback)
-        handleReject(trimmedFeedback || undefined)
-        break
+        handleReject(trimmedFeedback || undefined);
+        break;
       }
     }
   }
@@ -250,20 +220,12 @@ export function PowerShellPermissionRequest(
             { theme, verbose: true }, // always show the full command
           )}
         </Text>
-        {!explainerState.visible && (
-          <Text dimColor>{toolUseConfirm.description}</Text>
-        )}
-        <PermissionExplainerContent
-          visible={explainerState.visible}
-          promise={explainerState.promise}
-        />
+        {!explainerState.visible && <Text dimColor>{toolUseConfirm.description}</Text>}
+        <PermissionExplainerContent visible={explainerState.visible} promise={explainerState.promise} />
       </Box>
       {showPermissionDebug ? (
         <>
-          <PermissionDecisionDebugInfo
-            permissionResult={toolUseConfirm.permissionResult}
-            toolName="PowerShell"
-          />
+          <PermissionDecisionDebugInfo permissionResult={toolUseConfirm.permissionResult} toolName="PowerShell" />
           {toolUseContext.options.debug && (
             <Box justifyContent="flex-end" marginTop={1}>
               <Text dimColor>Ctrl-D to hide debug info</Text>
@@ -273,10 +235,7 @@ export function PowerShellPermissionRequest(
       ) : (
         <>
           <Box flexDirection="column">
-            <PermissionRuleExplanation
-              permissionResult={toolUseConfirm.permissionResult}
-              toolType="command"
-            />
+            <PermissionRuleExplanation permissionResult={toolUseConfirm.permissionResult} toolType="command" />
             {destructiveWarning && (
               <Box marginBottom={1}>
                 <Text color="warning">{destructiveWarning}</Text>
@@ -295,18 +254,14 @@ export function PowerShellPermissionRequest(
           <Box justifyContent="space-between" marginTop={1}>
             <Text dimColor>
               Esc to cancel
-              {((focusedOption === 'yes' && !yesInputMode) ||
-                (focusedOption === 'no' && !noInputMode)) &&
+              {((focusedOption === 'yes' && !yesInputMode) || (focusedOption === 'no' && !noInputMode)) &&
                 ' · Tab to amend'}
-              {explainerState.enabled &&
-                ` · ctrl+e to ${explainerState.visible ? 'hide' : 'explain'}`}
+              {explainerState.enabled && ` · ctrl+e to ${explainerState.visible ? 'hide' : 'explain'}`}
             </Text>
-            {toolUseContext.options.debug && (
-              <Text dimColor>Ctrl+d to show debug info</Text>
-            )}
+            {toolUseContext.options.debug && <Text dimColor>Ctrl+d to show debug info</Text>}
           </Box>
         </>
       )}
     </PermissionDialog>
-  )
+  );
 }
diff --git a/src/components/permissions/PowerShellPermissionRequest/powershellToolUseOptions.tsx b/src/components/permissions/PowerShellPermissionRequest/powershellToolUseOptions.tsx
index f09caf185..136a1b131 100644
--- a/src/components/permissions/PowerShellPermissionRequest/powershellToolUseOptions.tsx
+++ b/src/components/permissions/PowerShellPermissionRequest/powershellToolUseOptions.tsx
@@ -1,14 +1,10 @@
-import { POWERSHELL_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/PowerShellTool/toolName.js'
-import type { PermissionUpdate } from '../../../utils/permissions/PermissionUpdateSchema.js'
-import { shouldShowAlwaysAllowOptions } from '../../../utils/permissions/permissionsLoader.js'
-import type { OptionWithDescription } from '../../CustomSelect/select.js'
-import { generateShellSuggestionsLabel } from '../shellPermissionHelpers.js'
+import { POWERSHELL_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/PowerShellTool/toolName.js';
+import type { PermissionUpdate } from '../../../utils/permissions/PermissionUpdateSchema.js';
+import { shouldShowAlwaysAllowOptions } from '../../../utils/permissions/permissionsLoader.js';
+import type { OptionWithDescription } from '../../CustomSelect/select.js';
+import { generateShellSuggestionsLabel } from '../shellPermissionHelpers.js';
 
-export type PowerShellToolUseOption =
-  | 'yes'
-  | 'yes-apply-suggestions'
-  | 'yes-prefix-edited'
-  | 'no'
+export type PowerShellToolUseOption = 'yes' | 'yes-apply-suggestions' | 'yes-prefix-edited' | 'no';
 
 export function powershellToolUseOptions({
   suggestions = [],
@@ -19,15 +15,15 @@ export function powershellToolUseOptions({
   editablePrefix,
   onEditablePrefixChange,
 }: {
-  suggestions?: PermissionUpdate[]
-  onRejectFeedbackChange: (value: string) => void
-  onAcceptFeedbackChange: (value: string) => void
-  yesInputMode?: boolean
-  noInputMode?: boolean
-  editablePrefix?: string
-  onEditablePrefixChange?: (value: string) => void
+  suggestions?: PermissionUpdate[];
+  onRejectFeedbackChange: (value: string) => void;
+  onAcceptFeedbackChange: (value: string) => void;
+  yesInputMode?: boolean;
+  noInputMode?: boolean;
+  editablePrefix?: string;
+  onEditablePrefixChange?: (value: string) => void;
 }): OptionWithDescription<PowerShellToolUseOption>[] {
-  const options: OptionWithDescription<PowerShellToolUseOption>[] = []
+  const options: OptionWithDescription<PowerShellToolUseOption>[] = [];
 
   if (yesInputMode) {
     options.push({
@@ -37,12 +33,12 @@ export function powershellToolUseOptions({
       placeholder: 'and tell Claude what to do next',
       onChange: onAcceptFeedbackChange,
       allowEmptySubmitToCancel: true,
-    })
+    });
   } else {
     options.push({
       label: 'Yes',
       value: 'yes',
-    })
+    });
   }
 
   // Note: No sandbox toggle for PowerShell - sandbox is not supported on Windows
@@ -57,14 +53,9 @@ export function powershellToolUseOptions({
     const hasNonPowerShellSuggestions = suggestions.some(
       s =>
         s.type === 'addDirectories' ||
-        (s.type === 'addRules' &&
-          s.rules?.some(r => r.toolName !== POWERSHELL_TOOL_NAME)),
-    )
-    if (
-      editablePrefix !== undefined &&
-      onEditablePrefixChange &&
-      !hasNonPowerShellSuggestions
-    ) {
+        (s.type === 'addRules' && s.rules?.some(r => r.toolName !== POWERSHELL_TOOL_NAME)),
+    );
+    if (editablePrefix !== undefined && onEditablePrefixChange && !hasNonPowerShellSuggestions) {
       options.push({
         type: 'input',
         label: 'Yes, and don\u2019t ask again for',
@@ -76,17 +67,14 @@ export function powershellToolUseOptions({
         showLabelWithValue: true,
         labelValueSeparator: ': ',
         resetCursorOnUpdate: true,
-      })
+      });
     } else {
-      const label = generateShellSuggestionsLabel(
-        suggestions,
-        POWERSHELL_TOOL_NAME,
-      )
+      const label = generateShellSuggestionsLabel(suggestions, POWERSHELL_TOOL_NAME);
       if (label) {
         options.push({
           label,
           value: 'yes-apply-suggestions',
-        })
+        });
       }
     }
   }
@@ -99,13 +87,13 @@ export function powershellToolUseOptions({
       placeholder: 'and tell Claude what to do differently',
       onChange: onRejectFeedbackChange,
       allowEmptySubmitToCancel: true,
-    })
+    });
   } else {
     options.push({
       label: 'No',
       value: 'no',
-    })
+    });
   }
 
-  return options
+  return options;
 }
diff --git a/src/components/permissions/ReviewArtifactPermissionRequest/ReviewArtifactPermissionRequest.tsx b/src/components/permissions/ReviewArtifactPermissionRequest/ReviewArtifactPermissionRequest.tsx
index df24c2ea3..0b1dae4f8 100644
--- a/src/components/permissions/ReviewArtifactPermissionRequest/ReviewArtifactPermissionRequest.tsx
+++ b/src/components/permissions/ReviewArtifactPermissionRequest/ReviewArtifactPermissionRequest.tsx
@@ -1,10 +1,10 @@
-import React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { Select } from '../../CustomSelect/select.js'
-import { usePermissionRequestLogging } from '../hooks.js'
-import { PermissionDialog } from '../PermissionDialog.js'
-import type { PermissionRequestProps } from '../PermissionRequest.js'
-import { logUnaryPermissionEvent } from '../utils.js'
+import React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { Select } from '../../CustomSelect/select.js';
+import { usePermissionRequestLogging } from '../hooks.js';
+import { PermissionDialog } from '../PermissionDialog.js';
+import type { PermissionRequestProps } from '../PermissionRequest.js';
+import { logUnaryPermissionEvent } from '../utils.js';
 
 export function ReviewArtifactPermissionRequest({
   toolUseConfirm,
@@ -13,47 +13,40 @@ export function ReviewArtifactPermissionRequest({
   workerBadge,
 }: PermissionRequestProps): React.ReactNode {
   const { title, annotations, summary } = toolUseConfirm.input as {
-    title?: string
-    annotations?: Array<{ line?: number; message: string; severity?: string }>
-    summary?: string
-  }
+    title?: string;
+    annotations?: Array<{ line?: number; message: string; severity?: string }>;
+    summary?: string;
+  };
 
   const unaryEvent = {
     completion_type: 'tool_use_single' as const,
     language_name: 'none',
-  }
-  usePermissionRequestLogging(toolUseConfirm, unaryEvent)
+  };
+  usePermissionRequestLogging(toolUseConfirm, unaryEvent);
 
-  const annotationCount = annotations?.length ?? 0
+  const annotationCount = annotations?.length ?? 0;
 
   function handleResponse(value: 'yes' | 'no'): void {
     if (value === 'yes') {
-      logUnaryPermissionEvent('tool_use_single', toolUseConfirm, 'accept')
-      toolUseConfirm.onAllow(toolUseConfirm.input, [])
-      onDone()
+      logUnaryPermissionEvent('tool_use_single', toolUseConfirm, 'accept');
+      toolUseConfirm.onAllow(toolUseConfirm.input, []);
+      onDone();
     } else {
-      logUnaryPermissionEvent('tool_use_single', toolUseConfirm, 'reject')
-      toolUseConfirm.onReject()
-      onReject()
-      onDone()
+      logUnaryPermissionEvent('tool_use_single', toolUseConfirm, 'reject');
+      toolUseConfirm.onReject();
+      onReject();
+      onDone();
     }
   }
 
   return (
-    <PermissionDialog
-      color="permission"
-      title="Review artifact?"
-      workerBadge={workerBadge}
-    >
+    <PermissionDialog color="permission" title="Review artifact?" workerBadge={workerBadge}>
       <Box flexDirection="column" marginTop={1} paddingX={1}>
-        <Text>
-          Claude wants to review{title ? `: ${title}` : ' an artifact'}.
-        </Text>
+        <Text>Claude wants to review{title ? `: ${title}` : ' an artifact'}.</Text>
 
         <Box marginTop={1} flexDirection="column">
           <Text dimColor>
-            {annotationCount} annotation{annotationCount !== 1 ? 's' : ''} will
-            be presented.
+            {annotationCount} annotation{annotationCount !== 1 ? 's' : ''} will be presented.
           </Text>
           {summary ? <Text dimColor>Summary: {summary}</Text> : null}
         </Box>
@@ -70,5 +63,5 @@ export function ReviewArtifactPermissionRequest({
         </Box>
       </Box>
     </PermissionDialog>
-  )
+  );
 }
diff --git a/src/components/permissions/SandboxPermissionRequest.tsx b/src/components/permissions/SandboxPermissionRequest.tsx
index cf7ef1195..70f776abe 100644
--- a/src/components/permissions/SandboxPermissionRequest.tsx
+++ b/src/components/permissions/SandboxPermissionRequest.tsx
@@ -1,23 +1,17 @@
-import * as React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import {
-  type NetworkHostPattern,
-  shouldAllowManagedSandboxDomainsOnly,
-} from 'src/utils/sandbox/sandbox-adapter.js'
+import * as React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { type NetworkHostPattern, shouldAllowManagedSandboxDomainsOnly } from 'src/utils/sandbox/sandbox-adapter.js';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from '../../services/analytics/index.js'
-import { Select } from '../CustomSelect/select.js'
-import { PermissionDialog } from './PermissionDialog.js'
+} from '../../services/analytics/index.js';
+import { Select } from '../CustomSelect/select.js';
+import { PermissionDialog } from './PermissionDialog.js';
 
 export type SandboxPermissionRequestProps = {
-  hostPattern: NetworkHostPattern
-  onUserResponse: (response: {
-    allow: boolean
-    persistToSettings: boolean
-  }) => void
-}
+  hostPattern: NetworkHostPattern;
+  onUserResponse: (response: { allow: boolean; persistToSettings: boolean }) => void;
+};
 
 export function SandboxPermissionRequest({
   hostPattern: { host },
@@ -30,25 +24,24 @@ export function SandboxPermissionRequest({
     if (process.env.USER_TYPE === 'ant') {
       logEvent('tengu_sandbox_network_dialog_result', {
         host: host as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        result:
-          value as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
+        result: value as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
     }
 
     switch (value) {
       case 'yes':
-        onUserResponse({ allow: true, persistToSettings: false })
-        break
+        onUserResponse({ allow: true, persistToSettings: false });
+        break;
       case 'yes-dont-ask-again':
-        onUserResponse({ allow: true, persistToSettings: true })
-        break
+        onUserResponse({ allow: true, persistToSettings: true });
+        break;
       case 'no':
-        onUserResponse({ allow: false, persistToSettings: false })
-        break
+        onUserResponse({ allow: false, persistToSettings: false });
+        break;
     }
   }
 
-  const managedDomainsOnly = shouldAllowManagedSandboxDomainsOnly()
+  const managedDomainsOnly = shouldAllowManagedSandboxDomainsOnly();
 
   const options = [
     { label: 'Yes', value: 'yes' },
@@ -72,7 +65,7 @@ export function SandboxPermissionRequest({
       ),
       value: 'no',
     },
-  ]
+  ];
 
   return (
     <PermissionDialog title="Network request outside of sandbox">
@@ -92,15 +85,14 @@ export function SandboxPermissionRequest({
               if (process.env.USER_TYPE === 'ant') {
                 logEvent('tengu_sandbox_network_dialog_result', {
                   host: host as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-                  result:
-                    'cancel' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-                })
+                  result: 'cancel' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+                });
               }
-              onUserResponse({ allow: false, persistToSettings: false })
+              onUserResponse({ allow: false, persistToSettings: false });
             }}
           />
         </Box>
       </Box>
     </PermissionDialog>
-  )
+  );
 }
diff --git a/src/components/permissions/SedEditPermissionRequest/SedEditPermissionRequest.tsx b/src/components/permissions/SedEditPermissionRequest/SedEditPermissionRequest.tsx
index 4ccd2da67..74f66d876 100644
--- a/src/components/permissions/SedEditPermissionRequest/SedEditPermissionRequest.tsx
+++ b/src/components/permissions/SedEditPermissionRequest/SedEditPermissionRequest.tsx
@@ -1,30 +1,27 @@
-import { basename, relative } from 'path'
-import React, { Suspense, use, useMemo } from 'react'
-import { FileEditToolDiff } from 'src/components/FileEditToolDiff.js'
-import { getCwd } from 'src/utils/cwd.js'
-import { isENOENT } from 'src/utils/errors.js'
-import { detectEncodingForResolvedPath } from 'src/utils/fileRead.js'
-import { getFsImplementation } from 'src/utils/fsOperations.js'
-import { Text } from '@anthropic/ink'
-import { BashTool } from '@claude-code-best/builtin-tools/tools/BashTool/BashTool.js'
+import { basename, relative } from 'path';
+import React, { Suspense, use, useMemo } from 'react';
+import { FileEditToolDiff } from 'src/components/FileEditToolDiff.js';
+import { getCwd } from 'src/utils/cwd.js';
+import { isENOENT } from 'src/utils/errors.js';
+import { detectEncodingForResolvedPath } from 'src/utils/fileRead.js';
+import { getFsImplementation } from 'src/utils/fsOperations.js';
+import { Text } from '@anthropic/ink';
+import { BashTool } from '@claude-code-best/builtin-tools/tools/BashTool/BashTool.js';
 import {
   applySedSubstitution,
   type SedEditInfo,
-} from '@claude-code-best/builtin-tools/tools/BashTool/sedEditParser.js'
-import { FilePermissionDialog } from '../FilePermissionDialog/FilePermissionDialog.js'
-import type { PermissionRequestProps } from '../PermissionRequest.js'
+} from '@claude-code-best/builtin-tools/tools/BashTool/sedEditParser.js';
+import { FilePermissionDialog } from '../FilePermissionDialog/FilePermissionDialog.js';
+import type { PermissionRequestProps } from '../PermissionRequest.js';
 
 type SedEditPermissionRequestProps = PermissionRequestProps & {
-  sedInfo: SedEditInfo
-}
+  sedInfo: SedEditInfo;
+};
 
-type FileReadResult = { oldContent: string; fileExists: boolean }
+type FileReadResult = { oldContent: string; fileExists: boolean };
 
-export function SedEditPermissionRequest({
-  sedInfo,
-  ...props
-}: SedEditPermissionRequestProps): React.ReactNode {
-  const { filePath } = sedInfo
+export function SedEditPermissionRequest({ sedInfo, ...props }: SedEditPermissionRequestProps): React.ReactNode {
+  const { filePath } = sedInfo;
 
   // Read file content async so mount doesn't block React commit on disk I/O.
   // Large files would otherwise hang the dialog before it renders.
@@ -35,28 +32,24 @@ export function SedEditPermissionRequest({
         // Detect encoding first (sync 4KB read — negligible) so UTF-16LE BOMs
         // render correctly. This matches what readFileSync did before the
         // async conversion.
-        const encoding = detectEncodingForResolvedPath(filePath)
-        const raw = await getFsImplementation().readFile(filePath, { encoding })
+        const encoding = detectEncodingForResolvedPath(filePath);
+        const raw = await getFsImplementation().readFile(filePath, { encoding });
         return {
           oldContent: raw.replaceAll('\r\n', '\n'),
           fileExists: true,
-        }
+        };
       })().catch((e: unknown): FileReadResult => {
-        if (!isENOENT(e)) throw e
-        return { oldContent: '', fileExists: false }
+        if (!isENOENT(e)) throw e;
+        return { oldContent: '', fileExists: false };
       }),
     [filePath],
-  )
+  );
 
   return (
     <Suspense fallback={null}>
-      <SedEditPermissionRequestInner
-        sedInfo={sedInfo}
-        contentPromise={contentPromise}
-        {...props}
-      />
+      <SedEditPermissionRequestInner sedInfo={sedInfo} contentPromise={contentPromise} {...props} />
     </Suspense>
-  )
+  );
 }
 
 function SedEditPermissionRequestInner({
@@ -64,20 +57,20 @@ function SedEditPermissionRequestInner({
   contentPromise,
   ...props
 }: SedEditPermissionRequestProps & {
-  contentPromise: Promise<FileReadResult>
+  contentPromise: Promise<FileReadResult>;
 }): React.ReactNode {
-  const { filePath } = sedInfo
-  const { oldContent, fileExists } = use(contentPromise)
+  const { filePath } = sedInfo;
+  const { oldContent, fileExists } = use(contentPromise);
 
   // Compute the new content by applying the sed substitution
   const newContent = useMemo(() => {
-    return applySedSubstitution(oldContent, sedInfo)
-  }, [oldContent, sedInfo])
+    return applySedSubstitution(oldContent, sedInfo);
+  }, [oldContent, sedInfo]);
 
   // Create the edit representation for the diff
   const edits = useMemo(() => {
     if (oldContent === newContent) {
-      return []
+      return [];
     }
     return [
       {
@@ -85,29 +78,29 @@ function SedEditPermissionRequestInner({
         new_string: newContent,
         replace_all: false,
       },
-    ]
-  }, [oldContent, newContent])
+    ];
+  }, [oldContent, newContent]);
 
   // Determine appropriate message when no changes
   const noChangesMessage = useMemo(() => {
     if (!fileExists) {
-      return 'File does not exist'
+      return 'File does not exist';
     }
-    return 'Pattern did not match any content'
-  }, [fileExists])
+    return 'Pattern did not match any content';
+  }, [fileExists]);
 
   // Parse input and add _simulatedSedEdit to ensure what user previewed
   // is exactly what gets written (prevents sed/JS regex differences)
   const parseInput = (input: unknown) => {
-    const parsed = BashTool.inputSchema.parse(input)
+    const parsed = BashTool.inputSchema.parse(input);
     return {
       ...parsed,
       _simulatedSedEdit: {
         filePath,
         newContent,
       },
-    }
-  }
+    };
+  };
 
   return (
     <FilePermissionDialog
@@ -119,8 +112,7 @@ function SedEditPermissionRequestInner({
       subtitle={relative(getCwd(), filePath)}
       question={
         <Text>
-          Do you want to make this edit to{' '}
-          <Text bold>{basename(filePath)}</Text>?
+          Do you want to make this edit to <Text bold>{basename(filePath)}</Text>?
         </Text>
       }
       content={
@@ -135,5 +127,5 @@ function SedEditPermissionRequestInner({
       parseInput={parseInput}
       workerBadge={props.workerBadge}
     />
-  )
+  );
 }
diff --git a/src/components/permissions/SedEditPermissionRequest/src/components/FileEditToolDiff.ts b/src/components/permissions/SedEditPermissionRequest/src/components/FileEditToolDiff.ts
index d6d114f60..8b1551f7d 100644
--- a/src/components/permissions/SedEditPermissionRequest/src/components/FileEditToolDiff.ts
+++ b/src/components/permissions/SedEditPermissionRequest/src/components/FileEditToolDiff.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type FileEditToolDiff = any;
+export type FileEditToolDiff = any
diff --git a/src/components/permissions/SedEditPermissionRequest/src/utils/cwd.ts b/src/components/permissions/SedEditPermissionRequest/src/utils/cwd.ts
index 76c192ed8..4bd56a824 100644
--- a/src/components/permissions/SedEditPermissionRequest/src/utils/cwd.ts
+++ b/src/components/permissions/SedEditPermissionRequest/src/utils/cwd.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getCwd = any;
+export type getCwd = any
diff --git a/src/components/permissions/SedEditPermissionRequest/src/utils/errors.ts b/src/components/permissions/SedEditPermissionRequest/src/utils/errors.ts
index 8ccaeabf1..988b192ee 100644
--- a/src/components/permissions/SedEditPermissionRequest/src/utils/errors.ts
+++ b/src/components/permissions/SedEditPermissionRequest/src/utils/errors.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type isENOENT = any;
+export type isENOENT = any
diff --git a/src/components/permissions/SedEditPermissionRequest/src/utils/fileRead.ts b/src/components/permissions/SedEditPermissionRequest/src/utils/fileRead.ts
index 69d200068..60cd89922 100644
--- a/src/components/permissions/SedEditPermissionRequest/src/utils/fileRead.ts
+++ b/src/components/permissions/SedEditPermissionRequest/src/utils/fileRead.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type detectEncodingForResolvedPath = any;
+export type detectEncodingForResolvedPath = any
diff --git a/src/components/permissions/SedEditPermissionRequest/src/utils/fsOperations.ts b/src/components/permissions/SedEditPermissionRequest/src/utils/fsOperations.ts
index d30ccea0a..276e80162 100644
--- a/src/components/permissions/SedEditPermissionRequest/src/utils/fsOperations.ts
+++ b/src/components/permissions/SedEditPermissionRequest/src/utils/fsOperations.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getFsImplementation = any;
+export type getFsImplementation = any
diff --git a/src/components/permissions/SkillPermissionRequest/SkillPermissionRequest.tsx b/src/components/permissions/SkillPermissionRequest/SkillPermissionRequest.tsx
index 234f7d970..f54e2c93c 100644
--- a/src/components/permissions/SkillPermissionRequest/SkillPermissionRequest.tsx
+++ b/src/components/permissions/SkillPermissionRequest/SkillPermissionRequest.tsx
@@ -1,47 +1,33 @@
-import React, { useCallback, useMemo } from 'react'
-import { logError } from 'src/utils/log.js'
-import { getOriginalCwd } from '../../../bootstrap/state.js'
-import { Box, Text } from '@anthropic/ink'
-import { sanitizeToolNameForAnalytics } from '../../../services/analytics/metadata.js'
-import { SKILL_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/SkillTool/constants.js'
-import { SkillTool } from '@claude-code-best/builtin-tools/tools/SkillTool/SkillTool.js'
-import { env } from '../../../utils/env.js'
-import { shouldShowAlwaysAllowOptions } from '../../../utils/permissions/permissionsLoader.js'
-import { logUnaryEvent } from '../../../utils/unaryLogging.js'
-import { type UnaryEvent, usePermissionRequestLogging } from '../hooks.js'
-import { PermissionDialog } from '../PermissionDialog.js'
-import {
-  PermissionPrompt,
-  type PermissionPromptOption,
-  type ToolAnalyticsContext,
-} from '../PermissionPrompt.js'
-import type { PermissionRequestProps } from '../PermissionRequest.js'
-import { PermissionRuleExplanation } from '../PermissionRuleExplanation.js'
+import React, { useCallback, useMemo } from 'react';
+import { logError } from 'src/utils/log.js';
+import { getOriginalCwd } from '../../../bootstrap/state.js';
+import { Box, Text } from '@anthropic/ink';
+import { sanitizeToolNameForAnalytics } from '../../../services/analytics/metadata.js';
+import { SKILL_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/SkillTool/constants.js';
+import { SkillTool } from '@claude-code-best/builtin-tools/tools/SkillTool/SkillTool.js';
+import { env } from '../../../utils/env.js';
+import { shouldShowAlwaysAllowOptions } from '../../../utils/permissions/permissionsLoader.js';
+import { logUnaryEvent } from '../../../utils/unaryLogging.js';
+import { type UnaryEvent, usePermissionRequestLogging } from '../hooks.js';
+import { PermissionDialog } from '../PermissionDialog.js';
+import { PermissionPrompt, type PermissionPromptOption, type ToolAnalyticsContext } from '../PermissionPrompt.js';
+import type { PermissionRequestProps } from '../PermissionRequest.js';
+import { PermissionRuleExplanation } from '../PermissionRuleExplanation.js';
 
-type SkillOptionValue = 'yes' | 'yes-exact' | 'yes-prefix' | 'no'
+type SkillOptionValue = 'yes' | 'yes-exact' | 'yes-prefix' | 'no';
 
-export function SkillPermissionRequest(
-  props: PermissionRequestProps,
-): React.ReactNode {
-  const {
-    toolUseConfirm,
-    onDone,
-    onReject,
-    verbose: _verbose,
-    workerBadge,
-  } = props
+export function SkillPermissionRequest(props: PermissionRequestProps): React.ReactNode {
+  const { toolUseConfirm, onDone, onReject, verbose: _verbose, workerBadge } = props;
   const parseInput = (input: unknown): string => {
-    const result = SkillTool.inputSchema.safeParse(input)
+    const result = SkillTool.inputSchema.safeParse(input);
     if (!result.success) {
-      logError(
-        new Error(`Failed to parse skill tool input: ${result.error.message}`),
-      )
-      return ''
+      logError(new Error(`Failed to parse skill tool input: ${result.error.message}`));
+      return '';
     }
-    return result.data.skill
-  }
+    return result.data.skill;
+  };
 
-  const skill = parseInput(toolUseConfirm.input)
+  const skill = parseInput(toolUseConfirm.input);
 
   // Check if this is a command using metadata from checkPermissions
   const commandObj =
@@ -49,7 +35,7 @@ export function SkillPermissionRequest(
     toolUseConfirm.permissionResult.metadata &&
     'command' in toolUseConfirm.permissionResult.metadata
       ? toolUseConfirm.permissionResult.metadata.command
-      : undefined
+      : undefined;
 
   const unaryEvent = useMemo<UnaryEvent>(
     () => ({
@@ -57,12 +43,12 @@ export function SkillPermissionRequest(
       language_name: 'none',
     }),
     [],
-  )
+  );
 
-  usePermissionRequestLogging(toolUseConfirm, unaryEvent)
+  usePermissionRequestLogging(toolUseConfirm, unaryEvent);
 
-  const originalCwd = getOriginalCwd()
-  const showAlwaysAllowOptions = shouldShowAlwaysAllowOptions()
+  const originalCwd = getOriginalCwd();
+  const showAlwaysAllowOptions = shouldShowAlwaysAllowOptions();
   const options = useMemo((): PermissionPromptOption<SkillOptionValue>[] => {
     const baseOptions: PermissionPromptOption<SkillOptionValue>[] = [
       {
@@ -70,36 +56,34 @@ export function SkillPermissionRequest(
         value: 'yes',
         feedbackConfig: { type: 'accept' },
       },
-    ]
+    ];
 
     // Only add "always allow" options when not restricted by allowManagedPermissionRulesOnly
-    const alwaysAllowOptions: PermissionPromptOption<SkillOptionValue>[] = []
+    const alwaysAllowOptions: PermissionPromptOption<SkillOptionValue>[] = [];
     if (showAlwaysAllowOptions) {
       // Add exact match option
       alwaysAllowOptions.push({
         label: (
           <Text>
-            Yes, and don&apos;t ask again for <Text bold>{skill}</Text> in{' '}
-            <Text bold>{originalCwd}</Text>
+            Yes, and don&apos;t ask again for <Text bold>{skill}</Text> in <Text bold>{originalCwd}</Text>
           </Text>
         ),
         value: 'yes-exact',
-      })
+      });
 
       // Add prefix option if the skill has arguments
-      const spaceIndex = skill.indexOf(' ')
+      const spaceIndex = skill.indexOf(' ');
       if (spaceIndex > 0) {
-        const commandPrefix = skill.substring(0, spaceIndex)
+        const commandPrefix = skill.substring(0, spaceIndex);
         alwaysAllowOptions.push({
           label: (
             <Text>
-              Yes, and don&apos;t ask again for{' '}
-              <Text bold>{commandPrefix + ':*'}</Text> commands in{' '}
+              Yes, and don&apos;t ask again for <Text bold>{commandPrefix + ':*'}</Text> commands in{' '}
               <Text bold>{originalCwd}</Text>
             </Text>
           ),
           value: 'yes-prefix',
-        })
+        });
       }
     }
 
@@ -107,10 +91,10 @@ export function SkillPermissionRequest(
       label: 'No',
       value: 'no',
       feedbackConfig: { type: 'reject' },
-    }
+    };
 
-    return [...baseOptions, ...alwaysAllowOptions, noOption]
-  }, [skill, originalCwd, showAlwaysAllowOptions])
+    return [...baseOptions, ...alwaysAllowOptions, noOption];
+  }, [skill, originalCwd, showAlwaysAllowOptions]);
 
   const toolAnalyticsContext = useMemo(
     (): ToolAnalyticsContext => ({
@@ -118,7 +102,7 @@ export function SkillPermissionRequest(
       isMcp: toolUseConfirm.tool.isMcp ?? false,
     }),
     [toolUseConfirm.tool.name, toolUseConfirm.tool.isMcp],
-  )
+  );
 
   const handleSelect = useCallback(
     (value: SkillOptionValue, feedback?: string) => {
@@ -132,10 +116,10 @@ export function SkillPermissionRequest(
               message_id: toolUseConfirm.assistantMessage.message.id!,
               platform: env.platform,
             },
-          })
-          toolUseConfirm.onAllow(toolUseConfirm.input, [], feedback)
-          onDone()
-          break
+          });
+          toolUseConfirm.onAllow(toolUseConfirm.input, [], feedback);
+          onDone();
+          break;
         case 'yes-exact': {
           void logUnaryEvent({
             completion_type: 'tool_use_single',
@@ -145,7 +129,7 @@ export function SkillPermissionRequest(
               message_id: toolUseConfirm.assistantMessage.message.id!,
               platform: env.platform,
             },
-          })
+          });
 
           toolUseConfirm.onAllow(toolUseConfirm.input, [
             {
@@ -159,9 +143,9 @@ export function SkillPermissionRequest(
               behavior: 'allow',
               destination: 'localSettings',
             },
-          ])
-          onDone()
-          break
+          ]);
+          onDone();
+          break;
         }
         case 'yes-prefix': {
           void logUnaryEvent({
@@ -172,12 +156,11 @@ export function SkillPermissionRequest(
               message_id: toolUseConfirm.assistantMessage.message.id!,
               platform: env.platform,
             },
-          })
+          });
 
           // Extract the skill prefix (everything before the first space)
-          const spaceIndex = skill.indexOf(' ')
-          const commandPrefix =
-            spaceIndex > 0 ? skill.substring(0, spaceIndex) : skill
+          const spaceIndex = skill.indexOf(' ');
+          const commandPrefix = spaceIndex > 0 ? skill.substring(0, spaceIndex) : skill;
 
           toolUseConfirm.onAllow(toolUseConfirm.input, [
             {
@@ -191,9 +174,9 @@ export function SkillPermissionRequest(
               behavior: 'allow',
               destination: 'localSettings',
             },
-          ])
-          onDone()
-          break
+          ]);
+          onDone();
+          break;
         }
         case 'no':
           void logUnaryEvent({
@@ -204,15 +187,15 @@ export function SkillPermissionRequest(
               message_id: toolUseConfirm.assistantMessage.message.id!,
               platform: env.platform,
             },
-          })
-          toolUseConfirm.onReject(feedback)
-          onReject()
-          onDone()
-          break
+          });
+          toolUseConfirm.onReject(feedback);
+          onReject();
+          onDone();
+          break;
       }
     },
     [toolUseConfirm, onDone, onReject, skill],
-  )
+  );
 
   const handleCancel = useCallback(() => {
     void logUnaryEvent({
@@ -223,11 +206,11 @@ export function SkillPermissionRequest(
         message_id: toolUseConfirm.assistantMessage.message.id!,
         platform: env.platform,
       },
-    })
-    toolUseConfirm.onReject()
-    onReject()
-    onDone()
-  }, [toolUseConfirm, onDone, onReject])
+    });
+    toolUseConfirm.onReject();
+    onReject();
+    onDone();
+  }, [toolUseConfirm, onDone, onReject]);
 
   return (
     <PermissionDialog title={`Use skill "${skill}"?`} workerBadge={workerBadge}>
@@ -237,10 +220,7 @@ export function SkillPermissionRequest(
       </Box>
 
       <Box flexDirection="column">
-        <PermissionRuleExplanation
-          permissionResult={toolUseConfirm.permissionResult}
-          toolType="tool"
-        />
+        <PermissionRuleExplanation permissionResult={toolUseConfirm.permissionResult} toolType="tool" />
         <PermissionPrompt
           options={options}
           onSelect={handleSelect}
@@ -249,5 +229,5 @@ export function SkillPermissionRequest(
         />
       </Box>
     </PermissionDialog>
-  )
+  );
 }
diff --git a/src/components/permissions/SkillPermissionRequest/src/utils/log.ts b/src/components/permissions/SkillPermissionRequest/src/utils/log.ts
index cf30e90da..30df9cbcb 100644
--- a/src/components/permissions/SkillPermissionRequest/src/utils/log.ts
+++ b/src/components/permissions/SkillPermissionRequest/src/utils/log.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type logError = any;
+export type logError = any
diff --git a/src/components/permissions/WebFetchPermissionRequest/WebFetchPermissionRequest.tsx b/src/components/permissions/WebFetchPermissionRequest/WebFetchPermissionRequest.tsx
index f91f3431b..e3bfac8e6 100644
--- a/src/components/permissions/WebFetchPermissionRequest/WebFetchPermissionRequest.tsx
+++ b/src/components/permissions/WebFetchPermissionRequest/WebFetchPermissionRequest.tsx
@@ -1,28 +1,25 @@
-import React, { useMemo } from 'react'
-import { Box, Text, useTheme } from '@anthropic/ink'
-import { WebFetchTool } from '@claude-code-best/builtin-tools/tools/WebFetchTool/WebFetchTool.js'
-import { shouldShowAlwaysAllowOptions } from '../../../utils/permissions/permissionsLoader.js'
-import {
-  type OptionWithDescription,
-  Select,
-} from '../../CustomSelect/select.js'
-import { type UnaryEvent, usePermissionRequestLogging } from '../hooks.js'
-import { PermissionDialog } from '../PermissionDialog.js'
-import type { PermissionRequestProps } from '../PermissionRequest.js'
-import { PermissionRuleExplanation } from '../PermissionRuleExplanation.js'
-import { logUnaryPermissionEvent } from '../utils.js'
+import React, { useMemo } from 'react';
+import { Box, Text, useTheme } from '@anthropic/ink';
+import { WebFetchTool } from '@claude-code-best/builtin-tools/tools/WebFetchTool/WebFetchTool.js';
+import { shouldShowAlwaysAllowOptions } from '../../../utils/permissions/permissionsLoader.js';
+import { type OptionWithDescription, Select } from '../../CustomSelect/select.js';
+import { type UnaryEvent, usePermissionRequestLogging } from '../hooks.js';
+import { PermissionDialog } from '../PermissionDialog.js';
+import type { PermissionRequestProps } from '../PermissionRequest.js';
+import { PermissionRuleExplanation } from '../PermissionRuleExplanation.js';
+import { logUnaryPermissionEvent } from '../utils.js';
 
 function inputToPermissionRuleContent(input: { [k: string]: unknown }): string {
   try {
-    const parsedInput = WebFetchTool.inputSchema.safeParse(input)
+    const parsedInput = WebFetchTool.inputSchema.safeParse(input);
     if (!parsedInput.success) {
-      return `input:${input.toString()}`
+      return `input:${input.toString()}`;
     }
-    const { url } = parsedInput.data
-    const hostname = new URL(url).hostname
-    return `domain:${hostname}`
+    const { url } = parsedInput.data;
+    const hostname = new URL(url).hostname;
+    return `domain:${hostname}`;
   } catch {
-    return `input:${input.toString()}`
+    return `input:${input.toString()}`;
   }
 }
 
@@ -33,29 +30,26 @@ export function WebFetchPermissionRequest({
   verbose,
   workerBadge,
 }: PermissionRequestProps): React.ReactNode {
-  const [theme] = useTheme()
+  const [theme] = useTheme();
   // url is already validated by the input schema
-  const { url } = toolUseConfirm.input as { url: string }
+  const { url } = toolUseConfirm.input as { url: string };
 
   // Extract hostname from URL
-  const hostname = new URL(url).hostname
+  const hostname = new URL(url).hostname;
 
-  const unaryEvent = useMemo<UnaryEvent>(
-    () => ({ completion_type: 'tool_use_single', language_name: 'none' }),
-    [],
-  )
+  const unaryEvent = useMemo<UnaryEvent>(() => ({ completion_type: 'tool_use_single', language_name: 'none' }), []);
 
-  usePermissionRequestLogging(toolUseConfirm, unaryEvent)
+  usePermissionRequestLogging(toolUseConfirm, unaryEvent);
 
   // Generate permission options specific to domains
-  const showAlwaysAllowOptions = shouldShowAlwaysAllowOptions()
+  const showAlwaysAllowOptions = shouldShowAlwaysAllowOptions();
   const options = useMemo((): OptionWithDescription<string>[] => {
     const result: OptionWithDescription<string>[] = [
       {
         label: 'Yes',
         value: 'yes',
       },
-    ]
+    ];
 
     if (showAlwaysAllowOptions) {
       result.push({
@@ -65,7 +59,7 @@ export function WebFetchPermissionRequest({
           </Text>
         ),
         value: 'yes-dont-ask-again-domain',
-      })
+      });
     }
 
     result.push({
@@ -75,25 +69,25 @@ export function WebFetchPermissionRequest({
         </Text>
       ),
       value: 'no',
-    })
+    });
 
-    return result
-  }, [hostname, showAlwaysAllowOptions])
+    return result;
+  }, [hostname, showAlwaysAllowOptions]);
 
   function onChange(newValue: string) {
     switch (newValue) {
       case 'yes':
-        logUnaryPermissionEvent('tool_use_single', toolUseConfirm, 'accept')
-        toolUseConfirm.onAllow(toolUseConfirm.input, [])
-        onDone()
-        break
+        logUnaryPermissionEvent('tool_use_single', toolUseConfirm, 'accept');
+        toolUseConfirm.onAllow(toolUseConfirm.input, []);
+        onDone();
+        break;
       case 'yes-dont-ask-again-domain': {
-        logUnaryPermissionEvent('tool_use_single', toolUseConfirm, 'accept')
-        const ruleContent = inputToPermissionRuleContent(toolUseConfirm.input)
+        logUnaryPermissionEvent('tool_use_single', toolUseConfirm, 'accept');
+        const ruleContent = inputToPermissionRuleContent(toolUseConfirm.input);
         const ruleValue = {
           toolName: toolUseConfirm.tool.name,
           ruleContent,
-        }
+        };
 
         // Pass permission update directly to onAllow
         toolUseConfirm.onAllow(toolUseConfirm.input, [
@@ -103,16 +97,16 @@ export function WebFetchPermissionRequest({
             behavior: 'allow',
             destination: 'localSettings',
           },
-        ])
-        onDone()
-        break
+        ]);
+        onDone();
+        break;
       }
       case 'no':
-        logUnaryPermissionEvent('tool_use_single', toolUseConfirm, 'reject')
-        toolUseConfirm.onReject()
-        onReject()
-        onDone()
-        break
+        logUnaryPermissionEvent('tool_use_single', toolUseConfirm, 'reject');
+        toolUseConfirm.onReject();
+        onReject();
+        onDone();
+        break;
     }
   }
 
@@ -120,29 +114,19 @@ export function WebFetchPermissionRequest({
     <PermissionDialog title="Fetch" workerBadge={workerBadge}>
       <Box flexDirection="column" paddingX={2} paddingY={1}>
         <Text>
-          {WebFetchTool.renderToolUseMessage(
-            toolUseConfirm.input as { url: string; prompt: string },
-            {
-              theme,
-              verbose,
-            },
-          )}
+          {WebFetchTool.renderToolUseMessage(toolUseConfirm.input as { url: string; prompt: string }, {
+            theme,
+            verbose,
+          })}
         </Text>
         <Text dimColor>{toolUseConfirm.description}</Text>
       </Box>
 
       <Box flexDirection="column">
-        <PermissionRuleExplanation
-          permissionResult={toolUseConfirm.permissionResult}
-          toolType="tool"
-        />
+        <PermissionRuleExplanation permissionResult={toolUseConfirm.permissionResult} toolType="tool" />
         <Text>Do you want to allow Claude to fetch this content?</Text>
-        <Select
-          options={options}
-          onChange={onChange}
-          onCancel={() => onChange('no')}
-        />
+        <Select options={options} onChange={onChange} onCancel={() => onChange('no')} />
       </Box>
     </PermissionDialog>
-  )
+  );
 }
diff --git a/src/components/permissions/WorkerBadge.tsx b/src/components/permissions/WorkerBadge.tsx
index 959346e6e..14f79877b 100644
--- a/src/components/permissions/WorkerBadge.tsx
+++ b/src/components/permissions/WorkerBadge.tsx
@@ -1,27 +1,24 @@
-import * as React from 'react'
-import { BLACK_CIRCLE } from '../../constants/figures.js'
-import { Box, Text } from '@anthropic/ink'
-import { toInkColor } from '../../utils/ink.js'
+import * as React from 'react';
+import { BLACK_CIRCLE } from '../../constants/figures.js';
+import { Box, Text } from '@anthropic/ink';
+import { toInkColor } from '../../utils/ink.js';
 
 export type WorkerBadgeProps = {
-  name: string
-  color: string
-}
+  name: string;
+  color: string;
+};
 
 /**
  * Renders a colored badge showing the worker's name for permission prompts.
  * Used to indicate which swarm worker is requesting the permission.
  */
-export function WorkerBadge({
-  name,
-  color,
-}: WorkerBadgeProps): React.ReactNode {
-  const inkColor = toInkColor(color)
+export function WorkerBadge({ name, color }: WorkerBadgeProps): React.ReactNode {
+  const inkColor = toInkColor(color);
   return (
     <Box flexDirection="row" gap={1}>
       <Text color={inkColor}>
         {BLACK_CIRCLE} <Text bold>@{name}</Text>
       </Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/permissions/WorkerPendingPermission.tsx b/src/components/permissions/WorkerPendingPermission.tsx
index 2d7ef596e..25cac40c4 100644
--- a/src/components/permissions/WorkerPendingPermission.tsx
+++ b/src/components/permissions/WorkerPendingPermission.tsx
@@ -1,37 +1,25 @@
-import * as React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import {
-  getAgentName,
-  getTeammateColor,
-  getTeamName,
-} from '../../utils/teammate.js'
-import { Spinner } from '../Spinner.js'
-import { WorkerBadge } from './WorkerBadge.js'
+import * as React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { getAgentName, getTeammateColor, getTeamName } from '../../utils/teammate.js';
+import { Spinner } from '../Spinner.js';
+import { WorkerBadge } from './WorkerBadge.js';
 
 type Props = {
-  toolName: string
-  description: string
-}
+  toolName: string;
+  description: string;
+};
 
 /**
  * Visual indicator shown on workers while waiting for leader to approve a permission request.
  * Displays the pending tool with a spinner and information about what's being requested.
  */
-export function WorkerPendingPermission({
-  toolName,
-  description,
-}: Props): React.ReactNode {
-  const teamName = getTeamName()
-  const agentName = getAgentName()
-  const agentColor = getTeammateColor()
+export function WorkerPendingPermission({ toolName, description }: Props): React.ReactNode {
+  const teamName = getTeamName();
+  const agentName = getAgentName();
+  const agentColor = getTeammateColor();
 
   return (
-    <Box
-      flexDirection="column"
-      borderStyle="round"
-      borderColor="warning"
-      paddingX={1}
-    >
+    <Box flexDirection="column" borderStyle="round" borderColor="warning" paddingX={1}>
       <Box marginBottom={1}>
         <Spinner />
         <Text color="warning" bold>
@@ -66,5 +54,5 @@ export function WorkerPendingPermission({
         </Box>
       )}
     </Box>
-  )
+  );
 }
diff --git a/src/components/permissions/rules/AddPermissionRules.tsx b/src/components/permissions/rules/AddPermissionRules.tsx
index e62442c3c..b134c1f26 100644
--- a/src/components/permissions/rules/AddPermissionRules.tsx
+++ b/src/components/permissions/rules/AddPermissionRules.tsx
@@ -1,65 +1,54 @@
-import * as React from 'react'
-import { useCallback } from 'react'
-import { Select } from '../../../components/CustomSelect/select.js'
-import { Box, Dialog, Text } from '@anthropic/ink'
-import type { ToolPermissionContext } from '../../../Tool.js'
+import * as React from 'react';
+import { useCallback } from 'react';
+import { Select } from '../../../components/CustomSelect/select.js';
+import { Box, Dialog, Text } from '@anthropic/ink';
+import type { ToolPermissionContext } from '../../../Tool.js';
 import type {
   PermissionBehavior,
   PermissionRule,
   PermissionRuleValue,
-} from '../../../utils/permissions/PermissionRule.js'
-import {
-  applyPermissionUpdate,
-  persistPermissionUpdate,
-} from '../../../utils/permissions/PermissionUpdate.js'
-import { permissionRuleValueToString } from '../../../utils/permissions/permissionRuleParser.js'
-import {
-  detectUnreachableRules,
-  type UnreachableRule,
-} from '../../../utils/permissions/shadowedRuleDetection.js'
-import { SandboxManager } from '../../../utils/sandbox/sandbox-adapter.js'
-import {
-  type EditableSettingSource,
-  SOURCES,
-} from '../../../utils/settings/constants.js'
-import { getRelativeSettingsFilePathForSource } from '../../../utils/settings/settings.js'
-import { plural } from '../../../utils/stringUtils.js'
-import type { OptionWithDescription } from '../../CustomSelect/select.js'
-import { PermissionRuleDescription } from './PermissionRuleDescription.js'
+} from '../../../utils/permissions/PermissionRule.js';
+import { applyPermissionUpdate, persistPermissionUpdate } from '../../../utils/permissions/PermissionUpdate.js';
+import { permissionRuleValueToString } from '../../../utils/permissions/permissionRuleParser.js';
+import { detectUnreachableRules, type UnreachableRule } from '../../../utils/permissions/shadowedRuleDetection.js';
+import { SandboxManager } from '../../../utils/sandbox/sandbox-adapter.js';
+import { type EditableSettingSource, SOURCES } from '../../../utils/settings/constants.js';
+import { getRelativeSettingsFilePathForSource } from '../../../utils/settings/settings.js';
+import { plural } from '../../../utils/stringUtils.js';
+import type { OptionWithDescription } from '../../CustomSelect/select.js';
+import { PermissionRuleDescription } from './PermissionRuleDescription.js';
 
-export function optionForPermissionSaveDestination(
-  saveDestination: EditableSettingSource,
-): OptionWithDescription {
+export function optionForPermissionSaveDestination(saveDestination: EditableSettingSource): OptionWithDescription {
   switch (saveDestination) {
     case 'localSettings':
       return {
         label: 'Project settings (local)',
         description: `Saved in ${getRelativeSettingsFilePathForSource('localSettings')}`,
         value: saveDestination,
-      }
+      };
     case 'projectSettings':
       return {
         label: 'Project settings',
         description: `Checked in at ${getRelativeSettingsFilePathForSource('projectSettings')}`,
         value: saveDestination,
-      }
+      };
     case 'userSettings':
       return {
         label: 'User settings',
         description: `Saved in at ~/.claude/settings.json`,
         value: saveDestination,
-      }
+      };
   }
 }
 
 type Props = {
-  onAddRules: (rules: PermissionRule[], unreachable?: UnreachableRule[]) => void
-  onCancel: () => void
-  ruleValues: PermissionRuleValue[]
-  ruleBehavior: PermissionBehavior
-  initialContext: ToolPermissionContext
-  setToolPermissionContext: (newContext: ToolPermissionContext) => void
-}
+  onAddRules: (rules: PermissionRule[], unreachable?: UnreachableRule[]) => void;
+  onCancel: () => void;
+  ruleValues: PermissionRuleValue[];
+  ruleBehavior: PermissionBehavior;
+  initialContext: ToolPermissionContext;
+  setToolPermissionContext: (newContext: ToolPermissionContext) => void;
+};
 
 export function AddPermissionRules({
   onAddRules,
@@ -69,22 +58,22 @@ export function AddPermissionRules({
   initialContext,
   setToolPermissionContext,
 }: Props): React.ReactNode {
-  const allOptions = SOURCES.map(optionForPermissionSaveDestination)
+  const allOptions = SOURCES.map(optionForPermissionSaveDestination);
 
   const onSelect = useCallback(
     (selectedValue: string) => {
       if (selectedValue === 'cancel') {
-        onCancel()
-        return
+        onCancel();
+        return;
       } else if ((SOURCES as readonly string[]).includes(selectedValue)) {
-        const destination = selectedValue as EditableSettingSource
+        const destination = selectedValue as EditableSettingSource;
 
         const updatedContext = applyPermissionUpdate(initialContext, {
           type: 'addRules',
           rules: ruleValues,
           behavior: ruleBehavior,
           destination,
-        })
+        });
 
         // Persist to settings
         persistPermissionUpdate({
@@ -92,59 +81,43 @@ export function AddPermissionRules({
           rules: ruleValues,
           behavior: ruleBehavior,
           destination,
-        })
+        });
 
-        setToolPermissionContext(updatedContext)
+        setToolPermissionContext(updatedContext);
 
         const rules: PermissionRule[] = ruleValues.map(ruleValue => ({
           ruleValue,
           ruleBehavior,
           source: destination,
-        }))
+        }));
 
         // Check for unreachable rules among the ones we just added
         const sandboxAutoAllowEnabled =
-          SandboxManager.isSandboxingEnabled() &&
-          SandboxManager.isAutoAllowBashIfSandboxedEnabled()
+          SandboxManager.isSandboxingEnabled() && SandboxManager.isAutoAllowBashIfSandboxedEnabled();
         const allUnreachable = detectUnreachableRules(updatedContext, {
           sandboxAutoAllowEnabled,
-        })
+        });
 
         // Filter to only rules we just added
         const newUnreachable = allUnreachable.filter(u =>
           ruleValues.some(
-            rv =>
-              rv.toolName === u.rule.ruleValue.toolName &&
-              rv.ruleContent === u.rule.ruleValue.ruleContent,
+            rv => rv.toolName === u.rule.ruleValue.toolName && rv.ruleContent === u.rule.ruleValue.ruleContent,
           ),
-        )
+        );
 
-        onAddRules(
-          rules,
-          newUnreachable.length > 0 ? newUnreachable : undefined,
-        )
+        onAddRules(rules, newUnreachable.length > 0 ? newUnreachable : undefined);
       }
     },
-    [
-      onAddRules,
-      onCancel,
-      ruleValues,
-      ruleBehavior,
-      initialContext,
-      setToolPermissionContext,
-    ],
-  )
+    [onAddRules, onCancel, ruleValues, ruleBehavior, initialContext, setToolPermissionContext],
+  );
 
-  const title = `Add ${ruleBehavior} permission ${plural(ruleValues.length, 'rule')}`
+  const title = `Add ${ruleBehavior} permission ${plural(ruleValues.length, 'rule')}`;
 
   return (
     <Dialog title={title} onCancel={onCancel} color="permission">
       <Box flexDirection="column" paddingX={2}>
         {ruleValues.map(ruleValue => (
-          <Box
-            flexDirection="column"
-            key={permissionRuleValueToString(ruleValue)}
-          >
+          <Box flexDirection="column" key={permissionRuleValueToString(ruleValue)}>
             <Text bold>{permissionRuleValueToString(ruleValue)}</Text>
             <PermissionRuleDescription ruleValue={ruleValue} />
           </Box>
@@ -153,12 +126,10 @@ export function AddPermissionRules({
 
       <Box flexDirection="column" marginY={1}>
         <Text>
-          {ruleValues.length === 1
-            ? 'Where should this rule be saved?'
-            : 'Where should these rules be saved?'}
+          {ruleValues.length === 1 ? 'Where should this rule be saved?' : 'Where should these rules be saved?'}
         </Text>
         <Select options={allOptions} onChange={onSelect} />
       </Box>
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/permissions/rules/AddWorkspaceDirectory.tsx b/src/components/permissions/rules/AddWorkspaceDirectory.tsx
index 589928782..daed17f40 100644
--- a/src/components/permissions/rules/AddWorkspaceDirectory.tsx
+++ b/src/components/permissions/rules/AddWorkspaceDirectory.tsx
@@ -1,36 +1,30 @@
-import figures from 'figures'
-import * as React from 'react'
-import { useCallback, useEffect, useMemo, useState } from 'react'
-import { useDebounceCallback } from 'usehooks-ts'
-import {
-  addDirHelpMessage,
-  validateDirectoryForWorkspace,
-} from '../../../commands/add-dir/validation.js'
-import TextInput from '../../../components/TextInput.js'
-import { type KeyboardEvent, Box, Text } from '@anthropic/ink'
-import { useKeybinding } from '../../../keybindings/useKeybinding.js'
-import type { ToolPermissionContext } from '../../../Tool.js'
-import { getDirectoryCompletions } from '../../../utils/suggestions/directoryCompletion.js'
-import { ConfigurableShortcutHint } from '../../ConfigurableShortcutHint.js'
-import { Select } from '../../CustomSelect/select.js'
-import { Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink'
-import {
-  PromptInputFooterSuggestions,
-  type SuggestionItem,
-} from '../../PromptInput/PromptInputFooterSuggestions.js'
+import figures from 'figures';
+import * as React from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useDebounceCallback } from 'usehooks-ts';
+import { addDirHelpMessage, validateDirectoryForWorkspace } from '../../../commands/add-dir/validation.js';
+import TextInput from '../../../components/TextInput.js';
+import { type KeyboardEvent, Box, Text } from '@anthropic/ink';
+import { useKeybinding } from '../../../keybindings/useKeybinding.js';
+import type { ToolPermissionContext } from '../../../Tool.js';
+import { getDirectoryCompletions } from '../../../utils/suggestions/directoryCompletion.js';
+import { ConfigurableShortcutHint } from '../../ConfigurableShortcutHint.js';
+import { Select } from '../../CustomSelect/select.js';
+import { Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink';
+import { PromptInputFooterSuggestions, type SuggestionItem } from '../../PromptInput/PromptInputFooterSuggestions.js';
 
 type Props = {
-  onAddDirectory: (path: string, remember?: boolean) => void
-  onCancel: () => void
-  permissionContext: ToolPermissionContext
-  directoryPath?: string // When directoryPath is provided, show selection options instead of input
-}
+  onAddDirectory: (path: string, remember?: boolean) => void;
+  onCancel: () => void;
+  permissionContext: ToolPermissionContext;
+  directoryPath?: string; // When directoryPath is provided, show selection options instead of input
+};
 
-type RememberDirectoryOption = 'yes-session' | 'yes-remember' | 'no'
+type RememberDirectoryOption = 'yes-session' | 'yes-remember' | 'no';
 
 const REMEMBER_DIRECTORY_OPTIONS: Array<{
-  value: RememberDirectoryOption
-  label: string
+  value: RememberDirectoryOption;
+  label: string;
 }> = [
   {
     value: 'yes-session',
@@ -44,15 +38,14 @@ const REMEMBER_DIRECTORY_OPTIONS: Array<{
     value: 'no',
     label: 'No',
   },
-]
+];
 
 function PermissionDescription(): React.ReactNode {
   return (
     <Text dimColor>
-      Claude Code will be able to read files in this directory and make edits
-      when auto-accept edits is on.
+      Claude Code will be able to read files in this directory and make edits when auto-accept edits is on.
     </Text>
-  )
+  );
 }
 
 function DirectoryDisplay({ path }: { path: string }): React.ReactNode {
@@ -61,7 +54,7 @@ function DirectoryDisplay({ path }: { path: string }): React.ReactNode {
       <Text color="permission">{path}</Text>
       <PermissionDescription />
     </Box>
-  )
+  );
 }
 
 function DirectoryInput({
@@ -72,12 +65,12 @@ function DirectoryInput({
   suggestions,
   selectedSuggestion,
 }: {
-  value: string
-  onChange: (value: string) => void
-  onSubmit: (value: string) => void
-  error: string | null
-  suggestions: SuggestionItem[]
-  selectedSuggestion: number
+  value: string;
+  onChange: (value: string) => void;
+  onSubmit: (value: string) => void;
+  error: string | null;
+  suggestions: SuggestionItem[];
+  selectedSuggestion: number;
 }): React.ReactNode {
   return (
     <Box flexDirection="column">
@@ -96,15 +89,12 @@ function DirectoryInput({
       </Box>
       {suggestions.length > 0 && (
         <Box marginBottom={1}>
-          <PromptInputFooterSuggestions
-            suggestions={suggestions}
-            selectedSuggestion={selectedSuggestion}
-          />
+          <PromptInputFooterSuggestions suggestions={suggestions} selectedSuggestion={selectedSuggestion} />
         </Box>
       )}
       {error && <Text color="error">{error}</Text>}
     </Box>
-  )
+  );
 }
 
 export function AddWorkspaceDirectory({
@@ -113,129 +103,117 @@ export function AddWorkspaceDirectory({
   permissionContext,
   directoryPath,
 }: Props): React.ReactNode {
-  const [directoryInput, setDirectoryInput] = useState('')
-  const [error, setError] = useState<string | null>(null)
-  const [suggestions, setSuggestions] = useState<SuggestionItem[]>([])
-  const [selectedSuggestion, setSelectedSuggestion] = useState(0)
-  const options = useMemo(() => REMEMBER_DIRECTORY_OPTIONS, [])
+  const [directoryInput, setDirectoryInput] = useState('');
+  const [error, setError] = useState<string | null>(null);
+  const [suggestions, setSuggestions] = useState<SuggestionItem[]>([]);
+  const [selectedSuggestion, setSelectedSuggestion] = useState(0);
+  const options = useMemo(() => REMEMBER_DIRECTORY_OPTIONS, []);
 
   // Fetch directory completions
   const fetchSuggestions = useCallback(async (path: string) => {
     if (!path) {
-      setSuggestions([])
-      setSelectedSuggestion(0)
-      return
+      setSuggestions([]);
+      setSelectedSuggestion(0);
+      return;
     }
-    const completions = await getDirectoryCompletions(path)
-    setSuggestions(completions)
-    setSelectedSuggestion(0)
-  }, [])
+    const completions = await getDirectoryCompletions(path);
+    setSuggestions(completions);
+    setSelectedSuggestion(0);
+  }, []);
 
-  const debouncedFetchSuggestions = useDebounceCallback(fetchSuggestions, 100)
+  const debouncedFetchSuggestions = useDebounceCallback(fetchSuggestions, 100);
 
   useEffect(() => {
-    void debouncedFetchSuggestions(directoryInput)
-  }, [directoryInput, debouncedFetchSuggestions])
+    void debouncedFetchSuggestions(directoryInput);
+  }, [directoryInput, debouncedFetchSuggestions]);
 
   const applySuggestion = useCallback((suggestion: SuggestionItem) => {
-    const newPath = suggestion.id + '/'
-    setDirectoryInput(newPath)
-    setError(null)
+    const newPath = suggestion.id + '/';
+    setDirectoryInput(newPath);
+    setError(null);
     // Suggestions will update via the useEffect
-  }, [])
+  }, []);
 
   // Handle directory submission from input
   const handleSubmit = useCallback(
     async (newPath: string) => {
-      const result = await validateDirectoryForWorkspace(
-        newPath,
-        permissionContext,
-      )
+      const result = await validateDirectoryForWorkspace(newPath, permissionContext);
 
       if (result.resultType === 'success') {
-        onAddDirectory(result.absolutePath, false)
+        onAddDirectory(result.absolutePath, false);
       } else {
-        setError(addDirHelpMessage(result))
+        setError(addDirHelpMessage(result));
       }
     },
     [permissionContext, onAddDirectory],
-  )
+  );
 
   // Handle Esc to cancel (Ctrl+C handled by global keybindings)
   // Use Settings context so 'n' key doesn't cancel (allows typing 'n' in input)
-  useKeybinding('confirm:no', onCancel, { context: 'Settings' })
+  useKeybinding('confirm:no', onCancel, { context: 'Settings' });
 
   const handleKeyDown = useCallback(
     (e: KeyboardEvent) => {
       if (suggestions.length > 0) {
         // Tab: accept selected suggestion and continue (for drilling into subdirs)
         if (e.key === 'tab') {
-          e.preventDefault()
-          const suggestion = suggestions[selectedSuggestion]
+          e.preventDefault();
+          const suggestion = suggestions[selectedSuggestion];
           if (suggestion) {
-            applySuggestion(suggestion)
+            applySuggestion(suggestion);
           }
-          return
+          return;
         }
 
         // Enter: apply selected suggestion and submit
         if (e.key === 'return') {
-          e.preventDefault()
-          const suggestion = suggestions[selectedSuggestion]
+          e.preventDefault();
+          const suggestion = suggestions[selectedSuggestion];
           if (suggestion) {
-            void handleSubmit(suggestion.id + '/')
+            void handleSubmit(suggestion.id + '/');
           }
-          return
+          return;
         }
 
         if (e.key === 'up' || (e.ctrl && e.key === 'p')) {
-          e.preventDefault()
-          setSelectedSuggestion(prev =>
-            prev <= 0 ? suggestions.length - 1 : prev - 1,
-          )
-          return
+          e.preventDefault();
+          setSelectedSuggestion(prev => (prev <= 0 ? suggestions.length - 1 : prev - 1));
+          return;
         }
 
         if (e.key === 'down' || (e.ctrl && e.key === 'n')) {
-          e.preventDefault()
-          setSelectedSuggestion(prev =>
-            prev >= suggestions.length - 1 ? 0 : prev + 1,
-          )
-          return
+          e.preventDefault();
+          setSelectedSuggestion(prev => (prev >= suggestions.length - 1 ? 0 : prev + 1));
+          return;
         }
       }
     },
     [suggestions, selectedSuggestion, applySuggestion, handleSubmit],
-  )
+  );
 
   const handleSelect = useCallback(
     (value: string) => {
-      if (!directoryPath) return
+      if (!directoryPath) return;
 
-      const selectionValue = value as RememberDirectoryOption
+      const selectionValue = value as RememberDirectoryOption;
 
       switch (selectionValue) {
         case 'yes-session':
-          onAddDirectory(directoryPath, false)
-          break
+          onAddDirectory(directoryPath, false);
+          break;
         case 'yes-remember':
-          onAddDirectory(directoryPath, true)
-          break
+          onAddDirectory(directoryPath, true);
+          break;
         case 'no':
-          onCancel()
-          break
+          onCancel();
+          break;
       }
     },
     [directoryPath, onAddDirectory, onCancel],
-  )
+  );
 
   return (
-    <Box
-      flexDirection="column"
-      tabIndex={0}
-      autoFocus
-      onKeyDown={handleKeyDown}
-    >
+    <Box flexDirection="column" tabIndex={0} autoFocus onKeyDown={handleKeyDown}>
       <Dialog
         title="Add directory to workspace"
         onCancel={onCancel}
@@ -264,11 +242,7 @@ export function AddWorkspaceDirectory({
         {directoryPath ? (
           <Box flexDirection="column" gap={1}>
             <DirectoryDisplay path={directoryPath} />
-            <Select
-              options={options}
-              onChange={handleSelect}
-              onCancel={() => handleSelect('no')}
-            />
+            <Select options={options} onChange={handleSelect} onCancel={() => handleSelect('no')} />
           </Box>
         ) : (
           <Box flexDirection="column" gap={1} marginX={2}>
@@ -285,5 +259,5 @@ export function AddWorkspaceDirectory({
         )}
       </Dialog>
     </Box>
-  )
+  );
 }
diff --git a/src/components/permissions/rules/PermissionRuleDescription.tsx b/src/components/permissions/rules/PermissionRuleDescription.tsx
index 597fc4b09..217b25c09 100644
--- a/src/components/permissions/rules/PermissionRuleDescription.tsx
+++ b/src/components/permissions/rules/PermissionRuleDescription.tsx
@@ -1,34 +1,31 @@
-import * as React from 'react'
-import { Text } from '@anthropic/ink'
-import { BashTool } from '@claude-code-best/builtin-tools/tools/BashTool/BashTool.js'
-import type { PermissionRuleValue } from '../../../utils/permissions/PermissionRule.js'
+import * as React from 'react';
+import { Text } from '@anthropic/ink';
+import { BashTool } from '@claude-code-best/builtin-tools/tools/BashTool/BashTool.js';
+import type { PermissionRuleValue } from '../../../utils/permissions/PermissionRule.js';
 
 type RuleSubtitleProps = {
-  ruleValue: PermissionRuleValue
-}
+  ruleValue: PermissionRuleValue;
+};
 
-export function PermissionRuleDescription({
-  ruleValue,
-}: RuleSubtitleProps): React.ReactNode {
+export function PermissionRuleDescription({ ruleValue }: RuleSubtitleProps): React.ReactNode {
   switch (ruleValue.toolName) {
     case BashTool.name: {
       if (ruleValue.ruleContent) {
         if (ruleValue.ruleContent.endsWith(':*')) {
           return (
             <Text dimColor>
-              Any Bash command starting with{' '}
-              <Text bold>{ruleValue.ruleContent.slice(0, -2)}</Text>
+              Any Bash command starting with <Text bold>{ruleValue.ruleContent.slice(0, -2)}</Text>
             </Text>
-          )
+          );
         } else {
           return (
             <Text dimColor>
               The Bash command <Text bold>{ruleValue.ruleContent}</Text>
             </Text>
-          )
+          );
         }
       } else {
-        return <Text dimColor>Any Bash command</Text>
+        return <Text dimColor>Any Bash command</Text>;
       }
     }
     default: {
@@ -37,9 +34,9 @@ export function PermissionRuleDescription({
           <Text dimColor>
             Any use of the <Text bold>{ruleValue.toolName}</Text> tool
           </Text>
-        )
+        );
       } else {
-        return null
+        return null;
       }
     }
   }
diff --git a/src/components/permissions/rules/PermissionRuleInput.tsx b/src/components/permissions/rules/PermissionRuleInput.tsx
index 599263197..3b128090d 100644
--- a/src/components/permissions/rules/PermissionRuleInput.tsx
+++ b/src/components/permissions/rules/PermissionRuleInput.tsx
@@ -1,78 +1,57 @@
-import figures from 'figures'
-import * as React from 'react'
-import { useState } from 'react'
-import TextInput from '../../../components/TextInput.js'
-import { useExitOnCtrlCDWithKeybindings } from '../../../hooks/useExitOnCtrlCDWithKeybindings.js'
-import { useTerminalSize } from '../../../hooks/useTerminalSize.js'
-import { Box, Newline, Text } from '@anthropic/ink'
-import { useKeybinding } from '../../../keybindings/useKeybinding.js'
-import { BashTool } from '@claude-code-best/builtin-tools/tools/BashTool/BashTool.js'
-import { WebFetchTool } from '@claude-code-best/builtin-tools/tools/WebFetchTool/WebFetchTool.js'
-import type {
-  PermissionBehavior,
-  PermissionRuleValue,
-} from '../../../utils/permissions/PermissionRule.js'
+import figures from 'figures';
+import * as React from 'react';
+import { useState } from 'react';
+import TextInput from '../../../components/TextInput.js';
+import { useExitOnCtrlCDWithKeybindings } from '../../../hooks/useExitOnCtrlCDWithKeybindings.js';
+import { useTerminalSize } from '../../../hooks/useTerminalSize.js';
+import { Box, Newline, Text } from '@anthropic/ink';
+import { useKeybinding } from '../../../keybindings/useKeybinding.js';
+import { BashTool } from '@claude-code-best/builtin-tools/tools/BashTool/BashTool.js';
+import { WebFetchTool } from '@claude-code-best/builtin-tools/tools/WebFetchTool/WebFetchTool.js';
+import type { PermissionBehavior, PermissionRuleValue } from '../../../utils/permissions/PermissionRule.js';
 import {
   permissionRuleValueFromString,
   permissionRuleValueToString,
-} from '../../../utils/permissions/permissionRuleParser.js'
+} from '../../../utils/permissions/permissionRuleParser.js';
 
 export type PermissionRuleInputProps = {
-  onCancel: () => void
-  onSubmit: (
-    ruleValue: PermissionRuleValue,
-    ruleBehavior: PermissionBehavior,
-  ) => void
-  ruleBehavior: PermissionBehavior
-}
+  onCancel: () => void;
+  onSubmit: (ruleValue: PermissionRuleValue, ruleBehavior: PermissionBehavior) => void;
+  ruleBehavior: PermissionBehavior;
+};
 
-export function PermissionRuleInput({
-  onCancel,
-  onSubmit,
-  ruleBehavior,
-}: PermissionRuleInputProps): React.ReactNode {
-  const [inputValue, setInputValue] = useState('')
-  const [cursorOffset, setCursorOffset] = useState(0)
-  const exitState = useExitOnCtrlCDWithKeybindings()
+export function PermissionRuleInput({ onCancel, onSubmit, ruleBehavior }: PermissionRuleInputProps): React.ReactNode {
+  const [inputValue, setInputValue] = useState('');
+  const [cursorOffset, setCursorOffset] = useState(0);
+  const exitState = useExitOnCtrlCDWithKeybindings();
 
   // Use configurable keybinding for ESC to cancel
   // Use Settings context so 'n' key doesn't cancel (allows typing 'n' in input)
-  useKeybinding('confirm:no', onCancel, { context: 'Settings' })
+  useKeybinding('confirm:no', onCancel, { context: 'Settings' });
 
-  const { columns } = useTerminalSize()
-  const textInputColumns = columns - 6
+  const { columns } = useTerminalSize();
+  const textInputColumns = columns - 6;
 
   const handleSubmit = (value: string) => {
-    const trimmedValue = value.trim()
+    const trimmedValue = value.trim();
     if (trimmedValue.length === 0) {
-      return
+      return;
     }
-    const ruleValue = permissionRuleValueFromString(trimmedValue)
-    onSubmit(ruleValue, ruleBehavior)
-  }
+    const ruleValue = permissionRuleValueFromString(trimmedValue);
+    onSubmit(ruleValue, ruleBehavior);
+  };
 
   return (
     <>
-      <Box
-        flexDirection="column"
-        gap={1}
-        borderStyle="round"
-        paddingLeft={1}
-        paddingRight={1}
-        borderColor="permission"
-      >
+      <Box flexDirection="column" gap={1} borderStyle="round" paddingLeft={1} paddingRight={1} borderColor="permission">
         <Text bold color="permission">
           Add {ruleBehavior} permission rule
         </Text>
         <Box flexDirection="column">
           <Text>
-            Permission rules are a tool name, optionally followed by a specifier
-            in parentheses.
+            Permission rules are a tool name, optionally followed by a specifier in parentheses.
             <Newline />
-            e.g.,{' '}
-            <Text bold>
-              {permissionRuleValueToString({ toolName: WebFetchTool.name })}
-            </Text>
+            e.g., <Text bold>{permissionRuleValueToString({ toolName: WebFetchTool.name })}</Text>
             <Text bold={false}> or </Text>
             <Text bold>
               {permissionRuleValueToString({
@@ -103,5 +82,5 @@ export function PermissionRuleInput({
         )}
       </Box>
     </>
-  )
+  );
 }
diff --git a/src/components/permissions/rules/PermissionRuleList.tsx b/src/components/permissions/rules/PermissionRuleList.tsx
index a35f31115..d02d9c601 100644
--- a/src/components/permissions/rules/PermissionRuleList.tsx
+++ b/src/components/permissions/rules/PermissionRuleList.tsx
@@ -1,71 +1,61 @@
-import chalk from 'chalk'
-import figures from 'figures'
-import * as React from 'react'
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { useAppState, useSetAppState } from 'src/state/AppState.js'
-import {
-  applyPermissionUpdate,
-  persistPermissionUpdate,
-} from 'src/utils/permissions/PermissionUpdate.js'
-import type { PermissionUpdateDestination } from 'src/utils/permissions/PermissionUpdateSchema.js'
-import type { CommandResultDisplay } from '../../../commands.js'
-import { Select } from '../../../components/CustomSelect/select.js'
-import { useExitOnCtrlCDWithKeybindings } from '../../../hooks/useExitOnCtrlCDWithKeybindings.js'
-import { useSearchInput } from '../../../hooks/useSearchInput.js'
-import { type KeyboardEvent, Box, Text, useTerminalFocus } from '@anthropic/ink'
-import { useKeybinding } from '../../../keybindings/useKeybinding.js'
-import {
-  type AutoModeDenial,
-  getAutoModeDenials,
-} from '../../../utils/autoModeDenials.js'
+import chalk from 'chalk';
+import figures from 'figures';
+import * as React from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useAppState, useSetAppState } from 'src/state/AppState.js';
+import { applyPermissionUpdate, persistPermissionUpdate } from 'src/utils/permissions/PermissionUpdate.js';
+import type { PermissionUpdateDestination } from 'src/utils/permissions/PermissionUpdateSchema.js';
+import type { CommandResultDisplay } from '../../../commands.js';
+import { Select } from '../../../components/CustomSelect/select.js';
+import { useExitOnCtrlCDWithKeybindings } from '../../../hooks/useExitOnCtrlCDWithKeybindings.js';
+import { useSearchInput } from '../../../hooks/useSearchInput.js';
+import { type KeyboardEvent, Box, Text, useTerminalFocus } from '@anthropic/ink';
+import { useKeybinding } from '../../../keybindings/useKeybinding.js';
+import { type AutoModeDenial, getAutoModeDenials } from '../../../utils/autoModeDenials.js';
 import type {
   PermissionBehavior,
   PermissionRule,
   PermissionRuleValue,
-} from '../../../utils/permissions/PermissionRule.js'
-import { permissionRuleValueToString } from '../../../utils/permissions/permissionRuleParser.js'
+} from '../../../utils/permissions/PermissionRule.js';
+import { permissionRuleValueToString } from '../../../utils/permissions/permissionRuleParser.js';
 import {
   deletePermissionRule,
   getAllowRules,
   getAskRules,
   getDenyRules,
   permissionRuleSourceDisplayString,
-} from '../../../utils/permissions/permissions.js'
-import type { UnreachableRule } from '../../../utils/permissions/shadowedRuleDetection.js'
-import { jsonStringify } from '../../../utils/slowOperations.js'
-import { Pane, Tab, Tabs, useTabHeaderFocus, useTabsWidth } from '@anthropic/ink'
-import { SearchBox } from '../../SearchBox.js'
-import type { Option } from '../../ui/option.js'
-import { AddPermissionRules } from './AddPermissionRules.js'
-import { AddWorkspaceDirectory } from './AddWorkspaceDirectory.js'
-import { PermissionRuleDescription } from './PermissionRuleDescription.js'
-import { PermissionRuleInput } from './PermissionRuleInput.js'
-import { RecentDenialsTab } from './RecentDenialsTab.js'
-import { RemoveWorkspaceDirectory } from './RemoveWorkspaceDirectory.js'
-import { WorkspaceTab } from './WorkspaceTab.js'
+} from '../../../utils/permissions/permissions.js';
+import type { UnreachableRule } from '../../../utils/permissions/shadowedRuleDetection.js';
+import { jsonStringify } from '../../../utils/slowOperations.js';
+import { Pane, Tab, Tabs, useTabHeaderFocus, useTabsWidth } from '@anthropic/ink';
+import { SearchBox } from '../../SearchBox.js';
+import type { Option } from '../../ui/option.js';
+import { AddPermissionRules } from './AddPermissionRules.js';
+import { AddWorkspaceDirectory } from './AddWorkspaceDirectory.js';
+import { PermissionRuleDescription } from './PermissionRuleDescription.js';
+import { PermissionRuleInput } from './PermissionRuleInput.js';
+import { RecentDenialsTab } from './RecentDenialsTab.js';
+import { RemoveWorkspaceDirectory } from './RemoveWorkspaceDirectory.js';
+import { WorkspaceTab } from './WorkspaceTab.js';
 
-type TabType = 'recent' | 'allow' | 'ask' | 'deny' | 'workspace'
+type TabType = 'recent' | 'allow' | 'ask' | 'deny' | 'workspace';
 
 type RuleSourceTextProps = {
-  rule: PermissionRule
-}
+  rule: PermissionRule;
+};
 function RuleSourceText({ rule }: RuleSourceTextProps): React.ReactNode {
-  return (
-    <Text
-      dimColor
-    >{`From ${permissionRuleSourceDisplayString(rule.source)}`}</Text>
-  )
+  return <Text dimColor>{`From ${permissionRuleSourceDisplayString(rule.source)}`}</Text>;
 }
 
 // Helper function to get the appropriate label for rule behavior
 function getRuleBehaviorLabel(ruleBehavior: PermissionBehavior): string {
   switch (ruleBehavior) {
     case 'allow':
-      return 'allowed'
+      return 'allowed';
     case 'deny':
-      return 'denied'
+      return 'denied';
     case 'ask':
-      return 'ask'
+      return 'ask';
   }
 }
 
@@ -75,13 +65,13 @@ function RuleDetails({
   onDelete,
   onCancel,
 }: {
-  rule: PermissionRule
-  onDelete: () => void
-  onCancel: () => void
+  rule: PermissionRule;
+  onDelete: () => void;
+  onCancel: () => void;
 }): React.ReactNode {
-  const exitState = useExitOnCtrlCDWithKeybindings()
+  const exitState = useExitOnCtrlCDWithKeybindings();
   // Use configurable keybinding for ESC to cancel
-  useKeybinding('confirm:no', onCancel, { context: 'Confirmation' })
+  useKeybinding('confirm:no', onCancel, { context: 'Confirmation' });
 
   const ruleDescription = (
     <Box flexDirection="column" marginX={2}>
@@ -89,7 +79,7 @@ function RuleDetails({
       <PermissionRuleDescription ruleValue={rule.ruleValue} />
       <RuleSourceText rule={rule} />
     </Box>
-  )
+  );
 
   const footer = (
     <Box marginLeft={3}>
@@ -99,7 +89,7 @@ function RuleDetails({
         <Text dimColor>Esc to cancel</Text>
       )}
     </Box>
-  )
+  );
 
   // Managed settings can't be edited
   if (rule.source === 'policySettings') {
@@ -125,19 +115,12 @@ function RuleDetails({
         </Box>
         {footer}
       </>
-    )
+    );
   }
 
   return (
     <>
-      <Box
-        flexDirection="column"
-        gap={1}
-        borderStyle="round"
-        paddingLeft={1}
-        paddingRight={1}
-        borderColor="error"
-      >
+      <Box flexDirection="column" gap={1} borderStyle="round" paddingLeft={1} paddingRight={1} borderColor="error">
         <Text bold color="error">
           Delete {getRuleBehaviorLabel(rule.ruleBehavior)} tool?
         </Text>
@@ -154,20 +137,20 @@ function RuleDetails({
       </Box>
       {footer}
     </>
-  )
+  );
 }
 
 type RulesTabContentProps = {
-  options: Option[]
-  searchQuery: string
-  isSearchMode: boolean
-  isFocused: boolean
-  onSelect: (value: string) => void
-  onCancel: () => void
-  lastFocusedRuleKey: string | undefined
-  cursorOffset?: number
-  onHeaderFocusChange?: (focused: boolean) => void
-}
+  options: Option[];
+  searchQuery: string;
+  isSearchMode: boolean;
+  isFocused: boolean;
+  onSelect: (value: string) => void;
+  onCancel: () => void;
+  lastFocusedRuleKey: string | undefined;
+  cursorOffset?: number;
+  onHeaderFocusChange?: (focused: boolean) => void;
+};
 
 // Component for rendering rules tab content with full width support
 function RulesTabContent(props: RulesTabContentProps): React.ReactNode {
@@ -181,15 +164,15 @@ function RulesTabContent(props: RulesTabContentProps): React.ReactNode {
     lastFocusedRuleKey,
     cursorOffset,
     onHeaderFocusChange,
-  } = props
-  const tabWidth = useTabsWidth()
-  const { headerFocused, focusHeader, blurHeader } = useTabHeaderFocus()
+  } = props;
+  const tabWidth = useTabsWidth();
+  const { headerFocused, focusHeader, blurHeader } = useTabHeaderFocus();
   useEffect(() => {
-    if (isSearchMode && headerFocused) blurHeader()
-  }, [isSearchMode, headerFocused, blurHeader])
+    if (isSearchMode && headerFocused) blurHeader();
+  }, [isSearchMode, headerFocused, blurHeader]);
   useEffect(() => {
-    onHeaderFocusChange?.(headerFocused)
-  }, [headerFocused, onHeaderFocusChange])
+    onHeaderFocusChange?.(headerFocused);
+  }, [headerFocused, onHeaderFocusChange]);
   return (
     <Box flexDirection="column">
       <Box marginBottom={1} flexDirection="column">
@@ -211,7 +194,7 @@ function RulesTabContent(props: RulesTabContentProps): React.ReactNode {
         onUpFromFirstItem={focusHeader}
       />
     </Box>
-  )
+  );
 }
 
 // Composes the subtitle + search + Select for a single allow/ask/deny tab.
@@ -221,9 +204,9 @@ function PermissionRulesTab({
   handleToolSelect,
   ...rulesProps
 }: {
-  tab: 'allow' | 'ask' | 'deny'
-  getRulesOptions: (tab: TabType, query?: string) => { options: Option[] }
-  handleToolSelect: (value: string, tab: TabType) => void
+  tab: 'allow' | 'ask' | 'deny';
+  getRulesOptions: (tab: TabType, query?: string) => { options: Option[] };
+  handleToolSelect: (value: string, tab: TabType) => void;
 } & Omit<RulesTabContentProps, 'options' | 'onSelect'>): React.ReactNode {
   return (
     <Box flexDirection="column" flexShrink={tab === 'allow' ? 0 : undefined}>
@@ -242,166 +225,146 @@ function PermissionRulesTab({
         {...rulesProps}
       />
     </Box>
-  )
+  );
 }
 
 type Props = {
   onExit: (
     result?: string,
     options?: {
-      display?: CommandResultDisplay
-      shouldQuery?: boolean
-      metaMessages?: string[]
+      display?: CommandResultDisplay;
+      shouldQuery?: boolean;
+      metaMessages?: string[];
     },
-  ) => void
-  initialTab?: TabType
-  onRetryDenials?: (commands: string[]) => void
-}
+  ) => void;
+  initialTab?: TabType;
+  onRetryDenials?: (commands: string[]) => void;
+};
 
-export function PermissionRuleList({
-  onExit,
-  initialTab,
-  onRetryDenials,
-}: Props): React.ReactNode {
-  const hasDenials = getAutoModeDenials().length > 0
-  const defaultTab: TabType = initialTab ?? (hasDenials ? 'recent' : 'allow')
-  const [changes, setChanges] = useState<string[]>([])
-  const toolPermissionContext = useAppState(s => s.toolPermissionContext)
-  const setAppState = useSetAppState()
-  const isTerminalFocused = useTerminalFocus()
+export function PermissionRuleList({ onExit, initialTab, onRetryDenials }: Props): React.ReactNode {
+  const hasDenials = getAutoModeDenials().length > 0;
+  const defaultTab: TabType = initialTab ?? (hasDenials ? 'recent' : 'allow');
+  const [changes, setChanges] = useState<string[]>([]);
+  const toolPermissionContext = useAppState(s => s.toolPermissionContext);
+  const setAppState = useSetAppState();
+  const isTerminalFocused = useTerminalFocus();
 
   // Ref not state: RecentDenialsTab updates don't need to trigger parent
   // re-render (only read on exit), and re-renders trip the modal ScrollBox
   // collapse bug from #23592 in fullscreen.
   const denialStateRef = useRef<{
-    approved: Set<number>
-    retry: Set<number>
-    denials: readonly AutoModeDenial[]
-  }>({ approved: new Set(), retry: new Set(), denials: [] })
-  const handleDenialStateChange = useCallback(
-    (s: typeof denialStateRef.current) => {
-      denialStateRef.current = s
-    },
-    [],
-  )
+    approved: Set<number>;
+    retry: Set<number>;
+    denials: readonly AutoModeDenial[];
+  }>({ approved: new Set(), retry: new Set(), denials: [] });
+  const handleDenialStateChange = useCallback((s: typeof denialStateRef.current) => {
+    denialStateRef.current = s;
+  }, []);
 
-  const [selectedRule, setSelectedRule] = useState<PermissionRule | undefined>()
+  const [selectedRule, setSelectedRule] = useState<PermissionRule | undefined>();
   // Track the key of the last focused rule to restore position after deletion
-  const [lastFocusedRuleKey, setLastFocusedRuleKey] = useState<
-    string | undefined
-  >()
-  const [addingRuleToTab, setAddingRuleToTab] = useState<TabType | null>(null)
+  const [lastFocusedRuleKey, setLastFocusedRuleKey] = useState<string | undefined>();
+  const [addingRuleToTab, setAddingRuleToTab] = useState<TabType | null>(null);
   const [validatedRule, setValidatedRule] = useState<{
-    ruleBehavior: PermissionBehavior
-    ruleValue: PermissionRuleValue
-  } | null>(null)
-  const [isAddingWorkspaceDirectory, setIsAddingWorkspaceDirectory] =
-    useState(false)
-  const [removingDirectory, setRemovingDirectory] = useState<string | null>(
-    null,
-  )
-  const [isSearchMode, setIsSearchMode] = useState(false)
-  const [headerFocused, setHeaderFocused] = useState(true)
+    ruleBehavior: PermissionBehavior;
+    ruleValue: PermissionRuleValue;
+  } | null>(null);
+  const [isAddingWorkspaceDirectory, setIsAddingWorkspaceDirectory] = useState(false);
+  const [removingDirectory, setRemovingDirectory] = useState<string | null>(null);
+  const [isSearchMode, setIsSearchMode] = useState(false);
+  const [headerFocused, setHeaderFocused] = useState(true);
   const handleHeaderFocusChange = useCallback((focused: boolean) => {
-    setHeaderFocused(focused)
-  }, [])
+    setHeaderFocused(focused);
+  }, []);
 
   const allowRulesByKey = useMemo(() => {
-    const map = new Map<string, PermissionRule>()
+    const map = new Map<string, PermissionRule>();
     getAllowRules(toolPermissionContext).forEach(rule => {
-      map.set(jsonStringify(rule), rule)
-    })
-    return map
-  }, [toolPermissionContext])
+      map.set(jsonStringify(rule), rule);
+    });
+    return map;
+  }, [toolPermissionContext]);
 
   const denyRulesByKey = useMemo(() => {
-    const map = new Map<string, PermissionRule>()
+    const map = new Map<string, PermissionRule>();
     getDenyRules(toolPermissionContext).forEach(rule => {
-      map.set(jsonStringify(rule), rule)
-    })
-    return map
-  }, [toolPermissionContext])
+      map.set(jsonStringify(rule), rule);
+    });
+    return map;
+  }, [toolPermissionContext]);
 
   const askRulesByKey = useMemo(() => {
-    const map = new Map<string, PermissionRule>()
+    const map = new Map<string, PermissionRule>();
     getAskRules(toolPermissionContext).forEach(rule => {
-      map.set(jsonStringify(rule), rule)
-    })
-    return map
-  }, [toolPermissionContext])
+      map.set(jsonStringify(rule), rule);
+    });
+    return map;
+  }, [toolPermissionContext]);
 
   const getRulesOptions = useCallback(
     (tab: TabType, query: string = '') => {
       const rulesByKey = (() => {
         switch (tab) {
           case 'allow':
-            return allowRulesByKey
+            return allowRulesByKey;
           case 'deny':
-            return denyRulesByKey
+            return denyRulesByKey;
           case 'ask':
-            return askRulesByKey
+            return askRulesByKey;
           case 'workspace':
           case 'recent':
-            return new Map<string, PermissionRule>()
+            return new Map<string, PermissionRule>();
         }
-      })()
+      })();
 
-      const options: Option[] = []
+      const options: Option[] = [];
 
       // Only show "Add a new rule" for allow and deny tabs (and not when searching)
       if (tab !== 'workspace' && tab !== 'recent' && !query) {
         options.push({
           label: `Add a new rule${figures.ellipsis}`,
           value: 'add-new-rule',
-        })
+        });
       }
 
       // Get all rule keys and sort them alphabetically based on rule's formatted value
       const sortedRuleKeys = Array.from(rulesByKey.keys()).sort((a, b) => {
-        const ruleA = rulesByKey.get(a)
-        const ruleB = rulesByKey.get(b)
+        const ruleA = rulesByKey.get(a);
+        const ruleB = rulesByKey.get(b);
         if (ruleA && ruleB) {
-          const ruleAString = permissionRuleValueToString(
-            ruleA.ruleValue,
-          ).toLowerCase()
-          const ruleBString = permissionRuleValueToString(
-            ruleB.ruleValue,
-          ).toLowerCase()
-          return ruleAString.localeCompare(ruleBString)
+          const ruleAString = permissionRuleValueToString(ruleA.ruleValue).toLowerCase();
+          const ruleBString = permissionRuleValueToString(ruleB.ruleValue).toLowerCase();
+          return ruleAString.localeCompare(ruleBString);
         }
-        return 0
-      })
+        return 0;
+      });
 
       // Build options from sorted keys, filtering by search query
-      const lowerQuery = query.toLowerCase()
+      const lowerQuery = query.toLowerCase();
       for (const ruleKey of sortedRuleKeys) {
-        const rule = rulesByKey.get(ruleKey)
+        const rule = rulesByKey.get(ruleKey);
         if (rule) {
-          const ruleString = permissionRuleValueToString(rule.ruleValue)
+          const ruleString = permissionRuleValueToString(rule.ruleValue);
           // Filter by search query if provided
           if (query && !ruleString.toLowerCase().includes(lowerQuery)) {
-            continue
+            continue;
           }
           options.push({
             label: ruleString,
             value: ruleKey,
-          })
+          });
         }
       }
 
-      return { options, rulesByKey }
+      return { options, rulesByKey };
     },
     [allowRulesByKey, denyRulesByKey, askRulesByKey],
-  )
+  );
 
-  const exitState = useExitOnCtrlCDWithKeybindings()
+  const exitState = useExitOnCtrlCDWithKeybindings();
 
   const isSearchModeActive =
-    !selectedRule &&
-    !addingRuleToTab &&
-    !validatedRule &&
-    !isAddingWorkspaceDirectory &&
-    !removingDirectory
+    !selectedRule && !addingRuleToTab && !validatedRule && !isAddingWorkspaceDirectory && !removingDirectory;
 
   const {
     query: searchQuery,
@@ -410,25 +373,25 @@ export function PermissionRuleList({
   } = useSearchInput({
     isActive: isSearchModeActive && isSearchMode,
     onExit: () => {
-      setIsSearchMode(false)
+      setIsSearchMode(false);
     },
-  })
+  });
 
   // Handle entering search mode
   const handleKeyDown = useCallback(
     (e: KeyboardEvent) => {
-      if (!isSearchModeActive) return
-      if (isSearchMode) return
-      if (e.ctrl || e.meta) return
+      if (!isSearchModeActive) return;
+      if (isSearchMode) return;
+      if (e.ctrl || e.meta) return;
 
       // Enter search mode with '/' or any printable character.
       // e.key.length === 1 filters out special keys (down, return, escape,
       // etc.) — previously the raw escape sequence leaked through and
       // triggered search mode with garbage on arrow-key press.
       if (e.key === '/') {
-        e.preventDefault()
-        setIsSearchMode(true)
-        setSearchQuery('')
+        e.preventDefault();
+        setIsSearchMode(true);
+        setSearchQuery('');
       } else if (
         e.key.length === 1 &&
         // Don't enter search mode for vim-nav / space / retry key
@@ -439,115 +402,97 @@ export function PermissionRuleList({
         e.key !== 'r' &&
         e.key !== ' '
       ) {
-        e.preventDefault()
-        setIsSearchMode(true)
-        setSearchQuery(e.key)
+        e.preventDefault();
+        setIsSearchMode(true);
+        setSearchQuery(e.key);
       }
     },
     [isSearchModeActive, isSearchMode, setSearchQuery],
-  )
+  );
 
   const handleToolSelect = useCallback(
     (selectedValue: string, tab: TabType) => {
-      const { rulesByKey } = getRulesOptions(tab)
+      const { rulesByKey } = getRulesOptions(tab);
       if (selectedValue === 'add-new-rule') {
-        setAddingRuleToTab(tab)
-        return
+        setAddingRuleToTab(tab);
+        return;
       } else {
-        setSelectedRule(rulesByKey.get(selectedValue))
-        return
+        setSelectedRule(rulesByKey.get(selectedValue));
+        return;
       }
     },
     [getRulesOptions],
-  )
+  );
 
   const handleRuleInputCancel = useCallback(() => {
-    setAddingRuleToTab(null)
-  }, [])
+    setAddingRuleToTab(null);
+  }, []);
 
-  const handleRuleInputSubmit = useCallback(
-    (ruleValue: PermissionRuleValue, ruleBehavior: PermissionBehavior) => {
-      setValidatedRule({ ruleValue, ruleBehavior })
-      setAddingRuleToTab(null)
-    },
-    [],
-  )
+  const handleRuleInputSubmit = useCallback((ruleValue: PermissionRuleValue, ruleBehavior: PermissionBehavior) => {
+    setValidatedRule({ ruleValue, ruleBehavior });
+    setAddingRuleToTab(null);
+  }, []);
 
-  const handleAddRulesSuccess = useCallback(
-    (rules: PermissionRule[], unreachable?: UnreachableRule[]) => {
-      setValidatedRule(null)
-      for (const rule of rules) {
+  const handleAddRulesSuccess = useCallback((rules: PermissionRule[], unreachable?: UnreachableRule[]) => {
+    setValidatedRule(null);
+    for (const rule of rules) {
+      setChanges(prev => [
+        ...prev,
+        `Added ${rule.ruleBehavior} rule ${chalk.bold(permissionRuleValueToString(rule.ruleValue))}`,
+      ]);
+    }
+
+    // Show warnings for any unreachable rules we just added
+    if (unreachable && unreachable.length > 0) {
+      for (const u of unreachable) {
+        const severity = u.shadowType === 'deny' ? 'blocked' : 'shadowed';
         setChanges(prev => [
           ...prev,
-          `Added ${rule.ruleBehavior} rule ${chalk.bold(permissionRuleValueToString(rule.ruleValue))}`,
-        ])
+          chalk.yellow(`${figures.warning} Warning: ${permissionRuleValueToString(u.rule.ruleValue)} is ${severity}`),
+          chalk.dim(`  ${u.reason}`),
+          chalk.dim(`  Fix: ${u.fix}`),
+        ]);
       }
-
-      // Show warnings for any unreachable rules we just added
-      if (unreachable && unreachable.length > 0) {
-        for (const u of unreachable) {
-          const severity = u.shadowType === 'deny' ? 'blocked' : 'shadowed'
-          setChanges(prev => [
-            ...prev,
-            chalk.yellow(
-              `${figures.warning} Warning: ${permissionRuleValueToString(u.rule.ruleValue)} is ${severity}`,
-            ),
-            chalk.dim(`  ${u.reason}`),
-            chalk.dim(`  Fix: ${u.fix}`),
-          ])
-        }
-      }
-    },
-    [],
-  )
+    }
+  }, []);
 
   const handleAddRuleCancel = useCallback(() => {
-    setValidatedRule(null)
-  }, [])
+    setValidatedRule(null);
+  }, []);
 
-  const handleRequestAddDirectory = useCallback(
-    () => setIsAddingWorkspaceDirectory(true),
-    [],
-  )
-  const handleRequestRemoveDirectory = useCallback(
-    (path: string) => setRemovingDirectory(path),
-    [],
-  )
+  const handleRequestAddDirectory = useCallback(() => setIsAddingWorkspaceDirectory(true), []);
+  const handleRequestRemoveDirectory = useCallback((path: string) => setRemovingDirectory(path), []);
   const handleRulesCancel = useCallback(() => {
-    const s = denialStateRef.current
+    const s = denialStateRef.current;
     const denialsFor = (set: Set<number>) =>
       Array.from(set)
         .map(idx => s.denials[idx])
-        .filter((d): d is AutoModeDenial => d !== undefined)
+        .filter((d): d is AutoModeDenial => d !== undefined);
 
-    const retryDenials = denialsFor(s.retry)
+    const retryDenials = denialsFor(s.retry);
     if (retryDenials.length > 0) {
-      const commands = retryDenials.map(d => d.display)
-      onRetryDenials?.(commands)
+      const commands = retryDenials.map(d => d.display);
+      onRetryDenials?.(commands);
       onExit(undefined, {
         shouldQuery: true,
         metaMessages: [
           `Permission granted for: ${commands.join(', ')}. You may now retry ${commands.length === 1 ? 'this command' : 'these commands'} if you would like.`,
         ],
-      })
-      return
+      });
+      return;
     }
 
-    const approvedDenials = denialsFor(s.approved)
+    const approvedDenials = denialsFor(s.approved);
     if (approvedDenials.length > 0 || changes.length > 0) {
       const approvedMsg =
-        approvedDenials.length > 0
-          ? [
-              `Approved ${approvedDenials.map(d => chalk.bold(d.display)).join(', ')}`,
-            ]
-          : []
-      onExit([...approvedMsg, ...changes].join('\n'))
+        approvedDenials.length > 0 ? [`Approved ${approvedDenials.map(d => chalk.bold(d.display)).join(', ')}`] : [];
+      onExit([...approvedMsg, ...changes].join('\n'));
     } else {
       onExit('Permissions dialog dismissed', {
         display: 'system',
-      })
+      });
     }
-  }, [changes, onExit, onRetryDenials])
+  }, [changes, onExit, onRetryDenials]);
 
   // Handle Escape at the top level so it works even when header is focused
   // (which disables the Select component and its select:cancel keybinding).
@@ -555,31 +500,29 @@ export function PermissionRuleList({
   useKeybinding('confirm:no', handleRulesCancel, {
     context: 'Settings',
     isActive: isSearchModeActive && !isSearchMode,
-  })
+  });
 
   const handleDeleteRule = () => {
-    if (!selectedRule) return
+    if (!selectedRule) return;
 
     // Find the adjacent rule to focus on after deletion
-    const { options } = getRulesOptions(selectedRule.ruleBehavior as TabType)
-    const selectedKey = jsonStringify(selectedRule)
-    const ruleKeys = options
-      .filter(opt => opt.value !== 'add-new-rule')
-      .map(opt => opt.value)
-    const currentIndex = ruleKeys.indexOf(selectedKey)
+    const { options } = getRulesOptions(selectedRule.ruleBehavior as TabType);
+    const selectedKey = jsonStringify(selectedRule);
+    const ruleKeys = options.filter(opt => opt.value !== 'add-new-rule').map(opt => opt.value);
+    const currentIndex = ruleKeys.indexOf(selectedKey);
 
     // Try to focus on the next rule, or the previous if deleting the last one
-    let nextFocusKey: string | undefined
+    let nextFocusKey: string | undefined;
     if (currentIndex !== -1) {
       if (currentIndex < ruleKeys.length - 1) {
         // Focus on the next rule
-        nextFocusKey = ruleKeys[currentIndex + 1]
+        nextFocusKey = ruleKeys[currentIndex + 1];
       } else if (currentIndex > 0) {
         // Focus on the previous rule (we're deleting the last one)
-        nextFocusKey = ruleKeys[currentIndex - 1]
+        nextFocusKey = ruleKeys[currentIndex - 1];
       }
     }
-    setLastFocusedRuleKey(nextFocusKey)
+    setLastFocusedRuleKey(nextFocusKey);
 
     void deletePermissionRule({
       rule: selectedRule,
@@ -588,39 +531,29 @@ export function PermissionRuleList({
         setAppState(prev => ({
           ...prev,
           toolPermissionContext,
-        }))
+        }));
       },
-    })
+    });
 
     setChanges(prev => [
       ...prev,
       `Deleted ${selectedRule.ruleBehavior} rule ${chalk.bold(permissionRuleValueToString(selectedRule.ruleValue))}`,
-    ])
-    setSelectedRule(undefined)
-  }
+    ]);
+    setSelectedRule(undefined);
+  };
 
   if (selectedRule) {
-    return (
-      <RuleDetails
-        rule={selectedRule}
-        onDelete={handleDeleteRule}
-        onCancel={() => setSelectedRule(undefined)}
-      />
-    )
+    return <RuleDetails rule={selectedRule} onDelete={handleDeleteRule} onCancel={() => setSelectedRule(undefined)} />;
   }
 
-  if (
-    addingRuleToTab &&
-    addingRuleToTab !== 'workspace' &&
-    addingRuleToTab !== 'recent'
-  ) {
+  if (addingRuleToTab && addingRuleToTab !== 'workspace' && addingRuleToTab !== 'recent') {
     return (
       <PermissionRuleInput
         onCancel={handleRuleInputCancel}
         onSubmit={handleRuleInputSubmit}
         ruleBehavior={addingRuleToTab}
       />
-    )
+    );
   }
 
   if (validatedRule) {
@@ -635,10 +568,10 @@ export function PermissionRuleList({
           setAppState(prev => ({
             ...prev,
             toolPermissionContext,
-          }))
+          }));
         }}
       />
-    )
+    );
   }
 
   if (isAddingWorkspaceDirectory) {
@@ -646,40 +579,35 @@ export function PermissionRuleList({
       <AddWorkspaceDirectory
         onAddDirectory={(path, remember) => {
           // Apply the permission update to add the directory
-          const destination: PermissionUpdateDestination = remember
-            ? 'localSettings'
-            : 'session'
+          const destination: PermissionUpdateDestination = remember ? 'localSettings' : 'session';
 
           const permissionUpdate = {
             type: 'addDirectories' as const,
             directories: [path],
             destination,
-          }
+          };
 
-          const updatedContext = applyPermissionUpdate(
-            toolPermissionContext,
-            permissionUpdate,
-          )
+          const updatedContext = applyPermissionUpdate(toolPermissionContext, permissionUpdate);
           setAppState(prev => ({
             ...prev,
             toolPermissionContext: updatedContext,
-          }))
+          }));
 
           // Persist if remember is true
           if (remember) {
-            persistPermissionUpdate(permissionUpdate)
+            persistPermissionUpdate(permissionUpdate);
           }
 
           setChanges(prev => [
             ...prev,
             `Added directory ${chalk.bold(path)} to workspace${remember ? ' and saved to local settings' : ' for this session'}`,
-          ])
-          setIsAddingWorkspaceDirectory(false)
+          ]);
+          setIsAddingWorkspaceDirectory(false);
         }}
         onCancel={() => setIsAddingWorkspaceDirectory(false)}
         permissionContext={toolPermissionContext}
       />
-    )
+    );
   }
 
   if (removingDirectory) {
@@ -687,11 +615,8 @@ export function PermissionRuleList({
       <RemoveWorkspaceDirectory
         directoryPath={removingDirectory}
         onRemove={() => {
-          setChanges(prev => [
-            ...prev,
-            `Removed directory ${chalk.bold(removingDirectory)} from workspace`,
-          ])
-          setRemovingDirectory(null)
+          setChanges(prev => [...prev, `Removed directory ${chalk.bold(removingDirectory)} from workspace`]);
+          setRemovingDirectory(null);
         }}
         onCancel={() => setRemovingDirectory(null)}
         permissionContext={toolPermissionContext}
@@ -699,10 +624,10 @@ export function PermissionRuleList({
           setAppState(prev => ({
             ...prev,
             toolPermissionContext,
-          }))
+          }));
         }}
       />
-    )
+    );
   }
 
   const sharedRulesProps = {
@@ -715,14 +640,10 @@ export function PermissionRuleList({
     getRulesOptions,
     handleToolSelect,
     onHeaderFocusChange: handleHeaderFocusChange,
-  }
+  };
 
   const isHidden =
-    !!selectedRule ||
-    !!addingRuleToTab ||
-    !!validatedRule ||
-    isAddingWorkspaceDirectory ||
-    !!removingDirectory
+    !!selectedRule || !!addingRuleToTab || !!validatedRule || isAddingWorkspaceDirectory || !!removingDirectory;
 
   return (
     <Box flexDirection="column" onKeyDown={handleKeyDown}>
@@ -736,10 +657,7 @@ export function PermissionRuleList({
           navFromContent={!isSearchMode}
         >
           <Tab id="recent" title="Recently denied">
-            <RecentDenialsTab
-              onHeaderFocusChange={handleHeaderFocusChange}
-              onStateChange={handleDenialStateChange}
-            />
+            <RecentDenialsTab onHeaderFocusChange={handleHeaderFocusChange} onStateChange={handleDenialStateChange} />
           </Tab>
           <Tab id="allow" title="Allow">
             <PermissionRulesTab tab="allow" {...sharedRulesProps} />
@@ -752,10 +670,7 @@ export function PermissionRuleList({
           </Tab>
           <Tab id="workspace" title="Workspace">
             <Box flexDirection="column">
-              <Text>
-                Claude Code can read files in the workspace, and make edits when
-                auto-accept edits is on.
-              </Text>
+              <Text>Claude Code can read files in the workspace, and make edits when auto-accept edits is on.</Text>
               <WorkspaceTab
                 onExit={onExit}
                 toolPermissionContext={toolPermissionContext}
@@ -775,18 +690,13 @@ export function PermissionRuleList({
             ) : isSearchMode ? (
               <>Type to filter · Enter/↓ select · ↑ tabs · Esc clear</>
             ) : hasDenials && defaultTab === 'recent' ? (
-              <>
-                Enter approve · r retry · ↑↓ navigate · ←/→ switch · Esc cancel
-              </>
+              <>Enter approve · r retry · ↑↓ navigate · ←/→ switch · Esc cancel</>
             ) : (
-              <>
-                ↑↓ navigate · Enter select · Type to search · ←/→ switch · Esc
-                cancel
-              </>
+              <>↑↓ navigate · Enter select · Type to search · ←/→ switch · Esc cancel</>
             )}
           </Text>
         </Box>
       </Pane>
     </Box>
-  )
+  );
 }
diff --git a/src/components/permissions/rules/RecentDenialsTab.tsx b/src/components/permissions/rules/RecentDenialsTab.tsx
index 3edab0fda..cb6631bd5 100644
--- a/src/components/permissions/rules/RecentDenialsTab.tsx
+++ b/src/components/permissions/rules/RecentDenialsTab.tsx
@@ -1,92 +1,77 @@
-import * as React from 'react'
-import { useCallback, useEffect, useState } from 'react'
+import * as React from 'react';
+import { useCallback, useEffect, useState } from 'react';
 // eslint-disable-next-line custom-rules/prefer-use-keybindings -- 'r' is a view-specific key, not a global keybinding
-import { Box, Text, useInput, useTabHeaderFocus } from '@anthropic/ink'
-import {
-  type AutoModeDenial,
-  getAutoModeDenials,
-} from '../../../utils/autoModeDenials.js'
-import { Select } from '../../CustomSelect/select.js'
-import { StatusIcon } from '@anthropic/ink'
+import { Box, Text, useInput, useTabHeaderFocus } from '@anthropic/ink';
+import { type AutoModeDenial, getAutoModeDenials } from '../../../utils/autoModeDenials.js';
+import { Select } from '../../CustomSelect/select.js';
+import { StatusIcon } from '@anthropic/ink';
 
 type Props = {
-  onHeaderFocusChange?: (focused: boolean) => void
+  onHeaderFocusChange?: (focused: boolean) => void;
   /** Called when approved/retry state changes so parent can act on exit */
-  onStateChange: (state: {
-    approved: Set<number>
-    retry: Set<number>
-    denials: readonly AutoModeDenial[]
-  }) => void
-}
+  onStateChange: (state: { approved: Set<number>; retry: Set<number>; denials: readonly AutoModeDenial[] }) => void;
+};
 
-export function RecentDenialsTab({
-  onHeaderFocusChange,
-  onStateChange,
-}: Props): React.ReactNode {
-  const { headerFocused, focusHeader } = useTabHeaderFocus()
+export function RecentDenialsTab({ onHeaderFocusChange, onStateChange }: Props): React.ReactNode {
+  const { headerFocused, focusHeader } = useTabHeaderFocus();
   useEffect(() => {
-    onHeaderFocusChange?.(headerFocused)
-  }, [headerFocused, onHeaderFocusChange])
+    onHeaderFocusChange?.(headerFocused);
+  }, [headerFocused, onHeaderFocusChange]);
 
   // Snapshot on mount — approved/retry Sets key by index, and the live store
   // prepends. A concurrent denial would shift all indices mid-edit.
-  const [denials] = useState(() => getAutoModeDenials())
+  const [denials] = useState(() => getAutoModeDenials());
 
-  const [approved, setApproved] = useState<Set<number>>(() => new Set())
-  const [retry, setRetry] = useState<Set<number>>(() => new Set())
-  const [focusedIdx, setFocusedIdx] = useState(0)
+  const [approved, setApproved] = useState<Set<number>>(() => new Set());
+  const [retry, setRetry] = useState<Set<number>>(() => new Set());
+  const [focusedIdx, setFocusedIdx] = useState(0);
 
   useEffect(() => {
-    onStateChange({ approved, retry, denials })
-  }, [approved, retry, denials, onStateChange])
+    onStateChange({ approved, retry, denials });
+  }, [approved, retry, denials, onStateChange]);
 
   const handleSelect = useCallback((value: string) => {
-    const idx = Number(value)
+    const idx = Number(value);
     setApproved(prev => {
-      const next = new Set(prev)
-      if (next.has(idx)) next.delete(idx)
-      else next.add(idx)
-      return next
-    })
-  }, [])
+      const next = new Set(prev);
+      if (next.has(idx)) next.delete(idx);
+      else next.add(idx);
+      return next;
+    });
+  }, []);
 
   const handleFocus = useCallback((value: string) => {
-    setFocusedIdx(Number(value))
-  }, [])
+    setFocusedIdx(Number(value));
+  }, []);
 
   useInput(
     (input, _key) => {
       if (input === 'r') {
         setRetry(prev => {
-          const next = new Set(prev)
-          if (next.has(focusedIdx)) next.delete(focusedIdx)
-          else next.add(focusedIdx)
-          return next
-        })
+          const next = new Set(prev);
+          if (next.has(focusedIdx)) next.delete(focusedIdx);
+          else next.add(focusedIdx);
+          return next;
+        });
         // Retry implies approve
         setApproved(prev => {
-          if (prev.has(focusedIdx)) return prev
-          const next = new Set(prev)
-          next.add(focusedIdx)
-          return next
-        })
+          if (prev.has(focusedIdx)) return prev;
+          const next = new Set(prev);
+          next.add(focusedIdx);
+          return next;
+        });
       }
     },
     { isActive: denials.length > 0 },
-  )
+  );
 
   if (denials.length === 0) {
-    return (
-      <Text dimColor>
-        No recent denials. Commands denied by the auto mode classifier will
-        appear here.
-      </Text>
-    )
+    return <Text dimColor>No recent denials. Commands denied by the auto mode classifier will appear here.</Text>;
   }
 
   const options = denials.map((d, idx) => {
-    const isApproved = approved.has(idx)
-    const suffix = retry.has(idx) ? ' (retry)' : ''
+    const isApproved = approved.has(idx);
+    const suffix = retry.has(idx) ? ' (retry)' : '';
     return {
       label: (
         <Text>
@@ -96,8 +81,8 @@ export function RecentDenialsTab({
         </Text>
       ),
       value: String(idx),
-    }
-  })
+    };
+  });
 
   return (
     <Box flexDirection="column">
@@ -113,5 +98,5 @@ export function RecentDenialsTab({
         />
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/components/permissions/rules/RemoveWorkspaceDirectory.tsx b/src/components/permissions/rules/RemoveWorkspaceDirectory.tsx
index 8d7e6fa99..bc84e8247 100644
--- a/src/components/permissions/rules/RemoveWorkspaceDirectory.tsx
+++ b/src/components/permissions/rules/RemoveWorkspaceDirectory.tsx
@@ -1,18 +1,18 @@
-import * as React from 'react'
-import { useCallback } from 'react'
-import { Select } from '../../../components/CustomSelect/select.js'
-import { Box, Text } from '@anthropic/ink'
-import type { ToolPermissionContext } from '../../../Tool.js'
-import { applyPermissionUpdate } from '../../../utils/permissions/PermissionUpdate.js'
-import { Dialog } from '@anthropic/ink'
+import * as React from 'react';
+import { useCallback } from 'react';
+import { Select } from '../../../components/CustomSelect/select.js';
+import { Box, Text } from '@anthropic/ink';
+import type { ToolPermissionContext } from '../../../Tool.js';
+import { applyPermissionUpdate } from '../../../utils/permissions/PermissionUpdate.js';
+import { Dialog } from '@anthropic/ink';
 
 type Props = {
-  directoryPath: string
-  onRemove: () => void
-  onCancel: () => void
-  permissionContext: ToolPermissionContext
-  setPermissionContext: (context: ToolPermissionContext) => void
-}
+  directoryPath: string;
+  onRemove: () => void;
+  onCancel: () => void;
+  permissionContext: ToolPermissionContext;
+  setPermissionContext: (context: ToolPermissionContext) => void;
+};
 
 export function RemoveWorkspaceDirectory({
   directoryPath,
@@ -26,35 +26,29 @@ export function RemoveWorkspaceDirectory({
       type: 'removeDirectories',
       directories: [directoryPath],
       destination: 'session',
-    })
+    });
 
-    setPermissionContext(updatedContext)
-    onRemove()
-  }, [directoryPath, permissionContext, setPermissionContext, onRemove])
+    setPermissionContext(updatedContext);
+    onRemove();
+  }, [directoryPath, permissionContext, setPermissionContext, onRemove]);
 
   const handleSelect = useCallback(
     (value: string) => {
       if (value === 'yes') {
-        handleRemove()
+        handleRemove();
       } else {
-        onCancel()
+        onCancel();
       }
     },
     [handleRemove, onCancel],
-  )
+  );
 
   return (
-    <Dialog
-      title="Remove directory from workspace?"
-      onCancel={onCancel}
-      color="error"
-    >
+    <Dialog title="Remove directory from workspace?" onCancel={onCancel} color="error">
       <Box marginX={2} flexDirection="column">
         <Text bold>{directoryPath}</Text>
       </Box>
-      <Text>
-        Claude Code will no longer have access to files in this directory.
-      </Text>
+      <Text>Claude Code will no longer have access to files in this directory.</Text>
       <Select
         onChange={handleSelect}
         onCancel={onCancel}
@@ -64,5 +58,5 @@ export function RemoveWorkspaceDirectory({
         ]}
       />
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/permissions/rules/WorkspaceTab.tsx b/src/components/permissions/rules/WorkspaceTab.tsx
index 6aa410686..799a1cd29 100644
--- a/src/components/permissions/rules/WorkspaceTab.tsx
+++ b/src/components/permissions/rules/WorkspaceTab.tsx
@@ -1,28 +1,25 @@
-import figures from 'figures'
-import * as React from 'react'
-import { useCallback, useEffect } from 'react'
-import { getOriginalCwd } from '../../../bootstrap/state.js'
-import type { CommandResultDisplay } from '../../../commands.js'
-import { Select } from '../../../components/CustomSelect/select.js'
-import { Box, Text, useTabHeaderFocus } from '@anthropic/ink'
-import type { ToolPermissionContext } from '../../../Tool.js'
+import figures from 'figures';
+import * as React from 'react';
+import { useCallback, useEffect } from 'react';
+import { getOriginalCwd } from '../../../bootstrap/state.js';
+import type { CommandResultDisplay } from '../../../commands.js';
+import { Select } from '../../../components/CustomSelect/select.js';
+import { Box, Text, useTabHeaderFocus } from '@anthropic/ink';
+import type { ToolPermissionContext } from '../../../Tool.js';
 
 type Props = {
-  onExit: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-  toolPermissionContext: ToolPermissionContext
-  onRequestAddDirectory: () => void
-  onRequestRemoveDirectory: (path: string) => void
-  onHeaderFocusChange?: (focused: boolean) => void
-}
+  onExit: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+  toolPermissionContext: ToolPermissionContext;
+  onRequestAddDirectory: () => void;
+  onRequestRemoveDirectory: (path: string) => void;
+  onHeaderFocusChange?: (focused: boolean) => void;
+};
 
 type DirectoryItem = {
-  path: string
-  isCurrent: boolean
-  isDeletable: boolean
-}
+  path: string;
+  isCurrent: boolean;
+  isDeletable: boolean;
+};
 
 export function WorkspaceTab({
   onExit,
@@ -31,57 +28,50 @@ export function WorkspaceTab({
   onRequestRemoveDirectory,
   onHeaderFocusChange,
 }: Props): React.ReactNode {
-  const { headerFocused, focusHeader } = useTabHeaderFocus()
+  const { headerFocused, focusHeader } = useTabHeaderFocus();
   useEffect(() => {
-    onHeaderFocusChange?.(headerFocused)
-  }, [headerFocused, onHeaderFocusChange])
+    onHeaderFocusChange?.(headerFocused);
+  }, [headerFocused, onHeaderFocusChange]);
   // Get only additional workspace directories (not the current working directory)
   const additionalDirectories = React.useMemo((): DirectoryItem[] => {
-    return Array.from(
-      toolPermissionContext.additionalWorkingDirectories.keys(),
-    ).map(path => ({
+    return Array.from(toolPermissionContext.additionalWorkingDirectories.keys()).map(path => ({
       path,
       isCurrent: false,
       isDeletable: true,
-    }))
-  }, [toolPermissionContext.additionalWorkingDirectories])
+    }));
+  }, [toolPermissionContext.additionalWorkingDirectories]);
 
   const handleDirectorySelect = useCallback(
     (selectedValue: string) => {
       if (selectedValue === 'add-directory') {
-        onRequestAddDirectory()
-        return
+        onRequestAddDirectory();
+        return;
       }
 
-      const directory = additionalDirectories.find(
-        d => d.path === selectedValue,
-      )
+      const directory = additionalDirectories.find(d => d.path === selectedValue);
       if (directory && directory.isDeletable) {
-        onRequestRemoveDirectory(directory.path)
+        onRequestRemoveDirectory(directory.path);
       }
     },
     [additionalDirectories, onRequestAddDirectory, onRequestRemoveDirectory],
-  )
+  );
 
-  const handleCancel = useCallback(
-    () => onExit('Workspace dialog dismissed', { display: 'system' }),
-    [onExit],
-  )
+  const handleCancel = useCallback(() => onExit('Workspace dialog dismissed', { display: 'system' }), [onExit]);
 
   // Main list view options
   const options = React.useMemo(() => {
     const opts = additionalDirectories.map(dir => ({
       label: dir.path,
       value: dir.path,
-    }))
+    }));
 
     opts.push({
       label: `Add directory${figures.ellipsis}`,
       value: 'add-directory',
-    })
+    });
 
-    return opts
-  }, [additionalDirectories])
+    return opts;
+  }, [additionalDirectories]);
 
   // Main list view
   return (
@@ -100,5 +90,5 @@ export function WorkspaceTab({
         isDisabled={headerFocused}
       />
     </Box>
-  )
+  );
 }
diff --git a/src/components/permissions/rules/src/state/AppState.ts b/src/components/permissions/rules/src/state/AppState.ts
index cc3978f9a..53048a173 100644
--- a/src/components/permissions/rules/src/state/AppState.ts
+++ b/src/components/permissions/rules/src/state/AppState.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type useAppState = any;
-export type useSetAppState = any;
+export type useAppState = any
+export type useSetAppState = any
diff --git a/src/components/permissions/rules/src/utils/permissions/PermissionUpdate.ts b/src/components/permissions/rules/src/utils/permissions/PermissionUpdate.ts
index 9d49451cb..210dd1a77 100644
--- a/src/components/permissions/rules/src/utils/permissions/PermissionUpdate.ts
+++ b/src/components/permissions/rules/src/utils/permissions/PermissionUpdate.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type applyPermissionUpdate = any;
-export type persistPermissionUpdate = any;
+export type applyPermissionUpdate = any
+export type persistPermissionUpdate = any
diff --git a/src/components/permissions/rules/src/utils/permissions/PermissionUpdateSchema.ts b/src/components/permissions/rules/src/utils/permissions/PermissionUpdateSchema.ts
index 7f663cb14..bc57a1c6c 100644
--- a/src/components/permissions/rules/src/utils/permissions/PermissionUpdateSchema.ts
+++ b/src/components/permissions/rules/src/utils/permissions/PermissionUpdateSchema.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type PermissionUpdateDestination = any;
+export type PermissionUpdateDestination = any
diff --git a/src/components/permissions/shellPermissionHelpers.tsx b/src/components/permissions/shellPermissionHelpers.tsx
index 9b7c945f0..1ea9bebad 100644
--- a/src/components/permissions/shellPermissionHelpers.tsx
+++ b/src/components/permissions/shellPermissionHelpers.tsx
@@ -1,46 +1,45 @@
-import { basename, sep } from 'path'
-import React, { type ReactNode } from 'react'
-import { getOriginalCwd } from '../../bootstrap/state.js'
-import { Text } from '@anthropic/ink'
-import type { PermissionUpdate } from '../../utils/permissions/PermissionUpdateSchema.js'
-import { permissionRuleExtractPrefix } from '../../utils/permissions/shellRuleMatching.js'
+import { basename, sep } from 'path';
+import React, { type ReactNode } from 'react';
+import { getOriginalCwd } from '../../bootstrap/state.js';
+import { Text } from '@anthropic/ink';
+import type { PermissionUpdate } from '../../utils/permissions/PermissionUpdateSchema.js';
+import { permissionRuleExtractPrefix } from '../../utils/permissions/shellRuleMatching.js';
 
 function commandListDisplay(commands: string[]): ReactNode {
   switch (commands.length) {
     case 0:
-      return ''
+      return '';
     case 1:
-      return <Text bold>{commands[0]}</Text>
+      return <Text bold>{commands[0]}</Text>;
     case 2:
       return (
         <Text>
           <Text bold>{commands[0]}</Text> and <Text bold>{commands[1]}</Text>
         </Text>
-      )
+      );
     default:
       return (
         <Text>
-          <Text bold>{commands.slice(0, -1).join(', ')}</Text>, and{' '}
-          <Text bold>{commands.slice(-1)[0]}</Text>
+          <Text bold>{commands.slice(0, -1).join(', ')}</Text>, and <Text bold>{commands.slice(-1)[0]}</Text>
         </Text>
-      )
+      );
   }
 }
 
 function commandListDisplayTruncated(commands: string[]): ReactNode {
   // Check if the plain text representation would be too long
-  const plainText = commands.join(', ')
+  const plainText = commands.join(', ');
   if (plainText.length > 50) {
-    return 'similar'
+    return 'similar';
   }
-  return commandListDisplay(commands)
+  return commandListDisplay(commands);
 }
 
 function formatPathList(paths: string[]): ReactNode {
-  if (paths.length === 0) return ''
+  if (paths.length === 0) return '';
 
   // Extract directory names from paths
-  const names = paths.map(p => basename(p) || p)
+  const names = paths.map(p => basename(p) || p);
 
   if (names.length === 1) {
     return (
@@ -48,7 +47,7 @@ function formatPathList(paths: string[]): ReactNode {
         <Text bold>{names[0]}</Text>
         {sep}
       </Text>
-    )
+    );
   }
   if (names.length === 2) {
     return (
@@ -57,7 +56,7 @@ function formatPathList(paths: string[]): ReactNode {
         {sep} and <Text bold>{names[1]}</Text>
         {sep}
       </Text>
-    )
+    );
   }
 
   // For 3+, show first two with "and N more"
@@ -67,7 +66,7 @@ function formatPathList(paths: string[]): ReactNode {
       {sep}, <Text bold>{names[1]}</Text>
       {sep} and {paths.length - 2} more
     </Text>
-  )
+  );
 }
 
 /**
@@ -82,83 +81,67 @@ export function generateShellSuggestionsLabel(
   commandTransform?: (command: string) => string,
 ): ReactNode | null {
   // Collect all rules for display
-  const allRules = suggestions
-    .filter(s => s.type === 'addRules')
-    .flatMap(s => s.rules || [])
+  const allRules = suggestions.filter(s => s.type === 'addRules').flatMap(s => s.rules || []);
 
   // Separate Read rules from shell rules
-  const readRules = allRules.filter(r => r.toolName === 'Read')
-  const shellRules = allRules.filter(r => r.toolName === shellToolName)
+  const readRules = allRules.filter(r => r.toolName === 'Read');
+  const shellRules = allRules.filter(r => r.toolName === shellToolName);
 
   // Get directory info
-  const directories = suggestions
-    .filter(s => s.type === 'addDirectories')
-    .flatMap(s => s.directories || [])
+  const directories = suggestions.filter(s => s.type === 'addDirectories').flatMap(s => s.directories || []);
 
   // Extract paths from Read rules (keep separate from directories)
-  const readPaths = readRules
-    .map(r => r.ruleContent?.replace('/**', '') || '')
-    .filter(p => p)
+  const readPaths = readRules.map(r => r.ruleContent?.replace('/**', '') || '').filter(p => p);
 
   // Extract shell command prefixes, optionally transforming for display
   const shellCommands = [
     ...new Set(
       shellRules.flatMap(rule => {
-        if (!rule.ruleContent) return []
-        const command =
-          permissionRuleExtractPrefix(rule.ruleContent) ?? rule.ruleContent
-        return commandTransform ? commandTransform(command) : command
+        if (!rule.ruleContent) return [];
+        const command = permissionRuleExtractPrefix(rule.ruleContent) ?? rule.ruleContent;
+        return commandTransform ? commandTransform(command) : command;
       }),
     ),
-  ]
+  ];
 
   // Check what we have
-  const hasDirectories = directories.length > 0
-  const hasReadPaths = readPaths.length > 0
-  const hasCommands = shellCommands.length > 0
+  const hasDirectories = directories.length > 0;
+  const hasReadPaths = readPaths.length > 0;
+  const hasCommands = shellCommands.length > 0;
 
   // Handle single type cases
   if (hasReadPaths && !hasDirectories && !hasCommands) {
     // Only Read rules - use "reading from" language
     if (readPaths.length === 1) {
-      const firstPath = readPaths[0]!
-      const dirName = basename(firstPath) || firstPath
+      const firstPath = readPaths[0]!;
+      const dirName = basename(firstPath) || firstPath;
       return (
         <Text>
           Yes, allow reading from <Text bold>{dirName}</Text>
           {sep} from this project
         </Text>
-      )
+      );
     }
 
     // Multiple read paths
-    return (
-      <Text>
-        Yes, allow reading from {formatPathList(readPaths)} from this project
-      </Text>
-    )
+    return <Text>Yes, allow reading from {formatPathList(readPaths)} from this project</Text>;
   }
 
   if (hasDirectories && !hasReadPaths && !hasCommands) {
     // Only directory permissions - use "access to" language
     if (directories.length === 1) {
-      const firstDir = directories[0]!
-      const dirName = basename(firstDir) || firstDir
+      const firstDir = directories[0]!;
+      const dirName = basename(firstDir) || firstDir;
       return (
         <Text>
           Yes, and always allow access to <Text bold>{dirName}</Text>
           {sep} from this project
         </Text>
-      )
+      );
     }
 
     // Multiple directories
-    return (
-      <Text>
-        Yes, and always allow access to {formatPathList(directories)} from this
-        project
-      </Text>
-    )
+    return <Text>Yes, and always allow access to {formatPathList(directories)} from this project</Text>;
   }
 
   if (hasCommands && !hasDirectories && !hasReadPaths) {
@@ -166,48 +149,40 @@ export function generateShellSuggestionsLabel(
     return (
       <Text>
         {"Yes, and don't ask again for "}
-        {commandListDisplayTruncated(shellCommands)} commands in{' '}
-        <Text bold>{getOriginalCwd()}</Text>
+        {commandListDisplayTruncated(shellCommands)} commands in <Text bold>{getOriginalCwd()}</Text>
       </Text>
-    )
+    );
   }
 
   // Handle mixed cases
   if ((hasDirectories || hasReadPaths) && !hasCommands) {
     // Combine directories and read paths since they're both path access
-    const allPaths = [...directories, ...readPaths]
+    const allPaths = [...directories, ...readPaths];
     if (hasDirectories && hasReadPaths) {
       // Mixed - use generic "access to"
-      return (
-        <Text>
-          Yes, and always allow access to {formatPathList(allPaths)} from this
-          project
-        </Text>
-      )
+      return <Text>Yes, and always allow access to {formatPathList(allPaths)} from this project</Text>;
     }
   }
 
   if ((hasDirectories || hasReadPaths) && hasCommands) {
     // Build descriptive message for both types
-    const allPaths = [...directories, ...readPaths]
+    const allPaths = [...directories, ...readPaths];
 
     // Keep it concise but informative
     if (allPaths.length === 1 && shellCommands.length === 1) {
       return (
         <Text>
-          Yes, and allow access to {formatPathList(allPaths)} and{' '}
-          {commandListDisplayTruncated(shellCommands)} commands
+          Yes, and allow access to {formatPathList(allPaths)} and {commandListDisplayTruncated(shellCommands)} commands
         </Text>
-      )
+      );
     }
 
     return (
       <Text>
-        Yes, and allow {formatPathList(allPaths)} access and{' '}
-        {commandListDisplayTruncated(shellCommands)} commands
+        Yes, and allow {formatPathList(allPaths)} access and {commandListDisplayTruncated(shellCommands)} commands
       </Text>
-    )
+    );
   }
 
-  return null
+  return null;
 }
diff --git a/src/components/permissions/src/ink.ts b/src/components/permissions/src/ink.ts
index 51d6eb4b7..7371bcca6 100644
--- a/src/components/permissions/src/ink.ts
+++ b/src/components/permissions/src/ink.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type Box = any;
-export type Text = any;
+export type Box = any
+export type Text = any
diff --git a/src/components/permissions/src/services/analytics/index.ts b/src/components/permissions/src/services/analytics/index.ts
index 142e7b6f5..2e0f796da 100644
--- a/src/components/permissions/src/services/analytics/index.ts
+++ b/src/components/permissions/src/services/analytics/index.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any;
-export type logEvent = any;
+export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any
+export type logEvent = any
diff --git a/src/components/permissions/src/services/analytics/metadata.ts b/src/components/permissions/src/services/analytics/metadata.ts
index 807602756..8d346ef8e 100644
--- a/src/components/permissions/src/services/analytics/metadata.ts
+++ b/src/components/permissions/src/services/analytics/metadata.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type sanitizeToolNameForAnalytics = any;
+export type sanitizeToolNameForAnalytics = any
diff --git a/src/components/permissions/src/tools/BashTool/BashTool.ts b/src/components/permissions/src/tools/BashTool/BashTool.ts
index 7a3ea3cc5..0e57d5e17 100644
--- a/src/components/permissions/src/tools/BashTool/BashTool.ts
+++ b/src/components/permissions/src/tools/BashTool/BashTool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type BashTool = any;
+export type BashTool = any
diff --git a/src/components/permissions/src/tools/EnterPlanModeTool/EnterPlanModeTool.ts b/src/components/permissions/src/tools/EnterPlanModeTool/EnterPlanModeTool.ts
index c4d43e44a..5d1ff0405 100644
--- a/src/components/permissions/src/tools/EnterPlanModeTool/EnterPlanModeTool.ts
+++ b/src/components/permissions/src/tools/EnterPlanModeTool/EnterPlanModeTool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type EnterPlanModeTool = any;
+export type EnterPlanModeTool = any
diff --git a/src/components/permissions/src/tools/ExitPlanModeTool/ExitPlanModeV2Tool.ts b/src/components/permissions/src/tools/ExitPlanModeTool/ExitPlanModeV2Tool.ts
index f9708d2b3..1e7971d36 100644
--- a/src/components/permissions/src/tools/ExitPlanModeTool/ExitPlanModeV2Tool.ts
+++ b/src/components/permissions/src/tools/ExitPlanModeTool/ExitPlanModeV2Tool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type ExitPlanModeV2Tool = any;
+export type ExitPlanModeV2Tool = any
diff --git a/src/components/permissions/src/utils/bash/commands.ts b/src/components/permissions/src/utils/bash/commands.ts
index 8886e5cc6..e817a69c9 100644
--- a/src/components/permissions/src/utils/bash/commands.ts
+++ b/src/components/permissions/src/utils/bash/commands.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type splitCommand_DEPRECATED = any;
+export type splitCommand_DEPRECATED = any
diff --git a/src/components/permissions/src/utils/permissions/PermissionResult.ts b/src/components/permissions/src/utils/permissions/PermissionResult.ts
index 7958ed68e..9b45eb981 100644
--- a/src/components/permissions/src/utils/permissions/PermissionResult.ts
+++ b/src/components/permissions/src/utils/permissions/PermissionResult.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type PermissionDecisionReason = any;
-export type PermissionResult = any;
+export type PermissionDecisionReason = any
+export type PermissionResult = any
diff --git a/src/components/permissions/src/utils/permissions/PermissionUpdate.ts b/src/components/permissions/src/utils/permissions/PermissionUpdate.ts
index 5779475d9..c0bcd3a59 100644
--- a/src/components/permissions/src/utils/permissions/PermissionUpdate.ts
+++ b/src/components/permissions/src/utils/permissions/PermissionUpdate.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type extractRules = any;
-export type hasRules = any;
+export type extractRules = any
+export type hasRules = any
diff --git a/src/components/permissions/src/utils/permissions/permissionRuleParser.ts b/src/components/permissions/src/utils/permissions/permissionRuleParser.ts
index 37691b2d9..9dff2e26c 100644
--- a/src/components/permissions/src/utils/permissions/permissionRuleParser.ts
+++ b/src/components/permissions/src/utils/permissions/permissionRuleParser.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type permissionRuleValueToString = any;
+export type permissionRuleValueToString = any
diff --git a/src/components/permissions/src/utils/sandbox/sandbox-adapter.ts b/src/components/permissions/src/utils/sandbox/sandbox-adapter.ts
index 5dd1d93d7..0f69c175e 100644
--- a/src/components/permissions/src/utils/sandbox/sandbox-adapter.ts
+++ b/src/components/permissions/src/utils/sandbox/sandbox-adapter.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type NetworkHostPattern = any;
-export type shouldAllowManagedSandboxDomainsOnly = any;
-export type SandboxManager = any;
+export type NetworkHostPattern = any
+export type shouldAllowManagedSandboxDomainsOnly = any
+export type SandboxManager = any
diff --git a/src/components/sandbox/SandboxConfigTab.tsx b/src/components/sandbox/SandboxConfigTab.tsx
index 37e00ce56..83620fb98 100644
--- a/src/components/sandbox/SandboxConfigTab.tsx
+++ b/src/components/sandbox/SandboxConfigTab.tsx
@@ -1,15 +1,12 @@
-import * as React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import {
-  SandboxManager,
-  shouldAllowManagedSandboxDomainsOnly,
-} from '../../utils/sandbox/sandbox-adapter.js'
+import * as React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { SandboxManager, shouldAllowManagedSandboxDomainsOnly } from '../../utils/sandbox/sandbox-adapter.js';
 
 export function SandboxConfigTab(): React.ReactNode {
-  const isEnabled = SandboxManager.isSandboxingEnabled()
+  const isEnabled = SandboxManager.isSandboxingEnabled();
 
   // Show warnings (e.g., seccomp not available on Linux)
-  const depCheck = SandboxManager.checkDependencies()
+  const depCheck = SandboxManager.checkDependencies();
   const warningsNote =
     depCheck.warnings.length > 0 ? (
       <Box marginTop={1} flexDirection="column">
@@ -19,7 +16,7 @@ export function SandboxConfigTab(): React.ReactNode {
           </Text>
         ))}
       </Box>
-    ) : null
+    ) : null;
 
   if (!isEnabled) {
     return (
@@ -27,15 +24,15 @@ export function SandboxConfigTab(): React.ReactNode {
         <Text color="subtle">Sandbox is not enabled</Text>
         {warningsNote}
       </Box>
-    )
+    );
   }
 
-  const fsReadConfig = SandboxManager.getFsReadConfig()
-  const fsWriteConfig = SandboxManager.getFsWriteConfig()
-  const networkConfig = SandboxManager.getNetworkRestrictionConfig()
-  const allowUnixSockets = SandboxManager.getAllowUnixSockets()
-  const excludedCommands = SandboxManager.getExcludedCommands()
-  const globPatternWarnings = SandboxManager.getLinuxGlobPatternWarnings()
+  const fsReadConfig = SandboxManager.getFsReadConfig();
+  const fsWriteConfig = SandboxManager.getFsWriteConfig();
+  const networkConfig = SandboxManager.getNetworkRestrictionConfig();
+  const allowUnixSockets = SandboxManager.getAllowUnixSockets();
+  const excludedCommands = SandboxManager.getExcludedCommands();
+  const globPatternWarnings = SandboxManager.getLinuxGlobPatternWarnings();
 
   return (
     <Box flexDirection="column" paddingY={1}>
@@ -44,9 +41,7 @@ export function SandboxConfigTab(): React.ReactNode {
         <Text bold color="permission">
           Excluded Commands:
         </Text>
-        <Text dimColor>
-          {excludedCommands.length > 0 ? excludedCommands.join(', ') : 'None'}
-        </Text>
+        <Text dimColor>{excludedCommands.length > 0 ? excludedCommands.join(', ') : 'None'}</Text>
       </Box>
 
       {/* Filesystem Read Restrictions */}
@@ -56,12 +51,9 @@ export function SandboxConfigTab(): React.ReactNode {
             Filesystem Read Restrictions:
           </Text>
           <Text dimColor>Denied: {fsReadConfig.denyOnly.join(', ')}</Text>
-          {fsReadConfig.allowWithinDeny &&
-            fsReadConfig.allowWithinDeny.length > 0 && (
-              <Text dimColor>
-                Allowed within denied: {fsReadConfig.allowWithinDeny.join(', ')}
-              </Text>
-            )}
+          {fsReadConfig.allowWithinDeny && fsReadConfig.allowWithinDeny.length > 0 && (
+            <Text dimColor>Allowed within denied: {fsReadConfig.allowWithinDeny.join(', ')}</Text>
+          )}
         </Box>
       )}
 
@@ -73,34 +65,25 @@ export function SandboxConfigTab(): React.ReactNode {
           </Text>
           <Text dimColor>Allowed: {fsWriteConfig.allowOnly.join(', ')}</Text>
           {fsWriteConfig.denyWithinAllow.length > 0 && (
-            <Text dimColor>
-              Denied within allowed: {fsWriteConfig.denyWithinAllow.join(', ')}
-            </Text>
+            <Text dimColor>Denied within allowed: {fsWriteConfig.denyWithinAllow.join(', ')}</Text>
           )}
         </Box>
       )}
 
       {/* Network Restrictions */}
       {((networkConfig.allowedHosts && networkConfig.allowedHosts.length > 0) ||
-        (networkConfig.deniedHosts &&
-          networkConfig.deniedHosts.length > 0)) && (
+        (networkConfig.deniedHosts && networkConfig.deniedHosts.length > 0)) && (
         <Box marginTop={1} flexDirection="column">
           <Text bold color="permission">
             Network Restrictions
             {shouldAllowManagedSandboxDomainsOnly() ? ' (Managed)' : ''}:
           </Text>
-          {networkConfig.allowedHosts &&
-            networkConfig.allowedHosts.length > 0 && (
-              <Text dimColor>
-                Allowed: {networkConfig.allowedHosts.join(', ')}
-              </Text>
-            )}
-          {networkConfig.deniedHosts &&
-            networkConfig.deniedHosts.length > 0 && (
-              <Text dimColor>
-                Denied: {networkConfig.deniedHosts.join(', ')}
-              </Text>
-            )}
+          {networkConfig.allowedHosts && networkConfig.allowedHosts.length > 0 && (
+            <Text dimColor>Allowed: {networkConfig.allowedHosts.join(', ')}</Text>
+          )}
+          {networkConfig.deniedHosts && networkConfig.deniedHosts.length > 0 && (
+            <Text dimColor>Denied: {networkConfig.deniedHosts.join(', ')}</Text>
+          )}
         </Box>
       )}
 
@@ -121,15 +104,13 @@ export function SandboxConfigTab(): React.ReactNode {
             ⚠ Warning: Glob patterns not fully supported on Linux
           </Text>
           <Text dimColor>
-            The following patterns will be ignored:{' '}
-            {globPatternWarnings.slice(0, 3).join(', ')}
-            {globPatternWarnings.length > 3 &&
-              ` (${globPatternWarnings.length - 3} more)`}
+            The following patterns will be ignored: {globPatternWarnings.slice(0, 3).join(', ')}
+            {globPatternWarnings.length > 3 && ` (${globPatternWarnings.length - 3} more)`}
           </Text>
         </Box>
       )}
 
       {warningsNote}
     </Box>
-  )
+  );
 }
diff --git a/src/components/sandbox/SandboxDependenciesTab.tsx b/src/components/sandbox/SandboxDependenciesTab.tsx
index 24efdf1ef..ebe59289e 100644
--- a/src/components/sandbox/SandboxDependenciesTab.tsx
+++ b/src/components/sandbox/SandboxDependenciesTab.tsx
@@ -1,15 +1,15 @@
-import React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { getPlatform } from '../../utils/platform.js'
-import type { SandboxDependencyCheck } from '../../utils/sandbox/sandbox-adapter.js'
+import React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { getPlatform } from '../../utils/platform.js';
+import type { SandboxDependencyCheck } from '../../utils/sandbox/sandbox-adapter.js';
 
 type Props = {
-  depCheck: SandboxDependencyCheck
-}
+  depCheck: SandboxDependencyCheck;
+};
 
 export function SandboxDependenciesTab({ depCheck }: Props): React.ReactNode {
-  const platform = getPlatform()
-  const isMac = platform === 'macos'
+  const platform = getPlatform();
+  const isMac = platform === 'macos';
 
   // ripgrep is required on all platforms (used to scan for dangerous dirs).
   // On macOS, seatbelt is built into the OS — ripgrep is the only runtime dep.
@@ -18,18 +18,18 @@ export function SandboxDependenciesTab({ depCheck }: Props): React.ReactNode {
   // #31804: previously this tab unconditionally rendered Linux deps (bwrap,
   // socat, seccomp). When ripgrep was missing on macOS, users saw confusing
   // Linux install instructions and no mention of the actual problem.
-  const rgMissing = depCheck.errors.some(e => e.includes('ripgrep'))
-  const bwrapMissing = depCheck.errors.some(e => e.includes('bwrap'))
-  const socatMissing = depCheck.errors.some(e => e.includes('socat'))
-  const seccompMissing = depCheck.warnings.length > 0
+  const rgMissing = depCheck.errors.some(e => e.includes('ripgrep'));
+  const bwrapMissing = depCheck.errors.some(e => e.includes('bwrap'));
+  const socatMissing = depCheck.errors.some(e => e.includes('socat'));
+  const seccompMissing = depCheck.warnings.length > 0;
 
   // Any errors we don't have a dedicated row for — render verbatim so they
   // aren't silently swallowed (e.g. "Unsupported platform" or future deps).
   const otherErrors = depCheck.errors.filter(
     e => !e.includes('ripgrep') && !e.includes('bwrap') && !e.includes('socat'),
-  )
+  );
 
-  const rgInstallHint = isMac ? 'brew install ripgrep' : 'apt install ripgrep'
+  const rgInstallHint = isMac ? 'brew install ripgrep' : 'apt install ripgrep';
 
   return (
     <Box flexDirection="column" paddingY={1} gap={1}>
@@ -43,12 +43,7 @@ export function SandboxDependenciesTab({ depCheck }: Props): React.ReactNode {
 
       <Box flexDirection="column">
         <Text>
-          ripgrep (rg):{' '}
-          {rgMissing ? (
-            <Text color="error">not found</Text>
-          ) : (
-            <Text color="success">found</Text>
-          )}
+          ripgrep (rg): {rgMissing ? <Text color="error">not found</Text> : <Text color="success">found</Text>}
         </Text>
         {rgMissing && (
           <Text dimColor>
@@ -62,25 +57,14 @@ export function SandboxDependenciesTab({ depCheck }: Props): React.ReactNode {
           <Box flexDirection="column">
             <Text>
               bubblewrap (bwrap):{' '}
-              {bwrapMissing ? (
-                <Text color="error">not installed</Text>
-              ) : (
-                <Text color="success">installed</Text>
-              )}
+              {bwrapMissing ? <Text color="error">not installed</Text> : <Text color="success">installed</Text>}
             </Text>
-            {bwrapMissing && (
-              <Text dimColor>{'  '}· apt install bubblewrap</Text>
-            )}
+            {bwrapMissing && <Text dimColor>{'  '}· apt install bubblewrap</Text>}
           </Box>
 
           <Box flexDirection="column">
             <Text>
-              socat:{' '}
-              {socatMissing ? (
-                <Text color="error">not installed</Text>
-              ) : (
-                <Text color="success">installed</Text>
-              )}
+              socat: {socatMissing ? <Text color="error">not installed</Text> : <Text color="success">installed</Text>}
             </Text>
             {socatMissing && <Text dimColor>{'  '}· apt install socat</Text>}
           </Box>
@@ -88,26 +72,14 @@ export function SandboxDependenciesTab({ depCheck }: Props): React.ReactNode {
           <Box flexDirection="column">
             <Text>
               seccomp filter:{' '}
-              {seccompMissing ? (
-                <Text color="warning">not installed</Text>
-              ) : (
-                <Text color="success">installed</Text>
-              )}
-              {seccompMissing && (
-                <Text dimColor> (required to block unix domain sockets)</Text>
-              )}
+              {seccompMissing ? <Text color="warning">not installed</Text> : <Text color="success">installed</Text>}
+              {seccompMissing && <Text dimColor> (required to block unix domain sockets)</Text>}
             </Text>
             {seccompMissing && (
               <Box flexDirection="column">
-                <Text dimColor>
-                  {'  '}· npm install -g @anthropic-ai/sandbox-runtime
-                </Text>
-                <Text dimColor>
-                  {'  '}· or copy vendor/seccomp/* from sandbox-runtime and set
-                </Text>
-                <Text dimColor>
-                  {'    '}sandbox.seccomp.bpfPath and applyPath in settings.json
-                </Text>
+                <Text dimColor>{'  '}· npm install -g @anthropic-ai/sandbox-runtime</Text>
+                <Text dimColor>{'  '}· or copy vendor/seccomp/* from sandbox-runtime and set</Text>
+                <Text dimColor>{'    '}sandbox.seccomp.bpfPath and applyPath in settings.json</Text>
               </Box>
             )}
           </Box>
@@ -120,5 +92,5 @@ export function SandboxDependenciesTab({ depCheck }: Props): React.ReactNode {
         </Text>
       ))}
     </Box>
-  )
+  );
 }
diff --git a/src/components/sandbox/SandboxDoctorSection.tsx b/src/components/sandbox/SandboxDoctorSection.tsx
index effa9500e..242490032 100644
--- a/src/components/sandbox/SandboxDoctorSection.tsx
+++ b/src/components/sandbox/SandboxDoctorSection.tsx
@@ -1,28 +1,26 @@
-import React from 'react'
-import { Box, Text } from '@anthropic/ink'
-import { SandboxManager } from '../../utils/sandbox/sandbox-adapter.js'
+import React from 'react';
+import { Box, Text } from '@anthropic/ink';
+import { SandboxManager } from '../../utils/sandbox/sandbox-adapter.js';
 
 export function SandboxDoctorSection(): React.ReactNode {
   if (!SandboxManager.isSupportedPlatform()) {
-    return null
+    return null;
   }
 
   if (!SandboxManager.isSandboxEnabledInSettings()) {
-    return null
+    return null;
   }
 
-  const depCheck = SandboxManager.checkDependencies()
-  const hasErrors = depCheck.errors.length > 0
-  const hasWarnings = depCheck.warnings.length > 0
+  const depCheck = SandboxManager.checkDependencies();
+  const hasErrors = depCheck.errors.length > 0;
+  const hasWarnings = depCheck.warnings.length > 0;
 
   if (!hasErrors && !hasWarnings) {
-    return null
+    return null;
   }
 
-  const statusColor = hasErrors ? ('error' as const) : ('warning' as const)
-  const statusText = hasErrors
-    ? 'Missing dependencies'
-    : 'Available (with warnings)'
+  const statusColor = hasErrors ? ('error' as const) : ('warning' as const);
+  const statusText = hasErrors ? 'Missing dependencies' : 'Available (with warnings)';
 
   return (
     <Box flexDirection="column">
@@ -40,9 +38,7 @@ export function SandboxDoctorSection(): React.ReactNode {
           └ {w}
         </Text>
       ))}
-      {hasErrors && (
-        <Text dimColor>└ Run /sandbox for install instructions</Text>
-      )}
+      {hasErrors && <Text dimColor>└ Run /sandbox for install instructions</Text>}
     </Box>
-  )
+  );
 }
diff --git a/src/components/sandbox/SandboxOverridesTab.tsx b/src/components/sandbox/SandboxOverridesTab.tsx
index 257dcc670..17f93002a 100644
--- a/src/components/sandbox/SandboxOverridesTab.tsx
+++ b/src/components/sandbox/SandboxOverridesTab.tsx
@@ -1,101 +1,78 @@
-import React from 'react'
-import { Box, color, Link, Text, useTheme, useTabHeaderFocus } from '@anthropic/ink'
-import type { CommandResultDisplay } from '../../types/command.js'
-import { SandboxManager } from '../../utils/sandbox/sandbox-adapter.js'
-import { Select } from '../CustomSelect/select.js'
+import React from 'react';
+import { Box, color, Link, Text, useTheme, useTabHeaderFocus } from '@anthropic/ink';
+import type { CommandResultDisplay } from '../../types/command.js';
+import { SandboxManager } from '../../utils/sandbox/sandbox-adapter.js';
+import { Select } from '../CustomSelect/select.js';
 
 type Props = {
-  onComplete: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-}
+  onComplete: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+};
 
-type OverrideMode = 'open' | 'closed'
+type OverrideMode = 'open' | 'closed';
 
 export function SandboxOverridesTab({ onComplete }: Props): React.ReactNode {
-  const isEnabled = SandboxManager.isSandboxingEnabled()
-  const isLocked = SandboxManager.areSandboxSettingsLockedByPolicy()
-  const currentAllowUnsandboxed = SandboxManager.areUnsandboxedCommandsAllowed()
+  const isEnabled = SandboxManager.isSandboxingEnabled();
+  const isLocked = SandboxManager.areSandboxSettingsLockedByPolicy();
+  const currentAllowUnsandboxed = SandboxManager.areUnsandboxedCommandsAllowed();
 
   if (!isEnabled) {
     return (
       <Box flexDirection="column" paddingY={1}>
-        <Text color="subtle">
-          Sandbox is not enabled. Enable sandbox to configure override settings.
-        </Text>
+        <Text color="subtle">Sandbox is not enabled. Enable sandbox to configure override settings.</Text>
       </Box>
-    )
+    );
   }
 
   if (isLocked) {
     return (
       <Box flexDirection="column" paddingY={1}>
         <Text color="subtle">
-          Override settings are managed by a higher-priority configuration and
-          cannot be changed locally.
+          Override settings are managed by a higher-priority configuration and cannot be changed locally.
         </Text>
         <Box marginTop={1}>
           <Text dimColor>
-            Current setting:{' '}
-            {currentAllowUnsandboxed
-              ? 'Allow unsandboxed fallback'
-              : 'Strict sandbox mode'}
+            Current setting: {currentAllowUnsandboxed ? 'Allow unsandboxed fallback' : 'Strict sandbox mode'}
           </Text>
         </Box>
       </Box>
-    )
+    );
   }
 
-  return (
-    <OverridesSelect
-      onComplete={onComplete}
-      currentMode={currentAllowUnsandboxed ? 'open' : 'closed'}
-    />
-  )
+  return <OverridesSelect onComplete={onComplete} currentMode={currentAllowUnsandboxed ? 'open' : 'closed'} />;
 }
 
 // Split so useTabHeaderFocus() only runs when the Select renders. Calling it
 // above the early returns registers a down-arrow opt-in even when we return
 // static text — pressing ↓ then blurs the header with no way back.
-function OverridesSelect({
-  onComplete,
-  currentMode,
-}: Props & { currentMode: OverrideMode }): React.ReactNode {
-  const [theme] = useTheme()
-  const { headerFocused, focusHeader } = useTabHeaderFocus()
-  const currentIndicator = color('success', theme)(`(current)`)
+function OverridesSelect({ onComplete, currentMode }: Props & { currentMode: OverrideMode }): React.ReactNode {
+  const [theme] = useTheme();
+  const { headerFocused, focusHeader } = useTabHeaderFocus();
+  const currentIndicator = color('success', theme)(`(current)`);
 
   const options = [
     {
-      label:
-        currentMode === 'open'
-          ? `Allow unsandboxed fallback ${currentIndicator}`
-          : 'Allow unsandboxed fallback',
+      label: currentMode === 'open' ? `Allow unsandboxed fallback ${currentIndicator}` : 'Allow unsandboxed fallback',
       value: 'open',
     },
     {
-      label:
-        currentMode === 'closed'
-          ? `Strict sandbox mode ${currentIndicator}`
-          : 'Strict sandbox mode',
+      label: currentMode === 'closed' ? `Strict sandbox mode ${currentIndicator}` : 'Strict sandbox mode',
       value: 'closed',
     },
-  ]
+  ];
 
   async function handleSelect(value: string) {
-    const mode = value as OverrideMode
+    const mode = value as OverrideMode;
 
     await SandboxManager.setSandboxSettings({
       allowUnsandboxedCommands: mode === 'open',
-    })
+    });
 
     const message =
       mode === 'open'
         ? '✓ Unsandboxed fallback allowed - commands can run outside sandbox when necessary'
-        : '✓ Strict sandbox mode - all commands must run in sandbox or be excluded via the `excludedCommands` option'
+        : '✓ Strict sandbox mode - all commands must run in sandbox or be excluded via the `excludedCommands` option';
 
-    onComplete(message)
+    onComplete(message);
   }
 
   return (
@@ -115,16 +92,15 @@ function OverridesSelect({
           <Text bold dimColor>
             Allow unsandboxed fallback:
           </Text>{' '}
-          When a command fails due to sandbox restrictions, Claude can retry
-          with dangerouslyDisableSandbox to run outside the sandbox (falling
-          back to default permissions).
+          When a command fails due to sandbox restrictions, Claude can retry with dangerouslyDisableSandbox to run
+          outside the sandbox (falling back to default permissions).
         </Text>
         <Text dimColor>
           <Text bold dimColor>
             Strict sandbox mode:
           </Text>{' '}
-          All bash commands invoked by the model must run in the sandbox unless
-          they are explicitly listed in excludedCommands.
+          All bash commands invoked by the model must run in the sandbox unless they are explicitly listed in
+          excludedCommands.
         </Text>
         <Text dimColor>
           Learn more:{' '}
@@ -134,5 +110,5 @@ function OverridesSelect({
         </Text>
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/components/sandbox/SandboxSettings.tsx b/src/components/sandbox/SandboxSettings.tsx
index 005d071e1..5212628f5 100644
--- a/src/components/sandbox/SandboxSettings.tsx
+++ b/src/components/sandbox/SandboxSettings.tsx
@@ -1,47 +1,41 @@
-import React from 'react'
-import { Box, color, Link, Text, useTheme, Pane, Tab, Tabs, useTabHeaderFocus } from '@anthropic/ink'
-import { useKeybindings } from '../../keybindings/useKeybinding.js'
-import type { CommandResultDisplay } from '../../types/command.js'
-import type { SandboxDependencyCheck } from '../../utils/sandbox/sandbox-adapter.js'
-import { SandboxManager } from '../../utils/sandbox/sandbox-adapter.js'
-import { getSettings_DEPRECATED } from '../../utils/settings/settings.js'
-import { Select } from '../CustomSelect/select.js'
-import { SandboxConfigTab } from './SandboxConfigTab.js'
-import { SandboxDependenciesTab } from './SandboxDependenciesTab.js'
-import { SandboxOverridesTab } from './SandboxOverridesTab.js'
+import React from 'react';
+import { Box, color, Link, Text, useTheme, Pane, Tab, Tabs, useTabHeaderFocus } from '@anthropic/ink';
+import { useKeybindings } from '../../keybindings/useKeybinding.js';
+import type { CommandResultDisplay } from '../../types/command.js';
+import type { SandboxDependencyCheck } from '../../utils/sandbox/sandbox-adapter.js';
+import { SandboxManager } from '../../utils/sandbox/sandbox-adapter.js';
+import { getSettings_DEPRECATED } from '../../utils/settings/settings.js';
+import { Select } from '../CustomSelect/select.js';
+import { SandboxConfigTab } from './SandboxConfigTab.js';
+import { SandboxDependenciesTab } from './SandboxDependenciesTab.js';
+import { SandboxOverridesTab } from './SandboxOverridesTab.js';
 
 type Props = {
-  onComplete: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-  depCheck: SandboxDependencyCheck
-}
+  onComplete: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+  depCheck: SandboxDependencyCheck;
+};
 
-type SandboxMode = 'auto-allow' | 'regular' | 'disabled'
+type SandboxMode = 'auto-allow' | 'regular' | 'disabled';
 
-export function SandboxSettings({
-  onComplete,
-  depCheck,
-}: Props): React.ReactNode {
-  const [theme] = useTheme()
-  const currentEnabled = SandboxManager.isSandboxingEnabled()
-  const currentAutoAllow = SandboxManager.isAutoAllowBashIfSandboxedEnabled()
-  const hasWarnings = depCheck.warnings.length > 0
-  const settings = getSettings_DEPRECATED()
-  const allowAllUnixSockets = settings.sandbox?.network?.allowAllUnixSockets
+export function SandboxSettings({ onComplete, depCheck }: Props): React.ReactNode {
+  const [theme] = useTheme();
+  const currentEnabled = SandboxManager.isSandboxingEnabled();
+  const currentAutoAllow = SandboxManager.isAutoAllowBashIfSandboxedEnabled();
+  const hasWarnings = depCheck.warnings.length > 0;
+  const settings = getSettings_DEPRECATED();
+  const allowAllUnixSockets = settings.sandbox?.network?.allowAllUnixSockets;
   // Show warning if seccomp missing AND user hasn't allowed all unix sockets
-  const showSocketWarning = hasWarnings && !allowAllUnixSockets
+  const showSocketWarning = hasWarnings && !allowAllUnixSockets;
 
   // Determine current mode
   const getCurrentMode = (): SandboxMode => {
-    if (!currentEnabled) return 'disabled'
-    if (currentAutoAllow) return 'auto-allow'
-    return 'regular'
-  }
+    if (!currentEnabled) return 'disabled';
+    if (currentAutoAllow) return 'auto-allow';
+    return 'regular';
+  };
 
-  const currentMode = getCurrentMode()
-  const currentIndicator = color('success', theme)(`(current)`)
+  const currentMode = getCurrentMode();
+  const currentIndicator = color('success', theme)(`(current)`);
 
   const options = [
     {
@@ -59,39 +53,36 @@ export function SandboxSettings({
       value: 'regular',
     },
     {
-      label:
-        currentMode === 'disabled'
-          ? `No Sandbox ${currentIndicator}`
-          : 'No Sandbox',
+      label: currentMode === 'disabled' ? `No Sandbox ${currentIndicator}` : 'No Sandbox',
       value: 'disabled',
     },
-  ]
+  ];
 
   async function handleSelect(value: string) {
-    const mode = value as SandboxMode
+    const mode = value as SandboxMode;
 
     switch (mode) {
       case 'auto-allow':
         await SandboxManager.setSandboxSettings({
           enabled: true,
           autoAllowBashIfSandboxed: true,
-        })
-        onComplete('✓ Sandbox enabled with auto-allow for bash commands')
-        break
+        });
+        onComplete('✓ Sandbox enabled with auto-allow for bash commands');
+        break;
       case 'regular':
         await SandboxManager.setSandboxSettings({
           enabled: true,
           autoAllowBashIfSandboxed: false,
-        })
-        onComplete('✓ Sandbox enabled with regular bash permissions')
-        break
+        });
+        onComplete('✓ Sandbox enabled with regular bash permissions');
+        break;
       case 'disabled':
         await SandboxManager.setSandboxSettings({
           enabled: false,
           autoAllowBashIfSandboxed: false,
-        })
-        onComplete('○ Sandbox disabled')
-        break
+        });
+        onComplete('○ Sandbox disabled');
+        break;
     }
   }
 
@@ -100,7 +91,7 @@ export function SandboxSettings({
       'confirm:no': () => onComplete(undefined, { display: 'skip' }),
     },
     { context: 'Settings' },
-  )
+  );
 
   const modeTab = (
     <Tab key="mode" title="Mode">
@@ -111,21 +102,21 @@ export function SandboxSettings({
         onComplete={onComplete}
       />
     </Tab>
-  )
+  );
 
   const overridesTab = (
     <Tab key="overrides" title="Overrides">
       <SandboxOverridesTab onComplete={onComplete} />
     </Tab>
-  )
+  );
 
   const configTab = (
     <Tab key="config" title="Config">
       <SandboxConfigTab />
     </Tab>
-  )
+  );
 
-  const hasErrors = depCheck.errors.length > 0
+  const hasErrors = depCheck.errors.length > 0;
 
   // If required deps missing, only show Dependencies tab
   // If only optional deps missing, show all tabs
@@ -146,7 +137,7 @@ export function SandboxSettings({
           : []),
         overridesTab,
         configTab,
-      ]
+      ];
 
   return (
     <Pane color="permission">
@@ -154,7 +145,7 @@ export function SandboxSettings({
         {tabs}
       </Tabs>
     </Pane>
-  )
+  );
 }
 
 function SandboxModeTab({
@@ -163,19 +154,17 @@ function SandboxModeTab({
   onSelect,
   onComplete,
 }: {
-  showSocketWarning: boolean
-  options: Array<{ label: string; value: string }>
-  onSelect: (value: string) => void
-  onComplete: Props['onComplete']
+  showSocketWarning: boolean;
+  options: Array<{ label: string; value: string }>;
+  onSelect: (value: string) => void;
+  onComplete: Props['onComplete'];
 }): React.ReactNode {
-  const { headerFocused, focusHeader } = useTabHeaderFocus()
+  const { headerFocused, focusHeader } = useTabHeaderFocus();
   return (
     <Box flexDirection="column" paddingY={1}>
       {showSocketWarning && (
         <Box marginBottom={1}>
-          <Text color="warning">
-            Cannot block unix domain sockets (see Dependencies tab)
-          </Text>
+          <Text color="warning">Cannot block unix domain sockets (see Dependencies tab)</Text>
         </Box>
       )}
       <Box marginBottom={1}>
@@ -193,17 +182,13 @@ function SandboxModeTab({
           <Text bold dimColor>
             Auto-allow mode:
           </Text>{' '}
-          Commands will try to run in the sandbox automatically, and attempts to
-          run outside of the sandbox fallback to regular permissions. Explicit
-          ask/deny rules are always respected.
+          Commands will try to run in the sandbox automatically, and attempts to run outside of the sandbox fallback to
+          regular permissions. Explicit ask/deny rules are always respected.
         </Text>
         <Text dimColor>
-          Learn more:{' '}
-          <Link url="https://code.claude.com/docs/en/sandboxing">
-            code.claude.com/docs/en/sandboxing
-          </Link>
+          Learn more: <Link url="https://code.claude.com/docs/en/sandboxing">code.claude.com/docs/en/sandboxing</Link>
         </Text>
       </Box>
     </Box>
-  )
+  );
 }
diff --git a/src/components/shell/ExpandShellOutputContext.tsx b/src/components/shell/ExpandShellOutputContext.tsx
index cc6628b64..4398d8e47 100644
--- a/src/components/shell/ExpandShellOutputContext.tsx
+++ b/src/components/shell/ExpandShellOutputContext.tsx
@@ -1,5 +1,5 @@
-import * as React from 'react'
-import { useContext } from 'react'
+import * as React from 'react';
+import { useContext } from 'react';
 
 /**
  * Context to indicate that shell output should be shown in full (not truncated).
@@ -8,18 +8,10 @@ import { useContext } from 'react'
  * This follows the same pattern as MessageResponseContext and SubAgentContext -
  * a boolean context that child components can check to modify their behavior.
  */
-const ExpandShellOutputContext = React.createContext(false)
+const ExpandShellOutputContext = React.createContext(false);
 
-export function ExpandShellOutputProvider({
-  children,
-}: {
-  children: React.ReactNode
-}): React.ReactNode {
-  return (
-    <ExpandShellOutputContext.Provider value={true}>
-      {children}
-    </ExpandShellOutputContext.Provider>
-  )
+export function ExpandShellOutputProvider({ children }: { children: React.ReactNode }): React.ReactNode {
+  return <ExpandShellOutputContext.Provider value={true}>{children}</ExpandShellOutputContext.Provider>;
 }
 
 /**
@@ -27,5 +19,5 @@ export function ExpandShellOutputProvider({
  * indicating the shell output should be shown in full rather than truncated.
  */
 export function useExpandShellOutput(): boolean {
-  return useContext(ExpandShellOutputContext)
+  return useContext(ExpandShellOutputContext);
 }
diff --git a/src/components/shell/OutputLine.tsx b/src/components/shell/OutputLine.tsx
index 0b2c280af..615239c37 100644
--- a/src/components/shell/OutputLine.tsx
+++ b/src/components/shell/OutputLine.tsx
@@ -1,54 +1,54 @@
-import * as React from 'react'
-import { useMemo } from 'react'
-import { useTerminalSize } from '../../hooks/useTerminalSize.js'
-import { Ansi, Text } from '@anthropic/ink'
-import { createHyperlink } from '../../utils/hyperlink.js'
+import * as React from 'react';
+import { useMemo } from 'react';
+import { useTerminalSize } from '../../hooks/useTerminalSize.js';
+import { Ansi, Text } from '@anthropic/ink';
+import { createHyperlink } from '../../utils/hyperlink.js';
 
-import { jsonParse, jsonStringify } from '../../utils/slowOperations.js'
-import { renderTruncatedContent } from '../../utils/terminal.js'
-import { MessageResponse } from '../MessageResponse.js'
-import { InVirtualListContext } from '../messageActions.js'
-import { useExpandShellOutput } from './ExpandShellOutputContext.js'
+import { jsonParse, jsonStringify } from '../../utils/slowOperations.js';
+import { renderTruncatedContent } from '../../utils/terminal.js';
+import { MessageResponse } from '../MessageResponse.js';
+import { InVirtualListContext } from '../messageActions.js';
+import { useExpandShellOutput } from './ExpandShellOutputContext.js';
 
 export function tryFormatJson(line: string): string {
   try {
-    const parsed = jsonParse(line)
-    const stringified = jsonStringify(parsed)
+    const parsed = jsonParse(line);
+    const stringified = jsonStringify(parsed);
 
     // Check if precision was lost during JSON round-trip
     // This happens when large integers exceed Number.MAX_SAFE_INTEGER
     // We normalize both strings by removing whitespace and unnecessary
     // escapes (\/ is valid but optional in JSON) for comparison
-    const normalizedOriginal = line.replace(/\\\//g, '/').replace(/\s+/g, '')
-    const normalizedStringified = stringified.replace(/\s+/g, '')
+    const normalizedOriginal = line.replace(/\\\//g, '/').replace(/\s+/g, '');
+    const normalizedStringified = stringified.replace(/\s+/g, '');
 
     if (normalizedOriginal !== normalizedStringified) {
       // Precision loss detected - return original line unformatted
-      return line
+      return line;
     }
 
-    return jsonStringify(parsed, null, 2)
+    return jsonStringify(parsed, null, 2);
   } catch {
-    return line
+    return line;
   }
 }
 
-const MAX_JSON_FORMAT_LENGTH = 10_000
+const MAX_JSON_FORMAT_LENGTH = 10_000;
 
 export function tryJsonFormatContent(content: string): string {
   if (content.length > MAX_JSON_FORMAT_LENGTH) {
-    return content
+    return content;
   }
-  const allLines = content.split('\n')
-  return allLines.map(tryFormatJson).join('\n')
+  const allLines = content.split('\n');
+  return allLines.map(tryFormatJson).join('\n');
 }
 
 // Match http(s) URLs inside JSON string values. Conservative: no quotes,
 // no whitespace, no trailing comma/brace that'd be JSON structure.
-const URL_IN_JSON = /https?:\/\/[^\s"'<>\\]+/g
+const URL_IN_JSON = /https?:\/\/[^\s"'<>\\]+/g;
 
 export function linkifyUrlsInText(content: string): string {
-  return content.replace(URL_IN_JSON, url => createHyperlink(url))
+  return content.replace(URL_IN_JSON, url => createHyperlink(url));
 }
 
 export function OutputLine({
@@ -58,34 +58,32 @@ export function OutputLine({
   isWarning,
   linkifyUrls,
 }: {
-  content: string
-  verbose: boolean
-  isError?: boolean
-  isWarning?: boolean
-  linkifyUrls?: boolean
+  content: string;
+  verbose: boolean;
+  isError?: boolean;
+  isWarning?: boolean;
+  linkifyUrls?: boolean;
 }): React.ReactNode {
-  const { columns } = useTerminalSize()
+  const { columns } = useTerminalSize();
   // Context-based expansion for latest user shell output (from ! commands)
-  const expandShellOutput = useExpandShellOutput()
-  const inVirtualList = React.useContext(InVirtualListContext)
+  const expandShellOutput = useExpandShellOutput();
+  const inVirtualList = React.useContext(InVirtualListContext);
 
   // Show full output if verbose mode OR if this is the latest user shell output
-  const shouldShowFull = verbose || expandShellOutput
+  const shouldShowFull = verbose || expandShellOutput;
 
   const formattedContent = useMemo(() => {
-    let formatted = tryJsonFormatContent(content)
+    let formatted = tryJsonFormatContent(content);
     if (linkifyUrls) {
-      formatted = linkifyUrlsInText(formatted)
+      formatted = linkifyUrlsInText(formatted);
     }
     if (shouldShowFull) {
-      return stripUnderlineAnsi(formatted)
+      return stripUnderlineAnsi(formatted);
     }
-    return stripUnderlineAnsi(
-      renderTruncatedContent(formatted, columns, inVirtualList),
-    )
-  }, [content, shouldShowFull, columns, linkifyUrls, inVirtualList])
+    return stripUnderlineAnsi(renderTruncatedContent(formatted, columns, inVirtualList));
+  }, [content, shouldShowFull, columns, linkifyUrls, inVirtualList]);
 
-  const color = isError ? 'error' : isWarning ? 'warning' : undefined
+  const color = isError ? 'error' : isWarning ? 'warning' : undefined;
 
   return (
     <MessageResponse>
@@ -93,7 +91,7 @@ export function OutputLine({
         <Ansi>{formattedContent}</Ansi>
       </Text>
     </MessageResponse>
-  )
+  );
 }
 
 /**
@@ -106,7 +104,8 @@ export function OutputLine({
 export function stripUnderlineAnsi(content: string): string {
   return content.replace(
     // eslint-disable-next-line no-control-regex
+    // biome-ignore lint/suspicious/noControlCharactersInRegex: intentional ANSI escape code regex
     /\u001b\[([0-9]+;)*4(;[0-9]+)*m|\u001b\[4(;[0-9]+)*m|\u001b\[([0-9]+;)*4m/g,
     '',
-  )
+  );
 }
diff --git a/src/components/shell/ShellProgressMessage.tsx b/src/components/shell/ShellProgressMessage.tsx
index a99bdbd0d..e8aada93e 100644
--- a/src/components/shell/ShellProgressMessage.tsx
+++ b/src/components/shell/ShellProgressMessage.tsx
@@ -1,21 +1,21 @@
-import React from 'react'
-import stripAnsi from 'strip-ansi'
-import { Box, Text } from '@anthropic/ink'
-import { formatFileSize } from '../../utils/format.js'
-import { MessageResponse } from '../MessageResponse.js'
-import { OffscreenFreeze } from '../OffscreenFreeze.js'
-import { ShellTimeDisplay } from './ShellTimeDisplay.js'
+import React from 'react';
+import stripAnsi from 'strip-ansi';
+import { Box, Text } from '@anthropic/ink';
+import { formatFileSize } from '../../utils/format.js';
+import { MessageResponse } from '../MessageResponse.js';
+import { OffscreenFreeze } from '../OffscreenFreeze.js';
+import { ShellTimeDisplay } from './ShellTimeDisplay.js';
 
 type Props = {
-  output: string
-  fullOutput: string
-  elapsedTimeSeconds?: number
-  totalLines?: number
-  totalBytes?: number
-  timeoutMs?: number
-  taskId?: string
-  verbose: boolean
-}
+  output: string;
+  fullOutput: string;
+  elapsedTimeSeconds?: number;
+  totalLines?: number;
+  totalBytes?: number;
+  timeoutMs?: number;
+  taskId?: string;
+  verbose: boolean;
+};
 
 export function ShellProgressMessage({
   output,
@@ -26,10 +26,10 @@ export function ShellProgressMessage({
   timeoutMs,
   verbose,
 }: Props): React.ReactNode {
-  const strippedFullOutput = stripAnsi(fullOutput.trim())
-  const strippedOutput = stripAnsi(output.trim())
-  const lines = strippedOutput.split('\n').filter(line => line)
-  const displayLines = verbose ? strippedFullOutput : lines.slice(-5).join('\n')
+  const strippedFullOutput = stripAnsi(fullOutput.trim());
+  const strippedOutput = stripAnsi(output.trim());
+  const lines = strippedOutput.split('\n').filter(line => line);
+  const displayLines = verbose ? strippedFullOutput : lines.slice(-5).join('\n');
 
   // OffscreenFreeze: BashTool yields progress (elapsedTimeSeconds) every second.
   // If this line scrolls into scrollback, each tick forces a full terminal reset.
@@ -40,48 +40,36 @@ export function ShellProgressMessage({
       <MessageResponse>
         <OffscreenFreeze>
           <Text dimColor>Running… </Text>
-          <ShellTimeDisplay
-            elapsedTimeSeconds={elapsedTimeSeconds}
-            timeoutMs={timeoutMs}
-          />
+          <ShellTimeDisplay elapsedTimeSeconds={elapsedTimeSeconds} timeoutMs={timeoutMs} />
         </OffscreenFreeze>
       </MessageResponse>
-    )
+    );
   }
 
   // Not truncated: "+2 lines" (total exceeds displayed 5)
   // Truncated:     "~2000 lines" (extrapolated estimate from tail sample)
-  const extraLines = totalLines ? Math.max(0, totalLines - 5) : 0
-  let lineStatus = ''
+  const extraLines = totalLines ? Math.max(0, totalLines - 5) : 0;
+  let lineStatus = '';
   if (!verbose && totalBytes && totalLines) {
-    lineStatus = `~${totalLines} lines`
+    lineStatus = `~${totalLines} lines`;
   } else if (!verbose && extraLines > 0) {
-    lineStatus = `+${extraLines} lines`
+    lineStatus = `+${extraLines} lines`;
   }
 
   return (
     <MessageResponse>
       <OffscreenFreeze>
         <Box flexDirection="column">
-          <Box
-            height={verbose ? undefined : Math.min(5, lines.length)}
-            flexDirection="column"
-            overflow="hidden"
-          >
+          <Box height={verbose ? undefined : Math.min(5, lines.length)} flexDirection="column" overflow="hidden">
             <Text dimColor>{displayLines}</Text>
           </Box>
           <Box flexDirection="row" gap={1}>
             {lineStatus ? <Text dimColor>{lineStatus}</Text> : null}
-            <ShellTimeDisplay
-              elapsedTimeSeconds={elapsedTimeSeconds}
-              timeoutMs={timeoutMs}
-            />
-            {totalBytes ? (
-              <Text dimColor>{formatFileSize(totalBytes)}</Text>
-            ) : null}
+            <ShellTimeDisplay elapsedTimeSeconds={elapsedTimeSeconds} timeoutMs={timeoutMs} />
+            {totalBytes ? <Text dimColor>{formatFileSize(totalBytes)}</Text> : null}
           </Box>
         </Box>
       </OffscreenFreeze>
     </MessageResponse>
-  )
+  );
 }
diff --git a/src/components/shell/ShellTimeDisplay.tsx b/src/components/shell/ShellTimeDisplay.tsx
index 67b5c373a..32fff276e 100644
--- a/src/components/shell/ShellTimeDisplay.tsx
+++ b/src/components/shell/ShellTimeDisplay.tsx
@@ -1,28 +1,23 @@
-import React from 'react'
-import { Text } from '@anthropic/ink'
-import { formatDuration } from '../../utils/format.js'
+import React from 'react';
+import { Text } from '@anthropic/ink';
+import { formatDuration } from '../../utils/format.js';
 
 type Props = {
-  elapsedTimeSeconds?: number
-  timeoutMs?: number
-}
+  elapsedTimeSeconds?: number;
+  timeoutMs?: number;
+};
 
-export function ShellTimeDisplay({
-  elapsedTimeSeconds,
-  timeoutMs,
-}: Props): React.ReactNode {
+export function ShellTimeDisplay({ elapsedTimeSeconds, timeoutMs }: Props): React.ReactNode {
   if (elapsedTimeSeconds === undefined && !timeoutMs) {
-    return null
+    return null;
   }
-  const timeout = timeoutMs
-    ? formatDuration(timeoutMs, { hideTrailingZeros: true })
-    : undefined
+  const timeout = timeoutMs ? formatDuration(timeoutMs, { hideTrailingZeros: true }) : undefined;
   if (elapsedTimeSeconds === undefined) {
-    return <Text dimColor>{`(timeout ${timeout})`}</Text>
+    return <Text dimColor>{`(timeout ${timeout})`}</Text>;
   }
-  const elapsed = formatDuration(elapsedTimeSeconds * 1000)
+  const elapsed = formatDuration(elapsedTimeSeconds * 1000);
   if (timeout) {
-    return <Text dimColor>{`(${elapsed} · timeout ${timeout})`}</Text>
+    return <Text dimColor>{`(${elapsed} · timeout ${timeout})`}</Text>;
   }
-  return <Text dimColor>{`(${elapsed})`}</Text>
+  return <Text dimColor>{`(${elapsed})`}</Text>;
 }
diff --git a/src/components/skills/SkillsMenu.tsx b/src/components/skills/SkillsMenu.tsx
index 6bbf48bf2..c14e02a27 100644
--- a/src/components/skills/SkillsMenu.tsx
+++ b/src/components/skills/SkillsMenu.tsx
@@ -1,56 +1,44 @@
-import capitalize from 'lodash-es/capitalize.js'
-import * as React from 'react'
-import { useMemo } from 'react'
+import capitalize from 'lodash-es/capitalize.js';
+import * as React from 'react';
+import { useMemo } from 'react';
 import {
   type Command,
   type CommandBase,
   type CommandResultDisplay,
   getCommandName,
   type PromptCommand,
-} from '../../commands.js'
-import { Box, Text } from '@anthropic/ink'
-import type { Theme } from '@anthropic/ink'
-import {
-  estimateSkillFrontmatterTokens,
-  getSkillsPath,
-} from '../../skills/loadSkillsDir.js'
-import { getDisplayPath } from '../../utils/file.js'
-import { formatTokens } from '../../utils/format.js'
-import {
-  getSettingSourceName,
-  type SettingSource,
-} from '../../utils/settings/constants.js'
-import { plural } from '../../utils/stringUtils.js'
-import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js'
-import { Dialog } from '@anthropic/ink'
+} from '../../commands.js';
+import { Box, Text } from '@anthropic/ink';
+import type { Theme } from '@anthropic/ink';
+import { estimateSkillFrontmatterTokens, getSkillsPath } from '../../skills/loadSkillsDir.js';
+import { getDisplayPath } from '../../utils/file.js';
+import { formatTokens } from '../../utils/format.js';
+import { getSettingSourceName, type SettingSource } from '../../utils/settings/constants.js';
+import { plural } from '../../utils/stringUtils.js';
+import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js';
+import { Dialog } from '@anthropic/ink';
 
 // Skills are always PromptCommands with CommandBase properties
-type SkillCommand = CommandBase & PromptCommand
+type SkillCommand = CommandBase & PromptCommand;
 
-type SkillSource = SettingSource | 'plugin' | 'mcp'
+type SkillSource = SettingSource | 'plugin' | 'mcp';
 
 type Props = {
-  onExit: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-  commands: Command[]
-}
+  onExit: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+  commands: Command[];
+};
 
 function getSourceTitle(source: SkillSource): string {
   if (source === 'plugin') {
-    return 'Plugin skills'
+    return 'Plugin skills';
   }
   if (source === 'mcp') {
-    return 'MCP skills'
+    return 'MCP skills';
   }
-  return `${capitalize(getSettingSourceName(source))} skills`
+  return `${capitalize(getSettingSourceName(source))} skills`;
 }
 
-function getSourceSubtitle(
-  source: SkillSource,
-  skills: SkillCommand[],
-): string | undefined {
+function getSourceSubtitle(source: SkillSource, skills: SkillCommand[]): string | undefined {
   // MCP skills show server names; file-based skills show filesystem paths.
   // Skill names are `<server>:<skill>`, not `mcp__<server>__…`.
   if (source === 'mcp') {
@@ -58,21 +46,17 @@ function getSourceSubtitle(
       ...new Set(
         skills
           .map(s => {
-            const idx = s.name.indexOf(':')
-            return idx > 0 ? s.name.slice(0, idx) : null
+            const idx = s.name.indexOf(':');
+            return idx > 0 ? s.name.slice(0, idx) : null;
           })
           .filter((n): n is string => n != null),
       ),
-    ]
-    return servers.length > 0 ? servers.join(', ') : undefined
+    ];
+    return servers.length > 0 ? servers.join(', ') : undefined;
   }
-  const skillsPath = getDisplayPath(getSkillsPath(source, 'skills'))
-  const hasCommandsSkills = skills.some(
-    s => s.loadedFrom === 'commands_DEPRECATED',
-  )
-  return hasCommandsSkills
-    ? `${skillsPath}, ${getDisplayPath(getSkillsPath(source, 'commands'))}`
-    : skillsPath
+  const skillsPath = getDisplayPath(getSkillsPath(source, 'skills'));
+  const hasCommandsSkills = skills.some(s => s.loadedFrom === 'commands_DEPRECATED');
+  return hasCommandsSkills ? `${skillsPath}, ${getDisplayPath(getSkillsPath(source, 'commands'))}` : skillsPath;
 }
 
 export function SkillsMenu({ onExit, commands }: Props): React.ReactNode {
@@ -85,8 +69,8 @@ export function SkillsMenu({ onExit, commands }: Props): React.ReactNode {
           cmd.loadedFrom === 'commands_DEPRECATED' ||
           cmd.loadedFrom === 'plugin' ||
           cmd.loadedFrom === 'mcp'),
-    )
-  }, [commands])
+    );
+  }, [commands]);
 
   const skillsBySource = useMemo((): Record<SkillSource, SkillCommand[]> => {
     const groups: Record<SkillSource, SkillCommand[]> = {
@@ -97,95 +81,74 @@ export function SkillsMenu({ onExit, commands }: Props): React.ReactNode {
       flagSettings: [],
       plugin: [],
       mcp: [],
-    }
+    };
 
     for (const skill of skills) {
-      const source = skill.source as SkillSource
+      const source = skill.source as SkillSource;
       if (source in groups) {
-        groups[source].push(skill)
+        groups[source].push(skill);
       }
     }
 
     for (const group of Object.values(groups)) {
-      group.sort((a, b) => getCommandName(a).localeCompare(getCommandName(b)))
+      group.sort((a, b) => getCommandName(a).localeCompare(getCommandName(b)));
     }
 
-    return groups
-  }, [skills])
+    return groups;
+  }, [skills]);
 
   const handleCancel = (): void => {
-    onExit('Skills dialog dismissed', { display: 'system' })
-  }
+    onExit('Skills dialog dismissed', { display: 'system' });
+  };
 
   if (skills.length === 0) {
     return (
-      <Dialog
-        title="Skills"
-        subtitle="No skills found"
-        onCancel={handleCancel}
-        hideInputGuide
-      >
-        <Text dimColor>
-          Create skills in .claude/skills/ or ~/.claude/skills/
-        </Text>
+      <Dialog title="Skills" subtitle="No skills found" onCancel={handleCancel} hideInputGuide>
+        <Text dimColor>Create skills in .claude/skills/ or ~/.claude/skills/</Text>
         <Text dimColor italic>
-          <ConfigurableShortcutHint
-            action="confirm:no"
-            context="Confirmation"
-            fallback="Esc"
-            description="close"
-          />
+          <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="close" />
         </Text>
       </Dialog>
-    )
+    );
   }
 
-  const getScopeTag = (
-    source: string,
-  ): { label: string; color: string } | undefined => {
+  const getScopeTag = (source: string): { label: string; color: string } | undefined => {
     switch (source) {
       case 'projectSettings':
       case 'localSettings':
-        return { label: 'local', color: 'yellow' }
+        return { label: 'local', color: 'yellow' };
       case 'userSettings':
-        return { label: 'global', color: 'cyan' }
+        return { label: 'global', color: 'cyan' };
       case 'policySettings':
-        return { label: 'managed', color: 'magenta' }
+        return { label: 'managed', color: 'magenta' };
       default:
-        return undefined
+        return undefined;
     }
-  }
+  };
 
   const renderSkill = (skill: SkillCommand) => {
-    const estimatedTokens = estimateSkillFrontmatterTokens(skill)
-    const tokenDisplay = `~${formatTokens(estimatedTokens)}`
-    const pluginName =
-      skill.source === 'plugin'
-        ? skill.pluginInfo?.pluginManifest.name
-        : undefined
-    const scopeTag = getScopeTag(skill.source)
+    const estimatedTokens = estimateSkillFrontmatterTokens(skill);
+    const tokenDisplay = `~${formatTokens(estimatedTokens)}`;
+    const pluginName = skill.source === 'plugin' ? skill.pluginInfo?.pluginManifest.name : undefined;
+    const scopeTag = getScopeTag(skill.source);
 
     return (
       <Box key={`${skill.name}-${skill.source}`}>
         <Text>{getCommandName(skill)}</Text>
-        {scopeTag && (
-          <Text color={scopeTag.color as keyof Theme}> [{scopeTag.label}]</Text>
-
-        )}
+        {scopeTag && <Text color={scopeTag.color as keyof Theme}> [{scopeTag.label}]</Text>}
         <Text dimColor>
-          {pluginName ? ` · ${pluginName}` : ''} · {tokenDisplay} description
-          tokens
+          {pluginName ? ` · ${pluginName}` : ''} · {tokenDisplay} description tokens
         </Text>
       </Box>
-    )
-  }
+    );
+  };
 
   const renderSkillGroup = (source: SkillSource) => {
-    const groupSkills = skillsBySource[source]
-    if (groupSkills.length === 0) return null
+    const groupSkills = skillsBySource[source];
+    if (groupSkills.length === 0) return null;
 
-    const title = getSourceTitle(source)
-    const subtitle = getSourceSubtitle(source, groupSkills)
+    const title = getSourceTitle(source);
+    const subtitle = getSourceSubtitle(source, groupSkills);
 
     return (
       <Box flexDirection="column" key={source}>
@@ -197,8 +160,8 @@ export function SkillsMenu({ onExit, commands }: Props): React.ReactNode {
         </Box>
         {groupSkills.map(skill => renderSkill(skill))}
       </Box>
-    )
-  }
+    );
+  };
 
   return (
     <Dialog
@@ -217,13 +180,8 @@ export function SkillsMenu({ onExit, commands }: Props): React.ReactNode {
         {renderSkillGroup('mcp')}
       </Box>
       <Text dimColor italic>
-        <ConfigurableShortcutHint
-          action="confirm:no"
-          context="Confirmation"
-          fallback="Esc"
-          description="close"
-        />
+        <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="close" />
       </Text>
     </Dialog>
-  )
+  );
 }
diff --git a/src/components/src/bootstrap/state.ts b/src/components/src/bootstrap/state.ts
index c6af340fa..b274336b7 100644
--- a/src/components/src/bootstrap/state.ts
+++ b/src/components/src/bootstrap/state.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getLastAPIRequest = any;
+export type getLastAPIRequest = any
diff --git a/src/components/src/commands.ts b/src/components/src/commands.ts
index 8552dd207..4d2f681ce 100644
--- a/src/components/src/commands.ts
+++ b/src/components/src/commands.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type CommandResultDisplay = any;
+export type CommandResultDisplay = any
diff --git a/src/components/src/components/shell/OutputLine.ts b/src/components/src/components/shell/OutputLine.ts
index 9c5093c9a..fbd140f05 100644
--- a/src/components/src/components/shell/OutputLine.ts
+++ b/src/components/src/components/shell/OutputLine.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type stripUnderlineAnsi = any;
+export type stripUnderlineAnsi = any
diff --git a/src/components/src/hooks/useExitOnCtrlCDWithKeybindings.ts b/src/components/src/hooks/useExitOnCtrlCDWithKeybindings.ts
index 38810d68c..317a9c014 100644
--- a/src/components/src/hooks/useExitOnCtrlCDWithKeybindings.ts
+++ b/src/components/src/hooks/useExitOnCtrlCDWithKeybindings.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useExitOnCtrlCDWithKeybindings = any;
+export type useExitOnCtrlCDWithKeybindings = any
diff --git a/src/components/src/hooks/useTerminalSize.ts b/src/components/src/hooks/useTerminalSize.ts
index 4a0ef3ea3..fdaf2e999 100644
--- a/src/components/src/hooks/useTerminalSize.ts
+++ b/src/components/src/hooks/useTerminalSize.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useTerminalSize = any;
+export type useTerminalSize = any
diff --git a/src/components/src/services/analytics/firstPartyEventLogger.ts b/src/components/src/services/analytics/firstPartyEventLogger.ts
index 3387d83a1..5791e6926 100644
--- a/src/components/src/services/analytics/firstPartyEventLogger.ts
+++ b/src/components/src/services/analytics/firstPartyEventLogger.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type logEventTo1P = any;
+export type logEventTo1P = any
diff --git a/src/components/src/services/analytics/index.ts b/src/components/src/services/analytics/index.ts
index ce0a9a827..eca4493cf 100644
--- a/src/components/src/services/analytics/index.ts
+++ b/src/components/src/services/analytics/index.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type logEvent = any;
-export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any;
+export type logEvent = any
+export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any
diff --git a/src/components/src/state/AppState.ts b/src/components/src/state/AppState.ts
index cc3978f9a..53048a173 100644
--- a/src/components/src/state/AppState.ts
+++ b/src/components/src/state/AppState.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type useAppState = any;
-export type useSetAppState = any;
+export type useAppState = any
+export type useSetAppState = any
diff --git a/src/components/src/tools/FileEditTool/types.ts b/src/components/src/tools/FileEditTool/types.ts
index 077f10550..bc2085aba 100644
--- a/src/components/src/tools/FileEditTool/types.ts
+++ b/src/components/src/tools/FileEditTool/types.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type FileEditOutput = any;
+export type FileEditOutput = any
diff --git a/src/components/src/tools/FileWriteTool/FileWriteTool.ts b/src/components/src/tools/FileWriteTool/FileWriteTool.ts
index 50716571f..3a75203ed 100644
--- a/src/components/src/tools/FileWriteTool/FileWriteTool.ts
+++ b/src/components/src/tools/FileWriteTool/FileWriteTool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type Output = any;
+export type Output = any
diff --git a/src/components/src/utils/background/remote/preconditions.ts b/src/components/src/utils/background/remote/preconditions.ts
index 4c7df781f..e35b2da52 100644
--- a/src/components/src/utils/background/remote/preconditions.ts
+++ b/src/components/src/utils/background/remote/preconditions.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type checkIsGitClean = any;
-export type checkNeedsClaudeAiLogin = any;
+export type checkIsGitClean = any
+export type checkNeedsClaudeAiLogin = any
diff --git a/src/components/src/utils/conversationRecovery.ts b/src/components/src/utils/conversationRecovery.ts
index ecd18bdac..4a003ab02 100644
--- a/src/components/src/utils/conversationRecovery.ts
+++ b/src/components/src/utils/conversationRecovery.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type TeleportRemoteResponse = any;
+export type TeleportRemoteResponse = any
diff --git a/src/components/src/utils/cwd.ts b/src/components/src/utils/cwd.ts
index 76c192ed8..4bd56a824 100644
--- a/src/components/src/utils/cwd.ts
+++ b/src/components/src/utils/cwd.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getCwd = any;
+export type getCwd = any
diff --git a/src/components/src/utils/debug.ts b/src/components/src/utils/debug.ts
index c64d5960c..5a0f1d515 100644
--- a/src/components/src/utils/debug.ts
+++ b/src/components/src/utils/debug.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type logForDebugging = any;
+export type logForDebugging = any
diff --git a/src/components/src/utils/envDynamic.ts b/src/components/src/utils/envDynamic.ts
index f97791718..f3eea282f 100644
--- a/src/components/src/utils/envDynamic.ts
+++ b/src/components/src/utils/envDynamic.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type envDynamic = any;
+export type envDynamic = any
diff --git a/src/components/src/utils/fastMode.ts b/src/components/src/utils/fastMode.ts
index cf4c9c15a..1c0638137 100644
--- a/src/components/src/utils/fastMode.ts
+++ b/src/components/src/utils/fastMode.ts
@@ -1,5 +1,5 @@
 // Auto-generated type stub — replace with real implementation
-export type FAST_MODE_MODEL_DISPLAY = any;
-export type isFastModeAvailable = any;
-export type isFastModeCooldown = any;
-export type isFastModeEnabled = any;
+export type FAST_MODE_MODEL_DISPLAY = any
+export type isFastModeAvailable = any
+export type isFastModeCooldown = any
+export type isFastModeEnabled = any
diff --git a/src/components/src/utils/fileHistory.ts b/src/components/src/utils/fileHistory.ts
index d3a0a3eb9..e1afb14d8 100644
--- a/src/components/src/utils/fileHistory.ts
+++ b/src/components/src/utils/fileHistory.ts
@@ -1,5 +1,5 @@
 // Auto-generated type stub — replace with real implementation
-export type DiffStats = any;
-export type fileHistoryCanRestore = any;
-export type fileHistoryEnabled = any;
-export type fileHistoryGetDiffStats = any;
+export type DiffStats = any
+export type fileHistoryCanRestore = any
+export type fileHistoryEnabled = any
+export type fileHistoryGetDiffStats = any
diff --git a/src/components/src/utils/gracefulShutdown.ts b/src/components/src/utils/gracefulShutdown.ts
index 6b72be424..58d9f0c53 100644
--- a/src/components/src/utils/gracefulShutdown.ts
+++ b/src/components/src/utils/gracefulShutdown.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type gracefulShutdown = any;
-export type gracefulShutdownSync = any;
+export type gracefulShutdown = any
+export type gracefulShutdownSync = any
diff --git a/src/components/src/utils/log.ts b/src/components/src/utils/log.ts
index cf30e90da..30df9cbcb 100644
--- a/src/components/src/utils/log.ts
+++ b/src/components/src/utils/log.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type logError = any;
+export type logError = any
diff --git a/src/components/src/utils/messages.ts b/src/components/src/utils/messages.ts
index e84ec855e..86ae0f462 100644
--- a/src/components/src/utils/messages.ts
+++ b/src/components/src/utils/messages.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type extractTag = any;
-export type getLastAssistantMessage = any;
-export type normalizeMessagesForAPI = any;
+export type extractTag = any
+export type getLastAssistantMessage = any
+export type normalizeMessagesForAPI = any
diff --git a/src/components/src/utils/permissions/PermissionMode.ts b/src/components/src/utils/permissions/PermissionMode.ts
index 1bc6199f9..799935c26 100644
--- a/src/components/src/utils/permissions/PermissionMode.ts
+++ b/src/components/src/utils/permissions/PermissionMode.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type PermissionMode = any;
+export type PermissionMode = any
diff --git a/src/components/src/utils/platform.ts b/src/components/src/utils/platform.ts
index b6686f812..c7486cc77 100644
--- a/src/components/src/utils/platform.ts
+++ b/src/components/src/utils/platform.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getPlatform = any;
+export type getPlatform = any
diff --git a/src/components/src/utils/process.ts b/src/components/src/utils/process.ts
index 4fde4749b..15c34582e 100644
--- a/src/components/src/utils/process.ts
+++ b/src/components/src/utils/process.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type writeToStdout = any;
+export type writeToStdout = any
diff --git a/src/components/src/utils/sandbox/sandbox-ui-utils.ts b/src/components/src/utils/sandbox/sandbox-ui-utils.ts
index f514e53a9..a008b1faa 100644
--- a/src/components/src/utils/sandbox/sandbox-ui-utils.ts
+++ b/src/components/src/utils/sandbox/sandbox-ui-utils.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type removeSandboxViolationTags = any;
+export type removeSandboxViolationTags = any
diff --git a/src/components/src/utils/set.ts b/src/components/src/utils/set.ts
index 9450ee339..06eae7cc6 100644
--- a/src/components/src/utils/set.ts
+++ b/src/components/src/utils/set.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type every = any;
+export type every = any
diff --git a/src/components/src/utils/teleport/api.ts b/src/components/src/utils/teleport/api.ts
index d532f65b9..de2d2167c 100644
--- a/src/components/src/utils/teleport/api.ts
+++ b/src/components/src/utils/teleport/api.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type CodeSession = any;
-export type fetchCodeSessionsFromSessionsAPI = any;
+export type CodeSession = any
+export type fetchCodeSessionsFromSessionsAPI = any
diff --git a/src/components/src/utils/theme.ts b/src/components/src/utils/theme.ts
index c6999a678..833b24799 100644
--- a/src/components/src/utils/theme.ts
+++ b/src/components/src/utils/theme.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type Theme = any;
+export type Theme = any
diff --git a/src/components/tasks/AsyncAgentDetailDialog.tsx b/src/components/tasks/AsyncAgentDetailDialog.tsx
index 2070b9a68..0d1d66243 100644
--- a/src/components/tasks/AsyncAgentDetailDialog.tsx
+++ b/src/components/tasks/AsyncAgentDetailDialog.tsx
@@ -1,42 +1,32 @@
-import React, { useMemo } from 'react'
-import type { DeepImmutable } from 'src/types/utils.js'
-import { useElapsedTime } from '../../hooks/useElapsedTime.js'
-import { type KeyboardEvent, Box, Text, useTheme } from '@anthropic/ink'
-import { useKeybindings } from '../../keybindings/useKeybinding.js'
-import { getEmptyToolPermissionContext } from '../../Tool.js'
-import type { LocalAgentTaskState } from '../../tasks/LocalAgentTask/LocalAgentTask.js'
-import { getTools } from '../../tools.js'
-import { formatNumber } from '../../utils/format.js'
-import { extractTag } from '../../utils/messages.js'
-import { Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink'
-import { UserPlanMessage } from '../messages/UserPlanMessage.js'
-import { renderToolActivity } from './renderToolActivity.js'
-import { getTaskStatusColor, getTaskStatusIcon } from './taskStatusUtils.js'
+import React, { useMemo } from 'react';
+import type { DeepImmutable } from 'src/types/utils.js';
+import { useElapsedTime } from '../../hooks/useElapsedTime.js';
+import { type KeyboardEvent, Box, Text, useTheme } from '@anthropic/ink';
+import { useKeybindings } from '../../keybindings/useKeybinding.js';
+import { getEmptyToolPermissionContext } from '../../Tool.js';
+import type { LocalAgentTaskState } from '../../tasks/LocalAgentTask/LocalAgentTask.js';
+import { getTools } from '../../tools.js';
+import { formatNumber } from '../../utils/format.js';
+import { extractTag } from '../../utils/messages.js';
+import { Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink';
+import { UserPlanMessage } from '../messages/UserPlanMessage.js';
+import { renderToolActivity } from './renderToolActivity.js';
+import { getTaskStatusColor, getTaskStatusIcon } from './taskStatusUtils.js';
 
 type Props = {
-  agent: DeepImmutable<LocalAgentTaskState>
-  onDone: () => void
-  onKillAgent?: () => void
-  onBack?: () => void
-}
+  agent: DeepImmutable<LocalAgentTaskState>;
+  onDone: () => void;
+  onKillAgent?: () => void;
+  onBack?: () => void;
+};
 
-export function AsyncAgentDetailDialog({
-  agent,
-  onDone,
-  onKillAgent,
-  onBack,
-}: Props): React.ReactNode {
-  const [theme] = useTheme()
+export function AsyncAgentDetailDialog({ agent, onDone, onKillAgent, onBack }: Props): React.ReactNode {
+  const [theme] = useTheme();
 
   // Get tools for rendering activity messages
-  const tools = useMemo(() => getTools(getEmptyToolPermissionContext()), [])
+  const tools = useMemo(() => getTools(getEmptyToolPermissionContext()), []);
 
-  const elapsedTime = useElapsedTime(
-    agent.startTime,
-    agent.status === 'running',
-    1000,
-    agent.totalPausedMs ?? 0,
-  )
+  const elapsedTime = useElapsedTime(agent.startTime, agent.status === 'running', 1000, agent.totalPausedMs ?? 0);
 
   // Restore confirm:yes (Enter/y) dismissal — Dialog handles confirm:no (Esc)
   // internally but does NOT auto-wire confirm:yes.
@@ -45,7 +35,7 @@ export function AsyncAgentDetailDialog({
       'confirm:yes': onDone,
     },
     { context: 'Confirmation' },
-  )
+  );
 
   // Component-specific shortcuts shown in UI hints (x=stop) and
   // navigation keys (space=dismiss, left=back). These are context-dependent
@@ -54,36 +44,31 @@ export function AsyncAgentDetailDialog({
   // confirm:yes (Enter/y) is handled by useKeybindings above.
   const handleKeyDown = (e: KeyboardEvent) => {
     if (e.key === ' ') {
-      e.preventDefault()
-      onDone()
+      e.preventDefault();
+      onDone();
     } else if (e.key === 'left' && onBack) {
-      e.preventDefault()
-      onBack()
+      e.preventDefault();
+      onBack();
     } else if (e.key === 'x' && agent.status === 'running' && onKillAgent) {
-      e.preventDefault()
-      onKillAgent()
+      e.preventDefault();
+      onKillAgent();
     }
-  }
+  };
 
   // Extract plan from prompt - if present, we show the plan instead of the prompt
-  const planContent = extractTag(agent.prompt, 'plan')
+  const planContent = extractTag(agent.prompt, 'plan');
 
-  const displayPrompt =
-    agent.prompt.length > 300
-      ? agent.prompt.substring(0, 297) + '…'
-      : agent.prompt
+  const displayPrompt = agent.prompt.length > 300 ? agent.prompt.substring(0, 297) + '…' : agent.prompt;
 
   // Get tokens and tool uses (from result if completed, otherwise from progress)
-  const tokenCount = agent.result?.totalTokens ?? agent.progress?.tokenCount
-  const toolUseCount =
-    agent.result?.totalToolUseCount ?? agent.progress?.toolUseCount
+  const tokenCount = agent.result?.totalTokens ?? agent.progress?.tokenCount;
+  const toolUseCount = agent.result?.totalToolUseCount ?? agent.progress?.toolUseCount;
 
   const title = (
     <Text>
-      {agent.selectedAgent?.agentType ?? 'agent'} ›{' '}
-      {agent.description || 'Async agent'}
+      {agent.selectedAgent?.agentType ?? 'agent'} › {agent.description || 'Async agent'}
     </Text>
-  )
+  );
 
   // Build subtitle with status and stats
   const subtitle = (
@@ -91,19 +76,13 @@ export function AsyncAgentDetailDialog({
       {agent.status !== 'running' && (
         <Text color={getTaskStatusColor(agent.status)}>
           {getTaskStatusIcon(agent.status)}{' '}
-          {agent.status === 'completed'
-            ? 'Completed'
-            : agent.status === 'failed'
-              ? 'Failed'
-              : 'Stopped'}
+          {agent.status === 'completed' ? 'Completed' : agent.status === 'failed' ? 'Failed' : 'Stopped'}
           {' · '}
         </Text>
       )}
       <Text dimColor>
         {elapsedTime}
-        {tokenCount !== undefined && tokenCount > 0 && (
-          <> · {formatNumber(tokenCount)} tokens</>
-        )}
+        {tokenCount !== undefined && tokenCount > 0 && <> · {formatNumber(tokenCount)} tokens</>}
         {toolUseCount !== undefined && toolUseCount > 0 && (
           <>
             {' '}
@@ -112,15 +91,10 @@ export function AsyncAgentDetailDialog({
         )}
       </Text>
     </Text>
-  )
+  );
 
   return (
-    <Box
-      flexDirection="column"
-      tabIndex={0}
-      autoFocus
-      onKeyDown={handleKeyDown}
-    >
+    <Box flexDirection="column" tabIndex={0} autoFocus onKeyDown={handleKeyDown}>
       <Dialog
         title={title}
         subtitle={subtitle}
@@ -133,9 +107,7 @@ export function AsyncAgentDetailDialog({
             <Byline>
               {onBack && <KeyboardShortcutHint shortcut="←" action="go back" />}
               <KeyboardShortcutHint shortcut="Esc/Enter/Space" action="close" />
-              {agent.status === 'running' && onKillAgent && (
-                <KeyboardShortcutHint shortcut="x" action="stop" />
-              )}
+              {agent.status === 'running' && onKillAgent && <KeyboardShortcutHint shortcut="x" action="stop" />}
             </Byline>
           )
         }
@@ -150,14 +122,8 @@ export function AsyncAgentDetailDialog({
                   Progress
                 </Text>
                 {agent.progress.recentActivities.map((activity, i) => (
-                  <Text
-                    key={i}
-                    dimColor={i < agent.progress!.recentActivities!.length - 1}
-                    wrap="truncate-end"
-                  >
-                    {i === agent.progress!.recentActivities!.length - 1
-                      ? '› '
-                      : '  '}
+                  <Text key={i} dimColor={i < agent.progress!.recentActivities!.length - 1} wrap="truncate-end">
+                    {i === agent.progress!.recentActivities!.length - 1 ? '› ' : '  '}
                     {renderToolActivity(activity, tools, theme)}
                   </Text>
                 ))}
@@ -193,5 +159,5 @@ export function AsyncAgentDetailDialog({
         </Box>
       </Dialog>
     </Box>
-  )
+  );
 }
diff --git a/src/components/tasks/BackgroundTask.tsx b/src/components/tasks/BackgroundTask.tsx
index 62a3e6268..267b09173 100644
--- a/src/components/tasks/BackgroundTask.tsx
+++ b/src/components/tasks/BackgroundTask.tsx
@@ -1,38 +1,31 @@
-import * as React from 'react'
-import { Text } from '@anthropic/ink'
-import { toInkColor } from '../../utils/ink.js'
-import type { BackgroundTaskState } from 'src/tasks/types.js'
-import type { DeepImmutable } from 'src/types/utils.js'
-import { truncate } from 'src/utils/format.js'
+import * as React from 'react';
+import { Text } from '@anthropic/ink';
+import { toInkColor } from '../../utils/ink.js';
+import type { BackgroundTaskState } from 'src/tasks/types.js';
+import type { DeepImmutable } from 'src/types/utils.js';
+import { truncate } from 'src/utils/format.js';
 
-import { plural } from 'src/utils/stringUtils.js'
-import { DIAMOND_FILLED, DIAMOND_OPEN } from '../../constants/figures.js'
-import { RemoteSessionProgress } from './RemoteSessionProgress.js'
-import { ShellProgress, TaskStatusText } from './ShellProgress.js'
-import { describeTeammateActivity } from './taskStatusUtils.js'
+import { plural } from 'src/utils/stringUtils.js';
+import { DIAMOND_FILLED, DIAMOND_OPEN } from '../../constants/figures.js';
+import { RemoteSessionProgress } from './RemoteSessionProgress.js';
+import { ShellProgress, TaskStatusText } from './ShellProgress.js';
+import { describeTeammateActivity } from './taskStatusUtils.js';
 
 type Props = {
-  task: DeepImmutable<BackgroundTaskState>
-  maxActivityWidth?: number
-}
+  task: DeepImmutable<BackgroundTaskState>;
+  maxActivityWidth?: number;
+};
 
-export function BackgroundTask({
-  task,
-  maxActivityWidth,
-}: Props): React.ReactNode {
-  const activityLimit = maxActivityWidth ?? 40
+export function BackgroundTask({ task, maxActivityWidth }: Props): React.ReactNode {
+  const activityLimit = maxActivityWidth ?? 40;
   switch (task.type) {
     case 'local_bash':
       return (
         <Text>
-          {truncate(
-            task.kind === 'monitor' ? task.description : task.command,
-            activityLimit,
-            true,
-          )}{' '}
+          {truncate(task.kind === 'monitor' ? task.description : task.command, activityLimit, true)}{' '}
           <ShellProgress shell={task} />
         </Text>
-      )
+      );
     case 'remote_agent': {
       // Lite-review renders its own rainbow line (title + live counts),
       // so we don't prefix the title — the rainbow already includes it.
@@ -41,9 +34,9 @@ export function BackgroundTask({
           <Text>
             <RemoteSessionProgress session={task} />
           </Text>
-        )
+        );
       }
-      const running = task.status === 'running' || task.status === 'pending'
+      const running = task.status === 'running' || task.status === 'pending';
       return (
         <Text>
           <Text dimColor>{running ? DIAMOND_OPEN : DIAMOND_FILLED} </Text>
@@ -51,7 +44,7 @@ export function BackgroundTask({
           <Text dimColor> · </Text>
           <RemoteSessionProgress session={task} />
         </Text>
-      )
+      );
     }
     case 'local_agent':
       return (
@@ -60,27 +53,21 @@ export function BackgroundTask({
           <TaskStatusText
             status={task.status}
             label={task.status === 'completed' ? 'done' : undefined}
-            suffix={
-              task.status === 'completed' && !task.notified
-                ? ', unread'
-                : undefined
-            }
+            suffix={task.status === 'completed' && !task.notified ? ', unread' : undefined}
           />
         </Text>
-      )
+      );
     case 'in_process_teammate': {
-      const activity = describeTeammateActivity(task)
+      const activity = describeTeammateActivity(task);
       return (
         <Text>
-          <Text color={toInkColor(task.identity.color)}>
-            @{task.identity.agentName}
-          </Text>
+          <Text color={toInkColor(task.identity.color)}>@{task.identity.agentName}</Text>
           <Text dimColor>: {truncate(activity, activityLimit, true)}</Text>
         </Text>
-      )
+      );
     }
     case 'local_workflow': {
-      const _task = task as Record<string, unknown>
+      const _task = task as Record<string, unknown>;
       return (
         <Text>
           {truncate(
@@ -97,14 +84,10 @@ export function BackgroundTask({
                   ? 'done'
                   : undefined
             }
-            suffix={
-              task.status === 'completed' && !task.notified
-                ? ', unread'
-                : undefined
-            }
+            suffix={task.status === 'completed' && !task.notified ? ', unread' : undefined}
           />
         </Text>
-      )
+      );
     }
     case 'monitor_mcp':
       return (
@@ -113,20 +96,16 @@ export function BackgroundTask({
           <TaskStatusText
             status={task.status}
             label={task.status === 'completed' ? 'done' : undefined}
-            suffix={
-              task.status === 'completed' && !task.notified
-                ? ', unread'
-                : undefined
-            }
+            suffix={task.status === 'completed' && !task.notified ? ', unread' : undefined}
           />
         </Text>
-      )
+      );
     case 'dream': {
-      const n = task.filesTouched.length
+      const n = task.filesTouched.length;
       const detail =
         task.phase === 'updating' && n > 0
           ? `${n} ${plural(n, 'file')}`
-          : `${task.sessionsReviewing} ${plural(task.sessionsReviewing, 'session')}`
+          : `${task.sessionsReviewing} ${plural(task.sessionsReviewing, 'session')}`;
       return (
         <Text>
           {task.description}{' '}
@@ -136,14 +115,10 @@ export function BackgroundTask({
           <TaskStatusText
             status={task.status}
             label={task.status === 'completed' ? 'done' : undefined}
-            suffix={
-              task.status === 'completed' && !task.notified
-                ? ', unread'
-                : undefined
-            }
+            suffix={task.status === 'completed' && !task.notified ? ', unread' : undefined}
           />
         </Text>
-      )
+      );
     }
   }
 }
diff --git a/src/components/tasks/BackgroundTaskStatus.tsx b/src/components/tasks/BackgroundTaskStatus.tsx
index 4813c86eb..21948f074 100644
--- a/src/components/tasks/BackgroundTaskStatus.tsx
+++ b/src/components/tasks/BackgroundTaskStatus.tsx
@@ -1,38 +1,31 @@
-import figures from 'figures'
-import * as React from 'react'
-import { useMemo, useState } from 'react'
-import { useTerminalSize } from 'src/hooks/useTerminalSize.js'
-import { stringWidth } from '@anthropic/ink'
-import { useAppState, useSetAppState } from 'src/state/AppState.js'
-import {
-  enterTeammateView,
-  exitTeammateView,
-} from 'src/state/teammateViewHelpers.js'
-import { isPanelAgentTask } from 'src/tasks/LocalAgentTask/LocalAgentTask.js'
-import { getPillLabel, pillNeedsCta } from 'src/tasks/pillLabel.js'
-import {
-  type BackgroundTaskState,
-  isBackgroundTask,
-  type TaskState,
-} from 'src/tasks/types.js'
-import { calculateHorizontalScrollWindow } from 'src/utils/horizontalScroll.js'
-import { Box, Text } from '@anthropic/ink'
+import figures from 'figures';
+import * as React from 'react';
+import { useMemo, useState } from 'react';
+import { useTerminalSize } from 'src/hooks/useTerminalSize.js';
+import { stringWidth } from '@anthropic/ink';
+import { useAppState, useSetAppState } from 'src/state/AppState.js';
+import { enterTeammateView, exitTeammateView } from 'src/state/teammateViewHelpers.js';
+import { isPanelAgentTask } from 'src/tasks/LocalAgentTask/LocalAgentTask.js';
+import { getPillLabel, pillNeedsCta } from 'src/tasks/pillLabel.js';
+import { type BackgroundTaskState, isBackgroundTask, type TaskState } from 'src/tasks/types.js';
+import { calculateHorizontalScrollWindow } from 'src/utils/horizontalScroll.js';
+import { Box, Text } from '@anthropic/ink';
 import {
   AGENT_COLOR_TO_THEME_COLOR,
   AGENT_COLORS,
   type AgentColorName,
-} from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js'
-import type { Theme } from '../../utils/theme.js'
-import { KeyboardShortcutHint } from '@anthropic/ink'
-import { shouldHideTasksFooter } from './taskStatusUtils.js'
+} from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js';
+import type { Theme } from '../../utils/theme.js';
+import { KeyboardShortcutHint } from '@anthropic/ink';
+import { shouldHideTasksFooter } from './taskStatusUtils.js';
 
 type Props = {
-  tasksSelected: boolean
-  isViewingTeammate?: boolean
-  teammateFooterIndex?: number
-  isLeaderIdle?: boolean
-  onOpenDialog?: (taskId?: string) => void
-}
+  tasksSelected: boolean;
+  isViewingTeammate?: boolean;
+  teammateFooterIndex?: number;
+  isLeaderIdle?: boolean;
+  onOpenDialog?: (taskId?: string) => void;
+};
 
 export function BackgroundTaskStatus({
   tasksSelected,
@@ -41,43 +34,34 @@ export function BackgroundTaskStatus({
   isLeaderIdle = false,
   onOpenDialog,
 }: Props): React.ReactNode {
-  const setAppState = useSetAppState()
-  const { columns } = useTerminalSize()
-  const tasks = useAppState(s => s.tasks)
-  const viewingAgentTaskId = useAppState(s => s.viewingAgentTaskId)
+  const setAppState = useSetAppState();
+  const { columns } = useTerminalSize();
+  const tasks = useAppState(s => s.tasks);
+  const viewingAgentTaskId = useAppState(s => s.viewingAgentTaskId);
 
   const runningTasks = useMemo(
     () =>
       (Object.values(tasks ?? {}) as TaskState[]).filter(
-        t =>
-          isBackgroundTask(t) &&
-          !(process.env.USER_TYPE === 'ant' && isPanelAgentTask(t)),
+        t => isBackgroundTask(t) && !(process.env.USER_TYPE === 'ant' && isPanelAgentTask(t)),
       ),
     [tasks],
-  )
+  );
 
   // Check if all tasks are in-process teammates (team mode)
   // In spinner-tree mode, don't show teammate pills (teammates appear in the spinner tree)
-  const expandedView = useAppState(s => s.expandedView)
-  const showSpinnerTree = expandedView === 'teammates'
+  const expandedView = useAppState(s => s.expandedView);
+  const showSpinnerTree = expandedView === 'teammates';
   const allTeammates =
-    !showSpinnerTree &&
-    runningTasks.length > 0 &&
-    runningTasks.every(t => t.type === 'in_process_teammate')
+    !showSpinnerTree && runningTasks.length > 0 && runningTasks.every(t => t.type === 'in_process_teammate');
 
   // Memoize teammate-related computations at the top level (rules of hooks)
   const teammateEntries = useMemo(
     () =>
       runningTasks
-        .filter(
-          (t): t is BackgroundTaskState & { type: 'in_process_teammate' } =>
-            t.type === 'in_process_teammate',
-        )
-        .sort((a, b) =>
-          a.identity.agentName.localeCompare(b.identity.agentName),
-        ),
+        .filter((t): t is BackgroundTaskState & { type: 'in_process_teammate' } => t.type === 'in_process_teammate')
+        .sort((a, b) => a.identity.agentName.localeCompare(b.identity.agentName)),
     [runningTasks],
-  )
+  );
 
   // Build array of all pills with their activity state
   // Each pill is "@{name}" and separator is " " (1 char)
@@ -90,67 +74,64 @@ export function BackgroundTaskStatus({
       color: undefined as keyof Theme | undefined,
       isIdle: isLeaderIdle,
       taskId: undefined as string | undefined,
-    }
+    };
 
     const teammatePills = teammateEntries.map(t => ({
       name: t.identity.agentName,
       color: getAgentThemeColor(t.identity.color),
       isIdle: t.isIdle,
       taskId: t.id,
-    }))
+    }));
 
     // Only sort teammates when not selecting to avoid reordering during navigation
     if (!tasksSelected) {
       teammatePills.sort((a, b) => {
         // Active agents first, idle agents last
-        if (a.isIdle !== b.isIdle) return a.isIdle ? 1 : -1
-        return 0 // Keep original order within each group
-      })
+        if (a.isIdle !== b.isIdle) return a.isIdle ? 1 : -1;
+        return 0; // Keep original order within each group
+      });
     }
 
     // main always first, then sorted teammates
-    const pills = [mainPill, ...teammatePills]
+    const pills = [mainPill, ...teammatePills];
 
     // Add idx after sorting
-    return pills.map((pill, i) => ({ ...pill, idx: i }))
-  }, [teammateEntries, isLeaderIdle, tasksSelected])
+    return pills.map((pill, i) => ({ ...pill, idx: i }));
+  }, [teammateEntries, isLeaderIdle, tasksSelected]);
 
   // Calculate pill widths (including separator space, except first)
   const pillWidths = useMemo(
     () =>
       allPills.map((pill, i) => {
-        const pillText = `@${pill.name}`
+        const pillText = `@${pill.name}`;
         // First pill has no leading space, others have 1 space separator
-        return stringWidth(pillText) + (i > 0 ? 1 : 0)
+        return stringWidth(pillText) + (i > 0 ? 1 : 0);
       }),
     [allPills],
-  )
+  );
 
   if (allTeammates || (!showSpinnerTree && isViewingTeammate)) {
-    const selectedIdx = tasksSelected ? teammateFooterIndex : -1
+    const selectedIdx = tasksSelected ? teammateFooterIndex : -1;
     // Which agent is currently foregrounded (bold)
-    const viewedIdx = viewingAgentTaskId
-      ? teammateEntries.findIndex(t => t.id === viewingAgentTaskId) + 1
-      : 0 // 0 = main/leader
+    const viewedIdx = viewingAgentTaskId ? teammateEntries.findIndex(t => t.id === viewingAgentTaskId) + 1 : 0; // 0 = main/leader
 
     // Calculate available width for pills
     // Reserve space for: arrows, hint, and minimal padding
     // Pills are rendered on their own line when in team mode
-    const ARROW_WIDTH = 2 // arrow char + space
-    const HINT_WIDTH = 20 // shift+↓ to expand
-    const PADDING = 4 // minimal safety margin
-    const availableWidth = Math.max(20, columns - HINT_WIDTH - PADDING)
+    const ARROW_WIDTH = 2; // arrow char + space
+    const HINT_WIDTH = 20; // shift+↓ to expand
+    const PADDING = 4; // minimal safety margin
+    const availableWidth = Math.max(20, columns - HINT_WIDTH - PADDING);
 
     // Calculate visible window of pills
-    const { startIndex, endIndex, showLeftArrow, showRightArrow } =
-      calculateHorizontalScrollWindow(
-        pillWidths,
-        availableWidth,
-        ARROW_WIDTH,
-        selectedIdx >= 0 ? selectedIdx : 0,
-      )
+    const { startIndex, endIndex, showLeftArrow, showRightArrow } = calculateHorizontalScrollWindow(
+      pillWidths,
+      availableWidth,
+      ARROW_WIDTH,
+      selectedIdx >= 0 ? selectedIdx : 0,
+    );
 
-    const visiblePills = allPills.slice(startIndex, endIndex)
+    const visiblePills = allPills.slice(startIndex, endIndex);
 
     return (
       <>
@@ -158,7 +139,7 @@ export function BackgroundTaskStatus({
         {visiblePills.map((pill, i) => {
           // First visible pill has no leading separator
           // (left arrow already provides spacing if present)
-          const needsSeparator = i > 0
+          const needsSeparator = i > 0;
           return (
             <React.Fragment key={pill.name}>
               {needsSeparator && <Text> </Text>}
@@ -169,13 +150,11 @@ export function BackgroundTaskStatus({
                 isViewed={viewedIdx === pill.idx}
                 isIdle={pill.isIdle}
                 onClick={() =>
-                  pill.taskId
-                    ? enterTeammateView(pill.taskId, setAppState)
-                    : exitTeammateView(setAppState)
+                  pill.taskId ? enterTeammateView(pill.taskId, setAppState) : exitTeammateView(setAppState)
                 }
               />
             </React.Fragment>
-          )
+          );
         })}
         {showRightArrow && <Text dimColor> {figures.arrowRight}</Text>}
         <Text dimColor>
@@ -183,17 +162,17 @@ export function BackgroundTaskStatus({
           <KeyboardShortcutHint shortcut="shift + ↓" action="expand" />
         </Text>
       </>
-    )
+    );
   }
 
   // In spinner-tree mode, don't show any footer status for teammates
   // (they appear in the spinner tree above)
   if (shouldHideTasksFooter(tasks ?? {}, showSpinnerTree)) {
-    return null
+    return null;
   }
 
   if (runningTasks.length === 0) {
-    return null
+    return null;
   }
 
   return (
@@ -201,35 +180,26 @@ export function BackgroundTaskStatus({
       <SummaryPill selected={tasksSelected} onClick={onOpenDialog}>
         {getPillLabel(runningTasks)}
       </SummaryPill>
-      {pillNeedsCta(runningTasks) && (
-        <Text dimColor> · {figures.arrowDown} to view</Text>
-      )}
+      {pillNeedsCta(runningTasks) && <Text dimColor> · {figures.arrowDown} to view</Text>}
     </>
-  )
+  );
 }
 
 type AgentPillProps = {
-  name: string
-  color?: keyof Theme
-  isSelected: boolean
-  isViewed: boolean
-  isIdle: boolean
-  onClick?: () => void
-}
+  name: string;
+  color?: keyof Theme;
+  isSelected: boolean;
+  isViewed: boolean;
+  isIdle: boolean;
+  onClick?: () => void;
+};
 
-function AgentPill({
-  name,
-  color,
-  isSelected,
-  isViewed,
-  isIdle,
-  onClick,
-}: AgentPillProps): React.ReactNode {
-  const [hover, setHover] = useState(false)
+function AgentPill({ name, color, isSelected, isViewed, isIdle, onClick }: AgentPillProps): React.ReactNode {
+  const [hover, setHover] = useState(false);
   // Hover mirrors the keyboard-selected look so the affordance is familiar.
-  const highlighted = isSelected || hover
+  const highlighted = isSelected || hover;
 
-  let label: React.ReactNode
+  let label: React.ReactNode;
   if (highlighted) {
     label = color ? (
       <Text backgroundColor={color} color="inverseText" bold={isViewed}>
@@ -239,37 +209,33 @@ function AgentPill({
       <Text color="background" inverse bold={isViewed}>
         @{name}
       </Text>
-    )
+    );
   } else if (isIdle) {
     label = (
       <Text dimColor bold={isViewed}>
         @{name}
       </Text>
-    )
+    );
   } else if (isViewed) {
     label = (
       <Text color={color} bold>
         @{name}
       </Text>
-    )
+    );
   } else {
     label = (
       <Text color={color} dimColor={!color}>
         @{name}
       </Text>
-    )
+    );
   }
 
-  if (!onClick) return label
+  if (!onClick) return label;
   return (
-    <Box
-      onClick={onClick}
-      onMouseEnter={() => setHover(true)}
-      onMouseLeave={() => setHover(false)}
-    >
+    <Box onClick={onClick} onMouseEnter={() => setHover(true)} onMouseLeave={() => setHover(false)}>
       {label}
     </Box>
-  )
+  );
 }
 
 function SummaryPill({
@@ -277,34 +243,28 @@ function SummaryPill({
   onClick,
   children,
 }: {
-  selected: boolean
-  onClick?: () => void
-  children: React.ReactNode
+  selected: boolean;
+  onClick?: () => void;
+  children: React.ReactNode;
 }): React.ReactNode {
-  const [hover, setHover] = useState(false)
+  const [hover, setHover] = useState(false);
   const label = (
     <Text color="background" inverse={selected || hover}>
       {children}
     </Text>
-  )
-  if (!onClick) return label
+  );
+  if (!onClick) return label;
   return (
-    <Box
-      onClick={onClick}
-      onMouseEnter={() => setHover(true)}
-      onMouseLeave={() => setHover(false)}
-    >
+    <Box onClick={onClick} onMouseEnter={() => setHover(true)} onMouseLeave={() => setHover(false)}>
       {label}
     </Box>
-  )
+  );
 }
 
-function getAgentThemeColor(
-  colorName: string | undefined,
-): keyof Theme | undefined {
-  if (!colorName) return undefined
+function getAgentThemeColor(colorName: string | undefined): keyof Theme | undefined {
+  if (!colorName) return undefined;
   if (AGENT_COLORS.includes(colorName as AgentColorName)) {
-    return AGENT_COLOR_TO_THEME_COLOR[colorName as AgentColorName]
+    return AGENT_COLOR_TO_THEME_COLOR[colorName as AgentColorName];
   }
-  return undefined
+  return undefined;
 }
diff --git a/src/components/tasks/BackgroundTasksDialog.tsx b/src/components/tasks/BackgroundTasksDialog.tsx
index 80249e9ea..9fdd89f1a 100644
--- a/src/components/tasks/BackgroundTasksDialog.tsx
+++ b/src/components/tasks/BackgroundTasksDialog.tsx
@@ -1,158 +1,131 @@
-import { feature } from 'bun:bundle'
-import figures from 'figures'
-import type { AgentId } from '../../types/ids.js'
-import React, {
-  type ReactNode,
-  useEffect,
-  useEffectEvent,
-  useMemo,
-  useRef,
-  useState,
-} from 'react'
-import { isCoordinatorMode } from 'src/coordinator/coordinatorMode.js'
-import { useTerminalSize } from 'src/hooks/useTerminalSize.js'
-import { useAppState, useSetAppState } from 'src/state/AppState.js'
-import {
-  enterTeammateView,
-  exitTeammateView,
-} from 'src/state/teammateViewHelpers.js'
-import type { ToolUseContext } from 'src/Tool.js'
-import {
-  DreamTask,
-  type DreamTaskState,
-} from 'src/tasks/DreamTask/DreamTask.js'
-import { InProcessTeammateTask } from 'src/tasks/InProcessTeammateTask/InProcessTeammateTask.js'
-import type { InProcessTeammateTaskState } from 'src/tasks/InProcessTeammateTask/types.js'
-import type { LocalAgentTaskState } from 'src/tasks/LocalAgentTask/LocalAgentTask.js'
-import { LocalAgentTask } from 'src/tasks/LocalAgentTask/LocalAgentTask.js'
-import type { LocalShellTaskState } from 'src/tasks/LocalShellTask/guards.js'
-import { LocalShellTask } from 'src/tasks/LocalShellTask/LocalShellTask.js'
+import { feature } from 'bun:bundle';
+import figures from 'figures';
+import type { AgentId } from '../../types/ids.js';
+import React, { type ReactNode, useEffect, useEffectEvent, useMemo, useRef, useState } from 'react';
+import { isCoordinatorMode } from 'src/coordinator/coordinatorMode.js';
+import { useTerminalSize } from 'src/hooks/useTerminalSize.js';
+import { useAppState, useSetAppState } from 'src/state/AppState.js';
+import { enterTeammateView, exitTeammateView } from 'src/state/teammateViewHelpers.js';
+import type { ToolUseContext } from 'src/Tool.js';
+import { DreamTask, type DreamTaskState } from 'src/tasks/DreamTask/DreamTask.js';
+import { InProcessTeammateTask } from 'src/tasks/InProcessTeammateTask/InProcessTeammateTask.js';
+import type { InProcessTeammateTaskState } from 'src/tasks/InProcessTeammateTask/types.js';
+import type { LocalAgentTaskState } from 'src/tasks/LocalAgentTask/LocalAgentTask.js';
+import { LocalAgentTask } from 'src/tasks/LocalAgentTask/LocalAgentTask.js';
+import type { LocalShellTaskState } from 'src/tasks/LocalShellTask/guards.js';
+import { LocalShellTask } from 'src/tasks/LocalShellTask/LocalShellTask.js';
 // Type import is erased at build time — safe even though module is ant-gated.
-import type { LocalWorkflowTaskState } from 'src/tasks/LocalWorkflowTask/LocalWorkflowTask.js'
-import type { MonitorMcpTaskState } from 'src/tasks/MonitorMcpTask/MonitorMcpTask.js'
-import {
-  RemoteAgentTask,
-  type RemoteAgentTaskState,
-} from 'src/tasks/RemoteAgentTask/RemoteAgentTask.js'
-import {
-  type BackgroundTaskState,
-  isBackgroundTask,
-  type TaskState,
-} from 'src/tasks/types.js'
-import type { DeepImmutable } from 'src/types/utils.js'
-import { intersperse } from 'src/utils/array.js'
-import { TEAM_LEAD_NAME } from 'src/utils/swarm/constants.js'
-import { stopUltraplan } from '../../commands/ultraplan.js'
-import type { CommandResultDisplay } from '../../commands.js'
-import { useRegisterOverlay } from '../../context/overlayContext.js'
-import type { ExitState } from '../../hooks/useExitOnCtrlCDWithKeybindings.js'
-import { type KeyboardEvent, Box, Text } from '@anthropic/ink'
-import { useKeybindings } from '../../keybindings/useKeybinding.js'
-import { useShortcutDisplay } from '../../keybindings/useShortcutDisplay.js'
-import { count } from '../../utils/array.js'
-import { Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink'
-import { AsyncAgentDetailDialog } from './AsyncAgentDetailDialog.js'
-import { BackgroundTask as BackgroundTaskComponent } from './BackgroundTask.js'
-import { DreamDetailDialog } from './DreamDetailDialog.js'
-import { InProcessTeammateDetailDialog } from './InProcessTeammateDetailDialog.js'
-import { RemoteSessionDetailDialog } from './RemoteSessionDetailDialog.js'
-import { ShellDetailDialog } from './ShellDetailDialog.js'
+import type { LocalWorkflowTaskState } from 'src/tasks/LocalWorkflowTask/LocalWorkflowTask.js';
+import type { MonitorMcpTaskState } from 'src/tasks/MonitorMcpTask/MonitorMcpTask.js';
+import { RemoteAgentTask, type RemoteAgentTaskState } from 'src/tasks/RemoteAgentTask/RemoteAgentTask.js';
+import { type BackgroundTaskState, isBackgroundTask, type TaskState } from 'src/tasks/types.js';
+import type { DeepImmutable } from 'src/types/utils.js';
+import { intersperse } from 'src/utils/array.js';
+import { TEAM_LEAD_NAME } from 'src/utils/swarm/constants.js';
+import { stopUltraplan } from '../../commands/ultraplan.js';
+import type { CommandResultDisplay } from '../../commands.js';
+import { useRegisterOverlay } from '../../context/overlayContext.js';
+import type { ExitState } from '../../hooks/useExitOnCtrlCDWithKeybindings.js';
+import { type KeyboardEvent, Box, Text } from '@anthropic/ink';
+import { useKeybindings } from '../../keybindings/useKeybinding.js';
+import { useShortcutDisplay } from '../../keybindings/useShortcutDisplay.js';
+import { count } from '../../utils/array.js';
+import { Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink';
+import { AsyncAgentDetailDialog } from './AsyncAgentDetailDialog.js';
+import { BackgroundTask as BackgroundTaskComponent } from './BackgroundTask.js';
+import { DreamDetailDialog } from './DreamDetailDialog.js';
+import { InProcessTeammateDetailDialog } from './InProcessTeammateDetailDialog.js';
+import { RemoteSessionDetailDialog } from './RemoteSessionDetailDialog.js';
+import { ShellDetailDialog } from './ShellDetailDialog.js';
 
-type ViewState = { mode: 'list' } | { mode: 'detail'; itemId: string }
+type ViewState = { mode: 'list' } | { mode: 'detail'; itemId: string };
 
 type Props = {
-  onDone: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-  toolUseContext: ToolUseContext
-  initialDetailTaskId?: string
-}
+  onDone: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+  toolUseContext: ToolUseContext;
+  initialDetailTaskId?: string;
+};
 
 type ListItem =
   | {
-      id: string
-      type: 'local_bash'
-      label: string
-      status: string
-      task: DeepImmutable<LocalShellTaskState>
+      id: string;
+      type: 'local_bash';
+      label: string;
+      status: string;
+      task: DeepImmutable<LocalShellTaskState>;
     }
   | {
-      id: string
-      type: 'remote_agent'
-      label: string
-      status: string
-      task: DeepImmutable<RemoteAgentTaskState>
+      id: string;
+      type: 'remote_agent';
+      label: string;
+      status: string;
+      task: DeepImmutable<RemoteAgentTaskState>;
     }
   | {
-      id: string
-      type: 'local_agent'
-      label: string
-      status: string
-      task: DeepImmutable<LocalAgentTaskState>
+      id: string;
+      type: 'local_agent';
+      label: string;
+      status: string;
+      task: DeepImmutable<LocalAgentTaskState>;
     }
   | {
-      id: string
-      type: 'in_process_teammate'
-      label: string
-      status: string
-      task: DeepImmutable<InProcessTeammateTaskState>
+      id: string;
+      type: 'in_process_teammate';
+      label: string;
+      status: string;
+      task: DeepImmutable<InProcessTeammateTaskState>;
     }
   | {
-      id: string
-      type: 'local_workflow'
-      label: string
-      status: string
-      task: DeepImmutable<LocalWorkflowTaskState>
+      id: string;
+      type: 'local_workflow';
+      label: string;
+      status: string;
+      task: DeepImmutable<LocalWorkflowTaskState>;
     }
   | {
-      id: string
-      type: 'monitor_mcp'
-      label: string
-      status: string
-      task: DeepImmutable<MonitorMcpTaskState>
+      id: string;
+      type: 'monitor_mcp';
+      label: string;
+      status: string;
+      task: DeepImmutable<MonitorMcpTaskState>;
     }
   | {
-      id: string
-      type: 'dream'
-      label: string
-      status: string
-      task: DeepImmutable<DreamTaskState>
+      id: string;
+      type: 'dream';
+      label: string;
+      status: string;
+      task: DeepImmutable<DreamTaskState>;
     }
   | {
-      id: string
-      type: 'leader'
-      label: string
-      status: 'running'
-    }
+      id: string;
+      type: 'leader';
+      label: string;
+      status: 'running';
+    };
 
 // WORKFLOW_SCRIPTS is ant-only (build_flags.yaml). Static imports would leak
 // ~1.3K lines into external builds. Gate with feature() + require so the
 // bundler can dead-code-eliminate the branch.
 /* eslint-disable @typescript-eslint/no-require-imports */
 const WorkflowDetailDialog = feature('WORKFLOW_SCRIPTS')
-  ? (
-      require('./WorkflowDetailDialog.js') as typeof import('./WorkflowDetailDialog.js')
-    ).WorkflowDetailDialog
-  : null
+  ? (require('./WorkflowDetailDialog.js') as typeof import('./WorkflowDetailDialog.js')).WorkflowDetailDialog
+  : null;
 const workflowTaskModule = feature('WORKFLOW_SCRIPTS')
   ? (require('src/tasks/LocalWorkflowTask/LocalWorkflowTask.js') as typeof import('src/tasks/LocalWorkflowTask/LocalWorkflowTask.js'))
-  : null
-const killWorkflowTask = workflowTaskModule?.killWorkflowTask ?? null
-const skipWorkflowAgent = workflowTaskModule?.skipWorkflowAgent ?? null
-const retryWorkflowAgent = workflowTaskModule?.retryWorkflowAgent ?? null
+  : null;
+const killWorkflowTask = workflowTaskModule?.killWorkflowTask ?? null;
+const skipWorkflowAgent = workflowTaskModule?.skipWorkflowAgent ?? null;
+const retryWorkflowAgent = workflowTaskModule?.retryWorkflowAgent ?? null;
 // Relative path, not `src/...` path-mapping — Bun's DCE can statically
 // resolve + eliminate `./` requires, but path-mapped strings stay opaque
 // and survive as dead literals in the bundle. Matches tasks.ts pattern.
 const monitorMcpModule = feature('MONITOR_TOOL')
   ? (require('../../tasks/MonitorMcpTask/MonitorMcpTask.js') as typeof import('../../tasks/MonitorMcpTask/MonitorMcpTask.js'))
-  : null
-const killMonitorMcp = monitorMcpModule?.killMonitorMcp ?? null
+  : null;
+const killMonitorMcp = monitorMcpModule?.killMonitorMcp ?? null;
 const MonitorMcpDetailDialog = feature('MONITOR_TOOL')
-  ? (
-      require('./MonitorMcpDetailDialog.js') as typeof import('./MonitorMcpDetailDialog.js')
-    ).MonitorMcpDetailDialog
-  : null
+  ? (require('./MonitorMcpDetailDialog.js') as typeof import('./MonitorMcpDetailDialog.js')).MonitorMcpDetailDialog
+  : null;
 /* eslint-enable @typescript-eslint/no-require-imports */
 
 // Helper to get filtered background tasks (excludes foregrounded local_agent)
@@ -160,53 +133,40 @@ function getSelectableBackgroundTasks(
   tasks: Record<string, TaskState> | undefined,
   foregroundedTaskId: string | undefined,
 ): TaskState[] {
-  const backgroundTasks = Object.values(tasks ?? {}).filter(isBackgroundTask)
-  return backgroundTasks.filter(
-    task => !(task.type === 'local_agent' && task.id === foregroundedTaskId),
-  )
+  const backgroundTasks = Object.values(tasks ?? {}).filter(isBackgroundTask);
+  return backgroundTasks.filter(task => !(task.type === 'local_agent' && task.id === foregroundedTaskId));
 }
 
-export function BackgroundTasksDialog({
-  onDone,
-  toolUseContext,
-  initialDetailTaskId,
-}: Props): React.ReactNode {
-  const tasks = useAppState(s => s.tasks)
-  const foregroundedTaskId = useAppState(s => s.foregroundedTaskId)
-  const showSpinnerTree = useAppState(s => s.expandedView) === 'teammates'
-  const setAppState = useSetAppState()
-  const killAgentsShortcut = useShortcutDisplay(
-    'chat:killAgents',
-    'Chat',
-    'ctrl+x ctrl+k',
-  )
-  const typedTasks = tasks as Record<string, TaskState> | undefined
+export function BackgroundTasksDialog({ onDone, toolUseContext, initialDetailTaskId }: Props): React.ReactNode {
+  const tasks = useAppState(s => s.tasks);
+  const foregroundedTaskId = useAppState(s => s.foregroundedTaskId);
+  const showSpinnerTree = useAppState(s => s.expandedView) === 'teammates';
+  const setAppState = useSetAppState();
+  const killAgentsShortcut = useShortcutDisplay('chat:killAgents', 'Chat', 'ctrl+x ctrl+k');
+  const typedTasks = tasks as Record<string, TaskState> | undefined;
 
   // Track if we skipped list view on mount (for back button behavior)
-  const skippedListOnMount = useRef(false)
+  const skippedListOnMount = useRef(false);
 
   // Compute initial view state - skip list if caller provided a specific task,
   // or if there's exactly one task
   const [viewState, setViewState] = useState<ViewState>(() => {
     if (initialDetailTaskId) {
-      skippedListOnMount.current = true
-      return { mode: 'detail', itemId: initialDetailTaskId }
+      skippedListOnMount.current = true;
+      return { mode: 'detail', itemId: initialDetailTaskId };
     }
-    const allItems = getSelectableBackgroundTasks(
-      typedTasks,
-      foregroundedTaskId,
-    )
+    const allItems = getSelectableBackgroundTasks(typedTasks, foregroundedTaskId);
     if (allItems.length === 1) {
-      skippedListOnMount.current = true
-      return { mode: 'detail', itemId: allItems[0]!.id }
+      skippedListOnMount.current = true;
+      return { mode: 'detail', itemId: allItems[0]!.id };
     }
-    return { mode: 'list' }
-  })
-  const [selectedIndex, setSelectedIndex] = useState<number>(0)
+    return { mode: 'list' };
+  });
+  const [selectedIndex, setSelectedIndex] = useState<number>(0);
 
   // Register as modal overlay so parent Chat keybindings (up/down for history)
   // are deactivated while this dialog is open
-  useRegisterOverlay('background-tasks-dialog')
+  useRegisterOverlay('background-tasks-dialog');
 
   // Memoize the sorted and categorized items together to ensure stable references
   const {
@@ -220,32 +180,26 @@ export function BackgroundTasksDialog({
     allSelectableItems,
   } = useMemo(() => {
     // Filter to only show running/pending background tasks, matching the status bar count
-    const backgroundTasks = Object.values(typedTasks ?? {}).filter(
-      isBackgroundTask,
-    )
-    const allItems = backgroundTasks.map(toListItem)
+    const backgroundTasks = Object.values(typedTasks ?? {}).filter(isBackgroundTask);
+    const allItems = backgroundTasks.map(toListItem);
     const sorted = allItems.sort((a, b) => {
-      const aStatus = a.status
-      const bStatus = b.status
-      if (aStatus === 'running' && bStatus !== 'running') return -1
-      if (aStatus !== 'running' && bStatus === 'running') return 1
-      const aTime = 'task' in a ? a.task.startTime : 0
-      const bTime = 'task' in b ? b.task.startTime : 0
-      return bTime - aTime
-    })
-    const bash = sorted.filter(item => item.type === 'local_bash')
-    const remote = sorted.filter(item => item.type === 'remote_agent')
+      const aStatus = a.status;
+      const bStatus = b.status;
+      if (aStatus === 'running' && bStatus !== 'running') return -1;
+      if (aStatus !== 'running' && bStatus === 'running') return 1;
+      const aTime = 'task' in a ? a.task.startTime : 0;
+      const bTime = 'task' in b ? b.task.startTime : 0;
+      return bTime - aTime;
+    });
+    const bash = sorted.filter(item => item.type === 'local_bash');
+    const remote = sorted.filter(item => item.type === 'remote_agent');
     // Exclude foregrounded task - it's being viewed in the main UI, not a background task
-    const agent = sorted.filter(
-      item => item.type === 'local_agent' && item.id !== foregroundedTaskId,
-    )
-    const workflows = sorted.filter(item => item.type === 'local_workflow')
-    const monitorMcp = sorted.filter(item => item.type === 'monitor_mcp')
-    const dreamTasks = sorted.filter(item => item.type === 'dream')
+    const agent = sorted.filter(item => item.type === 'local_agent' && item.id !== foregroundedTaskId);
+    const workflows = sorted.filter(item => item.type === 'local_workflow');
+    const monitorMcp = sorted.filter(item => item.type === 'monitor_mcp');
+    const dreamTasks = sorted.filter(item => item.type === 'dream');
     // In spinner-tree mode, exclude teammates from the dialog (they appear in the tree)
-    const teammates = showSpinnerTree
-      ? []
-      : sorted.filter(item => item.type === 'in_process_teammate')
+    const teammates = showSpinnerTree ? [] : sorted.filter(item => item.type === 'in_process_teammate');
     // Add leader entry when there are teammates, so users can foreground back to leader
     const leaderItem: ListItem[] =
       teammates.length > 0
@@ -257,7 +211,7 @@ export function BackgroundTasksDialog({
               status: 'running',
             },
           ]
-        : []
+        : [];
     return {
       bashTasks: bash,
       remoteSessions: remote,
@@ -279,167 +233,135 @@ export function BackgroundTasksDialog({
         ...workflows,
         ...dreamTasks,
       ],
-    }
-  }, [typedTasks, foregroundedTaskId, showSpinnerTree])
+    };
+  }, [typedTasks, foregroundedTaskId, showSpinnerTree]);
 
-  const currentSelection = allSelectableItems[selectedIndex] ?? null
+  const currentSelection = allSelectableItems[selectedIndex] ?? null;
 
   // Use configurable keybindings for standard navigation and confirm/cancel.
   // confirm:no is handled by Dialog's onCancel prop.
   useKeybindings(
     {
       'confirm:previous': () => setSelectedIndex(prev => Math.max(0, prev - 1)),
-      'confirm:next': () =>
-        setSelectedIndex(prev =>
-          Math.min(allSelectableItems.length - 1, prev + 1),
-        ),
+      'confirm:next': () => setSelectedIndex(prev => Math.min(allSelectableItems.length - 1, prev + 1)),
       'confirm:yes': () => {
-        const current = allSelectableItems[selectedIndex]
+        const current = allSelectableItems[selectedIndex];
         if (current) {
           if (current.type === 'leader') {
-            exitTeammateView(setAppState)
-            onDone('Viewing leader', { display: 'system' })
+            exitTeammateView(setAppState);
+            onDone('Viewing leader', { display: 'system' });
           } else {
-            setViewState({ mode: 'detail', itemId: current.id })
+            setViewState({ mode: 'detail', itemId: current.id });
           }
         }
       },
     },
     { context: 'Confirmation', isActive: viewState.mode === 'list' },
-  )
+  );
 
   // Component-specific shortcuts (x=stop, f=foreground, right=zoom) shown in UI.
   // These are task-type and status dependent, not standard dialog keybindings.
   const handleKeyDown = (e: KeyboardEvent) => {
     // Only handle input when in list mode
-    if (viewState.mode !== 'list') return
+    if (viewState.mode !== 'list') return;
 
     if (e.key === 'left') {
-      e.preventDefault()
-      onDone('Background tasks dialog dismissed', { display: 'system' })
-      return
+      e.preventDefault();
+      onDone('Background tasks dialog dismissed', { display: 'system' });
+      return;
     }
 
     // Compute current selection at the time of the key press
-    const currentSelection = allSelectableItems[selectedIndex]
-    if (!currentSelection) return // everything below requires a selection
+    const currentSelection = allSelectableItems[selectedIndex];
+    if (!currentSelection) return; // everything below requires a selection
 
     if (e.key === 'x') {
-      e.preventDefault()
-      if (
-        currentSelection.type === 'local_bash' &&
-        currentSelection.status === 'running'
-      ) {
-        void killShellTask(currentSelection.id)
-      } else if (
-        currentSelection.type === 'local_agent' &&
-        currentSelection.status === 'running'
-      ) {
-        void killAgentTask(currentSelection.id)
-      } else if (
-        currentSelection.type === 'in_process_teammate' &&
-        currentSelection.status === 'running'
-      ) {
-        void killTeammateTask(currentSelection.id)
+      e.preventDefault();
+      if (currentSelection.type === 'local_bash' && currentSelection.status === 'running') {
+        void killShellTask(currentSelection.id);
+      } else if (currentSelection.type === 'local_agent' && currentSelection.status === 'running') {
+        void killAgentTask(currentSelection.id);
+      } else if (currentSelection.type === 'in_process_teammate' && currentSelection.status === 'running') {
+        void killTeammateTask(currentSelection.id);
       } else if (
         currentSelection.type === 'local_workflow' &&
         currentSelection.status === 'running' &&
         killWorkflowTask
       ) {
-        killWorkflowTask(currentSelection.id, setAppState)
-      } else if (
-        currentSelection.type === 'monitor_mcp' &&
-        currentSelection.status === 'running' &&
-        killMonitorMcp
-      ) {
-        killMonitorMcp(currentSelection.id, setAppState)
-      } else if (
-        currentSelection.type === 'dream' &&
-        currentSelection.status === 'running'
-      ) {
-        void killDreamTask(currentSelection.id)
-      } else if (
-        currentSelection.type === 'remote_agent' &&
-        currentSelection.status === 'running'
-      ) {
+        killWorkflowTask(currentSelection.id, setAppState);
+      } else if (currentSelection.type === 'monitor_mcp' && currentSelection.status === 'running' && killMonitorMcp) {
+        killMonitorMcp(currentSelection.id, setAppState);
+      } else if (currentSelection.type === 'dream' && currentSelection.status === 'running') {
+        void killDreamTask(currentSelection.id);
+      } else if (currentSelection.type === 'remote_agent' && currentSelection.status === 'running') {
         if (currentSelection.task.isUltraplan) {
-          void stopUltraplan(
-            currentSelection.id,
-            currentSelection.task.sessionId,
-            setAppState,
-          )
+          void stopUltraplan(currentSelection.id, currentSelection.task.sessionId, setAppState);
         } else {
-          void killRemoteAgentTask(currentSelection.id)
+          void killRemoteAgentTask(currentSelection.id);
         }
       }
     }
 
     if (e.key === 'f') {
-      if (
-        currentSelection.type === 'in_process_teammate' &&
-        currentSelection.status === 'running'
-      ) {
-        e.preventDefault()
-        enterTeammateView(currentSelection.id, setAppState)
-        onDone('Viewing teammate', { display: 'system' })
+      if (currentSelection.type === 'in_process_teammate' && currentSelection.status === 'running') {
+        e.preventDefault();
+        enterTeammateView(currentSelection.id, setAppState);
+        onDone('Viewing teammate', { display: 'system' });
       } else if (currentSelection.type === 'leader') {
-        e.preventDefault()
-        exitTeammateView(setAppState)
-        onDone('Viewing leader', { display: 'system' })
+        e.preventDefault();
+        exitTeammateView(setAppState);
+        onDone('Viewing leader', { display: 'system' });
       }
     }
-  }
+  };
 
   async function killShellTask(taskId: string): Promise<void> {
-    await LocalShellTask.kill(taskId, setAppState)
+    await LocalShellTask.kill(taskId, setAppState);
   }
 
   async function killAgentTask(taskId: string): Promise<void> {
-    await LocalAgentTask.kill(taskId, setAppState)
+    await LocalAgentTask.kill(taskId, setAppState);
   }
 
   async function killTeammateTask(taskId: string): Promise<void> {
-    await InProcessTeammateTask.kill(taskId, setAppState)
+    await InProcessTeammateTask.kill(taskId, setAppState);
   }
 
   async function killDreamTask(taskId: string): Promise<void> {
-    await DreamTask.kill(taskId, setAppState)
+    await DreamTask.kill(taskId, setAppState);
   }
 
   async function killRemoteAgentTask(taskId: string): Promise<void> {
-    await RemoteAgentTask.kill(taskId, setAppState)
+    await RemoteAgentTask.kill(taskId, setAppState);
   }
 
   // Wrap onDone in useEffectEvent to get a stable reference that always calls
   // the current onDone callback without causing the effect to re-fire.
-  const onDoneEvent = useEffectEvent(onDone)
+  const onDoneEvent = useEffectEvent(onDone);
 
   useEffect(() => {
     if (viewState.mode !== 'list') {
-      const task = (typedTasks ?? {})[viewState.itemId]
+      const task = (typedTasks ?? {})[viewState.itemId];
       // Workflow tasks get a grace: their detail view stays open through
       // completion so the user sees the final state before eviction.
-      if (
-        !task ||
-        (task.type !== 'local_workflow' && !isBackgroundTask(task))
-      ) {
+      if (!task || (task.type !== 'local_workflow' && !isBackgroundTask(task))) {
         // Task was removed or is no longer a background task (e.g. killed).
         // If we skipped the list on mount, close the dialog entirely.
         if (skippedListOnMount.current) {
           onDoneEvent('Background tasks dialog dismissed', {
             display: 'system',
-          })
+          });
         } else {
-          setViewState({ mode: 'list' })
+          setViewState({ mode: 'list' });
         }
       }
     }
 
-    const totalItems = allSelectableItems.length
+    const totalItems = allSelectableItems.length;
     if (selectedIndex >= totalItems && totalItems > 0) {
-      setSelectedIndex(totalItems - 1)
+      setSelectedIndex(totalItems - 1);
     }
-  }, [viewState, typedTasks, selectedIndex, allSelectableItems, onDoneEvent])
+  }, [viewState, typedTasks, selectedIndex, allSelectableItems, onDoneEvent]);
 
   // Helper to go back to list view (or close dialog if we skipped list on
   // mount AND there's still only ≤1 item). Checking current count prevents
@@ -447,18 +369,18 @@ export function BackgroundTasksDialog({
   // then a second task started, 'back' should show the list — not close.
   const goBackToList = () => {
     if (skippedListOnMount.current && allSelectableItems.length <= 1) {
-      onDone('Background tasks dialog dismissed', { display: 'system' })
+      onDone('Background tasks dialog dismissed', { display: 'system' });
     } else {
-      skippedListOnMount.current = false
-      setViewState({ mode: 'list' })
+      skippedListOnMount.current = false;
+      setViewState({ mode: 'list' });
     }
-  }
+  };
 
   // If an item is selected, show the appropriate view
   if (viewState.mode !== 'list' && typedTasks) {
-    const task = typedTasks[viewState.itemId]
+    const task = typedTasks[viewState.itemId];
     if (!task) {
-      return null
+      return null;
     }
 
     // Detail mode - show appropriate detail dialog
@@ -472,7 +394,7 @@ export function BackgroundTasksDialog({
             onBack={goBackToList}
             key={`shell-${task.id}`}
           />
-        )
+        );
       case 'local_agent':
         return (
           <AsyncAgentDetailDialog
@@ -482,7 +404,7 @@ export function BackgroundTasksDialog({
             onBack={goBackToList}
             key={`agent-${task.id}`}
           />
-        )
+        );
       case 'remote_agent':
         return (
           <RemoteSessionDetailDialog
@@ -494,45 +416,38 @@ export function BackgroundTasksDialog({
               task.status !== 'running'
                 ? undefined
                 : task.isUltraplan
-                  ? () =>
-                      void stopUltraplan(task.id, task.sessionId, setAppState)
+                  ? () => void stopUltraplan(task.id, task.sessionId, setAppState)
                   : () => void killRemoteAgentTask(task.id)
             }
             key={`session-${task.id}`}
           />
-        )
+        );
       case 'in_process_teammate':
         return (
           <InProcessTeammateDetailDialog
             teammate={task}
             onDone={onDone}
-            onKill={
-              task.status === 'running'
-                ? () => void killTeammateTask(task.id)
-                : undefined
-            }
+            onKill={task.status === 'running' ? () => void killTeammateTask(task.id) : undefined}
             onBack={goBackToList}
             onForeground={
               task.status === 'running'
                 ? () => {
-                    enterTeammateView(task.id, setAppState)
-                    onDone('Viewing teammate', { display: 'system' })
+                    enterTeammateView(task.id, setAppState);
+                    onDone('Viewing teammate', { display: 'system' });
                   }
                 : undefined
             }
             key={`teammate-${task.id}`}
           />
-        )
+        );
       case 'local_workflow':
-        if (!WorkflowDetailDialog) return null
+        if (!WorkflowDetailDialog) return null;
         return (
           <WorkflowDetailDialog
             workflow={task}
             onDone={onDone as (message?: string, options?: { display?: string }) => void}
             onKill={
-              task.status === 'running' && killWorkflowTask
-                ? () => killWorkflowTask(task.id, setAppState)
-                : undefined
+              task.status === 'running' && killWorkflowTask ? () => killWorkflowTask(task.id, setAppState) : undefined
             }
             onSkipAgent={
               task.status === 'running' && skipWorkflowAgent
@@ -547,21 +462,19 @@ export function BackgroundTasksDialog({
             onBack={goBackToList}
             key={`workflow-${task.id}`}
           />
-        )
+        );
       case 'monitor_mcp':
-        if (!MonitorMcpDetailDialog) return null
+        if (!MonitorMcpDetailDialog) return null;
         return (
           <MonitorMcpDetailDialog
             task={task}
             onKill={
-              task.status === 'running' && killMonitorMcp
-                ? () => killMonitorMcp(task.id, setAppState)
-                : undefined
+              task.status === 'running' && killMonitorMcp ? () => killMonitorMcp(task.id, setAppState) : undefined
             }
             onBack={goBackToList}
             key={`monitor-mcp-${task.id}`}
           />
-        )
+        );
       case 'dream':
         return (
           <DreamDetailDialog
@@ -572,66 +485,50 @@ export function BackgroundTasksDialog({
               })
             }
             onBack={goBackToList}
-            onKill={
-              task.status === 'running'
-                ? () => void killDreamTask(task.id)
-                : undefined
-            }
+            onKill={task.status === 'running' ? () => void killDreamTask(task.id) : undefined}
             key={`dream-${task.id}`}
           />
-        )
+        );
     }
   }
 
-  const runningBashCount = count(bashTasks, _ => _.status === 'running')
+  const runningBashCount = count(bashTasks, _ => _.status === 'running');
   const runningAgentCount =
-    count(
-      remoteSessions,
-      _ => _.status === 'running' || _.status === 'pending',
-    ) + count(agentTasks, _ => _.status === 'running')
-  const runningTeammateCount = count(teammateTasks, _ => _.status === 'running')
+    count(remoteSessions, _ => _.status === 'running' || _.status === 'pending') +
+    count(agentTasks, _ => _.status === 'running');
+  const runningTeammateCount = count(teammateTasks, _ => _.status === 'running');
   const subtitle = intersperse(
     [
       ...(runningTeammateCount > 0
         ? [
             <Text key="teammates">
-              {runningTeammateCount}{' '}
-              {runningTeammateCount !== 1 ? 'agents' : 'agent'}
+              {runningTeammateCount} {runningTeammateCount !== 1 ? 'agents' : 'agent'}
             </Text>,
           ]
         : []),
       ...(runningBashCount > 0
         ? [
             <Text key="shells">
-              {runningBashCount}{' '}
-              {runningBashCount !== 1 ? 'active shells' : 'active shell'}
+              {runningBashCount} {runningBashCount !== 1 ? 'active shells' : 'active shell'}
             </Text>,
           ]
         : []),
       ...(runningAgentCount > 0
         ? [
             <Text key="agents">
-              {runningAgentCount}{' '}
-              {runningAgentCount !== 1 ? 'active agents' : 'active agent'}
+              {runningAgentCount} {runningAgentCount !== 1 ? 'active agents' : 'active agent'}
             </Text>,
           ]
         : []),
     ],
     index => <Text key={`separator-${index}`}> · </Text>,
-  )
+  );
 
   const actions = [
     <KeyboardShortcutHint key="upDown" shortcut="↑/↓" action="select" />,
     <KeyboardShortcutHint key="enter" shortcut="Enter" action="view" />,
-    ...(currentSelection?.type === 'in_process_teammate' &&
-    currentSelection.status === 'running'
-      ? [
-          <KeyboardShortcutHint
-            key="foreground"
-            shortcut="f"
-            action="foreground"
-          />,
-        ]
+    ...(currentSelection?.type === 'in_process_teammate' && currentSelection.status === 'running'
+      ? [<KeyboardShortcutHint key="foreground" shortcut="f" action="foreground" />]
       : []),
     ...((currentSelection?.type === 'local_bash' ||
       currentSelection?.type === 'local_agent' ||
@@ -644,34 +541,22 @@ export function BackgroundTasksDialog({
       ? [<KeyboardShortcutHint key="kill" shortcut="x" action="stop" />]
       : []),
     ...(agentTasks.some(t => t.status === 'running')
-      ? [
-          <KeyboardShortcutHint
-            key="kill-all"
-            shortcut={killAgentsShortcut}
-            action="stop all agents"
-          />,
-        ]
+      ? [<KeyboardShortcutHint key="kill-all" shortcut={killAgentsShortcut} action="stop all agents" />]
       : []),
     <KeyboardShortcutHint key="esc" shortcut="←/Esc" action="close" />,
-  ]
+  ];
 
-  const handleCancel = () =>
-    onDone('Background tasks dialog dismissed', { display: 'system' })
+  const handleCancel = () => onDone('Background tasks dialog dismissed', { display: 'system' });
 
   function renderInputGuide(exitState: ExitState): React.ReactNode {
     if (exitState.pending) {
-      return <Text>Press {exitState.keyName} again to exit</Text>
+      return <Text>Press {exitState.keyName} again to exit</Text>;
     }
-    return <Byline>{actions}</Byline>
+    return <Byline>{actions}</Byline>;
   }
 
   return (
-    <Box
-      flexDirection="column"
-      tabIndex={0}
-      autoFocus
-      onKeyDown={handleKeyDown}
-    >
+    <Box flexDirection="column" tabIndex={0} autoFocus onKeyDown={handleKeyDown}>
       <Dialog
         title="Background tasks"
         subtitle={<>{subtitle}</>}
@@ -685,64 +570,40 @@ export function BackgroundTasksDialog({
           <Box flexDirection="column">
             {teammateTasks.length > 0 && (
               <Box flexDirection="column">
-                {(bashTasks.length > 0 ||
-                  remoteSessions.length > 0 ||
-                  agentTasks.length > 0) && (
+                {(bashTasks.length > 0 || remoteSessions.length > 0 || agentTasks.length > 0) && (
                   <Text dimColor>
-                    <Text bold>{'  '}Agents</Text> (
-                    {count(teammateTasks, i => i.type !== 'leader')})
+                    <Text bold>{'  '}Agents</Text> ({count(teammateTasks, i => i.type !== 'leader')})
                   </Text>
                 )}
                 <Box flexDirection="column">
-                  <TeammateTaskGroups
-                    teammateTasks={teammateTasks}
-                    currentSelectionId={currentSelection?.id}
-                  />
+                  <TeammateTaskGroups teammateTasks={teammateTasks} currentSelectionId={currentSelection?.id} />
                 </Box>
               </Box>
             )}
 
             {bashTasks.length > 0 && (
-              <Box
-                flexDirection="column"
-                marginTop={teammateTasks.length > 0 ? 1 : 0}
-              >
-                {(teammateTasks.length > 0 ||
-                  remoteSessions.length > 0 ||
-                  agentTasks.length > 0) && (
+              <Box flexDirection="column" marginTop={teammateTasks.length > 0 ? 1 : 0}>
+                {(teammateTasks.length > 0 || remoteSessions.length > 0 || agentTasks.length > 0) && (
                   <Text dimColor>
                     <Text bold>{'  '}Shells</Text> ({bashTasks.length})
                   </Text>
                 )}
                 <Box flexDirection="column">
                   {bashTasks.map(item => (
-                    <Item
-                      key={item.id}
-                      item={item}
-                      isSelected={item.id === currentSelection?.id}
-                    />
+                    <Item key={item.id} item={item} isSelected={item.id === currentSelection?.id} />
                   ))}
                 </Box>
               </Box>
             )}
 
             {mcpMonitors.length > 0 && (
-              <Box
-                flexDirection="column"
-                marginTop={
-                  teammateTasks.length > 0 || bashTasks.length > 0 ? 1 : 0
-                }
-              >
+              <Box flexDirection="column" marginTop={teammateTasks.length > 0 || bashTasks.length > 0 ? 1 : 0}>
                 <Text dimColor>
                   <Text bold>{'  '}Monitors</Text> ({mcpMonitors.length})
                 </Text>
                 <Box flexDirection="column">
                   {mcpMonitors.map(item => (
-                    <Item
-                      key={item.id}
-                      item={item}
-                      isSelected={item.id === currentSelection?.id}
-                    />
+                    <Item key={item.id} item={item} isSelected={item.id === currentSelection?.id} />
                   ))}
                 </Box>
               </Box>
@@ -751,25 +612,14 @@ export function BackgroundTasksDialog({
             {remoteSessions.length > 0 && (
               <Box
                 flexDirection="column"
-                marginTop={
-                  teammateTasks.length > 0 ||
-                  bashTasks.length > 0 ||
-                  mcpMonitors.length > 0
-                    ? 1
-                    : 0
-                }
+                marginTop={teammateTasks.length > 0 || bashTasks.length > 0 || mcpMonitors.length > 0 ? 1 : 0}
               >
                 <Text dimColor>
-                  <Text bold>{'  '}Remote agents</Text> ({remoteSessions.length}
-                  )
+                  <Text bold>{'  '}Remote agents</Text> ({remoteSessions.length})
                 </Text>
                 <Box flexDirection="column">
                   {remoteSessions.map(item => (
-                    <Item
-                      key={item.id}
-                      item={item}
-                      isSelected={item.id === currentSelection?.id}
-                    />
+                    <Item key={item.id} item={item} isSelected={item.id === currentSelection?.id} />
                   ))}
                 </Box>
               </Box>
@@ -792,11 +642,7 @@ export function BackgroundTasksDialog({
                 </Text>
                 <Box flexDirection="column">
                   {agentTasks.map(item => (
-                    <Item
-                      key={item.id}
-                      item={item}
-                      isSelected={item.id === currentSelection?.id}
-                    />
+                    <Item key={item.id} item={item} isSelected={item.id === currentSelection?.id} />
                   ))}
                 </Box>
               </Box>
@@ -820,11 +666,7 @@ export function BackgroundTasksDialog({
                 </Text>
                 <Box flexDirection="column">
                   {workflowTasks.map(item => (
-                    <Item
-                      key={item.id}
-                      item={item}
-                      isSelected={item.id === currentSelection?.id}
-                    />
+                    <Item key={item.id} item={item} isSelected={item.id === currentSelection?.id} />
                   ))}
                 </Box>
               </Box>
@@ -846,11 +688,7 @@ export function BackgroundTasksDialog({
               >
                 <Box flexDirection="column">
                   {dreamTasks.map(item => (
-                    <Item
-                      key={item.id}
-                      item={item}
-                      isSelected={item.id === currentSelection?.id}
-                    />
+                    <Item key={item.id} item={item} isSelected={item.id === currentSelection?.id} />
                   ))}
                 </Box>
               </Box>
@@ -859,7 +697,7 @@ export function BackgroundTasksDialog({
         )}
       </Dialog>
     </Box>
-  )
+  );
 }
 
 function toListItem(task: BackgroundTaskState): ListItem {
@@ -871,7 +709,7 @@ function toListItem(task: BackgroundTaskState): ListItem {
         label: task.kind === 'monitor' ? task.description : task.command,
         status: task.status,
         task,
-      }
+      };
     case 'remote_agent':
       return {
         id: task.id,
@@ -879,7 +717,7 @@ function toListItem(task: BackgroundTaskState): ListItem {
         label: task.title,
         status: task.status,
         task,
-      }
+      };
     case 'local_agent':
       return {
         id: task.id,
@@ -887,7 +725,7 @@ function toListItem(task: BackgroundTaskState): ListItem {
         label: task.description,
         status: task.status,
         task,
-      }
+      };
     case 'in_process_teammate':
       return {
         id: task.id,
@@ -895,7 +733,7 @@ function toListItem(task: BackgroundTaskState): ListItem {
         label: `@${task.identity.agentName}`,
         status: task.status,
         task,
-      }
+      };
     case 'local_workflow':
       return {
         id: task.id,
@@ -903,7 +741,7 @@ function toListItem(task: BackgroundTaskState): ListItem {
         label: task.summary ?? task.description,
         status: task.status,
         task,
-      }
+      };
     case 'monitor_mcp':
       return {
         id: task.id,
@@ -911,7 +749,7 @@ function toListItem(task: BackgroundTaskState): ListItem {
         label: task.description,
         status: task.status,
         task,
-      }
+      };
     case 'dream':
       return {
         id: task.id,
@@ -919,69 +757,56 @@ function toListItem(task: BackgroundTaskState): ListItem {
         label: task.description,
         status: task.status,
         task,
-      }
+      };
   }
 }
 
-function Item({
-  item,
-  isSelected,
-}: {
-  item: ListItem
-  isSelected: boolean
-}): ReactNode {
-  const { columns } = useTerminalSize()
+function Item({ item, isSelected }: { item: ListItem; isSelected: boolean }): ReactNode {
+  const { columns } = useTerminalSize();
   // Dialog border (2) + padding (2) + pointer prefix (2) + name/status overhead (~20)
-  const maxActivityWidth = Math.max(30, columns - 26)
+  const maxActivityWidth = Math.max(30, columns - 26);
   // In coordinator mode, use grey pointer instead of blue
-  const useGreyPointer = isCoordinatorMode()
+  const useGreyPointer = isCoordinatorMode();
 
   return (
     <Box flexDirection="row">
-      <Text dimColor={useGreyPointer && isSelected}>
-        {isSelected ? figures.pointer + ' ' : '  '}
-      </Text>
+      <Text dimColor={useGreyPointer && isSelected}>{isSelected ? figures.pointer + ' ' : '  '}</Text>
       <Text color={isSelected && !useGreyPointer ? 'suggestion' : undefined}>
         {item.type === 'leader' ? (
           <Text>@{TEAM_LEAD_NAME}</Text>
         ) : (
-          <BackgroundTaskComponent
-            task={item.task}
-            maxActivityWidth={maxActivityWidth}
-          />
+          <BackgroundTaskComponent task={item.task} maxActivityWidth={maxActivityWidth} />
         )}
       </Text>
     </Box>
-  )
+  );
 }
 
 function TeammateTaskGroups({
   teammateTasks,
   currentSelectionId,
 }: {
-  teammateTasks: ListItem[]
-  currentSelectionId: string | undefined
+  teammateTasks: ListItem[];
+  currentSelectionId: string | undefined;
 }): ReactNode {
   // Separate leader from teammates, group teammates by team
-  const leaderItems = teammateTasks.filter(i => i.type === 'leader')
-  const teammateItems = teammateTasks.filter(
-    i => i.type === 'in_process_teammate',
-  )
-  const teams = new Map<string, typeof teammateItems>()
+  const leaderItems = teammateTasks.filter(i => i.type === 'leader');
+  const teammateItems = teammateTasks.filter(i => i.type === 'in_process_teammate');
+  const teams = new Map<string, typeof teammateItems>();
   for (const item of teammateItems) {
-    const teamName = item.task.identity.teamName
-    const group = teams.get(teamName)
+    const teamName = item.task.identity.teamName;
+    const group = teams.get(teamName);
     if (group) {
-      group.push(item)
+      group.push(item);
     } else {
-      teams.set(teamName, [item])
+      teams.set(teamName, [item]);
     }
   }
-  const teamEntries = [...teams.entries()]
+  const teamEntries = [...teams.entries()];
   return (
     <>
       {teamEntries.map(([teamName, items]) => {
-        const memberCount = items.length + leaderItems.length
+        const memberCount = items.length + leaderItems.length;
         return (
           <Box key={teamName} flexDirection="column">
             <Text dimColor>
@@ -989,22 +814,14 @@ function TeammateTaskGroups({
             </Text>
             {/* Render leader first within each team */}
             {leaderItems.map(item => (
-              <Item
-                key={`${item.id}-${teamName}`}
-                item={item}
-                isSelected={item.id === currentSelectionId}
-              />
+              <Item key={`${item.id}-${teamName}`} item={item} isSelected={item.id === currentSelectionId} />
             ))}
             {items.map(item => (
-              <Item
-                key={item.id}
-                item={item}
-                isSelected={item.id === currentSelectionId}
-              />
+              <Item key={item.id} item={item} isSelected={item.id === currentSelectionId} />
             ))}
           </Box>
-        )
+        );
       })}
     </>
-  )
+  );
 }
diff --git a/src/components/tasks/DreamDetailDialog.tsx b/src/components/tasks/DreamDetailDialog.tsx
index 67baab993..16040c77f 100644
--- a/src/components/tasks/DreamDetailDialog.tsx
+++ b/src/components/tasks/DreamDetailDialog.tsx
@@ -1,75 +1,58 @@
-import React from 'react'
-import type { DeepImmutable } from 'src/types/utils.js'
-import { useElapsedTime } from '../../hooks/useElapsedTime.js'
-import { type KeyboardEvent, Box, Text } from '@anthropic/ink'
-import { useKeybindings } from '../../keybindings/useKeybinding.js'
-import type { DreamTaskState } from '../../tasks/DreamTask/DreamTask.js'
-import { plural } from '../../utils/stringUtils.js'
-import { Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink'
+import React from 'react';
+import type { DeepImmutable } from 'src/types/utils.js';
+import { useElapsedTime } from '../../hooks/useElapsedTime.js';
+import { type KeyboardEvent, Box, Text } from '@anthropic/ink';
+import { useKeybindings } from '../../keybindings/useKeybinding.js';
+import type { DreamTaskState } from '../../tasks/DreamTask/DreamTask.js';
+import { plural } from '../../utils/stringUtils.js';
+import { Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink';
 
 type Props = {
-  task: DeepImmutable<DreamTaskState>
-  onDone: () => void
-  onBack?: () => void
-  onKill?: () => void
-}
+  task: DeepImmutable<DreamTaskState>;
+  onDone: () => void;
+  onBack?: () => void;
+  onKill?: () => void;
+};
 
 // How many recent turns to render. Earlier turns collapse to a count.
-const VISIBLE_TURNS = 6
+const VISIBLE_TURNS = 6;
 
-export function DreamDetailDialog({
-  task,
-  onDone,
-  onBack,
-  onKill,
-}: Props): React.ReactNode {
-  const elapsedTime = useElapsedTime(
-    task.startTime,
-    task.status === 'running',
-    1000,
-    0,
-  )
+export function DreamDetailDialog({ task, onDone, onBack, onKill }: Props): React.ReactNode {
+  const elapsedTime = useElapsedTime(task.startTime, task.status === 'running', 1000, 0);
 
   // Dialog handles confirm:no (Esc) → onCancel. Wire confirm:yes (Enter/y) too.
-  useKeybindings({ 'confirm:yes': onDone }, { context: 'Confirmation' })
+  useKeybindings({ 'confirm:yes': onDone }, { context: 'Confirmation' });
 
   const handleKeyDown = (e: KeyboardEvent) => {
     if (e.key === ' ') {
-      e.preventDefault()
-      onDone()
+      e.preventDefault();
+      onDone();
     } else if (e.key === 'left' && onBack) {
-      e.preventDefault()
-      onBack()
+      e.preventDefault();
+      onBack();
     } else if (e.key === 'x' && task.status === 'running' && onKill) {
-      e.preventDefault()
-      onKill()
+      e.preventDefault();
+      onKill();
     }
-  }
+  };
 
   // Turns with text to show. Tool-only turns (text='') are dropped entirely —
   // the per-turn toolUseCount already captures that work.
-  const visibleTurns = task.turns.filter(t => t.text !== '')
-  const shown = visibleTurns.slice(-VISIBLE_TURNS)
-  const hidden = visibleTurns.length - shown.length
+  const visibleTurns = task.turns.filter(t => t.text !== '');
+  const shown = visibleTurns.slice(-VISIBLE_TURNS);
+  const hidden = visibleTurns.length - shown.length;
 
   return (
-    <Box
-      flexDirection="column"
-      tabIndex={0}
-      autoFocus
-      onKeyDown={handleKeyDown}
-    >
+    <Box flexDirection="column" tabIndex={0} autoFocus onKeyDown={handleKeyDown}>
       <Dialog
         title="Memory consolidation"
         subtitle={
           <Text dimColor>
-            {elapsedTime} · reviewing {task.sessionsReviewing}{' '}
-            {plural(task.sessionsReviewing, 'session')}
+            {elapsedTime} · reviewing {task.sessionsReviewing} {plural(task.sessionsReviewing, 'session')}
             {task.filesTouched.length > 0 && (
               <>
                 {' '}
-                · {task.filesTouched.length}{' '}
-                {plural(task.filesTouched.length, 'file')} touched
+                · {task.filesTouched.length} {plural(task.filesTouched.length, 'file')} touched
               </>
             )}
           </Text>
@@ -83,9 +66,7 @@ export function DreamDetailDialog({
             <Byline>
               {onBack && <KeyboardShortcutHint shortcut="←" action="go back" />}
               <KeyboardShortcutHint shortcut="Esc/Enter/Space" action="close" />
-              {task.status === 'running' && onKill && (
-                <KeyboardShortcutHint shortcut="x" action="stop" />
-              )}
+              {task.status === 'running' && onKill && <KeyboardShortcutHint shortcut="x" action="stop" />}
             </Byline>
           )
         }
@@ -103,9 +84,7 @@ export function DreamDetailDialog({
           </Text>
 
           {shown.length === 0 ? (
-            <Text dimColor>
-              {task.status === 'running' ? 'Starting…' : '(no text output)'}
-            </Text>
+            <Text dimColor>{task.status === 'running' ? 'Starting…' : '(no text output)'}</Text>
           ) : (
             <>
               {hidden > 0 && (
@@ -118,8 +97,7 @@ export function DreamDetailDialog({
                   <Text wrap="wrap">{turn.text}</Text>
                   {turn.toolUseCount > 0 && (
                     <Text dimColor>
-                      {'  '}({turn.toolUseCount}{' '}
-                      {plural(turn.toolUseCount, 'tool')})
+                      {'  '}({turn.toolUseCount} {plural(turn.toolUseCount, 'tool')})
                     </Text>
                   )}
                 </Box>
@@ -129,5 +107,5 @@ export function DreamDetailDialog({
         </Box>
       </Dialog>
     </Box>
-  )
+  );
 }
diff --git a/src/components/tasks/InProcessTeammateDetailDialog.tsx b/src/components/tasks/InProcessTeammateDetailDialog.tsx
index c0a755a60..b2b845191 100644
--- a/src/components/tasks/InProcessTeammateDetailDialog.tsx
+++ b/src/components/tasks/InProcessTeammateDetailDialog.tsx
@@ -1,25 +1,25 @@
-import React, { useMemo } from 'react'
-import type { DeepImmutable } from 'src/types/utils.js'
-import { useElapsedTime } from '../../hooks/useElapsedTime.js'
-import { type KeyboardEvent, Box, Text, useTheme } from '@anthropic/ink'
-import { useKeybindings } from '../../keybindings/useKeybinding.js'
-import { getEmptyToolPermissionContext } from '../../Tool.js'
-import type { InProcessTeammateTaskState } from '../../tasks/InProcessTeammateTask/types.js'
-import { getTools } from '../../tools.js'
-import { formatNumber, truncateToWidth } from '../../utils/format.js'
+import React, { useMemo } from 'react';
+import type { DeepImmutable } from 'src/types/utils.js';
+import { useElapsedTime } from '../../hooks/useElapsedTime.js';
+import { type KeyboardEvent, Box, Text, useTheme } from '@anthropic/ink';
+import { useKeybindings } from '../../keybindings/useKeybinding.js';
+import { getEmptyToolPermissionContext } from '../../Tool.js';
+import type { InProcessTeammateTaskState } from '../../tasks/InProcessTeammateTask/types.js';
+import { getTools } from '../../tools.js';
+import { formatNumber, truncateToWidth } from '../../utils/format.js';
 
-import { Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink'
-import { toInkColor } from '../../utils/ink.js'
-import { renderToolActivity } from './renderToolActivity.js'
-import { describeTeammateActivity } from './taskStatusUtils.js'
+import { Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink';
+import { toInkColor } from '../../utils/ink.js';
+import { renderToolActivity } from './renderToolActivity.js';
+import { describeTeammateActivity } from './taskStatusUtils.js';
 
 type Props = {
-  teammate: DeepImmutable<InProcessTeammateTaskState>
-  onDone: () => void
-  onKill?: () => void
-  onBack?: () => void
-  onForeground?: () => void
-}
+  teammate: DeepImmutable<InProcessTeammateTaskState>;
+  onDone: () => void;
+  onKill?: () => void;
+  onBack?: () => void;
+  onForeground?: () => void;
+};
 export function InProcessTeammateDetailDialog({
   teammate,
   onDone,
@@ -27,15 +27,15 @@ export function InProcessTeammateDetailDialog({
   onBack,
   onForeground,
 }: Props): React.ReactNode {
-  const [theme] = useTheme()
-  const tools = useMemo(() => getTools(getEmptyToolPermissionContext()), [])
+  const [theme] = useTheme();
+  const tools = useMemo(() => getTools(getEmptyToolPermissionContext()), []);
 
   const elapsedTime = useElapsedTime(
     teammate.startTime,
     teammate.status === 'running',
     1000,
     teammate.totalPausedMs ?? 0,
-  )
+  );
 
   // Restore confirm:yes (Enter/y) dismissal — Dialog handles confirm:no (Esc)
   useKeybindings(
@@ -43,67 +43,49 @@ export function InProcessTeammateDetailDialog({
       'confirm:yes': onDone,
     },
     { context: 'Confirmation' },
-  )
+  );
 
   const handleKeyDown = (e: KeyboardEvent) => {
     if (e.key === ' ') {
-      e.preventDefault()
-      onDone()
+      e.preventDefault();
+      onDone();
     } else if (e.key === 'left' && onBack) {
-      e.preventDefault()
-      onBack()
+      e.preventDefault();
+      onBack();
     } else if (e.key === 'x' && teammate.status === 'running' && onKill) {
-      e.preventDefault()
-      onKill()
+      e.preventDefault();
+      onKill();
     } else if (e.key === 'f' && teammate.status === 'running' && onForeground) {
-      e.preventDefault()
-      onForeground()
+      e.preventDefault();
+      onForeground();
     }
-  }
+  };
 
-  const activity = describeTeammateActivity(teammate)
+  const activity = describeTeammateActivity(teammate);
 
-  const tokenCount =
-    teammate.result?.totalTokens ?? teammate.progress?.tokenCount
-  const toolUseCount =
-    teammate.result?.totalToolUseCount ?? teammate.progress?.toolUseCount
+  const tokenCount = teammate.result?.totalTokens ?? teammate.progress?.tokenCount;
+  const toolUseCount = teammate.result?.totalToolUseCount ?? teammate.progress?.toolUseCount;
 
-  const displayPrompt = truncateToWidth(teammate.prompt, 300)
+  const displayPrompt = truncateToWidth(teammate.prompt, 300);
 
   const title = (
     <Text>
-      <Text color={toInkColor(teammate.identity.color)}>
-        @{teammate.identity.agentName}
-      </Text>
+      <Text color={toInkColor(teammate.identity.color)}>@{teammate.identity.agentName}</Text>
       {activity && <Text dimColor> ({activity})</Text>}
     </Text>
-  )
+  );
 
   const subtitle = (
     <Text>
       {teammate.status !== 'running' && (
-        <Text
-          color={
-            teammate.status === 'completed'
-              ? 'success'
-              : teammate.status === 'killed'
-                ? 'warning'
-                : 'error'
-          }
-        >
-          {teammate.status === 'completed'
-            ? 'Completed'
-            : teammate.status === 'failed'
-              ? 'Failed'
-              : 'Stopped'}
+        <Text color={teammate.status === 'completed' ? 'success' : teammate.status === 'killed' ? 'warning' : 'error'}>
+          {teammate.status === 'completed' ? 'Completed' : teammate.status === 'failed' ? 'Failed' : 'Stopped'}
           {' · '}
         </Text>
       )}
       <Text dimColor>
         {elapsedTime}
-        {tokenCount !== undefined && tokenCount > 0 && (
-          <> · {formatNumber(tokenCount)} tokens</>
-        )}
+        {tokenCount !== undefined && tokenCount > 0 && <> · {formatNumber(tokenCount)} tokens</>}
         {toolUseCount !== undefined && toolUseCount > 0 && (
           <>
             {' '}
@@ -112,15 +94,10 @@ export function InProcessTeammateDetailDialog({
         )}
       </Text>
     </Text>
-  )
+  );
 
   return (
-    <Box
-      flexDirection="column"
-      tabIndex={0}
-      autoFocus
-      onKeyDown={handleKeyDown}
-    >
+    <Box flexDirection="column" tabIndex={0} autoFocus onKeyDown={handleKeyDown}>
       <Dialog
         title={title}
         subtitle={subtitle}
@@ -133,9 +110,7 @@ export function InProcessTeammateDetailDialog({
             <Byline>
               {onBack && <KeyboardShortcutHint shortcut="←" action="go back" />}
               <KeyboardShortcutHint shortcut="Esc/Enter/Space" action="close" />
-              {teammate.status === 'running' && onKill && (
-                <KeyboardShortcutHint shortcut="x" action="stop" />
-              )}
+              {teammate.status === 'running' && onKill && <KeyboardShortcutHint shortcut="x" action="stop" />}
               {teammate.status === 'running' && onForeground && (
                 <KeyboardShortcutHint shortcut="f" action="foreground" />
               )}
@@ -152,14 +127,8 @@ export function InProcessTeammateDetailDialog({
                 Progress
               </Text>
               {teammate.progress.recentActivities.map((activity, i) => (
-                <Text
-                  key={i}
-                  dimColor={i < teammate.progress!.recentActivities!.length - 1}
-                  wrap="truncate-end"
-                >
-                  {i === teammate.progress!.recentActivities!.length - 1
-                    ? '› '
-                    : '  '}
+                <Text key={i} dimColor={i < teammate.progress!.recentActivities!.length - 1} wrap="truncate-end">
+                  {i === teammate.progress!.recentActivities!.length - 1 ? '› ' : '  '}
                   {renderToolActivity(activity, tools, theme)}
                 </Text>
               ))}
@@ -187,5 +156,5 @@ export function InProcessTeammateDetailDialog({
         )}
       </Dialog>
     </Box>
-  )
+  );
 }
diff --git a/src/components/tasks/MonitorMcpDetailDialog.tsx b/src/components/tasks/MonitorMcpDetailDialog.tsx
index 5e1d3b433..ebadcb419 100644
--- a/src/components/tasks/MonitorMcpDetailDialog.tsx
+++ b/src/components/tasks/MonitorMcpDetailDialog.tsx
@@ -1,50 +1,38 @@
-import React from 'react'
-import type { DeepImmutable } from 'src/types/utils.js'
-import { useElapsedTime } from '../../hooks/useElapsedTime.js'
-import { Box, Text, type KeyboardEvent } from '@anthropic/ink'
-import { useKeybindings } from '../../keybindings/useKeybinding.js'
-import type { MonitorMcpTaskState } from '../../tasks/MonitorMcpTask/MonitorMcpTask.js'
-import { Byline } from '../design-system/Byline.js'
-import { Dialog } from '../design-system/Dialog.js'
-import { KeyboardShortcutHint } from '../design-system/KeyboardShortcutHint.js'
+import React from 'react';
+import type { DeepImmutable } from 'src/types/utils.js';
+import { useElapsedTime } from '../../hooks/useElapsedTime.js';
+import { Box, Text, type KeyboardEvent } from '@anthropic/ink';
+import { useKeybindings } from '../../keybindings/useKeybinding.js';
+import type { MonitorMcpTaskState } from '../../tasks/MonitorMcpTask/MonitorMcpTask.js';
+import { Byline } from '../design-system/Byline.js';
+import { Dialog } from '../design-system/Dialog.js';
+import { KeyboardShortcutHint } from '../design-system/KeyboardShortcutHint.js';
 
 type Props = {
-  task: DeepImmutable<MonitorMcpTaskState>
-  onBack?: () => void
-  onKill?: () => void
-}
+  task: DeepImmutable<MonitorMcpTaskState>;
+  onBack?: () => void;
+  onKill?: () => void;
+};
 
 /**
  * Detail dialog for MCP monitor tasks shown in the Shift+Down background
  * tasks overlay. Displays the server name, resource URI, and current status.
  * Follows the DreamDetailDialog/ShellDetailDialog pattern.
  */
-export function MonitorMcpDetailDialog({
-  task,
-  onBack,
-  onKill,
-}: Props): React.ReactNode {
-  const elapsedTime = useElapsedTime(
-    task.startTime,
-    task.status === 'running',
-    1000,
-    0,
-  )
+export function MonitorMcpDetailDialog({ task, onBack, onKill }: Props): React.ReactNode {
+  const elapsedTime = useElapsedTime(task.startTime, task.status === 'running', 1000, 0);
 
-  useKeybindings(
-    {},
-    { context: 'MonitorMcpDetail' },
-  )
+  useKeybindings({}, { context: 'MonitorMcpDetail' });
 
   const handleKeyDown = (e: KeyboardEvent): void => {
     if (e.key === 'left' && onBack) {
-      e.preventDefault()
-      onBack()
+      e.preventDefault();
+      onBack();
     } else if (e.key === 'x' && task.status === 'running' && onKill) {
-      e.preventDefault()
-      onKill()
+      e.preventDefault();
+      onKill();
     }
-  }
+  };
 
   return (
     <Box flexDirection="column" tabIndex={0} borderStyle="round" onKeyDown={handleKeyDown}>
@@ -58,13 +46,9 @@ export function MonitorMcpDetailDialog({
         onCancel={onBack ?? (() => {})}
         inputGuide={() => (
           <Byline>
-            {onBack && (
-              <KeyboardShortcutHint shortcut="←" action="go back" />
-            )}
+            {onBack && <KeyboardShortcutHint shortcut="←" action="go back" />}
             <KeyboardShortcutHint shortcut="Esc" action="close" />
-            {task.status === 'running' && onKill && (
-              <KeyboardShortcutHint shortcut="x" action="stop" />
-            )}
+            {task.status === 'running' && onKill && <KeyboardShortcutHint shortcut="x" action="stop" />}
           </Byline>
         )}
       >
@@ -96,5 +80,5 @@ export function MonitorMcpDetailDialog({
         </Box>
       </Dialog>
     </Box>
-  )
+  );
 }
diff --git a/src/components/tasks/RemoteSessionDetailDialog.tsx b/src/components/tasks/RemoteSessionDetailDialog.tsx
index 5e45dfbb5..d43eb9d7d 100644
--- a/src/components/tasks/RemoteSessionDetailDialog.tsx
+++ b/src/components/tasks/RemoteSessionDetailDialog.tsx
@@ -1,46 +1,37 @@
-import figures from 'figures'
-import React, { useMemo, useState } from 'react'
-import type { SDKMessage } from 'src/entrypoints/agentSdkTypes.js'
-import type { ToolUseContext } from 'src/Tool.js'
-import type { DeepImmutable } from 'src/types/utils.js'
-import type { CommandResultDisplay } from '../../commands.js'
-import { DIAMOND_FILLED, DIAMOND_OPEN } from '../../constants/figures.js'
-import { useElapsedTime } from '../../hooks/useElapsedTime.js'
-import { type KeyboardEvent, Box, Link, Text } from '@anthropic/ink'
-import type { RemoteAgentTaskState } from '../../tasks/RemoteAgentTask/RemoteAgentTask.js'
-import { getRemoteTaskSessionUrl } from '../../tasks/RemoteAgentTask/RemoteAgentTask.js'
-import {
-  AGENT_TOOL_NAME,
-  LEGACY_AGENT_TOOL_NAME,
-} from '@claude-code-best/builtin-tools/tools/AgentTool/constants.js'
-import { ASK_USER_QUESTION_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/AskUserQuestionTool/prompt.js'
-import { EXIT_PLAN_MODE_V2_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/ExitPlanModeTool/constants.js'
-import { openBrowser } from '../../utils/browser.js'
-import { errorMessage } from '../../utils/errors.js'
-import { formatDuration, truncateToWidth } from '../../utils/format.js'
-import { toInternalMessages } from '../../utils/messages/mappers.js'
-import { EMPTY_LOOKUPS, normalizeMessages } from '../../utils/messages.js'
-import { plural } from '../../utils/stringUtils.js'
-import { teleportResumeCodeSession } from '../../utils/teleport.js'
-import { Select } from '../CustomSelect/select.js'
-import { Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink'
-import { Message } from '../Message.js'
-import {
-  formatReviewStageCounts,
-  RemoteSessionProgress,
-} from './RemoteSessionProgress.js'
-import { AssistantMessage } from 'src/types/message.js'
+import figures from 'figures';
+import React, { useMemo, useState } from 'react';
+import type { SDKMessage } from 'src/entrypoints/agentSdkTypes.js';
+import type { ToolUseContext } from 'src/Tool.js';
+import type { DeepImmutable } from 'src/types/utils.js';
+import type { CommandResultDisplay } from '../../commands.js';
+import { DIAMOND_FILLED, DIAMOND_OPEN } from '../../constants/figures.js';
+import { useElapsedTime } from '../../hooks/useElapsedTime.js';
+import { type KeyboardEvent, Box, Link, Text } from '@anthropic/ink';
+import type { RemoteAgentTaskState } from '../../tasks/RemoteAgentTask/RemoteAgentTask.js';
+import { getRemoteTaskSessionUrl } from '../../tasks/RemoteAgentTask/RemoteAgentTask.js';
+import { AGENT_TOOL_NAME, LEGACY_AGENT_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/AgentTool/constants.js';
+import { ASK_USER_QUESTION_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/AskUserQuestionTool/prompt.js';
+import { EXIT_PLAN_MODE_V2_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/ExitPlanModeTool/constants.js';
+import { openBrowser } from '../../utils/browser.js';
+import { errorMessage } from '../../utils/errors.js';
+import { formatDuration, truncateToWidth } from '../../utils/format.js';
+import { toInternalMessages } from '../../utils/messages/mappers.js';
+import { EMPTY_LOOKUPS, normalizeMessages } from '../../utils/messages.js';
+import { plural } from '../../utils/stringUtils.js';
+import { teleportResumeCodeSession } from '../../utils/teleport.js';
+import { Select } from '../CustomSelect/select.js';
+import { Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink';
+import { Message } from '../Message.js';
+import { formatReviewStageCounts, RemoteSessionProgress } from './RemoteSessionProgress.js';
+import { AssistantMessage } from 'src/types/message.js';
 
 type Props = {
-  session: DeepImmutable<RemoteAgentTaskState>
-  toolUseContext: ToolUseContext
-  onDone: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-  onBack?: () => void
-  onKill?: () => void
-}
+  session: DeepImmutable<RemoteAgentTaskState>;
+  toolUseContext: ToolUseContext;
+  onDone: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+  onBack?: () => void;
+  onKill?: () => void;
+};
 
 // Compact one-line summary: tool name + first meaningful string arg.
 // Lighter than tool.renderToolUseMessage (no registry lookup / schema parse).
@@ -49,119 +40,89 @@ type Props = {
 export function formatToolUseSummary(name: string, input: unknown): string {
   // plan_ready phase is only reached via ExitPlanMode tool
   if (name === EXIT_PLAN_MODE_V2_TOOL_NAME) {
-    return 'Review the plan in Claude Code on the web'
+    return 'Review the plan in Claude Code on the web';
   }
-  if (!input || typeof input !== 'object') return name
+  if (!input || typeof input !== 'object') return name;
   // AskUserQuestion: show the question text as a CTA, not the tool name.
   // Input shape is {questions: [{question, header, options}]}.
   if (name === ASK_USER_QUESTION_TOOL_NAME && 'questions' in input) {
-    const qs = input.questions
+    const qs = input.questions;
     if (Array.isArray(qs) && qs[0] && typeof qs[0] === 'object') {
       // Prefer question (full text) over header (max-12-char tag). header
       // is a required schema field so checking it first would make the
       // question fallback dead code.
       const q =
-        'question' in qs[0] &&
-        typeof qs[0].question === 'string' &&
-        qs[0].question
+        'question' in qs[0] && typeof qs[0].question === 'string' && qs[0].question
           ? qs[0].question
           : 'header' in qs[0] && typeof qs[0].header === 'string'
             ? qs[0].header
-            : null
+            : null;
       if (q) {
-        const oneLine = q.replace(/\s+/g, ' ').trim()
-        return `Answer in browser: ${truncateToWidth(oneLine, 50)}`
+        const oneLine = q.replace(/\s+/g, ' ').trim();
+        return `Answer in browser: ${truncateToWidth(oneLine, 50)}`;
       }
     }
   }
   for (const v of Object.values(input)) {
     if (typeof v === 'string' && v.trim()) {
-      const oneLine = v.replace(/\s+/g, ' ').trim()
-      return `${name} ${truncateToWidth(oneLine, 60)}`
+      const oneLine = v.replace(/\s+/g, ' ').trim();
+      return `${name} ${truncateToWidth(oneLine, 60)}`;
     }
   }
-  return name
+  return name;
 }
 
 const PHASE_LABEL = {
   needs_input: 'input required',
   plan_ready: 'ready',
-} as const
+} as const;
 
 const AGENT_VERB = {
   needs_input: 'waiting',
   plan_ready: 'done',
-} as const
+} as const;
 
-function UltraplanSessionDetail({
-  session,
-  onDone,
-  onBack,
-  onKill,
-}: Omit<Props, 'toolUseContext'>): React.ReactNode {
-  const running = session.status === 'running' || session.status === 'pending'
-  const phase = session.ultraplanPhase
-  const statusText = running
-    ? phase
-      ? PHASE_LABEL[phase]
-      : 'running'
-    : session.status
-  const elapsedTime = useElapsedTime(
-    session.startTime,
-    running,
-    1000,
-    0,
-    session.endTime,
-  )
+function UltraplanSessionDetail({ session, onDone, onBack, onKill }: Omit<Props, 'toolUseContext'>): React.ReactNode {
+  const running = session.status === 'running' || session.status === 'pending';
+  const phase = session.ultraplanPhase;
+  const statusText = running ? (phase ? PHASE_LABEL[phase] : 'running') : session.status;
+  const elapsedTime = useElapsedTime(session.startTime, running, 1000, 0, session.endTime);
 
   // Counts are eventually correct (lag ≤ poll interval). agentsWorking starts
   // at 1 (the main session agent) and increments per subagent spawn. toolCalls
   // is main-session only — subagent calls may not surface in this stream.
   const { agentsWorking, toolCalls, lastToolCall } = useMemo(() => {
-    let spawns = 0
-    let calls = 0
-    let lastBlock: { name: string; input: unknown } | null = null
+    let spawns = 0;
+    let calls = 0;
+    let lastBlock: { name: string; input: unknown } | null = null;
     for (const msg of session.log) {
-      if (msg.type !== 'assistant') continue
-      const content = (msg.message as { content?: unknown[] })?.content ?? []
-      for (const block of content as Array<{type: string; name: string; input: unknown}>) {
-        if (block.type !== 'tool_use') continue
-        calls++
-        lastBlock = block
-        if (
-          block.name === AGENT_TOOL_NAME ||
-          block.name === LEGACY_AGENT_TOOL_NAME
-        ) {
-          spawns++
+      if (msg.type !== 'assistant') continue;
+      const content = (msg.message as { content?: unknown[] })?.content ?? [];
+      for (const block of content as Array<{ type: string; name: string; input: unknown }>) {
+        if (block.type !== 'tool_use') continue;
+        calls++;
+        lastBlock = block;
+        if (block.name === AGENT_TOOL_NAME || block.name === LEGACY_AGENT_TOOL_NAME) {
+          spawns++;
         }
       }
     }
     return {
       agentsWorking: 1 + spawns,
       toolCalls: calls,
-      lastToolCall: lastBlock
-        ? formatToolUseSummary(lastBlock.name, lastBlock.input)
-        : null,
-    }
-  }, [session.log])
+      lastToolCall: lastBlock ? formatToolUseSummary(lastBlock.name, lastBlock.input) : null,
+    };
+  }, [session.log]);
 
-  const sessionUrl = getRemoteTaskSessionUrl(session.sessionId)
-  const goBackOrClose =
-    onBack ??
-    (() => onDone('Remote session details dismissed', { display: 'system' }))
-  const [confirmingStop, setConfirmingStop] = useState(false)
+  const sessionUrl = getRemoteTaskSessionUrl(session.sessionId);
+  const goBackOrClose = onBack ?? (() => onDone('Remote session details dismissed', { display: 'system' }));
+  const [confirmingStop, setConfirmingStop] = useState(false);
 
   if (confirmingStop) {
     return (
-      <Dialog
-        title="Stop ultraplan?"
-        onCancel={() => setConfirmingStop(false)}
-        color="background"
-      >
+      <Dialog title="Stop ultraplan?" onCancel={() => setConfirmingStop(false)} color="background">
         <Box flexDirection="column" gap={1}>
-          <Text dimColor>
-            This will terminate the Claude Code on the web session.
-          </Text>
+          <Text dimColor>This will terminate the Claude Code on the web session.</Text>
           <Select
             options={[
               { label: 'Terminate session', value: 'stop' as const },
@@ -169,25 +130,23 @@ function UltraplanSessionDetail({
             ]}
             onChange={v => {
               if (v === 'stop') {
-                onKill?.()
-                goBackOrClose()
+                onKill?.();
+                goBackOrClose();
               } else {
-                setConfirmingStop(false)
+                setConfirmingStop(false);
               }
             }}
           />
         </Box>
       </Dialog>
-    )
+    );
   }
 
   return (
     <Dialog
       title={
         <Text>
-          <Text color="background">
-            {phase === 'plan_ready' ? DIAMOND_FILLED : DIAMOND_OPEN}{' '}
-          </Text>
+          <Text color="background">{phase === 'plan_ready' ? DIAMOND_FILLED : DIAMOND_OPEN} </Text>
           <Text bold>ultraplan</Text>
           <Text dimColor>
             {' · '}
@@ -202,11 +161,8 @@ function UltraplanSessionDetail({
     >
       <Box flexDirection="column" gap={1}>
         <Text>
-          {phase === 'plan_ready' && (
-            <Text color="success">{figures.tick} </Text>
-          )}
-          {agentsWorking} {plural(agentsWorking, 'agent')}{' '}
-          {phase ? AGENT_VERB[phase] : 'working'} · {toolCalls} tool{' '}
+          {phase === 'plan_ready' && <Text color="success">{figures.tick} </Text>}
+          {agentsWorking} {plural(agentsWorking, 'agent')} {phase ? AGENT_VERB[phase] : 'working'} · {toolCalls} tool{' '}
           {plural(toolCalls, 'call')}
         </Text>
         {lastToolCall && <Text dimColor>{lastToolCall}</Text>}
@@ -219,40 +175,38 @@ function UltraplanSessionDetail({
               label: 'Review in Claude Code on the web',
               value: 'open' as const,
             },
-            ...(onKill && running
-              ? [{ label: 'Stop ultraplan', value: 'stop' as const }]
-              : []),
+            ...(onKill && running ? [{ label: 'Stop ultraplan', value: 'stop' as const }] : []),
             { label: 'Back', value: 'back' as const },
           ]}
           onChange={v => {
             switch (v) {
               case 'open':
-                void openBrowser(sessionUrl)
+                void openBrowser(sessionUrl);
                 // Close the dialog so the user lands back at the prompt with
                 // any half-written input intact (inputValue persists across
                 // the showBashesDialog toggle).
-                onDone()
-                return
+                onDone();
+                return;
               case 'stop':
-                setConfirmingStop(true)
-                return
+                setConfirmingStop(true);
+                return;
               case 'back':
-                goBackOrClose()
-                return
+                goBackOrClose();
+                return;
             }
           }}
         />
       </Box>
     </Dialog>
-  )
+  );
 }
 
-const STAGES = ['finding', 'verifying', 'synthesizing'] as const
+const STAGES = ['finding', 'verifying', 'synthesizing'] as const;
 const STAGE_LABELS: Record<(typeof STAGES)[number], string> = {
   finding: 'Find',
   verifying: 'Verify',
   synthesizing: 'Dedupe',
-}
+};
 
 // Setup → Find → Verify → Dedupe pipeline. Current stage in cloud teal,
 // rest dim. When completed, all stages dim with a trailing green ✓. The
@@ -264,100 +218,74 @@ function StagePipeline({
   completed,
   hasProgress,
 }: {
-  stage: 'finding' | 'verifying' | 'synthesizing' | undefined
-  completed: boolean
-  hasProgress: boolean
+  stage: 'finding' | 'verifying' | 'synthesizing' | undefined;
+  completed: boolean;
+  hasProgress: boolean;
 }): React.ReactNode {
-  const currentIdx = stage ? STAGES.indexOf(stage) : -1
-  const inSetup = !completed && !hasProgress
+  const currentIdx = stage ? STAGES.indexOf(stage) : -1;
+  const inSetup = !completed && !hasProgress;
   return (
     <Text>
-      {inSetup ? (
-        <Text color="background">Setup</Text>
-      ) : (
-        <Text dimColor>Setup</Text>
-      )}
+      {inSetup ? <Text color="background">Setup</Text> : <Text dimColor>Setup</Text>}
       <Text dimColor> → </Text>
       {STAGES.map((s, i) => {
-        const isCurrent = !completed && !inSetup && i === currentIdx
+        const isCurrent = !completed && !inSetup && i === currentIdx;
         return (
           <React.Fragment key={s}>
             {i > 0 && <Text dimColor> → </Text>}
-            {isCurrent ? (
-              <Text color="background">{STAGE_LABELS[s]}</Text>
-            ) : (
-              <Text dimColor>{STAGE_LABELS[s]}</Text>
-            )}
+            {isCurrent ? <Text color="background">{STAGE_LABELS[s]}</Text> : <Text dimColor>{STAGE_LABELS[s]}</Text>}
           </React.Fragment>
-        )
+        );
       })}
       {completed && <Text color="success"> ✓</Text>}
     </Text>
-  )
+  );
 }
 
 // Stage-appropriate counts line. Running-state formatting delegates to
 // formatReviewStageCounts (shared with the pill) so the two views can't
 // drift; completed state is dialog-specific (findings summary).
-function reviewCountsLine(
-  session: DeepImmutable<RemoteAgentTaskState>,
-): string {
-  const p = session.reviewProgress
+function reviewCountsLine(session: DeepImmutable<RemoteAgentTaskState>): string {
+  const p = session.reviewProgress;
   // No progress data — the orchestrator never wrote a snapshot. Don't
   // claim "0 findings" when completed; we just don't know.
-  if (!p) return session.status === 'completed' ? 'done' : 'setting up'
-  const verified = p.bugsVerified
-  const refuted = p.bugsRefuted ?? 0
+  if (!p) return session.status === 'completed' ? 'done' : 'setting up';
+  const verified = p.bugsVerified;
+  const refuted = p.bugsRefuted ?? 0;
   if (session.status === 'completed') {
-    const parts = [`${verified} ${plural(verified, 'finding')}`]
-    if (refuted > 0) parts.push(`${refuted} refuted`)
-    return parts.join(' · ')
+    const parts = [`${verified} ${plural(verified, 'finding')}`];
+    if (refuted > 0) parts.push(`${refuted} refuted`);
+    return parts.join(' · ');
   }
-  return formatReviewStageCounts(p.stage, p.bugsFound, verified, refuted)
+  return formatReviewStageCounts(p.stage, p.bugsFound, verified, refuted);
 }
 
-type MenuAction = 'open' | 'stop' | 'back' | 'dismiss'
+type MenuAction = 'open' | 'stop' | 'back' | 'dismiss';
 
-function ReviewSessionDetail({
-  session,
-  onDone,
-  onBack,
-  onKill,
-}: Omit<Props, 'toolUseContext'>): React.ReactNode {
-  const completed = session.status === 'completed'
-  const running = session.status === 'running' || session.status === 'pending'
-  const [confirmingStop, setConfirmingStop] = useState(false)
+function ReviewSessionDetail({ session, onDone, onBack, onKill }: Omit<Props, 'toolUseContext'>): React.ReactNode {
+  const completed = session.status === 'completed';
+  const running = session.status === 'running' || session.status === 'pending';
+  const [confirmingStop, setConfirmingStop] = useState(false);
 
   // useElapsedTime drives the 1Hz tick so the timer advances while the
   // dialog is open — the previous inline elapsed-time calculation only
   // re-rendered on session state changes (poll interval), which looked
   // like the clock was stuck.
-  const elapsedTime = useElapsedTime(
-    session.startTime,
-    running,
-    1000,
-    0,
-    session.endTime,
-  )
+  const elapsedTime = useElapsedTime(session.startTime, running, 1000, 0, session.endTime);
 
-  const handleClose = () =>
-    onDone('Remote session details dismissed', { display: 'system' })
-  const goBackOrClose = onBack ?? handleClose
+  const handleClose = () => onDone('Remote session details dismissed', { display: 'system' });
+  const goBackOrClose = onBack ?? handleClose;
 
-  const sessionUrl = getRemoteTaskSessionUrl(session.sessionId)
-  const statusLabel = completed ? 'ready' : running ? 'running' : session.status
+  const sessionUrl = getRemoteTaskSessionUrl(session.sessionId);
+  const statusLabel = completed ? 'ready' : running ? 'running' : session.status;
 
   if (confirmingStop) {
     return (
-      <Dialog
-        title="Stop ultrareview?"
-        onCancel={() => setConfirmingStop(false)}
-        color="background"
-      >
+      <Dialog title="Stop ultrareview?" onCancel={() => setConfirmingStop(false)} color="background">
         <Box flexDirection="column" gap={1}>
           <Text dimColor>
-            This archives the remote session and stops local tracking. The
-            review will not complete and any findings so far are discarded.
+            This archives the remote session and stops local tracking. The review will not complete and any findings so
+            far are discarded.
           </Text>
           <Select
             options={[
@@ -366,16 +294,16 @@ function ReviewSessionDetail({
             ]}
             onChange={v => {
               if (v === 'stop') {
-                onKill?.()
-                goBackOrClose()
+                onKill?.();
+                goBackOrClose();
               } else {
-                setConfirmingStop(false)
+                setConfirmingStop(false);
               }
             }}
           />
         </Box>
       </Dialog>
-    )
+    );
   }
 
   const options: { label: string; value: MenuAction }[] = completed
@@ -385,37 +313,33 @@ function ReviewSessionDetail({
       ]
     : [
         { label: 'Open in Claude Code on the web', value: 'open' },
-        ...(onKill && running
-          ? [{ label: 'Stop ultrareview', value: 'stop' as const }]
-          : []),
+        ...(onKill && running ? [{ label: 'Stop ultrareview', value: 'stop' as const }] : []),
         { label: 'Back', value: 'back' },
-      ]
+      ];
 
   const handleSelect = (action: MenuAction) => {
     switch (action) {
       case 'open':
-        void openBrowser(sessionUrl)
-        onDone()
-        break
+        void openBrowser(sessionUrl);
+        onDone();
+        break;
       case 'stop':
-        setConfirmingStop(true)
-        break
+        setConfirmingStop(true);
+        break;
       case 'back':
-        goBackOrClose()
-        break
+        goBackOrClose();
+        break;
       case 'dismiss':
-        handleClose()
-        break
+        handleClose();
+        break;
     }
-  }
+  };
 
   return (
     <Dialog
       title={
         <Text>
-          <Text color="background">
-            {completed ? DIAMOND_FILLED : DIAMOND_OPEN}{' '}
-          </Text>
+          <Text color="background">{completed ? DIAMOND_FILLED : DIAMOND_OPEN} </Text>
           <Text bold>ultrareview</Text>
           <Text dimColor>
             {' · '}
@@ -455,18 +379,12 @@ function ReviewSessionDetail({
         <Select options={options} onChange={handleSelect} />
       </Box>
     </Dialog>
-  )
+  );
 }
 
-export function RemoteSessionDetailDialog({
-  session,
-  toolUseContext,
-  onDone,
-  onBack,
-  onKill,
-}: Props): React.ReactNode {
-  const [isTeleporting, setIsTeleporting] = useState(false)
-  const [teleportError, setTeleportError] = useState<string | null>(null)
+export function RemoteSessionDetailDialog({ session, toolUseContext, onDone, onBack, onKill }: Props): React.ReactNode {
+  const [isTeleporting, setIsTeleporting] = useState(false);
+  const [teleportError, setTeleportError] = useState<string | null>(null);
 
   // Get last few messages from remote session for display.
   // Scan all messages (not just the last 3 raw entries) because the tail of
@@ -474,85 +392,64 @@ export function RemoteSessionDetailDialog({
   // Placed before the early returns so hook call order is stable (Rules of Hooks).
   // Ultraplan/review sessions never read this — skip the normalize work for them.
   const lastMessages = useMemo(() => {
-    if (session.isUltraplan || session.isRemoteReview) return []
+    if (session.isUltraplan || session.isRemoteReview) return [];
     return normalizeMessages(toInternalMessages(session.log as SDKMessage[]))
       .filter(_ => _.type !== 'progress')
-      .slice(-3)
-  }, [session])
+      .slice(-3);
+  }, [session]);
 
   if (session.isUltraplan) {
-    return (
-      <UltraplanSessionDetail
-        session={session}
-        onDone={onDone}
-        onBack={onBack}
-        onKill={onKill}
-      />
-    )
+    return <UltraplanSessionDetail session={session} onDone={onDone} onBack={onBack} onKill={onKill} />;
   }
 
   // Review sessions get the stage-pipeline view; everything else keeps the
   // generic label/value + recent-messages dialog below.
   if (session.isRemoteReview) {
-    return (
-      <ReviewSessionDetail
-        session={session}
-        onDone={onDone}
-        onBack={onBack}
-        onKill={onKill}
-      />
-    )
+    return <ReviewSessionDetail session={session} onDone={onDone} onBack={onBack} onKill={onKill} />;
   }
 
-  const handleClose = () =>
-    onDone('Remote session details dismissed', { display: 'system' })
+  const handleClose = () => onDone('Remote session details dismissed', { display: 'system' });
 
   // Component-specific shortcuts shown in UI hints (t=teleport, space=dismiss,
   // left=back). These are state-dependent actions, not standard dialog keybindings.
   const handleKeyDown = (e: KeyboardEvent) => {
     if (e.key === ' ') {
-      e.preventDefault()
-      onDone('Remote session details dismissed', { display: 'system' })
+      e.preventDefault();
+      onDone('Remote session details dismissed', { display: 'system' });
     } else if (e.key === 'left' && onBack) {
-      e.preventDefault()
-      onBack()
+      e.preventDefault();
+      onBack();
     } else if (e.key === 't' && !isTeleporting) {
-      e.preventDefault()
-      void handleTeleport()
+      e.preventDefault();
+      void handleTeleport();
     } else if (e.key === 'return') {
-      e.preventDefault()
-      handleClose()
+      e.preventDefault();
+      handleClose();
     }
-  }
+  };
 
   // Handle teleporting to remote session
   async function handleTeleport(): Promise<void> {
-    setIsTeleporting(true)
-    setTeleportError(null)
+    setIsTeleporting(true);
+    setTeleportError(null);
 
     try {
-      await teleportResumeCodeSession(session.sessionId)
+      await teleportResumeCodeSession(session.sessionId);
     } catch (err) {
-      setTeleportError(errorMessage(err))
+      setTeleportError(errorMessage(err));
     } finally {
-      setIsTeleporting(false)
+      setIsTeleporting(false);
     }
   }
 
   // Truncate title if too long (for display purposes)
-  const displayTitle = truncateToWidth(session.title, 50)
+  const displayTitle = truncateToWidth(session.title, 50);
 
   // Map TaskStatus to display status (handle 'pending')
-  const displayStatus =
-    session.status === 'pending' ? 'starting' : session.status
+  const displayStatus = session.status === 'pending' ? 'starting' : session.status;
 
   return (
-    <Box
-      flexDirection="column"
-      tabIndex={0}
-      autoFocus
-      onKeyDown={handleKeyDown}
-    >
+    <Box flexDirection="column" tabIndex={0} autoFocus onKeyDown={handleKeyDown}>
       <Dialog
         title="Remote session details"
         onCancel={handleClose}
@@ -564,9 +461,7 @@ export function RemoteSessionDetailDialog({
             <Byline>
               {onBack && <KeyboardShortcutHint shortcut="←" action="go back" />}
               <KeyboardShortcutHint shortcut="Esc/Enter/Space" action="close" />
-              {!isTeleporting && (
-                <KeyboardShortcutHint shortcut="t" action="teleport" />
-              )}
+              {!isTeleporting && <KeyboardShortcutHint shortcut="t" action="teleport" />}
             </Byline>
           )
         }
@@ -583,17 +478,13 @@ export function RemoteSessionDetailDialog({
             )}
           </Text>
           <Text>
-            <Text bold>Runtime</Text>:{' '}
-            {formatDuration(
-              (session.endTime ?? Date.now()) - session.startTime,
-            )}
+            <Text bold>Runtime</Text>: {formatDuration((session.endTime ?? Date.now()) - session.startTime)}
           </Text>
           <Text wrap="truncate-end">
             <Text bold>Title</Text>: {displayTitle}
           </Text>
           <Text>
-            <Text bold>Progress</Text>:{' '}
-            <RemoteSessionProgress session={session} />
+            <Text bold>Progress</Text>: <RemoteSessionProgress session={session} />
           </Text>
           <Text>
             <Text bold>Session URL</Text>:{' '}
@@ -631,8 +522,7 @@ export function RemoteSessionDetailDialog({
             </Box>
             <Box marginTop={1}>
               <Text dimColor italic>
-                Showing last {lastMessages.length} of {session.log.length}{' '}
-                messages
+                Showing last {lastMessages.length} of {session.log.length} messages
               </Text>
             </Box>
           </Box>
@@ -646,10 +536,8 @@ export function RemoteSessionDetailDialog({
         )}
 
         {/* Teleporting status */}
-        {isTeleporting && (
-          <Text color="background">Teleporting to session…</Text>
-        )}
+        {isTeleporting && <Text color="background">Teleporting to session…</Text>}
       </Dialog>
     </Box>
-  )
+  );
 }
diff --git a/src/components/tasks/RemoteSessionProgress.tsx b/src/components/tasks/RemoteSessionProgress.tsx
index d7e0f8e68..1819740c4 100644
--- a/src/components/tasks/RemoteSessionProgress.tsx
+++ b/src/components/tasks/RemoteSessionProgress.tsx
@@ -1,17 +1,15 @@
-import React, { useRef } from 'react'
-import type { RemoteAgentTaskState } from 'src/tasks/RemoteAgentTask/RemoteAgentTask.js'
-import type { DeepImmutable } from 'src/types/utils.js'
-import { DIAMOND_FILLED, DIAMOND_OPEN } from '../../constants/figures.js'
-import { useSettings } from '../../hooks/useSettings.js'
-import { Text, useAnimationFrame } from '@anthropic/ink'
-import { count } from '../../utils/array.js'
-import { getRainbowColor } from '../../utils/thinking.js'
+import React, { useRef } from 'react';
+import type { RemoteAgentTaskState } from 'src/tasks/RemoteAgentTask/RemoteAgentTask.js';
+import type { DeepImmutable } from 'src/types/utils.js';
+import { DIAMOND_FILLED, DIAMOND_OPEN } from '../../constants/figures.js';
+import { useSettings } from '../../hooks/useSettings.js';
+import { Text, useAnimationFrame } from '@anthropic/ink';
+import { count } from '../../utils/array.js';
+import { getRainbowColor } from '../../utils/thinking.js';
 
-const TICK_MS = 80
+const TICK_MS = 80;
 
-type ReviewStage = NonNullable<
-  NonNullable<RemoteAgentTaskState['reviewProgress']>['stage']
->
+type ReviewStage = NonNullable<NonNullable<RemoteAgentTaskState['reviewProgress']>['stage']>;
 
 /**
  * Stage-appropriate counts line for a running review. Shared between the
@@ -29,32 +27,26 @@ export function formatReviewStageCounts(
   refuted: number,
 ): string {
   // Pre-stage orchestrator images don't write the stage field.
-  if (!stage) return `${found} found · ${verified} verified`
+  if (!stage) return `${found} found · ${verified} verified`;
   if (stage === 'synthesizing') {
-    const parts = [`${verified} verified`]
-    if (refuted > 0) parts.push(`${refuted} refuted`)
-    parts.push('deduping')
-    return parts.join(' · ')
+    const parts = [`${verified} verified`];
+    if (refuted > 0) parts.push(`${refuted} refuted`);
+    parts.push('deduping');
+    return parts.join(' · ');
   }
   if (stage === 'verifying') {
-    const parts = [`${found} found`, `${verified} verified`]
-    if (refuted > 0) parts.push(`${refuted} refuted`)
-    return parts.join(' · ')
+    const parts = [`${found} found`, `${verified} verified`];
+    if (refuted > 0) parts.push(`${refuted} refuted`);
+    return parts.join(' · ');
   }
   // stage === 'finding'
-  return found > 0 ? `${found} found` : 'finding'
+  return found > 0 ? `${found} found` : 'finding';
 }
 
 // Per-character rainbow gradient, same treatment as the ultraplan keyword.
 // The phase offset lets the gradient cycle — so the colors sweep along the
 // text on each animation frame instead of being static.
-function RainbowText({
-  text,
-  phase = 0,
-}: {
-  text: string
-  phase?: number
-}): React.ReactNode {
+function RainbowText({ text, phase = 0 }: { text: string; phase?: number }): React.ReactNode {
   return (
     <>
       {[...text].map((ch, i) => (
@@ -63,7 +55,7 @@ function RainbowText({
         </Text>
       ))}
     </>
-  )
+  );
 }
 
 // Smooth-tick a count toward target, +1 per frame. Same pattern as the
@@ -73,26 +65,22 @@ function RainbowText({
 // the clock is frozen), bypass the tick and jump straight to target —
 // otherwise a frozen `time` would leave the ref stuck at its init value.
 function useSmoothCount(target: number, time: number, snap: boolean): number {
-  const displayed = useRef(target)
-  const lastTick = useRef(time)
+  const displayed = useRef(target);
+  const lastTick = useRef(time);
   if (snap || target < displayed.current) {
-    displayed.current = target
+    displayed.current = target;
   } else if (target > displayed.current && time !== lastTick.current) {
-    displayed.current += 1
-    lastTick.current = time
+    displayed.current += 1;
+    lastTick.current = time;
   }
-  return displayed.current
+  return displayed.current;
 }
 
-function ReviewRainbowLine({
-  session,
-}: {
-  session: DeepImmutable<RemoteAgentTaskState>
-}): React.ReactNode {
-  const settings = useSettings()
-  const reducedMotion = settings.prefersReducedMotion ?? false
-  const p = session.reviewProgress
-  const running = session.status === 'running'
+function ReviewRainbowLine({ session }: { session: DeepImmutable<RemoteAgentTaskState> }): React.ReactNode {
+  const settings = useSettings();
+  const reducedMotion = settings.prefersReducedMotion ?? false;
+  const p = session.reviewProgress;
+  const running = session.status === 'running';
   // Animation clock runs only while running — completed/failed are static.
   // Disabled entirely when the user prefers reduced motion.
   //
@@ -101,22 +89,22 @@ function ReviewRainbowLine({
   // Ink can't nest <Box> inside <Text>. Dropping the ref means
   // useTerminalViewport's isVisible stays true, so the clock ticks even when
   // scrolled off-screen — acceptable for a single 30-char line.
-  const [, time] = useAnimationFrame(running && !reducedMotion ? TICK_MS : null)
+  const [, time] = useAnimationFrame(running && !reducedMotion ? TICK_MS : null);
 
-  const targetFound = p?.bugsFound ?? 0
-  const targetVerified = p?.bugsVerified ?? 0
-  const targetRefuted = p?.bugsRefuted ?? 0
+  const targetFound = p?.bugsFound ?? 0;
+  const targetVerified = p?.bugsVerified ?? 0;
+  const targetRefuted = p?.bugsRefuted ?? 0;
   // snap when the clock isn't advancing (reduced motion, or not running) —
   // useAnimationFrame(null) freezes `time` at its mount value, which would
   // leave the tick-gate permanently false.
-  const snap = reducedMotion || !running
-  const found = useSmoothCount(targetFound, time, snap)
-  const verified = useSmoothCount(targetVerified, time, snap)
-  const refuted = useSmoothCount(targetRefuted, time, snap)
+  const snap = reducedMotion || !running;
+  const found = useSmoothCount(targetFound, time, snap);
+  const verified = useSmoothCount(targetVerified, time, snap);
+  const refuted = useSmoothCount(targetRefuted, time, snap);
 
   // Phase advances every 3 ticks so the gradient sweep is visible but
   // not frantic. Modulo keeps it in the 7-color cycle.
-  const phase = Math.floor(time / (TICK_MS * 3)) % 7
+  const phase = Math.floor(time / (TICK_MS * 3)) % 7;
 
   // ◇ open diamond while running (teal, matches cloud-session accent), ◆
   // filled when terminal. Rainbow is scoped to the word `ultrareview` only —
@@ -129,7 +117,7 @@ function ReviewRainbowLine({
         <RainbowText text="ultrareview" phase={0} />
         <Text dimColor> ready · shift+↓ to view</Text>
       </>
-    )
+    );
   }
   if (session.status === 'failed') {
     return (
@@ -141,34 +129,28 @@ function ReviewRainbowLine({
           error
         </Text>
       </>
-    )
+    );
   }
 
   // The !p branch ("setting up") covers the window before the orchestrator
   // writes its first progress snapshot — container boot + repo clone can
   // take 1-3 min, during which "0 found" looked hung.
-  const tail = !p
-    ? 'setting up'
-    : formatReviewStageCounts(p.stage, found, verified, refuted)
+  const tail = !p ? 'setting up' : formatReviewStageCounts(p.stage, found, verified, refuted);
   return (
     <>
       <Text color="background">{DIAMOND_OPEN} </Text>
       <RainbowText text="ultrareview" phase={running ? phase : 0} />
       <Text dimColor> · {tail}</Text>
     </>
-  )
+  );
 }
 
-export function RemoteSessionProgress({
-  session,
-}: {
-  session: DeepImmutable<RemoteAgentTaskState>
-}): React.ReactNode {
+export function RemoteSessionProgress({ session }: { session: DeepImmutable<RemoteAgentTaskState> }): React.ReactNode {
   // Lite-review: rainbow gradient over the full line, ultraplan-style.
   // BackgroundTask.tsx delegates the whole <Text> wrapper here so the
   // gradient spans the title, not just the trailing status.
   if (session.isRemoteReview) {
-    return <ReviewRainbowLine session={session} />
+    return <ReviewRainbowLine session={session} />;
   }
 
   if (session.status === 'completed') {
@@ -176,7 +158,7 @@ export function RemoteSessionProgress({
       <Text bold color="success" dimColor>
         done
       </Text>
-    )
+    );
   }
 
   if (session.status === 'failed') {
@@ -184,18 +166,18 @@ export function RemoteSessionProgress({
       <Text bold color="error" dimColor>
         error
       </Text>
-    )
+    );
   }
 
   if (!session.todoList.length) {
-    return <Text dimColor>{session.status}…</Text>
+    return <Text dimColor>{session.status}…</Text>;
   }
 
-  const completed = count(session.todoList, _ => _.status === 'completed')
-  const total = session.todoList.length
+  const completed = count(session.todoList, _ => _.status === 'completed');
+  const total = session.todoList.length;
   return (
     <Text dimColor>
       {completed}/{total}
     </Text>
-  )
+  );
 }
diff --git a/src/components/tasks/ShellDetailDialog.tsx b/src/components/tasks/ShellDetailDialog.tsx
index 7627ec561..a21c15456 100644
--- a/src/components/tasks/ShellDetailDialog.tsx
+++ b/src/components/tasks/ShellDetailDialog.tsx
@@ -1,91 +1,68 @@
-import React, {
-  Suspense,
-  use,
-  useDeferredValue,
-  useEffect,
-  useState,
-} from 'react'
-import type { DeepImmutable } from 'src/types/utils.js'
-import type { CommandResultDisplay } from '../../commands.js'
-import { useTerminalSize } from '../../hooks/useTerminalSize.js'
-import { type KeyboardEvent, Box, Text } from '@anthropic/ink'
-import { useKeybindings } from '../../keybindings/useKeybinding.js'
-import type { LocalShellTaskState } from '../../tasks/LocalShellTask/guards.js'
-import {
-  formatDuration,
-  formatFileSize,
-  truncateToWidth,
-} from '../../utils/format.js'
-import { tailFile } from '../../utils/fsOperations.js'
-import { getTaskOutputPath } from '../../utils/task/diskOutput.js'
-import { Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink'
+import React, { Suspense, use, useDeferredValue, useEffect, useState } from 'react';
+import type { DeepImmutable } from 'src/types/utils.js';
+import type { CommandResultDisplay } from '../../commands.js';
+import { useTerminalSize } from '../../hooks/useTerminalSize.js';
+import { type KeyboardEvent, Box, Text } from '@anthropic/ink';
+import { useKeybindings } from '../../keybindings/useKeybinding.js';
+import type { LocalShellTaskState } from '../../tasks/LocalShellTask/guards.js';
+import { formatDuration, formatFileSize, truncateToWidth } from '../../utils/format.js';
+import { tailFile } from '../../utils/fsOperations.js';
+import { getTaskOutputPath } from '../../utils/task/diskOutput.js';
+import { Byline, Dialog, KeyboardShortcutHint } from '@anthropic/ink';
 
 type Props = {
-  shell: DeepImmutable<LocalShellTaskState>
-  onDone: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-  onKillShell?: () => void
-  onBack?: () => void
-}
+  shell: DeepImmutable<LocalShellTaskState>;
+  onDone: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+  onKillShell?: () => void;
+  onBack?: () => void;
+};
 
-const SHELL_DETAIL_TAIL_BYTES = 8192
+const SHELL_DETAIL_TAIL_BYTES = 8192;
 
 type TaskOutputResult = {
-  content: string
-  bytesTotal: number
-}
+  content: string;
+  bytesTotal: number;
+};
 
 /**
  * Read the tail of the task output file. Only reads the last few KB,
  * not the entire file.
  */
-async function getTaskOutput(
-  shell: DeepImmutable<LocalShellTaskState>,
-): Promise<TaskOutputResult> {
-  const path = getTaskOutputPath(shell.id)
+async function getTaskOutput(shell: DeepImmutable<LocalShellTaskState>): Promise<TaskOutputResult> {
+  const path = getTaskOutputPath(shell.id);
   try {
-    const result = await tailFile(path, SHELL_DETAIL_TAIL_BYTES)
-    return { content: result.content, bytesTotal: result.bytesTotal }
+    const result = await tailFile(path, SHELL_DETAIL_TAIL_BYTES);
+    return { content: result.content, bytesTotal: result.bytesTotal };
   } catch {
-    return { content: '', bytesTotal: 0 }
+    return { content: '', bytesTotal: 0 };
   }
 }
 
-export function ShellDetailDialog({
-  shell,
-  onDone,
-  onKillShell,
-  onBack,
-}: Props): React.ReactNode {
-  const { columns } = useTerminalSize()
+export function ShellDetailDialog({ shell, onDone, onKillShell, onBack }: Props): React.ReactNode {
+  const { columns } = useTerminalSize();
 
   // Promise created in initializer (not during render). For running shells,
   // the effect timer replaces it periodically to pick up new output.
   // useDeferredValue keeps showing the previous output while the new promise
   // resolves, preventing the Suspense fallback from flickering.
-  const [outputPromise, setOutputPromise] = useState<Promise<TaskOutputResult>>(
-    () => getTaskOutput(shell),
-  )
-  const deferredOutputPromise = useDeferredValue(outputPromise)
+  const [outputPromise, setOutputPromise] = useState<Promise<TaskOutputResult>>(() => getTaskOutput(shell));
+  const deferredOutputPromise = useDeferredValue(outputPromise);
 
   useEffect(() => {
     if (shell.status !== 'running') {
-      return
+      return;
     }
     const timer = setInterval(
       (setOutputPromise, shell) => setOutputPromise(getTaskOutput(shell)),
       1000,
       setOutputPromise,
       shell,
-    )
-    return () => clearInterval(timer)
-  }, [shell.id, shell.status])
+    );
+    return () => clearInterval(timer);
+  }, [shell.id, shell.status]);
 
   // Handle standard close action
-  const handleClose = () =>
-    onDone('Shell details dismissed', { display: 'system' })
+  const handleClose = () => onDone('Shell details dismissed', { display: 'system' });
 
   // Handle additional close actions beyond Dialog's built-in Esc handler
   useKeybindings(
@@ -93,33 +70,28 @@ export function ShellDetailDialog({
       'confirm:yes': handleClose,
     },
     { context: 'Confirmation' },
-  )
+  );
 
   // Handle dialog-specific keys
   const handleKeyDown = (e: KeyboardEvent) => {
     if (e.key === ' ') {
-      e.preventDefault()
-      onDone('Shell details dismissed', { display: 'system' })
+      e.preventDefault();
+      onDone('Shell details dismissed', { display: 'system' });
     } else if (e.key === 'left' && onBack) {
-      e.preventDefault()
-      onBack()
+      e.preventDefault();
+      onBack();
     } else if (e.key === 'x' && shell.status === 'running' && onKillShell) {
-      e.preventDefault()
-      onKillShell()
+      e.preventDefault();
+      onKillShell();
     }
-  }
+  };
 
   // Truncate command if too long (for display purposes)
-  const isMonitor = shell.kind === 'monitor'
-  const displayCommand = truncateToWidth(shell.command, 280)
+  const isMonitor = shell.kind === 'monitor';
+  const displayCommand = truncateToWidth(shell.command, 280);
 
   return (
-    <Box
-      flexDirection="column"
-      tabIndex={0}
-      autoFocus
-      onKeyDown={handleKeyDown}
-    >
+    <Box flexDirection="column" tabIndex={0} autoFocus onKeyDown={handleKeyDown}>
       <Dialog
         title={isMonitor ? 'Monitor details' : 'Shell details'}
         onCancel={handleClose}
@@ -131,9 +103,7 @@ export function ShellDetailDialog({
             <Byline>
               {onBack && <KeyboardShortcutHint shortcut="←" action="go back" />}
               <KeyboardShortcutHint shortcut="Esc/Enter/Space" action="close" />
-              {shell.status === 'running' && onKillShell && (
-                <KeyboardShortcutHint shortcut="x" action="stop" />
-              )}
+              {shell.status === 'running' && onKillShell && <KeyboardShortcutHint shortcut="x" action="stop" />}
             </Byline>
           )
         }
@@ -144,91 +114,74 @@ export function ShellDetailDialog({
             {shell.status === 'running' ? (
               <Text color="background">
                 {shell.status}
-                {shell.result?.code !== undefined &&
-                  ` (exit code: ${shell.result.code})`}
+                {shell.result?.code !== undefined && ` (exit code: ${shell.result.code})`}
               </Text>
             ) : shell.status === 'completed' ? (
               <Text color="success">
                 {shell.status}
-                {shell.result?.code !== undefined &&
-                  ` (exit code: ${shell.result.code})`}
+                {shell.result?.code !== undefined && ` (exit code: ${shell.result.code})`}
               </Text>
             ) : (
               <Text color="error">
                 {shell.status}
-                {shell.result?.code !== undefined &&
-                  ` (exit code: ${shell.result.code})`}
+                {shell.result?.code !== undefined && ` (exit code: ${shell.result.code})`}
               </Text>
             )}
           </Text>
           <Text>
-            <Text bold>Runtime:</Text>{' '}
-            {formatDuration((shell.endTime ?? Date.now()) - shell.startTime)}
+            <Text bold>Runtime:</Text> {formatDuration((shell.endTime ?? Date.now()) - shell.startTime)}
           </Text>
           <Text wrap="wrap">
-            <Text bold>{isMonitor ? 'Script:' : 'Command:'}</Text>{' '}
-            {displayCommand}
+            <Text bold>{isMonitor ? 'Script:' : 'Command:'}</Text> {displayCommand}
           </Text>
         </Box>
 
         <Box flexDirection="column">
           <Text bold>Output:</Text>
           <Suspense fallback={<Text dimColor>Loading output…</Text>}>
-            <ShellOutputContent
-              outputPromise={deferredOutputPromise}
-              columns={columns}
-            />
+            <ShellOutputContent outputPromise={deferredOutputPromise} columns={columns} />
           </Suspense>
         </Box>
       </Dialog>
     </Box>
-  )
+  );
 }
 
 type ShellOutputContentProps = {
-  outputPromise: Promise<TaskOutputResult>
-  columns: number
-}
+  outputPromise: Promise<TaskOutputResult>;
+  columns: number;
+};
 
-function ShellOutputContent({
-  outputPromise,
-  columns,
-}: ShellOutputContentProps): React.ReactNode {
-  const { content, bytesTotal } = use(outputPromise)
+function ShellOutputContent({ outputPromise, columns }: ShellOutputContentProps): React.ReactNode {
+  const { content, bytesTotal } = use(outputPromise);
 
   if (!content) {
-    return <Text dimColor>No output available</Text>
+    return <Text dimColor>No output available</Text>;
   }
 
   // Find last 10 line boundaries via lastIndexOf
-  const starts: number[] = []
-  let pos = content.length
+  const starts: number[] = [];
+  let pos = content.length;
   for (let i = 0; i < 10 && pos > 0; i++) {
-    const prev = content.lastIndexOf('\n', pos - 1)
-    starts.push(prev + 1)
-    pos = prev
+    const prev = content.lastIndexOf('\n', pos - 1);
+    starts.push(prev + 1);
+    pos = prev;
   }
-  starts.reverse()
-  const isIncomplete = bytesTotal > content.length
+  starts.reverse();
+  const isIncomplete = bytesTotal > content.length;
 
   // Build lines, skip empty trailing/leading segments
-  const rendered: string[] = []
+  const rendered: string[] = [];
   for (let i = 0; i < starts.length; i++) {
-    const start = starts[i]!
-    const end = i < starts.length - 1 ? starts[i + 1]! - 1 : content.length
-    const line = content.slice(start, end)
-    if (line) rendered.push(line)
+    const start = starts[i]!;
+    const end = i < starts.length - 1 ? starts[i + 1]! - 1 : content.length;
+    const line = content.slice(start, end);
+    if (line) rendered.push(line);
   }
 
   return (
     <>
-      <Box
-        borderStyle="round"
-        paddingX={1}
-        flexDirection="column"
-        height={12}
-        maxWidth={columns - 6}
-      >
+      <Box borderStyle="round" paddingX={1} flexDirection="column" height={12} maxWidth={columns - 6}>
         {rendered.map((line, i) => (
           <Text key={i} wrap="truncate-end">
             {line}
@@ -240,5 +193,5 @@ function ShellOutputContent({
         {isIncomplete ? ` of ${formatFileSize(bytesTotal)}` : ''}
       </Text>
     </>
-  )
+  );
 }
diff --git a/src/components/tasks/ShellProgress.tsx b/src/components/tasks/ShellProgress.tsx
index d5da46f63..412047f61 100644
--- a/src/components/tasks/ShellProgress.tsx
+++ b/src/components/tasks/ShellProgress.tsx
@@ -1,52 +1,38 @@
-import type { ReactNode } from 'react'
-import React from 'react'
-import { Text } from '@anthropic/ink'
-import type { TaskStatus } from 'src/Task.js'
-import type { LocalShellTaskState } from 'src/tasks/LocalShellTask/guards.js'
-import type { DeepImmutable } from 'src/types/utils.js'
+import type { ReactNode } from 'react';
+import React from 'react';
+import { Text } from '@anthropic/ink';
+import type { TaskStatus } from 'src/Task.js';
+import type { LocalShellTaskState } from 'src/tasks/LocalShellTask/guards.js';
+import type { DeepImmutable } from 'src/types/utils.js';
 
 type TaskStatusTextProps = {
-  status: TaskStatus
-  label?: string
-  suffix?: string
-}
+  status: TaskStatus;
+  label?: string;
+  suffix?: string;
+};
 
-export function TaskStatusText({
-  status,
-  label,
-  suffix,
-}: TaskStatusTextProps): ReactNode {
-  const displayLabel = label ?? status
+export function TaskStatusText({ status, label, suffix }: TaskStatusTextProps): ReactNode {
+  const displayLabel = label ?? status;
   const color =
-    status === 'completed'
-      ? 'success'
-      : status === 'failed'
-        ? 'error'
-        : status === 'killed'
-          ? 'warning'
-          : undefined
+    status === 'completed' ? 'success' : status === 'failed' ? 'error' : status === 'killed' ? 'warning' : undefined;
   return (
     <Text color={color} dimColor>
       ({displayLabel}
       {suffix})
     </Text>
-  )
+  );
 }
 
-export function ShellProgress({
-  shell,
-}: {
-  shell: DeepImmutable<LocalShellTaskState>
-}): ReactNode {
+export function ShellProgress({ shell }: { shell: DeepImmutable<LocalShellTaskState> }): ReactNode {
   switch (shell.status) {
     case 'completed':
-      return <TaskStatusText status="completed" label="done" />
+      return <TaskStatusText status="completed" label="done" />;
     case 'failed':
-      return <TaskStatusText status="failed" label="error" />
+      return <TaskStatusText status="failed" label="error" />;
     case 'killed':
-      return <TaskStatusText status="killed" label="stopped" />
+      return <TaskStatusText status="killed" label="stopped" />;
     case 'running':
     case 'pending':
-      return <TaskStatusText status="running" />
+      return <TaskStatusText status="running" />;
   }
 }
diff --git a/src/components/tasks/WorkflowDetailDialog.tsx b/src/components/tasks/WorkflowDetailDialog.tsx
index dfaa3be71..6ae83866c 100644
--- a/src/components/tasks/WorkflowDetailDialog.tsx
+++ b/src/components/tasks/WorkflowDetailDialog.tsx
@@ -1,21 +1,21 @@
-import React, { useCallback } from 'react'
-import type { DeepImmutable } from 'src/types/utils.js'
-import { useElapsedTime } from '../../hooks/useElapsedTime.js'
-import { Box, Text, type KeyboardEvent } from '@anthropic/ink'
-import { useKeybindings } from '../../keybindings/useKeybinding.js'
-import type { LocalWorkflowTaskState } from '../../tasks/LocalWorkflowTask/LocalWorkflowTask.js'
-import { Byline } from '../design-system/Byline.js'
-import { Dialog } from '../design-system/Dialog.js'
-import { KeyboardShortcutHint } from '../design-system/KeyboardShortcutHint.js'
+import React, { useCallback } from 'react';
+import type { DeepImmutable } from 'src/types/utils.js';
+import { useElapsedTime } from '../../hooks/useElapsedTime.js';
+import { Box, Text, type KeyboardEvent } from '@anthropic/ink';
+import { useKeybindings } from '../../keybindings/useKeybinding.js';
+import type { LocalWorkflowTaskState } from '../../tasks/LocalWorkflowTask/LocalWorkflowTask.js';
+import { Byline } from '../design-system/Byline.js';
+import { Dialog } from '../design-system/Dialog.js';
+import { KeyboardShortcutHint } from '../design-system/KeyboardShortcutHint.js';
 
 type Props = {
-  workflow: DeepImmutable<LocalWorkflowTaskState>
-  onDone: (message?: string, options?: { display?: string }) => void
-  onKill?: () => void
-  onSkipAgent?: (agentId: string) => void
-  onRetryAgent?: (agentId: string) => void
-  onBack?: () => void
-}
+  workflow: DeepImmutable<LocalWorkflowTaskState>;
+  onDone: (message?: string, options?: { display?: string }) => void;
+  onKill?: () => void;
+  onSkipAgent?: (agentId: string) => void;
+  onRetryAgent?: (agentId: string) => void;
+  onBack?: () => void;
+};
 
 /**
  * Detail dialog for local workflow tasks shown in the Shift+Down background
@@ -30,30 +30,22 @@ export function WorkflowDetailDialog({
   onRetryAgent: _onRetryAgent,
   onBack,
 }: Props): React.ReactNode {
-  const elapsedTime = useElapsedTime(
-    workflow.startTime,
-    workflow.status === 'running',
-    1000,
-    0,
-  )
+  const elapsedTime = useElapsedTime(workflow.startTime, workflow.status === 'running', 1000, 0);
 
-  useKeybindings(
-    {},
-    { context: 'WorkflowDetail' },
-  )
+  useKeybindings({}, { context: 'WorkflowDetail' });
 
   const handleKeyDown = useCallback(
     (e: KeyboardEvent): void => {
       if (e.key === 'left' && onBack) {
-        e.preventDefault()
-        onBack()
+        e.preventDefault();
+        onBack();
       } else if (e.key === 'x' && workflow.status === 'running' && onKill) {
-        e.preventDefault()
-        onKill()
+        e.preventDefault();
+        onKill();
       }
     },
     [onBack, onKill, workflow.status],
-  )
+  );
 
   return (
     <Box flexDirection="column" tabIndex={0} borderStyle="round" onKeyDown={handleKeyDown}>
@@ -67,13 +59,9 @@ export function WorkflowDetailDialog({
         onCancel={onBack ?? (() => {})}
         inputGuide={() => (
           <Byline>
-            {onBack && (
-              <KeyboardShortcutHint shortcut={'\u2190'} action="go back" />
-            )}
+            {onBack && <KeyboardShortcutHint shortcut={'\u2190'} action="go back" />}
             <KeyboardShortcutHint shortcut="Esc" action="close" />
-            {workflow.status === 'running' && onKill && (
-              <KeyboardShortcutHint shortcut="x" action="stop" />
-            )}
+            {workflow.status === 'running' && onKill && <KeyboardShortcutHint shortcut="x" action="stop" />}
           </Byline>
         )}
       >
@@ -111,5 +99,5 @@ export function WorkflowDetailDialog({
         </Box>
       </Dialog>
     </Box>
-  )
+  );
 }
diff --git a/src/components/tasks/renderToolActivity.tsx b/src/components/tasks/renderToolActivity.tsx
index 70abaa1bb..f3625e6fa 100644
--- a/src/components/tasks/renderToolActivity.tsx
+++ b/src/components/tasks/renderToolActivity.tsx
@@ -1,39 +1,35 @@
-import React from 'react'
-import { Text } from '@anthropic/ink'
-import type { Tools } from '../../Tool.js'
-import { findToolByName } from '../../Tool.js'
-import type { ToolActivity } from '../../tasks/LocalAgentTask/LocalAgentTask.js'
-import type { ThemeName } from '../../utils/theme.js'
+import React from 'react';
+import { Text } from '@anthropic/ink';
+import type { Tools } from '../../Tool.js';
+import { findToolByName } from '../../Tool.js';
+import type { ToolActivity } from '../../tasks/LocalAgentTask/LocalAgentTask.js';
+import type { ThemeName } from '../../utils/theme.js';
 
-export function renderToolActivity(
-  activity: ToolActivity,
-  tools: Tools,
-  theme: ThemeName,
-): React.ReactNode {
-  const tool = findToolByName(tools, activity.toolName)
+export function renderToolActivity(activity: ToolActivity, tools: Tools, theme: ThemeName): React.ReactNode {
+  const tool = findToolByName(tools, activity.toolName);
   if (!tool) {
-    return activity.toolName
+    return activity.toolName;
   }
   try {
-    const parsed = tool.inputSchema.safeParse(activity.input)
-    const parsedInput = parsed.success ? parsed.data : {}
-    const userFacingName = tool.userFacingName(parsedInput)
+    const parsed = tool.inputSchema.safeParse(activity.input);
+    const parsedInput = parsed.success ? parsed.data : {};
+    const userFacingName = tool.userFacingName(parsedInput);
     if (!userFacingName) {
-      return activity.toolName
+      return activity.toolName;
     }
     const toolArgs = tool.renderToolUseMessage(parsedInput, {
       theme,
       verbose: false,
-    })
+    });
     if (toolArgs) {
       return (
         <Text>
           {userFacingName}({toolArgs})
         </Text>
-      )
+      );
     }
-    return userFacingName
+    return userFacingName;
   } catch {
-    return activity.toolName
+    return activity.toolName;
   }
 }
diff --git a/src/components/tasks/src/Task.ts b/src/components/tasks/src/Task.ts
index cd6d817c8..764804bed 100644
--- a/src/components/tasks/src/Task.ts
+++ b/src/components/tasks/src/Task.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type TaskStatus = any;
+export type TaskStatus = any
diff --git a/src/components/tasks/src/Tool.ts b/src/components/tasks/src/Tool.ts
index 0492ff4d5..7e9fc93ed 100644
--- a/src/components/tasks/src/Tool.ts
+++ b/src/components/tasks/src/Tool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type ToolUseContext = any;
+export type ToolUseContext = any
diff --git a/src/components/tasks/src/coordinator/coordinatorMode.ts b/src/components/tasks/src/coordinator/coordinatorMode.ts
index 1879d10cd..a238c0655 100644
--- a/src/components/tasks/src/coordinator/coordinatorMode.ts
+++ b/src/components/tasks/src/coordinator/coordinatorMode.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type isCoordinatorMode = any;
+export type isCoordinatorMode = any
diff --git a/src/components/tasks/src/entrypoints/agentSdkTypes.ts b/src/components/tasks/src/entrypoints/agentSdkTypes.ts
index d4bdb4fb4..bcba4541a 100644
--- a/src/components/tasks/src/entrypoints/agentSdkTypes.ts
+++ b/src/components/tasks/src/entrypoints/agentSdkTypes.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type SDKMessage = any;
+export type SDKMessage = any
diff --git a/src/components/tasks/src/hooks/useTerminalSize.ts b/src/components/tasks/src/hooks/useTerminalSize.ts
index 4a0ef3ea3..fdaf2e999 100644
--- a/src/components/tasks/src/hooks/useTerminalSize.ts
+++ b/src/components/tasks/src/hooks/useTerminalSize.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useTerminalSize = any;
+export type useTerminalSize = any
diff --git a/src/components/tasks/src/ink.ts b/src/components/tasks/src/ink.ts
index 9fa0986a6..a7e12a392 100644
--- a/src/components/tasks/src/ink.ts
+++ b/src/components/tasks/src/ink.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type Text = any;
+export type Text = any
diff --git a/src/components/tasks/src/ink/stringWidth.ts b/src/components/tasks/src/ink/stringWidth.ts
index aa33710c8..a1cd5ebdf 100644
--- a/src/components/tasks/src/ink/stringWidth.ts
+++ b/src/components/tasks/src/ink/stringWidth.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type stringWidth = any;
+export type stringWidth = any
diff --git a/src/components/tasks/src/state/AppState.ts b/src/components/tasks/src/state/AppState.ts
index cc3978f9a..53048a173 100644
--- a/src/components/tasks/src/state/AppState.ts
+++ b/src/components/tasks/src/state/AppState.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type useAppState = any;
-export type useSetAppState = any;
+export type useAppState = any
+export type useSetAppState = any
diff --git a/src/components/tasks/src/state/teammateViewHelpers.ts b/src/components/tasks/src/state/teammateViewHelpers.ts
index 197123737..7c4b8c2cb 100644
--- a/src/components/tasks/src/state/teammateViewHelpers.ts
+++ b/src/components/tasks/src/state/teammateViewHelpers.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type enterTeammateView = any;
-export type exitTeammateView = any;
+export type enterTeammateView = any
+export type exitTeammateView = any
diff --git a/src/components/tasks/src/tasks/DreamTask/DreamTask.ts b/src/components/tasks/src/tasks/DreamTask/DreamTask.ts
index 1bb986a93..e2e0bffe2 100644
--- a/src/components/tasks/src/tasks/DreamTask/DreamTask.ts
+++ b/src/components/tasks/src/tasks/DreamTask/DreamTask.ts
@@ -3,5 +3,16 @@
 // Note: Currently unused — BackgroundTasksDialog.tsx imports directly from
 // src/tasks/DreamTask/DreamTask.js. Kept for decompilation completeness.
 
-export type { DreamTaskState, DreamPhase, DreamTurn } from '../../../../../tasks/DreamTask/DreamTask.js'
-export { isDreamTask, registerDreamTask, addDreamTurn, completeDreamTask, failDreamTask, DreamTask } from '../../../../../tasks/DreamTask/DreamTask.js'
+export type {
+  DreamTaskState,
+  DreamPhase,
+  DreamTurn,
+} from '../../../../../tasks/DreamTask/DreamTask.js'
+export {
+  isDreamTask,
+  registerDreamTask,
+  addDreamTurn,
+  completeDreamTask,
+  failDreamTask,
+  DreamTask,
+} from '../../../../../tasks/DreamTask/DreamTask.js'
diff --git a/src/components/tasks/src/tasks/InProcessTeammateTask/InProcessTeammateTask.ts b/src/components/tasks/src/tasks/InProcessTeammateTask/InProcessTeammateTask.ts
index 58a3fc93d..23a7c974a 100644
--- a/src/components/tasks/src/tasks/InProcessTeammateTask/InProcessTeammateTask.ts
+++ b/src/components/tasks/src/tasks/InProcessTeammateTask/InProcessTeammateTask.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type InProcessTeammateTask = any;
+export type InProcessTeammateTask = any
diff --git a/src/components/tasks/src/tasks/InProcessTeammateTask/types.ts b/src/components/tasks/src/tasks/InProcessTeammateTask/types.ts
index 67314b658..57dc044c4 100644
--- a/src/components/tasks/src/tasks/InProcessTeammateTask/types.ts
+++ b/src/components/tasks/src/tasks/InProcessTeammateTask/types.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type InProcessTeammateTaskState = any;
+export type InProcessTeammateTaskState = any
diff --git a/src/components/tasks/src/tasks/LocalAgentTask/LocalAgentTask.ts b/src/components/tasks/src/tasks/LocalAgentTask/LocalAgentTask.ts
index ecfe9aad9..760cd4a50 100644
--- a/src/components/tasks/src/tasks/LocalAgentTask/LocalAgentTask.ts
+++ b/src/components/tasks/src/tasks/LocalAgentTask/LocalAgentTask.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type isPanelAgentTask = any;
-export type LocalAgentTaskState = any;
-export type LocalAgentTask = any;
+export type isPanelAgentTask = any
+export type LocalAgentTaskState = any
+export type LocalAgentTask = any
diff --git a/src/components/tasks/src/tasks/LocalShellTask/LocalShellTask.ts b/src/components/tasks/src/tasks/LocalShellTask/LocalShellTask.ts
index 169ad065d..b8950b9f6 100644
--- a/src/components/tasks/src/tasks/LocalShellTask/LocalShellTask.ts
+++ b/src/components/tasks/src/tasks/LocalShellTask/LocalShellTask.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type LocalShellTask = any;
+export type LocalShellTask = any
diff --git a/src/components/tasks/src/tasks/LocalShellTask/guards.ts b/src/components/tasks/src/tasks/LocalShellTask/guards.ts
index baf4fdb8f..7dbe97533 100644
--- a/src/components/tasks/src/tasks/LocalShellTask/guards.ts
+++ b/src/components/tasks/src/tasks/LocalShellTask/guards.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type LocalShellTaskState = any;
+export type LocalShellTaskState = any
diff --git a/src/components/tasks/src/tasks/LocalWorkflowTask/LocalWorkflowTask.ts b/src/components/tasks/src/tasks/LocalWorkflowTask/LocalWorkflowTask.ts
index 655d5da82..64c2cfba7 100644
--- a/src/components/tasks/src/tasks/LocalWorkflowTask/LocalWorkflowTask.ts
+++ b/src/components/tasks/src/tasks/LocalWorkflowTask/LocalWorkflowTask.ts
@@ -1,2 +1,2 @@
 // Auto-generated stub — replace with real implementation
-export {};
+export {}
diff --git a/src/components/tasks/src/tasks/MonitorMcpTask/MonitorMcpTask.ts b/src/components/tasks/src/tasks/MonitorMcpTask/MonitorMcpTask.ts
index e7f7d4e85..152704616 100644
--- a/src/components/tasks/src/tasks/MonitorMcpTask/MonitorMcpTask.ts
+++ b/src/components/tasks/src/tasks/MonitorMcpTask/MonitorMcpTask.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type MonitorMcpTaskState = any;
+export type MonitorMcpTaskState = any
diff --git a/src/components/tasks/src/tasks/RemoteAgentTask/RemoteAgentTask.ts b/src/components/tasks/src/tasks/RemoteAgentTask/RemoteAgentTask.ts
index 5c1366343..1f5899cbc 100644
--- a/src/components/tasks/src/tasks/RemoteAgentTask/RemoteAgentTask.ts
+++ b/src/components/tasks/src/tasks/RemoteAgentTask/RemoteAgentTask.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type RemoteAgentTaskState = any;
-export type RemoteAgentTask = any;
+export type RemoteAgentTaskState = any
+export type RemoteAgentTask = any
diff --git a/src/components/tasks/src/tasks/pillLabel.ts b/src/components/tasks/src/tasks/pillLabel.ts
index e72c9424e..4d7047ddb 100644
--- a/src/components/tasks/src/tasks/pillLabel.ts
+++ b/src/components/tasks/src/tasks/pillLabel.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type getPillLabel = any;
-export type pillNeedsCta = any;
+export type getPillLabel = any
+export type pillNeedsCta = any
diff --git a/src/components/tasks/src/tasks/types.ts b/src/components/tasks/src/tasks/types.ts
index d48d29071..5b03e3686 100644
--- a/src/components/tasks/src/tasks/types.ts
+++ b/src/components/tasks/src/tasks/types.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type BackgroundTaskState = any;
-export type isBackgroundTask = any;
-export type TaskState = any;
+export type BackgroundTaskState = any
+export type isBackgroundTask = any
+export type TaskState = any
diff --git a/src/components/tasks/src/types/utils.ts b/src/components/tasks/src/types/utils.ts
index 655d5da82..64c2cfba7 100644
--- a/src/components/tasks/src/types/utils.ts
+++ b/src/components/tasks/src/types/utils.ts
@@ -1,2 +1,2 @@
 // Auto-generated stub — replace with real implementation
-export {};
+export {}
diff --git a/src/components/tasks/src/utils/array.ts b/src/components/tasks/src/utils/array.ts
index ee55dafe2..8906bb035 100644
--- a/src/components/tasks/src/utils/array.ts
+++ b/src/components/tasks/src/utils/array.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type intersperse = any;
+export type intersperse = any
diff --git a/src/components/tasks/src/utils/collapseReadSearch.ts b/src/components/tasks/src/utils/collapseReadSearch.ts
index 137b5d428..3fb995679 100644
--- a/src/components/tasks/src/utils/collapseReadSearch.ts
+++ b/src/components/tasks/src/utils/collapseReadSearch.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type summarizeRecentActivities = any;
+export type summarizeRecentActivities = any
diff --git a/src/components/tasks/src/utils/format.ts b/src/components/tasks/src/utils/format.ts
index ae90c3800..b92cec7a4 100644
--- a/src/components/tasks/src/utils/format.ts
+++ b/src/components/tasks/src/utils/format.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type truncate = any;
+export type truncate = any
diff --git a/src/components/tasks/src/utils/horizontalScroll.ts b/src/components/tasks/src/utils/horizontalScroll.ts
index d89f93f24..9e52603bd 100644
--- a/src/components/tasks/src/utils/horizontalScroll.ts
+++ b/src/components/tasks/src/utils/horizontalScroll.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type calculateHorizontalScrollWindow = any;
+export type calculateHorizontalScrollWindow = any
diff --git a/src/components/tasks/src/utils/ink.ts b/src/components/tasks/src/utils/ink.ts
index 53989201a..86d5e69a0 100644
--- a/src/components/tasks/src/utils/ink.ts
+++ b/src/components/tasks/src/utils/ink.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type toInkColor = any;
+export type toInkColor = any
diff --git a/src/components/tasks/src/utils/stringUtils.ts b/src/components/tasks/src/utils/stringUtils.ts
index 8b747e13b..93fe47765 100644
--- a/src/components/tasks/src/utils/stringUtils.ts
+++ b/src/components/tasks/src/utils/stringUtils.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type plural = any;
+export type plural = any
diff --git a/src/components/tasks/src/utils/swarm/constants.ts b/src/components/tasks/src/utils/swarm/constants.ts
index 69a5e1ff5..461b35acf 100644
--- a/src/components/tasks/src/utils/swarm/constants.ts
+++ b/src/components/tasks/src/utils/swarm/constants.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type TEAM_LEAD_NAME = any;
+export type TEAM_LEAD_NAME = any
diff --git a/src/components/tasks/taskStatusUtils.tsx b/src/components/tasks/taskStatusUtils.tsx
index 91cb14cbf..3ca414e38 100644
--- a/src/components/tasks/taskStatusUtils.tsx
+++ b/src/components/tasks/taskStatusUtils.tsx
@@ -2,19 +2,19 @@
  * Shared utilities for displaying task status across different task types.
  */
 
-import figures from 'figures'
-import type { TaskStatus } from 'src/Task.js'
-import type { InProcessTeammateTaskState } from 'src/tasks/InProcessTeammateTask/types.js'
-import { isPanelAgentTask } from 'src/tasks/LocalAgentTask/LocalAgentTask.js'
-import { isBackgroundTask, type TaskState } from 'src/tasks/types.js'
-import type { DeepImmutable } from 'src/types/utils.js'
-import { summarizeRecentActivities } from 'src/utils/collapseReadSearch.js'
+import figures from 'figures';
+import type { TaskStatus } from 'src/Task.js';
+import type { InProcessTeammateTaskState } from 'src/tasks/InProcessTeammateTask/types.js';
+import { isPanelAgentTask } from 'src/tasks/LocalAgentTask/LocalAgentTask.js';
+import { isBackgroundTask, type TaskState } from 'src/tasks/types.js';
+import type { DeepImmutable } from 'src/types/utils.js';
+import { summarizeRecentActivities } from 'src/utils/collapseReadSearch.js';
 
 /**
  * Returns true if the given task status represents a terminal (finished) state.
  */
 export function isTerminalStatus(status: TaskStatus): boolean {
-  return status === 'completed' || status === 'failed' || status === 'killed'
+  return status === 'completed' || status === 'failed' || status === 'killed';
 }
 
 /**
@@ -23,26 +23,25 @@ export function isTerminalStatus(status: TaskStatus): boolean {
 export function getTaskStatusIcon(
   status: TaskStatus,
   options?: {
-    isIdle?: boolean
-    awaitingApproval?: boolean
-    hasError?: boolean
-    shutdownRequested?: boolean
+    isIdle?: boolean;
+    awaitingApproval?: boolean;
+    hasError?: boolean;
+    shutdownRequested?: boolean;
   },
 ): string {
-  const { isIdle, awaitingApproval, hasError, shutdownRequested } =
-    options ?? {}
+  const { isIdle, awaitingApproval, hasError, shutdownRequested } = options ?? {};
 
-  if (hasError) return figures.cross
-  if (awaitingApproval) return figures.questionMarkPrefix
-  if (shutdownRequested) return figures.warning
+  if (hasError) return figures.cross;
+  if (awaitingApproval) return figures.questionMarkPrefix;
+  if (shutdownRequested) return figures.warning;
 
   if (status === 'running') {
-    if (isIdle) return figures.ellipsis
-    return figures.play
+    if (isIdle) return figures.ellipsis;
+    return figures.play;
   }
-  if (status === 'completed') return figures.tick
-  if (status === 'failed' || status === 'killed') return figures.cross
-  return figures.bullet
+  if (status === 'completed') return figures.tick;
+  if (status === 'failed' || status === 'killed') return figures.cross;
+  return figures.bullet;
 }
 
 /**
@@ -51,24 +50,23 @@ export function getTaskStatusIcon(
 export function getTaskStatusColor(
   status: TaskStatus,
   options?: {
-    isIdle?: boolean
-    awaitingApproval?: boolean
-    hasError?: boolean
-    shutdownRequested?: boolean
+    isIdle?: boolean;
+    awaitingApproval?: boolean;
+    hasError?: boolean;
+    shutdownRequested?: boolean;
   },
 ): 'success' | 'error' | 'warning' | 'background' {
-  const { isIdle, awaitingApproval, hasError, shutdownRequested } =
-    options ?? {}
+  const { isIdle, awaitingApproval, hasError, shutdownRequested } = options ?? {};
 
-  if (hasError) return 'error'
-  if (awaitingApproval) return 'warning'
-  if (shutdownRequested) return 'warning'
-  if (isIdle) return 'background'
+  if (hasError) return 'error';
+  if (awaitingApproval) return 'warning';
+  if (shutdownRequested) return 'warning';
+  if (isIdle) return 'background';
 
-  if (status === 'completed') return 'success'
-  if (status === 'failed') return 'error'
-  if (status === 'killed') return 'warning'
-  return 'background'
+  if (status === 'completed') return 'success';
+  if (status === 'failed') return 'error';
+  if (status === 'killed') return 'warning';
+  return 'background';
 }
 
 /**
@@ -76,18 +74,15 @@ export function getTaskStatusColor(
  * accounting for shutdown/approval/idle states and falling back through
  * recent-activity summary → last activity description → 'working'.
  */
-export function describeTeammateActivity(
-  t: DeepImmutable<InProcessTeammateTaskState>,
-): string {
-  if (t.shutdownRequested) return 'stopping'
-  if (t.awaitingPlanApproval) return 'awaiting approval'
-  if (t.isIdle) return 'idle'
+export function describeTeammateActivity(t: DeepImmutable<InProcessTeammateTaskState>): string {
+  if (t.shutdownRequested) return 'stopping';
+  if (t.awaitingPlanApproval) return 'awaiting approval';
+  if (t.isIdle) return 'idle';
   return (
-    (t.progress?.recentActivities &&
-      summarizeRecentActivities(t.progress.recentActivities)) ??
+    (t.progress?.recentActivities && summarizeRecentActivities(t.progress.recentActivities)) ??
     t.progress?.lastActivity?.activityDescription ??
     'working'
-  )
+  );
 }
 
 /**
@@ -99,21 +94,15 @@ export function describeTeammateActivity(
  * plus exclusion of panel-managed agent tasks for ants (those are shown
  * by CoordinatorTaskPanel).
  */
-export function shouldHideTasksFooter(
-  tasks: { [taskId: string]: TaskState },
-  showSpinnerTree: boolean,
-): boolean {
-  if (!showSpinnerTree) return false
-  let hasVisibleTask = false
+export function shouldHideTasksFooter(tasks: { [taskId: string]: TaskState }, showSpinnerTree: boolean): boolean {
+  if (!showSpinnerTree) return false;
+  let hasVisibleTask = false;
   for (const t of Object.values(tasks) as TaskState[]) {
-    if (
-      !isBackgroundTask(t) ||
-      (process.env.USER_TYPE === 'ant' && isPanelAgentTask(t))
-    ) {
-      continue
+    if (!isBackgroundTask(t) || (process.env.USER_TYPE === 'ant' && isPanelAgentTask(t))) {
+      continue;
     }
-    hasVisibleTask = true
-    if (t.type !== 'in_process_teammate') return false
+    hasVisibleTask = true;
+    if (t.type !== 'in_process_teammate') return false;
   }
-  return hasVisibleTask
+  return hasVisibleTask;
 }
diff --git a/src/components/teams/TeamStatus.tsx b/src/components/teams/TeamStatus.tsx
index 79bf89667..c02454756 100644
--- a/src/components/teams/TeamStatus.tsx
+++ b/src/components/teams/TeamStatus.tsx
@@ -1,30 +1,26 @@
-import * as React from 'react'
-import { Text } from '@anthropic/ink'
-import { useAppState } from '../../state/AppState.js'
+import * as React from 'react';
+import { Text } from '@anthropic/ink';
+import { useAppState } from '../../state/AppState.js';
 
 type Props = {
-  teamsSelected: boolean
-  showHint: boolean
-}
+  teamsSelected: boolean;
+  showHint: boolean;
+};
 
 /**
  * Footer status indicator showing teammate count
  * Similar to BackgroundTaskStatus but for teammates
  */
-export function TeamStatus({
-  teamsSelected,
-  showHint,
-}: Props): React.ReactNode {
-  const teamContext = useAppState(s => s.teamContext)
+export function TeamStatus({ teamsSelected, showHint }: Props): React.ReactNode {
+  const teamContext = useAppState(s => s.teamContext);
 
   // Derive teammate count from teamContext (no filesystem I/O needed)
   const totalTeammates = teamContext
-    ? Object.values(teamContext.teammates).filter(t => t.name !== 'team-lead')
-        .length
-    : 0
+    ? Object.values(teamContext.teammates).filter(t => t.name !== 'team-lead').length
+    : 0;
 
   if (totalTeammates === 0) {
-    return null
+    return null;
   }
 
   const hint =
@@ -33,20 +29,16 @@ export function TeamStatus({
         <Text dimColor>· </Text>
         <Text dimColor>Enter to view</Text>
       </>
-    ) : null
+    ) : null;
 
-  const statusText = `${totalTeammates} ${totalTeammates === 1 ? 'teammate' : 'teammates'}`
+  const statusText = `${totalTeammates} ${totalTeammates === 1 ? 'teammate' : 'teammates'}`;
 
   return (
     <>
-      <Text
-        key={teamsSelected ? 'selected' : 'normal'}
-        color="background"
-        inverse={teamsSelected}
-      >
+      <Text key={teamsSelected ? 'selected' : 'normal'} color="background" inverse={teamsSelected}>
         {statusText}
       </Text>
       {hint ? <Text> {hint}</Text> : null}
     </>
-  )
+  );
 }
diff --git a/src/components/teams/TeamsDialog.tsx b/src/components/teams/TeamsDialog.tsx
index 48019d6e0..6b4c366b4 100644
--- a/src/components/teams/TeamsDialog.tsx
+++ b/src/components/teams/TeamsDialog.tsx
@@ -1,205 +1,157 @@
-import { randomUUID } from 'crypto'
-import figures from 'figures'
-import * as React from 'react'
-import { useCallback, useEffect, useMemo, useState } from 'react'
-import { useInterval } from 'usehooks-ts'
-import { useRegisterOverlay } from '../../context/overlayContext.js'
+import { randomUUID } from 'crypto';
+import figures from 'figures';
+import * as React from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useInterval } from 'usehooks-ts';
+import { useRegisterOverlay } from '../../context/overlayContext.js';
 // eslint-disable-next-line custom-rules/prefer-use-keybindings -- raw j/k/arrow dialog navigation
-import { Box, Text, useInput, stringWidth } from '@anthropic/ink'
-import { useKeybindings } from '../../keybindings/useKeybinding.js'
-import { useShortcutDisplay } from '../../keybindings/useShortcutDisplay.js'
-import {
-  type AppState,
-  useAppState,
-  useSetAppState,
-} from '../../state/AppState.js'
-import { getEmptyToolPermissionContext } from '../../Tool.js'
-import { AGENT_COLOR_TO_THEME_COLOR } from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js'
-import { logForDebugging } from '../../utils/debug.js'
-import { execFileNoThrow } from '../../utils/execFileNoThrow.js'
-import { truncateToWidth } from '../../utils/format.js'
-import { getNextPermissionMode } from '../../utils/permissions/getNextPermissionMode.js'
+import { Box, Text, useInput, stringWidth } from '@anthropic/ink';
+import { useKeybindings } from '../../keybindings/useKeybinding.js';
+import { useShortcutDisplay } from '../../keybindings/useShortcutDisplay.js';
+import { type AppState, useAppState, useSetAppState } from '../../state/AppState.js';
+import { getEmptyToolPermissionContext } from '../../Tool.js';
+import { AGENT_COLOR_TO_THEME_COLOR } from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js';
+import { logForDebugging } from '../../utils/debug.js';
+import { execFileNoThrow } from '../../utils/execFileNoThrow.js';
+import { truncateToWidth } from '../../utils/format.js';
+import { getNextPermissionMode } from '../../utils/permissions/getNextPermissionMode.js';
 import {
   getModeColor,
   type PermissionMode,
   permissionModeFromString,
   permissionModeSymbol,
-} from '../../utils/permissions/PermissionMode.js'
-import { jsonStringify } from '../../utils/slowOperations.js'
-import {
-  IT2_COMMAND,
-  isInsideTmuxSync,
-} from '../../utils/swarm/backends/detection.js'
-import {
-  ensureBackendsRegistered,
-  getBackendByType,
-  getCachedBackend,
-} from '../../utils/swarm/backends/registry.js'
-import type { PaneBackendType } from '../../utils/swarm/backends/types.js'
-import {
-  getSwarmSocketName,
-  TMUX_COMMAND,
-} from '../../utils/swarm/constants.js'
+} from '../../utils/permissions/PermissionMode.js';
+import { jsonStringify } from '../../utils/slowOperations.js';
+import { IT2_COMMAND, isInsideTmuxSync } from '../../utils/swarm/backends/detection.js';
+import { ensureBackendsRegistered, getBackendByType, getCachedBackend } from '../../utils/swarm/backends/registry.js';
+import type { PaneBackendType } from '../../utils/swarm/backends/types.js';
+import { getSwarmSocketName, TMUX_COMMAND } from '../../utils/swarm/constants.js';
 import {
   addHiddenPaneId,
   removeHiddenPaneId,
   removeMemberFromTeam,
   setMemberMode,
   setMultipleMemberModes,
-} from '../../utils/swarm/teamHelpers.js'
-import {
-  listTasks,
-  type Task,
-  unassignTeammateTasks,
-} from '../../utils/tasks.js'
-import {
-  getTeammateStatuses,
-  type TeammateStatus,
-  type TeamSummary,
-} from '../../utils/teamDiscovery.js'
+} from '../../utils/swarm/teamHelpers.js';
+import { listTasks, type Task, unassignTeammateTasks } from '../../utils/tasks.js';
+import { getTeammateStatuses, type TeammateStatus, type TeamSummary } from '../../utils/teamDiscovery.js';
 import {
   createModeSetRequestMessage,
   sendShutdownRequestToMailbox,
   writeToMailbox,
-} from '../../utils/teammateMailbox.js'
-import { Dialog } from '@anthropic/ink'
-import ThemedText from '../design-system/ThemedText.js'
+} from '../../utils/teammateMailbox.js';
+import { Dialog } from '@anthropic/ink';
+import ThemedText from '../design-system/ThemedText.js';
 
 type Props = {
-  initialTeams?: TeamSummary[]
-  onDone: () => void
-}
+  initialTeams?: TeamSummary[];
+  onDone: () => void;
+};
 
 type DialogLevel =
   | { type: 'teammateList'; teamName: string }
-  | { type: 'teammateDetail'; teamName: string; memberName: string }
+  | { type: 'teammateDetail'; teamName: string; memberName: string };
 
 /**
  * Dialog for viewing teammates in the current team
  */
 export function TeamsDialog({ initialTeams, onDone }: Props): React.ReactNode {
   // Register as overlay so CancelRequestHandler doesn't intercept escape
-  useRegisterOverlay('teams-dialog')
+  useRegisterOverlay('teams-dialog');
 
   // initialTeams is derived from teamContext in PromptInput (no filesystem I/O)
-  const setAppState = useSetAppState()
+  const setAppState = useSetAppState();
 
   // Initialize dialogLevel with first team name if available
-  const firstTeamName = initialTeams?.[0]?.name ?? ''
+  const firstTeamName = initialTeams?.[0]?.name ?? '';
   const [dialogLevel, setDialogLevel] = useState<DialogLevel>({
     type: 'teammateList',
     teamName: firstTeamName,
-  })
-  const [selectedIndex, setSelectedIndex] = useState(0)
-  const [refreshKey, setRefreshKey] = useState(0)
+  });
+  const [selectedIndex, setSelectedIndex] = useState(0);
+  const [refreshKey, setRefreshKey] = useState(0);
 
   // initialTeams is now always provided from PromptInput (derived from teamContext)
   // No filesystem I/O needed here
 
   const teammateStatuses = useMemo(() => {
-    return getTeammateStatuses(dialogLevel.teamName)
+    return getTeammateStatuses(dialogLevel.teamName);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    // biome-ignore lint/correctness/useExhaustiveDependencies: intentional
-  }, [dialogLevel.teamName, refreshKey])
+  }, [dialogLevel.teamName, refreshKey]);
 
   // Periodically refresh to pick up mode changes from teammates
   useInterval(() => {
-    setRefreshKey(k => k + 1)
-  }, 1000)
+    setRefreshKey(k => k + 1);
+  }, 1000);
 
   const currentTeammate = useMemo(() => {
-    if (dialogLevel.type !== 'teammateDetail') return null
-    return teammateStatuses.find(t => t.name === dialogLevel.memberName) ?? null
-  }, [dialogLevel, teammateStatuses])
+    if (dialogLevel.type !== 'teammateDetail') return null;
+    return teammateStatuses.find(t => t.name === dialogLevel.memberName) ?? null;
+  }, [dialogLevel, teammateStatuses]);
 
   // Get isBypassPermissionsModeAvailable from AppState
-  const isBypassAvailable = useAppState(
-    s => s.toolPermissionContext.isBypassPermissionsModeAvailable,
-  )
+  const isBypassAvailable = useAppState(s => s.toolPermissionContext.isBypassPermissionsModeAvailable);
 
   const goBackToList = (): void => {
-    setDialogLevel({ type: 'teammateList', teamName: dialogLevel.teamName })
-    setSelectedIndex(0)
-  }
+    setDialogLevel({ type: 'teammateList', teamName: dialogLevel.teamName });
+    setSelectedIndex(0);
+  };
 
   // Handler for confirm:cycleMode - cycle teammate permission modes
   const handleCycleMode = useCallback(() => {
     if (dialogLevel.type === 'teammateDetail' && currentTeammate) {
       // Detail view: cycle just this teammate
-      cycleTeammateMode(
-        currentTeammate,
-        dialogLevel.teamName,
-        isBypassAvailable,
-      )
-      setRefreshKey(k => k + 1)
-    } else if (
-      dialogLevel.type === 'teammateList' &&
-      teammateStatuses.length > 0
-    ) {
+      cycleTeammateMode(currentTeammate, dialogLevel.teamName, isBypassAvailable);
+      setRefreshKey(k => k + 1);
+    } else if (dialogLevel.type === 'teammateList' && teammateStatuses.length > 0) {
       // List view: cycle all teammates in tandem
-      cycleAllTeammateModes(
-        teammateStatuses,
-        dialogLevel.teamName,
-        isBypassAvailable,
-      )
-      setRefreshKey(k => k + 1)
+      cycleAllTeammateModes(teammateStatuses, dialogLevel.teamName, isBypassAvailable);
+      setRefreshKey(k => k + 1);
     }
-  }, [dialogLevel, currentTeammate, teammateStatuses, isBypassAvailable])
+  }, [dialogLevel, currentTeammate, teammateStatuses, isBypassAvailable]);
 
   // Use keybindings for mode cycling
-  useKeybindings(
-    { 'confirm:cycleMode': handleCycleMode },
-    { context: 'Confirmation' },
-  )
+  useKeybindings({ 'confirm:cycleMode': handleCycleMode }, { context: 'Confirmation' });
 
   useInput((input, key) => {
     // Handle left arrow to go back
     if (key.leftArrow) {
       if (dialogLevel.type === 'teammateDetail') {
-        goBackToList()
+        goBackToList();
       }
-      return
+      return;
     }
 
     // Handle up/down navigation
     if (key.upArrow || key.downArrow) {
-      const maxIndex = getMaxIndex()
+      const maxIndex = getMaxIndex();
       if (key.upArrow) {
-        setSelectedIndex(prev => Math.max(0, prev - 1))
+        setSelectedIndex(prev => Math.max(0, prev - 1));
       } else {
-        setSelectedIndex(prev => Math.min(maxIndex, prev + 1))
+        setSelectedIndex(prev => Math.min(maxIndex, prev + 1));
       }
-      return
+      return;
     }
 
     // Handle Enter to drill down or view output
     if (key.return) {
-      if (
-        dialogLevel.type === 'teammateList' &&
-        teammateStatuses[selectedIndex]
-      ) {
+      if (dialogLevel.type === 'teammateList' && teammateStatuses[selectedIndex]) {
         setDialogLevel({
           type: 'teammateDetail',
           teamName: dialogLevel.teamName,
           memberName: teammateStatuses[selectedIndex].name,
-        })
+        });
       } else if (dialogLevel.type === 'teammateDetail' && currentTeammate) {
         // View output - switch to tmux pane
-        void viewTeammateOutput(
-          currentTeammate.tmuxPaneId,
-          currentTeammate.backendType,
-        )
-        onDone()
+        void viewTeammateOutput(currentTeammate.tmuxPaneId, currentTeammate.backendType);
+        onDone();
       }
-      return
+      return;
     }
 
     // Handle 'k' to kill teammate
     if (input === 'k') {
-      if (
-        dialogLevel.type === 'teammateList' &&
-        teammateStatuses[selectedIndex]
-      ) {
+      if (dialogLevel.type === 'teammateList' && teammateStatuses[selectedIndex]) {
         void killTeammate(
           teammateStatuses[selectedIndex].tmuxPaneId,
           teammateStatuses[selectedIndex].backendType,
@@ -208,12 +160,10 @@ export function TeamsDialog({ initialTeams, onDone }: Props): React.ReactNode {
           teammateStatuses[selectedIndex].name,
           setAppState,
         ).then(() => {
-          setRefreshKey(k => k + 1)
+          setRefreshKey(k => k + 1);
           // Adjust selection if needed
-          setSelectedIndex(prev =>
-            Math.max(0, Math.min(prev, teammateStatuses.length - 2)),
-          )
-        })
+          setSelectedIndex(prev => Math.max(0, Math.min(prev, teammateStatuses.length - 2)));
+        });
       } else if (dialogLevel.type === 'teammateDetail' && currentTeammate) {
         void killTeammate(
           currentTeammate.tmuxPaneId,
@@ -222,118 +172,96 @@ export function TeamsDialog({ initialTeams, onDone }: Props): React.ReactNode {
           currentTeammate.agentId,
           currentTeammate.name,
           setAppState,
-        )
-        goBackToList()
+        );
+        goBackToList();
       }
-      return
+      return;
     }
 
     // Handle 's' for shutdown of selected teammate
     if (input === 's') {
-      if (
-        dialogLevel.type === 'teammateList' &&
-        teammateStatuses[selectedIndex]
-      ) {
-        const teammate = teammateStatuses[selectedIndex]
+      if (dialogLevel.type === 'teammateList' && teammateStatuses[selectedIndex]) {
+        const teammate = teammateStatuses[selectedIndex];
         void sendShutdownRequestToMailbox(
           teammate.name,
           dialogLevel.teamName,
           'Graceful shutdown requested by team lead',
-        )
+        );
       } else if (dialogLevel.type === 'teammateDetail' && currentTeammate) {
         void sendShutdownRequestToMailbox(
           currentTeammate.name,
           dialogLevel.teamName,
           'Graceful shutdown requested by team lead',
-        )
-        goBackToList()
+        );
+        goBackToList();
       }
-      return
+      return;
     }
 
     // Handle 'h' to hide/show individual teammate (only for backends that support it)
     if (input === 'h') {
-      const backend = getCachedBackend()
+      const backend = getCachedBackend();
       const teammate =
         dialogLevel.type === 'teammateList'
           ? teammateStatuses[selectedIndex]
           : dialogLevel.type === 'teammateDetail'
             ? currentTeammate
-            : null
+            : null;
 
       if (teammate && backend?.supportsHideShow) {
-        void toggleTeammateVisibility(teammate, dialogLevel.teamName).then(
-          () => {
-            // Force refresh of teammate statuses
-            setRefreshKey(k => k + 1)
-          },
-        )
+        void toggleTeammateVisibility(teammate, dialogLevel.teamName).then(() => {
+          // Force refresh of teammate statuses
+          setRefreshKey(k => k + 1);
+        });
         if (dialogLevel.type === 'teammateDetail') {
-          goBackToList()
+          goBackToList();
         }
       }
-      return
+      return;
     }
 
     // Handle 'H' to hide/show all teammates (only for backends that support it)
     if (input === 'H' && dialogLevel.type === 'teammateList') {
-      const backend = getCachedBackend()
+      const backend = getCachedBackend();
       if (backend?.supportsHideShow && teammateStatuses.length > 0) {
         // If any are visible, hide all. Otherwise, show all.
-        const anyVisible = teammateStatuses.some(t => !t.isHidden)
+        const anyVisible = teammateStatuses.some(t => !t.isHidden);
         void Promise.all(
           teammateStatuses.map(t =>
-            anyVisible
-              ? hideTeammate(t, dialogLevel.teamName)
-              : showTeammate(t, dialogLevel.teamName),
+            anyVisible ? hideTeammate(t, dialogLevel.teamName) : showTeammate(t, dialogLevel.teamName),
           ),
         ).then(() => {
           // Force refresh of teammate statuses
-          setRefreshKey(k => k + 1)
-        })
+          setRefreshKey(k => k + 1);
+        });
       }
-      return
+      return;
     }
 
     // Handle 'p' to prune (kill) all idle teammates
     if (input === 'p' && dialogLevel.type === 'teammateList') {
-      const idleTeammates = teammateStatuses.filter(t => t.status === 'idle')
+      const idleTeammates = teammateStatuses.filter(t => t.status === 'idle');
       if (idleTeammates.length > 0) {
         void Promise.all(
           idleTeammates.map(t =>
-            killTeammate(
-              t.tmuxPaneId,
-              t.backendType,
-              dialogLevel.teamName,
-              t.agentId,
-              t.name,
-              setAppState,
-            ),
+            killTeammate(t.tmuxPaneId, t.backendType, dialogLevel.teamName, t.agentId, t.name, setAppState),
           ),
         ).then(() => {
-          setRefreshKey(k => k + 1)
-          setSelectedIndex(prev =>
-            Math.max(
-              0,
-              Math.min(
-                prev,
-                teammateStatuses.length - idleTeammates.length - 1,
-              ),
-            ),
-          )
-        })
+          setRefreshKey(k => k + 1);
+          setSelectedIndex(prev => Math.max(0, Math.min(prev, teammateStatuses.length - idleTeammates.length - 1)));
+        });
       }
-      return
+      return;
     }
 
     // Note: Mode cycling (shift+tab) is handled via useKeybindings with confirm:cycleMode action
-  })
+  });
 
   function getMaxIndex(): number {
     if (dialogLevel.type === 'teammateList') {
-      return Math.max(0, teammateStatuses.length - 1)
+      return Math.max(0, teammateStatuses.length - 1);
     }
-    return 0
+    return 0;
   }
 
   // Render based on dialog level
@@ -345,215 +273,150 @@ export function TeamsDialog({ initialTeams, onDone }: Props): React.ReactNode {
         selectedIndex={selectedIndex}
         onCancel={onDone}
       />
-    )
+    );
   }
 
   if (dialogLevel.type === 'teammateDetail' && currentTeammate) {
-    return (
-      <TeammateDetailView
-        teammate={currentTeammate}
-        teamName={dialogLevel.teamName}
-        onCancel={goBackToList}
-      />
-    )
+    return <TeammateDetailView teammate={currentTeammate} teamName={dialogLevel.teamName} onCancel={goBackToList} />;
   }
 
-  return null
+  return null;
 }
 
 type TeamDetailViewProps = {
-  teamName: string
-  teammates: TeammateStatus[]
-  selectedIndex: number
-  onCancel: () => void
-}
+  teamName: string;
+  teammates: TeammateStatus[];
+  selectedIndex: number;
+  onCancel: () => void;
+};
 
-function TeamDetailView({
-  teamName,
-  teammates,
-  selectedIndex,
-  onCancel,
-}: TeamDetailViewProps): React.ReactNode {
-  const subtitle = `${teammates.length} ${teammates.length === 1 ? 'teammate' : 'teammates'}`
+function TeamDetailView({ teamName, teammates, selectedIndex, onCancel }: TeamDetailViewProps): React.ReactNode {
+  const subtitle = `${teammates.length} ${teammates.length === 1 ? 'teammate' : 'teammates'}`;
   // Check if the backend supports hide/show
-  const supportsHideShow = getCachedBackend()?.supportsHideShow ?? false
+  const supportsHideShow = getCachedBackend()?.supportsHideShow ?? false;
   // Get the display text for the cycle mode shortcut
-  const cycleModeShortcut = useShortcutDisplay(
-    'confirm:cycleMode',
-    'Confirmation',
-    'shift+tab',
-  )
+  const cycleModeShortcut = useShortcutDisplay('confirm:cycleMode', 'Confirmation', 'shift+tab');
 
   return (
     <>
-      <Dialog
-        title={`Team ${teamName}`}
-        subtitle={subtitle}
-        onCancel={onCancel}
-        color="background"
-        hideInputGuide
-      >
+      <Dialog title={`Team ${teamName}`} subtitle={subtitle} onCancel={onCancel} color="background" hideInputGuide>
         {teammates.length === 0 ? (
           <Text dimColor>No teammates</Text>
         ) : (
           <Box flexDirection="column">
             {teammates.map((teammate, index) => (
-              <TeammateListItem
-                key={teammate.agentId}
-                teammate={teammate}
-                isSelected={index === selectedIndex}
-              />
+              <TeammateListItem key={teammate.agentId} teammate={teammate} isSelected={index === selectedIndex} />
             ))}
           </Box>
         )}
       </Dialog>
       <Box marginLeft={1}>
         <Text dimColor>
-          {figures.arrowUp}/{figures.arrowDown} select · Enter view · k kill · s
-          shutdown · p prune idle
+          {figures.arrowUp}/{figures.arrowDown} select · Enter view · k kill · s shutdown · p prune idle
           {supportsHideShow && ' · h hide/show · H hide/show all'}
           {' · '}
           {cycleModeShortcut} sync cycle modes for all · Esc close
         </Text>
       </Box>
     </>
-  )
+  );
 }
 
 type TeammateListItemProps = {
-  teammate: TeammateStatus
-  isSelected: boolean
-}
+  teammate: TeammateStatus;
+  isSelected: boolean;
+};
 
-function TeammateListItem({
-  teammate,
-  isSelected,
-}: TeammateListItemProps): React.ReactNode {
-  const isIdle = teammate.status === 'idle'
+function TeammateListItem({ teammate, isSelected }: TeammateListItemProps): React.ReactNode {
+  const isIdle = teammate.status === 'idle';
   // Only dim if idle AND not selected - selection highlighting takes precedence
-  const shouldDim = isIdle && !isSelected
+  const shouldDim = isIdle && !isSelected;
 
   // Get mode display
-  const mode = teammate.mode
-    ? permissionModeFromString(teammate.mode)
-    : 'default'
-  const modeSymbol = permissionModeSymbol(mode)
-  const modeColor = getModeColor(mode)
+  const mode = teammate.mode ? permissionModeFromString(teammate.mode) : 'default';
+  const modeSymbol = permissionModeSymbol(mode);
+  const modeColor = getModeColor(mode);
 
   return (
     <Text color={isSelected ? 'suggestion' : undefined} dimColor={shouldDim}>
       {isSelected ? figures.pointer + ' ' : '  '}
       {teammate.isHidden && <Text dimColor>[hidden] </Text>}
       {isIdle && <Text dimColor>[idle] </Text>}
-      {modeSymbol && <Text color={modeColor}>{modeSymbol} </Text>}@
-      {teammate.name}
+      {modeSymbol && <Text color={modeColor}>{modeSymbol} </Text>}@{teammate.name}
       {teammate.model && <Text dimColor> ({teammate.model})</Text>}
     </Text>
-  )
+  );
 }
 
 type TeammateDetailViewProps = {
-  teammate: TeammateStatus
-  teamName: string
-  onCancel: () => void
-}
+  teammate: TeammateStatus;
+  teamName: string;
+  onCancel: () => void;
+};
 
-function TeammateDetailView({
-  teammate,
-  teamName,
-  onCancel,
-}: TeammateDetailViewProps): React.ReactNode {
-  const [promptExpanded, setPromptExpanded] = useState(false)
+function TeammateDetailView({ teammate, teamName, onCancel }: TeammateDetailViewProps): React.ReactNode {
+  const [promptExpanded, setPromptExpanded] = useState(false);
   // Get the display text for the cycle mode shortcut
-  const cycleModeShortcut = useShortcutDisplay(
-    'confirm:cycleMode',
-    'Confirmation',
-    'shift+tab',
-  )
+  const cycleModeShortcut = useShortcutDisplay('confirm:cycleMode', 'Confirmation', 'shift+tab');
   const themeColor = teammate.color
-    ? AGENT_COLOR_TO_THEME_COLOR[
-        teammate.color as keyof typeof AGENT_COLOR_TO_THEME_COLOR
-      ]
-    : undefined
+    ? AGENT_COLOR_TO_THEME_COLOR[teammate.color as keyof typeof AGENT_COLOR_TO_THEME_COLOR]
+    : undefined;
 
   // Get tasks assigned to this teammate
-  const [teammateTasks, setTeammateTasks] = useState<Task[]>([])
+  const [teammateTasks, setTeammateTasks] = useState<Task[]>([]);
   useEffect(() => {
-    let cancelled = false
+    let cancelled = false;
     void listTasks(teamName).then(allTasks => {
-      if (cancelled) return
+      if (cancelled) return;
       // Filter tasks owned by this teammate (by agentId or name)
-      setTeammateTasks(
-        allTasks.filter(
-          task =>
-            task.owner === teammate.agentId || task.owner === teammate.name,
-        ),
-      )
-    })
+      setTeammateTasks(allTasks.filter(task => task.owner === teammate.agentId || task.owner === teammate.name));
+    });
     return () => {
-      cancelled = true
-    }
-  }, [teamName, teammate.agentId, teammate.name])
+      cancelled = true;
+    };
+  }, [teamName, teammate.agentId, teammate.name]);
 
   useInput(input => {
     // Handle 'p' to expand/collapse prompt
     if (input === 'p') {
-      setPromptExpanded(prev => !prev)
+      setPromptExpanded(prev => !prev);
     }
-  })
+  });
 
   // Determine working directory display
-  const workingPath = teammate.worktreePath || teammate.cwd
+  const workingPath = teammate.worktreePath || teammate.cwd;
 
   // Build subtitle with metadata
-  const subtitleParts: string[] = []
-  if (teammate.model) subtitleParts.push(teammate.model)
+  const subtitleParts: string[] = [];
+  if (teammate.model) subtitleParts.push(teammate.model);
   if (workingPath) {
-    subtitleParts.push(
-      teammate.worktreePath ? `worktree: ${workingPath}` : workingPath,
-    )
+    subtitleParts.push(teammate.worktreePath ? `worktree: ${workingPath}` : workingPath);
   }
-  const subtitle = subtitleParts.join(' · ') || undefined
+  const subtitle = subtitleParts.join(' · ') || undefined;
 
   // Get mode display for title
-  const mode = teammate.mode
-    ? permissionModeFromString(teammate.mode)
-    : 'default'
-  const modeSymbol = permissionModeSymbol(mode)
-  const modeColor = getModeColor(mode)
+  const mode = teammate.mode ? permissionModeFromString(teammate.mode) : 'default';
+  const modeSymbol = permissionModeSymbol(mode);
+  const modeColor = getModeColor(mode);
 
   // Build title with mode symbol and colored name if applicable
   const title = (
     <>
       {modeSymbol && <Text color={modeColor}>{modeSymbol} </Text>}
-      {themeColor ? (
-        <ThemedText color={themeColor}>{`@${teammate.name}`}</ThemedText>
-      ) : (
-        `@${teammate.name}`
-      )}
+      {themeColor ? <ThemedText color={themeColor}>{`@${teammate.name}`}</ThemedText> : `@${teammate.name}`}
     </>
-  )
+  );
 
   return (
     <>
-      <Dialog
-        title={title}
-        subtitle={subtitle}
-        onCancel={onCancel}
-        color="background"
-        hideInputGuide
-      >
+      <Dialog title={title} subtitle={subtitle} onCancel={onCancel} color="background" hideInputGuide>
         {/* Tasks section */}
         {teammateTasks.length > 0 && (
           <Box flexDirection="column">
             <Text bold>Tasks</Text>
             {teammateTasks.map(task => (
-              <Text
-                key={task.id}
-                color={task.status === 'completed' ? 'success' : undefined}
-              >
-                {task.status === 'completed' ? figures.tick : '◼'}{' '}
-                {task.subject}
+              <Text key={task.id} color={task.status === 'completed' ? 'success' : undefined}>
+                {task.status === 'completed' ? figures.tick : '◼'} {task.subject}
               </Text>
             ))}
           </Box>
@@ -564,12 +427,8 @@ function TeammateDetailView({
           <Box flexDirection="column">
             <Text bold>Prompt</Text>
             <Text>
-              {promptExpanded
-                ? teammate.prompt
-                : truncateToWidth(teammate.prompt, 80)}
-              {stringWidth(teammate.prompt) > 80 && !promptExpanded && (
-                <Text dimColor> (p to expand)</Text>
-              )}
+              {promptExpanded ? teammate.prompt : truncateToWidth(teammate.prompt, 80)}
+              {stringWidth(teammate.prompt) > 80 && !promptExpanded && <Text dimColor> (p to expand)</Text>}
             </Text>
           </Box>
         )}
@@ -583,7 +442,7 @@ function TeammateDetailView({
         </Text>
       </Box>
     </>
-  )
+  );
 }
 
 async function killTeammate(
@@ -602,36 +461,28 @@ async function killTeammate(
       // Use ensureBackendsRegistered (not detectAndGetBackend) — this process may
       // be a teammate that never ran detection, but we only need class imports
       // here, not subprocess probes that could throw in a different environment.
-      await ensureBackendsRegistered()
-      await getBackendByType(backendType).killPane(paneId, !isInsideTmuxSync())
+      await ensureBackendsRegistered();
+      await getBackendByType(backendType).killPane(paneId, !isInsideTmuxSync());
     } catch (error) {
-      logForDebugging(`[TeamsDialog] Failed to kill pane ${paneId}: ${error}`)
+      logForDebugging(`[TeamsDialog] Failed to kill pane ${paneId}: ${error}`);
     }
   } else {
     // backendType undefined: old team files predating this field, or in-process.
     // Old tmux-file case is a migration gap — the pane is orphaned. In-process
     // teammates have no pane to kill, so this is correct for them.
-    logForDebugging(
-      `[TeamsDialog] Skipping pane kill for ${paneId}: no backendType recorded`,
-    )
+    logForDebugging(`[TeamsDialog] Skipping pane kill for ${paneId}: no backendType recorded`);
   }
   // Remove from team config file
-  removeMemberFromTeam(teamName, paneId)
+  removeMemberFromTeam(teamName, paneId);
 
   // Unassign tasks and build notification message
-  const { notificationMessage } = await unassignTeammateTasks(
-    teamName,
-    teammateId,
-    teammateName,
-    'terminated',
-  )
+  const { notificationMessage } = await unassignTeammateTasks(teamName, teammateId, teammateName, 'terminated');
 
   // Update AppState to keep status line in sync and notify the lead
   setAppState(prev => {
-    if (!prev.teamContext?.teammates) return prev
-    if (!(teammateId in prev.teamContext.teammates)) return prev
-    const { [teammateId]: _, ...remainingTeammates } =
-      prev.teamContext.teammates
+    if (!prev.teamContext?.teammates) return prev;
+    if (!(teammateId in prev.teamContext.teammates)) return prev;
+    const { [teammateId]: _, ...remainingTeammates } = prev.teamContext.teammates;
     return {
       ...prev,
       teamContext: {
@@ -653,40 +504,34 @@ async function killTeammate(
           },
         ],
       },
-    }
-  })
-  logForDebugging(`[TeamsDialog] Removed ${teammateId} from teamContext`)
+    };
+  });
+  logForDebugging(`[TeamsDialog] Removed ${teammateId} from teamContext`);
 }
 
-async function viewTeammateOutput(
-  paneId: string,
-  backendType: PaneBackendType | undefined,
-): Promise<void> {
+async function viewTeammateOutput(paneId: string, backendType: PaneBackendType | undefined): Promise<void> {
   if (backendType === 'iterm2') {
     // -s is required to target a specific session (ITermBackend.ts:216-217)
-    await execFileNoThrow(IT2_COMMAND, ['session', 'focus', '-s', paneId])
+    await execFileNoThrow(IT2_COMMAND, ['session', 'focus', '-s', paneId]);
   } else {
     // External-tmux teammates live on the swarm socket — without -L, this
     // targets the default server and silently no-ops. Mirrors runTmuxInSwarm
     // in TmuxBackend.ts:85-89.
     const args = isInsideTmuxSync()
       ? ['select-pane', '-t', paneId]
-      : ['-L', getSwarmSocketName(), 'select-pane', '-t', paneId]
-    await execFileNoThrow(TMUX_COMMAND, args)
+      : ['-L', getSwarmSocketName(), 'select-pane', '-t', paneId];
+    await execFileNoThrow(TMUX_COMMAND, args);
   }
 }
 
 /**
  * Toggle visibility of a teammate pane (hide if visible, show if hidden)
  */
-async function toggleTeammateVisibility(
-  teammate: TeammateStatus,
-  teamName: string,
-): Promise<void> {
+async function toggleTeammateVisibility(teammate: TeammateStatus, teamName: string): Promise<void> {
   if (teammate.isHidden) {
-    await showTeammate(teammate, teamName)
+    await showTeammate(teammate, teamName);
   } else {
-    await hideTeammate(teammate, teamName)
+    await hideTeammate(teammate, teamName);
   }
 }
 
@@ -694,39 +539,27 @@ async function toggleTeammateVisibility(
  * Hide a teammate pane using the backend abstraction.
  * Only available for ant users (gated for dead code elimination in external builds)
  */
-async function hideTeammate(
-  teammate: TeammateStatus,
-  teamName: string,
-): Promise<void> {
-}
+async function hideTeammate(teammate: TeammateStatus, teamName: string): Promise<void> {}
 
 /**
  * Show a previously hidden teammate pane using the backend abstraction.
  * Only available for ant users (gated for dead code elimination in external builds)
  */
-async function showTeammate(
-  teammate: TeammateStatus,
-  teamName: string,
-): Promise<void> {
-}
+async function showTeammate(teammate: TeammateStatus, teamName: string): Promise<void> {}
 
 /**
  * Send a mode change message to a single teammate
  * Also updates config.json directly so the UI reflects the change immediately
  */
-function sendModeChangeToTeammate(
-  teammateName: string,
-  teamName: string,
-  targetMode: PermissionMode,
-): void {
+function sendModeChangeToTeammate(teammateName: string, teamName: string, targetMode: PermissionMode): void {
   // Update config.json directly so UI shows the change immediately
-  setMemberMode(teamName, teammateName, targetMode)
+  setMemberMode(teamName, teammateName, targetMode);
 
   // Also send message so teammate updates their local permission context
   const message = createModeSetRequestMessage({
     mode: targetMode,
     from: 'team-lead',
-  })
+  });
   void writeToMailbox(
     teammateName,
     {
@@ -735,30 +568,22 @@ function sendModeChangeToTeammate(
       timestamp: new Date().toISOString(),
     },
     teamName,
-  )
-  logForDebugging(
-    `[TeamsDialog] Sent mode change to ${teammateName}: ${targetMode}`,
-  )
+  );
+  logForDebugging(`[TeamsDialog] Sent mode change to ${teammateName}: ${targetMode}`);
 }
 
 /**
  * Cycle a single teammate's mode
  */
-function cycleTeammateMode(
-  teammate: TeammateStatus,
-  teamName: string,
-  isBypassAvailable: boolean,
-): void {
-  const currentMode = teammate.mode
-    ? permissionModeFromString(teammate.mode)
-    : 'default'
+function cycleTeammateMode(teammate: TeammateStatus, teamName: string, isBypassAvailable: boolean): void {
+  const currentMode = teammate.mode ? permissionModeFromString(teammate.mode) : 'default';
   const context = {
     ...getEmptyToolPermissionContext(),
     mode: currentMode,
     isBypassPermissionsModeAvailable: isBypassAvailable,
-  }
-  const nextMode = getNextPermissionMode(context)
-  sendModeChangeToTeammate(teammate.name, teamName, nextMode)
+  };
+  const nextMode = getNextPermissionMode(context);
+  sendModeChangeToTeammate(teammate.name, teamName, nextMode);
 }
 
 /**
@@ -767,17 +592,11 @@ function cycleTeammateMode(
  * If same, cycle all to next mode
  * Uses batch update to avoid race conditions
  */
-function cycleAllTeammateModes(
-  teammates: TeammateStatus[],
-  teamName: string,
-  isBypassAvailable: boolean,
-): void {
-  if (teammates.length === 0) return
+function cycleAllTeammateModes(teammates: TeammateStatus[], teamName: string, isBypassAvailable: boolean): void {
+  if (teammates.length === 0) return;
 
-  const modes = teammates.map(t =>
-    t.mode ? permissionModeFromString(t.mode) : 'default',
-  )
-  const allSame = modes.every(m => m === modes[0])
+  const modes = teammates.map(t => (t.mode ? permissionModeFromString(t.mode) : 'default'));
+  const allSame = modes.every(m => m === modes[0]);
 
   // Determine target mode for all teammates
   const targetMode = !allSame
@@ -786,21 +605,21 @@ function cycleAllTeammateModes(
         ...getEmptyToolPermissionContext(),
         mode: modes[0] ?? 'default',
         isBypassPermissionsModeAvailable: isBypassAvailable,
-      })
+      });
 
   // Batch update config.json in a single atomic operation
   const modeUpdates = teammates.map(t => ({
     memberName: t.name,
     mode: targetMode,
-  }))
-  setMultipleMemberModes(teamName, modeUpdates)
+  }));
+  setMultipleMemberModes(teamName, modeUpdates);
 
   // Send mailbox messages to each teammate
   for (const teammate of teammates) {
     const message = createModeSetRequestMessage({
       mode: targetMode,
       from: 'team-lead',
-    })
+    });
     void writeToMailbox(
       teammate.name,
       {
@@ -809,9 +628,7 @@ function cycleAllTeammateModes(
         timestamp: new Date().toISOString(),
       },
       teamName,
-    )
+    );
   }
-  logForDebugging(
-    `[TeamsDialog] Sent mode change to all ${teammates.length} teammates: ${targetMode}`,
-  )
+  logForDebugging(`[TeamsDialog] Sent mode change to all ${teammates.length} teammates: ${targetMode}`);
 }
diff --git a/src/components/ui/OrderedList.tsx b/src/components/ui/OrderedList.tsx
index dde5e5998..e78467f5f 100644
--- a/src/components/ui/OrderedList.tsx
+++ b/src/components/ui/OrderedList.tsx
@@ -1,54 +1,47 @@
-import React, {
-  createContext,
-  isValidElement,
-  type ReactNode,
-  useContext,
-} from 'react'
-import { Box } from '@anthropic/ink'
-import { OrderedListItem, OrderedListItemContext } from './OrderedListItem.js'
+import React, { createContext, isValidElement, type ReactNode, useContext } from 'react';
+import { Box } from '@anthropic/ink';
+import { OrderedListItem, OrderedListItemContext } from './OrderedListItem.js';
 
-const OrderedListContext = createContext({ marker: '' })
+const OrderedListContext = createContext({ marker: '' });
 
 type OrderedListProps = {
-  children: ReactNode
-}
+  children: ReactNode;
+};
 
 function OrderedListComponent({ children }: OrderedListProps): React.ReactNode {
-  const { marker: parentMarker } = useContext(OrderedListContext)
+  const { marker: parentMarker } = useContext(OrderedListContext);
 
-  let numberOfItems = 0
+  let numberOfItems = 0;
   for (const child of React.Children.toArray(children)) {
     if (!isValidElement(child) || child.type !== OrderedListItem) {
-      continue
+      continue;
     }
-    numberOfItems++
+    numberOfItems++;
   }
 
-  const maxMarkerWidth = String(numberOfItems).length
+  const maxMarkerWidth = String(numberOfItems).length;
 
   return (
     <Box flexDirection="column">
       {React.Children.map(children, (child, index) => {
         if (!isValidElement(child) || child.type !== OrderedListItem) {
-          return child
+          return child;
         }
 
-        const paddedMarker = `${String(index + 1).padStart(maxMarkerWidth)}.`
-        const marker = `${parentMarker}${paddedMarker}`
+        const paddedMarker = `${String(index + 1).padStart(maxMarkerWidth)}.`;
+        const marker = `${parentMarker}${paddedMarker}`;
 
         return (
           <OrderedListContext.Provider value={{ marker }}>
-            <OrderedListItemContext.Provider value={{ marker }}>
-              {child}
-            </OrderedListItemContext.Provider>
+            <OrderedListItemContext.Provider value={{ marker }}>{child}</OrderedListItemContext.Provider>
           </OrderedListContext.Provider>
-        )
+        );
       })}
     </Box>
-  )
+  );
 }
 
 // eslint-disable-next-line custom-rules/no-top-level-side-effects
-OrderedListComponent.Item = OrderedListItem
+OrderedListComponent.Item = OrderedListItem;
 
-export const OrderedList = OrderedListComponent
+export const OrderedList = OrderedListComponent;
diff --git a/src/components/ui/OrderedListItem.tsx b/src/components/ui/OrderedListItem.tsx
index 7b60152c1..6750437f1 100644
--- a/src/components/ui/OrderedListItem.tsx
+++ b/src/components/ui/OrderedListItem.tsx
@@ -1,21 +1,19 @@
-import React, { createContext, type ReactNode, useContext } from 'react'
-import { Box, Text } from '@anthropic/ink'
+import React, { createContext, type ReactNode, useContext } from 'react';
+import { Box, Text } from '@anthropic/ink';
 
-export const OrderedListItemContext = createContext({ marker: '' })
+export const OrderedListItemContext = createContext({ marker: '' });
 
 type OrderedListItemProps = {
-  children: ReactNode
-}
+  children: ReactNode;
+};
 
-export function OrderedListItem({
-  children,
-}: OrderedListItemProps): React.ReactNode {
-  const { marker } = useContext(OrderedListItemContext)
+export function OrderedListItem({ children }: OrderedListItemProps): React.ReactNode {
+  const { marker } = useContext(OrderedListItemContext);
 
   return (
     <Box gap={1}>
       <Text dimColor>{marker}</Text>
       <Box flexDirection="column">{children}</Box>
     </Box>
-  )
+  );
 }
diff --git a/src/components/ui/TreeSelect.tsx b/src/components/ui/TreeSelect.tsx
index 9e6ec7f49..c34befc33 100644
--- a/src/components/ui/TreeSelect.tsx
+++ b/src/components/ui/TreeSelect.tsx
@@ -1,107 +1,107 @@
-import React from 'react'
-import { type KeyboardEvent, Box } from '@anthropic/ink'
-import { type OptionWithDescription, Select } from '../CustomSelect/select.js'
+import React from 'react';
+import { type KeyboardEvent, Box } from '@anthropic/ink';
+import { type OptionWithDescription, Select } from '../CustomSelect/select.js';
 
 export type TreeNode<T> = {
-  id: string | number
-  value: T
-  label: string
-  description?: string
-  dimDescription?: boolean
-  children?: TreeNode<T>[]
-  metadata?: Record<string, unknown>
-}
+  id: string | number;
+  value: T;
+  label: string;
+  description?: string;
+  dimDescription?: boolean;
+  children?: TreeNode<T>[];
+  metadata?: Record<string, unknown>;
+};
 
 type FlattenedNode<T> = {
-  node: TreeNode<T>
-  depth: number
-  isExpanded: boolean
-  hasChildren: boolean
-  parentId?: string | number
-}
+  node: TreeNode<T>;
+  depth: number;
+  isExpanded: boolean;
+  hasChildren: boolean;
+  parentId?: string | number;
+};
 
 export type TreeSelectProps<T> = {
   /**
    * Tree nodes to display.
    */
-  readonly nodes: TreeNode<T>[]
+  readonly nodes: TreeNode<T>[];
 
   /**
    * Callback when a node is selected.
    */
-  readonly onSelect: (node: TreeNode<T>) => void
+  readonly onSelect: (node: TreeNode<T>) => void;
 
   /**
    * Callback when cancel is pressed.
    */
-  readonly onCancel?: () => void
+  readonly onCancel?: () => void;
 
   /**
    * Callback when focused node changes.
    */
-  readonly onFocus?: (node: TreeNode<T>) => void
+  readonly onFocus?: (node: TreeNode<T>) => void;
 
   /**
    * Node to focus by ID.
    */
-  readonly focusNodeId?: string | number
+  readonly focusNodeId?: string | number;
 
   /**
    * Number of visible options.
    */
-  readonly visibleOptionCount?: number
+  readonly visibleOptionCount?: number;
 
   /**
    * Layout of the options.
    */
-  readonly layout?: 'compact' | 'expanded' | 'compact-vertical'
+  readonly layout?: 'compact' | 'expanded' | 'compact-vertical';
 
   /**
    * When disabled, user input is ignored.
    */
-  readonly isDisabled?: boolean
+  readonly isDisabled?: boolean;
 
   /**
    * When true, hides the numeric indexes next to each option.
    */
-  readonly hideIndexes?: boolean
+  readonly hideIndexes?: boolean;
 
   /**
    * Function to determine if a node should be initially expanded.
    * If not provided, all nodes start collapsed.
    */
-  readonly isNodeExpanded?: (nodeId: string | number) => boolean
+  readonly isNodeExpanded?: (nodeId: string | number) => boolean;
 
   /**
    * Callback when a node is expanded.
    */
-  readonly onExpand?: (nodeId: string | number) => void
+  readonly onExpand?: (nodeId: string | number) => void;
 
   /**
    * Callback when a node is collapsed.
    */
-  readonly onCollapse?: (nodeId: string | number) => void
+  readonly onCollapse?: (nodeId: string | number) => void;
 
   /**
    * Custom prefix function for parent nodes
    * @param isExpanded - Whether the parent node is currently expanded
    * @returns The prefix string to display (default: '▼ ' when expanded, '▶ ' when collapsed)
    */
-  readonly getParentPrefix?: (isExpanded: boolean) => string
+  readonly getParentPrefix?: (isExpanded: boolean) => string;
 
   /**
    * Custom prefix function for child nodes
    * @param depth - The depth of the child node in the tree (0-indexed from parent)
    * @returns The prefix string to display (default: '  ▸ ')
    */
-  readonly getChildPrefix?: (depth: number) => string
+  readonly getChildPrefix?: (depth: number) => string;
 
   /**
    * Callback when user presses up from the first item.
    * If provided, navigation will not wrap to the last item.
    */
-  readonly onUpFromFirstItem?: () => void
-}
+  readonly onUpFromFirstItem?: () => void;
+};
 
 /**
  * TreeSelect is a generic component for selecting items from a hierarchical tree structure.
@@ -126,38 +126,32 @@ export function TreeSelect<T>({
   onUpFromFirstItem,
 }: TreeSelectProps<T>): React.ReactNode {
   // Track which nodes are expanded (internal state if not controlled externally)
-  const [internalExpandedIds, setInternalExpandedIds] = React.useState<
-    Set<string | number>
-  >(new Set())
+  const [internalExpandedIds, setInternalExpandedIds] = React.useState<Set<string | number>>(new Set());
 
   // Track if we're programmatically setting focus to avoid infinite loops
-  const isProgrammaticFocusRef = React.useRef(false)
+  const isProgrammaticFocusRef = React.useRef(false);
 
   // Track last focused ID to prevent duplicate focus calls
-  const lastFocusedIdRef = React.useRef<string | number | null>(null)
+  const lastFocusedIdRef = React.useRef<string | number | null>(null);
 
   // Determine if a node is expanded (use external function if provided, otherwise use internal state)
   const isExpanded = React.useCallback(
     (nodeId: string | number): boolean => {
       if (isNodeExpanded) {
-        return isNodeExpanded(nodeId)
+        return isNodeExpanded(nodeId);
       }
-      return internalExpandedIds.has(nodeId)
+      return internalExpandedIds.has(nodeId);
     },
     [isNodeExpanded, internalExpandedIds],
-  )
+  );
 
   // Flatten the tree into a linear list for the Select component
   const flattenedNodes = React.useMemo((): FlattenedNode<T>[] => {
-    const result: FlattenedNode<T>[] = []
+    const result: FlattenedNode<T>[] = [];
 
-    function traverse(
-      node: TreeNode<T>,
-      depth: number,
-      parentId?: string | number,
-    ): void {
-      const hasChildren = !!node.children && node.children.length > 0
-      const nodeIsExpanded = isExpanded(node.id)
+    function traverse(node: TreeNode<T>, depth: number, parentId?: string | number): void {
+      const hasChildren = !!node.children && node.children.length > 0;
+      const nodeIsExpanded = isExpanded(node.id);
 
       result.push({
         node,
@@ -165,176 +159,168 @@ export function TreeSelect<T>({
         isExpanded: nodeIsExpanded,
         hasChildren,
         parentId,
-      })
+      });
 
       // Only traverse children if this node is expanded
       if (hasChildren && nodeIsExpanded && node.children) {
         for (const child of node.children) {
-          traverse(child, depth + 1, node.id)
+          traverse(child, depth + 1, node.id);
         }
       }
     }
 
     for (const node of nodes) {
-      traverse(node, 0)
+      traverse(node, 0);
     }
 
-    return result
-  }, [nodes, isExpanded])
+    return result;
+  }, [nodes, isExpanded]);
 
   // Default prefix functions
-  const defaultGetParentPrefix = React.useCallback(
-    (isExpanded: boolean): string => (isExpanded ? '▼ ' : '▶ '),
-    [],
-  )
-  const defaultGetChildPrefix = React.useCallback(
-    (_depth: number): string => '  ▸ ',
-    [],
-  )
+  const defaultGetParentPrefix = React.useCallback((isExpanded: boolean): string => (isExpanded ? '▼ ' : '▶ '), []);
+  const defaultGetChildPrefix = React.useCallback((_depth: number): string => '  ▸ ', []);
 
-  const parentPrefixFn = getParentPrefix ?? defaultGetParentPrefix
-  const childPrefixFn = getChildPrefix ?? defaultGetChildPrefix
+  const parentPrefixFn = getParentPrefix ?? defaultGetParentPrefix;
+  const childPrefixFn = getChildPrefix ?? defaultGetChildPrefix;
 
   // Build the label with appropriate prefixes based on tree position
   const buildLabel = React.useCallback(
     (flatNode: FlattenedNode<T>): string => {
-      let prefix = ''
+      let prefix = '';
 
       if (flatNode.hasChildren) {
         // Parent node with children
-        prefix = parentPrefixFn(flatNode.isExpanded)
+        prefix = parentPrefixFn(flatNode.isExpanded);
       } else if (flatNode.depth > 0) {
         // Child node
-        prefix = childPrefixFn(flatNode.depth)
+        prefix = childPrefixFn(flatNode.depth);
       }
 
-      return prefix + flatNode.node.label
+      return prefix + flatNode.node.label;
     },
     [parentPrefixFn, childPrefixFn],
-  )
+  );
 
   // Convert flattened nodes to Select options
-  const options = React.useMemo((): OptionWithDescription<
-    string | number
-  >[] => {
+  const options = React.useMemo((): OptionWithDescription<string | number>[] => {
     return flattenedNodes.map(flatNode => ({
       label: buildLabel(flatNode),
       description: flatNode.node.description,
       dimDescription: flatNode.node.dimDescription ?? true,
       value: flatNode.node.id,
-    }))
-  }, [flattenedNodes, buildLabel])
+    }));
+  }, [flattenedNodes, buildLabel]);
 
   // Map from node ID to the actual node for quick lookup
   const nodeMap = React.useMemo(() => {
-    const map = new Map<string | number, TreeNode<T>>()
-    flattenedNodes.forEach(fn => map.set(fn.node.id, fn.node))
-    return map
-  }, [flattenedNodes])
+    const map = new Map<string | number, TreeNode<T>>();
+    flattenedNodes.forEach(fn => map.set(fn.node.id, fn.node));
+    return map;
+  }, [flattenedNodes]);
 
   // Find the flattened node by ID
   const findFlattenedNode = React.useCallback(
     (nodeId: string | number): FlattenedNode<T> | undefined => {
-      return flattenedNodes.find(fn => fn.node.id === nodeId)
+      return flattenedNodes.find(fn => fn.node.id === nodeId);
     },
     [flattenedNodes],
-  )
+  );
 
   // Handle expand/collapse
   const toggleExpand = React.useCallback(
     (nodeId: string | number, shouldExpand: boolean) => {
-      const flatNode = findFlattenedNode(nodeId)
-      if (!flatNode || !flatNode.hasChildren) return
+      const flatNode = findFlattenedNode(nodeId);
+      if (!flatNode || !flatNode.hasChildren) return;
 
       if (shouldExpand) {
         if (onExpand) {
-          onExpand(nodeId)
+          onExpand(nodeId);
         } else {
-          setInternalExpandedIds(prev => new Set(prev).add(nodeId))
+          setInternalExpandedIds(prev => new Set(prev).add(nodeId));
         }
       } else {
         if (onCollapse) {
-          onCollapse(nodeId)
+          onCollapse(nodeId);
         } else {
           setInternalExpandedIds(prev => {
-            const newSet = new Set(prev)
-            newSet.delete(nodeId)
-            return newSet
-          })
+            const newSet = new Set(prev);
+            newSet.delete(nodeId);
+            return newSet;
+          });
         }
       }
     },
     [findFlattenedNode, onExpand, onCollapse],
-  )
+  );
 
   // Handle left/right arrow keys for expand/collapse
   const handleKeyDown = (e: KeyboardEvent) => {
-    if (!focusNodeId || isDisabled) return
+    if (!focusNodeId || isDisabled) return;
 
-    const flatNode = findFlattenedNode(focusNodeId)
-    if (!flatNode) return
+    const flatNode = findFlattenedNode(focusNodeId);
+    if (!flatNode) return;
 
     if (e.key === 'right' && flatNode.hasChildren) {
       // Expand the focused node (only if it has children)
-      e.preventDefault()
-      toggleExpand(focusNodeId, true)
+      e.preventDefault();
+      toggleExpand(focusNodeId, true);
     } else if (e.key === 'left') {
       if (flatNode.hasChildren && flatNode.isExpanded) {
         // Collapse the focused parent node
-        e.preventDefault()
-        toggleExpand(focusNodeId, false)
+        e.preventDefault();
+        toggleExpand(focusNodeId, false);
       } else if (flatNode.parentId !== undefined) {
         // If this is a child node OR a collapsed parent with a parent,
         // collapse the parent and focus it
-        e.preventDefault()
-        isProgrammaticFocusRef.current = true
-        toggleExpand(flatNode.parentId, false)
+        e.preventDefault();
+        isProgrammaticFocusRef.current = true;
+        toggleExpand(flatNode.parentId, false);
         if (onFocus) {
-          const parentNode = nodeMap.get(flatNode.parentId)
+          const parentNode = nodeMap.get(flatNode.parentId);
           if (parentNode) {
-            onFocus(parentNode)
+            onFocus(parentNode);
           }
         }
       }
     }
-  }
+  };
 
   // Handle selection
   const handleChange = React.useCallback(
     (nodeId: string | number) => {
-      const node = nodeMap.get(nodeId)
-      if (!node) return
+      const node = nodeMap.get(nodeId);
+      if (!node) return;
 
       // Always select the node - expand/collapse is handled by arrow keys
-      onSelect(node)
+      onSelect(node);
     },
     [nodeMap, onSelect],
-  )
+  );
 
   // Handle focus changes
   const handleFocus = React.useCallback(
     (nodeId: string | number) => {
       // Skip if this is a programmatic focus change
       if (isProgrammaticFocusRef.current) {
-        isProgrammaticFocusRef.current = false
-        return
+        isProgrammaticFocusRef.current = false;
+        return;
       }
 
       // Skip if same node already focused
       if (lastFocusedIdRef.current === nodeId) {
-        return
+        return;
       }
-      lastFocusedIdRef.current = nodeId
+      lastFocusedIdRef.current = nodeId;
 
       if (onFocus) {
-        const node = nodeMap.get(nodeId)
+        const node = nodeMap.get(nodeId);
         if (node) {
-          onFocus(node)
+          onFocus(node);
         }
       }
     },
     [onFocus, nodeMap],
-  )
+  );
 
   return (
     <Box tabIndex={0} autoFocus onKeyDown={handleKeyDown}>
@@ -351,5 +337,5 @@ export function TreeSelect<T>({
         onUpFromFirstItem={onUpFromFirstItem}
       />
     </Box>
-  )
+  );
 }
diff --git a/src/components/ui/option.ts b/src/components/ui/option.ts
index 794027d0b..da1402f40 100644
--- a/src/components/ui/option.ts
+++ b/src/components/ui/option.ts
@@ -1,2 +1,2 @@
 // Auto-generated stub — replace with real implementation
-export type Option = any;
+export type Option = any
diff --git a/src/components/ultraplan/UltraplanChoiceDialog.tsx b/src/components/ultraplan/UltraplanChoiceDialog.tsx
index a49925e30..1f21febd0 100644
--- a/src/components/ultraplan/UltraplanChoiceDialog.tsx
+++ b/src/components/ultraplan/UltraplanChoiceDialog.tsx
@@ -56,7 +56,7 @@ export function UltraplanChoiceDialog({
   setConversationId,
   resultDedupState: _resultDedupState,
 }: UltraplanChoiceDialogProps): React.ReactNode {
-  useRegisterOverlay('ultraplan-choice')
+  useRegisterOverlay('ultraplan-choice');
 
   const setAppState = useSetAppState();
   const { rows, columns } = useTerminalSize();
@@ -65,7 +65,7 @@ export function UltraplanChoiceDialog({
   const visibleHeight = React.useMemo(
     () => Math.min(MAX_VISIBLE_LINES, Math.max(1, Math.floor(rows / 2) - CHROME_LINES)),
     [rows],
-  )
+  );
 
   const wrappedLines = React.useMemo(
     () => wrapText(plan, Math.max(1, columns - 4), 'wrap').split('\n'),
@@ -106,7 +106,7 @@ export function UltraplanChoiceDialog({
   const handleChoice = React.useCallback(
     async (choice: ChoiceValue) => {
       switch (choice) {
-        case 'here': 
+        case 'here':
           enqueuePendingNotification({
             value: [
               'Ultraplan approved in browser. Here is the plan:',
@@ -120,9 +120,12 @@ export function UltraplanChoiceDialog({
             mode: 'task-notification',
           });
           break;
-        case 'fresh': 
+        case 'fresh':
           const previousSessionId = getSessionId();
-          const transcriptSaved = await stat(getTranscriptPath()).then(() => true, () => false)
+          const transcriptSaved = await stat(getTranscriptPath()).then(
+            () => true,
+            () => false,
+          );
 
           await clearConversation({
             setMessages,
@@ -135,7 +138,10 @@ export function UltraplanChoiceDialog({
           if (transcriptSaved) {
             setMessages(prev => [
               ...prev,
-              createSystemMessage(`Previous session saved · resume with: claude --resume ${previousSessionId}`, 'suggestion'),
+              createSystemMessage(
+                `Previous session saved · resume with: claude --resume ${previousSessionId}`,
+                'suggestion',
+              ),
             ]);
           }
 
@@ -170,16 +176,7 @@ export function UltraplanChoiceDialog({
       // Archive the remote CCR session.
       archiveRemoteSession(sessionId);
     },
-    [
-      plan,
-      sessionId,
-      taskId,
-      setMessages,
-      getAppState,
-      setAppState,
-      readFileState,
-      setConversationId,
-    ],
+    [plan, sessionId, taskId, setMessages, getAppState, setAppState, readFileState, setConversationId],
   );
 
   // ── Menu options ───────────────────────────────────────────────────
@@ -206,8 +203,8 @@ export function UltraplanChoiceDialog({
 
   // ── Render ─────────────────────────────────────────────────────────
   return (
-    <Dialog 
-      title="Ultraplan approved" 
+    <Dialog
+      title="Ultraplan approved"
       subtitle="How should the plan be implemented?"
       onCancel={() => {}}
       hideInputGuide
diff --git a/src/components/ultraplan/UltraplanLaunchDialog.tsx b/src/components/ultraplan/UltraplanLaunchDialog.tsx
index ed00f0602..fd9545098 100644
--- a/src/components/ultraplan/UltraplanLaunchDialog.tsx
+++ b/src/components/ultraplan/UltraplanLaunchDialog.tsx
@@ -23,7 +23,7 @@ interface UltraplanLaunchDialogProps {
   ) => void;
 }
 
-function dispatchShowTermsLink(){
+function dispatchShowTermsLink() {
   return !getGlobalConfig().hasSeenUltraplanTerms;
 }
 
@@ -41,7 +41,7 @@ export function UltraplanLaunchDialog({ onChoice }: UltraplanLaunchDialogProps):
   // Dialog copy derived from the prompt identifier
   const dialogConfig = React.useMemo(() => {
     return getDialogConfig(promptIdentifier);
-  }, [promptIdentifier])
+  }, [promptIdentifier]);
 
   // Whether the remote-control bridge is currently active
   const isBridgeEnabled = useAppState(state => state.replBridgeEnabled);
@@ -52,13 +52,14 @@ export function UltraplanLaunchDialog({ onChoice }: UltraplanLaunchDialogProps):
   // Choice handler
   // ------------------------------------------------------------------
 
-  const handleChoice = React.useCallback((value: ChoiceValue) => {
+  const handleChoice = React.useCallback(
+    (value: ChoiceValue) => {
       // If the user chose "run" while the bridge is enabled, disconnect it
       // first so the ultraplan session doesn't collide with remote control.
       const disconnectedBridge = value === 'run' && isBridgeEnabled;
 
       if (disconnectedBridge) {
-        setAppState((prev) => {
+        setAppState(prev => {
           if (!prev.replBridgeEnabled) {
             return prev;
           }
@@ -76,14 +77,14 @@ export function UltraplanLaunchDialog({ onChoice }: UltraplanLaunchDialogProps):
         saveGlobalConfig(prev => (prev.hasSeenUltraplanTerms ? prev : { ...prev, hasSeenUltraplanTerms: true }));
       }
 
-      onChoice(value, { disconnectedBridge, promptIdentifier});
+      onChoice(value, { disconnectedBridge, promptIdentifier });
     },
     [onChoice, isBridgeEnabled, setAppState, showTermsLink],
-  )
+  );
 
   const handleCancel = React.useCallback(() => {
-    handleChoice('cancel')
-  }, [handleChoice])
+    handleChoice('cancel');
+  }, [handleChoice]);
 
   const runDescription = isBridgeEnabled
     ? 'Disable remote control and launch in Claude Code on the web'
@@ -99,24 +100,16 @@ export function UltraplanLaunchDialog({ onChoice }: UltraplanLaunchDialogProps):
   ];
 
   return (
-    <Dialog
-      title="Run ultraplan in the cloud?"
-      subtitle={dialogConfig.timeEstimate}
-      onCancel={handleCancel}
-    >
+    <Dialog title="Run ultraplan in the cloud?" subtitle={dialogConfig.timeEstimate} onCancel={handleCancel}>
       <Box flexDirection="column" gap={1}>
         <Box flexDirection="column">
           <Text dimColor>{dialogConfig.dialogBody}</Text>
-          {
-            showTermsLink
-              ? (
-                  <Text dimColor>
-                  For more information on Claude Code on the web:
-                  <Link url={CCR_TERMS_URL}>{CCR_TERMS_URL}</Link>
-                  </Text>
-                )
-              : null
-          }
+          {showTermsLink ? (
+            <Text dimColor>
+              For more information on Claude Code on the web:
+              <Link url={CCR_TERMS_URL}>{CCR_TERMS_URL}</Link>
+            </Text>
+          ) : null}
         </Box>
 
         {/* Pipeline description (hidden when bridge will be disconnected) */}
@@ -124,10 +117,7 @@ export function UltraplanLaunchDialog({ onChoice }: UltraplanLaunchDialogProps):
           {isBridgeEnabled ? 'This will disable Remote Control for this session.' : dialogConfig.dialogPipeline}
         </Text>
 
-        <Select
-          options={options}
-          onChange={handleChoice}
-        />
+        <Select options={options} onChange={handleChoice} />
       </Box>
     </Dialog>
   );
diff --git a/src/components/wizard/WizardDialogLayout.tsx b/src/components/wizard/WizardDialogLayout.tsx
index 0a03b255e..a77765b9b 100644
--- a/src/components/wizard/WizardDialogLayout.tsx
+++ b/src/components/wizard/WizardDialogLayout.tsx
@@ -1,16 +1,16 @@
-import React, { type ReactNode } from 'react'
-import type { Theme } from '../../utils/theme.js'
-import { Dialog } from '@anthropic/ink'
-import { useWizard } from './useWizard.js'
-import { WizardNavigationFooter } from './WizardNavigationFooter.js'
+import React, { type ReactNode } from 'react';
+import type { Theme } from '../../utils/theme.js';
+import { Dialog } from '@anthropic/ink';
+import { useWizard } from './useWizard.js';
+import { WizardNavigationFooter } from './WizardNavigationFooter.js';
 
 type Props = {
-  title?: string
-  color?: keyof Theme
-  children: ReactNode
-  subtitle?: string
-  footerText?: ReactNode
-}
+  title?: string;
+  color?: keyof Theme;
+  children: ReactNode;
+  subtitle?: string;
+  footerText?: ReactNode;
+};
 
 export function WizardDialogLayout({
   title: titleOverride,
@@ -19,16 +19,9 @@ export function WizardDialogLayout({
   subtitle,
   footerText,
 }: Props): ReactNode {
-  const {
-    currentStepIndex,
-    totalSteps,
-    title: providerTitle,
-    showStepCounter,
-    goBack,
-  } = useWizard()
-  const title = titleOverride || providerTitle || 'Wizard'
-  const stepSuffix =
-    showStepCounter !== false ? ` (${currentStepIndex + 1}/${totalSteps})` : ''
+  const { currentStepIndex, totalSteps, title: providerTitle, showStepCounter, goBack } = useWizard();
+  const title = titleOverride || providerTitle || 'Wizard';
+  const stepSuffix = showStepCounter !== false ? ` (${currentStepIndex + 1}/${totalSteps})` : '';
 
   return (
     <>
@@ -44,5 +37,5 @@ export function WizardDialogLayout({
       </Dialog>
       <WizardNavigationFooter instructions={footerText} />
     </>
-  )
+  );
 }
diff --git a/src/components/wizard/WizardNavigationFooter.tsx b/src/components/wizard/WizardNavigationFooter.tsx
index 96c547c65..6f2eb9dca 100644
--- a/src/components/wizard/WizardNavigationFooter.tsx
+++ b/src/components/wizard/WizardNavigationFooter.tsx
@@ -1,36 +1,27 @@
-import React, { type ReactNode } from 'react'
-import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js'
-import { Box, Text } from '@anthropic/ink'
-import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js'
-import { Byline, KeyboardShortcutHint } from '@anthropic/ink'
+import React, { type ReactNode } from 'react';
+import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js';
+import { Box, Text } from '@anthropic/ink';
+import { ConfigurableShortcutHint } from '../ConfigurableShortcutHint.js';
+import { Byline, KeyboardShortcutHint } from '@anthropic/ink';
 
 type Props = {
-  instructions?: ReactNode
-}
+  instructions?: ReactNode;
+};
 
 export function WizardNavigationFooter({
   instructions = (
     <Byline>
       <KeyboardShortcutHint shortcut="↑↓" action="navigate" />
       <KeyboardShortcutHint shortcut="Enter" action="select" />
-      <ConfigurableShortcutHint
-        action="confirm:no"
-        context="Confirmation"
-        fallback="Esc"
-        description="go back"
-      />
+      <ConfigurableShortcutHint action="confirm:no" context="Confirmation" fallback="Esc" description="go back" />
     </Byline>
   ),
 }: Props): ReactNode {
-  const exitState = useExitOnCtrlCDWithKeybindings()
+  const exitState = useExitOnCtrlCDWithKeybindings();
 
   return (
     <Box marginLeft={3} marginTop={1}>
-      <Text dimColor>
-        {exitState.pending
-          ? `Press ${exitState.keyName} again to exit`
-          : instructions}
-      </Text>
+      <Text dimColor>{exitState.pending ? `Press ${exitState.keyName} again to exit` : instructions}</Text>
     </Box>
-  )
+  );
 }
diff --git a/src/components/wizard/WizardProvider.tsx b/src/components/wizard/WizardProvider.tsx
index e15555d25..617715913 100644
--- a/src/components/wizard/WizardProvider.tsx
+++ b/src/components/wizard/WizardProvider.tsx
@@ -1,17 +1,10 @@
-import React, {
-  createContext,
-  type ReactNode,
-  useCallback,
-  useEffect,
-  useMemo,
-  useState,
-} from 'react'
-import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js'
-import type { WizardContextValue, WizardProviderProps } from './types.js'
+import React, { createContext, type ReactNode, useCallback, useEffect, useMemo, useState } from 'react';
+import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js';
+import type { WizardContextValue, WizardProviderProps } from './types.js';
 
 // Use any here for the context since it will be cast properly when used
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const WizardContext = createContext<WizardContextValue<any> | null>(null)
+export const WizardContext = createContext<WizardContextValue<any> | null>(null);
 
 export function WizardProvider<T extends Record<string, unknown>>({
   steps,
@@ -21,73 +14,80 @@ export function WizardProvider<T extends Record<string, unknown>>({
   children,
   title,
   showStepCounter = true,
-}: WizardProviderProps & { initialData?: T; onComplete: (data: T) => void; onCancel: () => void; children: ReactNode; title: string; showStepCounter?: boolean }): ReactNode {
-  const [currentStepIndex, setCurrentStepIndex] = useState(0)
-  const [wizardData, setWizardData] = useState<T>(initialData)
-  const [isCompleted, setIsCompleted] = useState(false)
-  const [navigationHistory, setNavigationHistory] = useState<number[]>([])
+}: WizardProviderProps & {
+  initialData?: T;
+  onComplete: (data: T) => void;
+  onCancel: () => void;
+  children: ReactNode;
+  title: string;
+  showStepCounter?: boolean;
+}): ReactNode {
+  const [currentStepIndex, setCurrentStepIndex] = useState(0);
+  const [wizardData, setWizardData] = useState<T>(initialData);
+  const [isCompleted, setIsCompleted] = useState(false);
+  const [navigationHistory, setNavigationHistory] = useState<number[]>([]);
 
-  useExitOnCtrlCDWithKeybindings()
+  useExitOnCtrlCDWithKeybindings();
 
   // Handle completion in useEffect to avoid updating parent during render
   useEffect(() => {
     if (isCompleted) {
-      setNavigationHistory([])
-      void onComplete(wizardData)
+      setNavigationHistory([]);
+      void onComplete(wizardData);
     }
-  }, [isCompleted, wizardData, onComplete])
+  }, [isCompleted, wizardData, onComplete]);
 
   const goNext = useCallback(() => {
     if (currentStepIndex < steps.length - 1) {
       // If we have history (non-linear flow), add current step to it
       if (navigationHistory.length > 0) {
-        setNavigationHistory(prev => [...prev, currentStepIndex])
+        setNavigationHistory(prev => [...prev, currentStepIndex]);
       }
 
-      setCurrentStepIndex(prev => prev + 1)
+      setCurrentStepIndex(prev => prev + 1);
     } else {
       // Mark as completed, which will trigger useEffect
-      setIsCompleted(true)
+      setIsCompleted(true);
     }
-  }, [currentStepIndex, steps.length, navigationHistory])
+  }, [currentStepIndex, steps.length, navigationHistory]);
 
   const goBack = useCallback(() => {
     // Check if we have navigation history to use
     if (navigationHistory.length > 0) {
-      const previousStep = navigationHistory[navigationHistory.length - 1]
+      const previousStep = navigationHistory[navigationHistory.length - 1];
       if (previousStep !== undefined) {
-        setNavigationHistory(prev => prev.slice(0, -1))
-        setCurrentStepIndex(previousStep)
+        setNavigationHistory(prev => prev.slice(0, -1));
+        setCurrentStepIndex(previousStep);
       }
     } else if (currentStepIndex > 0) {
       // Fallback to simple decrement if no history
-      setCurrentStepIndex(prev => prev - 1)
+      setCurrentStepIndex(prev => prev - 1);
     } else if (onCancel) {
-      onCancel()
+      onCancel();
     }
-  }, [currentStepIndex, navigationHistory, onCancel])
+  }, [currentStepIndex, navigationHistory, onCancel]);
 
   const goToStep = useCallback(
     (index: number) => {
       if (index >= 0 && index < steps.length) {
         // Push current step to history before jumping
-        setNavigationHistory(prev => [...prev, currentStepIndex])
-        setCurrentStepIndex(index)
+        setNavigationHistory(prev => [...prev, currentStepIndex]);
+        setCurrentStepIndex(index);
       }
     },
     [currentStepIndex, steps.length],
-  )
+  );
 
   const cancel = useCallback(() => {
-    setNavigationHistory([])
+    setNavigationHistory([]);
     if (onCancel) {
-      onCancel()
+      onCancel();
     }
-  }, [onCancel])
+  }, [onCancel]);
 
   const updateWizardData = useCallback((updates: Partial<T>) => {
-    setWizardData(prev => ({ ...prev, ...updates }))
-  }, [])
+    setWizardData(prev => ({ ...prev, ...updates }));
+  }, []);
 
   const contextValue = useMemo<WizardContextValue<T>>(
     () => ({
@@ -115,17 +115,13 @@ export function WizardProvider<T extends Record<string, unknown>>({
       title,
       showStepCounter,
     ],
-  )
+  );
 
-  const CurrentStepComponent = steps[currentStepIndex]
+  const CurrentStepComponent = steps[currentStepIndex];
 
   if (!CurrentStepComponent || isCompleted) {
-    return null
+    return null;
   }
 
-  return (
-    <WizardContext.Provider value={contextValue}>
-      {children || <CurrentStepComponent />}
-    </WizardContext.Provider>
-  )
+  return <WizardContext.Provider value={contextValue}>{children || <CurrentStepComponent />}</WizardContext.Provider>;
 }
diff --git a/src/components/wizard/types.ts b/src/components/wizard/types.ts
index 2e1c20222..c1cdc2bf3 100644
--- a/src/components/wizard/types.ts
+++ b/src/components/wizard/types.ts
@@ -1,4 +1,4 @@
 // Auto-generated stub — replace with real implementation
-export type WizardContextValue<T = any> = any;
-export type WizardProviderProps = any;
-export type WizardStepComponent = any;
+export type WizardContextValue<T = any> = any
+export type WizardProviderProps = any
+export type WizardStepComponent = any
diff --git a/src/constants/betas.ts b/src/constants/betas.ts
index 88abf3f68..f213bf4d9 100644
--- a/src/constants/betas.ts
+++ b/src/constants/betas.ts
@@ -47,4 +47,4 @@ export const VERTEX_COUNT_TOKENS_ALLOWED_BETAS = new Set([
   INTERLEAVED_THINKING_BETA_HEADER,
   CONTEXT_MANAGEMENT_BETA_HEADER,
 ])
-export const CACHE_EDITING_BETA_HEADER: string = '';
+export const CACHE_EDITING_BETA_HEADER: string = ''
diff --git a/src/constants/querySource.ts b/src/constants/querySource.ts
index b79de64ca..f4be12484 100644
--- a/src/constants/querySource.ts
+++ b/src/constants/querySource.ts
@@ -1,2 +1,2 @@
 // Auto-generated stub — replace with real implementation
-export type QuerySource = any;
+export type QuerySource = any
diff --git a/src/constants/src/commands.ts b/src/constants/src/commands.ts
index e358f0755..0ba78c72c 100644
--- a/src/constants/src/commands.ts
+++ b/src/constants/src/commands.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getSkillToolCommands = any;
+export type getSkillToolCommands = any
diff --git a/src/constants/src/services/analytics/growthbook.ts b/src/constants/src/services/analytics/growthbook.ts
index e380906ea..7967fd3ee 100644
--- a/src/constants/src/services/analytics/growthbook.ts
+++ b/src/constants/src/services/analytics/growthbook.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getFeatureValue_CACHED_MAY_BE_STALE = any;
+export type getFeatureValue_CACHED_MAY_BE_STALE = any
diff --git a/src/constants/src/tools/AgentTool/built-in/exploreAgent.ts b/src/constants/src/tools/AgentTool/built-in/exploreAgent.ts
index 7ec141a4e..3ddad8a49 100644
--- a/src/constants/src/tools/AgentTool/built-in/exploreAgent.ts
+++ b/src/constants/src/tools/AgentTool/built-in/exploreAgent.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type EXPLORE_AGENT = any;
-export type EXPLORE_AGENT_MIN_QUERIES = any;
+export type EXPLORE_AGENT = any
+export type EXPLORE_AGENT_MIN_QUERIES = any
diff --git a/src/constants/src/tools/AgentTool/builtInAgents.ts b/src/constants/src/tools/AgentTool/builtInAgents.ts
index 8358c0b6b..95fce9108 100644
--- a/src/constants/src/tools/AgentTool/builtInAgents.ts
+++ b/src/constants/src/tools/AgentTool/builtInAgents.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type areExplorePlanAgentsEnabled = any;
+export type areExplorePlanAgentsEnabled = any
diff --git a/src/constants/src/tools/GlobTool/prompt.ts b/src/constants/src/tools/GlobTool/prompt.ts
index 060caf29c..5ff2b16bb 100644
--- a/src/constants/src/tools/GlobTool/prompt.ts
+++ b/src/constants/src/tools/GlobTool/prompt.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type GLOB_TOOL_NAME = any;
+export type GLOB_TOOL_NAME = any
diff --git a/src/constants/src/tools/GrepTool/prompt.ts b/src/constants/src/tools/GrepTool/prompt.ts
index 08b8a8d29..4645d4c52 100644
--- a/src/constants/src/tools/GrepTool/prompt.ts
+++ b/src/constants/src/tools/GrepTool/prompt.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type GREP_TOOL_NAME = any;
+export type GREP_TOOL_NAME = any
diff --git a/src/constants/src/utils/embeddedTools.ts b/src/constants/src/utils/embeddedTools.ts
index c0160dbf9..0568d4b57 100644
--- a/src/constants/src/utils/embeddedTools.ts
+++ b/src/constants/src/utils/embeddedTools.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type hasEmbeddedSearchTools = any;
+export type hasEmbeddedSearchTools = any
diff --git a/src/constants/src/utils/envUtils.ts b/src/constants/src/utils/envUtils.ts
index deb349096..dfe8dd636 100644
--- a/src/constants/src/utils/envUtils.ts
+++ b/src/constants/src/utils/envUtils.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type isEnvTruthy = any;
+export type isEnvTruthy = any
diff --git a/src/constants/tools.ts b/src/constants/tools.ts
index 063558802..511114eba 100644
--- a/src/constants/tools.ts
+++ b/src/constants/tools.ts
@@ -82,7 +82,9 @@ export const IN_PROCESS_TEAMMATE_ALLOWED_TOOLS = new Set([
   SEND_MESSAGE_TOOL_NAME,
   // Teammate-created crons are tagged with the creating agentId and routed to
   // that teammate's pendingUserMessages queue (see useScheduledTasks.ts).
-  CRON_CREATE_TOOL_NAME, CRON_DELETE_TOOL_NAME, CRON_LIST_TOOL_NAME,
+  CRON_CREATE_TOOL_NAME,
+  CRON_DELETE_TOOL_NAME,
+  CRON_LIST_TOOL_NAME,
 ])
 
 /*
diff --git a/src/context/QueuedMessageContext.tsx b/src/context/QueuedMessageContext.tsx
index d78c9487b..332005c51 100644
--- a/src/context/QueuedMessageContext.tsx
+++ b/src/context/QueuedMessageContext.tsx
@@ -1,45 +1,36 @@
-import * as React from 'react'
-import { Box } from '@anthropic/ink'
+import * as React from 'react';
+import { Box } from '@anthropic/ink';
 
 type QueuedMessageContextValue = {
-  isQueued: boolean
-  isFirst: boolean
+  isQueued: boolean;
+  isFirst: boolean;
   /** Width reduction for container padding (e.g., 4 for paddingX={2}) */
-  paddingWidth: number
-}
+  paddingWidth: number;
+};
 
-const QueuedMessageContext = React.createContext<
-  QueuedMessageContextValue | undefined
->(undefined)
+const QueuedMessageContext = React.createContext<QueuedMessageContextValue | undefined>(undefined);
 
 export function useQueuedMessage(): QueuedMessageContextValue | undefined {
-  return React.useContext(QueuedMessageContext)
+  return React.useContext(QueuedMessageContext);
 }
 
-const PADDING_X = 2
+const PADDING_X = 2;
 
 type Props = {
-  isFirst: boolean
-  useBriefLayout?: boolean
-  children: React.ReactNode
-}
+  isFirst: boolean;
+  useBriefLayout?: boolean;
+  children: React.ReactNode;
+};
 
-export function QueuedMessageProvider({
-  isFirst,
-  useBriefLayout,
-  children,
-}: Props): React.ReactNode {
+export function QueuedMessageProvider({ isFirst, useBriefLayout, children }: Props): React.ReactNode {
   // Brief mode already indents via paddingLeft in HighlightedThinkingText /
   // BriefTool UI — adding paddingX here would double-indent the queue.
-  const padding = useBriefLayout ? 0 : PADDING_X
-  const value = React.useMemo(
-    () => ({ isQueued: true, isFirst, paddingWidth: padding * 2 }),
-    [isFirst, padding],
-  )
+  const padding = useBriefLayout ? 0 : PADDING_X;
+  const value = React.useMemo(() => ({ isQueued: true, isFirst, paddingWidth: padding * 2 }), [isFirst, padding]);
 
   return (
     <QueuedMessageContext.Provider value={value}>
       <Box paddingX={padding}>{children}</Box>
     </QueuedMessageContext.Provider>
-  )
+  );
 }
diff --git a/src/context/fpsMetrics.tsx b/src/context/fpsMetrics.tsx
index b23a411ec..4e9bfbe20 100644
--- a/src/context/fpsMetrics.tsx
+++ b/src/context/fpsMetrics.tsx
@@ -1,26 +1,19 @@
-import React, { createContext, useContext } from 'react'
-import type { FpsMetrics } from '../utils/fpsTracker.js'
+import React, { createContext, useContext } from 'react';
+import type { FpsMetrics } from '../utils/fpsTracker.js';
 
-type FpsMetricsGetter = () => FpsMetrics | undefined
+type FpsMetricsGetter = () => FpsMetrics | undefined;
 
-const FpsMetricsContext = createContext<FpsMetricsGetter | undefined>(undefined)
+const FpsMetricsContext = createContext<FpsMetricsGetter | undefined>(undefined);
 
 type Props = {
-  getFpsMetrics: FpsMetricsGetter
-  children: React.ReactNode
-}
+  getFpsMetrics: FpsMetricsGetter;
+  children: React.ReactNode;
+};
 
-export function FpsMetricsProvider({
-  getFpsMetrics,
-  children,
-}: Props): React.ReactNode {
-  return (
-    <FpsMetricsContext.Provider value={getFpsMetrics}>
-      {children}
-    </FpsMetricsContext.Provider>
-  )
+export function FpsMetricsProvider({ getFpsMetrics, children }: Props): React.ReactNode {
+  return <FpsMetricsContext.Provider value={getFpsMetrics}>{children}</FpsMetricsContext.Provider>;
 }
 
 export function useFpsMetrics(): FpsMetricsGetter | undefined {
-  return useContext(FpsMetricsContext)
+  return useContext(FpsMetricsContext);
 }
diff --git a/src/context/mailbox.tsx b/src/context/mailbox.tsx
index a02e2cb46..10675785c 100644
--- a/src/context/mailbox.tsx
+++ b/src/context/mailbox.tsx
@@ -1,25 +1,21 @@
-import React, { createContext, useContext, useMemo } from 'react'
-import { Mailbox } from '../utils/mailbox.js'
+import React, { createContext, useContext, useMemo } from 'react';
+import { Mailbox } from '../utils/mailbox.js';
 
-const MailboxContext = createContext<Mailbox | undefined>(undefined)
+const MailboxContext = createContext<Mailbox | undefined>(undefined);
 
 type Props = {
-  children: React.ReactNode
-}
+  children: React.ReactNode;
+};
 
 export function MailboxProvider({ children }: Props): React.ReactNode {
-  const mailbox = useMemo(() => new Mailbox(), [])
-  return (
-    <MailboxContext.Provider value={mailbox}>
-      {children}
-    </MailboxContext.Provider>
-  )
+  const mailbox = useMemo(() => new Mailbox(), []);
+  return <MailboxContext.Provider value={mailbox}>{children}</MailboxContext.Provider>;
 }
 
 export function useMailbox(): Mailbox {
-  const mailbox = useContext(MailboxContext)
+  const mailbox = useContext(MailboxContext);
   if (!mailbox) {
-    throw new Error('useMailbox must be used within a MailboxProvider')
+    throw new Error('useMailbox must be used within a MailboxProvider');
   }
-  return mailbox
+  return mailbox;
 }
diff --git a/src/context/modalContext.tsx b/src/context/modalContext.tsx
index 7d8498784..298ee871f 100644
--- a/src/context/modalContext.tsx
+++ b/src/context/modalContext.tsx
@@ -1,5 +1,5 @@
-import { createContext, type RefObject, useContext } from 'react'
-import type { ScrollBoxHandle } from '@anthropic/ink'
+import { createContext, type RefObject, useContext } from 'react';
+import type { ScrollBoxHandle } from '@anthropic/ink';
 
 /**
  * Set by FullscreenLayout when rendering content in its `modal` slot —
@@ -19,14 +19,14 @@ import type { ScrollBoxHandle } from '@anthropic/ink'
  * null = not inside the modal slot.
  */
 type ModalCtx = {
-  rows: number
-  columns: number
-  scrollRef: RefObject<ScrollBoxHandle | null> | null
-}
-export const ModalContext = createContext<ModalCtx | null>(null)
+  rows: number;
+  columns: number;
+  scrollRef: RefObject<ScrollBoxHandle | null> | null;
+};
+export const ModalContext = createContext<ModalCtx | null>(null);
 
 export function useIsInsideModal(): boolean {
-  return useContext(ModalContext) !== null
+  return useContext(ModalContext) !== null;
 }
 
 /**
@@ -35,14 +35,11 @@ export function useIsInsideModal(): boolean {
  * component caps its visible content height — the modal's inner area is
  * smaller than the terminal.
  */
-export function useModalOrTerminalSize(fallback: {
-  rows: number
-  columns: number
-}): { rows: number; columns: number } {
-  const ctx = useContext(ModalContext)
-  return ctx ? { rows: ctx.rows, columns: ctx.columns } : fallback
+export function useModalOrTerminalSize(fallback: { rows: number; columns: number }): { rows: number; columns: number } {
+  const ctx = useContext(ModalContext);
+  return ctx ? { rows: ctx.rows, columns: ctx.columns } : fallback;
 }
 
 export function useModalScrollRef(): RefObject<ScrollBoxHandle | null> | null {
-  return useContext(ModalContext)?.scrollRef ?? null
+  return useContext(ModalContext)?.scrollRef ?? null;
 }
diff --git a/src/context/notifications.tsx b/src/context/notifications.tsx
index a19d908f9..c7d27e8fb 100644
--- a/src/context/notifications.tsx
+++ b/src/context/notifications.tsx
@@ -1,70 +1,70 @@
-import type * as React from 'react'
-import { useCallback, useEffect } from 'react'
-import { useAppStateStore, useSetAppState } from 'src/state/AppState.js'
-import type { Theme } from '../utils/theme.js'
+import type * as React from 'react';
+import { useCallback, useEffect } from 'react';
+import { useAppStateStore, useSetAppState } from 'src/state/AppState.js';
+import type { Theme } from '../utils/theme.js';
 
-type Priority = 'low' | 'medium' | 'high' | 'immediate'
+type Priority = 'low' | 'medium' | 'high' | 'immediate';
 
 type BaseNotification = {
-  key: string
+  key: string;
   /**
    * Keys of notifications that this notification invalidates.
    * If a notification is invalidated, it will be removed from the queue
    * and, if currently displayed, cleared immediately.
    */
-  invalidates?: string[]
-  priority: Priority
-  timeoutMs?: number
+  invalidates?: string[];
+  priority: Priority;
+  timeoutMs?: number;
   /**
    * Combine notifications with the same key, like Array.reduce().
    * Called as fold(accumulator, incoming) when a notification with a matching
    * key already exists in the queue or is currently displayed.
    * Returns the merged notification (should carry fold forward for future merges).
    */
-  fold?: (accumulator: Notification, incoming: Notification) => Notification
-}
+  fold?: (accumulator: Notification, incoming: Notification) => Notification;
+};
 
 type TextNotification = BaseNotification & {
-  text: string
-  color?: keyof Theme
-}
+  text: string;
+  color?: keyof Theme;
+};
 
 type JSXNotification = BaseNotification & {
-  jsx: React.ReactNode
-}
+  jsx: React.ReactNode;
+};
 
-type AddNotificationFn = (content: Notification) => void
-type RemoveNotificationFn = (key: string) => void
+type AddNotificationFn = (content: Notification) => void;
+type RemoveNotificationFn = (key: string) => void;
 
-export type Notification = TextNotification | JSXNotification
+export type Notification = TextNotification | JSXNotification;
 
-const DEFAULT_TIMEOUT_MS = 8000
+const DEFAULT_TIMEOUT_MS = 8000;
 
 // Track current timeout to clear it when immediate notifications arrive
-let currentTimeoutId: NodeJS.Timeout | null = null
+let currentTimeoutId: NodeJS.Timeout | null = null;
 
 export function useNotifications(): {
-  addNotification: AddNotificationFn
-  removeNotification: RemoveNotificationFn
+  addNotification: AddNotificationFn;
+  removeNotification: RemoveNotificationFn;
 } {
-  const store = useAppStateStore()
-  const setAppState = useSetAppState()
+  const store = useAppStateStore();
+  const setAppState = useSetAppState();
 
   // Process queue when current notification finishes or queue changes
   const processQueue = useCallback(() => {
     setAppState(prev => {
-      const next = getNext(prev.notifications.queue)
+      const next = getNext(prev.notifications.queue);
       if (prev.notifications.current !== null || !next) {
-        return prev
+        return prev;
       }
 
       currentTimeoutId = setTimeout(
         (setAppState, nextKey, processQueue) => {
-          currentTimeoutId = null
+          currentTimeoutId = null;
           setAppState(prev => {
             // Compare by key instead of reference to handle re-created notifications
             if (prev.notifications.current?.key !== nextKey) {
-              return prev
+              return prev;
             }
             return {
               ...prev,
@@ -72,15 +72,15 @@ export function useNotifications(): {
                 queue: prev.notifications.queue,
                 current: null,
               },
-            }
-          })
-          processQueue()
+            };
+          });
+          processQueue();
         },
         next.timeoutMs ?? DEFAULT_TIMEOUT_MS,
         setAppState,
         next.key,
         processQueue,
-      )
+      );
 
       return {
         ...prev,
@@ -88,9 +88,9 @@ export function useNotifications(): {
           queue: prev.notifications.queue.filter(_ => _ !== next),
           current: next,
         },
-      }
-    })
-  }, [setAppState])
+      };
+    });
+  }, [setAppState]);
 
   const addNotification = useCallback<AddNotificationFn>(
     (notif: Notification) => {
@@ -98,36 +98,34 @@ export function useNotifications(): {
       if (notif.priority === 'immediate') {
         // Clear any existing timeout since we're showing a new immediate notification
         if (currentTimeoutId) {
-          clearTimeout(currentTimeoutId)
-          currentTimeoutId = null
+          clearTimeout(currentTimeoutId);
+          currentTimeoutId = null;
         }
 
         // Set up timeout for the immediate notification
         currentTimeoutId = setTimeout(
           (setAppState, notif, processQueue) => {
-            currentTimeoutId = null
+            currentTimeoutId = null;
             setAppState(prev => {
               // Compare by key instead of reference to handle re-created notifications
               if (prev.notifications.current?.key !== notif.key) {
-                return prev
+                return prev;
               }
               return {
                 ...prev,
                 notifications: {
-                  queue: prev.notifications.queue.filter(
-                    _ => !notif.invalidates?.includes(_.key),
-                  ),
+                  queue: prev.notifications.queue.filter(_ => !notif.invalidates?.includes(_.key)),
                   current: null,
                 },
-              }
-            })
-            processQueue()
+              };
+            });
+            processQueue();
           },
           notif.timeoutMs ?? DEFAULT_TIMEOUT_MS,
           setAppState,
           notif,
           processQueue,
-        )
+        );
 
         // Show the immediate notification right away
         setAppState(prev => ({
@@ -136,19 +134,12 @@ export function useNotifications(): {
             current: notif,
             queue:
               // Only re-queue the current notification if it's not immediate
-              [
-                ...(prev.notifications.current
-                  ? [prev.notifications.current]
-                  : []),
-                ...prev.notifications.queue,
-              ].filter(
-                _ =>
-                  _.priority !== 'immediate' &&
-                  !notif.invalidates?.includes(_.key),
+              [...(prev.notifications.current ? [prev.notifications.current] : []), ...prev.notifications.queue].filter(
+                _ => _.priority !== 'immediate' && !notif.invalidates?.includes(_.key),
               ),
           },
-        }))
-        return // IMPORTANT: Exit addNotification for immediate notifications
+        }));
+        return; // IMPORTANT: Exit addNotification for immediate notifications
       }
 
       // Handle non-immediate notifications
@@ -157,18 +148,18 @@ export function useNotifications(): {
         if (notif.fold) {
           // Fold into current notification if keys match
           if (prev.notifications.current?.key === notif.key) {
-            const folded = notif.fold(prev.notifications.current, notif)
+            const folded = notif.fold(prev.notifications.current, notif);
             // Reset timeout for the folded notification
             if (currentTimeoutId) {
-              clearTimeout(currentTimeoutId)
-              currentTimeoutId = null
+              clearTimeout(currentTimeoutId);
+              currentTimeoutId = null;
             }
             currentTimeoutId = setTimeout(
               (setAppState, foldedKey, processQueue) => {
-                currentTimeoutId = null
+                currentTimeoutId = null;
                 setAppState(p => {
                   if (p.notifications.current?.key !== foldedKey) {
-                    return p
+                    return p;
                   }
                   return {
                     ...p,
@@ -176,15 +167,15 @@ export function useNotifications(): {
                       queue: p.notifications.queue,
                       current: null,
                     },
-                  }
-                })
-                processQueue()
+                  };
+                });
+                processQueue();
               },
               folded.timeoutMs ?? DEFAULT_TIMEOUT_MS,
               setAppState,
               folded.key,
               processQueue,
-            )
+            );
 
             return {
               ...prev,
@@ -192,45 +183,37 @@ export function useNotifications(): {
                 current: folded,
                 queue: prev.notifications.queue,
               },
-            }
+            };
           }
 
           // Fold into queued notification if keys match
-          const queueIdx = prev.notifications.queue.findIndex(
-            _ => _.key === notif.key,
-          )
+          const queueIdx = prev.notifications.queue.findIndex(_ => _.key === notif.key);
           if (queueIdx !== -1) {
-            const folded = notif.fold(
-              prev.notifications.queue[queueIdx]!,
-              notif,
-            )
-            const newQueue = [...prev.notifications.queue]
-            newQueue[queueIdx] = folded
+            const folded = notif.fold(prev.notifications.queue[queueIdx]!, notif);
+            const newQueue = [...prev.notifications.queue];
+            newQueue[queueIdx] = folded;
             return {
               ...prev,
               notifications: {
                 current: prev.notifications.current,
                 queue: newQueue,
               },
-            }
+            };
           }
         }
 
         // Only add to queue if not already present (prevent duplicates)
-        const queuedKeys = new Set(prev.notifications.queue.map(_ => _.key))
-        const shouldAdd =
-          !queuedKeys.has(notif.key) &&
-          prev.notifications.current?.key !== notif.key
+        const queuedKeys = new Set(prev.notifications.queue.map(_ => _.key));
+        const shouldAdd = !queuedKeys.has(notif.key) && prev.notifications.current?.key !== notif.key;
 
-        if (!shouldAdd) return prev
+        if (!shouldAdd) return prev;
 
         const invalidatesCurrent =
-          prev.notifications.current !== null &&
-          notif.invalidates?.includes(prev.notifications.current.key)
+          prev.notifications.current !== null && notif.invalidates?.includes(prev.notifications.current.key);
 
         if (invalidatesCurrent && currentTimeoutId) {
-          clearTimeout(currentTimeoutId)
-          currentTimeoutId = null
+          clearTimeout(currentTimeoutId);
+          currentTimeoutId = null;
         }
 
         return {
@@ -239,35 +222,33 @@ export function useNotifications(): {
             current: invalidatesCurrent ? null : prev.notifications.current,
             queue: [
               ...prev.notifications.queue.filter(
-                _ =>
-                  _.priority !== 'immediate' &&
-                  !notif.invalidates?.includes(_.key),
+                _ => _.priority !== 'immediate' && !notif.invalidates?.includes(_.key),
               ),
               notif,
             ],
           },
-        }
-      })
+        };
+      });
 
       // Process queue after adding the notification
-      processQueue()
+      processQueue();
     },
     [setAppState, processQueue],
-  )
+  );
 
   const removeNotification = useCallback<RemoveNotificationFn>(
     (key: string) => {
       setAppState(prev => {
-        const isCurrent = prev.notifications.current?.key === key
-        const inQueue = prev.notifications.queue.some(n => n.key === key)
+        const isCurrent = prev.notifications.current?.key === key;
+        const inQueue = prev.notifications.queue.some(n => n.key === key);
 
         if (!isCurrent && !inQueue) {
-          return prev
+          return prev;
         }
 
         if (isCurrent && currentTimeoutId) {
-          clearTimeout(currentTimeoutId)
-          currentTimeoutId = null
+          clearTimeout(currentTimeoutId);
+          currentTimeoutId = null;
         }
 
         return {
@@ -276,26 +257,25 @@ export function useNotifications(): {
             current: isCurrent ? null : prev.notifications.current,
             queue: prev.notifications.queue.filter(n => n.key !== key),
           },
-        }
-      })
+        };
+      });
 
-      processQueue()
+      processQueue();
     },
     [setAppState, processQueue],
-  )
+  );
 
   // Process queue on mount if there are notifications in the initial state.
   // Imperative read (not useAppState) — a subscription in a mount-only
   // effect would be vestigial and make every caller re-render on queue changes.
   // eslint-disable-next-line react-hooks/exhaustive-deps
-  // biome-ignore lint/correctness/useExhaustiveDependencies: mount-only effect, store is a stable context ref
   useEffect(() => {
     if (store.getState().notifications.queue.length > 0) {
-      processQueue()
+      processQueue();
     }
-  }, [])
+  }, []);
 
-  return { addNotification, removeNotification }
+  return { addNotification, removeNotification };
 }
 
 const PRIORITIES: Record<Priority, number> = {
@@ -303,10 +283,8 @@ const PRIORITIES: Record<Priority, number> = {
   high: 1,
   medium: 2,
   low: 3,
-}
+};
 export function getNext(queue: Notification[]): Notification | undefined {
-  if (queue.length === 0) return undefined
-  return queue.reduce((min, n) =>
-    PRIORITIES[n.priority] < PRIORITIES[min.priority] ? n : min,
-  )
+  if (queue.length === 0) return undefined;
+  return queue.reduce((min, n) => (PRIORITIES[n.priority] < PRIORITIES[min.priority] ? n : min));
 }
diff --git a/src/context/overlayContext.tsx b/src/context/overlayContext.tsx
index 406e03f98..8e852b6c2 100644
--- a/src/context/overlayContext.tsx
+++ b/src/context/overlayContext.tsx
@@ -12,12 +12,12 @@
  * The hook automatically registers on mount and unregisters on unmount,
  * so no manual cleanup or state management is needed.
  */
-import { useContext, useEffect, useLayoutEffect } from 'react'
-import { instances } from '@anthropic/ink'
-import { AppStoreContext, useAppState } from '../state/AppState.js'
+import { useContext, useEffect, useLayoutEffect } from 'react';
+import { instances } from '@anthropic/ink';
+import { AppStoreContext, useAppState } from '../state/AppState.js';
 
 // Non-modal overlays that shouldn't disable TextInput focus
-const NON_MODAL_OVERLAYS = new Set(['autocomplete'])
+const NON_MODAL_OVERLAYS = new Set(['autocomplete']);
 
 /**
  * Hook to register a component as an active overlay.
@@ -37,25 +37,25 @@ const NON_MODAL_OVERLAYS = new Set(['autocomplete'])
 export function useRegisterOverlay(id: string, enabled = true): void {
   // Use context directly so this is a no-op when rendered outside AppStateProvider
   // (e.g., in isolated component tests that don't need the full app state tree).
-  const store = useContext(AppStoreContext)
-  const setAppState = store?.setState
+  const store = useContext(AppStoreContext);
+  const setAppState = store?.setState;
   useEffect(() => {
-    if (!enabled || !setAppState) return
+    if (!enabled || !setAppState) return;
     setAppState(prev => {
-      if (prev.activeOverlays.has(id)) return prev
-      const next = new Set(prev.activeOverlays)
-      next.add(id)
-      return { ...prev, activeOverlays: next }
-    })
+      if (prev.activeOverlays.has(id)) return prev;
+      const next = new Set(prev.activeOverlays);
+      next.add(id);
+      return { ...prev, activeOverlays: next };
+    });
     return () => {
       setAppState(prev => {
-        if (!prev.activeOverlays.has(id)) return prev
-        const next = new Set(prev.activeOverlays)
-        next.delete(id)
-        return { ...prev, activeOverlays: next }
-      })
-    }
-  }, [id, enabled, setAppState])
+        if (!prev.activeOverlays.has(id)) return prev;
+        const next = new Set(prev.activeOverlays);
+        next.delete(id);
+        return { ...prev, activeOverlays: next };
+      });
+    };
+  }, [id, enabled, setAppState]);
 
   // On overlay close, force the next render to full-damage diff instead
   // of blit. A tall overlay (e.g. FuzzyPicker with a 20-line preview)
@@ -66,9 +66,9 @@ export function useRegisterOverlay(id: string, enabled = true): void {
   // deferred onRender (scheduleRender queues a microtask from
   // resetAfterCommit; passive-effect cleanup would land after it).
   useLayoutEffect(() => {
-    if (!enabled) return
-    return () => instances.get(process.stdout)?.invalidatePrevFrame()
-  }, [enabled])
+    if (!enabled) return;
+    return () => instances.get(process.stdout)?.invalidatePrevFrame();
+  }, [enabled]);
 }
 
 /**
@@ -85,7 +85,7 @@ export function useRegisterOverlay(id: string, enabled = true): void {
  * }
  */
 export function useIsOverlayActive(): boolean {
-  return useAppState(s => s.activeOverlays.size > 0)
+  return useAppState(s => s.activeOverlays.size > 0);
 }
 
 /**
@@ -102,8 +102,8 @@ export function useIsOverlayActive(): boolean {
 export function useIsModalOverlayActive(): boolean {
   return useAppState(s => {
     for (const id of s.activeOverlays) {
-      if (!NON_MODAL_OVERLAYS.has(id)) return true
+      if (!NON_MODAL_OVERLAYS.has(id)) return true;
     }
-    return false
-  })
+    return false;
+  });
 }
diff --git a/src/context/promptOverlayContext.tsx b/src/context/promptOverlayContext.tsx
index 87c97d559..65db861cf 100644
--- a/src/context/promptOverlayContext.tsx
+++ b/src/context/promptOverlayContext.tsx
@@ -18,54 +18,42 @@
  * Split into data/setter context pairs so writers never re-render on
  * their own writes — the setter contexts are stable.
  */
-import React, {
-  createContext,
-  type ReactNode,
-  useContext,
-  useEffect,
-  useState,
-} from 'react'
-import type { SuggestionItem } from '../components/PromptInput/PromptInputFooterSuggestions.js'
+import React, { createContext, type ReactNode, useContext, useEffect, useState } from 'react';
+import type { SuggestionItem } from '../components/PromptInput/PromptInputFooterSuggestions.js';
 
 export type PromptOverlayData = {
-  suggestions: SuggestionItem[]
-  selectedSuggestion: number
-  maxColumnWidth?: number
-}
+  suggestions: SuggestionItem[];
+  selectedSuggestion: number;
+  maxColumnWidth?: number;
+};
 
-type Setter<T> = (d: T | null) => void
+type Setter<T> = (d: T | null) => void;
 
-const DataContext = createContext<PromptOverlayData | null>(null)
-const SetContext = createContext<Setter<PromptOverlayData> | null>(null)
-const DialogContext = createContext<ReactNode>(null)
-const SetDialogContext = createContext<Setter<ReactNode> | null>(null)
+const DataContext = createContext<PromptOverlayData | null>(null);
+const SetContext = createContext<Setter<PromptOverlayData> | null>(null);
+const DialogContext = createContext<ReactNode>(null);
+const SetDialogContext = createContext<Setter<ReactNode> | null>(null);
 
-export function PromptOverlayProvider({
-  children,
-}: {
-  children: ReactNode
-}): ReactNode {
-  const [data, setData] = useState<PromptOverlayData | null>(null)
-  const [dialog, setDialog] = useState<ReactNode>(null)
+export function PromptOverlayProvider({ children }: { children: ReactNode }): ReactNode {
+  const [data, setData] = useState<PromptOverlayData | null>(null);
+  const [dialog, setDialog] = useState<ReactNode>(null);
   return (
     <SetContext.Provider value={setData}>
       <SetDialogContext.Provider value={setDialog}>
         <DataContext.Provider value={data}>
-          <DialogContext.Provider value={dialog}>
-            {children}
-          </DialogContext.Provider>
+          <DialogContext.Provider value={dialog}>{children}</DialogContext.Provider>
         </DataContext.Provider>
       </SetDialogContext.Provider>
     </SetContext.Provider>
-  )
+  );
 }
 
 export function usePromptOverlay(): PromptOverlayData | null {
-  return useContext(DataContext)
+  return useContext(DataContext);
 }
 
 export function usePromptOverlayDialog(): ReactNode {
-  return useContext(DialogContext)
+  return useContext(DialogContext);
 }
 
 /**
@@ -73,12 +61,12 @@ export function usePromptOverlayDialog(): ReactNode {
  * No-op outside the provider (non-fullscreen renders inline instead).
  */
 export function useSetPromptOverlay(data: PromptOverlayData | null): void {
-  const set = useContext(SetContext)
+  const set = useContext(SetContext);
   useEffect(() => {
-    if (!set) return
-    set(data)
-    return () => set(null)
-  }, [set, data])
+    if (!set) return;
+    set(data);
+    return () => set(null);
+  }, [set, data]);
 }
 
 /**
@@ -86,10 +74,10 @@ export function useSetPromptOverlay(data: PromptOverlayData | null): void {
  * No-op outside the provider (non-fullscreen renders inline instead).
  */
 export function useSetPromptOverlayDialog(node: ReactNode): void {
-  const set = useContext(SetDialogContext)
+  const set = useContext(SetDialogContext);
   useEffect(() => {
-    if (!set) return
-    set(node)
-    return () => set(null)
-  }, [set, node])
+    if (!set) return;
+    set(node);
+    return () => set(null);
+  }, [set, node]);
 }
diff --git a/src/context/src/state/AppState.ts b/src/context/src/state/AppState.ts
index 5237ca451..5c50c0aa1 100644
--- a/src/context/src/state/AppState.ts
+++ b/src/context/src/state/AppState.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type useAppStateStore = any;
-export type useSetAppState = any;
+export type useAppStateStore = any
+export type useSetAppState = any
diff --git a/src/context/stats.tsx b/src/context/stats.tsx
index 14a21f171..395bf3fd3 100644
--- a/src/context/stats.tsx
+++ b/src/context/stats.tsx
@@ -1,173 +1,158 @@
-import React, {
-  createContext,
-  useCallback,
-  useContext,
-  useEffect,
-  useMemo,
-} from 'react'
-import { saveCurrentProjectConfig } from '../utils/config.js'
+import React, { createContext, useCallback, useContext, useEffect, useMemo } from 'react';
+import { saveCurrentProjectConfig } from '../utils/config.js';
 
 export type StatsStore = {
-  increment(name: string, value?: number): void
-  set(name: string, value: number): void
-  observe(name: string, value: number): void
-  add(name: string, value: string): void
-  getAll(): Record<string, number>
-}
+  increment(name: string, value?: number): void;
+  set(name: string, value: number): void;
+  observe(name: string, value: number): void;
+  add(name: string, value: string): void;
+  getAll(): Record<string, number>;
+};
 
 function percentile(sorted: number[], p: number): number {
-  const index = (p / 100) * (sorted.length - 1)
-  const lower = Math.floor(index)
-  const upper = Math.ceil(index)
+  const index = (p / 100) * (sorted.length - 1);
+  const lower = Math.floor(index);
+  const upper = Math.ceil(index);
   if (lower === upper) {
-    return sorted[lower]!
+    return sorted[lower]!;
   }
-  return sorted[lower]! + (sorted[upper]! - sorted[lower]!) * (index - lower)
+  return sorted[lower]! + (sorted[upper]! - sorted[lower]!) * (index - lower);
 }
 
-const RESERVOIR_SIZE = 1024
+const RESERVOIR_SIZE = 1024;
 
 type Histogram = {
-  reservoir: number[]
-  count: number
-  sum: number
-  min: number
-  max: number
-}
+  reservoir: number[];
+  count: number;
+  sum: number;
+  min: number;
+  max: number;
+};
 
 export function createStatsStore(): StatsStore {
-  const metrics = new Map<string, number>()
-  const histograms = new Map<string, Histogram>()
-  const sets = new Map<string, Set<string>>()
+  const metrics = new Map<string, number>();
+  const histograms = new Map<string, Histogram>();
+  const sets = new Map<string, Set<string>>();
 
   return {
     increment(name: string, value = 1) {
-      metrics.set(name, (metrics.get(name) ?? 0) + value)
+      metrics.set(name, (metrics.get(name) ?? 0) + value);
     },
     set(name: string, value: number) {
-      metrics.set(name, value)
+      metrics.set(name, value);
     },
     observe(name: string, value: number) {
-      let h = histograms.get(name)
+      let h = histograms.get(name);
       if (!h) {
-        h = { reservoir: [], count: 0, sum: 0, min: value, max: value }
-        histograms.set(name, h)
+        h = { reservoir: [], count: 0, sum: 0, min: value, max: value };
+        histograms.set(name, h);
       }
-      h.count++
-      h.sum += value
+      h.count++;
+      h.sum += value;
       if (value < h.min) {
-        h.min = value
+        h.min = value;
       }
       if (value > h.max) {
-        h.max = value
+        h.max = value;
       }
       // Reservoir sampling (Algorithm R)
       if (h.reservoir.length < RESERVOIR_SIZE) {
-        h.reservoir.push(value)
+        h.reservoir.push(value);
       } else {
-        const j = Math.floor(Math.random() * h.count)
+        const j = Math.floor(Math.random() * h.count);
         if (j < RESERVOIR_SIZE) {
-          h.reservoir[j] = value
+          h.reservoir[j] = value;
         }
       }
     },
     add(name: string, value: string) {
-      let s = sets.get(name)
+      let s = sets.get(name);
       if (!s) {
-        s = new Set()
-        sets.set(name, s)
+        s = new Set();
+        sets.set(name, s);
       }
-      s.add(value)
+      s.add(value);
     },
     getAll() {
-      const result: Record<string, number> = Object.fromEntries(metrics)
+      const result: Record<string, number> = Object.fromEntries(metrics);
 
       for (const [name, h] of histograms) {
         if (h.count === 0) {
-          continue
+          continue;
         }
-        result[`${name}_count`] = h.count
-        result[`${name}_min`] = h.min
-        result[`${name}_max`] = h.max
-        result[`${name}_avg`] = h.sum / h.count
-        const sorted = [...h.reservoir].sort((a, b) => a - b)
-        result[`${name}_p50`] = percentile(sorted, 50)
-        result[`${name}_p95`] = percentile(sorted, 95)
-        result[`${name}_p99`] = percentile(sorted, 99)
+        result[`${name}_count`] = h.count;
+        result[`${name}_min`] = h.min;
+        result[`${name}_max`] = h.max;
+        result[`${name}_avg`] = h.sum / h.count;
+        const sorted = [...h.reservoir].sort((a, b) => a - b);
+        result[`${name}_p50`] = percentile(sorted, 50);
+        result[`${name}_p95`] = percentile(sorted, 95);
+        result[`${name}_p99`] = percentile(sorted, 99);
       }
 
       for (const [name, s] of sets) {
-        result[name] = s.size
+        result[name] = s.size;
       }
 
-      return result
+      return result;
     },
-  }
+  };
 }
 
-export const StatsContext = createContext<StatsStore | null>(null)
+export const StatsContext = createContext<StatsStore | null>(null);
 
 type Props = {
-  store?: StatsStore
-  children: React.ReactNode
-}
+  store?: StatsStore;
+  children: React.ReactNode;
+};
 
-export function StatsProvider({
-  store: externalStore,
-  children,
-}: Props): React.ReactNode {
-  const internalStore = useMemo(() => createStatsStore(), [])
-  const store = externalStore ?? internalStore
+export function StatsProvider({ store: externalStore, children }: Props): React.ReactNode {
+  const internalStore = useMemo(() => createStatsStore(), []);
+  const store = externalStore ?? internalStore;
 
   useEffect(() => {
     const flush = () => {
-      const metrics = store.getAll()
+      const metrics = store.getAll();
       if (Object.keys(metrics).length > 0) {
         saveCurrentProjectConfig(current => ({
           ...current,
           lastSessionMetrics: metrics,
-        }))
+        }));
       }
-    }
-    process.on('exit', flush)
+    };
+    process.on('exit', flush);
     return () => {
-      process.off('exit', flush)
-    }
-  }, [store])
+      process.off('exit', flush);
+    };
+  }, [store]);
 
-  return <StatsContext.Provider value={store}>{children}</StatsContext.Provider>
+  return <StatsContext.Provider value={store}>{children}</StatsContext.Provider>;
 }
 
 export function useStats(): StatsStore {
-  const store = useContext(StatsContext)
+  const store = useContext(StatsContext);
   if (!store) {
-    throw new Error('useStats must be used within a StatsProvider')
+    throw new Error('useStats must be used within a StatsProvider');
   }
-  return store
+  return store;
 }
 
 export function useCounter(name: string): (value?: number) => void {
-  const store = useStats()
-  return useCallback(
-    (value?: number) => store.increment(name, value),
-    [store, name],
-  )
+  const store = useStats();
+  return useCallback((value?: number) => store.increment(name, value), [store, name]);
 }
 
 export function useGauge(name: string): (value: number) => void {
-  const store = useStats()
-  return useCallback((value: number) => store.set(name, value), [store, name])
+  const store = useStats();
+  return useCallback((value: number) => store.set(name, value), [store, name]);
 }
 
 export function useTimer(name: string): (value: number) => void {
-  const store = useStats()
-  return useCallback(
-    (value: number) => store.observe(name, value),
-    [store, name],
-  )
+  const store = useStats();
+  return useCallback((value: number) => store.observe(name, value), [store, name]);
 }
 
 export function useSet(name: string): (value: string) => void {
-  const store = useStats()
-  return useCallback((value: string) => store.add(name, value), [store, name])
+  const store = useStats();
+  return useCallback((value: string) => store.add(name, value), [store, name]);
 }
diff --git a/src/context/voice.tsx b/src/context/voice.tsx
index 3adcc4d27..3e2b38f40 100644
--- a/src/context/voice.tsx
+++ b/src/context/voice.tsx
@@ -1,18 +1,13 @@
-import React, {
-  createContext,
-  useContext,
-  useState,
-  useSyncExternalStore,
-} from 'react'
-import { createStore, type Store } from '../state/store.js'
+import React, { createContext, useContext, useState, useSyncExternalStore } from 'react';
+import { createStore, type Store } from '../state/store.js';
 
 export type VoiceState = {
-  voiceState: 'idle' | 'recording' | 'processing'
-  voiceError: string | null
-  voiceInterimTranscript: string
-  voiceAudioLevels: number[]
-  voiceWarmingUp: boolean
-}
+  voiceState: 'idle' | 'recording' | 'processing';
+  voiceError: string | null;
+  voiceInterimTranscript: string;
+  voiceAudioLevels: number[];
+  voiceWarmingUp: boolean;
+};
 
 const DEFAULT_STATE: VoiceState = {
   voiceState: 'idle',
@@ -20,29 +15,29 @@ const DEFAULT_STATE: VoiceState = {
   voiceInterimTranscript: '',
   voiceAudioLevels: [],
   voiceWarmingUp: false,
-}
+};
 
-type VoiceStore = Store<VoiceState>
+type VoiceStore = Store<VoiceState>;
 
-const VoiceContext = createContext<VoiceStore | null>(null)
+const VoiceContext = createContext<VoiceStore | null>(null);
 
 type Props = {
-  children: React.ReactNode
-}
+  children: React.ReactNode;
+};
 
 export function VoiceProvider({ children }: Props): React.ReactNode {
   // Store is created once — stable context value means the provider never
   // triggers re-renders. Consumers subscribe to slices via useVoiceState.
-  const [store] = useState(() => createStore<VoiceState>(DEFAULT_STATE))
-  return <VoiceContext.Provider value={store}>{children}</VoiceContext.Provider>
+  const [store] = useState(() => createStore<VoiceState>(DEFAULT_STATE));
+  return <VoiceContext.Provider value={store}>{children}</VoiceContext.Provider>;
 }
 
 function useVoiceStore(): VoiceStore {
-  const store = useContext(VoiceContext)
+  const store = useContext(VoiceContext);
   if (!store) {
-    throw new Error('useVoiceState must be used within a VoiceProvider')
+    throw new Error('useVoiceState must be used within a VoiceProvider');
   }
-  return store
+  return store;
 }
 
 /**
@@ -50,9 +45,9 @@ function useVoiceStore(): VoiceStore {
  * value changes (compared via Object.is).
  */
 export function useVoiceState<T>(selector: (state: VoiceState) => T): T {
-  const store = useVoiceStore()
-  const get = () => selector(store.getState())
-  return useSyncExternalStore(store.subscribe, get, get)
+  const store = useVoiceStore();
+  const get = () => selector(store.getState());
+  return useSyncExternalStore(store.subscribe, get, get);
 }
 
 /**
@@ -60,10 +55,8 @@ export function useVoiceState<T>(selector: (state: VoiceState) => T): T {
  * store.setState is synchronous: callers can read getVoiceState() immediately
  * after to observe the new value (VoiceKeybindingHandler relies on this).
  */
-export function useSetVoiceState(): (
-  updater: (prev: VoiceState) => VoiceState,
-) => void {
-  return useVoiceStore().setState
+export function useSetVoiceState(): (updater: (prev: VoiceState) => VoiceState) => void {
+  return useVoiceStore().setState;
 }
 
 /**
@@ -72,5 +65,5 @@ export function useSetVoiceState(): (
  * inside event handlers that need to read state set earlier in the same tick.
  */
 export function useGetVoiceState(): () => VoiceState {
-  return useVoiceStore().getState
+  return useVoiceStore().getState;
 }
diff --git a/src/dialogLaunchers.tsx b/src/dialogLaunchers.tsx
index ace8548a3..dfeec0f99 100644
--- a/src/dialogLaunchers.tsx
+++ b/src/dialogLaunchers.tsx
@@ -6,23 +6,23 @@
  * Part of the main.tsx React/JSX extraction effort. See sibling PRs
  * perf/extract-interactive-helpers and perf/launch-repl.
  */
-import React from 'react'
-import type { AssistantSession } from './assistant/sessionDiscovery.js'
-import type { StatsStore } from './context/stats.js'
-import type { Root } from '@anthropic/ink'
-import { renderAndRun, showSetupDialog } from './interactiveHelpers.js'
-import { KeybindingSetup } from './keybindings/KeybindingProviderSetup.js'
-import type { AppState } from './state/AppStateStore.js'
-import type { AgentMemoryScope } from '@claude-code-best/builtin-tools/tools/AgentTool/agentMemory.js'
-import type { TeleportRemoteResponse } from './utils/conversationRecovery.js'
-import type { FpsMetrics } from './utils/fpsTracker.js'
-import type { ValidationError } from './utils/settings/validation.js'
+import React from 'react';
+import type { AssistantSession } from './assistant/sessionDiscovery.js';
+import type { StatsStore } from './context/stats.js';
+import type { Root } from '@anthropic/ink';
+import { renderAndRun, showSetupDialog } from './interactiveHelpers.js';
+import { KeybindingSetup } from './keybindings/KeybindingProviderSetup.js';
+import type { AppState } from './state/AppStateStore.js';
+import type { AgentMemoryScope } from '@claude-code-best/builtin-tools/tools/AgentTool/agentMemory.js';
+import type { TeleportRemoteResponse } from './utils/conversationRecovery.js';
+import type { FpsMetrics } from './utils/fpsTracker.js';
+import type { ValidationError } from './utils/settings/validation.js';
 
 // Type-only access to ResumeConversation's Props via the module type.
 // No runtime cost - erased at compile time.
 type ResumeConversationProps = React.ComponentProps<
   typeof import('./screens/ResumeConversation.js').ResumeConversation
->
+>;
 
 /**
  * Site ~3173: SnapshotUpdateDialog (agent memory snapshot update prompt).
@@ -31,14 +31,12 @@ type ResumeConversationProps = React.ComponentProps<
 export async function launchSnapshotUpdateDialog(
   root: Root,
   props: {
-    agentType: string
-    scope: AgentMemoryScope
-    snapshotTimestamp: string
+    agentType: string;
+    scope: AgentMemoryScope;
+    snapshotTimestamp: string;
   },
 ): Promise<'merge' | 'keep' | 'replace'> {
-  const { SnapshotUpdateDialog } = await import(
-    './components/agents/SnapshotUpdateDialog.js'
-  )
+  const { SnapshotUpdateDialog } = await import('./components/agents/SnapshotUpdateDialog.js');
   return showSetupDialog<'merge' | 'keep' | 'replace'>(root, done => (
     <SnapshotUpdateDialog
       agentType={props.agentType}
@@ -47,7 +45,7 @@ export async function launchSnapshotUpdateDialog(
       onComplete={done}
       onCancel={() => done('keep')}
     />
-  ))
+  ));
 }
 
 /**
@@ -57,20 +55,14 @@ export async function launchSnapshotUpdateDialog(
 export async function launchInvalidSettingsDialog(
   root: Root,
   props: {
-    settingsErrors: ValidationError[]
-    onExit: () => void
+    settingsErrors: ValidationError[];
+    onExit: () => void;
   },
 ): Promise<void> {
-  const { InvalidSettingsDialog } = await import(
-    './components/InvalidSettingsDialog.js'
-  )
+  const { InvalidSettingsDialog } = await import('./components/InvalidSettingsDialog.js');
   return showSetupDialog(root, done => (
-    <InvalidSettingsDialog
-      settingsErrors={props.settingsErrors}
-      onContinue={done}
-      onExit={props.onExit}
-    />
-  ))
+    <InvalidSettingsDialog settingsErrors={props.settingsErrors} onContinue={done} onExit={props.onExit} />
+  ));
 }
 
 /**
@@ -81,16 +73,14 @@ export async function launchAssistantSessionChooser(
   root: Root,
   props: { sessions: AssistantSession[] },
 ): Promise<string | null> {
-  const { AssistantSessionChooser } = await import(
-    './assistant/AssistantSessionChooser.js'
-  )
+  const { AssistantSessionChooser } = await import('./assistant/AssistantSessionChooser.js');
   return showSetupDialog<string | null>(root, done => (
     <AssistantSessionChooser
       sessions={props.sessions}
       onSelect={(id: string) => done(id)}
       onCancel={() => done(null)}
     />
-  ))
+  ));
 }
 
 /**
@@ -99,47 +89,33 @@ export async function launchAssistantSessionChooser(
  * success, null on cancel. Rejects on install failure so the caller can
  * distinguish errors from user cancellation.
  */
-export async function launchAssistantInstallWizard(
-  root: Root,
-): Promise<string | null> {
-  const { NewInstallWizard, computeDefaultInstallDir } = await import(
-    './commands/assistant/assistant.js'
-  )
-  const defaultDir = await computeDefaultInstallDir()
-  let rejectWithError: (reason: Error) => void
+export async function launchAssistantInstallWizard(root: Root): Promise<string | null> {
+  const { NewInstallWizard, computeDefaultInstallDir } = await import('./commands/assistant/assistant.js');
+  const defaultDir = await computeDefaultInstallDir();
+  let rejectWithError: (reason: Error) => void;
   const errorPromise = new Promise<never>((_, reject) => {
-    rejectWithError = reject
-  })
+    rejectWithError = reject;
+  });
   const resultPromise = showSetupDialog<string | null>(root, done => (
     <NewInstallWizard
       defaultDir={defaultDir}
       onInstalled={dir => done(dir)}
       onCancel={() => done(null)}
-      onError={message =>
-        rejectWithError(new Error(`Installation failed: ${message}`))
-      }
+      onError={message => rejectWithError(new Error(`Installation failed: ${message}`))}
     />
-  ))
-  return Promise.race([resultPromise, errorPromise])
+  ));
+  return Promise.race([resultPromise, errorPromise]);
 }
 
 /**
  * Site ~4549: TeleportResumeWrapper (interactive teleport session picker).
  * Original callback wiring: onComplete={done}, onCancel={() => done(null)}, source="cliArg".
  */
-export async function launchTeleportResumeWrapper(
-  root: Root,
-): Promise<TeleportRemoteResponse | null> {
-  const { TeleportResumeWrapper } = await import(
-    './components/TeleportResumeWrapper.js'
-  )
+export async function launchTeleportResumeWrapper(root: Root): Promise<TeleportRemoteResponse | null> {
+  const { TeleportResumeWrapper } = await import('./components/TeleportResumeWrapper.js');
   return showSetupDialog<TeleportRemoteResponse | null>(root, done => (
-    <TeleportResumeWrapper
-      onComplete={done}
-      onCancel={() => done(null)}
-      source="cliArg"
-    />
-  ))
+    <TeleportResumeWrapper onComplete={done} onCancel={() => done(null)} source="cliArg" />
+  ));
 }
 
 /**
@@ -149,13 +125,11 @@ export async function launchTeleportResumeWrapper(
 export async function launchTeleportRepoMismatchDialog(
   root: Root,
   props: {
-    targetRepo: string
-    initialPaths: string[]
+    targetRepo: string;
+    initialPaths: string[];
   },
 ): Promise<string | null> {
-  const { TeleportRepoMismatchDialog } = await import(
-    './components/TeleportRepoMismatchDialog.js'
-  )
+  const { TeleportRepoMismatchDialog } = await import('./components/TeleportRepoMismatchDialog.js');
   return showSetupDialog<string | null>(root, done => (
     <TeleportRepoMismatchDialog
       targetRepo={props.targetRepo}
@@ -163,7 +137,7 @@ export async function launchTeleportRepoMismatchDialog(
       onSelectPath={done}
       onCancel={() => done(null)}
     />
-  ))
+  ));
 }
 
 /**
@@ -174,9 +148,9 @@ export async function launchTeleportRepoMismatchDialog(
 export async function launchResumeChooser(
   root: Root,
   appProps: {
-    getFpsMetrics: () => FpsMetrics | undefined
-    stats: StatsStore
-    initialState: AppState
+    getFpsMetrics: () => FpsMetrics | undefined;
+    stats: StatsStore;
+    initialState: AppState;
   },
   worktreePathsPromise: Promise<string[]>,
   resumeProps: Omit<ResumeConversationProps, 'worktreePaths'>,
@@ -185,17 +159,13 @@ export async function launchResumeChooser(
     worktreePathsPromise,
     import('./screens/ResumeConversation.js'),
     import('./components/App.js'),
-  ])
+  ]);
   await renderAndRun(
     root,
-    <App
-      getFpsMetrics={appProps.getFpsMetrics}
-      stats={appProps.stats}
-      initialState={appProps.initialState}
-    >
+    <App getFpsMetrics={appProps.getFpsMetrics} stats={appProps.stats} initialState={appProps.initialState}>
       <KeybindingSetup>
         <ResumeConversation {...resumeProps} worktreePaths={worktreePaths} />
       </KeybindingSetup>
     </App>,
-  )
+  );
 }
diff --git a/src/entrypoints/agentSdkTypes.ts b/src/entrypoints/agentSdkTypes.ts
index 842490372..17e5cf42c 100644
--- a/src/entrypoints/agentSdkTypes.ts
+++ b/src/entrypoints/agentSdkTypes.ts
@@ -441,5 +441,5 @@ export async function connectRemoteControl(
 ): Promise<RemoteControlHandle | null> {
   throw new Error('not implemented')
 }
-export type HookEvent = any;
-export type ExitReason = any;
+export type HookEvent = any
+export type ExitReason = any
diff --git a/src/entrypoints/cli.tsx b/src/entrypoints/cli.tsx
index 18dc15857..ed283a547 100644
--- a/src/entrypoints/cli.tsx
+++ b/src/entrypoints/cli.tsx
@@ -1,11 +1,11 @@
 #!/usr/bin/env bun
-import { feature } from 'bun:bundle'
-import { isEnvTruthy } from '../utils/envUtils.js'
+import { feature } from 'bun:bundle';
+import { isEnvTruthy } from '../utils/envUtils.js';
 
 // Runtime fallback for MACRO.* when not injected by build/dev defines.
 // This happens when running cli.tsx directly (not via `bun run dev` or built dist/).
 if (typeof globalThis.MACRO === 'undefined') {
-  ;(globalThis as any).MACRO = {
+  (globalThis as any).MACRO = {
     VERSION: process.env.CLAUDE_CODE_VERSION || '2.1.888',
     BUILD_TIME: new Date().toISOString(),
     FEEDBACK_CHANNEL: '',
@@ -13,7 +13,7 @@ if (typeof globalThis.MACRO === 'undefined') {
     NATIVE_PACKAGE_URL: '',
     PACKAGE_URL: '',
     VERSION_CHANGELOG: '',
-  }
+  };
 }
 
 if (isEnvTruthy(process.env.CLAUDE_CODE_FORCE_INTERACTIVE)) {
@@ -23,7 +23,7 @@ if (isEnvTruthy(process.env.CLAUDE_CODE_FORCE_INTERACTIVE)) {
         Object.defineProperty(stream, 'isTTY', {
           value: true,
           configurable: true,
-        })
+        });
       } catch {
         // Best-effort dev-only override for nested bun launch on Windows.
       }
@@ -33,17 +33,15 @@ if (isEnvTruthy(process.env.CLAUDE_CODE_FORCE_INTERACTIVE)) {
 
 // Bugfix for corepack auto-pinning, which adds yarnpkg to peoples' package.jsons
 // eslint-disable-next-line custom-rules/no-top-level-side-effects
-process.env.COREPACK_ENABLE_AUTO_PIN = '0'
+process.env.COREPACK_ENABLE_AUTO_PIN = '0';
 
 // Set max heap size for child processes in CCR environments (containers have 16GB)
 // eslint-disable-next-line custom-rules/no-top-level-side-effects, custom-rules/no-process-env-top-level, custom-rules/safe-env-boolean-check
 if (process.env.CLAUDE_CODE_REMOTE === 'true') {
   // eslint-disable-next-line custom-rules/no-top-level-side-effects, custom-rules/no-process-env-top-level
-  const existing = process.env.NODE_OPTIONS || ''
+  const existing = process.env.NODE_OPTIONS || '';
   // eslint-disable-next-line custom-rules/no-top-level-side-effects, custom-rules/no-process-env-top-level
-  process.env.NODE_OPTIONS = existing
-    ? `${existing} --max-old-space-size=8192`
-    : '--max-old-space-size=8192'
+  process.env.NODE_OPTIONS = existing ? `${existing} --max-old-space-size=8192` : '--max-old-space-size=8192';
 }
 
 // Harness-science L0 ablation baseline. Inlined here (not init.ts) because
@@ -62,7 +60,7 @@ if (feature('ABLATION_BASELINE') && process.env.CLAUDE_CODE_ABLATION_BASELINE) {
     'CLAUDE_CODE_DISABLE_BACKGROUND_TASKS',
   ]) {
     // eslint-disable-next-line custom-rules/no-top-level-side-effects, custom-rules/no-process-env-top-level
-    process.env[k] ??= '1'
+    process.env[k] ??= '1';
   }
 }
 
@@ -72,64 +70,50 @@ if (feature('ABLATION_BASELINE') && process.env.CLAUDE_CODE_ABLATION_BASELINE) {
  * Fast-path for --version has zero imports beyond this file.
  */
 async function main(): Promise<void> {
-  const args = process.argv.slice(2)
+  const args = process.argv.slice(2);
 
   // Fast-path for --version/-v: zero module loading needed
-  if (
-    args.length === 1 &&
-    (args[0] === '--version' || args[0] === '-v' || args[0] === '-V')
-  ) {
+  if (args.length === 1 && (args[0] === '--version' || args[0] === '-v' || args[0] === '-V')) {
     // MACRO.VERSION is inlined at build time
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
-    console.log(`${MACRO.VERSION} (Claude Code)`)
-    return
+    console.log(`${MACRO.VERSION} (Claude Code)`);
+    return;
   }
 
   // For all other paths, load the startup profiler
-  const { profileCheckpoint } = await import('../utils/startupProfiler.js')
-  profileCheckpoint('cli_entry')
+  const { profileCheckpoint } = await import('../utils/startupProfiler.js');
+  profileCheckpoint('cli_entry');
 
   // Fast-path for --dump-system-prompt: output the rendered system prompt and exit.
   // Used by prompt sensitivity evals to extract the system prompt at a specific commit.
   // Ant-only: eliminated from external builds via feature flag.
   if (feature('DUMP_SYSTEM_PROMPT') && args[0] === '--dump-system-prompt') {
-    profileCheckpoint('cli_dump_system_prompt_path')
-    const { enableConfigs } = await import('../utils/config.js')
-    enableConfigs()
-    const { getMainLoopModel } = await import('../utils/model/model.js')
-    const modelIdx = args.indexOf('--model')
-    const model = (modelIdx !== -1 && args[modelIdx + 1]) || getMainLoopModel()
-    const { getSystemPrompt } = await import('../constants/prompts.js')
-    const prompt = await getSystemPrompt([], model)
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
-    console.log(prompt.join('\n'))
-    return
+    profileCheckpoint('cli_dump_system_prompt_path');
+    const { enableConfigs } = await import('../utils/config.js');
+    enableConfigs();
+    const { getMainLoopModel } = await import('../utils/model/model.js');
+    const modelIdx = args.indexOf('--model');
+    const model = (modelIdx !== -1 && args[modelIdx + 1]) || getMainLoopModel();
+    const { getSystemPrompt } = await import('../constants/prompts.js');
+    const prompt = await getSystemPrompt([], model);
+    console.log(prompt.join('\n'));
+    return;
   }
 
   if (process.argv[2] === '--claude-in-chrome-mcp') {
-    profileCheckpoint('cli_claude_in_chrome_mcp_path')
-    const { runClaudeInChromeMcpServer } = await import(
-      '../utils/claudeInChrome/mcpServer.js'
-    )
-    await runClaudeInChromeMcpServer()
-    return
+    profileCheckpoint('cli_claude_in_chrome_mcp_path');
+    const { runClaudeInChromeMcpServer } = await import('../utils/claudeInChrome/mcpServer.js');
+    await runClaudeInChromeMcpServer();
+    return;
   } else if (process.argv[2] === '--chrome-native-host') {
-    profileCheckpoint('cli_chrome_native_host_path')
-    const { runChromeNativeHost } = await import(
-      '../utils/claudeInChrome/chromeNativeHost.js'
-    )
-    await runChromeNativeHost()
-    return
-  } else if (
-    feature('CHICAGO_MCP') &&
-    process.argv[2] === '--computer-use-mcp'
-  ) {
-    profileCheckpoint('cli_computer_use_mcp_path')
-    const { runComputerUseMcpServer } = await import(
-      '../utils/computerUse/mcpServer.js'
-    )
-    await runComputerUseMcpServer()
-    return
+    profileCheckpoint('cli_chrome_native_host_path');
+    const { runChromeNativeHost } = await import('../utils/claudeInChrome/chromeNativeHost.js');
+    await runChromeNativeHost();
+    return;
+  } else if (feature('CHICAGO_MCP') && process.argv[2] === '--computer-use-mcp') {
+    profileCheckpoint('cli_computer_use_mcp_path');
+    const { runComputerUseMcpServer } = await import('../utils/computerUse/mcpServer.js');
+    await runComputerUseMcpServer();
+    return;
   }
 
   // Fast-path for `--daemon-worker=<kind>` (internal — supervisor spawns this).
@@ -138,9 +122,9 @@ async function main(): Promise<void> {
   // workers are lean. If a worker kind needs configs/auth (assistant will),
   // it calls them inside its run() fn.
   if (feature('DAEMON') && args[0] === '--daemon-worker') {
-    const { runDaemonWorker } = await import('../daemon/workerRegistry.js')
-    await runDaemonWorker(args[1])
-    return
+    const { runDaemonWorker } = await import('../daemon/workerRegistry.js');
+    await runDaemonWorker(args[1]);
+    return;
   }
 
   // Fast-path for `claude remote-control` (also accepts legacy `claude remote` / `claude sync` / `claude bridge`):
@@ -155,204 +139,169 @@ async function main(): Promise<void> {
       args[0] === 'sync' ||
       args[0] === 'bridge')
   ) {
-    profileCheckpoint('cli_bridge_path')
-    const { enableConfigs } = await import('../utils/config.js')
-    enableConfigs()
+    profileCheckpoint('cli_bridge_path');
+    const { enableConfigs } = await import('../utils/config.js');
+    enableConfigs();
 
-    const { getBridgeDisabledReason, checkBridgeMinVersion } = await import(
-      '../bridge/bridgeEnabled.js'
-    )
-    const { BRIDGE_LOGIN_ERROR } = await import('../bridge/types.js')
-    const { bridgeMain } = await import('../bridge/bridgeMain.js')
-    const { exitWithError } = await import('../utils/process.js')
+    const { getBridgeDisabledReason, checkBridgeMinVersion } = await import('../bridge/bridgeEnabled.js');
+    const { BRIDGE_LOGIN_ERROR } = await import('../bridge/types.js');
+    const { bridgeMain } = await import('../bridge/bridgeMain.js');
+    const { exitWithError } = await import('../utils/process.js');
 
     // Auth check must come before the GrowthBook gate check — without auth,
     // GrowthBook has no user context and would return a stale/default false.
     // getBridgeDisabledReason awaits GB init, so the returned value is fresh
     // (not the stale disk cache), but init still needs auth headers to work.
-    const { getClaudeAIOAuthTokens } = await import('../utils/auth.js')
-    const { getBridgeAccessToken } = await import('../bridge/bridgeConfig.js')
+    const { getClaudeAIOAuthTokens } = await import('../utils/auth.js');
+    const { getBridgeAccessToken } = await import('../bridge/bridgeConfig.js');
     if (!getClaudeAIOAuthTokens()?.accessToken && !getBridgeAccessToken()) {
-      exitWithError(BRIDGE_LOGIN_ERROR)
+      exitWithError(BRIDGE_LOGIN_ERROR);
     }
-    const disabledReason = await getBridgeDisabledReason()
+    const disabledReason = await getBridgeDisabledReason();
     if (disabledReason) {
-      exitWithError(`Error: ${disabledReason}`)
+      exitWithError(`Error: ${disabledReason}`);
     }
-    const versionError = checkBridgeMinVersion()
+    const versionError = checkBridgeMinVersion();
     if (versionError) {
-      exitWithError(versionError)
+      exitWithError(versionError);
     }
 
     // Bridge is a remote control feature - check policy limits
-    const { waitForPolicyLimitsToLoad, isPolicyAllowed } = await import(
-      '../services/policyLimits/index.js'
-    )
-    await waitForPolicyLimitsToLoad()
+    const { waitForPolicyLimitsToLoad, isPolicyAllowed } = await import('../services/policyLimits/index.js');
+    await waitForPolicyLimitsToLoad();
     if (!isPolicyAllowed('allow_remote_control')) {
-      exitWithError(
-        "Error: Remote Control is disabled by your organization's policy.",
-      )
+      exitWithError("Error: Remote Control is disabled by your organization's policy.");
     }
 
-    await bridgeMain(args.slice(1))
-    return
+    await bridgeMain(args.slice(1));
+    return;
   }
 
   // Fast-path for `claude daemon [subcommand]`: unified daemon + session management.
   // Handles both supervisor (start/stop) and background session (bg/attach/logs/kill)
   // subcommands under one namespace.
-  if (
-    (feature('DAEMON') || feature('BG_SESSIONS')) &&
-    args[0] === 'daemon'
-  ) {
-    profileCheckpoint('cli_daemon_path')
-    const { enableConfigs } = await import('../utils/config.js')
-    enableConfigs()
-    const { initSinks } = await import('../utils/sinks.js')
-    initSinks()
-    const { daemonMain } = await import('../daemon/main.js')
-    await daemonMain(args.slice(1))
-    return
+  if ((feature('DAEMON') || feature('BG_SESSIONS')) && args[0] === 'daemon') {
+    profileCheckpoint('cli_daemon_path');
+    const { enableConfigs } = await import('../utils/config.js');
+    enableConfigs();
+    const { initSinks } = await import('../utils/sinks.js');
+    initSinks();
+    const { daemonMain } = await import('../daemon/main.js');
+    await daemonMain(args.slice(1));
+    return;
   }
 
   // Fast-path for `--bg`/`--background` shortcut → daemon bg.
-  if (
-    feature('BG_SESSIONS') &&
-    (args.includes('--bg') || args.includes('--background'))
-  ) {
-    profileCheckpoint('cli_daemon_path')
-    const { enableConfigs } = await import('../utils/config.js')
-    enableConfigs()
-    const bg = await import('../cli/bg.js')
-    await bg.handleBgStart(
-      args.filter(a => a !== '--bg' && a !== '--background'),
-    )
-    return
+  if (feature('BG_SESSIONS') && (args.includes('--bg') || args.includes('--background'))) {
+    profileCheckpoint('cli_daemon_path');
+    const { enableConfigs } = await import('../utils/config.js');
+    enableConfigs();
+    const bg = await import('../cli/bg.js');
+    await bg.handleBgStart(args.filter(a => a !== '--bg' && a !== '--background'));
+    return;
   }
 
   // Backward-compat: ps/logs/attach/kill → daemon <sub> (deprecated)
   if (
     feature('BG_SESSIONS') &&
-    (args[0] === 'ps' ||
-      args[0] === 'logs' ||
-      args[0] === 'attach' ||
-      args[0] === 'kill')
+    (args[0] === 'ps' || args[0] === 'logs' || args[0] === 'attach' || args[0] === 'kill')
   ) {
-    const mapped = args[0] === 'ps' ? 'status' : args[0]
-    console.error(
-      `[deprecated] Use: claude daemon ${mapped}${args[1] ? ' ' + args[1] : ''}`,
-    )
-    profileCheckpoint('cli_daemon_path')
-    const { enableConfigs } = await import('../utils/config.js')
-    enableConfigs()
-    const { initSinks } = await import('../utils/sinks.js')
-    initSinks()
-    const { daemonMain } = await import('../daemon/main.js')
-    await daemonMain([args[0] === 'ps' ? 'status' : args[0]!, ...args.slice(1)])
-    return
+    const mapped = args[0] === 'ps' ? 'status' : args[0];
+    console.error(`[deprecated] Use: claude daemon ${mapped}${args[1] ? ' ' + args[1] : ''}`);
+    profileCheckpoint('cli_daemon_path');
+    const { enableConfigs } = await import('../utils/config.js');
+    enableConfigs();
+    const { initSinks } = await import('../utils/sinks.js');
+    initSinks();
+    const { daemonMain } = await import('../daemon/main.js');
+    await daemonMain([args[0] === 'ps' ? 'status' : args[0]!, ...args.slice(1)]);
+    return;
   }
 
   // Fast-path for `claude job <subcommand>`: template jobs.
   if (feature('TEMPLATES') && args[0] === 'job') {
-    profileCheckpoint('cli_templates_path')
-    const { templatesMain } = await import('../cli/handlers/templateJobs.js')
-    await templatesMain(args.slice(1))
+    profileCheckpoint('cli_templates_path');
+    const { templatesMain } = await import('../cli/handlers/templateJobs.js');
+    await templatesMain(args.slice(1));
     // process.exit (not return) — mountFleetView's Ink TUI can leave event
     // loop handles that prevent natural exit.
     // eslint-disable-next-line custom-rules/no-process-exit
-    process.exit(0)
+    process.exit(0);
   }
 
   // Backward-compat: new/list/reply → job <sub> (deprecated)
-  if (
-    feature('TEMPLATES') &&
-    (args[0] === 'new' || args[0] === 'list' || args[0] === 'reply')
-  ) {
-    console.error(
-      `[deprecated] Use: claude job ${args[0]} ${args.slice(1).join(' ')}`.trim(),
-    )
-    profileCheckpoint('cli_templates_path')
-    const { templatesMain } = await import('../cli/handlers/templateJobs.js')
-    await templatesMain(args)
+  if (feature('TEMPLATES') && (args[0] === 'new' || args[0] === 'list' || args[0] === 'reply')) {
+    console.error(`[deprecated] Use: claude job ${args[0]} ${args.slice(1).join(' ')}`.trim());
+    profileCheckpoint('cli_templates_path');
+    const { templatesMain } = await import('../cli/handlers/templateJobs.js');
+    await templatesMain(args);
     // eslint-disable-next-line custom-rules/no-process-exit
-    process.exit(0)
+    process.exit(0);
   }
 
   // Fast-path for `claude environment-runner`: headless BYOC runner.
   // feature() must stay inline for build-time dead code elimination.
   if (feature('BYOC_ENVIRONMENT_RUNNER') && args[0] === 'environment-runner') {
-    profileCheckpoint('cli_environment_runner_path')
-    const { environmentRunnerMain } = await import(
-      '../environment-runner/main.js'
-    )
-    await environmentRunnerMain(args.slice(1))
-    return
+    profileCheckpoint('cli_environment_runner_path');
+    const { environmentRunnerMain } = await import('../environment-runner/main.js');
+    await environmentRunnerMain(args.slice(1));
+    return;
   }
 
   // Fast-path for `claude self-hosted-runner`: headless self-hosted-runner
   // targeting the SelfHostedRunnerWorkerService API (register + poll; poll IS
   // heartbeat). feature() must stay inline for build-time dead code elimination.
   if (feature('SELF_HOSTED_RUNNER') && args[0] === 'self-hosted-runner') {
-    profileCheckpoint('cli_self_hosted_runner_path')
-    const { selfHostedRunnerMain } = await import(
-      '../self-hosted-runner/main.js'
-    )
-    await selfHostedRunnerMain(args.slice(1))
-    return
+    profileCheckpoint('cli_self_hosted_runner_path');
+    const { selfHostedRunnerMain } = await import('../self-hosted-runner/main.js');
+    await selfHostedRunnerMain(args.slice(1));
+    return;
   }
 
   // Fast-path for --worktree --tmux: exec into tmux before loading full CLI
-  const hasTmuxFlag = args.includes('--tmux') || args.includes('--tmux=classic')
+  const hasTmuxFlag = args.includes('--tmux') || args.includes('--tmux=classic');
   if (
     hasTmuxFlag &&
-    (args.includes('-w') ||
-      args.includes('--worktree') ||
-      args.some(a => a.startsWith('--worktree=')))
+    (args.includes('-w') || args.includes('--worktree') || args.some(a => a.startsWith('--worktree=')))
   ) {
-    profileCheckpoint('cli_tmux_worktree_fast_path')
-    const { enableConfigs } = await import('../utils/config.js')
-    enableConfigs()
-    const { isWorktreeModeEnabled } = await import(
-      '../utils/worktreeModeEnabled.js'
-    )
+    profileCheckpoint('cli_tmux_worktree_fast_path');
+    const { enableConfigs } = await import('../utils/config.js');
+    enableConfigs();
+    const { isWorktreeModeEnabled } = await import('../utils/worktreeModeEnabled.js');
     if (isWorktreeModeEnabled()) {
-      const { execIntoTmuxWorktree } = await import('../utils/worktree.js')
-      const result = await execIntoTmuxWorktree(args)
+      const { execIntoTmuxWorktree } = await import('../utils/worktree.js');
+      const result = await execIntoTmuxWorktree(args);
       if (result.handled) {
-        return
+        return;
       }
       // If not handled (e.g., error), fall through to normal CLI
       if (result.error) {
-        const { exitWithError } = await import('../utils/process.js')
-        exitWithError(result.error)
+        const { exitWithError } = await import('../utils/process.js');
+        exitWithError(result.error);
       }
     }
   }
 
   // Redirect common update flag mistakes to the update subcommand
-  if (
-    args.length === 1 &&
-    (args[0] === '--update' || args[0] === '--upgrade')
-  ) {
-    process.argv = [process.argv[0]!, process.argv[1]!, 'update']
+  if (args.length === 1 && (args[0] === '--update' || args[0] === '--upgrade')) {
+    process.argv = [process.argv[0]!, process.argv[1]!, 'update'];
   }
 
   // --bare: set SIMPLE early so gates fire during module eval / commander
   // option building (not just inside the action handler).
   if (args.includes('--bare')) {
-    process.env.CLAUDE_CODE_SIMPLE = '1'
+    process.env.CLAUDE_CODE_SIMPLE = '1';
   }
 
   // No special flags detected, load and run the full CLI
-  const { startCapturingEarlyInput } = await import('../utils/earlyInput.js')
-  startCapturingEarlyInput()
-  profileCheckpoint('cli_before_main_import')
-  const { main: cliMain } = await import('../main.jsx')
-  profileCheckpoint('cli_after_main_import')
-  await cliMain()
-  profileCheckpoint('cli_after_main_complete')
+  const { startCapturingEarlyInput } = await import('../utils/earlyInput.js');
+  startCapturingEarlyInput();
+  profileCheckpoint('cli_before_main_import');
+  const { main: cliMain } = await import('../main.jsx');
+  profileCheckpoint('cli_after_main_import');
+  await cliMain();
+  profileCheckpoint('cli_after_main_complete');
 }
 
 // eslint-disable-next-line custom-rules/no-top-level-side-effects
-void main()
+void main();
diff --git a/src/entrypoints/sdk/controlSchemas.ts b/src/entrypoints/sdk/controlSchemas.ts
index fccf13e1b..3fd9152d0 100644
--- a/src/entrypoints/sdk/controlSchemas.ts
+++ b/src/entrypoints/sdk/controlSchemas.ts
@@ -102,7 +102,6 @@ export const SDKControlInterruptRequestSchema = lazySchema(() =>
     .describe('Interrupts the currently running conversation turn.'),
 )
 
-
 export const SDKControlPermissionRequestSchema = lazySchema(() =>
   z
     .object({
@@ -451,7 +450,6 @@ export const SDKControlMcpToggleRequestSchema = lazySchema(() =>
     .describe('Enables or disables an MCP server.'),
 )
 
-
 export const SDKControlStopTaskRequestSchema = lazySchema(() =>
   z
     .object({
@@ -544,7 +542,6 @@ export const SDKControlElicitationResponseSchema = lazySchema(() =>
     .describe('Response from the SDK consumer for an elicitation request.'),
 )
 
-
 // ============================================================================
 // Control Request/Response Wrappers
 // ============================================================================
diff --git a/src/entrypoints/sdk/controlTypes.ts b/src/entrypoints/sdk/controlTypes.ts
index 58d52cca8..943962bce 100644
--- a/src/entrypoints/sdk/controlTypes.ts
+++ b/src/entrypoints/sdk/controlTypes.ts
@@ -20,15 +20,35 @@ import type {
 } from './controlSchemas.js'
 import type { SDKPartialAssistantMessageSchema } from './coreSchemas.js'
 
-export type SDKControlRequest = z.infer<ReturnType<typeof SDKControlRequestSchema>>
-export type SDKControlResponse = z.infer<ReturnType<typeof SDKControlResponseSchema>>
+export type SDKControlRequest = z.infer<
+  ReturnType<typeof SDKControlRequestSchema>
+>
+export type SDKControlResponse = z.infer<
+  ReturnType<typeof SDKControlResponseSchema>
+>
 export type StdoutMessage = z.infer<ReturnType<typeof StdoutMessageSchema>>
-export type SDKControlInitializeRequest = z.infer<ReturnType<typeof SDKControlInitializeRequestSchema>>
-export type SDKControlInitializeResponse = z.infer<ReturnType<typeof SDKControlInitializeResponseSchema>>
-export type SDKControlMcpSetServersResponse = z.infer<ReturnType<typeof SDKControlMcpSetServersResponseSchema>>
-export type SDKControlReloadPluginsResponse = z.infer<ReturnType<typeof SDKControlReloadPluginsResponseSchema>>
+export type SDKControlInitializeRequest = z.infer<
+  ReturnType<typeof SDKControlInitializeRequestSchema>
+>
+export type SDKControlInitializeResponse = z.infer<
+  ReturnType<typeof SDKControlInitializeResponseSchema>
+>
+export type SDKControlMcpSetServersResponse = z.infer<
+  ReturnType<typeof SDKControlMcpSetServersResponseSchema>
+>
+export type SDKControlReloadPluginsResponse = z.infer<
+  ReturnType<typeof SDKControlReloadPluginsResponseSchema>
+>
 export type StdinMessage = z.infer<ReturnType<typeof StdinMessageSchema>>
-export type SDKPartialAssistantMessage = z.infer<ReturnType<typeof SDKPartialAssistantMessageSchema>>
-export type SDKControlPermissionRequest = z.infer<ReturnType<typeof SDKControlPermissionRequestSchema>>
-export type SDKControlCancelRequest = z.infer<ReturnType<typeof SDKControlCancelRequestSchema>>
-export type SDKControlRequestInner = z.infer<ReturnType<typeof SDKControlRequestInnerSchema>>
+export type SDKPartialAssistantMessage = z.infer<
+  ReturnType<typeof SDKPartialAssistantMessageSchema>
+>
+export type SDKControlPermissionRequest = z.infer<
+  ReturnType<typeof SDKControlPermissionRequestSchema>
+>
+export type SDKControlCancelRequest = z.infer<
+  ReturnType<typeof SDKControlCancelRequestSchema>
+>
+export type SDKControlRequestInner = z.infer<
+  ReturnType<typeof SDKControlRequestInnerSchema>
+>
diff --git a/src/entrypoints/sdk/coreSchemas.ts b/src/entrypoints/sdk/coreSchemas.ts
index c1aab5bc1..741e1dbc2 100644
--- a/src/entrypoints/sdk/coreSchemas.ts
+++ b/src/entrypoints/sdk/coreSchemas.ts
@@ -336,7 +336,14 @@ export const PermissionResultSchema = lazySchema(() =>
 
 export const PermissionModeSchema = lazySchema(() =>
   z
-    .enum(['default', 'acceptEdits', 'bypassPermissions', 'plan', 'dontAsk', 'auto'])
+    .enum([
+      'default',
+      'acceptEdits',
+      'bypassPermissions',
+      'plan',
+      'dontAsk',
+      'auto',
+    ])
     .describe(
       'Permission mode for controlling how tool executions are handled. ' +
         "'default' - Standard behavior, prompts for dangerous operations. " +
@@ -348,7 +355,6 @@ export const PermissionModeSchema = lazySchema(() =>
     ),
 )
 
-
 // ============================================================================
 // Hook Types
 // ============================================================================
@@ -1747,7 +1753,6 @@ export const SDKSessionStateChangedMessageSchema = lazySchema(() =>
     ),
 )
 
-
 export const SDKTaskProgressMessageSchema = lazySchema(() =>
   z.object({
     type: z.literal('system'),
diff --git a/src/entrypoints/sdk/coreTypes.generated.ts b/src/entrypoints/sdk/coreTypes.generated.ts
index a0ac6dc3d..ff89ccb0b 100644
--- a/src/entrypoints/sdk/coreTypes.generated.ts
+++ b/src/entrypoints/sdk/coreTypes.generated.ts
@@ -33,13 +33,13 @@ export type ModelInfo = {
 export type McpServerConfigForProcessTransport = {
   command: string
   args: string[]
-  type?: "stdio"
+  type?: 'stdio'
   env?: Record<string, string>
 } & { scope: string; pluginSource?: string }
 
 export type McpServerStatus = {
   name: string
-  status: "connected" | "disconnected" | "error"
+  status: 'connected' | 'disconnected' | 'error'
   [key: string]: unknown
 }
 
@@ -47,8 +47,8 @@ export type McpServerStatus = {
 export type PermissionMode = string
 
 export type PermissionResult =
-  | { behavior: "allow" }
-  | { behavior: "deny"; message?: string }
+  | { behavior: 'allow' }
+  | { behavior: 'deny'; message?: string }
 
 export type PermissionUpdate = {
   path: string
@@ -100,33 +100,89 @@ export type FileChangedHookInput = HookInput & { path: string }
 // SDK Message types
 export type SDKMessage = { type: string; [key: string]: unknown }
 export type SDKUserMessage = {
-  type: "user"
+  type: 'user'
   content: string | Array<{ type: string; [key: string]: unknown }>
   uuid: string
-  message?: { role?: string; id?: string; content?: MessageContent; usage?: BetaUsage | Record<string, unknown>; [key: string]: unknown }
+  message?: {
+    role?: string
+    id?: string
+    content?: MessageContent
+    usage?: BetaUsage | Record<string, unknown>
+    [key: string]: unknown
+  }
   tool_use_result?: unknown
   timestamp?: string
   [key: string]: unknown
 }
 export type SDKUserMessageReplay = SDKUserMessage
 export type SDKAssistantMessage = {
-  type: "assistant"
+  type: 'assistant'
   content: unknown
-  message?: { role?: string; id?: string; content?: MessageContent; usage?: BetaUsage | Record<string, unknown>; [key: string]: unknown }
+  message?: {
+    role?: string
+    id?: string
+    content?: MessageContent
+    usage?: BetaUsage | Record<string, unknown>
+    [key: string]: unknown
+  }
   uuid?: UUID
   error?: unknown
   [key: string]: unknown
 }
-export type SDKAssistantErrorMessage = { type: "assistant_error"; error: unknown; [key: string]: unknown }
-export type SDKAssistantMessageError = 'authentication_failed' | 'billing_error' | 'rate_limit' | 'invalid_request' | 'server_error' | 'unknown' | 'max_output_tokens'
-export type SDKPartialAssistantMessage = { type: "partial_assistant"; event: { type: string; [key: string]: unknown }; [key: string]: unknown }
-export type SDKResultMessage = { type: "result"; subtype?: string; errors?: string[]; result?: string; uuid?: UUID; [key: string]: unknown }
-export type SDKResultSuccess = { type: "result_success"; [key: string]: unknown }
-export type SDKSystemMessage = { type: "system"; subtype?: string; model?: string; uuid?: UUID; [key: string]: unknown }
-export type SDKStatusMessage = { type: "status"; subtype?: string; status?: string; uuid?: UUID; [key: string]: unknown }
-export type SDKToolProgressMessage = { type: "tool_progress"; tool_name?: string; elapsed_time_seconds?: number; uuid?: UUID; tool_use_id?: string; [key: string]: unknown }
+export type SDKAssistantErrorMessage = {
+  type: 'assistant_error'
+  error: unknown
+  [key: string]: unknown
+}
+export type SDKAssistantMessageError =
+  | 'authentication_failed'
+  | 'billing_error'
+  | 'rate_limit'
+  | 'invalid_request'
+  | 'server_error'
+  | 'unknown'
+  | 'max_output_tokens'
+export type SDKPartialAssistantMessage = {
+  type: 'partial_assistant'
+  event: { type: string; [key: string]: unknown }
+  [key: string]: unknown
+}
+export type SDKResultMessage = {
+  type: 'result'
+  subtype?: string
+  errors?: string[]
+  result?: string
+  uuid?: UUID
+  [key: string]: unknown
+}
+export type SDKResultSuccess = {
+  type: 'result_success'
+  [key: string]: unknown
+}
+export type SDKSystemMessage = {
+  type: 'system'
+  subtype?: string
+  model?: string
+  uuid?: UUID
+  [key: string]: unknown
+}
+export type SDKStatusMessage = {
+  type: 'status'
+  subtype?: string
+  status?: string
+  uuid?: UUID
+  [key: string]: unknown
+}
+export type SDKToolProgressMessage = {
+  type: 'tool_progress'
+  tool_name?: string
+  elapsed_time_seconds?: number
+  uuid?: UUID
+  tool_use_id?: string
+  [key: string]: unknown
+}
 export type SDKCompactBoundaryMessage = {
-  type: "compact_boundary"
+  type: 'compact_boundary'
   uuid?: UUID
   compact_metadata: {
     trigger?: unknown
@@ -141,9 +197,12 @@ export type SDKCompactBoundaryMessage = {
   }
   [key: string]: unknown
 }
-export type SDKPermissionDenial = { type: "permission_denial"; [key: string]: unknown }
-export type SDKRateLimitInfo = { type: "rate_limit"; [key: string]: unknown }
-export type SDKStatus = "active" | "idle" | "error" | string
+export type SDKPermissionDenial = {
+  type: 'permission_denial'
+  [key: string]: unknown
+}
+export type SDKRateLimitInfo = { type: 'rate_limit'; [key: string]: unknown }
+export type SDKStatus = 'active' | 'idle' | 'error' | string
 
 export type SDKSessionInfo = {
   sessionId: string
@@ -152,15 +211,34 @@ export type SDKSessionInfo = {
 }
 
 // Other referenced types
-export type OutputFormat = { type: "json_schema"; schema: Record<string, unknown> }
+export type OutputFormat = {
+  type: 'json_schema'
+  schema: Record<string, unknown>
+}
 export type ConfigScope = string
 export type SdkBeta = string
 export type ThinkingConfig = { type: string; [key: string]: unknown }
-export type McpStdioServerConfig = { command: string; args: string[]; type: "stdio"; env?: Record<string, string> }
-export type McpSSEServerConfig = { type: "sse"; url: string; [key: string]: unknown }
-export type McpHttpServerConfig = { type: "http"; url: string; [key: string]: unknown }
-export type McpSdkServerConfig = { type: "sdk"; [key: string]: unknown }
-export type McpClaudeAIProxyServerConfig = { type: "claudeai-proxy"; [key: string]: unknown }
+export type McpStdioServerConfig = {
+  command: string
+  args: string[]
+  type: 'stdio'
+  env?: Record<string, string>
+}
+export type McpSSEServerConfig = {
+  type: 'sse'
+  url: string
+  [key: string]: unknown
+}
+export type McpHttpServerConfig = {
+  type: 'http'
+  url: string
+  [key: string]: unknown
+}
+export type McpSdkServerConfig = { type: 'sdk'; [key: string]: unknown }
+export type McpClaudeAIProxyServerConfig = {
+  type: 'claudeai-proxy'
+  [key: string]: unknown
+}
 export type McpServerStatusConfig = { [key: string]: unknown }
 export type McpSetServersResult = { [key: string]: unknown }
 export type PermissionUpdateDestination = string
diff --git a/src/entrypoints/sdk/runtimeTypes.ts b/src/entrypoints/sdk/runtimeTypes.ts
index 212c06e8b..a37a1631a 100644
--- a/src/entrypoints/sdk/runtimeTypes.ts
+++ b/src/entrypoints/sdk/runtimeTypes.ts
@@ -6,13 +6,30 @@
 export type AnyZodRawShape = Record<string, unknown>
 export type InferShape<T extends AnyZodRawShape> = { [K in keyof T]: unknown }
 
-export type ForkSessionOptions = { dir?: string; upToMessageId?: string; title?: string }
+export type ForkSessionOptions = {
+  dir?: string
+  upToMessageId?: string
+  title?: string
+}
 export type ForkSessionResult = { sessionId: string }
 export type GetSessionInfoOptions = { dir?: string }
-export type GetSessionMessagesOptions = { dir?: string; limit?: number; offset?: number; includeSystemMessages?: boolean }
-export type ListSessionsOptions = { dir?: string; limit?: number; offset?: number }
+export type GetSessionMessagesOptions = {
+  dir?: string
+  limit?: number
+  offset?: number
+  includeSystemMessages?: boolean
+}
+export type ListSessionsOptions = {
+  dir?: string
+  limit?: number
+  offset?: number
+}
 export type SessionMutationOptions = { dir?: string }
-export type SessionMessage = { role: string; content: unknown; [key: string]: unknown }
+export type SessionMessage = {
+  role: string
+  content: unknown
+  [key: string]: unknown
+}
 
 export interface SDKSession {
   sessionId: string
@@ -27,7 +44,9 @@ export type SDKSessionOptions = {
   [key: string]: unknown
 }
 
-export interface SdkMcpToolDefinition<T extends AnyZodRawShape = AnyZodRawShape> {
+export interface SdkMcpToolDefinition<
+  T extends AnyZodRawShape = AnyZodRawShape,
+> {
   name: string
   description: string
   inputSchema: T
@@ -60,4 +79,4 @@ export interface Query {
 export interface InternalQuery extends Query {
   [key: string]: unknown
 }
-export type EffortLevel = 'low' | 'medium' | 'high' | 'max';
+export type EffortLevel = 'low' | 'medium' | 'high' | 'max'
diff --git a/src/entrypoints/src/bootstrap/state.ts b/src/entrypoints/src/bootstrap/state.ts
index 9f1f964ae..0945531c1 100644
--- a/src/entrypoints/src/bootstrap/state.ts
+++ b/src/entrypoints/src/bootstrap/state.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getIsNonInteractiveSession = any;
+export type getIsNonInteractiveSession = any
diff --git a/src/entrypoints/src/state/AppStateStore.ts b/src/entrypoints/src/state/AppStateStore.ts
index 1d4f082ab..1af7fba99 100644
--- a/src/entrypoints/src/state/AppStateStore.ts
+++ b/src/entrypoints/src/state/AppStateStore.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getDefaultAppState = any;
+export type getDefaultAppState = any
diff --git a/src/environment-runner/main.ts b/src/environment-runner/main.ts
index d38434218..43a89b481 100644
--- a/src/environment-runner/main.ts
+++ b/src/environment-runner/main.ts
@@ -1,3 +1,4 @@
 // Auto-generated stub — replace with real implementation
-export {};
-export const environmentRunnerMain: (args: string[]) => Promise<void> = () => Promise.resolve();
+export {}
+export const environmentRunnerMain: (args: string[]) => Promise<void> = () =>
+  Promise.resolve()
diff --git a/src/history.ts b/src/history.ts
index 3f6234321..a51970368 100644
--- a/src/history.ts
+++ b/src/history.ts
@@ -67,7 +67,7 @@ export function parseReferences(
   const matches = [...input.matchAll(referencePattern)]
   return matches
     .map(match => ({
-      id: parseInt(match[2] || '0'),
+      id: parseInt(match[2] || '0', 10),
       match: match[0],
       index: match.index,
     }))
diff --git a/src/hooks/notifs/src/context/notifications.ts b/src/hooks/notifs/src/context/notifications.ts
index 95d2759e1..926093655 100644
--- a/src/hooks/notifs/src/context/notifications.ts
+++ b/src/hooks/notifs/src/context/notifications.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type useNotifications = any;
-export type Notification = any;
+export type useNotifications = any
+export type Notification = any
diff --git a/src/hooks/notifs/src/ink.ts b/src/hooks/notifs/src/ink.ts
index 9fa0986a6..a7e12a392 100644
--- a/src/hooks/notifs/src/ink.ts
+++ b/src/hooks/notifs/src/ink.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type Text = any;
+export type Text = any
diff --git a/src/hooks/notifs/src/services/claudeAiLimits.ts b/src/hooks/notifs/src/services/claudeAiLimits.ts
index 4dceb08d6..7a1f7ca4d 100644
--- a/src/hooks/notifs/src/services/claudeAiLimits.ts
+++ b/src/hooks/notifs/src/services/claudeAiLimits.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type getRateLimitWarning = any;
-export type getUsingOverageText = any;
+export type getRateLimitWarning = any
+export type getUsingOverageText = any
diff --git a/src/hooks/notifs/src/services/claudeAiLimitsHook.ts b/src/hooks/notifs/src/services/claudeAiLimitsHook.ts
index 617852958..162891d0a 100644
--- a/src/hooks/notifs/src/services/claudeAiLimitsHook.ts
+++ b/src/hooks/notifs/src/services/claudeAiLimitsHook.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useClaudeAiLimits = any;
+export type useClaudeAiLimits = any
diff --git a/src/hooks/notifs/src/services/mcp/types.ts b/src/hooks/notifs/src/services/mcp/types.ts
index be4f983ff..315c57db3 100644
--- a/src/hooks/notifs/src/services/mcp/types.ts
+++ b/src/hooks/notifs/src/services/mcp/types.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type MCPServerConnection = any;
+export type MCPServerConnection = any
diff --git a/src/hooks/notifs/src/services/oauth/getOauthProfile.ts b/src/hooks/notifs/src/services/oauth/getOauthProfile.ts
index 3741d6442..b7be4fc2e 100644
--- a/src/hooks/notifs/src/services/oauth/getOauthProfile.ts
+++ b/src/hooks/notifs/src/services/oauth/getOauthProfile.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getOauthProfileFromApiKey = any;
+export type getOauthProfileFromApiKey = any
diff --git a/src/hooks/notifs/src/state/AppState.ts b/src/hooks/notifs/src/state/AppState.ts
index cc3978f9a..53048a173 100644
--- a/src/hooks/notifs/src/state/AppState.ts
+++ b/src/hooks/notifs/src/state/AppState.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type useAppState = any;
-export type useSetAppState = any;
+export type useAppState = any
+export type useSetAppState = any
diff --git a/src/hooks/notifs/src/utils/auth.ts b/src/hooks/notifs/src/utils/auth.ts
index c473f1703..8ead38aa8 100644
--- a/src/hooks/notifs/src/utils/auth.ts
+++ b/src/hooks/notifs/src/utils/auth.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type getSubscriptionType = any;
-export type isClaudeAISubscriber = any;
+export type getSubscriptionType = any
+export type isClaudeAISubscriber = any
diff --git a/src/hooks/notifs/src/utils/billing.ts b/src/hooks/notifs/src/utils/billing.ts
index fd3cae2d7..de39042b1 100644
--- a/src/hooks/notifs/src/utils/billing.ts
+++ b/src/hooks/notifs/src/utils/billing.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type hasClaudeAiBillingAccess = any;
+export type hasClaudeAiBillingAccess = any
diff --git a/src/hooks/notifs/src/utils/bundledMode.ts b/src/hooks/notifs/src/utils/bundledMode.ts
index d2d26c4ec..55b58b22c 100644
--- a/src/hooks/notifs/src/utils/bundledMode.ts
+++ b/src/hooks/notifs/src/utils/bundledMode.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type isInBundledMode = any;
+export type isInBundledMode = any
diff --git a/src/hooks/notifs/src/utils/config.ts b/src/hooks/notifs/src/utils/config.ts
index a42d3c993..5c7b5e363 100644
--- a/src/hooks/notifs/src/utils/config.ts
+++ b/src/hooks/notifs/src/utils/config.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type getGlobalConfig = any;
-export type saveGlobalConfig = any;
-export type GlobalConfig = any;
+export type getGlobalConfig = any
+export type saveGlobalConfig = any
+export type GlobalConfig = any
diff --git a/src/hooks/notifs/src/utils/doctorDiagnostic.ts b/src/hooks/notifs/src/utils/doctorDiagnostic.ts
index ed3809f04..84b402328 100644
--- a/src/hooks/notifs/src/utils/doctorDiagnostic.ts
+++ b/src/hooks/notifs/src/utils/doctorDiagnostic.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getCurrentInstallationType = any;
+export type getCurrentInstallationType = any
diff --git a/src/hooks/notifs/src/utils/envUtils.ts b/src/hooks/notifs/src/utils/envUtils.ts
index deb349096..dfe8dd636 100644
--- a/src/hooks/notifs/src/utils/envUtils.ts
+++ b/src/hooks/notifs/src/utils/envUtils.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type isEnvTruthy = any;
+export type isEnvTruthy = any
diff --git a/src/hooks/notifs/src/utils/fastMode.ts b/src/hooks/notifs/src/utils/fastMode.ts
index 14189e5bd..be7448097 100644
--- a/src/hooks/notifs/src/utils/fastMode.ts
+++ b/src/hooks/notifs/src/utils/fastMode.ts
@@ -1,7 +1,7 @@
 // Auto-generated type stub — replace with real implementation
-export type CooldownReason = any;
-export type isFastModeEnabled = any;
-export type onCooldownExpired = any;
-export type onCooldownTriggered = any;
-export type onFastModeOverageRejection = any;
-export type onOrgFastModeChanged = any;
+export type CooldownReason = any
+export type isFastModeEnabled = any
+export type onCooldownExpired = any
+export type onCooldownTriggered = any
+export type onFastModeOverageRejection = any
+export type onOrgFastModeChanged = any
diff --git a/src/hooks/notifs/src/utils/format.ts b/src/hooks/notifs/src/utils/format.ts
index 8cb04d1d0..a50c0cdd8 100644
--- a/src/hooks/notifs/src/utils/format.ts
+++ b/src/hooks/notifs/src/utils/format.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type formatDuration = any;
+export type formatDuration = any
diff --git a/src/hooks/notifs/src/utils/ide.ts b/src/hooks/notifs/src/utils/ide.ts
index 3903e6d4a..16278bfac 100644
--- a/src/hooks/notifs/src/utils/ide.ts
+++ b/src/hooks/notifs/src/utils/ide.ts
@@ -1,5 +1,5 @@
 // Auto-generated type stub — replace with real implementation
-export type detectIDEs = any;
-export type IDEExtensionInstallationStatus = any;
-export type isJetBrainsIde = any;
-export type isSupportedTerminal = any;
+export type detectIDEs = any
+export type IDEExtensionInstallationStatus = any
+export type isJetBrainsIde = any
+export type isSupportedTerminal = any
diff --git a/src/hooks/notifs/src/utils/model/deprecation.ts b/src/hooks/notifs/src/utils/model/deprecation.ts
index 2a5102d0a..67ff51854 100644
--- a/src/hooks/notifs/src/utils/model/deprecation.ts
+++ b/src/hooks/notifs/src/utils/model/deprecation.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getModelDeprecationWarning = any;
+export type getModelDeprecationWarning = any
diff --git a/src/hooks/notifs/src/utils/nativeInstaller/index.ts b/src/hooks/notifs/src/utils/nativeInstaller/index.ts
index 19088d1b0..bafcf50c4 100644
--- a/src/hooks/notifs/src/utils/nativeInstaller/index.ts
+++ b/src/hooks/notifs/src/utils/nativeInstaller/index.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type checkInstall = any;
+export type checkInstall = any
diff --git a/src/hooks/notifs/useCanSwitchToExistingSubscription.tsx b/src/hooks/notifs/useCanSwitchToExistingSubscription.tsx
index 37d8542b0..a377a131f 100644
--- a/src/hooks/notifs/useCanSwitchToExistingSubscription.tsx
+++ b/src/hooks/notifs/useCanSwitchToExistingSubscription.tsx
@@ -1,12 +1,12 @@
-import * as React from 'react'
-import { getOauthProfileFromApiKey } from 'src/services/oauth/getOauthProfile.js'
-import { isClaudeAISubscriber } from 'src/utils/auth.js'
-import { Text } from '@anthropic/ink'
-import { logEvent } from '../../services/analytics/index.js'
-import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js'
-import { useStartupNotification } from './useStartupNotification.js'
+import * as React from 'react';
+import { getOauthProfileFromApiKey } from 'src/services/oauth/getOauthProfile.js';
+import { isClaudeAISubscriber } from 'src/utils/auth.js';
+import { Text } from '@anthropic/ink';
+import { logEvent } from '../../services/analytics/index.js';
+import { getGlobalConfig, saveGlobalConfig } from '../../utils/config.js';
+import { useStartupNotification } from './useStartupNotification.js';
 
-const MAX_SHOW_COUNT = 3
+const MAX_SHOW_COUNT = 3;
 
 /**
  * Hook to check if the user has a subscription on Console but isn't logged into it.
@@ -14,16 +14,16 @@ const MAX_SHOW_COUNT = 3
 export function useCanSwitchToExistingSubscription(): void {
   useStartupNotification(async () => {
     if ((getGlobalConfig().subscriptionNoticeCount ?? 0) >= MAX_SHOW_COUNT) {
-      return null
+      return null;
     }
-    const subscriptionType = await getExistingClaudeSubscription()
-    if (subscriptionType === null) return null
+    const subscriptionType = await getExistingClaudeSubscription();
+    if (subscriptionType === null) return null;
 
     saveGlobalConfig(current => ({
       ...current,
       subscriptionNoticeCount: (current.subscriptionNoticeCount ?? 0) + 1,
-    }))
-    logEvent('tengu_switch_to_subscription_notice_shown', {})
+    }));
+    logEvent('tengu_switch_to_subscription_notice_shown', {});
 
     return {
       key: 'switch-to-subscription',
@@ -37,8 +37,8 @@ export function useCanSwitchToExistingSubscription(): void {
         </Text>
       ),
       priority: 'low',
-    }
-  })
+    };
+  });
 }
 
 /**
@@ -48,20 +48,20 @@ export function useCanSwitchToExistingSubscription(): void {
 async function getExistingClaudeSubscription(): Promise<'Max' | 'Pro' | null> {
   // If already using subscription auth, there is nothing to switch to
   if (isClaudeAISubscriber()) {
-    return null
+    return null;
   }
-  const profile = await getOauthProfileFromApiKey()
+  const profile = await getOauthProfileFromApiKey();
   if (!profile) {
-    return null
+    return null;
   }
 
   if (profile.account.has_claude_max) {
-    return 'Max'
+    return 'Max';
   }
 
   if (profile.account.has_claude_pro) {
-    return 'Pro'
+    return 'Pro';
   }
 
-  return null
+  return null;
 }
diff --git a/src/hooks/notifs/useDeprecationWarningNotification.tsx b/src/hooks/notifs/useDeprecationWarningNotification.tsx
index 7c40ffc47..a897b1d46 100644
--- a/src/hooks/notifs/useDeprecationWarningNotification.tsx
+++ b/src/hooks/notifs/useDeprecationWarningNotification.tsx
@@ -1,30 +1,30 @@
-import { useEffect, useRef } from 'react'
-import { useNotifications } from 'src/context/notifications.js'
-import { getModelDeprecationWarning } from 'src/utils/model/deprecation.js'
-import { getIsRemoteMode } from '../../bootstrap/state.js'
+import { useEffect, useRef } from 'react';
+import { useNotifications } from 'src/context/notifications.js';
+import { getModelDeprecationWarning } from 'src/utils/model/deprecation.js';
+import { getIsRemoteMode } from '../../bootstrap/state.js';
 
 export function useDeprecationWarningNotification(model: string): void {
-  const { addNotification } = useNotifications()
-  const lastWarningRef = useRef<string | null>(null)
+  const { addNotification } = useNotifications();
+  const lastWarningRef = useRef<string | null>(null);
 
   useEffect(() => {
-    if (getIsRemoteMode()) return
-    const deprecationWarning = getModelDeprecationWarning(model)
+    if (getIsRemoteMode()) return;
+    const deprecationWarning = getModelDeprecationWarning(model);
 
     // Show warning if model is deprecated and we haven't shown this exact warning yet
     if (deprecationWarning && deprecationWarning !== lastWarningRef.current) {
-      lastWarningRef.current = deprecationWarning
+      lastWarningRef.current = deprecationWarning;
       addNotification({
         key: 'model-deprecation-warning',
         text: deprecationWarning,
         color: 'warning',
         priority: 'high',
-      })
+      });
     }
 
     // Reset tracking if model changes to non-deprecated
     if (!deprecationWarning) {
-      lastWarningRef.current = null
+      lastWarningRef.current = null;
     }
-  }, [model, addNotification])
+  }, [model, addNotification]);
 }
diff --git a/src/hooks/notifs/useFastModeNotification.tsx b/src/hooks/notifs/useFastModeNotification.tsx
index fd8728954..8154c681f 100644
--- a/src/hooks/notifs/useFastModeNotification.tsx
+++ b/src/hooks/notifs/useFastModeNotification.tsx
@@ -1,6 +1,6 @@
-import { useEffect } from 'react'
-import { useNotifications } from 'src/context/notifications.js'
-import { useAppState, useSetAppState } from 'src/state/AppState.js'
+import { useEffect } from 'react';
+import { useNotifications } from 'src/context/notifications.js';
+import { useAppState, useSetAppState } from 'src/state/AppState.js';
 import {
   type CooldownReason,
   isFastModeEnabled,
@@ -8,25 +8,25 @@ import {
   onCooldownTriggered,
   onFastModeOverageRejection,
   onOrgFastModeChanged,
-} from 'src/utils/fastMode.js'
-import { formatDuration } from 'src/utils/format.js'
-import { getIsRemoteMode } from '../../bootstrap/state.js'
+} from 'src/utils/fastMode.js';
+import { formatDuration } from 'src/utils/format.js';
+import { getIsRemoteMode } from '../../bootstrap/state.js';
 
-const COOLDOWN_STARTED_KEY = 'fast-mode-cooldown-started'
-const COOLDOWN_EXPIRED_KEY = 'fast-mode-cooldown-expired'
-const ORG_CHANGED_KEY = 'fast-mode-org-changed'
-const OVERAGE_REJECTED_KEY = 'fast-mode-overage-rejected'
+const COOLDOWN_STARTED_KEY = 'fast-mode-cooldown-started';
+const COOLDOWN_EXPIRED_KEY = 'fast-mode-cooldown-expired';
+const ORG_CHANGED_KEY = 'fast-mode-org-changed';
+const OVERAGE_REJECTED_KEY = 'fast-mode-overage-rejected';
 
 export function useFastModeNotification(): void {
-  const { addNotification } = useNotifications()
-  const isFastMode = useAppState(s => s.fastMode)
-  const setAppState = useSetAppState()
+  const { addNotification } = useNotifications();
+  const isFastMode = useAppState(s => s.fastMode);
+  const setAppState = useSetAppState();
 
   // Notify when org fast mode status changes
   useEffect(() => {
-    if (getIsRemoteMode()) return
+    if (getIsRemoteMode()) return;
     if (!isFastModeEnabled()) {
-      return
+      return;
     }
 
     return onOrgFastModeChanged(orgEnabled => {
@@ -36,55 +36,55 @@ export function useFastModeNotification(): void {
           color: 'fastMode',
           priority: 'immediate',
           text: 'Fast mode is now available · /fast to turn on',
-        })
+        });
       } else if (isFastMode) {
         // Org disabled fast mode — permanently turn off fast mode
-        setAppState(prev => ({ ...prev, fastMode: false }))
+        setAppState(prev => ({ ...prev, fastMode: false }));
         addNotification({
           key: ORG_CHANGED_KEY,
           color: 'warning',
           priority: 'immediate',
           text: 'Fast mode has been disabled by your organization',
-        })
+        });
       }
-    })
-  }, [addNotification, isFastMode, setAppState])
+    });
+  }, [addNotification, isFastMode, setAppState]);
 
   // Notify when fast mode is rejected due to overage/extra usage issues
   useEffect(() => {
-    if (getIsRemoteMode()) return
-    if (!isFastModeEnabled()) return
+    if (getIsRemoteMode()) return;
+    if (!isFastModeEnabled()) return;
 
     return onFastModeOverageRejection(message => {
-      setAppState(prev => ({ ...prev, fastMode: false }))
+      setAppState(prev => ({ ...prev, fastMode: false }));
       addNotification({
         key: OVERAGE_REJECTED_KEY,
         color: 'warning',
         priority: 'immediate',
         text: message,
-      })
-    })
-  }, [addNotification, setAppState])
+      });
+    });
+  }, [addNotification, setAppState]);
 
   useEffect(() => {
-    if (getIsRemoteMode()) return
+    if (getIsRemoteMode()) return;
     if (!isFastMode) {
-      return
+      return;
     }
 
     const unsubTriggered = onCooldownTriggered((resetAt, reason) => {
       const resetIn = formatDuration(resetAt - Date.now(), {
         hideTrailingZeros: true,
-      })
-      const message = getCooldownMessage(reason, resetIn)
+      });
+      const message = getCooldownMessage(reason, resetIn);
       addNotification({
         key: COOLDOWN_STARTED_KEY,
         invalidates: [COOLDOWN_EXPIRED_KEY],
         text: message,
         color: 'warning',
         priority: 'immediate',
-      })
-    })
+      });
+    });
     const unsubExpired = onCooldownExpired(() => {
       addNotification({
         key: COOLDOWN_EXPIRED_KEY,
@@ -92,20 +92,20 @@ export function useFastModeNotification(): void {
         color: 'fastMode',
         text: `Fast limit reset · now using fast mode`,
         priority: 'immediate',
-      })
-    })
+      });
+    });
     return () => {
-      unsubTriggered()
-      unsubExpired()
-    }
-  }, [addNotification, isFastMode])
+      unsubTriggered();
+      unsubExpired();
+    };
+  }, [addNotification, isFastMode]);
 }
 
 function getCooldownMessage(reason: CooldownReason, resetIn: string): string {
   switch (reason) {
     case 'overloaded':
-      return `Fast mode overloaded and is temporarily unavailable · resets in ${resetIn}`
+      return `Fast mode overloaded and is temporarily unavailable · resets in ${resetIn}`;
     case 'rate_limit':
-      return `Fast limit reached and temporarily disabled · resets in ${resetIn}`
+      return `Fast limit reached and temporarily disabled · resets in ${resetIn}`;
   }
 }
diff --git a/src/hooks/notifs/useIDEStatusIndicator.tsx b/src/hooks/notifs/useIDEStatusIndicator.tsx
index 70175d10f..20ad7ec3f 100644
--- a/src/hooks/notifs/useIDEStatusIndicator.tsx
+++ b/src/hooks/notifs/useIDEStatusIndicator.tsx
@@ -1,87 +1,63 @@
-import React, { useEffect, useRef } from 'react'
-import { useNotifications } from 'src/context/notifications.js'
-import { Text } from '@anthropic/ink'
-import type { MCPServerConnection } from 'src/services/mcp/types.js'
-import { getGlobalConfig, saveGlobalConfig } from 'src/utils/config.js'
-import {
-  detectIDEs,
-  type IDEExtensionInstallationStatus,
-  isJetBrainsIde,
-  isSupportedTerminal,
-} from 'src/utils/ide.js'
-import { getIsRemoteMode } from '../../bootstrap/state.js'
-import { useIdeConnectionStatus } from '../useIdeConnectionStatus.js'
-import type { IDESelection } from '../useIdeSelection.js'
+import React, { useEffect, useRef } from 'react';
+import { useNotifications } from 'src/context/notifications.js';
+import { Text } from '@anthropic/ink';
+import type { MCPServerConnection } from 'src/services/mcp/types.js';
+import { getGlobalConfig, saveGlobalConfig } from 'src/utils/config.js';
+import { detectIDEs, type IDEExtensionInstallationStatus, isJetBrainsIde, isSupportedTerminal } from 'src/utils/ide.js';
+import { getIsRemoteMode } from '../../bootstrap/state.js';
+import { useIdeConnectionStatus } from '../useIdeConnectionStatus.js';
+import type { IDESelection } from '../useIdeSelection.js';
 
-const MAX_IDE_HINT_SHOW_COUNT = 5
+const MAX_IDE_HINT_SHOW_COUNT = 5;
 
 type Props = {
-  ideInstallationStatus: IDEExtensionInstallationStatus | null
-  ideSelection: IDESelection | undefined
-  mcpClients: MCPServerConnection[]
-}
+  ideInstallationStatus: IDEExtensionInstallationStatus | null;
+  ideSelection: IDESelection | undefined;
+  mcpClients: MCPServerConnection[];
+};
 
-export function useIDEStatusIndicator({
-  ideSelection,
-  mcpClients,
-  ideInstallationStatus,
-}: Props): void {
-  const { addNotification, removeNotification } = useNotifications()
-  const { status: ideStatus, ideName } = useIdeConnectionStatus(mcpClients)
-  const hasShownHintRef = useRef(false)
+export function useIDEStatusIndicator({ ideSelection, mcpClients, ideInstallationStatus }: Props): void {
+  const { addNotification, removeNotification } = useNotifications();
+  const { status: ideStatus, ideName } = useIdeConnectionStatus(mcpClients);
+  const hasShownHintRef = useRef(false);
 
-  const isJetBrains = ideInstallationStatus
-    ? isJetBrainsIde(ideInstallationStatus?.ideType)
-    : false
-  const showIDEInstallErrorOrJetBrainsInfo =
-    ideInstallationStatus?.error || isJetBrains
+  const isJetBrains = ideInstallationStatus ? isJetBrainsIde(ideInstallationStatus?.ideType) : false;
+  const showIDEInstallErrorOrJetBrainsInfo = ideInstallationStatus?.error || isJetBrains;
 
   const shouldShowIdeSelection =
-    ideStatus === 'connected' &&
-    (ideSelection?.filePath ||
-      (ideSelection?.text && ideSelection.lineCount > 0))
+    ideStatus === 'connected' && (ideSelection?.filePath || (ideSelection?.text && ideSelection.lineCount > 0));
 
   // Only show the connected if not showing context
-  const shouldShowConnected =
-    ideStatus === 'connected' && !shouldShowIdeSelection
+  const shouldShowConnected = ideStatus === 'connected' && !shouldShowIdeSelection;
 
   const showIDEInstallError =
-    showIDEInstallErrorOrJetBrainsInfo &&
-    !isJetBrains &&
-    !shouldShowConnected &&
-    !shouldShowIdeSelection
+    showIDEInstallErrorOrJetBrainsInfo && !isJetBrains && !shouldShowConnected && !shouldShowIdeSelection;
 
   const showJetBrainsInfo =
-    showIDEInstallErrorOrJetBrainsInfo &&
-    isJetBrains &&
-    !shouldShowConnected &&
-    !shouldShowIdeSelection
+    showIDEInstallErrorOrJetBrainsInfo && isJetBrains && !shouldShowConnected && !shouldShowIdeSelection;
 
   // Show the /ide command hint if running from an external terminal and found running IDE(s)
   // Delay showing hint to avoid brief flash during auto-connect startup
   useEffect(() => {
-    if (getIsRemoteMode()) return
+    if (getIsRemoteMode()) return;
     if (isSupportedTerminal() || ideStatus !== null || showJetBrainsInfo) {
-      removeNotification('ide-status-hint')
-      return
+      removeNotification('ide-status-hint');
+      return;
     }
     // Wait a bit to let auto-connect happen first, avoiding brief hint flash
-    if (
-      hasShownHintRef.current ||
-      (getGlobalConfig().ideHintShownCount ?? 0) >= MAX_IDE_HINT_SHOW_COUNT
-    ) {
-      return
+    if (hasShownHintRef.current || (getGlobalConfig().ideHintShownCount ?? 0) >= MAX_IDE_HINT_SHOW_COUNT) {
+      return;
     }
     const timeoutId = setTimeout(
       (hasShownHintRef, addNotification) => {
         void detectIDEs(true).then(infos => {
-          const ideName = infos[0]?.name
+          const ideName = infos[0]?.name;
           if (ideName && !hasShownHintRef.current) {
-            hasShownHintRef.current = true
+            hasShownHintRef.current = true;
             saveGlobalConfig(current => ({
               ...current,
               ideHintShownCount: (current.ideHintShownCount ?? 0) + 1,
-            }))
+            }));
             addNotification({
               key: 'ide-status-hint',
               jsx: (
@@ -90,70 +66,58 @@ export function useIDEStatusIndicator({
                 </Text>
               ),
               priority: 'low',
-            })
+            });
           }
-        })
+        });
       },
       3000,
       hasShownHintRef,
       addNotification,
-    )
-    return () => clearTimeout(timeoutId)
-  }, [addNotification, removeNotification, ideStatus, showJetBrainsInfo])
+    );
+    return () => clearTimeout(timeoutId);
+  }, [addNotification, removeNotification, ideStatus, showJetBrainsInfo]);
 
   // Show IDE disconnected/failed notification when status is disconnected
   useEffect(() => {
-    if (getIsRemoteMode()) return
-    if (
-      showIDEInstallError ||
-      showJetBrainsInfo ||
-      ideStatus !== 'disconnected' ||
-      !ideName
-    ) {
-      removeNotification('ide-status-disconnected')
-      return
+    if (getIsRemoteMode()) return;
+    if (showIDEInstallError || showJetBrainsInfo || ideStatus !== 'disconnected' || !ideName) {
+      removeNotification('ide-status-disconnected');
+      return;
     }
     addNotification({
       key: 'ide-status-disconnected',
       text: `${ideName} disconnected`,
       color: 'error',
       priority: 'medium',
-    })
-  }, [
-    addNotification,
-    removeNotification,
-    ideStatus,
-    ideName,
-    showIDEInstallError,
-    showJetBrainsInfo,
-  ])
+    });
+  }, [addNotification, removeNotification, ideStatus, ideName, showIDEInstallError, showJetBrainsInfo]);
 
   // Show JetBrains plugin not connected hint
   useEffect(() => {
-    if (getIsRemoteMode()) return
+    if (getIsRemoteMode()) return;
     if (!showJetBrainsInfo) {
-      removeNotification('ide-status-jetbrains-disconnected')
-      return
+      removeNotification('ide-status-jetbrains-disconnected');
+      return;
     }
     addNotification({
       key: 'ide-status-jetbrains-disconnected',
       text: 'IDE plugin not connected · /status for info',
       priority: 'medium',
-    })
-  }, [addNotification, removeNotification, showJetBrainsInfo])
+    });
+  }, [addNotification, removeNotification, showJetBrainsInfo]);
 
   // Show IDE install error
   useEffect(() => {
-    if (getIsRemoteMode()) return
+    if (getIsRemoteMode()) return;
     if (!showIDEInstallError) {
-      removeNotification('ide-status-install-error')
-      return
+      removeNotification('ide-status-install-error');
+      return;
     }
     addNotification({
       key: 'ide-status-install-error',
       text: 'IDE extension install failed (see /status for info)',
       color: 'error',
       priority: 'medium',
-    })
-  }, [addNotification, removeNotification, showIDEInstallError])
+    });
+  }, [addNotification, removeNotification, showIDEInstallError]);
 }
diff --git a/src/hooks/notifs/useInstallMessages.tsx b/src/hooks/notifs/useInstallMessages.tsx
index 47d4dc73d..3b91c98fb 100644
--- a/src/hooks/notifs/useInstallMessages.tsx
+++ b/src/hooks/notifs/useInstallMessages.tsx
@@ -1,22 +1,22 @@
-import { checkInstall } from 'src/utils/nativeInstaller/index.js'
-import { useStartupNotification } from './useStartupNotification.js'
+import { checkInstall } from 'src/utils/nativeInstaller/index.js';
+import { useStartupNotification } from './useStartupNotification.js';
 
 export function useInstallMessages(): void {
   useStartupNotification(async () => {
-    const messages = await checkInstall()
+    const messages = await checkInstall();
     return messages.map((message, index) => {
-      let priority: 'low' | 'medium' | 'high' | 'immediate' = 'low'
+      let priority: 'low' | 'medium' | 'high' | 'immediate' = 'low';
       if (message.type === 'error' || message.userActionRequired) {
-        priority = 'high'
+        priority = 'high';
       } else if (message.type === 'path' || message.type === 'alias') {
-        priority = 'medium'
+        priority = 'medium';
       }
       return {
         key: `install-message-${index}-${message.type}`,
         text: message.message,
         priority,
         color: message.type === 'error' ? 'error' : 'warning',
-      }
-    })
-  })
+      };
+    });
+  });
 }
diff --git a/src/hooks/notifs/useLspInitializationNotification.tsx b/src/hooks/notifs/useLspInitializationNotification.tsx
index 7b096f2b0..0619e56a6 100644
--- a/src/hooks/notifs/useLspInitializationNotification.tsx
+++ b/src/hooks/notifs/useLspInitializationNotification.tsx
@@ -1,17 +1,14 @@
-import * as React from 'react'
-import { useInterval } from 'usehooks-ts'
-import { getIsRemoteMode, getIsScrollDraining } from '../../bootstrap/state.js'
-import { useNotifications } from '../../context/notifications.js'
-import { Text } from '@anthropic/ink'
-import {
-  getInitializationStatus,
-  getLspServerManager,
-} from '../../services/lsp/manager.js'
-import { useSetAppState } from '../../state/AppState.js'
-import { logForDebugging } from '../../utils/debug.js'
-import { isEnvTruthy } from '../../utils/envUtils.js'
+import * as React from 'react';
+import { useInterval } from 'usehooks-ts';
+import { getIsRemoteMode, getIsScrollDraining } from '../../bootstrap/state.js';
+import { useNotifications } from '../../context/notifications.js';
+import { Text } from '@anthropic/ink';
+import { getInitializationStatus, getLspServerManager } from '../../services/lsp/manager.js';
+import { useSetAppState } from '../../state/AppState.js';
+import { logForDebugging } from '../../utils/debug.js';
+import { isEnvTruthy } from '../../utils/envUtils.js';
 
-const LSP_POLL_INTERVAL_MS = 5000
+const LSP_POLL_INTERVAL_MS = 5000;
 
 /**
  * Hook that polls LSP status and shows a notification when:
@@ -23,27 +20,25 @@ const LSP_POLL_INTERVAL_MS = 5000
  * Only active when ENABLE_LSP_TOOL is set.
  */
 export function useLspInitializationNotification(): void {
-  const { addNotification } = useNotifications()
-  const setAppState = useSetAppState()
+  const { addNotification } = useNotifications();
+  const setAppState = useSetAppState();
   // Lazy initializer — eager form re-evaluates isEnvTruthy on every REPL
   // render (the arg expression runs even though useState ignores it after
   // mount). Showed up as 7.2s isEnvTruthy self-time during PageUp spam
   // after #24498 swapped cheap !!process.env.X for isEnvTruthy().
-  const [shouldPoll, setShouldPoll] = React.useState(() =>
-    isEnvTruthy("true"),
-  )
+  const [shouldPoll, setShouldPoll] = React.useState(() => isEnvTruthy('true'));
   // Track which errors we've already notified about to avoid duplicates
-  const notifiedErrorsRef = React.useRef<Set<string>>(new Set())
+  const notifiedErrorsRef = React.useRef<Set<string>>(new Set());
 
   const addError = React.useCallback(
     (source: string, errorMessage: string) => {
-      const errorKey = `${source}:${errorMessage}`
+      const errorKey = `${source}:${errorMessage}`;
       if (notifiedErrorsRef.current.has(errorKey)) {
-        return // Already notified
+        return; // Already notified
       }
-      notifiedErrorsRef.current.add(errorKey)
+      notifiedErrorsRef.current.add(errorKey);
 
-      logForDebugging(`LSP error: ${source} - ${errorMessage}`)
+      logForDebugging(`LSP error: ${source} - ${errorMessage}`);
 
       // Add error to appState.plugins.errors
       setAppState(prev => {
@@ -51,15 +46,15 @@ export function useLspInitializationNotification(): void {
         const existingKeys = new Set(
           prev.plugins.errors.map(e => {
             if (e.type === 'generic-error') {
-              return `generic-error:${e.source}:${e.error}`
+              return `generic-error:${e.source}:${e.error}`;
             }
-            return `${e.type}:${e.source}`
+            return `${e.type}:${e.source}`;
           }),
-        )
+        );
 
-        const stateErrorKey = `generic-error:${source}:${errorMessage}`
+        const stateErrorKey = `generic-error:${source}:${errorMessage}`;
         if (existingKeys.has(stateErrorKey)) {
-          return prev
+          return prev;
         }
 
         return {
@@ -75,13 +70,11 @@ export function useLspInitializationNotification(): void {
               },
             ],
           },
-        }
-      })
+        };
+      });
 
       // Show notification - extract plugin name from source like "plugin:typescript-lsp:typescript"
-      const displayName = source.startsWith('plugin:')
-        ? (source.split(':')[1] ?? source)
-        : source
+      const displayName = source.startsWith('plugin:') ? (source.split(':')[1] ?? source) : source;
 
       addNotification({
         key: `lsp-error-${source}`,
@@ -93,49 +86,49 @@ export function useLspInitializationNotification(): void {
         ),
         priority: 'medium',
         timeoutMs: 8000,
-      })
+      });
     },
     [addNotification, setAppState],
-  )
+  );
 
   const poll = React.useCallback(() => {
-    if (getIsRemoteMode()) return
+    if (getIsRemoteMode()) return;
     // Skip during scroll drain — iterating all LSP servers + setAppState
     // competes for the event loop with scroll frames. Next interval picks up.
-    if (getIsScrollDraining()) return
+    if (getIsScrollDraining()) return;
 
-    const status = getInitializationStatus()
+    const status = getInitializationStatus();
 
     // Check manager initialization status
     if (status.status === 'failed') {
-      addError('lsp-manager', status.error.message)
-      setShouldPoll(false)
-      return
+      addError('lsp-manager', status.error.message);
+      setShouldPoll(false);
+      return;
     }
 
     if (status.status === 'pending' || status.status === 'not-started') {
       // Still initializing, continue polling
-      return
+      return;
     }
 
     // Manager initialized successfully - check for server errors
-    const manager = getLspServerManager()
+    const manager = getLspServerManager();
     if (manager) {
-      const servers = manager.getAllServers()
+      const servers = manager.getAllServers();
       for (const [serverName, server] of servers) {
         if (server.state === 'error' && server.lastError) {
-          addError(serverName, server.lastError.message)
+          addError(serverName, server.lastError.message);
         }
       }
     }
     // Continue polling to detect future server errors
-  }, [addError])
+  }, [addError]);
 
-  useInterval(poll, shouldPoll ? LSP_POLL_INTERVAL_MS : null)
+  useInterval(poll, shouldPoll ? LSP_POLL_INTERVAL_MS : null);
 
   // Initial poll on mount
   React.useEffect(() => {
-    if (getIsRemoteMode() || !shouldPoll) return
-    poll()
-  }, [poll, shouldPoll])
+    if (getIsRemoteMode() || !shouldPoll) return;
+    poll();
+  }, [poll, shouldPoll]);
 }
diff --git a/src/hooks/notifs/useMcpConnectivityStatus.tsx b/src/hooks/notifs/useMcpConnectivityStatus.tsx
index 89adb8382..2f0c02cdb 100644
--- a/src/hooks/notifs/useMcpConnectivityStatus.tsx
+++ b/src/hooks/notifs/useMcpConnectivityStatus.tsx
@@ -1,30 +1,28 @@
-import * as React from 'react'
-import { useEffect } from 'react'
-import { useNotifications } from 'src/context/notifications.js'
-import { getIsRemoteMode } from '../../bootstrap/state.js'
-import { Text } from '@anthropic/ink'
-import { hasClaudeAiMcpEverConnected } from '../../services/mcp/claudeai.js'
-import type { MCPServerConnection } from '../../services/mcp/types.js'
+import * as React from 'react';
+import { useEffect } from 'react';
+import { useNotifications } from 'src/context/notifications.js';
+import { getIsRemoteMode } from '../../bootstrap/state.js';
+import { Text } from '@anthropic/ink';
+import { hasClaudeAiMcpEverConnected } from '../../services/mcp/claudeai.js';
+import type { MCPServerConnection } from '../../services/mcp/types.js';
 
 type Props = {
-  mcpClients?: MCPServerConnection[]
-}
+  mcpClients?: MCPServerConnection[];
+};
 
-const EMPTY_MCP_CLIENTS: MCPServerConnection[] = []
+const EMPTY_MCP_CLIENTS: MCPServerConnection[] = [];
 
-export function useMcpConnectivityStatus({
-  mcpClients = EMPTY_MCP_CLIENTS,
-}: Props): void {
-  const { addNotification } = useNotifications()
+export function useMcpConnectivityStatus({ mcpClients = EMPTY_MCP_CLIENTS }: Props): void {
+  const { addNotification } = useNotifications();
   useEffect(() => {
-    if (getIsRemoteMode()) return
+    if (getIsRemoteMode()) return;
     const failedLocalClients = mcpClients.filter(
       client =>
         client.type === 'failed' &&
         client.config.type !== 'sse-ide' &&
         client.config.type !== 'ws-ide' &&
         client.config.type !== 'claudeai-proxy',
-    )
+    );
     // claude.ai failures get a separate notification: they almost always indicate
     // a toolbox-service outage (shared auth backend), not a local config issue.
     // Only flag connectors that have previously connected successfully — an
@@ -33,27 +31,24 @@ export function useMcpConnectivityStatus({
     // yesterday and is now failed is a state change worth surfacing.
     const failedClaudeAiClients = mcpClients.filter(
       client =>
-        client.type === 'failed' &&
-        client.config.type === 'claudeai-proxy' &&
-        hasClaudeAiMcpEverConnected(client.name),
-    )
+        client.type === 'failed' && client.config.type === 'claudeai-proxy' && hasClaudeAiMcpEverConnected(client.name),
+    );
     const needsAuthLocalServers = mcpClients.filter(
-      client =>
-        client.type === 'needs-auth' && client.config.type !== 'claudeai-proxy',
-    )
+      client => client.type === 'needs-auth' && client.config.type !== 'claudeai-proxy',
+    );
     const needsAuthClaudeAiServers = mcpClients.filter(
       client =>
         client.type === 'needs-auth' &&
         client.config.type === 'claudeai-proxy' &&
         hasClaudeAiMcpEverConnected(client.name),
-    )
+    );
     if (
       failedLocalClients.length === 0 &&
       failedClaudeAiClients.length === 0 &&
       needsAuthLocalServers.length === 0 &&
       needsAuthClaudeAiServers.length === 0
     ) {
-      return
+      return;
     }
     if (failedLocalClients.length > 0) {
       addNotification({
@@ -61,14 +56,13 @@ export function useMcpConnectivityStatus({
         jsx: (
           <>
             <Text color="error">
-              {failedLocalClients.length} MCP{' '}
-              {failedLocalClients.length === 1 ? 'server' : 'servers'} failed
+              {failedLocalClients.length} MCP {failedLocalClients.length === 1 ? 'server' : 'servers'} failed
             </Text>
             <Text dimColor> · /mcp</Text>
           </>
         ),
         priority: 'medium',
-      })
+      });
     }
     if (failedClaudeAiClients.length > 0) {
       addNotification({
@@ -76,15 +70,14 @@ export function useMcpConnectivityStatus({
         jsx: (
           <>
             <Text color="error">
-              {failedClaudeAiClients.length} claude.ai{' '}
-              {failedClaudeAiClients.length === 1 ? 'connector' : 'connectors'}{' '}
+              {failedClaudeAiClients.length} claude.ai {failedClaudeAiClients.length === 1 ? 'connector' : 'connectors'}{' '}
               unavailable
             </Text>
             <Text dimColor> · /mcp</Text>
           </>
         ),
         priority: 'medium',
-      })
+      });
     }
     if (needsAuthLocalServers.length > 0) {
       addNotification({
@@ -92,17 +85,14 @@ export function useMcpConnectivityStatus({
         jsx: (
           <>
             <Text color="warning">
-              {needsAuthLocalServers.length} MCP{' '}
-              {needsAuthLocalServers.length === 1
-                ? 'server needs'
-                : 'servers need'}{' '}
+              {needsAuthLocalServers.length} MCP {needsAuthLocalServers.length === 1 ? 'server needs' : 'servers need'}{' '}
               auth
             </Text>
             <Text dimColor> · /mcp</Text>
           </>
         ),
         priority: 'medium',
-      })
+      });
     }
     if (needsAuthClaudeAiServers.length > 0) {
       addNotification({
@@ -111,16 +101,13 @@ export function useMcpConnectivityStatus({
           <>
             <Text color="warning">
               {needsAuthClaudeAiServers.length} claude.ai{' '}
-              {needsAuthClaudeAiServers.length === 1
-                ? 'connector needs'
-                : 'connectors need'}{' '}
-              auth
+              {needsAuthClaudeAiServers.length === 1 ? 'connector needs' : 'connectors need'} auth
             </Text>
             <Text dimColor> · /mcp</Text>
           </>
         ),
         priority: 'medium',
-      })
+      });
     }
-  }, [addNotification, mcpClients])
+  }, [addNotification, mcpClients]);
 }
diff --git a/src/hooks/notifs/useModelMigrationNotifications.tsx b/src/hooks/notifs/useModelMigrationNotifications.tsx
index b2bdc52fb..83286ca4c 100644
--- a/src/hooks/notifs/useModelMigrationNotifications.tsx
+++ b/src/hooks/notifs/useModelMigrationNotifications.tsx
@@ -1,6 +1,6 @@
-import type { Notification } from 'src/context/notifications.js'
-import { type GlobalConfig, getGlobalConfig } from 'src/utils/config.js'
-import { useStartupNotification } from './useStartupNotification.js'
+import type { Notification } from 'src/context/notifications.js';
+import { type GlobalConfig, getGlobalConfig } from 'src/utils/config.js';
+import { useStartupNotification } from './useStartupNotification.js';
 
 // Shows a one-time notification right after a model migration writes its
 // timestamp to config. Each entry reads its own timestamp field(s) and emits
@@ -9,21 +9,21 @@ import { useStartupNotification } from './useStartupNotification.js'
 const MIGRATIONS: ((c: GlobalConfig) => Notification | undefined)[] = [
   // Sonnet 4.5 → 4.6 (pro/max/team premium)
   c => {
-    if (!recent(c.sonnet45To46MigrationTimestamp)) return
+    if (!recent(c.sonnet45To46MigrationTimestamp)) return;
     return {
       key: 'sonnet-46-update',
       text: 'Model updated to Sonnet 4.6',
       color: 'suggestion',
       priority: 'high',
       timeoutMs: 3000,
-    }
+    };
   },
   // Opus Pro → default, or pinned 4.0/4.1 → opus alias. Both land on the
   // current Opus default (4.6 for 1P).
   c => {
-    const isLegacyRemap = Boolean(c.legacyOpusMigrationTimestamp)
-    const ts = c.legacyOpusMigrationTimestamp ?? c.opusProMigrationTimestamp
-    if (!recent(ts)) return
+    const isLegacyRemap = Boolean(c.legacyOpusMigrationTimestamp);
+    const ts = c.legacyOpusMigrationTimestamp ?? c.opusProMigrationTimestamp;
+    if (!recent(ts)) return;
     return {
       key: 'opus-pro-update',
       text: isLegacyRemap
@@ -32,22 +32,22 @@ const MIGRATIONS: ((c: GlobalConfig) => Notification | undefined)[] = [
       color: 'suggestion',
       priority: 'high',
       timeoutMs: isLegacyRemap ? 8000 : 3000,
-    }
+    };
   },
-]
+];
 
 export function useModelMigrationNotifications(): void {
   useStartupNotification(() => {
-    const config = getGlobalConfig()
-    const notifs: Notification[] = []
+    const config = getGlobalConfig();
+    const notifs: Notification[] = [];
     for (const migration of MIGRATIONS) {
-      const notif = migration(config)
-      if (notif) notifs.push(notif)
+      const notif = migration(config);
+      if (notif) notifs.push(notif);
     }
-    return notifs.length > 0 ? notifs : null
-  })
+    return notifs.length > 0 ? notifs : null;
+  });
 }
 
 function recent(ts: number | undefined): boolean {
-  return ts !== undefined && Date.now() - ts < 3000
+  return ts !== undefined && Date.now() - ts < 3000;
 }
diff --git a/src/hooks/notifs/useNpmDeprecationNotification.tsx b/src/hooks/notifs/useNpmDeprecationNotification.tsx
index e6d62bff7..4f5c1a9d4 100644
--- a/src/hooks/notifs/useNpmDeprecationNotification.tsx
+++ b/src/hooks/notifs/useNpmDeprecationNotification.tsx
@@ -1,27 +1,23 @@
-import { isInBundledMode } from 'src/utils/bundledMode.js'
-import { getCurrentInstallationType } from 'src/utils/doctorDiagnostic.js'
-import { isEnvTruthy } from 'src/utils/envUtils.js'
-import { useStartupNotification } from './useStartupNotification.js'
+import { isInBundledMode } from 'src/utils/bundledMode.js';
+import { getCurrentInstallationType } from 'src/utils/doctorDiagnostic.js';
+import { isEnvTruthy } from 'src/utils/envUtils.js';
+import { useStartupNotification } from './useStartupNotification.js';
 
-const NPM_DEPRECATION_MESSAGE =
-  ''
+const NPM_DEPRECATION_MESSAGE = '';
 
 export function useNpmDeprecationNotification(): void {
   useStartupNotification(async () => {
-    if (
-      isInBundledMode() ||
-      isEnvTruthy(process.env.DISABLE_INSTALLATION_CHECKS)
-    ) {
-      return null
+    if (isInBundledMode() || isEnvTruthy(process.env.DISABLE_INSTALLATION_CHECKS)) {
+      return null;
     }
-    const installationType = await getCurrentInstallationType()
-    if (installationType === 'development') return null
+    const installationType = await getCurrentInstallationType();
+    if (installationType === 'development') return null;
     return {
       timeoutMs: 15000,
       key: 'npm-deprecation-warning',
       text: NPM_DEPRECATION_MESSAGE,
       color: 'warning',
       priority: 'high',
-    }
-  })
+    };
+  });
 }
diff --git a/src/hooks/notifs/usePluginAutoupdateNotification.tsx b/src/hooks/notifs/usePluginAutoupdateNotification.tsx
index 7468e8ba0..1a4e2ee11 100644
--- a/src/hooks/notifs/usePluginAutoupdateNotification.tsx
+++ b/src/hooks/notifs/usePluginAutoupdateNotification.tsx
@@ -1,67 +1,59 @@
-import * as React from 'react'
-import { useEffect, useState } from 'react'
-import { getIsRemoteMode } from '../../bootstrap/state.js'
-import { useNotifications } from '../../context/notifications.js'
-import { Text } from '@anthropic/ink'
-import { logForDebugging } from '../../utils/debug.js'
-import { onPluginsAutoUpdated } from '../../utils/plugins/pluginAutoupdate.js'
+import * as React from 'react';
+import { useEffect, useState } from 'react';
+import { getIsRemoteMode } from '../../bootstrap/state.js';
+import { useNotifications } from '../../context/notifications.js';
+import { Text } from '@anthropic/ink';
+import { logForDebugging } from '../../utils/debug.js';
+import { onPluginsAutoUpdated } from '../../utils/plugins/pluginAutoupdate.js';
 
 /**
  * Hook that displays a notification when plugins have been auto-updated.
  * The notification tells the user to run /reload-plugins to apply the updates.
  */
 export function usePluginAutoupdateNotification(): void {
-  const { addNotification } = useNotifications()
-  const [updatedPlugins, setUpdatedPlugins] = useState<string[]>([])
+  const { addNotification } = useNotifications();
+  const [updatedPlugins, setUpdatedPlugins] = useState<string[]>([]);
 
   // Register for autoupdate notifications
   useEffect(() => {
-    if (getIsRemoteMode()) return
+    if (getIsRemoteMode()) return;
     const unsubscribe = onPluginsAutoUpdated(plugins => {
-      logForDebugging(
-        `Plugin autoupdate notification: ${plugins.length} plugin(s) updated`,
-      )
-      setUpdatedPlugins(plugins)
-    })
+      logForDebugging(`Plugin autoupdate notification: ${plugins.length} plugin(s) updated`);
+      setUpdatedPlugins(plugins);
+    });
 
-    return unsubscribe
-  }, [])
+    return unsubscribe;
+  }, []);
 
   // Show notification when plugins are updated
   useEffect(() => {
-    if (getIsRemoteMode()) return
+    if (getIsRemoteMode()) return;
     if (updatedPlugins.length === 0) {
-      return
+      return;
     }
 
     // Extract plugin names from plugin IDs (format: "name@marketplace")
     const pluginNames = updatedPlugins.map(id => {
-      const atIndex = id.indexOf('@')
-      return atIndex > 0 ? id.substring(0, atIndex) : id
-    })
+      const atIndex = id.indexOf('@');
+      return atIndex > 0 ? id.substring(0, atIndex) : id;
+    });
 
-    const displayNames =
-      pluginNames.length <= 2
-        ? pluginNames.join(' and ')
-        : `${pluginNames.length} plugins`
+    const displayNames = pluginNames.length <= 2 ? pluginNames.join(' and ') : `${pluginNames.length} plugins`;
 
     addNotification({
       key: 'plugin-autoupdate-restart',
       jsx: (
         <>
           <Text color="success">
-            {pluginNames.length === 1 ? 'Plugin' : 'Plugins'} updated:{' '}
-            {displayNames}
+            {pluginNames.length === 1 ? 'Plugin' : 'Plugins'} updated: {displayNames}
           </Text>
           <Text dimColor> · Run /reload-plugins to apply</Text>
         </>
       ),
       priority: 'low',
       timeoutMs: 10000,
-    })
+    });
 
-    logForDebugging(
-      `Showing plugin autoupdate notification for: ${pluginNames.join(', ')}`,
-    )
-  }, [updatedPlugins, addNotification])
+    logForDebugging(`Showing plugin autoupdate notification for: ${pluginNames.join(', ')}`);
+  }, [updatedPlugins, addNotification]);
 }
diff --git a/src/hooks/notifs/usePluginInstallationStatus.tsx b/src/hooks/notifs/usePluginInstallationStatus.tsx
index 9ab3de8fe..8884531d8 100644
--- a/src/hooks/notifs/usePluginInstallationStatus.tsx
+++ b/src/hooks/notifs/usePluginInstallationStatus.tsx
@@ -1,64 +1,57 @@
-import * as React from 'react'
-import { useEffect, useMemo } from 'react'
-import { getIsRemoteMode } from '../../bootstrap/state.js'
-import { useNotifications } from '../../context/notifications.js'
-import { Text } from '@anthropic/ink'
-import { useAppState } from '../../state/AppState.js'
-import { logForDebugging } from '../../utils/debug.js'
-import { plural } from '../../utils/stringUtils.js'
+import * as React from 'react';
+import { useEffect, useMemo } from 'react';
+import { getIsRemoteMode } from '../../bootstrap/state.js';
+import { useNotifications } from '../../context/notifications.js';
+import { Text } from '@anthropic/ink';
+import { useAppState } from '../../state/AppState.js';
+import { logForDebugging } from '../../utils/debug.js';
+import { plural } from '../../utils/stringUtils.js';
 
 export function usePluginInstallationStatus(): void {
-  const { addNotification } = useNotifications()
-  const installationStatus = useAppState(s => s.plugins.installationStatus)
+  const { addNotification } = useNotifications();
+  const installationStatus = useAppState(s => s.plugins.installationStatus);
 
   // Memoize the failed counts to prevent unnecessary effect triggers
-  const { totalFailed, failedMarketplacesCount, failedPluginsCount } =
-    useMemo(() => {
-      if (!installationStatus) {
-        return {
-          totalFailed: 0,
-          failedMarketplacesCount: 0,
-          failedPluginsCount: 0,
-        }
-      }
-
-      const failedMarketplaces = installationStatus.marketplaces.filter(
-        m => m.status === 'failed',
-      )
-      const failedPlugins = installationStatus.plugins.filter(
-        p => p.status === 'failed',
-      )
-
+  const { totalFailed, failedMarketplacesCount, failedPluginsCount } = useMemo(() => {
+    if (!installationStatus) {
       return {
-        totalFailed: failedMarketplaces.length + failedPlugins.length,
-        failedMarketplacesCount: failedMarketplaces.length,
-        failedPluginsCount: failedPlugins.length,
-      }
-    }, [installationStatus])
+        totalFailed: 0,
+        failedMarketplacesCount: 0,
+        failedPluginsCount: 0,
+      };
+    }
+
+    const failedMarketplaces = installationStatus.marketplaces.filter(m => m.status === 'failed');
+    const failedPlugins = installationStatus.plugins.filter(p => p.status === 'failed');
+
+    return {
+      totalFailed: failedMarketplaces.length + failedPlugins.length,
+      failedMarketplacesCount: failedMarketplaces.length,
+      failedPluginsCount: failedPlugins.length,
+    };
+  }, [installationStatus]);
 
   useEffect(() => {
-    if (getIsRemoteMode()) return
+    if (getIsRemoteMode()) return;
     if (!installationStatus) {
-      logForDebugging('No installation status to monitor')
-      return
+      logForDebugging('No installation status to monitor');
+      return;
     }
 
     if (totalFailed === 0) {
-      return
+      return;
     }
 
     logForDebugging(
       `Plugin installation status: ${failedMarketplacesCount} failed marketplaces, ${failedPluginsCount} failed plugins`,
-    )
+    );
 
     if (totalFailed === 0) {
-      return
+      return;
     }
 
     // Add notification for failures
-    logForDebugging(
-      `Adding notification for ${totalFailed} failed installations`,
-    )
+    logForDebugging(`Adding notification for ${totalFailed} failed installations`);
     addNotification({
       key: 'plugin-install-failed',
       jsx: (
@@ -70,11 +63,6 @@ export function usePluginInstallationStatus(): void {
         </>
       ),
       priority: 'medium',
-    })
-  }, [
-    addNotification,
-    totalFailed,
-    failedMarketplacesCount,
-    failedPluginsCount,
-  ])
+    });
+  }, [addNotification, totalFailed, failedMarketplacesCount, failedPluginsCount]);
 }
diff --git a/src/hooks/notifs/useRateLimitWarningNotification.tsx b/src/hooks/notifs/useRateLimitWarningNotification.tsx
index 0e8520e96..5d30e761d 100644
--- a/src/hooks/notifs/useRateLimitWarningNotification.tsx
+++ b/src/hooks/notifs/useRateLimitWarningNotification.tsx
@@ -1,56 +1,41 @@
-import * as React from 'react'
-import { useEffect, useMemo, useRef, useState } from 'react'
-import { useNotifications } from 'src/context/notifications.js'
-import { Text } from '@anthropic/ink'
-import {
-  getRateLimitWarning,
-  getUsingOverageText,
-} from 'src/services/claudeAiLimits.js'
-import { useClaudeAiLimits } from 'src/services/claudeAiLimitsHook.js'
-import { getSubscriptionType } from 'src/utils/auth.js'
-import { hasClaudeAiBillingAccess } from 'src/utils/billing.js'
-import { getIsRemoteMode } from '../../bootstrap/state.js'
+import * as React from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
+import { useNotifications } from 'src/context/notifications.js';
+import { Text } from '@anthropic/ink';
+import { getRateLimitWarning, getUsingOverageText } from 'src/services/claudeAiLimits.js';
+import { useClaudeAiLimits } from 'src/services/claudeAiLimitsHook.js';
+import { getSubscriptionType } from 'src/utils/auth.js';
+import { hasClaudeAiBillingAccess } from 'src/utils/billing.js';
+import { getIsRemoteMode } from '../../bootstrap/state.js';
 
 export function useRateLimitWarningNotification(model: string): void {
-  const { addNotification } = useNotifications()
-  const claudeAiLimits = useClaudeAiLimits()
+  const { addNotification } = useNotifications();
+  const claudeAiLimits = useClaudeAiLimits();
   // claudeAiLimits reference is stable until statusListeners fire (API
   // response), so these skip the Intl formatting work on most REPL renders.
-  const rateLimitWarning = useMemo(
-    () => getRateLimitWarning(claudeAiLimits, model),
-    [claudeAiLimits, model],
-  )
-  const usingOverageText = useMemo(
-    () => getUsingOverageText(claudeAiLimits),
-    [claudeAiLimits],
-  )
-  const shownWarningRef = useRef<string | null>(null)
-  const subscriptionType = getSubscriptionType()
-  const hasBillingAccess = hasClaudeAiBillingAccess()
-  const isTeamOrEnterprise =
-    subscriptionType === 'team' || subscriptionType === 'enterprise'
+  const rateLimitWarning = useMemo(() => getRateLimitWarning(claudeAiLimits, model), [claudeAiLimits, model]);
+  const usingOverageText = useMemo(() => getUsingOverageText(claudeAiLimits), [claudeAiLimits]);
+  const shownWarningRef = useRef<string | null>(null);
+  const subscriptionType = getSubscriptionType();
+  const hasBillingAccess = hasClaudeAiBillingAccess();
+  const isTeamOrEnterprise = subscriptionType === 'team' || subscriptionType === 'enterprise';
 
   // Track overage mode transitions
-  const [hasShownOverageNotification, setHasShownOverageNotification] =
-    useState(false)
+  const [hasShownOverageNotification, setHasShownOverageNotification] = useState(false);
 
   // Show immediate notification when entering overage mode
   useEffect(() => {
-    if (getIsRemoteMode()) return
-    if (
-      claudeAiLimits.isUsingOverage &&
-      !hasShownOverageNotification &&
-      (!isTeamOrEnterprise || hasBillingAccess)
-    ) {
+    if (getIsRemoteMode()) return;
+    if (claudeAiLimits.isUsingOverage && !hasShownOverageNotification && (!isTeamOrEnterprise || hasBillingAccess)) {
       addNotification({
         key: 'limit-reached',
         text: usingOverageText,
         priority: 'immediate',
-      })
-      setHasShownOverageNotification(true)
+      });
+      setHasShownOverageNotification(true);
     } else if (!claudeAiLimits.isUsingOverage && hasShownOverageNotification) {
       // Reset when no longer in overage mode
-      setHasShownOverageNotification(false)
+      setHasShownOverageNotification(false);
     }
   }, [
     claudeAiLimits.isUsingOverage,
@@ -59,13 +44,13 @@ export function useRateLimitWarningNotification(model: string): void {
     addNotification,
     hasBillingAccess,
     isTeamOrEnterprise,
-  ])
+  ]);
 
   // Show warning notification for approaching limits
   useEffect(() => {
-    if (getIsRemoteMode()) return
+    if (getIsRemoteMode()) return;
     if (rateLimitWarning && rateLimitWarning !== shownWarningRef.current) {
-      shownWarningRef.current = rateLimitWarning
+      shownWarningRef.current = rateLimitWarning;
       addNotification({
         key: 'rate-limit-warning',
         jsx: (
@@ -74,7 +59,7 @@ export function useRateLimitWarningNotification(model: string): void {
           </Text>
         ),
         priority: 'high',
-      })
+      });
     }
-  }, [rateLimitWarning, addNotification])
+  }, [rateLimitWarning, addNotification]);
 }
diff --git a/src/hooks/notifs/useSettingsErrors.tsx b/src/hooks/notifs/useSettingsErrors.tsx
index 86c762cec..5e13290d7 100644
--- a/src/hooks/notifs/useSettingsErrors.tsx
+++ b/src/hooks/notifs/useSettingsErrors.tsx
@@ -1,41 +1,41 @@
-import { useCallback, useEffect, useState } from 'react'
-import { useNotifications } from 'src/context/notifications.js'
-import { getIsRemoteMode } from '../../bootstrap/state.js'
-import { getSettingsWithAllErrors } from '../../utils/settings/allErrors.js'
-import type { ValidationError } from '../../utils/settings/validation.js'
-import { useSettingsChange } from '../useSettingsChange.js'
+import { useCallback, useEffect, useState } from 'react';
+import { useNotifications } from 'src/context/notifications.js';
+import { getIsRemoteMode } from '../../bootstrap/state.js';
+import { getSettingsWithAllErrors } from '../../utils/settings/allErrors.js';
+import type { ValidationError } from '../../utils/settings/validation.js';
+import { useSettingsChange } from '../useSettingsChange.js';
 
-const SETTINGS_ERRORS_NOTIFICATION_KEY = 'settings-errors'
+const SETTINGS_ERRORS_NOTIFICATION_KEY = 'settings-errors';
 
 export function useSettingsErrors(): ValidationError[] {
-  const { addNotification, removeNotification } = useNotifications()
+  const { addNotification, removeNotification } = useNotifications();
   const [errors, setErrors] = useState<ValidationError[]>(() => {
-    const { errors } = getSettingsWithAllErrors()
-    return errors
-  })
+    const { errors } = getSettingsWithAllErrors();
+    return errors;
+  });
 
   const handleSettingsChange = useCallback(() => {
-    const { errors } = getSettingsWithAllErrors()
-    setErrors(errors)
-  }, [])
+    const { errors } = getSettingsWithAllErrors();
+    setErrors(errors);
+  }, []);
 
-  useSettingsChange(handleSettingsChange)
+  useSettingsChange(handleSettingsChange);
 
   useEffect(() => {
-    if (getIsRemoteMode()) return
+    if (getIsRemoteMode()) return;
     if (errors.length > 0) {
-      const message = `Found ${errors.length} settings ${errors.length === 1 ? 'issue' : 'issues'} · /doctor for details`
+      const message = `Found ${errors.length} settings ${errors.length === 1 ? 'issue' : 'issues'} · /doctor for details`;
       addNotification({
         key: SETTINGS_ERRORS_NOTIFICATION_KEY,
         text: message,
         color: 'warning',
         priority: 'high',
         timeoutMs: 60000,
-      })
+      });
     } else {
-      removeNotification(SETTINGS_ERRORS_NOTIFICATION_KEY)
+      removeNotification(SETTINGS_ERRORS_NOTIFICATION_KEY);
     }
-  }, [errors, addNotification, removeNotification])
+  }, [errors, addNotification, removeNotification]);
 
-  return errors
+  return errors;
 }
diff --git a/src/hooks/renderPlaceholder.ts b/src/hooks/renderPlaceholder.ts
index 50913ff01..d7fb91cbd 100644
--- a/src/hooks/renderPlaceholder.ts
+++ b/src/hooks/renderPlaceholder.ts
@@ -22,7 +22,7 @@ export function renderPlaceholder({
   renderedPlaceholder: string | undefined
   showPlaceholder: boolean
 } {
-  let renderedPlaceholder: string | undefined = undefined
+  let renderedPlaceholder: string | undefined
 
   if (placeholder) {
     if (hidePlaceholderText) {
diff --git a/src/hooks/src/bootstrap/state.ts b/src/hooks/src/bootstrap/state.ts
index 5c3776b79..64466ce45 100644
--- a/src/hooks/src/bootstrap/state.ts
+++ b/src/hooks/src/bootstrap/state.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type setTeleportedSessionInfo = any;
+export type setTeleportedSessionInfo = any
diff --git a/src/hooks/src/components/PromptInput/PromptInputFooterSuggestions.ts b/src/hooks/src/components/PromptInput/PromptInputFooterSuggestions.ts
index d0fd674c7..503d88641 100644
--- a/src/hooks/src/components/PromptInput/PromptInputFooterSuggestions.ts
+++ b/src/hooks/src/components/PromptInput/PromptInputFooterSuggestions.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type SuggestionItem = any;
+export type SuggestionItem = any
diff --git a/src/hooks/src/components/PromptInput/inputModes.ts b/src/hooks/src/components/PromptInput/inputModes.ts
index 22713bb37..67d513afc 100644
--- a/src/hooks/src/components/PromptInput/inputModes.ts
+++ b/src/hooks/src/components/PromptInput/inputModes.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type isInputModeCharacter = any;
-export type getModeFromInput = any;
+export type isInputModeCharacter = any
+export type getModeFromInput = any
diff --git a/src/hooks/src/context/notifications.ts b/src/hooks/src/context/notifications.ts
index 82956e65a..603737bb5 100644
--- a/src/hooks/src/context/notifications.ts
+++ b/src/hooks/src/context/notifications.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useNotifications = any;
+export type useNotifications = any
diff --git a/src/hooks/src/hooks/fileSuggestions.ts b/src/hooks/src/hooks/fileSuggestions.ts
index 273e550e1..ccf69bbf6 100644
--- a/src/hooks/src/hooks/fileSuggestions.ts
+++ b/src/hooks/src/hooks/fileSuggestions.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type generateFileSuggestions = any;
+export type generateFileSuggestions = any
diff --git a/src/hooks/src/ink.ts b/src/hooks/src/ink.ts
index 9fa0986a6..a7e12a392 100644
--- a/src/hooks/src/ink.ts
+++ b/src/hooks/src/ink.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type Text = any;
+export type Text = any
diff --git a/src/hooks/src/ink/components/TerminalSizeContext.ts b/src/hooks/src/ink/components/TerminalSizeContext.ts
index c0d125b18..496d1ba5c 100644
--- a/src/hooks/src/ink/components/TerminalSizeContext.ts
+++ b/src/hooks/src/ink/components/TerminalSizeContext.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type TerminalSize = any;
-export type TerminalSizeContext = any;
+export type TerminalSize = any
+export type TerminalSizeContext = any
diff --git a/src/hooks/src/services/analytics/index.ts b/src/hooks/src/services/analytics/index.ts
index 142e7b6f5..2e0f796da 100644
--- a/src/hooks/src/services/analytics/index.ts
+++ b/src/hooks/src/services/analytics/index.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any;
-export type logEvent = any;
+export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any
+export type logEvent = any
diff --git a/src/hooks/src/services/analytics/metadata.ts b/src/hooks/src/services/analytics/metadata.ts
index dd7c40970..696071111 100644
--- a/src/hooks/src/services/analytics/metadata.ts
+++ b/src/hooks/src/services/analytics/metadata.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type sanitizeToolNameForAnalytics = any;
-export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any;
+export type sanitizeToolNameForAnalytics = any
+export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any
diff --git a/src/hooks/src/services/mcp/types.ts b/src/hooks/src/services/mcp/types.ts
index a0f730eaa..7a82bac92 100644
--- a/src/hooks/src/services/mcp/types.ts
+++ b/src/hooks/src/services/mcp/types.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type ServerResource = any;
+export type ServerResource = any
diff --git a/src/hooks/src/state/AppState.ts b/src/hooks/src/state/AppState.ts
index f1e2aa661..80730fcb1 100644
--- a/src/hooks/src/state/AppState.ts
+++ b/src/hooks/src/state/AppState.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type useAppState = any;
-export type useAppStateStore = any;
-export type useSetAppState = any;
+export type useAppState = any
+export type useAppStateStore = any
+export type useSetAppState = any
diff --git a/src/hooks/src/tools/AgentTool/agentColorManager.ts b/src/hooks/src/tools/AgentTool/agentColorManager.ts
index 83720443d..c2754a33b 100644
--- a/src/hooks/src/tools/AgentTool/agentColorManager.ts
+++ b/src/hooks/src/tools/AgentTool/agentColorManager.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getAgentColor = any;
+export type getAgentColor = any
diff --git a/src/hooks/src/tools/AgentTool/loadAgentsDir.ts b/src/hooks/src/tools/AgentTool/loadAgentsDir.ts
index 3fa66c4bb..7ba0d976f 100644
--- a/src/hooks/src/tools/AgentTool/loadAgentsDir.ts
+++ b/src/hooks/src/tools/AgentTool/loadAgentsDir.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type AgentDefinition = { name: string; [key: string]: unknown };
+export type AgentDefinition = { name: string; [key: string]: unknown }
diff --git a/src/hooks/src/utils/conversationRecovery.ts b/src/hooks/src/utils/conversationRecovery.ts
index ecd18bdac..4a003ab02 100644
--- a/src/hooks/src/utils/conversationRecovery.ts
+++ b/src/hooks/src/utils/conversationRecovery.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type TeleportRemoteResponse = any;
+export type TeleportRemoteResponse = any
diff --git a/src/hooks/src/utils/fileRead.ts b/src/hooks/src/utils/fileRead.ts
index 108536974..1871fd2ca 100644
--- a/src/hooks/src/utils/fileRead.ts
+++ b/src/hooks/src/utils/fileRead.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type readFileSync = any;
+export type readFileSync = any
diff --git a/src/hooks/src/utils/format.ts b/src/hooks/src/utils/format.ts
index b4e3460a4..0edc95bc1 100644
--- a/src/hooks/src/utils/format.ts
+++ b/src/hooks/src/utils/format.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type truncateToWidth = any;
+export type truncateToWidth = any
diff --git a/src/hooks/src/utils/log.ts b/src/hooks/src/utils/log.ts
index cf30e90da..30df9cbcb 100644
--- a/src/hooks/src/utils/log.ts
+++ b/src/hooks/src/utils/log.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type logError = any;
+export type logError = any
diff --git a/src/hooks/src/utils/markdownConfigLoader.ts b/src/hooks/src/utils/markdownConfigLoader.ts
index 2c3f2d06c..d41ee95bb 100644
--- a/src/hooks/src/utils/markdownConfigLoader.ts
+++ b/src/hooks/src/utils/markdownConfigLoader.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type CLAUDE_CONFIG_DIRECTORIES = any;
-export type loadMarkdownFilesForSubdir = any;
+export type CLAUDE_CONFIG_DIRECTORIES = any
+export type loadMarkdownFilesForSubdir = any
diff --git a/src/hooks/src/utils/path.ts b/src/hooks/src/utils/path.ts
index a965844dd..2d783dc63 100644
--- a/src/hooks/src/utils/path.ts
+++ b/src/hooks/src/utils/path.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type expandPath = any;
+export type expandPath = any
diff --git a/src/hooks/src/utils/teleport/api.ts b/src/hooks/src/utils/teleport/api.ts
index d43b96cab..b1590f09f 100644
--- a/src/hooks/src/utils/teleport/api.ts
+++ b/src/hooks/src/utils/teleport/api.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type CodeSession = any;
+export type CodeSession = any
diff --git a/src/hooks/src/utils/theme.ts b/src/hooks/src/utils/theme.ts
index c6999a678..833b24799 100644
--- a/src/hooks/src/utils/theme.ts
+++ b/src/hooks/src/utils/theme.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type Theme = any;
+export type Theme = any
diff --git a/src/hooks/toolPermission/PermissionContext.ts b/src/hooks/toolPermission/PermissionContext.ts
index c799db1ee..b162b5979 100644
--- a/src/hooks/toolPermission/PermissionContext.ts
+++ b/src/hooks/toolPermission/PermissionContext.ts
@@ -234,7 +234,8 @@ function createPermissionContext(
             const finalInput = decision.updatedInput ?? updatedInput ?? input
             return await this.handleHookAllow(
               finalInput,
-              (decision.updatedPermissions ?? []) as unknown as import('../../types/permissions.js').PermissionUpdate[],
+              (decision.updatedPermissions ??
+                []) as unknown as import('../../types/permissions.js').PermissionUpdate[],
               permissionPromptStartTimeMs,
             )
           } else if (decision.behavior === 'deny') {
diff --git a/src/hooks/toolPermission/handlers/src/utils/debug.ts b/src/hooks/toolPermission/handlers/src/utils/debug.ts
index c64d5960c..5a0f1d515 100644
--- a/src/hooks/toolPermission/handlers/src/utils/debug.ts
+++ b/src/hooks/toolPermission/handlers/src/utils/debug.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type logForDebugging = any;
+export type logForDebugging = any
diff --git a/src/hooks/toolPermission/src/services/analytics/index.ts b/src/hooks/toolPermission/src/services/analytics/index.ts
index 142e7b6f5..2e0f796da 100644
--- a/src/hooks/toolPermission/src/services/analytics/index.ts
+++ b/src/hooks/toolPermission/src/services/analytics/index.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any;
-export type logEvent = any;
+export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any
+export type logEvent = any
diff --git a/src/hooks/toolPermission/src/services/analytics/metadata.ts b/src/hooks/toolPermission/src/services/analytics/metadata.ts
index 807602756..8d346ef8e 100644
--- a/src/hooks/toolPermission/src/services/analytics/metadata.ts
+++ b/src/hooks/toolPermission/src/services/analytics/metadata.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type sanitizeToolNameForAnalytics = any;
+export type sanitizeToolNameForAnalytics = any
diff --git a/src/hooks/useArrowKeyHistory.tsx b/src/hooks/useArrowKeyHistory.tsx
index d874e32b0..ff31bd744 100644
--- a/src/hooks/useArrowKeyHistory.tsx
+++ b/src/hooks/useArrowKeyHistory.tsx
@@ -1,149 +1,133 @@
-import React, { useCallback, useRef, useState } from 'react'
-import { getModeFromInput } from 'src/components/PromptInput/inputModes.js'
-import { useNotifications } from 'src/context/notifications.js'
-import { ConfigurableShortcutHint } from '../components/ConfigurableShortcutHint.js'
-import { FOOTER_TEMPORARY_STATUS_TIMEOUT } from '../components/PromptInput/Notifications.js'
-import { getHistory } from '../history.js'
-import { Text } from '@anthropic/ink'
-import type { PromptInputMode } from '../types/textInputTypes.js'
-import type { HistoryEntry, PastedContent } from '../utils/config.js'
+import React, { useCallback, useRef, useState } from 'react';
+import { getModeFromInput } from 'src/components/PromptInput/inputModes.js';
+import { useNotifications } from 'src/context/notifications.js';
+import { ConfigurableShortcutHint } from '../components/ConfigurableShortcutHint.js';
+import { FOOTER_TEMPORARY_STATUS_TIMEOUT } from '../components/PromptInput/Notifications.js';
+import { getHistory } from '../history.js';
+import { Text } from '@anthropic/ink';
+import type { PromptInputMode } from '../types/textInputTypes.js';
+import type { HistoryEntry, PastedContent } from '../utils/config.js';
 
-export type HistoryMode = PromptInputMode
+export type HistoryMode = PromptInputMode;
 
 // Load history entries in chunks to reduce disk reads on rapid keypresses
-const HISTORY_CHUNK_SIZE = 10
+const HISTORY_CHUNK_SIZE = 10;
 
 // Shared state for batching concurrent load requests into a single disk read
 // Mode filter is included to ensure we don't mix filtered and unfiltered caches
-let pendingLoad: Promise<HistoryEntry[]> | null = null
-let pendingLoadTarget = 0
-let pendingLoadModeFilter: HistoryMode | undefined = undefined
+let pendingLoad: Promise<HistoryEntry[]> | null = null;
+let pendingLoadTarget = 0;
+let pendingLoadModeFilter: HistoryMode | undefined;
 
-async function loadHistoryEntries(
-  minCount: number,
-  modeFilter?: HistoryMode,
-): Promise<HistoryEntry[]> {
+async function loadHistoryEntries(minCount: number, modeFilter?: HistoryMode): Promise<HistoryEntry[]> {
   // Round up to next chunk to avoid repeated small reads
-  const target = Math.ceil(minCount / HISTORY_CHUNK_SIZE) * HISTORY_CHUNK_SIZE
+  const target = Math.ceil(minCount / HISTORY_CHUNK_SIZE) * HISTORY_CHUNK_SIZE;
 
   // If a load is already pending with the same mode filter and will satisfy our needs, wait for it
-  if (
-    pendingLoad &&
-    pendingLoadTarget >= target &&
-    pendingLoadModeFilter === modeFilter
-  ) {
-    return pendingLoad
+  if (pendingLoad && pendingLoadTarget >= target && pendingLoadModeFilter === modeFilter) {
+    return pendingLoad;
   }
 
   // If a load is pending but won't satisfy our needs or has different filter, we need to wait for it
   // to complete first, then start a new one (can't interrupt an ongoing read)
   if (pendingLoad) {
-    await pendingLoad
+    await pendingLoad;
   }
 
   // Start a new load
-  pendingLoadTarget = target
-  pendingLoadModeFilter = modeFilter
+  pendingLoadTarget = target;
+  pendingLoadModeFilter = modeFilter;
   pendingLoad = (async () => {
-    const entries: HistoryEntry[] = []
-    let loaded = 0
+    const entries: HistoryEntry[] = [];
+    let loaded = 0;
     for await (const entry of getHistory()) {
       // If mode filter is specified, only include entries that match the mode
       if (modeFilter) {
-        const entryMode = getModeFromInput(entry.display)
+        const entryMode = getModeFromInput(entry.display);
         if (entryMode !== modeFilter) {
-          continue
+          continue;
         }
       }
-      entries.push(entry)
-      loaded++
-      if (loaded >= pendingLoadTarget) break
+      entries.push(entry);
+      loaded++;
+      if (loaded >= pendingLoadTarget) break;
     }
-    return entries
-  })()
+    return entries;
+  })();
 
   try {
-    return await pendingLoad
+    return await pendingLoad;
   } finally {
-    pendingLoad = null
-    pendingLoadTarget = 0
-    pendingLoadModeFilter = undefined
+    pendingLoad = null;
+    pendingLoadTarget = 0;
+    pendingLoadModeFilter = undefined;
   }
 }
 
 export function useArrowKeyHistory(
-  onSetInput: (
-    value: string,
-    mode: HistoryMode,
-    pastedContents: Record<number, PastedContent>,
-  ) => void,
+  onSetInput: (value: string, mode: HistoryMode, pastedContents: Record<number, PastedContent>) => void,
   currentInput: string,
   pastedContents: Record<number, PastedContent>,
   setCursorOffset?: (offset: number) => void,
   currentMode?: HistoryMode,
 ): {
-  historyIndex: number
-  setHistoryIndex: (index: number) => void
-  onHistoryUp: () => void
-  onHistoryDown: () => boolean
-  resetHistory: () => void
-  dismissSearchHint: () => void
+  historyIndex: number;
+  setHistoryIndex: (index: number) => void;
+  onHistoryUp: () => void;
+  onHistoryDown: () => boolean;
+  resetHistory: () => void;
+  dismissSearchHint: () => void;
 } {
-  const [historyIndex, setHistoryIndex] = useState(0)
+  const [historyIndex, setHistoryIndex] = useState(0);
   const [lastShownHistoryEntry, setLastShownHistoryEntry] = useState<
     (HistoryEntry & { mode?: HistoryMode }) | undefined
-  >(undefined)
-  const hasShownSearchHintRef = useRef(false)
-  const { addNotification, removeNotification } = useNotifications()
+  >(undefined);
+  const hasShownSearchHintRef = useRef(false);
+  const { addNotification, removeNotification } = useNotifications();
 
   // Cache loaded history entries
-  const historyCache = useRef<HistoryEntry[]>([])
+  const historyCache = useRef<HistoryEntry[]>([]);
   // Track which mode filter the cache was loaded with
-  const historyCacheModeFilter = useRef<HistoryMode | undefined>(undefined)
+  const historyCacheModeFilter = useRef<HistoryMode | undefined>(undefined);
 
   // Synchronous tracker for history index to avoid stale closure issues
   // React state updates are async, so rapid keypresses can see stale values
-  const historyIndexRef = useRef(0)
+  const historyIndexRef = useRef(0);
 
   // Track the mode filter that was active when history navigation started
   // This is set on the first arrow press and stays fixed until reset
-  const initialModeFilterRef = useRef<HistoryMode | undefined>(undefined)
+  const initialModeFilterRef = useRef<HistoryMode | undefined>(undefined);
 
   // Refs to track current input values for draft preservation
   // These ensure we capture the draft with the latest values, not stale closure values
-  const currentInputRef = useRef(currentInput)
-  const pastedContentsRef = useRef(pastedContents)
-  const currentModeRef = useRef(currentMode)
+  const currentInputRef = useRef(currentInput);
+  const pastedContentsRef = useRef(pastedContents);
+  const currentModeRef = useRef(currentMode);
 
   // Keep refs in sync with props (synchronous update on each render)
-  currentInputRef.current = currentInput
-  pastedContentsRef.current = pastedContents
-  currentModeRef.current = currentMode
+  currentInputRef.current = currentInput;
+  pastedContentsRef.current = pastedContents;
+  currentModeRef.current = currentMode;
 
   const setInputWithCursor = useCallback(
-    (
-      value: string,
-      mode: HistoryMode,
-      contents: Record<number, PastedContent>,
-      cursorToStart = false,
-    ): void => {
-      onSetInput(value, mode, contents)
-      setCursorOffset?.(cursorToStart ? 0 : value.length)
+    (value: string, mode: HistoryMode, contents: Record<number, PastedContent>, cursorToStart = false): void => {
+      onSetInput(value, mode, contents);
+      setCursorOffset?.(cursorToStart ? 0 : value.length);
     },
     [onSetInput, setCursorOffset],
-  )
+  );
 
   const updateInput = useCallback(
     (input: HistoryEntry | undefined, cursorToStart = false): void => {
-      if (!input || !input.display) return
+      if (!input || !input.display) return;
 
-      const mode = getModeFromInput(input.display)
-      const value = mode === 'bash' ? input.display.slice(1) : input.display
+      const mode = getModeFromInput(input.display);
+      const value = mode === 'bash' ? input.display.slice(1) : input.display;
 
-      setInputWithCursor(value, mode, input.pastedContents ?? {}, cursorToStart)
+      setInputWithCursor(value, mode, input.pastedContents ?? {}, cursorToStart);
     },
     [setInputWithCursor],
-  )
+  );
 
   const showSearchHint = useCallback((): void => {
     addNotification({
@@ -160,25 +144,24 @@ export function useArrowKeyHistory(
       ),
       priority: 'immediate',
       timeoutMs: FOOTER_TEMPORARY_STATUS_TIMEOUT,
-    })
-  }, [addNotification])
+    });
+  }, [addNotification]);
 
   const onHistoryUp = useCallback((): void => {
     // Capture and increment synchronously to handle rapid keypresses
-    const targetIndex = historyIndexRef.current
-    historyIndexRef.current++
+    const targetIndex = historyIndexRef.current;
+    historyIndexRef.current++;
 
-    const inputAtPress = currentInputRef.current
-    const pastedContentsAtPress = pastedContentsRef.current
-    const modeAtPress = currentModeRef.current
+    const inputAtPress = currentInputRef.current;
+    const pastedContentsAtPress = pastedContentsRef.current;
+    const modeAtPress = currentModeRef.current;
 
     if (targetIndex === 0) {
-      initialModeFilterRef.current =
-        modeAtPress === 'bash' ? modeAtPress : undefined
+      initialModeFilterRef.current = modeAtPress === 'bash' ? modeAtPress : undefined;
 
       // Save draft synchronously using refs for the latest values
       // This ensures we capture the draft before any async operations or re-renders
-      const hasInput = inputAtPress.trim() !== ''
+      const hasInput = inputAtPress.trim() !== '';
       setLastShownHistoryEntry(
         hasInput
           ? {
@@ -187,95 +170,91 @@ export function useArrowKeyHistory(
               mode: modeAtPress,
             }
           : undefined,
-      )
+      );
     }
 
-    const modeFilter = initialModeFilterRef.current
+    const modeFilter = initialModeFilterRef.current;
 
     void (async () => {
-      const neededCount = targetIndex + 1 // How many entries we need
+      const neededCount = targetIndex + 1; // How many entries we need
 
       // If mode filter changed, invalidate cache
       if (historyCacheModeFilter.current !== modeFilter) {
-        historyCache.current = []
-        historyCacheModeFilter.current = modeFilter
-        historyIndexRef.current = 0
+        historyCache.current = [];
+        historyCacheModeFilter.current = modeFilter;
+        historyIndexRef.current = 0;
       }
 
       // Load more entries if needed
       if (historyCache.current.length < neededCount) {
         // Batches concurrent requests - rapid keypresses share a single disk read
-        const entries = await loadHistoryEntries(neededCount, modeFilter)
+        const entries = await loadHistoryEntries(neededCount, modeFilter);
         // Only update cache if we loaded more than currently cached
         // (handles race condition where multiple loads complete out of order)
         if (entries.length > historyCache.current.length) {
-          historyCache.current = entries
+          historyCache.current = entries;
         }
       }
 
       // Check if we can navigate
       if (targetIndex >= historyCache.current.length) {
         // Rollback the ref since we can't navigate
-        historyIndexRef.current--
+        historyIndexRef.current--;
         // Keep the draft intact - user stays on their current input
-        return
+        return;
       }
 
-      const newIndex = targetIndex + 1
-      setHistoryIndex(newIndex)
-      updateInput(historyCache.current[targetIndex], true)
+      const newIndex = targetIndex + 1;
+      setHistoryIndex(newIndex);
+      updateInput(historyCache.current[targetIndex], true);
 
       // Show hint once per session after navigating through 2 history entries
       if (newIndex >= 2 && !hasShownSearchHintRef.current) {
-        hasShownSearchHintRef.current = true
-        showSearchHint()
+        hasShownSearchHintRef.current = true;
+        showSearchHint();
       }
-    })()
-  }, [updateInput, showSearchHint])
+    })();
+  }, [updateInput, showSearchHint]);
 
   const onHistoryDown = useCallback((): boolean => {
     // Use the ref for consistent reads
-    const currentIndex = historyIndexRef.current
+    const currentIndex = historyIndexRef.current;
     if (currentIndex > 1) {
-      historyIndexRef.current--
-      setHistoryIndex(currentIndex - 1)
-      updateInput(historyCache.current[currentIndex - 2])
+      historyIndexRef.current--;
+      setHistoryIndex(currentIndex - 1);
+      updateInput(historyCache.current[currentIndex - 2]);
     } else if (currentIndex === 1) {
-      historyIndexRef.current = 0
-      setHistoryIndex(0)
+      historyIndexRef.current = 0;
+      setHistoryIndex(0);
       if (lastShownHistoryEntry) {
         // Restore the draft with its saved mode if available
-        const savedMode = lastShownHistoryEntry.mode
+        const savedMode = lastShownHistoryEntry.mode;
         if (savedMode) {
-          setInputWithCursor(
-            lastShownHistoryEntry.display,
-            savedMode,
-            lastShownHistoryEntry.pastedContents ?? {},
-          )
+          setInputWithCursor(lastShownHistoryEntry.display, savedMode, lastShownHistoryEntry.pastedContents ?? {});
         } else {
-          updateInput(lastShownHistoryEntry)
+          updateInput(lastShownHistoryEntry);
         }
       } else {
         // When in filtered mode, stay in that mode when clearing input
-        setInputWithCursor('', initialModeFilterRef.current ?? 'prompt', {})
+        setInputWithCursor('', initialModeFilterRef.current ?? 'prompt', {});
       }
     }
-    return currentIndex <= 0
-  }, [lastShownHistoryEntry, updateInput, setInputWithCursor])
+    return currentIndex <= 0;
+  }, [lastShownHistoryEntry, updateInput, setInputWithCursor]);
 
   const resetHistory = useCallback((): void => {
-    setLastShownHistoryEntry(undefined)
-    setHistoryIndex(0)
-    historyIndexRef.current = 0
-    initialModeFilterRef.current = undefined
-    removeNotification('search-history-hint')
-    historyCache.current = []
-    historyCacheModeFilter.current = undefined
-  }, [removeNotification])
+    setLastShownHistoryEntry(undefined);
+    setHistoryIndex(0);
+    historyIndexRef.current = 0;
+    initialModeFilterRef.current = undefined;
+    removeNotification('search-history-hint');
+    historyCache.current = [];
+    historyCacheModeFilter.current = undefined;
+  }, [removeNotification]);
 
   const dismissSearchHint = useCallback((): void => {
-    removeNotification('search-history-hint')
-  }, [removeNotification])
+    removeNotification('search-history-hint');
+  }, [removeNotification]);
 
   return {
     historyIndex,
@@ -284,5 +263,5 @@ export function useArrowKeyHistory(
     onHistoryDown,
     resetHistory,
     dismissSearchHint,
-  }
+  };
 }
diff --git a/src/hooks/useBlink.ts b/src/hooks/useBlink.ts
index cecf54c53..4dba5b516 100644
--- a/src/hooks/useBlink.ts
+++ b/src/hooks/useBlink.ts
@@ -1,4 +1,8 @@
-import { type DOMElement, useAnimationFrame, useTerminalFocus } from '@anthropic/ink'
+import {
+  type DOMElement,
+  useAnimationFrame,
+  useTerminalFocus,
+} from '@anthropic/ink'
 
 const BLINK_INTERVAL_MS = 600
 
diff --git a/src/hooks/useCanUseTool.tsx b/src/hooks/useCanUseTool.tsx
index 7a3df0ab0..d09f0772c 100644
--- a/src/hooks/useCanUseTool.tsx
+++ b/src/hooks/useCanUseTool.tsx
@@ -1,72 +1,54 @@
-import { feature } from 'bun:bundle'
-import { APIUserAbortError } from '@anthropic-ai/sdk'
-import * as React from 'react'
-import { useCallback } from 'react'
+import { feature } from 'bun:bundle';
+import { APIUserAbortError } from '@anthropic-ai/sdk';
+import * as React from 'react';
+import { useCallback } from 'react';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from 'src/services/analytics/index.js'
-import { sanitizeToolNameForAnalytics } from 'src/services/analytics/metadata.js'
-import type { ToolUseConfirm } from '../components/permissions/PermissionRequest.js'
-import { Text } from '@anthropic/ink'
-import type {
-  ToolPermissionContext,
-  Tool as ToolType,
-  ToolUseContext,
-} from '../Tool.js'
+} from 'src/services/analytics/index.js';
+import { sanitizeToolNameForAnalytics } from 'src/services/analytics/metadata.js';
+import type { ToolUseConfirm } from '../components/permissions/PermissionRequest.js';
+import { Text } from '@anthropic/ink';
+import type { ToolPermissionContext, Tool as ToolType, ToolUseContext } from '../Tool.js';
 import {
   consumeSpeculativeClassifierCheck,
   peekSpeculativeClassifierCheck,
-} from '@claude-code-best/builtin-tools/tools/BashTool/bashPermissions.js'
-import { BASH_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/BashTool/toolName.js'
-import type { AssistantMessage } from '../types/message.js'
-import { recordAutoModeDenial } from '../utils/autoModeDenials.js'
+} from '@claude-code-best/builtin-tools/tools/BashTool/bashPermissions.js';
+import { BASH_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/BashTool/toolName.js';
+import type { AssistantMessage } from '../types/message.js';
+import { recordAutoModeDenial } from '../utils/autoModeDenials.js';
 import {
   clearClassifierChecking,
   setClassifierApproval,
   setYoloClassifierApproval,
-} from '../utils/classifierApprovals.js'
-import { logForDebugging } from '../utils/debug.js'
-import { AbortError } from '../utils/errors.js'
-import { logError } from '../utils/log.js'
-import type { PermissionDecision } from '../utils/permissions/PermissionResult.js'
-import { hasPermissionsToUseTool } from '../utils/permissions/permissions.js'
-import { jsonStringify } from '../utils/slowOperations.js'
-import { handleCoordinatorPermission } from './toolPermission/handlers/coordinatorHandler.js'
-import { handleInteractivePermission } from './toolPermission/handlers/interactiveHandler.js'
-import { handleSwarmWorkerPermission } from './toolPermission/handlers/swarmWorkerHandler.js'
-import {
-  createPermissionContext,
-  createPermissionQueueOps,
-} from './toolPermission/PermissionContext.js'
-import { logPermissionDecision } from './toolPermission/permissionLogging.js'
+} from '../utils/classifierApprovals.js';
+import { logForDebugging } from '../utils/debug.js';
+import { AbortError } from '../utils/errors.js';
+import { logError } from '../utils/log.js';
+import type { PermissionDecision } from '../utils/permissions/PermissionResult.js';
+import { hasPermissionsToUseTool } from '../utils/permissions/permissions.js';
+import { jsonStringify } from '../utils/slowOperations.js';
+import { handleCoordinatorPermission } from './toolPermission/handlers/coordinatorHandler.js';
+import { handleInteractivePermission } from './toolPermission/handlers/interactiveHandler.js';
+import { handleSwarmWorkerPermission } from './toolPermission/handlers/swarmWorkerHandler.js';
+import { createPermissionContext, createPermissionQueueOps } from './toolPermission/PermissionContext.js';
+import { logPermissionDecision } from './toolPermission/permissionLogging.js';
 
-export type CanUseToolFn<
-  Input extends Record<string, unknown> = Record<string, unknown>,
-> = (
+export type CanUseToolFn<Input extends Record<string, unknown> = Record<string, unknown>> = (
   tool: ToolType,
   input: Input,
   toolUseContext: ToolUseContext,
   assistantMessage: AssistantMessage,
   toolUseID: string,
   forceDecision?: PermissionDecision<Input>,
-) => Promise<PermissionDecision<Input>>
+) => Promise<PermissionDecision<Input>>;
 
 function useCanUseTool(
-  setToolUseConfirmQueue: React.Dispatch<
-    React.SetStateAction<ToolUseConfirm[]>
-  >,
+  setToolUseConfirmQueue: React.Dispatch<React.SetStateAction<ToolUseConfirm[]>>,
   setToolPermissionContext: (context: ToolPermissionContext) => void,
 ): CanUseToolFn {
   return useCallback<CanUseToolFn>(
-    async (
-      tool,
-      input,
-      toolUseContext,
-      assistantMessage,
-      toolUseID,
-      forceDecision,
-    ) => {
+    async (tool, input, toolUseContext, assistantMessage, toolUseID, forceDecision) => {
       return new Promise(resolve => {
         const ctx = createPermissionContext(
           tool,
@@ -76,20 +58,14 @@ function useCanUseTool(
           toolUseID,
           setToolPermissionContext,
           createPermissionQueueOps(setToolUseConfirmQueue),
-        )
+        );
 
-        if (ctx.resolveIfAborted(resolve)) return
+        if (ctx.resolveIfAborted(resolve)) return;
 
         const decisionPromise =
           forceDecision !== undefined
             ? Promise.resolve(forceDecision)
-            : hasPermissionsToUseTool(
-                tool,
-                input,
-                toolUseContext,
-                assistantMessage,
-                toolUseID,
-              )
+            : hasPermissionsToUseTool(tool, input, toolUseContext, assistantMessage, toolUseID);
 
         return decisionPromise
           .then(async result => {
@@ -97,52 +73,44 @@ function useCanUseTool(
             if (process.env.USER_TYPE === 'ant') {
               logEvent('tengu_internal_tool_permission_decision', {
                 toolName: sanitizeToolNameForAnalytics(tool.name),
-                behavior:
-                  result.behavior as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+                behavior: result.behavior as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
                 // Note: input contains code/filepaths, only log for ants
-                input: jsonStringify(
-                  input,
-                ) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-                messageID:
-                  ctx.messageId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+                input: jsonStringify(input) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+                messageID: ctx.messageId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
                 isMcp: tool.isMcp ?? false,
-              })
+              });
             }
 
             // Has permissions to use tool, granted in config
             if (result.behavior === 'allow') {
-              if (ctx.resolveIfAborted(resolve)) return
+              if (ctx.resolveIfAborted(resolve)) return;
               // Track auto mode classifier approvals for UI display
               if (
                 feature('TRANSCRIPT_CLASSIFIER') &&
                 result.decisionReason?.type === 'classifier' &&
                 result.decisionReason.classifier === 'auto-mode'
               ) {
-                setYoloClassifierApproval(
-                  toolUseID,
-                  result.decisionReason.reason,
-                )
+                setYoloClassifierApproval(toolUseID, result.decisionReason.reason);
               }
 
-              ctx.logDecision({ decision: 'accept', source: 'config' })
+              ctx.logDecision({ decision: 'accept', source: 'config' });
 
               resolve(
                 ctx.buildAllow(result.updatedInput ?? input, {
                   decisionReason: result.decisionReason,
                 }),
-              )
-              return
+              );
+              return;
             }
 
-            const appState = toolUseContext.getAppState()
+            const appState = toolUseContext.getAppState();
             const description = await tool.description(input as never, {
-              isNonInteractiveSession:
-                toolUseContext.options.isNonInteractiveSession,
+              isNonInteractiveSession: toolUseContext.options.isNonInteractiveSession,
               toolPermissionContext: appState.toolPermissionContext,
               tools: toolUseContext.options.tools,
-            })
+            });
 
-            if (ctx.resolveIfAborted(resolve)) return
+            if (ctx.resolveIfAborted(resolve)) return;
 
             // Does not have permissions to use tool, check the behavior
             switch (result.behavior) {
@@ -156,7 +124,7 @@ function useCanUseTool(
                     toolUseID,
                   },
                   { decision: 'reject', source: 'config' },
-                )
+                );
                 if (
                   feature('TRANSCRIPT_CLASSIFIER') &&
                   result.decisionReason?.type === 'classifier' &&
@@ -167,49 +135,40 @@ function useCanUseTool(
                     display: description,
                     reason: result.decisionReason.reason ?? '',
                     timestamp: Date.now(),
-                  })
+                  });
                   toolUseContext.addNotification?.({
                     key: 'auto-mode-denied',
                     priority: 'immediate',
                     jsx: (
                       <>
-                        <Text color="error">
-                          {tool.userFacingName(input).toLowerCase()} denied by
-                          auto mode
-                        </Text>
+                        <Text color="error">{tool.userFacingName(input).toLowerCase()} denied by auto mode</Text>
                         <Text dimColor> · /permissions</Text>
                       </>
                     ),
-                  })
+                  });
                 }
-                resolve(result)
-                return
+                resolve(result);
+                return;
               }
 
               case 'ask': {
                 // For coordinator workers, await automated checks before showing dialog.
                 // Background workers should only interrupt the user when automated checks can't decide.
-                if (
-                  appState.toolPermissionContext
-                    .awaitAutomatedChecksBeforeDialog
-                ) {
-                  const coordinatorDecision = await handleCoordinatorPermission(
-                    {
-                      ctx,
-                      ...(feature('BASH_CLASSIFIER')
-                        ? {
-                            pendingClassifierCheck:
-                              result.pendingClassifierCheck,
-                          }
-                        : {}),
-                      updatedInput: result.updatedInput,
-                      suggestions: result.suggestions,
-                      permissionMode: appState.toolPermissionContext.mode,
-                    },
-                  )
+                if (appState.toolPermissionContext.awaitAutomatedChecksBeforeDialog) {
+                  const coordinatorDecision = await handleCoordinatorPermission({
+                    ctx,
+                    ...(feature('BASH_CLASSIFIER')
+                      ? {
+                          pendingClassifierCheck: result.pendingClassifierCheck,
+                        }
+                      : {}),
+                    updatedInput: result.updatedInput,
+                    suggestions: result.suggestions,
+                    permissionMode: appState.toolPermissionContext.mode,
+                  });
                   if (coordinatorDecision) {
-                    resolve(coordinatorDecision)
-                    return
+                    resolve(coordinatorDecision);
+                    return;
                   }
                   // null means neither automated check resolved -- fall through to dialog below.
                   // Hooks already ran, classifier already consumed.
@@ -217,7 +176,7 @@ function useCanUseTool(
 
                 // After awaiting automated checks, verify the request wasn't aborted
                 // while we were waiting. Without this check, a stale dialog could appear.
-                if (ctx.resolveIfAborted(resolve)) return
+                if (ctx.resolveIfAborted(resolve)) return;
 
                 // For swarm workers, try classifier auto-approval then
                 // forward permission requests to the leader via mailbox.
@@ -231,10 +190,10 @@ function useCanUseTool(
                     : {}),
                   updatedInput: result.updatedInput,
                   suggestions: result.suggestions,
-                })
+                });
                 if (swarmDecision) {
-                  resolve(swarmDecision)
-                  return
+                  resolve(swarmDecision);
+                  return;
                 }
 
                 // Grace period: wait up to 2s for speculative classifier
@@ -243,12 +202,9 @@ function useCanUseTool(
                   feature('BASH_CLASSIFIER') &&
                   result.pendingClassifierCheck &&
                   tool.name === BASH_TOOL_NAME &&
-                  !appState.toolPermissionContext
-                    .awaitAutomatedChecksBeforeDialog
+                  !appState.toolPermissionContext.awaitAutomatedChecksBeforeDialog
                 ) {
-                  const speculativePromise = peekSpeculativeClassifierCheck(
-                    (input as { command: string }).command,
-                  )
+                  const speculativePromise = peekSpeculativeClassifierCheck((input as { command: string }).command);
                   if (speculativePromise) {
                     const raceResult = await Promise.race([
                       speculativePromise.then(r => ({
@@ -259,9 +215,9 @@ function useCanUseTool(
                         // eslint-disable-next-line no-restricted-syntax -- resolves with a value, not void
                         setTimeout(res, 2000, { type: 'timeout' as const }),
                       ),
-                    ])
+                    ]);
 
-                    if (ctx.resolveIfAborted(resolve)) return
+                    if (ctx.resolveIfAborted(resolve)) return;
 
                     if (
                       raceResult.type === 'result' &&
@@ -270,34 +226,27 @@ function useCanUseTool(
                       feature('BASH_CLASSIFIER')
                     ) {
                       // Classifier approved within grace period — skip dialog
-                      void consumeSpeculativeClassifierCheck(
-                        (input as { command: string }).command,
-                      )
+                      void consumeSpeculativeClassifierCheck((input as { command: string }).command);
 
-                      const matchedRule =
-                        raceResult.result.matchedDescription ?? undefined
+                      const matchedRule = raceResult.result.matchedDescription ?? undefined;
                       if (matchedRule) {
-                        setClassifierApproval(toolUseID, matchedRule)
+                        setClassifierApproval(toolUseID, matchedRule);
                       }
 
                       ctx.logDecision({
                         decision: 'accept',
                         source: { type: 'classifier' },
-                      })
+                      });
                       resolve(
-                        ctx.buildAllow(
-                          result.updatedInput ??
-                            (input as Record<string, unknown>),
-                          {
-                            decisionReason: {
-                              type: 'classifier' as const,
-                              classifier: 'bash_allow' as const,
-                              reason: `Allowed by prompt rule: "${raceResult.result.matchedDescription}"`,
-                            },
+                        ctx.buildAllow(result.updatedInput ?? (input as Record<string, unknown>), {
+                          decisionReason: {
+                            type: 'classifier' as const,
+                            classifier: 'bash_allow' as const,
+                            reason: `Allowed by prompt rule: "${raceResult.result.matchedDescription}"`,
                           },
-                        ),
-                      )
-                      return
+                        }),
+                      );
+                      return;
                     }
                     // Timeout or no match — fall through to show dialog
                   }
@@ -309,46 +258,37 @@ function useCanUseTool(
                     ctx,
                     description,
                     result,
-                    awaitAutomatedChecksBeforeDialog:
-                      appState.toolPermissionContext
-                        .awaitAutomatedChecksBeforeDialog,
-                    bridgeCallbacks: feature('BRIDGE_MODE')
-                      ? appState.replBridgePermissionCallbacks
-                      : undefined,
+                    awaitAutomatedChecksBeforeDialog: appState.toolPermissionContext.awaitAutomatedChecksBeforeDialog,
+                    bridgeCallbacks: feature('BRIDGE_MODE') ? appState.replBridgePermissionCallbacks : undefined,
                     channelCallbacks:
-                      feature('KAIROS') || feature('KAIROS_CHANNELS')
-                        ? appState.channelPermissionCallbacks
-                        : undefined,
+                      feature('KAIROS') || feature('KAIROS_CHANNELS') ? appState.channelPermissionCallbacks : undefined,
                   },
                   resolve,
-                )
+                );
 
-                return
+                return;
               }
             }
           })
           .catch(error => {
-            if (
-              error instanceof AbortError ||
-              error instanceof APIUserAbortError
-            ) {
+            if (error instanceof AbortError || error instanceof APIUserAbortError) {
               logForDebugging(
                 `Permission check threw ${error.constructor.name} for tool=${tool.name}: ${error.message}`,
-              )
-              ctx.logCancelled()
-              resolve(ctx.cancelAndAbort(undefined, true))
+              );
+              ctx.logCancelled();
+              resolve(ctx.cancelAndAbort(undefined, true));
             } else {
-              logError(error)
-              resolve(ctx.cancelAndAbort(undefined, true))
+              logError(error);
+              resolve(ctx.cancelAndAbort(undefined, true));
             }
           })
           .finally(() => {
-            clearClassifierChecking(toolUseID)
-          })
-      })
+            clearClassifierChecking(toolUseID);
+          });
+      });
     },
     [setToolUseConfirmQueue, setToolPermissionContext],
-  )
+  );
 }
 
-export default useCanUseTool
+export default useCanUseTool;
diff --git a/src/hooks/useChromeExtensionNotification.tsx b/src/hooks/useChromeExtensionNotification.tsx
index 01dbd1597..bb681d45d 100644
--- a/src/hooks/useChromeExtensionNotification.tsx
+++ b/src/hooks/useChromeExtensionNotification.tsx
@@ -1,56 +1,45 @@
-import * as React from 'react'
-import { Text } from '@anthropic/ink'
-import { isClaudeAISubscriber } from '../utils/auth.js'
-import {
-  isChromeExtensionInstalled,
-  shouldEnableClaudeInChrome,
-} from '../utils/claudeInChrome/setup.js'
-import { isRunningOnHomespace } from '../utils/envUtils.js'
-import { useStartupNotification } from './notifs/useStartupNotification.js'
+import * as React from 'react';
+import { Text } from '@anthropic/ink';
+import { isClaudeAISubscriber } from '../utils/auth.js';
+import { isChromeExtensionInstalled, shouldEnableClaudeInChrome } from '../utils/claudeInChrome/setup.js';
+import { isRunningOnHomespace } from '../utils/envUtils.js';
+import { useStartupNotification } from './notifs/useStartupNotification.js';
 
 function getChromeFlag(): boolean | undefined {
   if (process.argv.includes('--chrome')) {
-    return true
+    return true;
   }
   if (process.argv.includes('--no-chrome')) {
-    return false
+    return false;
   }
-  return undefined
+  return undefined;
 }
 
 export function useChromeExtensionNotification(): void {
   useStartupNotification(async () => {
-    const chromeFlag = getChromeFlag()
-    if (!shouldEnableClaudeInChrome(chromeFlag)) return null
+    const chromeFlag = getChromeFlag();
+    if (!shouldEnableClaudeInChrome(chromeFlag)) return null;
 
     // Claude in Chrome is only supported for claude.ai subscribers (unless user is ant)
     if (process.env.USER_TYPE !== 'ant' && !isClaudeAISubscriber()) {
       return {
         key: 'chrome-requires-subscription',
-        jsx: (
-          <Text color="error">
-            Claude in Chrome requires a claude.ai subscription
-          </Text>
-        ),
+        jsx: <Text color="error">Claude in Chrome requires a claude.ai subscription</Text>,
         priority: 'immediate',
         timeoutMs: 5000,
-      }
+      };
     }
 
-    const installed = await isChromeExtensionInstalled()
+    const installed = await isChromeExtensionInstalled();
     if (!installed && !isRunningOnHomespace()) {
       // Skip notification on Homespace since Chrome setup requires different steps (see go/hsproxy)
       return {
         key: 'chrome-extension-not-detected',
-        jsx: (
-          <Text color="warning">
-            Chrome extension not detected · https://claude.ai/chrome to install
-          </Text>
-        ),
+        jsx: <Text color="warning">Chrome extension not detected · https://claude.ai/chrome to install</Text>,
         // TODO(hackyon): Lower the priority if the claude-in-chrome integration is no longer opt-in
         priority: 'immediate',
         timeoutMs: 3000,
-      }
+      };
     }
     if (chromeFlag === undefined) {
       // Show low priority notification only when Chrome is enabled by default
@@ -59,8 +48,8 @@ export function useChromeExtensionNotification(): void {
         key: 'claude-in-chrome-default-enabled',
         text: `Claude in Chrome enabled · /chrome`,
         priority: 'low',
-      }
+      };
     }
-    return null
-  })
+    return null;
+  });
 }
diff --git a/src/hooks/useClaudeCodeHintRecommendation.tsx b/src/hooks/useClaudeCodeHintRecommendation.tsx
index 4d2a76af5..268ce082b 100644
--- a/src/hooks/useClaudeCodeHintRecommendation.tsx
+++ b/src/hooks/useClaudeCodeHintRecommendation.tsx
@@ -8,117 +8,101 @@
  * anything that reaches this hook is worth resolving.
  */
 
-import * as React from 'react'
-import { useNotifications } from '../context/notifications.js'
+import * as React from 'react';
+import { useNotifications } from '../context/notifications.js';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_PII_TAGGED,
   logEvent,
-} from '../services/analytics/index.js'
+} from '../services/analytics/index.js';
 import {
   clearPendingHint,
   getPendingHintSnapshot,
   markShownThisSession,
   subscribeToPendingHint,
-} from '../utils/claudeCodeHints.js'
-import { logForDebugging } from '../utils/debug.js'
+} from '../utils/claudeCodeHints.js';
+import { logForDebugging } from '../utils/debug.js';
 import {
   disableHintRecommendations,
   markHintPluginShown,
   type PluginHintRecommendation,
   resolvePluginHint,
-} from '../utils/plugins/hintRecommendation.js'
-import { installPluginFromMarketplace } from '../utils/plugins/pluginInstallationHelpers.js'
-import {
-  installPluginAndNotify,
-  usePluginRecommendationBase,
-} from './usePluginRecommendationBase.js'
+} from '../utils/plugins/hintRecommendation.js';
+import { installPluginFromMarketplace } from '../utils/plugins/pluginInstallationHelpers.js';
+import { installPluginAndNotify, usePluginRecommendationBase } from './usePluginRecommendationBase.js';
 
 type UseClaudeCodeHintRecommendationResult = {
-  recommendation: PluginHintRecommendation | null
-  handleResponse: (response: 'yes' | 'no' | 'disable') => void
-}
+  recommendation: PluginHintRecommendation | null;
+  handleResponse: (response: 'yes' | 'no' | 'disable') => void;
+};
 
 export function useClaudeCodeHintRecommendation(): UseClaudeCodeHintRecommendationResult {
-  const pendingHint = React.useSyncExternalStore(
-    subscribeToPendingHint,
-    getPendingHintSnapshot,
-  )
-  const { addNotification } = useNotifications()
-  const { recommendation, clearRecommendation, tryResolve } =
-    usePluginRecommendationBase<PluginHintRecommendation>()
+  const pendingHint = React.useSyncExternalStore(subscribeToPendingHint, getPendingHintSnapshot);
+  const { addNotification } = useNotifications();
+  const { recommendation, clearRecommendation, tryResolve } = usePluginRecommendationBase<PluginHintRecommendation>();
 
   React.useEffect(() => {
-    if (!pendingHint) return
+    if (!pendingHint) return;
     tryResolve(async () => {
-      const resolved = await resolvePluginHint(pendingHint)
+      const resolved = await resolvePluginHint(pendingHint);
       if (resolved) {
         logForDebugging(
           `[useClaudeCodeHintRecommendation] surfacing ${resolved.pluginId} from ${resolved.sourceCommand}`,
-        )
-        markShownThisSession()
+        );
+        markShownThisSession();
       }
       // Drop the slot — but only if it still holds the hint we just
       // resolved. A newer hint may have overwritten it during the async
       // lookup; don't clobber that.
       if (getPendingHintSnapshot() === pendingHint) {
-        clearPendingHint()
+        clearPendingHint();
       }
-      return resolved
-    })
-  }, [pendingHint, tryResolve])
+      return resolved;
+    });
+  }, [pendingHint, tryResolve]);
 
   const handleResponse = React.useCallback(
     (response: 'yes' | 'no' | 'disable') => {
-      if (!recommendation) return
+      if (!recommendation) return;
 
       // Record show-once here, not at resolution-time — the dialog may have
       // been blocked by a higher-priority focusedInputDialog and never
       // rendered. Auto-dismiss reaches this via onResponse('no').
-      markHintPluginShown(recommendation.pluginId)
+      markHintPluginShown(recommendation.pluginId);
       logEvent('tengu_plugin_hint_response', {
-        _PROTO_plugin_name:
-          recommendation.pluginName as AnalyticsMetadata_I_VERIFIED_THIS_IS_PII_TAGGED,
-        _PROTO_marketplace_name:
-          recommendation.marketplaceName as AnalyticsMetadata_I_VERIFIED_THIS_IS_PII_TAGGED,
-        response:
-          response as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
+        _PROTO_plugin_name: recommendation.pluginName as AnalyticsMetadata_I_VERIFIED_THIS_IS_PII_TAGGED,
+        _PROTO_marketplace_name: recommendation.marketplaceName as AnalyticsMetadata_I_VERIFIED_THIS_IS_PII_TAGGED,
+        response: response as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
 
       switch (response) {
         case 'yes': {
-          const { pluginId, pluginName, marketplaceName } = recommendation
-          void installPluginAndNotify(
-            pluginId,
-            pluginName,
-            'hint-plugin',
-            addNotification,
-            async pluginData => {
-              const result = await installPluginFromMarketplace({
-                pluginId,
-                entry: pluginData.entry,
-                marketplaceName,
-                scope: 'user',
-                trigger: 'hint',
-              })
-              if (!result.success) {
-                throw new Error(!result.success ? (result as { error: string }).error : 'Unknown error')
-              }
-            },
-          )
-          break
+          const { pluginId, pluginName, marketplaceName } = recommendation;
+          void installPluginAndNotify(pluginId, pluginName, 'hint-plugin', addNotification, async pluginData => {
+            const result = await installPluginFromMarketplace({
+              pluginId,
+              entry: pluginData.entry,
+              marketplaceName,
+              scope: 'user',
+              trigger: 'hint',
+            });
+            if (!result.success) {
+              throw new Error(!result.success ? (result as { error: string }).error : 'Unknown error');
+            }
+          });
+          break;
         }
         case 'disable':
-          disableHintRecommendations()
-          break
+          disableHintRecommendations();
+          break;
         case 'no':
-          break
+          break;
       }
 
-      clearRecommendation()
+      clearRecommendation();
     },
     [recommendation, addNotification, clearRecommendation],
-  )
+  );
 
-  return { recommendation, handleResponse }
+  return { recommendation, handleResponse };
 }
diff --git a/src/hooks/useCommandKeybindings.tsx b/src/hooks/useCommandKeybindings.tsx
index 416a07ce7..38c9ba375 100644
--- a/src/hooks/useCommandKeybindings.tsx
+++ b/src/hooks/useCommandKeybindings.tsx
@@ -8,11 +8,11 @@
  * Commands triggered via keybinding are treated as "immediate" - they execute right
  * away and preserve the user's existing input text (the prompt is not cleared).
  */
-import { useMemo } from 'react'
-import { useIsModalOverlayActive } from '../context/overlayContext.js'
-import { useOptionalKeybindingContext } from '../keybindings/KeybindingContext.js'
-import { useKeybindings } from '../keybindings/useKeybinding.js'
-import type { PromptInputHelpers } from '../utils/handlePromptSubmit.js'
+import { useMemo } from 'react';
+import { useIsModalOverlayActive } from '../context/overlayContext.js';
+import { useOptionalKeybindingContext } from '../keybindings/KeybindingContext.js';
+import { useKeybindings } from '../keybindings/useKeybinding.js';
+import type { PromptInputHelpers } from '../utils/handlePromptSubmit.js';
 
 type Props = {
   // onSubmit accepts additional parameters beyond what we pass here,
@@ -20,63 +20,57 @@ type Props = {
   onSubmit: (
     input: string,
     helpers: PromptInputHelpers,
-    ...rest: [
-      speculationAccept?: undefined,
-      options?: { fromKeybinding?: boolean },
-    ]
-  ) => void
+    ...rest: [speculationAccept?: undefined, options?: { fromKeybinding?: boolean }]
+  ) => void;
   /** Set to false to disable command keybindings (e.g., when a dialog is open) */
-  isActive?: boolean
-}
+  isActive?: boolean;
+};
 
 const NOOP_HELPERS: PromptInputHelpers = {
   setCursorOffset: () => {},
   clearBuffer: () => {},
   resetHistory: () => {},
-}
+};
 
 /**
  * Registers keybinding handlers for all "command:*" actions found in the
  * user's keybinding configuration. When triggered, each handler submits
  * the corresponding slash command (e.g., "command:commit" submits "/commit").
  */
-export function CommandKeybindingHandlers({
-  onSubmit,
-  isActive = true,
-}: Props): null {
-  const keybindingContext = useOptionalKeybindingContext()
-  const isModalOverlayActive = useIsModalOverlayActive()
+export function CommandKeybindingHandlers({ onSubmit, isActive = true }: Props): null {
+  const keybindingContext = useOptionalKeybindingContext();
+  const isModalOverlayActive = useIsModalOverlayActive();
 
   // Extract command actions from parsed bindings
   const commandActions = useMemo(() => {
-    if (!keybindingContext) return new Set<string>()
-    const actions = new Set<string>()
+    if (!keybindingContext) return new Set<string>();
+    const actions = new Set<string>();
     for (const binding of keybindingContext.bindings) {
       if (binding.action?.startsWith('command:')) {
-        actions.add(binding.action)
+        actions.add(binding.action);
       }
     }
-    return actions
-  }, [keybindingContext])
+    return actions;
+  }, [keybindingContext]);
 
   // Build handler map for all command actions
   const handlers = useMemo(() => {
-    const map: Record<string, () => void> = {}
+    const map: Record<string, () => void> = {};
     for (const action of commandActions) {
-      const commandName = action.slice('command:'.length)
+      const commandName = action.slice('command:'.length);
       map[action] = () => {
         onSubmit(`/${commandName}`, NOOP_HELPERS, undefined, {
           fromKeybinding: true,
-        })
-      }
+        });
+      };
     }
-    return map
-  }, [commandActions, onSubmit])
+    return map;
+  }, [commandActions, onSubmit]);
 
   useKeybindings(handlers, {
     context: 'Chat',
     isActive: isActive && !isModalOverlayActive,
-  })
+  });
 
-  return null
+  return null;
 }
diff --git a/src/hooks/useDirectConnect.ts b/src/hooks/useDirectConnect.ts
index 7b2a162ae..09734fe5f 100644
--- a/src/hooks/useDirectConnect.ts
+++ b/src/hooks/useDirectConnect.ts
@@ -16,7 +16,10 @@ import {
 import type { Tool } from '../Tool.js'
 import { findToolByName } from '../Tool.js'
 import type { Message as MessageType } from '../types/message.js'
-import type { PermissionAskDecision, PermissionUpdate } from '../types/permissions.js'
+import type {
+  PermissionAskDecision,
+  PermissionUpdate,
+} from '../types/permissions.js'
 import { logForDebugging } from '../utils/debug.js'
 import { gracefulShutdown } from '../utils/gracefulShutdown.js'
 import type { RemoteMessageContent } from '../utils/teleport/api.js'
diff --git a/src/hooks/useGlobalKeybindings.tsx b/src/hooks/useGlobalKeybindings.tsx
index 5668748fc..0a8bd68ba 100644
--- a/src/hooks/useGlobalKeybindings.tsx
+++ b/src/hooks/useGlobalKeybindings.tsx
@@ -4,31 +4,31 @@
  * Must be rendered inside KeybindingSetup to have access to the keybinding context.
  * This component renders nothing - it just registers the keybinding handlers.
  */
-import { feature } from 'bun:bundle'
-import { useCallback } from 'react'
-import { instances } from '@anthropic/ink'
-import { useKeybinding } from '../keybindings/useKeybinding.js'
-import type { Screen } from '../screens/REPL.js'
-import { getFeatureValue_CACHED_MAY_BE_STALE } from '../services/analytics/growthbook.js'
+import { feature } from 'bun:bundle';
+import { useCallback } from 'react';
+import { instances } from '@anthropic/ink';
+import { useKeybinding } from '../keybindings/useKeybinding.js';
+import type { Screen } from '../screens/REPL.js';
+import { getFeatureValue_CACHED_MAY_BE_STALE } from '../services/analytics/growthbook.js';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from '../services/analytics/index.js'
-import { useAppState, useSetAppState } from '../state/AppState.js'
-import { count } from '../utils/array.js'
-import { getTerminalPanel } from '../utils/terminalPanel.js'
+} from '../services/analytics/index.js';
+import { useAppState, useSetAppState } from '../state/AppState.js';
+import { count } from '../utils/array.js';
+import { getTerminalPanel } from '../utils/terminalPanel.js';
 
 type Props = {
-  screen: Screen
-  setScreen: React.Dispatch<React.SetStateAction<Screen>>
-  showAllInTranscript: boolean
-  setShowAllInTranscript: React.Dispatch<React.SetStateAction<boolean>>
-  messageCount: number
-  onEnterTranscript?: () => void
-  onExitTranscript?: () => void
-  virtualScrollActive?: boolean
-  searchBarOpen?: boolean
-}
+  screen: Screen;
+  setScreen: React.Dispatch<React.SetStateAction<Screen>>;
+  showAllInTranscript: boolean;
+  setShowAllInTranscript: React.Dispatch<React.SetStateAction<boolean>>;
+  messageCount: number;
+  onEnterTranscript?: () => void;
+  onExitTranscript?: () => void;
+  virtualScrollActive?: boolean;
+  searchBarOpen?: boolean;
+};
 
 /**
  * Registers global keybinding handlers for:
@@ -48,53 +48,45 @@ export function GlobalKeybindingHandlers({
   virtualScrollActive,
   searchBarOpen = false,
 }: Props): null {
-  const expandedView = useAppState(s => s.expandedView)
-  const setAppState = useSetAppState()
+  const expandedView = useAppState(s => s.expandedView);
+  const setAppState = useSetAppState();
 
   // Toggle todo list (ctrl+t) - cycles through views
   const handleToggleTodos = useCallback(() => {
     logEvent('tengu_toggle_todos', {
       is_expanded: expandedView === 'tasks',
-    })
+    });
     setAppState(prev => {
       const { getAllInProcessTeammateTasks } =
         // eslint-disable-next-line @typescript-eslint/no-require-imports
-        require('../tasks/InProcessTeammateTask/InProcessTeammateTask.js') as typeof import('../tasks/InProcessTeammateTask/InProcessTeammateTask.js')
-      const hasTeammates =
-        count(
-          getAllInProcessTeammateTasks(prev.tasks),
-          t => t.status === 'running',
-        ) > 0
+        require('../tasks/InProcessTeammateTask/InProcessTeammateTask.js') as typeof import('../tasks/InProcessTeammateTask/InProcessTeammateTask.js');
+      const hasTeammates = count(getAllInProcessTeammateTasks(prev.tasks), t => t.status === 'running') > 0;
 
       if (hasTeammates) {
         // Both exist: none → tasks → teammates → none
         switch (prev.expandedView) {
           case 'none':
-            return { ...prev, expandedView: 'tasks' as const }
+            return { ...prev, expandedView: 'tasks' as const };
           case 'tasks':
-            return { ...prev, expandedView: 'teammates' as const }
+            return { ...prev, expandedView: 'teammates' as const };
           case 'teammates':
-            return { ...prev, expandedView: 'none' as const }
+            return { ...prev, expandedView: 'none' as const };
         }
       }
       // Only tasks: none ↔ tasks
       return {
         ...prev,
-        expandedView:
-          prev.expandedView === 'tasks'
-            ? ('none' as const)
-            : ('tasks' as const),
-      }
-    })
-  }, [expandedView, setAppState])
+        expandedView: prev.expandedView === 'tasks' ? ('none' as const) : ('tasks' as const),
+      };
+    });
+  }, [expandedView, setAppState]);
 
   // Toggle transcript mode (ctrl+o). Two-way prompt ↔ transcript.
   // Brief view has its own dedicated toggle on ctrl+shift+b.
   const isBriefOnly =
     feature('KAIROS') || feature('KAIROS_BRIEF')
-      ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-        useAppState(s => s.isBriefOnly)
-      : false
+      ? useAppState(s => s.isBriefOnly)
+      : false;
   const handleToggleTranscript = useCallback(() => {
     if (feature('KAIROS') || feature('KAIROS_BRIEF')) {
       // Escape hatch: GB kill-switch while defaultView=chat was persisted
@@ -104,30 +96,30 @@ export function GlobalKeybindingHandlers({
       // isBriefOnly (Messages.tsx filter is gated on !isTranscriptMode).
       /* eslint-disable @typescript-eslint/no-require-imports */
       const { isBriefEnabled } =
-        require('@claude-code-best/builtin-tools/tools/BriefTool/BriefTool.js') as typeof import('@claude-code-best/builtin-tools/tools/BriefTool/BriefTool.js')
+        require('@claude-code-best/builtin-tools/tools/BriefTool/BriefTool.js') as typeof import('@claude-code-best/builtin-tools/tools/BriefTool/BriefTool.js');
       /* eslint-enable @typescript-eslint/no-require-imports */
       if (!isBriefEnabled() && isBriefOnly && screen !== 'transcript') {
         setAppState(prev => {
-          if (!prev.isBriefOnly) return prev
-          return { ...prev, isBriefOnly: false }
-        })
-        return
+          if (!prev.isBriefOnly) return prev;
+          return { ...prev, isBriefOnly: false };
+        });
+        return;
       }
     }
 
-    const isEnteringTranscript = screen !== 'transcript'
+    const isEnteringTranscript = screen !== 'transcript';
     logEvent('tengu_toggle_transcript', {
       is_entering: isEnteringTranscript,
       show_all: showAllInTranscript,
       message_count: messageCount,
-    })
-    setScreen(s => (s === 'transcript' ? 'prompt' : 'transcript'))
-    setShowAllInTranscript(false)
+    });
+    setScreen(s => (s === 'transcript' ? 'prompt' : 'transcript'));
+    setShowAllInTranscript(false);
     if (isEnteringTranscript && onEnterTranscript) {
-      onEnterTranscript()
+      onEnterTranscript();
     }
     if (!isEnteringTranscript && onExitTranscript) {
-      onExitTranscript()
+      onExitTranscript();
     }
   }, [
     screen,
@@ -139,35 +131,29 @@ export function GlobalKeybindingHandlers({
     setAppState,
     onEnterTranscript,
     onExitTranscript,
-  ])
+  ]);
 
   // Toggle showing all messages in transcript mode (ctrl+e)
   const handleToggleShowAll = useCallback(() => {
     logEvent('tengu_transcript_toggle_show_all', {
       is_expanding: !showAllInTranscript,
       message_count: messageCount,
-    })
-    setShowAllInTranscript(prev => !prev)
-  }, [showAllInTranscript, setShowAllInTranscript, messageCount])
+    });
+    setShowAllInTranscript(prev => !prev);
+  }, [showAllInTranscript, setShowAllInTranscript, messageCount]);
 
   // Exit transcript mode (ctrl+c or escape)
   const handleExitTranscript = useCallback(() => {
     logEvent('tengu_transcript_exit', {
       show_all: showAllInTranscript,
       message_count: messageCount,
-    })
-    setScreen('prompt')
-    setShowAllInTranscript(false)
+    });
+    setScreen('prompt');
+    setShowAllInTranscript(false);
     if (onExitTranscript) {
-      onExitTranscript()
+      onExitTranscript();
     }
-  }, [
-    setScreen,
-    showAllInTranscript,
-    setShowAllInTranscript,
-    messageCount,
-    onExitTranscript,
-  ])
+  }, [setScreen, showAllInTranscript, setShowAllInTranscript, messageCount, onExitTranscript]);
 
   // Toggle brief-only view (ctrl+shift+b). Pure display filter toggle —
   // does not touch opt-in state. Asymmetric gate (mirrors /brief): OFF
@@ -177,35 +163,33 @@ export function GlobalKeybindingHandlers({
     if (feature('KAIROS') || feature('KAIROS_BRIEF')) {
       /* eslint-disable @typescript-eslint/no-require-imports */
       const { isBriefEnabled } =
-        require('@claude-code-best/builtin-tools/tools/BriefTool/BriefTool.js') as typeof import('@claude-code-best/builtin-tools/tools/BriefTool/BriefTool.js')
+        require('@claude-code-best/builtin-tools/tools/BriefTool/BriefTool.js') as typeof import('@claude-code-best/builtin-tools/tools/BriefTool/BriefTool.js');
       /* eslint-enable @typescript-eslint/no-require-imports */
-      if (!isBriefEnabled() && !isBriefOnly) return
-      const next = !isBriefOnly
+      if (!isBriefEnabled() && !isBriefOnly) return;
+      const next = !isBriefOnly;
       logEvent('tengu_brief_mode_toggled', {
         enabled: next,
         gated: false,
-        source:
-          'keybinding' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
+        source: 'keybinding' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
       setAppState(prev => {
-        if (prev.isBriefOnly === next) return prev
-        return { ...prev, isBriefOnly: next }
-      })
+        if (prev.isBriefOnly === next) return prev;
+        return { ...prev, isBriefOnly: next };
+      });
     }
-  }, [isBriefOnly, setAppState])
+  }, [isBriefOnly, setAppState]);
 
   // Register keybinding handlers
   useKeybinding('app:toggleTodos', handleToggleTodos, {
     context: 'Global',
-  })
+  });
   useKeybinding('app:toggleTranscript', handleToggleTranscript, {
     context: 'Global',
-  })
+  });
   if (feature('KAIROS') || feature('KAIROS_BRIEF')) {
-    // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
     useKeybinding('app:toggleBrief', handleToggleBrief, {
       context: 'Global',
-    })
+    });
   }
 
   // Register teammate keybinding
@@ -215,41 +199,41 @@ export function GlobalKeybindingHandlers({
       setAppState(prev => ({
         ...prev,
         showTeammateMessagePreview: !prev.showTeammateMessagePreview,
-      }))
+      }));
     },
     {
       context: 'Global',
     },
-  )
+  );
 
   // Toggle built-in terminal panel (meta+j).
   // toggle() blocks in spawnSync until the user detaches from tmux.
   const handleToggleTerminal = useCallback(() => {
     if (feature('TERMINAL_PANEL')) {
       if (!getFeatureValue_CACHED_MAY_BE_STALE('tengu_terminal_panel', false)) {
-        return
+        return;
       }
-      getTerminalPanel().toggle()
+      getTerminalPanel().toggle();
     }
-  }, [])
+  }, []);
   useKeybinding('app:toggleTerminal', handleToggleTerminal, {
     context: 'Global',
-  })
+  });
 
   // Clear screen and force full redraw (ctrl+l). Recovery path when the
   // terminal was cleared externally (macOS Cmd+K) and Ink's diff engine
   // thinks unchanged cells don't need repainting.
   const handleRedraw = useCallback(() => {
-    instances.get(process.stdout)?.forceRedraw()
-  }, [])
-  useKeybinding('app:redraw', handleRedraw, { context: 'Global' })
+    instances.get(process.stdout)?.forceRedraw();
+  }, []);
+  useKeybinding('app:redraw', handleRedraw, { context: 'Global' });
 
   // Transcript-specific bindings (only active when in transcript mode)
-  const isInTranscript = screen === 'transcript'
+  const isInTranscript = screen === 'transcript';
   useKeybinding('transcript:toggleShowAll', handleToggleShowAll, {
     context: 'Transcript',
     isActive: isInTranscript && !virtualScrollActive,
-  })
+  });
   useKeybinding('transcript:exit', handleExitTranscript, {
     context: 'Transcript',
     // Bar-open is a mode (owns keystrokes). Navigating (highlights
@@ -258,7 +242,7 @@ export function GlobalKeybindingHandlers({
     // so without this gate its onCancel AND this handler would both
     // fire on one Esc (child registers first, fires first, bubbles).
     isActive: isInTranscript && !searchBarOpen,
-  })
+  });
 
-  return null
+  return null;
 }
diff --git a/src/hooks/useIDEIntegration.tsx b/src/hooks/useIDEIntegration.tsx
index 786146ee7..4d1b36954 100644
--- a/src/hooks/useIDEIntegration.tsx
+++ b/src/hooks/useIDEIntegration.tsx
@@ -1,26 +1,22 @@
-import { useEffect } from 'react'
-import type { ScopedMcpServerConfig } from '../services/mcp/types.js'
-import { getGlobalConfig } from '../utils/config.js'
-import { isEnvDefinedFalsy, isEnvTruthy } from '../utils/envUtils.js'
-import type { DetectedIDEInfo } from '../utils/ide.js'
+import { useEffect } from 'react';
+import type { ScopedMcpServerConfig } from '../services/mcp/types.js';
+import { getGlobalConfig } from '../utils/config.js';
+import { isEnvDefinedFalsy, isEnvTruthy } from '../utils/envUtils.js';
+import type { DetectedIDEInfo } from '../utils/ide.js';
 import {
   type IDEExtensionInstallationStatus,
   type IdeType,
   initializeIdeIntegration,
   isSupportedTerminal,
-} from '../utils/ide.js'
+} from '../utils/ide.js';
 
 type UseIDEIntegrationProps = {
-  autoConnectIdeFlag?: boolean
-  ideToInstallExtension: IdeType | null
-  setDynamicMcpConfig: React.Dispatch<
-    React.SetStateAction<Record<string, ScopedMcpServerConfig> | undefined>
-  >
-  setShowIdeOnboarding: React.Dispatch<React.SetStateAction<boolean>>
-  setIDEInstallationState: React.Dispatch<
-    React.SetStateAction<IDEExtensionInstallationStatus | null>
-  >
-}
+  autoConnectIdeFlag?: boolean;
+  ideToInstallExtension: IdeType | null;
+  setDynamicMcpConfig: React.Dispatch<React.SetStateAction<Record<string, ScopedMcpServerConfig> | undefined>>;
+  setShowIdeOnboarding: React.Dispatch<React.SetStateAction<boolean>>;
+  setIDEInstallationState: React.Dispatch<React.SetStateAction<IDEExtensionInstallationStatus | null>>;
+};
 
 export function useIDEIntegration({
   autoConnectIdeFlag,
@@ -32,11 +28,11 @@ export function useIDEIntegration({
   useEffect(() => {
     function addIde(ide: DetectedIDEInfo | null) {
       if (!ide) {
-        return
+        return;
       }
 
       // Check if auto-connect is enabled
-      const globalConfig = getGlobalConfig()
+      const globalConfig = getGlobalConfig();
       const autoConnectEnabled =
         (globalConfig.autoConnectIde ||
           autoConnectIdeFlag ||
@@ -46,16 +42,16 @@ export function useIDEIntegration({
           process.env.CLAUDE_CODE_SSE_PORT ||
           ideToInstallExtension ||
           isEnvTruthy(process.env.CLAUDE_CODE_AUTO_CONNECT_IDE)) &&
-        !isEnvDefinedFalsy(process.env.CLAUDE_CODE_AUTO_CONNECT_IDE)
+        !isEnvDefinedFalsy(process.env.CLAUDE_CODE_AUTO_CONNECT_IDE);
 
       if (!autoConnectEnabled) {
-        return
+        return;
       }
 
       setDynamicMcpConfig(prev => {
         // Only add the IDE if we don't already have one
         if (prev?.ide) {
-          return prev
+          return prev;
         }
         return {
           ...prev,
@@ -67,8 +63,8 @@ export function useIDEIntegration({
             ideRunningInWindows: ide.ideRunningInWindows,
             scope: 'dynamic' as const,
           },
-        }
-      })
+        };
+      });
     }
 
     // Use the new utility function
@@ -77,12 +73,6 @@ export function useIDEIntegration({
       ideToInstallExtension,
       () => setShowIdeOnboarding(true),
       status => setIDEInstallationState(status),
-    )
-  }, [
-    autoConnectIdeFlag,
-    ideToInstallExtension,
-    setDynamicMcpConfig,
-    setShowIdeOnboarding,
-    setIDEInstallationState,
-  ])
+    );
+  }, [autoConnectIdeFlag, ideToInstallExtension, setDynamicMcpConfig, setShowIdeOnboarding, setIDEInstallationState]);
 }
diff --git a/src/hooks/useIssueFlagBanner.ts b/src/hooks/useIssueFlagBanner.ts
index c21789cec..49161fe95 100644
--- a/src/hooks/useIssueFlagBanner.ts
+++ b/src/hooks/useIssueFlagBanner.ts
@@ -97,16 +97,13 @@ export function useIssueFlagBanner(
     return false
   }
 
-  // biome-ignore lint/correctness/useHookAtTopLevel: process.env.USER_TYPE is a compile-time constant
   const lastTriggeredAtRef = useRef(0)
-  // biome-ignore lint/correctness/useHookAtTopLevel: process.env.USER_TYPE is a compile-time constant
   const activeForSubmitRef = useRef(-1)
 
   // Memoize the O(messages) scans. This hook runs on every REPL render
   // (including every keystroke), but messages is stable during typing.
   // isSessionContainerCompatible walks all messages + regex-tests each
   // bash command — by far the heaviest work here.
-  // biome-ignore lint/correctness/useHookAtTopLevel: process.env.USER_TYPE is a compile-time constant
   const shouldTrigger = useMemo(
     () => isSessionContainerCompatible(messages) && hasFrictionSignal(messages),
     [messages],
diff --git a/src/hooks/useLspPluginRecommendation.tsx b/src/hooks/useLspPluginRecommendation.tsx
index 610431a63..69bb0a638 100644
--- a/src/hooks/useLspPluginRecommendation.tsx
+++ b/src/hooks/useLspPluginRecommendation.tsx
@@ -10,170 +10,138 @@
  * Only shows one recommendation per session.
  */
 
-import { extname, join } from 'path'
-import * as React from 'react'
-import {
-  hasShownLspRecommendationThisSession,
-  setLspRecommendationShownThisSession,
-} from '../bootstrap/state.js'
-import { useNotifications } from '../context/notifications.js'
-import { useAppState } from '../state/AppState.js'
-import { saveGlobalConfig } from '../utils/config.js'
-import { logForDebugging } from '../utils/debug.js'
-import { logError } from '../utils/log.js'
-import {
-  addToNeverSuggest,
-  getMatchingLspPlugins,
-  incrementIgnoredCount,
-} from '../utils/plugins/lspRecommendation.js'
-import { cacheAndRegisterPlugin } from '../utils/plugins/pluginInstallationHelpers.js'
-import {
-  getSettingsForSource,
-  updateSettingsForSource,
-} from '../utils/settings/settings.js'
-import {
-  installPluginAndNotify,
-  usePluginRecommendationBase,
-} from './usePluginRecommendationBase.js'
+import { extname, join } from 'path';
+import * as React from 'react';
+import { hasShownLspRecommendationThisSession, setLspRecommendationShownThisSession } from '../bootstrap/state.js';
+import { useNotifications } from '../context/notifications.js';
+import { useAppState } from '../state/AppState.js';
+import { saveGlobalConfig } from '../utils/config.js';
+import { logForDebugging } from '../utils/debug.js';
+import { logError } from '../utils/log.js';
+import { addToNeverSuggest, getMatchingLspPlugins, incrementIgnoredCount } from '../utils/plugins/lspRecommendation.js';
+import { cacheAndRegisterPlugin } from '../utils/plugins/pluginInstallationHelpers.js';
+import { getSettingsForSource, updateSettingsForSource } from '../utils/settings/settings.js';
+import { installPluginAndNotify, usePluginRecommendationBase } from './usePluginRecommendationBase.js';
 
 // Threshold for detecting timeout vs explicit dismiss (ms)
 // Menu auto-dismisses at 30s, so anything over 28s is likely timeout
-const TIMEOUT_THRESHOLD_MS = 28_000
+const TIMEOUT_THRESHOLD_MS = 28_000;
 
 export type LspRecommendationState = {
-  pluginId: string
-  pluginName: string
-  pluginDescription?: string
-  fileExtension: string
-  shownAt: number // Timestamp for timeout detection
-} | null
+  pluginId: string;
+  pluginName: string;
+  pluginDescription?: string;
+  fileExtension: string;
+  shownAt: number; // Timestamp for timeout detection
+} | null;
 
 type UseLspPluginRecommendationResult = {
-  recommendation: LspRecommendationState
-  handleResponse: (response: 'yes' | 'no' | 'never' | 'disable') => void
-}
+  recommendation: LspRecommendationState;
+  handleResponse: (response: 'yes' | 'no' | 'never' | 'disable') => void;
+};
 
 export function useLspPluginRecommendation(): UseLspPluginRecommendationResult {
-  const trackedFiles = useAppState(s => s.fileHistory.trackedFiles)
-  const { addNotification } = useNotifications()
-  const checkedFilesRef = React.useRef<Set<string>>(new Set())
+  const trackedFiles = useAppState(s => s.fileHistory.trackedFiles);
+  const { addNotification } = useNotifications();
+  const checkedFilesRef = React.useRef<Set<string>>(new Set());
   const { recommendation, clearRecommendation, tryResolve } =
-    usePluginRecommendationBase<NonNullable<LspRecommendationState>>()
+    usePluginRecommendationBase<NonNullable<LspRecommendationState>>();
 
   React.useEffect(() => {
     tryResolve(async () => {
-      if (hasShownLspRecommendationThisSession()) return null
+      if (hasShownLspRecommendationThisSession()) return null;
 
-      const newFiles: string[] = []
+      const newFiles: string[] = [];
       for (const file of trackedFiles) {
         if (!checkedFilesRef.current.has(file)) {
-          checkedFilesRef.current.add(file)
-          newFiles.push(file)
+          checkedFilesRef.current.add(file);
+          newFiles.push(file);
         }
       }
 
       for (const filePath of newFiles) {
         try {
-          const matches = await getMatchingLspPlugins(filePath)
-          const match = matches[0] // official plugins prioritized
+          const matches = await getMatchingLspPlugins(filePath);
+          const match = matches[0]; // official plugins prioritized
           if (match) {
-            logForDebugging(
-              `[useLspPluginRecommendation] Found match: ${match.pluginName} for ${filePath}`,
-            )
-            setLspRecommendationShownThisSession(true)
+            logForDebugging(`[useLspPluginRecommendation] Found match: ${match.pluginName} for ${filePath}`);
+            setLspRecommendationShownThisSession(true);
             return {
               pluginId: match.pluginId,
               pluginName: match.pluginName,
               pluginDescription: match.description,
               fileExtension: extname(filePath),
               shownAt: Date.now(),
-            }
+            };
           }
         } catch (error) {
-          logError(error)
+          logError(error);
         }
       }
-      return null
-    })
-  }, [trackedFiles, tryResolve])
+      return null;
+    });
+  }, [trackedFiles, tryResolve]);
 
   const handleResponse = React.useCallback(
     (response: 'yes' | 'no' | 'never' | 'disable') => {
-      if (!recommendation) return
+      if (!recommendation) return;
 
-      const { pluginId, pluginName, shownAt } = recommendation
+      const { pluginId, pluginName, shownAt } = recommendation;
 
-      logForDebugging(
-        `[useLspPluginRecommendation] User response: ${response} for ${pluginName}`,
-      )
+      logForDebugging(`[useLspPluginRecommendation] User response: ${response} for ${pluginName}`);
 
       switch (response) {
         case 'yes':
-          void installPluginAndNotify(
-            pluginId,
-            pluginName,
-            'lsp-plugin',
-            addNotification,
-            async pluginData => {
-              logForDebugging(
-                `[useLspPluginRecommendation] Installing plugin: ${pluginId}`,
-              )
-              const localSourcePath =
-                typeof pluginData.entry.source === 'string'
-                  ? join(
-                      pluginData.marketplaceInstallLocation,
-                      pluginData.entry.source,
-                    )
-                  : undefined
-              await cacheAndRegisterPlugin(
-                pluginId,
-                pluginData.entry,
-                'user',
-                undefined, // projectPath - not needed for user scope
-                localSourcePath,
-              )
-              // Enable in user settings so it loads on restart
-              const settings = getSettingsForSource('userSettings')
-              updateSettingsForSource('userSettings', {
-                enabledPlugins: {
-                  ...settings?.enabledPlugins,
-                  [pluginId]: true,
-                },
-              })
-              logForDebugging(
-                `[useLspPluginRecommendation] Plugin installed: ${pluginId}`,
-              )
-            },
-          )
-          break
+          void installPluginAndNotify(pluginId, pluginName, 'lsp-plugin', addNotification, async pluginData => {
+            logForDebugging(`[useLspPluginRecommendation] Installing plugin: ${pluginId}`);
+            const localSourcePath =
+              typeof pluginData.entry.source === 'string'
+                ? join(pluginData.marketplaceInstallLocation, pluginData.entry.source)
+                : undefined;
+            await cacheAndRegisterPlugin(
+              pluginId,
+              pluginData.entry,
+              'user',
+              undefined, // projectPath - not needed for user scope
+              localSourcePath,
+            );
+            // Enable in user settings so it loads on restart
+            const settings = getSettingsForSource('userSettings');
+            updateSettingsForSource('userSettings', {
+              enabledPlugins: {
+                ...settings?.enabledPlugins,
+                [pluginId]: true,
+              },
+            });
+            logForDebugging(`[useLspPluginRecommendation] Plugin installed: ${pluginId}`);
+          });
+          break;
 
         case 'no': {
-          const elapsed = Date.now() - shownAt
+          const elapsed = Date.now() - shownAt;
           if (elapsed >= TIMEOUT_THRESHOLD_MS) {
-            logForDebugging(
-              `[useLspPluginRecommendation] Timeout detected (${elapsed}ms), incrementing ignored count`,
-            )
-            incrementIgnoredCount()
+            logForDebugging(`[useLspPluginRecommendation] Timeout detected (${elapsed}ms), incrementing ignored count`);
+            incrementIgnoredCount();
           }
-          break
+          break;
         }
 
         case 'never':
-          addToNeverSuggest(pluginId)
-          break
+          addToNeverSuggest(pluginId);
+          break;
 
         case 'disable':
           saveGlobalConfig(current => {
-            if (current.lspRecommendationDisabled) return current
-            return { ...current, lspRecommendationDisabled: true }
-          })
-          break
+            if (current.lspRecommendationDisabled) return current;
+            return { ...current, lspRecommendationDisabled: true };
+          });
+          break;
       }
 
-      clearRecommendation()
+      clearRecommendation();
     },
     [recommendation, addNotification, clearRecommendation],
-  )
+  );
 
-  return { recommendation, handleResponse }
+  return { recommendation, handleResponse };
 }
diff --git a/src/hooks/useManagePlugins.ts b/src/hooks/useManagePlugins.ts
index 6e230b252..f8b13ffbb 100644
--- a/src/hooks/useManagePlugins.ts
+++ b/src/hooks/useManagePlugins.ts
@@ -52,7 +52,8 @@ export function useManagePlugins({
   const initialPluginLoad = useCallback(async () => {
     try {
       // Load all plugins - capture errors array
-      const { enabled, disabled, errors }: PluginLoadResult = await loadAllPlugins()
+      const { enabled, disabled, errors }: PluginLoadResult =
+        await loadAllPlugins()
 
       // Detect delisted plugins, auto-uninstall them, and record as flagged.
       await detectAndUninstallDelistedPlugins()
@@ -189,9 +190,17 @@ export function useManagePlugins({
         if (!p.hooksConfig) return sum
         return (
           sum +
-          (Object.values(p.hooksConfig) as Array<Array<{ hooks: unknown[] }> | undefined>).reduce(
+          (
+            Object.values(p.hooksConfig) as Array<
+              Array<{ hooks: unknown[] }> | undefined
+            >
+          ).reduce(
             (s, matchers) =>
-              s + (matchers?.reduce((h: number, m: { hooks: unknown[] }) => h + m.hooks.length, 0) ?? 0),
+              s +
+              (matchers?.reduce(
+                (h: number, m: { hooks: unknown[] }) => h + m.hooks.length,
+                0,
+              ) ?? 0),
             0,
           )
         )
diff --git a/src/hooks/useMasterMonitor.ts b/src/hooks/useMasterMonitor.ts
index e2659692a..b308375b2 100644
--- a/src/hooks/useMasterMonitor.ts
+++ b/src/hooks/useMasterMonitor.ts
@@ -134,7 +134,10 @@ const MUTED_DROPPABLE_TYPES = new Set([
  * Centralized mute check used by both attachPipeEntryEmitter and
  * useMasterMonitor's inline handler — keeps the two gates in sync.
  */
-export function shouldDropMutedMessage(slaveName: string, msgType: string): boolean {
+export function shouldDropMutedMessage(
+  slaveName: string,
+  msgType: string,
+): boolean {
   if (hasSendOverride(slaveName)) return false
   if (!isMasterPipeMuted(slaveName)) return false
   return MUTED_DROPPABLE_TYPES.has(msgType)
@@ -193,7 +196,8 @@ function attachPipeEntryEmitter(name: string, client: PipeClient): void {
               data: JSON.stringify({
                 requestId: payload.requestId,
                 behavior: 'deny',
-                feedback: 'Permission auto-denied: pipe is logically disconnected.',
+                feedback:
+                  'Permission auto-denied: pipe is logically disconnected.',
               }),
             })
           }
@@ -205,7 +209,10 @@ function attachPipeEntryEmitter(name: string, client: PipeClient): void {
     }
 
     // Clear /send override when slave turn completes
-    if ((msg.type === 'done' || msg.type === 'error') && hasSendOverride(name)) {
+    if (
+      (msg.type === 'done' || msg.type === 'error') &&
+      hasSendOverride(name)
+    ) {
       removeSendOverride(name)
     }
 
@@ -222,7 +229,9 @@ function emitSlaveClientRegistryChanged(): void {
   }
 }
 
-export function subscribeToSlaveClientRegistry(listener: () => void): () => void {
+export function subscribeToSlaveClientRegistry(
+  listener: () => void,
+): () => void {
   _slaveClientRegistryListeners.add(listener)
   return () => {
     _slaveClientRegistryListeners.delete(listener)
@@ -315,7 +324,10 @@ export function useMasterMonitor(): void {
         }
 
         // Clear /send override when slave turn completes
-        if ((msg.type === 'done' || msg.type === 'error') && hasSendOverride(slaveName)) {
+        if (
+          (msg.type === 'done' || msg.type === 'error') &&
+          hasSendOverride(slaveName)
+        ) {
           removeSendOverride(slaveName)
         }
 
diff --git a/src/hooks/useOfficialMarketplaceNotification.tsx b/src/hooks/useOfficialMarketplaceNotification.tsx
index 6ba179e9b..2d6f24c69 100644
--- a/src/hooks/useOfficialMarketplaceNotification.tsx
+++ b/src/hooks/useOfficialMarketplaceNotification.tsx
@@ -1,9 +1,9 @@
-import * as React from 'react'
-import type { Notification } from '../context/notifications.js'
-import { Text } from '@anthropic/ink'
-import { logForDebugging } from '../utils/debug.js'
-import { checkAndInstallOfficialMarketplace } from '../utils/plugins/officialMarketplaceStartupCheck.js'
-import { useStartupNotification } from './notifs/useStartupNotification.js'
+import * as React from 'react';
+import type { Notification } from '../context/notifications.js';
+import { Text } from '@anthropic/ink';
+import { logForDebugging } from '../utils/debug.js';
+import { checkAndInstallOfficialMarketplace } from '../utils/plugins/officialMarketplaceStartupCheck.js';
+import { useStartupNotification } from './notifs/useStartupNotification.js';
 
 /**
  * Hook that handles official marketplace auto-installation and shows
@@ -11,49 +11,36 @@ import { useStartupNotification } from './notifs/useStartupNotification.js'
  */
 export function useOfficialMarketplaceNotification(): void {
   useStartupNotification(async () => {
-    const result = await checkAndInstallOfficialMarketplace()
-    const notifs: Notification[] = []
+    const result = await checkAndInstallOfficialMarketplace();
+    const notifs: Notification[] = [];
 
     // Check for config save failure first - this is critical
     if (result.configSaveFailed) {
-      logForDebugging('Showing marketplace config save failure notification')
+      logForDebugging('Showing marketplace config save failure notification');
       notifs.push({
         key: 'marketplace-config-save-failed',
-        jsx: (
-          <Text color="error">
-            Failed to save marketplace retry info · Check ~/.claude.json
-            permissions
-          </Text>
-        ),
+        jsx: <Text color="error">Failed to save marketplace retry info · Check ~/.claude.json permissions</Text>,
         priority: 'immediate',
         timeoutMs: 10000,
-      })
+      });
     }
 
     if (result.installed) {
-      logForDebugging('Showing marketplace installation success notification')
+      logForDebugging('Showing marketplace installation success notification');
       notifs.push({
         key: 'marketplace-installed',
-        jsx: (
-          <Text color="success">
-            ✓ Anthropic marketplace installed · /plugin to see available plugins
-          </Text>
-        ),
+        jsx: <Text color="success">✓ Anthropic marketplace installed · /plugin to see available plugins</Text>,
         priority: 'immediate',
         timeoutMs: 7000,
-      })
+      });
     } else if (result.skipped && result.reason === 'unknown') {
-      logForDebugging('Showing marketplace installation failure notification')
+      logForDebugging('Showing marketplace installation failure notification');
       notifs.push({
         key: 'marketplace-install-failed',
-        jsx: (
-          <Text color="warning">
-            Failed to install Anthropic marketplace · Will retry on next startup
-          </Text>
-        ),
+        jsx: <Text color="warning">Failed to install Anthropic marketplace · Will retry on next startup</Text>,
         priority: 'immediate',
         timeoutMs: 8000,
-      })
+      });
     }
     // Don't show notifications for:
     // - already_installed (user already has it)
@@ -62,6 +49,6 @@ export function useOfficialMarketplaceNotification(): void {
     // - git_unavailable (marketplace is a nice-to-have; if git is missing
     //   or is a non-functional macOS xcrun shim, retry silently on backoff
     //   rather than nagging — the user will sort git out for other reasons)
-    return notifs
-  })
+    return notifs;
+  });
 }
diff --git a/src/hooks/usePipeMuteSync.ts b/src/hooks/usePipeMuteSync.ts
index 4bddd0451..4ecf0c621 100644
--- a/src/hooks/usePipeMuteSync.ts
+++ b/src/hooks/usePipeMuteSync.ts
@@ -26,7 +26,9 @@ import {
 } from './useMasterMonitor.js'
 
 type UsePipeMuteSyncDeps = {
-  setToolUseConfirmQueue: (action: React.SetStateAction<Record<string, unknown>[]>) => void
+  setToolUseConfirmQueue: (
+    action: React.SetStateAction<Record<string, unknown>[]>,
+  ) => void
 }
 
 export function usePipeMuteSync({
@@ -99,7 +101,9 @@ export function usePipeMuteSync({
               // onAbort may throw if client disconnected — safe to ignore
             }
           }
-          return queue.filter((item: Record<string, unknown>) => item.pipeName !== name)
+          return queue.filter(
+            (item: Record<string, unknown>) => item.pipeName !== name,
+          )
         })
 
         // Send relay_mute to slave
@@ -129,7 +133,13 @@ export function usePipeMuteSync({
     }
 
     prevMutedRef.current = nextMuted
-  }, [routeMode, selectedPipes, registryVersion, sendOverrideVersion, setToolUseConfirmQueue])
+  }, [
+    routeMode,
+    selectedPipes,
+    registryVersion,
+    sendOverrideVersion,
+    setToolUseConfirmQueue,
+  ])
 
   // Cleanup on unmount: clear all master-side mute state
   useEffect(() => {
diff --git a/src/hooks/usePipeRelay.ts b/src/hooks/usePipeRelay.ts
index 313d54720..a2d908c0d 100644
--- a/src/hooks/usePipeRelay.ts
+++ b/src/hooks/usePipeRelay.ts
@@ -23,20 +23,17 @@ export type PipeRelayHandle = {
 export function usePipeRelay(): PipeRelayHandle {
   const pipeReturnHadErrorRef = useRef(false)
 
-  const relayPipeMessage = useCallback(
-    (message: PipeMessage): boolean => {
-      const relay = getPipeRelay()
-      if (typeof relay !== 'function') {
-        return false
-      }
-      if (isRelayMuted()) {
-        return false
-      }
-      relay(message)
-      return true
-    },
-    [],
-  )
+  const relayPipeMessage = useCallback((message: PipeMessage): boolean => {
+    const relay = getPipeRelay()
+    if (typeof relay !== 'function') {
+      return false
+    }
+    if (isRelayMuted()) {
+      return false
+    }
+    relay(message)
+    return true
+  }, [])
 
   return { relayPipeMessage, pipeReturnHadErrorRef }
 }
diff --git a/src/hooks/usePluginRecommendationBase.tsx b/src/hooks/usePluginRecommendationBase.tsx
index 1e2fd7b5d..5312a7d6a 100644
--- a/src/hooks/usePluginRecommendationBase.tsx
+++ b/src/hooks/usePluginRecommendationBase.tsx
@@ -4,16 +4,16 @@
  * and success/failure notification JSX so new sources stay small.
  */
 
-import figures from 'figures'
-import * as React from 'react'
-import { getIsRemoteMode } from '../bootstrap/state.js'
-import type { useNotifications } from '../context/notifications.js'
-import { Text } from '@anthropic/ink'
-import { logError } from '../utils/log.js'
-import { getPluginById } from '../utils/plugins/marketplaceManager.js'
+import figures from 'figures';
+import * as React from 'react';
+import { getIsRemoteMode } from '../bootstrap/state.js';
+import type { useNotifications } from '../context/notifications.js';
+import { Text } from '@anthropic/ink';
+import { logError } from '../utils/log.js';
+import { getPluginById } from '../utils/plugins/marketplaceManager.js';
 
-type AddNotification = ReturnType<typeof useNotifications>['addNotification']
-type PluginData = NonNullable<Awaited<ReturnType<typeof getPluginById>>>
+type AddNotification = ReturnType<typeof useNotifications>['addNotification'];
+type PluginData = NonNullable<Awaited<ReturnType<typeof getPluginById>>>;
 
 /**
  * Call tryResolve inside a useEffect; it applies standard gates (remote
@@ -22,38 +22,35 @@ type PluginData = NonNullable<Awaited<ReturnType<typeof getPluginById>>>
  * identity tracks recommendation, so clearing re-triggers resolution.
  */
 export function usePluginRecommendationBase<T>(): {
-  recommendation: T | null
-  clearRecommendation: () => void
-  tryResolve: (resolve: () => Promise<T | null>) => void
+  recommendation: T | null;
+  clearRecommendation: () => void;
+  tryResolve: (resolve: () => Promise<T | null>) => void;
 } {
-  const [recommendation, setRecommendation] = React.useState<T | null>(null)
-  const isCheckingRef = React.useRef(false)
+  const [recommendation, setRecommendation] = React.useState<T | null>(null);
+  const isCheckingRef = React.useRef(false);
 
   const tryResolve = React.useCallback(
     (resolve: () => Promise<T | null>) => {
-      if (getIsRemoteMode()) return
-      if (recommendation) return
-      if (isCheckingRef.current) return
+      if (getIsRemoteMode()) return;
+      if (recommendation) return;
+      if (isCheckingRef.current) return;
 
-      isCheckingRef.current = true
+      isCheckingRef.current = true;
       void resolve()
         .then(rec => {
-          if (rec) setRecommendation(rec)
+          if (rec) setRecommendation(rec);
         })
         .catch(logError)
         .finally(() => {
-          isCheckingRef.current = false
-        })
+          isCheckingRef.current = false;
+        });
     },
     [recommendation],
-  )
+  );
 
-  const clearRecommendation = React.useCallback(
-    () => setRecommendation(null),
-    [],
-  )
+  const clearRecommendation = React.useCallback(() => setRecommendation(null), []);
 
-  return { recommendation, clearRecommendation, tryResolve }
+  return { recommendation, clearRecommendation, tryResolve };
 }
 
 /** Look up plugin, run install(), emit standard success/failure notification. */
@@ -65,11 +62,11 @@ export async function installPluginAndNotify(
   install: (pluginData: PluginData) => Promise<void>,
 ): Promise<void> {
   try {
-    const pluginData = await getPluginById(pluginId)
+    const pluginData = await getPluginById(pluginId);
     if (!pluginData) {
-      throw new Error(`Plugin ${pluginId} not found in marketplace`)
+      throw new Error(`Plugin ${pluginId} not found in marketplace`);
     }
-    await install(pluginData)
+    await install(pluginData);
     addNotification({
       key: `${keyPrefix}-installed`,
       jsx: (
@@ -79,14 +76,14 @@ export async function installPluginAndNotify(
       ),
       priority: 'immediate',
       timeoutMs: 5000,
-    })
+    });
   } catch (error) {
-    logError(error)
+    logError(error);
     addNotification({
       key: `${keyPrefix}-install-failed`,
       jsx: <Text color="error">Failed to install {pluginName}</Text>,
       priority: 'immediate',
       timeoutMs: 5000,
-    })
+    });
   }
 }
diff --git a/src/hooks/usePromptsFromClaudeInChrome.tsx b/src/hooks/usePromptsFromClaudeInChrome.tsx
index 6b9d34def..7334b0d4c 100644
--- a/src/hooks/usePromptsFromClaudeInChrome.tsx
+++ b/src/hooks/usePromptsFromClaudeInChrome.tsx
@@ -1,19 +1,13 @@
-import type { ContentBlockParam } from '@anthropic-ai/sdk/resources/messages.mjs'
-import { useEffect, useRef } from 'react'
-import { logError } from 'src/utils/log.js'
-import { z } from 'zod/v4'
-import { callIdeRpc } from '../services/mcp/client.js'
-import type {
-  ConnectedMCPServer,
-  MCPServerConnection,
-} from '../services/mcp/types.js'
-import type { PermissionMode } from '../types/permissions.js'
-import {
-  CLAUDE_IN_CHROME_MCP_SERVER_NAME,
-  isTrackedClaudeInChromeTabId,
-} from '../utils/claudeInChrome/common.js'
-import { lazySchema } from '../utils/lazySchema.js'
-import { enqueuePendingNotification } from '../utils/messageQueueManager.js'
+import type { ContentBlockParam } from '@anthropic-ai/sdk/resources/messages.mjs';
+import { useEffect, useRef } from 'react';
+import { logError } from 'src/utils/log.js';
+import { z } from 'zod/v4';
+import { callIdeRpc } from '../services/mcp/client.js';
+import type { ConnectedMCPServer, MCPServerConnection } from '../services/mcp/types.js';
+import type { PermissionMode } from '../types/permissions.js';
+import { CLAUDE_IN_CHROME_MCP_SERVER_NAME, isTrackedClaudeInChromeTabId } from '../utils/claudeInChrome/common.js';
+import { lazySchema } from '../utils/lazySchema.js';
+import { enqueuePendingNotification } from '../utils/messageQueueManager.js';
 
 // Schema for the prompt notification from Chrome extension (JSON-RPC 2.0 format)
 const ClaudeInChromePromptNotificationSchema = lazySchema(() =>
@@ -24,19 +18,14 @@ const ClaudeInChromePromptNotificationSchema = lazySchema(() =>
       image: z
         .object({
           type: z.literal('base64'),
-          media_type: z.enum([
-            'image/jpeg',
-            'image/png',
-            'image/gif',
-            'image/webp',
-          ]),
+          media_type: z.enum(['image/jpeg', 'image/png', 'image/gif', 'image/webp']),
           data: z.string(),
         })
         .optional(),
       tabId: z.number().optional(),
     }),
   }),
-)
+);
 
 /**
  * A hook that listens for prompt notifications from the Claude for Chrome extension,
@@ -46,84 +35,72 @@ export function usePromptsFromClaudeInChrome(
   mcpClients: MCPServerConnection[],
   toolPermissionMode: PermissionMode,
 ): void {
-  const mcpClientRef = useRef<ConnectedMCPServer | undefined>(undefined)
+  const mcpClientRef = useRef<ConnectedMCPServer | undefined>(undefined);
 
   useEffect(() => {
     if (process.env.USER_TYPE !== 'ant') {
-      return
+      return;
     }
 
-    const mcpClient = findChromeClient(mcpClients)
+    const mcpClient = findChromeClient(mcpClients);
     if (mcpClientRef.current !== mcpClient) {
-      mcpClientRef.current = mcpClient
+      mcpClientRef.current = mcpClient;
     }
 
     if (mcpClient) {
-      mcpClient.client.setNotificationHandler(
-        ClaudeInChromePromptNotificationSchema(),
-        notification => {
-          if (mcpClientRef.current !== mcpClient) {
-            return
-          }
-          const { tabId, prompt, image } = notification.params
+      mcpClient.client.setNotificationHandler(ClaudeInChromePromptNotificationSchema(), notification => {
+        if (mcpClientRef.current !== mcpClient) {
+          return;
+        }
+        const { tabId, prompt, image } = notification.params;
 
-          // Process notifications from tabs we're tracking since notifications are broadcasted
-          if (
-            typeof tabId !== 'number' ||
-            !isTrackedClaudeInChromeTabId(tabId)
-          ) {
-            return
-          }
+        // Process notifications from tabs we're tracking since notifications are broadcasted
+        if (typeof tabId !== 'number' || !isTrackedClaudeInChromeTabId(tabId)) {
+          return;
+        }
 
-          try {
-            // Build content blocks if there's an image, otherwise just use the prompt string
-            if (image) {
-              const contentBlocks: ContentBlockParam[] = [
-                { type: 'text', text: prompt },
-                {
-                  type: 'image',
-                  source: {
-                    type: image.type,
-                    media_type: image.media_type,
-                    data: image.data,
-                  },
+        try {
+          // Build content blocks if there's an image, otherwise just use the prompt string
+          if (image) {
+            const contentBlocks: ContentBlockParam[] = [
+              { type: 'text', text: prompt },
+              {
+                type: 'image',
+                source: {
+                  type: image.type,
+                  media_type: image.media_type,
+                  data: image.data,
                 },
-              ]
-              enqueuePendingNotification({
-                value: contentBlocks,
-                mode: 'prompt',
-              })
-            } else {
-              enqueuePendingNotification({ value: prompt, mode: 'prompt' })
-            }
-          } catch (error) {
-            logError(error as Error)
+              },
+            ];
+            enqueuePendingNotification({
+              value: contentBlocks,
+              mode: 'prompt',
+            });
+          } else {
+            enqueuePendingNotification({ value: prompt, mode: 'prompt' });
           }
-        },
-      )
+        } catch (error) {
+          logError(error as Error);
+        }
+      });
     }
-  }, [mcpClients])
+  }, [mcpClients]);
 
   // Sync permission mode with Chrome extension whenever it changes
   useEffect(() => {
-    const chromeClient = findChromeClient(mcpClients)
-    if (!chromeClient) return
+    const chromeClient = findChromeClient(mcpClients);
+    if (!chromeClient) return;
 
-    const chromeMode =
-      toolPermissionMode === 'bypassPermissions'
-        ? 'skip_all_permission_checks'
-        : 'ask'
+    const chromeMode = toolPermissionMode === 'bypassPermissions' ? 'skip_all_permission_checks' : 'ask';
 
-    void callIdeRpc('set_permission_mode', { mode: chromeMode }, chromeClient)
-  }, [mcpClients, toolPermissionMode])
+    void callIdeRpc('set_permission_mode', { mode: chromeMode }, chromeClient);
+  }, [mcpClients, toolPermissionMode]);
 }
 
-function findChromeClient(
-  clients: MCPServerConnection[],
-): ConnectedMCPServer | undefined {
+function findChromeClient(clients: MCPServerConnection[]): ConnectedMCPServer | undefined {
   return clients.find(
     (client): client is ConnectedMCPServer =>
-      client.type === 'connected' &&
-      client.name === CLAUDE_IN_CHROME_MCP_SERVER_NAME,
-  )
+      client.type === 'connected' && client.name === CLAUDE_IN_CHROME_MCP_SERVER_NAME,
+  );
 }
diff --git a/src/hooks/useRemoteSession.ts b/src/hooks/useRemoteSession.ts
index 0663f8b5d..971048b73 100644
--- a/src/hooks/useRemoteSession.ts
+++ b/src/hooks/useRemoteSession.ts
@@ -20,7 +20,10 @@ import type { AppState } from '../state/AppStateStore.js'
 import type { Tool } from '../Tool.js'
 import { findToolByName } from '../Tool.js'
 import type { Message as MessageType } from '../types/message.js'
-import type { PermissionAskDecision, PermissionUpdate } from '../types/permissions.js'
+import type {
+  PermissionAskDecision,
+  PermissionUpdate,
+} from '../types/permissions.js'
 import { logForDebugging } from '../utils/debug.js'
 import { truncateToWidth } from '../utils/format.js'
 import {
@@ -156,9 +159,11 @@ export function useRemoteSession({
     const manager = new RemoteSessionManager(config, {
       onMessage: sdkMessage => {
         const parts = [`type=${sdkMessage.type}`]
-        if ('subtype' in sdkMessage) parts.push(`subtype=${sdkMessage.subtype as string}`)
+        if ('subtype' in sdkMessage)
+          parts.push(`subtype=${sdkMessage.subtype as string}`)
         if (sdkMessage.type === 'user') {
-          const c = (sdkMessage.message as { content?: unknown } | undefined)?.content
+          const c = (sdkMessage.message as { content?: unknown } | undefined)
+            ?.content
           parts.push(
             `content=${Array.isArray(c) ? c.map(b => b.type).join(',') : typeof c}`,
           )
@@ -249,7 +254,9 @@ export function useRemoteSession({
         // and inProcessRunner.ts; without this the set grows unbounded for the
         // session lifetime (BQ: CCR cohort shows 5.2x higher RSS slope).
         if (setInProgressToolUseIDs && sdkMessage.type === 'user') {
-          const content = (sdkMessage.message as { content?: unknown } | undefined)?.content
+          const content = (
+            sdkMessage.message as { content?: unknown } | undefined
+          )?.content
           if (Array.isArray(content)) {
             const resultIds: string[] = []
             for (const block of content) {
@@ -291,7 +298,9 @@ export function useRemoteSession({
             setInProgressToolUseIDs &&
             converted.message.type === 'assistant'
           ) {
-            const contentArr = Array.isArray(converted.message.message?.content) ? converted.message.message.content : []
+            const contentArr = Array.isArray(converted.message.message?.content)
+              ? converted.message.message.content
+              : []
             const toolUseIds = contentArr
               .filter(block => block.type === 'tool_use')
               .map(block => (block as { id: string }).id)
diff --git a/src/hooks/useReplBridge.tsx b/src/hooks/useReplBridge.tsx
index 2b9899117..642bb3d87 100644
--- a/src/hooks/useReplBridge.tsx
+++ b/src/hooks/useReplBridge.tsx
@@ -1,53 +1,43 @@
-import { feature } from 'bun:bundle'
-import React, { useCallback, useEffect, useRef } from 'react'
-import { setMainLoopModelOverride } from '../bootstrap/state.js'
+import { feature } from 'bun:bundle';
+import React, { useCallback, useEffect, useRef } from 'react';
+import { setMainLoopModelOverride } from '../bootstrap/state.js';
 import {
   type BridgePermissionCallbacks,
   type BridgePermissionResponse,
   isBridgePermissionResponse,
-} from '../bridge/bridgePermissionCallbacks.js'
-import { buildBridgeConnectUrl } from '../bridge/bridgeStatusUtil.js'
-import { extractInboundMessageFields } from '../bridge/inboundMessages.js'
-import type { BridgeState, ReplBridgeHandle } from '../bridge/replBridge.js'
-import { setReplBridgeHandle } from '../bridge/replBridgeHandle.js'
-import type { Command } from '../commands.js'
-import { getSlashCommandToolSkills, isBridgeSafeCommand } from '../commands.js'
-import { getRemoteSessionUrl } from '../constants/product.js'
-import { useNotifications } from '../context/notifications.js'
-import type {
-  PermissionMode,
-  SDKMessage,
-} from '../entrypoints/agentSdkTypes.js'
-import type { SDKControlResponse } from '../entrypoints/sdk/controlTypes.js'
-import { Text } from '@anthropic/ink'
-import { getFeatureValue_CACHED_MAY_BE_STALE } from '../services/analytics/growthbook.js'
-import {
-  useAppState,
-  useAppStateStore,
-  useSetAppState,
-} from '../state/AppState.js'
-import type { Message } from '../types/message.js'
-import { getCwd } from '../utils/cwd.js'
-import { logForDebugging } from '../utils/debug.js'
-import { errorMessage } from '../utils/errors.js'
-import { enqueue } from '../utils/messageQueueManager.js'
-import { buildSystemInitMessage } from '../utils/messages/systemInit.js'
-import {
-  createBridgeStatusMessage,
-  createSystemMessage,
-} from '../utils/messages.js'
+} from '../bridge/bridgePermissionCallbacks.js';
+import { buildBridgeConnectUrl } from '../bridge/bridgeStatusUtil.js';
+import { extractInboundMessageFields } from '../bridge/inboundMessages.js';
+import type { BridgeState, ReplBridgeHandle } from '../bridge/replBridge.js';
+import { setReplBridgeHandle } from '../bridge/replBridgeHandle.js';
+import type { Command } from '../commands.js';
+import { getSlashCommandToolSkills, isBridgeSafeCommand } from '../commands.js';
+import { getRemoteSessionUrl } from '../constants/product.js';
+import { useNotifications } from '../context/notifications.js';
+import type { PermissionMode, SDKMessage } from '../entrypoints/agentSdkTypes.js';
+import type { SDKControlResponse } from '../entrypoints/sdk/controlTypes.js';
+import { Text } from '@anthropic/ink';
+import { getFeatureValue_CACHED_MAY_BE_STALE } from '../services/analytics/growthbook.js';
+import { useAppState, useAppStateStore, useSetAppState } from '../state/AppState.js';
+import type { Message } from '../types/message.js';
+import { getCwd } from '../utils/cwd.js';
+import { logForDebugging } from '../utils/debug.js';
+import { errorMessage } from '../utils/errors.js';
+import { enqueue } from '../utils/messageQueueManager.js';
+import { buildSystemInitMessage } from '../utils/messages/systemInit.js';
+import { createBridgeStatusMessage, createSystemMessage } from '../utils/messages.js';
 import {
   getAutoModeUnavailableNotification,
   getAutoModeUnavailableReason,
   isAutoModeGateEnabled,
   isBypassPermissionsModeDisabled,
   transitionPermissionMode,
-} from '../utils/permissions/permissionSetup.js'
-import { getLeaderToolUseConfirmQueue } from '../utils/swarm/leaderPermissionBridge.js'
-import { ContentBlockParam } from '@anthropic-ai/sdk/resources'
+} from '../utils/permissions/permissionSetup.js';
+import { getLeaderToolUseConfirmQueue } from '../utils/swarm/leaderPermissionBridge.js';
+import { ContentBlockParam } from '@anthropic-ai/sdk/resources';
 
 /** How long after a failure before replBridgeEnabled is auto-cleared (stops retries). */
-export const BRIDGE_FAILURE_DISMISS_MS = 10_000
+export const BRIDGE_FAILURE_DISMISS_MS = 10_000;
 
 /**
  * Max consecutive initReplBridge failures before the hook stops re-attempting
@@ -58,7 +48,7 @@ export const BRIDGE_FAILURE_DISMISS_MS = 10_000
  * top stuck client generated 2,879 × 401/day alone (17% of all 401s on the
  * route).
  */
-const MAX_CONSECUTIVE_INIT_FAILURES = 3
+const MAX_CONSECUTIVE_INIT_FAILURES = 3;
 
 /**
  * Hook that initializes an always-on bridge connection in the background
@@ -78,45 +68,39 @@ export function useReplBridge(
   commands: readonly Command[],
   mainLoopModel: string,
 ): { sendBridgeResult: () => void } {
-  const handleRef = useRef<ReplBridgeHandle | null>(null)
-  const teardownPromiseRef = useRef<Promise<void> | undefined>(undefined)
-  const lastWrittenIndexRef = useRef(0)
+  const handleRef = useRef<ReplBridgeHandle | null>(null);
+  const teardownPromiseRef = useRef<Promise<void> | undefined>(undefined);
+  const lastWrittenIndexRef = useRef(0);
   // Tracks UUIDs already flushed as initial messages. Persists across
   // bridge reconnections so Bridge #2+ only sends new messages — sending
   // duplicate UUIDs causes the server to kill the WebSocket.
-  const flushedUUIDsRef = useRef(new Set<string>())
-  const failureTimeoutRef = useRef<ReturnType<typeof setTimeout> | undefined>(
-    undefined,
-  )
+  const flushedUUIDsRef = useRef(new Set<string>());
+  const failureTimeoutRef = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);
   // Persists across effect re-runs (unlike the effect's local state). Reset
   // only on successful init. Hits MAX_CONSECUTIVE_INIT_FAILURES → fuse blown
   // for the session, regardless of replBridgeEnabled re-toggling.
-  const consecutiveFailuresRef = useRef(0)
-  const setAppState = useSetAppState()
-  const commandsRef = useRef(commands)
-  commandsRef.current = commands
-  const mainLoopModelRef = useRef(mainLoopModel)
-  mainLoopModelRef.current = mainLoopModel
-  const messagesRef = useRef(messages)
-  messagesRef.current = messages
-  const store = useAppStateStore()
-  const { addNotification } = useNotifications()
+  const consecutiveFailuresRef = useRef(0);
+  const setAppState = useSetAppState();
+  const commandsRef = useRef(commands);
+  commandsRef.current = commands;
+  const mainLoopModelRef = useRef(mainLoopModel);
+  mainLoopModelRef.current = mainLoopModel;
+  const messagesRef = useRef(messages);
+  messagesRef.current = messages;
+  const store = useAppStateStore();
+  const { addNotification } = useNotifications();
   const replBridgeEnabled = feature('BRIDGE_MODE')
-    ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-      useAppState(s => s.replBridgeEnabled)
-    : false
+    ? useAppState(s => s.replBridgeEnabled)
+    : false;
   const replBridgeConnected = feature('BRIDGE_MODE')
-    ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-      useAppState(s => s.replBridgeConnected)
-    : false
+    ? useAppState(s => s.replBridgeConnected)
+    : false;
   const replBridgeOutboundOnly = feature('BRIDGE_MODE')
-    ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-      useAppState(s => s.replBridgeOutboundOnly)
-    : false
+    ? useAppState(s => s.replBridgeOutboundOnly)
+    : false;
   const replBridgeInitialName = feature('BRIDGE_MODE')
-    ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-      useAppState(s => s.replBridgeInitialName)
-    : undefined
+    ? useAppState(s => s.replBridgeInitialName)
+    : undefined;
 
   // Initialize/teardown bridge when enabled state changes.
   // Passes current messages as initialMessages so the remote session
@@ -126,11 +110,11 @@ export function useReplBridge(
     // negative pattern (if (!feature(...)) return) does NOT eliminate
     // dynamic imports below.
     if (feature('BRIDGE_MODE')) {
-      if (!replBridgeEnabled) return
+      if (!replBridgeEnabled) return;
 
-      const outboundOnly = replBridgeOutboundOnly
+      const outboundOnly = replBridgeOutboundOnly;
       function notifyBridgeFailed(detail?: string): void {
-        if (outboundOnly) return
+        if (outboundOnly) return;
         addNotification({
           key: 'bridge-failed',
           jsx: (
@@ -140,33 +124,32 @@ export function useReplBridge(
             </>
           ),
           priority: 'immediate',
-        })
+        });
       }
 
       if (consecutiveFailuresRef.current >= MAX_CONSECUTIVE_INIT_FAILURES) {
         logForDebugging(
           `[bridge:repl] Hook: ${consecutiveFailuresRef.current} consecutive init failures, not retrying this session`,
-        )
+        );
         // Clear replBridgeEnabled so /remote-control doesn't mistakenly show
         // BridgeDisconnectDialog for a bridge that never connected.
-        const fuseHint = 'disabled after repeated failures · restart to retry'
-        notifyBridgeFailed(fuseHint)
+        const fuseHint = 'disabled after repeated failures · restart to retry';
+        notifyBridgeFailed(fuseHint);
         setAppState(prev => {
-          if (prev.replBridgeError === fuseHint && !prev.replBridgeEnabled)
-            return prev
+          if (prev.replBridgeError === fuseHint && !prev.replBridgeEnabled) return prev;
           return {
             ...prev,
             replBridgeError: fuseHint,
             replBridgeEnabled: false,
-          }
-        })
-        return
+          };
+        });
+        return;
       }
 
-      let cancelled = false
+      let cancelled = false;
       // Capture messages.length now so we don't re-send initial messages
       // through writeMessages after the bridge connects.
-      const initialMessageCount = messages.length
+      const initialMessageCount = messages.length;
 
       void (async () => {
         try {
@@ -175,22 +158,16 @@ export function useReplBridge(
           // the previous teardown races with the new register call, and the
           // server may tear down the freshly-created environment.
           if (teardownPromiseRef.current) {
-            logForDebugging(
-              '[bridge:repl] Hook: waiting for previous teardown to complete before re-init',
-            )
-            await teardownPromiseRef.current
-            teardownPromiseRef.current = undefined
-            logForDebugging(
-              '[bridge:repl] Hook: previous teardown complete, proceeding with re-init',
-            )
+            logForDebugging('[bridge:repl] Hook: waiting for previous teardown to complete before re-init');
+            await teardownPromiseRef.current;
+            teardownPromiseRef.current = undefined;
+            logForDebugging('[bridge:repl] Hook: previous teardown complete, proceeding with re-init');
           }
-          if (cancelled) return
+          if (cancelled) return;
 
           // Dynamic import so the module is tree-shaken in external builds
-          const { initReplBridge } = await import('../bridge/initReplBridge.js')
-          const { shouldShowAppUpgradeMessage } = await import(
-            '../bridge/envLessBridgeConfig.js'
-          )
+          const { initReplBridge } = await import('../bridge/initReplBridge.js');
+          const { shouldShowAppUpgradeMessage } = await import('../bridge/envLessBridgeConfig.js');
 
           // Assistant mode: perpetual bridge session — claude.ai shows one
           // continuous conversation across CLI restarts instead of a new
@@ -201,10 +178,10 @@ export function useReplBridge(
           // pointer-clear so the session survives clean exits, not just
           // crashes. Non-assistant bridges clear the pointer on teardown
           // (crash-recovery only).
-          let perpetual = false
+          let perpetual = false;
           if (feature('KAIROS')) {
-            const { isAssistantMode } = await import('../assistant/index.js')
-            perpetual = isAssistantMode()
+            const { isAssistantMode } = await import('../assistant/index.js');
+            perpetual = isAssistantMode();
           }
 
           // When a user message arrives from claude.ai, inject it into the REPL.
@@ -217,35 +194,31 @@ export function useReplBridge(
           // later, which is fine (web messages aren't rapid-fire).
           async function handleInboundMessage(msg: SDKMessage): Promise<void> {
             try {
-              const fields = extractInboundMessageFields(msg)
-              if (!fields) return
+              const fields = extractInboundMessageFields(msg);
+              if (!fields) return;
 
-              const { uuid } = fields
+              const { uuid } = fields;
 
               // Dynamic import keeps the bridge code out of non-BRIDGE_MODE builds.
-              const { resolveAndPrepend } = await import(
-                '../bridge/inboundAttachments.js'
-              )
-              const rawContent = fields.content
-              let sanitized: string | Array<{ type: string; [key: string]: unknown }> = typeof rawContent === 'string' ? rawContent : rawContent as unknown as Array<{ type: string; [key: string]: unknown }>
+              const { resolveAndPrepend } = await import('../bridge/inboundAttachments.js');
+              const rawContent = fields.content;
+              let sanitized: string | Array<{ type: string; [key: string]: unknown }> =
+                typeof rawContent === 'string'
+                  ? rawContent
+                  : (rawContent as unknown as Array<{ type: string; [key: string]: unknown }>);
               if (feature('KAIROS_GITHUB_WEBHOOKS')) {
                 /* eslint-disable @typescript-eslint/no-require-imports */
                 const { sanitizeInboundWebhookContent } =
-                  require('../bridge/webhookSanitizer.js') as typeof import('../bridge/webhookSanitizer.js')
+                  require('../bridge/webhookSanitizer.js') as typeof import('../bridge/webhookSanitizer.js');
                 /* eslint-enable @typescript-eslint/no-require-imports */
                 if (typeof sanitized === 'string') {
-                  sanitized = sanitizeInboundWebhookContent(sanitized)
+                  sanitized = sanitizeInboundWebhookContent(sanitized);
                 }
               }
-              const content = await resolveAndPrepend(msg, sanitized as string | ContentBlockParam[])
+              const content = await resolveAndPrepend(msg, sanitized as string | ContentBlockParam[]);
 
-              const preview =
-                typeof content === 'string'
-                  ? content.slice(0, 80)
-                  : `[${content.length} content blocks]`
-              logForDebugging(
-                `[bridge:repl] Injecting inbound user message: ${preview}${uuid ? ` uuid=${uuid}` : ''}`,
-              )
+              const preview = typeof content === 'string' ? content.slice(0, 80) : `[${content.length} content blocks]`;
+              logForDebugging(`[bridge:repl] Injecting inbound user message: ${preview}${uuid ? ` uuid=${uuid}` : ''}`);
               enqueue({
                 value: content,
                 mode: 'prompt' as const,
@@ -257,59 +230,45 @@ export function useReplBridge(
                 // intact for any code path that checks skipSlashCommands directly.
                 skipSlashCommands: true,
                 bridgeOrigin: true,
-              })
+              });
             } catch (e) {
-              logForDebugging(
-                `[bridge:repl] handleInboundMessage failed: ${e}`,
-                { level: 'error' },
-              )
+              logForDebugging(`[bridge:repl] handleInboundMessage failed: ${e}`, { level: 'error' });
             }
           }
 
           // State change callback — maps bridge lifecycle events to AppState.
-          function handleStateChange(
-            state: BridgeState,
-            detail?: string,
-          ): void {
-            if (cancelled) return
+          function handleStateChange(state: BridgeState, detail?: string): void {
+            if (cancelled) return;
             if (outboundOnly) {
-              logForDebugging(
-                `[bridge:repl] Mirror state=${state}${detail ? ` detail=${detail}` : ''}`,
-              )
+              logForDebugging(`[bridge:repl] Mirror state=${state}${detail ? ` detail=${detail}` : ''}`);
               // Sync replBridgeConnected so the forwarding effect starts/stops
               // writing as the transport comes up or dies.
               if (state === 'failed') {
                 setAppState(prev => {
-                  if (!prev.replBridgeConnected) return prev
-                  return { ...prev, replBridgeConnected: false }
-                })
+                  if (!prev.replBridgeConnected) return prev;
+                  return { ...prev, replBridgeConnected: false };
+                });
               } else if (state === 'ready' || state === 'connected') {
                 setAppState(prev => {
-                  if (prev.replBridgeConnected) return prev
-                  return { ...prev, replBridgeConnected: true }
-                })
+                  if (prev.replBridgeConnected) return prev;
+                  return { ...prev, replBridgeConnected: true };
+                });
               }
-              return
+              return;
             }
-            const handle = handleRef.current
+            const handle = handleRef.current;
             switch (state) {
               case 'ready':
                 setAppState(prev => {
                   const connectUrl =
                     handle && handle.environmentId !== ''
-                      ? buildBridgeConnectUrl(
-                          handle.environmentId,
-                          handle.sessionIngressUrl,
-                        )
-                      : prev.replBridgeConnectUrl
+                      ? buildBridgeConnectUrl(handle.environmentId, handle.sessionIngressUrl)
+                      : prev.replBridgeConnectUrl;
                   const sessionUrl = handle
-                    ? getRemoteSessionUrl(
-                        handle.bridgeSessionId,
-                        handle.sessionIngressUrl,
-                      )
-                    : prev.replBridgeSessionUrl
-                  const envId = handle?.environmentId
-                  const sessionId = handle?.bridgeSessionId
+                    ? getRemoteSessionUrl(handle.bridgeSessionId, handle.sessionIngressUrl)
+                    : prev.replBridgeSessionUrl;
+                  const envId = handle?.environmentId;
+                  const sessionId = handle?.bridgeSessionId;
                   if (
                     prev.replBridgeConnected &&
                     !prev.replBridgeSessionActive &&
@@ -319,7 +278,7 @@ export function useReplBridge(
                     prev.replBridgeEnvironmentId === envId &&
                     prev.replBridgeSessionId === sessionId
                   ) {
-                    return prev
+                    return prev;
                   }
                   return {
                     ...prev,
@@ -331,37 +290,32 @@ export function useReplBridge(
                     replBridgeEnvironmentId: envId,
                     replBridgeSessionId: sessionId,
                     replBridgeError: undefined,
-                  }
-                })
-                break
+                  };
+                });
+                break;
               case 'connected': {
                 setAppState(prev => {
-                  if (prev.replBridgeSessionActive) return prev
+                  if (prev.replBridgeSessionActive) return prev;
                   return {
                     ...prev,
                     replBridgeConnected: true,
                     replBridgeSessionActive: true,
                     replBridgeReconnecting: false,
                     replBridgeError: undefined,
-                  }
-                })
+                  };
+                });
                 // Send system/init so remote clients (web/iOS/Android) get
                 // session metadata. REPL uses query() directly — never hits
                 // QueryEngine's SDKMessage layer — so this is the only path
                 // to put system/init on the REPL-bridge wire. Skills load is
                 // async (memoized, cheap after REPL startup); fire-and-forget
                 // so the connected-state transition isn't blocked.
-                if (
-                  getFeatureValue_CACHED_MAY_BE_STALE(
-                    'tengu_bridge_system_init',
-                    false,
-                  )
-                ) {
+                if (getFeatureValue_CACHED_MAY_BE_STALE('tengu_bridge_system_init', false)) {
                   void (async () => {
                     try {
-                      const skills = await getSlashCommandToolSkills(getCwd())
-                      if (cancelled) return
-                      const state = store.getState()
+                      const skills = await getSlashCommandToolSkills(getCwd());
+                      if (cancelled) return;
+                      const state = store.getState();
                       handleRef.current?.writeSdkMessages([
                         buildSystemInitMessage({
                           // tools/mcpClients/plugins redacted for REPL-bridge:
@@ -375,94 +329,82 @@ export function useReplBridge(
                           tools: [],
                           mcpClients: [],
                           model: mainLoopModelRef.current,
-                          permissionMode: state.toolPermissionContext
-                            .mode as PermissionMode, // TODO: avoid the cast
+                          permissionMode: state.toolPermissionContext.mode as PermissionMode, // TODO: avoid the cast
                           // Remote clients can only invoke bridge-safe commands —
                           // advertising unsafe ones (local-jsx, unallowed local)
                           // would let mobile/web attempt them and hit errors.
-                          commands:
-                            commandsRef.current.filter(isBridgeSafeCommand),
+                          commands: commandsRef.current.filter(isBridgeSafeCommand),
                           agents: state.agentDefinitions.activeAgents,
                           skills,
                           plugins: [],
                           fastMode: state.fastMode,
                         }),
-                      ])
+                      ]);
                     } catch (err) {
-                      logForDebugging(
-                        `[bridge:repl] Failed to send system/init: ${errorMessage(err)}`,
-                        { level: 'error' },
-                      )
+                      logForDebugging(`[bridge:repl] Failed to send system/init: ${errorMessage(err)}`, {
+                        level: 'error',
+                      });
                     }
-                  })()
+                  })();
                 }
-                break
+                break;
               }
               case 'reconnecting':
                 setAppState(prev => {
-                  if (prev.replBridgeReconnecting) return prev
+                  if (prev.replBridgeReconnecting) return prev;
                   return {
                     ...prev,
                     replBridgeReconnecting: true,
                     replBridgeSessionActive: false,
-                  }
-                })
-                break
+                  };
+                });
+                break;
               case 'failed':
                 // Clear any previous failure dismiss timer
-                clearTimeout(failureTimeoutRef.current)
-                notifyBridgeFailed(detail)
+                clearTimeout(failureTimeoutRef.current);
+                notifyBridgeFailed(detail);
                 setAppState(prev => ({
                   ...prev,
                   replBridgeError: detail,
                   replBridgeReconnecting: false,
                   replBridgeSessionActive: false,
                   replBridgeConnected: false,
-                }))
+                }));
                 // Auto-disable after timeout so the hook stops retrying.
                 failureTimeoutRef.current = setTimeout(() => {
-                  if (cancelled) return
-                  failureTimeoutRef.current = undefined
+                  if (cancelled) return;
+                  failureTimeoutRef.current = undefined;
                   setAppState(prev => {
-                    if (!prev.replBridgeError) return prev
+                    if (!prev.replBridgeError) return prev;
                     return {
                       ...prev,
                       replBridgeEnabled: false,
                       replBridgeError: undefined,
-                    }
-                  })
-                }, BRIDGE_FAILURE_DISMISS_MS)
-                break
+                    };
+                  });
+                }, BRIDGE_FAILURE_DISMISS_MS);
+                break;
             }
           }
 
           // Map of pending bridge permission response handlers, keyed by request_id.
           // Each entry is an onResponse handler waiting for CCR to reply.
-          const pendingPermissionHandlers = new Map<
-            string,
-            (response: BridgePermissionResponse) => void
-          >()
+          const pendingPermissionHandlers = new Map<string, (response: BridgePermissionResponse) => void>();
 
           // Dispatch incoming control_response messages to registered handlers
           function handlePermissionResponse(msg: SDKControlResponse): void {
-            const requestId = msg.response?.request_id
-            if (!requestId) return
-            const handler = pendingPermissionHandlers.get(requestId)
+            const requestId = msg.response?.request_id;
+            if (!requestId) return;
+            const handler = pendingPermissionHandlers.get(requestId);
             if (!handler) {
-              logForDebugging(
-                `[bridge:repl] No handler for control_response request_id=${requestId}`,
-              )
-              return
+              logForDebugging(`[bridge:repl] No handler for control_response request_id=${requestId}`);
+              return;
             }
-            pendingPermissionHandlers.delete(requestId)
+            pendingPermissionHandlers.delete(requestId);
             // Extract the permission decision from the control_response payload
-            const inner = msg.response
-            if (
-              inner.subtype === 'success' &&
-              inner.response &&
-              isBridgePermissionResponse(inner.response)
-            ) {
-              handler(inner.response)
+            const inner = msg.response;
+            if (inner.subtype === 'success' && inner.response && isBridgePermissionResponse(inner.response)) {
+              handler(inner.response);
             }
           }
 
@@ -472,22 +414,22 @@ export function useReplBridge(
             onInboundMessage: handleInboundMessage,
             onPermissionResponse: handlePermissionResponse,
             onInterrupt() {
-              abortControllerRef.current?.abort()
+              abortControllerRef.current?.abort();
             },
             onSetModel(model) {
-              const resolved = model === 'default' ? null : (model ?? null)
-              setMainLoopModelOverride(resolved)
+              const resolved = model === 'default' ? null : (model ?? null);
+              setMainLoopModelOverride(resolved);
               setAppState(prev => {
-                if (prev.mainLoopModelForSession === resolved) return prev
-                return { ...prev, mainLoopModelForSession: resolved }
-              })
+                if (prev.mainLoopModelForSession === resolved) return prev;
+                return { ...prev, mainLoopModelForSession: resolved };
+              });
             },
             onSetMaxThinkingTokens(maxTokens) {
-              const enabled = maxTokens !== null
+              const enabled = maxTokens !== null;
               setAppState(prev => {
-                if (prev.thinkingEnabled === enabled) return prev
-                return { ...prev, thinkingEnabled: enabled }
-              })
+                if (prev.thinkingEnabled === enabled) return prev;
+                return { ...prev, thinkingEnabled: enabled };
+              });
             },
             onSetPermissionMode(mode) {
               // Policy guards MUST fire before transitionPermissionMode —
@@ -506,57 +448,46 @@ export function useReplBridge(
                     ok: false,
                     error:
                       'Cannot set permission mode to bypassPermissions because it is disabled by settings or configuration',
-                  }
+                  };
                 }
-                if (
-                  !store.getState().toolPermissionContext
-                    .isBypassPermissionsModeAvailable
-                ) {
+                if (!store.getState().toolPermissionContext.isBypassPermissionsModeAvailable) {
                   return {
                     ok: false,
                     error:
                       'Cannot set permission mode to bypassPermissions because the session was not launched with --dangerously-skip-permissions',
-                  }
+                  };
                 }
               }
-              if (
-                feature('TRANSCRIPT_CLASSIFIER') &&
-                mode === 'auto' &&
-                !isAutoModeGateEnabled()
-              ) {
-                const reason = getAutoModeUnavailableReason()
+              if (feature('TRANSCRIPT_CLASSIFIER') && mode === 'auto' && !isAutoModeGateEnabled()) {
+                const reason = getAutoModeUnavailableReason();
                 return {
                   ok: false,
                   error: reason
                     ? `Cannot set permission mode to auto: ${getAutoModeUnavailableNotification(reason)}`
                     : 'Cannot set permission mode to auto',
-                }
+                };
               }
               // Guards passed — apply via the centralized transition so
               // prePlanMode stashing and auto-mode state sync all fire.
               setAppState(prev => {
-                const current = prev.toolPermissionContext.mode
-                if (current === mode) return prev
-                const next = transitionPermissionMode(
-                  current,
-                  mode,
-                  prev.toolPermissionContext,
-                )
+                const current = prev.toolPermissionContext.mode;
+                if (current === mode) return prev;
+                const next = transitionPermissionMode(current, mode, prev.toolPermissionContext);
                 return {
                   ...prev,
                   toolPermissionContext: { ...next, mode },
-                }
-              })
+                };
+              });
               // Recheck queued permission prompts now that mode changed.
               setImmediate(() => {
                 getLeaderToolUseConfirmQueue()?.(currentQueue => {
                   currentQueue.forEach(item => {
-                    void item.recheckPermission()
-                  })
-                  return currentQueue
-                })
-              })
-              return { ok: true }
+                    void item.recheckPermission();
+                  });
+                  return currentQueue;
+                });
+              });
+              return { ok: true };
             },
             onStateChange: handleStateChange,
             initialMessages: messages.length > 0 ? messages : undefined,
@@ -564,62 +495,57 @@ export function useReplBridge(
             previouslyFlushedUUIDs: flushedUUIDsRef.current,
             initialName: replBridgeInitialName,
             perpetual,
-          })
+          });
           if (cancelled) {
             // Effect was cancelled while initReplBridge was in flight.
             // Tear down the handle to avoid leaking resources (poll loop,
             // WebSocket, registered environment, cleanup callback).
             logForDebugging(
               `[bridge:repl] Hook: init cancelled during flight, tearing down${handle ? ` env=${handle.environmentId}` : ''}`,
-            )
+            );
             if (handle) {
-              void handle.teardown()
+              void handle.teardown();
             }
-            return
+            return;
           }
           if (!handle) {
             // initReplBridge returned null — a precondition failed. For most
             // cases (no_oauth, policy_denied, etc.) onStateChange('failed')
             // already fired with a specific hint. The GrowthBook-gate-off case
             // is intentionally silent — not a failure, just not rolled out.
-            consecutiveFailuresRef.current++
+            consecutiveFailuresRef.current++;
             logForDebugging(
               `[bridge:repl] Init returned null (precondition or session creation failed); consecutive failures: ${consecutiveFailuresRef.current}`,
-            )
-            clearTimeout(failureTimeoutRef.current)
+            );
+            clearTimeout(failureTimeoutRef.current);
             setAppState(prev => ({
               ...prev,
-              replBridgeError:
-                prev.replBridgeError ?? 'check debug logs for details',
-            }))
+              replBridgeError: prev.replBridgeError ?? 'check debug logs for details',
+            }));
             failureTimeoutRef.current = setTimeout(() => {
-              if (cancelled) return
-              failureTimeoutRef.current = undefined
+              if (cancelled) return;
+              failureTimeoutRef.current = undefined;
               setAppState(prev => {
-                if (!prev.replBridgeError) return prev
+                if (!prev.replBridgeError) return prev;
                 return {
                   ...prev,
                   replBridgeEnabled: false,
                   replBridgeError: undefined,
-                }
-              })
-            }, BRIDGE_FAILURE_DISMISS_MS)
-            return
+                };
+              });
+            }, BRIDGE_FAILURE_DISMISS_MS);
+            return;
           }
-          handleRef.current = handle
-          setReplBridgeHandle(handle)
-          consecutiveFailuresRef.current = 0
+          handleRef.current = handle;
+          setReplBridgeHandle(handle);
+          consecutiveFailuresRef.current = 0;
           // Skip initial messages in the forwarding effect — they were
           // already loaded as session events during creation.
-          lastWrittenIndexRef.current = initialMessageCount
+          lastWrittenIndexRef.current = initialMessageCount;
 
           if (outboundOnly) {
             setAppState(prev => {
-              if (
-                prev.replBridgeConnected &&
-                prev.replBridgeSessionId === handle.bridgeSessionId
-              )
-                return prev
+              if (prev.replBridgeConnected && prev.replBridgeSessionId === handle.bridgeSessionId) return prev;
               return {
                 ...prev,
                 replBridgeConnected: true,
@@ -627,24 +553,14 @@ export function useReplBridge(
                 replBridgeSessionUrl: undefined,
                 replBridgeConnectUrl: undefined,
                 replBridgeError: undefined,
-              }
-            })
-            logForDebugging(
-              `[bridge:repl] Mirror initialized, session=${handle.bridgeSessionId}`,
-            )
+              };
+            });
+            logForDebugging(`[bridge:repl] Mirror initialized, session=${handle.bridgeSessionId}`);
           } else {
             // Build bridge permission callbacks so the interactive permission
             // handler can race bridge responses against local user interaction.
             const permissionCallbacks: BridgePermissionCallbacks = {
-              sendRequest(
-                requestId,
-                toolName,
-                input,
-                toolUseId,
-                description,
-                permissionSuggestions,
-                blockedPath,
-              ) {
+              sendRequest(requestId, toolName, input, toolUseId, description, permissionSuggestions, blockedPath) {
                 handle.sendControlRequest({
                   type: 'control_request',
                   request_id: requestId,
@@ -654,15 +570,13 @@ export function useReplBridge(
                     input,
                     tool_use_id: toolUseId,
                     description,
-                    ...(permissionSuggestions
-                      ? { permission_suggestions: permissionSuggestions }
-                      : {}),
+                    ...(permissionSuggestions ? { permission_suggestions: permissionSuggestions } : {}),
                     ...(blockedPath ? { blocked_path: blockedPath } : {}),
                   },
-                })
+                });
               },
               sendResponse(requestId, response) {
-                const payload: Record<string, unknown> = { ...response }
+                const payload: Record<string, unknown> = { ...response };
                 handle.sendControlResponse({
                   type: 'control_response',
                   response: {
@@ -670,41 +584,32 @@ export function useReplBridge(
                     request_id: requestId,
                     response: payload,
                   },
-                })
+                });
               },
               cancelRequest(requestId) {
-                handle.sendControlCancelRequest(requestId)
+                handle.sendControlCancelRequest(requestId);
               },
               onResponse(requestId, handler) {
-                pendingPermissionHandlers.set(requestId, handler)
+                pendingPermissionHandlers.set(requestId, handler);
                 return () => {
-                  pendingPermissionHandlers.delete(requestId)
-                }
+                  pendingPermissionHandlers.delete(requestId);
+                };
               },
-            }
+            };
             setAppState(prev => ({
               ...prev,
               replBridgePermissionCallbacks: permissionCallbacks,
-            }))
-            const url = getRemoteSessionUrl(
-              handle.bridgeSessionId,
-              handle.sessionIngressUrl,
-            )
+            }));
+            const url = getRemoteSessionUrl(handle.bridgeSessionId, handle.sessionIngressUrl);
             // environmentId === '' signals the v2 env-less path. buildBridgeConnectUrl
             // builds an env-specific connect URL, which doesn't exist without an env.
-            const hasEnv = handle.environmentId !== ''
+            const hasEnv = handle.environmentId !== '';
             const connectUrl = hasEnv
-              ? buildBridgeConnectUrl(
-                  handle.environmentId,
-                  handle.sessionIngressUrl,
-                )
-              : undefined
+              ? buildBridgeConnectUrl(handle.environmentId, handle.sessionIngressUrl)
+              : undefined;
             setAppState(prev => {
-              if (
-                prev.replBridgeConnected &&
-                prev.replBridgeSessionUrl === url
-              ) {
-                return prev
+              if (prev.replBridgeConnected && prev.replBridgeSessionUrl === url) {
+                return prev;
               }
               return {
                 ...prev,
@@ -714,17 +619,15 @@ export function useReplBridge(
                 replBridgeEnvironmentId: handle.environmentId,
                 replBridgeSessionId: handle.bridgeSessionId,
                 replBridgeError: undefined,
-              }
-            })
+              };
+            });
 
             // Show bridge status with URL in the transcript. perpetual (KAIROS
             // assistant mode) falls back to v1 at initReplBridge.ts — skip the
             // v2-only upgrade nudge for them. Own try/catch so a cosmetic
             // GrowthBook hiccup doesn't hit the outer init-failure handler.
-            const upgradeNudge = !perpetual
-              ? await shouldShowAppUpgradeMessage().catch(() => false)
-              : false
-            if (cancelled) return
+            const upgradeNudge = !perpetual ? await shouldShowAppUpgradeMessage().catch(() => false) : false;
+            if (cancelled) return;
             setMessages(prev => [
               ...prev,
               createBridgeStatusMessage(
@@ -733,11 +636,9 @@ export function useReplBridge(
                   ? 'Please upgrade to the latest version of the Claude mobile app to see your Remote Control sessions.'
                   : undefined,
               ),
-            ])
+            ]);
 
-            logForDebugging(
-              `[bridge:repl] Hook initialized, session=${handle.bridgeSessionId}`,
-            )
+            logForDebugging(`[bridge:repl] Hook initialized, session=${handle.bridgeSessionId}`);
           }
         } catch (err) {
           // Never crash the REPL — surface the error in the UI.
@@ -746,61 +647,54 @@ export function useReplBridge(
           // error), don't count that toward the fuse or spam a stale error
           // into the UI. Also fixes pre-existing spurious setAppState/
           // setMessages on cancelled throws.
-          if (cancelled) return
-          consecutiveFailuresRef.current++
-          const errMsg = errorMessage(err)
+          if (cancelled) return;
+          consecutiveFailuresRef.current++;
+          const errMsg = errorMessage(err);
           logForDebugging(
             `[bridge:repl] Init failed: ${errMsg}; consecutive failures: ${consecutiveFailuresRef.current}`,
-          )
-          clearTimeout(failureTimeoutRef.current)
-          notifyBridgeFailed(errMsg)
+          );
+          clearTimeout(failureTimeoutRef.current);
+          notifyBridgeFailed(errMsg);
           setAppState(prev => ({
             ...prev,
             replBridgeError: errMsg,
-          }))
+          }));
           failureTimeoutRef.current = setTimeout(() => {
-            if (cancelled) return
-            failureTimeoutRef.current = undefined
+            if (cancelled) return;
+            failureTimeoutRef.current = undefined;
             setAppState(prev => {
-              if (!prev.replBridgeError) return prev
+              if (!prev.replBridgeError) return prev;
               return {
                 ...prev,
                 replBridgeEnabled: false,
                 replBridgeError: undefined,
-              }
-            })
-          }, BRIDGE_FAILURE_DISMISS_MS)
+              };
+            });
+          }, BRIDGE_FAILURE_DISMISS_MS);
           if (!outboundOnly) {
             setMessages(prev => [
               ...prev,
-              createSystemMessage(
-                `Remote Control failed to connect: ${errMsg}`,
-                'warning',
-              ),
-            ])
+              createSystemMessage(`Remote Control failed to connect: ${errMsg}`, 'warning'),
+            ]);
           }
         }
-      })()
+      })();
 
       return () => {
-        cancelled = true
-        clearTimeout(failureTimeoutRef.current)
-        failureTimeoutRef.current = undefined
+        cancelled = true;
+        clearTimeout(failureTimeoutRef.current);
+        failureTimeoutRef.current = undefined;
         if (handleRef.current) {
           logForDebugging(
             `[bridge:repl] Hook cleanup: starting teardown for env=${handleRef.current.environmentId} session=${handleRef.current.bridgeSessionId}`,
-          )
-          teardownPromiseRef.current = handleRef.current.teardown()
-          handleRef.current = null
-          setReplBridgeHandle(null)
+          );
+          teardownPromiseRef.current = handleRef.current.teardown();
+          handleRef.current = null;
+          setReplBridgeHandle(null);
         }
         setAppState(prev => {
-          if (
-            !prev.replBridgeConnected &&
-            !prev.replBridgeSessionActive &&
-            !prev.replBridgeError
-          ) {
-            return prev
+          if (!prev.replBridgeConnected && !prev.replBridgeSessionActive && !prev.replBridgeError) {
+            return prev;
           }
           return {
             ...prev,
@@ -813,18 +707,12 @@ export function useReplBridge(
             replBridgeSessionId: undefined,
             replBridgeError: undefined,
             replBridgePermissionCallbacks: undefined,
-          }
-        })
-        lastWrittenIndexRef.current = 0
-      }
+          };
+        });
+        lastWrittenIndexRef.current = 0;
+      };
     }
-  }, [
-    replBridgeEnabled,
-    replBridgeOutboundOnly,
-    setAppState,
-    setMessages,
-    addNotification,
-  ])
+  }, [replBridgeEnabled, replBridgeOutboundOnly, setAppState, setMessages, addNotification]);
 
   // Write new messages as they appear.
   // Also re-runs when replBridgeConnected changes (bridge finishes init),
@@ -832,10 +720,10 @@ export function useReplBridge(
   useEffect(() => {
     // Positive feature() guard — see first useEffect comment
     if (feature('BRIDGE_MODE')) {
-      if (!replBridgeConnected) return
+      if (!replBridgeConnected) return;
 
-      const handle = handleRef.current
-      if (!handle) return
+      const handle = handleRef.current;
+      if (!handle) return;
 
       // Clamp the index in case messages were compacted (array shortened).
       // After compaction the ref could exceed messages.length, and without
@@ -843,36 +731,36 @@ export function useReplBridge(
       if (lastWrittenIndexRef.current > messages.length) {
         logForDebugging(
           `[bridge:repl] Compaction detected: lastWrittenIndex=${lastWrittenIndexRef.current} > messages.length=${messages.length}, clamping`,
-        )
+        );
       }
-      const startIndex = Math.min(lastWrittenIndexRef.current, messages.length)
+      const startIndex = Math.min(lastWrittenIndexRef.current, messages.length);
 
       // Collect new messages since last write
-      const newMessages: Message[] = []
+      const newMessages: Message[] = [];
       for (let i = startIndex; i < messages.length; i++) {
-        const msg = messages[i]
+        const msg = messages[i];
         if (
           msg &&
           (msg.type === 'user' ||
             msg.type === 'assistant' ||
             (msg.type === 'system' && msg.subtype === 'local_command'))
         ) {
-          newMessages.push(msg)
+          newMessages.push(msg);
         }
       }
-      lastWrittenIndexRef.current = messages.length
+      lastWrittenIndexRef.current = messages.length;
 
       if (newMessages.length > 0) {
-        handle.writeMessages(newMessages)
+        handle.writeMessages(newMessages);
       }
     }
-  }, [messages, replBridgeConnected])
+  }, [messages, replBridgeConnected]);
 
   const sendBridgeResult = useCallback(() => {
     if (feature('BRIDGE_MODE')) {
-      handleRef.current?.sendResult()
+      handleRef.current?.sendResult();
     }
-  }, [])
+  }, []);
 
-  return { sendBridgeResult }
+  return { sendBridgeResult };
 }
diff --git a/src/hooks/useSSHSession.ts b/src/hooks/useSSHSession.ts
index 0ee717e3e..d1fb25b74 100644
--- a/src/hooks/useSSHSession.ts
+++ b/src/hooks/useSSHSession.ts
@@ -21,7 +21,10 @@ import {
   isSessionEndMessage,
 } from '../remote/sdkMessageAdapter.js'
 import type { SSHSession } from '../ssh/createSSHSession.js'
-import type { SSHSessionManager, SSHPermissionRequest } from '../ssh/SSHSessionManager.js'
+import type {
+  SSHSessionManager,
+  SSHPermissionRequest,
+} from '../ssh/SSHSessionManager.js'
 import type { Tool } from '../Tool.js'
 import { findToolByName } from '../Tool.js'
 import type { Message as MessageType } from '../types/message.js'
@@ -98,7 +101,9 @@ export function useSSHSession({
           createToolStub(request.tool_name)
 
         const syntheticMessage = createSyntheticAssistantMessage(
-          request as unknown as Parameters<typeof createSyntheticAssistantMessage>[0],
+          request as unknown as Parameters<
+            typeof createSyntheticAssistantMessage
+          >[0],
           requestId,
         )
 
diff --git a/src/hooks/useTeleportResume.tsx b/src/hooks/useTeleportResume.tsx
index bc0e1fb0e..2843bac48 100644
--- a/src/hooks/useTeleportResume.tsx
+++ b/src/hooks/useTeleportResume.tsx
@@ -1,72 +1,62 @@
-import { useCallback, useState } from 'react'
-import { setTeleportedSessionInfo } from 'src/bootstrap/state.js'
+import { useCallback, useState } from 'react';
+import { setTeleportedSessionInfo } from 'src/bootstrap/state.js';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from 'src/services/analytics/index.js'
-import type { TeleportRemoteResponse } from 'src/utils/conversationRecovery.js'
-import type { CodeSession } from 'src/utils/teleport/api.js'
-import { errorMessage, TeleportOperationError } from '../utils/errors.js'
-import { teleportResumeCodeSession } from '../utils/teleport.js'
+} from 'src/services/analytics/index.js';
+import type { TeleportRemoteResponse } from 'src/utils/conversationRecovery.js';
+import type { CodeSession } from 'src/utils/teleport/api.js';
+import { errorMessage, TeleportOperationError } from '../utils/errors.js';
+import { teleportResumeCodeSession } from '../utils/teleport.js';
 
 export type TeleportResumeError = {
-  message: string
-  formattedMessage?: string
-  isOperationError: boolean
-}
+  message: string;
+  formattedMessage?: string;
+  isOperationError: boolean;
+};
 
-export type TeleportSource = 'cliArg' | 'localCommand'
+export type TeleportSource = 'cliArg' | 'localCommand';
 
 export function useTeleportResume(source: TeleportSource) {
-  const [isResuming, setIsResuming] = useState(false)
-  const [error, setError] = useState<TeleportResumeError | null>(null)
-  const [selectedSession, setSelectedSession] = useState<CodeSession | null>(
-    null,
-  )
+  const [isResuming, setIsResuming] = useState(false);
+  const [error, setError] = useState<TeleportResumeError | null>(null);
+  const [selectedSession, setSelectedSession] = useState<CodeSession | null>(null);
 
   const resumeSession = useCallback(
     async (session: CodeSession): Promise<TeleportRemoteResponse | null> => {
-      setIsResuming(true)
-      setError(null)
-      setSelectedSession(session)
+      setIsResuming(true);
+      setError(null);
+      setSelectedSession(session);
 
       // Log teleport session selection
       logEvent('tengu_teleport_resume_session', {
-        source:
-          source as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        session_id:
-          session.id as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
+        source: source as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        session_id: session.id as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
 
       try {
-        const result = await teleportResumeCodeSession(session.id)
+        const result = await teleportResumeCodeSession(session.id);
         // Track teleported session for reliability logging
-        setTeleportedSessionInfo({ sessionId: session.id })
-        setIsResuming(false)
-        return result
+        setTeleportedSessionInfo({ sessionId: session.id });
+        setIsResuming(false);
+        return result;
       } catch (err) {
         const teleportError: TeleportResumeError = {
-          message:
-            err instanceof TeleportOperationError
-              ? err.message
-              : errorMessage(err),
-          formattedMessage:
-            err instanceof TeleportOperationError
-              ? err.formattedMessage
-              : undefined,
+          message: err instanceof TeleportOperationError ? err.message : errorMessage(err),
+          formattedMessage: err instanceof TeleportOperationError ? err.formattedMessage : undefined,
           isOperationError: err instanceof TeleportOperationError,
-        }
-        setError(teleportError)
-        setIsResuming(false)
-        return null
+        };
+        setError(teleportError);
+        setIsResuming(false);
+        return null;
       }
     },
     [source],
-  )
+  );
 
   const clearError = useCallback(() => {
-    setError(null)
-  }, [])
+    setError(null);
+  }, []);
 
   return {
     resumeSession,
@@ -74,5 +64,5 @@ export function useTeleportResume(source: TeleportSource) {
     error,
     selectedSession,
     clearError,
-  }
+  };
 }
diff --git a/src/hooks/useTextInput.ts b/src/hooks/useTextInput.ts
index 21e0dbf19..5cf16e261 100644
--- a/src/hooks/useTextInput.ts
+++ b/src/hooks/useTextInput.ts
@@ -24,6 +24,7 @@ import type { ImageDimensions } from '../utils/imageResizer.js'
 import { isModifierPressed, prewarmModifiers } from '../utils/modifiers.js'
 import { useDoublePress } from './useDoublePress.js'
 
+// biome-ignore lint/suspicious/noConfusingVoidType: void is the correct return type for cursor handlers that return nothing
 type MaybeCursor = void | Cursor
 type InputHandler = (input: string) => MaybeCursor
 type InputMapper = (input: string) => MaybeCursor
diff --git a/src/hooks/useTypeahead.tsx b/src/hooks/useTypeahead.tsx
index 6625586d3..1eece26e3 100644
--- a/src/hooks/useTypeahead.tsx
+++ b/src/hooks/useTypeahead.tsx
@@ -584,7 +584,6 @@ export function useTypeahead({
   const debouncedFetchSlackChannels = useDebounceCallback(fetchSlackChannels, 150);
 
   // Handle immediate suggestion logic (cheap operations)
-  // biome-ignore lint/correctness/useExhaustiveDependencies: store is a stable context ref, read imperatively at call-time
   const updateSuggestions = useCallback(
     async (value: string, inputCursorOffset?: number): Promise<void> => {
       // Use provided cursor offset or fall back to ref (avoids dependency on cursorOffset)
diff --git a/src/hooks/useVoiceIntegration.tsx b/src/hooks/useVoiceIntegration.tsx
index b798a61ae..6897b1834 100644
--- a/src/hooks/useVoiceIntegration.tsx
+++ b/src/hooks/useVoiceIntegration.tsx
@@ -1,84 +1,69 @@
-import { feature } from 'bun:bundle'
-import * as React from 'react'
-import { useCallback, useEffect, useMemo, useRef } from 'react'
-import { useNotifications } from '../context/notifications.js'
-import { useIsModalOverlayActive } from '../context/overlayContext.js'
-import {
-  useGetVoiceState,
-  useSetVoiceState,
-  useVoiceState,
-} from '../context/voice.js'
-import { KeyboardEvent, useInput } from '@anthropic/ink'
+import { feature } from 'bun:bundle';
+import * as React from 'react';
+import { useCallback, useEffect, useMemo, useRef } from 'react';
+import { useNotifications } from '../context/notifications.js';
+import { useIsModalOverlayActive } from '../context/overlayContext.js';
+import { useGetVoiceState, useSetVoiceState, useVoiceState } from '../context/voice.js';
+import { KeyboardEvent, useInput } from '@anthropic/ink';
 // backward-compat bridge until REPL wires handleKeyDown to <Box onKeyDown>
-import { useOptionalKeybindingContext } from '../keybindings/KeybindingContext.js'
-import { keystrokesEqual } from '../keybindings/resolver.js'
-import type { ParsedKeystroke } from '../keybindings/types.js'
-import { normalizeFullWidthSpace } from '../utils/stringUtils.js'
-import { useVoiceEnabled } from './useVoiceEnabled.js'
+import { useOptionalKeybindingContext } from '../keybindings/KeybindingContext.js';
+import { keystrokesEqual } from '../keybindings/resolver.js';
+import type { ParsedKeystroke } from '../keybindings/types.js';
+import { normalizeFullWidthSpace } from '../utils/stringUtils.js';
+import { useVoiceEnabled } from './useVoiceEnabled.js';
 
 // Dead code elimination: conditional import for voice input hook.
 /* eslint-disable @typescript-eslint/no-require-imports */
 // Capture the module namespace, not the function: spyOn() mutates the module
 // object, so `voiceNs.useVoice(...)` resolves to the spy even if this module
 // was loaded before the spy was installed (test ordering independence).
-const voiceNs: { useVoice: typeof import('./useVoice.js').useVoice } = feature(
-  'VOICE_MODE',
-)
+const voiceNs: { useVoice: typeof import('./useVoice.js').useVoice } = feature('VOICE_MODE')
   ? require('./useVoice.js')
   : {
-      useVoice: ({
-        enabled: _e,
-      }: {
-        onTranscript: (t: string) => void
-        enabled: boolean
-      }) => ({
+      useVoice: ({ enabled: _e }: { onTranscript: (t: string) => void; enabled: boolean }) => ({
         state: 'idle' as const,
         handleKeyEvent: (_fallbackMs?: number) => {},
       }),
-    }
+    };
 /* eslint-enable @typescript-eslint/no-require-imports */
 
 // Maximum gap (ms) between key presses to count as held (auto-repeat).
 // Terminal auto-repeat fires every 30-80ms; 120ms covers jitter while
 // excluding normal typing speed (100-300ms between keystrokes).
-const RAPID_KEY_GAP_MS = 120
+const RAPID_KEY_GAP_MS = 120;
 
 // Fallback (ms) for modifier-combo first-press activation. Must match
 // FIRST_PRESS_FALLBACK_MS in useVoice.ts. Covers the max OS initial
 // key-repeat delay (~2s on macOS with slider at "Long") so holding a
 // modifier combo doesn't fragment into two sessions when the first
 // auto-repeat arrives after the default 600ms REPEAT_FALLBACK_MS.
-const MODIFIER_FIRST_PRESS_FALLBACK_MS = 2000
+const MODIFIER_FIRST_PRESS_FALLBACK_MS = 2000;
 
 // Number of rapid consecutive key events required to activate voice.
 // Only applies to bare-char bindings (space, v, etc.) where a single press
 // could be normal typing. Modifier combos activate on the first press.
-const HOLD_THRESHOLD = 5
+const HOLD_THRESHOLD = 5;
 
 // Number of rapid key events to start showing warmup feedback.
-const WARMUP_THRESHOLD = 2
+const WARMUP_THRESHOLD = 2;
 
 // Match a KeyboardEvent against a ParsedKeystroke. Replaces the legacy
 // matchesKeystroke(input, Key, ...) path which assumed useInput's raw
 // `input` arg — KeyboardEvent.key holds normalized names (e.g. 'space',
 // 'f9') that getKeyName() didn't handle, so modifier combos and f-keys
 // silently failed to match after the onKeyDown migration (#23524).
-function matchesKeyboardEvent(
-  e: KeyboardEvent,
-  target: ParsedKeystroke,
-): boolean {
+function matchesKeyboardEvent(e: KeyboardEvent, target: ParsedKeystroke): boolean {
   // KeyboardEvent stores key names; ParsedKeystroke stores ' ' for space
   // and 'enter' for return (see parser.ts case 'space'/'return').
-  const key =
-    e.key === 'space' ? ' ' : e.key === 'return' ? 'enter' : e.key.toLowerCase()
-  if (key !== target.key) return false
-  if (e.ctrl !== target.ctrl) return false
-  if (e.shift !== target.shift) return false
+  const key = e.key === 'space' ? ' ' : e.key === 'return' ? 'enter' : e.key.toLowerCase();
+  if (key !== target.key) return false;
+  if (e.ctrl !== target.ctrl) return false;
+  if (e.shift !== target.shift) return false;
   // KeyboardEvent.meta folds alt|option (terminal limitation — esc-prefix);
   // ParsedKeystroke has both alt and meta as aliases for the same thing.
-  if (e.meta !== (target.alt || target.meta)) return false
-  if (e.superKey !== target.super) return false
-  return true
+  if (e.meta !== (target.alt || target.meta)) return false;
+  if (e.superKey !== target.super) return false;
+  return true;
 }
 
 // Hardcoded default for when there's no KeybindingProvider at all (e.g.
@@ -92,60 +77,60 @@ const DEFAULT_VOICE_KEYSTROKE: ParsedKeystroke = {
   shift: false,
   meta: false,
   super: false,
-}
+};
 
 type InsertTextHandle = {
-  insert: (text: string) => void
-  setInputWithCursor: (value: string, cursor: number) => void
-  cursorOffset: number
-}
+  insert: (text: string) => void;
+  setInputWithCursor: (value: string, cursor: number) => void;
+  cursorOffset: number;
+};
 
 type UseVoiceIntegrationArgs = {
-  setInputValueRaw: React.Dispatch<React.SetStateAction<string>>
-  inputValueRef: React.RefObject<string>
-  insertTextRef: React.RefObject<InsertTextHandle | null>
-}
+  setInputValueRaw: React.Dispatch<React.SetStateAction<string>>;
+  inputValueRef: React.RefObject<string>;
+  insertTextRef: React.RefObject<InsertTextHandle | null>;
+};
 
-type InterimRange = { start: number; end: number }
+type InterimRange = { start: number; end: number };
 
 type StripOpts = {
   // Which char to strip (the configured hold key). Defaults to space.
-  char?: string
+  char?: string;
   // Capture the voice prefix/suffix anchor at the stripped position.
-  anchor?: boolean
+  anchor?: boolean;
   // Minimum trailing count to leave behind — prevents stripping the
   // intentional warmup chars when defensively cleaning up leaks.
-  floor?: number
-}
+  floor?: number;
+};
 
 type UseVoiceIntegrationResult = {
   // Returns the number of trailing chars remaining after stripping.
-  stripTrailing: (maxStrip: number, opts?: StripOpts) => number
+  stripTrailing: (maxStrip: number, opts?: StripOpts) => number;
   // Undo the gap space and reset anchor refs after a failed voice activation.
-  resetAnchor: () => void
-  handleKeyEvent: (fallbackMs?: number) => void
-  interimRange: InterimRange | null
-}
+  resetAnchor: () => void;
+  handleKeyEvent: (fallbackMs?: number) => void;
+  interimRange: InterimRange | null;
+};
 
 export function useVoiceIntegration({
   setInputValueRaw,
   inputValueRef,
   insertTextRef,
 }: UseVoiceIntegrationArgs): UseVoiceIntegrationResult {
-  const { addNotification } = useNotifications()
+  const { addNotification } = useNotifications();
 
   // Tracks the input content before/after the cursor when voice starts,
   // so interim transcripts can be inserted at the cursor position without
   // clobbering surrounding user text.
-  const voicePrefixRef = useRef<string | null>(null)
-  const voiceSuffixRef = useRef<string>('')
+  const voicePrefixRef = useRef<string | null>(null);
+  const voiceSuffixRef = useRef<string>('');
   // Tracks the last input value this hook wrote (via anchor, interim effect,
   // or handleVoiceTranscript). If inputValueRef.current diverges, the user
   // submitted or edited — both write paths bail to avoid clobbering. This is
   // the only guard that correctly handles empty-prefix-empty-suffix: a
   // startsWith('')/endsWith('') check vacuously passes, and a length check
   // can't distinguish a cleared input from a never-set one.
-  const lastSetInputRef = useRef<string | null>(null)
+  const lastSetInputRef = useRef<string | null>(null);
 
   // Strip trailing hold-key chars (and optionally capture the voice
   // anchor). Called during warmup (to clean up chars that leaked past
@@ -160,29 +145,22 @@ export function useVoiceIntegration({
   // trailing chars remaining after stripping. When nothing changes, no
   // state update is performed.
   const stripTrailing = useCallback(
-    (
-      maxStrip: number,
-      { char = ' ', anchor = false, floor = 0 }: StripOpts = {},
-    ) => {
-      const prev = inputValueRef.current
-      const offset = insertTextRef.current?.cursorOffset ?? prev.length
-      const beforeCursor = prev.slice(0, offset)
-      const afterCursor = prev.slice(offset)
+    (maxStrip: number, { char = ' ', anchor = false, floor = 0 }: StripOpts = {}) => {
+      const prev = inputValueRef.current;
+      const offset = insertTextRef.current?.cursorOffset ?? prev.length;
+      const beforeCursor = prev.slice(0, offset);
+      const afterCursor = prev.slice(offset);
       // When the hold key is space, also count full-width spaces (U+3000)
       // that a CJK IME may have inserted for the same physical key.
       // U+3000 is BMP single-code-unit so indices align with beforeCursor.
-      const scan =
-        char === ' ' ? normalizeFullWidthSpace(beforeCursor) : beforeCursor
-      let trailing = 0
-      while (
-        trailing < scan.length &&
-        scan[scan.length - 1 - trailing] === char
-      ) {
-        trailing++
+      const scan = char === ' ' ? normalizeFullWidthSpace(beforeCursor) : beforeCursor;
+      let trailing = 0;
+      while (trailing < scan.length && scan[scan.length - 1 - trailing] === char) {
+        trailing++;
       }
-      const stripCount = Math.max(0, Math.min(trailing - floor, maxStrip))
-      const remaining = trailing - stripCount
-      const stripped = beforeCursor.slice(0, beforeCursor.length - stripCount)
+      const stripCount = Math.max(0, Math.min(trailing - floor, maxStrip));
+      const remaining = trailing - stripCount;
+      const stripped = beforeCursor.slice(0, beforeCursor.length - stripCount);
       // When anchoring with a non-space suffix, insert a gap space so the
       // waveform cursor sits on the gap instead of covering the first
       // suffix letter. The interim transcript effect maintains this same
@@ -192,26 +170,26 @@ export function useVoiceIntegration({
       // voice (voiceState stayed 'idle'), the cleanup effect didn't fire and
       // the old anchor is stale. anchor=true is only passed on the single
       // activation call, never during recording, so overwrite is safe.
-      let gap = ''
+      let gap = '';
       if (anchor) {
-        voicePrefixRef.current = stripped
-        voiceSuffixRef.current = afterCursor
+        voicePrefixRef.current = stripped;
+        voiceSuffixRef.current = afterCursor;
         if (afterCursor.length > 0 && !/^\s/.test(afterCursor)) {
-          gap = ' '
+          gap = ' ';
         }
       }
-      const newValue = stripped + gap + afterCursor
-      if (anchor) lastSetInputRef.current = newValue
-      if (newValue === prev && stripCount === 0) return remaining
+      const newValue = stripped + gap + afterCursor;
+      if (anchor) lastSetInputRef.current = newValue;
+      if (newValue === prev && stripCount === 0) return remaining;
       if (insertTextRef.current) {
-        insertTextRef.current.setInputWithCursor(newValue, stripped.length)
+        insertTextRef.current.setInputWithCursor(newValue, stripped.length);
       } else {
-        setInputValueRaw(newValue)
+        setInputValueRaw(newValue);
       }
-      return remaining
+      return remaining;
     },
     [setInputValueRaw, inputValueRef, insertTextRef],
-  )
+  );
 
   // Undo the gap space inserted by stripTrailing(..., {anchor:true}) and
   // reset the voice prefix/suffix refs. Called when voice activation fails
@@ -220,123 +198,113 @@ export function useVoiceIntegration({
   // reach the stale anchor. Without this, the gap space and stale refs
   // persist in the input.
   const resetAnchor = useCallback(() => {
-    const prefix = voicePrefixRef.current
-    if (prefix === null) return
-    const suffix = voiceSuffixRef.current
-    voicePrefixRef.current = null
-    voiceSuffixRef.current = ''
-    const restored = prefix + suffix
+    const prefix = voicePrefixRef.current;
+    if (prefix === null) return;
+    const suffix = voiceSuffixRef.current;
+    voicePrefixRef.current = null;
+    voiceSuffixRef.current = '';
+    const restored = prefix + suffix;
     if (insertTextRef.current) {
-      insertTextRef.current.setInputWithCursor(restored, prefix.length)
+      insertTextRef.current.setInputWithCursor(restored, prefix.length);
     } else {
-      setInputValueRaw(restored)
+      setInputValueRaw(restored);
     }
-  }, [setInputValueRaw, insertTextRef])
+  }, [setInputValueRaw, insertTextRef]);
 
   // Voice state selectors. useVoiceEnabled = user intent (settings) +
   // auth + GB kill-switch, with the auth half memoized on authVersion so
   // render loops never hit a cold keychain spawn.
-  // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-  const voiceEnabled = feature('VOICE_MODE') ? useVoiceEnabled() : false
+  const voiceEnabled = feature('VOICE_MODE') ? useVoiceEnabled() : false;
   const voiceState = feature('VOICE_MODE')
-    ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-      useVoiceState(s => s.voiceState)
-    : ('idle' as const)
+    ? useVoiceState(s => s.voiceState)
+    : ('idle' as const);
   const voiceInterimTranscript = feature('VOICE_MODE')
-    ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-      useVoiceState(s => s.voiceInterimTranscript)
-    : ''
+    ? useVoiceState(s => s.voiceInterimTranscript)
+    : '';
 
   // Set the voice anchor for focus mode (where recording starts via terminal
   // focus, not key hold). Key-hold sets the anchor in stripTrailing.
   useEffect(() => {
-    if (!feature('VOICE_MODE')) return
+    if (!feature('VOICE_MODE')) return;
     if (voiceState === 'recording' && voicePrefixRef.current === null) {
-      const input = inputValueRef.current
-      const offset = insertTextRef.current?.cursorOffset ?? input.length
-      voicePrefixRef.current = input.slice(0, offset)
-      voiceSuffixRef.current = input.slice(offset)
-      lastSetInputRef.current = input
+      const input = inputValueRef.current;
+      const offset = insertTextRef.current?.cursorOffset ?? input.length;
+      voicePrefixRef.current = input.slice(0, offset);
+      voiceSuffixRef.current = input.slice(offset);
+      lastSetInputRef.current = input;
     }
     if (voiceState === 'idle') {
-      voicePrefixRef.current = null
-      voiceSuffixRef.current = ''
-      lastSetInputRef.current = null
+      voicePrefixRef.current = null;
+      voiceSuffixRef.current = '';
+      lastSetInputRef.current = null;
     }
-  }, [voiceState, inputValueRef, insertTextRef])
+  }, [voiceState, inputValueRef, insertTextRef]);
 
   // Live-update the prompt input with the interim transcript as voice
   // transcribes speech. The prefix (user-typed text before the cursor) is
   // preserved and the transcript is inserted between prefix and suffix.
   useEffect(() => {
-    if (!feature('VOICE_MODE')) return
-    if (voicePrefixRef.current === null) return
-    const prefix = voicePrefixRef.current
-    const suffix = voiceSuffixRef.current
+    if (!feature('VOICE_MODE')) return;
+    if (voicePrefixRef.current === null) return;
+    const prefix = voicePrefixRef.current;
+    const suffix = voiceSuffixRef.current;
     // Submit race: if the input isn't what this hook last set it to, the
     // user submitted (clearing it) or edited it. voicePrefixRef is only
     // cleared on voiceState→idle, so it's still set during the 'processing'
     // window between CloseStream and WS close — this catches refined
     // TranscriptText arriving then and re-filling a cleared input.
-    if (inputValueRef.current !== lastSetInputRef.current) return
-    const needsSpace =
-      prefix.length > 0 &&
-      !/\s$/.test(prefix) &&
-      voiceInterimTranscript.length > 0
+    if (inputValueRef.current !== lastSetInputRef.current) return;
+    const needsSpace = prefix.length > 0 && !/\s$/.test(prefix) && voiceInterimTranscript.length > 0;
     // Don't gate on voiceInterimTranscript.length -- when interim clears to ''
     // after handleVoiceTranscript sets the final text, the trailing space
     // between prefix and suffix must still be preserved.
-    const needsTrailingSpace = suffix.length > 0 && !/^\s/.test(suffix)
-    const leadingSpace = needsSpace ? ' ' : ''
-    const trailingSpace = needsTrailingSpace ? ' ' : ''
-    const newValue =
-      prefix + leadingSpace + voiceInterimTranscript + trailingSpace + suffix
+    const needsTrailingSpace = suffix.length > 0 && !/^\s/.test(suffix);
+    const leadingSpace = needsSpace ? ' ' : '';
+    const trailingSpace = needsTrailingSpace ? ' ' : '';
+    const newValue = prefix + leadingSpace + voiceInterimTranscript + trailingSpace + suffix;
     // Position cursor after the transcribed text (before suffix)
-    const cursorPos =
-      prefix.length + leadingSpace.length + voiceInterimTranscript.length
+    const cursorPos = prefix.length + leadingSpace.length + voiceInterimTranscript.length;
     if (insertTextRef.current) {
-      insertTextRef.current.setInputWithCursor(newValue, cursorPos)
+      insertTextRef.current.setInputWithCursor(newValue, cursorPos);
     } else {
-      setInputValueRaw(newValue)
+      setInputValueRaw(newValue);
     }
-    lastSetInputRef.current = newValue
-  }, [voiceInterimTranscript, setInputValueRaw, inputValueRef, insertTextRef])
+    lastSetInputRef.current = newValue;
+  }, [voiceInterimTranscript, setInputValueRaw, inputValueRef, insertTextRef]);
 
   const handleVoiceTranscript = useCallback(
     (text: string) => {
-      if (!feature('VOICE_MODE')) return
-      const prefix = voicePrefixRef.current
+      if (!feature('VOICE_MODE')) return;
+      const prefix = voicePrefixRef.current;
       // No voice anchor — voice was reset (or never started). Nothing to do.
-      if (prefix === null) return
-      const suffix = voiceSuffixRef.current
+      if (prefix === null) return;
+      const suffix = voiceSuffixRef.current;
       // Submit race: finishRecording() → user presses Enter (input cleared)
       // → WebSocket close → this callback fires with stale prefix/suffix.
       // If the input isn't what this hook last set (via the interim effect
       // or anchor), the user submitted or edited — don't re-fill. Comparing
       // against `text.length` would false-positive when the final is longer
       // than the interim (ASR routinely adds punctuation/corrections).
-      if (inputValueRef.current !== lastSetInputRef.current) return
-      const needsSpace =
-        prefix.length > 0 && !/\s$/.test(prefix) && text.length > 0
-      const needsTrailingSpace =
-        suffix.length > 0 && !/^\s/.test(suffix) && text.length > 0
-      const leadingSpace = needsSpace ? ' ' : ''
-      const trailingSpace = needsTrailingSpace ? ' ' : ''
-      const newInput = prefix + leadingSpace + text + trailingSpace + suffix
+      if (inputValueRef.current !== lastSetInputRef.current) return;
+      const needsSpace = prefix.length > 0 && !/\s$/.test(prefix) && text.length > 0;
+      const needsTrailingSpace = suffix.length > 0 && !/^\s/.test(suffix) && text.length > 0;
+      const leadingSpace = needsSpace ? ' ' : '';
+      const trailingSpace = needsTrailingSpace ? ' ' : '';
+      const newInput = prefix + leadingSpace + text + trailingSpace + suffix;
       // Position cursor after the transcribed text (before suffix)
-      const cursorPos = prefix.length + leadingSpace.length + text.length
+      const cursorPos = prefix.length + leadingSpace.length + text.length;
       if (insertTextRef.current) {
-        insertTextRef.current.setInputWithCursor(newInput, cursorPos)
+        insertTextRef.current.setInputWithCursor(newInput, cursorPos);
       } else {
-        setInputValueRaw(newInput)
+        setInputValueRaw(newInput);
       }
-      lastSetInputRef.current = newInput
+      lastSetInputRef.current = newInput;
       // Update the prefix to include this chunk so focus mode can continue
       // appending subsequent transcripts after it.
-      voicePrefixRef.current = prefix + leadingSpace + text
+      voicePrefixRef.current = prefix + leadingSpace + text;
     },
     [setInputValueRaw, inputValueRef, insertTextRef],
-  )
+  );
 
   const voice = voiceNs.useVoice({
     onTranscript: handleVoiceTranscript,
@@ -347,34 +315,31 @@ export function useVoiceIntegration({
         color: 'error',
         priority: 'immediate',
         timeoutMs: 10_000,
-      })
+      });
     },
     enabled: voiceEnabled,
     focusMode: false,
-  })
+  });
 
   // Compute the character range of interim (not-yet-finalized) transcript
   // text in the input value, so the UI can dim it.
   const interimRange = useMemo((): InterimRange | null => {
-    if (!feature('VOICE_MODE')) return null
-    if (voicePrefixRef.current === null) return null
-    if (voiceInterimTranscript.length === 0) return null
-    const prefix = voicePrefixRef.current
-    const needsSpace =
-      prefix.length > 0 &&
-      !/\s$/.test(prefix) &&
-      voiceInterimTranscript.length > 0
-    const start = prefix.length + (needsSpace ? 1 : 0)
-    const end = start + voiceInterimTranscript.length
-    return { start, end }
-  }, [voiceInterimTranscript])
+    if (!feature('VOICE_MODE')) return null;
+    if (voicePrefixRef.current === null) return null;
+    if (voiceInterimTranscript.length === 0) return null;
+    const prefix = voicePrefixRef.current;
+    const needsSpace = prefix.length > 0 && !/\s$/.test(prefix) && voiceInterimTranscript.length > 0;
+    const start = prefix.length + (needsSpace ? 1 : 0);
+    const end = start + voiceInterimTranscript.length;
+    return { start, end };
+  }, [voiceInterimTranscript]);
 
   return {
     stripTrailing,
     resetAnchor,
     handleKeyEvent: voice.handleKeyEvent,
     interimRange,
-  }
+  };
 }
 
 /**
@@ -407,21 +372,19 @@ export function useVoiceKeybindingHandler({
   resetAnchor,
   isActive,
 }: {
-  voiceHandleKeyEvent: (fallbackMs?: number) => void
-  stripTrailing: (maxStrip: number, opts?: StripOpts) => number
-  resetAnchor: () => void
-  isActive: boolean
+  voiceHandleKeyEvent: (fallbackMs?: number) => void;
+  stripTrailing: (maxStrip: number, opts?: StripOpts) => number;
+  resetAnchor: () => void;
+  isActive: boolean;
 }): { handleKeyDown: (e: KeyboardEvent) => void } {
-  const getVoiceState = useGetVoiceState()
-  const setVoiceState = useSetVoiceState()
-  const keybindingContext = useOptionalKeybindingContext()
-  const isModalOverlayActive = useIsModalOverlayActive()
-  // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-  const voiceEnabled = feature('VOICE_MODE') ? useVoiceEnabled() : false
+  const getVoiceState = useGetVoiceState();
+  const setVoiceState = useSetVoiceState();
+  const keybindingContext = useOptionalKeybindingContext();
+  const isModalOverlayActive = useIsModalOverlayActive();
+  const voiceEnabled = feature('VOICE_MODE') ? useVoiceEnabled() : false;
   const voiceState = feature('VOICE_MODE')
-    ? // biome-ignore lint/correctness/useHookAtTopLevel: feature() is a compile-time constant
-      useVoiceState(s => s.voiceState)
-    : 'idle'
+    ? useVoiceState(s => s.voiceState)
+    : 'idle';
 
   // Find the configured key for voice:pushToTalk from keybinding context.
   // Forward iteration with last-wins (matching the resolver): if a later
@@ -433,22 +396,22 @@ export function useVoiceKeybindingHandler({
   // is also bound in Settings/Confirmation/Plugin (select:accept etc.);
   // without the filter those would null out the default.
   const voiceKeystroke = useMemo((): ParsedKeystroke | null => {
-    if (!keybindingContext) return DEFAULT_VOICE_KEYSTROKE
-    let result: ParsedKeystroke | null = null
+    if (!keybindingContext) return DEFAULT_VOICE_KEYSTROKE;
+    let result: ParsedKeystroke | null = null;
     for (const binding of keybindingContext.bindings) {
-      if (binding.context !== 'Chat') continue
-      if (binding.chord.length !== 1) continue
-      const ks = binding.chord[0]
-      if (!ks) continue
+      if (binding.context !== 'Chat') continue;
+      if (binding.chord.length !== 1) continue;
+      const ks = binding.chord[0];
+      if (!ks) continue;
       if (binding.action === 'voice:pushToTalk') {
-        result = ks
+        result = ks;
       } else if (result !== null && keystrokesEqual(ks, result)) {
         // A later binding overrides this chord (null unbind or reassignment)
-        result = null
+        result = null;
       }
     }
-    return result
-  }, [keybindingContext])
+    return result;
+  }, [keybindingContext]);
 
   // If the binding is a bare (unmodified) single printable char, terminal
   // auto-repeat may batch N keystrokes into one input event (e.g. "vvv"),
@@ -465,9 +428,9 @@ export function useVoiceKeybindingHandler({
     !voiceKeystroke.meta &&
     !voiceKeystroke.super
       ? voiceKeystroke.key
-      : null
+      : null;
 
-  const rapidCountRef = useRef(0)
+  const rapidCountRef = useRef(0);
   // How many rapid chars we intentionally let through to the text
   // input (the first WARMUP_THRESHOLD). The activation strip removes
   // up to this many + the activation event's potential leak. For the
@@ -476,15 +439,15 @@ export function useVoiceKeybindingHandler({
   // one pre-existing char if the input already ended in the bound
   // letter (e.g. "hav" + hold "v" → "ha"). We don't track that
   // boundary — it's best-effort and the warning says so.
-  const charsInInputRef = useRef(0)
+  const charsInInputRef = useRef(0);
   // Trailing-char count remaining after the activation strip — these
   // belong to the user's anchored prefix and must be preserved during
   // recording's defensive leak cleanup.
-  const recordingFloorRef = useRef(0)
+  const recordingFloorRef = useRef(0);
   // True when the current recording was started by key-hold (not focus).
   // Used to avoid swallowing keypresses during focus-mode recording.
-  const isHoldActiveRef = useRef(false)
-  const resetTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
+  const isHoldActiveRef = useRef(false);
+  const resetTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
 
   // Reset hold state as soon as we leave 'recording'. The physical hold
   // ends when key-repeat stops (state → 'processing'); keeping the ref
@@ -492,19 +455,19 @@ export function useVoiceKeybindingHandler({
   // while the transcript finalizes.
   useEffect(() => {
     if (voiceState !== 'recording') {
-      isHoldActiveRef.current = false
-      rapidCountRef.current = 0
-      charsInInputRef.current = 0
-      recordingFloorRef.current = 0
+      isHoldActiveRef.current = false;
+      rapidCountRef.current = 0;
+      charsInInputRef.current = 0;
+      recordingFloorRef.current = 0;
       setVoiceState(prev => {
-        if (!prev.voiceWarmingUp) return prev
-        return { ...prev, voiceWarmingUp: false }
-      })
+        if (!prev.voiceWarmingUp) return prev;
+        return { ...prev, voiceWarmingUp: false };
+      });
     }
-  }, [voiceState, setVoiceState])
+  }, [voiceState, setVoiceState]);
 
   const handleKeyDown = (e: KeyboardEvent): void => {
-    if (!voiceEnabled) return
+    if (!voiceEnabled) return;
 
     // PromptInput is not a valid transcript target — let the hold key
     // flow through instead of swallowing it into stale refs (#33556).
@@ -514,37 +477,32 @@ export function useVoiceKeybindingHandler({
     //     /plugin. Mirrors CommandKeybindingHandlers' isActive gate.
     //   - isModalOverlayActive: overlay (permission dialog, Select with
     //     onCancel) has focus; PromptInput is mounted but focus=false.
-    if (!isActive || isModalOverlayActive) return
+    if (!isActive || isModalOverlayActive) return;
 
     // null means the user overrode the default (null-unbind/reassign) —
     // hold-to-talk is disabled via binding. To toggle the feature
     // itself, use /voice.
-    if (voiceKeystroke === null) return
+    if (voiceKeystroke === null) return;
 
     // Match the configured key. Bare chars match by content (handles
     // batched auto-repeat like "vvv") with a modifier reject so e.g.
     // ctrl+v doesn't trip a "v" binding. Modifier combos go through
     // matchesKeyboardEvent (one event per repeat, no batching).
-    let repeatCount: number
+    let repeatCount: number;
     if (bareChar !== null) {
-      if (e.ctrl || e.meta || e.shift) return
+      if (e.ctrl || e.meta || e.shift) return;
       // When bound to space, also accept U+3000 (full-width space) —
       // CJK IMEs emit it for the same physical key.
-      const normalized =
-        bareChar === ' ' ? normalizeFullWidthSpace(e.key) : e.key
+      const normalized = bareChar === ' ' ? normalizeFullWidthSpace(e.key) : e.key;
       // Fast-path: normal typing (any char that isn't the bound one)
       // bails here without allocating. The repeat() check only matters
       // for batched auto-repeat (input.length > 1) which is rare.
-      if (normalized[0] !== bareChar) return
-      if (
-        normalized.length > 1 &&
-        normalized !== bareChar.repeat(normalized.length)
-      )
-        return
-      repeatCount = normalized.length
+      if (normalized[0] !== bareChar) return;
+      if (normalized.length > 1 && normalized !== bareChar.repeat(normalized.length)) return;
+      repeatCount = normalized.length;
     } else {
-      if (!matchesKeyboardEvent(e, voiceKeystroke)) return
-      repeatCount = 1
+      if (!matchesKeyboardEvent(e, voiceKeystroke)) return;
+      repeatCount = 1;
     }
 
     // Guard: only swallow keypresses when recording was triggered by
@@ -554,22 +512,22 @@ export function useVoiceKeybindingHandler({
     // from the store so that if voiceHandleKeyEvent() fails to transition
     // state (module not loaded, stream unavailable) we don't permanently
     // swallow keypresses.
-    const currentVoiceState = getVoiceState().voiceState
+    const currentVoiceState = getVoiceState().voiceState;
     if (isHoldActiveRef.current && currentVoiceState !== 'idle') {
       // Already recording — swallow continued keypresses and forward
       // to voice for release detection. For bare chars, defensively
       // strip in case the text input handler fired before this one
       // (listener order is not guaranteed). Modifier combos don't
       // insert text, so nothing to strip.
-      e.stopImmediatePropagation()
+      e.stopImmediatePropagation();
       if (bareChar !== null) {
         stripTrailing(repeatCount, {
           char: bareChar,
           floor: recordingFloorRef.current,
-        })
+        });
       }
-      voiceHandleKeyEvent()
-      return
+      voiceHandleKeyEvent();
+      return;
     }
 
     // Non-hold recording (focus-mode) or processing is active.
@@ -579,12 +537,12 @@ export function useVoiceKeybindingHandler({
     // hit the warmup else-branch (swallow only). Bare chars flow through
     // unconditionally — user may be typing during focus-recording.
     if (currentVoiceState !== 'idle') {
-      if (bareChar === null) e.stopImmediatePropagation()
-      return
+      if (bareChar === null) e.stopImmediatePropagation();
+      return;
     }
 
-    const countBefore = rapidCountRef.current
-    rapidCountRef.current += repeatCount
+    const countBefore = rapidCountRef.current;
+    rapidCountRef.current += repeatCount;
 
     // ── Activation ────────────────────────────────────────────
     // Handled first so the warmup branch below does NOT also run
@@ -594,37 +552,37 @@ export function useVoiceKeybindingHandler({
     // typed accidentally, so the hold threshold (which exists to
     // distinguish typing a space from holding space) doesn't apply.
     if (bareChar === null || rapidCountRef.current >= HOLD_THRESHOLD) {
-      e.stopImmediatePropagation()
+      e.stopImmediatePropagation();
       if (resetTimerRef.current) {
-        clearTimeout(resetTimerRef.current)
-        resetTimerRef.current = null
+        clearTimeout(resetTimerRef.current);
+        resetTimerRef.current = null;
       }
-      rapidCountRef.current = 0
-      isHoldActiveRef.current = true
+      rapidCountRef.current = 0;
+      isHoldActiveRef.current = true;
       setVoiceState(prev => {
-        if (!prev.voiceWarmingUp) return prev
-        return { ...prev, voiceWarmingUp: false }
-      })
+        if (!prev.voiceWarmingUp) return prev;
+        return { ...prev, voiceWarmingUp: false };
+      });
       if (bareChar !== null) {
         // Strip the intentional warmup chars plus this event's leak
         // (if text input fired first). Cap covers both; min(trailing)
         // handles the no-leak case. Anchor the voice prefix here.
         // The return value (remaining) becomes the floor for
         // recording-time leak cleanup.
-        recordingFloorRef.current = stripTrailing(
-          charsInInputRef.current + repeatCount,
-          { char: bareChar, anchor: true },
-        )
-        charsInInputRef.current = 0
-        voiceHandleKeyEvent()
+        recordingFloorRef.current = stripTrailing(charsInInputRef.current + repeatCount, {
+          char: bareChar,
+          anchor: true,
+        });
+        charsInInputRef.current = 0;
+        voiceHandleKeyEvent();
       } else {
         // Modifier combo: nothing inserted, nothing to strip. Just
         // anchor the voice prefix at the current cursor position.
         // Longer fallback: this call is at t=0 (before auto-repeat),
         // so the gap to the next keypress is the OS initial repeat
         // *delay* (up to ~2s), not the repeat *rate* (~30-80ms).
-        stripTrailing(0, { anchor: true })
-        voiceHandleKeyEvent(MODIFIER_FIRST_PRESS_FALLBACK_MS)
+        stripTrailing(0, { anchor: true });
+        voiceHandleKeyEvent(MODIFIER_FIRST_PRESS_FALLBACK_MS);
       }
       // If voice failed to transition (module not loaded, stream
       // unavailable, stale enabled), clear the ref so a later
@@ -633,10 +591,10 @@ export function useVoiceKeybindingHandler({
       // immediate. The anchor set by stripTrailing above will
       // be overwritten on retry (anchor always overwrites now).
       if (getVoiceState().voiceState === 'idle') {
-        isHoldActiveRef.current = false
-        resetAnchor()
+        isHoldActiveRef.current = false;
+        resetAnchor();
       }
-      return
+      return;
     }
 
     // ── Warmup (bare-char only; modifier combos activated above) ──
@@ -649,43 +607,43 @@ export function useVoiceKeybindingHandler({
     // no-op when nothing leaked. Check countBefore so the event that
     // crosses the threshold still flows through (terminal batching).
     if (countBefore >= WARMUP_THRESHOLD) {
-      e.stopImmediatePropagation()
+      e.stopImmediatePropagation();
       stripTrailing(repeatCount, {
         char: bareChar,
         floor: charsInInputRef.current,
-      })
+      });
     } else {
-      charsInInputRef.current += repeatCount
+      charsInInputRef.current += repeatCount;
     }
 
     // Show warmup feedback once we detect a hold pattern
     if (rapidCountRef.current >= WARMUP_THRESHOLD) {
       setVoiceState(prev => {
-        if (prev.voiceWarmingUp) return prev
-        return { ...prev, voiceWarmingUp: true }
-      })
+        if (prev.voiceWarmingUp) return prev;
+        return { ...prev, voiceWarmingUp: true };
+      });
     }
 
     if (resetTimerRef.current) {
-      clearTimeout(resetTimerRef.current)
+      clearTimeout(resetTimerRef.current);
     }
     resetTimerRef.current = setTimeout(
       (resetTimerRef, rapidCountRef, charsInInputRef, setVoiceState) => {
-        resetTimerRef.current = null
-        rapidCountRef.current = 0
-        charsInInputRef.current = 0
+        resetTimerRef.current = null;
+        rapidCountRef.current = 0;
+        charsInInputRef.current = 0;
         setVoiceState(prev => {
-          if (!prev.voiceWarmingUp) return prev
-          return { ...prev, voiceWarmingUp: false }
-        })
+          if (!prev.voiceWarmingUp) return prev;
+          return { ...prev, voiceWarmingUp: false };
+        });
       },
       RAPID_KEY_GAP_MS,
       resetTimerRef,
       rapidCountRef,
       charsInInputRef,
       setVoiceState,
-    )
-  }
+    );
+  };
 
   // Backward-compat bridge: REPL.tsx doesn't yet wire handleKeyDown to
   // <Box onKeyDown>. Subscribe via useInput and adapt InputEvent →
@@ -693,30 +651,30 @@ export function useVoiceKeybindingHandler({
   // TODO(onKeyDown-migration): remove once REPL passes handleKeyDown.
   useInput(
     (_input, _key, event) => {
-      const kbEvent = new KeyboardEvent(event.keypress)
-      handleKeyDown(kbEvent)
+      const kbEvent = new KeyboardEvent(event.keypress);
+      handleKeyDown(kbEvent);
       // handleKeyDown stopped the adapter event, not the InputEvent the
       // emitter actually checks — forward it so the text input's useInput
       // listener is skipped and held spaces don't leak into the prompt.
       if (kbEvent.didStopImmediatePropagation()) {
-        event.stopImmediatePropagation()
+        event.stopImmediatePropagation();
       }
     },
     { isActive },
-  )
+  );
 
-  return { handleKeyDown }
+  return { handleKeyDown };
 }
 
 // TODO(onKeyDown-migration): temporary shim so existing JSX callers
 // (<VoiceKeybindingHandler .../>) keep compiling. Remove once REPL.tsx
 // wires handleKeyDown directly.
 export function VoiceKeybindingHandler(props: {
-  voiceHandleKeyEvent: (fallbackMs?: number) => void
-  stripTrailing: (maxStrip: number, opts?: StripOpts) => number
-  resetAnchor: () => void
-  isActive: boolean
+  voiceHandleKeyEvent: (fallbackMs?: number) => void;
+  stripTrailing: (maxStrip: number, opts?: StripOpts) => number;
+  resetAnchor: () => void;
+  isActive: boolean;
 }): null {
-  useVoiceKeybindingHandler(props)
-  return null
+  useVoiceKeybindingHandler(props);
+  return null;
 }
diff --git a/src/interactiveHelpers.tsx b/src/interactiveHelpers.tsx
index 7c66edd1a..be78043f6 100644
--- a/src/interactiveHelpers.tsx
+++ b/src/interactiveHelpers.tsx
@@ -1,11 +1,8 @@
-import { feature } from 'bun:bundle'
-import { appendFileSync } from 'fs'
-import React from 'react'
-import { logEvent } from 'src/services/analytics/index.js'
-import {
-  gracefulShutdown,
-  gracefulShutdownSync,
-} from 'src/utils/gracefulShutdown.js'
+import { feature } from 'bun:bundle';
+import { appendFileSync } from 'fs';
+import React from 'react';
+import { logEvent } from 'src/services/analytics/index.js';
+import { gracefulShutdown, gracefulShutdownSync } from 'src/utils/gracefulShutdown.js';
 import {
   type ChannelEntry,
   getAllowedChannels,
@@ -13,64 +10,58 @@ import {
   setHasDevChannels,
   setSessionTrustAccepted,
   setStatsStore,
-} from './bootstrap/state.js'
-import type { Command } from './commands.js'
-import { createStatsStore, type StatsStore } from './context/stats.js'
-import { getSystemContext } from './context.js'
-import { initializeTelemetryAfterTrust } from './entrypoints/init.js'
-import { isSynchronizedOutputSupported } from '@anthropic/ink'
-import type { RenderOptions, Root, TextProps } from '@anthropic/ink'
-import { KeybindingSetup } from './keybindings/KeybindingProviderSetup.js'
-import { startDeferredPrefetches } from './main.js'
+} from './bootstrap/state.js';
+import type { Command } from './commands.js';
+import { createStatsStore, type StatsStore } from './context/stats.js';
+import { getSystemContext } from './context.js';
+import { initializeTelemetryAfterTrust } from './entrypoints/init.js';
+import { isSynchronizedOutputSupported } from '@anthropic/ink';
+import type { RenderOptions, Root, TextProps } from '@anthropic/ink';
+import { KeybindingSetup } from './keybindings/KeybindingProviderSetup.js';
+import { startDeferredPrefetches } from './main.js';
 import {
   checkGate_CACHED_OR_BLOCKING,
   initializeGrowthBook,
   resetGrowthBook,
-} from './services/analytics/growthbook.js'
-import { isQualifiedForGrove } from './services/api/grove.js'
-import { handleMcpjsonServerApprovals } from './services/mcpServerApproval.js'
-import { AppStateProvider } from './state/AppState.js'
-import { onChangeAppState } from './state/onChangeAppState.js'
-import { normalizeApiKeyForConfig } from './utils/authPortable.js'
+} from './services/analytics/growthbook.js';
+import { isQualifiedForGrove } from './services/api/grove.js';
+import { handleMcpjsonServerApprovals } from './services/mcpServerApproval.js';
+import { AppStateProvider } from './state/AppState.js';
+import { onChangeAppState } from './state/onChangeAppState.js';
+import { normalizeApiKeyForConfig } from './utils/authPortable.js';
 import {
   getExternalClaudeMdIncludes,
   getMemoryFiles,
   shouldShowClaudeMdExternalIncludesWarning,
-} from './utils/claudemd.js'
+} from './utils/claudemd.js';
 import {
   checkHasTrustDialogAccepted,
   getCustomApiKeyStatus,
   getGlobalConfig,
   saveGlobalConfig,
-} from './utils/config.js'
-import { updateDeepLinkTerminalPreference } from './utils/deepLink/terminalPreference.js'
-import { isEnvTruthy, isRunningOnHomespace } from './utils/envUtils.js'
-import { type FpsMetrics, FpsTracker } from './utils/fpsTracker.js'
-import { updateGithubRepoPathMapping } from './utils/githubRepoPathMapping.js'
-import { applyConfigEnvironmentVariables } from './utils/managedEnv.js'
-import type { PermissionMode } from './utils/permissions/PermissionMode.js'
-import { getBaseRenderOptions } from './utils/renderOptions.js'
-import { getSettingsWithAllErrors } from './utils/settings/allErrors.js'
-import {
-  hasAutoModeOptIn,
-  hasSkipDangerousModePermissionPrompt,
-} from './utils/settings/settings.js'
+} from './utils/config.js';
+import { updateDeepLinkTerminalPreference } from './utils/deepLink/terminalPreference.js';
+import { isEnvTruthy, isRunningOnHomespace } from './utils/envUtils.js';
+import { type FpsMetrics, FpsTracker } from './utils/fpsTracker.js';
+import { updateGithubRepoPathMapping } from './utils/githubRepoPathMapping.js';
+import { applyConfigEnvironmentVariables } from './utils/managedEnv.js';
+import type { PermissionMode } from './utils/permissions/PermissionMode.js';
+import { getBaseRenderOptions } from './utils/renderOptions.js';
+import { getSettingsWithAllErrors } from './utils/settings/allErrors.js';
+import { hasAutoModeOptIn, hasSkipDangerousModePermissionPrompt } from './utils/settings/settings.js';
 
 export function completeOnboarding(): void {
   saveGlobalConfig(current => ({
     ...current,
     hasCompletedOnboarding: true,
     lastOnboardingVersion: MACRO.VERSION,
-  }))
+  }));
 }
-export function showDialog<T = void>(
-  root: Root,
-  renderer: (done: (result: T) => void) => React.ReactNode,
-): Promise<T> {
+export function showDialog<T = void>(root: Root, renderer: (done: (result: T) => void) => React.ReactNode): Promise<T> {
   return new Promise<T>(resolve => {
-    const done = (result: T): void => void resolve(result)
-    root.render(renderer(done))
-  })
+    const done = (result: T): void => void resolve(result);
+    root.render(renderer(done));
+  });
 }
 
 /**
@@ -79,12 +70,8 @@ export function showDialog<T = void>(
  * console.error is swallowed by Ink's patchConsole, so we render
  * through the React tree instead.
  */
-export async function exitWithError(
-  root: Root,
-  message: string,
-  beforeExit?: () => Promise<void>,
-): Promise<never> {
-  return exitWithMessage(root, message, { color: 'error', beforeExit })
+export async function exitWithError(root: Root, message: string, beforeExit?: () => Promise<void>): Promise<never> {
+  return exitWithMessage(root, message, { color: 'error', beforeExit });
 }
 
 /**
@@ -97,21 +84,19 @@ export async function exitWithMessage(
   root: Root,
   message: string,
   options?: {
-    color?: TextProps['color']
-    exitCode?: number
-    beforeExit?: () => Promise<void>
+    color?: TextProps['color'];
+    exitCode?: number;
+    beforeExit?: () => Promise<void>;
   },
 ): Promise<never> {
-  const { Text } = await import('@anthropic/ink')
-  const color = options?.color
-  const exitCode = options?.exitCode ?? 1
-  root.render(
-    color ? <Text color={color}>{message}</Text> : <Text>{message}</Text>,
-  )
-  root.unmount()
-  await options?.beforeExit?.()
+  const { Text } = await import('@anthropic/ink');
+  const color = options?.color;
+  const exitCode = options?.exitCode ?? 1;
+  root.render(color ? <Text color={color}>{message}</Text> : <Text>{message}</Text>);
+  root.unmount();
+  await options?.beforeExit?.();
   // eslint-disable-next-line custom-rules/no-process-exit -- exit after Ink unmount
-  process.exit(exitCode)
+  process.exit(exitCode);
 }
 
 /**
@@ -127,21 +112,18 @@ export function showSetupDialog<T = void>(
     <AppStateProvider onChangeAppState={options?.onChangeAppState}>
       <KeybindingSetup>{renderer(done)}</KeybindingSetup>
     </AppStateProvider>
-  ))
+  ));
 }
 
 /**
  * Render the main UI into the root and wait for it to exit.
  * Handles the common epilogue: start deferred prefetches, wait for exit, graceful shutdown.
  */
-export async function renderAndRun(
-  root: Root,
-  element: React.ReactNode,
-): Promise<void> {
-  root.render(element)
-  startDeferredPrefetches()
-  await root.waitUntilExit()
-  await gracefulShutdown(0)
+export async function renderAndRun(root: Root, element: React.ReactNode): Promise<void> {
+  root.render(element);
+  startDeferredPrefetches();
+  await root.waitUntilExit();
+  await gracefulShutdown(0);
 }
 
 export async function showSetupScreens(
@@ -157,29 +139,29 @@ export async function showSetupScreens(
     isEnvTruthy(false) ||
     process.env.IS_DEMO // Skip onboarding in demo mode
   ) {
-    return false
+    return false;
   }
 
-  const config = getGlobalConfig()
-  let onboardingShown = false
+  const config = getGlobalConfig();
+  let onboardingShown = false;
   if (
     !config.theme ||
     !config.hasCompletedOnboarding // always show onboarding at least once
   ) {
-    onboardingShown = true
-    const { Onboarding } = await import('./components/Onboarding.js')
+    onboardingShown = true;
+    const { Onboarding } = await import('./components/Onboarding.js');
     await showSetupDialog(
       root,
       done => (
         <Onboarding
           onDone={() => {
-            completeOnboarding()
-            void done()
+            completeOnboarding();
+            void done();
           }}
         />
       ),
       { onChangeAppState },
-    )
+    );
   }
 
   // Always show the trust dialog in interactive sessions, regardless of permission mode.
@@ -193,83 +175,71 @@ export async function showSetupScreens(
     // If it returns true, the TrustDialog would auto-resolve regardless of
     // security features, so we can skip the dynamic import and render cycle.
     if (!checkHasTrustDialogAccepted()) {
-      const { TrustDialog } = await import(
-        './components/TrustDialog/TrustDialog.js'
-      )
-      await showSetupDialog(root, done => (
-        <TrustDialog commands={commands} onDone={done} />
-      ))
+      const { TrustDialog } = await import('./components/TrustDialog/TrustDialog.js');
+      await showSetupDialog(root, done => <TrustDialog commands={commands} onDone={done} />);
     }
 
     // Signal that trust has been verified for this session.
     // GrowthBook checks this to decide whether to include auth headers.
-    setSessionTrustAccepted(true)
+    setSessionTrustAccepted(true);
 
     // Reset and reinitialize GrowthBook after trust is established.
     // Defense for login/logout: clears any prior client so the next init
     // picks up fresh auth headers.
-    resetGrowthBook()
-    void initializeGrowthBook()
+    resetGrowthBook();
+    void initializeGrowthBook();
 
     // Now that trust is established, prefetch system context if it wasn't already
-    void getSystemContext()
+    void getSystemContext();
 
     // If settings are valid, check for any mcp.json servers that need approval
-    const { errors: allErrors } = getSettingsWithAllErrors()
+    const { errors: allErrors } = getSettingsWithAllErrors();
     if (allErrors.length === 0) {
-      await handleMcpjsonServerApprovals(root)
+      await handleMcpjsonServerApprovals(root);
     }
 
     // Check for claude.md includes that need approval
     if (await shouldShowClaudeMdExternalIncludesWarning()) {
-      const externalIncludes = getExternalClaudeMdIncludes(
-        await getMemoryFiles(true),
-      )
-      const { ClaudeMdExternalIncludesDialog } = await import(
-        './components/ClaudeMdExternalIncludesDialog.js'
-      )
+      const externalIncludes = getExternalClaudeMdIncludes(await getMemoryFiles(true));
+      const { ClaudeMdExternalIncludesDialog } = await import('./components/ClaudeMdExternalIncludesDialog.js');
       await showSetupDialog(root, done => (
-        <ClaudeMdExternalIncludesDialog
-          onDone={done}
-          isStandaloneDialog
-          externalIncludes={externalIncludes}
-        />
-      ))
+        <ClaudeMdExternalIncludesDialog onDone={done} isStandaloneDialog externalIncludes={externalIncludes} />
+      ));
     }
   }
 
   // Track current repo path for teleport directory switching (fire-and-forget)
   // This must happen AFTER trust to prevent untrusted directories from poisoning the mapping
-  void updateGithubRepoPathMapping()
+  void updateGithubRepoPathMapping();
   if (feature('LODESTONE')) {
-    updateDeepLinkTerminalPreference()
+    updateDeepLinkTerminalPreference();
   }
 
   // Apply full environment variables after trust dialog is accepted OR in bypass mode
   // In bypass mode (CI/CD, automation), we trust the environment so apply all variables
   // In normal mode, this happens after the trust dialog is accepted
   // This includes potentially dangerous environment variables from untrusted sources
-  applyConfigEnvironmentVariables()
+  applyConfigEnvironmentVariables();
 
   // Initialize telemetry after env vars are applied so OTEL endpoint env vars and
   // otelHeadersHelper (which requires trust to execute) are available.
   // Defer to next tick so the OTel dynamic import resolves after first render
   // instead of during the pre-render microtask queue.
-  setImmediate(() => initializeTelemetryAfterTrust())
+  setImmediate(() => initializeTelemetryAfterTrust());
 
   if (await isQualifiedForGrove()) {
-    const { GroveDialog } = await import('src/components/grove/Grove.js')
+    const { GroveDialog } = await import('src/components/grove/Grove.js');
     const decision = await showSetupDialog<string>(root, done => (
       <GroveDialog
         showIfAlreadyViewed={false}
         location={onboardingShown ? 'onboarding' : 'policy_update_modal'}
         onDone={done}
       />
-    ))
+    ));
     if (decision === 'escape') {
-      logEvent('tengu_grove_policy_exited', {})
-      gracefulShutdownSync(0)
-      return false
+      logEvent('tengu_grove_policy_exited', {});
+      gracefulShutdownSync(0);
+      return false;
     }
   }
 
@@ -277,36 +247,24 @@ export async function showSetupScreens(
   // On homespace, ANTHROPIC_API_KEY is preserved in process.env for child
   // processes but ignored by Claude Code itself (see auth.ts).
   if (process.env.ANTHROPIC_API_KEY && !isRunningOnHomespace()) {
-    const customApiKeyTruncated = normalizeApiKeyForConfig(
-      process.env.ANTHROPIC_API_KEY,
-    )
-    const keyStatus = getCustomApiKeyStatus(customApiKeyTruncated)
+    const customApiKeyTruncated = normalizeApiKeyForConfig(process.env.ANTHROPIC_API_KEY);
+    const keyStatus = getCustomApiKeyStatus(customApiKeyTruncated);
     if (keyStatus === 'new') {
-      const { ApproveApiKey } = await import('./components/ApproveApiKey.js')
+      const { ApproveApiKey } = await import('./components/ApproveApiKey.js');
       await showSetupDialog<boolean>(
         root,
-        done => (
-          <ApproveApiKey
-            customApiKeyTruncated={customApiKeyTruncated}
-            onDone={done}
-          />
-        ),
+        done => <ApproveApiKey customApiKeyTruncated={customApiKeyTruncated} onDone={done} />,
         { onChangeAppState },
-      )
+      );
     }
   }
 
   if (
-    (permissionMode === 'bypassPermissions' ||
-      allowDangerouslySkipPermissions) &&
+    (permissionMode === 'bypassPermissions' || allowDangerouslySkipPermissions) &&
     !hasSkipDangerousModePermissionPrompt()
   ) {
-    const { BypassPermissionsModeDialog } = await import(
-      './components/BypassPermissionsModeDialog.js'
-    )
-    await showSetupDialog(root, done => (
-      <BypassPermissionsModeDialog onAccept={done} />
-    ))
+    const { BypassPermissionsModeDialog } = await import('./components/BypassPermissionsModeDialog.js');
+    await showSetupDialog(root, done => <BypassPermissionsModeDialog onAccept={done} />);
   }
 
   if (feature('TRANSCRIPT_CLASSIFIER')) {
@@ -315,16 +273,10 @@ export async function showSetupScreens(
     // consent for an unavailable feature is pointless. The
     // verifyAutoModeGateAccess notification will explain why instead.
     if (permissionMode === 'auto' && !hasAutoModeOptIn()) {
-      const { AutoModeOptInDialog } = await import(
-        './components/AutoModeOptInDialog.js'
-      )
+      const { AutoModeOptInDialog } = await import('./components/AutoModeOptInDialog.js');
       await showSetupDialog(root, done => (
-        <AutoModeOptInDialog
-          onAccept={done}
-          onDecline={() => gracefulShutdownSync(1)}
-          declineExits
-        />
-      ))
+        <AutoModeOptInDialog onAccept={done} onDecline={() => gracefulShutdownSync(1)} declineExits />
+      ));
     }
   }
 
@@ -342,15 +294,14 @@ export async function showSetupScreens(
     // initializeGrowthBook promise fired earlier). Also warms the
     // isChannelsEnabled() check in the dev-channels dialog below.
     if (getAllowedChannels().length > 0 || (devChannels?.length ?? 0) > 0) {
-      await checkGate_CACHED_OR_BLOCKING('tengu_harbor')
+      await checkGate_CACHED_OR_BLOCKING('tengu_harbor');
     }
 
     if (devChannels && devChannels.length > 0) {
-      const [{ isChannelsEnabled }, { getClaudeAIOAuthTokens }] =
-        await Promise.all([
-          import('./services/mcp/channelAllowlist.js'),
-          import('./utils/auth.js'),
-        ])
+      const [{ isChannelsEnabled }, { getClaudeAIOAuthTokens }] = await Promise.all([
+        import('./services/mcp/channelAllowlist.js'),
+        import('./utils/auth.js'),
+      ]);
       // Skip the dialog when channels are blocked (tengu_harbor off or no
       // OAuth) — accepting then immediately seeing "not available" in
       // ChannelsNotice is worse than no dialog. Append entries anyway so
@@ -359,80 +310,65 @@ export async function showSetupScreens(
       // (hasNonDev check); the allowlist bypass it also grants is moot
       // since the gate blocks upstream.
       if (!isChannelsEnabled() || !getClaudeAIOAuthTokens()?.accessToken) {
-        setAllowedChannels([
-          ...getAllowedChannels(),
-          ...devChannels.map(c => ({ ...c, dev: true })),
-        ])
-        setHasDevChannels(true)
+        setAllowedChannels([...getAllowedChannels(), ...devChannels.map(c => ({ ...c, dev: true }))]);
+        setHasDevChannels(true);
       } else {
-        const { DevChannelsDialog } = await import(
-          './components/DevChannelsDialog.js'
-        )
+        const { DevChannelsDialog } = await import('./components/DevChannelsDialog.js');
         await showSetupDialog(root, done => (
           <DevChannelsDialog
             channels={devChannels}
             onAccept={() => {
               // Mark dev entries per-entry so the allowlist bypass doesn't leak
               // to --channels entries when both flags are passed.
-              setAllowedChannels([
-                ...getAllowedChannels(),
-                ...devChannels.map(c => ({ ...c, dev: true })),
-              ])
-              setHasDevChannels(true)
-              void done()
+              setAllowedChannels([...getAllowedChannels(), ...devChannels.map(c => ({ ...c, dev: true }))]);
+              setHasDevChannels(true);
+              void done();
             }}
           />
-        ))
+        ));
       }
     }
   }
 
   // Show Chrome onboarding for first-time Claude in Chrome users
-  if (
-    claudeInChrome &&
-    !getGlobalConfig().hasCompletedClaudeInChromeOnboarding
-  ) {
-    const { ClaudeInChromeOnboarding } = await import(
-      './components/ClaudeInChromeOnboarding.js'
-    )
-    await showSetupDialog(root, done => (
-      <ClaudeInChromeOnboarding onDone={done} />
-    ))
+  if (claudeInChrome && !getGlobalConfig().hasCompletedClaudeInChromeOnboarding) {
+    const { ClaudeInChromeOnboarding } = await import('./components/ClaudeInChromeOnboarding.js');
+    await showSetupDialog(root, done => <ClaudeInChromeOnboarding onDone={done} />);
   }
 
-  return onboardingShown
+  return onboardingShown;
 }
 
 export function getRenderContext(exitOnCtrlC: boolean): {
-  renderOptions: RenderOptions
-  getFpsMetrics: () => FpsMetrics | undefined
-  stats: StatsStore
+  renderOptions: RenderOptions;
+  getFpsMetrics: () => FpsMetrics | undefined;
+  stats: StatsStore;
 } {
-  let lastFlickerTime = 0
-  const baseOptions = getBaseRenderOptions(exitOnCtrlC)
+  let lastFlickerTime = 0;
+  const baseOptions = getBaseRenderOptions(exitOnCtrlC);
 
   // Log analytics event when stdin override is active
   if (baseOptions.stdin) {
-    logEvent('tengu_stdin_interactive', {})
+    logEvent('tengu_stdin_interactive', {});
   }
 
-  const fpsTracker = new FpsTracker()
-  const stats = createStatsStore()
-  setStatsStore(stats)
+  const fpsTracker = new FpsTracker();
+  const stats = createStatsStore();
+  setStatsStore(stats);
 
   // Bench mode: when set, append per-frame phase timings as JSONL for
   // offline analysis by bench/repl-scroll.ts. Captures the full TUI
   // render pipeline (yoga → screen buffer → diff → optimize → stdout)
   // so perf work on any phase can be validated against real user flows.
-  const frameTimingLogPath = process.env.CLAUDE_CODE_FRAME_TIMING_LOG
+  const frameTimingLogPath = process.env.CLAUDE_CODE_FRAME_TIMING_LOG;
   return {
     getFpsMetrics: () => fpsTracker.getMetrics(),
     stats,
     renderOptions: {
       ...baseOptions,
       onFrame: event => {
-        fpsTracker.record(event.durationMs)
-        stats.observe('frame_duration_ms', event.durationMs)
+        fpsTracker.record(event.durationMs);
+        stats.observe('frame_duration_ms', event.durationMs);
         if (frameTimingLogPath && event.phases) {
           // Bench-only env-var-gated path: sync write so no frames dropped
           // on abrupt exit. ~100 bytes at ≤60fps is negligible. rss/cpu are
@@ -444,30 +380,30 @@ export function getRenderContext(exitOnCtrlC: boolean): {
               ...event.phases,
               rss: process.memoryUsage.rss(),
               cpu: process.cpuUsage(),
-            }) + '\n'
+            }) + '\n';
           // eslint-disable-next-line custom-rules/no-sync-fs -- bench-only, sync so no frames dropped on exit
-          appendFileSync(frameTimingLogPath, line)
+          appendFileSync(frameTimingLogPath, line);
         }
         // Skip flicker reporting for terminals with synchronized output —
         // DEC 2026 buffers between BSU/ESU so clear+redraw is atomic.
         if (isSynchronizedOutputSupported()) {
-          return
+          return;
         }
         for (const flicker of event.flickers) {
           if (flicker.reason === 'resize') {
-            continue
+            continue;
           }
-          const now = Date.now()
+          const now = Date.now();
           if (now - lastFlickerTime < 1000) {
             logEvent('tengu_flicker', {
               desiredHeight: flicker.desiredHeight,
               actualHeight: flicker.availableHeight,
               reason: flicker.reason,
-            } as unknown as Record<string, boolean | number | undefined>)
+            } as unknown as Record<string, boolean | number | undefined>);
           }
-          lastFlickerTime = now
+          lastFlickerTime = now;
         }
       },
     },
-  }
+  };
 }
diff --git a/src/keybindings/KeybindingContext.tsx b/src/keybindings/KeybindingContext.tsx
index 10cbb8507..7ca92253b 100644
--- a/src/keybindings/KeybindingContext.tsx
+++ b/src/keybindings/KeybindingContext.tsx
@@ -4,4 +4,4 @@ export {
   useKeybindingContext,
   useOptionalKeybindingContext,
   useRegisterKeybindingContext,
-} from '@anthropic/ink'
+} from '@anthropic/ink';
diff --git a/src/keybindings/KeybindingProviderSetup.tsx b/src/keybindings/KeybindingProviderSetup.tsx
index f288a7f65..d17ab334b 100644
--- a/src/keybindings/KeybindingProviderSetup.tsx
+++ b/src/keybindings/KeybindingProviderSetup.tsx
@@ -4,22 +4,22 @@
  * Wires up app-specific dependencies (notification system, binding loading,
  * file watching, debug logging) and re-exports as KeybindingSetup.
  */
-import { useCallback } from 'react'
-import { useNotifications } from '../context/notifications.js'
-import { count } from '../utils/array.js'
-import { logForDebugging } from '../utils/debug.js'
-import { plural } from '../utils/stringUtils.js'
-import { KeybindingSetup as InkKeybindingSetup } from '@anthropic/ink'
-import type { KeybindingWarning } from '@anthropic/ink'
+import { useCallback } from 'react';
+import { useNotifications } from '../context/notifications.js';
+import { count } from '../utils/array.js';
+import { logForDebugging } from '../utils/debug.js';
+import { plural } from '../utils/stringUtils.js';
+import { KeybindingSetup as InkKeybindingSetup } from '@anthropic/ink';
+import type { KeybindingWarning } from '@anthropic/ink';
 import {
   initializeKeybindingWatcher,
   loadKeybindingsSyncWithWarnings,
   subscribeToKeybindingChanges,
-} from './loadUserBindings.js'
+} from './loadUserBindings.js';
 
 type Props = {
-  children: React.ReactNode
-}
+  children: React.ReactNode;
+};
 
 /**
  * Keybinding provider with default + user bindings and hot-reload support.
@@ -42,29 +42,29 @@ type Props = {
  * - Chord support with automatic timeout
  */
 export function KeybindingSetup({ children }: Props): React.ReactNode {
-  const { addNotification, removeNotification } = useNotifications()
+  const { addNotification, removeNotification } = useNotifications();
 
   const handleWarnings = useCallback(
     (warnings: KeybindingWarning[], _isReload: boolean) => {
-      const notificationKey = 'keybinding-config-warning'
+      const notificationKey = 'keybinding-config-warning';
 
       if (warnings.length === 0) {
-        removeNotification(notificationKey)
-        return
+        removeNotification(notificationKey);
+        return;
       }
 
-      const errorCount = count(warnings, w => w.severity === 'error')
-      const warnCount = count(warnings, w => w.severity === 'warning')
+      const errorCount = count(warnings, w => w.severity === 'error');
+      const warnCount = count(warnings, w => w.severity === 'warning');
 
-      let message: string
+      let message: string;
       if (errorCount > 0 && warnCount > 0) {
-        message = `Found ${errorCount} keybinding ${plural(errorCount, 'error')} and ${warnCount} ${plural(warnCount, 'warning')}`
+        message = `Found ${errorCount} keybinding ${plural(errorCount, 'error')} and ${warnCount} ${plural(warnCount, 'warning')}`;
       } else if (errorCount > 0) {
-        message = `Found ${errorCount} keybinding ${plural(errorCount, 'error')}`
+        message = `Found ${errorCount} keybinding ${plural(errorCount, 'error')}`;
       } else {
-        message = `Found ${warnCount} keybinding ${plural(warnCount, 'warning')}`
+        message = `Found ${warnCount} keybinding ${plural(warnCount, 'warning')}`;
       }
-      message += ' · /doctor for details'
+      message += ' · /doctor for details';
 
       addNotification({
         key: notificationKey,
@@ -72,10 +72,10 @@ export function KeybindingSetup({ children }: Props): React.ReactNode {
         color: errorCount > 0 ? 'error' : 'warning',
         priority: errorCount > 0 ? 'immediate' : 'high',
         timeoutMs: 60000,
-      })
+      });
     },
     [addNotification, removeNotification],
-  )
+  );
 
   return (
     <InkKeybindingSetup
@@ -87,5 +87,5 @@ export function KeybindingSetup({ children }: Props): React.ReactNode {
     >
       {children}
     </InkKeybindingSetup>
-  )
+  );
 }
diff --git a/src/keybindings/src/utils/semver.ts b/src/keybindings/src/utils/semver.ts
index 28b438729..b75e3c79a 100644
--- a/src/keybindings/src/utils/semver.ts
+++ b/src/keybindings/src/utils/semver.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type satisfies = any;
+export type satisfies = any
diff --git a/src/main.tsx b/src/main.tsx
index ecb8ff067..656304fb9 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -6,163 +6,146 @@
 //    key) in parallel — isRemoteManagedSettingsEligible() otherwise reads them
 //    sequentially via sync spawn inside applySafeConfigEnvironmentVariables()
 //    (~65ms on every macOS startup)
-import { profileCheckpoint, profileReport } from "./utils/startupProfiler.js";
+import { profileCheckpoint, profileReport } from './utils/startupProfiler.js';
 
 // eslint-disable-next-line custom-rules/no-top-level-side-effects
-profileCheckpoint("main_tsx_entry");
+profileCheckpoint('main_tsx_entry');
 
-import { startMdmRawRead } from "./utils/settings/mdm/rawRead.js";
+import { startMdmRawRead } from './utils/settings/mdm/rawRead.js';
 
 // eslint-disable-next-line custom-rules/no-top-level-side-effects
 startMdmRawRead();
 
-import {
-	ensureKeychainPrefetchCompleted,
-	startKeychainPrefetch,
-} from "./utils/secureStorage/keychainPrefetch.js";
+import { ensureKeychainPrefetchCompleted, startKeychainPrefetch } from './utils/secureStorage/keychainPrefetch.js';
 
 // eslint-disable-next-line custom-rules/no-top-level-side-effects
 startKeychainPrefetch();
 
-import { feature } from "bun:bundle";
+import { feature } from 'bun:bundle';
+import { Command as CommanderCommand, InvalidArgumentError, Option } from '@commander-js/extra-typings';
+import chalk from 'chalk';
+import { readFileSync } from 'fs';
+import mapValues from 'lodash-es/mapValues.js';
+import pickBy from 'lodash-es/pickBy.js';
+import uniqBy from 'lodash-es/uniqBy.js';
+import React from 'react';
+import { getOauthConfig } from './constants/oauth.js';
+import { getRemoteSessionUrl } from './constants/product.js';
+import { getSystemContext, getUserContext } from './context.js';
+import { init, initializeTelemetryAfterTrust } from './entrypoints/init.js';
+import { addToHistory } from './history.js';
+import type { Root } from '@anthropic/ink';
+import { launchRepl } from './replLauncher.js';
 import {
-  Command as CommanderCommand,
-  InvalidArgumentError,
-  Option,
-} from '@commander-js/extra-typings'
-import chalk from 'chalk'
-import { readFileSync } from 'fs'
-import mapValues from 'lodash-es/mapValues.js'
-import pickBy from 'lodash-es/pickBy.js'
-import uniqBy from 'lodash-es/uniqBy.js'
-import React from 'react'
-import { getOauthConfig } from './constants/oauth.js'
-import { getRemoteSessionUrl } from './constants/product.js'
-import { getSystemContext, getUserContext } from './context.js'
-import { init, initializeTelemetryAfterTrust } from './entrypoints/init.js'
-import { addToHistory } from './history.js'
-import type { Root } from '@anthropic/ink'
-import { launchRepl } from './replLauncher.js'
+  hasGrowthBookEnvOverride,
+  initializeGrowthBook,
+  refreshGrowthBookAfterAuthChange,
+} from './services/analytics/growthbook.js';
+import { fetchBootstrapData } from './services/api/bootstrap.js';
 import {
-	hasGrowthBookEnvOverride,
-	initializeGrowthBook,
-	refreshGrowthBookAfterAuthChange,
-} from "./services/analytics/growthbook.js";
-import { fetchBootstrapData } from "./services/api/bootstrap.js";
+  type DownloadResult,
+  downloadSessionFiles,
+  type FilesApiConfig,
+  parseFileSpecs,
+} from './services/api/filesApi.js';
+import { prefetchPassesEligibility } from './services/api/referral.js';
+import type { McpSdkServerConfig, McpServerConfig, ScopedMcpServerConfig } from './services/mcp/types.js';
 import {
-	type DownloadResult,
-	downloadSessionFiles,
-	type FilesApiConfig,
-	parseFileSpecs,
-} from "./services/api/filesApi.js";
-import { prefetchPassesEligibility } from "./services/api/referral.js";
-import type {
-	McpSdkServerConfig,
-	McpServerConfig,
-	ScopedMcpServerConfig,
-} from "./services/mcp/types.js";
+  isPolicyAllowed,
+  loadPolicyLimits,
+  refreshPolicyLimits,
+  waitForPolicyLimitsToLoad,
+} from './services/policyLimits/index.js';
+import { loadRemoteManagedSettings, refreshRemoteManagedSettings } from './services/remoteManagedSettings/index.js';
+import type { ToolInputJSONSchema } from './Tool.js';
 import {
-	isPolicyAllowed,
-	loadPolicyLimits,
-	refreshPolicyLimits,
-	waitForPolicyLimitsToLoad,
-} from "./services/policyLimits/index.js";
+  createSyntheticOutputTool,
+  isSyntheticOutputToolEnabled,
+} from '@claude-code-best/builtin-tools/tools/SyntheticOutputTool/SyntheticOutputTool.js';
+import { getTools } from './tools.js';
 import {
-	loadRemoteManagedSettings,
-	refreshRemoteManagedSettings,
-} from "./services/remoteManagedSettings/index.js";
-import type { ToolInputJSONSchema } from "./Tool.js";
+  canUserConfigureAdvisor,
+  getInitialAdvisorSetting,
+  isAdvisorEnabled,
+  isValidAdvisorModel,
+  modelSupportsAdvisor,
+} from './utils/advisor.js';
+import { isAgentSwarmsEnabled } from './utils/agentSwarmsEnabled.js';
+import { count, uniq } from './utils/array.js';
+import { installAsciicastRecorder } from './utils/asciicast.js';
 import {
-	createSyntheticOutputTool,
-	isSyntheticOutputToolEnabled,
-} from "@claude-code-best/builtin-tools/tools/SyntheticOutputTool/SyntheticOutputTool.js";
-import { getTools } from "./tools.js";
+  getSubscriptionType,
+  isClaudeAISubscriber,
+  prefetchAwsCredentialsAndBedRockInfoIfSafe,
+  prefetchGcpCredentialsIfSafe,
+  validateForceLoginOrg,
+} from './utils/auth.js';
 import {
-	canUserConfigureAdvisor,
-	getInitialAdvisorSetting,
-	isAdvisorEnabled,
-	isValidAdvisorModel,
-	modelSupportsAdvisor,
-} from "./utils/advisor.js";
-import { isAgentSwarmsEnabled } from "./utils/agentSwarmsEnabled.js";
-import { count, uniq } from "./utils/array.js";
-import { installAsciicastRecorder } from "./utils/asciicast.js";
+  checkHasTrustDialogAccepted,
+  getGlobalConfig,
+  getRemoteControlAtStartup,
+  isAutoUpdaterDisabled,
+  saveGlobalConfig,
+} from './utils/config.js';
+import { seedEarlyInput, stopCapturingEarlyInput } from './utils/earlyInput.js';
+import { getInitialEffortSetting, parseEffortValue } from './utils/effort.js';
 import {
-	getSubscriptionType,
-	isClaudeAISubscriber,
-	prefetchAwsCredentialsAndBedRockInfoIfSafe,
-	prefetchGcpCredentialsIfSafe,
-	validateForceLoginOrg,
-} from "./utils/auth.js";
-import {
-	checkHasTrustDialogAccepted,
-	getGlobalConfig,
-	getRemoteControlAtStartup,
-	isAutoUpdaterDisabled,
-	saveGlobalConfig,
-} from "./utils/config.js";
-import { seedEarlyInput, stopCapturingEarlyInput } from "./utils/earlyInput.js";
-import { getInitialEffortSetting, parseEffortValue } from "./utils/effort.js";
-import {
-	getInitialFastModeSetting,
-	isFastModeEnabled,
-	prefetchFastModeStatus,
-	resolveFastModeStatusFromCache,
-} from "./utils/fastMode.js";
-import { applyConfigEnvironmentVariables } from "./utils/managedEnv.js";
-import { createSystemMessage, createUserMessage } from "./utils/messages.js";
-import { getPlatform } from "./utils/platform.js";
-import { getBaseRenderOptions } from "./utils/renderOptions.js";
-import { getSessionIngressAuthToken } from "./utils/sessionIngressAuth.js";
-import { settingsChangeDetector } from "./utils/settings/changeDetector.js";
-import { skillChangeDetector } from "./utils/skills/skillChangeDetector.js";
-import { jsonParse, writeFileSync_DEPRECATED } from "./utils/slowOperations.js";
-import { computeInitialTeamContext } from "./utils/swarm/reconnection.js";
-import { initializeWarningHandler } from "./utils/warningHandler.js";
-import { isWorktreeModeEnabled } from "./utils/worktreeModeEnabled.js";
+  getInitialFastModeSetting,
+  isFastModeEnabled,
+  prefetchFastModeStatus,
+  resolveFastModeStatusFromCache,
+} from './utils/fastMode.js';
+import { applyConfigEnvironmentVariables } from './utils/managedEnv.js';
+import { createSystemMessage, createUserMessage } from './utils/messages.js';
+import { getPlatform } from './utils/platform.js';
+import { getBaseRenderOptions } from './utils/renderOptions.js';
+import { getSessionIngressAuthToken } from './utils/sessionIngressAuth.js';
+import { settingsChangeDetector } from './utils/settings/changeDetector.js';
+import { skillChangeDetector } from './utils/skills/skillChangeDetector.js';
+import { jsonParse, writeFileSync_DEPRECATED } from './utils/slowOperations.js';
+import { computeInitialTeamContext } from './utils/swarm/reconnection.js';
+import { initializeWarningHandler } from './utils/warningHandler.js';
+import { isWorktreeModeEnabled } from './utils/worktreeModeEnabled.js';
 
 // Lazy require to avoid circular dependency: teammate.ts -> AppState.tsx -> ... -> main.tsx
 /* eslint-disable @typescript-eslint/no-require-imports */
-const getTeammateUtils = () =>
-	require("./utils/teammate.js") as typeof import("./utils/teammate.js");
+const getTeammateUtils = () => require('./utils/teammate.js') as typeof import('./utils/teammate.js');
 const getTeammatePromptAddendum = () =>
-	require("./utils/swarm/teammatePromptAddendum.js") as typeof import("./utils/swarm/teammatePromptAddendum.js");
+  require('./utils/swarm/teammatePromptAddendum.js') as typeof import('./utils/swarm/teammatePromptAddendum.js');
 const getTeammateModeSnapshot = () =>
-	require("./utils/swarm/backends/teammateModeSnapshot.js") as typeof import("./utils/swarm/backends/teammateModeSnapshot.js");
+  require('./utils/swarm/backends/teammateModeSnapshot.js') as typeof import('./utils/swarm/backends/teammateModeSnapshot.js');
 /* eslint-enable @typescript-eslint/no-require-imports */
 // Dead code elimination: conditional import for COORDINATOR_MODE
 /* eslint-disable @typescript-eslint/no-require-imports */
-const coordinatorModeModule = feature("COORDINATOR_MODE")
-	? (require("./coordinator/coordinatorMode.js") as typeof import("./coordinator/coordinatorMode.js"))
-	: null;
+const coordinatorModeModule = feature('COORDINATOR_MODE')
+  ? (require('./coordinator/coordinatorMode.js') as typeof import('./coordinator/coordinatorMode.js'))
+  : null;
 /* eslint-enable @typescript-eslint/no-require-imports */
 // Dead code elimination: conditional import for KAIROS (assistant mode)
 /* eslint-disable @typescript-eslint/no-require-imports */
-const assistantModule = feature("KAIROS")
-	? (require("./assistant/index.js") as typeof import("./assistant/index.js"))
-	: null;
-const kairosGate = feature("KAIROS")
-	? (require("./assistant/gate.js") as typeof import("./assistant/gate.js"))
-	: null;
+const assistantModule = feature('KAIROS')
+  ? (require('./assistant/index.js') as typeof import('./assistant/index.js'))
+  : null;
+const kairosGate = feature('KAIROS') ? (require('./assistant/gate.js') as typeof import('./assistant/gate.js')) : null;
 
-import { relative, resolve } from "path";
-import { isAnalyticsDisabled } from "src/services/analytics/config.js";
-import { getFeatureValue_CACHED_MAY_BE_STALE } from "src/services/analytics/growthbook.js";
+import { relative, resolve } from 'path';
+import { isAnalyticsDisabled } from 'src/services/analytics/config.js';
+import { getFeatureValue_CACHED_MAY_BE_STALE } from 'src/services/analytics/growthbook.js';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from 'src/services/analytics/index.js'
-import { initializeAnalyticsGates } from 'src/services/analytics/sink.js'
+} from 'src/services/analytics/index.js';
+import { initializeAnalyticsGates } from 'src/services/analytics/sink.js';
 import {
-	getOriginalCwd,
-	setAdditionalDirectoriesForClaudeMd,
-	setIsRemoteMode,
-	setMainLoopModelOverride,
-	setMainThreadAgentType,
-	setTeleportedSessionInfo,
-} from "./bootstrap/state.js";
-import { filterCommandsForRemoteMode, getCommands } from "./commands.js";
-import type { StatsStore } from "./context/stats.js";
+  getOriginalCwd,
+  setAdditionalDirectoriesForClaudeMd,
+  setIsRemoteMode,
+  setMainLoopModelOverride,
+  setMainThreadAgentType,
+  setTeleportedSessionInfo,
+} from './bootstrap/state.js';
+import { filterCommandsForRemoteMode, getCommands } from './commands.js';
+import type { StatsStore } from './context/stats.js';
 import {
   launchAssistantInstallWizard,
   launchAssistantSessionChooser,
@@ -171,284 +154,214 @@ import {
   launchSnapshotUpdateDialog,
   launchTeleportRepoMismatchDialog,
   launchTeleportResumeWrapper,
-} from './dialogLaunchers.js'
-import { SHOW_CURSOR } from '@anthropic/ink'
+} from './dialogLaunchers.js';
+import { SHOW_CURSOR } from '@anthropic/ink';
 import {
-	exitWithError,
-	exitWithMessage,
-	getRenderContext,
-	renderAndRun,
-	showSetupScreens,
-} from "./interactiveHelpers.js";
-import { initBuiltinPlugins } from "./plugins/bundled/index.js";
+  exitWithError,
+  exitWithMessage,
+  getRenderContext,
+  renderAndRun,
+  showSetupScreens,
+} from './interactiveHelpers.js';
+import { initBuiltinPlugins } from './plugins/bundled/index.js';
 /* eslint-enable @typescript-eslint/no-require-imports */
-import { checkQuotaStatus } from "./services/claudeAiLimits.js";
+import { checkQuotaStatus } from './services/claudeAiLimits.js';
+import { getMcpToolsCommandsAndResources, prefetchAllMcpResources } from './services/mcp/client.js';
+import { VALID_INSTALLABLE_SCOPES, VALID_UPDATE_SCOPES } from './services/plugins/pluginCliCommands.js';
+import { initBundledSkills } from './skills/bundled/index.js';
+import type { AgentColorName } from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js';
 import {
-	getMcpToolsCommandsAndResources,
-	prefetchAllMcpResources,
-} from "./services/mcp/client.js";
+  getActiveAgentsFromList,
+  getAgentDefinitionsWithOverrides,
+  isBuiltInAgent,
+  isCustomAgent,
+  parseAgentsFromJson,
+} from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js';
+import type { LogOption } from './types/logs.js';
+import type { Message as MessageType } from './types/message.js';
 import {
-	VALID_INSTALLABLE_SCOPES,
-	VALID_UPDATE_SCOPES,
-} from "./services/plugins/pluginCliCommands.js";
-import { initBundledSkills } from "./skills/bundled/index.js";
-import type { AgentColorName } from "@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js";
+  CLAUDE_IN_CHROME_SKILL_HINT,
+  CLAUDE_IN_CHROME_SKILL_HINT_WITH_WEBBROWSER,
+} from './utils/claudeInChrome/prompt.js';
 import {
-	getActiveAgentsFromList,
-	getAgentDefinitionsWithOverrides,
-	isBuiltInAgent,
-	isCustomAgent,
-	parseAgentsFromJson,
-} from "@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js";
-import type { LogOption } from "./types/logs.js";
-import type { Message as MessageType } from "./types/message.js";
+  setupClaudeInChrome,
+  shouldAutoEnableClaudeInChrome,
+  shouldEnableClaudeInChrome,
+} from './utils/claudeInChrome/setup.js';
+import { getContextWindowForModel } from './utils/context.js';
+import { loadConversationForResume } from './utils/conversationRecovery.js';
+import { buildDeepLinkBanner } from './utils/deepLink/banner.js';
+import { hasNodeOption, isBareMode, isEnvTruthy, isInProtectedNamespace } from './utils/envUtils.js';
+import { refreshExampleCommands } from './utils/exampleCommands.js';
+import type { FpsMetrics } from './utils/fpsTracker.js';
+import { getWorktreePaths } from './utils/getWorktreePaths.js';
+import { findGitRoot, getBranch, getIsGit, getWorktreeCount } from './utils/git.js';
+import { getGhAuthStatus } from './utils/github/ghAuthStatus.js';
+import { safeParseJSON } from './utils/json.js';
+import { logError } from './utils/log.js';
+import { getModelDeprecationWarning } from './utils/model/deprecation.js';
 import {
-	CLAUDE_IN_CHROME_SKILL_HINT,
-	CLAUDE_IN_CHROME_SKILL_HINT_WITH_WEBBROWSER,
-} from "./utils/claudeInChrome/prompt.js";
+  getDefaultMainLoopModel,
+  getUserSpecifiedModelSetting,
+  normalizeModelStringForAPI,
+  parseUserSpecifiedModel,
+} from './utils/model/model.js';
+import { ensureModelStringsInitialized } from './utils/model/modelStrings.js';
+import { PERMISSION_MODES } from './utils/permissions/PermissionMode.js';
 import {
-	setupClaudeInChrome,
-	shouldAutoEnableClaudeInChrome,
-	shouldEnableClaudeInChrome,
-} from "./utils/claudeInChrome/setup.js";
-import { getContextWindowForModel } from "./utils/context.js";
-import { loadConversationForResume } from "./utils/conversationRecovery.js";
-import { buildDeepLinkBanner } from "./utils/deepLink/banner.js";
+  checkAndDisableBypassPermissions,
+  getAutoModeEnabledStateIfCached,
+  initializeToolPermissionContext,
+  initialPermissionModeFromCLI,
+  isDefaultPermissionModeAuto,
+  parseToolListFromCLI,
+  removeDangerousPermissions,
+  stripDangerousPermissionsForAutoMode,
+  verifyAutoModeGateAccess,
+} from './utils/permissions/permissionSetup.js';
+import { cleanupOrphanedPluginVersionsInBackground } from './utils/plugins/cacheUtils.js';
+import { initializeVersionedPlugins } from './utils/plugins/installedPluginsManager.js';
+import { getManagedPluginNames } from './utils/plugins/managedPlugins.js';
+import { getGlobExclusionsForPluginCache } from './utils/plugins/orphanedPluginFilter.js';
+import { getPluginSeedDirs } from './utils/plugins/pluginDirectories.js';
+import { countFilesRoundedRg } from './utils/ripgrep.js';
+import { processSessionStartHooks, processSetupHooks } from './utils/sessionStart.js';
 import {
-	hasNodeOption,
-	isBareMode,
-	isEnvTruthy,
-	isInProtectedNamespace,
-} from "./utils/envUtils.js";
-import { refreshExampleCommands } from "./utils/exampleCommands.js";
-import type { FpsMetrics } from "./utils/fpsTracker.js";
-import { getWorktreePaths } from "./utils/getWorktreePaths.js";
+  cacheSessionTitle,
+  getSessionIdFromLog,
+  loadTranscriptFromFile,
+  saveAgentSetting,
+  saveMode,
+  searchSessionsByCustomTitle,
+  sessionIdExists,
+} from './utils/sessionStorage.js';
+import { ensureMdmSettingsLoaded } from './utils/settings/mdm/settings.js';
 import {
-	findGitRoot,
-	getBranch,
-	getIsGit,
-	getWorktreeCount,
-} from "./utils/git.js";
-import { getGhAuthStatus } from "./utils/github/ghAuthStatus.js";
-import { safeParseJSON } from "./utils/json.js";
-import { logError } from "./utils/log.js";
-import { getModelDeprecationWarning } from "./utils/model/deprecation.js";
-import {
-	getDefaultMainLoopModel,
-	getUserSpecifiedModelSetting,
-	normalizeModelStringForAPI,
-	parseUserSpecifiedModel,
-} from "./utils/model/model.js";
-import { ensureModelStringsInitialized } from "./utils/model/modelStrings.js";
-import { PERMISSION_MODES } from "./utils/permissions/PermissionMode.js";
-import {
-	checkAndDisableBypassPermissions,
-	getAutoModeEnabledStateIfCached,
-	initializeToolPermissionContext,
-	initialPermissionModeFromCLI,
-	isDefaultPermissionModeAuto,
-	parseToolListFromCLI,
-	removeDangerousPermissions,
-	stripDangerousPermissionsForAutoMode,
-	verifyAutoModeGateAccess,
-} from "./utils/permissions/permissionSetup.js";
-import { cleanupOrphanedPluginVersionsInBackground } from "./utils/plugins/cacheUtils.js";
-import { initializeVersionedPlugins } from "./utils/plugins/installedPluginsManager.js";
-import { getManagedPluginNames } from "./utils/plugins/managedPlugins.js";
-import { getGlobExclusionsForPluginCache } from "./utils/plugins/orphanedPluginFilter.js";
-import { getPluginSeedDirs } from "./utils/plugins/pluginDirectories.js";
-import { countFilesRoundedRg } from "./utils/ripgrep.js";
-import {
-	processSessionStartHooks,
-	processSetupHooks,
-} from "./utils/sessionStart.js";
-import {
-	cacheSessionTitle,
-	getSessionIdFromLog,
-	loadTranscriptFromFile,
-	saveAgentSetting,
-	saveMode,
-	searchSessionsByCustomTitle,
-	sessionIdExists,
-} from "./utils/sessionStorage.js";
-import { ensureMdmSettingsLoaded } from "./utils/settings/mdm/settings.js";
-import {
-	getInitialSettings,
-	getManagedSettingsKeysForLogging,
-	getSettingsForSource,
-	getSettingsWithErrors,
-} from "./utils/settings/settings.js";
-import { resetSettingsCache } from "./utils/settings/settingsCache.js";
-import type { ValidationError } from "./utils/settings/validation.js";
-import {
-	DEFAULT_TASKS_MODE_TASK_LIST_ID,
-	TASK_STATUSES,
-} from "./utils/tasks.js";
-import {
-	logPluginLoadErrors,
-	logPluginsEnabledForSession,
-} from "./utils/telemetry/pluginTelemetry.js";
-import { logSkillsLoaded } from "./utils/telemetry/skillLoadedEvent.js";
-import { generateTempFilePath } from "./utils/tempfile.js";
-import { validateUuid } from "./utils/uuid.js";
+  getInitialSettings,
+  getManagedSettingsKeysForLogging,
+  getSettingsForSource,
+  getSettingsWithErrors,
+} from './utils/settings/settings.js';
+import { resetSettingsCache } from './utils/settings/settingsCache.js';
+import type { ValidationError } from './utils/settings/validation.js';
+import { DEFAULT_TASKS_MODE_TASK_LIST_ID, TASK_STATUSES } from './utils/tasks.js';
+import { logPluginLoadErrors, logPluginsEnabledForSession } from './utils/telemetry/pluginTelemetry.js';
+import { logSkillsLoaded } from './utils/telemetry/skillLoadedEvent.js';
+import { generateTempFilePath } from './utils/tempfile.js';
+import { validateUuid } from './utils/uuid.js';
 // Plugin startup checks are now handled non-blockingly in REPL.tsx
 
-import { registerMcpAddCommand } from "src/commands/mcp/addCommand.js";
-import { registerMcpXaaIdpCommand } from "src/commands/mcp/xaaIdpCommand.js";
-import { logPermissionContextForAnts } from "src/services/internalLogging.js";
-import { fetchClaudeAIMcpConfigsIfEligible } from "src/services/mcp/claudeai.js";
-import { clearServerCache } from "src/services/mcp/client.js";
+import { registerMcpAddCommand } from 'src/commands/mcp/addCommand.js';
+import { registerMcpXaaIdpCommand } from 'src/commands/mcp/xaaIdpCommand.js';
+import { logPermissionContextForAnts } from 'src/services/internalLogging.js';
+import { fetchClaudeAIMcpConfigsIfEligible } from 'src/services/mcp/claudeai.js';
+import { clearServerCache } from 'src/services/mcp/client.js';
 import {
-	areMcpConfigsAllowedWithEnterpriseMcpConfig,
-	dedupClaudeAiMcpServers,
-	doesEnterpriseMcpConfigExist,
-	filterMcpServersByPolicy,
-	getClaudeCodeMcpConfigs,
-	getMcpServerSignature,
-	parseMcpConfig,
-	parseMcpConfigFromFilePath,
-} from "src/services/mcp/config.js";
+  areMcpConfigsAllowedWithEnterpriseMcpConfig,
+  dedupClaudeAiMcpServers,
+  doesEnterpriseMcpConfigExist,
+  filterMcpServersByPolicy,
+  getClaudeCodeMcpConfigs,
+  getMcpServerSignature,
+  parseMcpConfig,
+  parseMcpConfigFromFilePath,
+} from 'src/services/mcp/config.js';
+import { excludeCommandsByServer, excludeResourcesByServer } from 'src/services/mcp/utils.js';
+import { isXaaEnabled } from 'src/services/mcp/xaaIdpLogin.js';
+import { getRelevantTips } from 'src/services/tips/tipRegistry.js';
+import { logContextMetrics } from 'src/utils/api.js';
+import { CLAUDE_IN_CHROME_MCP_SERVER_NAME, isClaudeInChromeMCPServer } from 'src/utils/claudeInChrome/common.js';
+import { registerCleanup } from 'src/utils/cleanupRegistry.js';
+import { eagerParseCliFlag } from 'src/utils/cliArgs.js';
+import { createEmptyAttributionState } from 'src/utils/commitAttribution.js';
+import { countConcurrentSessions, registerSession, updateSessionName } from 'src/utils/concurrentSessions.js';
+import { getCwd } from 'src/utils/cwd.js';
+import { logForDebugging, setHasFormattedOutput } from 'src/utils/debug.js';
+import { errorMessage, getErrnoCode, isENOENT, TeleportOperationError, toError } from 'src/utils/errors.js';
+import { getFsImplementation, safeResolvePath } from 'src/utils/fsOperations.js';
+import { gracefulShutdown, gracefulShutdownSync } from 'src/utils/gracefulShutdown.js';
+import { setAllHookEventsEnabled } from 'src/utils/hooks/hookEvents.js';
+import { refreshModelCapabilities } from 'src/utils/model/modelCapabilities.js';
+import { peekForStdinData, writeToStderr } from 'src/utils/process.js';
+import { setCwd } from 'src/utils/Shell.js';
+import { type ProcessedResume, processResumedConversation } from 'src/utils/sessionRestore.js';
+import { parseSettingSourcesFlag } from 'src/utils/settings/constants.js';
+import { plural } from 'src/utils/stringUtils.js';
 import {
-	excludeCommandsByServer,
-	excludeResourcesByServer,
-} from "src/services/mcp/utils.js";
-import { isXaaEnabled } from "src/services/mcp/xaaIdpLogin.js";
-import { getRelevantTips } from "src/services/tips/tipRegistry.js";
-import { logContextMetrics } from "src/utils/api.js";
-import {
-	CLAUDE_IN_CHROME_MCP_SERVER_NAME,
-	isClaudeInChromeMCPServer,
-} from "src/utils/claudeInChrome/common.js";
-import { registerCleanup } from "src/utils/cleanupRegistry.js";
-import { eagerParseCliFlag } from "src/utils/cliArgs.js";
-import { createEmptyAttributionState } from "src/utils/commitAttribution.js";
-import {
-	countConcurrentSessions,
-	registerSession,
-	updateSessionName,
-} from "src/utils/concurrentSessions.js";
-import { getCwd } from "src/utils/cwd.js";
-import { logForDebugging, setHasFormattedOutput } from "src/utils/debug.js";
-import {
-	errorMessage,
-	getErrnoCode,
-	isENOENT,
-	TeleportOperationError,
-	toError,
-} from "src/utils/errors.js";
-import {
-	getFsImplementation,
-	safeResolvePath,
-} from "src/utils/fsOperations.js";
-import {
-	gracefulShutdown,
-	gracefulShutdownSync,
-} from "src/utils/gracefulShutdown.js";
-import { setAllHookEventsEnabled } from "src/utils/hooks/hookEvents.js";
-import { refreshModelCapabilities } from "src/utils/model/modelCapabilities.js";
-import { peekForStdinData, writeToStderr } from "src/utils/process.js";
-import { setCwd } from "src/utils/Shell.js";
-import {
-	type ProcessedResume,
-	processResumedConversation,
-} from "src/utils/sessionRestore.js";
-import { parseSettingSourcesFlag } from "src/utils/settings/constants.js";
-import { plural } from "src/utils/stringUtils.js";
-import {
-	type ChannelEntry,
-	getInitialMainLoopModel,
-	getIsNonInteractiveSession,
-	getSdkBetas,
-	getSessionId,
-	getUserMsgOptIn,
-	setAllowedChannels,
-	setAllowedSettingSources,
-	setChromeFlagOverride,
-	setClientType,
-	setCwdState,
-	setDirectConnectServerUrl,
-	setFlagSettingsPath,
-	setInitialMainLoopModel,
-	setInlinePlugins,
-	setIsInteractive,
-	setKairosActive,
-	setOriginalCwd,
-	setQuestionPreviewFormat,
-	setSdkBetas,
-	setSessionBypassPermissionsMode,
-	setSessionPersistenceDisabled,
-	setSessionSource,
-	setUserMsgOptIn,
-	switchSession,
-} from "./bootstrap/state.js";
+  type ChannelEntry,
+  getInitialMainLoopModel,
+  getIsNonInteractiveSession,
+  getSdkBetas,
+  getSessionId,
+  getUserMsgOptIn,
+  setAllowedChannels,
+  setAllowedSettingSources,
+  setChromeFlagOverride,
+  setClientType,
+  setCwdState,
+  setDirectConnectServerUrl,
+  setFlagSettingsPath,
+  setInitialMainLoopModel,
+  setInlinePlugins,
+  setIsInteractive,
+  setKairosActive,
+  setOriginalCwd,
+  setQuestionPreviewFormat,
+  setSdkBetas,
+  setSessionBypassPermissionsMode,
+  setSessionPersistenceDisabled,
+  setSessionSource,
+  setUserMsgOptIn,
+  switchSession,
+} from './bootstrap/state.js';
 
 /* eslint-disable @typescript-eslint/no-require-imports */
-const autoModeStateModule = feature("TRANSCRIPT_CLASSIFIER")
-	? (require("./utils/permissions/autoModeState.js") as typeof import("./utils/permissions/autoModeState.js"))
-	: null;
+const autoModeStateModule = feature('TRANSCRIPT_CLASSIFIER')
+  ? (require('./utils/permissions/autoModeState.js') as typeof import('./utils/permissions/autoModeState.js'))
+  : null;
 
 // TeleportRepoMismatchDialog, TeleportResumeWrapper dynamically imported at call sites
-import { migrateBypassPermissionsAcceptedToSettings } from "./migrations/migrateBypassPermissionsAcceptedToSettings.js";
-import { migrateEnableAllProjectMcpServersToSettings } from "./migrations/migrateEnableAllProjectMcpServersToSettings.js";
-import { migrateFennecToOpus } from "./migrations/migrateFennecToOpus.js";
-import { migrateLegacyOpusToCurrent } from "./migrations/migrateLegacyOpusToCurrent.js";
-import { migrateOpusToOpus1m } from "./migrations/migrateOpusToOpus1m.js";
-import { migrateReplBridgeEnabledToRemoteControlAtStartup } from "./migrations/migrateReplBridgeEnabledToRemoteControlAtStartup.js";
-import { migrateSonnet1mToSonnet45 } from "./migrations/migrateSonnet1mToSonnet45.js";
-import { migrateSonnet45ToSonnet46 } from "./migrations/migrateSonnet45ToSonnet46.js";
-import { resetAutoModeOptInForDefaultOffer } from "./migrations/resetAutoModeOptInForDefaultOffer.js";
-import { resetProToOpusDefault } from "./migrations/resetProToOpusDefault.js";
-import { createRemoteSessionConfig } from "./remote/RemoteSessionManager.js";
+import { migrateBypassPermissionsAcceptedToSettings } from './migrations/migrateBypassPermissionsAcceptedToSettings.js';
+import { migrateEnableAllProjectMcpServersToSettings } from './migrations/migrateEnableAllProjectMcpServersToSettings.js';
+import { migrateFennecToOpus } from './migrations/migrateFennecToOpus.js';
+import { migrateLegacyOpusToCurrent } from './migrations/migrateLegacyOpusToCurrent.js';
+import { migrateOpusToOpus1m } from './migrations/migrateOpusToOpus1m.js';
+import { migrateReplBridgeEnabledToRemoteControlAtStartup } from './migrations/migrateReplBridgeEnabledToRemoteControlAtStartup.js';
+import { migrateSonnet1mToSonnet45 } from './migrations/migrateSonnet1mToSonnet45.js';
+import { migrateSonnet45ToSonnet46 } from './migrations/migrateSonnet45ToSonnet46.js';
+import { resetAutoModeOptInForDefaultOffer } from './migrations/resetAutoModeOptInForDefaultOffer.js';
+import { resetProToOpusDefault } from './migrations/resetProToOpusDefault.js';
+import { createRemoteSessionConfig } from './remote/RemoteSessionManager.js';
 /* eslint-enable @typescript-eslint/no-require-imports */
 // teleportWithProgress dynamically imported at call site
+import { createDirectConnectSession, DirectConnectError } from './server/createDirectConnectSession.js';
+import { initializeLspServerManager } from './services/lsp/manager.js';
+import { shouldEnablePromptSuggestion } from './services/PromptSuggestion/promptSuggestion.js';
+import { type AppState, getDefaultAppState, IDLE_SPECULATION_STATE } from './state/AppStateStore.js';
+import { onChangeAppState } from './state/onChangeAppState.js';
+import { createStore } from './state/store.js';
+import { asSessionId } from './types/ids.js';
+import { filterAllowedSdkBetas } from './utils/betas.js';
+import { isInBundledMode, isRunningWithBun } from './utils/bundledMode.js';
+import { logForDiagnosticsNoPII } from './utils/diagLogs.js';
+import { filterExistingPaths, getKnownPathsForRepo } from './utils/githubRepoPathMapping.js';
+import { clearPluginCache, loadAllPluginsCacheOnly } from './utils/plugins/pluginLoader.js';
+import { migrateChangelogFromConfig } from './utils/releaseNotes.js';
+import { SandboxManager } from './utils/sandbox/sandbox-adapter.js';
+import { fetchSession, prepareApiRequest } from './utils/teleport/api.js';
 import {
-	createDirectConnectSession,
-	DirectConnectError,
-} from "./server/createDirectConnectSession.js";
-import { initializeLspServerManager } from "./services/lsp/manager.js";
-import { shouldEnablePromptSuggestion } from "./services/PromptSuggestion/promptSuggestion.js";
-import {
-	type AppState,
-	getDefaultAppState,
-	IDLE_SPECULATION_STATE,
-} from "./state/AppStateStore.js";
-import { onChangeAppState } from "./state/onChangeAppState.js";
-import { createStore } from "./state/store.js";
-import { asSessionId } from "./types/ids.js";
-import { filterAllowedSdkBetas } from "./utils/betas.js";
-import { isInBundledMode, isRunningWithBun } from "./utils/bundledMode.js";
-import { logForDiagnosticsNoPII } from "./utils/diagLogs.js";
-import {
-	filterExistingPaths,
-	getKnownPathsForRepo,
-} from "./utils/githubRepoPathMapping.js";
-import {
-	clearPluginCache,
-	loadAllPluginsCacheOnly,
-} from "./utils/plugins/pluginLoader.js";
-import { migrateChangelogFromConfig } from "./utils/releaseNotes.js";
-import { SandboxManager } from "./utils/sandbox/sandbox-adapter.js";
-import { fetchSession, prepareApiRequest } from "./utils/teleport/api.js";
-import {
-	checkOutTeleportedSessionBranch,
-	processMessagesForTeleportResume,
-	teleportToRemoteWithErrorHandling,
-	validateGitState,
-	validateSessionRepository,
-} from "./utils/teleport.js";
-import {
-  shouldEnableThinkingByDefault,
-  type ThinkingConfig,
-} from './utils/thinking.js'
-import { initUser, resetUserCache } from './utils/user.js'
-import {
-	getTmuxInstallInstructions,
-	isTmuxAvailable,
-	parsePRReference,
-} from "./utils/worktree.js";
+  checkOutTeleportedSessionBranch,
+  processMessagesForTeleportResume,
+  teleportToRemoteWithErrorHandling,
+  validateGitState,
+  validateSessionRepository,
+} from './utils/teleport.js';
+import { shouldEnableThinkingByDefault, type ThinkingConfig } from './utils/thinking.js';
+import { initUser, resetUserCache } from './utils/user.js';
+import { getTmuxInstallInstructions, isTmuxAvailable, parsePRReference } from './utils/worktree.js';
 
 // eslint-disable-next-line custom-rules/no-top-level-side-effects
-profileCheckpoint("main_tsx_imports_loaded");
+profileCheckpoint('main_tsx_imports_loaded');
 
 /**
  * Log managed settings keys to Statsig for analytics.
@@ -456,60 +369,54 @@ profileCheckpoint("main_tsx_imports_loaded");
  * and environment variables are applied before model resolution.
  */
 function logManagedSettings(): void {
-	try {
-		const policySettings = getSettingsForSource("policySettings");
-		if (policySettings) {
-			const allKeys = getManagedSettingsKeysForLogging(policySettings);
-			logEvent("tengu_managed_settings_loaded", {
-				keyCount: allKeys.length,
-				keys: allKeys.join(
-					",",
-				) as unknown as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-			});
-		}
-	} catch {
-		// Silently ignore errors - this is just for analytics
-	}
+  try {
+    const policySettings = getSettingsForSource('policySettings');
+    if (policySettings) {
+      const allKeys = getManagedSettingsKeysForLogging(policySettings);
+      logEvent('tengu_managed_settings_loaded', {
+        keyCount: allKeys.length,
+        keys: allKeys.join(',') as unknown as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
+    }
+  } catch {
+    // Silently ignore errors - this is just for analytics
+  }
 }
 
 // Check if running in debug/inspection mode
 function isBeingDebugged() {
-	const isBun = isRunningWithBun();
+  const isBun = isRunningWithBun();
 
-	// Check for inspect flags in process arguments (including all variants)
-	const hasInspectArg = process.execArgv.some((arg) => {
-		if (isBun) {
-			// Note: Bun has an issue with single-file executables where application arguments
-			// from process.argv leak into process.execArgv (similar to https://github.com/oven-sh/bun/issues/11673)
-			// This breaks use of --debug mode if we omit this branch
-			// We're fine to skip that check, because Bun doesn't support Node.js legacy --debug or --debug-brk flags
-			return /--inspect(-brk)?/.test(arg);
-		} else {
-			// In Node.js, check for both --inspect and legacy --debug flags
-			return /--inspect(-brk)?|--debug(-brk)?/.test(arg);
-		}
-	});
+  // Check for inspect flags in process arguments (including all variants)
+  const hasInspectArg = process.execArgv.some(arg => {
+    if (isBun) {
+      // Note: Bun has an issue with single-file executables where application arguments
+      // from process.argv leak into process.execArgv (similar to https://github.com/oven-sh/bun/issues/11673)
+      // This breaks use of --debug mode if we omit this branch
+      // We're fine to skip that check, because Bun doesn't support Node.js legacy --debug or --debug-brk flags
+      return /--inspect(-brk)?/.test(arg);
+    } else {
+      // In Node.js, check for both --inspect and legacy --debug flags
+      return /--inspect(-brk)?|--debug(-brk)?/.test(arg);
+    }
+  });
 
-	// Check if NODE_OPTIONS contains inspect flags
-	const hasInspectEnv =
-		process.env.NODE_OPTIONS &&
-		/--inspect(-brk)?|--debug(-brk)?/.test(process.env.NODE_OPTIONS);
+  // Check if NODE_OPTIONS contains inspect flags
+  const hasInspectEnv = process.env.NODE_OPTIONS && /--inspect(-brk)?|--debug(-brk)?/.test(process.env.NODE_OPTIONS);
 
-	// Check if inspector is available and active (indicates debugging)
-	try {
-		// Dynamic import would be better but is async - use global object instead
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		const inspector = (global as any).require("inspector");
-		const hasInspectorUrl = !!inspector.url();
-		return hasInspectorUrl || hasInspectArg || hasInspectEnv;
-	} catch {
-		// Ignore error and fall back to argument detection
-		return hasInspectArg || hasInspectEnv;
-	}
+  // Check if inspector is available and active (indicates debugging)
+  try {
+    // Dynamic import would be better but is async - use global object instead
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const inspector = (global as any).require('inspector');
+    const hasInspectorUrl = !!inspector.url();
+    return hasInspectorUrl || hasInspectArg || hasInspectEnv;
+  } catch {
+    // Ignore error and fall back to argument detection
+    return hasInspectArg || hasInspectEnv;
+  }
 }
 
-
-
 /**
  * Per-session skill/plugin telemetry. Called from both the interactive path
  * and the headless -p path (before runHeadless) — both go through
@@ -517,97 +424,80 @@ function isBeingDebugged() {
  * call sites here rather than one here + one in QueryEngine.
  */
 function logSessionTelemetry(): void {
-	const model = parseUserSpecifiedModel(
-		getInitialMainLoopModel() ?? getDefaultMainLoopModel(),
-	);
-	void logSkillsLoaded(
-		getCwd(),
-		getContextWindowForModel(model, getSdkBetas()),
-	);
-	void loadAllPluginsCacheOnly()
-		.then(({ enabled, errors }) => {
-			const managedNames = getManagedPluginNames();
-			logPluginsEnabledForSession(
-				enabled,
-				managedNames,
-				getPluginSeedDirs(),
-			);
-			logPluginLoadErrors(errors, managedNames);
-		})
-		.catch((err) => logError(err));
+  const model = parseUserSpecifiedModel(getInitialMainLoopModel() ?? getDefaultMainLoopModel());
+  void logSkillsLoaded(getCwd(), getContextWindowForModel(model, getSdkBetas()));
+  void loadAllPluginsCacheOnly()
+    .then(({ enabled, errors }) => {
+      const managedNames = getManagedPluginNames();
+      logPluginsEnabledForSession(enabled, managedNames, getPluginSeedDirs());
+      logPluginLoadErrors(errors, managedNames);
+    })
+    .catch(err => logError(err));
 }
 
 function getCertEnvVarTelemetry(): Record<string, boolean> {
-	const result: Record<string, boolean> = {};
-	if (process.env.NODE_EXTRA_CA_CERTS) {
-		result.has_node_extra_ca_certs = true;
-	}
-	if (process.env.CLAUDE_CODE_CLIENT_CERT) {
-		result.has_client_cert = true;
-	}
-	if (hasNodeOption("--use-system-ca")) {
-		result.has_use_system_ca = true;
-	}
-	if (hasNodeOption("--use-openssl-ca")) {
-		result.has_use_openssl_ca = true;
-	}
-	return result;
+  const result: Record<string, boolean> = {};
+  if (process.env.NODE_EXTRA_CA_CERTS) {
+    result.has_node_extra_ca_certs = true;
+  }
+  if (process.env.CLAUDE_CODE_CLIENT_CERT) {
+    result.has_client_cert = true;
+  }
+  if (hasNodeOption('--use-system-ca')) {
+    result.has_use_system_ca = true;
+  }
+  if (hasNodeOption('--use-openssl-ca')) {
+    result.has_use_openssl_ca = true;
+  }
+  return result;
 }
 
 async function logStartupTelemetry(): Promise<void> {
-	if (isAnalyticsDisabled()) return;
-	const [isGit, worktreeCount, ghAuthStatus] = await Promise.all([
-		getIsGit(),
-		getWorktreeCount(),
-		getGhAuthStatus(),
-	]);
+  if (isAnalyticsDisabled()) return;
+  const [isGit, worktreeCount, ghAuthStatus] = await Promise.all([getIsGit(), getWorktreeCount(), getGhAuthStatus()]);
 
-	logEvent("tengu_startup_telemetry", {
-		is_git: isGit,
-		worktree_count: worktreeCount,
-		gh_auth_status:
-			ghAuthStatus as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-		sandbox_enabled: SandboxManager.isSandboxingEnabled(),
-		are_unsandboxed_commands_allowed:
-			SandboxManager.areUnsandboxedCommandsAllowed(),
-		is_auto_bash_allowed_if_sandbox_enabled:
-			SandboxManager.isAutoAllowBashIfSandboxedEnabled(),
-		auto_updater_disabled: isAutoUpdaterDisabled(),
-		prefers_reduced_motion:
-			getInitialSettings().prefersReducedMotion ?? false,
-		...getCertEnvVarTelemetry(),
-	});
+  logEvent('tengu_startup_telemetry', {
+    is_git: isGit,
+    worktree_count: worktreeCount,
+    gh_auth_status: ghAuthStatus as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+    sandbox_enabled: SandboxManager.isSandboxingEnabled(),
+    are_unsandboxed_commands_allowed: SandboxManager.areUnsandboxedCommandsAllowed(),
+    is_auto_bash_allowed_if_sandbox_enabled: SandboxManager.isAutoAllowBashIfSandboxedEnabled(),
+    auto_updater_disabled: isAutoUpdaterDisabled(),
+    prefers_reduced_motion: getInitialSettings().prefersReducedMotion ?? false,
+    ...getCertEnvVarTelemetry(),
+  });
 }
 
 // @[MODEL LAUNCH]: Consider any migrations you may need for model strings. See migrateSonnet1mToSonnet45.ts for an example.
 // Bump this when adding a new sync migration so existing users re-run the set.
 const CURRENT_MIGRATION_VERSION = 11;
 function runMigrations(): void {
-	if (getGlobalConfig().migrationVersion !== CURRENT_MIGRATION_VERSION) {
-		migrateBypassPermissionsAcceptedToSettings();
-		migrateEnableAllProjectMcpServersToSettings();
-		resetProToOpusDefault();
-		migrateSonnet1mToSonnet45();
-		migrateLegacyOpusToCurrent();
-		migrateSonnet45ToSonnet46();
-		migrateOpusToOpus1m();
-		migrateReplBridgeEnabledToRemoteControlAtStartup();
-		if (feature("TRANSCRIPT_CLASSIFIER")) {
-			resetAutoModeOptInForDefaultOffer();
-		}
-		if (process.env.USER_TYPE === "ant") {
-			migrateFennecToOpus();
-		}
-		saveGlobalConfig((prev) =>
-			prev.migrationVersion === CURRENT_MIGRATION_VERSION
-				? prev
-				: { ...prev, migrationVersion: CURRENT_MIGRATION_VERSION },
-		);
-	}
-	// Async migration - fire and forget since it's non-blocking
-	migrateChangelogFromConfig().catch(() => {
-		// Silently ignore migration errors - will retry on next startup
-	});
+  if (getGlobalConfig().migrationVersion !== CURRENT_MIGRATION_VERSION) {
+    migrateBypassPermissionsAcceptedToSettings();
+    migrateEnableAllProjectMcpServersToSettings();
+    resetProToOpusDefault();
+    migrateSonnet1mToSonnet45();
+    migrateLegacyOpusToCurrent();
+    migrateSonnet45ToSonnet46();
+    migrateOpusToOpus1m();
+    migrateReplBridgeEnabledToRemoteControlAtStartup();
+    if (feature('TRANSCRIPT_CLASSIFIER')) {
+      resetAutoModeOptInForDefaultOffer();
+    }
+    if (process.env.USER_TYPE === 'ant') {
+      migrateFennecToOpus();
+    }
+    saveGlobalConfig(prev =>
+      prev.migrationVersion === CURRENT_MIGRATION_VERSION
+        ? prev
+        : { ...prev, migrationVersion: CURRENT_MIGRATION_VERSION },
+    );
+  }
+  // Async migration - fire and forget since it's non-blocking
+  migrateChangelogFromConfig().catch(() => {
+    // Silently ignore migration errors - will retry on next startup
+  });
 }
 
 /**
@@ -617,31 +507,25 @@ function runMigrations(): void {
  * non-interactive mode where trust is implicit.
  */
 function prefetchSystemContextIfSafe(): void {
-	const isNonInteractiveSession = getIsNonInteractiveSession();
+  const isNonInteractiveSession = getIsNonInteractiveSession();
 
-	// In non-interactive mode (--print), trust dialog is skipped and
-	// execution is considered trusted (as documented in help text)
-	if (isNonInteractiveSession) {
-		logForDiagnosticsNoPII(
-			"info",
-			"prefetch_system_context_non_interactive",
-		);
-		void getSystemContext();
-		return;
-	}
+  // In non-interactive mode (--print), trust dialog is skipped and
+  // execution is considered trusted (as documented in help text)
+  if (isNonInteractiveSession) {
+    logForDiagnosticsNoPII('info', 'prefetch_system_context_non_interactive');
+    void getSystemContext();
+    return;
+  }
 
-	// In interactive mode, only prefetch if trust has already been established
-	const hasTrust = checkHasTrustDialogAccepted();
-	if (hasTrust) {
-		logForDiagnosticsNoPII("info", "prefetch_system_context_has_trust");
-		void getSystemContext();
-	} else {
-		logForDiagnosticsNoPII(
-			"info",
-			"prefetch_system_context_skipped_no_trust",
-		);
-	}
-	// Otherwise, don't prefetch - wait for trust to be established first
+  // In interactive mode, only prefetch if trust has already been established
+  const hasTrust = checkHasTrustDialogAccepted();
+  if (hasTrust) {
+    logForDiagnosticsNoPII('info', 'prefetch_system_context_has_trust');
+    void getSystemContext();
+  } else {
+    logForDiagnosticsNoPII('info', 'prefetch_system_context_skipped_no_trust');
+  }
+  // Otherwise, don't prefetch - wait for trust to be established first
 }
 
 /**
@@ -651,142 +535,118 @@ function prefetchSystemContextIfSafe(): void {
  * Call this after the REPL has been rendered.
  */
 export function startDeferredPrefetches(): void {
-	// This function runs after first render, so it doesn't block the initial paint.
-	// However, the spawned processes and async work still contend for CPU and event
-	// loop time, which skews startup benchmarks (CPU profiles, time-to-first-render
-	// measurements). Skip all of it when we're only measuring startup performance.
-	if (
-		isEnvTruthy(process.env.CLAUDE_CODE_EXIT_AFTER_FIRST_RENDER) ||
-		// --bare: skip ALL prefetches. These are cache-warms for the REPL's
-		// first-turn responsiveness (initUser, getUserContext, tips, countFiles,
-		// modelCapabilities, change detectors). Scripted -p calls don't have a
-		// "user is typing" window to hide this work in — it's pure overhead on
-		// the critical path.
-		isBareMode()
-	) {
-		return;
-	}
+  // This function runs after first render, so it doesn't block the initial paint.
+  // However, the spawned processes and async work still contend for CPU and event
+  // loop time, which skews startup benchmarks (CPU profiles, time-to-first-render
+  // measurements). Skip all of it when we're only measuring startup performance.
+  if (
+    isEnvTruthy(process.env.CLAUDE_CODE_EXIT_AFTER_FIRST_RENDER) ||
+    // --bare: skip ALL prefetches. These are cache-warms for the REPL's
+    // first-turn responsiveness (initUser, getUserContext, tips, countFiles,
+    // modelCapabilities, change detectors). Scripted -p calls don't have a
+    // "user is typing" window to hide this work in — it's pure overhead on
+    // the critical path.
+    isBareMode()
+  ) {
+    return;
+  }
 
-	// Process-spawning prefetches (consumed at first API call, user is still typing)
-	void initUser();
-	void getUserContext();
-	prefetchSystemContextIfSafe();
-	void getRelevantTips();
-	if (
-		isEnvTruthy(process.env.CLAUDE_CODE_USE_BEDROCK) &&
-		!isEnvTruthy(process.env.CLAUDE_CODE_SKIP_BEDROCK_AUTH)
-	) {
-		void prefetchAwsCredentialsAndBedRockInfoIfSafe();
-	}
-	if (
-		isEnvTruthy(process.env.CLAUDE_CODE_USE_VERTEX) &&
-		!isEnvTruthy(process.env.CLAUDE_CODE_SKIP_VERTEX_AUTH)
-	) {
-		void prefetchGcpCredentialsIfSafe();
-	}
-	void countFilesRoundedRg(getCwd(), AbortSignal.timeout(3000), []);
+  // Process-spawning prefetches (consumed at first API call, user is still typing)
+  void initUser();
+  void getUserContext();
+  prefetchSystemContextIfSafe();
+  void getRelevantTips();
+  if (isEnvTruthy(process.env.CLAUDE_CODE_USE_BEDROCK) && !isEnvTruthy(process.env.CLAUDE_CODE_SKIP_BEDROCK_AUTH)) {
+    void prefetchAwsCredentialsAndBedRockInfoIfSafe();
+  }
+  if (isEnvTruthy(process.env.CLAUDE_CODE_USE_VERTEX) && !isEnvTruthy(process.env.CLAUDE_CODE_SKIP_VERTEX_AUTH)) {
+    void prefetchGcpCredentialsIfSafe();
+  }
+  void countFilesRoundedRg(getCwd(), AbortSignal.timeout(3000), []);
 
-	// Analytics and feature flag initialization
-	void initializeAnalyticsGates();
+  // Analytics and feature flag initialization
+  void initializeAnalyticsGates();
 
-	void refreshModelCapabilities();
+  void refreshModelCapabilities();
 
-	// File change detectors deferred from init() to unblock first render
-	void settingsChangeDetector.initialize();
-	if (!isBareMode()) {
-		void skillChangeDetector.initialize();
-	}
+  // File change detectors deferred from init() to unblock first render
+  void settingsChangeDetector.initialize();
+  if (!isBareMode()) {
+    void skillChangeDetector.initialize();
+  }
 
-	// Event loop stall detector — logs when the main thread is blocked >500ms
-	if (process.env.USER_TYPE === "ant") {
-		void import("./utils/eventLoopStallDetector.js").then((m) =>
-			m.startEventLoopStallDetector(),
-		);
-	}
+  // Event loop stall detector — logs when the main thread is blocked >500ms
+  if (process.env.USER_TYPE === 'ant') {
+    void import('./utils/eventLoopStallDetector.js').then(m => m.startEventLoopStallDetector());
+  }
 }
 
 function loadSettingsFromFlag(settingsFile: string): void {
-	try {
-		const trimmedSettings = settingsFile.trim();
-		const looksLikeJson =
-			trimmedSettings.startsWith("{") && trimmedSettings.endsWith("}");
+  try {
+    const trimmedSettings = settingsFile.trim();
+    const looksLikeJson = trimmedSettings.startsWith('{') && trimmedSettings.endsWith('}');
 
-		let settingsPath: string;
+    let settingsPath: string;
 
-		if (looksLikeJson) {
-			// It's a JSON string - validate and create temp file
-			const parsedJson = safeParseJSON(trimmedSettings);
-			if (!parsedJson) {
-				process.stderr.write(
-					chalk.red("Error: Invalid JSON provided to --settings\n"),
-				);
-				process.exit(1);
-			}
+    if (looksLikeJson) {
+      // It's a JSON string - validate and create temp file
+      const parsedJson = safeParseJSON(trimmedSettings);
+      if (!parsedJson) {
+        process.stderr.write(chalk.red('Error: Invalid JSON provided to --settings\n'));
+        process.exit(1);
+      }
 
-			// Create a temporary file and write the JSON to it.
-			// Use a content-hash-based path instead of random UUID to avoid
-			// busting the Anthropic API prompt cache. The settings path ends up
-			// in the Bash tool's sandbox denyWithinAllow list, which is part of
-			// the tool description sent to the API. A random UUID per subprocess
-			// changes the tool description on every query() call, invalidating
-			// the cache prefix and causing a 12x input token cost penalty.
-			// The content hash ensures identical settings produce the same path
-			// across process boundaries (each SDK query() spawns a new process).
-			settingsPath = generateTempFilePath("claude-settings", ".json", {
-				contentHash: trimmedSettings,
-			});
-			writeFileSync_DEPRECATED(settingsPath, trimmedSettings, "utf8");
-		} else {
-			// It's a file path - resolve and validate by attempting to read
-			const { resolvedPath: resolvedSettingsPath } = safeResolvePath(
-				getFsImplementation(),
-				settingsFile,
-			);
-			try {
-				readFileSync(resolvedSettingsPath, "utf8");
-			} catch (e) {
-				if (isENOENT(e)) {
-					process.stderr.write(
-						chalk.red(
-							`Error: Settings file not found: ${resolvedSettingsPath}\n`,
-						),
-					);
-					process.exit(1);
-				}
-				throw e;
-			}
-			settingsPath = resolvedSettingsPath;
-		}
+      // Create a temporary file and write the JSON to it.
+      // Use a content-hash-based path instead of random UUID to avoid
+      // busting the Anthropic API prompt cache. The settings path ends up
+      // in the Bash tool's sandbox denyWithinAllow list, which is part of
+      // the tool description sent to the API. A random UUID per subprocess
+      // changes the tool description on every query() call, invalidating
+      // the cache prefix and causing a 12x input token cost penalty.
+      // The content hash ensures identical settings produce the same path
+      // across process boundaries (each SDK query() spawns a new process).
+      settingsPath = generateTempFilePath('claude-settings', '.json', {
+        contentHash: trimmedSettings,
+      });
+      writeFileSync_DEPRECATED(settingsPath, trimmedSettings, 'utf8');
+    } else {
+      // It's a file path - resolve and validate by attempting to read
+      const { resolvedPath: resolvedSettingsPath } = safeResolvePath(getFsImplementation(), settingsFile);
+      try {
+        readFileSync(resolvedSettingsPath, 'utf8');
+      } catch (e) {
+        if (isENOENT(e)) {
+          process.stderr.write(chalk.red(`Error: Settings file not found: ${resolvedSettingsPath}\n`));
+          process.exit(1);
+        }
+        throw e;
+      }
+      settingsPath = resolvedSettingsPath;
+    }
 
-		setFlagSettingsPath(settingsPath);
-		resetSettingsCache();
-	} catch (error) {
-		if (error instanceof Error) {
-			logError(error);
-		}
-		process.stderr.write(
-			chalk.red(`Error processing settings: ${errorMessage(error)}\n`),
-		);
-		process.exit(1);
-	}
+    setFlagSettingsPath(settingsPath);
+    resetSettingsCache();
+  } catch (error) {
+    if (error instanceof Error) {
+      logError(error);
+    }
+    process.stderr.write(chalk.red(`Error processing settings: ${errorMessage(error)}\n`));
+    process.exit(1);
+  }
 }
 
 function loadSettingSourcesFromFlag(settingSourcesArg: string): void {
-	try {
-		const sources = parseSettingSourcesFlag(settingSourcesArg);
-		setAllowedSettingSources(sources);
-		resetSettingsCache();
-	} catch (error) {
-		if (error instanceof Error) {
-			logError(error);
-		}
-		process.stderr.write(
-			chalk.red(
-				`Error processing --setting-sources: ${errorMessage(error)}\n`,
-			),
-		);
-		process.exit(1);
-	}
+  try {
+    const sources = parseSettingSourcesFlag(settingSourcesArg);
+    setAllowedSettingSources(sources);
+    resetSettingsCache();
+  } catch (error) {
+    if (error instanceof Error) {
+      logError(error);
+    }
+    process.stderr.write(chalk.red(`Error processing --setting-sources: ${errorMessage(error)}\n`));
+    process.exit(1);
+  }
 }
 
 /**
@@ -794,5700 +654,4551 @@ function loadSettingSourcesFromFlag(settingSourcesArg: string): void {
  * This ensures settings are filtered from the start of initialization
  */
 function eagerLoadSettings(): void {
-	profileCheckpoint("eagerLoadSettings_start");
-	// Parse --settings flag early to ensure settings are loaded before init()
-	const settingsFile = eagerParseCliFlag("--settings");
-	if (settingsFile) {
-		loadSettingsFromFlag(settingsFile);
-	}
+  profileCheckpoint('eagerLoadSettings_start');
+  // Parse --settings flag early to ensure settings are loaded before init()
+  const settingsFile = eagerParseCliFlag('--settings');
+  if (settingsFile) {
+    loadSettingsFromFlag(settingsFile);
+  }
 
-	// Parse --setting-sources flag early to control which sources are loaded
-	const settingSourcesArg = eagerParseCliFlag("--setting-sources");
-	if (settingSourcesArg !== undefined) {
-		loadSettingSourcesFromFlag(settingSourcesArg);
-	}
-	profileCheckpoint("eagerLoadSettings_end");
+  // Parse --setting-sources flag early to control which sources are loaded
+  const settingSourcesArg = eagerParseCliFlag('--setting-sources');
+  if (settingSourcesArg !== undefined) {
+    loadSettingSourcesFromFlag(settingSourcesArg);
+  }
+  profileCheckpoint('eagerLoadSettings_end');
 }
 
 function initializeEntrypoint(isNonInteractive: boolean): void {
-	// Skip if already set (e.g., by SDK or other entrypoints)
-	if (process.env.CLAUDE_CODE_ENTRYPOINT) {
-		return;
-	}
+  // Skip if already set (e.g., by SDK or other entrypoints)
+  if (process.env.CLAUDE_CODE_ENTRYPOINT) {
+    return;
+  }
 
-	const cliArgs = process.argv.slice(2);
+  const cliArgs = process.argv.slice(2);
 
-	// Check for MCP serve command (handle flags before mcp serve, e.g., --debug mcp serve)
-	const mcpIndex = cliArgs.indexOf("mcp");
-	if (mcpIndex !== -1 && cliArgs[mcpIndex + 1] === "serve") {
-		process.env.CLAUDE_CODE_ENTRYPOINT = "mcp";
-		return;
-	}
+  // Check for MCP serve command (handle flags before mcp serve, e.g., --debug mcp serve)
+  const mcpIndex = cliArgs.indexOf('mcp');
+  if (mcpIndex !== -1 && cliArgs[mcpIndex + 1] === 'serve') {
+    process.env.CLAUDE_CODE_ENTRYPOINT = 'mcp';
+    return;
+  }
 
-	if (isEnvTruthy(process.env.CLAUDE_CODE_ACTION)) {
-		process.env.CLAUDE_CODE_ENTRYPOINT = "claude-code-github-action";
-		return;
-	}
+  if (isEnvTruthy(process.env.CLAUDE_CODE_ACTION)) {
+    process.env.CLAUDE_CODE_ENTRYPOINT = 'claude-code-github-action';
+    return;
+  }
 
-	// Note: 'local-agent' entrypoint is set by the local agent mode launcher
-	// via CLAUDE_CODE_ENTRYPOINT env var (handled by early return above)
+  // Note: 'local-agent' entrypoint is set by the local agent mode launcher
+  // via CLAUDE_CODE_ENTRYPOINT env var (handled by early return above)
 
-	// Set based on interactive status
-	process.env.CLAUDE_CODE_ENTRYPOINT = isNonInteractive ? "sdk-cli" : "cli";
+  // Set based on interactive status
+  process.env.CLAUDE_CODE_ENTRYPOINT = isNonInteractive ? 'sdk-cli' : 'cli';
 }
 
 // Set by early argv processing when `claude open <url>` is detected (interactive mode only)
 type PendingConnect = {
-	url: string | undefined;
-	authToken: string | undefined;
-	dangerouslySkipPermissions: boolean;
+  url: string | undefined;
+  authToken: string | undefined;
+  dangerouslySkipPermissions: boolean;
 };
-const _pendingConnect: PendingConnect | undefined = feature("DIRECT_CONNECT")
-	? {
-			url: undefined,
-			authToken: undefined,
-			dangerouslySkipPermissions: false,
-		}
-	: undefined;
+const _pendingConnect: PendingConnect | undefined = feature('DIRECT_CONNECT')
+  ? {
+      url: undefined,
+      authToken: undefined,
+      dangerouslySkipPermissions: false,
+    }
+  : undefined;
 
 // Set by early argv processing when `claude assistant [sessionId]` is detected
 type PendingAssistantChat = { sessionId?: string; discover: boolean };
-const _pendingAssistantChat: PendingAssistantChat | undefined = feature(
-	"KAIROS",
-)
-	? { sessionId: undefined, discover: false }
-	: undefined;
+const _pendingAssistantChat: PendingAssistantChat | undefined = feature('KAIROS')
+  ? { sessionId: undefined, discover: false }
+  : undefined;
 
 // `claude ssh <host> [dir]` — parsed from argv early (same pattern as
 // DIRECT_CONNECT above) so the main command path can pick it up and hand
 // the REPL an SSH-backed session instead of a local one.
 type PendingSSH = {
-	host: string | undefined;
-	cwd: string | undefined;
-	permissionMode: string | undefined;
-	dangerouslySkipPermissions: boolean;
-	/** --local: spawn the child CLI directly, skip ssh/probe/deploy. e2e test mode. */
-	local: boolean;
-	/** Extra CLI args to forward to the remote CLI on initial spawn (--resume, -c). */
-	extraCliArgs: string[];
+  host: string | undefined;
+  cwd: string | undefined;
+  permissionMode: string | undefined;
+  dangerouslySkipPermissions: boolean;
+  /** --local: spawn the child CLI directly, skip ssh/probe/deploy. e2e test mode. */
+  local: boolean;
+  /** Extra CLI args to forward to the remote CLI on initial spawn (--resume, -c). */
+  extraCliArgs: string[];
 };
-const _pendingSSH: PendingSSH | undefined = feature("SSH_REMOTE")
-	? {
-			host: undefined,
-			cwd: undefined,
-			permissionMode: undefined,
-			dangerouslySkipPermissions: false,
-			local: false,
-			extraCliArgs: [],
-		}
-	: undefined;
+const _pendingSSH: PendingSSH | undefined = feature('SSH_REMOTE')
+  ? {
+      host: undefined,
+      cwd: undefined,
+      permissionMode: undefined,
+      dangerouslySkipPermissions: false,
+      local: false,
+      extraCliArgs: [],
+    }
+  : undefined;
 
 export async function main() {
-	profileCheckpoint("main_function_start");
+  profileCheckpoint('main_function_start');
 
-	// SECURITY: Prevent Windows from executing commands from current directory
-	// This must be set before ANY command execution to prevent PATH hijacking attacks
-	// See: https://docs.microsoft.com/en-us/windows/win32/api/processenv/nf-processenv-searchpathw
-	process.env.NoDefaultCurrentDirectoryInExePath = "1";
+  // SECURITY: Prevent Windows from executing commands from current directory
+  // This must be set before ANY command execution to prevent PATH hijacking attacks
+  // See: https://docs.microsoft.com/en-us/windows/win32/api/processenv/nf-processenv-searchpathw
+  process.env.NoDefaultCurrentDirectoryInExePath = '1';
 
-	// Initialize warning handler early to catch warnings
-	initializeWarningHandler();
+  // Initialize warning handler early to catch warnings
+  initializeWarningHandler();
 
-	process.on("exit", () => {
-		resetCursor();
-	});
-	process.on("SIGINT", () => {
-		// In print mode, print.ts registers its own SIGINT handler that aborts
-		// the in-flight query and calls gracefulShutdown; skip here to avoid
-		// preempting it with a synchronous process.exit().
-		if (process.argv.includes("-p") || process.argv.includes("--print")) {
-			return;
-		}
-		process.exit(0);
-	});
-	profileCheckpoint("main_warning_handler_initialized");
+  process.on('exit', () => {
+    resetCursor();
+  });
+  process.on('SIGINT', () => {
+    // In print mode, print.ts registers its own SIGINT handler that aborts
+    // the in-flight query and calls gracefulShutdown; skip here to avoid
+    // preempting it with a synchronous process.exit().
+    if (process.argv.includes('-p') || process.argv.includes('--print')) {
+      return;
+    }
+    process.exit(0);
+  });
+  profileCheckpoint('main_warning_handler_initialized');
 
-	// Check for cc:// or cc+unix:// URL in argv — rewrite so the main command
-	// handles it, giving the full interactive TUI instead of a stripped-down subcommand.
-	// For headless (-p), we rewrite to the internal `open` subcommand.
-	if (feature("DIRECT_CONNECT")) {
-		const rawCliArgs = process.argv.slice(2);
-		const ccIdx = rawCliArgs.findIndex(
-			(a) => a.startsWith("cc://") || a.startsWith("cc+unix://"),
-		);
-		if (ccIdx !== -1 && _pendingConnect) {
-			const ccUrl = rawCliArgs[ccIdx]!;
-			const { parseConnectUrl } =
-				await import("./server/parseConnectUrl.js");
-			const parsed = parseConnectUrl(ccUrl);
-			_pendingConnect.dangerouslySkipPermissions = rawCliArgs.includes(
-				"--dangerously-skip-permissions",
-			);
+  // Check for cc:// or cc+unix:// URL in argv — rewrite so the main command
+  // handles it, giving the full interactive TUI instead of a stripped-down subcommand.
+  // For headless (-p), we rewrite to the internal `open` subcommand.
+  if (feature('DIRECT_CONNECT')) {
+    const rawCliArgs = process.argv.slice(2);
+    const ccIdx = rawCliArgs.findIndex(a => a.startsWith('cc://') || a.startsWith('cc+unix://'));
+    if (ccIdx !== -1 && _pendingConnect) {
+      const ccUrl = rawCliArgs[ccIdx]!;
+      const { parseConnectUrl } = await import('./server/parseConnectUrl.js');
+      const parsed = parseConnectUrl(ccUrl);
+      _pendingConnect.dangerouslySkipPermissions = rawCliArgs.includes('--dangerously-skip-permissions');
 
-			if (rawCliArgs.includes("-p") || rawCliArgs.includes("--print")) {
-				// Headless: rewrite to internal `open` subcommand
-				const stripped = rawCliArgs.filter((_, i) => i !== ccIdx);
-				const dspIdx = stripped.indexOf(
-					"--dangerously-skip-permissions",
-				);
-				if (dspIdx !== -1) {
-					stripped.splice(dspIdx, 1);
-				}
-				process.argv = [
-					process.argv[0]!,
-					process.argv[1]!,
-					"open",
-					ccUrl,
-					...stripped,
-				];
-			} else {
-				// Interactive: strip cc:// URL and flags, run main command
-				_pendingConnect.url = parsed.serverUrl;
-				_pendingConnect.authToken = parsed.authToken;
-				const stripped = rawCliArgs.filter((_, i) => i !== ccIdx);
-				const dspIdx = stripped.indexOf(
-					"--dangerously-skip-permissions",
-				);
-				if (dspIdx !== -1) {
-					stripped.splice(dspIdx, 1);
-				}
-				process.argv = [
-					process.argv[0]!,
-					process.argv[1]!,
-					...stripped,
-				];
-			}
-		}
-	}
+      if (rawCliArgs.includes('-p') || rawCliArgs.includes('--print')) {
+        // Headless: rewrite to internal `open` subcommand
+        const stripped = rawCliArgs.filter((_, i) => i !== ccIdx);
+        const dspIdx = stripped.indexOf('--dangerously-skip-permissions');
+        if (dspIdx !== -1) {
+          stripped.splice(dspIdx, 1);
+        }
+        process.argv = [process.argv[0]!, process.argv[1]!, 'open', ccUrl, ...stripped];
+      } else {
+        // Interactive: strip cc:// URL and flags, run main command
+        _pendingConnect.url = parsed.serverUrl;
+        _pendingConnect.authToken = parsed.authToken;
+        const stripped = rawCliArgs.filter((_, i) => i !== ccIdx);
+        const dspIdx = stripped.indexOf('--dangerously-skip-permissions');
+        if (dspIdx !== -1) {
+          stripped.splice(dspIdx, 1);
+        }
+        process.argv = [process.argv[0]!, process.argv[1]!, ...stripped];
+      }
+    }
+  }
 
-	// Handle deep link URIs early — this is invoked by the OS protocol handler
-	// and should bail out before full init since it only needs to parse the URI
-	// and open a terminal.
-	if (feature("LODESTONE")) {
-		const handleUriIdx = process.argv.indexOf("--handle-uri");
-		if (handleUriIdx !== -1 && process.argv[handleUriIdx + 1]) {
-			const { enableConfigs } = await import("./utils/config.js");
-			enableConfigs();
-			const uri = process.argv[handleUriIdx + 1]!;
-			const { handleDeepLinkUri } =
-				await import("./utils/deepLink/protocolHandler.js");
-			const exitCode = await handleDeepLinkUri(uri);
-			process.exit(exitCode);
-		}
+  // Handle deep link URIs early — this is invoked by the OS protocol handler
+  // and should bail out before full init since it only needs to parse the URI
+  // and open a terminal.
+  if (feature('LODESTONE')) {
+    const handleUriIdx = process.argv.indexOf('--handle-uri');
+    if (handleUriIdx !== -1 && process.argv[handleUriIdx + 1]) {
+      const { enableConfigs } = await import('./utils/config.js');
+      enableConfigs();
+      const uri = process.argv[handleUriIdx + 1]!;
+      const { handleDeepLinkUri } = await import('./utils/deepLink/protocolHandler.js');
+      const exitCode = await handleDeepLinkUri(uri);
+      process.exit(exitCode);
+    }
 
-		// macOS URL handler: when LaunchServices launches our .app bundle, the
-		// URL arrives via Apple Event (not argv). LaunchServices overwrites
-		// __CFBundleIdentifier to the launching bundle's ID, which is a precise
-		// positive signal — cheaper than importing and guessing with heuristics.
-		if (
-			process.platform === "darwin" &&
-			process.env.__CFBundleIdentifier ===
-				"com.anthropic.claude-code-url-handler"
-		) {
-			const { enableConfigs } = await import("./utils/config.js");
-			enableConfigs();
-			const { handleUrlSchemeLaunch } =
-				await import("./utils/deepLink/protocolHandler.js");
-			const urlSchemeResult = await handleUrlSchemeLaunch();
-			process.exit(urlSchemeResult ?? 1);
-		}
-	}
+    // macOS URL handler: when LaunchServices launches our .app bundle, the
+    // URL arrives via Apple Event (not argv). LaunchServices overwrites
+    // __CFBundleIdentifier to the launching bundle's ID, which is a precise
+    // positive signal — cheaper than importing and guessing with heuristics.
+    if (process.platform === 'darwin' && process.env.__CFBundleIdentifier === 'com.anthropic.claude-code-url-handler') {
+      const { enableConfigs } = await import('./utils/config.js');
+      enableConfigs();
+      const { handleUrlSchemeLaunch } = await import('./utils/deepLink/protocolHandler.js');
+      const urlSchemeResult = await handleUrlSchemeLaunch();
+      process.exit(urlSchemeResult ?? 1);
+    }
+  }
 
-	// `claude assistant [sessionId]` — stash and strip so the main
-	// command handles it, giving the full interactive TUI. Position-0 only
-	// (matching the ssh pattern below) — indexOf would false-positive on
-	// `claude -p "explain assistant"`. Root-flag-before-subcommand
-	// (e.g. `--debug assistant`) falls through to the stub, which
-	// prints usage.
-	if (feature("KAIROS") && _pendingAssistantChat) {
-		const rawArgs = process.argv.slice(2);
-		if (rawArgs[0] === "assistant") {
-			const nextArg = rawArgs[1];
-			if (nextArg && !nextArg.startsWith("-")) {
-				_pendingAssistantChat.sessionId = nextArg;
-				rawArgs.splice(0, 2); // drop 'assistant' and sessionId
-				process.argv = [process.argv[0]!, process.argv[1]!, ...rawArgs];
-			} else if (!nextArg) {
-				_pendingAssistantChat.discover = true;
-				rawArgs.splice(0, 1); // drop 'assistant'
-				process.argv = [process.argv[0]!, process.argv[1]!, ...rawArgs];
-			}
-			// else: `claude assistant --help` → fall through to stub
-		}
-	}
+  // `claude assistant [sessionId]` — stash and strip so the main
+  // command handles it, giving the full interactive TUI. Position-0 only
+  // (matching the ssh pattern below) — indexOf would false-positive on
+  // `claude -p "explain assistant"`. Root-flag-before-subcommand
+  // (e.g. `--debug assistant`) falls through to the stub, which
+  // prints usage.
+  if (feature('KAIROS') && _pendingAssistantChat) {
+    const rawArgs = process.argv.slice(2);
+    if (rawArgs[0] === 'assistant') {
+      const nextArg = rawArgs[1];
+      if (nextArg && !nextArg.startsWith('-')) {
+        _pendingAssistantChat.sessionId = nextArg;
+        rawArgs.splice(0, 2); // drop 'assistant' and sessionId
+        process.argv = [process.argv[0]!, process.argv[1]!, ...rawArgs];
+      } else if (!nextArg) {
+        _pendingAssistantChat.discover = true;
+        rawArgs.splice(0, 1); // drop 'assistant'
+        process.argv = [process.argv[0]!, process.argv[1]!, ...rawArgs];
+      }
+      // else: `claude assistant --help` → fall through to stub
+    }
+  }
 
-	// `claude ssh <host> [dir]` — strip from argv so the main command handler
-	// runs (full interactive TUI), stash the host/dir for the REPL branch at
-	// ~line 3720 to pick up. Headless (-p) mode not supported in v1: SSH
-	// sessions need the local REPL to drive them (interrupt, permissions).
-	if (feature("SSH_REMOTE") && _pendingSSH) {
-		const rawCliArgs = process.argv.slice(2);
-		// SSH-specific flags can appear before the host positional (e.g.
-		// `ssh --permission-mode auto host /tmp` — standard POSIX flags-before-
-		// positionals). Pull them all out BEFORE checking whether a host was
-		// given, so `claude ssh --permission-mode auto host` and `claude ssh host
-		// --permission-mode auto` are equivalent. The host check below only needs
-		// to guard against `-h`/`--help` (which commander should handle).
-		if (rawCliArgs[0] === "ssh") {
-			const localIdx = rawCliArgs.indexOf("--local");
-			if (localIdx !== -1) {
-				_pendingSSH.local = true;
-				rawCliArgs.splice(localIdx, 1);
-			}
-			const dspIdx = rawCliArgs.indexOf("--dangerously-skip-permissions");
-			if (dspIdx !== -1) {
-				_pendingSSH.dangerouslySkipPermissions = true;
-				rawCliArgs.splice(dspIdx, 1);
-			}
-			const pmIdx = rawCliArgs.indexOf("--permission-mode");
-			if (
-				pmIdx !== -1 &&
-				rawCliArgs[pmIdx + 1] &&
-				!rawCliArgs[pmIdx + 1]!.startsWith("-")
-			) {
-				_pendingSSH.permissionMode = rawCliArgs[pmIdx + 1];
-				rawCliArgs.splice(pmIdx, 2);
-			}
-			const pmEqIdx = rawCliArgs.findIndex((a) =>
-				a.startsWith("--permission-mode="),
-			);
-			if (pmEqIdx !== -1) {
-				_pendingSSH.permissionMode = rawCliArgs[pmEqIdx]!.split("=")[1];
-				rawCliArgs.splice(pmEqIdx, 1);
-			}
-			// Forward session-resume + model flags to the remote CLI's initial spawn.
-			// --continue/-c and --resume <uuid> operate on the REMOTE session history
-			// (which persists under the remote's ~/.claude/projects/<cwd>/).
-			// --model controls which model the remote uses.
-			const extractFlag = (
-				flag: string,
-				opts: { hasValue?: boolean; as?: string } = {},
-			) => {
-				const i = rawCliArgs.indexOf(flag);
-				if (i !== -1) {
-					_pendingSSH.extraCliArgs.push(opts.as ?? flag);
-					const val = rawCliArgs[i + 1];
-					if (opts.hasValue && val && !val.startsWith("-")) {
-						_pendingSSH.extraCliArgs.push(val);
-						rawCliArgs.splice(i, 2);
-					} else {
-						rawCliArgs.splice(i, 1);
-					}
-				}
-				const eqI = rawCliArgs.findIndex((a) =>
-					a.startsWith(`${flag}=`),
-				);
-				if (eqI !== -1) {
-					_pendingSSH.extraCliArgs.push(
-						opts.as ?? flag,
-						rawCliArgs[eqI]!.slice(flag.length + 1),
-					);
-					rawCliArgs.splice(eqI, 1);
-				}
-			};
-			extractFlag("-c", { as: "--continue" });
-			extractFlag("--continue");
-			extractFlag("--resume", { hasValue: true });
-			extractFlag("--model", { hasValue: true });
-		}
-		// After pre-extraction, any remaining dash-arg at [1] is either -h/--help
-		// (commander handles) or an unknown-to-ssh flag (fall through to commander
-		// so it surfaces a proper error). Only a non-dash arg is the host.
-		if (
-			rawCliArgs[0] === "ssh" &&
-			rawCliArgs[1] &&
-			!rawCliArgs[1].startsWith("-")
-		) {
-			_pendingSSH.host = rawCliArgs[1];
-			// Optional positional cwd.
-			let consumed = 2;
-			if (rawCliArgs[2] && !rawCliArgs[2].startsWith("-")) {
-				_pendingSSH.cwd = rawCliArgs[2];
-				consumed = 3;
-			}
-			const rest = rawCliArgs.slice(consumed);
+  // `claude ssh <host> [dir]` — strip from argv so the main command handler
+  // runs (full interactive TUI), stash the host/dir for the REPL branch at
+  // ~line 3720 to pick up. Headless (-p) mode not supported in v1: SSH
+  // sessions need the local REPL to drive them (interrupt, permissions).
+  if (feature('SSH_REMOTE') && _pendingSSH) {
+    const rawCliArgs = process.argv.slice(2);
+    // SSH-specific flags can appear before the host positional (e.g.
+    // `ssh --permission-mode auto host /tmp` — standard POSIX flags-before-
+    // positionals). Pull them all out BEFORE checking whether a host was
+    // given, so `claude ssh --permission-mode auto host` and `claude ssh host
+    // --permission-mode auto` are equivalent. The host check below only needs
+    // to guard against `-h`/`--help` (which commander should handle).
+    if (rawCliArgs[0] === 'ssh') {
+      const localIdx = rawCliArgs.indexOf('--local');
+      if (localIdx !== -1) {
+        _pendingSSH.local = true;
+        rawCliArgs.splice(localIdx, 1);
+      }
+      const dspIdx = rawCliArgs.indexOf('--dangerously-skip-permissions');
+      if (dspIdx !== -1) {
+        _pendingSSH.dangerouslySkipPermissions = true;
+        rawCliArgs.splice(dspIdx, 1);
+      }
+      const pmIdx = rawCliArgs.indexOf('--permission-mode');
+      if (pmIdx !== -1 && rawCliArgs[pmIdx + 1] && !rawCliArgs[pmIdx + 1]!.startsWith('-')) {
+        _pendingSSH.permissionMode = rawCliArgs[pmIdx + 1];
+        rawCliArgs.splice(pmIdx, 2);
+      }
+      const pmEqIdx = rawCliArgs.findIndex(a => a.startsWith('--permission-mode='));
+      if (pmEqIdx !== -1) {
+        _pendingSSH.permissionMode = rawCliArgs[pmEqIdx]!.split('=')[1];
+        rawCliArgs.splice(pmEqIdx, 1);
+      }
+      // Forward session-resume + model flags to the remote CLI's initial spawn.
+      // --continue/-c and --resume <uuid> operate on the REMOTE session history
+      // (which persists under the remote's ~/.claude/projects/<cwd>/).
+      // --model controls which model the remote uses.
+      const extractFlag = (flag: string, opts: { hasValue?: boolean; as?: string } = {}) => {
+        const i = rawCliArgs.indexOf(flag);
+        if (i !== -1) {
+          _pendingSSH.extraCliArgs.push(opts.as ?? flag);
+          const val = rawCliArgs[i + 1];
+          if (opts.hasValue && val && !val.startsWith('-')) {
+            _pendingSSH.extraCliArgs.push(val);
+            rawCliArgs.splice(i, 2);
+          } else {
+            rawCliArgs.splice(i, 1);
+          }
+        }
+        const eqI = rawCliArgs.findIndex(a => a.startsWith(`${flag}=`));
+        if (eqI !== -1) {
+          _pendingSSH.extraCliArgs.push(opts.as ?? flag, rawCliArgs[eqI]!.slice(flag.length + 1));
+          rawCliArgs.splice(eqI, 1);
+        }
+      };
+      extractFlag('-c', { as: '--continue' });
+      extractFlag('--continue');
+      extractFlag('--resume', { hasValue: true });
+      extractFlag('--model', { hasValue: true });
+    }
+    // After pre-extraction, any remaining dash-arg at [1] is either -h/--help
+    // (commander handles) or an unknown-to-ssh flag (fall through to commander
+    // so it surfaces a proper error). Only a non-dash arg is the host.
+    if (rawCliArgs[0] === 'ssh' && rawCliArgs[1] && !rawCliArgs[1].startsWith('-')) {
+      _pendingSSH.host = rawCliArgs[1];
+      // Optional positional cwd.
+      let consumed = 2;
+      if (rawCliArgs[2] && !rawCliArgs[2].startsWith('-')) {
+        _pendingSSH.cwd = rawCliArgs[2];
+        consumed = 3;
+      }
+      const rest = rawCliArgs.slice(consumed);
 
-			// Headless (-p) mode is not supported with SSH in v1 — reject early
-			// so the flag doesn't silently cause local execution.
-			if (rest.includes("-p") || rest.includes("--print")) {
-				process.stderr.write(
-					"Error: headless (-p/--print) mode is not supported with claude ssh\n",
-				);
-				gracefulShutdownSync(1);
-				return;
-			}
+      // Headless (-p) mode is not supported with SSH in v1 — reject early
+      // so the flag doesn't silently cause local execution.
+      if (rest.includes('-p') || rest.includes('--print')) {
+        process.stderr.write('Error: headless (-p/--print) mode is not supported with claude ssh\n');
+        gracefulShutdownSync(1);
+        return;
+      }
 
-			// Rewrite argv so the main command sees remaining flags but not `ssh`.
-			process.argv = [process.argv[0]!, process.argv[1]!, ...rest];
-		}
-	}
+      // Rewrite argv so the main command sees remaining flags but not `ssh`.
+      process.argv = [process.argv[0]!, process.argv[1]!, ...rest];
+    }
+  }
 
-		// Check for -p/--print and --init-only flags early to set isInteractiveSession before init()
-		// This is needed because telemetry initialization calls auth functions that need this flag
-		const cliArgs = process.argv.slice(2);
-		const hasPrintFlag = cliArgs.includes("-p") || cliArgs.includes("--print");
-		const hasInitOnlyFlag = cliArgs.includes("--init-only");
-		const hasSdkUrl = cliArgs.some((arg) => arg.startsWith("--sdk-url"));
-		const forceInteractive = isEnvTruthy(process.env.CLAUDE_CODE_FORCE_INTERACTIVE);
-		const isNonInteractive =
-			hasPrintFlag || hasInitOnlyFlag || hasSdkUrl || (!forceInteractive && !process.stdout.isTTY);
+  // Check for -p/--print and --init-only flags early to set isInteractiveSession before init()
+  // This is needed because telemetry initialization calls auth functions that need this flag
+  const cliArgs = process.argv.slice(2);
+  const hasPrintFlag = cliArgs.includes('-p') || cliArgs.includes('--print');
+  const hasInitOnlyFlag = cliArgs.includes('--init-only');
+  const hasSdkUrl = cliArgs.some(arg => arg.startsWith('--sdk-url'));
+  const forceInteractive = isEnvTruthy(process.env.CLAUDE_CODE_FORCE_INTERACTIVE);
+  const isNonInteractive = hasPrintFlag || hasInitOnlyFlag || hasSdkUrl || (!forceInteractive && !process.stdout.isTTY);
 
-	// Stop capturing early input for non-interactive modes
-	if (isNonInteractive) {
-		stopCapturingEarlyInput();
-	}
+  // Stop capturing early input for non-interactive modes
+  if (isNonInteractive) {
+    stopCapturingEarlyInput();
+  }
 
-	// Set simplified tracking fields
-	const isInteractive = !isNonInteractive;
-	setIsInteractive(isInteractive);
+  // Set simplified tracking fields
+  const isInteractive = !isNonInteractive;
+  setIsInteractive(isInteractive);
 
-	// Initialize entrypoint based on mode - needs to be set before any event is logged
-	initializeEntrypoint(isNonInteractive);
+  // Initialize entrypoint based on mode - needs to be set before any event is logged
+  initializeEntrypoint(isNonInteractive);
 
-	// Determine client type
-	const clientType = (() => {
-		if (isEnvTruthy(process.env.GITHUB_ACTIONS)) return "github-action";
-		if (process.env.CLAUDE_CODE_ENTRYPOINT === "sdk-ts")
-			return "sdk-typescript";
-		if (process.env.CLAUDE_CODE_ENTRYPOINT === "sdk-py")
-			return "sdk-python";
-		if (process.env.CLAUDE_CODE_ENTRYPOINT === "sdk-cli") return "sdk-cli";
-		if (process.env.CLAUDE_CODE_ENTRYPOINT === "claude-vscode")
-			return "claude-vscode";
-		if (process.env.CLAUDE_CODE_ENTRYPOINT === "local-agent")
-			return "local-agent";
-		if (process.env.CLAUDE_CODE_ENTRYPOINT === "claude-desktop")
-			return "claude-desktop";
+  // Determine client type
+  const clientType = (() => {
+    if (isEnvTruthy(process.env.GITHUB_ACTIONS)) return 'github-action';
+    if (process.env.CLAUDE_CODE_ENTRYPOINT === 'sdk-ts') return 'sdk-typescript';
+    if (process.env.CLAUDE_CODE_ENTRYPOINT === 'sdk-py') return 'sdk-python';
+    if (process.env.CLAUDE_CODE_ENTRYPOINT === 'sdk-cli') return 'sdk-cli';
+    if (process.env.CLAUDE_CODE_ENTRYPOINT === 'claude-vscode') return 'claude-vscode';
+    if (process.env.CLAUDE_CODE_ENTRYPOINT === 'local-agent') return 'local-agent';
+    if (process.env.CLAUDE_CODE_ENTRYPOINT === 'claude-desktop') return 'claude-desktop';
 
-		// Check if session-ingress token is provided (indicates remote session)
-		const hasSessionIngressToken =
-			process.env.CLAUDE_CODE_SESSION_ACCESS_TOKEN ||
-			process.env.CLAUDE_CODE_WEBSOCKET_AUTH_FILE_DESCRIPTOR;
-		if (
-			process.env.CLAUDE_CODE_ENTRYPOINT === "remote" ||
-			hasSessionIngressToken
-		) {
-			return "remote";
-		}
+    // Check if session-ingress token is provided (indicates remote session)
+    const hasSessionIngressToken =
+      process.env.CLAUDE_CODE_SESSION_ACCESS_TOKEN || process.env.CLAUDE_CODE_WEBSOCKET_AUTH_FILE_DESCRIPTOR;
+    if (process.env.CLAUDE_CODE_ENTRYPOINT === 'remote' || hasSessionIngressToken) {
+      return 'remote';
+    }
 
-		return "cli";
-	})();
-	setClientType(clientType);
+    return 'cli';
+  })();
+  setClientType(clientType);
 
-	const previewFormat = process.env.CLAUDE_CODE_QUESTION_PREVIEW_FORMAT;
-	if (previewFormat === "markdown" || previewFormat === "html") {
-		setQuestionPreviewFormat(previewFormat);
-	} else if (
-		!clientType.startsWith("sdk-") &&
-		// Desktop and CCR pass previewFormat via toolConfig; when the feature is
-		// gated off they pass undefined — don't override that with markdown.
-		clientType !== "claude-desktop" &&
-		clientType !== "local-agent" &&
-		clientType !== "remote"
-	) {
-		setQuestionPreviewFormat("markdown");
-	}
+  const previewFormat = process.env.CLAUDE_CODE_QUESTION_PREVIEW_FORMAT;
+  if (previewFormat === 'markdown' || previewFormat === 'html') {
+    setQuestionPreviewFormat(previewFormat);
+  } else if (
+    !clientType.startsWith('sdk-') &&
+    // Desktop and CCR pass previewFormat via toolConfig; when the feature is
+    // gated off they pass undefined — don't override that with markdown.
+    clientType !== 'claude-desktop' &&
+    clientType !== 'local-agent' &&
+    clientType !== 'remote'
+  ) {
+    setQuestionPreviewFormat('markdown');
+  }
 
-	// Tag sessions created via `claude remote-control` so the backend can identify them
-	if (process.env.CLAUDE_CODE_ENVIRONMENT_KIND === "bridge") {
-		setSessionSource("remote-control");
-	}
+  // Tag sessions created via `claude remote-control` so the backend can identify them
+  if (process.env.CLAUDE_CODE_ENVIRONMENT_KIND === 'bridge') {
+    setSessionSource('remote-control');
+  }
 
-	profileCheckpoint("main_client_type_determined");
+  profileCheckpoint('main_client_type_determined');
 
-	// Parse and load settings flags early, before init()
-	eagerLoadSettings();
+  // Parse and load settings flags early, before init()
+  eagerLoadSettings();
 
-	profileCheckpoint("main_before_run");
+  profileCheckpoint('main_before_run');
 
-	await run();
-	profileCheckpoint("main_after_run");
+  await run();
+  profileCheckpoint('main_after_run');
 }
 
 async function getInputPrompt(
-	prompt: string,
-	inputFormat: "text" | "stream-json",
+  prompt: string,
+  inputFormat: 'text' | 'stream-json',
 ): Promise<string | AsyncIterable<string>> {
-	if (
-		!process.stdin.isTTY &&
-		// Input hijacking breaks MCP.
-		!process.argv.includes("mcp")
-	) {
-		if (inputFormat === "stream-json") {
-			return process.stdin;
-		}
-		process.stdin.setEncoding("utf8");
-		let data = "";
-		const onData = (chunk: string) => {
-			data += chunk;
-		};
-		process.stdin.on("data", onData);
-		// If no data arrives in 3s, stop waiting and warn. Stdin is likely an
-		// inherited pipe from a parent that isn't writing (subprocess spawned
-		// without explicit stdin handling). 3s covers slow producers like curl,
-		// jq on large files, python with import overhead. The warning makes
-		// silent data loss visible for the rare producer that's slower still.
-		const timedOut = await peekForStdinData(process.stdin, 3000);
-		process.stdin.off("data", onData);
-		if (timedOut) {
-			process.stderr.write(
-				"Warning: no stdin data received in 3s, proceeding without it. " +
-					"If piping from a slow command, redirect stdin explicitly: < /dev/null to skip, or wait longer.\n",
-			);
-		}
-		return [prompt, data].filter(Boolean).join("\n");
-	}
-	return prompt;
+  if (
+    !process.stdin.isTTY &&
+    // Input hijacking breaks MCP.
+    !process.argv.includes('mcp')
+  ) {
+    if (inputFormat === 'stream-json') {
+      return process.stdin;
+    }
+    process.stdin.setEncoding('utf8');
+    let data = '';
+    const onData = (chunk: string) => {
+      data += chunk;
+    };
+    process.stdin.on('data', onData);
+    // If no data arrives in 3s, stop waiting and warn. Stdin is likely an
+    // inherited pipe from a parent that isn't writing (subprocess spawned
+    // without explicit stdin handling). 3s covers slow producers like curl,
+    // jq on large files, python with import overhead. The warning makes
+    // silent data loss visible for the rare producer that's slower still.
+    const timedOut = await peekForStdinData(process.stdin, 3000);
+    process.stdin.off('data', onData);
+    if (timedOut) {
+      process.stderr.write(
+        'Warning: no stdin data received in 3s, proceeding without it. ' +
+          'If piping from a slow command, redirect stdin explicitly: < /dev/null to skip, or wait longer.\n',
+      );
+    }
+    return [prompt, data].filter(Boolean).join('\n');
+  }
+  return prompt;
 }
 
 async function run(): Promise<CommanderCommand> {
-	profileCheckpoint("run_function_start");
-
-	// Create help config that sorts options by long option name.
-	// Commander supports compareOptions at runtime but @commander-js/extra-typings
-	// doesn't include it in the type definitions, so we use Object.assign to add it.
-	function createSortedHelpConfig(): {
-		sortSubcommands: true;
-		sortOptions: true;
-	} {
-		const getOptionSortKey = (opt: Option): string =>
-			opt.long?.replace(/^--/, "") ?? opt.short?.replace(/^-/, "") ?? "";
-		return Object.assign(
-			{ sortSubcommands: true, sortOptions: true } as const,
-			{
-				compareOptions: (a: Option, b: Option) =>
-					getOptionSortKey(a).localeCompare(getOptionSortKey(b)),
-			},
-		);
-	}
-	const program = new CommanderCommand()
-		.configureHelp(createSortedHelpConfig())
-		.enablePositionalOptions();
-	profileCheckpoint("run_commander_initialized");
-
-	// Use preAction hook to run initialization only when executing a command,
-	// not when displaying help. This avoids the need for env variable signaling.
-	program.hook("preAction", async (thisCommand) => {
-		profileCheckpoint("preAction_start");
-		// Await async subprocess loads started at module evaluation (lines 12-20).
-		// Nearly free — subprocesses complete during the ~135ms of imports above.
-		// Must resolve before init() which triggers the first settings read
-		// (applySafeConfigEnvironmentVariables → getSettingsForSource('policySettings')
-		// → isRemoteManagedSettingsEligible → sync keychain reads otherwise ~65ms).
-		await Promise.all([
-			ensureMdmSettingsLoaded(),
-			ensureKeychainPrefetchCompleted(),
-		]);
-		profileCheckpoint("preAction_after_mdm");
-		await init();
-		profileCheckpoint("preAction_after_init");
-
-		// process.title on Windows sets the console title directly; on POSIX,
-		// terminal shell integration may mirror the process name to the tab.
-		// After init() so settings.json env can also gate this (gh-4765).
-		if (!isEnvTruthy(process.env.CLAUDE_CODE_DISABLE_TERMINAL_TITLE)) {
-			process.title = "claude";
-		}
-
-		// Attach logging sinks so subcommand handlers can use logEvent/logError.
-		// Before PR #11106 logEvent dispatched directly; after, events queue until
-		// a sink attaches. setup() attaches sinks for the default command, but
-		// subcommands (doctor, mcp, plugin, auth) never call setup() and would
-		// silently drop events on process.exit(). Both inits are idempotent.
-		const { initSinks } = await import("./utils/sinks.js");
-		initSinks();
-		profileCheckpoint("preAction_after_sinks");
-
-		// gh-33508: --plugin-dir is a top-level program option. The default
-		// action reads it from its own options destructure, but subcommands
-		// (plugin list, plugin install, mcp *) have their own actions and
-		// never see it. Wire it up here so getInlinePlugins() works everywhere.
-		// thisCommand.opts() is typed {} here because this hook is attached
-		// before .option('--plugin-dir', ...) in the chain — extra-typings
-		// builds the type as options are added. Narrow with a runtime guard;
-		// the collect accumulator + [] default guarantee string[] in practice.
-		const pluginDir = thisCommand.getOptionValue("pluginDir");
-		if (
-			Array.isArray(pluginDir) &&
-			pluginDir.length > 0 &&
-			pluginDir.every((p) => typeof p === "string")
-		) {
-			setInlinePlugins(pluginDir);
-			clearPluginCache("preAction: --plugin-dir inline plugins");
-		}
-
-		runMigrations();
-		profileCheckpoint("preAction_after_migrations");
-
-		// Load remote managed settings for enterprise customers (non-blocking)
-		// Fails open - if fetch fails, continues without remote settings
-		// Settings are applied via hot-reload when they arrive
-		// Must happen after init() to ensure config reading is allowed
-		void loadRemoteManagedSettings();
-		void loadPolicyLimits();
-
-		profileCheckpoint("preAction_after_remote_settings");
-
-		// Load settings sync (non-blocking, fail-open)
-		// CLI: uploads local settings to remote (CCR download is handled by print.ts)
-		if (feature("UPLOAD_USER_SETTINGS")) {
-			void import("./services/settingsSync/index.js").then((m) =>
-				m.uploadUserSettingsInBackground(),
-			);
-		}
-
-		profileCheckpoint("preAction_after_settings_sync");
-	});
-
-	program
-		.name("claude")
-		.description(
-			`Claude Code - starts an interactive session by default, use -p/--print for non-interactive output`,
-		)
-		.argument("[prompt]", "Your prompt", String)
-		// Subcommands inherit helpOption via commander's copyInheritedSettings —
-		// setting it once here covers mcp, plugin, auth, and all other subcommands.
-		.helpOption("-h, --help", "Display help for command")
-		.option(
-			"-d, --debug [filter]",
-			'Enable debug mode with optional category filtering (e.g., "api,hooks" or "!1p,!file")',
-			(_value: string | true) => {
-				// If value is provided, it will be the filter string
-				// If not provided but flag is present, value will be true
-				// The actual filtering is handled in debug.ts by parsing process.argv
-				return true;
-			},
-		)
-		.addOption(
-			new Option("--debug-to-stderr", "Enable debug mode (to stderr)")
-				.argParser(Boolean)
-				.hideHelp(),
-		)
-		.option(
-			"--debug-file <path>",
-			"Write debug logs to a specific file path (implicitly enables debug mode)",
-			() => true,
-		)
-		.option(
-			"--verbose",
-			"Override verbose mode setting from config",
-			() => true,
-		)
-		.option(
-			"-p, --print",
-			"Print response and exit (useful for pipes). Note: The workspace trust dialog is skipped when Claude is run with the -p mode. Only use this flag in directories you trust.",
-			() => true,
-		)
-		.option(
-			"--bare",
-			"Minimal mode: skip hooks, LSP, plugin sync, attribution, auto-memory, background prefetches, keychain reads, and CLAUDE.md auto-discovery. Sets CLAUDE_CODE_SIMPLE=1. Anthropic auth is strictly ANTHROPIC_API_KEY or apiKeyHelper via --settings (OAuth and keychain are never read). 3P providers (Bedrock/Vertex/Foundry) use their own credentials. Skills still resolve via /skill-name. Explicitly provide context via: --system-prompt[-file], --append-system-prompt[-file], --add-dir (CLAUDE.md dirs), --mcp-config, --settings, --agents, --plugin-dir.",
-			() => true,
-		)
-		.addOption(
-			new Option(
-				"--init",
-				"Run Setup hooks with init trigger, then continue",
-			).hideHelp(),
-		)
-		.addOption(
-			new Option(
-				"--init-only",
-				"Run Setup and SessionStart:startup hooks, then exit",
-			).hideHelp(),
-		)
-		.addOption(
-			new Option(
-				"--maintenance",
-				"Run Setup hooks with maintenance trigger, then continue",
-			).hideHelp(),
-		)
-		.addOption(
-			new Option(
-				"--output-format <format>",
-				'Output format (only works with --print): "text" (default), "json" (single result), or "stream-json" (realtime streaming)',
-			).choices(["text", "json", "stream-json"]),
-		)
-		.addOption(
-			new Option(
-				"--json-schema <schema>",
-				"JSON Schema for structured output validation. " +
-					'Example: {"type":"object","properties":{"name":{"type":"string"}},"required":["name"]}',
-			).argParser(String),
-		)
-		.option(
-			"--include-hook-events",
-			"Include all hook lifecycle events in the output stream (only works with --output-format=stream-json)",
-			() => true,
-		)
-		.option(
-			"--include-partial-messages",
-			"Include partial message chunks as they arrive (only works with --print and --output-format=stream-json)",
-			() => true,
-		)
-		.addOption(
-			new Option(
-				"--input-format <format>",
-				'Input format (only works with --print): "text" (default), or "stream-json" (realtime streaming input)',
-			).choices(["text", "stream-json"]),
-		)
-		.option(
-			"--mcp-debug",
-			"[DEPRECATED. Use --debug instead] Enable MCP debug mode (shows MCP server errors)",
-			() => true,
-		)
-		.option(
-			"--dangerously-skip-permissions",
-			"Bypass all permission checks. Recommended only for sandboxes with no internet access.",
-			() => true,
-		)
-		.option(
-			"--allow-dangerously-skip-permissions",
-			"Enable bypassing all permission checks as an option, without it being enabled by default. Recommended only for sandboxes with no internet access.",
-			() => true,
-		)
-		.addOption(
-			new Option(
-				"--thinking <mode>",
-				"Thinking mode: enabled (equivalent to adaptive), disabled",
-			)
-				.choices(["enabled", "adaptive", "disabled"])
-				.hideHelp(),
-		)
-		.addOption(
-			new Option(
-				"--max-thinking-tokens <tokens>",
-				"[DEPRECATED. Use --thinking instead for newer models] Maximum number of thinking tokens (only works with --print)",
-			)
-				.argParser(Number)
-				.hideHelp(),
-		)
-		.addOption(
-			new Option(
-				"--max-turns <turns>",
-				"Maximum number of agentic turns in non-interactive mode. This will early exit the conversation after the specified number of turns. (only works with --print)",
-			)
-				.argParser(Number)
-				.hideHelp(),
-		)
-		.addOption(
-			new Option(
-				"--max-budget-usd <amount>",
-				"Maximum dollar amount to spend on API calls (only works with --print)",
-			).argParser((value) => {
-				const amount = Number(value);
-				if (isNaN(amount) || amount <= 0) {
-					throw new Error(
-						"--max-budget-usd must be a positive number greater than 0",
-					);
-				}
-				return amount;
-			}),
-		)
-		.addOption(
-			new Option(
-				"--task-budget <tokens>",
-				"API-side task budget in tokens (output_config.task_budget)",
-			)
-				.argParser((value) => {
-					const tokens = Number(value);
-					if (
-						isNaN(tokens) ||
-						tokens <= 0 ||
-						!Number.isInteger(tokens)
-					) {
-						throw new Error(
-							"--task-budget must be a positive integer",
-						);
-					}
-					return tokens;
-				})
-				.hideHelp(),
-		)
-		.option(
-			"--replay-user-messages",
-			"Re-emit user messages from stdin back on stdout for acknowledgment (only works with --input-format=stream-json and --output-format=stream-json)",
-			() => true,
-		)
-		.addOption(
-			new Option(
-				"--enable-auth-status",
-				"Enable auth status messages in SDK mode",
-			)
-				.default(false)
-				.hideHelp(),
-		)
-		.option(
-			"--allowedTools, --allowed-tools <tools...>",
-			'Comma or space-separated list of tool names to allow (e.g. "Bash(git:*) Edit")',
-		)
-		.option(
-			"--tools <tools...>",
-			'Specify the list of available tools from the built-in set. Use "" to disable all tools, "default" to use all tools, or specify tool names (e.g. "Bash,Edit,Read").',
-		)
-		.option(
-			"--disallowedTools, --disallowed-tools <tools...>",
-			'Comma or space-separated list of tool names to deny (e.g. "Bash(git:*) Edit")',
-		)
-		.option(
-			"--mcp-config <configs...>",
-			"Load MCP servers from JSON files or strings (space-separated)",
-		)
-		.addOption(
-			new Option(
-				"--permission-prompt-tool <tool>",
-				"MCP tool to use for permission prompts (only works with --print)",
-			)
-				.argParser(String)
-				.hideHelp(),
-		)
-		.addOption(
-			new Option(
-				"--system-prompt <prompt>",
-				"System prompt to use for the session",
-			).argParser(String),
-		)
-		.addOption(
-			new Option(
-				"--system-prompt-file <file>",
-				"Read system prompt from a file",
-			)
-				.argParser(String)
-				.hideHelp(),
-		)
-		.addOption(
-			new Option(
-				"--append-system-prompt <prompt>",
-				"Append a system prompt to the default system prompt",
-			).argParser(String),
-		)
-		.addOption(
-			new Option(
-				"--append-system-prompt-file <file>",
-				"Read system prompt from a file and append to the default system prompt",
-			)
-				.argParser(String)
-				.hideHelp(),
-		)
-		.addOption(
-			new Option(
-				"--permission-mode <mode>",
-				"Permission mode to use for the session",
-			)
-				.argParser(String)
-				.choices(PERMISSION_MODES),
-		)
-		.option(
-			"-c, --continue",
-			"Continue the most recent conversation in the current directory",
-			() => true,
-		)
-		.option(
-			"-r, --resume [value]",
-			"Resume a conversation by session ID, or open interactive picker with optional search term",
-			(value) => value || true,
-		)
-		.option(
-			"--fork-session",
-			"When resuming, create a new session ID instead of reusing the original (use with --resume or --continue)",
-			() => true,
-		)
-		.addOption(
-			new Option(
-				"--prefill <text>",
-				"Pre-fill the prompt input with text without submitting it",
-			).hideHelp(),
-		)
-		.addOption(
-			new Option(
-				"--deep-link-origin",
-				"Signal that this session was launched from a deep link",
-			).hideHelp(),
-		)
-		.addOption(
-			new Option(
-				"--deep-link-repo <slug>",
-				"Repo slug the deep link ?repo= parameter resolved to the current cwd",
-			).hideHelp(),
-		)
-		.addOption(
-			new Option(
-				"--deep-link-last-fetch <ms>",
-				"FETCH_HEAD mtime in epoch ms, precomputed by the deep link trampoline",
-			)
-				.argParser((v) => {
-					const n = Number(v);
-					return Number.isFinite(n) ? n : undefined;
-				})
-				.hideHelp(),
-		)
-		.option(
-			"--from-pr [value]",
-			"Resume a session linked to a PR by PR number/URL, or open interactive picker with optional search term",
-			(value) => value || true,
-		)
-		.option(
-			"--no-session-persistence",
-			"Disable session persistence - sessions will not be saved to disk and cannot be resumed (only works with --print)",
-		)
-		.addOption(
-			new Option(
-				"--resume-session-at <message id>",
-				"When resuming, only messages up to and including the assistant message with <message.id> (use with --resume in print mode)",
-			)
-				.argParser(String)
-				.hideHelp(),
-		)
-		.addOption(
-			new Option(
-				"--rewind-files <user-message-id>",
-				"Restore files to state at the specified user message and exit (requires --resume)",
-			).hideHelp(),
-		)
-		// @[MODEL LAUNCH]: Update the example model ID in the --model help text.
-		.option(
-			"--model <model>",
-			`Model for the current session. Provide an alias for the latest model (e.g. 'sonnet' or 'opus') or a model's full name (e.g. 'claude-sonnet-4-6').`,
-		)
-		.addOption(
-			new Option(
-				"--effort <level>",
-				`Effort level for the current session (low, medium, high, max)`,
-			).argParser((rawValue: string) => {
-				const value = rawValue.toLowerCase();
-				const allowed = ["low", "medium", "high", "max"];
-				if (!allowed.includes(value)) {
-					throw new InvalidArgumentError(
-						`It must be one of: ${allowed.join(", ")}`,
-					);
-				}
-				return value;
-			}),
-		)
-		.option(
-			"--agent <agent>",
-			`Agent for the current session. Overrides the 'agent' setting.`,
-		)
-		.option(
-			"--betas <betas...>",
-			"Beta headers to include in API requests (API key users only)",
-		)
-		.option(
-			"--fallback-model <model>",
-			"Enable automatic fallback to specified model when default model is overloaded (only works with --print)",
-		)
-		.addOption(
-			new Option(
-				"--workload <tag>",
-				"Workload tag for billing-header attribution (cc_workload). Process-scoped; set by SDK daemon callers that spawn subprocesses for cron work. (only works with --print)",
-			).hideHelp(),
-		)
-		.option(
-			"--settings <file-or-json>",
-			"Path to a settings JSON file or a JSON string to load additional settings from",
-		)
-		.option(
-			"--add-dir <directories...>",
-			"Additional directories to allow tool access to",
-		)
-		.option(
-			"--ide",
-			"Automatically connect to IDE on startup if exactly one valid IDE is available",
-			() => true,
-		)
-		.option(
-			"--strict-mcp-config",
-			"Only use MCP servers from --mcp-config, ignoring all other MCP configurations",
-			() => true,
-		)
-		.option(
-			"--session-id <uuid>",
-			"Use a specific session ID for the conversation (must be a valid UUID)",
-		)
-		.option(
-			"-n, --name <name>",
-			"Set a display name for this session (shown in /resume and terminal title)",
-		)
-		.option(
-			"--agents <json>",
-			'JSON object defining custom agents (e.g. \'{"reviewer": {"description": "Reviews code", "prompt": "You are a code reviewer"}}\')',
-		)
-		.option(
-			"--setting-sources <sources>",
-			"Comma-separated list of setting sources to load (user, project, local).",
-		)
-		// gh-33508: <paths...> (variadic) consumed everything until the next
-		// --flag. `claude --plugin-dir /path mcp add --transport http` swallowed
-		// `mcp` and `add` as paths, then choked on --transport as an unknown
-		// top-level option. Single-value + collect accumulator means each
-		// --plugin-dir takes exactly one arg; repeat the flag for multiple dirs.
-		.option(
-			"--plugin-dir <path>",
-			"Load plugins from a directory for this session only (repeatable: --plugin-dir A --plugin-dir B)",
-			(val: string, prev: string[]) => [...prev, val],
-			[] as string[],
-		)
-		.option("--disable-slash-commands", "Disable all skills", () => true)
-		.option("--chrome", "Enable Claude in Chrome integration")
-		.option("--no-chrome", "Disable Claude in Chrome integration")
-		.option(
-			"--file <specs...>",
-			"File resources to download at startup. Format: file_id:relative_path (e.g., --file file_abc:doc.txt file_def:img.png)",
-		)
-		.action(async (prompt, options) => {
-			profileCheckpoint("action_handler_start");
-
-			// --bare = one-switch minimal mode. Sets SIMPLE so all the existing
-			// gates fire (CLAUDE.md, skills, hooks inside executeHooks, agent
-			// dir-walk). Must be set before setup() / any of the gated work runs.
-			if ((options as { bare?: boolean }).bare) {
-				process.env.CLAUDE_CODE_SIMPLE = "1";
-			}
-
-			// Ignore "code" as a prompt - treat it the same as no prompt
-			if (prompt === "code") {
-				logEvent("tengu_code_prompt_ignored", {});
-				// biome-ignore lint/suspicious/noConsole:: intentional console output
-				console.warn(
-					chalk.yellow(
-						"Tip: You can launch Claude Code with just `claude`",
-					),
-				);
-				prompt = undefined;
-			}
-
-			// Log event for any single-word prompt
-			if (
-				prompt &&
-				typeof prompt === "string" &&
-				!/\s/.test(prompt) &&
-				prompt.length > 0
-			) {
-				logEvent("tengu_single_word_prompt", { length: prompt.length });
-			}
-
-			// Assistant mode: when .claude/settings.json has assistant: true AND
-			// the tengu_kairos GrowthBook gate is on, force brief on. Permission
-			// mode is left to the user — settings defaultMode or --permission-mode
-			// apply as normal. REPL-typed messages already default to 'next'
-			// priority (messageQueueManager.enqueue) so they drain mid-turn between
-			// tool calls. SendUserMessage (BriefTool) is enabled via the brief env
-			// var. SleepTool stays disabled (its isEnabled() gates on proactive).
-			// kairosEnabled is computed once here and reused at the
-			// getAssistantSystemPromptAddendum() call site further down.
-			//
-			// Trust gate: .claude/settings.json is attacker-controllable in an
-			// untrusted clone. We run ~1000 lines before showSetupScreens() shows
-			// the trust dialog, and by then we've already appended
-			// .claude/agents/assistant.md to the system prompt. Refuse to activate
-			// until the directory has been explicitly trusted.
-			let kairosEnabled = false;
-			let assistantTeamContext:
-				| Awaited<
-						ReturnType<
-							NonNullable<
-								typeof assistantModule
-							>["initializeAssistantTeam"]
-						>
-				  >
-				| undefined;
-			if (
-				feature("KAIROS") &&
-				(options as { assistant?: boolean }).assistant &&
-				assistantModule
-			) {
-				// --assistant (Agent SDK daemon mode): force the latch before
-				// isAssistantMode() runs below. The daemon has already checked
-				// entitlement — don't make the child re-check tengu_kairos.
-				assistantModule.markAssistantForced();
-			}
-			if (
-				feature("KAIROS") &&
-				assistantModule &&
-				(assistantModule.isAssistantForced() ||
-					(options as Record<string, unknown>).assistant === true) &&
-				// Spawned teammates share the leader's cwd + settings.json, so
-				// the flag is true for them too. --agent-id being set
-				// means we ARE a spawned teammate (extractTeammateOptions runs
-				// ~170 lines later so check the raw commander option) — don't
-				// re-init the team or override teammateMode/proactive/brief.
-				!(options as { agentId?: unknown }).agentId &&
-				kairosGate
-			) {
-				if (!checkHasTrustDialogAccepted()) {
-					// biome-ignore lint/suspicious/noConsole:: intentional console output
-					console.warn(
-						chalk.yellow(
-							"Assistant mode disabled: directory is not trusted. Accept the trust dialog and restart.",
-						),
-					);
-				} else {
-					// Blocking gate check — returns cached `true` instantly; if disk
-					// cache is false/missing, lazily inits GrowthBook and fetches fresh
-					// (max ~5s). --assistant skips the gate entirely (daemon is
-					// pre-entitled).
-					kairosEnabled =
-						assistantModule.isAssistantForced() ||
-						(await kairosGate.isKairosEnabled());
-					if (kairosEnabled) {
-						const opts = options as { brief?: boolean };
-						opts.brief = true;
-						setKairosActive(true);
-						// Pre-seed an in-process team so Agent(name: "foo") spawns
-						// teammates without TeamCreate. Must run BEFORE setup() captures
-						// the teammateMode snapshot (initializeAssistantTeam calls
-						// setCliTeammateModeOverride internally).
-						assistantTeamContext =
-							await assistantModule.initializeAssistantTeam();
-					}
-				}
-			}
-
-			const {
-				debug = false,
-				debugToStderr = false,
-				dangerouslySkipPermissions,
-				allowDangerouslySkipPermissions = false,
-				tools: baseTools = [],
-				allowedTools = [],
-				disallowedTools = [],
-				mcpConfig = [],
-				permissionMode: permissionModeCli,
-				addDir = [],
-				fallbackModel,
-				betas = [],
-				ide = false,
-				sessionId,
-				includeHookEvents,
-				includePartialMessages,
-			} = options;
-
-			if (options.prefill) {
-				seedEarlyInput(options.prefill);
-			}
-
-			// Promise for file downloads - started early, awaited before REPL renders
-			let fileDownloadPromise: Promise<DownloadResult[]> | undefined;
-
-			const agentsJson = options.agents;
-			const agentCli = options.agent;
-			if (feature("BG_SESSIONS") && agentCli) {
-				process.env.CLAUDE_CODE_AGENT = agentCli;
-			}
-
-			// NOTE: LSP manager initialization is intentionally deferred until after
-			// the trust dialog is accepted. This prevents plugin LSP servers from
-			// executing code in untrusted directories before user consent.
-
-			// Extract these separately so they can be modified if needed
-			let outputFormat = options.outputFormat;
-			let inputFormat = options.inputFormat;
-			let verbose = options.verbose ?? getGlobalConfig().verbose;
-			let print = options.print;
-			const init = options.init ?? false;
-			const initOnly = options.initOnly ?? false;
-			const maintenance = options.maintenance ?? false;
-
-			// Extract disable slash commands flag
-			const disableSlashCommands = options.disableSlashCommands || false;
-
-			// Extract tasks mode options (ant-only)
-			const tasksOption =
-				process.env.USER_TYPE === "ant" &&
-				(options as { tasks?: boolean | string }).tasks;
-			const taskListId = tasksOption
-				? typeof tasksOption === "string"
-					? tasksOption
-					: DEFAULT_TASKS_MODE_TASK_LIST_ID
-				: undefined;
-			if (process.env.USER_TYPE === "ant" && taskListId) {
-				process.env.CLAUDE_CODE_TASK_LIST_ID = taskListId;
-			}
-
-			// Extract worktree option
-			// worktree can be true (flag without value) or a string (custom name or PR reference)
-			const worktreeOption = isWorktreeModeEnabled()
-				? (options as { worktree?: boolean | string }).worktree
-				: undefined;
-			let worktreeName =
-				typeof worktreeOption === "string" ? worktreeOption : undefined;
-			const worktreeEnabled = worktreeOption !== undefined;
-
-			// Check if worktree name is a PR reference (#N or GitHub PR URL)
-			let worktreePRNumber: number | undefined;
-			if (worktreeName) {
-				const prNum = parsePRReference(worktreeName);
-				if (prNum !== null) {
-					worktreePRNumber = prNum;
-					worktreeName = undefined; // slug will be generated in setup()
-				}
-			}
-
-			// Extract tmux option (requires --worktree)
-			const tmuxEnabled =
-				isWorktreeModeEnabled() &&
-				(options as { tmux?: boolean }).tmux === true;
-
-			// Validate tmux option
-			if (tmuxEnabled) {
-				if (!worktreeEnabled) {
-					process.stderr.write(
-						chalk.red("Error: --tmux requires --worktree\n"),
-					);
-					process.exit(1);
-				}
-				if (getPlatform() === "windows") {
-					process.stderr.write(
-						chalk.red(
-							"Error: --tmux is not supported on Windows\n",
-						),
-					);
-					process.exit(1);
-				}
-				if (!(await isTmuxAvailable())) {
-					process.stderr.write(
-						chalk.red(
-							`Error: tmux is not installed.\n${getTmuxInstallInstructions()}\n`,
-						),
-					);
-					process.exit(1);
-				}
-			}
-
-			// Extract teammate options (for tmux-spawned agents)
-			// Declared outside the if block so it's accessible later for system prompt addendum
-			let storedTeammateOpts: TeammateOptions | undefined;
-			if (isAgentSwarmsEnabled()) {
-				// Extract agent identity options (for tmux-spawned agents)
-				// These replace the CLAUDE_CODE_* environment variables
-				const teammateOpts = extractTeammateOptions(options);
-				storedTeammateOpts = teammateOpts;
-
-				// If any teammate identity option is provided, all three required ones must be present
-				const hasAnyTeammateOpt =
-					teammateOpts.agentId ||
-					teammateOpts.agentName ||
-					teammateOpts.teamName;
-				const hasAllRequiredTeammateOpts =
-					teammateOpts.agentId &&
-					teammateOpts.agentName &&
-					teammateOpts.teamName;
-
-				if (hasAnyTeammateOpt && !hasAllRequiredTeammateOpts) {
-					process.stderr.write(
-						chalk.red(
-							"Error: --agent-id, --agent-name, and --team-name must all be provided together\n",
-						),
-					);
-					process.exit(1);
-				}
-
-				// If teammate identity is provided via CLI, set up dynamicTeamContext
-				if (
-					teammateOpts.agentId &&
-					teammateOpts.agentName &&
-					teammateOpts.teamName
-				) {
-					getTeammateUtils().setDynamicTeamContext?.({
-						agentId: teammateOpts.agentId,
-						agentName: teammateOpts.agentName,
-						teamName: teammateOpts.teamName,
-						color: teammateOpts.agentColor,
-						planModeRequired:
-							teammateOpts.planModeRequired ?? false,
-						parentSessionId: teammateOpts.parentSessionId,
-					});
-				}
-
-				// Set teammate mode CLI override if provided
-				// This must be done before setup() captures the snapshot
-				if (teammateOpts.teammateMode) {
-					getTeammateModeSnapshot().setCliTeammateModeOverride?.(
-						teammateOpts.teammateMode,
-					);
-				}
-			}
-
-			// Extract remote sdk options
-			const sdkUrl = (options as { sdkUrl?: string }).sdkUrl ?? undefined;
-
-			// Allow env var to enable partial messages (used by sandbox gateway for baku)
-			const effectiveIncludePartialMessages =
-				includePartialMessages ||
-				isEnvTruthy(process.env.CLAUDE_CODE_INCLUDE_PARTIAL_MESSAGES);
-
-			// Enable all hook event types when explicitly requested via SDK option
-			// or when running in CLAUDE_CODE_REMOTE mode (CCR needs them).
-			// Without this, only SessionStart and Setup events are emitted.
-			if (
-				includeHookEvents ||
-				isEnvTruthy(process.env.CLAUDE_CODE_REMOTE)
-			) {
-				setAllHookEventsEnabled(true);
-			}
-
-			// Auto-set input/output formats, verbose mode, and print mode when SDK URL is provided
-			if (sdkUrl) {
-				// If SDK URL is provided, automatically use stream-json formats unless explicitly set
-				if (!inputFormat) {
-					inputFormat = "stream-json";
-				}
-				if (!outputFormat) {
-					outputFormat = "stream-json";
-				}
-				// Auto-enable verbose mode unless explicitly disabled or already set
-				if (options.verbose === undefined) {
-					verbose = true;
-				}
-				// Auto-enable print mode unless explicitly disabled
-				if (!options.print) {
-					print = true;
-				}
-			}
-
-			// Extract teleport option
-			const teleport =
-				(options as { teleport?: string | true }).teleport ?? null;
-
-			// Extract remote option (can be true if no description provided, or a string)
-			const remoteOption = (options as { remote?: string | true }).remote;
-			const remote = remoteOption === true ? "" : (remoteOption ?? null);
-
-			// Extract --remote-control / --rc flag (enable bridge in interactive session)
-			const remoteControlOption =
-				(options as { remoteControl?: string | true }).remoteControl ??
-				(options as { rc?: string | true }).rc;
-			// Actual bridge check is deferred to after showSetupScreens() so that
-			// trust is established and GrowthBook has auth headers.
-			let remoteControl = false;
-			const remoteControlName =
-				typeof remoteControlOption === "string" &&
-				remoteControlOption.length > 0
-					? remoteControlOption
-					: undefined;
-
-			// Validate session ID if provided
-			if (sessionId) {
-				// Check for conflicting flags
-				// --session-id can be used with --continue or --resume when --fork-session is also provided
-				// (to specify a custom ID for the forked session)
-				if (
-					(options.continue || options.resume) &&
-					!options.forkSession
-				) {
-					process.stderr.write(
-						chalk.red(
-							"Error: --session-id can only be used with --continue or --resume if --fork-session is also specified.\n",
-						),
-					);
-					process.exit(1);
-				}
-
-				// When --sdk-url is provided (bridge/remote mode), the session ID is a
-				// server-assigned tagged ID (e.g. "session_local_01...") rather than a
-				// UUID. Skip UUID validation and local existence checks in that case.
-				if (!sdkUrl) {
-					const validatedSessionId = validateUuid(sessionId);
-					if (!validatedSessionId) {
-						process.stderr.write(
-							chalk.red(
-								"Error: Invalid session ID. Must be a valid UUID.\n",
-							),
-						);
-						process.exit(1);
-					}
-
-					// Check if session ID already exists
-					if (sessionIdExists(validatedSessionId)) {
-						process.stderr.write(
-							chalk.red(
-								`Error: Session ID ${validatedSessionId} is already in use.\n`,
-							),
-						);
-						process.exit(1);
-					}
-				}
-			}
-
-			// Download file resources if specified via --file flag
-			const fileSpecs = (options as { file?: string[] }).file;
-			if (fileSpecs && fileSpecs.length > 0) {
-				// Get session ingress token (provided by EnvManager via CLAUDE_CODE_SESSION_ACCESS_TOKEN)
-				const sessionToken = getSessionIngressAuthToken();
-				if (!sessionToken) {
-					process.stderr.write(
-						chalk.red(
-							"Error: Session token required for file downloads. CLAUDE_CODE_SESSION_ACCESS_TOKEN must be set.\n",
-						),
-					);
-					process.exit(1);
-				}
-
-				// Resolve session ID: prefer remote session ID, fall back to internal session ID
-				const fileSessionId =
-					process.env.CLAUDE_CODE_REMOTE_SESSION_ID || getSessionId();
-
-				const files = parseFileSpecs(fileSpecs);
-				if (files.length > 0) {
-					// Use ANTHROPIC_BASE_URL if set (by EnvManager), otherwise use OAuth config
-					// This ensures consistency with session ingress API in all environments
-					const config: FilesApiConfig = {
-						baseUrl:
-							process.env.ANTHROPIC_BASE_URL ||
-							getOauthConfig().BASE_API_URL,
-						oauthToken: sessionToken,
-						sessionId: fileSessionId,
-					};
-
-					// Start download without blocking startup - await before REPL renders
-					fileDownloadPromise = downloadSessionFiles(files, config);
-				}
-			}
-
-			// Get isNonInteractiveSession from state (was set before init())
-			const isNonInteractiveSession = getIsNonInteractiveSession();
-
-			// Validate that fallback model is different from main model
-			if (
-				fallbackModel &&
-				options.model &&
-				fallbackModel === options.model
-			) {
-				process.stderr.write(
-					chalk.red(
-						"Error: Fallback model cannot be the same as the main model. Please specify a different model for --fallback-model.\n",
-					),
-				);
-				process.exit(1);
-			}
-
-			// Handle system prompt options
-			let systemPrompt = options.systemPrompt;
-			if (options.systemPromptFile) {
-				if (options.systemPrompt) {
-					process.stderr.write(
-						chalk.red(
-							"Error: Cannot use both --system-prompt and --system-prompt-file. Please use only one.\n",
-						),
-					);
-					process.exit(1);
-				}
-
-				try {
-					const filePath = resolve(options.systemPromptFile);
-					systemPrompt = readFileSync(filePath, "utf8");
-				} catch (error) {
-					const code = getErrnoCode(error);
-					if (code === "ENOENT") {
-						process.stderr.write(
-							chalk.red(
-								`Error: System prompt file not found: ${resolve(options.systemPromptFile)}\n`,
-							),
-						);
-						process.exit(1);
-					}
-					process.stderr.write(
-						chalk.red(
-							`Error reading system prompt file: ${errorMessage(error)}\n`,
-						),
-					);
-					process.exit(1);
-				}
-			}
-
-			// Handle append system prompt options
-			let appendSystemPrompt = options.appendSystemPrompt;
-			if (options.appendSystemPromptFile) {
-				if (options.appendSystemPrompt) {
-					process.stderr.write(
-						chalk.red(
-							"Error: Cannot use both --append-system-prompt and --append-system-prompt-file. Please use only one.\n",
-						),
-					);
-					process.exit(1);
-				}
-
-				try {
-					const filePath = resolve(options.appendSystemPromptFile);
-					appendSystemPrompt = readFileSync(filePath, "utf8");
-				} catch (error) {
-					const code = getErrnoCode(error);
-					if (code === "ENOENT") {
-						process.stderr.write(
-							chalk.red(
-								`Error: Append system prompt file not found: ${resolve(options.appendSystemPromptFile)}\n`,
-							),
-						);
-						process.exit(1);
-					}
-					process.stderr.write(
-						chalk.red(
-							`Error reading append system prompt file: ${errorMessage(error)}\n`,
-						),
-					);
-					process.exit(1);
-				}
-			}
-
-			// Add teammate-specific system prompt addendum for tmux teammates
-			if (
-				isAgentSwarmsEnabled() &&
-				storedTeammateOpts?.agentId &&
-				storedTeammateOpts?.agentName &&
-				storedTeammateOpts?.teamName
-			) {
-				const addendum =
-					getTeammatePromptAddendum().TEAMMATE_SYSTEM_PROMPT_ADDENDUM;
-				appendSystemPrompt = appendSystemPrompt
-					? `${appendSystemPrompt}\n\n${addendum}`
-					: addendum;
-			}
-
-			const {
-				mode: permissionMode,
-				notification: permissionModeNotification,
-			} = initialPermissionModeFromCLI({
-				permissionModeCli,
-				dangerouslySkipPermissions,
-			});
-
-			// Store session bypass permissions mode for trust dialog check
-			setSessionBypassPermissionsMode(
-				permissionMode === "bypassPermissions",
-			);
-			if (feature("TRANSCRIPT_CLASSIFIER")) {
-				// autoModeFlagCli is the "did the user intend auto this session" signal.
-				// Set when: --enable-auto-mode, --permission-mode auto, resolved mode
-				// is auto, OR settings defaultMode is auto but the gate denied it
-				// (permissionMode resolved to default with no explicit CLI override).
-				// Used by verifyAutoModeGateAccess to decide whether to notify on
-				// auto-unavailable, and by tengu_auto_mode_config opt-in carousel.
-				if (
-					(options as { enableAutoMode?: boolean }).enableAutoMode ||
-					permissionModeCli === "auto" ||
-					permissionMode === "auto" ||
-					(!permissionModeCli && isDefaultPermissionModeAuto())
-				) {
-					autoModeStateModule?.setAutoModeFlagCli(true);
-				}
-			}
-
-			// Parse the MCP config files/strings if provided
-			let dynamicMcpConfig: Record<string, ScopedMcpServerConfig> = {
-				// Built-in MCP servers (default disabled, user enables via /mcp)
-				"mcp-chrome": {
-					type: "http",
-					url: "http://127.0.0.1:12306/mcp",
-					scope: "dynamic",
-					"headers": {
-						"Authorization": "Bearer my-static-token",
-					}
-				},
-			};
-
-			if (mcpConfig && mcpConfig.length > 0) {
-				// Process mcpConfig array
-				const processedConfigs = mcpConfig
-					.map((config) => config.trim())
-					.filter((config) => config.length > 0);
-
-				let allConfigs: Record<string, McpServerConfig> = {};
-				const allErrors: ValidationError[] = [];
-
-				for (const configItem of processedConfigs) {
-					let configs: Record<string, McpServerConfig> | null = null;
-					let errors: ValidationError[] = [];
-
-					// First try to parse as JSON string
-					const parsedJson = safeParseJSON(configItem);
-					if (parsedJson) {
-						const result = parseMcpConfig({
-							configObject: parsedJson,
-							filePath: "command line",
-							expandVars: true,
-							scope: "dynamic",
-						});
-						if (result.config) {
-							configs = result.config.mcpServers;
-						} else {
-							errors = result.errors;
-						}
-					} else {
-						// Try as file path
-						const configPath = resolve(configItem);
-						const result = parseMcpConfigFromFilePath({
-							filePath: configPath,
-							expandVars: true,
-							scope: "dynamic",
-						});
-						if (result.config) {
-							configs = result.config.mcpServers;
-						} else {
-							errors = result.errors;
-						}
-					}
-
-					if (errors.length > 0) {
-						allErrors.push(...errors);
-					} else if (configs) {
-						// Merge configs, later ones override earlier ones
-						allConfigs = { ...allConfigs, ...configs };
-					}
-				}
-
-				if (allErrors.length > 0) {
-					const formattedErrors = allErrors
-						.map(
-							(err) =>
-								`${err.path ? err.path + ": " : ""}${err.message}`,
-						)
-						.join("\n");
-					logForDebugging(
-						`--mcp-config validation failed (${allErrors.length} errors): ${formattedErrors}`,
-						{
-							level: "error",
-						},
-					);
-					process.stderr.write(
-						`Error: Invalid MCP configuration:\n${formattedErrors}\n`,
-					);
-					process.exit(1);
-				}
-
-				if (Object.keys(allConfigs).length > 0) {
-					// SDK hosts (Nest/Desktop) own their server naming and may reuse
-					// built-in names — skip reserved-name checks for type:'sdk'.
-					const nonSdkConfigNames = Object.entries(allConfigs)
-						.filter(([, config]) => config.type !== "sdk")
-						.map(([name]) => name);
-
-					let reservedNameError: string | null = null;
-					if (nonSdkConfigNames.some(isClaudeInChromeMCPServer)) {
-						reservedNameError = `Invalid MCP configuration: "${CLAUDE_IN_CHROME_MCP_SERVER_NAME}" is a reserved MCP name.`;
-					} else if (feature("CHICAGO_MCP")) {
-						const {
-							isComputerUseMCPServer,
-							COMPUTER_USE_MCP_SERVER_NAME,
-						} = await import("src/utils/computerUse/common.js");
-						if (nonSdkConfigNames.some(isComputerUseMCPServer)) {
-							reservedNameError = `Invalid MCP configuration: "${COMPUTER_USE_MCP_SERVER_NAME}" is a reserved MCP name.`;
-						}
-					}
-					if (reservedNameError) {
-						// stderr+exit(1) — a throw here becomes a silent unhandled
-						// rejection in stream-json mode (void main() in cli.tsx).
-						process.stderr.write(`Error: ${reservedNameError}\n`);
-						process.exit(1);
-					}
-
-					// Add dynamic scope to all configs. type:'sdk' entries pass through
-					// unchanged — they're extracted into sdkMcpConfigs downstream and
-					// passed to print.ts. The Python SDK relies on this path (it doesn't
-					// send sdkMcpServers in the initialize message). Dropping them here
-					// broke Coworker (inc-5122). The policy filter below already exempts
-					// type:'sdk', and the entries are inert without an SDK transport on
-					// stdin, so there's no bypass risk from letting them through.
-					const scopedConfigs = mapValues(allConfigs, (config) => ({
-						...config,
-						scope: "dynamic" as const,
-					}));
-
-					// Enforce managed policy (allowedMcpServers / deniedMcpServers) on
-					// --mcp-config servers. Without this, the CLI flag bypasses the
-					// enterprise allowlist that user/project/local configs go through in
-					// getClaudeCodeMcpConfigs — callers spread dynamicMcpConfig back on
-					// top of filtered results. Filter here at the source so all
-					// downstream consumers see the policy-filtered set.
-					const { allowed, blocked } =
-						filterMcpServersByPolicy(scopedConfigs);
-					if (blocked.length > 0) {
-						process.stderr.write(
-							`Warning: MCP ${plural(blocked.length, "server")} blocked by enterprise policy: ${blocked.join(", ")}\n`,
-						);
-					}
-					dynamicMcpConfig = { ...dynamicMcpConfig, ...(allowed as Record<string, ScopedMcpServerConfig>) };
-				}
-			}
-
-			// Extract Claude in Chrome option and enforce claude.ai subscriber check (unless user is ant)
-			const chromeOpts = options as { chrome?: boolean };
-			// Store the explicit CLI flag so teammates can inherit it
-			setChromeFlagOverride(chromeOpts.chrome);
-			const enableClaudeInChrome =
-				shouldEnableClaudeInChrome(chromeOpts.chrome) &&
-				(process.env.USER_TYPE === "ant" || isClaudeAISubscriber());
-			const autoEnableClaudeInChrome =
-				!enableClaudeInChrome && shouldAutoEnableClaudeInChrome();
-
-			if (enableClaudeInChrome) {
-				const platform = getPlatform();
-				try {
-					logEvent("tengu_claude_in_chrome_setup", {
-						platform:
-							platform as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-					});
-
-					const {
-						mcpConfig: chromeMcpConfig,
-						allowedTools: chromeMcpTools,
-						systemPrompt: chromeSystemPrompt,
-					} = setupClaudeInChrome();
-					dynamicMcpConfig = {
-						...dynamicMcpConfig,
-						...chromeMcpConfig,
-					};
-					allowedTools.push(...chromeMcpTools);
-					if (chromeSystemPrompt) {
-						appendSystemPrompt = appendSystemPrompt
-							? `${chromeSystemPrompt}\n\n${appendSystemPrompt}`
-							: chromeSystemPrompt;
-					}
-				} catch (error) {
-					logEvent("tengu_claude_in_chrome_setup_failed", {
-						platform:
-							platform as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-					});
-					logForDebugging(`[Claude in Chrome] Error: ${error}`);
-					logError(error);
-					// biome-ignore lint/suspicious/noConsole:: intentional console output
-					console.error(
-						`Error: Failed to run with Claude in Chrome.`,
-					);
-					process.exit(1);
-				}
-			} else if (autoEnableClaudeInChrome) {
-				try {
-					const { mcpConfig: chromeMcpConfig } =
-						setupClaudeInChrome();
-					dynamicMcpConfig = {
-						...dynamicMcpConfig,
-						...chromeMcpConfig,
-					};
-
-					const hint =
-						feature("WEB_BROWSER_TOOL") &&
-						typeof Bun !== "undefined" &&
-						"WebView" in Bun
-							? CLAUDE_IN_CHROME_SKILL_HINT_WITH_WEBBROWSER
-							: CLAUDE_IN_CHROME_SKILL_HINT;
-					appendSystemPrompt = appendSystemPrompt
-						? `${appendSystemPrompt}\n\n${hint}`
-						: hint;
-				} catch (error) {
-					// Silently skip any errors for the auto-enable
-					logForDebugging(
-						`[Claude in Chrome] Error (auto-enable): ${error}`,
-					);
-				}
-			}
-
-			// Extract strict MCP config flag
-			const strictMcpConfig = options.strictMcpConfig || false;
-
-			// Check if enterprise MCP configuration exists. When it does, only allow dynamic MCP
-			// configs that contain special server types (sdk)
-			if (doesEnterpriseMcpConfigExist()) {
-				if (strictMcpConfig) {
-					process.stderr.write(
-						chalk.red(
-							"You cannot use --strict-mcp-config when an enterprise MCP config is present",
-						),
-					);
-					process.exit(1);
-				}
-
-				// For --mcp-config, allow if all servers are internal types (sdk)
-				if (
-					dynamicMcpConfig &&
-					!areMcpConfigsAllowedWithEnterpriseMcpConfig(
-						dynamicMcpConfig,
-					)
-				) {
-					process.stderr.write(
-						chalk.red(
-							"You cannot dynamically configure MCP servers when an enterprise MCP config is present",
-						),
-					);
-					process.exit(1);
-				}
-			}
-
-			// chicago MCP: guarded Computer Use (app allowlist + frontmost gate +
-			// SCContentFilter screenshots). Ant-only, GrowthBook-gated — failures
-			// are silent (this is dogfooding). Platform + interactive checks inline
-			// so non-macOS / print-mode ants skip the heavy @ant/computer-use-mcp
-			// import entirely. gates.js is light (type-only package import).
-			//
-			// Placed AFTER the enterprise-MCP-config check: that check rejects any
-			// dynamicMcpConfig entry with `type !== 'sdk'`, and our config is
-			// `type: 'stdio'`. An enterprise-config ant with the GB gate on would
-			// otherwise process.exit(1). Chrome has the same latent issue but has
-			// shipped without incident; chicago places itself correctly.
-			if (
-				feature("CHICAGO_MCP") &&
-				getPlatform() !== "unknown" &&
-				!getIsNonInteractiveSession()
-			) {
-				try {
-					const { getChicagoEnabled } =
-						await import("src/utils/computerUse/gates.js");
-					if (getChicagoEnabled()) {
-						const { setupComputerUseMCP } =
-							await import("src/utils/computerUse/setup.js");
-						const { mcpConfig, allowedTools: cuTools } =
-							setupComputerUseMCP();
-						dynamicMcpConfig = {
-							...dynamicMcpConfig,
-							...mcpConfig,
-						};
-						allowedTools.push(...cuTools);
-					}
-				} catch (error) {
-					logForDebugging(
-						`[Computer Use MCP] Setup failed: ${errorMessage(error)}`,
-					);
-				}
-			}
-
-			// Store additional directories for CLAUDE.md loading (controlled by env var)
-			setAdditionalDirectoriesForClaudeMd(addDir);
-
-			// Channel server allowlist from --channels flag — servers whose
-			// inbound push notifications should register this session. The option
-			// is added inside a feature() block so TS doesn't know about it
-			// on the options type — same pattern as --assistant at main.tsx:1824.
-			// devChannels is deferred: showSetupScreens shows a confirmation dialog
-			// and only appends to allowedChannels on accept.
-			let devChannels: ChannelEntry[] | undefined;
-			if (feature("KAIROS") || feature("KAIROS_CHANNELS")) {
-				// Parse plugin:name@marketplace / server:Y tags into typed entries.
-				// Tag decides trust model downstream: plugin-kind hits marketplace
-				// verification + GrowthBook allowlist, server-kind always fails
-				// allowlist (schema is plugin-only) unless dev flag is set.
-				// Untagged or marketplace-less plugin entries are hard errors —
-				// silently not-matching in the gate would look like channels are
-				// "on" but nothing ever fires.
-				const parseChannelEntries = (
-					raw: string[],
-					flag: string,
-				): ChannelEntry[] => {
-					const entries: ChannelEntry[] = [];
-					const bad: string[] = [];
-					for (const c of raw) {
-						if (c.startsWith("plugin:")) {
-							const rest = c.slice(7);
-							const at = rest.indexOf("@");
-							if (at <= 0 || at === rest.length - 1) {
-								bad.push(c);
-							} else {
-								entries.push({
-									kind: "plugin",
-									name: rest.slice(0, at),
-									marketplace: rest.slice(at + 1),
-								});
-							}
-						} else if (c.startsWith("server:") && c.length > 7) {
-							entries.push({ kind: "server", name: c.slice(7) });
-						} else {
-							bad.push(c);
-						}
-					}
-					if (bad.length > 0) {
-						process.stderr.write(
-							chalk.red(
-								`${flag} entries must be tagged: ${bad.join(", ")}\n` +
-									`  plugin:<name>@<marketplace>  — plugin-provided channel (allowlist enforced)\n` +
-									`  server:<name>                — manually configured MCP server\n`,
-							),
-						);
-						process.exit(1);
-					}
-					return entries;
-				};
-
-				const channelOpts = options as {
-					channels?: string[];
-					dangerouslyLoadDevelopmentChannels?: string[];
-				};
-				const rawChannels = channelOpts.channels;
-				const rawDev = channelOpts.dangerouslyLoadDevelopmentChannels;
-				// Always parse + set. ChannelsNotice reads getAllowedChannels() and
-				// renders the appropriate branch (disabled/noAuth/policyBlocked/
-				// listening) in the startup screen. gateChannelServer() enforces.
-				// --channels works in both interactive and print/SDK modes; dev-channels
-				// stays interactive-only (requires a confirmation dialog).
-				let channelEntries: ChannelEntry[] = [];
-				if (rawChannels && rawChannels.length > 0) {
-					channelEntries = parseChannelEntries(
-						rawChannels,
-						"--channels",
-					);
-					setAllowedChannels(channelEntries);
-				}
-				if (!isNonInteractiveSession) {
-					if (rawDev && rawDev.length > 0) {
-						devChannels = parseChannelEntries(
-							rawDev,
-							"--dangerously-load-development-channels",
-						);
-					}
-				}
-				// Flag-usage telemetry. Plugin identifiers are logged (same tier as
-				// tengu_plugin_installed — public-registry-style names); server-kind
-				// names are not (MCP-server-name tier, opt-in-only elsewhere).
-				// Per-server gate outcomes land in tengu_mcp_channel_gate once
-				// servers connect. Dev entries go through a confirmation dialog after
-				// this — dev_plugins captures what was typed, not what was accepted.
-				if (
-					channelEntries.length > 0 ||
-					(devChannels?.length ?? 0) > 0
-				) {
-					const joinPluginIds = (entries: ChannelEntry[]) => {
-						const ids = entries.flatMap((e) =>
-							e.kind === "plugin"
-								? [`${e.name}@${e.marketplace}`]
-								: [],
-						);
-						return ids.length > 0
-							? (ids
-									.sort()
-									.join(
-										",",
-									) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS)
-							: undefined;
-					};
-					logEvent("tengu_mcp_channel_flags", {
-						channels_count: channelEntries.length,
-						dev_count: devChannels?.length ?? 0,
-						plugins: joinPluginIds(channelEntries),
-						dev_plugins: joinPluginIds(devChannels ?? []),
-					});
-				}
-			}
-
-			// SDK opt-in for SendUserMessage via --tools. All sessions require
-			// explicit opt-in; listing it in --tools signals intent. Runs BEFORE
-			// initializeToolPermissionContext so getToolsForDefaultPreset() sees
-			// the tool as enabled when computing the base-tools disallow filter.
-			// Conditional require avoids leaking the tool-name string into
-			// external builds.
-			if (
-				(feature("KAIROS") || feature("KAIROS_BRIEF")) &&
-				baseTools.length > 0
-			) {
-				/* eslint-disable @typescript-eslint/no-require-imports */
-				const { BRIEF_TOOL_NAME, LEGACY_BRIEF_TOOL_NAME } =
-					require("@claude-code-best/builtin-tools/tools/BriefTool/prompt.js") as typeof import("@claude-code-best/builtin-tools/tools/BriefTool/prompt.js");
-				const { isBriefEntitled } =
-					require("@claude-code-best/builtin-tools/tools/BriefTool/BriefTool.js") as typeof import("@claude-code-best/builtin-tools/tools/BriefTool/BriefTool.js");
-				/* eslint-enable @typescript-eslint/no-require-imports */
-				const parsed = parseToolListFromCLI(baseTools);
-				if (
-					(parsed.includes(BRIEF_TOOL_NAME) ||
-						parsed.includes(LEGACY_BRIEF_TOOL_NAME)) &&
-					isBriefEntitled()
-				) {
-					setUserMsgOptIn(true);
-				}
-			}
-
-			// This await replaces blocking existsSync/statSync calls that were already in
-			// the startup path. Wall-clock time is unchanged; we just yield to the event
-			// loop during the fs I/O instead of blocking it. See #19661.
-			const initResult = await initializeToolPermissionContext({
-				allowedToolsCli: allowedTools,
-				disallowedToolsCli: disallowedTools,
-				baseToolsCli: baseTools,
-				permissionMode,
-				allowDangerouslySkipPermissions,
-				addDirs: addDir,
-			});
-			let toolPermissionContext = initResult.toolPermissionContext;
-			const {
-				warnings,
-				dangerousPermissions,
-				overlyBroadBashPermissions,
-			} = initResult;
-
-			// Handle overly broad shell allow rules for ant users (Bash(*), PowerShell(*))
-			if (
-				process.env.USER_TYPE === "ant" &&
-				overlyBroadBashPermissions.length > 0
-			) {
-				for (const permission of overlyBroadBashPermissions) {
-					logForDebugging(
-						`Ignoring overly broad shell permission ${permission.ruleDisplay} from ${permission.sourceDisplay}`,
-					);
-				}
-				toolPermissionContext = removeDangerousPermissions(
-					toolPermissionContext,
-					overlyBroadBashPermissions,
-				);
-			}
-
-			if (
-				feature("TRANSCRIPT_CLASSIFIER") &&
-				dangerousPermissions.length > 0
-			) {
-				toolPermissionContext = stripDangerousPermissionsForAutoMode(
-					toolPermissionContext,
-				);
-			}
-
-			// Print any warnings from initialization
-			warnings.forEach((warning) => {
-				// biome-ignore lint/suspicious/noConsole:: intentional console output
-				console.error(warning);
-			});
-
-
-			// claude.ai config fetch: -p mode only (interactive uses useManageMCPConnections
-			// two-phase loading). Kicked off here to overlap with setup(); awaited
-			// before runHeadless so single-turn -p sees connectors. Skipped under
-			// enterprise/strict MCP to preserve policy boundaries.
-			const claudeaiConfigPromise: Promise<
-				Record<string, ScopedMcpServerConfig>
-			> =
-				isNonInteractiveSession &&
-				!strictMcpConfig &&
-				!doesEnterpriseMcpConfigExist() &&
-				// --bare / SIMPLE: skip claude.ai proxy servers (datadog, Gmail,
-				// Slack, BigQuery, PubMed — 6-14s each to connect). Scripted calls
-				// that need MCP pass --mcp-config explicitly.
-				!isBareMode()
-					? fetchClaudeAIMcpConfigsIfEligible().then((configs) => {
-							const { allowed, blocked } =
-								filterMcpServersByPolicy(configs);
-							if (blocked.length > 0) {
-								process.stderr.write(
-									`Warning: claude.ai MCP ${plural(blocked.length, "server")} blocked by enterprise policy: ${blocked.join(", ")}\n`,
-								);
-							}
-							return allowed;
-						})
-					: Promise.resolve({});
-
-			// Kick off MCP config loading early (safe - just reads files, no execution).
-			// Both interactive and -p use getClaudeCodeMcpConfigs (local file reads only).
-			// The local promise is awaited later (before prefetchAllMcpResources) to
-			// overlap config I/O with setup(), commands loading, and trust dialog.
-			logForDebugging("[STARTUP] Loading MCP configs...");
-			const mcpConfigStart = Date.now();
-			let mcpConfigResolvedMs: number | undefined;
-			// --bare skips auto-discovered MCP (.mcp.json, user settings, plugins) —
-			// only explicit --mcp-config works. dynamicMcpConfig is spread onto
-			// allMcpConfigs downstream so it survives this skip.
-			const mcpConfigPromise = (
-				strictMcpConfig || isBareMode()
-					? Promise.resolve({
-							servers: {} as Record<
-								string,
-								ScopedMcpServerConfig
-							>,
-						})
-					: getClaudeCodeMcpConfigs(dynamicMcpConfig)
-			).then((result) => {
-				mcpConfigResolvedMs = Date.now() - mcpConfigStart;
-				return result;
-			});
-
-			// NOTE: We do NOT call prefetchAllMcpResources here - that's deferred until after trust dialog
-
-			if (
-				inputFormat &&
-				inputFormat !== "text" &&
-				inputFormat !== "stream-json"
-			) {
-				// biome-ignore lint/suspicious/noConsole:: intentional console output
-				console.error(`Error: Invalid input format "${inputFormat}".`);
-				process.exit(1);
-			}
-			if (
-				inputFormat === "stream-json" &&
-				outputFormat !== "stream-json"
-			) {
-				// biome-ignore lint/suspicious/noConsole:: intentional console output
-				console.error(
-					`Error: --input-format=stream-json requires output-format=stream-json.`,
-				);
-				process.exit(1);
-			}
-
-			// Validate sdkUrl is only used with appropriate formats (formats are auto-set above)
-			if (sdkUrl) {
-				if (
-					inputFormat !== "stream-json" ||
-					outputFormat !== "stream-json"
-				) {
-					// biome-ignore lint/suspicious/noConsole:: intentional console output
-					console.error(
-						`Error: --sdk-url requires both --input-format=stream-json and --output-format=stream-json.`,
-					);
-					process.exit(1);
-				}
-			}
-
-			// Validate replayUserMessages is only used with stream-json formats
-			if (options.replayUserMessages) {
-				if (
-					inputFormat !== "stream-json" ||
-					outputFormat !== "stream-json"
-				) {
-					// biome-ignore lint/suspicious/noConsole:: intentional console output
-					console.error(
-						`Error: --replay-user-messages requires both --input-format=stream-json and --output-format=stream-json.`,
-					);
-					process.exit(1);
-				}
-			}
-
-			// Validate includePartialMessages is only used with print mode and stream-json output
-			if (effectiveIncludePartialMessages) {
-				if (
-					!isNonInteractiveSession ||
-					outputFormat !== "stream-json"
-				) {
-					writeToStderr(
-						`Error: --include-partial-messages requires --print and --output-format=stream-json.`,
-					);
-					process.exit(1);
-				}
-			}
-
-			// Validate --no-session-persistence is only used with print mode
-			if (
-				options.sessionPersistence === false &&
-				!isNonInteractiveSession
-			) {
-				writeToStderr(
-					`Error: --no-session-persistence can only be used with --print mode.`,
-				);
-				process.exit(1);
-			}
-
-			const effectivePrompt = prompt || "";
-			let inputPrompt = await getInputPrompt(
-				effectivePrompt,
-				(inputFormat ?? "text") as "text" | "stream-json",
-			);
-			profileCheckpoint("action_after_input_prompt");
-
-			// Activate proactive mode BEFORE getTools() so SleepTool.isEnabled()
-			// (which returns isProactiveActive()) passes and Sleep is included.
-			// The later REPL-path maybeActivateProactive() calls are idempotent.
-			maybeActivateProactive(options);
-
-			let tools = getTools(toolPermissionContext);
-
-			// Apply coordinator mode tool filtering for headless path
-			// (mirrors useMergedTools.ts filtering for REPL/interactive path)
-			if (
-				feature("COORDINATOR_MODE") &&
-				isEnvTruthy(process.env.CLAUDE_CODE_COORDINATOR_MODE)
-			) {
-				const { applyCoordinatorToolFilter } =
-					await import("./utils/toolPool.js");
-				tools = applyCoordinatorToolFilter(tools);
-			}
-
-			profileCheckpoint("action_tools_loaded");
-
-			let jsonSchema: ToolInputJSONSchema | undefined;
-			if (
-				isSyntheticOutputToolEnabled({ isNonInteractiveSession }) &&
-				options.jsonSchema
-			) {
-				jsonSchema = jsonParse(
-					options.jsonSchema,
-				) as ToolInputJSONSchema;
-			}
-
-			if (jsonSchema) {
-				const syntheticOutputResult =
-					createSyntheticOutputTool(jsonSchema);
-				if ("tool" in syntheticOutputResult) {
-					// Add SyntheticOutputTool to the tools array AFTER getTools() filtering.
-					// This tool is excluded from normal filtering (see tools.ts) because it's
-					// an implementation detail for structured output, not a user-controlled tool.
-					tools = [...tools, syntheticOutputResult.tool];
-
-					logEvent("tengu_structured_output_enabled", {
-						schema_property_count: Object.keys(
-							(jsonSchema.properties as Record<
-								string,
-								unknown
-							>) || {},
-						)
-							.length as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-						has_required_fields: Boolean(
-							jsonSchema.required,
-						) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-					});
-				} else {
-					logEvent("tengu_structured_output_failure", {
-						error: "Invalid JSON schema" as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-					});
-				}
-			}
-
-			// IMPORTANT: setup() must be called before any other code that depends on the cwd or worktree setup
-			profileCheckpoint("action_before_setup");
-			logForDebugging("[STARTUP] Running setup()...");
-			const setupStart = Date.now();
-			const { setup } = await import("./setup.js");
-			const messagingSocketPath = feature("UDS_INBOX")
-				? (options as { messagingSocketPath?: string })
-						.messagingSocketPath
-				: undefined;
-			// Parallelize setup() with commands+agents loading. setup()'s ~28ms is
-			// mostly startUdsMessaging (socket bind, ~20ms) — not disk-bound, so it
-			// doesn't contend with getCommands' file reads. Gated on !worktreeEnabled
-			// since --worktree makes setup() process.chdir() (setup.ts:203), and
-			// commands/agents need the post-chdir cwd.
-			const preSetupCwd = getCwd();
-			// Register bundled skills/plugins before kicking getCommands() — they're
-			// pure in-memory array pushes (<1ms, zero I/O) that getBundledSkills()
-			// reads synchronously. Previously ran inside setup() after ~20ms of
-			// await points, so the parallel getCommands() memoized an empty list.
-			if (process.env.CLAUDE_CODE_ENTRYPOINT !== "local-agent") {
-				initBuiltinPlugins();
-				initBundledSkills();
-			}
-			const setupPromise = setup(
-				preSetupCwd,
-				permissionMode,
-				allowDangerouslySkipPermissions,
-				worktreeEnabled,
-				worktreeName,
-				tmuxEnabled,
-				sessionId ? validateUuid(sessionId) : undefined,
-				worktreePRNumber,
-				messagingSocketPath,
-			);
-			const commandsPromise = worktreeEnabled
-				? null
-				: getCommands(preSetupCwd);
-			const agentDefsPromise = worktreeEnabled
-				? null
-				: getAgentDefinitionsWithOverrides(preSetupCwd);
-			// Suppress transient unhandledRejection if these reject during the
-			// ~28ms setupPromise await before Promise.all joins them below.
-			commandsPromise?.catch(() => {});
-			agentDefsPromise?.catch(() => {});
-			await setupPromise;
-			logForDebugging(
-				`[STARTUP] setup() completed in ${Date.now() - setupStart}ms`,
-			);
-			profileCheckpoint("action_after_setup");
-
-			// Replay user messages into stream-json only when the socket was
-			// explicitly requested. The auto-generated socket is passive — it
-			// lets tools inject if they want to, but turning it on by default
-			// shouldn't reshape stream-json for SDK consumers who never touch it.
-			// Callers who inject and also want those injections visible in the
-			// stream pass --messaging-socket-path explicitly (or --replay-user-messages).
-			let effectiveReplayUserMessages = !!options.replayUserMessages;
-			if (feature("UDS_INBOX")) {
-				if (
-					!effectiveReplayUserMessages &&
-					outputFormat === "stream-json"
-				) {
-					effectiveReplayUserMessages = !!(
-						options as { messagingSocketPath?: string }
-					).messagingSocketPath;
-				}
-			}
-
-			if (getIsNonInteractiveSession()) {
-				// Apply full merged settings env now (including project-scoped
-				// .claude/settings.json PATH/GIT_DIR/GIT_WORK_TREE) so gitExe() and
-				// the git spawn below see it. Trust is implicit in -p mode; the
-				// docstring at managedEnv.ts:96-97 says this applies "potentially
-				// dangerous environment variables such as LD_PRELOAD, PATH" from all
-				// sources. The later call in the isNonInteractiveSession block below
-				// is idempotent (Object.assign, configureGlobalAgents ejects prior
-				// interceptor) and picks up any plugin-contributed env after plugin
-				// init. Project settings are already loaded here:
-				// applySafeConfigEnvironmentVariables in init() called
-				// getSettings_DEPRECATED at managedEnv.ts:86 which merges all enabled
-				// sources including projectSettings/localSettings.
-				applyConfigEnvironmentVariables();
-
-				// Spawn git status/log/branch now so the subprocess execution overlaps
-				// with the getCommands await below and startDeferredPrefetches. After
-				// setup() so cwd is final (setup.ts:254 may process.chdir(worktreePath)
-				// for --worktree) and after the applyConfigEnvironmentVariables above
-				// so PATH/GIT_DIR/GIT_WORK_TREE from all sources (trusted + project)
-				// are applied. getSystemContext is memoized; the
-				// prefetchSystemContextIfSafe call in startDeferredPrefetches becomes
-				// a cache hit. The microtask from await getIsGit() drains at the
-				// getCommands Promise.all await below. Trust is implicit in -p mode
-				// (same gate as prefetchSystemContextIfSafe).
-				void getSystemContext();
-				// Kick getUserContext now too — its first await (fs.readFile in
-				// getMemoryFiles) yields naturally, so the CLAUDE.md directory walk
-				// runs during the ~280ms overlap window before the context
-				// Promise.all join in print.ts. The void getUserContext() in
-				// startDeferredPrefetches becomes a memoize cache-hit.
-				void getUserContext();
-				// Kick ensureModelStringsInitialized now — for Bedrock this triggers
-				// a 100-200ms profile fetch that was awaited serially at
-				// print.ts:739. updateBedrockModelStrings is sequential()-wrapped so
-				// the await joins the in-flight fetch. Non-Bedrock is a sync
-				// early-return (zero-cost).
-				void ensureModelStringsInitialized();
-			}
-
-			// Apply --name: cache-only so no orphan file is created before the
-			// session ID is finalized by --continue/--resume. materializeSessionFile
-			// persists it on the first user message; REPL's useTerminalTitle reads it
-			// via getCurrentSessionTitle.
-			const sessionNameArg = options.name?.trim();
-			if (sessionNameArg) {
-				cacheSessionTitle(sessionNameArg);
-			}
-
-			// Ant model aliases (capybara-fast etc.) resolve via the
-			// tengu_ant_model_override GrowthBook flag. _CACHED_MAY_BE_STALE reads
-			// disk synchronously; disk is populated by a fire-and-forget write. On a
-			// cold cache, parseUserSpecifiedModel returns the unresolved alias, the
-			// API 404s, and -p exits before the async write lands — crashloop on
-			// fresh pods. Awaiting init here populates the in-memory payload map that
-			// _CACHED_MAY_BE_STALE now checks first. Gated so the warm path stays
-			// non-blocking:
-			//  - explicit model via --model or ANTHROPIC_MODEL (both feed alias resolution)
-			//  - no env override (which short-circuits _CACHED_MAY_BE_STALE before disk)
-			//  - flag absent from disk (== null also catches pre-#22279 poisoned null)
-			const explicitModel = options.model || process.env.ANTHROPIC_MODEL;
-			if (
-				process.env.USER_TYPE === "ant" &&
-				explicitModel &&
-				explicitModel !== "default" &&
-				!hasGrowthBookEnvOverride("tengu_ant_model_override") &&
-				getGlobalConfig().cachedGrowthBookFeatures?.[
-					"tengu_ant_model_override"
-				] == null
-			) {
-				await initializeGrowthBook();
-			}
-
-			// Special case the default model with the null keyword
-			// NOTE: Model resolution happens after setup() to ensure trust is established before AWS auth
-			const userSpecifiedModel =
-				options.model === "default"
-					? getDefaultMainLoopModel()
-					: options.model;
-			const userSpecifiedFallbackModel =
-				fallbackModel === "default"
-					? getDefaultMainLoopModel()
-					: fallbackModel;
-
-			// Reuse preSetupCwd unless setup() chdir'd (worktreeEnabled). Saves a
-			// getCwd() syscall in the common path.
-			const currentCwd = worktreeEnabled ? getCwd() : preSetupCwd;
-			logForDebugging("[STARTUP] Loading commands and agents...");
-			const commandsStart = Date.now();
-			// Join the promises kicked before setup() (or start fresh if
-			// worktreeEnabled gated the early kick). Both memoized by cwd.
-			const [commands, agentDefinitionsResult] = await Promise.all([
-				commandsPromise ?? getCommands(currentCwd),
-				agentDefsPromise ??
-					getAgentDefinitionsWithOverrides(currentCwd),
-			]);
-			logForDebugging(
-				`[STARTUP] Commands and agents loaded in ${Date.now() - commandsStart}ms`,
-			);
-			profileCheckpoint("action_commands_loaded");
-
-			// Parse CLI agents if provided via --agents flag
-			let cliAgents: typeof agentDefinitionsResult.activeAgents = [];
-			if (agentsJson) {
-				try {
-					const parsedAgents = safeParseJSON(agentsJson);
-					if (parsedAgents) {
-						cliAgents = parseAgentsFromJson(
-							parsedAgents,
-							"flagSettings",
-						);
-					}
-				} catch (error) {
-					logError(error);
-				}
-			}
-
-			// Merge CLI agents with existing ones
-			const allAgents = [
-				...agentDefinitionsResult.allAgents,
-				...cliAgents,
-			];
-			const agentDefinitions = {
-				...agentDefinitionsResult,
-				allAgents,
-				activeAgents: getActiveAgentsFromList(allAgents),
-			};
-
-			// Look up main thread agent from CLI flag or settings
-			const agentSetting = agentCli ?? getInitialSettings().agent;
-			let mainThreadAgentDefinition:
-				| (typeof agentDefinitions.activeAgents)[number]
-				| undefined;
-			if (agentSetting) {
-				mainThreadAgentDefinition = agentDefinitions.activeAgents.find(
-					(agent) => agent.agentType === agentSetting,
-				);
-				if (!mainThreadAgentDefinition) {
-					logForDebugging(
-						`Warning: agent "${agentSetting}" not found. ` +
-							`Available agents: ${agentDefinitions.activeAgents.map((a) => a.agentType).join(", ")}. ` +
-							`Using default behavior.`,
-					);
-				}
-			}
-
-			// Store the main thread agent type in bootstrap state so hooks can access it
-			setMainThreadAgentType(mainThreadAgentDefinition?.agentType);
-
-			// Log agent flag usage — only log agent name for built-in agents to avoid leaking custom agent names
-			if (mainThreadAgentDefinition) {
-				logEvent("tengu_agent_flag", {
-					agentType: isBuiltInAgent(mainThreadAgentDefinition)
-						? (mainThreadAgentDefinition.agentType as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS)
-						: ("custom" as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS),
-					...(agentCli && {
-						source: "cli" as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-					}),
-				});
-			}
-
-			// Persist agent setting to session transcript for resume view display and restoration
-			if (mainThreadAgentDefinition?.agentType) {
-				saveAgentSetting(mainThreadAgentDefinition.agentType);
-			}
-
-			// Apply the agent's system prompt for non-interactive sessions
-			// (interactive mode uses buildEffectiveSystemPrompt instead)
-			if (
-				isNonInteractiveSession &&
-				mainThreadAgentDefinition &&
-				!systemPrompt &&
-				!isBuiltInAgent(mainThreadAgentDefinition)
-			) {
-				const agentSystemPrompt =
-					mainThreadAgentDefinition.getSystemPrompt();
-				if (agentSystemPrompt) {
-					systemPrompt = agentSystemPrompt;
-				}
-			}
-
-			// initialPrompt goes first so its slash command (if any) is processed;
-			// user-provided text becomes trailing context.
-			// Only concatenate when inputPrompt is a string. When it's an
-			// AsyncIterable (SDK stream-json mode), template interpolation would
-			// call .toString() producing "[object Object]". The AsyncIterable case
-			// is handled in print.ts via structuredIO.prependUserMessage().
-			if (mainThreadAgentDefinition?.initialPrompt) {
-				if (typeof inputPrompt === "string") {
-					inputPrompt = inputPrompt
-						? `${mainThreadAgentDefinition.initialPrompt}\n\n${inputPrompt}`
-						: mainThreadAgentDefinition.initialPrompt;
-				} else if (!inputPrompt) {
-					inputPrompt = mainThreadAgentDefinition.initialPrompt;
-				}
-			}
-
-			// Compute effective model early so hooks can run in parallel with MCP
-			// If user didn't specify a model but agent has one, use the agent's model
-			let effectiveModel = userSpecifiedModel;
-			if (
-				!effectiveModel &&
-				mainThreadAgentDefinition?.model &&
-				mainThreadAgentDefinition.model !== "inherit"
-			) {
-				effectiveModel = parseUserSpecifiedModel(
-					mainThreadAgentDefinition.model,
-				);
-			}
-
-			setMainLoopModelOverride(effectiveModel);
-
-			// Compute resolved model for hooks (use user-specified model at launch)
-			setInitialMainLoopModel(getUserSpecifiedModelSetting() || null);
-			const initialMainLoopModel = getInitialMainLoopModel();
-			const resolvedInitialModel = parseUserSpecifiedModel(
-				initialMainLoopModel ?? getDefaultMainLoopModel(),
-			);
-
-			let advisorModel: string | undefined;
-			if (isAdvisorEnabled()) {
-				const advisorOption = canUserConfigureAdvisor()
-					? (options as { advisor?: string }).advisor
-					: undefined;
-				if (advisorOption) {
-					logForDebugging(`[AdvisorTool] --advisor ${advisorOption}`);
-					if (!modelSupportsAdvisor(resolvedInitialModel)) {
-						process.stderr.write(
-							chalk.red(
-								`Error: The model "${resolvedInitialModel}" does not support the advisor tool.\n`,
-							),
-						);
-						process.exit(1);
-					}
-					const normalizedAdvisorModel = normalizeModelStringForAPI(
-						parseUserSpecifiedModel(advisorOption),
-					);
-					if (!isValidAdvisorModel(normalizedAdvisorModel)) {
-						process.stderr.write(
-							chalk.red(
-								`Error: The model "${advisorOption}" cannot be used as an advisor.\n`,
-							),
-						);
-						process.exit(1);
-					}
-				}
-				advisorModel = canUserConfigureAdvisor()
-					? (advisorOption ?? getInitialAdvisorSetting())
-					: advisorOption;
-				if (advisorModel) {
-					logForDebugging(
-						`[AdvisorTool] Advisor model: ${advisorModel}`,
-					);
-				}
-			}
-
-			// For tmux teammates with --agent-type, append the custom agent's prompt
-			if (
-				isAgentSwarmsEnabled() &&
-				storedTeammateOpts?.agentId &&
-				storedTeammateOpts?.agentName &&
-				storedTeammateOpts?.teamName &&
-				storedTeammateOpts?.agentType
-			) {
-				// Look up the custom agent definition
-				const customAgent = agentDefinitions.activeAgents.find(
-					(a) => a.agentType === storedTeammateOpts.agentType,
-				);
-				if (customAgent) {
-					// Get the prompt - need to handle both built-in and custom agents
-					let customPrompt: string | undefined;
-					if (customAgent.source === "built-in") {
-						// Built-in agents have getSystemPrompt that takes toolUseContext
-						// We can't access full toolUseContext here, so skip for now
-						logForDebugging(
-							`[teammate] Built-in agent ${storedTeammateOpts.agentType} - skipping custom prompt (not supported)`,
-						);
-					} else {
-						// Custom agents have getSystemPrompt that takes no args
-						customPrompt = customAgent.getSystemPrompt();
-					}
-
-					// Log agent memory loaded event for tmux teammates
-					if (customAgent.memory) {
-						logEvent("tengu_agent_memory_loaded", {
-							...(process.env.USER_TYPE === "ant" && {
-								agent_type:
-									customAgent.agentType as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-							}),
-							scope: customAgent.memory as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-							source: "teammate" as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-						});
-					}
-
-					if (customPrompt) {
-						const customInstructions = `\n# Custom Agent Instructions\n${customPrompt}`;
-						appendSystemPrompt = appendSystemPrompt
-							? `${appendSystemPrompt}\n\n${customInstructions}`
-							: customInstructions;
-					}
-				} else {
-					logForDebugging(
-						`[teammate] Custom agent ${storedTeammateOpts.agentType} not found in available agents`,
-					);
-				}
-			}
-
-			maybeActivateBrief(options);
-			// defaultView: 'chat' is a persisted opt-in — check entitlement and set
-			// userMsgOptIn so the tool + prompt section activate. Interactive-only:
-			// defaultView is a display preference; SDK sessions have no display, and
-			// the assistant installer writes defaultView:'chat' to settings.local.json
-			// which would otherwise leak into --print sessions in the same directory.
-			// Runs right after maybeActivateBrief() so all startup opt-in paths fire
-			// BEFORE any isBriefEnabled() read below (proactive prompt's
-			// briefVisibility). A persisted 'chat' after a GB kill-switch falls
-			// through (entitlement fails).
-			if (
-				(feature("KAIROS") || feature("KAIROS_BRIEF")) &&
-				!getIsNonInteractiveSession() &&
-				!getUserMsgOptIn() &&
-				getInitialSettings().defaultView === "chat"
-			) {
-				/* eslint-disable @typescript-eslint/no-require-imports */
-				const { isBriefEntitled } =
-					require("@claude-code-best/builtin-tools/tools/BriefTool/BriefTool.js") as typeof import("@claude-code-best/builtin-tools/tools/BriefTool/BriefTool.js");
-				/* eslint-enable @typescript-eslint/no-require-imports */
-				if (isBriefEntitled()) {
-					setUserMsgOptIn(true);
-				}
-			}
-			// Coordinator mode has its own system prompt and filters out Sleep, so
-			// the generic proactive prompt would tell it to call a tool it can't
-			// access and conflict with delegation instructions.
-			if (
-				(feature("PROACTIVE") || feature("KAIROS")) &&
-				((options as { proactive?: boolean }).proactive ||
-					isEnvTruthy(process.env.CLAUDE_CODE_PROACTIVE)) &&
-				!coordinatorModeModule?.isCoordinatorMode()
-			) {
-				/* eslint-disable @typescript-eslint/no-require-imports */
-				const briefVisibility =
-					feature("KAIROS") || feature("KAIROS_BRIEF")
-						? (
-								require("@claude-code-best/builtin-tools/tools/BriefTool/BriefTool.js") as typeof import("@claude-code-best/builtin-tools/tools/BriefTool/BriefTool.js")
-							).isBriefEnabled()
-							? "Call SendUserMessage at checkpoints to mark where things stand."
-							: "The user will see any text you output."
-						: "The user will see any text you output.";
-				/* eslint-enable @typescript-eslint/no-require-imports */
-				const proactivePrompt = `\n# Proactive Mode\n\nYou are in proactive mode. Take initiative — explore, act, and make progress without waiting for instructions.\n\nStart by briefly greeting the user.\n\nYou will receive periodic <tick> prompts. These are check-ins. Do whatever seems most useful, or call Sleep if there's nothing to do. ${briefVisibility}`;
-				appendSystemPrompt = appendSystemPrompt
-					? `${appendSystemPrompt}\n\n${proactivePrompt}`
-					: proactivePrompt;
-			}
-
-			if (feature("KAIROS") && kairosEnabled && assistantModule) {
-				const assistantAddendum =
-					assistantModule.getAssistantSystemPromptAddendum();
-				appendSystemPrompt = appendSystemPrompt
-					? `${appendSystemPrompt}\n\n${assistantAddendum}`
-					: assistantAddendum;
-			}
-
-			// Ink root is only needed for interactive sessions — patchConsole in the
-			// Ink constructor would swallow console output in headless mode.
-			let root!: Root;
-			let getFpsMetrics!: () => FpsMetrics | undefined;
-			let stats!: StatsStore;
-
-			// Show setup screens after commands are loaded
-			if (!isNonInteractiveSession) {
-				const ctx = getRenderContext(false);
-				getFpsMetrics = ctx.getFpsMetrics;
-				stats = ctx.stats;
-				// Install asciicast recorder before Ink mounts (ant-only, opt-in via CLAUDE_CODE_TERMINAL_RECORDING=1)
-				if (process.env.USER_TYPE === "ant") {
-					installAsciicastRecorder();
-				}
-
-				const { createRoot } = await import('@anthropic/ink')
-				root = await createRoot(ctx.renderOptions)
-
-				// Log startup time now, before any blocking dialog renders. Logging
-				// from REPL's first render (the old location) included however long
-				// the user sat on trust/OAuth/onboarding/resume-picker — p99 was ~70s
-				// dominated by dialog-wait time, not code-path startup.
-				logEvent("tengu_timer", {
-					event: "startup" as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-					durationMs: Math.round(process.uptime() * 1000),
-				});
-
-				logForDebugging("[STARTUP] Running showSetupScreens()...");
-				const setupScreensStart = Date.now();
-				const onboardingShown = await showSetupScreens(
-					root,
-					permissionMode,
-					allowDangerouslySkipPermissions,
-					commands,
-					enableClaudeInChrome,
-					devChannels,
-				);
-				logForDebugging(
-					`[STARTUP] showSetupScreens() completed in ${Date.now() - setupScreensStart}ms`,
-				);
-
-				// Now that trust is established and GrowthBook has auth headers,
-				// resolve the --remote-control / --rc entitlement gate.
-				if (
-					feature("BRIDGE_MODE") &&
-					remoteControlOption !== undefined
-				) {
-					const { getBridgeDisabledReason } =
-						await import("./bridge/bridgeEnabled.js");
-					const disabledReason = await getBridgeDisabledReason();
-					remoteControl = disabledReason === null;
-					if (disabledReason) {
-						process.stderr.write(
-							chalk.yellow(
-								`${disabledReason}\n--rc flag ignored.\n`,
-							),
-						);
-					}
-				}
-
-				// Check for pending agent memory snapshot updates (only for --agent mode, ant-only)
-				if (
-					feature("AGENT_MEMORY_SNAPSHOT") &&
-					mainThreadAgentDefinition &&
-					isCustomAgent(mainThreadAgentDefinition) &&
-					mainThreadAgentDefinition.memory &&
-					mainThreadAgentDefinition.pendingSnapshotUpdate
-				) {
-					const agentDef = mainThreadAgentDefinition;
-					const choice = await launchSnapshotUpdateDialog(root, {
-						agentType: agentDef.agentType,
-						scope: agentDef.memory!,
-						snapshotTimestamp:
-							agentDef.pendingSnapshotUpdate!.snapshotTimestamp,
-					});
-					if (choice === "merge") {
-						const { buildMergePrompt } =
-							await import("./components/agents/SnapshotUpdateDialog.js");
-						const mergePrompt = buildMergePrompt(
-							agentDef.agentType,
-							agentDef.memory!,
-						);
-						inputPrompt = inputPrompt
-							? `${mergePrompt}\n\n${inputPrompt}`
-							: mergePrompt;
-					}
-					agentDef.pendingSnapshotUpdate = undefined;
-				}
-
-				// Skip executing /login if we just completed onboarding for it
-				if (
-					onboardingShown &&
-					prompt?.trim().toLowerCase() === "/login"
-				) {
-					prompt = "";
-				}
-
-				if (onboardingShown) {
-					// Refresh auth-dependent services now that the user has logged in during onboarding.
-					// Keep in sync with the post-login logic in src/commands/login.tsx
-					void refreshRemoteManagedSettings();
-					void refreshPolicyLimits();
-					// Clear user data cache BEFORE GrowthBook refresh so it picks up fresh credentials
-					resetUserCache();
-					// Refresh GrowthBook after login to get updated feature flags (e.g., for claude.ai MCPs)
-					refreshGrowthBookAfterAuthChange();
-					// Clear any stale trusted device token then enroll for Remote Control.
-					// Both self-gate on tengu_sessions_elevated_auth_enforcement internally
-					// — enrollTrustedDevice() via checkGate_CACHED_OR_BLOCKING (awaits
-					// the GrowthBook reinit above), clearTrustedDeviceToken() via the
-					// sync cached check (acceptable since clear is idempotent).
-					void import("./bridge/trustedDevice.js").then((m) => {
-						m.clearTrustedDeviceToken();
-						return m.enrollTrustedDevice();
-					});
-				}
-
-				// Validate that the active token's org matches forceLoginOrgUUID (if set
-				// in managed settings). Runs after onboarding so managed settings and
-				// login state are fully loaded.
-				const orgValidation = await validateForceLoginOrg();
-				if (!orgValidation.valid) {
-					await exitWithError(root, (orgValidation as { valid: false; message: string }).message);
-				}
-			}
-
-			// If gracefulShutdown was initiated (e.g., user rejected trust dialog),
-			// process.exitCode will be set. Skip all subsequent operations that could
-			// trigger code execution before the process exits (e.g. we don't want apiKeyHelper
-			// to run if trust was not established).
-			if (process.exitCode !== undefined) {
-				logForDebugging(
-					"Graceful shutdown initiated, skipping further initialization",
-				);
-				return;
-			}
-
-			// Initialize LSP manager AFTER trust is established (or in non-interactive mode
-			// where trust is implicit). This prevents plugin LSP servers from executing
-			// code in untrusted directories before user consent.
-			// Must be after inline plugins are set (if any) so --plugin-dir LSP servers are included.
-			initializeLspServerManager();
-
-			// Show settings validation errors after trust is established
-			// MCP config errors don't block settings from loading, so exclude them
-			if (!isNonInteractiveSession) {
-				const { errors } = getSettingsWithErrors();
-				const nonMcpErrors = errors.filter((e) => !e.mcpErrorMetadata);
-				if (nonMcpErrors.length > 0) {
-					await launchInvalidSettingsDialog(root, {
-						settingsErrors: nonMcpErrors,
-						onExit: () => gracefulShutdownSync(1),
-					});
-				}
-			}
-
-			// Check quota status, fast mode, passes eligibility, and bootstrap data
-			// after trust is established. These make API calls which could trigger
-			// apiKeyHelper execution.
-			// --bare / SIMPLE: skip — these are cache-warms for the REPL's
-			// first-turn responsiveness (quota, passes, fastMode, bootstrap data). Fast
-			// mode doesn't apply to the Agent SDK anyway (see getFastModeUnavailableReason).
-			const bgRefreshThrottleMs = getFeatureValue_CACHED_MAY_BE_STALE(
-				"tengu_cicada_nap_ms",
-				0,
-			);
-			const lastPrefetched = getGlobalConfig().startupPrefetchedAt ?? 0;
-			const skipStartupPrefetches =
-				isBareMode() ||
-				(bgRefreshThrottleMs > 0 &&
-					Date.now() - lastPrefetched < bgRefreshThrottleMs);
-
-			if (!skipStartupPrefetches) {
-				const lastPrefetchedInfo =
-					lastPrefetched > 0
-						? ` last ran ${Math.round((Date.now() - lastPrefetched) / 1000)}s ago`
-						: "";
-				logForDebugging(
-					`Starting background startup prefetches${lastPrefetchedInfo}`,
-				);
-
-				checkQuotaStatus().catch((error) => logError(error));
-
-				// Fetch bootstrap data from the server and update all cache values.
-				void fetchBootstrapData();
-
-				// TODO: Consolidate other prefetches into a single bootstrap request.
-				void prefetchPassesEligibility();
-				if (
-					!getFeatureValue_CACHED_MAY_BE_STALE(
-						"tengu_miraculo_the_bard",
-						false,
-					)
-				) {
-					void prefetchFastModeStatus();
-				} else {
-					// Kill switch skips the network call, not org-policy enforcement.
-					// Resolve from cache so orgStatus doesn't stay 'pending' (which
-					// getFastModeUnavailableReason treats as permissive).
-					resolveFastModeStatusFromCache();
-				}
-				if (bgRefreshThrottleMs > 0) {
-					saveGlobalConfig((current) => ({
-						...current,
-						startupPrefetchedAt: Date.now(),
-					}));
-				}
-			} else {
-				logForDebugging(
-					`Skipping startup prefetches, last ran ${Math.round((Date.now() - lastPrefetched) / 1000)}s ago`,
-				);
-				// Resolve fast mode org status from cache (no network)
-				resolveFastModeStatusFromCache();
-			}
-
-			if (!isNonInteractiveSession) {
-				void refreshExampleCommands(); // Pre-fetch example commands (runs git log, no API call)
-			}
-
-			// Resolve MCP configs (started early, overlaps with setup/trust dialog work)
-			const { servers: existingMcpConfigs } = await mcpConfigPromise;
-			logForDebugging(
-				`[STARTUP] MCP configs resolved in ${mcpConfigResolvedMs}ms (awaited at +${Date.now() - mcpConfigStart}ms)`,
-			);
-			// CLI flag (--mcp-config) should override file-based configs, matching settings precedence
-			const allMcpConfigs = {
-				...existingMcpConfigs,
-				...dynamicMcpConfig,
-			};
-
-			// Separate SDK configs from regular MCP configs
-			const sdkMcpConfigs: Record<string, McpSdkServerConfig> = {};
-			const regularMcpConfigs: Record<string, ScopedMcpServerConfig> = {};
-
-			for (const [name, config] of Object.entries(allMcpConfigs)) {
-				const typedConfig = config as
-					| ScopedMcpServerConfig
-					| McpSdkServerConfig;
-				if (typedConfig.type === "sdk") {
-					sdkMcpConfigs[name] = typedConfig as McpSdkServerConfig;
-				} else {
-					regularMcpConfigs[name] =
-						typedConfig as ScopedMcpServerConfig;
-				}
-			}
-
-			profileCheckpoint("action_mcp_configs_loaded");
-
-			// Prefetch MCP resources after trust dialog (this is where execution happens).
-			// Interactive mode only: print mode defers connects until headlessStore exists
-			// and pushes per-server (below), so ToolSearch's pending-client handling works
-			// and one slow server doesn't block the batch.
-			const localMcpPromise = isNonInteractiveSession
-				? Promise.resolve({ clients: [], tools: [], commands: [] })
-				: prefetchAllMcpResources(regularMcpConfigs);
-			const claudeaiMcpPromise = isNonInteractiveSession
-				? Promise.resolve({ clients: [], tools: [], commands: [] })
-				: claudeaiConfigPromise.then((configs) =>
-						Object.keys(configs).length > 0
-							? prefetchAllMcpResources(configs)
-							: { clients: [], tools: [], commands: [] },
-					);
-			// Merge with dedup by name: each prefetchAllMcpResources call independently
-			// adds helper tools (ListMcpResourcesTool, ReadMcpResourceTool) via
-			// local dedup flags, so merging two calls can yield duplicates. print.ts
-			// already uniqBy's the final tool pool, but dedup here keeps appState clean.
-			const mcpPromise = Promise.all([
-				localMcpPromise,
-				claudeaiMcpPromise,
-			]).then(([local, claudeai]) => ({
-				clients: [...local.clients, ...claudeai.clients],
-				tools: uniqBy([...local.tools, ...claudeai.tools], "name"),
-				commands: uniqBy(
-					[...local.commands, ...claudeai.commands],
-					"name",
-				),
-			}));
-
-			// Start hooks early so they run in parallel with MCP connections.
-			// Skip for initOnly/init/maintenance (handled separately), non-interactive
-			// (handled via setupTrigger), and resume/continue (conversationRecovery.ts
-			// fires 'resume' instead — without this guard, hooks fire TWICE on /resume
-			// and the second systemMessage clobbers the first. gh-30825)
-			const hooksPromise =
-				initOnly ||
-				init ||
-				maintenance ||
-				isNonInteractiveSession ||
-				options.continue ||
-				options.resume
-					? null
-					: processSessionStartHooks("startup", {
-							agentType: mainThreadAgentDefinition?.agentType,
-							model: resolvedInitialModel,
-						});
-
-			// MCP never blocks REPL render OR turn 1 TTFT. useManageMCPConnections
-			// populates appState.mcp async as servers connect (connectToServer is
-			// memoized — the prefetch calls above and the hook converge on the same
-			// connections). getToolUseContext reads store.getState() fresh via
-			// computeTools(), so turn 1 sees whatever's connected by query time.
-			// Slow servers populate for turn 2+. Matches interactive-no-prompt
-			// behavior. Print mode: per-server push into headlessStore (below).
-			const hookMessages: Awaited<NonNullable<typeof hooksPromise>> = [];
-			// Suppress transient unhandledRejection — the prefetch warms the
-			// memoized connectToServer cache but nobody awaits it in interactive.
-			mcpPromise.catch(() => {});
-
-			const mcpClients: Awaited<typeof mcpPromise>["clients"] = [];
-			const mcpTools: Awaited<typeof mcpPromise>["tools"] = [];
-			const mcpCommands: Awaited<typeof mcpPromise>["commands"] = [];
-
-			let thinkingEnabled = shouldEnableThinkingByDefault();
-			let thinkingConfig: ThinkingConfig =
-				thinkingEnabled !== false
-					? { type: "adaptive" }
-					: { type: "disabled" };
-
-			if (
-				options.thinking === "adaptive" ||
-				options.thinking === "enabled"
-			) {
-				thinkingEnabled = true;
-				thinkingConfig = { type: "adaptive" };
-			} else if (options.thinking === "disabled") {
-				thinkingEnabled = false;
-				thinkingConfig = { type: "disabled" };
-			} else {
-				const maxThinkingTokens = process.env.MAX_THINKING_TOKENS
-					? parseInt(process.env.MAX_THINKING_TOKENS, 10)
-					: options.maxThinkingTokens;
-				if (maxThinkingTokens !== undefined) {
-					if (maxThinkingTokens > 0) {
-						thinkingEnabled = true;
-						thinkingConfig = {
-							type: "enabled",
-							budgetTokens: maxThinkingTokens,
-						};
-					} else if (maxThinkingTokens === 0) {
-						thinkingEnabled = false;
-						thinkingConfig = { type: "disabled" };
-					}
-				}
-			}
-
-			logForDiagnosticsNoPII("info", "started", {
-				version: MACRO.VERSION,
-				is_native_binary: isInBundledMode(),
-			});
-
-			registerCleanup(async () => {
-				logForDiagnosticsNoPII("info", "exited");
-			});
-
-			void logTenguInit({
-				hasInitialPrompt: Boolean(prompt),
-				hasStdin: Boolean(inputPrompt),
-				verbose,
-				debug,
-				debugToStderr,
-				print: print ?? false,
-				outputFormat: outputFormat ?? "text",
-				inputFormat: inputFormat ?? "text",
-				numAllowedTools: allowedTools.length,
-				numDisallowedTools: disallowedTools.length,
-				mcpClientCount: Object.keys(allMcpConfigs).length,
-				worktreeEnabled,
-				skipWebFetchPreflight:
-					getInitialSettings().skipWebFetchPreflight,
-				githubActionInputs: process.env.GITHUB_ACTION_INPUTS,
-				dangerouslySkipPermissionsPassed:
-					dangerouslySkipPermissions ?? false,
-				permissionMode,
-				modeIsBypass: permissionMode === "bypassPermissions",
-				allowDangerouslySkipPermissionsPassed:
-					allowDangerouslySkipPermissions,
-				systemPromptFlag: systemPrompt
-					? options.systemPromptFile
-						? "file"
-						: "flag"
-					: undefined,
-				appendSystemPromptFlag: appendSystemPrompt
-					? options.appendSystemPromptFile
-						? "file"
-						: "flag"
-					: undefined,
-				thinkingConfig,
-				assistantActivationPath:
-					feature("KAIROS") && kairosEnabled
-						? assistantModule?.getAssistantActivationPath()
-						: undefined,
-			});
-
-			// Log context metrics once at initialization
-			void logContextMetrics(regularMcpConfigs, toolPermissionContext);
-
-			void logPermissionContextForAnts(null, "initialization");
-
-			logManagedSettings();
-
-			// Register PID file for concurrent-session detection (~/.claude/sessions/)
-			// and fire multi-clauding telemetry. Lives here (not init.ts) so only the
-			// REPL path registers — not subcommands like `claude doctor`. Chained:
-			// count must run after register's write completes or it misses our own file.
-			void registerSession().then((registered) => {
-				if (!registered) return;
-				if (sessionNameArg) {
-					void updateSessionName(sessionNameArg);
-				}
-				void countConcurrentSessions().then((count) => {
-					if (count >= 2) {
-						logEvent("tengu_concurrent_sessions", {
-							num_sessions: count,
-						});
-					}
-				});
-			});
-
-			// Initialize versioned plugins system (triggers V1→V2 migration if
-			// needed). Then run orphan GC, THEN warm the Grep/Glob exclusion cache.
-			// Sequencing matters: the warmup scans disk for .orphaned_at markers,
-			// so it must see the GC's Pass 1 (remove markers from reinstalled
-			// versions) and Pass 2 (stamp unmarked orphans) already applied. The
-			// warm also lands before autoupdate (fires on first submit in REPL)
-			// can orphan this session's active version underneath us.
-			// --bare / SIMPLE: skip plugin version sync + orphan cleanup. These
-			// are install/upgrade bookkeeping that scripted calls don't need —
-			// the next interactive session will reconcile. The await here was
-			// blocking -p on a marketplace round-trip.
-			if (isBareMode()) {
-				// skip — no-op
-			} else if (isNonInteractiveSession) {
-				// In headless mode, await to ensure plugin sync completes before CLI exits
-				await initializeVersionedPlugins();
-				profileCheckpoint("action_after_plugins_init");
-				void cleanupOrphanedPluginVersionsInBackground().then(() =>
-					getGlobExclusionsForPluginCache(),
-				);
-			} else {
-				// In interactive mode, fire-and-forget — this is purely bookkeeping
-				// that doesn't affect runtime behavior of the current session
-				void initializeVersionedPlugins().then(async () => {
-					profileCheckpoint("action_after_plugins_init");
-					await cleanupOrphanedPluginVersionsInBackground();
-					void getGlobExclusionsForPluginCache();
-				});
-			}
-
-			const setupTrigger =
-				initOnly || init ? "init" : maintenance ? "maintenance" : null;
-			if (initOnly) {
-				applyConfigEnvironmentVariables();
-				await processSetupHooks("init", { forceSyncExecution: true });
-				await processSessionStartHooks("startup", {
-					forceSyncExecution: true,
-				});
-				gracefulShutdownSync(0);
-				return;
-			}
-
-			// --print mode
-			if (isNonInteractiveSession) {
-				if (outputFormat === "stream-json" || outputFormat === "json") {
-					setHasFormattedOutput(true);
-				}
-
-				// Apply full environment variables in print mode since trust dialog is bypassed
-				// This includes potentially dangerous environment variables from untrusted sources
-				// but print mode is considered trusted (as documented in help text)
-				applyConfigEnvironmentVariables();
-
-				// Initialize telemetry after env vars are applied so OTEL endpoint env vars and
-				// otelHeadersHelper (which requires trust to execute) are available.
-				initializeTelemetryAfterTrust();
-
-				// Kick SessionStart hooks now so the subprocess spawn overlaps with
-				// MCP connect + plugin init + print.ts import below. loadInitialMessages
-				// joins this at print.ts:4397. Guarded same as loadInitialMessages —
-				// continue/resume/teleport paths don't fire startup hooks (or fire them
-				// conditionally inside the resume branch, where this promise is
-				// undefined and the ?? fallback runs). Also skip when setupTrigger is
-				// set — those paths run setup hooks first (print.ts:544), and session
-				// start hooks must wait until setup completes.
-				const sessionStartHooksPromise =
-					options.continue ||
-					options.resume ||
-					teleport ||
-					setupTrigger
-						? undefined
-						: processSessionStartHooks("startup");
-				// Suppress transient unhandledRejection if this rejects before
-				// loadInitialMessages awaits it. Downstream await still observes the
-				// rejection — this just prevents the spurious global handler fire.
-				sessionStartHooksPromise?.catch(() => {});
-
-				profileCheckpoint("before_validateForceLoginOrg");
-				// Validate org restriction for non-interactive sessions
-				const orgValidation = await validateForceLoginOrg();
-				if (!orgValidation.valid) {
-					process.stderr.write((orgValidation as { valid: false; message: string }).message + "\n");
-					process.exit(1);
-				}
-
-				// Headless mode supports all prompt commands and some local commands
-				// If disableSlashCommands is true, return empty array
-				const commandsHeadless = disableSlashCommands
-					? []
-					: commands.filter(
-							(command) =>
-								(command.type === "prompt" &&
-									!command.disableNonInteractive) ||
-								(command.type === "local" &&
-									command.supportsNonInteractive),
-						);
-
-				const defaultState = getDefaultAppState();
-				const headlessInitialState: AppState = {
-					...defaultState,
-					mcp: {
-						...defaultState.mcp,
-						clients: mcpClients,
-						commands: mcpCommands,
-						tools: mcpTools,
-					},
-					toolPermissionContext,
-					effortValue:
-						parseEffortValue(options.effort) ??
-						getInitialEffortSetting(),
-					...(isFastModeEnabled() && {
-						fastMode: getInitialFastModeSetting(
-							effectiveModel ?? null,
-						),
-					}),
-					...(isAdvisorEnabled() && advisorModel && { advisorModel }),
-					// kairosEnabled gates the async fire-and-forget path in
-					// executeForkedSlashCommand (processSlashCommand.tsx:132) and
-					// AgentTool's shouldRunAsync. The REPL initialState sets this at
-					// ~3459; headless was defaulting to false, so the daemon child's
-					// scheduled tasks and Agent-tool calls ran synchronously — N
-					// overdue cron tasks on spawn = N serial subagent turns blocking
-					// user input. Computed at :1620, well before this branch.
-					...(feature("KAIROS") ? { kairosEnabled } : {}),
-				};
-
-				// Init app state
-				const headlessStore = createStore(
-					headlessInitialState,
-					onChangeAppState,
-				);
-
-				// Check if bypassPermissions should be disabled based on Statsig gate
-				// This runs in parallel to the code below, to avoid blocking the main loop.
-				if (
-					toolPermissionContext.mode === "bypassPermissions" ||
-					allowDangerouslySkipPermissions
-				) {
-					void checkAndDisableBypassPermissions(
-						toolPermissionContext,
-					);
-				}
-
-				// Async check of auto mode gate — corrects state and disables auto if needed.
-				// Gated on TRANSCRIPT_CLASSIFIER (not USER_TYPE) so GrowthBook kill switch runs for external builds too.
-				if (feature("TRANSCRIPT_CLASSIFIER")) {
-					void verifyAutoModeGateAccess(
-						toolPermissionContext,
-						headlessStore.getState().fastMode,
-					).then(({ updateContext }) => {
-						headlessStore.setState((prev) => {
-							const nextCtx = updateContext(
-								prev.toolPermissionContext,
-							);
-							if (nextCtx === prev.toolPermissionContext)
-								return prev;
-							return { ...prev, toolPermissionContext: nextCtx };
-						});
-					});
-				}
-
-				// Set global state for session persistence
-				if (options.sessionPersistence === false) {
-					setSessionPersistenceDisabled(true);
-				}
-
-				// Store SDK betas in global state for context window calculation
-				// Only store allowed betas (filters by allowlist and subscriber status)
-				setSdkBetas(filterAllowedSdkBetas(betas));
-
-				// Print-mode MCP: per-server incremental push into headlessStore.
-				// Mirrors useManageMCPConnections — push pending first (so ToolSearch's
-				// pending-check at ToolSearchTool.ts:334 sees them), then replace with
-				// connected/failed as each server settles.
-				const connectMcpBatch = (
-					configs: Record<string, ScopedMcpServerConfig>,
-					label: string,
-				): Promise<void> => {
-					if (Object.keys(configs).length === 0)
-						return Promise.resolve();
-					headlessStore.setState((prev) => ({
-						...prev,
-						mcp: {
-							...prev.mcp,
-							clients: [
-								...prev.mcp.clients,
-								...Object.entries(configs).map(
-									([name, config]) => ({
-										name,
-										type: "pending" as const,
-										config,
-									}),
-								),
-							],
-						},
-					}));
-					return getMcpToolsCommandsAndResources(
-						({ client, tools, commands }) => {
-							headlessStore.setState((prev) => ({
-								...prev,
-								mcp: {
-									...prev.mcp,
-									clients: prev.mcp.clients.some(
-										(c) => c.name === client.name,
-									)
-										? prev.mcp.clients.map((c) =>
-												c.name === client.name
-													? client
-													: c,
-											)
-										: [...prev.mcp.clients, client],
-									tools: uniqBy(
-										[...prev.mcp.tools, ...tools],
-										"name",
-									),
-									commands: uniqBy(
-										[...prev.mcp.commands, ...commands],
-										"name",
-									),
-								},
-							}));
-						},
-						configs,
-					).catch((err) =>
-						logForDebugging(`[MCP] ${label} connect error: ${err}`),
-					);
-				};
-				// Await all MCP configs — print mode is often single-turn, so
-				// "late-connecting servers visible next turn" doesn't help. SDK init
-				// message and turn-1 tool list both need configured MCP tools present.
-				// Zero-server case is free via the early return in connectMcpBatch.
-				// Connectors parallelize inside getMcpToolsCommandsAndResources
-				// (processBatched with Promise.all). claude.ai is awaited too — its
-				// fetch was kicked off early (line ~2558) so only residual time blocks
-				// here. --bare skips claude.ai entirely for perf-sensitive scripts.
-				profileCheckpoint("before_connectMcp");
-				await connectMcpBatch(regularMcpConfigs, "regular");
-				profileCheckpoint("after_connectMcp");
-				// Dedup: suppress plugin MCP servers that duplicate a claude.ai
-				// connector (connector wins), then connect claude.ai servers.
-				// Bounded wait — #23725 made this blocking so single-turn -p sees
-				// connectors, but with 40+ slow connectors tengu_startup_perf p99
-				// climbed to 76s. If fetch+connect doesn't finish in time, proceed;
-				// the promise keeps running and updates headlessStore in the
-				// background so turn 2+ still sees connectors.
-				const CLAUDE_AI_MCP_TIMEOUT_MS = 5_000;
-				const claudeaiConnect = claudeaiConfigPromise.then(
-					(claudeaiConfigs) => {
-						if (Object.keys(claudeaiConfigs).length > 0) {
-							const claudeaiSigs = new Set<string>();
-							for (const config of Object.values(
-								claudeaiConfigs,
-							)) {
-								const sig = getMcpServerSignature(config);
-								if (sig) claudeaiSigs.add(sig);
-							}
-							const suppressed = new Set<string>();
-							for (const [name, config] of Object.entries(
-								regularMcpConfigs,
-							)) {
-								if (!name.startsWith("plugin:")) continue;
-								const sig = getMcpServerSignature(config);
-								if (sig && claudeaiSigs.has(sig))
-									suppressed.add(name);
-							}
-							if (suppressed.size > 0) {
-								logForDebugging(
-									`[MCP] Lazy dedup: suppressing ${suppressed.size} plugin server(s) that duplicate claude.ai connectors: ${[...suppressed].join(", ")}`,
-								);
-								// Disconnect before filtering from state. Only connected
-								// servers need cleanup — clearServerCache on a never-connected
-								// server triggers a real connect just to kill it (memoize
-								// cache-miss path, see useManageMCPConnections.ts:870).
-								for (const c of headlessStore.getState().mcp
-									.clients) {
-									if (
-										!suppressed.has(c.name) ||
-										c.type !== "connected"
-									)
-										continue;
-									c.client.onclose = undefined;
-									void clearServerCache(
-										c.name,
-										c.config,
-									).catch(() => {});
-								}
-								headlessStore.setState((prev) => {
-									let {
-										clients,
-										tools,
-										commands,
-										resources,
-									} = prev.mcp;
-									clients = clients.filter(
-										(c) => !suppressed.has(c.name),
-									);
-									tools = tools.filter(
-										(t) =>
-											!t.mcpInfo ||
-											!suppressed.has(
-												t.mcpInfo.serverName,
-											),
-									);
-									for (const name of suppressed) {
-										commands = excludeCommandsByServer(
-											commands,
-											name,
-										);
-										resources = excludeResourcesByServer(
-											resources,
-											name,
-										);
-									}
-									return {
-										...prev,
-										mcp: {
-											...prev.mcp,
-											clients,
-											tools,
-											commands,
-											resources,
-										},
-									};
-								});
-							}
-						}
-						// Suppress claude.ai connectors that duplicate an enabled
-						// manual server (URL-signature match). Plugin dedup above only
-						// handles `plugin:*` keys; this catches manual `.mcp.json` entries.
-						// plugin:* must be excluded here — step 1 already suppressed
-						// those (claude.ai wins); leaving them in suppresses the
-						// connector too, and neither survives (gh-39974).
-						const nonPluginConfigs = pickBy(
-							regularMcpConfigs,
-							(_, n) => !n.startsWith("plugin:"),
-						);
-						const { servers: dedupedClaudeAi } =
-							dedupClaudeAiMcpServers(
-								claudeaiConfigs,
-								nonPluginConfigs,
-							);
-						return connectMcpBatch(dedupedClaudeAi, "claudeai");
-					},
-				);
-				let claudeaiTimer: ReturnType<typeof setTimeout> | undefined;
-				const claudeaiTimedOut = await Promise.race([
-					claudeaiConnect.then(() => false),
-					new Promise<boolean>((resolve) => {
-						claudeaiTimer = setTimeout(
-							(r) => r(true),
-							CLAUDE_AI_MCP_TIMEOUT_MS,
-							resolve,
-						);
-					}),
-				]);
-				if (claudeaiTimer) clearTimeout(claudeaiTimer);
-				if (claudeaiTimedOut) {
-					logForDebugging(
-						`[MCP] claude.ai connectors not ready after ${CLAUDE_AI_MCP_TIMEOUT_MS}ms — proceeding; background connection continues`,
-					);
-				}
-				profileCheckpoint("after_connectMcp_claudeai");
-
-				// In headless mode, start deferred prefetches immediately (no user typing delay)
-				// --bare / SIMPLE: startDeferredPrefetches early-returns internally.
-				// backgroundHousekeeping (initExtractMemories, pruneShellSnapshots,
-				// cleanupOldMessageFiles) and sdkHeapDumpMonitor are all bookkeeping
-				// that scripted calls don't need — the next interactive session reconciles.
-				if (!isBareMode()) {
-					startDeferredPrefetches();
-					void import("./utils/backgroundHousekeeping.js").then((m) =>
-						m.startBackgroundHousekeeping(),
-					);
-					if (process.env.USER_TYPE === "ant") {
-						void import("./utils/sdkHeapDumpMonitor.js").then((m) =>
-							m.startSdkMemoryMonitor(),
-						);
-					}
-				}
-
-				logSessionTelemetry();
-				profileCheckpoint("before_print_import");
-				const { runHeadless } = await import("src/cli/print.js");
-				profileCheckpoint("after_print_import");
-				void runHeadless(
-					inputPrompt,
-					() => headlessStore.getState(),
-					headlessStore.setState,
-					commandsHeadless,
-					tools,
-					sdkMcpConfigs,
-					agentDefinitions.activeAgents,
-					{
-						continue: options.continue,
-						resume: options.resume,
-						verbose: verbose,
-						outputFormat: outputFormat,
-						jsonSchema,
-						permissionPromptToolName: options.permissionPromptTool,
-						allowedTools,
-						thinkingConfig,
-						maxTurns: options.maxTurns,
-						maxBudgetUsd: options.maxBudgetUsd,
-						taskBudget: options.taskBudget
-							? { total: options.taskBudget }
-							: undefined,
-						systemPrompt,
-						appendSystemPrompt,
-						userSpecifiedModel: effectiveModel,
-						fallbackModel: userSpecifiedFallbackModel,
-						teleport,
-						sdkUrl,
-						replayUserMessages: effectiveReplayUserMessages,
-						includePartialMessages: effectiveIncludePartialMessages,
-						forkSession: options.forkSession || false,
-						resumeSessionAt: options.resumeSessionAt || undefined,
-						rewindFiles: options.rewindFiles,
-						enableAuthStatus: options.enableAuthStatus,
-						agent: agentCli,
-						workload: options.workload,
-						setupTrigger: setupTrigger ?? undefined,
-						sessionStartHooksPromise,
-					},
-				);
-				return;
-			}
-
-			// Log model config at startup
-			logEvent("tengu_startup_manual_model_config", {
-				cli_flag:
-					options.model as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-				env_var: process.env
-					.ANTHROPIC_MODEL as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-				settings_file: (getInitialSettings() || {})
-					.model as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-				subscriptionType:
-					getSubscriptionType() as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-				agent: agentSetting as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-			});
-
-			// Get deprecation warning for the initial model (resolvedInitialModel computed earlier for hooks parallelization)
-			const deprecationWarning =
-				getModelDeprecationWarning(resolvedInitialModel);
-
-			// Build initial notification queue
-			const initialNotifications: Array<{
-				key: string;
-				text: string;
-				color?: "warning";
-				priority: "high";
-			}> = [];
-			if (permissionModeNotification) {
-				initialNotifications.push({
-					key: "permission-mode-notification",
-					text: permissionModeNotification,
-					priority: "high",
-				});
-			}
-			if (deprecationWarning) {
-				initialNotifications.push({
-					key: "model-deprecation-warning",
-					text: deprecationWarning,
-					color: "warning",
-					priority: "high",
-				});
-			}
-			if (overlyBroadBashPermissions.length > 0) {
-				const displayList = uniq(
-					overlyBroadBashPermissions.map((p) => p.ruleDisplay),
-				);
-				const displays = displayList.join(", ");
-				const sources = uniq(
-					overlyBroadBashPermissions.map((p) => p.sourceDisplay),
-				).join(", ");
-				const n = displayList.length;
-				initialNotifications.push({
-					key: "overly-broad-bash-notification",
-					text: `${displays} allow ${plural(n, "rule")} from ${sources} ${plural(n, "was", "were")} ignored \u2014 not available for Ants, please use auto-mode instead`,
-					color: "warning",
-					priority: "high",
-				});
-			}
-
-			const effectiveToolPermissionContext = {
-				...toolPermissionContext,
-				mode:
-					isAgentSwarmsEnabled() &&
-					getTeammateUtils().isPlanModeRequired()
-						? ("plan" as const)
-						: toolPermissionContext.mode,
-			};
-			// All startup opt-in paths (--tools, --brief, defaultView) have fired
-			// above; initialIsBriefOnly just reads the resulting state.
-			const initialIsBriefOnly =
-				feature("KAIROS") || feature("KAIROS_BRIEF")
-					? getUserMsgOptIn()
-					: false;
-			const fullRemoteControl =
-				remoteControl || getRemoteControlAtStartup() || kairosEnabled;
-			let ccrMirrorEnabled = false;
-			if (feature("CCR_MIRROR") && !fullRemoteControl) {
-				/* eslint-disable @typescript-eslint/no-require-imports */
-				const { isCcrMirrorEnabled } =
-					require("./bridge/bridgeEnabled.js") as typeof import("./bridge/bridgeEnabled.js");
-				/* eslint-enable @typescript-eslint/no-require-imports */
-				ccrMirrorEnabled = isCcrMirrorEnabled();
-			}
-
-			const initialState: AppState = {
-				settings: getInitialSettings(),
-				tasks: {},
-				agentNameRegistry: new Map(),
-				verbose: verbose ?? getGlobalConfig().verbose ?? false,
-				mainLoopModel: initialMainLoopModel,
-				mainLoopModelForSession: null,
-				isBriefOnly: initialIsBriefOnly,
-				expandedView: getGlobalConfig().showSpinnerTree
-					? "teammates"
-					: getGlobalConfig().showExpandedTodos
-						? "tasks"
-						: "none",
-				showTeammateMessagePreview: isAgentSwarmsEnabled()
-					? false
-					: undefined,
-				selectedIPAgentIndex: -1,
-				coordinatorTaskIndex: -1,
-				viewSelectionMode: "none",
-				footerSelection: null,
-				toolPermissionContext: effectiveToolPermissionContext,
-				agent: mainThreadAgentDefinition?.agentType,
-				agentDefinitions,
-				mcp: {
-					clients: [],
-					tools: [],
-					commands: [],
-					resources: {},
-					pluginReconnectKey: 0,
-				},
-				plugins: {
-					enabled: [],
-					disabled: [],
-					commands: [],
-					errors: [],
-					installationStatus: {
-						marketplaces: [],
-						plugins: [],
-					},
-					needsRefresh: false,
-				},
-				statusLineText: undefined,
-				kairosEnabled,
-				remoteSessionUrl: undefined,
-				remoteConnectionStatus: "connecting",
-				remoteBackgroundTaskCount: 0,
-				replBridgeEnabled: fullRemoteControl || ccrMirrorEnabled,
-				replBridgeExplicit: remoteControl,
-				replBridgeOutboundOnly: ccrMirrorEnabled,
-				replBridgeConnected: false,
-				replBridgeSessionActive: false,
-				replBridgeReconnecting: false,
-				replBridgeConnectUrl: undefined,
-				replBridgeSessionUrl: undefined,
-				replBridgeEnvironmentId: undefined,
-				replBridgeSessionId: undefined,
-				replBridgeError: undefined,
-				replBridgeInitialName: remoteControlName,
-				showRemoteCallout: false,
-				notifications: {
-					current: null,
-					queue: initialNotifications,
-				},
-				elicitation: {
-					queue: [],
-				},
-				todos: {},
-				remoteAgentTaskSuggestions: [],
-				fileHistory: {
-					snapshots: [],
-					trackedFiles: new Set(),
-					snapshotSequence: 0,
-				},
-				attribution: createEmptyAttributionState(),
-				thinkingEnabled,
-				promptSuggestionEnabled: shouldEnablePromptSuggestion(),
-				sessionHooks: new Map(),
-				inbox: {
-					messages: [],
-				},
-				promptSuggestion: {
-					text: null,
-					promptId: null,
-					shownAt: 0,
-					acceptedAt: 0,
-					generationRequestId: null,
-				},
-				speculation: IDLE_SPECULATION_STATE,
-				speculationSessionTimeSavedMs: 0,
-				skillImprovement: {
-					suggestion: null,
-				},
-				workerSandboxPermissions: {
-					queue: [],
-					selectedIndex: 0,
-				},
-				pendingWorkerRequest: null,
-				pendingSandboxRequest: null,
-				authVersion: 0,
-				initialMessage: inputPrompt
-					? {
-							message: createUserMessage({
-								content: String(inputPrompt),
-							}),
-						}
-					: null,
-				effortValue:
-					parseEffortValue(options.effort) ??
-					getInitialEffortSetting(),
-				activeOverlays: new Set<string>(),
-				fastMode: getInitialFastModeSetting(resolvedInitialModel),
-				...(isAdvisorEnabled() && advisorModel && { advisorModel }),
-				// Compute teamContext synchronously to avoid useEffect setState during render.
-				// KAIROS: assistantTeamContext takes precedence — set earlier in the
-				// KAIROS block so Agent(name: "foo") can spawn in-process teammates
-				// without TeamCreate. computeInitialTeamContext() is for tmux-spawned
-				// teammates reading their own identity, not the assistant-mode leader.
-				teamContext: (feature("KAIROS")
-					? (assistantTeamContext ?? computeInitialTeamContext())
-					: computeInitialTeamContext()) as AppState["teamContext"],
-			};
-
-			// Add CLI initial prompt to history
-			if (inputPrompt) {
-				addToHistory(String(inputPrompt));
-			}
-
-			const initialTools = mcpTools;
-
-			// Increment numStartups synchronously — first-render readers like
-			// shouldShowEffortCallout (via useState initializer) need the updated
-			// value before setImmediate fires. Defer only telemetry.
-			saveGlobalConfig((current) => ({
-				...current,
-				numStartups: (current.numStartups ?? 0) + 1,
-			}));
-			setImmediate(() => {
-				void logStartupTelemetry();
-				logSessionTelemetry();
-			});
-
-			// Set up per-turn session environment data uploader (ant-only build).
-			// Default-enabled for all ant users when working in an Anthropic-owned
-			// repo. Captures git/filesystem state (NOT transcripts) at each turn so
-			// environments can be recreated at any user message index. Gating:
-			//   - Build-time: this import is stubbed in external builds.
-			//   - Runtime: uploader checks github.com/anthropics/* remote + gcloud auth.
-			//   - Safety: CLAUDE_CODE_DISABLE_SESSION_DATA_UPLOAD=1 bypasses (tests set this).
-			// Import is dynamic + async to avoid adding startup latency.
-			const sessionUploaderPromise =
-				process.env.USER_TYPE === "ant"
-					? import("./utils/sessionDataUploader.js")
-					: null;
-
-			// Defer session uploader resolution to the onTurnComplete callback to avoid
-			// adding a new top-level await in main.tsx (performance-critical path).
-			// The per-turn auth logic in sessionDataUploader.ts handles unauthenticated
-			// state gracefully (re-checks each turn, so auth recovery mid-session works).
-			const uploaderReady = sessionUploaderPromise
-				? sessionUploaderPromise
-						.then((mod) => mod.createSessionTurnUploader())
-						.catch(() => null)
-				: null;
-
-			const sessionConfig = {
-				debug: debug || debugToStderr,
-				commands: [...commands, ...mcpCommands],
-				initialTools,
-				mcpClients,
-				autoConnectIdeFlag: ide,
-				mainThreadAgentDefinition,
-				disableSlashCommands,
-				dynamicMcpConfig,
-				strictMcpConfig,
-				systemPrompt,
-				appendSystemPrompt,
-				taskListId,
-				thinkingConfig,
-				...(uploaderReady && {
-					onTurnComplete: (messages: MessageType[]) => {
-						void uploaderReady.then((uploader) =>
-							(uploader as ((msgs: MessageType[]) => void) | null)?.(messages),
-						);
-					},
-				}),
-			};
-
-			// Shared context for processResumedConversation calls
-			const resumeContext = {
-				modeApi: coordinatorModeModule,
-				mainThreadAgentDefinition,
-				agentDefinitions,
-				currentCwd,
-				cliAgents,
-				initialState,
-			};
-
-			if (options.continue) {
-				// Continue the most recent conversation directly
-				let resumeSucceeded = false;
-				try {
-					const resumeStart = performance.now();
-
-					// Clear stale caches before resuming to ensure fresh file/skill discovery
-					const { clearSessionCaches } =
-						await import("./commands/clear/caches.js");
-					clearSessionCaches();
-
-					const result = await loadConversationForResume(
-						undefined /* sessionId */,
-						undefined /* sourceFile */,
-					);
-					if (!result) {
-						logEvent("tengu_continue", {
-							success: false,
-						});
-						return await exitWithError(
-							root,
-							"No conversation found to continue",
-						);
-					}
-
-					const loaded = await processResumedConversation(
-						result,
-						{
-							forkSession: !!options.forkSession,
-							includeAttribution: true,
-							transcriptPath: result.fullPath,
-						},
-						resumeContext,
-					);
-
-					if (loaded.restoredAgentDef) {
-						mainThreadAgentDefinition = loaded.restoredAgentDef;
-					}
-
-					maybeActivateProactive(options);
-					maybeActivateBrief(options);
-
-					logEvent("tengu_continue", {
-						success: true,
-						resume_duration_ms: Math.round(
-							performance.now() - resumeStart,
-						),
-					});
-					resumeSucceeded = true;
-
-					await launchRepl(
-						root,
-						{
-							getFpsMetrics,
-							stats,
-							initialState: loaded.initialState,
-						},
-						{
-							...sessionConfig,
-							mainThreadAgentDefinition:
-								loaded.restoredAgentDef ??
-								mainThreadAgentDefinition,
-							initialMessages: loaded.messages,
-							initialFileHistorySnapshots:
-								loaded.fileHistorySnapshots,
-							initialContentReplacements:
-								loaded.contentReplacements,
-							initialAgentName: loaded.agentName,
-							initialAgentColor: loaded.agentColor,
-						},
-						renderAndRun,
-					);
-				} catch (error) {
-					if (!resumeSucceeded) {
-						logEvent("tengu_continue", {
-							success: false,
-						});
-					}
-					logError(error);
-					process.exit(1);
-				}
-			} else if (feature("DIRECT_CONNECT") && _pendingConnect?.url) {
-				// `claude connect <url>` — full interactive TUI connected to a remote server
-				let directConnectConfig;
-				try {
-					const session = await createDirectConnectSession({
-						serverUrl: _pendingConnect.url,
-						authToken: _pendingConnect.authToken,
-						cwd: getOriginalCwd(),
-						dangerouslySkipPermissions:
-							_pendingConnect.dangerouslySkipPermissions,
-					});
-					if (session.workDir) {
-						setOriginalCwd(session.workDir);
-						setCwdState(session.workDir);
-					}
-					setDirectConnectServerUrl(_pendingConnect.url);
-					directConnectConfig = session.config;
-				} catch (err) {
-					return await exitWithError(
-						root,
-						err instanceof DirectConnectError
-							? err.message
-							: String(err),
-						() => gracefulShutdown(1),
-					);
-				}
-
-				const connectInfoMessage = createSystemMessage(
-					`Connected to server at ${_pendingConnect.url}\nSession: ${directConnectConfig.sessionId}`,
-					"info",
-				);
-
-				await launchRepl(
-					root,
-					{ getFpsMetrics, stats, initialState },
-					{
-						debug: debug || debugToStderr,
-						commands,
-						initialTools: [],
-						initialMessages: [connectInfoMessage],
-						mcpClients: [],
-						autoConnectIdeFlag: ide,
-						mainThreadAgentDefinition,
-						disableSlashCommands,
-						directConnectConfig,
-						thinkingConfig,
-					},
-					renderAndRun,
-				);
-				return;
-			} else if (feature("SSH_REMOTE") && _pendingSSH?.host) {
-				// `claude ssh <host> [dir]` — probe remote, deploy binary if needed,
-				// spawn ssh with unix-socket -R forward to a local auth proxy, hand
-				// the REPL an SSHSession. Tools run remotely, UI renders locally.
-				// `--local` skips probe/deploy/ssh and spawns the current binary
-				// directly with the same env — e2e test of the proxy/auth plumbing.
-				const {
-					createSSHSession,
-					createLocalSSHSession,
-					SSHSessionError,
-				} = await import("./ssh/createSSHSession.js");
-				let sshSession: import('./ssh/createSSHSession.js').SSHSession | undefined;
-				try {
-					if (_pendingSSH.local) {
-						process.stderr.write(
-							"Starting local ssh-proxy test session...\n",
-						);
-						sshSession = await createLocalSSHSession({
-							cwd: _pendingSSH.cwd,
-							permissionMode: _pendingSSH.permissionMode,
-							dangerouslySkipPermissions:
-								_pendingSSH.dangerouslySkipPermissions,
-						});
-					} else {
-						process.stderr.write(
-							`Connecting to ${_pendingSSH.host}…\n`,
-						);
-						// In-place progress: \r + EL0 (erase to end of line). Final \n on
-						// success so the next message lands on a fresh line. No-op when
-						// stderr isn't a TTY (piped/redirected) — \r would just emit noise.
-						const isTTY = process.stderr.isTTY;
-						let hadProgress = false;
-						sshSession = await createSSHSession(
-							{
-								host: _pendingSSH.host,
-								cwd: _pendingSSH.cwd,
-								localVersion: MACRO.VERSION,
-								permissionMode: _pendingSSH.permissionMode,
-								dangerouslySkipPermissions:
-									_pendingSSH.dangerouslySkipPermissions,
-								extraCliArgs: _pendingSSH.extraCliArgs,
-							},
-							isTTY
-								? {
-										onProgress: (msg: string) => {
-											hadProgress = true;
-											process.stderr.write(
-												`\r  ${msg}\x1b[K`,
-											);
-										},
-									}
-								: {},
-						);
-						if (hadProgress) process.stderr.write("\n");
-					}
-					setOriginalCwd(sshSession.remoteCwd);
-					setCwdState(sshSession.remoteCwd);
-					setDirectConnectServerUrl(
-						_pendingSSH.local ? "local" : _pendingSSH.host,
-					);
-				} catch (err) {
-					return await exitWithError(
-						root,
-						err instanceof SSHSessionError
-							? err.message
-							: String(err),
-						() => gracefulShutdown(1),
-					);
-				}
-
-				const sshInfoMessage = createSystemMessage(
-					_pendingSSH.local
-						? `Local ssh-proxy test session\ncwd: ${sshSession.remoteCwd}\nAuth: unix socket → local proxy`
-						: `SSH session to ${_pendingSSH.host}\nRemote cwd: ${sshSession.remoteCwd}\nAuth: unix socket -R → local proxy`,
-					"info",
-				);
-
-				await launchRepl(
-					root,
-					{ getFpsMetrics, stats, initialState },
-					{
-						debug: debug || debugToStderr,
-						commands,
-						initialTools: [],
-						initialMessages: [sshInfoMessage],
-						mcpClients: [],
-						autoConnectIdeFlag: ide,
-						mainThreadAgentDefinition,
-						disableSlashCommands,
-						sshSession,
-						thinkingConfig,
-					},
-					renderAndRun,
-				);
-				return;
-			} else if (
-				feature("KAIROS") &&
-				_pendingAssistantChat &&
-				(_pendingAssistantChat.sessionId ||
-					_pendingAssistantChat.discover)
-			) {
-				// `claude assistant [sessionId]` — REPL as a pure viewer client
-				// of a remote assistant session. The agentic loop runs remotely; this
-				// process streams live events and POSTs messages. History is lazy-
-				// loaded by useAssistantHistory on scroll-up (no blocking fetch here).
-				const { discoverAssistantSessions } =
-					await import("./assistant/sessionDiscovery.js");
-
-				let targetSessionId = _pendingAssistantChat.sessionId;
-
-				// Discovery flow — list bridge environments, filter sessions
-				if (!targetSessionId) {
-					let sessions;
-					try {
-						sessions = await discoverAssistantSessions();
-					} catch (e) {
-						return await exitWithError(
-							root,
-							`Failed to discover sessions: ${e instanceof Error ? e.message : e}`,
-							() => gracefulShutdown(1),
-						);
-					}
-					if (sessions.length === 0) {
-						let installedDir: string | null;
-						try {
-							installedDir =
-								await launchAssistantInstallWizard(root);
-						} catch (e) {
-							return await exitWithError(
-								root,
-								`Assistant installation failed: ${e instanceof Error ? e.message : e}`,
-								() => gracefulShutdown(1),
-							);
-						}
-						if (installedDir === null) {
-							await gracefulShutdown(0);
-							process.exit(0);
-						}
-						// The daemon needs a few seconds to spin up its worker and
-						// establish a bridge session before discovery will find it.
-						return await exitWithMessage(
-							root,
-							`Assistant installed in ${installedDir}. The daemon is starting up — run \`claude assistant\` again in a few seconds to connect.`,
-							{
-								exitCode: 0,
-								beforeExit: () => gracefulShutdown(0),
-							},
-						);
-					}
-					if (sessions.length === 1) {
-						targetSessionId = sessions[0]!.id;
-					} else {
-						const picked = await launchAssistantSessionChooser(
-							root,
-							{
-								sessions,
-							},
-						);
-						if (!picked) {
-							await gracefulShutdown(0);
-							process.exit(0);
-						}
-						targetSessionId = picked;
-					}
-				}
-
-				// Auth — call prepareApiRequest() once for orgUUID, but use a
-				// getAccessToken closure for the token so reconnects get fresh tokens.
-				const {
-					checkAndRefreshOAuthTokenIfNeeded,
-					getClaudeAIOAuthTokens,
-				} = await import("./utils/auth.js");
-				await checkAndRefreshOAuthTokenIfNeeded();
-				let apiCreds;
-				try {
-					apiCreds = await prepareApiRequest();
-				} catch (e) {
-					return await exitWithError(
-						root,
-						`Error: ${e instanceof Error ? e.message : "Failed to authenticate"}`,
-						() => gracefulShutdown(1),
-					);
-				}
-				const getAccessToken = (): string =>
-					getClaudeAIOAuthTokens()?.accessToken ??
-					apiCreds.accessToken;
-
-				// Brief mode activation: setKairosActive(true) satisfies BOTH opt-in
-				// and entitlement for isBriefEnabled() (BriefTool.ts:124-132).
-				setKairosActive(true);
-				setUserMsgOptIn(true);
-				setIsRemoteMode(true);
-
-				const remoteSessionConfig = createRemoteSessionConfig(
-					targetSessionId,
-					getAccessToken,
-					apiCreds.orgUUID,
-					/* hasInitialPrompt */ false,
-					/* viewerOnly */ true,
-				);
-
-				const infoMessage = createSystemMessage(
-					`Attached to assistant session ${targetSessionId.slice(0, 8)}…`,
-					"info",
-				);
-
-				const assistantInitialState: AppState = {
-					...initialState,
-					isBriefOnly: true,
-					kairosEnabled: false,
-					replBridgeEnabled: false,
-				};
-
-				const remoteCommands = filterCommandsForRemoteMode(commands);
-				await launchRepl(
-					root,
-					{
-						getFpsMetrics,
-						stats,
-						initialState: assistantInitialState,
-					},
-					{
-						debug: debug || debugToStderr,
-						commands: remoteCommands,
-						initialTools: [],
-						initialMessages: [infoMessage],
-						mcpClients: [],
-						autoConnectIdeFlag: ide,
-						mainThreadAgentDefinition,
-						disableSlashCommands,
-						remoteSessionConfig,
-						thinkingConfig,
-					},
-					renderAndRun,
-				);
-				return;
-			} else if (
-				options.resume ||
-				options.fromPr ||
-				teleport ||
-				remote !== null
-			) {
-				// Handle resume flow - from file (ant-only), session ID, or interactive selector
-
-				// Clear stale caches before resuming to ensure fresh file/skill discovery
-				const { clearSessionCaches } =
-					await import("./commands/clear/caches.js");
-				clearSessionCaches();
-
-				let messages: MessageType[] | null = null;
-				let processedResume: ProcessedResume | undefined;
-
-				let maybeSessionId = validateUuid(options.resume);
-				let searchTerm: string | undefined;
-				// Store full LogOption when found by custom title (for cross-worktree resume)
-				let matchedLog: LogOption | null = null;
-				// PR filter for --from-pr flag
-				let filterByPr: boolean | number | string | undefined;
-
-				// Handle --from-pr flag
-				if (options.fromPr) {
-					if (options.fromPr === true) {
-						// Show all sessions with linked PRs
-						filterByPr = true;
-					} else if (typeof options.fromPr === "string") {
-						// Could be a PR number or URL
-						filterByPr = options.fromPr;
-					}
-				}
-
-				// If resume value is not a UUID, try exact match by custom title first
-				if (
-					options.resume &&
-					typeof options.resume === "string" &&
-					!maybeSessionId
-				) {
-					const trimmedValue = options.resume.trim();
-					if (trimmedValue) {
-						const matches = await searchSessionsByCustomTitle(
-							trimmedValue,
-							{
-								exact: true,
-							},
-						);
-
-						if (matches.length === 1) {
-							// Exact match found - store full LogOption for cross-worktree resume
-							matchedLog = matches[0]!;
-							maybeSessionId =
-								getSessionIdFromLog(matchedLog) ?? null;
-						} else {
-							// No match or multiple matches - use as search term for picker
-							searchTerm = trimmedValue;
-						}
-					}
-				}
-
-				// --remote and --teleport both create/resume Claude Code Web (CCR) sessions.
-				// Remote Control (--rc) is a separate feature gated in initReplBridge.ts.
-				if (remote !== null || teleport) {
-					await waitForPolicyLimitsToLoad();
-					if (!isPolicyAllowed("allow_remote_sessions")) {
-						return await exitWithError(
-							root,
-							"Error: Remote sessions are disabled by your organization's policy.",
-							() => gracefulShutdown(1),
-						);
-					}
-				}
-
-				if (remote !== null) {
-					// Create remote session (optionally with initial prompt)
-					const hasInitialPrompt = remote.length > 0;
-
-					// Check if TUI mode is enabled - description is only optional in TUI mode
-					const isRemoteTuiEnabled =
-						getFeatureValue_CACHED_MAY_BE_STALE(
-							"tengu_remote_backend",
-							false,
-						);
-					if (!isRemoteTuiEnabled && !hasInitialPrompt) {
-						return await exitWithError(
-							root,
-							'Error: --remote requires a description.\nUsage: claude --remote "your task description"',
-							() => gracefulShutdown(1),
-						);
-					}
-
-					logEvent("tengu_remote_create_session", {
-						has_initial_prompt: String(
-							hasInitialPrompt,
-						) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-					});
-
-					// Pass current branch so CCR clones the repo at the right revision
-					const currentBranch = await getBranch();
-					const createdSession =
-						await teleportToRemoteWithErrorHandling(
-							root,
-							hasInitialPrompt ? remote : null,
-							new AbortController().signal,
-							currentBranch || undefined,
-						);
-					if (!createdSession) {
-						logEvent("tengu_remote_create_session_error", {
-							error: "unable_to_create_session" as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-						});
-						return await exitWithError(
-							root,
-							"Error: Unable to create remote session",
-							() => gracefulShutdown(1),
-						);
-					}
-					logEvent("tengu_remote_create_session_success", {
-						session_id:
-							createdSession.id as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-					});
-
-					// Check if new remote TUI mode is enabled via feature gate
-					if (!isRemoteTuiEnabled) {
-						// Original behavior: print session info and exit
-						process.stdout.write(
-							`Created remote session: ${createdSession.title}\n`,
-						);
-						process.stdout.write(
-							`View: ${getRemoteSessionUrl(createdSession.id)}?m=0\n`,
-						);
-						process.stdout.write(
-							`Resume with: claude --teleport ${createdSession.id}\n`,
-						);
-						await gracefulShutdown(0);
-						process.exit(0);
-					}
-
-					// New behavior: start local TUI with CCR engine
-					// Mark that we're in remote mode for command visibility
-					setIsRemoteMode(true);
-					switchSession(asSessionId(createdSession.id));
-
-					// Get OAuth credentials for remote session
-					let apiCreds: { accessToken: string; orgUUID: string };
-					try {
-						apiCreds = await prepareApiRequest();
-					} catch (error) {
-						logError(toError(error));
-						return await exitWithError(
-							root,
-							`Error: ${errorMessage(error) || "Failed to authenticate"}`,
-							() => gracefulShutdown(1),
-						);
-					}
-
-					// Create remote session config for the REPL
-					const { getClaudeAIOAuthTokens: getTokensForRemote } =
-						await import("./utils/auth.js");
-					const getAccessTokenForRemote = (): string =>
-						getTokensForRemote()?.accessToken ??
-						apiCreds.accessToken;
-					const remoteSessionConfig = createRemoteSessionConfig(
-						createdSession.id,
-						getAccessTokenForRemote,
-						apiCreds.orgUUID,
-						hasInitialPrompt,
-					);
-
-					// Add remote session info as initial system message
-					const remoteSessionUrl = `${getRemoteSessionUrl(createdSession.id)}?m=0`;
-					const remoteInfoMessage = createSystemMessage(
-						`/remote-control is active. Code in CLI or at ${remoteSessionUrl}`,
-						"info",
-					);
-
-					// Create initial user message from the prompt if provided (CCR echoes it back but we ignore that)
-					const initialUserMessage = hasInitialPrompt
-						? createUserMessage({ content: remote })
-						: null;
-
-					// Set remote session URL in app state for footer indicator
-					const remoteInitialState = {
-						...initialState,
-						remoteSessionUrl,
-					};
-
-					// Pre-filter commands to only include remote-safe ones.
-					// CCR's init response may further refine the list (via handleRemoteInit in REPL).
-					const remoteCommands =
-						filterCommandsForRemoteMode(commands);
-					await launchRepl(
-						root,
-						{
-							getFpsMetrics,
-							stats,
-							initialState: remoteInitialState,
-						},
-						{
-							debug: debug || debugToStderr,
-							commands: remoteCommands,
-							initialTools: [],
-							initialMessages: initialUserMessage
-								? [remoteInfoMessage, initialUserMessage]
-								: [remoteInfoMessage],
-							mcpClients: [],
-							autoConnectIdeFlag: ide,
-							mainThreadAgentDefinition,
-							disableSlashCommands,
-							remoteSessionConfig,
-							thinkingConfig,
-						},
-						renderAndRun,
-					);
-					return;
-				} else if (teleport) {
-					if (teleport === true || teleport === "") {
-						// Interactive mode: show task selector and handle resume
-						logEvent("tengu_teleport_interactive_mode", {});
-						logForDebugging(
-							"selectAndResumeTeleportTask: Starting teleport flow...",
-						);
-						const teleportResult =
-							await launchTeleportResumeWrapper(root);
-						if (!teleportResult) {
-							// User cancelled or error occurred
-							await gracefulShutdown(0);
-							process.exit(0);
-						}
-						const { branchError } =
-							await checkOutTeleportedSessionBranch(
-								teleportResult.branch,
-							);
-						messages = processMessagesForTeleportResume(
-							teleportResult.log,
-							branchError,
-						);
-					} else if (typeof teleport === "string") {
-						logEvent("tengu_teleport_resume_session", {
-							mode: "direct" as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-						});
-						try {
-							// First, fetch session and validate repository before checking git state
-							const sessionData = await fetchSession(teleport);
-							const repoValidation =
-								await validateSessionRepository(sessionData);
-
-							// Handle repo mismatch or not in repo cases
-							if (
-								repoValidation.status === "mismatch" ||
-								repoValidation.status === "not_in_repo"
-							) {
-								const sessionRepo = repoValidation.sessionRepo;
-								if (sessionRepo) {
-									// Check for known paths
-									const knownPaths =
-										getKnownPathsForRepo(sessionRepo);
-									const existingPaths =
-										await filterExistingPaths(knownPaths);
-
-									if (existingPaths.length > 0) {
-										// Show directory switch dialog
-										const selectedPath =
-											await launchTeleportRepoMismatchDialog(
-												root,
-												{
-													targetRepo: sessionRepo,
-													initialPaths: existingPaths,
-												},
-											);
-
-										if (selectedPath) {
-											// Change to the selected directory
-											process.chdir(selectedPath);
-											setCwd(selectedPath);
-											setOriginalCwd(selectedPath);
-										} else {
-											// User cancelled
-											await gracefulShutdown(0);
-										}
-									} else {
-										// No known paths - show original error
-										throw new TeleportOperationError(
-											`You must run claude --teleport ${teleport} from a checkout of ${sessionRepo}.`,
-											chalk.red(
-												`You must run claude --teleport ${teleport} from a checkout of ${chalk.bold(sessionRepo)}.\n`,
-											),
-										);
-									}
-								}
-							} else if (repoValidation.status === "error") {
-								throw new TeleportOperationError(
-									repoValidation.errorMessage ||
-										"Failed to validate session",
-									chalk.red(
-										`Error: ${repoValidation.errorMessage || "Failed to validate session"}\n`,
-									),
-								);
-							}
-
-							await validateGitState();
-
-							// Use progress UI for teleport
-							const { teleportWithProgress } =
-								await import("./components/TeleportProgress.js");
-							const result = await teleportWithProgress(
-								root,
-								teleport,
-							);
-							// Track teleported session for reliability logging
-							setTeleportedSessionInfo({ sessionId: teleport });
-							messages = result.messages;
-						} catch (error) {
-							if (error instanceof TeleportOperationError) {
-								process.stderr.write(
-									error.formattedMessage + "\n",
-								);
-							} else {
-								logError(error);
-								process.stderr.write(
-									chalk.red(
-										`Error: ${errorMessage(error)}\n`,
-									),
-								);
-							}
-							await gracefulShutdown(1);
-						}
-					}
-				}
-				if (process.env.USER_TYPE === "ant") {
-					if (
-						options.resume &&
-						typeof options.resume === "string" &&
-						!maybeSessionId
-					) {
-						// Check for ccshare URL (e.g. https://go/ccshare/boris-20260311-211036)
-						const { parseCcshareId, loadCcshare } =
-							await import("./utils/ccshareResume.js");
-						const ccshareId = parseCcshareId(options.resume);
-						if (ccshareId) {
-							try {
-								const resumeStart = performance.now();
-								const logOption = await loadCcshare(ccshareId);
-								const result = await loadConversationForResume(
-									logOption,
-									undefined,
-								);
-								if (result) {
-									processedResume =
-										await processResumedConversation(
-											result,
-											{
-												forkSession: true,
-												transcriptPath: result.fullPath,
-											},
-											resumeContext,
-										);
-									if (processedResume.restoredAgentDef) {
-										mainThreadAgentDefinition =
-											processedResume.restoredAgentDef;
-									}
-									logEvent("tengu_session_resumed", {
-										entrypoint:
-											"ccshare" as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-										success: true,
-										resume_duration_ms: Math.round(
-											performance.now() - resumeStart,
-										),
-									});
-								} else {
-									logEvent("tengu_session_resumed", {
-										entrypoint:
-											"ccshare" as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-										success: false,
-									});
-								}
-							} catch (error) {
-								logEvent("tengu_session_resumed", {
-									entrypoint:
-										"ccshare" as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-									success: false,
-								});
-								logError(error);
-								await exitWithError(
-									root,
-									`Unable to resume from ccshare: ${errorMessage(error)}`,
-									() => gracefulShutdown(1),
-								);
-							}
-						} else {
-							const resolvedPath = resolve(options.resume);
-							try {
-								const resumeStart = performance.now();
-								let logOption;
-								try {
-									// Attempt to load as a transcript file; ENOENT falls through to session-ID handling
-									logOption =
-										await loadTranscriptFromFile(
-											resolvedPath,
-										);
-								} catch (error) {
-									if (!isENOENT(error)) throw error;
-									// ENOENT: not a file path — fall through to session-ID handling
-								}
-								if (logOption) {
-									const result =
-										await loadConversationForResume(
-											logOption,
-											undefined /* sourceFile */,
-										);
-									if (result) {
-										processedResume =
-											await processResumedConversation(
-												result,
-												{
-													forkSession:
-														!!options.forkSession,
-													transcriptPath:
-														result.fullPath,
-												},
-												resumeContext,
-											);
-										if (processedResume.restoredAgentDef) {
-											mainThreadAgentDefinition =
-												processedResume.restoredAgentDef;
-										}
-										logEvent("tengu_session_resumed", {
-											entrypoint:
-												"file" as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-											success: true,
-											resume_duration_ms: Math.round(
-												performance.now() - resumeStart,
-											),
-										});
-									} else {
-										logEvent("tengu_session_resumed", {
-											entrypoint:
-												"file" as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-											success: false,
-										});
-									}
-								}
-							} catch (error) {
-								logEvent("tengu_session_resumed", {
-									entrypoint:
-										"file" as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-									success: false,
-								});
-								logError(error);
-								await exitWithError(
-									root,
-									`Unable to load transcript from file: ${options.resume}`,
-									() => gracefulShutdown(1),
-								);
-							}
-						}
-					}
-				}
-
-				// If not loaded as a file, try as session ID
-				if (maybeSessionId) {
-					// Resume specific session by ID
-					const sessionId = maybeSessionId;
-					try {
-						const resumeStart = performance.now();
-						// Use matchedLog if available (for cross-worktree resume by custom title)
-						// Otherwise fall back to sessionId string (for direct UUID resume)
-						const result = await loadConversationForResume(
-							matchedLog ?? sessionId,
-							undefined,
-						);
-
-						if (!result) {
-							logEvent("tengu_session_resumed", {
-								entrypoint:
-									"cli_flag" as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-								success: false,
-							});
-							return await exitWithError(
-								root,
-								`No conversation found with session ID: ${sessionId}`,
-							);
-						}
-
-						const fullPath =
-							matchedLog?.fullPath ?? result.fullPath;
-						processedResume = await processResumedConversation(
-							result,
-							{
-								forkSession: !!options.forkSession,
-								sessionIdOverride: sessionId,
-								transcriptPath: fullPath,
-							},
-							resumeContext,
-						);
-
-						if (processedResume.restoredAgentDef) {
-							mainThreadAgentDefinition =
-								processedResume.restoredAgentDef;
-						}
-						logEvent("tengu_session_resumed", {
-							entrypoint:
-								"cli_flag" as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-							success: true,
-							resume_duration_ms: Math.round(
-								performance.now() - resumeStart,
-							),
-						});
-					} catch (error) {
-						logEvent("tengu_session_resumed", {
-							entrypoint:
-								"cli_flag" as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-							success: false,
-						});
-						logError(error);
-						await exitWithError(
-							root,
-							`Failed to resume session ${sessionId}`,
-						);
-					}
-				}
-
-				// Await file downloads before rendering REPL (files must be available)
-				if (fileDownloadPromise) {
-					try {
-						const results = await fileDownloadPromise;
-						const failedCount = count(results, (r) => !r.success);
-						if (failedCount > 0) {
-							process.stderr.write(
-								chalk.yellow(
-									`Warning: ${failedCount}/${results.length} file(s) failed to download.\n`,
-								),
-							);
-						}
-					} catch (error) {
-						return await exitWithError(
-							root,
-							`Error downloading files: ${errorMessage(error)}`,
-						);
-					}
-				}
-
-				// If we have a processed resume or teleport messages, render the REPL
-				const resumeData =
-					processedResume ??
-					(Array.isArray(messages)
-						? {
-								messages,
-								fileHistorySnapshots: undefined,
-								agentName: undefined,
-								agentColor: undefined as
-									| AgentColorName
-									| undefined,
-								restoredAgentDef: mainThreadAgentDefinition,
-								initialState,
-								contentReplacements: undefined,
-							}
-						: undefined);
-				if (resumeData) {
-					maybeActivateProactive(options);
-					maybeActivateBrief(options);
-
-					await launchRepl(
-						root,
-						{
-							getFpsMetrics,
-							stats,
-							initialState: resumeData.initialState,
-						},
-						{
-							...sessionConfig,
-							mainThreadAgentDefinition:
-								resumeData.restoredAgentDef ??
-								mainThreadAgentDefinition,
-							initialMessages: resumeData.messages,
-							initialFileHistorySnapshots:
-								resumeData.fileHistorySnapshots,
-							initialContentReplacements:
-								resumeData.contentReplacements,
-							initialAgentName: resumeData.agentName,
-							initialAgentColor: resumeData.agentColor,
-						},
-						renderAndRun,
-					);
-				} else {
-					// Show interactive selector (includes same-repo worktrees)
-					// Note: ResumeConversation loads logs internally to ensure proper GC after selection
-					await launchResumeChooser(
-						root,
-						{ getFpsMetrics, stats, initialState },
-						getWorktreePaths(getOriginalCwd()),
-						{
-							...sessionConfig,
-							initialSearchQuery: searchTerm,
-							forkSession: options.forkSession,
-							filterByPr,
-						},
-					);
-				}
-			} else {
-				// Pass unresolved hooks promise to REPL so it can render immediately
-				// instead of blocking ~500ms waiting for SessionStart hooks to finish.
-				// REPL will inject hook messages when they resolve and await them before
-				// the first API call so the model always sees hook context.
-				const pendingHookMessages =
-					hooksPromise && hookMessages.length === 0
-						? hooksPromise
-						: undefined;
-
-				profileCheckpoint("action_after_hooks");
-				maybeActivateProactive(options);
-				maybeActivateBrief(options);
-				// Persist the current mode for fresh sessions so future resumes know what mode was used
-				if (feature("COORDINATOR_MODE")) {
-					saveMode(
-						coordinatorModeModule?.isCoordinatorMode()
-							? "coordinator"
-							: "normal",
-					);
-				}
-
-				// If launched via a deep link, show a provenance banner so the user
-				// knows the session originated externally. Linux xdg-open and
-				// browsers with "always allow" set dispatch the link with no OS-level
-				// confirmation, so this is the only signal the user gets that the
-				// prompt — and the working directory / CLAUDE.md it implies — came
-				// from an external source rather than something they typed.
-				let deepLinkBanner: ReturnType<
-					typeof createSystemMessage
-				> | null = null;
-				if (feature("LODESTONE")) {
-					if (options.deepLinkOrigin) {
-						logEvent("tengu_deep_link_opened", {
-							has_prefill: Boolean(options.prefill),
-							has_repo: Boolean(options.deepLinkRepo),
-						});
-						deepLinkBanner = createSystemMessage(
-							buildDeepLinkBanner({
-								cwd: getCwd(),
-								prefillLength: options.prefill?.length,
-								repo: options.deepLinkRepo,
-								lastFetch:
-									options.deepLinkLastFetch !== undefined
-										? new Date(options.deepLinkLastFetch)
-										: undefined,
-							}),
-							"warning",
-						);
-					} else if (options.prefill) {
-						deepLinkBanner = createSystemMessage(
-							"Launched with a pre-filled prompt — review it before pressing Enter.",
-							"warning",
-						);
-					}
-				}
-				const initialMessages = deepLinkBanner
-					? [deepLinkBanner, ...hookMessages]
-					: hookMessages.length > 0
-						? hookMessages
-						: undefined;
-
-				await launchRepl(
-					root,
-					{ getFpsMetrics, stats, initialState },
-					{
-						...sessionConfig,
-						initialMessages,
-						pendingHookMessages,
-					},
-					renderAndRun,
-				);
-			}
-		})
-		.version(
-			`${MACRO.VERSION} (Claude Code)`,
-			"-v, --version",
-			"Output the version number",
-		);
-
-	// Worktree flags
-	program.option(
-		"-w, --worktree [name]",
-		"Create a new git worktree for this session (optionally specify a name)",
-	);
-	program.option(
-		"--tmux",
-		"Create a tmux session for the worktree (requires --worktree). Uses iTerm2 native panes when available; use --tmux=classic for traditional tmux.",
-	);
-
-	if (canUserConfigureAdvisor()) {
-		program.addOption(
-			new Option(
-				"--advisor <model>",
-				"Enable the server-side advisor tool with the specified model (alias or full ID).",
-			).hideHelp(),
-		);
-	}
-
-	if (process.env.USER_TYPE === "ant") {
-		program.addOption(
-			new Option(
-				"--delegate-permissions",
-				"[ANT-ONLY] Alias for --permission-mode auto.",
-			).implies({
-				permissionMode: "auto",
-			}),
-		);
-		program.addOption(
-			new Option(
-				"--dangerously-skip-permissions-with-classifiers",
-				"[ANT-ONLY] Deprecated alias for --permission-mode auto.",
-			)
-				.hideHelp()
-				.implies({ permissionMode: "auto" }),
-		);
-		program.addOption(
-			new Option(
-				"--afk",
-				"[ANT-ONLY] Deprecated alias for --permission-mode auto.",
-			)
-				.hideHelp()
-				.implies({ permissionMode: "auto" }),
-		);
-		program.addOption(
-			new Option(
-				"--tasks [id]",
-				'[ANT-ONLY] Tasks mode: watch for tasks and auto-process them. Optional id is used as both the task list ID and agent ID (defaults to "tasklist").',
-			)
-				.argParser(String)
-				.hideHelp(),
-		);
-		program.option(
-			"--agent-teams",
-			"[ANT-ONLY] Force Claude to use multi-agent mode for solving problems",
-			() => true,
-		);
-	}
-
-	if (feature("TRANSCRIPT_CLASSIFIER")) {
-		program.addOption(
-			new Option("--enable-auto-mode", "Opt in to auto mode").hideHelp(),
-		);
-	}
-
-	if (feature("PROACTIVE") || feature("KAIROS")) {
-		program.addOption(
-			new Option("--proactive", "Start in proactive autonomous mode"),
-		);
-	}
-
-	if (feature("UDS_INBOX")) {
-		program.addOption(
-			new Option(
-				"--messaging-socket-path <path>",
-				"Unix domain socket path for the UDS messaging server (defaults to a tmp path)",
-			),
-		);
-	}
-
-	if (feature("KAIROS") || feature("KAIROS_BRIEF")) {
-		program.addOption(
-			new Option(
-				"--brief",
-				"Enable SendUserMessage tool for agent-to-user communication",
-			),
-		);
-	}
-	if (feature("KAIROS")) {
-		program.addOption(
-			new Option(
-				"--assistant",
-				"Force assistant mode (Agent SDK daemon use)",
-			).hideHelp(),
-		);
-	}
-	if (feature("KAIROS") || feature("KAIROS_CHANNELS")) {
-		program.addOption(
-			new Option(
-				"--channels <servers...>",
-				"MCP servers whose channel notifications (inbound push) should register this session. Space-separated server names.",
-			).hideHelp(),
-		);
-		program.addOption(
-			new Option(
-				"--dangerously-load-development-channels <servers...>",
-				"Load channel servers not on the approved allowlist. For local channel development only. Shows a confirmation dialog at startup.",
-			).hideHelp(),
-		);
-	}
-
-	// Teammate identity options (set by leader when spawning tmux teammates)
-	// These replace the CLAUDE_CODE_* environment variables
-	program.addOption(
-		new Option("--agent-id <id>", "Teammate agent ID").hideHelp(),
-	);
-	program.addOption(
-		new Option("--agent-name <name>", "Teammate display name").hideHelp(),
-	);
-	program.addOption(
-		new Option(
-			"--team-name <name>",
-			"Team name for swarm coordination",
-		).hideHelp(),
-	);
-	program.addOption(
-		new Option("--agent-color <color>", "Teammate UI color").hideHelp(),
-	);
-	program.addOption(
-		new Option(
-			"--plan-mode-required",
-			"Require plan mode before implementation",
-		).hideHelp(),
-	);
-	program.addOption(
-		new Option(
-			"--parent-session-id <id>",
-			"Parent session ID for analytics correlation",
-		).hideHelp(),
-	);
-	program.addOption(
-		new Option(
-			"--teammate-mode <mode>",
-			'How to spawn teammates: "tmux", "in-process", or "auto"',
-		)
-			.choices(["auto", "tmux", "in-process"])
-			.hideHelp(),
-	);
-	program.addOption(
-		new Option(
-			"--agent-type <type>",
-			"Custom agent type for this teammate",
-		).hideHelp(),
-	);
-
-	// Enable SDK URL for all builds but hide from help
-	program.addOption(
-		new Option(
-			"--sdk-url <url>",
-			"Use remote WebSocket endpoint for SDK I/O streaming (only with -p and stream-json format)",
-		).hideHelp(),
-	);
-
-	// Enable teleport/remote flags for all builds but keep them undocumented until GA
-	program.addOption(
-		new Option(
-			"--teleport [session]",
-			"Resume a teleport session, optionally specify session ID",
-		).hideHelp(),
-	);
-	program.addOption(
-		new Option(
-			"--remote [description]",
-			"Create a remote session with the given description",
-		).hideHelp(),
-	);
-	if (feature("BRIDGE_MODE")) {
-		program.addOption(
-			new Option(
-				"--remote-control [name]",
-				"Start an interactive session with Remote Control enabled (optionally named)",
-			)
-				.argParser((value) => value || true)
-				.hideHelp(),
-		);
-		program.addOption(
-			new Option("--rc [name]", "Alias for --remote-control")
-				.argParser((value) => value || true)
-				.hideHelp(),
-		);
-	}
-
-	if (feature("HARD_FAIL")) {
-		program.addOption(
-			new Option(
-				"--hard-fail",
-				"Crash on logError calls instead of silently logging",
-			).hideHelp(),
-		);
-	}
-
-	profileCheckpoint("run_main_options_built");
-
-	// -p/--print mode: skip subcommand registration. The 52 subcommands
-	// (mcp, auth, plugin, skill, task, config, doctor, update, etc.) are
-	// never dispatched in print mode — commander routes the prompt to the
-	// default action. The subcommand registration path was measured at ~65ms
-	// on baseline — mostly the isBridgeEnabled() call (25ms settings Zod parse
-	// + 40ms sync keychain subprocess), both hidden by the try/catch that
-	// always returns false before enableConfigs(). cc:// URLs are rewritten to
-	// `open` at main() line ~851 BEFORE this runs, so argv check is safe here.
-	const isPrintMode =
-		process.argv.includes("-p") || process.argv.includes("--print");
-	const isCcUrl = process.argv.some(
-		(a) => a.startsWith("cc://") || a.startsWith("cc+unix://"),
-	);
-	if (isPrintMode && !isCcUrl) {
-		profileCheckpoint("run_before_parse");
-		await program.parseAsync(process.argv);
-		profileCheckpoint("run_after_parse");
-		return program;
-	}
-
-	// claude mcp
-
-	const mcp = program
-		.command("mcp")
-		.description("Configure and manage MCP servers")
-		.configureHelp(createSortedHelpConfig())
-		.enablePositionalOptions();
-
-	mcp.command("serve")
-		.description(`Start the Claude Code MCP server`)
-		.option("-d, --debug", "Enable debug mode", () => true)
-		.option(
-			"--verbose",
-			"Override verbose mode setting from config",
-			() => true,
-		)
-		.action(
-			async ({
-				debug,
-				verbose,
-			}: {
-				debug?: boolean;
-				verbose?: boolean;
-			}) => {
-				const { mcpServeHandler } =
-					await import("./cli/handlers/mcp.js");
-				await mcpServeHandler({ debug, verbose });
-			},
-		);
-
-	// Register the mcp add subcommand (extracted for testability)
-	registerMcpAddCommand(mcp);
-
-	if (isXaaEnabled()) {
-		registerMcpXaaIdpCommand(mcp);
-	}
-
-	mcp.command("remove <name>")
-		.description("Remove an MCP server")
-		.option(
-			"-s, --scope <scope>",
-			"Configuration scope (local, user, or project) - if not specified, removes from whichever scope it exists in",
-		)
-		.action(async (name: string, options: { scope?: string }) => {
-			const { mcpRemoveHandler } = await import("./cli/handlers/mcp.js");
-			await mcpRemoveHandler(name, options);
-		});
-
-	mcp.command("list")
-		.description(
-			"List configured MCP servers. Note: The workspace trust dialog is skipped and stdio servers from .mcp.json are spawned for health checks. Only use this command in directories you trust.",
-		)
-		.action(async () => {
-			const { mcpListHandler } = await import("./cli/handlers/mcp.js");
-			await mcpListHandler();
-		});
-
-	mcp.command("get <name>")
-		.description(
-			"Get details about an MCP server. Note: The workspace trust dialog is skipped and stdio servers from .mcp.json are spawned for health checks. Only use this command in directories you trust.",
-		)
-		.action(async (name: string) => {
-			const { mcpGetHandler } = await import("./cli/handlers/mcp.js");
-			await mcpGetHandler(name);
-		});
-
-	mcp.command("add-json <name> <json>")
-		.description("Add an MCP server (stdio or SSE) with a JSON string")
-		.option(
-			"-s, --scope <scope>",
-			"Configuration scope (local, user, or project)",
-			"local",
-		)
-		.option(
-			"--client-secret",
-			"Prompt for OAuth client secret (or set MCP_CLIENT_SECRET env var)",
-		)
-		.action(
-			async (
-				name: string,
-				json: string,
-				options: { scope?: string; clientSecret?: true },
-			) => {
-				const { mcpAddJsonHandler } =
-					await import("./cli/handlers/mcp.js");
-				await mcpAddJsonHandler(name, json, options);
-			},
-		);
-
-	mcp.command("add-from-claude-desktop")
-		.description(
-			"Import MCP servers from Claude Desktop (Mac and WSL only)",
-		)
-		.option(
-			"-s, --scope <scope>",
-			"Configuration scope (local, user, or project)",
-			"local",
-		)
-		.action(async (options: { scope?: string }) => {
-			const { mcpAddFromDesktopHandler } =
-				await import("./cli/handlers/mcp.js");
-			await mcpAddFromDesktopHandler(options);
-		});
-
-	mcp.command("reset-project-choices")
-		.description(
-			"Reset all approved and rejected project-scoped (.mcp.json) servers within this project",
-		)
-		.action(async () => {
-			const { mcpResetChoicesHandler } =
-				await import("./cli/handlers/mcp.js");
-			await mcpResetChoicesHandler();
-		});
-
-	// claude server
-	if (feature("DIRECT_CONNECT")) {
-		program
-			.command("server")
-			.description("Start a Claude Code session server")
-			.option("--port <number>", "HTTP port", "0")
-			.option("--host <string>", "Bind address", "0.0.0.0")
-			.option("--auth-token <token>", "Bearer token for auth")
-			.option("--unix <path>", "Listen on a unix domain socket")
-			.option(
-				"--workspace <dir>",
-				"Default working directory for sessions that do not specify cwd",
-			)
-			.option(
-				"--idle-timeout <ms>",
-				"Idle timeout for detached sessions in ms (0 = never expire)",
-				"600000",
-			)
-			.option(
-				"--max-sessions <n>",
-				"Maximum concurrent sessions (0 = unlimited)",
-				"32",
-			)
-			.action(
-				async (opts: {
-					port: string;
-					host: string;
-					authToken?: string;
-					unix?: string;
-					workspace?: string;
-					idleTimeout: string;
-					maxSessions: string;
-				}) => {
-					const { randomBytes } = await import("crypto");
-					const { startServer } = await import("./server/server.js");
-					const { SessionManager } =
-						await import("./server/sessionManager.js");
-					const { DangerousBackend } =
-						await import("./server/backends/dangerousBackend.js");
-					const { printBanner } =
-						await import("./server/serverBanner.js");
-					const { createServerLogger } =
-						await import("./server/serverLog.js");
-					const {
-						writeServerLock,
-						removeServerLock,
-						probeRunningServer,
-					} = await import("./server/lockfile.js");
-
-					const existing = await probeRunningServer();
-					if (existing) {
-						process.stderr.write(
-							`A claude server is already running (pid ${existing.pid}) at ${existing.httpUrl}\n`,
-						);
-						process.exit(1);
-					}
-
-					const authToken =
-						opts.authToken ??
-						`sk-ant-cc-${randomBytes(16).toString("base64url")}`;
-
-					const config = {
-						port: parseInt(opts.port, 10),
-						host: opts.host,
-						authToken,
-						unix: opts.unix,
-						workspace: opts.workspace,
-						idleTimeoutMs: parseInt(opts.idleTimeout, 10),
-						maxSessions: parseInt(opts.maxSessions, 10),
-					};
-
-					const backend = new DangerousBackend();
-					const sessionManager = new SessionManager(backend, {
-						idleTimeoutMs: config.idleTimeoutMs,
-						maxSessions: config.maxSessions,
-					});
-					const logger = createServerLogger();
-
-					const server = startServer(config, sessionManager, logger);
-					const actualPort = server.port ?? config.port;
-					printBanner(config, authToken, actualPort);
-
-					await writeServerLock({
-						pid: process.pid,
-						port: actualPort,
-						host: config.host,
-						httpUrl: config.unix
-							? `unix:${config.unix}`
-							: `http://${config.host}:${actualPort}`,
-						startedAt: Date.now(),
-					});
-
-					let shuttingDown = false;
-					const shutdown = async () => {
-						if (shuttingDown) return;
-						shuttingDown = true;
-						// Stop accepting new connections before tearing down sessions.
-						server.stop(true);
-						await sessionManager.destroyAll();
-						await removeServerLock();
-						process.exit(0);
-					};
-					process.once("SIGINT", () => void shutdown());
-					process.once("SIGTERM", () => void shutdown());
-				},
-			);
-	}
-
-	// `claude ssh <host> [dir]` — registered here only so --help shows it.
-	// The actual interactive flow is handled by early argv rewriting in main()
-	// (parallels the DIRECT_CONNECT/cc:// pattern above). If commander reaches
-	// this action it means the argv rewrite didn't fire (e.g. user ran
-	// `claude ssh` with no host) — just print usage.
-	if (feature("SSH_REMOTE")) {
-		program
-			.command("ssh <host> [dir]")
-			.description(
-				"Run Claude Code on a remote host over SSH. Deploys the binary and " +
-					"tunnels API auth back through your local machine — no remote setup needed.",
-			)
-			.option(
-				"--permission-mode <mode>",
-				"Permission mode for the remote session",
-			)
-			.option(
-				"--dangerously-skip-permissions",
-				"Skip all permission prompts on the remote (dangerous)",
-			)
-			.option(
-				"--local",
-				"e2e test mode — spawn the child CLI locally (skip ssh/deploy). " +
-					"Exercises the auth proxy and unix-socket plumbing without a remote host.",
-			)
-			.action(async () => {
-				// Argv rewriting in main() should have consumed `ssh <host>` before
-				// commander runs. Reaching here means host was missing or the
-				// rewrite predicate didn't match.
-				process.stderr.write(
-					"Usage: claude ssh <user@host | ssh-config-alias> [dir]\n\n" +
-						"Runs Claude Code on a remote Linux host. You don't need to install\n" +
-						"anything on the remote or run `claude auth login` there — the binary is\n" +
-						"deployed over SSH and API auth tunnels back through your local machine.\n",
-				);
-				process.exit(1);
-			});
-	}
-
-	// claude connect — subcommand only handles -p (headless) mode.
-	// Interactive mode (without -p) is handled by early argv rewriting in main()
-	// which redirects to the main command with full TUI support.
-	if (feature("DIRECT_CONNECT")) {
-		program
-			.command("open <cc-url>")
-			.description(
-				"Connect to a Claude Code server (internal — use cc:// URLs)",
-			)
-			.option("-p, --print [prompt]", "Print mode (headless)")
-			.option(
-				"--output-format <format>",
-				"Output format: text, json, stream-json",
-				"text",
-			)
-			.action(
-				async (
-					ccUrl: string,
-					opts: {
-						print?: string | true;
-						outputFormat?: string;
-					},
-				) => {
-					const { parseConnectUrl } =
-						await import("./server/parseConnectUrl.js");
-					const { serverUrl, authToken } = parseConnectUrl(ccUrl);
-
-					let connectConfig;
-					try {
-						const session = await createDirectConnectSession({
-							serverUrl,
-							authToken,
-							cwd: getOriginalCwd(),
-							dangerouslySkipPermissions:
-								_pendingConnect?.dangerouslySkipPermissions,
-						});
-						if (session.workDir) {
-							setOriginalCwd(session.workDir);
-							setCwdState(session.workDir);
-						}
-						setDirectConnectServerUrl(serverUrl);
-						connectConfig = session.config;
-					} catch (err) {
-						// biome-ignore lint/suspicious/noConsole: intentional error output
-						console.error(
-							err instanceof DirectConnectError
-								? err.message
-								: String(err),
-						);
-						process.exit(1);
-					}
-
-					const { runConnectHeadless } =
-						await import("./server/connectHeadless.js");
-
-					const prompt =
-						typeof opts.print === "string" ? opts.print : "";
-					const interactive = opts.print === true;
-					await runConnectHeadless(
-						connectConfig,
-						prompt,
-						opts.outputFormat,
-						interactive,
-					);
-				},
-			);
-	}
-
-	// claude auth
-
-	const auth = program
-		.command("auth")
-		.description("Manage authentication")
-		.configureHelp(createSortedHelpConfig());
-
-	auth.command("login")
-		.description("Sign in to your Anthropic account")
-		.option(
-			"--email <email>",
-			"Pre-populate email address on the login page",
-		)
-		.option("--sso", "Force SSO login flow")
-		.option(
-			"--console",
-			"Use Anthropic Console (API usage billing) instead of Claude subscription",
-		)
-		.option("--claudeai", "Use Claude subscription (default)")
-		.action(
-			async ({
-				email,
-				sso,
-				console: useConsole,
-				claudeai,
-			}: {
-				email?: string;
-				sso?: boolean;
-				console?: boolean;
-				claudeai?: boolean;
-			}) => {
-				const { authLogin } = await import("./cli/handlers/auth.js");
-				await authLogin({ email, sso, console: useConsole, claudeai });
-			},
-		);
-
-	auth.command("status")
-		.description("Show authentication status")
-		.option("--json", "Output as JSON (default)")
-		.option("--text", "Output as human-readable text")
-		.action(async (opts: { json?: boolean; text?: boolean }) => {
-			const { authStatus } = await import("./cli/handlers/auth.js");
-			await authStatus(opts);
-		});
-
-	auth.command("logout")
-		.description("Log out from your Anthropic account")
-		.action(async () => {
-			const { authLogout } = await import("./cli/handlers/auth.js");
-			await authLogout();
-		});
-
-	/**
-	 * Helper function to handle marketplace command errors consistently.
-	 * Logs the error and exits the process with status 1.
-	 * @param error The error that occurred
-	 * @param action Description of the action that failed
-	 */
-	// Hidden flag on all plugin/marketplace subcommands to target cowork_plugins.
-	const coworkOption = () =>
-		new Option("--cowork", "Use cowork_plugins directory").hideHelp();
-
-	// Plugin validate command
-	const pluginCmd = program
-		.command("plugin")
-		.alias("plugins")
-		.description("Manage Claude Code plugins")
-		.configureHelp(createSortedHelpConfig());
-
-	pluginCmd
-		.command("validate <path>")
-		.description("Validate a plugin or marketplace manifest")
-		.addOption(coworkOption())
-		.action(async (manifestPath: string, options: { cowork?: boolean }) => {
-			const { pluginValidateHandler } =
-				await import("./cli/handlers/plugins.js");
-			await pluginValidateHandler(manifestPath, options);
-		});
-
-	// Plugin list command
-	pluginCmd
-		.command("list")
-		.description("List installed plugins")
-		.option("--json", "Output as JSON")
-		.option(
-			"--available",
-			"Include available plugins from marketplaces (requires --json)",
-		)
-		.addOption(coworkOption())
-		.action(
-			async (options: {
-				json?: boolean;
-				available?: boolean;
-				cowork?: boolean;
-			}) => {
-				const { pluginListHandler } =
-					await import("./cli/handlers/plugins.js");
-				await pluginListHandler(options);
-			},
-		);
-
-	// Marketplace subcommands
-	const marketplaceCmd = pluginCmd
-		.command("marketplace")
-		.description("Manage Claude Code marketplaces")
-		.configureHelp(createSortedHelpConfig());
-
-	marketplaceCmd
-		.command("add <source>")
-		.description("Add a marketplace from a URL, path, or GitHub repo")
-		.addOption(coworkOption())
-		.option(
-			"--sparse <paths...>",
-			"Limit checkout to specific directories via git sparse-checkout (for monorepos). Example: --sparse .claude-plugin plugins",
-		)
-		.option(
-			"--scope <scope>",
-			"Where to declare the marketplace: user (default), project, or local",
-		)
-		.action(
-			async (
-				source: string,
-				options: {
-					cowork?: boolean;
-					sparse?: string[];
-					scope?: string;
-				},
-			) => {
-				const { marketplaceAddHandler } =
-					await import("./cli/handlers/plugins.js");
-				await marketplaceAddHandler(source, options);
-			},
-		);
-
-	marketplaceCmd
-		.command("list")
-		.description("List all configured marketplaces")
-		.option("--json", "Output as JSON")
-		.addOption(coworkOption())
-		.action(async (options: { json?: boolean; cowork?: boolean }) => {
-			const { marketplaceListHandler } =
-				await import("./cli/handlers/plugins.js");
-			await marketplaceListHandler(options);
-		});
-
-	marketplaceCmd
-		.command("remove <name>")
-		.alias("rm")
-		.description("Remove a configured marketplace")
-		.addOption(coworkOption())
-		.action(async (name: string, options: { cowork?: boolean }) => {
-			const { marketplaceRemoveHandler } =
-				await import("./cli/handlers/plugins.js");
-			await marketplaceRemoveHandler(name, options);
-		});
-
-	marketplaceCmd
-		.command("update [name]")
-		.description(
-			"Update marketplace(s) from their source - updates all if no name specified",
-		)
-		.addOption(coworkOption())
-		.action(
-			async (name: string | undefined, options: { cowork?: boolean }) => {
-				const { marketplaceUpdateHandler } =
-					await import("./cli/handlers/plugins.js");
-				await marketplaceUpdateHandler(name, options);
-			},
-		);
-
-	// Plugin install command
-	pluginCmd
-		.command("install <plugin>")
-		.alias("i")
-		.description(
-			"Install a plugin from available marketplaces (use plugin@marketplace for specific marketplace)",
-		)
-		.option(
-			"-s, --scope <scope>",
-			"Installation scope: user, project, or local",
-			"user",
-		)
-		.addOption(coworkOption())
-		.action(
-			async (
-				plugin: string,
-				options: { scope?: string; cowork?: boolean },
-			) => {
-				const { pluginInstallHandler } =
-					await import("./cli/handlers/plugins.js");
-				await pluginInstallHandler(plugin, options);
-			},
-		);
-
-	// Plugin uninstall command
-	pluginCmd
-		.command("uninstall <plugin>")
-		.alias("remove")
-		.alias("rm")
-		.description("Uninstall an installed plugin")
-		.option(
-			"-s, --scope <scope>",
-			"Uninstall from scope: user, project, or local",
-			"user",
-		)
-		.option(
-			"--keep-data",
-			"Preserve the plugin's persistent data directory (~/.claude/plugins/data/{id}/)",
-		)
-		.addOption(coworkOption())
-		.action(
-			async (
-				plugin: string,
-				options: {
-					scope?: string;
-					cowork?: boolean;
-					keepData?: boolean;
-				},
-			) => {
-				const { pluginUninstallHandler } =
-					await import("./cli/handlers/plugins.js");
-				await pluginUninstallHandler(plugin, options);
-			},
-		);
-
-	// Plugin enable command
-	pluginCmd
-		.command("enable <plugin>")
-		.description("Enable a disabled plugin")
-		.option(
-			"-s, --scope <scope>",
-			`Installation scope: ${VALID_INSTALLABLE_SCOPES.join(", ")} (default: auto-detect)`,
-		)
-		.addOption(coworkOption())
-		.action(
-			async (
-				plugin: string,
-				options: { scope?: string; cowork?: boolean },
-			) => {
-				const { pluginEnableHandler } =
-					await import("./cli/handlers/plugins.js");
-				await pluginEnableHandler(plugin, options);
-			},
-		);
-
-	// Plugin disable command
-	pluginCmd
-		.command("disable [plugin]")
-		.description("Disable an enabled plugin")
-		.option("-a, --all", "Disable all enabled plugins")
-		.option(
-			"-s, --scope <scope>",
-			`Installation scope: ${VALID_INSTALLABLE_SCOPES.join(", ")} (default: auto-detect)`,
-		)
-		.addOption(coworkOption())
-		.action(
-			async (
-				plugin: string | undefined,
-				options: { scope?: string; cowork?: boolean; all?: boolean },
-			) => {
-				const { pluginDisableHandler } =
-					await import("./cli/handlers/plugins.js");
-				await pluginDisableHandler(plugin, options);
-			},
-		);
-
-	// Plugin update command
-	pluginCmd
-		.command("update <plugin>")
-		.description(
-			"Update a plugin to the latest version (restart required to apply)",
-		)
-		.option(
-			"-s, --scope <scope>",
-			`Installation scope: ${VALID_UPDATE_SCOPES.join(", ")} (default: user)`,
-		)
-		.addOption(coworkOption())
-		.action(
-			async (
-				plugin: string,
-				options: { scope?: string; cowork?: boolean },
-			) => {
-				const { pluginUpdateHandler } =
-					await import("./cli/handlers/plugins.js");
-				await pluginUpdateHandler(plugin, options);
-			},
-		);
-	// END ANT-ONLY
+  profileCheckpoint('run_function_start');
+
+  // Create help config that sorts options by long option name.
+  // Commander supports compareOptions at runtime but @commander-js/extra-typings
+  // doesn't include it in the type definitions, so we use Object.assign to add it.
+  function createSortedHelpConfig(): {
+    sortSubcommands: true;
+    sortOptions: true;
+  } {
+    const getOptionSortKey = (opt: Option): string =>
+      opt.long?.replace(/^--/, '') ?? opt.short?.replace(/^-/, '') ?? '';
+    return Object.assign({ sortSubcommands: true, sortOptions: true } as const, {
+      compareOptions: (a: Option, b: Option) => getOptionSortKey(a).localeCompare(getOptionSortKey(b)),
+    });
+  }
+  const program = new CommanderCommand().configureHelp(createSortedHelpConfig()).enablePositionalOptions();
+  profileCheckpoint('run_commander_initialized');
+
+  // Use preAction hook to run initialization only when executing a command,
+  // not when displaying help. This avoids the need for env variable signaling.
+  program.hook('preAction', async thisCommand => {
+    profileCheckpoint('preAction_start');
+    // Await async subprocess loads started at module evaluation (lines 12-20).
+    // Nearly free — subprocesses complete during the ~135ms of imports above.
+    // Must resolve before init() which triggers the first settings read
+    // (applySafeConfigEnvironmentVariables → getSettingsForSource('policySettings')
+    // → isRemoteManagedSettingsEligible → sync keychain reads otherwise ~65ms).
+    await Promise.all([ensureMdmSettingsLoaded(), ensureKeychainPrefetchCompleted()]);
+    profileCheckpoint('preAction_after_mdm');
+    await init();
+    profileCheckpoint('preAction_after_init');
+
+    // process.title on Windows sets the console title directly; on POSIX,
+    // terminal shell integration may mirror the process name to the tab.
+    // After init() so settings.json env can also gate this (gh-4765).
+    if (!isEnvTruthy(process.env.CLAUDE_CODE_DISABLE_TERMINAL_TITLE)) {
+      process.title = 'claude';
+    }
+
+    // Attach logging sinks so subcommand handlers can use logEvent/logError.
+    // Before PR #11106 logEvent dispatched directly; after, events queue until
+    // a sink attaches. setup() attaches sinks for the default command, but
+    // subcommands (doctor, mcp, plugin, auth) never call setup() and would
+    // silently drop events on process.exit(). Both inits are idempotent.
+    const { initSinks } = await import('./utils/sinks.js');
+    initSinks();
+    profileCheckpoint('preAction_after_sinks');
+
+    // gh-33508: --plugin-dir is a top-level program option. The default
+    // action reads it from its own options destructure, but subcommands
+    // (plugin list, plugin install, mcp *) have their own actions and
+    // never see it. Wire it up here so getInlinePlugins() works everywhere.
+    // thisCommand.opts() is typed {} here because this hook is attached
+    // before .option('--plugin-dir', ...) in the chain — extra-typings
+    // builds the type as options are added. Narrow with a runtime guard;
+    // the collect accumulator + [] default guarantee string[] in practice.
+    const pluginDir = thisCommand.getOptionValue('pluginDir');
+    if (Array.isArray(pluginDir) && pluginDir.length > 0 && pluginDir.every(p => typeof p === 'string')) {
+      setInlinePlugins(pluginDir);
+      clearPluginCache('preAction: --plugin-dir inline plugins');
+    }
+
+    runMigrations();
+    profileCheckpoint('preAction_after_migrations');
+
+    // Load remote managed settings for enterprise customers (non-blocking)
+    // Fails open - if fetch fails, continues without remote settings
+    // Settings are applied via hot-reload when they arrive
+    // Must happen after init() to ensure config reading is allowed
+    void loadRemoteManagedSettings();
+    void loadPolicyLimits();
+
+    profileCheckpoint('preAction_after_remote_settings');
+
+    // Load settings sync (non-blocking, fail-open)
+    // CLI: uploads local settings to remote (CCR download is handled by print.ts)
+    if (feature('UPLOAD_USER_SETTINGS')) {
+      void import('./services/settingsSync/index.js').then(m => m.uploadUserSettingsInBackground());
+    }
+
+    profileCheckpoint('preAction_after_settings_sync');
+  });
+
+  program
+    .name('claude')
+    .description(`Claude Code - starts an interactive session by default, use -p/--print for non-interactive output`)
+    .argument('[prompt]', 'Your prompt', String)
+    // Subcommands inherit helpOption via commander's copyInheritedSettings —
+    // setting it once here covers mcp, plugin, auth, and all other subcommands.
+    .helpOption('-h, --help', 'Display help for command')
+    .option(
+      '-d, --debug [filter]',
+      'Enable debug mode with optional category filtering (e.g., "api,hooks" or "!1p,!file")',
+      (_value: string | true) => {
+        // If value is provided, it will be the filter string
+        // If not provided but flag is present, value will be true
+        // The actual filtering is handled in debug.ts by parsing process.argv
+        return true;
+      },
+    )
+    .addOption(new Option('--debug-to-stderr', 'Enable debug mode (to stderr)').argParser(Boolean).hideHelp())
+    .option(
+      '--debug-file <path>',
+      'Write debug logs to a specific file path (implicitly enables debug mode)',
+      () => true,
+    )
+    .option('--verbose', 'Override verbose mode setting from config', () => true)
+    .option(
+      '-p, --print',
+      'Print response and exit (useful for pipes). Note: The workspace trust dialog is skipped when Claude is run with the -p mode. Only use this flag in directories you trust.',
+      () => true,
+    )
+    .option(
+      '--bare',
+      'Minimal mode: skip hooks, LSP, plugin sync, attribution, auto-memory, background prefetches, keychain reads, and CLAUDE.md auto-discovery. Sets CLAUDE_CODE_SIMPLE=1. Anthropic auth is strictly ANTHROPIC_API_KEY or apiKeyHelper via --settings (OAuth and keychain are never read). 3P providers (Bedrock/Vertex/Foundry) use their own credentials. Skills still resolve via /skill-name. Explicitly provide context via: --system-prompt[-file], --append-system-prompt[-file], --add-dir (CLAUDE.md dirs), --mcp-config, --settings, --agents, --plugin-dir.',
+      () => true,
+    )
+    .addOption(new Option('--init', 'Run Setup hooks with init trigger, then continue').hideHelp())
+    .addOption(new Option('--init-only', 'Run Setup and SessionStart:startup hooks, then exit').hideHelp())
+    .addOption(new Option('--maintenance', 'Run Setup hooks with maintenance trigger, then continue').hideHelp())
+    .addOption(
+      new Option(
+        '--output-format <format>',
+        'Output format (only works with --print): "text" (default), "json" (single result), or "stream-json" (realtime streaming)',
+      ).choices(['text', 'json', 'stream-json']),
+    )
+    .addOption(
+      new Option(
+        '--json-schema <schema>',
+        'JSON Schema for structured output validation. ' +
+          'Example: {"type":"object","properties":{"name":{"type":"string"}},"required":["name"]}',
+      ).argParser(String),
+    )
+    .option(
+      '--include-hook-events',
+      'Include all hook lifecycle events in the output stream (only works with --output-format=stream-json)',
+      () => true,
+    )
+    .option(
+      '--include-partial-messages',
+      'Include partial message chunks as they arrive (only works with --print and --output-format=stream-json)',
+      () => true,
+    )
+    .addOption(
+      new Option(
+        '--input-format <format>',
+        'Input format (only works with --print): "text" (default), or "stream-json" (realtime streaming input)',
+      ).choices(['text', 'stream-json']),
+    )
+    .option(
+      '--mcp-debug',
+      '[DEPRECATED. Use --debug instead] Enable MCP debug mode (shows MCP server errors)',
+      () => true,
+    )
+    .option(
+      '--dangerously-skip-permissions',
+      'Bypass all permission checks. Recommended only for sandboxes with no internet access.',
+      () => true,
+    )
+    .option(
+      '--allow-dangerously-skip-permissions',
+      'Enable bypassing all permission checks as an option, without it being enabled by default. Recommended only for sandboxes with no internet access.',
+      () => true,
+    )
+    .addOption(
+      new Option('--thinking <mode>', 'Thinking mode: enabled (equivalent to adaptive), disabled')
+        .choices(['enabled', 'adaptive', 'disabled'])
+        .hideHelp(),
+    )
+    .addOption(
+      new Option(
+        '--max-thinking-tokens <tokens>',
+        '[DEPRECATED. Use --thinking instead for newer models] Maximum number of thinking tokens (only works with --print)',
+      )
+        .argParser(Number)
+        .hideHelp(),
+    )
+    .addOption(
+      new Option(
+        '--max-turns <turns>',
+        'Maximum number of agentic turns in non-interactive mode. This will early exit the conversation after the specified number of turns. (only works with --print)',
+      )
+        .argParser(Number)
+        .hideHelp(),
+    )
+    .addOption(
+      new Option(
+        '--max-budget-usd <amount>',
+        'Maximum dollar amount to spend on API calls (only works with --print)',
+      ).argParser(value => {
+        const amount = Number(value);
+        if (isNaN(amount) || amount <= 0) {
+          throw new Error('--max-budget-usd must be a positive number greater than 0');
+        }
+        return amount;
+      }),
+    )
+    .addOption(
+      new Option('--task-budget <tokens>', 'API-side task budget in tokens (output_config.task_budget)')
+        .argParser(value => {
+          const tokens = Number(value);
+          if (isNaN(tokens) || tokens <= 0 || !Number.isInteger(tokens)) {
+            throw new Error('--task-budget must be a positive integer');
+          }
+          return tokens;
+        })
+        .hideHelp(),
+    )
+    .option(
+      '--replay-user-messages',
+      'Re-emit user messages from stdin back on stdout for acknowledgment (only works with --input-format=stream-json and --output-format=stream-json)',
+      () => true,
+    )
+    .addOption(new Option('--enable-auth-status', 'Enable auth status messages in SDK mode').default(false).hideHelp())
+    .option(
+      '--allowedTools, --allowed-tools <tools...>',
+      'Comma or space-separated list of tool names to allow (e.g. "Bash(git:*) Edit")',
+    )
+    .option(
+      '--tools <tools...>',
+      'Specify the list of available tools from the built-in set. Use "" to disable all tools, "default" to use all tools, or specify tool names (e.g. "Bash,Edit,Read").',
+    )
+    .option(
+      '--disallowedTools, --disallowed-tools <tools...>',
+      'Comma or space-separated list of tool names to deny (e.g. "Bash(git:*) Edit")',
+    )
+    .option('--mcp-config <configs...>', 'Load MCP servers from JSON files or strings (space-separated)')
+    .addOption(
+      new Option('--permission-prompt-tool <tool>', 'MCP tool to use for permission prompts (only works with --print)')
+        .argParser(String)
+        .hideHelp(),
+    )
+    .addOption(new Option('--system-prompt <prompt>', 'System prompt to use for the session').argParser(String))
+    .addOption(new Option('--system-prompt-file <file>', 'Read system prompt from a file').argParser(String).hideHelp())
+    .addOption(
+      new Option('--append-system-prompt <prompt>', 'Append a system prompt to the default system prompt').argParser(
+        String,
+      ),
+    )
+    .addOption(
+      new Option(
+        '--append-system-prompt-file <file>',
+        'Read system prompt from a file and append to the default system prompt',
+      )
+        .argParser(String)
+        .hideHelp(),
+    )
+    .addOption(
+      new Option('--permission-mode <mode>', 'Permission mode to use for the session')
+        .argParser(String)
+        .choices(PERMISSION_MODES),
+    )
+    .option('-c, --continue', 'Continue the most recent conversation in the current directory', () => true)
+    .option(
+      '-r, --resume [value]',
+      'Resume a conversation by session ID, or open interactive picker with optional search term',
+      value => value || true,
+    )
+    .option(
+      '--fork-session',
+      'When resuming, create a new session ID instead of reusing the original (use with --resume or --continue)',
+      () => true,
+    )
+    .addOption(new Option('--prefill <text>', 'Pre-fill the prompt input with text without submitting it').hideHelp())
+    .addOption(new Option('--deep-link-origin', 'Signal that this session was launched from a deep link').hideHelp())
+    .addOption(
+      new Option(
+        '--deep-link-repo <slug>',
+        'Repo slug the deep link ?repo= parameter resolved to the current cwd',
+      ).hideHelp(),
+    )
+    .addOption(
+      new Option('--deep-link-last-fetch <ms>', 'FETCH_HEAD mtime in epoch ms, precomputed by the deep link trampoline')
+        .argParser(v => {
+          const n = Number(v);
+          return Number.isFinite(n) ? n : undefined;
+        })
+        .hideHelp(),
+    )
+    .option(
+      '--from-pr [value]',
+      'Resume a session linked to a PR by PR number/URL, or open interactive picker with optional search term',
+      value => value || true,
+    )
+    .option(
+      '--no-session-persistence',
+      'Disable session persistence - sessions will not be saved to disk and cannot be resumed (only works with --print)',
+    )
+    .addOption(
+      new Option(
+        '--resume-session-at <message id>',
+        'When resuming, only messages up to and including the assistant message with <message.id> (use with --resume in print mode)',
+      )
+        .argParser(String)
+        .hideHelp(),
+    )
+    .addOption(
+      new Option(
+        '--rewind-files <user-message-id>',
+        'Restore files to state at the specified user message and exit (requires --resume)',
+      ).hideHelp(),
+    )
+    // @[MODEL LAUNCH]: Update the example model ID in the --model help text.
+    .option(
+      '--model <model>',
+      `Model for the current session. Provide an alias for the latest model (e.g. 'sonnet' or 'opus') or a model's full name (e.g. 'claude-sonnet-4-6').`,
+    )
+    .addOption(
+      new Option('--effort <level>', `Effort level for the current session (low, medium, high, max)`).argParser(
+        (rawValue: string) => {
+          const value = rawValue.toLowerCase();
+          const allowed = ['low', 'medium', 'high', 'max'];
+          if (!allowed.includes(value)) {
+            throw new InvalidArgumentError(`It must be one of: ${allowed.join(', ')}`);
+          }
+          return value;
+        },
+      ),
+    )
+    .option('--agent <agent>', `Agent for the current session. Overrides the 'agent' setting.`)
+    .option('--betas <betas...>', 'Beta headers to include in API requests (API key users only)')
+    .option(
+      '--fallback-model <model>',
+      'Enable automatic fallback to specified model when default model is overloaded (only works with --print)',
+    )
+    .addOption(
+      new Option(
+        '--workload <tag>',
+        'Workload tag for billing-header attribution (cc_workload). Process-scoped; set by SDK daemon callers that spawn subprocesses for cron work. (only works with --print)',
+      ).hideHelp(),
+    )
+    .option(
+      '--settings <file-or-json>',
+      'Path to a settings JSON file or a JSON string to load additional settings from',
+    )
+    .option('--add-dir <directories...>', 'Additional directories to allow tool access to')
+    .option('--ide', 'Automatically connect to IDE on startup if exactly one valid IDE is available', () => true)
+    .option(
+      '--strict-mcp-config',
+      'Only use MCP servers from --mcp-config, ignoring all other MCP configurations',
+      () => true,
+    )
+    .option('--session-id <uuid>', 'Use a specific session ID for the conversation (must be a valid UUID)')
+    .option('-n, --name <name>', 'Set a display name for this session (shown in /resume and terminal title)')
+    .option(
+      '--agents <json>',
+      'JSON object defining custom agents (e.g. \'{"reviewer": {"description": "Reviews code", "prompt": "You are a code reviewer"}}\')',
+    )
+    .option('--setting-sources <sources>', 'Comma-separated list of setting sources to load (user, project, local).')
+    // gh-33508: <paths...> (variadic) consumed everything until the next
+    // --flag. `claude --plugin-dir /path mcp add --transport http` swallowed
+    // `mcp` and `add` as paths, then choked on --transport as an unknown
+    // top-level option. Single-value + collect accumulator means each
+    // --plugin-dir takes exactly one arg; repeat the flag for multiple dirs.
+    .option(
+      '--plugin-dir <path>',
+      'Load plugins from a directory for this session only (repeatable: --plugin-dir A --plugin-dir B)',
+      (val: string, prev: string[]) => [...prev, val],
+      [] as string[],
+    )
+    .option('--disable-slash-commands', 'Disable all skills', () => true)
+    .option('--chrome', 'Enable Claude in Chrome integration')
+    .option('--no-chrome', 'Disable Claude in Chrome integration')
+    .option(
+      '--file <specs...>',
+      'File resources to download at startup. Format: file_id:relative_path (e.g., --file file_abc:doc.txt file_def:img.png)',
+    )
+    .action(async (prompt, options) => {
+      profileCheckpoint('action_handler_start');
+
+      // --bare = one-switch minimal mode. Sets SIMPLE so all the existing
+      // gates fire (CLAUDE.md, skills, hooks inside executeHooks, agent
+      // dir-walk). Must be set before setup() / any of the gated work runs.
+      if ((options as { bare?: boolean }).bare) {
+        process.env.CLAUDE_CODE_SIMPLE = '1';
+      }
+
+      // Ignore "code" as a prompt - treat it the same as no prompt
+      if (prompt === 'code') {
+        logEvent('tengu_code_prompt_ignored', {});
+        console.warn(chalk.yellow('Tip: You can launch Claude Code with just `claude`'));
+        prompt = undefined;
+      }
+
+      // Log event for any single-word prompt
+      if (prompt && typeof prompt === 'string' && !/\s/.test(prompt) && prompt.length > 0) {
+        logEvent('tengu_single_word_prompt', { length: prompt.length });
+      }
+
+      // Assistant mode: when .claude/settings.json has assistant: true AND
+      // the tengu_kairos GrowthBook gate is on, force brief on. Permission
+      // mode is left to the user — settings defaultMode or --permission-mode
+      // apply as normal. REPL-typed messages already default to 'next'
+      // priority (messageQueueManager.enqueue) so they drain mid-turn between
+      // tool calls. SendUserMessage (BriefTool) is enabled via the brief env
+      // var. SleepTool stays disabled (its isEnabled() gates on proactive).
+      // kairosEnabled is computed once here and reused at the
+      // getAssistantSystemPromptAddendum() call site further down.
+      //
+      // Trust gate: .claude/settings.json is attacker-controllable in an
+      // untrusted clone. We run ~1000 lines before showSetupScreens() shows
+      // the trust dialog, and by then we've already appended
+      // .claude/agents/assistant.md to the system prompt. Refuse to activate
+      // until the directory has been explicitly trusted.
+      let kairosEnabled = false;
+      let assistantTeamContext:
+        | Awaited<ReturnType<NonNullable<typeof assistantModule>['initializeAssistantTeam']>>
+        | undefined;
+      if (feature('KAIROS') && (options as { assistant?: boolean }).assistant && assistantModule) {
+        // --assistant (Agent SDK daemon mode): force the latch before
+        // isAssistantMode() runs below. The daemon has already checked
+        // entitlement — don't make the child re-check tengu_kairos.
+        assistantModule.markAssistantForced();
+      }
+      if (
+        feature('KAIROS') &&
+        assistantModule &&
+        (assistantModule.isAssistantForced() || (options as Record<string, unknown>).assistant === true) &&
+        // Spawned teammates share the leader's cwd + settings.json, so
+        // the flag is true for them too. --agent-id being set
+        // means we ARE a spawned teammate (extractTeammateOptions runs
+        // ~170 lines later so check the raw commander option) — don't
+        // re-init the team or override teammateMode/proactive/brief.
+        !(options as { agentId?: unknown }).agentId &&
+        kairosGate
+      ) {
+        if (!checkHasTrustDialogAccepted()) {
+          console.warn(
+            chalk.yellow('Assistant mode disabled: directory is not trusted. Accept the trust dialog and restart.'),
+          );
+        } else {
+          // Blocking gate check — returns cached `true` instantly; if disk
+          // cache is false/missing, lazily inits GrowthBook and fetches fresh
+          // (max ~5s). --assistant skips the gate entirely (daemon is
+          // pre-entitled).
+          kairosEnabled = assistantModule.isAssistantForced() || (await kairosGate.isKairosEnabled());
+          if (kairosEnabled) {
+            const opts = options as { brief?: boolean };
+            opts.brief = true;
+            setKairosActive(true);
+            // Pre-seed an in-process team so Agent(name: "foo") spawns
+            // teammates without TeamCreate. Must run BEFORE setup() captures
+            // the teammateMode snapshot (initializeAssistantTeam calls
+            // setCliTeammateModeOverride internally).
+            assistantTeamContext = await assistantModule.initializeAssistantTeam();
+          }
+        }
+      }
+
+      const {
+        debug = false,
+        debugToStderr = false,
+        dangerouslySkipPermissions,
+        allowDangerouslySkipPermissions = false,
+        tools: baseTools = [],
+        allowedTools = [],
+        disallowedTools = [],
+        mcpConfig = [],
+        permissionMode: permissionModeCli,
+        addDir = [],
+        fallbackModel,
+        betas = [],
+        ide = false,
+        sessionId,
+        includeHookEvents,
+        includePartialMessages,
+      } = options;
+
+      if (options.prefill) {
+        seedEarlyInput(options.prefill);
+      }
+
+      // Promise for file downloads - started early, awaited before REPL renders
+      let fileDownloadPromise: Promise<DownloadResult[]> | undefined;
+
+      const agentsJson = options.agents;
+      const agentCli = options.agent;
+      if (feature('BG_SESSIONS') && agentCli) {
+        process.env.CLAUDE_CODE_AGENT = agentCli;
+      }
+
+      // NOTE: LSP manager initialization is intentionally deferred until after
+      // the trust dialog is accepted. This prevents plugin LSP servers from
+      // executing code in untrusted directories before user consent.
+
+      // Extract these separately so they can be modified if needed
+      let outputFormat = options.outputFormat;
+      let inputFormat = options.inputFormat;
+      let verbose = options.verbose ?? getGlobalConfig().verbose;
+      let print = options.print;
+      const init = options.init ?? false;
+      const initOnly = options.initOnly ?? false;
+      const maintenance = options.maintenance ?? false;
+
+      // Extract disable slash commands flag
+      const disableSlashCommands = options.disableSlashCommands || false;
+
+      // Extract tasks mode options (ant-only)
+      const tasksOption = process.env.USER_TYPE === 'ant' && (options as { tasks?: boolean | string }).tasks;
+      const taskListId = tasksOption
+        ? typeof tasksOption === 'string'
+          ? tasksOption
+          : DEFAULT_TASKS_MODE_TASK_LIST_ID
+        : undefined;
+      if (process.env.USER_TYPE === 'ant' && taskListId) {
+        process.env.CLAUDE_CODE_TASK_LIST_ID = taskListId;
+      }
+
+      // Extract worktree option
+      // worktree can be true (flag without value) or a string (custom name or PR reference)
+      const worktreeOption = isWorktreeModeEnabled()
+        ? (options as { worktree?: boolean | string }).worktree
+        : undefined;
+      let worktreeName = typeof worktreeOption === 'string' ? worktreeOption : undefined;
+      const worktreeEnabled = worktreeOption !== undefined;
+
+      // Check if worktree name is a PR reference (#N or GitHub PR URL)
+      let worktreePRNumber: number | undefined;
+      if (worktreeName) {
+        const prNum = parsePRReference(worktreeName);
+        if (prNum !== null) {
+          worktreePRNumber = prNum;
+          worktreeName = undefined; // slug will be generated in setup()
+        }
+      }
+
+      // Extract tmux option (requires --worktree)
+      const tmuxEnabled = isWorktreeModeEnabled() && (options as { tmux?: boolean }).tmux === true;
+
+      // Validate tmux option
+      if (tmuxEnabled) {
+        if (!worktreeEnabled) {
+          process.stderr.write(chalk.red('Error: --tmux requires --worktree\n'));
+          process.exit(1);
+        }
+        if (getPlatform() === 'windows') {
+          process.stderr.write(chalk.red('Error: --tmux is not supported on Windows\n'));
+          process.exit(1);
+        }
+        if (!(await isTmuxAvailable())) {
+          process.stderr.write(chalk.red(`Error: tmux is not installed.\n${getTmuxInstallInstructions()}\n`));
+          process.exit(1);
+        }
+      }
+
+      // Extract teammate options (for tmux-spawned agents)
+      // Declared outside the if block so it's accessible later for system prompt addendum
+      let storedTeammateOpts: TeammateOptions | undefined;
+      if (isAgentSwarmsEnabled()) {
+        // Extract agent identity options (for tmux-spawned agents)
+        // These replace the CLAUDE_CODE_* environment variables
+        const teammateOpts = extractTeammateOptions(options);
+        storedTeammateOpts = teammateOpts;
+
+        // If any teammate identity option is provided, all three required ones must be present
+        const hasAnyTeammateOpt = teammateOpts.agentId || teammateOpts.agentName || teammateOpts.teamName;
+        const hasAllRequiredTeammateOpts = teammateOpts.agentId && teammateOpts.agentName && teammateOpts.teamName;
+
+        if (hasAnyTeammateOpt && !hasAllRequiredTeammateOpts) {
+          process.stderr.write(
+            chalk.red('Error: --agent-id, --agent-name, and --team-name must all be provided together\n'),
+          );
+          process.exit(1);
+        }
+
+        // If teammate identity is provided via CLI, set up dynamicTeamContext
+        if (teammateOpts.agentId && teammateOpts.agentName && teammateOpts.teamName) {
+          getTeammateUtils().setDynamicTeamContext?.({
+            agentId: teammateOpts.agentId,
+            agentName: teammateOpts.agentName,
+            teamName: teammateOpts.teamName,
+            color: teammateOpts.agentColor,
+            planModeRequired: teammateOpts.planModeRequired ?? false,
+            parentSessionId: teammateOpts.parentSessionId,
+          });
+        }
+
+        // Set teammate mode CLI override if provided
+        // This must be done before setup() captures the snapshot
+        if (teammateOpts.teammateMode) {
+          getTeammateModeSnapshot().setCliTeammateModeOverride?.(teammateOpts.teammateMode);
+        }
+      }
+
+      // Extract remote sdk options
+      const sdkUrl = (options as { sdkUrl?: string }).sdkUrl ?? undefined;
+
+      // Allow env var to enable partial messages (used by sandbox gateway for baku)
+      const effectiveIncludePartialMessages =
+        includePartialMessages || isEnvTruthy(process.env.CLAUDE_CODE_INCLUDE_PARTIAL_MESSAGES);
+
+      // Enable all hook event types when explicitly requested via SDK option
+      // or when running in CLAUDE_CODE_REMOTE mode (CCR needs them).
+      // Without this, only SessionStart and Setup events are emitted.
+      if (includeHookEvents || isEnvTruthy(process.env.CLAUDE_CODE_REMOTE)) {
+        setAllHookEventsEnabled(true);
+      }
+
+      // Auto-set input/output formats, verbose mode, and print mode when SDK URL is provided
+      if (sdkUrl) {
+        // If SDK URL is provided, automatically use stream-json formats unless explicitly set
+        if (!inputFormat) {
+          inputFormat = 'stream-json';
+        }
+        if (!outputFormat) {
+          outputFormat = 'stream-json';
+        }
+        // Auto-enable verbose mode unless explicitly disabled or already set
+        if (options.verbose === undefined) {
+          verbose = true;
+        }
+        // Auto-enable print mode unless explicitly disabled
+        if (!options.print) {
+          print = true;
+        }
+      }
+
+      // Extract teleport option
+      const teleport = (options as { teleport?: string | true }).teleport ?? null;
+
+      // Extract remote option (can be true if no description provided, or a string)
+      const remoteOption = (options as { remote?: string | true }).remote;
+      const remote = remoteOption === true ? '' : (remoteOption ?? null);
+
+      // Extract --remote-control / --rc flag (enable bridge in interactive session)
+      const remoteControlOption =
+        (options as { remoteControl?: string | true }).remoteControl ?? (options as { rc?: string | true }).rc;
+      // Actual bridge check is deferred to after showSetupScreens() so that
+      // trust is established and GrowthBook has auth headers.
+      let remoteControl = false;
+      const remoteControlName =
+        typeof remoteControlOption === 'string' && remoteControlOption.length > 0 ? remoteControlOption : undefined;
+
+      // Validate session ID if provided
+      if (sessionId) {
+        // Check for conflicting flags
+        // --session-id can be used with --continue or --resume when --fork-session is also provided
+        // (to specify a custom ID for the forked session)
+        if ((options.continue || options.resume) && !options.forkSession) {
+          process.stderr.write(
+            chalk.red(
+              'Error: --session-id can only be used with --continue or --resume if --fork-session is also specified.\n',
+            ),
+          );
+          process.exit(1);
+        }
+
+        // When --sdk-url is provided (bridge/remote mode), the session ID is a
+        // server-assigned tagged ID (e.g. "session_local_01...") rather than a
+        // UUID. Skip UUID validation and local existence checks in that case.
+        if (!sdkUrl) {
+          const validatedSessionId = validateUuid(sessionId);
+          if (!validatedSessionId) {
+            process.stderr.write(chalk.red('Error: Invalid session ID. Must be a valid UUID.\n'));
+            process.exit(1);
+          }
+
+          // Check if session ID already exists
+          if (sessionIdExists(validatedSessionId)) {
+            process.stderr.write(chalk.red(`Error: Session ID ${validatedSessionId} is already in use.\n`));
+            process.exit(1);
+          }
+        }
+      }
+
+      // Download file resources if specified via --file flag
+      const fileSpecs = (options as { file?: string[] }).file;
+      if (fileSpecs && fileSpecs.length > 0) {
+        // Get session ingress token (provided by EnvManager via CLAUDE_CODE_SESSION_ACCESS_TOKEN)
+        const sessionToken = getSessionIngressAuthToken();
+        if (!sessionToken) {
+          process.stderr.write(
+            chalk.red(
+              'Error: Session token required for file downloads. CLAUDE_CODE_SESSION_ACCESS_TOKEN must be set.\n',
+            ),
+          );
+          process.exit(1);
+        }
+
+        // Resolve session ID: prefer remote session ID, fall back to internal session ID
+        const fileSessionId = process.env.CLAUDE_CODE_REMOTE_SESSION_ID || getSessionId();
+
+        const files = parseFileSpecs(fileSpecs);
+        if (files.length > 0) {
+          // Use ANTHROPIC_BASE_URL if set (by EnvManager), otherwise use OAuth config
+          // This ensures consistency with session ingress API in all environments
+          const config: FilesApiConfig = {
+            baseUrl: process.env.ANTHROPIC_BASE_URL || getOauthConfig().BASE_API_URL,
+            oauthToken: sessionToken,
+            sessionId: fileSessionId,
+          };
+
+          // Start download without blocking startup - await before REPL renders
+          fileDownloadPromise = downloadSessionFiles(files, config);
+        }
+      }
+
+      // Get isNonInteractiveSession from state (was set before init())
+      const isNonInteractiveSession = getIsNonInteractiveSession();
+
+      // Validate that fallback model is different from main model
+      if (fallbackModel && options.model && fallbackModel === options.model) {
+        process.stderr.write(
+          chalk.red(
+            'Error: Fallback model cannot be the same as the main model. Please specify a different model for --fallback-model.\n',
+          ),
+        );
+        process.exit(1);
+      }
+
+      // Handle system prompt options
+      let systemPrompt = options.systemPrompt;
+      if (options.systemPromptFile) {
+        if (options.systemPrompt) {
+          process.stderr.write(
+            chalk.red('Error: Cannot use both --system-prompt and --system-prompt-file. Please use only one.\n'),
+          );
+          process.exit(1);
+        }
+
+        try {
+          const filePath = resolve(options.systemPromptFile);
+          systemPrompt = readFileSync(filePath, 'utf8');
+        } catch (error) {
+          const code = getErrnoCode(error);
+          if (code === 'ENOENT') {
+            process.stderr.write(
+              chalk.red(`Error: System prompt file not found: ${resolve(options.systemPromptFile)}\n`),
+            );
+            process.exit(1);
+          }
+          process.stderr.write(chalk.red(`Error reading system prompt file: ${errorMessage(error)}\n`));
+          process.exit(1);
+        }
+      }
+
+      // Handle append system prompt options
+      let appendSystemPrompt = options.appendSystemPrompt;
+      if (options.appendSystemPromptFile) {
+        if (options.appendSystemPrompt) {
+          process.stderr.write(
+            chalk.red(
+              'Error: Cannot use both --append-system-prompt and --append-system-prompt-file. Please use only one.\n',
+            ),
+          );
+          process.exit(1);
+        }
+
+        try {
+          const filePath = resolve(options.appendSystemPromptFile);
+          appendSystemPrompt = readFileSync(filePath, 'utf8');
+        } catch (error) {
+          const code = getErrnoCode(error);
+          if (code === 'ENOENT') {
+            process.stderr.write(
+              chalk.red(`Error: Append system prompt file not found: ${resolve(options.appendSystemPromptFile)}\n`),
+            );
+            process.exit(1);
+          }
+          process.stderr.write(chalk.red(`Error reading append system prompt file: ${errorMessage(error)}\n`));
+          process.exit(1);
+        }
+      }
+
+      // Add teammate-specific system prompt addendum for tmux teammates
+      if (
+        isAgentSwarmsEnabled() &&
+        storedTeammateOpts?.agentId &&
+        storedTeammateOpts?.agentName &&
+        storedTeammateOpts?.teamName
+      ) {
+        const addendum = getTeammatePromptAddendum().TEAMMATE_SYSTEM_PROMPT_ADDENDUM;
+        appendSystemPrompt = appendSystemPrompt ? `${appendSystemPrompt}\n\n${addendum}` : addendum;
+      }
+
+      const { mode: permissionMode, notification: permissionModeNotification } = initialPermissionModeFromCLI({
+        permissionModeCli,
+        dangerouslySkipPermissions,
+      });
+
+      // Store session bypass permissions mode for trust dialog check
+      setSessionBypassPermissionsMode(permissionMode === 'bypassPermissions');
+      if (feature('TRANSCRIPT_CLASSIFIER')) {
+        // autoModeFlagCli is the "did the user intend auto this session" signal.
+        // Set when: --enable-auto-mode, --permission-mode auto, resolved mode
+        // is auto, OR settings defaultMode is auto but the gate denied it
+        // (permissionMode resolved to default with no explicit CLI override).
+        // Used by verifyAutoModeGateAccess to decide whether to notify on
+        // auto-unavailable, and by tengu_auto_mode_config opt-in carousel.
+        if (
+          (options as { enableAutoMode?: boolean }).enableAutoMode ||
+          permissionModeCli === 'auto' ||
+          permissionMode === 'auto' ||
+          (!permissionModeCli && isDefaultPermissionModeAuto())
+        ) {
+          autoModeStateModule?.setAutoModeFlagCli(true);
+        }
+      }
+
+      // Parse the MCP config files/strings if provided
+      let dynamicMcpConfig: Record<string, ScopedMcpServerConfig> = {
+        // Built-in MCP servers (default disabled, user enables via /mcp)
+        'mcp-chrome': {
+          type: 'http',
+          url: 'http://127.0.0.1:12306/mcp',
+          scope: 'dynamic',
+          headers: {
+            Authorization: 'Bearer my-static-token',
+          },
+        },
+      };
+
+      if (mcpConfig && mcpConfig.length > 0) {
+        // Process mcpConfig array
+        const processedConfigs = mcpConfig.map(config => config.trim()).filter(config => config.length > 0);
+
+        let allConfigs: Record<string, McpServerConfig> = {};
+        const allErrors: ValidationError[] = [];
+
+        for (const configItem of processedConfigs) {
+          let configs: Record<string, McpServerConfig> | null = null;
+          let errors: ValidationError[] = [];
+
+          // First try to parse as JSON string
+          const parsedJson = safeParseJSON(configItem);
+          if (parsedJson) {
+            const result = parseMcpConfig({
+              configObject: parsedJson,
+              filePath: 'command line',
+              expandVars: true,
+              scope: 'dynamic',
+            });
+            if (result.config) {
+              configs = result.config.mcpServers;
+            } else {
+              errors = result.errors;
+            }
+          } else {
+            // Try as file path
+            const configPath = resolve(configItem);
+            const result = parseMcpConfigFromFilePath({
+              filePath: configPath,
+              expandVars: true,
+              scope: 'dynamic',
+            });
+            if (result.config) {
+              configs = result.config.mcpServers;
+            } else {
+              errors = result.errors;
+            }
+          }
+
+          if (errors.length > 0) {
+            allErrors.push(...errors);
+          } else if (configs) {
+            // Merge configs, later ones override earlier ones
+            allConfigs = { ...allConfigs, ...configs };
+          }
+        }
+
+        if (allErrors.length > 0) {
+          const formattedErrors = allErrors.map(err => `${err.path ? err.path + ': ' : ''}${err.message}`).join('\n');
+          logForDebugging(`--mcp-config validation failed (${allErrors.length} errors): ${formattedErrors}`, {
+            level: 'error',
+          });
+          process.stderr.write(`Error: Invalid MCP configuration:\n${formattedErrors}\n`);
+          process.exit(1);
+        }
+
+        if (Object.keys(allConfigs).length > 0) {
+          // SDK hosts (Nest/Desktop) own their server naming and may reuse
+          // built-in names — skip reserved-name checks for type:'sdk'.
+          const nonSdkConfigNames = Object.entries(allConfigs)
+            .filter(([, config]) => config.type !== 'sdk')
+            .map(([name]) => name);
+
+          let reservedNameError: string | null = null;
+          if (nonSdkConfigNames.some(isClaudeInChromeMCPServer)) {
+            reservedNameError = `Invalid MCP configuration: "${CLAUDE_IN_CHROME_MCP_SERVER_NAME}" is a reserved MCP name.`;
+          } else if (feature('CHICAGO_MCP')) {
+            const { isComputerUseMCPServer, COMPUTER_USE_MCP_SERVER_NAME } = await import(
+              'src/utils/computerUse/common.js'
+            );
+            if (nonSdkConfigNames.some(isComputerUseMCPServer)) {
+              reservedNameError = `Invalid MCP configuration: "${COMPUTER_USE_MCP_SERVER_NAME}" is a reserved MCP name.`;
+            }
+          }
+          if (reservedNameError) {
+            // stderr+exit(1) — a throw here becomes a silent unhandled
+            // rejection in stream-json mode (void main() in cli.tsx).
+            process.stderr.write(`Error: ${reservedNameError}\n`);
+            process.exit(1);
+          }
+
+          // Add dynamic scope to all configs. type:'sdk' entries pass through
+          // unchanged — they're extracted into sdkMcpConfigs downstream and
+          // passed to print.ts. The Python SDK relies on this path (it doesn't
+          // send sdkMcpServers in the initialize message). Dropping them here
+          // broke Coworker (inc-5122). The policy filter below already exempts
+          // type:'sdk', and the entries are inert without an SDK transport on
+          // stdin, so there's no bypass risk from letting them through.
+          const scopedConfigs = mapValues(allConfigs, config => ({
+            ...config,
+            scope: 'dynamic' as const,
+          }));
+
+          // Enforce managed policy (allowedMcpServers / deniedMcpServers) on
+          // --mcp-config servers. Without this, the CLI flag bypasses the
+          // enterprise allowlist that user/project/local configs go through in
+          // getClaudeCodeMcpConfigs — callers spread dynamicMcpConfig back on
+          // top of filtered results. Filter here at the source so all
+          // downstream consumers see the policy-filtered set.
+          const { allowed, blocked } = filterMcpServersByPolicy(scopedConfigs);
+          if (blocked.length > 0) {
+            process.stderr.write(
+              `Warning: MCP ${plural(blocked.length, 'server')} blocked by enterprise policy: ${blocked.join(', ')}\n`,
+            );
+          }
+          dynamicMcpConfig = { ...dynamicMcpConfig, ...(allowed as Record<string, ScopedMcpServerConfig>) };
+        }
+      }
+
+      // Extract Claude in Chrome option and enforce claude.ai subscriber check (unless user is ant)
+      const chromeOpts = options as { chrome?: boolean };
+      // Store the explicit CLI flag so teammates can inherit it
+      setChromeFlagOverride(chromeOpts.chrome);
+      const enableClaudeInChrome =
+        shouldEnableClaudeInChrome(chromeOpts.chrome) && (process.env.USER_TYPE === 'ant' || isClaudeAISubscriber());
+      const autoEnableClaudeInChrome = !enableClaudeInChrome && shouldAutoEnableClaudeInChrome();
+
+      if (enableClaudeInChrome) {
+        const platform = getPlatform();
+        try {
+          logEvent('tengu_claude_in_chrome_setup', {
+            platform: platform as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          });
+
+          const {
+            mcpConfig: chromeMcpConfig,
+            allowedTools: chromeMcpTools,
+            systemPrompt: chromeSystemPrompt,
+          } = setupClaudeInChrome();
+          dynamicMcpConfig = {
+            ...dynamicMcpConfig,
+            ...chromeMcpConfig,
+          };
+          allowedTools.push(...chromeMcpTools);
+          if (chromeSystemPrompt) {
+            appendSystemPrompt = appendSystemPrompt
+              ? `${chromeSystemPrompt}\n\n${appendSystemPrompt}`
+              : chromeSystemPrompt;
+          }
+        } catch (error) {
+          logEvent('tengu_claude_in_chrome_setup_failed', {
+            platform: platform as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          });
+          logForDebugging(`[Claude in Chrome] Error: ${error}`);
+          logError(error);
+          console.error(`Error: Failed to run with Claude in Chrome.`);
+          process.exit(1);
+        }
+      } else if (autoEnableClaudeInChrome) {
+        try {
+          const { mcpConfig: chromeMcpConfig } = setupClaudeInChrome();
+          dynamicMcpConfig = {
+            ...dynamicMcpConfig,
+            ...chromeMcpConfig,
+          };
+
+          const hint =
+            feature('WEB_BROWSER_TOOL') && typeof Bun !== 'undefined' && 'WebView' in Bun
+              ? CLAUDE_IN_CHROME_SKILL_HINT_WITH_WEBBROWSER
+              : CLAUDE_IN_CHROME_SKILL_HINT;
+          appendSystemPrompt = appendSystemPrompt ? `${appendSystemPrompt}\n\n${hint}` : hint;
+        } catch (error) {
+          // Silently skip any errors for the auto-enable
+          logForDebugging(`[Claude in Chrome] Error (auto-enable): ${error}`);
+        }
+      }
+
+      // Extract strict MCP config flag
+      const strictMcpConfig = options.strictMcpConfig || false;
+
+      // Check if enterprise MCP configuration exists. When it does, only allow dynamic MCP
+      // configs that contain special server types (sdk)
+      if (doesEnterpriseMcpConfigExist()) {
+        if (strictMcpConfig) {
+          process.stderr.write(
+            chalk.red('You cannot use --strict-mcp-config when an enterprise MCP config is present'),
+          );
+          process.exit(1);
+        }
+
+        // For --mcp-config, allow if all servers are internal types (sdk)
+        if (dynamicMcpConfig && !areMcpConfigsAllowedWithEnterpriseMcpConfig(dynamicMcpConfig)) {
+          process.stderr.write(
+            chalk.red('You cannot dynamically configure MCP servers when an enterprise MCP config is present'),
+          );
+          process.exit(1);
+        }
+      }
+
+      // chicago MCP: guarded Computer Use (app allowlist + frontmost gate +
+      // SCContentFilter screenshots). Ant-only, GrowthBook-gated — failures
+      // are silent (this is dogfooding). Platform + interactive checks inline
+      // so non-macOS / print-mode ants skip the heavy @ant/computer-use-mcp
+      // import entirely. gates.js is light (type-only package import).
+      //
+      // Placed AFTER the enterprise-MCP-config check: that check rejects any
+      // dynamicMcpConfig entry with `type !== 'sdk'`, and our config is
+      // `type: 'stdio'`. An enterprise-config ant with the GB gate on would
+      // otherwise process.exit(1). Chrome has the same latent issue but has
+      // shipped without incident; chicago places itself correctly.
+      if (feature('CHICAGO_MCP') && getPlatform() !== 'unknown' && !getIsNonInteractiveSession()) {
+        try {
+          const { getChicagoEnabled } = await import('src/utils/computerUse/gates.js');
+          if (getChicagoEnabled()) {
+            const { setupComputerUseMCP } = await import('src/utils/computerUse/setup.js');
+            const { mcpConfig, allowedTools: cuTools } = setupComputerUseMCP();
+            dynamicMcpConfig = {
+              ...dynamicMcpConfig,
+              ...mcpConfig,
+            };
+            allowedTools.push(...cuTools);
+          }
+        } catch (error) {
+          logForDebugging(`[Computer Use MCP] Setup failed: ${errorMessage(error)}`);
+        }
+      }
+
+      // Store additional directories for CLAUDE.md loading (controlled by env var)
+      setAdditionalDirectoriesForClaudeMd(addDir);
+
+      // Channel server allowlist from --channels flag — servers whose
+      // inbound push notifications should register this session. The option
+      // is added inside a feature() block so TS doesn't know about it
+      // on the options type — same pattern as --assistant at main.tsx:1824.
+      // devChannels is deferred: showSetupScreens shows a confirmation dialog
+      // and only appends to allowedChannels on accept.
+      let devChannels: ChannelEntry[] | undefined;
+      if (feature('KAIROS') || feature('KAIROS_CHANNELS')) {
+        // Parse plugin:name@marketplace / server:Y tags into typed entries.
+        // Tag decides trust model downstream: plugin-kind hits marketplace
+        // verification + GrowthBook allowlist, server-kind always fails
+        // allowlist (schema is plugin-only) unless dev flag is set.
+        // Untagged or marketplace-less plugin entries are hard errors —
+        // silently not-matching in the gate would look like channels are
+        // "on" but nothing ever fires.
+        const parseChannelEntries = (raw: string[], flag: string): ChannelEntry[] => {
+          const entries: ChannelEntry[] = [];
+          const bad: string[] = [];
+          for (const c of raw) {
+            if (c.startsWith('plugin:')) {
+              const rest = c.slice(7);
+              const at = rest.indexOf('@');
+              if (at <= 0 || at === rest.length - 1) {
+                bad.push(c);
+              } else {
+                entries.push({
+                  kind: 'plugin',
+                  name: rest.slice(0, at),
+                  marketplace: rest.slice(at + 1),
+                });
+              }
+            } else if (c.startsWith('server:') && c.length > 7) {
+              entries.push({ kind: 'server', name: c.slice(7) });
+            } else {
+              bad.push(c);
+            }
+          }
+          if (bad.length > 0) {
+            process.stderr.write(
+              chalk.red(
+                `${flag} entries must be tagged: ${bad.join(', ')}\n` +
+                  `  plugin:<name>@<marketplace>  — plugin-provided channel (allowlist enforced)\n` +
+                  `  server:<name>                — manually configured MCP server\n`,
+              ),
+            );
+            process.exit(1);
+          }
+          return entries;
+        };
+
+        const channelOpts = options as {
+          channels?: string[];
+          dangerouslyLoadDevelopmentChannels?: string[];
+        };
+        const rawChannels = channelOpts.channels;
+        const rawDev = channelOpts.dangerouslyLoadDevelopmentChannels;
+        // Always parse + set. ChannelsNotice reads getAllowedChannels() and
+        // renders the appropriate branch (disabled/noAuth/policyBlocked/
+        // listening) in the startup screen. gateChannelServer() enforces.
+        // --channels works in both interactive and print/SDK modes; dev-channels
+        // stays interactive-only (requires a confirmation dialog).
+        let channelEntries: ChannelEntry[] = [];
+        if (rawChannels && rawChannels.length > 0) {
+          channelEntries = parseChannelEntries(rawChannels, '--channels');
+          setAllowedChannels(channelEntries);
+        }
+        if (!isNonInteractiveSession) {
+          if (rawDev && rawDev.length > 0) {
+            devChannels = parseChannelEntries(rawDev, '--dangerously-load-development-channels');
+          }
+        }
+        // Flag-usage telemetry. Plugin identifiers are logged (same tier as
+        // tengu_plugin_installed — public-registry-style names); server-kind
+        // names are not (MCP-server-name tier, opt-in-only elsewhere).
+        // Per-server gate outcomes land in tengu_mcp_channel_gate once
+        // servers connect. Dev entries go through a confirmation dialog after
+        // this — dev_plugins captures what was typed, not what was accepted.
+        if (channelEntries.length > 0 || (devChannels?.length ?? 0) > 0) {
+          const joinPluginIds = (entries: ChannelEntry[]) => {
+            const ids = entries.flatMap(e => (e.kind === 'plugin' ? [`${e.name}@${e.marketplace}`] : []));
+            return ids.length > 0
+              ? (ids.sort().join(',') as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS)
+              : undefined;
+          };
+          logEvent('tengu_mcp_channel_flags', {
+            channels_count: channelEntries.length,
+            dev_count: devChannels?.length ?? 0,
+            plugins: joinPluginIds(channelEntries),
+            dev_plugins: joinPluginIds(devChannels ?? []),
+          });
+        }
+      }
+
+      // SDK opt-in for SendUserMessage via --tools. All sessions require
+      // explicit opt-in; listing it in --tools signals intent. Runs BEFORE
+      // initializeToolPermissionContext so getToolsForDefaultPreset() sees
+      // the tool as enabled when computing the base-tools disallow filter.
+      // Conditional require avoids leaking the tool-name string into
+      // external builds.
+      if ((feature('KAIROS') || feature('KAIROS_BRIEF')) && baseTools.length > 0) {
+        /* eslint-disable @typescript-eslint/no-require-imports */
+        const { BRIEF_TOOL_NAME, LEGACY_BRIEF_TOOL_NAME } =
+          require('@claude-code-best/builtin-tools/tools/BriefTool/prompt.js') as typeof import('@claude-code-best/builtin-tools/tools/BriefTool/prompt.js');
+        const { isBriefEntitled } =
+          require('@claude-code-best/builtin-tools/tools/BriefTool/BriefTool.js') as typeof import('@claude-code-best/builtin-tools/tools/BriefTool/BriefTool.js');
+        /* eslint-enable @typescript-eslint/no-require-imports */
+        const parsed = parseToolListFromCLI(baseTools);
+        if ((parsed.includes(BRIEF_TOOL_NAME) || parsed.includes(LEGACY_BRIEF_TOOL_NAME)) && isBriefEntitled()) {
+          setUserMsgOptIn(true);
+        }
+      }
+
+      // This await replaces blocking existsSync/statSync calls that were already in
+      // the startup path. Wall-clock time is unchanged; we just yield to the event
+      // loop during the fs I/O instead of blocking it. See #19661.
+      const initResult = await initializeToolPermissionContext({
+        allowedToolsCli: allowedTools,
+        disallowedToolsCli: disallowedTools,
+        baseToolsCli: baseTools,
+        permissionMode,
+        allowDangerouslySkipPermissions,
+        addDirs: addDir,
+      });
+      let toolPermissionContext = initResult.toolPermissionContext;
+      const { warnings, dangerousPermissions, overlyBroadBashPermissions } = initResult;
+
+      // Handle overly broad shell allow rules for ant users (Bash(*), PowerShell(*))
+      if (process.env.USER_TYPE === 'ant' && overlyBroadBashPermissions.length > 0) {
+        for (const permission of overlyBroadBashPermissions) {
+          logForDebugging(
+            `Ignoring overly broad shell permission ${permission.ruleDisplay} from ${permission.sourceDisplay}`,
+          );
+        }
+        toolPermissionContext = removeDangerousPermissions(toolPermissionContext, overlyBroadBashPermissions);
+      }
+
+      if (feature('TRANSCRIPT_CLASSIFIER') && dangerousPermissions.length > 0) {
+        toolPermissionContext = stripDangerousPermissionsForAutoMode(toolPermissionContext);
+      }
+
+      // Print any warnings from initialization
+      warnings.forEach(warning => {
+        console.error(warning);
+      });
+
+      // claude.ai config fetch: -p mode only (interactive uses useManageMCPConnections
+      // two-phase loading). Kicked off here to overlap with setup(); awaited
+      // before runHeadless so single-turn -p sees connectors. Skipped under
+      // enterprise/strict MCP to preserve policy boundaries.
+      const claudeaiConfigPromise: Promise<Record<string, ScopedMcpServerConfig>> =
+        isNonInteractiveSession &&
+        !strictMcpConfig &&
+        !doesEnterpriseMcpConfigExist() &&
+        // --bare / SIMPLE: skip claude.ai proxy servers (datadog, Gmail,
+        // Slack, BigQuery, PubMed — 6-14s each to connect). Scripted calls
+        // that need MCP pass --mcp-config explicitly.
+        !isBareMode()
+          ? fetchClaudeAIMcpConfigsIfEligible().then(configs => {
+              const { allowed, blocked } = filterMcpServersByPolicy(configs);
+              if (blocked.length > 0) {
+                process.stderr.write(
+                  `Warning: claude.ai MCP ${plural(blocked.length, 'server')} blocked by enterprise policy: ${blocked.join(', ')}\n`,
+                );
+              }
+              return allowed;
+            })
+          : Promise.resolve({});
+
+      // Kick off MCP config loading early (safe - just reads files, no execution).
+      // Both interactive and -p use getClaudeCodeMcpConfigs (local file reads only).
+      // The local promise is awaited later (before prefetchAllMcpResources) to
+      // overlap config I/O with setup(), commands loading, and trust dialog.
+      logForDebugging('[STARTUP] Loading MCP configs...');
+      const mcpConfigStart = Date.now();
+      let mcpConfigResolvedMs: number | undefined;
+      // --bare skips auto-discovered MCP (.mcp.json, user settings, plugins) —
+      // only explicit --mcp-config works. dynamicMcpConfig is spread onto
+      // allMcpConfigs downstream so it survives this skip.
+      const mcpConfigPromise = (
+        strictMcpConfig || isBareMode()
+          ? Promise.resolve({
+              servers: {} as Record<string, ScopedMcpServerConfig>,
+            })
+          : getClaudeCodeMcpConfigs(dynamicMcpConfig)
+      ).then(result => {
+        mcpConfigResolvedMs = Date.now() - mcpConfigStart;
+        return result;
+      });
+
+      // NOTE: We do NOT call prefetchAllMcpResources here - that's deferred until after trust dialog
+
+      if (inputFormat && inputFormat !== 'text' && inputFormat !== 'stream-json') {
+        console.error(`Error: Invalid input format "${inputFormat}".`);
+        process.exit(1);
+      }
+      if (inputFormat === 'stream-json' && outputFormat !== 'stream-json') {
+        console.error(`Error: --input-format=stream-json requires output-format=stream-json.`);
+        process.exit(1);
+      }
+
+      // Validate sdkUrl is only used with appropriate formats (formats are auto-set above)
+      if (sdkUrl) {
+        if (inputFormat !== 'stream-json' || outputFormat !== 'stream-json') {
+          console.error(`Error: --sdk-url requires both --input-format=stream-json and --output-format=stream-json.`);
+          process.exit(1);
+        }
+      }
+
+      // Validate replayUserMessages is only used with stream-json formats
+      if (options.replayUserMessages) {
+        if (inputFormat !== 'stream-json' || outputFormat !== 'stream-json') {
+          console.error(
+            `Error: --replay-user-messages requires both --input-format=stream-json and --output-format=stream-json.`,
+          );
+          process.exit(1);
+        }
+      }
+
+      // Validate includePartialMessages is only used with print mode and stream-json output
+      if (effectiveIncludePartialMessages) {
+        if (!isNonInteractiveSession || outputFormat !== 'stream-json') {
+          writeToStderr(`Error: --include-partial-messages requires --print and --output-format=stream-json.`);
+          process.exit(1);
+        }
+      }
+
+      // Validate --no-session-persistence is only used with print mode
+      if (options.sessionPersistence === false && !isNonInteractiveSession) {
+        writeToStderr(`Error: --no-session-persistence can only be used with --print mode.`);
+        process.exit(1);
+      }
+
+      const effectivePrompt = prompt || '';
+      let inputPrompt = await getInputPrompt(effectivePrompt, (inputFormat ?? 'text') as 'text' | 'stream-json');
+      profileCheckpoint('action_after_input_prompt');
+
+      // Activate proactive mode BEFORE getTools() so SleepTool.isEnabled()
+      // (which returns isProactiveActive()) passes and Sleep is included.
+      // The later REPL-path maybeActivateProactive() calls are idempotent.
+      maybeActivateProactive(options);
+
+      let tools = getTools(toolPermissionContext);
+
+      // Apply coordinator mode tool filtering for headless path
+      // (mirrors useMergedTools.ts filtering for REPL/interactive path)
+      if (feature('COORDINATOR_MODE') && isEnvTruthy(process.env.CLAUDE_CODE_COORDINATOR_MODE)) {
+        const { applyCoordinatorToolFilter } = await import('./utils/toolPool.js');
+        tools = applyCoordinatorToolFilter(tools);
+      }
+
+      profileCheckpoint('action_tools_loaded');
+
+      let jsonSchema: ToolInputJSONSchema | undefined;
+      if (isSyntheticOutputToolEnabled({ isNonInteractiveSession }) && options.jsonSchema) {
+        jsonSchema = jsonParse(options.jsonSchema) as ToolInputJSONSchema;
+      }
+
+      if (jsonSchema) {
+        const syntheticOutputResult = createSyntheticOutputTool(jsonSchema);
+        if ('tool' in syntheticOutputResult) {
+          // Add SyntheticOutputTool to the tools array AFTER getTools() filtering.
+          // This tool is excluded from normal filtering (see tools.ts) because it's
+          // an implementation detail for structured output, not a user-controlled tool.
+          tools = [...tools, syntheticOutputResult.tool];
+
+          logEvent('tengu_structured_output_enabled', {
+            schema_property_count: Object.keys((jsonSchema.properties as Record<string, unknown>) || {})
+              .length as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+            has_required_fields: Boolean(
+              jsonSchema.required,
+            ) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          });
+        } else {
+          logEvent('tengu_structured_output_failure', {
+            error: 'Invalid JSON schema' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          });
+        }
+      }
+
+      // IMPORTANT: setup() must be called before any other code that depends on the cwd or worktree setup
+      profileCheckpoint('action_before_setup');
+      logForDebugging('[STARTUP] Running setup()...');
+      const setupStart = Date.now();
+      const { setup } = await import('./setup.js');
+      const messagingSocketPath = feature('UDS_INBOX')
+        ? (options as { messagingSocketPath?: string }).messagingSocketPath
+        : undefined;
+      // Parallelize setup() with commands+agents loading. setup()'s ~28ms is
+      // mostly startUdsMessaging (socket bind, ~20ms) — not disk-bound, so it
+      // doesn't contend with getCommands' file reads. Gated on !worktreeEnabled
+      // since --worktree makes setup() process.chdir() (setup.ts:203), and
+      // commands/agents need the post-chdir cwd.
+      const preSetupCwd = getCwd();
+      // Register bundled skills/plugins before kicking getCommands() — they're
+      // pure in-memory array pushes (<1ms, zero I/O) that getBundledSkills()
+      // reads synchronously. Previously ran inside setup() after ~20ms of
+      // await points, so the parallel getCommands() memoized an empty list.
+      if (process.env.CLAUDE_CODE_ENTRYPOINT !== 'local-agent') {
+        initBuiltinPlugins();
+        initBundledSkills();
+      }
+      const setupPromise = setup(
+        preSetupCwd,
+        permissionMode,
+        allowDangerouslySkipPermissions,
+        worktreeEnabled,
+        worktreeName,
+        tmuxEnabled,
+        sessionId ? validateUuid(sessionId) : undefined,
+        worktreePRNumber,
+        messagingSocketPath,
+      );
+      const commandsPromise = worktreeEnabled ? null : getCommands(preSetupCwd);
+      const agentDefsPromise = worktreeEnabled ? null : getAgentDefinitionsWithOverrides(preSetupCwd);
+      // Suppress transient unhandledRejection if these reject during the
+      // ~28ms setupPromise await before Promise.all joins them below.
+      commandsPromise?.catch(() => {});
+      agentDefsPromise?.catch(() => {});
+      await setupPromise;
+      logForDebugging(`[STARTUP] setup() completed in ${Date.now() - setupStart}ms`);
+      profileCheckpoint('action_after_setup');
+
+      // Replay user messages into stream-json only when the socket was
+      // explicitly requested. The auto-generated socket is passive — it
+      // lets tools inject if they want to, but turning it on by default
+      // shouldn't reshape stream-json for SDK consumers who never touch it.
+      // Callers who inject and also want those injections visible in the
+      // stream pass --messaging-socket-path explicitly (or --replay-user-messages).
+      let effectiveReplayUserMessages = !!options.replayUserMessages;
+      if (feature('UDS_INBOX')) {
+        if (!effectiveReplayUserMessages && outputFormat === 'stream-json') {
+          effectiveReplayUserMessages = !!(options as { messagingSocketPath?: string }).messagingSocketPath;
+        }
+      }
+
+      if (getIsNonInteractiveSession()) {
+        // Apply full merged settings env now (including project-scoped
+        // .claude/settings.json PATH/GIT_DIR/GIT_WORK_TREE) so gitExe() and
+        // the git spawn below see it. Trust is implicit in -p mode; the
+        // docstring at managedEnv.ts:96-97 says this applies "potentially
+        // dangerous environment variables such as LD_PRELOAD, PATH" from all
+        // sources. The later call in the isNonInteractiveSession block below
+        // is idempotent (Object.assign, configureGlobalAgents ejects prior
+        // interceptor) and picks up any plugin-contributed env after plugin
+        // init. Project settings are already loaded here:
+        // applySafeConfigEnvironmentVariables in init() called
+        // getSettings_DEPRECATED at managedEnv.ts:86 which merges all enabled
+        // sources including projectSettings/localSettings.
+        applyConfigEnvironmentVariables();
+
+        // Spawn git status/log/branch now so the subprocess execution overlaps
+        // with the getCommands await below and startDeferredPrefetches. After
+        // setup() so cwd is final (setup.ts:254 may process.chdir(worktreePath)
+        // for --worktree) and after the applyConfigEnvironmentVariables above
+        // so PATH/GIT_DIR/GIT_WORK_TREE from all sources (trusted + project)
+        // are applied. getSystemContext is memoized; the
+        // prefetchSystemContextIfSafe call in startDeferredPrefetches becomes
+        // a cache hit. The microtask from await getIsGit() drains at the
+        // getCommands Promise.all await below. Trust is implicit in -p mode
+        // (same gate as prefetchSystemContextIfSafe).
+        void getSystemContext();
+        // Kick getUserContext now too — its first await (fs.readFile in
+        // getMemoryFiles) yields naturally, so the CLAUDE.md directory walk
+        // runs during the ~280ms overlap window before the context
+        // Promise.all join in print.ts. The void getUserContext() in
+        // startDeferredPrefetches becomes a memoize cache-hit.
+        void getUserContext();
+        // Kick ensureModelStringsInitialized now — for Bedrock this triggers
+        // a 100-200ms profile fetch that was awaited serially at
+        // print.ts:739. updateBedrockModelStrings is sequential()-wrapped so
+        // the await joins the in-flight fetch. Non-Bedrock is a sync
+        // early-return (zero-cost).
+        void ensureModelStringsInitialized();
+      }
+
+      // Apply --name: cache-only so no orphan file is created before the
+      // session ID is finalized by --continue/--resume. materializeSessionFile
+      // persists it on the first user message; REPL's useTerminalTitle reads it
+      // via getCurrentSessionTitle.
+      const sessionNameArg = options.name?.trim();
+      if (sessionNameArg) {
+        cacheSessionTitle(sessionNameArg);
+      }
+
+      // Ant model aliases (capybara-fast etc.) resolve via the
+      // tengu_ant_model_override GrowthBook flag. _CACHED_MAY_BE_STALE reads
+      // disk synchronously; disk is populated by a fire-and-forget write. On a
+      // cold cache, parseUserSpecifiedModel returns the unresolved alias, the
+      // API 404s, and -p exits before the async write lands — crashloop on
+      // fresh pods. Awaiting init here populates the in-memory payload map that
+      // _CACHED_MAY_BE_STALE now checks first. Gated so the warm path stays
+      // non-blocking:
+      //  - explicit model via --model or ANTHROPIC_MODEL (both feed alias resolution)
+      //  - no env override (which short-circuits _CACHED_MAY_BE_STALE before disk)
+      //  - flag absent from disk (== null also catches pre-#22279 poisoned null)
+      const explicitModel = options.model || process.env.ANTHROPIC_MODEL;
+      if (
+        process.env.USER_TYPE === 'ant' &&
+        explicitModel &&
+        explicitModel !== 'default' &&
+        !hasGrowthBookEnvOverride('tengu_ant_model_override') &&
+        getGlobalConfig().cachedGrowthBookFeatures?.['tengu_ant_model_override'] == null
+      ) {
+        await initializeGrowthBook();
+      }
+
+      // Special case the default model with the null keyword
+      // NOTE: Model resolution happens after setup() to ensure trust is established before AWS auth
+      const userSpecifiedModel = options.model === 'default' ? getDefaultMainLoopModel() : options.model;
+      const userSpecifiedFallbackModel = fallbackModel === 'default' ? getDefaultMainLoopModel() : fallbackModel;
+
+      // Reuse preSetupCwd unless setup() chdir'd (worktreeEnabled). Saves a
+      // getCwd() syscall in the common path.
+      const currentCwd = worktreeEnabled ? getCwd() : preSetupCwd;
+      logForDebugging('[STARTUP] Loading commands and agents...');
+      const commandsStart = Date.now();
+      // Join the promises kicked before setup() (or start fresh if
+      // worktreeEnabled gated the early kick). Both memoized by cwd.
+      const [commands, agentDefinitionsResult] = await Promise.all([
+        commandsPromise ?? getCommands(currentCwd),
+        agentDefsPromise ?? getAgentDefinitionsWithOverrides(currentCwd),
+      ]);
+      logForDebugging(`[STARTUP] Commands and agents loaded in ${Date.now() - commandsStart}ms`);
+      profileCheckpoint('action_commands_loaded');
+
+      // Parse CLI agents if provided via --agents flag
+      let cliAgents: typeof agentDefinitionsResult.activeAgents = [];
+      if (agentsJson) {
+        try {
+          const parsedAgents = safeParseJSON(agentsJson);
+          if (parsedAgents) {
+            cliAgents = parseAgentsFromJson(parsedAgents, 'flagSettings');
+          }
+        } catch (error) {
+          logError(error);
+        }
+      }
+
+      // Merge CLI agents with existing ones
+      const allAgents = [...agentDefinitionsResult.allAgents, ...cliAgents];
+      const agentDefinitions = {
+        ...agentDefinitionsResult,
+        allAgents,
+        activeAgents: getActiveAgentsFromList(allAgents),
+      };
+
+      // Look up main thread agent from CLI flag or settings
+      const agentSetting = agentCli ?? getInitialSettings().agent;
+      let mainThreadAgentDefinition: (typeof agentDefinitions.activeAgents)[number] | undefined;
+      if (agentSetting) {
+        mainThreadAgentDefinition = agentDefinitions.activeAgents.find(agent => agent.agentType === agentSetting);
+        if (!mainThreadAgentDefinition) {
+          logForDebugging(
+            `Warning: agent "${agentSetting}" not found. ` +
+              `Available agents: ${agentDefinitions.activeAgents.map(a => a.agentType).join(', ')}. ` +
+              `Using default behavior.`,
+          );
+        }
+      }
+
+      // Store the main thread agent type in bootstrap state so hooks can access it
+      setMainThreadAgentType(mainThreadAgentDefinition?.agentType);
+
+      // Log agent flag usage — only log agent name for built-in agents to avoid leaking custom agent names
+      if (mainThreadAgentDefinition) {
+        logEvent('tengu_agent_flag', {
+          agentType: isBuiltInAgent(mainThreadAgentDefinition)
+            ? (mainThreadAgentDefinition.agentType as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS)
+            : ('custom' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS),
+          ...(agentCli && {
+            source: 'cli' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          }),
+        });
+      }
+
+      // Persist agent setting to session transcript for resume view display and restoration
+      if (mainThreadAgentDefinition?.agentType) {
+        saveAgentSetting(mainThreadAgentDefinition.agentType);
+      }
+
+      // Apply the agent's system prompt for non-interactive sessions
+      // (interactive mode uses buildEffectiveSystemPrompt instead)
+      if (
+        isNonInteractiveSession &&
+        mainThreadAgentDefinition &&
+        !systemPrompt &&
+        !isBuiltInAgent(mainThreadAgentDefinition)
+      ) {
+        const agentSystemPrompt = mainThreadAgentDefinition.getSystemPrompt();
+        if (agentSystemPrompt) {
+          systemPrompt = agentSystemPrompt;
+        }
+      }
+
+      // initialPrompt goes first so its slash command (if any) is processed;
+      // user-provided text becomes trailing context.
+      // Only concatenate when inputPrompt is a string. When it's an
+      // AsyncIterable (SDK stream-json mode), template interpolation would
+      // call .toString() producing "[object Object]". The AsyncIterable case
+      // is handled in print.ts via structuredIO.prependUserMessage().
+      if (mainThreadAgentDefinition?.initialPrompt) {
+        if (typeof inputPrompt === 'string') {
+          inputPrompt = inputPrompt
+            ? `${mainThreadAgentDefinition.initialPrompt}\n\n${inputPrompt}`
+            : mainThreadAgentDefinition.initialPrompt;
+        } else if (!inputPrompt) {
+          inputPrompt = mainThreadAgentDefinition.initialPrompt;
+        }
+      }
+
+      // Compute effective model early so hooks can run in parallel with MCP
+      // If user didn't specify a model but agent has one, use the agent's model
+      let effectiveModel = userSpecifiedModel;
+      if (!effectiveModel && mainThreadAgentDefinition?.model && mainThreadAgentDefinition.model !== 'inherit') {
+        effectiveModel = parseUserSpecifiedModel(mainThreadAgentDefinition.model);
+      }
+
+      setMainLoopModelOverride(effectiveModel);
+
+      // Compute resolved model for hooks (use user-specified model at launch)
+      setInitialMainLoopModel(getUserSpecifiedModelSetting() || null);
+      const initialMainLoopModel = getInitialMainLoopModel();
+      const resolvedInitialModel = parseUserSpecifiedModel(initialMainLoopModel ?? getDefaultMainLoopModel());
+
+      let advisorModel: string | undefined;
+      if (isAdvisorEnabled()) {
+        const advisorOption = canUserConfigureAdvisor() ? (options as { advisor?: string }).advisor : undefined;
+        if (advisorOption) {
+          logForDebugging(`[AdvisorTool] --advisor ${advisorOption}`);
+          if (!modelSupportsAdvisor(resolvedInitialModel)) {
+            process.stderr.write(
+              chalk.red(`Error: The model "${resolvedInitialModel}" does not support the advisor tool.\n`),
+            );
+            process.exit(1);
+          }
+          const normalizedAdvisorModel = normalizeModelStringForAPI(parseUserSpecifiedModel(advisorOption));
+          if (!isValidAdvisorModel(normalizedAdvisorModel)) {
+            process.stderr.write(chalk.red(`Error: The model "${advisorOption}" cannot be used as an advisor.\n`));
+            process.exit(1);
+          }
+        }
+        advisorModel = canUserConfigureAdvisor() ? (advisorOption ?? getInitialAdvisorSetting()) : advisorOption;
+        if (advisorModel) {
+          logForDebugging(`[AdvisorTool] Advisor model: ${advisorModel}`);
+        }
+      }
+
+      // For tmux teammates with --agent-type, append the custom agent's prompt
+      if (
+        isAgentSwarmsEnabled() &&
+        storedTeammateOpts?.agentId &&
+        storedTeammateOpts?.agentName &&
+        storedTeammateOpts?.teamName &&
+        storedTeammateOpts?.agentType
+      ) {
+        // Look up the custom agent definition
+        const customAgent = agentDefinitions.activeAgents.find(a => a.agentType === storedTeammateOpts.agentType);
+        if (customAgent) {
+          // Get the prompt - need to handle both built-in and custom agents
+          let customPrompt: string | undefined;
+          if (customAgent.source === 'built-in') {
+            // Built-in agents have getSystemPrompt that takes toolUseContext
+            // We can't access full toolUseContext here, so skip for now
+            logForDebugging(
+              `[teammate] Built-in agent ${storedTeammateOpts.agentType} - skipping custom prompt (not supported)`,
+            );
+          } else {
+            // Custom agents have getSystemPrompt that takes no args
+            customPrompt = customAgent.getSystemPrompt();
+          }
+
+          // Log agent memory loaded event for tmux teammates
+          if (customAgent.memory) {
+            logEvent('tengu_agent_memory_loaded', {
+              ...(process.env.USER_TYPE === 'ant' && {
+                agent_type: customAgent.agentType as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+              }),
+              scope: customAgent.memory as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+              source: 'teammate' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+            });
+          }
+
+          if (customPrompt) {
+            const customInstructions = `\n# Custom Agent Instructions\n${customPrompt}`;
+            appendSystemPrompt = appendSystemPrompt
+              ? `${appendSystemPrompt}\n\n${customInstructions}`
+              : customInstructions;
+          }
+        } else {
+          logForDebugging(`[teammate] Custom agent ${storedTeammateOpts.agentType} not found in available agents`);
+        }
+      }
+
+      maybeActivateBrief(options);
+      // defaultView: 'chat' is a persisted opt-in — check entitlement and set
+      // userMsgOptIn so the tool + prompt section activate. Interactive-only:
+      // defaultView is a display preference; SDK sessions have no display, and
+      // the assistant installer writes defaultView:'chat' to settings.local.json
+      // which would otherwise leak into --print sessions in the same directory.
+      // Runs right after maybeActivateBrief() so all startup opt-in paths fire
+      // BEFORE any isBriefEnabled() read below (proactive prompt's
+      // briefVisibility). A persisted 'chat' after a GB kill-switch falls
+      // through (entitlement fails).
+      if (
+        (feature('KAIROS') || feature('KAIROS_BRIEF')) &&
+        !getIsNonInteractiveSession() &&
+        !getUserMsgOptIn() &&
+        getInitialSettings().defaultView === 'chat'
+      ) {
+        /* eslint-disable @typescript-eslint/no-require-imports */
+        const { isBriefEntitled } =
+          require('@claude-code-best/builtin-tools/tools/BriefTool/BriefTool.js') as typeof import('@claude-code-best/builtin-tools/tools/BriefTool/BriefTool.js');
+        /* eslint-enable @typescript-eslint/no-require-imports */
+        if (isBriefEntitled()) {
+          setUserMsgOptIn(true);
+        }
+      }
+      // Coordinator mode has its own system prompt and filters out Sleep, so
+      // the generic proactive prompt would tell it to call a tool it can't
+      // access and conflict with delegation instructions.
+      if (
+        (feature('PROACTIVE') || feature('KAIROS')) &&
+        ((options as { proactive?: boolean }).proactive || isEnvTruthy(process.env.CLAUDE_CODE_PROACTIVE)) &&
+        !coordinatorModeModule?.isCoordinatorMode()
+      ) {
+        /* eslint-disable @typescript-eslint/no-require-imports */
+        const briefVisibility =
+          feature('KAIROS') || feature('KAIROS_BRIEF')
+            ? (
+                require('@claude-code-best/builtin-tools/tools/BriefTool/BriefTool.js') as typeof import('@claude-code-best/builtin-tools/tools/BriefTool/BriefTool.js')
+              ).isBriefEnabled()
+              ? 'Call SendUserMessage at checkpoints to mark where things stand.'
+              : 'The user will see any text you output.'
+            : 'The user will see any text you output.';
+        /* eslint-enable @typescript-eslint/no-require-imports */
+        const proactivePrompt = `\n# Proactive Mode\n\nYou are in proactive mode. Take initiative — explore, act, and make progress without waiting for instructions.\n\nStart by briefly greeting the user.\n\nYou will receive periodic <tick> prompts. These are check-ins. Do whatever seems most useful, or call Sleep if there's nothing to do. ${briefVisibility}`;
+        appendSystemPrompt = appendSystemPrompt ? `${appendSystemPrompt}\n\n${proactivePrompt}` : proactivePrompt;
+      }
+
+      if (feature('KAIROS') && kairosEnabled && assistantModule) {
+        const assistantAddendum = assistantModule.getAssistantSystemPromptAddendum();
+        appendSystemPrompt = appendSystemPrompt ? `${appendSystemPrompt}\n\n${assistantAddendum}` : assistantAddendum;
+      }
+
+      // Ink root is only needed for interactive sessions — patchConsole in the
+      // Ink constructor would swallow console output in headless mode.
+      let root!: Root;
+      let getFpsMetrics!: () => FpsMetrics | undefined;
+      let stats!: StatsStore;
+
+      // Show setup screens after commands are loaded
+      if (!isNonInteractiveSession) {
+        const ctx = getRenderContext(false);
+        getFpsMetrics = ctx.getFpsMetrics;
+        stats = ctx.stats;
+        // Install asciicast recorder before Ink mounts (ant-only, opt-in via CLAUDE_CODE_TERMINAL_RECORDING=1)
+        if (process.env.USER_TYPE === 'ant') {
+          installAsciicastRecorder();
+        }
+
+        const { createRoot } = await import('@anthropic/ink');
+        root = await createRoot(ctx.renderOptions);
+
+        // Log startup time now, before any blocking dialog renders. Logging
+        // from REPL's first render (the old location) included however long
+        // the user sat on trust/OAuth/onboarding/resume-picker — p99 was ~70s
+        // dominated by dialog-wait time, not code-path startup.
+        logEvent('tengu_timer', {
+          event: 'startup' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          durationMs: Math.round(process.uptime() * 1000),
+        });
+
+        logForDebugging('[STARTUP] Running showSetupScreens()...');
+        const setupScreensStart = Date.now();
+        const onboardingShown = await showSetupScreens(
+          root,
+          permissionMode,
+          allowDangerouslySkipPermissions,
+          commands,
+          enableClaudeInChrome,
+          devChannels,
+        );
+        logForDebugging(`[STARTUP] showSetupScreens() completed in ${Date.now() - setupScreensStart}ms`);
+
+        // Now that trust is established and GrowthBook has auth headers,
+        // resolve the --remote-control / --rc entitlement gate.
+        if (feature('BRIDGE_MODE') && remoteControlOption !== undefined) {
+          const { getBridgeDisabledReason } = await import('./bridge/bridgeEnabled.js');
+          const disabledReason = await getBridgeDisabledReason();
+          remoteControl = disabledReason === null;
+          if (disabledReason) {
+            process.stderr.write(chalk.yellow(`${disabledReason}\n--rc flag ignored.\n`));
+          }
+        }
+
+        // Check for pending agent memory snapshot updates (only for --agent mode, ant-only)
+        if (
+          feature('AGENT_MEMORY_SNAPSHOT') &&
+          mainThreadAgentDefinition &&
+          isCustomAgent(mainThreadAgentDefinition) &&
+          mainThreadAgentDefinition.memory &&
+          mainThreadAgentDefinition.pendingSnapshotUpdate
+        ) {
+          const agentDef = mainThreadAgentDefinition;
+          const choice = await launchSnapshotUpdateDialog(root, {
+            agentType: agentDef.agentType,
+            scope: agentDef.memory!,
+            snapshotTimestamp: agentDef.pendingSnapshotUpdate!.snapshotTimestamp,
+          });
+          if (choice === 'merge') {
+            const { buildMergePrompt } = await import('./components/agents/SnapshotUpdateDialog.js');
+            const mergePrompt = buildMergePrompt(agentDef.agentType, agentDef.memory!);
+            inputPrompt = inputPrompt ? `${mergePrompt}\n\n${inputPrompt}` : mergePrompt;
+          }
+          agentDef.pendingSnapshotUpdate = undefined;
+        }
+
+        // Skip executing /login if we just completed onboarding for it
+        if (onboardingShown && prompt?.trim().toLowerCase() === '/login') {
+          prompt = '';
+        }
+
+        if (onboardingShown) {
+          // Refresh auth-dependent services now that the user has logged in during onboarding.
+          // Keep in sync with the post-login logic in src/commands/login.tsx
+          void refreshRemoteManagedSettings();
+          void refreshPolicyLimits();
+          // Clear user data cache BEFORE GrowthBook refresh so it picks up fresh credentials
+          resetUserCache();
+          // Refresh GrowthBook after login to get updated feature flags (e.g., for claude.ai MCPs)
+          refreshGrowthBookAfterAuthChange();
+          // Clear any stale trusted device token then enroll for Remote Control.
+          // Both self-gate on tengu_sessions_elevated_auth_enforcement internally
+          // — enrollTrustedDevice() via checkGate_CACHED_OR_BLOCKING (awaits
+          // the GrowthBook reinit above), clearTrustedDeviceToken() via the
+          // sync cached check (acceptable since clear is idempotent).
+          void import('./bridge/trustedDevice.js').then(m => {
+            m.clearTrustedDeviceToken();
+            return m.enrollTrustedDevice();
+          });
+        }
+
+        // Validate that the active token's org matches forceLoginOrgUUID (if set
+        // in managed settings). Runs after onboarding so managed settings and
+        // login state are fully loaded.
+        const orgValidation = await validateForceLoginOrg();
+        if (!orgValidation.valid) {
+          await exitWithError(root, (orgValidation as { valid: false; message: string }).message);
+        }
+      }
+
+      // If gracefulShutdown was initiated (e.g., user rejected trust dialog),
+      // process.exitCode will be set. Skip all subsequent operations that could
+      // trigger code execution before the process exits (e.g. we don't want apiKeyHelper
+      // to run if trust was not established).
+      if (process.exitCode !== undefined) {
+        logForDebugging('Graceful shutdown initiated, skipping further initialization');
+        return;
+      }
+
+      // Initialize LSP manager AFTER trust is established (or in non-interactive mode
+      // where trust is implicit). This prevents plugin LSP servers from executing
+      // code in untrusted directories before user consent.
+      // Must be after inline plugins are set (if any) so --plugin-dir LSP servers are included.
+      initializeLspServerManager();
+
+      // Show settings validation errors after trust is established
+      // MCP config errors don't block settings from loading, so exclude them
+      if (!isNonInteractiveSession) {
+        const { errors } = getSettingsWithErrors();
+        const nonMcpErrors = errors.filter(e => !e.mcpErrorMetadata);
+        if (nonMcpErrors.length > 0) {
+          await launchInvalidSettingsDialog(root, {
+            settingsErrors: nonMcpErrors,
+            onExit: () => gracefulShutdownSync(1),
+          });
+        }
+      }
+
+      // Check quota status, fast mode, passes eligibility, and bootstrap data
+      // after trust is established. These make API calls which could trigger
+      // apiKeyHelper execution.
+      // --bare / SIMPLE: skip — these are cache-warms for the REPL's
+      // first-turn responsiveness (quota, passes, fastMode, bootstrap data). Fast
+      // mode doesn't apply to the Agent SDK anyway (see getFastModeUnavailableReason).
+      const bgRefreshThrottleMs = getFeatureValue_CACHED_MAY_BE_STALE('tengu_cicada_nap_ms', 0);
+      const lastPrefetched = getGlobalConfig().startupPrefetchedAt ?? 0;
+      const skipStartupPrefetches =
+        isBareMode() || (bgRefreshThrottleMs > 0 && Date.now() - lastPrefetched < bgRefreshThrottleMs);
+
+      if (!skipStartupPrefetches) {
+        const lastPrefetchedInfo =
+          lastPrefetched > 0 ? ` last ran ${Math.round((Date.now() - lastPrefetched) / 1000)}s ago` : '';
+        logForDebugging(`Starting background startup prefetches${lastPrefetchedInfo}`);
+
+        checkQuotaStatus().catch(error => logError(error));
+
+        // Fetch bootstrap data from the server and update all cache values.
+        void fetchBootstrapData();
+
+        // TODO: Consolidate other prefetches into a single bootstrap request.
+        void prefetchPassesEligibility();
+        if (!getFeatureValue_CACHED_MAY_BE_STALE('tengu_miraculo_the_bard', false)) {
+          void prefetchFastModeStatus();
+        } else {
+          // Kill switch skips the network call, not org-policy enforcement.
+          // Resolve from cache so orgStatus doesn't stay 'pending' (which
+          // getFastModeUnavailableReason treats as permissive).
+          resolveFastModeStatusFromCache();
+        }
+        if (bgRefreshThrottleMs > 0) {
+          saveGlobalConfig(current => ({
+            ...current,
+            startupPrefetchedAt: Date.now(),
+          }));
+        }
+      } else {
+        logForDebugging(
+          `Skipping startup prefetches, last ran ${Math.round((Date.now() - lastPrefetched) / 1000)}s ago`,
+        );
+        // Resolve fast mode org status from cache (no network)
+        resolveFastModeStatusFromCache();
+      }
+
+      if (!isNonInteractiveSession) {
+        void refreshExampleCommands(); // Pre-fetch example commands (runs git log, no API call)
+      }
+
+      // Resolve MCP configs (started early, overlaps with setup/trust dialog work)
+      const { servers: existingMcpConfigs } = await mcpConfigPromise;
+      logForDebugging(
+        `[STARTUP] MCP configs resolved in ${mcpConfigResolvedMs}ms (awaited at +${Date.now() - mcpConfigStart}ms)`,
+      );
+      // CLI flag (--mcp-config) should override file-based configs, matching settings precedence
+      const allMcpConfigs = {
+        ...existingMcpConfigs,
+        ...dynamicMcpConfig,
+      };
+
+      // Separate SDK configs from regular MCP configs
+      const sdkMcpConfigs: Record<string, McpSdkServerConfig> = {};
+      const regularMcpConfigs: Record<string, ScopedMcpServerConfig> = {};
+
+      for (const [name, config] of Object.entries(allMcpConfigs)) {
+        const typedConfig = config as ScopedMcpServerConfig | McpSdkServerConfig;
+        if (typedConfig.type === 'sdk') {
+          sdkMcpConfigs[name] = typedConfig as McpSdkServerConfig;
+        } else {
+          regularMcpConfigs[name] = typedConfig as ScopedMcpServerConfig;
+        }
+      }
+
+      profileCheckpoint('action_mcp_configs_loaded');
+
+      // Prefetch MCP resources after trust dialog (this is where execution happens).
+      // Interactive mode only: print mode defers connects until headlessStore exists
+      // and pushes per-server (below), so ToolSearch's pending-client handling works
+      // and one slow server doesn't block the batch.
+      const localMcpPromise = isNonInteractiveSession
+        ? Promise.resolve({ clients: [], tools: [], commands: [] })
+        : prefetchAllMcpResources(regularMcpConfigs);
+      const claudeaiMcpPromise = isNonInteractiveSession
+        ? Promise.resolve({ clients: [], tools: [], commands: [] })
+        : claudeaiConfigPromise.then(configs =>
+            Object.keys(configs).length > 0
+              ? prefetchAllMcpResources(configs)
+              : { clients: [], tools: [], commands: [] },
+          );
+      // Merge with dedup by name: each prefetchAllMcpResources call independently
+      // adds helper tools (ListMcpResourcesTool, ReadMcpResourceTool) via
+      // local dedup flags, so merging two calls can yield duplicates. print.ts
+      // already uniqBy's the final tool pool, but dedup here keeps appState clean.
+      const mcpPromise = Promise.all([localMcpPromise, claudeaiMcpPromise]).then(([local, claudeai]) => ({
+        clients: [...local.clients, ...claudeai.clients],
+        tools: uniqBy([...local.tools, ...claudeai.tools], 'name'),
+        commands: uniqBy([...local.commands, ...claudeai.commands], 'name'),
+      }));
+
+      // Start hooks early so they run in parallel with MCP connections.
+      // Skip for initOnly/init/maintenance (handled separately), non-interactive
+      // (handled via setupTrigger), and resume/continue (conversationRecovery.ts
+      // fires 'resume' instead — without this guard, hooks fire TWICE on /resume
+      // and the second systemMessage clobbers the first. gh-30825)
+      const hooksPromise =
+        initOnly || init || maintenance || isNonInteractiveSession || options.continue || options.resume
+          ? null
+          : processSessionStartHooks('startup', {
+              agentType: mainThreadAgentDefinition?.agentType,
+              model: resolvedInitialModel,
+            });
+
+      // MCP never blocks REPL render OR turn 1 TTFT. useManageMCPConnections
+      // populates appState.mcp async as servers connect (connectToServer is
+      // memoized — the prefetch calls above and the hook converge on the same
+      // connections). getToolUseContext reads store.getState() fresh via
+      // computeTools(), so turn 1 sees whatever's connected by query time.
+      // Slow servers populate for turn 2+. Matches interactive-no-prompt
+      // behavior. Print mode: per-server push into headlessStore (below).
+      const hookMessages: Awaited<NonNullable<typeof hooksPromise>> = [];
+      // Suppress transient unhandledRejection — the prefetch warms the
+      // memoized connectToServer cache but nobody awaits it in interactive.
+      mcpPromise.catch(() => {});
+
+      const mcpClients: Awaited<typeof mcpPromise>['clients'] = [];
+      const mcpTools: Awaited<typeof mcpPromise>['tools'] = [];
+      const mcpCommands: Awaited<typeof mcpPromise>['commands'] = [];
+
+      let thinkingEnabled = shouldEnableThinkingByDefault();
+      let thinkingConfig: ThinkingConfig = thinkingEnabled !== false ? { type: 'adaptive' } : { type: 'disabled' };
+
+      if (options.thinking === 'adaptive' || options.thinking === 'enabled') {
+        thinkingEnabled = true;
+        thinkingConfig = { type: 'adaptive' };
+      } else if (options.thinking === 'disabled') {
+        thinkingEnabled = false;
+        thinkingConfig = { type: 'disabled' };
+      } else {
+        const maxThinkingTokens = process.env.MAX_THINKING_TOKENS
+          ? parseInt(process.env.MAX_THINKING_TOKENS, 10)
+          : options.maxThinkingTokens;
+        if (maxThinkingTokens !== undefined) {
+          if (maxThinkingTokens > 0) {
+            thinkingEnabled = true;
+            thinkingConfig = {
+              type: 'enabled',
+              budgetTokens: maxThinkingTokens,
+            };
+          } else if (maxThinkingTokens === 0) {
+            thinkingEnabled = false;
+            thinkingConfig = { type: 'disabled' };
+          }
+        }
+      }
+
+      logForDiagnosticsNoPII('info', 'started', {
+        version: MACRO.VERSION,
+        is_native_binary: isInBundledMode(),
+      });
+
+      registerCleanup(async () => {
+        logForDiagnosticsNoPII('info', 'exited');
+      });
+
+      void logTenguInit({
+        hasInitialPrompt: Boolean(prompt),
+        hasStdin: Boolean(inputPrompt),
+        verbose,
+        debug,
+        debugToStderr,
+        print: print ?? false,
+        outputFormat: outputFormat ?? 'text',
+        inputFormat: inputFormat ?? 'text',
+        numAllowedTools: allowedTools.length,
+        numDisallowedTools: disallowedTools.length,
+        mcpClientCount: Object.keys(allMcpConfigs).length,
+        worktreeEnabled,
+        skipWebFetchPreflight: getInitialSettings().skipWebFetchPreflight,
+        githubActionInputs: process.env.GITHUB_ACTION_INPUTS,
+        dangerouslySkipPermissionsPassed: dangerouslySkipPermissions ?? false,
+        permissionMode,
+        modeIsBypass: permissionMode === 'bypassPermissions',
+        allowDangerouslySkipPermissionsPassed: allowDangerouslySkipPermissions,
+        systemPromptFlag: systemPrompt ? (options.systemPromptFile ? 'file' : 'flag') : undefined,
+        appendSystemPromptFlag: appendSystemPrompt ? (options.appendSystemPromptFile ? 'file' : 'flag') : undefined,
+        thinkingConfig,
+        assistantActivationPath:
+          feature('KAIROS') && kairosEnabled ? assistantModule?.getAssistantActivationPath() : undefined,
+      });
+
+      // Log context metrics once at initialization
+      void logContextMetrics(regularMcpConfigs, toolPermissionContext);
+
+      void logPermissionContextForAnts(null, 'initialization');
+
+      logManagedSettings();
+
+      // Register PID file for concurrent-session detection (~/.claude/sessions/)
+      // and fire multi-clauding telemetry. Lives here (not init.ts) so only the
+      // REPL path registers — not subcommands like `claude doctor`. Chained:
+      // count must run after register's write completes or it misses our own file.
+      void registerSession().then(registered => {
+        if (!registered) return;
+        if (sessionNameArg) {
+          void updateSessionName(sessionNameArg);
+        }
+        void countConcurrentSessions().then(count => {
+          if (count >= 2) {
+            logEvent('tengu_concurrent_sessions', {
+              num_sessions: count,
+            });
+          }
+        });
+      });
+
+      // Initialize versioned plugins system (triggers V1→V2 migration if
+      // needed). Then run orphan GC, THEN warm the Grep/Glob exclusion cache.
+      // Sequencing matters: the warmup scans disk for .orphaned_at markers,
+      // so it must see the GC's Pass 1 (remove markers from reinstalled
+      // versions) and Pass 2 (stamp unmarked orphans) already applied. The
+      // warm also lands before autoupdate (fires on first submit in REPL)
+      // can orphan this session's active version underneath us.
+      // --bare / SIMPLE: skip plugin version sync + orphan cleanup. These
+      // are install/upgrade bookkeeping that scripted calls don't need —
+      // the next interactive session will reconcile. The await here was
+      // blocking -p on a marketplace round-trip.
+      if (isBareMode()) {
+        // skip — no-op
+      } else if (isNonInteractiveSession) {
+        // In headless mode, await to ensure plugin sync completes before CLI exits
+        await initializeVersionedPlugins();
+        profileCheckpoint('action_after_plugins_init');
+        void cleanupOrphanedPluginVersionsInBackground().then(() => getGlobExclusionsForPluginCache());
+      } else {
+        // In interactive mode, fire-and-forget — this is purely bookkeeping
+        // that doesn't affect runtime behavior of the current session
+        void initializeVersionedPlugins().then(async () => {
+          profileCheckpoint('action_after_plugins_init');
+          await cleanupOrphanedPluginVersionsInBackground();
+          void getGlobExclusionsForPluginCache();
+        });
+      }
+
+      const setupTrigger = initOnly || init ? 'init' : maintenance ? 'maintenance' : null;
+      if (initOnly) {
+        applyConfigEnvironmentVariables();
+        await processSetupHooks('init', { forceSyncExecution: true });
+        await processSessionStartHooks('startup', {
+          forceSyncExecution: true,
+        });
+        gracefulShutdownSync(0);
+        return;
+      }
+
+      // --print mode
+      if (isNonInteractiveSession) {
+        if (outputFormat === 'stream-json' || outputFormat === 'json') {
+          setHasFormattedOutput(true);
+        }
+
+        // Apply full environment variables in print mode since trust dialog is bypassed
+        // This includes potentially dangerous environment variables from untrusted sources
+        // but print mode is considered trusted (as documented in help text)
+        applyConfigEnvironmentVariables();
+
+        // Initialize telemetry after env vars are applied so OTEL endpoint env vars and
+        // otelHeadersHelper (which requires trust to execute) are available.
+        initializeTelemetryAfterTrust();
+
+        // Kick SessionStart hooks now so the subprocess spawn overlaps with
+        // MCP connect + plugin init + print.ts import below. loadInitialMessages
+        // joins this at print.ts:4397. Guarded same as loadInitialMessages —
+        // continue/resume/teleport paths don't fire startup hooks (or fire them
+        // conditionally inside the resume branch, where this promise is
+        // undefined and the ?? fallback runs). Also skip when setupTrigger is
+        // set — those paths run setup hooks first (print.ts:544), and session
+        // start hooks must wait until setup completes.
+        const sessionStartHooksPromise =
+          options.continue || options.resume || teleport || setupTrigger
+            ? undefined
+            : processSessionStartHooks('startup');
+        // Suppress transient unhandledRejection if this rejects before
+        // loadInitialMessages awaits it. Downstream await still observes the
+        // rejection — this just prevents the spurious global handler fire.
+        sessionStartHooksPromise?.catch(() => {});
+
+        profileCheckpoint('before_validateForceLoginOrg');
+        // Validate org restriction for non-interactive sessions
+        const orgValidation = await validateForceLoginOrg();
+        if (!orgValidation.valid) {
+          process.stderr.write((orgValidation as { valid: false; message: string }).message + '\n');
+          process.exit(1);
+        }
+
+        // Headless mode supports all prompt commands and some local commands
+        // If disableSlashCommands is true, return empty array
+        const commandsHeadless = disableSlashCommands
+          ? []
+          : commands.filter(
+              command =>
+                (command.type === 'prompt' && !command.disableNonInteractive) ||
+                (command.type === 'local' && command.supportsNonInteractive),
+            );
+
+        const defaultState = getDefaultAppState();
+        const headlessInitialState: AppState = {
+          ...defaultState,
+          mcp: {
+            ...defaultState.mcp,
+            clients: mcpClients,
+            commands: mcpCommands,
+            tools: mcpTools,
+          },
+          toolPermissionContext,
+          effortValue: parseEffortValue(options.effort) ?? getInitialEffortSetting(),
+          ...(isFastModeEnabled() && {
+            fastMode: getInitialFastModeSetting(effectiveModel ?? null),
+          }),
+          ...(isAdvisorEnabled() && advisorModel && { advisorModel }),
+          // kairosEnabled gates the async fire-and-forget path in
+          // executeForkedSlashCommand (processSlashCommand.tsx:132) and
+          // AgentTool's shouldRunAsync. The REPL initialState sets this at
+          // ~3459; headless was defaulting to false, so the daemon child's
+          // scheduled tasks and Agent-tool calls ran synchronously — N
+          // overdue cron tasks on spawn = N serial subagent turns blocking
+          // user input. Computed at :1620, well before this branch.
+          ...(feature('KAIROS') ? { kairosEnabled } : {}),
+        };
+
+        // Init app state
+        const headlessStore = createStore(headlessInitialState, onChangeAppState);
+
+        // Check if bypassPermissions should be disabled based on Statsig gate
+        // This runs in parallel to the code below, to avoid blocking the main loop.
+        if (toolPermissionContext.mode === 'bypassPermissions' || allowDangerouslySkipPermissions) {
+          void checkAndDisableBypassPermissions(toolPermissionContext);
+        }
+
+        // Async check of auto mode gate — corrects state and disables auto if needed.
+        // Gated on TRANSCRIPT_CLASSIFIER (not USER_TYPE) so GrowthBook kill switch runs for external builds too.
+        if (feature('TRANSCRIPT_CLASSIFIER')) {
+          void verifyAutoModeGateAccess(toolPermissionContext, headlessStore.getState().fastMode).then(
+            ({ updateContext }) => {
+              headlessStore.setState(prev => {
+                const nextCtx = updateContext(prev.toolPermissionContext);
+                if (nextCtx === prev.toolPermissionContext) return prev;
+                return { ...prev, toolPermissionContext: nextCtx };
+              });
+            },
+          );
+        }
+
+        // Set global state for session persistence
+        if (options.sessionPersistence === false) {
+          setSessionPersistenceDisabled(true);
+        }
+
+        // Store SDK betas in global state for context window calculation
+        // Only store allowed betas (filters by allowlist and subscriber status)
+        setSdkBetas(filterAllowedSdkBetas(betas));
+
+        // Print-mode MCP: per-server incremental push into headlessStore.
+        // Mirrors useManageMCPConnections — push pending first (so ToolSearch's
+        // pending-check at ToolSearchTool.ts:334 sees them), then replace with
+        // connected/failed as each server settles.
+        const connectMcpBatch = (configs: Record<string, ScopedMcpServerConfig>, label: string): Promise<void> => {
+          if (Object.keys(configs).length === 0) return Promise.resolve();
+          headlessStore.setState(prev => ({
+            ...prev,
+            mcp: {
+              ...prev.mcp,
+              clients: [
+                ...prev.mcp.clients,
+                ...Object.entries(configs).map(([name, config]) => ({
+                  name,
+                  type: 'pending' as const,
+                  config,
+                })),
+              ],
+            },
+          }));
+          return getMcpToolsCommandsAndResources(({ client, tools, commands }) => {
+            headlessStore.setState(prev => ({
+              ...prev,
+              mcp: {
+                ...prev.mcp,
+                clients: prev.mcp.clients.some(c => c.name === client.name)
+                  ? prev.mcp.clients.map(c => (c.name === client.name ? client : c))
+                  : [...prev.mcp.clients, client],
+                tools: uniqBy([...prev.mcp.tools, ...tools], 'name'),
+                commands: uniqBy([...prev.mcp.commands, ...commands], 'name'),
+              },
+            }));
+          }, configs).catch(err => logForDebugging(`[MCP] ${label} connect error: ${err}`));
+        };
+        // Await all MCP configs — print mode is often single-turn, so
+        // "late-connecting servers visible next turn" doesn't help. SDK init
+        // message and turn-1 tool list both need configured MCP tools present.
+        // Zero-server case is free via the early return in connectMcpBatch.
+        // Connectors parallelize inside getMcpToolsCommandsAndResources
+        // (processBatched with Promise.all). claude.ai is awaited too — its
+        // fetch was kicked off early (line ~2558) so only residual time blocks
+        // here. --bare skips claude.ai entirely for perf-sensitive scripts.
+        profileCheckpoint('before_connectMcp');
+        await connectMcpBatch(regularMcpConfigs, 'regular');
+        profileCheckpoint('after_connectMcp');
+        // Dedup: suppress plugin MCP servers that duplicate a claude.ai
+        // connector (connector wins), then connect claude.ai servers.
+        // Bounded wait — #23725 made this blocking so single-turn -p sees
+        // connectors, but with 40+ slow connectors tengu_startup_perf p99
+        // climbed to 76s. If fetch+connect doesn't finish in time, proceed;
+        // the promise keeps running and updates headlessStore in the
+        // background so turn 2+ still sees connectors.
+        const CLAUDE_AI_MCP_TIMEOUT_MS = 5_000;
+        const claudeaiConnect = claudeaiConfigPromise.then(claudeaiConfigs => {
+          if (Object.keys(claudeaiConfigs).length > 0) {
+            const claudeaiSigs = new Set<string>();
+            for (const config of Object.values(claudeaiConfigs)) {
+              const sig = getMcpServerSignature(config);
+              if (sig) claudeaiSigs.add(sig);
+            }
+            const suppressed = new Set<string>();
+            for (const [name, config] of Object.entries(regularMcpConfigs)) {
+              if (!name.startsWith('plugin:')) continue;
+              const sig = getMcpServerSignature(config);
+              if (sig && claudeaiSigs.has(sig)) suppressed.add(name);
+            }
+            if (suppressed.size > 0) {
+              logForDebugging(
+                `[MCP] Lazy dedup: suppressing ${suppressed.size} plugin server(s) that duplicate claude.ai connectors: ${[...suppressed].join(', ')}`,
+              );
+              // Disconnect before filtering from state. Only connected
+              // servers need cleanup — clearServerCache on a never-connected
+              // server triggers a real connect just to kill it (memoize
+              // cache-miss path, see useManageMCPConnections.ts:870).
+              for (const c of headlessStore.getState().mcp.clients) {
+                if (!suppressed.has(c.name) || c.type !== 'connected') continue;
+                c.client.onclose = undefined;
+                void clearServerCache(c.name, c.config).catch(() => {});
+              }
+              headlessStore.setState(prev => {
+                let { clients, tools, commands, resources } = prev.mcp;
+                clients = clients.filter(c => !suppressed.has(c.name));
+                tools = tools.filter(t => !t.mcpInfo || !suppressed.has(t.mcpInfo.serverName));
+                for (const name of suppressed) {
+                  commands = excludeCommandsByServer(commands, name);
+                  resources = excludeResourcesByServer(resources, name);
+                }
+                return {
+                  ...prev,
+                  mcp: {
+                    ...prev.mcp,
+                    clients,
+                    tools,
+                    commands,
+                    resources,
+                  },
+                };
+              });
+            }
+          }
+          // Suppress claude.ai connectors that duplicate an enabled
+          // manual server (URL-signature match). Plugin dedup above only
+          // handles `plugin:*` keys; this catches manual `.mcp.json` entries.
+          // plugin:* must be excluded here — step 1 already suppressed
+          // those (claude.ai wins); leaving them in suppresses the
+          // connector too, and neither survives (gh-39974).
+          const nonPluginConfigs = pickBy(regularMcpConfigs, (_, n) => !n.startsWith('plugin:'));
+          const { servers: dedupedClaudeAi } = dedupClaudeAiMcpServers(claudeaiConfigs, nonPluginConfigs);
+          return connectMcpBatch(dedupedClaudeAi, 'claudeai');
+        });
+        let claudeaiTimer: ReturnType<typeof setTimeout> | undefined;
+        const claudeaiTimedOut = await Promise.race([
+          claudeaiConnect.then(() => false),
+          new Promise<boolean>(resolve => {
+            claudeaiTimer = setTimeout(r => r(true), CLAUDE_AI_MCP_TIMEOUT_MS, resolve);
+          }),
+        ]);
+        if (claudeaiTimer) clearTimeout(claudeaiTimer);
+        if (claudeaiTimedOut) {
+          logForDebugging(
+            `[MCP] claude.ai connectors not ready after ${CLAUDE_AI_MCP_TIMEOUT_MS}ms — proceeding; background connection continues`,
+          );
+        }
+        profileCheckpoint('after_connectMcp_claudeai');
+
+        // In headless mode, start deferred prefetches immediately (no user typing delay)
+        // --bare / SIMPLE: startDeferredPrefetches early-returns internally.
+        // backgroundHousekeeping (initExtractMemories, pruneShellSnapshots,
+        // cleanupOldMessageFiles) and sdkHeapDumpMonitor are all bookkeeping
+        // that scripted calls don't need — the next interactive session reconciles.
+        if (!isBareMode()) {
+          startDeferredPrefetches();
+          void import('./utils/backgroundHousekeeping.js').then(m => m.startBackgroundHousekeeping());
+          if (process.env.USER_TYPE === 'ant') {
+            void import('./utils/sdkHeapDumpMonitor.js').then(m => m.startSdkMemoryMonitor());
+          }
+        }
+
+        logSessionTelemetry();
+        profileCheckpoint('before_print_import');
+        const { runHeadless } = await import('src/cli/print.js');
+        profileCheckpoint('after_print_import');
+        void runHeadless(
+          inputPrompt,
+          () => headlessStore.getState(),
+          headlessStore.setState,
+          commandsHeadless,
+          tools,
+          sdkMcpConfigs,
+          agentDefinitions.activeAgents,
+          {
+            continue: options.continue,
+            resume: options.resume,
+            verbose: verbose,
+            outputFormat: outputFormat,
+            jsonSchema,
+            permissionPromptToolName: options.permissionPromptTool,
+            allowedTools,
+            thinkingConfig,
+            maxTurns: options.maxTurns,
+            maxBudgetUsd: options.maxBudgetUsd,
+            taskBudget: options.taskBudget ? { total: options.taskBudget } : undefined,
+            systemPrompt,
+            appendSystemPrompt,
+            userSpecifiedModel: effectiveModel,
+            fallbackModel: userSpecifiedFallbackModel,
+            teleport,
+            sdkUrl,
+            replayUserMessages: effectiveReplayUserMessages,
+            includePartialMessages: effectiveIncludePartialMessages,
+            forkSession: options.forkSession || false,
+            resumeSessionAt: options.resumeSessionAt || undefined,
+            rewindFiles: options.rewindFiles,
+            enableAuthStatus: options.enableAuthStatus,
+            agent: agentCli,
+            workload: options.workload,
+            setupTrigger: setupTrigger ?? undefined,
+            sessionStartHooksPromise,
+          },
+        );
+        return;
+      }
+
+      // Log model config at startup
+      logEvent('tengu_startup_manual_model_config', {
+        cli_flag: options.model as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        env_var: process.env.ANTHROPIC_MODEL as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        settings_file: (getInitialSettings() || {}).model as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        subscriptionType: getSubscriptionType() as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        agent: agentSetting as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
+
+      // Get deprecation warning for the initial model (resolvedInitialModel computed earlier for hooks parallelization)
+      const deprecationWarning = getModelDeprecationWarning(resolvedInitialModel);
+
+      // Build initial notification queue
+      const initialNotifications: Array<{
+        key: string;
+        text: string;
+        color?: 'warning';
+        priority: 'high';
+      }> = [];
+      if (permissionModeNotification) {
+        initialNotifications.push({
+          key: 'permission-mode-notification',
+          text: permissionModeNotification,
+          priority: 'high',
+        });
+      }
+      if (deprecationWarning) {
+        initialNotifications.push({
+          key: 'model-deprecation-warning',
+          text: deprecationWarning,
+          color: 'warning',
+          priority: 'high',
+        });
+      }
+      if (overlyBroadBashPermissions.length > 0) {
+        const displayList = uniq(overlyBroadBashPermissions.map(p => p.ruleDisplay));
+        const displays = displayList.join(', ');
+        const sources = uniq(overlyBroadBashPermissions.map(p => p.sourceDisplay)).join(', ');
+        const n = displayList.length;
+        initialNotifications.push({
+          key: 'overly-broad-bash-notification',
+          text: `${displays} allow ${plural(n, 'rule')} from ${sources} ${plural(n, 'was', 'were')} ignored \u2014 not available for Ants, please use auto-mode instead`,
+          color: 'warning',
+          priority: 'high',
+        });
+      }
+
+      const effectiveToolPermissionContext = {
+        ...toolPermissionContext,
+        mode:
+          isAgentSwarmsEnabled() && getTeammateUtils().isPlanModeRequired()
+            ? ('plan' as const)
+            : toolPermissionContext.mode,
+      };
+      // All startup opt-in paths (--tools, --brief, defaultView) have fired
+      // above; initialIsBriefOnly just reads the resulting state.
+      const initialIsBriefOnly = feature('KAIROS') || feature('KAIROS_BRIEF') ? getUserMsgOptIn() : false;
+      const fullRemoteControl = remoteControl || getRemoteControlAtStartup() || kairosEnabled;
+      let ccrMirrorEnabled = false;
+      if (feature('CCR_MIRROR') && !fullRemoteControl) {
+        /* eslint-disable @typescript-eslint/no-require-imports */
+        const { isCcrMirrorEnabled } =
+          require('./bridge/bridgeEnabled.js') as typeof import('./bridge/bridgeEnabled.js');
+        /* eslint-enable @typescript-eslint/no-require-imports */
+        ccrMirrorEnabled = isCcrMirrorEnabled();
+      }
+
+      const initialState: AppState = {
+        settings: getInitialSettings(),
+        tasks: {},
+        agentNameRegistry: new Map(),
+        verbose: verbose ?? getGlobalConfig().verbose ?? false,
+        mainLoopModel: initialMainLoopModel,
+        mainLoopModelForSession: null,
+        isBriefOnly: initialIsBriefOnly,
+        expandedView: getGlobalConfig().showSpinnerTree
+          ? 'teammates'
+          : getGlobalConfig().showExpandedTodos
+            ? 'tasks'
+            : 'none',
+        showTeammateMessagePreview: isAgentSwarmsEnabled() ? false : undefined,
+        selectedIPAgentIndex: -1,
+        coordinatorTaskIndex: -1,
+        viewSelectionMode: 'none',
+        footerSelection: null,
+        toolPermissionContext: effectiveToolPermissionContext,
+        agent: mainThreadAgentDefinition?.agentType,
+        agentDefinitions,
+        mcp: {
+          clients: [],
+          tools: [],
+          commands: [],
+          resources: {},
+          pluginReconnectKey: 0,
+        },
+        plugins: {
+          enabled: [],
+          disabled: [],
+          commands: [],
+          errors: [],
+          installationStatus: {
+            marketplaces: [],
+            plugins: [],
+          },
+          needsRefresh: false,
+        },
+        statusLineText: undefined,
+        kairosEnabled,
+        remoteSessionUrl: undefined,
+        remoteConnectionStatus: 'connecting',
+        remoteBackgroundTaskCount: 0,
+        replBridgeEnabled: fullRemoteControl || ccrMirrorEnabled,
+        replBridgeExplicit: remoteControl,
+        replBridgeOutboundOnly: ccrMirrorEnabled,
+        replBridgeConnected: false,
+        replBridgeSessionActive: false,
+        replBridgeReconnecting: false,
+        replBridgeConnectUrl: undefined,
+        replBridgeSessionUrl: undefined,
+        replBridgeEnvironmentId: undefined,
+        replBridgeSessionId: undefined,
+        replBridgeError: undefined,
+        replBridgeInitialName: remoteControlName,
+        showRemoteCallout: false,
+        notifications: {
+          current: null,
+          queue: initialNotifications,
+        },
+        elicitation: {
+          queue: [],
+        },
+        todos: {},
+        remoteAgentTaskSuggestions: [],
+        fileHistory: {
+          snapshots: [],
+          trackedFiles: new Set(),
+          snapshotSequence: 0,
+        },
+        attribution: createEmptyAttributionState(),
+        thinkingEnabled,
+        promptSuggestionEnabled: shouldEnablePromptSuggestion(),
+        sessionHooks: new Map(),
+        inbox: {
+          messages: [],
+        },
+        promptSuggestion: {
+          text: null,
+          promptId: null,
+          shownAt: 0,
+          acceptedAt: 0,
+          generationRequestId: null,
+        },
+        speculation: IDLE_SPECULATION_STATE,
+        speculationSessionTimeSavedMs: 0,
+        skillImprovement: {
+          suggestion: null,
+        },
+        workerSandboxPermissions: {
+          queue: [],
+          selectedIndex: 0,
+        },
+        pendingWorkerRequest: null,
+        pendingSandboxRequest: null,
+        authVersion: 0,
+        initialMessage: inputPrompt
+          ? {
+              message: createUserMessage({
+                content: String(inputPrompt),
+              }),
+            }
+          : null,
+        effortValue: parseEffortValue(options.effort) ?? getInitialEffortSetting(),
+        activeOverlays: new Set<string>(),
+        fastMode: getInitialFastModeSetting(resolvedInitialModel),
+        ...(isAdvisorEnabled() && advisorModel && { advisorModel }),
+        // Compute teamContext synchronously to avoid useEffect setState during render.
+        // KAIROS: assistantTeamContext takes precedence — set earlier in the
+        // KAIROS block so Agent(name: "foo") can spawn in-process teammates
+        // without TeamCreate. computeInitialTeamContext() is for tmux-spawned
+        // teammates reading their own identity, not the assistant-mode leader.
+        teamContext: (feature('KAIROS')
+          ? (assistantTeamContext ?? computeInitialTeamContext())
+          : computeInitialTeamContext()) as AppState['teamContext'],
+      };
+
+      // Add CLI initial prompt to history
+      if (inputPrompt) {
+        addToHistory(String(inputPrompt));
+      }
+
+      const initialTools = mcpTools;
+
+      // Increment numStartups synchronously — first-render readers like
+      // shouldShowEffortCallout (via useState initializer) need the updated
+      // value before setImmediate fires. Defer only telemetry.
+      saveGlobalConfig(current => ({
+        ...current,
+        numStartups: (current.numStartups ?? 0) + 1,
+      }));
+      setImmediate(() => {
+        void logStartupTelemetry();
+        logSessionTelemetry();
+      });
+
+      // Set up per-turn session environment data uploader (ant-only build).
+      // Default-enabled for all ant users when working in an Anthropic-owned
+      // repo. Captures git/filesystem state (NOT transcripts) at each turn so
+      // environments can be recreated at any user message index. Gating:
+      //   - Build-time: this import is stubbed in external builds.
+      //   - Runtime: uploader checks github.com/anthropics/* remote + gcloud auth.
+      //   - Safety: CLAUDE_CODE_DISABLE_SESSION_DATA_UPLOAD=1 bypasses (tests set this).
+      // Import is dynamic + async to avoid adding startup latency.
+      const sessionUploaderPromise = process.env.USER_TYPE === 'ant' ? import('./utils/sessionDataUploader.js') : null;
+
+      // Defer session uploader resolution to the onTurnComplete callback to avoid
+      // adding a new top-level await in main.tsx (performance-critical path).
+      // The per-turn auth logic in sessionDataUploader.ts handles unauthenticated
+      // state gracefully (re-checks each turn, so auth recovery mid-session works).
+      const uploaderReady = sessionUploaderPromise
+        ? sessionUploaderPromise.then(mod => mod.createSessionTurnUploader()).catch(() => null)
+        : null;
+
+      const sessionConfig = {
+        debug: debug || debugToStderr,
+        commands: [...commands, ...mcpCommands],
+        initialTools,
+        mcpClients,
+        autoConnectIdeFlag: ide,
+        mainThreadAgentDefinition,
+        disableSlashCommands,
+        dynamicMcpConfig,
+        strictMcpConfig,
+        systemPrompt,
+        appendSystemPrompt,
+        taskListId,
+        thinkingConfig,
+        ...(uploaderReady && {
+          onTurnComplete: (messages: MessageType[]) => {
+            void uploaderReady.then(uploader => (uploader as ((msgs: MessageType[]) => void) | null)?.(messages));
+          },
+        }),
+      };
+
+      // Shared context for processResumedConversation calls
+      const resumeContext = {
+        modeApi: coordinatorModeModule,
+        mainThreadAgentDefinition,
+        agentDefinitions,
+        currentCwd,
+        cliAgents,
+        initialState,
+      };
+
+      if (options.continue) {
+        // Continue the most recent conversation directly
+        let resumeSucceeded = false;
+        try {
+          const resumeStart = performance.now();
+
+          // Clear stale caches before resuming to ensure fresh file/skill discovery
+          const { clearSessionCaches } = await import('./commands/clear/caches.js');
+          clearSessionCaches();
+
+          const result = await loadConversationForResume(undefined /* sessionId */, undefined /* sourceFile */);
+          if (!result) {
+            logEvent('tengu_continue', {
+              success: false,
+            });
+            return await exitWithError(root, 'No conversation found to continue');
+          }
+
+          const loaded = await processResumedConversation(
+            result,
+            {
+              forkSession: !!options.forkSession,
+              includeAttribution: true,
+              transcriptPath: result.fullPath,
+            },
+            resumeContext,
+          );
+
+          if (loaded.restoredAgentDef) {
+            mainThreadAgentDefinition = loaded.restoredAgentDef;
+          }
+
+          maybeActivateProactive(options);
+          maybeActivateBrief(options);
+
+          logEvent('tengu_continue', {
+            success: true,
+            resume_duration_ms: Math.round(performance.now() - resumeStart),
+          });
+          resumeSucceeded = true;
+
+          await launchRepl(
+            root,
+            {
+              getFpsMetrics,
+              stats,
+              initialState: loaded.initialState,
+            },
+            {
+              ...sessionConfig,
+              mainThreadAgentDefinition: loaded.restoredAgentDef ?? mainThreadAgentDefinition,
+              initialMessages: loaded.messages,
+              initialFileHistorySnapshots: loaded.fileHistorySnapshots,
+              initialContentReplacements: loaded.contentReplacements,
+              initialAgentName: loaded.agentName,
+              initialAgentColor: loaded.agentColor,
+            },
+            renderAndRun,
+          );
+        } catch (error) {
+          if (!resumeSucceeded) {
+            logEvent('tengu_continue', {
+              success: false,
+            });
+          }
+          logError(error);
+          process.exit(1);
+        }
+      } else if (feature('DIRECT_CONNECT') && _pendingConnect?.url) {
+        // `claude connect <url>` — full interactive TUI connected to a remote server
+        let directConnectConfig;
+        try {
+          const session = await createDirectConnectSession({
+            serverUrl: _pendingConnect.url,
+            authToken: _pendingConnect.authToken,
+            cwd: getOriginalCwd(),
+            dangerouslySkipPermissions: _pendingConnect.dangerouslySkipPermissions,
+          });
+          if (session.workDir) {
+            setOriginalCwd(session.workDir);
+            setCwdState(session.workDir);
+          }
+          setDirectConnectServerUrl(_pendingConnect.url);
+          directConnectConfig = session.config;
+        } catch (err) {
+          return await exitWithError(root, err instanceof DirectConnectError ? err.message : String(err), () =>
+            gracefulShutdown(1),
+          );
+        }
+
+        const connectInfoMessage = createSystemMessage(
+          `Connected to server at ${_pendingConnect.url}\nSession: ${directConnectConfig.sessionId}`,
+          'info',
+        );
+
+        await launchRepl(
+          root,
+          { getFpsMetrics, stats, initialState },
+          {
+            debug: debug || debugToStderr,
+            commands,
+            initialTools: [],
+            initialMessages: [connectInfoMessage],
+            mcpClients: [],
+            autoConnectIdeFlag: ide,
+            mainThreadAgentDefinition,
+            disableSlashCommands,
+            directConnectConfig,
+            thinkingConfig,
+          },
+          renderAndRun,
+        );
+        return;
+      } else if (feature('SSH_REMOTE') && _pendingSSH?.host) {
+        // `claude ssh <host> [dir]` — probe remote, deploy binary if needed,
+        // spawn ssh with unix-socket -R forward to a local auth proxy, hand
+        // the REPL an SSHSession. Tools run remotely, UI renders locally.
+        // `--local` skips probe/deploy/ssh and spawns the current binary
+        // directly with the same env — e2e test of the proxy/auth plumbing.
+        const { createSSHSession, createLocalSSHSession, SSHSessionError } = await import('./ssh/createSSHSession.js');
+        let sshSession: import('./ssh/createSSHSession.js').SSHSession | undefined;
+        try {
+          if (_pendingSSH.local) {
+            process.stderr.write('Starting local ssh-proxy test session...\n');
+            sshSession = await createLocalSSHSession({
+              cwd: _pendingSSH.cwd,
+              permissionMode: _pendingSSH.permissionMode,
+              dangerouslySkipPermissions: _pendingSSH.dangerouslySkipPermissions,
+            });
+          } else {
+            process.stderr.write(`Connecting to ${_pendingSSH.host}…\n`);
+            // In-place progress: \r + EL0 (erase to end of line). Final \n on
+            // success so the next message lands on a fresh line. No-op when
+            // stderr isn't a TTY (piped/redirected) — \r would just emit noise.
+            const isTTY = process.stderr.isTTY;
+            let hadProgress = false;
+            sshSession = await createSSHSession(
+              {
+                host: _pendingSSH.host,
+                cwd: _pendingSSH.cwd,
+                localVersion: MACRO.VERSION,
+                permissionMode: _pendingSSH.permissionMode,
+                dangerouslySkipPermissions: _pendingSSH.dangerouslySkipPermissions,
+                extraCliArgs: _pendingSSH.extraCliArgs,
+              },
+              isTTY
+                ? {
+                    onProgress: (msg: string) => {
+                      hadProgress = true;
+                      process.stderr.write(`\r  ${msg}\x1b[K`);
+                    },
+                  }
+                : {},
+            );
+            if (hadProgress) process.stderr.write('\n');
+          }
+          setOriginalCwd(sshSession.remoteCwd);
+          setCwdState(sshSession.remoteCwd);
+          setDirectConnectServerUrl(_pendingSSH.local ? 'local' : _pendingSSH.host);
+        } catch (err) {
+          return await exitWithError(root, err instanceof SSHSessionError ? err.message : String(err), () =>
+            gracefulShutdown(1),
+          );
+        }
+
+        const sshInfoMessage = createSystemMessage(
+          _pendingSSH.local
+            ? `Local ssh-proxy test session\ncwd: ${sshSession.remoteCwd}\nAuth: unix socket → local proxy`
+            : `SSH session to ${_pendingSSH.host}\nRemote cwd: ${sshSession.remoteCwd}\nAuth: unix socket -R → local proxy`,
+          'info',
+        );
+
+        await launchRepl(
+          root,
+          { getFpsMetrics, stats, initialState },
+          {
+            debug: debug || debugToStderr,
+            commands,
+            initialTools: [],
+            initialMessages: [sshInfoMessage],
+            mcpClients: [],
+            autoConnectIdeFlag: ide,
+            mainThreadAgentDefinition,
+            disableSlashCommands,
+            sshSession,
+            thinkingConfig,
+          },
+          renderAndRun,
+        );
+        return;
+      } else if (
+        feature('KAIROS') &&
+        _pendingAssistantChat &&
+        (_pendingAssistantChat.sessionId || _pendingAssistantChat.discover)
+      ) {
+        // `claude assistant [sessionId]` — REPL as a pure viewer client
+        // of a remote assistant session. The agentic loop runs remotely; this
+        // process streams live events and POSTs messages. History is lazy-
+        // loaded by useAssistantHistory on scroll-up (no blocking fetch here).
+        const { discoverAssistantSessions } = await import('./assistant/sessionDiscovery.js');
+
+        let targetSessionId = _pendingAssistantChat.sessionId;
+
+        // Discovery flow — list bridge environments, filter sessions
+        if (!targetSessionId) {
+          let sessions;
+          try {
+            sessions = await discoverAssistantSessions();
+          } catch (e) {
+            return await exitWithError(root, `Failed to discover sessions: ${e instanceof Error ? e.message : e}`, () =>
+              gracefulShutdown(1),
+            );
+          }
+          if (sessions.length === 0) {
+            let installedDir: string | null;
+            try {
+              installedDir = await launchAssistantInstallWizard(root);
+            } catch (e) {
+              return await exitWithError(
+                root,
+                `Assistant installation failed: ${e instanceof Error ? e.message : e}`,
+                () => gracefulShutdown(1),
+              );
+            }
+            if (installedDir === null) {
+              await gracefulShutdown(0);
+              process.exit(0);
+            }
+            // The daemon needs a few seconds to spin up its worker and
+            // establish a bridge session before discovery will find it.
+            return await exitWithMessage(
+              root,
+              `Assistant installed in ${installedDir}. The daemon is starting up — run \`claude assistant\` again in a few seconds to connect.`,
+              {
+                exitCode: 0,
+                beforeExit: () => gracefulShutdown(0),
+              },
+            );
+          }
+          if (sessions.length === 1) {
+            targetSessionId = sessions[0]!.id;
+          } else {
+            const picked = await launchAssistantSessionChooser(root, {
+              sessions,
+            });
+            if (!picked) {
+              await gracefulShutdown(0);
+              process.exit(0);
+            }
+            targetSessionId = picked;
+          }
+        }
+
+        // Auth — call prepareApiRequest() once for orgUUID, but use a
+        // getAccessToken closure for the token so reconnects get fresh tokens.
+        const { checkAndRefreshOAuthTokenIfNeeded, getClaudeAIOAuthTokens } = await import('./utils/auth.js');
+        await checkAndRefreshOAuthTokenIfNeeded();
+        let apiCreds;
+        try {
+          apiCreds = await prepareApiRequest();
+        } catch (e) {
+          return await exitWithError(root, `Error: ${e instanceof Error ? e.message : 'Failed to authenticate'}`, () =>
+            gracefulShutdown(1),
+          );
+        }
+        const getAccessToken = (): string => getClaudeAIOAuthTokens()?.accessToken ?? apiCreds.accessToken;
+
+        // Brief mode activation: setKairosActive(true) satisfies BOTH opt-in
+        // and entitlement for isBriefEnabled() (BriefTool.ts:124-132).
+        setKairosActive(true);
+        setUserMsgOptIn(true);
+        setIsRemoteMode(true);
+
+        const remoteSessionConfig = createRemoteSessionConfig(
+          targetSessionId,
+          getAccessToken,
+          apiCreds.orgUUID,
+          /* hasInitialPrompt */ false,
+          /* viewerOnly */ true,
+        );
+
+        const infoMessage = createSystemMessage(
+          `Attached to assistant session ${targetSessionId.slice(0, 8)}…`,
+          'info',
+        );
+
+        const assistantInitialState: AppState = {
+          ...initialState,
+          isBriefOnly: true,
+          kairosEnabled: false,
+          replBridgeEnabled: false,
+        };
+
+        const remoteCommands = filterCommandsForRemoteMode(commands);
+        await launchRepl(
+          root,
+          {
+            getFpsMetrics,
+            stats,
+            initialState: assistantInitialState,
+          },
+          {
+            debug: debug || debugToStderr,
+            commands: remoteCommands,
+            initialTools: [],
+            initialMessages: [infoMessage],
+            mcpClients: [],
+            autoConnectIdeFlag: ide,
+            mainThreadAgentDefinition,
+            disableSlashCommands,
+            remoteSessionConfig,
+            thinkingConfig,
+          },
+          renderAndRun,
+        );
+        return;
+      } else if (options.resume || options.fromPr || teleport || remote !== null) {
+        // Handle resume flow - from file (ant-only), session ID, or interactive selector
+
+        // Clear stale caches before resuming to ensure fresh file/skill discovery
+        const { clearSessionCaches } = await import('./commands/clear/caches.js');
+        clearSessionCaches();
+
+        let messages: MessageType[] | null = null;
+        let processedResume: ProcessedResume | undefined;
+
+        let maybeSessionId = validateUuid(options.resume);
+        let searchTerm: string | undefined;
+        // Store full LogOption when found by custom title (for cross-worktree resume)
+        let matchedLog: LogOption | null = null;
+        // PR filter for --from-pr flag
+        let filterByPr: boolean | number | string | undefined;
+
+        // Handle --from-pr flag
+        if (options.fromPr) {
+          if (options.fromPr === true) {
+            // Show all sessions with linked PRs
+            filterByPr = true;
+          } else if (typeof options.fromPr === 'string') {
+            // Could be a PR number or URL
+            filterByPr = options.fromPr;
+          }
+        }
+
+        // If resume value is not a UUID, try exact match by custom title first
+        if (options.resume && typeof options.resume === 'string' && !maybeSessionId) {
+          const trimmedValue = options.resume.trim();
+          if (trimmedValue) {
+            const matches = await searchSessionsByCustomTitle(trimmedValue, {
+              exact: true,
+            });
+
+            if (matches.length === 1) {
+              // Exact match found - store full LogOption for cross-worktree resume
+              matchedLog = matches[0]!;
+              maybeSessionId = getSessionIdFromLog(matchedLog) ?? null;
+            } else {
+              // No match or multiple matches - use as search term for picker
+              searchTerm = trimmedValue;
+            }
+          }
+        }
+
+        // --remote and --teleport both create/resume Claude Code Web (CCR) sessions.
+        // Remote Control (--rc) is a separate feature gated in initReplBridge.ts.
+        if (remote !== null || teleport) {
+          await waitForPolicyLimitsToLoad();
+          if (!isPolicyAllowed('allow_remote_sessions')) {
+            return await exitWithError(root, "Error: Remote sessions are disabled by your organization's policy.", () =>
+              gracefulShutdown(1),
+            );
+          }
+        }
+
+        if (remote !== null) {
+          // Create remote session (optionally with initial prompt)
+          const hasInitialPrompt = remote.length > 0;
+
+          // Check if TUI mode is enabled - description is only optional in TUI mode
+          const isRemoteTuiEnabled = getFeatureValue_CACHED_MAY_BE_STALE('tengu_remote_backend', false);
+          if (!isRemoteTuiEnabled && !hasInitialPrompt) {
+            return await exitWithError(
+              root,
+              'Error: --remote requires a description.\nUsage: claude --remote "your task description"',
+              () => gracefulShutdown(1),
+            );
+          }
+
+          logEvent('tengu_remote_create_session', {
+            has_initial_prompt: String(hasInitialPrompt) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          });
+
+          // Pass current branch so CCR clones the repo at the right revision
+          const currentBranch = await getBranch();
+          const createdSession = await teleportToRemoteWithErrorHandling(
+            root,
+            hasInitialPrompt ? remote : null,
+            new AbortController().signal,
+            currentBranch || undefined,
+          );
+          if (!createdSession) {
+            logEvent('tengu_remote_create_session_error', {
+              error: 'unable_to_create_session' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+            });
+            return await exitWithError(root, 'Error: Unable to create remote session', () => gracefulShutdown(1));
+          }
+          logEvent('tengu_remote_create_session_success', {
+            session_id: createdSession.id as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          });
+
+          // Check if new remote TUI mode is enabled via feature gate
+          if (!isRemoteTuiEnabled) {
+            // Original behavior: print session info and exit
+            process.stdout.write(`Created remote session: ${createdSession.title}\n`);
+            process.stdout.write(`View: ${getRemoteSessionUrl(createdSession.id)}?m=0\n`);
+            process.stdout.write(`Resume with: claude --teleport ${createdSession.id}\n`);
+            await gracefulShutdown(0);
+            process.exit(0);
+          }
+
+          // New behavior: start local TUI with CCR engine
+          // Mark that we're in remote mode for command visibility
+          setIsRemoteMode(true);
+          switchSession(asSessionId(createdSession.id));
+
+          // Get OAuth credentials for remote session
+          let apiCreds: { accessToken: string; orgUUID: string };
+          try {
+            apiCreds = await prepareApiRequest();
+          } catch (error) {
+            logError(toError(error));
+            return await exitWithError(root, `Error: ${errorMessage(error) || 'Failed to authenticate'}`, () =>
+              gracefulShutdown(1),
+            );
+          }
+
+          // Create remote session config for the REPL
+          const { getClaudeAIOAuthTokens: getTokensForRemote } = await import('./utils/auth.js');
+          const getAccessTokenForRemote = (): string => getTokensForRemote()?.accessToken ?? apiCreds.accessToken;
+          const remoteSessionConfig = createRemoteSessionConfig(
+            createdSession.id,
+            getAccessTokenForRemote,
+            apiCreds.orgUUID,
+            hasInitialPrompt,
+          );
+
+          // Add remote session info as initial system message
+          const remoteSessionUrl = `${getRemoteSessionUrl(createdSession.id)}?m=0`;
+          const remoteInfoMessage = createSystemMessage(
+            `/remote-control is active. Code in CLI or at ${remoteSessionUrl}`,
+            'info',
+          );
+
+          // Create initial user message from the prompt if provided (CCR echoes it back but we ignore that)
+          const initialUserMessage = hasInitialPrompt ? createUserMessage({ content: remote }) : null;
+
+          // Set remote session URL in app state for footer indicator
+          const remoteInitialState = {
+            ...initialState,
+            remoteSessionUrl,
+          };
+
+          // Pre-filter commands to only include remote-safe ones.
+          // CCR's init response may further refine the list (via handleRemoteInit in REPL).
+          const remoteCommands = filterCommandsForRemoteMode(commands);
+          await launchRepl(
+            root,
+            {
+              getFpsMetrics,
+              stats,
+              initialState: remoteInitialState,
+            },
+            {
+              debug: debug || debugToStderr,
+              commands: remoteCommands,
+              initialTools: [],
+              initialMessages: initialUserMessage ? [remoteInfoMessage, initialUserMessage] : [remoteInfoMessage],
+              mcpClients: [],
+              autoConnectIdeFlag: ide,
+              mainThreadAgentDefinition,
+              disableSlashCommands,
+              remoteSessionConfig,
+              thinkingConfig,
+            },
+            renderAndRun,
+          );
+          return;
+        } else if (teleport) {
+          if (teleport === true || teleport === '') {
+            // Interactive mode: show task selector and handle resume
+            logEvent('tengu_teleport_interactive_mode', {});
+            logForDebugging('selectAndResumeTeleportTask: Starting teleport flow...');
+            const teleportResult = await launchTeleportResumeWrapper(root);
+            if (!teleportResult) {
+              // User cancelled or error occurred
+              await gracefulShutdown(0);
+              process.exit(0);
+            }
+            const { branchError } = await checkOutTeleportedSessionBranch(teleportResult.branch);
+            messages = processMessagesForTeleportResume(teleportResult.log, branchError);
+          } else if (typeof teleport === 'string') {
+            logEvent('tengu_teleport_resume_session', {
+              mode: 'direct' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+            });
+            try {
+              // First, fetch session and validate repository before checking git state
+              const sessionData = await fetchSession(teleport);
+              const repoValidation = await validateSessionRepository(sessionData);
+
+              // Handle repo mismatch or not in repo cases
+              if (repoValidation.status === 'mismatch' || repoValidation.status === 'not_in_repo') {
+                const sessionRepo = repoValidation.sessionRepo;
+                if (sessionRepo) {
+                  // Check for known paths
+                  const knownPaths = getKnownPathsForRepo(sessionRepo);
+                  const existingPaths = await filterExistingPaths(knownPaths);
+
+                  if (existingPaths.length > 0) {
+                    // Show directory switch dialog
+                    const selectedPath = await launchTeleportRepoMismatchDialog(root, {
+                      targetRepo: sessionRepo,
+                      initialPaths: existingPaths,
+                    });
+
+                    if (selectedPath) {
+                      // Change to the selected directory
+                      process.chdir(selectedPath);
+                      setCwd(selectedPath);
+                      setOriginalCwd(selectedPath);
+                    } else {
+                      // User cancelled
+                      await gracefulShutdown(0);
+                    }
+                  } else {
+                    // No known paths - show original error
+                    throw new TeleportOperationError(
+                      `You must run claude --teleport ${teleport} from a checkout of ${sessionRepo}.`,
+                      chalk.red(
+                        `You must run claude --teleport ${teleport} from a checkout of ${chalk.bold(sessionRepo)}.\n`,
+                      ),
+                    );
+                  }
+                }
+              } else if (repoValidation.status === 'error') {
+                throw new TeleportOperationError(
+                  repoValidation.errorMessage || 'Failed to validate session',
+                  chalk.red(`Error: ${repoValidation.errorMessage || 'Failed to validate session'}\n`),
+                );
+              }
+
+              await validateGitState();
+
+              // Use progress UI for teleport
+              const { teleportWithProgress } = await import('./components/TeleportProgress.js');
+              const result = await teleportWithProgress(root, teleport);
+              // Track teleported session for reliability logging
+              setTeleportedSessionInfo({ sessionId: teleport });
+              messages = result.messages;
+            } catch (error) {
+              if (error instanceof TeleportOperationError) {
+                process.stderr.write(error.formattedMessage + '\n');
+              } else {
+                logError(error);
+                process.stderr.write(chalk.red(`Error: ${errorMessage(error)}\n`));
+              }
+              await gracefulShutdown(1);
+            }
+          }
+        }
+        if (process.env.USER_TYPE === 'ant') {
+          if (options.resume && typeof options.resume === 'string' && !maybeSessionId) {
+            // Check for ccshare URL (e.g. https://go/ccshare/boris-20260311-211036)
+            const { parseCcshareId, loadCcshare } = await import('./utils/ccshareResume.js');
+            const ccshareId = parseCcshareId(options.resume);
+            if (ccshareId) {
+              try {
+                const resumeStart = performance.now();
+                const logOption = await loadCcshare(ccshareId);
+                const result = await loadConversationForResume(logOption, undefined);
+                if (result) {
+                  processedResume = await processResumedConversation(
+                    result,
+                    {
+                      forkSession: true,
+                      transcriptPath: result.fullPath,
+                    },
+                    resumeContext,
+                  );
+                  if (processedResume.restoredAgentDef) {
+                    mainThreadAgentDefinition = processedResume.restoredAgentDef;
+                  }
+                  logEvent('tengu_session_resumed', {
+                    entrypoint: 'ccshare' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+                    success: true,
+                    resume_duration_ms: Math.round(performance.now() - resumeStart),
+                  });
+                } else {
+                  logEvent('tengu_session_resumed', {
+                    entrypoint: 'ccshare' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+                    success: false,
+                  });
+                }
+              } catch (error) {
+                logEvent('tengu_session_resumed', {
+                  entrypoint: 'ccshare' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+                  success: false,
+                });
+                logError(error);
+                await exitWithError(root, `Unable to resume from ccshare: ${errorMessage(error)}`, () =>
+                  gracefulShutdown(1),
+                );
+              }
+            } else {
+              const resolvedPath = resolve(options.resume);
+              try {
+                const resumeStart = performance.now();
+                let logOption;
+                try {
+                  // Attempt to load as a transcript file; ENOENT falls through to session-ID handling
+                  logOption = await loadTranscriptFromFile(resolvedPath);
+                } catch (error) {
+                  if (!isENOENT(error)) throw error;
+                  // ENOENT: not a file path — fall through to session-ID handling
+                }
+                if (logOption) {
+                  const result = await loadConversationForResume(logOption, undefined /* sourceFile */);
+                  if (result) {
+                    processedResume = await processResumedConversation(
+                      result,
+                      {
+                        forkSession: !!options.forkSession,
+                        transcriptPath: result.fullPath,
+                      },
+                      resumeContext,
+                    );
+                    if (processedResume.restoredAgentDef) {
+                      mainThreadAgentDefinition = processedResume.restoredAgentDef;
+                    }
+                    logEvent('tengu_session_resumed', {
+                      entrypoint: 'file' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+                      success: true,
+                      resume_duration_ms: Math.round(performance.now() - resumeStart),
+                    });
+                  } else {
+                    logEvent('tengu_session_resumed', {
+                      entrypoint: 'file' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+                      success: false,
+                    });
+                  }
+                }
+              } catch (error) {
+                logEvent('tengu_session_resumed', {
+                  entrypoint: 'file' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+                  success: false,
+                });
+                logError(error);
+                await exitWithError(root, `Unable to load transcript from file: ${options.resume}`, () =>
+                  gracefulShutdown(1),
+                );
+              }
+            }
+          }
+        }
+
+        // If not loaded as a file, try as session ID
+        if (maybeSessionId) {
+          // Resume specific session by ID
+          const sessionId = maybeSessionId;
+          try {
+            const resumeStart = performance.now();
+            // Use matchedLog if available (for cross-worktree resume by custom title)
+            // Otherwise fall back to sessionId string (for direct UUID resume)
+            const result = await loadConversationForResume(matchedLog ?? sessionId, undefined);
+
+            if (!result) {
+              logEvent('tengu_session_resumed', {
+                entrypoint: 'cli_flag' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+                success: false,
+              });
+              return await exitWithError(root, `No conversation found with session ID: ${sessionId}`);
+            }
+
+            const fullPath = matchedLog?.fullPath ?? result.fullPath;
+            processedResume = await processResumedConversation(
+              result,
+              {
+                forkSession: !!options.forkSession,
+                sessionIdOverride: sessionId,
+                transcriptPath: fullPath,
+              },
+              resumeContext,
+            );
+
+            if (processedResume.restoredAgentDef) {
+              mainThreadAgentDefinition = processedResume.restoredAgentDef;
+            }
+            logEvent('tengu_session_resumed', {
+              entrypoint: 'cli_flag' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+              success: true,
+              resume_duration_ms: Math.round(performance.now() - resumeStart),
+            });
+          } catch (error) {
+            logEvent('tengu_session_resumed', {
+              entrypoint: 'cli_flag' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+              success: false,
+            });
+            logError(error);
+            await exitWithError(root, `Failed to resume session ${sessionId}`);
+          }
+        }
+
+        // Await file downloads before rendering REPL (files must be available)
+        if (fileDownloadPromise) {
+          try {
+            const results = await fileDownloadPromise;
+            const failedCount = count(results, r => !r.success);
+            if (failedCount > 0) {
+              process.stderr.write(
+                chalk.yellow(`Warning: ${failedCount}/${results.length} file(s) failed to download.\n`),
+              );
+            }
+          } catch (error) {
+            return await exitWithError(root, `Error downloading files: ${errorMessage(error)}`);
+          }
+        }
+
+        // If we have a processed resume or teleport messages, render the REPL
+        const resumeData =
+          processedResume ??
+          (Array.isArray(messages)
+            ? {
+                messages,
+                fileHistorySnapshots: undefined,
+                agentName: undefined,
+                agentColor: undefined as AgentColorName | undefined,
+                restoredAgentDef: mainThreadAgentDefinition,
+                initialState,
+                contentReplacements: undefined,
+              }
+            : undefined);
+        if (resumeData) {
+          maybeActivateProactive(options);
+          maybeActivateBrief(options);
+
+          await launchRepl(
+            root,
+            {
+              getFpsMetrics,
+              stats,
+              initialState: resumeData.initialState,
+            },
+            {
+              ...sessionConfig,
+              mainThreadAgentDefinition: resumeData.restoredAgentDef ?? mainThreadAgentDefinition,
+              initialMessages: resumeData.messages,
+              initialFileHistorySnapshots: resumeData.fileHistorySnapshots,
+              initialContentReplacements: resumeData.contentReplacements,
+              initialAgentName: resumeData.agentName,
+              initialAgentColor: resumeData.agentColor,
+            },
+            renderAndRun,
+          );
+        } else {
+          // Show interactive selector (includes same-repo worktrees)
+          // Note: ResumeConversation loads logs internally to ensure proper GC after selection
+          await launchResumeChooser(root, { getFpsMetrics, stats, initialState }, getWorktreePaths(getOriginalCwd()), {
+            ...sessionConfig,
+            initialSearchQuery: searchTerm,
+            forkSession: options.forkSession,
+            filterByPr,
+          });
+        }
+      } else {
+        // Pass unresolved hooks promise to REPL so it can render immediately
+        // instead of blocking ~500ms waiting for SessionStart hooks to finish.
+        // REPL will inject hook messages when they resolve and await them before
+        // the first API call so the model always sees hook context.
+        const pendingHookMessages = hooksPromise && hookMessages.length === 0 ? hooksPromise : undefined;
+
+        profileCheckpoint('action_after_hooks');
+        maybeActivateProactive(options);
+        maybeActivateBrief(options);
+        // Persist the current mode for fresh sessions so future resumes know what mode was used
+        if (feature('COORDINATOR_MODE')) {
+          saveMode(coordinatorModeModule?.isCoordinatorMode() ? 'coordinator' : 'normal');
+        }
+
+        // If launched via a deep link, show a provenance banner so the user
+        // knows the session originated externally. Linux xdg-open and
+        // browsers with "always allow" set dispatch the link with no OS-level
+        // confirmation, so this is the only signal the user gets that the
+        // prompt — and the working directory / CLAUDE.md it implies — came
+        // from an external source rather than something they typed.
+        let deepLinkBanner: ReturnType<typeof createSystemMessage> | null = null;
+        if (feature('LODESTONE')) {
+          if (options.deepLinkOrigin) {
+            logEvent('tengu_deep_link_opened', {
+              has_prefill: Boolean(options.prefill),
+              has_repo: Boolean(options.deepLinkRepo),
+            });
+            deepLinkBanner = createSystemMessage(
+              buildDeepLinkBanner({
+                cwd: getCwd(),
+                prefillLength: options.prefill?.length,
+                repo: options.deepLinkRepo,
+                lastFetch: options.deepLinkLastFetch !== undefined ? new Date(options.deepLinkLastFetch) : undefined,
+              }),
+              'warning',
+            );
+          } else if (options.prefill) {
+            deepLinkBanner = createSystemMessage(
+              'Launched with a pre-filled prompt — review it before pressing Enter.',
+              'warning',
+            );
+          }
+        }
+        const initialMessages = deepLinkBanner
+          ? [deepLinkBanner, ...hookMessages]
+          : hookMessages.length > 0
+            ? hookMessages
+            : undefined;
+
+        await launchRepl(
+          root,
+          { getFpsMetrics, stats, initialState },
+          {
+            ...sessionConfig,
+            initialMessages,
+            pendingHookMessages,
+          },
+          renderAndRun,
+        );
+      }
+    })
+    .version(`${MACRO.VERSION} (Claude Code)`, '-v, --version', 'Output the version number');
+
+  // Worktree flags
+  program.option('-w, --worktree [name]', 'Create a new git worktree for this session (optionally specify a name)');
+  program.option(
+    '--tmux',
+    'Create a tmux session for the worktree (requires --worktree). Uses iTerm2 native panes when available; use --tmux=classic for traditional tmux.',
+  );
+
+  if (canUserConfigureAdvisor()) {
+    program.addOption(
+      new Option(
+        '--advisor <model>',
+        'Enable the server-side advisor tool with the specified model (alias or full ID).',
+      ).hideHelp(),
+    );
+  }
+
+  if (process.env.USER_TYPE === 'ant') {
+    program.addOption(
+      new Option('--delegate-permissions', '[ANT-ONLY] Alias for --permission-mode auto.').implies({
+        permissionMode: 'auto',
+      }),
+    );
+    program.addOption(
+      new Option(
+        '--dangerously-skip-permissions-with-classifiers',
+        '[ANT-ONLY] Deprecated alias for --permission-mode auto.',
+      )
+        .hideHelp()
+        .implies({ permissionMode: 'auto' }),
+    );
+    program.addOption(
+      new Option('--afk', '[ANT-ONLY] Deprecated alias for --permission-mode auto.')
+        .hideHelp()
+        .implies({ permissionMode: 'auto' }),
+    );
+    program.addOption(
+      new Option(
+        '--tasks [id]',
+        '[ANT-ONLY] Tasks mode: watch for tasks and auto-process them. Optional id is used as both the task list ID and agent ID (defaults to "tasklist").',
+      )
+        .argParser(String)
+        .hideHelp(),
+    );
+    program.option('--agent-teams', '[ANT-ONLY] Force Claude to use multi-agent mode for solving problems', () => true);
+  }
+
+  if (feature('TRANSCRIPT_CLASSIFIER')) {
+    program.addOption(new Option('--enable-auto-mode', 'Opt in to auto mode').hideHelp());
+  }
+
+  if (feature('PROACTIVE') || feature('KAIROS')) {
+    program.addOption(new Option('--proactive', 'Start in proactive autonomous mode'));
+  }
+
+  if (feature('UDS_INBOX')) {
+    program.addOption(
+      new Option(
+        '--messaging-socket-path <path>',
+        'Unix domain socket path for the UDS messaging server (defaults to a tmp path)',
+      ),
+    );
+  }
+
+  if (feature('KAIROS') || feature('KAIROS_BRIEF')) {
+    program.addOption(new Option('--brief', 'Enable SendUserMessage tool for agent-to-user communication'));
+  }
+  if (feature('KAIROS')) {
+    program.addOption(new Option('--assistant', 'Force assistant mode (Agent SDK daemon use)').hideHelp());
+  }
+  if (feature('KAIROS') || feature('KAIROS_CHANNELS')) {
+    program.addOption(
+      new Option(
+        '--channels <servers...>',
+        'MCP servers whose channel notifications (inbound push) should register this session. Space-separated server names.',
+      ).hideHelp(),
+    );
+    program.addOption(
+      new Option(
+        '--dangerously-load-development-channels <servers...>',
+        'Load channel servers not on the approved allowlist. For local channel development only. Shows a confirmation dialog at startup.',
+      ).hideHelp(),
+    );
+  }
+
+  // Teammate identity options (set by leader when spawning tmux teammates)
+  // These replace the CLAUDE_CODE_* environment variables
+  program.addOption(new Option('--agent-id <id>', 'Teammate agent ID').hideHelp());
+  program.addOption(new Option('--agent-name <name>', 'Teammate display name').hideHelp());
+  program.addOption(new Option('--team-name <name>', 'Team name for swarm coordination').hideHelp());
+  program.addOption(new Option('--agent-color <color>', 'Teammate UI color').hideHelp());
+  program.addOption(new Option('--plan-mode-required', 'Require plan mode before implementation').hideHelp());
+  program.addOption(new Option('--parent-session-id <id>', 'Parent session ID for analytics correlation').hideHelp());
+  program.addOption(
+    new Option('--teammate-mode <mode>', 'How to spawn teammates: "tmux", "in-process", or "auto"')
+      .choices(['auto', 'tmux', 'in-process'])
+      .hideHelp(),
+  );
+  program.addOption(new Option('--agent-type <type>', 'Custom agent type for this teammate').hideHelp());
+
+  // Enable SDK URL for all builds but hide from help
+  program.addOption(
+    new Option(
+      '--sdk-url <url>',
+      'Use remote WebSocket endpoint for SDK I/O streaming (only with -p and stream-json format)',
+    ).hideHelp(),
+  );
+
+  // Enable teleport/remote flags for all builds but keep them undocumented until GA
+  program.addOption(
+    new Option('--teleport [session]', 'Resume a teleport session, optionally specify session ID').hideHelp(),
+  );
+  program.addOption(
+    new Option('--remote [description]', 'Create a remote session with the given description').hideHelp(),
+  );
+  if (feature('BRIDGE_MODE')) {
+    program.addOption(
+      new Option(
+        '--remote-control [name]',
+        'Start an interactive session with Remote Control enabled (optionally named)',
+      )
+        .argParser(value => value || true)
+        .hideHelp(),
+    );
+    program.addOption(
+      new Option('--rc [name]', 'Alias for --remote-control').argParser(value => value || true).hideHelp(),
+    );
+  }
+
+  if (feature('HARD_FAIL')) {
+    program.addOption(new Option('--hard-fail', 'Crash on logError calls instead of silently logging').hideHelp());
+  }
+
+  profileCheckpoint('run_main_options_built');
+
+  // -p/--print mode: skip subcommand registration. The 52 subcommands
+  // (mcp, auth, plugin, skill, task, config, doctor, update, etc.) are
+  // never dispatched in print mode — commander routes the prompt to the
+  // default action. The subcommand registration path was measured at ~65ms
+  // on baseline — mostly the isBridgeEnabled() call (25ms settings Zod parse
+  // + 40ms sync keychain subprocess), both hidden by the try/catch that
+  // always returns false before enableConfigs(). cc:// URLs are rewritten to
+  // `open` at main() line ~851 BEFORE this runs, so argv check is safe here.
+  const isPrintMode = process.argv.includes('-p') || process.argv.includes('--print');
+  const isCcUrl = process.argv.some(a => a.startsWith('cc://') || a.startsWith('cc+unix://'));
+  if (isPrintMode && !isCcUrl) {
+    profileCheckpoint('run_before_parse');
+    await program.parseAsync(process.argv);
+    profileCheckpoint('run_after_parse');
+    return program;
+  }
+
+  // claude mcp
+
+  const mcp = program
+    .command('mcp')
+    .description('Configure and manage MCP servers')
+    .configureHelp(createSortedHelpConfig())
+    .enablePositionalOptions();
+
+  mcp
+    .command('serve')
+    .description(`Start the Claude Code MCP server`)
+    .option('-d, --debug', 'Enable debug mode', () => true)
+    .option('--verbose', 'Override verbose mode setting from config', () => true)
+    .action(async ({ debug, verbose }: { debug?: boolean; verbose?: boolean }) => {
+      const { mcpServeHandler } = await import('./cli/handlers/mcp.js');
+      await mcpServeHandler({ debug, verbose });
+    });
+
+  // Register the mcp add subcommand (extracted for testability)
+  registerMcpAddCommand(mcp);
+
+  if (isXaaEnabled()) {
+    registerMcpXaaIdpCommand(mcp);
+  }
+
+  mcp
+    .command('remove <name>')
+    .description('Remove an MCP server')
+    .option(
+      '-s, --scope <scope>',
+      'Configuration scope (local, user, or project) - if not specified, removes from whichever scope it exists in',
+    )
+    .action(async (name: string, options: { scope?: string }) => {
+      const { mcpRemoveHandler } = await import('./cli/handlers/mcp.js');
+      await mcpRemoveHandler(name, options);
+    });
+
+  mcp
+    .command('list')
+    .description(
+      'List configured MCP servers. Note: The workspace trust dialog is skipped and stdio servers from .mcp.json are spawned for health checks. Only use this command in directories you trust.',
+    )
+    .action(async () => {
+      const { mcpListHandler } = await import('./cli/handlers/mcp.js');
+      await mcpListHandler();
+    });
+
+  mcp
+    .command('get <name>')
+    .description(
+      'Get details about an MCP server. Note: The workspace trust dialog is skipped and stdio servers from .mcp.json are spawned for health checks. Only use this command in directories you trust.',
+    )
+    .action(async (name: string) => {
+      const { mcpGetHandler } = await import('./cli/handlers/mcp.js');
+      await mcpGetHandler(name);
+    });
+
+  mcp
+    .command('add-json <name> <json>')
+    .description('Add an MCP server (stdio or SSE) with a JSON string')
+    .option('-s, --scope <scope>', 'Configuration scope (local, user, or project)', 'local')
+    .option('--client-secret', 'Prompt for OAuth client secret (or set MCP_CLIENT_SECRET env var)')
+    .action(async (name: string, json: string, options: { scope?: string; clientSecret?: true }) => {
+      const { mcpAddJsonHandler } = await import('./cli/handlers/mcp.js');
+      await mcpAddJsonHandler(name, json, options);
+    });
+
+  mcp
+    .command('add-from-claude-desktop')
+    .description('Import MCP servers from Claude Desktop (Mac and WSL only)')
+    .option('-s, --scope <scope>', 'Configuration scope (local, user, or project)', 'local')
+    .action(async (options: { scope?: string }) => {
+      const { mcpAddFromDesktopHandler } = await import('./cli/handlers/mcp.js');
+      await mcpAddFromDesktopHandler(options);
+    });
+
+  mcp
+    .command('reset-project-choices')
+    .description('Reset all approved and rejected project-scoped (.mcp.json) servers within this project')
+    .action(async () => {
+      const { mcpResetChoicesHandler } = await import('./cli/handlers/mcp.js');
+      await mcpResetChoicesHandler();
+    });
+
+  // claude server
+  if (feature('DIRECT_CONNECT')) {
+    program
+      .command('server')
+      .description('Start a Claude Code session server')
+      .option('--port <number>', 'HTTP port', '0')
+      .option('--host <string>', 'Bind address', '0.0.0.0')
+      .option('--auth-token <token>', 'Bearer token for auth')
+      .option('--unix <path>', 'Listen on a unix domain socket')
+      .option('--workspace <dir>', 'Default working directory for sessions that do not specify cwd')
+      .option('--idle-timeout <ms>', 'Idle timeout for detached sessions in ms (0 = never expire)', '600000')
+      .option('--max-sessions <n>', 'Maximum concurrent sessions (0 = unlimited)', '32')
+      .action(
+        async (opts: {
+          port: string;
+          host: string;
+          authToken?: string;
+          unix?: string;
+          workspace?: string;
+          idleTimeout: string;
+          maxSessions: string;
+        }) => {
+          const { randomBytes } = await import('crypto');
+          const { startServer } = await import('./server/server.js');
+          const { SessionManager } = await import('./server/sessionManager.js');
+          const { DangerousBackend } = await import('./server/backends/dangerousBackend.js');
+          const { printBanner } = await import('./server/serverBanner.js');
+          const { createServerLogger } = await import('./server/serverLog.js');
+          const { writeServerLock, removeServerLock, probeRunningServer } = await import('./server/lockfile.js');
+
+          const existing = await probeRunningServer();
+          if (existing) {
+            process.stderr.write(`A claude server is already running (pid ${existing.pid}) at ${existing.httpUrl}\n`);
+            process.exit(1);
+          }
+
+          const authToken = opts.authToken ?? `sk-ant-cc-${randomBytes(16).toString('base64url')}`;
+
+          const config = {
+            port: parseInt(opts.port, 10),
+            host: opts.host,
+            authToken,
+            unix: opts.unix,
+            workspace: opts.workspace,
+            idleTimeoutMs: parseInt(opts.idleTimeout, 10),
+            maxSessions: parseInt(opts.maxSessions, 10),
+          };
+
+          const backend = new DangerousBackend();
+          const sessionManager = new SessionManager(backend, {
+            idleTimeoutMs: config.idleTimeoutMs,
+            maxSessions: config.maxSessions,
+          });
+          const logger = createServerLogger();
+
+          const server = startServer(config, sessionManager, logger);
+          const actualPort = server.port ?? config.port;
+          printBanner(config, authToken, actualPort);
+
+          await writeServerLock({
+            pid: process.pid,
+            port: actualPort,
+            host: config.host,
+            httpUrl: config.unix ? `unix:${config.unix}` : `http://${config.host}:${actualPort}`,
+            startedAt: Date.now(),
+          });
+
+          let shuttingDown = false;
+          const shutdown = async () => {
+            if (shuttingDown) return;
+            shuttingDown = true;
+            // Stop accepting new connections before tearing down sessions.
+            server.stop(true);
+            await sessionManager.destroyAll();
+            await removeServerLock();
+            process.exit(0);
+          };
+          process.once('SIGINT', () => void shutdown());
+          process.once('SIGTERM', () => void shutdown());
+        },
+      );
+  }
+
+  // `claude ssh <host> [dir]` — registered here only so --help shows it.
+  // The actual interactive flow is handled by early argv rewriting in main()
+  // (parallels the DIRECT_CONNECT/cc:// pattern above). If commander reaches
+  // this action it means the argv rewrite didn't fire (e.g. user ran
+  // `claude ssh` with no host) — just print usage.
+  if (feature('SSH_REMOTE')) {
+    program
+      .command('ssh <host> [dir]')
+      .description(
+        'Run Claude Code on a remote host over SSH. Deploys the binary and ' +
+          'tunnels API auth back through your local machine — no remote setup needed.',
+      )
+      .option('--permission-mode <mode>', 'Permission mode for the remote session')
+      .option('--dangerously-skip-permissions', 'Skip all permission prompts on the remote (dangerous)')
+      .option(
+        '--local',
+        'e2e test mode — spawn the child CLI locally (skip ssh/deploy). ' +
+          'Exercises the auth proxy and unix-socket plumbing without a remote host.',
+      )
+      .action(async () => {
+        // Argv rewriting in main() should have consumed `ssh <host>` before
+        // commander runs. Reaching here means host was missing or the
+        // rewrite predicate didn't match.
+        process.stderr.write(
+          'Usage: claude ssh <user@host | ssh-config-alias> [dir]\n\n' +
+            "Runs Claude Code on a remote Linux host. You don't need to install\n" +
+            'anything on the remote or run `claude auth login` there — the binary is\n' +
+            'deployed over SSH and API auth tunnels back through your local machine.\n',
+        );
+        process.exit(1);
+      });
+  }
+
+  // claude connect — subcommand only handles -p (headless) mode.
+  // Interactive mode (without -p) is handled by early argv rewriting in main()
+  // which redirects to the main command with full TUI support.
+  if (feature('DIRECT_CONNECT')) {
+    program
+      .command('open <cc-url>')
+      .description('Connect to a Claude Code server (internal — use cc:// URLs)')
+      .option('-p, --print [prompt]', 'Print mode (headless)')
+      .option('--output-format <format>', 'Output format: text, json, stream-json', 'text')
+      .action(
+        async (
+          ccUrl: string,
+          opts: {
+            print?: string | true;
+            outputFormat?: string;
+          },
+        ) => {
+          const { parseConnectUrl } = await import('./server/parseConnectUrl.js');
+          const { serverUrl, authToken } = parseConnectUrl(ccUrl);
+
+          let connectConfig;
+          try {
+            const session = await createDirectConnectSession({
+              serverUrl,
+              authToken,
+              cwd: getOriginalCwd(),
+              dangerouslySkipPermissions: _pendingConnect?.dangerouslySkipPermissions,
+            });
+            if (session.workDir) {
+              setOriginalCwd(session.workDir);
+              setCwdState(session.workDir);
+            }
+            setDirectConnectServerUrl(serverUrl);
+            connectConfig = session.config;
+          } catch (err) {
+            console.error(err instanceof DirectConnectError ? err.message : String(err));
+            process.exit(1);
+          }
+
+          const { runConnectHeadless } = await import('./server/connectHeadless.js');
+
+          const prompt = typeof opts.print === 'string' ? opts.print : '';
+          const interactive = opts.print === true;
+          await runConnectHeadless(connectConfig, prompt, opts.outputFormat, interactive);
+        },
+      );
+  }
+
+  // claude auth
+
+  const auth = program.command('auth').description('Manage authentication').configureHelp(createSortedHelpConfig());
+
+  auth
+    .command('login')
+    .description('Sign in to your Anthropic account')
+    .option('--email <email>', 'Pre-populate email address on the login page')
+    .option('--sso', 'Force SSO login flow')
+    .option('--console', 'Use Anthropic Console (API usage billing) instead of Claude subscription')
+    .option('--claudeai', 'Use Claude subscription (default)')
+    .action(
+      async ({
+        email,
+        sso,
+        console: useConsole,
+        claudeai,
+      }: {
+        email?: string;
+        sso?: boolean;
+        console?: boolean;
+        claudeai?: boolean;
+      }) => {
+        const { authLogin } = await import('./cli/handlers/auth.js');
+        await authLogin({ email, sso, console: useConsole, claudeai });
+      },
+    );
+
+  auth
+    .command('status')
+    .description('Show authentication status')
+    .option('--json', 'Output as JSON (default)')
+    .option('--text', 'Output as human-readable text')
+    .action(async (opts: { json?: boolean; text?: boolean }) => {
+      const { authStatus } = await import('./cli/handlers/auth.js');
+      await authStatus(opts);
+    });
+
+  auth
+    .command('logout')
+    .description('Log out from your Anthropic account')
+    .action(async () => {
+      const { authLogout } = await import('./cli/handlers/auth.js');
+      await authLogout();
+    });
+
+  /**
+   * Helper function to handle marketplace command errors consistently.
+   * Logs the error and exits the process with status 1.
+   * @param error The error that occurred
+   * @param action Description of the action that failed
+   */
+  // Hidden flag on all plugin/marketplace subcommands to target cowork_plugins.
+  const coworkOption = () => new Option('--cowork', 'Use cowork_plugins directory').hideHelp();
+
+  // Plugin validate command
+  const pluginCmd = program
+    .command('plugin')
+    .alias('plugins')
+    .description('Manage Claude Code plugins')
+    .configureHelp(createSortedHelpConfig());
+
+  pluginCmd
+    .command('validate <path>')
+    .description('Validate a plugin or marketplace manifest')
+    .addOption(coworkOption())
+    .action(async (manifestPath: string, options: { cowork?: boolean }) => {
+      const { pluginValidateHandler } = await import('./cli/handlers/plugins.js');
+      await pluginValidateHandler(manifestPath, options);
+    });
+
+  // Plugin list command
+  pluginCmd
+    .command('list')
+    .description('List installed plugins')
+    .option('--json', 'Output as JSON')
+    .option('--available', 'Include available plugins from marketplaces (requires --json)')
+    .addOption(coworkOption())
+    .action(async (options: { json?: boolean; available?: boolean; cowork?: boolean }) => {
+      const { pluginListHandler } = await import('./cli/handlers/plugins.js');
+      await pluginListHandler(options);
+    });
+
+  // Marketplace subcommands
+  const marketplaceCmd = pluginCmd
+    .command('marketplace')
+    .description('Manage Claude Code marketplaces')
+    .configureHelp(createSortedHelpConfig());
+
+  marketplaceCmd
+    .command('add <source>')
+    .description('Add a marketplace from a URL, path, or GitHub repo')
+    .addOption(coworkOption())
+    .option(
+      '--sparse <paths...>',
+      'Limit checkout to specific directories via git sparse-checkout (for monorepos). Example: --sparse .claude-plugin plugins',
+    )
+    .option('--scope <scope>', 'Where to declare the marketplace: user (default), project, or local')
+    .action(
+      async (
+        source: string,
+        options: {
+          cowork?: boolean;
+          sparse?: string[];
+          scope?: string;
+        },
+      ) => {
+        const { marketplaceAddHandler } = await import('./cli/handlers/plugins.js');
+        await marketplaceAddHandler(source, options);
+      },
+    );
+
+  marketplaceCmd
+    .command('list')
+    .description('List all configured marketplaces')
+    .option('--json', 'Output as JSON')
+    .addOption(coworkOption())
+    .action(async (options: { json?: boolean; cowork?: boolean }) => {
+      const { marketplaceListHandler } = await import('./cli/handlers/plugins.js');
+      await marketplaceListHandler(options);
+    });
+
+  marketplaceCmd
+    .command('remove <name>')
+    .alias('rm')
+    .description('Remove a configured marketplace')
+    .addOption(coworkOption())
+    .action(async (name: string, options: { cowork?: boolean }) => {
+      const { marketplaceRemoveHandler } = await import('./cli/handlers/plugins.js');
+      await marketplaceRemoveHandler(name, options);
+    });
+
+  marketplaceCmd
+    .command('update [name]')
+    .description('Update marketplace(s) from their source - updates all if no name specified')
+    .addOption(coworkOption())
+    .action(async (name: string | undefined, options: { cowork?: boolean }) => {
+      const { marketplaceUpdateHandler } = await import('./cli/handlers/plugins.js');
+      await marketplaceUpdateHandler(name, options);
+    });
+
+  // Plugin install command
+  pluginCmd
+    .command('install <plugin>')
+    .alias('i')
+    .description('Install a plugin from available marketplaces (use plugin@marketplace for specific marketplace)')
+    .option('-s, --scope <scope>', 'Installation scope: user, project, or local', 'user')
+    .addOption(coworkOption())
+    .action(async (plugin: string, options: { scope?: string; cowork?: boolean }) => {
+      const { pluginInstallHandler } = await import('./cli/handlers/plugins.js');
+      await pluginInstallHandler(plugin, options);
+    });
+
+  // Plugin uninstall command
+  pluginCmd
+    .command('uninstall <plugin>')
+    .alias('remove')
+    .alias('rm')
+    .description('Uninstall an installed plugin')
+    .option('-s, --scope <scope>', 'Uninstall from scope: user, project, or local', 'user')
+    .option('--keep-data', "Preserve the plugin's persistent data directory (~/.claude/plugins/data/{id}/)")
+    .addOption(coworkOption())
+    .action(
+      async (
+        plugin: string,
+        options: {
+          scope?: string;
+          cowork?: boolean;
+          keepData?: boolean;
+        },
+      ) => {
+        const { pluginUninstallHandler } = await import('./cli/handlers/plugins.js');
+        await pluginUninstallHandler(plugin, options);
+      },
+    );
+
+  // Plugin enable command
+  pluginCmd
+    .command('enable <plugin>')
+    .description('Enable a disabled plugin')
+    .option('-s, --scope <scope>', `Installation scope: ${VALID_INSTALLABLE_SCOPES.join(', ')} (default: auto-detect)`)
+    .addOption(coworkOption())
+    .action(async (plugin: string, options: { scope?: string; cowork?: boolean }) => {
+      const { pluginEnableHandler } = await import('./cli/handlers/plugins.js');
+      await pluginEnableHandler(plugin, options);
+    });
+
+  // Plugin disable command
+  pluginCmd
+    .command('disable [plugin]')
+    .description('Disable an enabled plugin')
+    .option('-a, --all', 'Disable all enabled plugins')
+    .option('-s, --scope <scope>', `Installation scope: ${VALID_INSTALLABLE_SCOPES.join(', ')} (default: auto-detect)`)
+    .addOption(coworkOption())
+    .action(async (plugin: string | undefined, options: { scope?: string; cowork?: boolean; all?: boolean }) => {
+      const { pluginDisableHandler } = await import('./cli/handlers/plugins.js');
+      await pluginDisableHandler(plugin, options);
+    });
+
+  // Plugin update command
+  pluginCmd
+    .command('update <plugin>')
+    .description('Update a plugin to the latest version (restart required to apply)')
+    .option('-s, --scope <scope>', `Installation scope: ${VALID_UPDATE_SCOPES.join(', ')} (default: user)`)
+    .addOption(coworkOption())
+    .action(async (plugin: string, options: { scope?: string; cowork?: boolean }) => {
+      const { pluginUpdateHandler } = await import('./cli/handlers/plugins.js');
+      await pluginUpdateHandler(plugin, options);
+    });
+  // END ANT-ONLY
 
   // Setup token command
   program
     .command('setup-token')
-    .description(
-      'Set up a long-lived authentication token (requires Claude subscription)',
-    )
+    .description('Set up a long-lived authentication token (requires Claude subscription)')
     .action(async () => {
       const [{ setupTokenHandler }, { createRoot }] = await Promise.all([
         import('./cli/handlers/util.js'),
         import('@anthropic/ink'),
-      ])
-      const root = await createRoot(getBaseRenderOptions(false))
-      await setupTokenHandler(root)
-    })
+      ]);
+      const root = await createRoot(getBaseRenderOptions(false));
+      await setupTokenHandler(root);
+    });
 
-	// Agents command - list configured agents
-	program
-		.command("agents")
-		.description("List configured agents")
-		.option(
-			"--setting-sources <sources>",
-			"Comma-separated list of setting sources to load (user, project, local).",
-		)
-		.action(async () => {
-			const { agentsHandler } = await import("./cli/handlers/agents.js");
-			await agentsHandler();
-			process.exit(0);
-		});
+  // Agents command - list configured agents
+  program
+    .command('agents')
+    .description('List configured agents')
+    .option('--setting-sources <sources>', 'Comma-separated list of setting sources to load (user, project, local).')
+    .action(async () => {
+      const { agentsHandler } = await import('./cli/handlers/agents.js');
+      await agentsHandler();
+      process.exit(0);
+    });
 
-	if (feature("TRANSCRIPT_CLASSIFIER")) {
-		// Skip when tengu_auto_mode_config.enabled === 'disabled' (circuit breaker).
-		// Reads from disk cache — GrowthBook isn't initialized at registration time.
-		if (getAutoModeEnabledStateIfCached() !== "disabled") {
-			const autoModeCmd = program
-				.command("auto-mode")
-				.description("Inspect auto mode classifier configuration");
+  if (feature('TRANSCRIPT_CLASSIFIER')) {
+    // Skip when tengu_auto_mode_config.enabled === 'disabled' (circuit breaker).
+    // Reads from disk cache — GrowthBook isn't initialized at registration time.
+    if (getAutoModeEnabledStateIfCached() !== 'disabled') {
+      const autoModeCmd = program.command('auto-mode').description('Inspect auto mode classifier configuration');
 
-			autoModeCmd
-				.command("defaults")
-				.description(
-					"Print the default auto mode environment, allow, and deny rules as JSON",
-				)
-				.action(async () => {
-					const { autoModeDefaultsHandler } =
-						await import("./cli/handlers/autoMode.js");
-					autoModeDefaultsHandler();
-					process.exit(0);
-				});
+      autoModeCmd
+        .command('defaults')
+        .description('Print the default auto mode environment, allow, and deny rules as JSON')
+        .action(async () => {
+          const { autoModeDefaultsHandler } = await import('./cli/handlers/autoMode.js');
+          autoModeDefaultsHandler();
+          process.exit(0);
+        });
 
-			autoModeCmd
-				.command("config")
-				.description(
-					"Print the effective auto mode config as JSON: your settings where set, defaults otherwise",
-				)
-				.action(async () => {
-					const { autoModeConfigHandler } =
-						await import("./cli/handlers/autoMode.js");
-					autoModeConfigHandler();
-					process.exit(0);
-				});
+      autoModeCmd
+        .command('config')
+        .description('Print the effective auto mode config as JSON: your settings where set, defaults otherwise')
+        .action(async () => {
+          const { autoModeConfigHandler } = await import('./cli/handlers/autoMode.js');
+          autoModeConfigHandler();
+          process.exit(0);
+        });
 
-			autoModeCmd
-				.command("critique")
-				.description("Get AI feedback on your custom auto mode rules")
-				.option("--model <model>", "Override which model is used")
-				.action(async (options) => {
-					const { autoModeCritiqueHandler } =
-						await import("./cli/handlers/autoMode.js");
-					await autoModeCritiqueHandler(options);
-					process.exit();
-				});
-		}
-	}
+      autoModeCmd
+        .command('critique')
+        .description('Get AI feedback on your custom auto mode rules')
+        .option('--model <model>', 'Override which model is used')
+        .action(async options => {
+          const { autoModeCritiqueHandler } = await import('./cli/handlers/autoMode.js');
+          await autoModeCritiqueHandler(options);
+          process.exit();
+        });
+    }
+  }
 
-	// Remote Control command — connect local environment to claude.ai/code.
-	// The actual command is intercepted by the fast-path in cli.tsx before
-	// Commander.js runs, so this registration exists only for help output.
-	// Always hidden: isBridgeEnabled() at this point (before enableConfigs)
-	// would throw inside isClaudeAISubscriber → getGlobalConfig and return
-	// false via the try/catch — but not before paying ~65ms of side effects
-	// (25ms settings Zod parse + 40ms sync `security` keychain subprocess).
-	// The dynamic visibility never worked; the command was always hidden.
-	if (feature("BRIDGE_MODE")) {
-		program
-			.command("remote-control", { hidden: true })
-			.alias("rc")
-			.description(
-				"Connect your local environment for remote-control sessions via claude.ai/code",
-			)
-			.action(async () => {
-				// Unreachable — cli.tsx fast-path handles this command before main.tsx loads.
-				// If somehow reached, delegate to bridgeMain.
-				const { bridgeMain } = await import("./bridge/bridgeMain.js");
-				await bridgeMain(process.argv.slice(3));
-			});
-	}
+  // Remote Control command — connect local environment to claude.ai/code.
+  // The actual command is intercepted by the fast-path in cli.tsx before
+  // Commander.js runs, so this registration exists only for help output.
+  // Always hidden: isBridgeEnabled() at this point (before enableConfigs)
+  // would throw inside isClaudeAISubscriber → getGlobalConfig and return
+  // false via the try/catch — but not before paying ~65ms of side effects
+  // (25ms settings Zod parse + 40ms sync `security` keychain subprocess).
+  // The dynamic visibility never worked; the command was always hidden.
+  if (feature('BRIDGE_MODE')) {
+    program
+      .command('remote-control', { hidden: true })
+      .alias('rc')
+      .description('Connect your local environment for remote-control sessions via claude.ai/code')
+      .action(async () => {
+        // Unreachable — cli.tsx fast-path handles this command before main.tsx loads.
+        // If somehow reached, delegate to bridgeMain.
+        const { bridgeMain } = await import('./bridge/bridgeMain.js');
+        await bridgeMain(process.argv.slice(3));
+      });
+  }
 
-	if (feature("KAIROS")) {
-		program
-			.command("assistant [sessionId]")
-			.description(
-				"Attach the REPL as a client to a running bridge session. Discovers sessions via API if no sessionId given.",
-			)
-			.action(() => {
-				// Argv rewriting above should have consumed `assistant [id]`
-				// before commander runs. Reaching here means a root flag came first
-				// (e.g. `--debug assistant`) and the position-0 predicate
-				// didn't match. Print usage like the ssh stub does.
-				process.stderr.write(
-					"Usage: claude assistant [sessionId]\n\n" +
-						"Attach the REPL as a viewer client to a running bridge session.\n" +
-						"Omit sessionId to discover and pick from available sessions.\n",
-				);
-				process.exit(1);
-			});
-	}
+  if (feature('KAIROS')) {
+    program
+      .command('assistant [sessionId]')
+      .description(
+        'Attach the REPL as a client to a running bridge session. Discovers sessions via API if no sessionId given.',
+      )
+      .action(() => {
+        // Argv rewriting above should have consumed `assistant [id]`
+        // before commander runs. Reaching here means a root flag came first
+        // (e.g. `--debug assistant`) and the position-0 predicate
+        // didn't match. Print usage like the ssh stub does.
+        process.stderr.write(
+          'Usage: claude assistant [sessionId]\n\n' +
+            'Attach the REPL as a viewer client to a running bridge session.\n' +
+            'Omit sessionId to discover and pick from available sessions.\n',
+        );
+        process.exit(1);
+      });
+  }
 
   // Doctor command - check installation health
   program
@@ -6499,483 +5210,385 @@ async function run(): Promise<CommanderCommand> {
       const [{ doctorHandler }, { createRoot }] = await Promise.all([
         import('./cli/handlers/util.js'),
         import('@anthropic/ink'),
-      ])
-      const root = await createRoot(getBaseRenderOptions(false))
-      await doctorHandler(root)
-    })
+      ]);
+      const root = await createRoot(getBaseRenderOptions(false));
+      await doctorHandler(root);
+    });
 
+  // claude up — run the project's CLAUDE.md "# claude up" setup instructions.
+  if (process.env.USER_TYPE === 'ant') {
+    program
+      .command('up')
+      .description(
+        '[ANT-ONLY] Initialize or upgrade the local dev environment using the "# claude up" section of the nearest CLAUDE.md',
+      )
+      .action(async () => {
+        const { up } = await import('src/cli/up.js');
+        await up();
+      });
+  }
 
-	// claude up — run the project's CLAUDE.md "# claude up" setup instructions.
-	if (process.env.USER_TYPE === "ant") {
-		program
-			.command("up")
-			.description(
-				'[ANT-ONLY] Initialize or upgrade the local dev environment using the "# claude up" section of the nearest CLAUDE.md',
-			)
-			.action(async () => {
-				const { up } = await import("src/cli/up.js");
-				await up();
-			});
-	}
+  // claude rollback (ant-only)
+  // Rolls back to previous releases
+  if (process.env.USER_TYPE === 'ant') {
+    program
+      .command('rollback [target]')
+      .description(
+        '[ANT-ONLY] Roll back to a previous release\n\nExamples:\n  claude rollback                                    Go 1 version back from current\n  claude rollback 3                                  Go 3 versions back from current\n  claude rollback 2.0.73-dev.20251217.t190658        Roll back to a specific version',
+      )
+      .option('-l, --list', 'List recent published versions with ages')
+      .option('--dry-run', 'Show what would be installed without installing')
+      .option('--safe', 'Roll back to the server-pinned safe version (set by oncall during incidents)')
+      .action(
+        async (
+          target?: string,
+          options?: {
+            list?: boolean;
+            dryRun?: boolean;
+            safe?: boolean;
+          },
+        ) => {
+          const { rollback } = await import('src/cli/rollback.js');
+          await rollback(target, options);
+        },
+      );
+  }
 
-	// claude rollback (ant-only)
-	// Rolls back to previous releases
-	if (process.env.USER_TYPE === "ant") {
-		program
-			.command("rollback [target]")
-			.description(
-				"[ANT-ONLY] Roll back to a previous release\n\nExamples:\n  claude rollback                                    Go 1 version back from current\n  claude rollback 3                                  Go 3 versions back from current\n  claude rollback 2.0.73-dev.20251217.t190658        Roll back to a specific version",
-			)
-			.option("-l, --list", "List recent published versions with ages")
-			.option(
-				"--dry-run",
-				"Show what would be installed without installing",
-			)
-			.option(
-				"--safe",
-				"Roll back to the server-pinned safe version (set by oncall during incidents)",
-			)
-			.action(
-				async (
-					target?: string,
-					options?: {
-						list?: boolean;
-						dryRun?: boolean;
-						safe?: boolean;
-					},
-				) => {
-					const { rollback } = await import("src/cli/rollback.js");
-					await rollback(target, options);
-				},
-			);
-	}
+  // claude install
+  program
+    .command('install [target]')
+    .description(
+      'Install Claude Code native build. Use [target] to specify version (stable, latest, or specific version)',
+    )
+    .option('--force', 'Force installation even if already installed')
+    .action(async (target: string | undefined, options: { force?: boolean }) => {
+      const { installHandler } = await import('./cli/handlers/util.js');
+      await installHandler(target, options);
+    });
 
-	// claude install
-	program
-		.command("install [target]")
-		.description(
-			"Install Claude Code native build. Use [target] to specify version (stable, latest, or specific version)",
-		)
-		.option("--force", "Force installation even if already installed")
-		.action(
-			async (
-				target: string | undefined,
-				options: { force?: boolean },
-			) => {
-				const { installHandler } =
-					await import("./cli/handlers/util.js");
-				await installHandler(target, options);
-			},
-		);
+  // ant-only commands
+  if (process.env.USER_TYPE === 'ant') {
+    const validateLogId = (value: string) => {
+      const maybeSessionId = validateUuid(value);
+      if (maybeSessionId) return maybeSessionId;
+      return Number(value);
+    };
+    // claude log
+    program
+      .command('log')
+      .description('[ANT-ONLY] Manage conversation logs.')
+      .argument(
+        '[number|sessionId]',
+        'A number (0, 1, 2, etc.) to display a specific log, or the sesssion ID (uuid) of a log',
+        validateLogId,
+      )
+      .action(async (logId: string | number | undefined) => {
+        const { logHandler } = await import('./cli/handlers/ant.js');
+        await logHandler(logId);
+      });
 
-	// ant-only commands
-	if (process.env.USER_TYPE === "ant") {
-		const validateLogId = (value: string) => {
-			const maybeSessionId = validateUuid(value);
-			if (maybeSessionId) return maybeSessionId;
-			return Number(value);
-		};
-		// claude log
-		program
-			.command("log")
-			.description("[ANT-ONLY] Manage conversation logs.")
-			.argument(
-				"[number|sessionId]",
-				"A number (0, 1, 2, etc.) to display a specific log, or the sesssion ID (uuid) of a log",
-				validateLogId,
-			)
-			.action(async (logId: string | number | undefined) => {
-				const { logHandler } = await import("./cli/handlers/ant.js");
-				await logHandler(logId);
-			});
+    // claude error
+    program
+      .command('error')
+      .description(
+        '[ANT-ONLY] View error logs. Optionally provide a number (0, -1, -2, etc.) to display a specific log.',
+      )
+      .argument('[number]', 'A number (0, 1, 2, etc.) to display a specific log', parseInt)
+      .action(async (number: number | undefined) => {
+        const { errorHandler } = await import('./cli/handlers/ant.js');
+        await errorHandler(number);
+      });
 
-		// claude error
-		program
-			.command("error")
-			.description(
-				"[ANT-ONLY] View error logs. Optionally provide a number (0, -1, -2, etc.) to display a specific log.",
-			)
-			.argument(
-				"[number]",
-				"A number (0, 1, 2, etc.) to display a specific log",
-				parseInt,
-			)
-			.action(async (number: number | undefined) => {
-				const { errorHandler } = await import("./cli/handlers/ant.js");
-				await errorHandler(number);
-			});
-
-		// claude export
-		program
-			.command("export")
-			.description("[ANT-ONLY] Export a conversation to a text file.")
-			.usage("<source> <outputFile>")
-			.argument(
-				"<source>",
-				"Session ID, log index (0, 1, 2...), or path to a .json/.jsonl log file",
-			)
-			.argument("<outputFile>", "Output file path for the exported text")
-			.addHelpText(
-				"after",
-				`
+    // claude export
+    program
+      .command('export')
+      .description('[ANT-ONLY] Export a conversation to a text file.')
+      .usage('<source> <outputFile>')
+      .argument('<source>', 'Session ID, log index (0, 1, 2...), or path to a .json/.jsonl log file')
+      .argument('<outputFile>', 'Output file path for the exported text')
+      .addHelpText(
+        'after',
+        `
 Examples:
   $ claude export 0 conversation.txt                Export conversation at log index 0
   $ claude export <uuid> conversation.txt           Export conversation by session ID
   $ claude export input.json output.txt             Render JSON log file to text
   $ claude export <uuid>.jsonl output.txt           Render JSONL session file to text`,
-			)
-			.action(async (source: string, outputFile: string) => {
-				const { exportHandler } = await import("./cli/handlers/ant.js");
-				await exportHandler(source, outputFile);
-			});
+      )
+      .action(async (source: string, outputFile: string) => {
+        const { exportHandler } = await import('./cli/handlers/ant.js');
+        await exportHandler(source, outputFile);
+      });
 
-		if (process.env.USER_TYPE === "ant") {
-			const taskCmd = program
-				.command("task")
-				.description("[ANT-ONLY] Manage task list tasks");
+    if (process.env.USER_TYPE === 'ant') {
+      const taskCmd = program.command('task').description('[ANT-ONLY] Manage task list tasks');
 
-			taskCmd
-				.command("create <subject>")
-				.description("Create a new task")
-				.option("-d, --description <text>", "Task description")
-				.option(
-					"-l, --list <id>",
-					'Task list ID (defaults to "tasklist")',
-				)
-				.action(
-					async (
-						subject: string,
-						opts: { description?: string; list?: string },
-					) => {
-						const { taskCreateHandler } =
-							await import("./cli/handlers/ant.js");
-						await taskCreateHandler(subject, opts);
-					},
-				);
+      taskCmd
+        .command('create <subject>')
+        .description('Create a new task')
+        .option('-d, --description <text>', 'Task description')
+        .option('-l, --list <id>', 'Task list ID (defaults to "tasklist")')
+        .action(async (subject: string, opts: { description?: string; list?: string }) => {
+          const { taskCreateHandler } = await import('./cli/handlers/ant.js');
+          await taskCreateHandler(subject, opts);
+        });
 
-			taskCmd
-				.command("list")
-				.description("List all tasks")
-				.option(
-					"-l, --list <id>",
-					'Task list ID (defaults to "tasklist")',
-				)
-				.option("--pending", "Show only pending tasks")
-				.option("--json", "Output as JSON")
-				.action(
-					async (opts: {
-						list?: string;
-						pending?: boolean;
-						json?: boolean;
-					}) => {
-						const { taskListHandler } =
-							await import("./cli/handlers/ant.js");
-						await taskListHandler(opts);
-					},
-				);
+      taskCmd
+        .command('list')
+        .description('List all tasks')
+        .option('-l, --list <id>', 'Task list ID (defaults to "tasklist")')
+        .option('--pending', 'Show only pending tasks')
+        .option('--json', 'Output as JSON')
+        .action(async (opts: { list?: string; pending?: boolean; json?: boolean }) => {
+          const { taskListHandler } = await import('./cli/handlers/ant.js');
+          await taskListHandler(opts);
+        });
 
-			taskCmd
-				.command("get <id>")
-				.description("Get details of a task")
-				.option(
-					"-l, --list <id>",
-					'Task list ID (defaults to "tasklist")',
-				)
-				.action(async (id: string, opts: { list?: string }) => {
-					const { taskGetHandler } =
-						await import("./cli/handlers/ant.js");
-					await taskGetHandler(id, opts);
-				});
+      taskCmd
+        .command('get <id>')
+        .description('Get details of a task')
+        .option('-l, --list <id>', 'Task list ID (defaults to "tasklist")')
+        .action(async (id: string, opts: { list?: string }) => {
+          const { taskGetHandler } = await import('./cli/handlers/ant.js');
+          await taskGetHandler(id, opts);
+        });
 
-			taskCmd
-				.command("update <id>")
-				.description("Update a task")
-				.option(
-					"-l, --list <id>",
-					'Task list ID (defaults to "tasklist")',
-				)
-				.option(
-					"-s, --status <status>",
-					`Set status (${TASK_STATUSES.join(", ")})`,
-				)
-				.option("--subject <text>", "Update subject")
-				.option("-d, --description <text>", "Update description")
-				.option("--owner <agentId>", "Set owner")
-				.option("--clear-owner", "Clear owner")
-				.action(
-					async (
-						id: string,
-						opts: {
-							list?: string;
-							status?: string;
-							subject?: string;
-							description?: string;
-							owner?: string;
-							clearOwner?: boolean;
-						},
-					) => {
-						const { taskUpdateHandler } =
-							await import("./cli/handlers/ant.js");
-						await taskUpdateHandler(id, opts);
-					},
-				);
+      taskCmd
+        .command('update <id>')
+        .description('Update a task')
+        .option('-l, --list <id>', 'Task list ID (defaults to "tasklist")')
+        .option('-s, --status <status>', `Set status (${TASK_STATUSES.join(', ')})`)
+        .option('--subject <text>', 'Update subject')
+        .option('-d, --description <text>', 'Update description')
+        .option('--owner <agentId>', 'Set owner')
+        .option('--clear-owner', 'Clear owner')
+        .action(
+          async (
+            id: string,
+            opts: {
+              list?: string;
+              status?: string;
+              subject?: string;
+              description?: string;
+              owner?: string;
+              clearOwner?: boolean;
+            },
+          ) => {
+            const { taskUpdateHandler } = await import('./cli/handlers/ant.js');
+            await taskUpdateHandler(id, opts);
+          },
+        );
 
-			taskCmd
-				.command("dir")
-				.description("Show the tasks directory path")
-				.option(
-					"-l, --list <id>",
-					'Task list ID (defaults to "tasklist")',
-				)
-				.action(async (opts: { list?: string }) => {
-					const { taskDirHandler } =
-						await import("./cli/handlers/ant.js");
-					await taskDirHandler(opts);
-				});
-		}
+      taskCmd
+        .command('dir')
+        .description('Show the tasks directory path')
+        .option('-l, --list <id>', 'Task list ID (defaults to "tasklist")')
+        .action(async (opts: { list?: string }) => {
+          const { taskDirHandler } = await import('./cli/handlers/ant.js');
+          await taskDirHandler(opts);
+        });
+    }
 
-		// claude completion <shell>
-		program
-			.command("completion <shell>", { hidden: true })
-			.description(
-				"Generate shell completion script (bash, zsh, or fish)",
-			)
-			.option(
-				"--output <file>",
-				"Write completion script directly to a file instead of stdout",
-			)
-			.action(async (shell: string, opts: { output?: string }) => {
-				const { completionHandler } =
-					await import("./cli/handlers/ant.js");
-				await completionHandler(shell, opts, program);
-			});
-	}
+    // claude completion <shell>
+    program
+      .command('completion <shell>', { hidden: true })
+      .description('Generate shell completion script (bash, zsh, or fish)')
+      .option('--output <file>', 'Write completion script directly to a file instead of stdout')
+      .action(async (shell: string, opts: { output?: string }) => {
+        const { completionHandler } = await import('./cli/handlers/ant.js');
+        await completionHandler(shell, opts, program);
+      });
+  }
 
-	profileCheckpoint("run_before_parse");
-	await program.parseAsync(process.argv);
-	profileCheckpoint("run_after_parse");
+  profileCheckpoint('run_before_parse');
+  await program.parseAsync(process.argv);
+  profileCheckpoint('run_after_parse');
 
-	// Record final checkpoint for total_time calculation
-	profileCheckpoint("main_after_run");
+  // Record final checkpoint for total_time calculation
+  profileCheckpoint('main_after_run');
 
-	// Log startup perf to Statsig (sampled) and output detailed report if enabled
-	profileReport();
+  // Log startup perf to Statsig (sampled) and output detailed report if enabled
+  profileReport();
 
-	return program;
+  return program;
 }
 
 async function logTenguInit({
-	hasInitialPrompt,
-	hasStdin,
-	verbose,
-	debug,
-	debugToStderr,
-	print,
-	outputFormat,
-	inputFormat,
-	numAllowedTools,
-	numDisallowedTools,
-	mcpClientCount,
-	worktreeEnabled,
-	skipWebFetchPreflight,
-	githubActionInputs,
-	dangerouslySkipPermissionsPassed,
-	permissionMode,
-	modeIsBypass,
-	allowDangerouslySkipPermissionsPassed,
-	systemPromptFlag,
-	appendSystemPromptFlag,
-	thinkingConfig,
-	assistantActivationPath,
+  hasInitialPrompt,
+  hasStdin,
+  verbose,
+  debug,
+  debugToStderr,
+  print,
+  outputFormat,
+  inputFormat,
+  numAllowedTools,
+  numDisallowedTools,
+  mcpClientCount,
+  worktreeEnabled,
+  skipWebFetchPreflight,
+  githubActionInputs,
+  dangerouslySkipPermissionsPassed,
+  permissionMode,
+  modeIsBypass,
+  allowDangerouslySkipPermissionsPassed,
+  systemPromptFlag,
+  appendSystemPromptFlag,
+  thinkingConfig,
+  assistantActivationPath,
 }: {
-	hasInitialPrompt: boolean;
-	hasStdin: boolean;
-	verbose: boolean;
-	debug: boolean;
-	debugToStderr: boolean;
-	print: boolean;
-	outputFormat: string;
-	inputFormat: string;
-	numAllowedTools: number;
-	numDisallowedTools: number;
-	mcpClientCount: number;
-	worktreeEnabled: boolean;
-	skipWebFetchPreflight: boolean | undefined;
-	githubActionInputs: string | undefined;
-	dangerouslySkipPermissionsPassed: boolean;
-	permissionMode: string;
-	modeIsBypass: boolean;
-	allowDangerouslySkipPermissionsPassed: boolean;
-	systemPromptFlag: "file" | "flag" | undefined;
-	appendSystemPromptFlag: "file" | "flag" | undefined;
-	thinkingConfig: ThinkingConfig;
-	assistantActivationPath: string | undefined;
+  hasInitialPrompt: boolean;
+  hasStdin: boolean;
+  verbose: boolean;
+  debug: boolean;
+  debugToStderr: boolean;
+  print: boolean;
+  outputFormat: string;
+  inputFormat: string;
+  numAllowedTools: number;
+  numDisallowedTools: number;
+  mcpClientCount: number;
+  worktreeEnabled: boolean;
+  skipWebFetchPreflight: boolean | undefined;
+  githubActionInputs: string | undefined;
+  dangerouslySkipPermissionsPassed: boolean;
+  permissionMode: string;
+  modeIsBypass: boolean;
+  allowDangerouslySkipPermissionsPassed: boolean;
+  systemPromptFlag: 'file' | 'flag' | undefined;
+  appendSystemPromptFlag: 'file' | 'flag' | undefined;
+  thinkingConfig: ThinkingConfig;
+  assistantActivationPath: string | undefined;
 }): Promise<void> {
-	try {
-		logEvent("tengu_init", {
-			entrypoint:
-				"claude" as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-			hasInitialPrompt,
-			hasStdin,
-			verbose,
-			debug,
-			debugToStderr,
-			print,
-			outputFormat:
-				outputFormat as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-			inputFormat:
-				inputFormat as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-			numAllowedTools,
-			numDisallowedTools,
-			mcpClientCount,
-			worktree: worktreeEnabled,
-			skipWebFetchPreflight,
-			...(githubActionInputs && {
-				githubActionInputs:
-					githubActionInputs as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-			}),
-			dangerouslySkipPermissionsPassed,
-			permissionMode:
-				permissionMode as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-			modeIsBypass,
-			inProtectedNamespace: isInProtectedNamespace(),
-			allowDangerouslySkipPermissionsPassed,
-			thinkingType:
-				thinkingConfig.type as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-			...(systemPromptFlag && {
-				systemPromptFlag:
-					systemPromptFlag as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-			}),
-			...(appendSystemPromptFlag && {
-				appendSystemPromptFlag:
-					appendSystemPromptFlag as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-			}),
-			is_simple: isBareMode() || undefined,
-			is_coordinator:
-				feature("COORDINATOR_MODE") &&
-				coordinatorModeModule?.isCoordinatorMode()
-					? true
-					: undefined,
-			...(assistantActivationPath && {
-				assistantActivationPath:
-					assistantActivationPath as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-			}),
-			autoUpdatesChannel: (getInitialSettings().autoUpdatesChannel ??
-				"latest") as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-			...(process.env.USER_TYPE === "ant"
-				? (() => {
-						const cwd = getCwd();
-						const gitRoot = findGitRoot(cwd);
-						const rp = gitRoot
-							? relative(gitRoot, cwd) || "."
-							: undefined;
-						return rp
-							? {
-									relativeProjectPath:
-										rp as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-								}
-							: {};
-					})()
-				: {}),
-		});
-	} catch (error) {
-		logError(error);
-	}
+  try {
+    logEvent('tengu_init', {
+      entrypoint: 'claude' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      hasInitialPrompt,
+      hasStdin,
+      verbose,
+      debug,
+      debugToStderr,
+      print,
+      outputFormat: outputFormat as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      inputFormat: inputFormat as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      numAllowedTools,
+      numDisallowedTools,
+      mcpClientCount,
+      worktree: worktreeEnabled,
+      skipWebFetchPreflight,
+      ...(githubActionInputs && {
+        githubActionInputs: githubActionInputs as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      }),
+      dangerouslySkipPermissionsPassed,
+      permissionMode: permissionMode as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      modeIsBypass,
+      inProtectedNamespace: isInProtectedNamespace(),
+      allowDangerouslySkipPermissionsPassed,
+      thinkingType: thinkingConfig.type as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      ...(systemPromptFlag && {
+        systemPromptFlag: systemPromptFlag as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      }),
+      ...(appendSystemPromptFlag && {
+        appendSystemPromptFlag: appendSystemPromptFlag as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      }),
+      is_simple: isBareMode() || undefined,
+      is_coordinator: feature('COORDINATOR_MODE') && coordinatorModeModule?.isCoordinatorMode() ? true : undefined,
+      ...(assistantActivationPath && {
+        assistantActivationPath: assistantActivationPath as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      }),
+      autoUpdatesChannel: (getInitialSettings().autoUpdatesChannel ??
+        'latest') as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      ...(process.env.USER_TYPE === 'ant'
+        ? (() => {
+            const cwd = getCwd();
+            const gitRoot = findGitRoot(cwd);
+            const rp = gitRoot ? relative(gitRoot, cwd) || '.' : undefined;
+            return rp
+              ? {
+                  relativeProjectPath: rp as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+                }
+              : {};
+          })()
+        : {}),
+    });
+  } catch (error) {
+    logError(error);
+  }
 }
 
 function maybeActivateProactive(options: unknown): void {
-	if (
-		(feature("PROACTIVE") || feature("KAIROS")) &&
-		((options as { proactive?: boolean }).proactive ||
-			isEnvTruthy(process.env.CLAUDE_CODE_PROACTIVE))
-	) {
-		// eslint-disable-next-line @typescript-eslint/no-require-imports
-		const proactiveModule = require("./proactive/index.js");
-		if (!proactiveModule.isProactiveActive()) {
-			proactiveModule.activateProactive("command");
-		}
-	}
+  if (
+    (feature('PROACTIVE') || feature('KAIROS')) &&
+    ((options as { proactive?: boolean }).proactive || isEnvTruthy(process.env.CLAUDE_CODE_PROACTIVE))
+  ) {
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
+    const proactiveModule = require('./proactive/index.js');
+    if (!proactiveModule.isProactiveActive()) {
+      proactiveModule.activateProactive('command');
+    }
+  }
 }
 
 function maybeActivateBrief(options: unknown): void {
-	if (!(feature("KAIROS") || feature("KAIROS_BRIEF"))) return;
-	const briefFlag = (options as { brief?: boolean }).brief;
-	const briefEnv = isEnvTruthy(process.env.CLAUDE_CODE_BRIEF);
-	if (!briefFlag && !briefEnv) return;
-	// --brief / CLAUDE_CODE_BRIEF are explicit opt-ins: check entitlement,
-	// then set userMsgOptIn to activate the tool + prompt section. The env
-	// var also grants entitlement (isBriefEntitled() reads it), so setting
-	// CLAUDE_CODE_BRIEF=1 alone force-enables for dev/testing — no GB gate
-	// needed. initialIsBriefOnly reads getUserMsgOptIn() directly.
-	// Conditional require: static import would leak the tool name string
-	// into external builds via BriefTool.ts → prompt.ts.
-	/* eslint-disable @typescript-eslint/no-require-imports */
-	const { isBriefEntitled } =
-		require("@claude-code-best/builtin-tools/tools/BriefTool/BriefTool.js") as typeof import("@claude-code-best/builtin-tools/tools/BriefTool/BriefTool.js");
-	/* eslint-enable @typescript-eslint/no-require-imports */
-	const entitled = isBriefEntitled();
-	if (entitled) {
-		setUserMsgOptIn(true);
-	}
-	// Fire unconditionally once intent is seen: enabled=false captures the
-	// "user tried but was gated" failure mode in Datadog.
-	logEvent("tengu_brief_mode_enabled", {
-		enabled: entitled,
-		gated: !entitled,
-		source: (briefEnv
-			? "env"
-			: "flag") as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-	});
+  if (!(feature('KAIROS') || feature('KAIROS_BRIEF'))) return;
+  const briefFlag = (options as { brief?: boolean }).brief;
+  const briefEnv = isEnvTruthy(process.env.CLAUDE_CODE_BRIEF);
+  if (!briefFlag && !briefEnv) return;
+  // --brief / CLAUDE_CODE_BRIEF are explicit opt-ins: check entitlement,
+  // then set userMsgOptIn to activate the tool + prompt section. The env
+  // var also grants entitlement (isBriefEntitled() reads it), so setting
+  // CLAUDE_CODE_BRIEF=1 alone force-enables for dev/testing — no GB gate
+  // needed. initialIsBriefOnly reads getUserMsgOptIn() directly.
+  // Conditional require: static import would leak the tool name string
+  // into external builds via BriefTool.ts → prompt.ts.
+  /* eslint-disable @typescript-eslint/no-require-imports */
+  const { isBriefEntitled } =
+    require('@claude-code-best/builtin-tools/tools/BriefTool/BriefTool.js') as typeof import('@claude-code-best/builtin-tools/tools/BriefTool/BriefTool.js');
+  /* eslint-enable @typescript-eslint/no-require-imports */
+  const entitled = isBriefEntitled();
+  if (entitled) {
+    setUserMsgOptIn(true);
+  }
+  // Fire unconditionally once intent is seen: enabled=false captures the
+  // "user tried but was gated" failure mode in Datadog.
+  logEvent('tengu_brief_mode_enabled', {
+    enabled: entitled,
+    gated: !entitled,
+    source: (briefEnv ? 'env' : 'flag') as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+  });
 }
 
 function resetCursor() {
-	const terminal = process.stderr.isTTY
-		? process.stderr
-		: process.stdout.isTTY
-			? process.stdout
-			: undefined;
-	terminal?.write(SHOW_CURSOR);
+  const terminal = process.stderr.isTTY ? process.stderr : process.stdout.isTTY ? process.stdout : undefined;
+  terminal?.write(SHOW_CURSOR);
 }
 
 type TeammateOptions = {
-	agentId?: string;
-	agentName?: string;
-	teamName?: string;
-	agentColor?: string;
-	planModeRequired?: boolean;
-	parentSessionId?: string;
-	teammateMode?: "auto" | "tmux" | "in-process";
-	agentType?: string;
+  agentId?: string;
+  agentName?: string;
+  teamName?: string;
+  agentColor?: string;
+  planModeRequired?: boolean;
+  parentSessionId?: string;
+  teammateMode?: 'auto' | 'tmux' | 'in-process';
+  agentType?: string;
 };
 
 function extractTeammateOptions(options: unknown): TeammateOptions {
-	if (typeof options !== "object" || options === null) {
-		return {};
-	}
-	const opts = options as Record<string, unknown>;
-	const teammateMode = opts.teammateMode;
-	return {
-		agentId: typeof opts.agentId === "string" ? opts.agentId : undefined,
-		agentName:
-			typeof opts.agentName === "string" ? opts.agentName : undefined,
-		teamName: typeof opts.teamName === "string" ? opts.teamName : undefined,
-		agentColor:
-			typeof opts.agentColor === "string" ? opts.agentColor : undefined,
-		planModeRequired:
-			typeof opts.planModeRequired === "boolean"
-				? opts.planModeRequired
-				: undefined,
-		parentSessionId:
-			typeof opts.parentSessionId === "string"
-				? opts.parentSessionId
-				: undefined,
-		teammateMode:
-			teammateMode === "auto" ||
-			teammateMode === "tmux" ||
-			teammateMode === "in-process"
-				? teammateMode
-				: undefined,
-		agentType:
-			typeof opts.agentType === "string" ? opts.agentType : undefined,
-	};
+  if (typeof options !== 'object' || options === null) {
+    return {};
+  }
+  const opts = options as Record<string, unknown>;
+  const teammateMode = opts.teammateMode;
+  return {
+    agentId: typeof opts.agentId === 'string' ? opts.agentId : undefined,
+    agentName: typeof opts.agentName === 'string' ? opts.agentName : undefined,
+    teamName: typeof opts.teamName === 'string' ? opts.teamName : undefined,
+    agentColor: typeof opts.agentColor === 'string' ? opts.agentColor : undefined,
+    planModeRequired: typeof opts.planModeRequired === 'boolean' ? opts.planModeRequired : undefined,
+    parentSessionId: typeof opts.parentSessionId === 'string' ? opts.parentSessionId : undefined,
+    teammateMode:
+      teammateMode === 'auto' || teammateMode === 'tmux' || teammateMode === 'in-process' ? teammateMode : undefined,
+    agentType: typeof opts.agentType === 'string' ? opts.agentType : undefined,
+  };
 }
diff --git a/src/memdir/memoryShapeTelemetry.ts b/src/memdir/memoryShapeTelemetry.ts
index 60c31ac8d..9c58d0e02 100644
--- a/src/memdir/memoryShapeTelemetry.ts
+++ b/src/memdir/memoryShapeTelemetry.ts
@@ -1,7 +1,15 @@
 // Auto-generated stub — replace with real implementation
-import type { MemoryHeader } from './memoryScan.js';
-import type { MemoryScope } from '../utils/memoryFileDetection.js';
+import type { MemoryHeader } from './memoryScan.js'
+import type { MemoryScope } from '../utils/memoryFileDetection.js'
 
-export {};
-export const logMemoryRecallShape: (memories: MemoryHeader[], selected: MemoryHeader[]) => void = (() => {});
-export const logMemoryWriteShape: (toolName: string, toolInput: Record<string, unknown>, filePath: string, scope: MemoryScope) => void = (() => {});
+export {}
+export const logMemoryRecallShape: (
+  memories: MemoryHeader[],
+  selected: MemoryHeader[],
+) => void = () => {}
+export const logMemoryWriteShape: (
+  toolName: string,
+  toolInput: Record<string, unknown>,
+  filePath: string,
+  scope: MemoryScope,
+) => void = () => {}
diff --git a/src/migrations/src/services/analytics/index.ts b/src/migrations/src/services/analytics/index.ts
index 60402f927..c095b5a65 100644
--- a/src/migrations/src/services/analytics/index.ts
+++ b/src/migrations/src/services/analytics/index.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type logEvent = any;
+export type logEvent = any
diff --git a/src/moreright/useMoreRight.tsx b/src/moreright/useMoreRight.tsx
index fb605d9e3..14d58e77a 100644
--- a/src/moreright/useMoreRight.tsx
+++ b/src/moreright/useMoreRight.tsx
@@ -5,22 +5,22 @@
 // would resolve to scripts/external-stubs/src/types/ (doesn't exist).
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-type M = any
+type M = any;
 
 export function useMoreRight(_args: {
-  enabled: boolean
-  setMessages: (action: M[] | ((prev: M[]) => M[])) => void
-  inputValue: string
-  setInputValue: (s: string) => void
-  setToolJSX: (args: M) => void
+  enabled: boolean;
+  setMessages: (action: M[] | ((prev: M[]) => M[])) => void;
+  inputValue: string;
+  setInputValue: (s: string) => void;
+  setToolJSX: (args: M) => void;
 }): {
-  onBeforeQuery: (input: string, all: M[], n: number) => Promise<boolean>
-  onTurnComplete: (all: M[], aborted: boolean) => Promise<void>
-  render: () => null
+  onBeforeQuery: (input: string, all: M[], n: number) => Promise<boolean>;
+  onTurnComplete: (all: M[], aborted: boolean) => Promise<void>;
+  render: () => null;
 } {
   return {
     onBeforeQuery: async () => true,
     onTurnComplete: async () => {},
     render: () => null,
-  }
+  };
 }
diff --git a/src/native-ts/file-index/index.ts b/src/native-ts/file-index/index.ts
index 7eb9f4fa1..b407ce286 100644
--- a/src/native-ts/file-index/index.ts
+++ b/src/native-ts/file-index/index.ts
@@ -48,6 +48,7 @@ export class FileIndex {
   private topLevelCache: SearchResult[] | null = null
   // During async build, tracks how many paths have bitmap/lowerPath filled.
   // search() uses this to search the ready prefix while build continues.
+  // biome-ignore lint/correctness/noUnusedPrivateClassMembers: used via destructuring in search()
   private readyCount = 0
 
   /**
@@ -205,7 +206,7 @@ export class FileIndex {
 
     const { paths, lowerPaths, charBits, pathLens, readyCount } = this
 
-    outer: for (let i = 0; i < readyCount; i++) {
+    for (let i = 0; i < readyCount; i++) {
       // O(1) bitmap reject: path must contain every letter in the needle
       if ((charBits[i]! & needleBitmap) !== needleBitmap) continue
 
@@ -241,7 +242,7 @@ export class FileIndex {
           prevCode === 45 || // -
           prevCode === 95 || // _
           prevCode === 46 || // .
-          prevCode === 32    // space
+          prevCode === 32 // space
         ) {
           startPositions[startCount++] = bp
         }
@@ -260,7 +261,10 @@ export class FileIndex {
         let matched = true
         for (let j = 1; j < nLen; j++) {
           const pos = haystack.indexOf(needleChars[j]!, prev + 1)
-          if (pos === -1) { matched = false; break }
+          if (pos === -1) {
+            matched = false
+            break
+          }
           posBuf[j] = pos
           const gap = pos - prev - 1
           if (gap === 0) consecBonus += BONUS_CONSECUTIVE
diff --git a/src/native-ts/yoga-layout/index.ts b/src/native-ts/yoga-layout/index.ts
index 49b9602be..35e57cf8c 100644
--- a/src/native-ts/yoga-layout/index.ts
+++ b/src/native-ts/yoga-layout/index.ts
@@ -111,6 +111,7 @@ function isDefined(n: number): boolean {
 
 // NaN-safe equality for layout-cache input comparison
 function sameFloat(a: number, b: number): boolean {
+  // biome-ignore lint/suspicious/noSelfCompare: intentional NaN detection (a !== a is true only for NaN)
   return a === b || (a !== a && b !== b)
 }
 
@@ -2372,12 +2373,14 @@ function boundAxis(
     if (v > maxV.value) v = maxV.value
   } else if (maxU === 2) {
     const m = (maxV.value * owner) / 100
+    // biome-ignore lint/suspicious/noSelfCompare: intentional NaN guard (m === m is false only for NaN)
     if (m === m && v > m) v = m
   }
   if (minU === 1) {
     if (v < minV.value) v = minV.value
   } else if (minU === 2) {
     const m = (minV.value * owner) / 100
+    // biome-ignore lint/suspicious/noSelfCompare: intentional NaN guard (m === m is false only for NaN)
     if (m === m && v < m) v = m
   }
   return v
diff --git a/src/query.ts b/src/query.ts
index 8bfca6111..a83d68ecb 100644
--- a/src/query.ts
+++ b/src/query.ts
@@ -111,7 +111,11 @@ import {
 } from './bootstrap/state.js'
 import { createBudgetTracker, checkTokenBudget } from './query/tokenBudget.js'
 import { count } from './utils/array.js'
-import { createTrace, endTrace, isLangfuseEnabled } from './services/langfuse/index.js'
+import {
+  createTrace,
+  endTrace,
+  isLangfuseEnabled,
+} from './services/langfuse/index.js'
 import { getAPIProvider } from './utils/model/providers.js'
 
 /* eslint-disable @typescript-eslint/no-require-imports */
@@ -129,7 +133,11 @@ function* yieldMissingToolResultBlocks(
 ) {
   for (const assistantMessage of assistantMessages) {
     // Extract all tool use blocks from this assistant message
-    const toolUseBlocks = (Array.isArray(assistantMessage.message?.content) ? assistantMessage.message.content : []).filter(
+    const toolUseBlocks = (
+      Array.isArray(assistantMessage.message?.content)
+        ? assistantMessage.message.content
+        : []
+    ).filter(
       (content: { type: string }) => content.type === 'tool_use',
     ) as ToolUseBlock[]
 
@@ -235,8 +243,9 @@ export async function* query(
   // When called as a sub-agent, langfuseTrace is already set by runAgent()
   // — reuse it instead of creating an independent trace.
   const ownsTrace = !params.toolUseContext.langfuseTrace
-  const langfuseTrace = params.toolUseContext.langfuseTrace
-    ?? (isLangfuseEnabled()
+  const langfuseTrace =
+    params.toolUseContext.langfuseTrace ??
+    (isLangfuseEnabled()
       ? createTrace({
           sessionId: getSessionId(),
           model: params.toolUseContext.options.mainLoopModel,
@@ -274,7 +283,6 @@ export async function* query(
   for (const uuid of consumedCommandUuids) {
     notifyCommandLifecycle(uuid, 'completed')
   }
-  // biome-ignore lint/style/noNonNullAssertion: terminal is always assigned when queryLoop returns normally
   return terminal!
 }
 
@@ -328,7 +336,7 @@ async function* queryLoop(
   // multiple compacts: each subtracts the final context at that compact's
   // trigger point. Loop-local (not on State) to avoid touching the 7 continue
   // sites.
-  let taskBudgetRemaining: number | undefined = undefined
+  let taskBudgetRemaining: number | undefined
 
   // Snapshot immutable env/statsig/session state once at entry. See QueryConfig
   // for what's included and why feature() gates are intentionally excluded.
@@ -788,7 +796,14 @@ async function* queryLoop(
             let yieldMessage: typeof message = message
             if (message.type === 'assistant') {
               const assistantMsg = message as AssistantMessage
-              const contentArr = Array.isArray(assistantMsg.message?.content) ? assistantMsg.message.content as unknown as Array<{ type: string; input?: unknown; name?: string; [key: string]: unknown }> : []
+              const contentArr = Array.isArray(assistantMsg.message?.content)
+                ? (assistantMsg.message.content as unknown as Array<{
+                    type: string
+                    input?: unknown
+                    name?: string
+                    [key: string]: unknown
+                  }>)
+                : []
               let clonedContent: typeof contentArr | undefined
               for (let i = 0; i < contentArr.length; i++) {
                 const block = contentArr[i]!
@@ -824,7 +839,10 @@ async function* queryLoop(
               if (clonedContent) {
                 yieldMessage = {
                   ...message,
-                  message: { ...(assistantMsg.message ?? {}), content: clonedContent },
+                  message: {
+                    ...(assistantMsg.message ?? {}),
+                    content: clonedContent,
+                  },
                 } as typeof message
               }
             }
@@ -870,7 +888,11 @@ async function* queryLoop(
               const assistantMessage = message as AssistantMessage
               assistantMessages.push(assistantMessage)
 
-              const msgToolUseBlocks = (Array.isArray(assistantMessage.message?.content) ? assistantMessage.message.content : []).filter(
+              const msgToolUseBlocks = (
+                Array.isArray(assistantMessage.message?.content)
+                  ? assistantMessage.message.content
+                  : []
+              ).filter(
                 (content: { type: string }) => content.type === 'tool_use',
               ) as ToolUseBlock[]
               if (msgToolUseBlocks.length > 0) {
@@ -1003,7 +1025,10 @@ async function* queryLoop(
       logEvent('tengu_query_error', {
         assistantMessages: assistantMessages.length,
         toolUses: assistantMessages.flatMap(_ =>
-          (Array.isArray(_.message?.content) ? _.message.content as Array<{ type: string }> : []).filter(content => content.type === 'tool_use'),
+          (Array.isArray(_.message?.content)
+            ? (_.message.content as Array<{ type: string }>)
+            : []
+          ).filter(content => content.type === 'tool_use'),
         ).length,
 
         queryChainId: queryChainIdForAnalytics,
@@ -1406,7 +1431,6 @@ async function* queryLoop(
 
     queryCheckpoint('query_tool_execution_start')
 
-
     if (streamingToolExecutor) {
       logEvent('tengu_streaming_tool_execution_used', {
         tool_count: toolUseBlocks.length,
@@ -1466,9 +1490,14 @@ async function* queryLoop(
       const lastAssistantMessage = assistantMessages.at(-1)
       let lastAssistantText: string | undefined
       if (lastAssistantMessage) {
-        const textBlocks = (Array.isArray(lastAssistantMessage.message?.content) ? lastAssistantMessage.message.content as Array<{ type: string; text?: string }> : []).filter(
-          block => block.type === 'text',
-        )
+        const textBlocks = (
+          Array.isArray(lastAssistantMessage.message?.content)
+            ? (lastAssistantMessage.message.content as Array<{
+                type: string
+                text?: string
+              }>)
+            : []
+        ).filter(block => block.type === 'text')
         if (textBlocks.length > 0) {
           const lastTextBlock = textBlocks.at(-1)
           if (lastTextBlock && 'text' in lastTextBlock) {
@@ -1657,7 +1686,6 @@ async function* queryLoop(
       pendingMemoryPrefetch.consumedOnIteration = turnCount - 1
     }
 
-
     // Inject prefetched skill discovery. collectSkillDiscoveryPrefetch emits
     // hidden_by_main_turn — true when the prefetch resolved before this point
     // (should be >98% at AKI@250ms / Haiku@573ms vs turn durations of 2-30s).
diff --git a/src/query/stopHooks.ts b/src/query/stopHooks.ts
index 73aa62df6..a3b354c9a 100644
--- a/src/query/stopHooks.ts
+++ b/src/query/stopHooks.ts
@@ -156,7 +156,9 @@ export async function* handleStopHooks(
       // but before gracefulShutdownSync (see drainPendingExtraction).
       void extractMemoriesModule!.executeExtractMemories(
         stopHookContext,
-        toolUseContext.appendSystemMessage as ((msg: import('../types/message.js').SystemMessage) => void) | undefined,
+        toolUseContext.appendSystemMessage as
+          | ((msg: import('../types/message.js').SystemMessage) => void)
+          | undefined,
       )
     }
     if (!toolUseContext.agentId && !poorMode) {
@@ -231,7 +233,8 @@ export async function* handleStopHooks(
           ) {
             if (attachment.type === 'hook_non_blocking_error') {
               hookErrors.push(
-                (attachment.stderr as string) || `Exit code ${attachment.exitCode}`,
+                (attachment.stderr as string) ||
+                  `Exit code ${attachment.exitCode}`,
               )
               // Non-blocking errors always have output
               hasOutput = true
diff --git a/src/query/transitions.ts b/src/query/transitions.ts
index f8fe51551..38c269eda 100644
--- a/src/query/transitions.ts
+++ b/src/query/transitions.ts
@@ -1,3 +1,3 @@
 // Auto-generated stub — replace with real implementation
-export type Terminal = any;
-export type Continue = any;
+export type Terminal = any
+export type Continue = any
diff --git a/src/remote/sdkMessageAdapter.ts b/src/remote/sdkMessageAdapter.ts
index 60390adfb..bcde76233 100644
--- a/src/remote/sdkMessageAdapter.ts
+++ b/src/remote/sdkMessageAdapter.ts
@@ -172,7 +172,10 @@ export function convertSDKMessage(
 ): ConvertedMessage {
   switch (msg.type) {
     case 'assistant':
-      return { type: 'message', message: convertAssistantMessage(msg as SDKAssistantMessage) }
+      return {
+        type: 'message',
+        message: convertAssistantMessage(msg as SDKAssistantMessage),
+      }
 
     case 'user': {
       const userMsg = msg as SDKUserMessage
@@ -217,13 +220,19 @@ export function convertSDKMessage(
     }
 
     case 'stream_event':
-      return { type: 'stream_event', event: convertStreamEvent(msg as SDKPartialAssistantMessage) }
+      return {
+        type: 'stream_event',
+        event: convertStreamEvent(msg as SDKPartialAssistantMessage),
+      }
 
     case 'result':
       // Only show result messages for errors. Success results are noise
       // in multi-turn sessions (isLoading=false is sufficient signal).
       if ((msg as SDKResultMessage).subtype !== 'success') {
-        return { type: 'message', message: convertResultMessage(msg as SDKResultMessage) }
+        return {
+          type: 'message',
+          message: convertResultMessage(msg as SDKResultMessage),
+        }
       }
       return { type: 'ignored' }
 
@@ -241,7 +250,9 @@ export function convertSDKMessage(
       if (sysMsg.subtype === 'compact_boundary') {
         return {
           type: 'message',
-          message: convertCompactBoundaryMessage(msg as SDKCompactBoundaryMessage),
+          message: convertCompactBoundaryMessage(
+            msg as SDKCompactBoundaryMessage,
+          ),
         }
       }
       // hook_response and other subtypes
@@ -252,7 +263,10 @@ export function convertSDKMessage(
     }
 
     case 'tool_progress':
-      return { type: 'message', message: convertToolProgressMessage(msg as SDKToolProgressMessage) }
+      return {
+        type: 'message',
+        message: convertToolProgressMessage(msg as SDKToolProgressMessage),
+      }
 
     case 'auth_status':
       // Auth status is handled separately, not converted to a display message
diff --git a/src/replLauncher.tsx b/src/replLauncher.tsx
index 91550a3bd..0d27afe12 100644
--- a/src/replLauncher.tsx
+++ b/src/replLauncher.tsx
@@ -1,15 +1,15 @@
-import React from 'react'
-import type { StatsStore } from './context/stats.js'
-import type { Root } from '@anthropic/ink'
-import type { Props as REPLProps } from './screens/REPL.js'
-import type { AppState } from './state/AppStateStore.js'
-import type { FpsMetrics } from './utils/fpsTracker.js'
+import React from 'react';
+import type { StatsStore } from './context/stats.js';
+import type { Root } from '@anthropic/ink';
+import type { Props as REPLProps } from './screens/REPL.js';
+import type { AppState } from './state/AppStateStore.js';
+import type { FpsMetrics } from './utils/fpsTracker.js';
 
 type AppWrapperProps = {
-  getFpsMetrics: () => FpsMetrics | undefined
-  stats?: StatsStore
-  initialState: AppState
-}
+  getFpsMetrics: () => FpsMetrics | undefined;
+  stats?: StatsStore;
+  initialState: AppState;
+};
 
 export async function launchRepl(
   root: Root,
@@ -17,12 +17,12 @@ export async function launchRepl(
   replProps: REPLProps,
   renderAndRun: (root: Root, element: React.ReactNode) => Promise<void>,
 ): Promise<void> {
-  const { App } = await import('./components/App.js')
-  const { REPL } = await import('./screens/REPL.js')
+  const { App } = await import('./components/App.js');
+  const { REPL } = await import('./screens/REPL.js');
   await renderAndRun(
     root,
     <App {...appProps}>
       <REPL {...replProps} />
     </App>,
-  )
+  );
 }
diff --git a/src/schemas/hooks.ts b/src/schemas/hooks.ts
index 280bcb1c3..1ccc0dc6f 100644
--- a/src/schemas/hooks.ts
+++ b/src/schemas/hooks.ts
@@ -103,12 +103,10 @@ function buildHookSchemas() {
       .positive()
       .optional()
       .describe('Timeout in seconds for this specific request'),
-    headers: z
-      .record(z.string(), z.string())
-      .optional()
-      .describe(
-        'Additional headers to include in the request. Values may reference environment variables using $VAR_NAME or ${VAR_NAME} syntax (e.g., "Authorization": "Bearer $MY_TOKEN"). Only variables listed in allowedEnvVars will be interpolated.',
-      ),
+    headers: z.record(z.string(), z.string()).optional().describe(
+      // biome-ignore lint/suspicious/noTemplateCurlyInString: ${VAR_NAME} is documentation for the config syntax, not a JS template literal
+      'Additional headers to include in the request. Values may reference environment variables using $VAR_NAME or ${VAR_NAME} syntax (e.g., "Authorization": "Bearer $MY_TOKEN"). Only variables listed in allowedEnvVars will be interpolated.',
+    ),
     allowedEnvVars: z
       .array(z.string())
       .optional()
diff --git a/src/schemas/src/entrypoints/agentSdkTypes.ts b/src/schemas/src/entrypoints/agentSdkTypes.ts
index 264ee1cdd..ef42308dc 100644
--- a/src/schemas/src/entrypoints/agentSdkTypes.ts
+++ b/src/schemas/src/entrypoints/agentSdkTypes.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type HOOK_EVENTS = any;
-export type HookEvent = any;
+export type HOOK_EVENTS = any
+export type HookEvent = any
diff --git a/src/screens/Doctor.tsx b/src/screens/Doctor.tsx
index 6ba73f2a4..e6a9f8760 100644
--- a/src/screens/Doctor.tsx
+++ b/src/screens/Doctor.tsx
@@ -1,140 +1,104 @@
-import figures from 'figures'
-import { join } from 'path'
-import React, {
-  Suspense,
-  use,
-  useCallback,
-  useEffect,
-  useMemo,
-  useState,
-} from 'react'
-import { KeybindingWarnings } from 'src/components/KeybindingWarnings.js'
-import { McpParsingWarnings } from 'src/components/mcp/McpParsingWarnings.js'
-import { getModelMaxOutputTokens } from 'src/utils/context.js'
-import { getClaudeConfigHomeDir } from 'src/utils/envUtils.js'
-import type { SettingSource } from 'src/utils/settings/constants.js'
-import { getOriginalCwd } from '../bootstrap/state.js'
-import type { CommandResultDisplay } from '../commands.js'
-import { Pane } from '@anthropic/ink'
-import { PressEnterToContinue } from '../components/PressEnterToContinue.js'
-import { SandboxDoctorSection } from '../components/sandbox/SandboxDoctorSection.js'
-import { ValidationErrorsList } from '../components/ValidationErrorsList.js'
-import { useSettingsErrors } from '../hooks/notifs/useSettingsErrors.js'
-import { useExitOnCtrlCDWithKeybindings } from '../hooks/useExitOnCtrlCDWithKeybindings.js'
-import { Box, Text } from '@anthropic/ink'
-import { useKeybindings } from '../keybindings/useKeybinding.js'
-import { useAppState } from '../state/AppState.js'
-import { getPluginErrorMessage } from '../types/plugin.js'
-import {
-  getGcsDistTags,
-  getNpmDistTags,
-  type NpmDistTags,
-} from '../utils/autoUpdater.js'
-import {
-  type ContextWarnings,
-  checkContextWarnings,
-} from '../utils/doctorContextWarnings.js'
-import {
-  type DiagnosticInfo,
-  getDoctorDiagnostic,
-} from '../utils/doctorDiagnostic.js'
-import { validateBoundedIntEnvVar } from '../utils/envValidation.js'
-import { pathExists } from '../utils/file.js'
+import figures from 'figures';
+import { join } from 'path';
+import React, { Suspense, use, useCallback, useEffect, useMemo, useState } from 'react';
+import { KeybindingWarnings } from 'src/components/KeybindingWarnings.js';
+import { McpParsingWarnings } from 'src/components/mcp/McpParsingWarnings.js';
+import { getModelMaxOutputTokens } from 'src/utils/context.js';
+import { getClaudeConfigHomeDir } from 'src/utils/envUtils.js';
+import type { SettingSource } from 'src/utils/settings/constants.js';
+import { getOriginalCwd } from '../bootstrap/state.js';
+import type { CommandResultDisplay } from '../commands.js';
+import { Pane } from '@anthropic/ink';
+import { PressEnterToContinue } from '../components/PressEnterToContinue.js';
+import { SandboxDoctorSection } from '../components/sandbox/SandboxDoctorSection.js';
+import { ValidationErrorsList } from '../components/ValidationErrorsList.js';
+import { useSettingsErrors } from '../hooks/notifs/useSettingsErrors.js';
+import { useExitOnCtrlCDWithKeybindings } from '../hooks/useExitOnCtrlCDWithKeybindings.js';
+import { Box, Text } from '@anthropic/ink';
+import { useKeybindings } from '../keybindings/useKeybinding.js';
+import { useAppState } from '../state/AppState.js';
+import { getPluginErrorMessage } from '../types/plugin.js';
+import { getGcsDistTags, getNpmDistTags, type NpmDistTags } from '../utils/autoUpdater.js';
+import { type ContextWarnings, checkContextWarnings } from '../utils/doctorContextWarnings.js';
+import { type DiagnosticInfo, getDoctorDiagnostic } from '../utils/doctorDiagnostic.js';
+import { validateBoundedIntEnvVar } from '../utils/envValidation.js';
+import { pathExists } from '../utils/file.js';
 import {
   cleanupStaleLocks,
   getAllLockInfo,
   isPidBasedLockingEnabled,
   type LockInfo,
-} from '../utils/nativeInstaller/pidLock.js'
-import { getInitialSettings } from '../utils/settings/settings.js'
-import {
-  BASH_MAX_OUTPUT_DEFAULT,
-  BASH_MAX_OUTPUT_UPPER_LIMIT,
-} from '../utils/shell/outputLimits.js'
-import {
-  TASK_MAX_OUTPUT_DEFAULT,
-  TASK_MAX_OUTPUT_UPPER_LIMIT,
-} from '../utils/task/outputFormatting.js'
-import { getXDGStateHome } from '../utils/xdg.js'
+} from '../utils/nativeInstaller/pidLock.js';
+import { getInitialSettings } from '../utils/settings/settings.js';
+import { BASH_MAX_OUTPUT_DEFAULT, BASH_MAX_OUTPUT_UPPER_LIMIT } from '../utils/shell/outputLimits.js';
+import { TASK_MAX_OUTPUT_DEFAULT, TASK_MAX_OUTPUT_UPPER_LIMIT } from '../utils/task/outputFormatting.js';
+import { getXDGStateHome } from '../utils/xdg.js';
 
 type Props = {
-  onDone: (
-    result?: string,
-    options?: { display?: CommandResultDisplay },
-  ) => void
-}
+  onDone: (result?: string, options?: { display?: CommandResultDisplay }) => void;
+};
 
 type AgentInfo = {
   activeAgents: Array<{
-    agentType: string
-    source: SettingSource | 'built-in' | 'plugin'
-  }>
-  userAgentsDir: string
-  projectAgentsDir: string
-  userDirExists: boolean
-  projectDirExists: boolean
-  failedFiles?: Array<{ path: string; error: string }>
-}
+    agentType: string;
+    source: SettingSource | 'built-in' | 'plugin';
+  }>;
+  userAgentsDir: string;
+  projectAgentsDir: string;
+  userDirExists: boolean;
+  projectDirExists: boolean;
+  failedFiles?: Array<{ path: string; error: string }>;
+};
 
 type VersionLockInfo = {
-  enabled: boolean
-  locks: LockInfo[]
-  locksDir: string
-  staleLocksCleaned: number
-}
+  enabled: boolean;
+  locks: LockInfo[];
+  locksDir: string;
+  staleLocksCleaned: number;
+};
 
-function DistTagsDisplay({
-  promise,
-}: {
-  promise: Promise<NpmDistTags>
-}): React.ReactNode {
-  const distTags = use(promise)
+function DistTagsDisplay({ promise }: { promise: Promise<NpmDistTags> }): React.ReactNode {
+  const distTags = use(promise);
   if (!distTags.latest) {
-    return <Text dimColor>└ Failed to fetch versions</Text>
+    return <Text dimColor>└ Failed to fetch versions</Text>;
   }
   return (
     <>
       {distTags.stable && <Text>└ Stable version: {distTags.stable}</Text>}
       <Text>└ Latest version: {distTags.latest}</Text>
     </>
-  )
+  );
 }
 
 export function Doctor({ onDone }: Props): React.ReactNode {
-  const agentDefinitions = useAppState(s => s.agentDefinitions)
-  const mcpTools = useAppState(s => s.mcp.tools)
-  const toolPermissionContext = useAppState(s => s.toolPermissionContext)
-  const pluginsErrors = useAppState(s => s.plugins.errors)
-  useExitOnCtrlCDWithKeybindings()
+  const agentDefinitions = useAppState(s => s.agentDefinitions);
+  const mcpTools = useAppState(s => s.mcp.tools);
+  const toolPermissionContext = useAppState(s => s.toolPermissionContext);
+  const pluginsErrors = useAppState(s => s.plugins.errors);
+  useExitOnCtrlCDWithKeybindings();
 
   const tools = useMemo(() => {
-    return mcpTools || []
-  }, [mcpTools])
+    return mcpTools || [];
+  }, [mcpTools]);
 
-  const [diagnostic, setDiagnostic] = useState<DiagnosticInfo | null>(null)
-  const [agentInfo, setAgentInfo] = useState<AgentInfo | null>(null)
-  const [contextWarnings, setContextWarnings] =
-    useState<ContextWarnings | null>(null)
-  const [versionLockInfo, setVersionLockInfo] =
-    useState<VersionLockInfo | null>(null)
-  const validationErrors = useSettingsErrors()
+  const [diagnostic, setDiagnostic] = useState<DiagnosticInfo | null>(null);
+  const [agentInfo, setAgentInfo] = useState<AgentInfo | null>(null);
+  const [contextWarnings, setContextWarnings] = useState<ContextWarnings | null>(null);
+  const [versionLockInfo, setVersionLockInfo] = useState<VersionLockInfo | null>(null);
+  const validationErrors = useSettingsErrors();
 
   // Create promise once for dist-tags fetch (depends on diagnostic)
   const distTagsPromise = useMemo(
     () =>
       getDoctorDiagnostic().then(diag => {
-        const fetchDistTags =
-          diag.installationType === 'native' ? getGcsDistTags : getNpmDistTags
-        return fetchDistTags().catch(() => ({ latest: null, stable: null }))
+        const fetchDistTags = diag.installationType === 'native' ? getGcsDistTags : getNpmDistTags;
+        return fetchDistTags().catch(() => ({ latest: null, stable: null }));
       }),
     [],
-  )
-  const autoUpdatesChannel =
-    getInitialSettings()?.autoUpdatesChannel ?? 'latest'
+  );
+  const autoUpdatesChannel = getInitialSettings()?.autoUpdatesChannel ?? 'latest';
 
-  const errorsExcludingMcp = validationErrors.filter(
-    error => error.mcpErrorMetadata === undefined,
-  )
+  const errorsExcludingMcp = validationErrors.filter(error => error.mcpErrorMetadata === undefined);
 
   const envValidationErrors = useMemo(() => {
     const envVars = [
@@ -153,34 +117,29 @@ export function Doctor({ onDone }: Props): React.ReactNode {
         // Check for values against the latest supported model
         ...getModelMaxOutputTokens('claude-opus-4-6'),
       },
-    ]
+    ];
     return envVars
       .map(v => {
-        const value = process.env[v.name]
-        const result = validateBoundedIntEnvVar(
-          v.name,
-          value,
-          v.default,
-          v.upperLimit,
-        )
-        return { name: v.name, ...result }
+        const value = process.env[v.name];
+        const result = validateBoundedIntEnvVar(v.name, value, v.default, v.upperLimit);
+        return { name: v.name, ...result };
       })
-      .filter(v => v.status !== 'valid')
-  }, [])
+      .filter(v => v.status !== 'valid');
+  }, []);
 
   useEffect(() => {
-    void getDoctorDiagnostic().then(setDiagnostic)
+    void getDoctorDiagnostic().then(setDiagnostic);
 
     void (async () => {
-      const userAgentsDir = join(getClaudeConfigHomeDir(), 'agents')
-      const projectAgentsDir = join(getOriginalCwd(), '.claude', 'agents')
+      const userAgentsDir = join(getClaudeConfigHomeDir(), 'agents');
+      const projectAgentsDir = join(getOriginalCwd(), '.claude', 'agents');
 
-      const { activeAgents, allAgents, failedFiles } = agentDefinitions
+      const { activeAgents, allAgents, failedFiles } = agentDefinitions;
 
       const [userDirExists, projectDirExists] = await Promise.all([
         pathExists(userAgentsDir),
         pathExists(projectAgentsDir),
-      ])
+      ]);
 
       const agentInfoData = {
         activeAgents: activeAgents.map(a => ({
@@ -192,8 +151,8 @@ export function Doctor({ onDone }: Props): React.ReactNode {
         userDirExists,
         projectDirExists,
         failedFiles,
-      }
-      setAgentInfo(agentInfoData)
+      };
+      setAgentInfo(agentInfoData);
 
       const warnings = await checkContextWarnings(
         tools,
@@ -203,34 +162,34 @@ export function Doctor({ onDone }: Props): React.ReactNode {
           failedFiles,
         },
         async () => toolPermissionContext,
-      )
-      setContextWarnings(warnings)
+      );
+      setContextWarnings(warnings);
 
       // Fetch version lock info if PID-based locking is enabled
       if (isPidBasedLockingEnabled()) {
-        const locksDir = join(getXDGStateHome(), 'claude', 'locks')
-        const staleLocksCleaned = cleanupStaleLocks(locksDir)
-        const locks = getAllLockInfo(locksDir)
+        const locksDir = join(getXDGStateHome(), 'claude', 'locks');
+        const staleLocksCleaned = cleanupStaleLocks(locksDir);
+        const locks = getAllLockInfo(locksDir);
         setVersionLockInfo({
           enabled: true,
           locks,
           locksDir,
           staleLocksCleaned,
-        })
+        });
       } else {
         setVersionLockInfo({
           enabled: false,
           locks: [],
           locksDir: '',
           staleLocksCleaned: 0,
-        })
+        });
       }
-    })()
-  }, [toolPermissionContext, tools, agentDefinitions])
+    })();
+  }, [toolPermissionContext, tools, agentDefinitions]);
 
   const handleDismiss = useCallback(() => {
-    onDone('Claude Code diagnostics dismissed', { display: 'system' })
-  }, [onDone])
+    onDone('Claude Code diagnostics dismissed', { display: 'system' });
+  }, [onDone]);
 
   // Handle dismiss via keybindings (Enter, Escape, or Ctrl+C)
   useKeybindings(
@@ -239,7 +198,7 @@ export function Doctor({ onDone }: Props): React.ReactNode {
       'confirm:no': handleDismiss,
     },
     { context: 'Confirmation' },
-  )
+  );
 
   // Loading state
   if (!diagnostic) {
@@ -247,7 +206,7 @@ export function Doctor({ onDone }: Props): React.ReactNode {
       <Pane>
         <Text dimColor>Checking installation status…</Text>
       </Pane>
-    )
+    );
   }
 
   // Format the diagnostic output according to spec
@@ -256,12 +215,9 @@ export function Doctor({ onDone }: Props): React.ReactNode {
       <Box flexDirection="column">
         <Text bold>Diagnostics</Text>
         <Text>
-          └ Currently running: {diagnostic.installationType} (
-          {diagnostic.version})
+          └ Currently running: {diagnostic.installationType} ({diagnostic.version})
         </Text>
-        {diagnostic.packageManager && (
-          <Text>└ Package manager: {diagnostic.packageManager}</Text>
-        )}
+        {diagnostic.packageManager && <Text>└ Package manager: {diagnostic.packageManager}</Text>}
         <Text>└ Path: {diagnostic.installationPath}</Text>
         <Text>└ Invoked: {diagnostic.invokedBinary}</Text>
         <Text>└ Config install method: {diagnostic.configInstallMethod}</Text>
@@ -279,9 +235,7 @@ export function Doctor({ onDone }: Props): React.ReactNode {
         {diagnostic.recommendation && (
           <>
             <Text></Text>
-            <Text color="warning">
-              Recommendation: {diagnostic.recommendation.split('\n')[0]}
-            </Text>
+            <Text color="warning">Recommendation: {diagnostic.recommendation.split('\n')[0]}</Text>
             <Text dimColor>{diagnostic.recommendation.split('\n')[1]}</Text>
           </>
         )}
@@ -324,17 +278,9 @@ export function Doctor({ onDone }: Props): React.ReactNode {
       {/* Updates section */}
       <Box flexDirection="column">
         <Text bold>Updates</Text>
-        <Text>
-          └ Auto-updates:{' '}
-          {diagnostic.packageManager
-            ? 'Managed by package manager'
-            : diagnostic.autoUpdates}
-        </Text>
+        <Text>└ Auto-updates: {diagnostic.packageManager ? 'Managed by package manager' : diagnostic.autoUpdates}</Text>
         {diagnostic.hasUpdatePermissions !== null && (
-          <Text>
-            └ Update permissions:{' '}
-            {diagnostic.hasUpdatePermissions ? 'Yes' : 'No (requires sudo)'}
-          </Text>
+          <Text>└ Update permissions: {diagnostic.hasUpdatePermissions ? 'Yes' : 'No (requires sudo)'}</Text>
         )}
         <Text>└ Auto-update channel: {autoUpdatesChannel}</Text>
         <Suspense fallback={null}>
@@ -355,11 +301,7 @@ export function Doctor({ onDone }: Props): React.ReactNode {
           {envValidationErrors.map((validation, i) => (
             <Text key={i}>
               └ {validation.name}:{' '}
-              <Text
-                color={validation.status === 'capped' ? 'warning' : 'error'}
-              >
-                {validation.message}
-              </Text>
+              <Text color={validation.status === 'capped' ? 'warning' : 'error'}>{validation.message}</Text>
             </Text>
           ))}
         </Box>
@@ -370,9 +312,7 @@ export function Doctor({ onDone }: Props): React.ReactNode {
         <Box flexDirection="column">
           <Text bold>Version Locks</Text>
           {versionLockInfo.staleLocksCleaned > 0 && (
-            <Text dimColor>
-              └ Cleaned {versionLockInfo.staleLocksCleaned} stale lock(s)
-            </Text>
+            <Text dimColor>└ Cleaned {versionLockInfo.staleLocksCleaned} stale lock(s)</Text>
           )}
           {versionLockInfo.locks.length === 0 ? (
             <Text dimColor>└ No active version locks</Text>
@@ -380,11 +320,7 @@ export function Doctor({ onDone }: Props): React.ReactNode {
             versionLockInfo.locks.map((lock, i) => (
               <Text key={i}>
                 └ {lock.version}: PID {lock.pid}{' '}
-                {lock.isProcessRunning ? (
-                  <Text>(running)</Text>
-                ) : (
-                  <Text color="warning">(stale)</Text>
-                )}
+                {lock.isProcessRunning ? <Text>(running)</Text> : <Text color="warning">(stale)</Text>}
               </Text>
             ))
           )}
@@ -396,9 +332,7 @@ export function Doctor({ onDone }: Props): React.ReactNode {
           <Text bold color="error">
             Agent Parse Errors
           </Text>
-          <Text color="error">
-            └ Failed to parse {agentInfo.failedFiles.length} agent file(s):
-          </Text>
+          <Text color="error">└ Failed to parse {agentInfo.failedFiles.length} agent file(s):</Text>
           {agentInfo.failedFiles.map((file, i) => (
             <Text key={i} dimColor>
               {'  '}└ {file.path}: {file.error}
@@ -413,14 +347,11 @@ export function Doctor({ onDone }: Props): React.ReactNode {
           <Text bold color="error">
             Plugin Errors
           </Text>
-          <Text color="error">
-            └ {pluginsErrors.length} plugin error(s) detected:
-          </Text>
+          <Text color="error">└ {pluginsErrors.length} plugin error(s) detected:</Text>
           {pluginsErrors.map((error, i) => (
             <Text key={i} dimColor>
               {'  '}└ {error.source || 'unknown'}
-              {'plugin' in error && error.plugin ? ` [${error.plugin}]` : ''}:{' '}
-              {getPluginErrorMessage(error)}
+              {'plugin' in error && error.plugin ? ` [${error.plugin}]` : ''}: {getPluginErrorMessage(error)}
             </Text>
           ))}
         </Box>
@@ -435,8 +366,7 @@ export function Doctor({ onDone }: Props): React.ReactNode {
           <Text>
             └{' '}
             <Text color="warning">
-              {figures.warning}{' '}
-              {contextWarnings.unreachableRulesWarning.message}
+              {figures.warning} {contextWarnings.unreachableRulesWarning.message}
             </Text>
           </Text>
           {contextWarnings.unreachableRulesWarning.details.map((detail, i) => (
@@ -449,9 +379,7 @@ export function Doctor({ onDone }: Props): React.ReactNode {
 
       {/* Context Usage Warnings */}
       {contextWarnings &&
-        (contextWarnings.claudeMdWarning ||
-          contextWarnings.agentWarning ||
-          contextWarnings.mcpWarning) && (
+        (contextWarnings.claudeMdWarning || contextWarnings.agentWarning || contextWarnings.mcpWarning) && (
           <Box flexDirection="column">
             <Text bold>Context Usage Warnings</Text>
 
@@ -512,5 +440,5 @@ export function Doctor({ onDone }: Props): React.ReactNode {
         <PressEnterToContinue />
       </Box>
     </Pane>
-  )
+  );
 }
diff --git a/src/screens/ResumeConversation.tsx b/src/screens/ResumeConversation.tsx
index f1a5ea83e..fe07e46a1 100644
--- a/src/screens/ResumeConversation.tsx
+++ b/src/screens/ResumeConversation.tsx
@@ -1,43 +1,40 @@
-import { feature } from 'bun:bundle'
-import { dirname } from 'path'
-import React from 'react'
-import { useTerminalSize } from 'src/hooks/useTerminalSize.js'
-import { getOriginalCwd, switchSession } from '../bootstrap/state.js'
-import type { Command } from '../commands.js'
-import { LogSelector } from '../components/LogSelector.js'
-import { Spinner } from '../components/Spinner.js'
-import { restoreCostStateForSession } from '../cost-tracker.js'
-import { setClipboard } from '@anthropic/ink'
-import { Box, Text } from '@anthropic/ink'
-import { useKeybinding } from '../keybindings/useKeybinding.js'
+import { feature } from 'bun:bundle';
+import { dirname } from 'path';
+import React from 'react';
+import { useTerminalSize } from 'src/hooks/useTerminalSize.js';
+import { getOriginalCwd, switchSession } from '../bootstrap/state.js';
+import type { Command } from '../commands.js';
+import { LogSelector } from '../components/LogSelector.js';
+import { Spinner } from '../components/Spinner.js';
+import { restoreCostStateForSession } from '../cost-tracker.js';
+import { setClipboard } from '@anthropic/ink';
+import { Box, Text } from '@anthropic/ink';
+import { useKeybinding } from '../keybindings/useKeybinding.js';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from '../services/analytics/index.js'
-import type {
-  MCPServerConnection,
-  ScopedMcpServerConfig,
-} from '../services/mcp/types.js'
-import { useAppState, useSetAppState } from '../state/AppState.js'
-import type { Tool } from '../Tool.js'
-import type { AgentColorName } from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js'
-import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
-import { asSessionId } from '../types/ids.js'
-import type { LogOption } from '../types/logs.js'
-import type { Message } from '../types/message.js'
-import { agenticSessionSearch } from '../utils/agenticSessionSearch.js'
-import { renameRecordingForSession } from '../utils/asciicast.js'
-import { updateSessionName } from '../utils/concurrentSessions.js'
-import { loadConversationForResume } from '../utils/conversationRecovery.js'
-import { checkCrossProjectResume } from '../utils/crossProjectResume.js'
-import type { FileHistorySnapshot } from '../utils/fileHistory.js'
-import { logError } from '../utils/log.js'
-import { createSystemMessage } from '../utils/messages.js'
+} from '../services/analytics/index.js';
+import type { MCPServerConnection, ScopedMcpServerConfig } from '../services/mcp/types.js';
+import { useAppState, useSetAppState } from '../state/AppState.js';
+import type { Tool } from '../Tool.js';
+import type { AgentColorName } from '@claude-code-best/builtin-tools/tools/AgentTool/agentColorManager.js';
+import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js';
+import { asSessionId } from '../types/ids.js';
+import type { LogOption } from '../types/logs.js';
+import type { Message } from '../types/message.js';
+import { agenticSessionSearch } from '../utils/agenticSessionSearch.js';
+import { renameRecordingForSession } from '../utils/asciicast.js';
+import { updateSessionName } from '../utils/concurrentSessions.js';
+import { loadConversationForResume } from '../utils/conversationRecovery.js';
+import { checkCrossProjectResume } from '../utils/crossProjectResume.js';
+import type { FileHistorySnapshot } from '../utils/fileHistory.js';
+import { logError } from '../utils/log.js';
+import { createSystemMessage } from '../utils/messages.js';
 import {
   computeStandaloneAgentContext,
   restoreAgentFromSession,
   restoreWorktreeForResume,
-} from '../utils/sessionRestore.js'
+} from '../utils/sessionRestore.js';
 import {
   adoptResumedSessionFile,
   enrichLogs,
@@ -48,43 +45,43 @@ import {
   resetSessionFilePointer,
   restoreSessionMetadata,
   type SessionLogResult,
-} from '../utils/sessionStorage.js'
-import type { ThinkingConfig } from '../utils/thinking.js'
-import type { ContentReplacementRecord } from '../utils/toolResultStorage.js'
-import { REPL } from './REPL.js'
+} from '../utils/sessionStorage.js';
+import type { ThinkingConfig } from '../utils/thinking.js';
+import type { ContentReplacementRecord } from '../utils/toolResultStorage.js';
+import { REPL } from './REPL.js';
 
 function parsePrIdentifier(value: string): number | null {
-  const directNumber = parseInt(value, 10)
+  const directNumber = parseInt(value, 10);
   if (!isNaN(directNumber) && directNumber > 0) {
-    return directNumber
+    return directNumber;
   }
-  const urlMatch = value.match(/github\.com\/[^/]+\/[^/]+\/pull\/(\d+)/)
+  const urlMatch = value.match(/github\.com\/[^/]+\/[^/]+\/pull\/(\d+)/);
   if (urlMatch?.[1]) {
-    return parseInt(urlMatch[1], 10)
+    return parseInt(urlMatch[1], 10);
   }
-  return null
+  return null;
 }
 
 type Props = {
-  commands: Command[]
-  worktreePaths: string[]
-  initialTools: Tool[]
-  mcpClients?: MCPServerConnection[]
-  dynamicMcpConfig?: Record<string, ScopedMcpServerConfig>
-  debug: boolean
-  mainThreadAgentDefinition?: AgentDefinition
-  autoConnectIdeFlag?: boolean
-  strictMcpConfig?: boolean
-  systemPrompt?: string
-  appendSystemPrompt?: string
-  initialSearchQuery?: string
-  disableSlashCommands?: boolean
-  forkSession?: boolean
-  taskListId?: string
-  filterByPr?: boolean | number | string
-  thinkingConfig: ThinkingConfig
-  onTurnComplete?: (messages: Message[]) => void | Promise<void>
-}
+  commands: Command[];
+  worktreePaths: string[];
+  initialTools: Tool[];
+  mcpClients?: MCPServerConnection[];
+  dynamicMcpConfig?: Record<string, ScopedMcpServerConfig>;
+  debug: boolean;
+  mainThreadAgentDefinition?: AgentDefinition;
+  autoConnectIdeFlag?: boolean;
+  strictMcpConfig?: boolean;
+  systemPrompt?: string;
+  appendSystemPrompt?: string;
+  initialSearchQuery?: string;
+  disableSlashCommands?: boolean;
+  forkSession?: boolean;
+  taskListId?: string;
+  filterByPr?: boolean | number | string;
+  thinkingConfig: ThinkingConfig;
+  onTurnComplete?: (messages: Message[]) => void | Promise<void>;
+};
 
 export function ResumeConversation({
   commands,
@@ -106,155 +103,147 @@ export function ResumeConversation({
   thinkingConfig,
   onTurnComplete,
 }: Props): React.ReactNode {
-  const { rows } = useTerminalSize()
-  const agentDefinitions = useAppState(s => s.agentDefinitions)
-  const setAppState = useSetAppState()
-  const [logs, setLogs] = React.useState<LogOption[]>([])
-  const [loading, setLoading] = React.useState(true)
-  const [resuming, setResuming] = React.useState(false)
-  const [showAllProjects, setShowAllProjects] = React.useState(false)
+  const { rows } = useTerminalSize();
+  const agentDefinitions = useAppState(s => s.agentDefinitions);
+  const setAppState = useSetAppState();
+  const [logs, setLogs] = React.useState<LogOption[]>([]);
+  const [loading, setLoading] = React.useState(true);
+  const [resuming, setResuming] = React.useState(false);
+  const [showAllProjects, setShowAllProjects] = React.useState(false);
   const [resumeData, setResumeData] = React.useState<{
-    messages: Message[]
-    fileHistorySnapshots?: FileHistorySnapshot[]
-    contentReplacements?: ContentReplacementRecord[]
-    agentName?: string
-    agentColor?: AgentColorName
-    mainThreadAgentDefinition?: AgentDefinition
-  } | null>(null)
-  const [crossProjectCommand, setCrossProjectCommand] = React.useState<
-    string | null
-  >(null)
-  const sessionLogResultRef = React.useRef<SessionLogResult | null>(null)
+    messages: Message[];
+    fileHistorySnapshots?: FileHistorySnapshot[];
+    contentReplacements?: ContentReplacementRecord[];
+    agentName?: string;
+    agentColor?: AgentColorName;
+    mainThreadAgentDefinition?: AgentDefinition;
+  } | null>(null);
+  const [crossProjectCommand, setCrossProjectCommand] = React.useState<string | null>(null);
+  const sessionLogResultRef = React.useRef<SessionLogResult | null>(null);
   // Mirror of logs.length so loadMoreLogs can compute value indices outside
   // the setLogs updater (keeping it pure per React's contract).
-  const logCountRef = React.useRef(0)
+  const logCountRef = React.useRef(0);
 
   const filteredLogs = React.useMemo(() => {
-    let result = logs.filter(l => !l.isSidechain)
+    let result = logs.filter(l => !l.isSidechain);
     if (filterByPr !== undefined) {
       if (filterByPr === true) {
-        result = result.filter(l => l.prNumber !== undefined)
+        result = result.filter(l => l.prNumber !== undefined);
       } else if (typeof filterByPr === 'number') {
-        result = result.filter(l => l.prNumber === filterByPr)
+        result = result.filter(l => l.prNumber === filterByPr);
       } else if (typeof filterByPr === 'string') {
-        const prNumber = parsePrIdentifier(filterByPr)
+        const prNumber = parsePrIdentifier(filterByPr);
         if (prNumber !== null) {
-          result = result.filter(l => l.prNumber === prNumber)
+          result = result.filter(l => l.prNumber === prNumber);
         }
       }
     }
-    return result
-  }, [logs, filterByPr])
-  const isResumeWithRenameEnabled = isCustomTitleEnabled()
+    return result;
+  }, [logs, filterByPr]);
+  const isResumeWithRenameEnabled = isCustomTitleEnabled();
 
   React.useEffect(() => {
     loadSameRepoMessageLogsProgressive(worktreePaths)
       .then(result => {
-        sessionLogResultRef.current = result
-        logCountRef.current = result.logs.length
-        setLogs(result.logs)
-        setLoading(false)
+        sessionLogResultRef.current = result;
+        logCountRef.current = result.logs.length;
+        setLogs(result.logs);
+        setLoading(false);
       })
       .catch(error => {
-        logError(error)
-        setLoading(false)
-      })
-  }, [worktreePaths])
+        logError(error);
+        setLoading(false);
+      });
+  }, [worktreePaths]);
 
   const loadMoreLogs = React.useCallback((count: number) => {
-    const ref = sessionLogResultRef.current
-    if (!ref || ref.nextIndex >= ref.allStatLogs.length) return
+    const ref = sessionLogResultRef.current;
+    if (!ref || ref.nextIndex >= ref.allStatLogs.length) return;
 
     void enrichLogs(ref.allStatLogs, ref.nextIndex, count).then(result => {
-      ref.nextIndex = result.nextIndex
+      ref.nextIndex = result.nextIndex;
       if (result.logs.length > 0) {
         // enrichLogs returns fresh unshared objects — safe to mutate in place.
         // Offset comes from logCountRef so the setLogs updater stays pure.
-        const offset = logCountRef.current
+        const offset = logCountRef.current;
         result.logs.forEach((log, i) => {
-          log.value = offset + i
-        })
-        setLogs(prev => prev.concat(result.logs))
-        logCountRef.current += result.logs.length
+          log.value = offset + i;
+        });
+        setLogs(prev => prev.concat(result.logs));
+        logCountRef.current += result.logs.length;
       } else if (ref.nextIndex < ref.allStatLogs.length) {
-        loadMoreLogs(count)
+        loadMoreLogs(count);
       }
-    })
-  }, [])
+    });
+  }, []);
 
   const loadLogs = React.useCallback(
     (allProjects: boolean) => {
-      setLoading(true)
+      setLoading(true);
       const promise = allProjects
         ? loadAllProjectsMessageLogsProgressive()
-        : loadSameRepoMessageLogsProgressive(worktreePaths)
+        : loadSameRepoMessageLogsProgressive(worktreePaths);
       promise
         .then(result => {
-          sessionLogResultRef.current = result
-          logCountRef.current = result.logs.length
-          setLogs(result.logs)
+          sessionLogResultRef.current = result;
+          logCountRef.current = result.logs.length;
+          setLogs(result.logs);
         })
         .catch(error => {
-          logError(error)
+          logError(error);
         })
         .finally(() => {
-          setLoading(false)
-        })
+          setLoading(false);
+        });
     },
     [worktreePaths],
-  )
+  );
 
   const handleToggleAllProjects = React.useCallback(() => {
-    const newValue = !showAllProjects
-    setShowAllProjects(newValue)
-    loadLogs(newValue)
-  }, [showAllProjects, loadLogs])
+    const newValue = !showAllProjects;
+    setShowAllProjects(newValue);
+    loadLogs(newValue);
+  }, [showAllProjects, loadLogs]);
 
   function onCancel() {
     // eslint-disable-next-line custom-rules/no-process-exit
-    process.exit(1)
+    process.exit(1);
   }
 
   async function onSelect(log: LogOption) {
-    setResuming(true)
-    const resumeStart = performance.now()
+    setResuming(true);
+    const resumeStart = performance.now();
 
-    const crossProjectCheck = checkCrossProjectResume(
-      log,
-      showAllProjects,
-      worktreePaths,
-    )
+    const crossProjectCheck = checkCrossProjectResume(log, showAllProjects, worktreePaths);
     if (crossProjectCheck.isCrossProject) {
       if (!crossProjectCheck.isSameRepoWorktree) {
-        const cmd = (crossProjectCheck as { command: string }).command
-        const raw = await setClipboard(cmd)
-        if (raw) process.stdout.write(raw)
-        setCrossProjectCommand(cmd)
-        return
+        const cmd = (crossProjectCheck as { command: string }).command;
+        const raw = await setClipboard(cmd);
+        if (raw) process.stdout.write(raw);
+        setCrossProjectCommand(cmd);
+        return;
       }
     }
 
     try {
-      const result = await loadConversationForResume(log, undefined)
+      const result = await loadConversationForResume(log, undefined);
       if (!result) {
-        throw new Error('Failed to load conversation')
+        throw new Error('Failed to load conversation');
       }
 
       if (feature('COORDINATOR_MODE')) {
         /* eslint-disable @typescript-eslint/no-require-imports */
         const coordinatorModule =
-          require('../coordinator/coordinatorMode.js') as typeof import('../coordinator/coordinatorMode.js')
+          require('../coordinator/coordinatorMode.js') as typeof import('../coordinator/coordinatorMode.js');
         /* eslint-enable @typescript-eslint/no-require-imports */
-        const warning = coordinatorModule.matchSessionMode(result.mode)
+        const warning = coordinatorModule.matchSessionMode(result.mode);
         if (warning) {
           /* eslint-disable @typescript-eslint/no-require-imports */
           const { getAgentDefinitionsWithOverrides, getActiveAgentsFromList } =
-            require('@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js') as typeof import('@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js')
+            require('@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js') as typeof import('@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js');
           /* eslint-enable @typescript-eslint/no-require-imports */
-          getAgentDefinitionsWithOverrides.cache.clear?.()
-          const freshAgentDefs = await getAgentDefinitionsWithOverrides(
-            getOriginalCwd(),
-          )
+          getAgentDefinitionsWithOverrides.cache.clear?.();
+          const freshAgentDefs = await getAgentDefinitionsWithOverrides(getOriginalCwd());
           setAppState(prev => ({
             ...prev,
             agentDefinitions: {
@@ -262,101 +251,86 @@ export function ResumeConversation({
               allAgents: freshAgentDefs.allAgents,
               activeAgents: getActiveAgentsFromList(freshAgentDefs.allAgents),
             },
-          }))
-          result.messages.push(createSystemMessage(warning, 'warning'))
+          }));
+          result.messages.push(createSystemMessage(warning, 'warning'));
         }
       }
 
       if (result.sessionId && !forkSession) {
-        switchSession(
-          asSessionId(result.sessionId),
-          log.fullPath ? dirname(log.fullPath) : null,
-        )
-        await renameRecordingForSession()
-        await resetSessionFilePointer()
-        restoreCostStateForSession(result.sessionId)
+        switchSession(asSessionId(result.sessionId), log.fullPath ? dirname(log.fullPath) : null);
+        await renameRecordingForSession();
+        await resetSessionFilePointer();
+        restoreCostStateForSession(result.sessionId);
       } else if (forkSession && result.contentReplacements?.length) {
-        await recordContentReplacement(result.contentReplacements)
+        await recordContentReplacement(result.contentReplacements);
       }
 
       const { agentDefinition: resolvedAgentDef } = restoreAgentFromSession(
         result.agentSetting,
         mainThreadAgentDefinition,
         agentDefinitions,
-      )
-      setAppState(prev => ({ ...prev, agent: resolvedAgentDef?.agentType }))
+      );
+      setAppState(prev => ({ ...prev, agent: resolvedAgentDef?.agentType }));
 
       if (feature('COORDINATOR_MODE')) {
         /* eslint-disable @typescript-eslint/no-require-imports */
-        const { saveMode } = require('../utils/sessionStorage.js')
+        const { saveMode } = require('../utils/sessionStorage.js');
         const { isCoordinatorMode } =
-          require('../coordinator/coordinatorMode.js') as typeof import('../coordinator/coordinatorMode.js')
+          require('../coordinator/coordinatorMode.js') as typeof import('../coordinator/coordinatorMode.js');
         /* eslint-enable @typescript-eslint/no-require-imports */
-        saveMode(isCoordinatorMode() ? 'coordinator' : 'normal')
+        saveMode(isCoordinatorMode() ? 'coordinator' : 'normal');
       }
 
-      const standaloneAgentContext = computeStandaloneAgentContext(
-        result.agentName,
-        result.agentColor,
-      )
+      const standaloneAgentContext = computeStandaloneAgentContext(result.agentName, result.agentColor);
       if (standaloneAgentContext) {
-        setAppState(prev => ({ ...prev, standaloneAgentContext }))
+        setAppState(prev => ({ ...prev, standaloneAgentContext }));
       }
-      void updateSessionName(result.agentName)
+      void updateSessionName(result.agentName);
 
-      restoreSessionMetadata(
-        forkSession ? { ...result, worktreeSession: undefined } : result,
-      )
+      restoreSessionMetadata(forkSession ? { ...result, worktreeSession: undefined } : result);
 
       if (!forkSession) {
-        restoreWorktreeForResume(result.worktreeSession)
+        restoreWorktreeForResume(result.worktreeSession);
         if (result.sessionId) {
-          adoptResumedSessionFile()
+          adoptResumedSessionFile();
         }
       }
 
       if (feature('CONTEXT_COLLAPSE')) {
         /* eslint-disable @typescript-eslint/no-require-imports */
-        ;(
+        (
           require('../services/contextCollapse/persist.js') as typeof import('../services/contextCollapse/persist.js')
-        ).restoreFromEntries(
-          result.contextCollapseCommits ?? [],
-          result.contextCollapseSnapshot,
-        )
+        ).restoreFromEntries(result.contextCollapseCommits ?? [], result.contextCollapseSnapshot);
         /* eslint-enable @typescript-eslint/no-require-imports */
       }
 
       logEvent('tengu_session_resumed', {
-        entrypoint:
-          'picker' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        entrypoint: 'picker' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
         success: true,
         resume_duration_ms: Math.round(performance.now() - resumeStart),
-      })
+      });
 
-      setLogs([])
+      setLogs([]);
       setResumeData({
         messages: result.messages,
         fileHistorySnapshots: result.fileHistorySnapshots,
         contentReplacements: result.contentReplacements,
         agentName: result.agentName,
-        agentColor: (result.agentColor === 'default'
-          ? undefined
-          : result.agentColor) as AgentColorName | undefined,
+        agentColor: (result.agentColor === 'default' ? undefined : result.agentColor) as AgentColorName | undefined,
         mainThreadAgentDefinition: resolvedAgentDef,
-      })
+      });
     } catch (e) {
       logEvent('tengu_session_resumed', {
-        entrypoint:
-          'picker' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        entrypoint: 'picker' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
         success: false,
-      })
-      logError(e as Error)
-      throw e
+      });
+      logError(e as Error);
+      throw e;
     }
   }
 
   if (crossProjectCommand) {
-    return <CrossProjectMessage command={crossProjectCommand} />
+    return <CrossProjectMessage command={crossProjectCommand} />;
   }
 
   if (resumeData) {
@@ -382,7 +356,7 @@ export function ResumeConversation({
         thinkingConfig={thinkingConfig}
         onTurnComplete={onTurnComplete}
       />
-    )
+    );
   }
 
   if (loading) {
@@ -391,7 +365,7 @@ export function ResumeConversation({
         <Spinner />
         <Text> Loading conversations…</Text>
       </Box>
-    )
+    );
   }
 
   if (resuming) {
@@ -400,11 +374,11 @@ export function ResumeConversation({
         <Spinner />
         <Text> Resuming conversation…</Text>
       </Box>
-    )
+    );
   }
 
   if (filteredLogs.length === 0) {
-    return <NoConversationsMessage />
+    return <NoConversationsMessage />;
   }
 
   return (
@@ -413,16 +387,14 @@ export function ResumeConversation({
       maxHeight={rows}
       onCancel={onCancel}
       onSelect={onSelect}
-      onLogsChanged={
-        isResumeWithRenameEnabled ? () => loadLogs(showAllProjects) : undefined
-      }
+      onLogsChanged={isResumeWithRenameEnabled ? () => loadLogs(showAllProjects) : undefined}
       onLoadMore={loadMoreLogs}
       initialSearchQuery={initialSearchQuery}
       showAllProjects={showAllProjects}
       onToggleAllProjects={handleToggleAllProjects}
       onAgenticSearch={agenticSessionSearch}
     />
-  )
+  );
 }
 
 function NoConversationsMessage(): React.ReactNode {
@@ -430,31 +402,27 @@ function NoConversationsMessage(): React.ReactNode {
     'app:interrupt',
     () => {
       // eslint-disable-next-line custom-rules/no-process-exit
-      process.exit(1)
+      process.exit(1);
     },
     { context: 'Global' },
-  )
+  );
 
   return (
     <Box flexDirection="column">
       <Text>No conversations found to resume.</Text>
       <Text dimColor>Press Ctrl+C to exit and start a new conversation.</Text>
     </Box>
-  )
+  );
 }
 
-function CrossProjectMessage({
-  command,
-}: {
-  command: string
-}): React.ReactNode {
+function CrossProjectMessage({ command }: { command: string }): React.ReactNode {
   React.useEffect(() => {
     const timeout = setTimeout(() => {
       // eslint-disable-next-line custom-rules/no-process-exit
-      process.exit(0)
-    }, 100)
-    return () => clearTimeout(timeout)
-  }, [])
+      process.exit(0);
+    }, 100);
+    return () => clearTimeout(timeout);
+  }, []);
 
   return (
     <Box flexDirection="column" gap={1}>
@@ -465,5 +433,5 @@ function CrossProjectMessage({
       </Box>
       <Text dimColor>(Command copied to clipboard)</Text>
     </Box>
-  )
+  );
 }
diff --git a/src/screens/src/cli/structuredIO.ts b/src/screens/src/cli/structuredIO.ts
index 8e536b8a2..60bbe3e13 100644
--- a/src/screens/src/cli/structuredIO.ts
+++ b/src/screens/src/cli/structuredIO.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type SANDBOX_NETWORK_ACCESS_TOOL_NAME = any;
+export type SANDBOX_NETWORK_ACCESS_TOOL_NAME = any
diff --git a/src/screens/src/components/AutoModeOptInDialog.ts b/src/screens/src/components/AutoModeOptInDialog.ts
index f441f7e57..7a27e8afd 100644
--- a/src/screens/src/components/AutoModeOptInDialog.ts
+++ b/src/screens/src/components/AutoModeOptInDialog.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type AUTO_MODE_DESCRIPTION = any;
+export type AUTO_MODE_DESCRIPTION = any
diff --git a/src/screens/src/components/ClaudeCodeHint/PluginHintMenu.ts b/src/screens/src/components/ClaudeCodeHint/PluginHintMenu.ts
index 2369289c7..108a6b750 100644
--- a/src/screens/src/components/ClaudeCodeHint/PluginHintMenu.ts
+++ b/src/screens/src/components/ClaudeCodeHint/PluginHintMenu.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type PluginHintMenu = any;
+export type PluginHintMenu = any
diff --git a/src/screens/src/components/DesktopUpsell/DesktopUpsellStartup.ts b/src/screens/src/components/DesktopUpsell/DesktopUpsellStartup.ts
index fcb5dc73d..75df655b9 100644
--- a/src/screens/src/components/DesktopUpsell/DesktopUpsellStartup.ts
+++ b/src/screens/src/components/DesktopUpsell/DesktopUpsellStartup.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type DesktopUpsellStartup = any;
-export type shouldShowDesktopUpsellStartup = any;
+export type DesktopUpsellStartup = any
+export type shouldShowDesktopUpsellStartup = any
diff --git a/src/screens/src/components/FeedbackSurvey/FeedbackSurvey.ts b/src/screens/src/components/FeedbackSurvey/FeedbackSurvey.ts
index 2466dd075..d32558baf 100644
--- a/src/screens/src/components/FeedbackSurvey/FeedbackSurvey.ts
+++ b/src/screens/src/components/FeedbackSurvey/FeedbackSurvey.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type FeedbackSurvey = any;
+export type FeedbackSurvey = any
diff --git a/src/screens/src/components/FeedbackSurvey/useFeedbackSurvey.ts b/src/screens/src/components/FeedbackSurvey/useFeedbackSurvey.ts
index dcff53ce8..b62a45abd 100644
--- a/src/screens/src/components/FeedbackSurvey/useFeedbackSurvey.ts
+++ b/src/screens/src/components/FeedbackSurvey/useFeedbackSurvey.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useFeedbackSurvey = any;
+export type useFeedbackSurvey = any
diff --git a/src/screens/src/components/FeedbackSurvey/useMemorySurvey.ts b/src/screens/src/components/FeedbackSurvey/useMemorySurvey.ts
index f7e0029db..c85f1225a 100644
--- a/src/screens/src/components/FeedbackSurvey/useMemorySurvey.ts
+++ b/src/screens/src/components/FeedbackSurvey/useMemorySurvey.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useMemorySurvey = any;
+export type useMemorySurvey = any
diff --git a/src/screens/src/components/FeedbackSurvey/usePostCompactSurvey.ts b/src/screens/src/components/FeedbackSurvey/usePostCompactSurvey.ts
index e81d32694..bda93aba6 100644
--- a/src/screens/src/components/FeedbackSurvey/usePostCompactSurvey.ts
+++ b/src/screens/src/components/FeedbackSurvey/usePostCompactSurvey.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type usePostCompactSurvey = any;
+export type usePostCompactSurvey = any
diff --git a/src/screens/src/components/KeybindingWarnings.ts b/src/screens/src/components/KeybindingWarnings.ts
index e57e1f78f..da43c3765 100644
--- a/src/screens/src/components/KeybindingWarnings.ts
+++ b/src/screens/src/components/KeybindingWarnings.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type KeybindingWarnings = any;
+export type KeybindingWarnings = any
diff --git a/src/screens/src/components/LspRecommendation/LspRecommendationMenu.ts b/src/screens/src/components/LspRecommendation/LspRecommendationMenu.ts
index 0628cdcb0..e9f82e807 100644
--- a/src/screens/src/components/LspRecommendation/LspRecommendationMenu.ts
+++ b/src/screens/src/components/LspRecommendation/LspRecommendationMenu.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type LspRecommendationMenu = any;
+export type LspRecommendationMenu = any
diff --git a/src/screens/src/components/SandboxViolationExpandedView.ts b/src/screens/src/components/SandboxViolationExpandedView.ts
index 4af5947d8..2f06a9ff2 100644
--- a/src/screens/src/components/SandboxViolationExpandedView.ts
+++ b/src/screens/src/components/SandboxViolationExpandedView.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type SandboxViolationExpandedView = any;
+export type SandboxViolationExpandedView = any
diff --git a/src/screens/src/components/mcp/McpParsingWarnings.ts b/src/screens/src/components/mcp/McpParsingWarnings.ts
index ab05516ed..7c9e52187 100644
--- a/src/screens/src/components/mcp/McpParsingWarnings.ts
+++ b/src/screens/src/components/mcp/McpParsingWarnings.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type McpParsingWarnings = any;
+export type McpParsingWarnings = any
diff --git a/src/screens/src/components/messages/UserTextMessage.ts b/src/screens/src/components/messages/UserTextMessage.ts
index 40106edbb..4cc0ef57f 100644
--- a/src/screens/src/components/messages/UserTextMessage.ts
+++ b/src/screens/src/components/messages/UserTextMessage.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type UserTextMessage = any;
+export type UserTextMessage = any
diff --git a/src/screens/src/components/permissions/SandboxPermissionRequest.ts b/src/screens/src/components/permissions/SandboxPermissionRequest.ts
index bd5e216a4..db1549ab5 100644
--- a/src/screens/src/components/permissions/SandboxPermissionRequest.ts
+++ b/src/screens/src/components/permissions/SandboxPermissionRequest.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type SandboxPermissionRequest = any;
+export type SandboxPermissionRequest = any
diff --git a/src/screens/src/hooks/notifs/useAutoModeUnavailableNotification.ts b/src/screens/src/hooks/notifs/useAutoModeUnavailableNotification.ts
index b240eb3f5..77fa126ca 100644
--- a/src/screens/src/hooks/notifs/useAutoModeUnavailableNotification.ts
+++ b/src/screens/src/hooks/notifs/useAutoModeUnavailableNotification.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useAutoModeUnavailableNotification = any;
+export type useAutoModeUnavailableNotification = any
diff --git a/src/screens/src/hooks/notifs/useCanSwitchToExistingSubscription.ts b/src/screens/src/hooks/notifs/useCanSwitchToExistingSubscription.ts
index 7a4814cec..ad32d76e2 100644
--- a/src/screens/src/hooks/notifs/useCanSwitchToExistingSubscription.ts
+++ b/src/screens/src/hooks/notifs/useCanSwitchToExistingSubscription.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useCanSwitchToExistingSubscription = any;
+export type useCanSwitchToExistingSubscription = any
diff --git a/src/screens/src/hooks/notifs/useDeprecationWarningNotification.ts b/src/screens/src/hooks/notifs/useDeprecationWarningNotification.ts
index c919ed0d7..57bc25bd4 100644
--- a/src/screens/src/hooks/notifs/useDeprecationWarningNotification.ts
+++ b/src/screens/src/hooks/notifs/useDeprecationWarningNotification.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useDeprecationWarningNotification = any;
+export type useDeprecationWarningNotification = any
diff --git a/src/screens/src/hooks/notifs/useFastModeNotification.ts b/src/screens/src/hooks/notifs/useFastModeNotification.ts
index 2d8192243..007d69963 100644
--- a/src/screens/src/hooks/notifs/useFastModeNotification.ts
+++ b/src/screens/src/hooks/notifs/useFastModeNotification.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useFastModeNotification = any;
+export type useFastModeNotification = any
diff --git a/src/screens/src/hooks/notifs/useIDEStatusIndicator.ts b/src/screens/src/hooks/notifs/useIDEStatusIndicator.ts
index c85b1a312..87f9ad8f7 100644
--- a/src/screens/src/hooks/notifs/useIDEStatusIndicator.ts
+++ b/src/screens/src/hooks/notifs/useIDEStatusIndicator.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useIDEStatusIndicator = any;
+export type useIDEStatusIndicator = any
diff --git a/src/screens/src/hooks/notifs/useInstallMessages.ts b/src/screens/src/hooks/notifs/useInstallMessages.ts
index 033331f33..e3408ad6b 100644
--- a/src/screens/src/hooks/notifs/useInstallMessages.ts
+++ b/src/screens/src/hooks/notifs/useInstallMessages.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useInstallMessages = any;
+export type useInstallMessages = any
diff --git a/src/screens/src/hooks/notifs/useLspInitializationNotification.ts b/src/screens/src/hooks/notifs/useLspInitializationNotification.ts
index 67239f66d..1c480f5f8 100644
--- a/src/screens/src/hooks/notifs/useLspInitializationNotification.ts
+++ b/src/screens/src/hooks/notifs/useLspInitializationNotification.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useLspInitializationNotification = any;
+export type useLspInitializationNotification = any
diff --git a/src/screens/src/hooks/notifs/useMcpConnectivityStatus.ts b/src/screens/src/hooks/notifs/useMcpConnectivityStatus.ts
index 7abc0f54f..12516b95d 100644
--- a/src/screens/src/hooks/notifs/useMcpConnectivityStatus.ts
+++ b/src/screens/src/hooks/notifs/useMcpConnectivityStatus.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useMcpConnectivityStatus = any;
+export type useMcpConnectivityStatus = any
diff --git a/src/screens/src/hooks/notifs/useModelMigrationNotifications.ts b/src/screens/src/hooks/notifs/useModelMigrationNotifications.ts
index 2dbde4b2f..644ffb397 100644
--- a/src/screens/src/hooks/notifs/useModelMigrationNotifications.ts
+++ b/src/screens/src/hooks/notifs/useModelMigrationNotifications.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useModelMigrationNotifications = any;
+export type useModelMigrationNotifications = any
diff --git a/src/screens/src/hooks/notifs/useNpmDeprecationNotification.ts b/src/screens/src/hooks/notifs/useNpmDeprecationNotification.ts
index ee5cd8011..c7bf0c326 100644
--- a/src/screens/src/hooks/notifs/useNpmDeprecationNotification.ts
+++ b/src/screens/src/hooks/notifs/useNpmDeprecationNotification.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useNpmDeprecationNotification = any;
+export type useNpmDeprecationNotification = any
diff --git a/src/screens/src/hooks/notifs/usePluginAutoupdateNotification.ts b/src/screens/src/hooks/notifs/usePluginAutoupdateNotification.ts
index 020e8df25..6b728e49d 100644
--- a/src/screens/src/hooks/notifs/usePluginAutoupdateNotification.ts
+++ b/src/screens/src/hooks/notifs/usePluginAutoupdateNotification.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type usePluginAutoupdateNotification = any;
+export type usePluginAutoupdateNotification = any
diff --git a/src/screens/src/hooks/notifs/usePluginInstallationStatus.ts b/src/screens/src/hooks/notifs/usePluginInstallationStatus.ts
index c20954050..750e740d3 100644
--- a/src/screens/src/hooks/notifs/usePluginInstallationStatus.ts
+++ b/src/screens/src/hooks/notifs/usePluginInstallationStatus.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type usePluginInstallationStatus = any;
+export type usePluginInstallationStatus = any
diff --git a/src/screens/src/hooks/notifs/useRateLimitWarningNotification.ts b/src/screens/src/hooks/notifs/useRateLimitWarningNotification.ts
index 81d3a769c..4d00fa8f5 100644
--- a/src/screens/src/hooks/notifs/useRateLimitWarningNotification.ts
+++ b/src/screens/src/hooks/notifs/useRateLimitWarningNotification.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useRateLimitWarningNotification = any;
+export type useRateLimitWarningNotification = any
diff --git a/src/screens/src/hooks/notifs/useSettingsErrors.ts b/src/screens/src/hooks/notifs/useSettingsErrors.ts
index 0724b24d6..448f5e11b 100644
--- a/src/screens/src/hooks/notifs/useSettingsErrors.ts
+++ b/src/screens/src/hooks/notifs/useSettingsErrors.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useSettingsErrors = any;
+export type useSettingsErrors = any
diff --git a/src/screens/src/hooks/notifs/useTeammateShutdownNotification.ts b/src/screens/src/hooks/notifs/useTeammateShutdownNotification.ts
index 9fd3f8a7f..4cc16aee8 100644
--- a/src/screens/src/hooks/notifs/useTeammateShutdownNotification.ts
+++ b/src/screens/src/hooks/notifs/useTeammateShutdownNotification.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useTeammateLifecycleNotification = any;
+export type useTeammateLifecycleNotification = any
diff --git a/src/screens/src/hooks/useAwaySummary.ts b/src/screens/src/hooks/useAwaySummary.ts
index 4455dec96..acb7a2f88 100644
--- a/src/screens/src/hooks/useAwaySummary.ts
+++ b/src/screens/src/hooks/useAwaySummary.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useAwaySummary = any;
+export type useAwaySummary = any
diff --git a/src/screens/src/hooks/useChromeExtensionNotification.ts b/src/screens/src/hooks/useChromeExtensionNotification.ts
index c97ee1f82..24d3c3328 100644
--- a/src/screens/src/hooks/useChromeExtensionNotification.ts
+++ b/src/screens/src/hooks/useChromeExtensionNotification.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useChromeExtensionNotification = any;
+export type useChromeExtensionNotification = any
diff --git a/src/screens/src/hooks/useClaudeCodeHintRecommendation.ts b/src/screens/src/hooks/useClaudeCodeHintRecommendation.ts
index 83701c8a8..03b11dc1a 100644
--- a/src/screens/src/hooks/useClaudeCodeHintRecommendation.ts
+++ b/src/screens/src/hooks/useClaudeCodeHintRecommendation.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useClaudeCodeHintRecommendation = any;
+export type useClaudeCodeHintRecommendation = any
diff --git a/src/screens/src/hooks/useFileHistorySnapshotInit.ts b/src/screens/src/hooks/useFileHistorySnapshotInit.ts
index 8d14981c0..4cfb771a8 100644
--- a/src/screens/src/hooks/useFileHistorySnapshotInit.ts
+++ b/src/screens/src/hooks/useFileHistorySnapshotInit.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useFileHistorySnapshotInit = any;
+export type useFileHistorySnapshotInit = any
diff --git a/src/screens/src/hooks/useLspPluginRecommendation.ts b/src/screens/src/hooks/useLspPluginRecommendation.ts
index c6d24fab8..32c42e317 100644
--- a/src/screens/src/hooks/useLspPluginRecommendation.ts
+++ b/src/screens/src/hooks/useLspPluginRecommendation.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useLspPluginRecommendation = any;
+export type useLspPluginRecommendation = any
diff --git a/src/screens/src/hooks/useOfficialMarketplaceNotification.ts b/src/screens/src/hooks/useOfficialMarketplaceNotification.ts
index 95d10a32d..2824b36ba 100644
--- a/src/screens/src/hooks/useOfficialMarketplaceNotification.ts
+++ b/src/screens/src/hooks/useOfficialMarketplaceNotification.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useOfficialMarketplaceNotification = any;
+export type useOfficialMarketplaceNotification = any
diff --git a/src/screens/src/hooks/usePromptsFromClaudeInChrome.ts b/src/screens/src/hooks/usePromptsFromClaudeInChrome.ts
index ca8e71f05..946bc6f4a 100644
--- a/src/screens/src/hooks/usePromptsFromClaudeInChrome.ts
+++ b/src/screens/src/hooks/usePromptsFromClaudeInChrome.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type usePromptsFromClaudeInChrome = any;
+export type usePromptsFromClaudeInChrome = any
diff --git a/src/screens/src/hooks/useTerminalSize.ts b/src/screens/src/hooks/useTerminalSize.ts
index 4a0ef3ea3..fdaf2e999 100644
--- a/src/screens/src/hooks/useTerminalSize.ts
+++ b/src/screens/src/hooks/useTerminalSize.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type useTerminalSize = any;
+export type useTerminalSize = any
diff --git a/src/screens/src/services/analytics/growthbook.ts b/src/screens/src/services/analytics/growthbook.ts
index e380906ea..7967fd3ee 100644
--- a/src/screens/src/services/analytics/growthbook.ts
+++ b/src/screens/src/services/analytics/growthbook.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getFeatureValue_CACHED_MAY_BE_STALE = any;
+export type getFeatureValue_CACHED_MAY_BE_STALE = any
diff --git a/src/screens/src/services/analytics/index.ts b/src/screens/src/services/analytics/index.ts
index ce0a9a827..eca4493cf 100644
--- a/src/screens/src/services/analytics/index.ts
+++ b/src/screens/src/services/analytics/index.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type logEvent = any;
-export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any;
+export type logEvent = any
+export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any
diff --git a/src/screens/src/services/mcp/MCPConnectionManager.ts b/src/screens/src/services/mcp/MCPConnectionManager.ts
index 2a0ec4e7f..7cde40817 100644
--- a/src/screens/src/services/mcp/MCPConnectionManager.ts
+++ b/src/screens/src/services/mcp/MCPConnectionManager.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type MCPConnectionManager = any;
+export type MCPConnectionManager = any
diff --git a/src/screens/src/services/tips/tipScheduler.ts b/src/screens/src/services/tips/tipScheduler.ts
index 813f4de4e..88a1e3e06 100644
--- a/src/screens/src/services/tips/tipScheduler.ts
+++ b/src/screens/src/services/tips/tipScheduler.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type getTipToShowOnSpinner = any;
-export type recordShownTip = any;
+export type getTipToShowOnSpinner = any
+export type recordShownTip = any
diff --git a/src/screens/src/utils/context.ts b/src/screens/src/utils/context.ts
index 03d405458..5fcf08c4b 100644
--- a/src/screens/src/utils/context.ts
+++ b/src/screens/src/utils/context.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getModelMaxOutputTokens = any;
+export type getModelMaxOutputTokens = any
diff --git a/src/screens/src/utils/envUtils.ts b/src/screens/src/utils/envUtils.ts
index ef637d0cf..33260a183 100644
--- a/src/screens/src/utils/envUtils.ts
+++ b/src/screens/src/utils/envUtils.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getClaudeConfigHomeDir = any;
+export type getClaudeConfigHomeDir = any
diff --git a/src/screens/src/utils/permissions/bypassPermissionsKillswitch.ts b/src/screens/src/utils/permissions/bypassPermissionsKillswitch.ts
index cd1c15aa3..d1725db82 100644
--- a/src/screens/src/utils/permissions/bypassPermissionsKillswitch.ts
+++ b/src/screens/src/utils/permissions/bypassPermissionsKillswitch.ts
@@ -1,5 +1,5 @@
 // Auto-generated type stub — replace with real implementation
-export type checkAndDisableBypassPermissionsIfNeeded = any;
-export type checkAndDisableAutoModeIfNeeded = any;
-export type useKickOffCheckAndDisableBypassPermissionsIfNeeded = any;
-export type useKickOffCheckAndDisableAutoModeIfNeeded = any;
+export type checkAndDisableBypassPermissionsIfNeeded = any
+export type checkAndDisableAutoModeIfNeeded = any
+export type useKickOffCheckAndDisableBypassPermissionsIfNeeded = any
+export type useKickOffCheckAndDisableAutoModeIfNeeded = any
diff --git a/src/screens/src/utils/plugins/performStartupChecks.ts b/src/screens/src/utils/plugins/performStartupChecks.ts
index e555a9f1f..9c917733b 100644
--- a/src/screens/src/utils/plugins/performStartupChecks.ts
+++ b/src/screens/src/utils/plugins/performStartupChecks.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type performStartupChecks = any;
+export type performStartupChecks = any
diff --git a/src/screens/src/utils/sandbox/sandbox-adapter.ts b/src/screens/src/utils/sandbox/sandbox-adapter.ts
index edebe2640..e9f663b72 100644
--- a/src/screens/src/utils/sandbox/sandbox-adapter.ts
+++ b/src/screens/src/utils/sandbox/sandbox-adapter.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type SandboxManager = any;
+export type SandboxManager = any
diff --git a/src/screens/src/utils/settings/constants.ts b/src/screens/src/utils/settings/constants.ts
index b82138d6a..24eb36c76 100644
--- a/src/screens/src/utils/settings/constants.ts
+++ b/src/screens/src/utils/settings/constants.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type SettingSource = any;
+export type SettingSource = any
diff --git a/src/screens/src/utils/theme.ts b/src/screens/src/utils/theme.ts
index c6999a678..833b24799 100644
--- a/src/screens/src/utils/theme.ts
+++ b/src/screens/src/utils/theme.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type Theme = any;
+export type Theme = any
diff --git a/src/self-hosted-runner/main.ts b/src/self-hosted-runner/main.ts
index 09139d298..acec32b91 100644
--- a/src/self-hosted-runner/main.ts
+++ b/src/self-hosted-runner/main.ts
@@ -1,3 +1,4 @@
 // Auto-generated stub — replace with real implementation
-export {};
-export const selfHostedRunnerMain: (args: string[]) => Promise<void> = () => Promise.resolve();
+export {}
+export const selfHostedRunnerMain: (args: string[]) => Promise<void> = () =>
+  Promise.resolve()
diff --git a/src/server/backends/dangerousBackend.ts b/src/server/backends/dangerousBackend.ts
index 8bb43e5eb..9bc5a12b7 100644
--- a/src/server/backends/dangerousBackend.ts
+++ b/src/server/backends/dangerousBackend.ts
@@ -1,3 +1,5 @@
 // Auto-generated stub — replace with real implementation
-export {};
-export const DangerousBackend: new (...args: unknown[]) => Record<string, unknown> = class {} as never;
+export {}
+export const DangerousBackend: new (
+  ...args: unknown[]
+) => Record<string, unknown> = class {} as never
diff --git a/src/server/connectHeadless.ts b/src/server/connectHeadless.ts
index 110ea4747..8e693fccb 100644
--- a/src/server/connectHeadless.ts
+++ b/src/server/connectHeadless.ts
@@ -1,3 +1,4 @@
 // Auto-generated stub — replace with real implementation
-export {};
-export const runConnectHeadless: (...args: unknown[]) => Promise<void> = () => Promise.resolve();
+export {}
+export const runConnectHeadless: (...args: unknown[]) => Promise<void> = () =>
+  Promise.resolve()
diff --git a/src/server/lockfile.ts b/src/server/lockfile.ts
index 7efc3e804..d4507c804 100644
--- a/src/server/lockfile.ts
+++ b/src/server/lockfile.ts
@@ -8,6 +8,8 @@ export interface ServerLockInfo {
   startedAt: number
 }
 
-export const writeServerLock: (info: ServerLockInfo) => Promise<void> = (async () => {});
-export const removeServerLock: () => Promise<void> = (async () => {});
-export const probeRunningServer: () => Promise<ServerLockInfo | null> = (async () => null);
+export const writeServerLock: (info: ServerLockInfo) => Promise<void> =
+  async () => {}
+export const removeServerLock: () => Promise<void> = async () => {}
+export const probeRunningServer: () => Promise<ServerLockInfo | null> =
+  async () => null
diff --git a/src/server/parseConnectUrl.ts b/src/server/parseConnectUrl.ts
index f60ad4ecf..c86326b2e 100644
--- a/src/server/parseConnectUrl.ts
+++ b/src/server/parseConnectUrl.ts
@@ -1,3 +1,7 @@
 // Auto-generated stub — replace with real implementation
-export {};
-export const parseConnectUrl: (url: string) => { serverUrl: string; authToken: string; [key: string]: unknown } = () => ({ serverUrl: '', authToken: '' });
+export {}
+export const parseConnectUrl: (url: string) => {
+  serverUrl: string
+  authToken: string
+  [key: string]: unknown
+} = () => ({ serverUrl: '', authToken: '' })
diff --git a/src/server/server.ts b/src/server/server.ts
index 94a377148..a8f554098 100644
--- a/src/server/server.ts
+++ b/src/server/server.ts
@@ -1,3 +1,6 @@
 // Auto-generated stub — replace with real implementation
-export {};
-export const startServer: (...args: unknown[]) => { port?: number; stop: (closeActiveConnections: boolean) => void } = () => ({ stop() {} });
+export {}
+export const startServer: (...args: unknown[]) => {
+  port?: number
+  stop: (closeActiveConnections: boolean) => void
+} = () => ({ stop() {} })
diff --git a/src/server/serverBanner.ts b/src/server/serverBanner.ts
index b91b6b484..b06d386cc 100644
--- a/src/server/serverBanner.ts
+++ b/src/server/serverBanner.ts
@@ -1,3 +1,3 @@
 // Auto-generated stub — replace with real implementation
-export {};
-export const printBanner: (...args: unknown[]) => void = () => {};
+export {}
+export const printBanner: (...args: unknown[]) => void = () => {}
diff --git a/src/server/serverLog.ts b/src/server/serverLog.ts
index e89c00070..605f47eec 100644
--- a/src/server/serverLog.ts
+++ b/src/server/serverLog.ts
@@ -1,3 +1,3 @@
 // Auto-generated stub — replace with real implementation
-export {};
-export const createServerLogger: () => Record<string, unknown> = () => ({});
+export {}
+export const createServerLogger: () => Record<string, unknown> = () => ({})
diff --git a/src/server/sessionManager.ts b/src/server/sessionManager.ts
index 5684d78f8..9f893092a 100644
--- a/src/server/sessionManager.ts
+++ b/src/server/sessionManager.ts
@@ -1,3 +1,7 @@
 // Auto-generated stub — replace with real implementation
-export {};
-export const SessionManager: new (...args: unknown[]) => { destroyAll(): Promise<void>; [key: string]: unknown } = class { async destroyAll() {} } as never;
+export {}
+export const SessionManager: new (
+  ...args: unknown[]
+) => { destroyAll(): Promise<void>; [key: string]: unknown } = class {
+  async destroyAll() {}
+} as never
diff --git a/src/services/AgentSummary/agentSummary.ts b/src/services/AgentSummary/agentSummary.ts
index 50146b3c7..de3ee749b 100644
--- a/src/services/AgentSummary/agentSummary.ts
+++ b/src/services/AgentSummary/agentSummary.ts
@@ -136,7 +136,9 @@ export function startAgentSummarization(
           )
           continue
         }
-        const contentArr = Array.isArray(msg.message!.content) ? msg.message!.content : []
+        const contentArr = Array.isArray(msg.message!.content)
+          ? msg.message!.content
+          : []
         const textBlock = contentArr.find(b => b.type === 'text')
         if (textBlock?.type === 'text' && textBlock.text.trim()) {
           const summaryText = textBlock.text.trim()
diff --git a/src/services/MagicDocs/prompts.ts b/src/services/MagicDocs/prompts.ts
index 8b926a151..5e549404d 100644
--- a/src/services/MagicDocs/prompts.ts
+++ b/src/services/MagicDocs/prompts.ts
@@ -86,9 +86,7 @@ function substituteVariables(
   // (replacer fn treats $ literally), and (2) double-substitution when user
   // content happens to contain {{varName}} matching a later variable.
   return template.replace(/\{\{(\w+)\}\}/g, (match, key: string) =>
-    Object.prototype.hasOwnProperty.call(variables, key)
-      ? variables[key]!
-      : match,
+    Object.hasOwn(variables, key) ? variables[key]! : match,
   )
 }
 
diff --git a/src/services/PromptSuggestion/promptSuggestion.ts b/src/services/PromptSuggestion/promptSuggestion.ts
index c54df2a40..ee158ac92 100644
--- a/src/services/PromptSuggestion/promptSuggestion.ts
+++ b/src/services/PromptSuggestion/promptSuggestion.ts
@@ -249,7 +249,9 @@ export function getParentCacheSuppressReason(
   // The fork re-processes the parent's output (never cached) plus its own prompt.
   const outputTokens = usage!.output_tokens ?? 0
 
-  return (inputTokens as number) + (cacheWriteTokens as number) + (outputTokens as number) >
+  return (inputTokens as number) +
+    (cacheWriteTokens as number) +
+    (outputTokens as number) >
     MAX_PARENT_UNCACHED_TOKENS
     ? 'cache_cold'
     : null
@@ -339,7 +341,9 @@ export async function generateSuggestion(
 
   for (const msg of result.messages) {
     if (msg.type !== 'assistant') continue
-    const contentArr = Array.isArray(msg.message!.content) ? msg.message!.content as Array<{ type: string; text?: string }> : []
+    const contentArr = Array.isArray(msg.message!.content)
+      ? (msg.message!.content as Array<{ type: string; text?: string }>)
+      : []
     const textBlock = contentArr.find(b => b.type === 'text')
     if (textBlock?.type === 'text' && typeof textBlock.text === 'string') {
       const suggestion = textBlock.text.trim()
@@ -349,7 +353,7 @@ export async function generateSuggestion(
     }
   }
 
-  return { suggestion: null as (string | null), generationRequestId }
+  return { suggestion: null as string | null, generationRequestId }
 }
 
 export function shouldFilterSuggestion(
diff --git a/src/services/PromptSuggestion/speculation.ts b/src/services/PromptSuggestion/speculation.ts
index 9835d4d86..6e7b0a469 100644
--- a/src/services/PromptSuggestion/speculation.ts
+++ b/src/services/PromptSuggestion/speculation.ts
@@ -197,7 +197,9 @@ function getBoundaryDetail(
 function isUserMessageWithArrayContent(
   m: Message,
 ): m is Message & { message: { content: unknown[] } } {
-  return m.type === 'user' && 'message' in m && Array.isArray(m.message?.content)
+  return (
+    m.type === 'user' && 'message' in m && Array.isArray(m.message?.content)
+  )
 }
 
 export function prepareMessagesForInjection(messages: Message[]): Message[] {
@@ -254,7 +256,8 @@ export function prepareMessagesForInjection(messages: Message[]): Message[] {
 
   return messages
     .map(msg => {
-      if (!('message' in msg) || !Array.isArray(msg.message?.content)) return msg
+      if (!('message' in msg) || !Array.isArray(msg.message?.content))
+        return msg
       const content = msg.message!.content.filter(keep)
       if (content.length === msg.message!.content.length) return msg
       if (content.length === 0) return null
diff --git a/src/services/SessionMemory/prompts.ts b/src/services/SessionMemory/prompts.ts
index e220736f9..dc889cbe6 100644
--- a/src/services/SessionMemory/prompts.ts
+++ b/src/services/SessionMemory/prompts.ts
@@ -206,9 +206,7 @@ function substituteVariables(
   // (replacer fn treats $ literally), and (2) double-substitution when user
   // content happens to contain {{varName}} matching a later variable.
   return template.replace(/\{\{(\w+)\}\}/g, (match, key: string) =>
-    Object.prototype.hasOwnProperty.call(variables, key)
-      ? variables[key]!
-      : match,
+    Object.hasOwn(variables, key) ? variables[key]! : match,
   )
 }
 
diff --git a/src/services/analytics/datadog.ts b/src/services/analytics/datadog.ts
index 60bc5a7f7..f456b6458 100644
--- a/src/services/analytics/datadog.ts
+++ b/src/services/analytics/datadog.ts
@@ -16,10 +16,8 @@ import { getEventMetadata } from './metadata.js'
  *   DATADOG_LOGS_ENDPOINT=https://http-intake.logs.datadoghq.com/api/v2/logs
  *   DATADOG_API_KEY=<your-key>
  */
-const DATADOG_LOGS_ENDPOINT =
-  process.env.DATADOG_LOGS_ENDPOINT ?? ''
-const DATADOG_CLIENT_TOKEN =
-  process.env.DATADOG_API_KEY ?? ''
+const DATADOG_LOGS_ENDPOINT = process.env.DATADOG_LOGS_ENDPOINT ?? ''
+const DATADOG_CLIENT_TOKEN = process.env.DATADOG_API_KEY ?? ''
 const DEFAULT_FLUSH_INTERVAL_MS = 15000
 const MAX_BATCH_SIZE = 100
 const NETWORK_TIMEOUT_MS = 5000
diff --git a/src/services/analytics/firstPartyEventLogger.ts b/src/services/analytics/firstPartyEventLogger.ts
index e3a501d74..b54c43e12 100644
--- a/src/services/analytics/firstPartyEventLogger.ts
+++ b/src/services/analytics/firstPartyEventLogger.ts
@@ -331,6 +331,7 @@ export function initialize1PEventLogging(): void {
     parseInt(
       process.env.OTEL_LOGS_EXPORT_INTERVAL ||
         DEFAULT_LOGS_EXPORT_INTERVAL_MS.toString(),
+      10,
     )
 
   const maxExportBatchSize =
diff --git a/src/services/analytics/firstPartyEventLoggingExporter.ts b/src/services/analytics/firstPartyEventLoggingExporter.ts
index 99c559114..b0cf489c1 100644
--- a/src/services/analytics/firstPartyEventLoggingExporter.ts
+++ b/src/services/analytics/firstPartyEventLoggingExporter.ts
@@ -673,7 +673,9 @@ export class FirstPartyEventLoggingExporter implements LogRecordExporter {
         (attributes.event_name as string) || (log.body as string) || 'unknown'
 
       // Extract metadata objects directly (no JSON parsing needed)
-      const coreMetadata = attributes.core_metadata as unknown as EventMetadata | undefined
+      const coreMetadata = attributes.core_metadata as unknown as
+        | EventMetadata
+        | undefined
       const userMetadata = attributes.user_metadata as CoreUserData
       const eventMetadata = (attributes.event_metadata || {}) as Record<
         string,
diff --git a/src/services/analytics/metadata.ts b/src/services/analytics/metadata.ts
index b83e96aa3..7d0a7e124 100644
--- a/src/services/analytics/metadata.ts
+++ b/src/services/analytics/metadata.ts
@@ -742,7 +742,6 @@ export async function getEventMetadata(
   return metadata
 }
 
-
 /**
  * Core event metadata for 1P event logging (snake_case format).
  */
diff --git a/src/services/analytics/sink.ts b/src/services/analytics/sink.ts
index a7b702127..76e3b2c55 100644
--- a/src/services/analytics/sink.ts
+++ b/src/services/analytics/sink.ts
@@ -20,7 +20,7 @@ type LogEventMetadata = { [key: string]: boolean | number | undefined }
 const DATADOG_GATE_NAME = 'tengu_log_datadog_events'
 
 // Module-level gate state - starts undefined, initialized during startup
-let isDatadogGateEnabled: boolean | undefined = undefined
+let isDatadogGateEnabled: boolean | undefined
 
 /**
  * Check if Datadog tracking is enabled.
diff --git a/src/services/analytics/src/utils/user.ts b/src/services/analytics/src/utils/user.ts
index be2aa4592..99181f2d7 100644
--- a/src/services/analytics/src/utils/user.ts
+++ b/src/services/analytics/src/utils/user.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type CoreUserData = any;
+export type CoreUserData = any
diff --git a/src/services/api/claude.ts b/src/services/api/claude.ts
index 8b3c0e622..7c4d78ba3 100644
--- a/src/services/api/claude.ts
+++ b/src/services/api/claude.ts
@@ -230,7 +230,10 @@ import { getInitializationStatus } from '../lsp/manager.js'
 import { isToolFromMcpServer } from '../mcp/utils.js'
 import { recordLLMObservation } from '../langfuse/index.js'
 import type { LangfuseSpan } from '../langfuse/index.js'
-import { convertMessagesToLangfuse, convertOutputToLangfuse } from '../langfuse/convert.js'
+import {
+  convertMessagesToLangfuse,
+  convertOutputToLangfuse,
+} from '../langfuse/convert.js'
 import { withStreamingVCR, withVCR } from '../vcr.js'
 import { CLIENT_REQUEST_ID_HEADER, getAnthropicClient } from './client.js'
 import {
@@ -442,7 +445,7 @@ function configureEffortParams(
     betas.push(EFFORT_BETA_HEADER)
   } else if (typeof effortValue === 'string') {
     // Send string effort level as is
-    outputConfig.effort = effortValue as "high" | "medium" | "low" | "max"
+    outputConfig.effort = effortValue as 'high' | 'medium' | 'low' | 'max'
     betas.push(EFFORT_BETA_HEADER)
   } else if (process.env.USER_TYPE === 'ant') {
     // Numeric effort override - ant-only (uses anthropic_internal)
@@ -541,7 +544,6 @@ export async function verifyApiKey(
           }),
         async anthropic => {
           const messages: MessageParam[] = [{ role: 'user', content: 'test' }]
-          // biome-ignore lint/plugin: API key verification is intentionally a minimal direct call
           await anthropic.beta.messages.create({
             model,
             max_tokens: 1,
@@ -616,7 +618,8 @@ export function userMessageToMessageParam(
     role: 'user',
     content: (Array.isArray(message.message!.content)
       ? [...message.message!.content]
-      : message.message!.content) as import('@anthropic-ai/sdk/resources/beta/messages/messages.js').BetaContentBlockParam[],
+      : message.message!
+          .content) as import('@anthropic-ai/sdk/resources/beta/messages/messages.js').BetaContentBlockParam[],
   }
 }
 
@@ -667,7 +670,9 @@ export function assistantMessageToMessageParam(
     content:
       typeof message.message!.content === 'string'
         ? message.message!.content
-        : message.message!.content!.map(stripGeminiProviderMetadata) as BetaContentBlockParam[],
+        : (message.message!.content!.map(
+            stripGeminiProviderMetadata,
+          ) as BetaContentBlockParam[]),
   }
 }
 
@@ -682,10 +687,8 @@ function stripGeminiProviderMetadata<T extends BetaContentBlockParam | string>(
   }
 
   const obj = contentBlock as unknown as Record<string, unknown>
-  const {
-    _geminiThoughtSignature: _unusedGeminiThoughtSignature,
-    ...rest
-  } = obj
+  const { _geminiThoughtSignature: _unusedGeminiThoughtSignature, ...rest } =
+    obj
   return rest as unknown as T
 }
 
@@ -878,7 +881,6 @@ export async function* executeNonStreamingRequest(
       )
 
       try {
-        // biome-ignore lint/plugin: non-streaming API call
         return await anthropic.beta.messages.create(
           {
             ...adjustedParams,
@@ -1337,7 +1339,13 @@ async function* queryModel(
   // media stripping) but before Anthropic-specific logic (betas, thinking, caching).
   if (getAPIProvider() === 'openai') {
     const { queryModelOpenAI } = await import('./openai/index.js')
-    yield* queryModelOpenAI(messagesForAPI, systemPrompt, filteredTools, signal, options)
+    yield* queryModelOpenAI(
+      messagesForAPI,
+      systemPrompt,
+      filteredTools,
+      signal,
+      options,
+    )
     return
   }
 
@@ -1356,7 +1364,13 @@ async function* queryModel(
 
   if (getAPIProvider() === 'grok') {
     const { queryModelGrok } = await import('./grok/index.js')
-    yield* queryModelGrok(messagesForAPI, systemPrompt, filteredTools, signal, options)
+    yield* queryModelGrok(
+      messagesForAPI,
+      systemPrompt,
+      filteredTools,
+      signal,
+      options,
+    )
     return
   }
 
@@ -1552,11 +1566,11 @@ async function* queryModel(
   let start = Date.now()
   let attemptNumber = 0
   const attemptStartTimes: number[] = []
-  let stream: Stream<BetaRawMessageStreamEvent> | undefined = undefined
-  let streamRequestId: string | null | undefined = undefined
-  let clientRequestId: string | undefined = undefined
+  let stream: Stream<BetaRawMessageStreamEvent> | undefined
+  let streamRequestId: string | null | undefined
+  let clientRequestId: string | undefined
   // eslint-disable-next-line eslint-plugin-n/no-unsupported-features/node-builtins -- Response is available in Node 18+ and is used by the SDK
-  let streamResponse: Response | undefined = undefined
+  let streamResponse: Response | undefined
 
   // Release all stream resources to prevent native memory leaks.
   // The Response object holds native TLS/socket buffers that live outside the
@@ -1642,7 +1656,7 @@ async function* queryModel(
     const hasThinking =
       thinkingConfig.type !== 'disabled' &&
       !isEnvTruthy(process.env.CLAUDE_CODE_DISABLE_THINKING)
-    let thinking: BetaMessageStreamParams['thinking'] | undefined = undefined
+    let thinking: BetaMessageStreamParams['thinking'] | undefined
 
     // IMPORTANT: Do not change the adaptive-vs-budget thinking selection below
     // without notifying the model launch DRI and research. This is a sensitive
@@ -1806,7 +1820,7 @@ async function* queryModel(
 
   const newMessages: AssistantMessage[] = []
   let ttftMs = 0
-  let partialMessage: BetaMessage | undefined = undefined
+  let partialMessage: BetaMessage | undefined
   const contentBlocks: (BetaContentBlock | ConnectorTextBlock)[] = []
   let usage: NonNullableUsage = EMPTY_USAGE
   let costUSD = 0
@@ -1814,8 +1828,8 @@ async function* queryModel(
   let didFallBackToNonStreaming = false
   let fallbackMessage: AssistantMessage | undefined
   let maxOutputTokens = 0
-  let responseHeaders: globalThis.Headers | undefined = undefined
-  let research: unknown = undefined
+  let responseHeaders: globalThis.Headers | undefined
+  let research: unknown
   let isFastModeRequest = isFastMode // Keep separate state as it may change if falling back
   let isAdvisorInProgress = false
 
@@ -1864,7 +1878,6 @@ async function* queryModel(
         // Use raw stream instead of BetaMessageStream to avoid O(n²) partial JSON parsing
         // BetaMessageStream calls partialParse() on every input_json_delta, which we don't need
         // since we handle tool input accumulation ourselves
-        // biome-ignore lint/plugin: main conversation loop handles attribution separately
         const result = await anthropic.beta.messages
           .create(
             { ...params, stream: true },
@@ -2124,7 +2137,8 @@ async function* queryModel(
                 })
                 throw new Error('Content block is not a connector_text block')
               }
-              ;(contentBlock as { connector_text: string }).connector_text += delta.connector_text
+              ;(contentBlock as { connector_text: string }).connector_text +=
+                delta.connector_text
             } else {
               switch (delta.type) {
                 case 'citations_delta':
@@ -2203,7 +2217,8 @@ async function* queryModel(
                     })
                     throw new Error('Content block is not a thinking block')
                   }
-                  ;(contentBlock as { thinking: string }).thinking += delta.thinking
+                  ;(contentBlock as { thinking: string }).thinking +=
+                    delta.thinking
                   break
               }
             }
@@ -2294,7 +2309,10 @@ async function* queryModel(
             }
 
             // Update cost
-            const costUSDForPart = calculateUSDCost(resolvedModel, usage as unknown as BetaUsage)
+            const costUSDForPart = calculateUSDCost(
+              resolvedModel,
+              usage as unknown as BetaUsage,
+            )
             costUSD += addToTotalSessionCost(
               costUSDForPart,
               usage as unknown as BetaUsage,
@@ -2864,10 +2882,14 @@ async function* queryModel(
     // message_delta handler before any yield. Fallback pushes to newMessages
     // then yields, so tracking must be here to survive .return() at the yield.
     if (fallbackMessage) {
-      const fallbackUsage = fallbackMessage.message.usage as BetaMessageDeltaUsage
+      const fallbackUsage = fallbackMessage.message
+        .usage as BetaMessageDeltaUsage
       usage = updateUsage(EMPTY_USAGE, fallbackUsage)
       stopReason = fallbackMessage.message.stop_reason as BetaStopReason
-      const fallbackCost = calculateUSDCost(resolvedModel, fallbackUsage as unknown as BetaUsage)
+      const fallbackCost = calculateUSDCost(
+        resolvedModel,
+        fallbackUsage as unknown as BetaUsage,
+      )
       costUSD += addToTotalSessionCost(
         fallbackCost,
         fallbackUsage as unknown as BetaUsage,
@@ -2921,7 +2943,9 @@ async function* queryModel(
   void options.getToolPermissionContext().then(permissionContext => {
     logAPISuccessAndDuration({
       model:
-        (newMessages[0]?.message.model as string | undefined) ?? partialMessage?.model ?? options.model,
+        (newMessages[0]?.message.model as string | undefined) ??
+        partialMessage?.model ??
+        options.model,
       preNormalizedModel: options.model,
       usage,
       start,
diff --git a/src/services/api/client.ts b/src/services/api/client.ts
index 166eaadf3..9f862b7ec 100644
--- a/src/services/api/client.ts
+++ b/src/services/api/client.ts
@@ -73,14 +73,10 @@ import {
 function createStderrLogger(): ClientOptions['logger'] {
   return {
     error: (msg, ...args) =>
-      // biome-ignore lint/suspicious/noConsole:: intentional console output -- SDK logger must use console
       console.error('[Anthropic SDK ERROR]', msg, ...args),
-    // biome-ignore lint/suspicious/noConsole:: intentional console output -- SDK logger must use console
     warn: (msg, ...args) => console.error('[Anthropic SDK WARN]', msg, ...args),
-    // biome-ignore lint/suspicious/noConsole:: intentional console output -- SDK logger must use console
     info: (msg, ...args) => console.error('[Anthropic SDK INFO]', msg, ...args),
     debug: (msg, ...args) =>
-      // biome-ignore lint/suspicious/noConsole:: intentional console output -- SDK logger must use console
       console.error('[Anthropic SDK DEBUG]', msg, ...args),
   }
 }
diff --git a/src/services/api/filesApi.ts b/src/services/api/filesApi.ts
index 71b896bee..94096fd71 100644
--- a/src/services/api/filesApi.ts
+++ b/src/services/api/filesApi.ts
@@ -113,7 +113,7 @@ async function retryWithBackoff<T>(
     )
 
     if (attempt < MAX_RETRIES) {
-      const delayMs = BASE_DELAY_MS * Math.pow(2, attempt - 1)
+      const delayMs = BASE_DELAY_MS * 2 ** (attempt - 1)
       logDebug(`Retrying ${operation} in ${delayMs}ms...`)
       await sleep(delayMs)
     }
diff --git a/src/services/api/gemini/__tests__/convertMessages.test.ts b/src/services/api/gemini/__tests__/convertMessages.test.ts
index 63a9cf60a..20b208ffa 100644
--- a/src/services/api/gemini/__tests__/convertMessages.test.ts
+++ b/src/services/api/gemini/__tests__/convertMessages.test.ts
@@ -23,10 +23,9 @@ function makeAssistantMsg(content: string | any[]): AssistantMessage {
 
 describe('anthropicMessagesToGemini', () => {
   test('converts system prompt to systemInstruction', () => {
-    const result = anthropicMessagesToGemini(
-      [makeUserMsg('hello')],
-      ['You are helpful.'] as any,
-    )
+    const result = anthropicMessagesToGemini([makeUserMsg('hello')], [
+      'You are helpful.',
+    ] as any)
 
     expect(result.systemInstruction).toEqual({
       parts: [{ text: 'You are helpful.' }],
@@ -202,17 +201,19 @@ describe('anthropicMessagesToGemini', () => {
 
   test('converts base64 image to inlineData', () => {
     const result = anthropicMessagesToGemini(
-      [makeUserMsg([
-        { type: 'text', text: 'describe this' },
-        {
-          type: 'image',
-          source: {
-            type: 'base64',
-            media_type: 'image/png',
-            data: 'iVBORw0KGgo=',
+      [
+        makeUserMsg([
+          { type: 'text', text: 'describe this' },
+          {
+            type: 'image',
+            source: {
+              type: 'base64',
+              media_type: 'image/png',
+              data: 'iVBORw0KGgo=',
+            },
           },
-        },
-      ])],
+        ]),
+      ],
       [] as any,
     )
     expect(result.contents).toEqual([
@@ -228,15 +229,17 @@ describe('anthropicMessagesToGemini', () => {
 
   test('converts url image to text fallback', () => {
     const result = anthropicMessagesToGemini(
-      [makeUserMsg([
-        {
-          type: 'image',
-          source: {
-            type: 'url',
-            url: 'https://example.com/img.png',
+      [
+        makeUserMsg([
+          {
+            type: 'image',
+            source: {
+              type: 'url',
+              url: 'https://example.com/img.png',
+            },
           },
-        },
-      ])],
+        ]),
+      ],
       [] as any,
     )
     expect(result.contents).toEqual([
@@ -249,15 +252,17 @@ describe('anthropicMessagesToGemini', () => {
 
   test('defaults to image/png when media_type is missing', () => {
     const result = anthropicMessagesToGemini(
-      [makeUserMsg([
-        {
-          type: 'image',
-          source: {
-            type: 'base64',
-            data: 'ABC123',
+      [
+        makeUserMsg([
+          {
+            type: 'image',
+            source: {
+              type: 'base64',
+              data: 'ABC123',
+            },
           },
-        },
-      ])],
+        ]),
+      ],
       [] as any,
     )
     expect(result.contents[0].parts[0]).toEqual({
diff --git a/src/services/api/gemini/__tests__/convertTools.test.ts b/src/services/api/gemini/__tests__/convertTools.test.ts
index 999f362cd..8aae1c20f 100644
--- a/src/services/api/gemini/__tests__/convertTools.test.ts
+++ b/src/services/api/gemini/__tests__/convertTools.test.ts
@@ -120,11 +120,11 @@ describe('anthropicToolChoiceToGemini', () => {
   })
 
   test('maps explicit tool choice', () => {
-    expect(
-      anthropicToolChoiceToGemini({ type: 'tool', name: 'bash' }),
-    ).toEqual({
-      mode: 'ANY',
-      allowedFunctionNames: ['bash'],
-    })
+    expect(anthropicToolChoiceToGemini({ type: 'tool', name: 'bash' })).toEqual(
+      {
+        mode: 'ANY',
+        allowedFunctionNames: ['bash'],
+      },
+    )
   })
 })
diff --git a/src/services/api/gemini/__tests__/streamAdapter.test.ts b/src/services/api/gemini/__tests__/streamAdapter.test.ts
index d7b42229f..2ac8836d8 100644
--- a/src/services/api/gemini/__tests__/streamAdapter.test.ts
+++ b/src/services/api/gemini/__tests__/streamAdapter.test.ts
@@ -57,7 +57,8 @@ describe('adaptGeminiStreamToAnthropic', () => {
 
     const textDeltas = events.filter(
       event =>
-        event.type === 'content_block_delta' && event.delta.type === 'text_delta',
+        event.type === 'content_block_delta' &&
+        event.delta.type === 'text_delta',
     )
 
     expect(events[0].type).toBe('message_start')
@@ -92,7 +93,9 @@ describe('adaptGeminiStreamToAnthropic', () => {
       },
     ])
 
-    const blockStart = events.find(event => event.type === 'content_block_start')
+    const blockStart = events.find(
+      event => event.type === 'content_block_start',
+    )
     expect(blockStart.content_block.type).toBe('thinking')
 
     const signatureDelta = events.find(
@@ -125,7 +128,9 @@ describe('adaptGeminiStreamToAnthropic', () => {
       },
     ])
 
-    const blockStart = events.find(event => event.type === 'content_block_start')
+    const blockStart = events.find(
+      event => event.type === 'content_block_start',
+    )
     expect(blockStart.content_block.type).toBe('tool_use')
     expect(blockStart.content_block.name).toBe('bash')
 
diff --git a/src/services/api/gemini/convertMessages.ts b/src/services/api/gemini/convertMessages.ts
index 0bdf22223..081964778 100644
--- a/src/services/api/gemini/convertMessages.ts
+++ b/src/services/api/gemini/convertMessages.ts
@@ -84,7 +84,10 @@ function convertInternalUserMessage(
   return {
     role: 'user',
     parts: content.flatMap(block =>
-      convertUserContentBlockToGeminiParts(block as unknown as string | Record<string, unknown>, toolNamesById),
+      convertUserContentBlockToGeminiParts(
+        block as unknown as string | Record<string, unknown>,
+        toolNamesById,
+      ),
     ),
   }
 }
@@ -106,7 +109,8 @@ function convertUserContentBlockToGeminiParts(
     return [
       {
         functionResponse: {
-          name: toolNamesById.get(toolResult.tool_use_id) ?? toolResult.tool_use_id,
+          name:
+            toolNamesById.get(toolResult.tool_use_id) ?? toolResult.tool_use_id,
           response: toolResultToResponseObject(toolResult),
         },
       },
@@ -161,7 +165,9 @@ function convertInternalAssistantMessage(msg: AssistantMessage): GeminiContent {
       parts.push(
         ...createTextGeminiParts(
           block.text,
-          getGeminiThoughtSignature(block as unknown as Record<string, unknown>),
+          getGeminiThoughtSignature(
+            block as unknown as Record<string, unknown>,
+          ),
         ),
       )
       continue
@@ -185,8 +191,12 @@ function convertInternalAssistantMessage(msg: AssistantMessage): GeminiContent {
           name: toolUse.name,
           args: normalizeToolUseInput(toolUse.input),
         },
-        ...(getGeminiThoughtSignature(block as unknown as Record<string, unknown>) && {
-          thoughtSignature: getGeminiThoughtSignature(block as unknown as Record<string, unknown>),
+        ...(getGeminiThoughtSignature(
+          block as unknown as Record<string, unknown>,
+        ) && {
+          thoughtSignature: getGeminiThoughtSignature(
+            block as unknown as Record<string, unknown>,
+          ),
         }),
       })
     }
@@ -246,12 +256,10 @@ function toolResultToResponseObject(
   block: BetaToolResultBlockParam,
 ): Record<string, unknown> {
   const result = normalizeToolResultContent(block.content)
-  if (
-    result &&
-    typeof result === 'object' &&
-    !Array.isArray(result)
-  ) {
-    return block.is_error ? { ...(result as Record<string, unknown>), is_error: true } : result as Record<string, unknown>
+  if (result && typeof result === 'object' && !Array.isArray(result)) {
+    return block.is_error
+      ? { ...(result as Record<string, unknown>), is_error: true }
+      : (result as Record<string, unknown>)
   }
 
   return {
@@ -290,7 +298,9 @@ function normalizeToolResultContent(content: unknown): unknown {
   return content ?? ''
 }
 
-function getGeminiThoughtSignature(block: Record<string, unknown>): string | undefined {
+function getGeminiThoughtSignature(
+  block: Record<string, unknown>,
+): string | undefined {
   const signature = block[GEMINI_THOUGHT_SIGNATURE_FIELD]
   return typeof signature === 'string' && signature.length > 0
     ? signature
diff --git a/src/services/api/gemini/convertTools.ts b/src/services/api/gemini/convertTools.ts
index 7f6fc82c5..0473174c6 100644
--- a/src/services/api/gemini/convertTools.ts
+++ b/src/services/api/gemini/convertTools.ts
@@ -1,8 +1,5 @@
 import type { BetaToolUnion } from '@anthropic-ai/sdk/resources/beta/messages/messages.mjs'
-import type {
-  GeminiFunctionCallingConfig,
-  GeminiTool,
-} from './types.js'
+import type { GeminiFunctionCallingConfig, GeminiTool } from './types.js'
 
 const GEMINI_JSON_SCHEMA_TYPES = new Set([
   'string',
@@ -34,7 +31,9 @@ function normalizeGeminiJsonSchemaType(
   return undefined
 }
 
-function inferGeminiJsonSchemaTypeFromValue(value: unknown): string | undefined {
+function inferGeminiJsonSchemaTypeFromValue(
+  value: unknown,
+): string | undefined {
   if (value === null) return 'null'
   if (Array.isArray(value)) return 'array'
   if (typeof value === 'string') return 'string'
@@ -97,9 +96,7 @@ function sanitizeGeminiJsonSchemaArray(
   return sanitized.length > 0 ? sanitized : undefined
 }
 
-function sanitizeGeminiJsonSchema(
-  schema: unknown,
-): Record<string, unknown> {
+function sanitizeGeminiJsonSchema(schema: unknown): Record<string, unknown> {
   if (!schema || typeof schema !== 'object' || Array.isArray(schema)) {
     return {}
   }
@@ -236,17 +233,20 @@ export function anthropicToolsToGemini(tools: BetaToolUnion[]): GeminiTool[] {
   const functionDeclarations = tools
     .filter(tool => {
       const toolType = (tool as unknown as { type?: string }).type
-      return tool.type === 'custom' || !('type' in tool) || toolType !== 'server'
+      return (
+        tool.type === 'custom' || !('type' in tool) || toolType !== 'server'
+      )
     })
     .map(tool => {
       const anyTool = tool as unknown as Record<string, unknown>
       const name = (anyTool.name as string) || ''
       const description = (anyTool.description as string) || ''
-      const inputSchema =
-        (anyTool.input_schema as Record<string, unknown> | undefined) ?? {
-          type: 'object',
-          properties: {},
-        }
+      const inputSchema = (anyTool.input_schema as
+        | Record<string, unknown>
+        | undefined) ?? {
+        type: 'object',
+        properties: {},
+      }
 
       return {
         name,
@@ -255,9 +255,7 @@ export function anthropicToolsToGemini(tools: BetaToolUnion[]): GeminiTool[] {
       }
     })
 
-  return functionDeclarations.length > 0
-    ? [{ functionDeclarations }]
-    : []
+  return functionDeclarations.length > 0 ? [{ functionDeclarations }] : []
 }
 
 export function anthropicToolChoiceToGemini(
diff --git a/src/services/api/gemini/index.ts b/src/services/api/gemini/index.ts
index 1b887878e..c0d70103f 100644
--- a/src/services/api/gemini/index.ts
+++ b/src/services/api/gemini/index.ts
@@ -107,7 +107,7 @@ export async function* queryModelGemini(
 
     const adaptedStream = adaptGeminiStreamToAnthropic(stream, geminiModel)
     const contentBlocks: Record<number, any> = {}
-    let partialMessage: any = undefined
+    let partialMessage: any
     let ttftMs = 0
     const start = Date.now()
 
@@ -187,7 +187,9 @@ export async function* queryModelGemini(
     yield createAssistantAPIErrorMessage({
       content: `API Error: ${errorMessage}`,
       apiError: 'api_error',
-      error: (error instanceof Error ? error : new Error(String(error))) as unknown as SDKAssistantMessageError,
+      error: (error instanceof Error
+        ? error
+        : new Error(String(error))) as unknown as SDKAssistantMessageError,
     })
   }
 }
diff --git a/src/services/api/gemini/streamAdapter.ts b/src/services/api/gemini/streamAdapter.ts
index d40980e04..9095b6da0 100644
--- a/src/services/api/gemini/streamAdapter.ts
+++ b/src/services/api/gemini/streamAdapter.ts
@@ -10,9 +10,8 @@ export async function* adaptGeminiStreamToAnthropic(
   let started = false
   let stopped = false
   let nextContentIndex = 0
-  let openTextLikeBlock:
-    | { index: number; type: 'text' | 'thinking' }
-    | null = null
+  let openTextLikeBlock: { index: number; type: 'text' | 'thinking' } | null =
+    null
   let sawToolUse = false
   let finishReason: string | undefined
   let inputTokens = 0
@@ -85,7 +84,10 @@ export async function* adaptGeminiStreamToAnthropic(
           } as BetaRawMessageStreamEvent
         }
 
-        if (part.functionCall.args && Object.keys(part.functionCall.args).length > 0) {
+        if (
+          part.functionCall.args &&
+          Object.keys(part.functionCall.args).length > 0
+        ) {
           yield {
             type: 'content_block_delta',
             index: toolIndex,
@@ -213,9 +215,7 @@ export async function* adaptGeminiStreamToAnthropic(
   }
 }
 
-function getTextLikeBlockType(
-  part: GeminiPart,
-): 'text' | 'thinking' | null {
+function getTextLikeBlockType(part: GeminiPart): 'text' | 'thinking' | null {
   if (typeof part.text !== 'string') {
     return null
   }
diff --git a/src/services/api/grok/__tests__/modelMapping.test.ts b/src/services/api/grok/__tests__/modelMapping.test.ts
index 168f236fa..84253dac4 100644
--- a/src/services/api/grok/__tests__/modelMapping.test.ts
+++ b/src/services/api/grok/__tests__/modelMapping.test.ts
@@ -33,11 +33,14 @@ describe('resolveGrokModel', () => {
   })
 
   test('maps haiku models to grok-3-mini-fast', () => {
-    expect(resolveGrokModel('claude-haiku-4-5-20251001')).toBe('grok-3-mini-fast')
+    expect(resolveGrokModel('claude-haiku-4-5-20251001')).toBe(
+      'grok-3-mini-fast',
+    )
   })
 
   test('GROK_MODEL_MAP overrides family mapping', () => {
-    process.env.GROK_MODEL_MAP = '{"opus":"grok-4","sonnet":"grok-3","haiku":"grok-mini"}'
+    process.env.GROK_MODEL_MAP =
+      '{"opus":"grok-4","sonnet":"grok-3","haiku":"grok-mini"}'
     expect(resolveGrokModel('claude-opus-4-6')).toBe('grok-4')
     expect(resolveGrokModel('claude-sonnet-4-6')).toBe('grok-3')
     expect(resolveGrokModel('claude-haiku-4-5-20251001')).toBe('grok-mini')
@@ -62,6 +65,8 @@ describe('resolveGrokModel', () => {
   })
 
   test('falls back to family default for unlisted model', () => {
-    expect(resolveGrokModel('claude-opus-99-20300101')).toBe('grok-4.20-reasoning')
+    expect(resolveGrokModel('claude-opus-99-20300101')).toBe(
+      'grok-4.20-reasoning',
+    )
   })
 })
diff --git a/src/services/api/grok/index.ts b/src/services/api/grok/index.ts
index 3198e85f6..26bc511e9 100644
--- a/src/services/api/grok/index.ts
+++ b/src/services/api/grok/index.ts
@@ -1,6 +1,11 @@
 import type { BetaToolUnion } from '@anthropic-ai/sdk/resources/beta/messages/messages.mjs'
 import type { SystemPrompt } from '../../../utils/systemPromptType.js'
-import type { Message, StreamEvent, SystemAPIErrorMessage, AssistantMessage } from '../../../types/message.js'
+import type {
+  Message,
+  StreamEvent,
+  SystemAPIErrorMessage,
+  AssistantMessage,
+} from '../../../types/message.js'
 import type { Tools } from '../../../Tool.js'
 import type {
   ChatCompletionChunk,
@@ -8,7 +13,10 @@ import type {
 } from 'openai/resources/chat/completions/completions.mjs'
 import { getGrokClient } from './client.js'
 import { anthropicMessagesToOpenAI } from '../openai/convertMessages.js'
-import { anthropicToolsToOpenAI, anthropicToolChoiceToOpenAI } from '../openai/convertTools.js'
+import {
+  anthropicToolsToOpenAI,
+  anthropicToolChoiceToOpenAI,
+} from '../openai/convertTools.js'
 import { adaptOpenAIStreamToAnthropic } from '../openai/streamAdapter.js'
 import { resolveGrokModel } from './modelMapping.js'
 import { normalizeMessagesForAPI } from '../../../utils/messages.js'
@@ -57,11 +65,16 @@ export async function* queryModelGrok(
     const standardTools = toolSchemas.filter(
       (t): t is BetaToolUnion & { type: string } => {
         const anyT = t as unknown as Record<string, unknown>
-        return anyT.type !== 'advisor_20260301' && anyT.type !== 'computer_20250124'
+        return (
+          anyT.type !== 'advisor_20260301' && anyT.type !== 'computer_20250124'
+        )
       },
     )
 
-    const openaiMessages = anthropicMessagesToOpenAI(messagesForAPI, systemPrompt)
+    const openaiMessages = anthropicMessagesToOpenAI(
+      messagesForAPI,
+      systemPrompt,
+    )
     const openaiTools = anthropicToolsToOpenAI(standardTools)
     const openaiToolChoice = anthropicToolChoiceToOpenAI(options.toolChoice)
 
@@ -71,7 +84,9 @@ export async function* queryModelGrok(
       source: options.querySource,
     })
 
-    logForDebugging(`[Grok] Calling model=${grokModel}, messages=${openaiMessages.length}, tools=${openaiTools.length}`)
+    logForDebugging(
+      `[Grok] Calling model=${grokModel}, messages=${openaiMessages.length}, tools=${openaiTools.length}`,
+    )
 
     const stream = await client.chat.completions.create(
       {
@@ -92,10 +107,13 @@ export async function* queryModelGrok(
       },
     )
 
-    const adaptedStream = adaptOpenAIStreamToAnthropic(stream as AsyncIterable<ChatCompletionChunk>, grokModel)
+    const adaptedStream = adaptOpenAIStreamToAnthropic(
+      stream as AsyncIterable<ChatCompletionChunk>,
+      grokModel,
+    )
 
     const contentBlocks: Record<number, any> = {}
-    let partialMessage: any = undefined
+    let partialMessage: any
     let usage = {
       input_tokens: 0,
       output_tokens: 0,
@@ -111,7 +129,7 @@ export async function* queryModelGrok(
           partialMessage = (event as any).message
           ttftMs = Date.now() - start
           if ((event as any).message?.usage) {
-            usage = { ...usage, ...((event as any).message.usage) }
+            usage = { ...usage, ...(event as any).message.usage }
           }
           break
         }
@@ -174,7 +192,10 @@ export async function* queryModelGrok(
           break
       }
 
-      if (event.type === 'message_stop' && usage.input_tokens + usage.output_tokens > 0) {
+      if (
+        event.type === 'message_stop' &&
+        usage.input_tokens + usage.output_tokens > 0
+      ) {
         const costUSD = calculateUSDCost(grokModel, usage as any)
         addToTotalSessionCost(costUSD, usage as any, options.model)
       }
@@ -191,7 +212,9 @@ export async function* queryModelGrok(
     yield createAssistantAPIErrorMessage({
       content: `API Error: ${errorMessage}`,
       apiError: 'api_error',
-      error: (error instanceof Error ? error : new Error(String(error))) as unknown as SDKAssistantMessageError,
+      error: (error instanceof Error
+        ? error
+        : new Error(String(error))) as unknown as SDKAssistantMessageError,
     })
   }
 }
diff --git a/src/services/api/logging.ts b/src/services/api/logging.ts
index 821ce688a..c68708952 100644
--- a/src/services/api/logging.ts
+++ b/src/services/api/logging.ts
@@ -377,7 +377,7 @@ export function logAPIError({
   // Pass the span to correctly match responses to requests when beta tracing is enabled
   endLLMRequestSpan(llmSpan, {
     success: false,
-    statusCode: status ? parseInt(status) : undefined,
+    statusCode: status ? parseInt(status, 10) : undefined,
     error: errStr,
     attempt,
   })
@@ -656,7 +656,9 @@ export function logAPISuccessAndDuration({
     let connectorCount = 0
 
     for (const msg of newMessages) {
-      const contentArr = Array.isArray(msg.message.content) ? msg.message.content : []
+      const contentArr = Array.isArray(msg.message.content)
+        ? msg.message.content
+        : []
       for (const block of contentArr) {
         if (typeof block === 'string') continue
         if (block.type === 'text') {
@@ -664,14 +666,19 @@ export function logAPISuccessAndDuration({
         } else if (feature('CONNECTOR_TEXT') && isConnectorTextBlock(block)) {
           connectorCount++
         } else if (block.type === 'thinking') {
-          thinkingLen += (block as { type: 'thinking'; thinking: string }).thinking.length
+          thinkingLen += (block as { type: 'thinking'; thinking: string })
+            .thinking.length
         } else if (
           block.type === 'tool_use' ||
           block.type === 'server_tool_use' ||
           (block.type as string) === 'mcp_tool_use'
         ) {
-          const inputLen = jsonStringify((block as { input: unknown }).input).length
-          const sanitizedName = sanitizeToolNameForAnalytics((block as { name: string }).name)
+          const inputLen = jsonStringify(
+            (block as { input: unknown }).input,
+          ).length
+          const sanitizedName = sanitizeToolNameForAnalytics(
+            (block as { name: string }).name,
+          )
           toolLengths[sanitizedName] =
             (toolLengths[sanitizedName] ?? 0) + inputLen
           hasToolUse = true
diff --git a/src/services/api/openai/__tests__/convertMessages.test.ts b/src/services/api/openai/__tests__/convertMessages.test.ts
index 39811c7c8..e838af11f 100644
--- a/src/services/api/openai/__tests__/convertMessages.test.ts
+++ b/src/services/api/openai/__tests__/convertMessages.test.ts
@@ -1,6 +1,9 @@
 import { describe, expect, test } from 'bun:test'
 import { anthropicMessagesToOpenAI } from '../convertMessages.js'
-import type { UserMessage, AssistantMessage } from '../../../../types/message.js'
+import type {
+  UserMessage,
+  AssistantMessage,
+} from '../../../../types/message.js'
 
 // Helpers to create internal-format messages
 function makeUserMsg(content: string | any[]): UserMessage {
@@ -21,26 +24,22 @@ function makeAssistantMsg(content: string | any[]): AssistantMessage {
 
 describe('anthropicMessagesToOpenAI', () => {
   test('converts system prompt to system message', () => {
-    const result = anthropicMessagesToOpenAI(
-      [makeUserMsg('hello')],
-      ['You are helpful.'] as any,
-    )
+    const result = anthropicMessagesToOpenAI([makeUserMsg('hello')], [
+      'You are helpful.',
+    ] as any)
     expect(result[0]).toEqual({ role: 'system', content: 'You are helpful.' })
   })
 
   test('joins multiple system prompt strings', () => {
-    const result = anthropicMessagesToOpenAI(
-      [makeUserMsg('hi')],
-      ['Part 1', 'Part 2'] as any,
-    )
+    const result = anthropicMessagesToOpenAI([makeUserMsg('hi')], [
+      'Part 1',
+      'Part 2',
+    ] as any)
     expect(result[0]).toEqual({ role: 'system', content: 'Part 1\n\nPart 2' })
   })
 
   test('skips empty system prompt', () => {
-    const result = anthropicMessagesToOpenAI(
-      [makeUserMsg('hi')],
-      [] as any,
-    )
+    const result = anthropicMessagesToOpenAI([makeUserMsg('hi')], [] as any)
     expect(result[0].role).toBe('user')
   })
 
@@ -54,10 +53,12 @@ describe('anthropicMessagesToOpenAI', () => {
 
   test('converts user message with content array', () => {
     const result = anthropicMessagesToOpenAI(
-      [makeUserMsg([
-        { type: 'text', text: 'line 1' },
-        { type: 'text', text: 'line 2' },
-      ])],
+      [
+        makeUserMsg([
+          { type: 'text', text: 'line 1' },
+          { type: 'text', text: 'line 2' },
+        ]),
+      ],
       [] as any,
     )
     expect(result).toEqual([{ role: 'user', content: 'line 1\nline 2' }])
@@ -73,52 +74,64 @@ describe('anthropicMessagesToOpenAI', () => {
 
   test('converts assistant message with tool_use', () => {
     const result = anthropicMessagesToOpenAI(
-      [makeAssistantMsg([
-        { type: 'text', text: 'Let me help.' },
-        {
-          type: 'tool_use' as const,
-          id: 'toolu_123',
-          name: 'bash',
-          input: { command: 'ls' },
-        },
-      ])],
+      [
+        makeAssistantMsg([
+          { type: 'text', text: 'Let me help.' },
+          {
+            type: 'tool_use' as const,
+            id: 'toolu_123',
+            name: 'bash',
+            input: { command: 'ls' },
+          },
+        ]),
+      ],
       [] as any,
     )
-    expect(result).toEqual([{
-      role: 'assistant',
-      content: 'Let me help.',
-      tool_calls: [{
-        id: 'toolu_123',
-        type: 'function',
-        function: { name: 'bash', arguments: '{"command":"ls"}' },
-      }],
-    }])
+    expect(result).toEqual([
+      {
+        role: 'assistant',
+        content: 'Let me help.',
+        tool_calls: [
+          {
+            id: 'toolu_123',
+            type: 'function',
+            function: { name: 'bash', arguments: '{"command":"ls"}' },
+          },
+        ],
+      },
+    ])
   })
 
   test('converts tool_result to tool message', () => {
     const result = anthropicMessagesToOpenAI(
-      [makeUserMsg([
-        {
-          type: 'tool_result' as const,
-          tool_use_id: 'toolu_123',
-          content: 'file1.txt\nfile2.txt',
-        },
-      ])],
+      [
+        makeUserMsg([
+          {
+            type: 'tool_result' as const,
+            tool_use_id: 'toolu_123',
+            content: 'file1.txt\nfile2.txt',
+          },
+        ]),
+      ],
       [] as any,
     )
-    expect(result).toEqual([{
-      role: 'tool',
-      tool_call_id: 'toolu_123',
-      content: 'file1.txt\nfile2.txt',
-    }])
+    expect(result).toEqual([
+      {
+        role: 'tool',
+        tool_call_id: 'toolu_123',
+        content: 'file1.txt\nfile2.txt',
+      },
+    ])
   })
 
   test('strips thinking blocks', () => {
     const result = anthropicMessagesToOpenAI(
-      [makeAssistantMsg([
-        { type: 'thinking' as const, thinking: 'internal thoughts...' },
-        { type: 'text', text: 'visible response' },
-      ])],
+      [
+        makeAssistantMsg([
+          { type: 'thinking' as const, thinking: 'internal thoughts...' },
+          { type: 'text', text: 'visible response' },
+        ]),
+      ],
       [] as any,
     )
     expect(result).toEqual([{ role: 'assistant', content: 'visible response' }])
@@ -157,91 +170,105 @@ describe('anthropicMessagesToOpenAI', () => {
 
   test('converts base64 image to image_url', () => {
     const result = anthropicMessagesToOpenAI(
-      [makeUserMsg([
-        { type: 'text', text: 'what is this?' },
-        {
-          type: 'image' as const,
-          source: {
-            type: 'base64',
-            media_type: 'image/png',
-            data: 'iVBORw0KGgo=',
+      [
+        makeUserMsg([
+          { type: 'text', text: 'what is this?' },
+          {
+            type: 'image' as const,
+            source: {
+              type: 'base64',
+              media_type: 'image/png',
+              data: 'iVBORw0KGgo=',
+            },
           },
-        },
-      ])],
+        ]),
+      ],
       [] as any,
     )
-    expect(result).toEqual([{
-      role: 'user',
-      content: [
-        { type: 'text', text: 'what is this?' },
-        {
-          type: 'image_url',
-          image_url: { url: 'data:image/png;base64,iVBORw0KGgo=' },
-        },
-      ],
-    }])
+    expect(result).toEqual([
+      {
+        role: 'user',
+        content: [
+          { type: 'text', text: 'what is this?' },
+          {
+            type: 'image_url',
+            image_url: { url: 'data:image/png;base64,iVBORw0KGgo=' },
+          },
+        ],
+      },
+    ])
   })
 
   test('converts url image to image_url', () => {
     const result = anthropicMessagesToOpenAI(
-      [makeUserMsg([
-        {
-          type: 'image' as const,
-          source: {
-            type: 'url',
-            url: 'https://example.com/img.png',
+      [
+        makeUserMsg([
+          {
+            type: 'image' as const,
+            source: {
+              type: 'url',
+              url: 'https://example.com/img.png',
+            },
           },
-        },
-      ])],
+        ]),
+      ],
       [] as any,
     )
-    expect(result).toEqual([{
-      role: 'user',
-      content: [
-        {
-          type: 'image_url',
-          image_url: { url: 'https://example.com/img.png' },
-        },
-      ],
-    }])
+    expect(result).toEqual([
+      {
+        role: 'user',
+        content: [
+          {
+            type: 'image_url',
+            image_url: { url: 'https://example.com/img.png' },
+          },
+        ],
+      },
+    ])
   })
 
   test('converts image-only message without text', () => {
     const result = anthropicMessagesToOpenAI(
-      [makeUserMsg([
-        {
-          type: 'image' as const,
-          source: {
-            type: 'base64',
-            media_type: 'image/jpeg',
-            data: '/9j/4AAQ',
+      [
+        makeUserMsg([
+          {
+            type: 'image' as const,
+            source: {
+              type: 'base64',
+              media_type: 'image/jpeg',
+              data: '/9j/4AAQ',
+            },
           },
-        },
-      ])],
+        ]),
+      ],
       [] as any,
     )
-    expect(result).toEqual([{
-      role: 'user',
-      content: [
-        {
-          type: 'image_url',
-          image_url: { url: 'data:image/jpeg;base64,/9j/4AAQ' },
-        },
-      ],
-    }])
+    expect(result).toEqual([
+      {
+        role: 'user',
+        content: [
+          {
+            type: 'image_url',
+            image_url: { url: 'data:image/jpeg;base64,/9j/4AAQ' },
+          },
+        ],
+      },
+    ])
   })
 
   test('defaults to image/png when media_type is missing', () => {
     const result = anthropicMessagesToOpenAI(
-      [makeUserMsg([
-        {
-          type: 'image' as const,
-          source: {
-            type: 'base64',
-            data: 'ABC123',
+      [
+        makeUserMsg([
+          {
+            type: 'image' as const,
+            source: {
+              type: 'base64',
+              data: 'ABC123',
+            },
           },
-        },
-      ])],
+        ]),
+      ],
       [] as any,
     )
     expect((result[0].content as any[])[0].image_url.url).toBe(
@@ -253,10 +280,16 @@ describe('anthropicMessagesToOpenAI', () => {
 describe('DeepSeek thinking mode (enableThinking)', () => {
   test('preserves thinking block as reasoning_content when enabled', () => {
     const result = anthropicMessagesToOpenAI(
-      [makeUserMsg('question'), makeAssistantMsg([
-        { type: 'thinking' as const, thinking: 'Let me reason about this...' },
-        { type: 'text', text: 'The answer is 42.' },
-      ])],
+      [
+        makeUserMsg('question'),
+        makeAssistantMsg([
+          {
+            type: 'thinking' as const,
+            thinking: 'Let me reason about this...',
+          },
+          { type: 'text', text: 'The answer is 42.' },
+        ]),
+      ],
       [] as any,
       { enableThinking: true },
     )
@@ -271,10 +304,12 @@ describe('DeepSeek thinking mode (enableThinking)', () => {
 
   test('drops thinking block when enableThinking is false (default)', () => {
     const result = anthropicMessagesToOpenAI(
-      [makeAssistantMsg([
-        { type: 'thinking' as const, thinking: 'internal thoughts...' },
-        { type: 'text', text: 'visible response' },
-      ])],
+      [
+        makeAssistantMsg([
+          { type: 'thinking' as const, thinking: 'internal thoughts...' },
+          { type: 'text', text: 'visible response' },
+        ]),
+      ],
       [] as any,
     )
     const assistant = result[0] as any
@@ -287,7 +322,10 @@ describe('DeepSeek thinking mode (enableThinking)', () => {
       [
         makeUserMsg('what is the weather?'),
         makeAssistantMsg([
-          { type: 'thinking' as const, thinking: 'I need to call the weather tool.' },
+          {
+            type: 'thinking' as const,
+            thinking: 'I need to call the weather tool.',
+          },
           { type: 'text', text: '' },
           {
             type: 'tool_use' as const,
@@ -403,18 +441,27 @@ describe('DeepSeek thinking mode (enableThinking)', () => {
     const assistants = result.filter(m => m.role === 'assistant')
     expect(assistants.length).toBe(3)
     // All iterations within the same turn preserve reasoning
-    expect((assistants[0] as any).reasoning_content).toBe('I need the date first.')
-    expect((assistants[1] as any).reasoning_content).toBe('Now I can get the weather.')
-    expect((assistants[2] as any).reasoning_content).toBe('I have the info now.')
+    expect((assistants[0] as any).reasoning_content).toBe(
+      'I need the date first.',
+    )
+    expect((assistants[1] as any).reasoning_content).toBe(
+      'Now I can get the weather.',
+    )
+    expect((assistants[2] as any).reasoning_content).toBe(
+      'I have the info now.',
+    )
   })
 
   test('handles multiple thinking blocks in single assistant message', () => {
     const result = anthropicMessagesToOpenAI(
-      [makeUserMsg('question'), makeAssistantMsg([
-        { type: 'thinking' as const, thinking: 'First thought.' },
-        { type: 'thinking' as const, thinking: 'Second thought.' },
-        { type: 'text', text: 'Final answer.' },
-      ])],
+      [
+        makeUserMsg('question'),
+        makeAssistantMsg([
+          { type: 'thinking' as const, thinking: 'First thought.' },
+          { type: 'thinking' as const, thinking: 'Second thought.' },
+          { type: 'text', text: 'Final answer.' },
+        ]),
+      ],
       [] as any,
       { enableThinking: true },
     )
@@ -424,10 +471,13 @@ describe('DeepSeek thinking mode (enableThinking)', () => {
 
   test('skips empty thinking blocks', () => {
     const result = anthropicMessagesToOpenAI(
-      [makeUserMsg('question'), makeAssistantMsg([
-        { type: 'thinking' as const, thinking: '' },
-        { type: 'text', text: 'Answer.' },
-      ])],
+      [
+        makeUserMsg('question'),
+        makeAssistantMsg([
+          { type: 'thinking' as const, thinking: '' },
+          { type: 'text', text: 'Answer.' },
+        ]),
+      ],
       [] as any,
       { enableThinking: true },
     )
@@ -437,15 +487,18 @@ describe('DeepSeek thinking mode (enableThinking)', () => {
 
   test('sets content to null when only thinking and tool_calls present', () => {
     const result = anthropicMessagesToOpenAI(
-      [makeUserMsg('question'), makeAssistantMsg([
-        { type: 'thinking' as const, thinking: 'Reasoning only.' },
-        {
-          type: 'tool_use' as const,
-          id: 'toolu_001',
-          name: 'bash',
-          input: { command: 'ls' },
-        },
-      ])],
+      [
+        makeUserMsg('question'),
+        makeAssistantMsg([
+          { type: 'thinking' as const, thinking: 'Reasoning only.' },
+          {
+            type: 'tool_use' as const,
+            id: 'toolu_001',
+            name: 'bash',
+            input: { command: 'ls' },
+          },
+        ]),
+      ],
       [] as any,
       { enableThinking: true },
     )
diff --git a/src/services/api/openai/__tests__/convertTools.test.ts b/src/services/api/openai/__tests__/convertTools.test.ts
index 0c51a0b2c..22888d0ec 100644
--- a/src/services/api/openai/__tests__/convertTools.test.ts
+++ b/src/services/api/openai/__tests__/convertTools.test.ts
@@ -1,5 +1,8 @@
 import { describe, expect, test } from 'bun:test'
-import { anthropicToolsToOpenAI, anthropicToolChoiceToOpenAI } from '../convertTools.js'
+import {
+  anthropicToolsToOpenAI,
+  anthropicToolChoiceToOpenAI,
+} from '../convertTools.js'
 
 describe('anthropicToolsToOpenAI', () => {
   test('converts basic tool', () => {
@@ -18,25 +21,29 @@ describe('anthropicToolsToOpenAI', () => {
 
     const result = anthropicToolsToOpenAI(tools as any)
 
-    expect(result).toEqual([{
-      type: 'function',
-      function: {
-        name: 'bash',
-        description: 'Run a bash command',
-        parameters: {
-          type: 'object',
-          properties: { command: { type: 'string' } },
-          required: ['command'],
+    expect(result).toEqual([
+      {
+        type: 'function',
+        function: {
+          name: 'bash',
+          description: 'Run a bash command',
+          parameters: {
+            type: 'object',
+            properties: { command: { type: 'string' } },
+            required: ['command'],
+          },
         },
       },
-    }])
+    ])
   })
 
   test('uses empty schema when input_schema missing', () => {
     const tools = [{ type: 'custom', name: 'noop', description: 'no-op' }]
     const result = anthropicToolsToOpenAI(tools as any)
 
-    expect((result[0] as { function: { parameters: unknown } }).function.parameters).toEqual({ type: 'object', properties: {} })
+    expect(
+      (result[0] as { function: { parameters: unknown } }).function.parameters,
+    ).toEqual({ type: 'object', properties: {} })
   })
 
   test('strips Anthropic-specific fields', () => {
@@ -76,7 +83,8 @@ describe('anthropicToolsToOpenAI', () => {
       },
     ]
     const result = anthropicToolsToOpenAI(tools as any)
-    const props = (result[0] as { function: { parameters: any } }).function.parameters as any
+    const props = (result[0] as { function: { parameters: any } }).function
+      .parameters as any
     expect(props.properties.mode).toEqual({ enum: ['read'] })
     expect(props.properties.mode.const).toBeUndefined()
     expect(props.properties.name).toEqual({ type: 'string' })
@@ -110,8 +118,11 @@ describe('anthropicToolsToOpenAI', () => {
       },
     ]
     const result = anthropicToolsToOpenAI(tools as any)
-    const params = (result[0] as { function: { parameters: any } }).function.parameters as any
-    expect(params.properties.outer.properties.inner).toEqual({ enum: ['fixed'] })
+    const params = (result[0] as { function: { parameters: any } }).function
+      .parameters as any
+    expect(params.properties.outer.properties.inner).toEqual({
+      enum: ['fixed'],
+    })
     expect(params.definitions.MyType.properties.field).toEqual({ enum: [42] })
   })
 
@@ -125,18 +136,17 @@ describe('anthropicToolsToOpenAI', () => {
           type: 'object',
           properties: {
             val: {
-              anyOf: [
-                { const: 'a' },
-                { const: 'b' },
-                { type: 'string' },
-              ],
+              anyOf: [{ const: 'a' }, { const: 'b' }, { type: 'string' }],
             },
           },
         },
       },
     ]
     const result = anthropicToolsToOpenAI(tools as any)
-    const anyOf = ((result[0] as { function: { parameters: any } }).function.parameters as any).properties.val.anyOf
+    const anyOf = (
+      (result[0] as { function: { parameters: any } }).function
+        .parameters as any
+    ).properties.val.anyOf
     expect(anyOf[0]).toEqual({ enum: ['a'] })
     expect(anyOf[1]).toEqual({ enum: ['b'] })
     expect(anyOf[2]).toEqual({ type: 'string' })
diff --git a/src/services/api/openai/__tests__/queryModelOpenAI.isolated.ts b/src/services/api/openai/__tests__/queryModelOpenAI.isolated.ts
index 9af151c56..86ccc5d5d 100644
--- a/src/services/api/openai/__tests__/queryModelOpenAI.isolated.ts
+++ b/src/services/api/openai/__tests__/queryModelOpenAI.isolated.ts
@@ -15,12 +15,17 @@
  */
 import { describe, expect, test, mock, beforeEach, afterEach } from 'bun:test'
 import type { BetaRawMessageStreamEvent } from '@anthropic-ai/sdk/resources/beta/messages/messages.mjs'
-import type { AssistantMessage, StreamEvent } from '../../../../types/message.js'
+import type {
+  AssistantMessage,
+  StreamEvent,
+} from '../../../../types/message.js'
 
 // ─── helpers ─────────────────────────────────────────────────────────────────
 
 /** Build a minimal message_start event */
-function makeMessageStart(overrides: Record<string, any> = {}): BetaRawMessageStreamEvent {
+function makeMessageStart(
+  overrides: Record<string, any> = {},
+): BetaRawMessageStreamEvent {
   return {
     type: 'message_start',
     message: {
@@ -31,36 +36,67 @@ function makeMessageStart(overrides: Record<string, any> = {}): BetaRawMessageSt
       model: 'test-model',
       stop_reason: null,
       stop_sequence: null,
-      usage: { input_tokens: 0, output_tokens: 0, cache_creation_input_tokens: 0, cache_read_input_tokens: 0 },
+      usage: {
+        input_tokens: 0,
+        output_tokens: 0,
+        cache_creation_input_tokens: 0,
+        cache_read_input_tokens: 0,
+      },
       ...overrides,
     },
   } as any
 }
 
 /** Build a content_block_start event for the given block type */
-function makeContentBlockStart(index: number, type: 'text' | 'tool_use' | 'thinking', extra: Record<string, any> = {}): BetaRawMessageStreamEvent {
+function makeContentBlockStart(
+  index: number,
+  type: 'text' | 'tool_use' | 'thinking',
+  extra: Record<string, any> = {},
+): BetaRawMessageStreamEvent {
   const block =
     type === 'text'
       ? { type: 'text', text: '' }
       : type === 'tool_use'
         ? { type: 'tool_use', id: 'toolu_test', name: 'bash', input: {} }
         : { type: 'thinking', thinking: '', signature: '' }
-  return { type: 'content_block_start', index, content_block: { ...block, ...extra } } as any
+  return {
+    type: 'content_block_start',
+    index,
+    content_block: { ...block, ...extra },
+  } as any
 }
 
 /** Build a text_delta content_block_delta event */
 function makeTextDelta(index: number, text: string): BetaRawMessageStreamEvent {
-  return { type: 'content_block_delta', index, delta: { type: 'text_delta', text } } as any
+  return {
+    type: 'content_block_delta',
+    index,
+    delta: { type: 'text_delta', text },
+  } as any
 }
 
 /** Build an input_json_delta content_block_delta event */
-function makeInputJsonDelta(index: number, json: string): BetaRawMessageStreamEvent {
-  return { type: 'content_block_delta', index, delta: { type: 'input_json_delta', partial_json: json } } as any
+function makeInputJsonDelta(
+  index: number,
+  json: string,
+): BetaRawMessageStreamEvent {
+  return {
+    type: 'content_block_delta',
+    index,
+    delta: { type: 'input_json_delta', partial_json: json },
+  } as any
 }
 
 /** Build a thinking_delta content_block_delta event */
-function makeThinkingDelta(index: number, thinking: string): BetaRawMessageStreamEvent {
-  return { type: 'content_block_delta', index, delta: { type: 'thinking_delta', thinking } } as any
+function makeThinkingDelta(
+  index: number,
+  thinking: string,
+): BetaRawMessageStreamEvent {
+  return {
+    type: 'content_block_delta',
+    index,
+    delta: { type: 'thinking_delta', thinking },
+  } as any
 }
 
 /** Build a content_block_stop event */
@@ -69,7 +105,10 @@ function makeContentBlockStop(index: number): BetaRawMessageStreamEvent {
 }
 
 /** Build a message_delta event with stop_reason and output_tokens */
-function makeMessageDelta(stopReason: string, outputTokens: number): BetaRawMessageStreamEvent {
+function makeMessageDelta(
+  stopReason: string,
+  outputTokens: number,
+): BetaRawMessageStreamEvent {
   return {
     type: 'message_delta',
     delta: { stop_reason: stopReason, stop_sequence: null },
@@ -175,7 +214,8 @@ mock.module('../client.js', () => ({
 }))
 
 mock.module('../streamAdapter.js', () => ({
-  adaptOpenAIStreamToAnthropic: (_stream: any, _model: string) => eventStream(_nextEvents),
+  adaptOpenAIStreamToAnthropic: (_stream: any, _model: string) =>
+    eventStream(_nextEvents),
 }))
 
 mock.module('../modelMapping.js', () => ({
@@ -202,7 +242,10 @@ mock.module('../../../../utils/context.js', () => ({
   getModelMaxOutputTokens: () => ({ upperLimit: 8192, default: 8192 }),
   getContextWindowForModel: () => 200_000,
   getSonnet1mExpTreatmentEnabled: () => false,
-  calculateContextPercentages: () => ({ usedPercent: 0, remainingPercent: 100 }),
+  calculateContextPercentages: () => ({
+    usedPercent: 0,
+    remainingPercent: 100,
+  }),
   getMaxThinkingTokensForModel: () => 0,
 }))
 
@@ -211,7 +254,10 @@ mock.module('../../../../utils/messages.js', () => ({
   normalizeContentFromAPI: (blocks: any[]) => blocks,
   createAssistantAPIErrorMessage: (opts: any) => ({
     type: 'assistant',
-    message: { content: [{ type: 'text', text: opts.content }], apiError: opts.apiError },
+    message: {
+      content: [{ type: 'text', text: opts.content }],
+      apiError: opts.apiError,
+    },
     uuid: 'error-uuid',
     timestamp: new Date().toISOString(),
   }),
@@ -349,7 +395,14 @@ describe('queryModelOpenAI — usage accumulation', () => {
     // The spread in the message_delta handler must override all zeros from message_start,
     // including cache_read_input_tokens which was previously missing from message_delta.
     _nextEvents = [
-      makeMessageStart({ usage: { input_tokens: 0, output_tokens: 0, cache_creation_input_tokens: 0, cache_read_input_tokens: 0 } }),
+      makeMessageStart({
+        usage: {
+          input_tokens: 0,
+          output_tokens: 0,
+          cache_creation_input_tokens: 0,
+          cache_read_input_tokens: 0,
+        },
+      }),
       makeContentBlockStart(0, 'text'),
       makeTextDelta(0, 'response'),
       makeContentBlockStop(0),
@@ -357,7 +410,12 @@ describe('queryModelOpenAI — usage accumulation', () => {
       {
         type: 'message_delta',
         delta: { stop_reason: 'end_turn', stop_sequence: null },
-        usage: { input_tokens: 30011, output_tokens: 190, cache_read_input_tokens: 19904, cache_creation_input_tokens: 0 },
+        usage: {
+          input_tokens: 30011,
+          output_tokens: 190,
+          cache_read_input_tokens: 19904,
+          cache_creation_input_tokens: 0,
+        },
       } as any,
       makeMessageStop(),
     ]
diff --git a/src/services/api/openai/__tests__/streamAdapter.test.ts b/src/services/api/openai/__tests__/streamAdapter.test.ts
index db6b3015c..807e1dcda 100644
--- a/src/services/api/openai/__tests__/streamAdapter.test.ts
+++ b/src/services/api/openai/__tests__/streamAdapter.test.ts
@@ -10,7 +10,10 @@ import { tmpdir } from 'os'
 // We copy the source to a unique temp path so the import bypasses bun's
 // module mock cache completely.
 const _testDir = dirname(fileURLToPath(import.meta.url))
-const _realSource = readFileSync(join(_testDir, '..', 'streamAdapter.ts'), 'utf-8')
+const _realSource = readFileSync(
+  join(_testDir, '..', 'streamAdapter.ts'),
+  'utf-8',
+)
 const _tempDir = join(tmpdir(), `stream-adapter-test-${Date.now()}`)
 mkdirSync(_tempDir, { recursive: true })
 const _tempFile = join(_tempDir, 'streamAdapter.ts')
@@ -18,7 +21,9 @@ writeFileSync(_tempFile, _realSource, 'utf-8')
 const { adaptOpenAIStreamToAnthropic } = await import(_tempFile)
 
 /** Helper to create a mock async iterable from chunk array */
-function mockStream(chunks: ChatCompletionChunk[]): AsyncIterable<ChatCompletionChunk> {
+function mockStream(
+  chunks: ChatCompletionChunk[],
+): AsyncIterable<ChatCompletionChunk> {
   return {
     [Symbol.asyncIterator]() {
       let i = 0
@@ -33,7 +38,9 @@ function mockStream(chunks: ChatCompletionChunk[]): AsyncIterable<ChatCompletion
 }
 
 /** Create a minimal ChatCompletionChunk */
-function makeChunk(overrides: Partial<ChatCompletionChunk> & any = {}): ChatCompletionChunk {
+function makeChunk(
+  overrides: Partial<ChatCompletionChunk> & any = {},
+): ChatCompletionChunk {
   return {
     id: 'chatcmpl-test',
     object: 'chat.completion.chunk',
@@ -52,7 +59,10 @@ async function collectEvents(chunks: ChatCompletionChunk[]) {
   ).href
   const { adaptOpenAIStreamToAnthropic } = await import(realModuleUrl)
   const events: any[] = []
-  for await (const event of adaptOpenAIStreamToAnthropic(mockStream(chunks), 'gpt-4o')) {
+  for await (const event of adaptOpenAIStreamToAnthropic(
+    mockStream(chunks),
+    'gpt-4o',
+  )) {
     events.push(event)
   }
   return events
@@ -62,25 +72,31 @@ describe('adaptOpenAIStreamToAnthropic', () => {
   test('emits message_start on first chunk', async () => {
     const events = await collectEvents([
       makeChunk({
-        choices: [{
-          index: 0,
-          delta: { role: 'assistant', content: '' },
-          finish_reason: null,
-        }],
+        choices: [
+          {
+            index: 0,
+            delta: { role: 'assistant', content: '' },
+            finish_reason: null,
+          },
+        ],
       }),
       makeChunk({
-        choices: [{
-          index: 0,
-          delta: { content: 'hello' },
-          finish_reason: null,
-        }],
+        choices: [
+          {
+            index: 0,
+            delta: { content: 'hello' },
+            finish_reason: null,
+          },
+        ],
       }),
       makeChunk({
-        choices: [{
-          index: 0,
-          delta: {},
-          finish_reason: 'stop',
-        }],
+        choices: [
+          {
+            index: 0,
+            delta: {},
+            finish_reason: 'stop',
+          },
+        ],
         usage: { prompt_tokens: 10, completion_tokens: 5, total_tokens: 15 },
       }),
     ])
@@ -93,10 +109,14 @@ describe('adaptOpenAIStreamToAnthropic', () => {
   test('converts text content stream', async () => {
     const events = await collectEvents([
       makeChunk({
-        choices: [{ index: 0, delta: { content: 'Hello' }, finish_reason: null }],
+        choices: [
+          { index: 0, delta: { content: 'Hello' }, finish_reason: null },
+        ],
       }),
       makeChunk({
-        choices: [{ index: 0, delta: { content: ' world' }, finish_reason: null }],
+        choices: [
+          { index: 0, delta: { content: ' world' }, finish_reason: null },
+        ],
       }),
       makeChunk({
         choices: [{ index: 0, delta: {}, finish_reason: 'stop' }],
@@ -111,7 +131,9 @@ describe('adaptOpenAIStreamToAnthropic', () => {
     expect(types).toContain('message_delta')
     expect(types).toContain('message_stop')
 
-    const textDeltas = events.filter(e => e.type === 'content_block_delta') as any[]
+    const textDeltas = events.filter(
+      e => e.type === 'content_block_delta',
+    ) as any[]
     expect(textDeltas[0].delta.text).toBe('Hello')
     expect(textDeltas[1].delta.text).toBe(' world')
   })
@@ -119,42 +141,54 @@ describe('adaptOpenAIStreamToAnthropic', () => {
   test('converts tool_calls stream', async () => {
     const events = await collectEvents([
       makeChunk({
-        choices: [{
-          index: 0,
-          delta: {
-            tool_calls: [{
-              index: 0,
-              id: 'call_abc',
-              type: 'function',
-              function: { name: 'bash', arguments: '' },
-            }],
+        choices: [
+          {
+            index: 0,
+            delta: {
+              tool_calls: [
+                {
+                  index: 0,
+                  id: 'call_abc',
+                  type: 'function',
+                  function: { name: 'bash', arguments: '' },
+                },
+              ],
+            },
+            finish_reason: null,
           },
-          finish_reason: null,
-        }],
+        ],
       }),
       makeChunk({
-        choices: [{
-          index: 0,
-          delta: {
-            tool_calls: [{
-              index: 0,
-              function: { arguments: '{"comm' },
-            }],
+        choices: [
+          {
+            index: 0,
+            delta: {
+              tool_calls: [
+                {
+                  index: 0,
+                  function: { arguments: '{"comm' },
+                },
+              ],
+            },
+            finish_reason: null,
           },
-          finish_reason: null,
-        }],
+        ],
       }),
       makeChunk({
-        choices: [{
-          index: 0,
-          delta: {
-            tool_calls: [{
-              index: 0,
-              function: { arguments: 'and":"ls"}' },
-            }],
+        choices: [
+          {
+            index: 0,
+            delta: {
+              tool_calls: [
+                {
+                  index: 0,
+                  function: { arguments: 'and":"ls"}' },
+                },
+              ],
+            },
+            finish_reason: null,
           },
-          finish_reason: null,
-        }],
+        ],
       }),
       makeChunk({
         choices: [{ index: 0, delta: {}, finish_reason: 'tool_calls' }],
@@ -166,7 +200,8 @@ describe('adaptOpenAIStreamToAnthropic', () => {
     expect(blockStart.content_block.name).toBe('bash')
 
     const jsonDeltas = events.filter(
-      e => e.type === 'content_block_delta' && e.delta.type === 'input_json_delta',
+      e =>
+        e.type === 'content_block_delta' && e.delta.type === 'input_json_delta',
     ) as any[]
     const fullArgs = jsonDeltas.map(d => d.delta.partial_json).join('')
     expect(fullArgs).toBe('{"command":"ls"}')
@@ -191,13 +226,21 @@ describe('adaptOpenAIStreamToAnthropic', () => {
     // return finish_reason "stop" when they actually made tool calls.
     const events = await collectEvents([
       makeChunk({
-        choices: [{
-          index: 0,
-          delta: {
-            tool_calls: [{ index: 0, id: 'call_1', function: { name: 'bash', arguments: '{"cmd":"ls"}' } }],
+        choices: [
+          {
+            index: 0,
+            delta: {
+              tool_calls: [
+                {
+                  index: 0,
+                  id: 'call_1',
+                  function: { name: 'bash', arguments: '{"cmd":"ls"}' },
+                },
+              ],
+            },
+            finish_reason: null,
           },
-          finish_reason: null,
-        }],
+        ],
       }),
       makeChunk({
         choices: [{ index: 0, delta: {}, finish_reason: 'stop' }],
@@ -211,13 +254,21 @@ describe('adaptOpenAIStreamToAnthropic', () => {
   test('maps finish_reason tool_calls to tool_use', async () => {
     const events = await collectEvents([
       makeChunk({
-        choices: [{
-          index: 0,
-          delta: {
-            tool_calls: [{ index: 0, id: 'call_1', function: { name: 'bash', arguments: '{}' } }],
+        choices: [
+          {
+            index: 0,
+            delta: {
+              tool_calls: [
+                {
+                  index: 0,
+                  id: 'call_1',
+                  function: { name: 'bash', arguments: '{}' },
+                },
+              ],
+            },
+            finish_reason: null,
           },
-          finish_reason: null,
-        }],
+        ],
       }),
       makeChunk({
         choices: [{ index: 0, delta: {}, finish_reason: 'tool_calls' }],
@@ -231,7 +282,9 @@ describe('adaptOpenAIStreamToAnthropic', () => {
   test('maps finish_reason length to max_tokens', async () => {
     const events = await collectEvents([
       makeChunk({
-        choices: [{ index: 0, delta: { content: 'truncated' }, finish_reason: null }],
+        choices: [
+          { index: 0, delta: { content: 'truncated' }, finish_reason: null },
+        ],
       }),
       makeChunk({
         choices: [{ index: 0, delta: {}, finish_reason: 'length' }],
@@ -245,23 +298,35 @@ describe('adaptOpenAIStreamToAnthropic', () => {
   test('handles mixed text and tool_calls', async () => {
     const events = await collectEvents([
       makeChunk({
-        choices: [{ index: 0, delta: { content: 'Thinking...' }, finish_reason: null }],
+        choices: [
+          { index: 0, delta: { content: 'Thinking...' }, finish_reason: null },
+        ],
       }),
       makeChunk({
-        choices: [{
-          index: 0,
-          delta: {
-            tool_calls: [{ index: 0, id: 'call_1', function: { name: 'grep', arguments: '{"p":"test"}' } }],
+        choices: [
+          {
+            index: 0,
+            delta: {
+              tool_calls: [
+                {
+                  index: 0,
+                  id: 'call_1',
+                  function: { name: 'grep', arguments: '{"p":"test"}' },
+                },
+              ],
+            },
+            finish_reason: null,
           },
-          finish_reason: null,
-        }],
+        ],
       }),
       makeChunk({
         choices: [{ index: 0, delta: {}, finish_reason: 'tool_calls' }],
       }),
     ])
 
-    const blockStarts = events.filter(e => e.type === 'content_block_start') as any[]
+    const blockStarts = events.filter(
+      e => e.type === 'content_block_start',
+    ) as any[]
     expect(blockStarts.length).toBe(2)
     expect(blockStarts[0].content_block.type).toBe('text')
     expect(blockStarts[1].content_block.type).toBe('tool_use')
@@ -272,18 +337,22 @@ describe('thinking support (reasoning_content)', () => {
   test('converts reasoning_content to thinking block', async () => {
     const events = await collectEvents([
       makeChunk({
-        choices: [{
-          index: 0,
-          delta: { reasoning_content: 'Let me analyze this...' },
-          finish_reason: null,
-        }],
+        choices: [
+          {
+            index: 0,
+            delta: { reasoning_content: 'Let me analyze this...' },
+            finish_reason: null,
+          },
+        ],
       }),
       makeChunk({
-        choices: [{
-          index: 0,
-          delta: { reasoning_content: ' step by step.' },
-          finish_reason: null,
-        }],
+        choices: [
+          {
+            index: 0,
+            delta: { reasoning_content: ' step by step.' },
+            finish_reason: null,
+          },
+        ],
       }),
       makeChunk({
         choices: [{ index: 0, delta: {}, finish_reason: 'stop' }],
@@ -297,7 +366,8 @@ describe('thinking support (reasoning_content)', () => {
 
     // Should have thinking_delta events
     const thinkingDeltas = events.filter(
-      e => e.type === 'content_block_delta' && e.delta.type === 'thinking_delta',
+      e =>
+        e.type === 'content_block_delta' && e.delta.type === 'thinking_delta',
     ) as any[]
     expect(thinkingDeltas.length).toBe(2)
     expect(thinkingDeltas[0].delta.thinking).toBe('Let me analyze this...')
@@ -307,18 +377,22 @@ describe('thinking support (reasoning_content)', () => {
   test('converts reasoning then content (DeepSeek-style)', async () => {
     const events = await collectEvents([
       makeChunk({
-        choices: [{
-          index: 0,
-          delta: { reasoning_content: 'Thinking about the answer...' },
-          finish_reason: null,
-        }],
+        choices: [
+          {
+            index: 0,
+            delta: { reasoning_content: 'Thinking about the answer...' },
+            finish_reason: null,
+          },
+        ],
       }),
       makeChunk({
-        choices: [{
-          index: 0,
-          delta: { content: 'Here is my answer.' },
-          finish_reason: null,
-        }],
+        choices: [
+          {
+            index: 0,
+            delta: { content: 'Here is my answer.' },
+            finish_reason: null,
+          },
+        ],
       }),
       makeChunk({
         choices: [{ index: 0, delta: {}, finish_reason: 'stop' }],
@@ -326,13 +400,17 @@ describe('thinking support (reasoning_content)', () => {
     ])
 
     // Should have two content blocks: thinking + text
-    const blockStarts = events.filter(e => e.type === 'content_block_start') as any[]
+    const blockStarts = events.filter(
+      e => e.type === 'content_block_start',
+    ) as any[]
     expect(blockStarts.length).toBe(2)
     expect(blockStarts[0].content_block.type).toBe('thinking')
     expect(blockStarts[1].content_block.type).toBe('text')
 
     // Thinking block should be closed before text block starts
-    const blockStops = events.filter(e => e.type === 'content_block_stop') as any[]
+    const blockStops = events.filter(
+      e => e.type === 'content_block_stop',
+    ) as any[]
     expect(blockStops[0].index).toBe(0) // thinking block closed at index 0
     expect(blockStarts[1].index).toBe(1) // text block starts at index 1
 
@@ -346,27 +424,39 @@ describe('thinking support (reasoning_content)', () => {
   test('handles reasoning then tool_calls', async () => {
     const events = await collectEvents([
       makeChunk({
-        choices: [{
-          index: 0,
-          delta: { reasoning_content: 'I need to run a command.' },
-          finish_reason: null,
-        }],
+        choices: [
+          {
+            index: 0,
+            delta: { reasoning_content: 'I need to run a command.' },
+            finish_reason: null,
+          },
+        ],
       }),
       makeChunk({
-        choices: [{
-          index: 0,
-          delta: {
-            tool_calls: [{ index: 0, id: 'call_1', function: { name: 'bash', arguments: '{"c":"ls"}' } }],
+        choices: [
+          {
+            index: 0,
+            delta: {
+              tool_calls: [
+                {
+                  index: 0,
+                  id: 'call_1',
+                  function: { name: 'bash', arguments: '{"c":"ls"}' },
+                },
+              ],
+            },
+            finish_reason: null,
           },
-          finish_reason: null,
-        }],
+        ],
       }),
       makeChunk({
         choices: [{ index: 0, delta: {}, finish_reason: 'tool_calls' }],
       }),
     ])
 
-    const blockStarts = events.filter(e => e.type === 'content_block_start') as any[]
+    const blockStarts = events.filter(
+      e => e.type === 'content_block_start',
+    ) as any[]
     expect(blockStarts.length).toBe(2)
     expect(blockStarts[0].content_block.type).toBe('thinking')
     expect(blockStarts[1].content_block.type).toBe('tool_use')
@@ -375,25 +465,31 @@ describe('thinking support (reasoning_content)', () => {
   test('thinking block index is 0, text block index is 1', async () => {
     const events = await collectEvents([
       makeChunk({
-        choices: [{
-          index: 0,
-          delta: { reasoning_content: 'reason' },
-          finish_reason: null,
-        }],
+        choices: [
+          {
+            index: 0,
+            delta: { reasoning_content: 'reason' },
+            finish_reason: null,
+          },
+        ],
       }),
       makeChunk({
-        choices: [{
-          index: 0,
-          delta: { content: 'answer' },
-          finish_reason: null,
-        }],
+        choices: [
+          {
+            index: 0,
+            delta: { content: 'answer' },
+            finish_reason: null,
+          },
+        ],
       }),
       makeChunk({
         choices: [{ index: 0, delta: {}, finish_reason: 'stop' }],
       }),
     ])
 
-    const blockStarts = events.filter(e => e.type === 'content_block_start') as any[]
+    const blockStarts = events.filter(
+      e => e.type === 'content_block_start',
+    ) as any[]
     expect(blockStarts[0].index).toBe(0)
     expect(blockStarts[1].index).toBe(1)
   })
@@ -403,11 +499,13 @@ describe('prompt caching support', () => {
   test('maps cached_tokens to cache_read_input_tokens', async () => {
     const events = await collectEvents([
       makeChunk({
-        choices: [{
-          index: 0,
-          delta: { content: 'hi' },
-          finish_reason: null,
-        }],
+        choices: [
+          {
+            index: 0,
+            delta: { content: 'hi' },
+            finish_reason: null,
+          },
+        ],
         usage: {
           prompt_tokens: 1000,
           completion_tokens: 0,
@@ -483,7 +581,9 @@ describe('prompt caching support', () => {
     // emitted before the trailing chunk and always has input_tokens=0.
     const events = await collectEvents([
       makeChunk({
-        choices: [{ index: 0, delta: { content: 'hello' }, finish_reason: null }],
+        choices: [
+          { index: 0, delta: { content: 'hello' }, finish_reason: null },
+        ],
       }),
       // finish_reason chunk — usage not yet available
       makeChunk({
@@ -513,14 +613,20 @@ describe('prompt caching support', () => {
     // the autocompact threshold (~33k), so compaction never fires.
     const events = await collectEvents([
       makeChunk({
-        choices: [{ index: 0, delta: { content: 'answer' }, finish_reason: null }],
+        choices: [
+          { index: 0, delta: { content: 'answer' }, finish_reason: null },
+        ],
       }),
       makeChunk({
         choices: [{ index: 0, delta: {}, finish_reason: 'stop' }],
       }),
       makeChunk({
         choices: [],
-        usage: { prompt_tokens: 800, completion_tokens: 200, total_tokens: 1000 },
+        usage: {
+          prompt_tokens: 800,
+          completion_tokens: 200,
+          total_tokens: 1000,
+        },
       }),
     ])
 
@@ -534,13 +640,21 @@ describe('prompt caching support', () => {
     // when the model made tool calls and usage arrives in a trailing chunk.
     const events = await collectEvents([
       makeChunk({
-        choices: [{
-          index: 0,
-          delta: {
-            tool_calls: [{ index: 0, id: 'call_x', function: { name: 'bash', arguments: '{"cmd":"ls"}' } }],
+        choices: [
+          {
+            index: 0,
+            delta: {
+              tool_calls: [
+                {
+                  index: 0,
+                  id: 'call_x',
+                  function: { name: 'bash', arguments: '{"cmd":"ls"}' },
+                },
+              ],
+            },
+            finish_reason: null,
           },
-          finish_reason: null,
-        }],
+        ],
       }),
       makeChunk({
         choices: [{ index: 0, delta: {}, finish_reason: 'tool_calls' }],
@@ -560,9 +674,14 @@ describe('prompt caching support', () => {
   test('message_delta always comes before message_stop', async () => {
     // Verifies event ordering is preserved after deferring to post-loop emission.
     const events = await collectEvents([
-      makeChunk({ choices: [{ index: 0, delta: { content: 'x' }, finish_reason: null }] }),
+      makeChunk({
+        choices: [{ index: 0, delta: { content: 'x' }, finish_reason: null }],
+      }),
       makeChunk({ choices: [{ index: 0, delta: {}, finish_reason: 'stop' }] }),
-      makeChunk({ choices: [], usage: { prompt_tokens: 10, completion_tokens: 5, total_tokens: 15 } }),
+      makeChunk({
+        choices: [],
+        usage: { prompt_tokens: 10, completion_tokens: 5, total_tokens: 15 },
+      }),
     ])
 
     const types = events.map(e => e.type)
@@ -581,7 +700,9 @@ describe('prompt caching support', () => {
     // queryModelOpenAI's spread — even though cachedTokens was captured internally.
     const events = await collectEvents([
       makeChunk({
-        choices: [{ index: 0, delta: { content: 'answer' }, finish_reason: null }],
+        choices: [
+          { index: 0, delta: { content: 'answer' }, finish_reason: null },
+        ],
       }),
       makeChunk({
         choices: [{ index: 0, delta: {}, finish_reason: 'stop' }],
@@ -658,7 +779,9 @@ describe('prompt caching support', () => {
     // Some endpoints send usage in the finish_reason chunk instead of a trailing chunk.
     const events = await collectEvents([
       makeChunk({
-        choices: [{ index: 0, delta: { content: 'result' }, finish_reason: null }],
+        choices: [
+          { index: 0, delta: { content: 'result' }, finish_reason: null },
+        ],
       }),
       makeChunk({
         choices: [{ index: 0, delta: {}, finish_reason: 'stop' }],
diff --git a/src/services/api/openai/__tests__/thinking.test.ts b/src/services/api/openai/__tests__/thinking.test.ts
index 48d754bb5..a2e8dceb8 100644
--- a/src/services/api/openai/__tests__/thinking.test.ts
+++ b/src/services/api/openai/__tests__/thinking.test.ts
@@ -81,7 +81,9 @@ describe('isOpenAIThinkingEnabled', () => {
     })
 
     test('returns true when model name is namespaced for deepseek-reasoner', () => {
-      expect(isOpenAIThinkingEnabled('TokenService/deepseek-reasoner')).toBe(true)
+      expect(isOpenAIThinkingEnabled('TokenService/deepseek-reasoner')).toBe(
+        true,
+      )
     })
 
     test('returns true when model name is "deepseek-v3.2"', () => {
@@ -172,14 +174,20 @@ describe('buildOpenAIRequestBody — thinking params', () => {
   })
 
   test('does NOT include thinking params when disabled', () => {
-    const body = buildOpenAIRequestBody({ ...baseParams, enableThinking: false })
+    const body = buildOpenAIRequestBody({
+      ...baseParams,
+      enableThinking: false,
+    })
     expect(body.thinking).toBeUndefined()
     expect(body.enable_thinking).toBeUndefined()
     expect(body.chat_template_kwargs).toBeUndefined()
   })
 
   test('always includes stream and stream_options', () => {
-    const body = buildOpenAIRequestBody({ ...baseParams, enableThinking: false })
+    const body = buildOpenAIRequestBody({
+      ...baseParams,
+      enableThinking: false,
+    })
     expect(body.stream).toBe(true)
     expect(body.stream_options).toEqual({ include_usage: true })
   })
@@ -203,7 +211,10 @@ describe('buildOpenAIRequestBody — thinking params', () => {
   })
 
   test('excludes temperature when thinking is off and no override', () => {
-    const body = buildOpenAIRequestBody({ ...baseParams, enableThinking: false })
+    const body = buildOpenAIRequestBody({
+      ...baseParams,
+      enableThinking: false,
+    })
     expect(body.temperature).toBeUndefined()
   })
 
@@ -219,8 +230,11 @@ describe('buildOpenAIRequestBody — thinking params', () => {
   })
 
   test('excludes tools when empty', () => {
-    const body = buildOpenAIRequestBody({ ...baseParams, enableThinking: false })
+    const body = buildOpenAIRequestBody({
+      ...baseParams,
+      enableThinking: false,
+    })
     expect(body.tools).toBeUndefined()
     expect(body.tool_choice).toBeUndefined()
   })
-})
\ No newline at end of file
+})
diff --git a/src/services/api/openai/client.ts b/src/services/api/openai/client.ts
index 62a37dfbc..1d262d43e 100644
--- a/src/services/api/openai/client.ts
+++ b/src/services/api/openai/client.ts
@@ -29,8 +29,12 @@ export function getOpenAIClient(options?: {
     maxRetries: options?.maxRetries ?? 0,
     timeout: parseInt(process.env.API_TIMEOUT_MS || String(600 * 1000), 10),
     dangerouslyAllowBrowser: true,
-    ...(process.env.OPENAI_ORG_ID && { organization: process.env.OPENAI_ORG_ID }),
-    ...(process.env.OPENAI_PROJECT_ID && { project: process.env.OPENAI_PROJECT_ID }),
+    ...(process.env.OPENAI_ORG_ID && {
+      organization: process.env.OPENAI_ORG_ID,
+    }),
+    ...(process.env.OPENAI_PROJECT_ID && {
+      project: process.env.OPENAI_PROJECT_ID,
+    }),
     fetchOptions: getProxyFetchOptions({ forAnthropicAPI: false }),
     ...(options?.fetchOverride && { fetch: options.fetchOverride }),
   })
diff --git a/src/services/api/openai/convertMessages.ts b/src/services/api/openai/convertMessages.ts
index b525874ae..413bd4fd1 100644
--- a/src/services/api/openai/convertMessages.ts
+++ b/src/services/api/openai/convertMessages.ts
@@ -62,16 +62,18 @@ export function anthropicMessagesToOpenAI(
         // A user message starts a new turn if it contains any non-tool_result content
         // (text, image, or other media). Tool results alone do NOT start a new turn
         // because they are continuations of the previous assistant tool call.
-        const startsNewUserTurn = typeof content === 'string'
-          ? content.length > 0
-          : Array.isArray(content) && content.some(
-              (b: any) =>
-                typeof b === 'string' ||
-                (b &&
-                  typeof b === 'object' &&
-                  'type' in b &&
-                  b.type !== 'tool_result'),
-            )
+        const startsNewUserTurn =
+          typeof content === 'string'
+            ? content.length > 0
+            : Array.isArray(content) &&
+              content.some(
+                (b: any) =>
+                  typeof b === 'string' ||
+                  (b &&
+                    typeof b === 'object' &&
+                    'type' in b &&
+                    b.type !== 'tool_result'),
+              )
         if (startsNewUserTurn) {
           turnBoundaries.add(i)
         }
@@ -88,7 +90,8 @@ export function anthropicMessagesToOpenAI(
       case 'assistant':
         // Preserve reasoning_content unless we're before a turn boundary
         // (i.e., from a previous user Q&A round)
-        const preserveReasoning = enableThinking && !isBeforeAnyTurnBoundary(i, turnBoundaries)
+        const preserveReasoning =
+          enableThinking && !isBeforeAnyTurnBoundary(i, turnBoundaries)
         result.push(...convertInternalAssistantMessage(msg, preserveReasoning))
         break
       default:
@@ -101,9 +104,7 @@ export function anthropicMessagesToOpenAI(
 
 function systemPromptToText(systemPrompt: SystemPrompt): string {
   if (!systemPrompt || systemPrompt.length === 0) return ''
-  return systemPrompt
-    .filter(Boolean)
-    .join('\n\n')
+  return systemPrompt.filter(Boolean).join('\n\n')
 }
 
 /**
@@ -131,7 +132,8 @@ function convertInternalUserMessage(
   } else if (Array.isArray(content)) {
     const textParts: string[] = []
     const toolResults: BetaToolResultBlockParam[] = []
-    const imageParts: Array<{ type: 'image_url'; image_url: { url: string } }> = []
+    const imageParts: Array<{ type: 'image_url'; image_url: { url: string } }> =
+      []
 
     for (const block of content) {
       if (typeof block === 'string') {
@@ -141,7 +143,9 @@ function convertInternalUserMessage(
       } else if (block.type === 'tool_result') {
         toolResults.push(block as BetaToolResultBlockParam)
       } else if (block.type === 'image') {
-        const imagePart = convertImageBlockToOpenAI(block as unknown as Record<string, unknown>)
+        const imagePart = convertImageBlockToOpenAI(
+          block as unknown as Record<string, unknown>,
+        )
         if (imagePart) {
           imageParts.push(imagePart)
         }
@@ -159,7 +163,10 @@ function convertInternalUserMessage(
 
     // 如果有图片，构建多模态 content 数组
     if (imageParts.length > 0) {
-      const multiContent: Array<{ type: 'text'; text: string } | { type: 'image_url'; image_url: { url: string } }> = []
+      const multiContent: Array<
+        | { type: 'text'; text: string }
+        | { type: 'image_url'; image_url: { url: string } }
+      > = []
       if (textParts.length > 0) {
         multiContent.push({ type: 'text', text: textParts.join('\n') })
       }
@@ -230,7 +237,9 @@ function convertInternalAssistantMessage(
   }
 
   const textParts: string[] = []
-  const toolCalls: NonNullable<ChatCompletionAssistantMessageParam['tool_calls']> = []
+  const toolCalls: NonNullable<
+    ChatCompletionAssistantMessageParam['tool_calls']
+  > = []
   const reasoningParts: string[] = []
 
   for (const block of content) {
@@ -251,7 +260,8 @@ function convertInternalAssistantMessage(
       })
     } else if (block.type === 'thinking' && preserveReasoning) {
       // DeepSeek thinking mode: preserve reasoning_content for tool call iterations
-      const thinkingText = (block as unknown as Record<string, unknown>).thinking
+      const thinkingText = (block as unknown as Record<string, unknown>)
+        .thinking
       if (typeof thinkingText === 'string' && thinkingText) {
         reasoningParts.push(thinkingText)
       }
@@ -263,7 +273,9 @@ function convertInternalAssistantMessage(
     role: 'assistant',
     content: textParts.length > 0 ? textParts.join('\n') : null,
     ...(toolCalls.length > 0 && { tool_calls: toolCalls }),
-    ...(reasoningParts.length > 0 && { reasoning_content: reasoningParts.join('\n') }),
+    ...(reasoningParts.length > 0 && {
+      reasoning_content: reasoningParts.join('\n'),
+    }),
   }
 
   return [result]
diff --git a/src/services/api/openai/convertTools.ts b/src/services/api/openai/convertTools.ts
index bace8208b..fbf53009d 100644
--- a/src/services/api/openai/convertTools.ts
+++ b/src/services/api/openai/convertTools.ts
@@ -16,21 +16,27 @@ export function anthropicToolsToOpenAI(
     .filter(tool => {
       // Only convert standard tools (skip server tools like computer_use, etc.)
       const toolType = (tool as unknown as { type?: string }).type
-      return tool.type === 'custom' || !('type' in tool) || toolType !== 'server'
+      return (
+        tool.type === 'custom' || !('type' in tool) || toolType !== 'server'
+      )
     })
     .map(tool => {
       // Handle the various tool shapes from Anthropic SDK
       const anyTool = tool as unknown as Record<string, unknown>
       const name = (anyTool.name as string) || ''
       const description = (anyTool.description as string) || ''
-      const inputSchema = anyTool.input_schema as Record<string, unknown> | undefined
+      const inputSchema = anyTool.input_schema as
+        | Record<string, unknown>
+        | undefined
 
       return {
         type: 'function' as const,
         function: {
           name,
           description,
-          parameters: sanitizeJsonSchema(inputSchema || { type: 'object', properties: {} }),
+          parameters: sanitizeJsonSchema(
+            inputSchema || { type: 'object', properties: {} },
+          ),
         },
       } satisfies ChatCompletionTool
     })
@@ -43,7 +49,9 @@ export function anthropicToolsToOpenAI(
  * support the `const` keyword in JSON Schema. Convert it to `enum` with a
  * single-element array, which is semantically equivalent.
  */
-function sanitizeJsonSchema(schema: Record<string, unknown>): Record<string, unknown> {
+function sanitizeJsonSchema(
+  schema: Record<string, unknown>,
+): Record<string, unknown> {
   if (!schema || typeof schema !== 'object') return schema
 
   const result = { ...schema }
@@ -55,20 +63,37 @@ function sanitizeJsonSchema(schema: Record<string, unknown>): Record<string, unk
   }
 
   // Recursively process nested schemas
-  const objectKeys = ['properties', 'definitions', '$defs', 'patternProperties'] as const
+  const objectKeys = [
+    'properties',
+    'definitions',
+    '$defs',
+    'patternProperties',
+  ] as const
   for (const key of objectKeys) {
     const nested = result[key]
     if (nested && typeof nested === 'object') {
       const sanitized: Record<string, unknown> = {}
       for (const [k, v] of Object.entries(nested as Record<string, unknown>)) {
-        sanitized[k] = v && typeof v === 'object' ? sanitizeJsonSchema(v as Record<string, unknown>) : v
+        sanitized[k] =
+          v && typeof v === 'object'
+            ? sanitizeJsonSchema(v as Record<string, unknown>)
+            : v
       }
       result[key] = sanitized
     }
   }
 
   // Recursively process single-schema keys
-  const singleKeys = ['items', 'additionalProperties', 'not', 'if', 'then', 'else', 'contains', 'propertyNames'] as const
+  const singleKeys = [
+    'items',
+    'additionalProperties',
+    'not',
+    'if',
+    'then',
+    'else',
+    'contains',
+    'propertyNames',
+  ] as const
   for (const key of singleKeys) {
     const nested = result[key]
     if (nested && typeof nested === 'object' && !Array.isArray(nested)) {
@@ -82,7 +107,9 @@ function sanitizeJsonSchema(schema: Record<string, unknown>): Record<string, unk
     const nested = result[key]
     if (Array.isArray(nested)) {
       result[key] = nested.map(item =>
-        item && typeof item === 'object' ? sanitizeJsonSchema(item as Record<string, unknown>) : item
+        item && typeof item === 'object'
+          ? sanitizeJsonSchema(item as Record<string, unknown>)
+          : item,
       )
     }
   }
diff --git a/src/services/api/openai/index.ts b/src/services/api/openai/index.ts
index 040907006..f10efeac5 100644
--- a/src/services/api/openai/index.ts
+++ b/src/services/api/openai/index.ts
@@ -68,7 +68,10 @@ export function isOpenAIThinkingEnabled(model: string): boolean {
   if (isEnvTruthy(process.env.OPENAI_ENABLE_THINKING)) return true
   // Auto-detect from model name (deepseek-reasoner and DeepSeek-V3.2 support thinking mode)
   const modelLower = model.toLowerCase()
-  return modelLower.includes('deepseek-reasoner') || modelLower.includes('deepseek-v3.2')
+  return (
+    modelLower.includes('deepseek-reasoner') ||
+    modelLower.includes('deepseek-v3.2')
+  )
 }
 
 /**
@@ -96,7 +99,15 @@ export function buildOpenAIRequestBody(params: {
   enable_thinking?: boolean
   chat_template_kwargs?: { thinking: boolean }
 } {
-  const { model, messages, tools, toolChoice, enableThinking, maxTokens, temperatureOverride } = params
+  const {
+    model,
+    messages,
+    tools,
+    toolChoice,
+    enableThinking,
+    maxTokens,
+    temperatureOverride,
+  } = params
   return {
     model,
     messages,
@@ -118,9 +129,10 @@ export function buildOpenAIRequestBody(params: {
     }),
     // Only send temperature when thinking mode is off (DeepSeek ignores it anyway,
     // but other providers may respect it)
-    ...(!enableThinking && temperatureOverride !== undefined && {
-      temperature: temperatureOverride,
-    }),
+    ...(!enableThinking &&
+      temperatureOverride !== undefined && {
+        temperature: temperatureOverride,
+      }),
   }
 }
 
@@ -134,11 +146,24 @@ function assembleFinalAssistantOutputs(params: {
   contentBlocks: Record<number, any>
   tools: Tools
   agentId: string | undefined
-  usage: { input_tokens: number; output_tokens: number; cache_creation_input_tokens: number; cache_read_input_tokens: number }
+  usage: {
+    input_tokens: number
+    output_tokens: number
+    cache_creation_input_tokens: number
+    cache_read_input_tokens: number
+  }
   stopReason: string | null
   maxTokens: number
 }): (AssistantMessage | SystemAPIErrorMessage)[] {
-  const { partialMessage, contentBlocks, tools, agentId, usage, stopReason, maxTokens } = params
+  const {
+    partialMessage,
+    contentBlocks,
+    tools,
+    agentId,
+    usage,
+    stopReason,
+    maxTokens,
+  } = params
   const outputs: (AssistantMessage | SystemAPIErrorMessage)[] = []
 
   const allBlocks = Object.keys(contentBlocks)
@@ -150,7 +175,11 @@ function assembleFinalAssistantOutputs(params: {
     outputs.push({
       message: {
         ...partialMessage,
-        content: normalizeContentFromAPI(allBlocks, tools, agentId as AgentId | undefined),
+        content: normalizeContentFromAPI(
+          allBlocks,
+          tools,
+          agentId as AgentId | undefined,
+        ),
         usage,
         stop_reason: stopReason,
         stop_sequence: null,
@@ -163,12 +192,15 @@ function assembleFinalAssistantOutputs(params: {
   }
 
   if (stopReason === 'max_tokens') {
-    outputs.push(createAssistantAPIErrorMessage({
-      content: `Output truncated: response exceeded the ${maxTokens} token limit. ` +
-        `Set CLAUDE_CODE_MAX_OUTPUT_TOKENS to override.`,
-      apiError: 'max_output_tokens',
-      error: 'max_output_tokens',
-    }))
+    outputs.push(
+      createAssistantAPIErrorMessage({
+        content:
+          `Output truncated: response exceeded the ${maxTokens} token limit. ` +
+          `Set CLAUDE_CODE_MAX_OUTPUT_TOKENS to override.`,
+        apiError: 'max_output_tokens',
+        error: 'max_output_tokens',
+      }),
+    )
   }
 
   return outputs
@@ -256,9 +288,13 @@ export async function* queryModelOpenAI(
 
     // 8. Convert messages and tools to OpenAI format
     const enableThinking = isOpenAIThinkingEnabled(openaiModel)
-    const openaiMessages = anthropicMessagesToOpenAI(messagesForAPI, systemPrompt, {
-      enableThinking,
-    })
+    const openaiMessages = anthropicMessagesToOpenAI(
+      messagesForAPI,
+      systemPrompt,
+      {
+        enableThinking,
+      },
+    )
     const openaiTools = anthropicToolsToOpenAI(standardTools)
     const openaiToolChoice = anthropicToolChoiceToOpenAI(options.toolChoice)
 
@@ -310,10 +346,7 @@ export async function* queryModelOpenAI(
       maxTokens,
       temperatureOverride: options.temperatureOverride,
     })
-    const stream = await client.chat.completions.create(
-      requestBody,
-      { signal },
-    )
+    const stream = await client.chat.completions.create(requestBody, { signal })
 
     // 12. Convert OpenAI stream to Anthropic events, then process into
     //     AssistantMessage + StreamEvent (matching the Anthropic path behavior)
@@ -395,8 +428,13 @@ export async function* queryModelOpenAI(
           // here and injected so tokenCountWithEstimation() can read it.
           if (partialMessage) {
             for (const output of assembleFinalAssistantOutputs({
-              partialMessage, contentBlocks, tools, agentId: options.agentId,
-              usage, stopReason, maxTokens,
+              partialMessage,
+              contentBlocks,
+              tools,
+              agentId: options.agentId,
+              usage,
+              stopReason,
+              maxTokens,
             })) {
               yield output
             }
@@ -424,8 +462,13 @@ export async function* queryModelOpenAI(
     // Safety: if stream ended without message_stop, assemble and yield whatever we have
     if (partialMessage) {
       for (const output of assembleFinalAssistantOutputs({
-        partialMessage, contentBlocks, tools, agentId: options.agentId,
-        usage, stopReason, maxTokens,
+        partialMessage,
+        contentBlocks,
+        tools,
+        agentId: options.agentId,
+        usage,
+        stopReason,
+        maxTokens,
       })) {
         yield output
       }
@@ -436,7 +479,9 @@ export async function* queryModelOpenAI(
     yield createAssistantAPIErrorMessage({
       content: `API Error: ${errorMessage}`,
       apiError: 'api_error',
-      error: (error instanceof Error ? error : new Error(String(error))) as unknown as SDKAssistantMessageError,
+      error: (error instanceof Error
+        ? error
+        : new Error(String(error))) as unknown as SDKAssistantMessageError,
     })
   }
 }
diff --git a/src/services/api/openai/streamAdapter.ts b/src/services/api/openai/streamAdapter.ts
index 70f7161ff..51c8068ec 100644
--- a/src/services/api/openai/streamAdapter.ts
+++ b/src/services/api/openai/streamAdapter.ts
@@ -42,7 +42,10 @@ export async function* adaptOpenAIStreamToAnthropic(
   let currentContentIndex = -1
 
   // Track tool_use blocks: tool_calls index → { contentIndex, id, name, arguments }
-  const toolBlocks = new Map<number, { contentIndex: number; id: string; name: string; arguments: string }>()
+  const toolBlocks = new Map<
+    number,
+    { contentIndex: number; id: string; name: string; arguments: string }
+  >()
 
   // Track thinking block state
   let thinkingBlockOpen = false
@@ -212,7 +215,8 @@ export async function* adaptOpenAIStreamToAnthropic(
 
           // Start new tool_use block
           currentContentIndex++
-          const toolId = tc.id || `toolu_${randomUUID().replace(/-/g, '').slice(0, 24)}`
+          const toolId =
+            tc.id || `toolu_${randomUUID().replace(/-/g, '').slice(0, 24)}`
           const toolName = tc.function?.name || ''
 
           toolBlocks.set(tcIndex, {
diff --git a/src/services/api/promptCacheBreakDetection.ts b/src/services/api/promptCacheBreakDetection.ts
index 06307214f..e6f2410bc 100644
--- a/src/services/api/promptCacheBreakDetection.ts
+++ b/src/services/api/promptCacheBreakDetection.ts
@@ -459,7 +459,8 @@ export async function checkResponseForCacheBreak(
     // assistant message timestamp in the messages array (before the current response)
     const lastAssistantMessage = messages.findLast(m => m.type === 'assistant')
     const timeSinceLastAssistantMsg = lastAssistantMessage
-      ? Date.now() - new Date(lastAssistantMessage.timestamp as string | number).getTime()
+      ? Date.now() -
+        new Date(lastAssistantMessage.timestamp as string | number).getTime()
       : null
 
     // Skip the first call — no previous value to compare against
diff --git a/src/services/api/sessionIngress.ts b/src/services/api/sessionIngress.ts
index ae24a56cf..ed0576bb7 100644
--- a/src/services/api/sessionIngress.ts
+++ b/src/services/api/sessionIngress.ts
@@ -175,7 +175,7 @@ async function appendSessionLogImpl(
       return false
     }
 
-    const delayMs = Math.min(BASE_DELAY_MS * Math.pow(2, attempt - 1), 8000)
+    const delayMs = Math.min(BASE_DELAY_MS * 2 ** (attempt - 1), 8000)
     logForDebugging(
       `Remote persistence attempt ${attempt}/${MAX_RETRIES} failed, retrying in ${delayMs}ms…`,
     )
diff --git a/src/services/api/src/Tool.ts b/src/services/api/src/Tool.ts
index 63577b373..d6cf5b985 100644
--- a/src/services/api/src/Tool.ts
+++ b/src/services/api/src/Tool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type QueryChainTracking = any;
+export type QueryChainTracking = any
diff --git a/src/services/api/src/bootstrap/state.ts b/src/services/api/src/bootstrap/state.ts
index 24331fe0d..03c909720 100644
--- a/src/services/api/src/bootstrap/state.ts
+++ b/src/services/api/src/bootstrap/state.ts
@@ -1,22 +1,22 @@
 // Auto-generated type stub — replace with real implementation
-export type getSessionId = any;
-export type getAfkModeHeaderLatched = any;
-export type getCacheEditingHeaderLatched = any;
-export type getFastModeHeaderLatched = any;
-export type getLastApiCompletionTimestamp = any;
-export type getPromptCache1hAllowlist = any;
-export type getPromptCache1hEligible = any;
-export type getThinkingClearLatched = any;
-export type setAfkModeHeaderLatched = any;
-export type setCacheEditingHeaderLatched = any;
-export type setFastModeHeaderLatched = any;
-export type setLastMainRequestId = any;
-export type setPromptCache1hAllowlist = any;
-export type setPromptCache1hEligible = any;
-export type setThinkingClearLatched = any;
-export type addToTotalDurationState = any;
-export type consumePostCompaction = any;
-export type getIsNonInteractiveSession = any;
-export type getTeleportedSessionInfo = any;
-export type markFirstTeleportMessageLogged = any;
-export type setLastApiCompletionTimestamp = any;
+export type getSessionId = any
+export type getAfkModeHeaderLatched = any
+export type getCacheEditingHeaderLatched = any
+export type getFastModeHeaderLatched = any
+export type getLastApiCompletionTimestamp = any
+export type getPromptCache1hAllowlist = any
+export type getPromptCache1hEligible = any
+export type getThinkingClearLatched = any
+export type setAfkModeHeaderLatched = any
+export type setCacheEditingHeaderLatched = any
+export type setFastModeHeaderLatched = any
+export type setLastMainRequestId = any
+export type setPromptCache1hAllowlist = any
+export type setPromptCache1hEligible = any
+export type setThinkingClearLatched = any
+export type addToTotalDurationState = any
+export type consumePostCompaction = any
+export type getIsNonInteractiveSession = any
+export type getTeleportedSessionInfo = any
+export type markFirstTeleportMessageLogged = any
+export type setLastApiCompletionTimestamp = any
diff --git a/src/services/api/src/constants/betas.ts b/src/services/api/src/constants/betas.ts
index fd08b7176..5f9bd089b 100644
--- a/src/services/api/src/constants/betas.ts
+++ b/src/services/api/src/constants/betas.ts
@@ -1,10 +1,10 @@
 // Auto-generated type stub — replace with real implementation
-export type AFK_MODE_BETA_HEADER = any;
-export type CONTEXT_1M_BETA_HEADER = any;
-export type CONTEXT_MANAGEMENT_BETA_HEADER = any;
-export type EFFORT_BETA_HEADER = any;
-export type FAST_MODE_BETA_HEADER = any;
-export type PROMPT_CACHING_SCOPE_BETA_HEADER = any;
-export type REDACT_THINKING_BETA_HEADER = any;
-export type STRUCTURED_OUTPUTS_BETA_HEADER = any;
-export type TASK_BUDGETS_BETA_HEADER = any;
+export type AFK_MODE_BETA_HEADER = any
+export type CONTEXT_1M_BETA_HEADER = any
+export type CONTEXT_MANAGEMENT_BETA_HEADER = any
+export type EFFORT_BETA_HEADER = any
+export type FAST_MODE_BETA_HEADER = any
+export type PROMPT_CACHING_SCOPE_BETA_HEADER = any
+export type REDACT_THINKING_BETA_HEADER = any
+export type STRUCTURED_OUTPUTS_BETA_HEADER = any
+export type TASK_BUDGETS_BETA_HEADER = any
diff --git a/src/services/api/src/constants/querySource.ts b/src/services/api/src/constants/querySource.ts
index 61a17200d..09b2d0921 100644
--- a/src/services/api/src/constants/querySource.ts
+++ b/src/services/api/src/constants/querySource.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type QuerySource = any;
+export type QuerySource = any
diff --git a/src/services/api/src/context/notifications.ts b/src/services/api/src/context/notifications.ts
index c212e68b7..22164fdb3 100644
--- a/src/services/api/src/context/notifications.ts
+++ b/src/services/api/src/context/notifications.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type Notification = any;
+export type Notification = any
diff --git a/src/services/api/src/cost-tracker.ts b/src/services/api/src/cost-tracker.ts
index 3f76a9113..dea78c7af 100644
--- a/src/services/api/src/cost-tracker.ts
+++ b/src/services/api/src/cost-tracker.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type addToTotalSessionCost = any;
+export type addToTotalSessionCost = any
diff --git a/src/services/api/src/entrypoints/agentSdkTypes.ts b/src/services/api/src/entrypoints/agentSdkTypes.ts
index 0a85ba1ac..2c31d79aa 100644
--- a/src/services/api/src/entrypoints/agentSdkTypes.ts
+++ b/src/services/api/src/entrypoints/agentSdkTypes.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type SDKAssistantMessageError = any;
+export type SDKAssistantMessageError = any
diff --git a/src/services/api/src/services/analytics/growthbook.ts b/src/services/api/src/services/analytics/growthbook.ts
index e380906ea..7967fd3ee 100644
--- a/src/services/api/src/services/analytics/growthbook.ts
+++ b/src/services/api/src/services/analytics/growthbook.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getFeatureValue_CACHED_MAY_BE_STALE = any;
+export type getFeatureValue_CACHED_MAY_BE_STALE = any
diff --git a/src/services/api/src/services/analytics/index.ts b/src/services/api/src/services/analytics/index.ts
index 142e7b6f5..2e0f796da 100644
--- a/src/services/api/src/services/analytics/index.ts
+++ b/src/services/api/src/services/analytics/index.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any;
-export type logEvent = any;
+export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any
+export type logEvent = any
diff --git a/src/services/api/src/types/connectorText.ts b/src/services/api/src/types/connectorText.ts
index 6af50eb27..ff7f27861 100644
--- a/src/services/api/src/types/connectorText.ts
+++ b/src/services/api/src/types/connectorText.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type isConnectorTextBlock = (block: unknown) => boolean;
+export type isConnectorTextBlock = (block: unknown) => boolean
diff --git a/src/services/api/src/types/ids.ts b/src/services/api/src/types/ids.ts
index c8c60ebe5..93fc5f899 100644
--- a/src/services/api/src/types/ids.ts
+++ b/src/services/api/src/types/ids.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type AgentId = any;
+export type AgentId = any
diff --git a/src/services/api/src/types/message.ts b/src/services/api/src/types/message.ts
index c420ee31b..e46a6f93d 100644
--- a/src/services/api/src/types/message.ts
+++ b/src/services/api/src/types/message.ts
@@ -1,5 +1,5 @@
 // Auto-generated type stub — replace with real implementation
-export type Message = any;
-export type AssistantMessage = any;
-export type UserMessage = any;
-export type SystemAPIErrorMessage = any;
+export type Message = any
+export type AssistantMessage = any
+export type UserMessage = any
+export type SystemAPIErrorMessage = any
diff --git a/src/services/api/src/utils/advisor.ts b/src/services/api/src/utils/advisor.ts
index 57cbac38c..963080e31 100644
--- a/src/services/api/src/utils/advisor.ts
+++ b/src/services/api/src/utils/advisor.ts
@@ -1,6 +1,6 @@
 // Auto-generated type stub — replace with real implementation
-export type ADVISOR_TOOL_INSTRUCTIONS = any;
-export type getExperimentAdvisorModels = any;
-export type isAdvisorEnabled = any;
-export type isValidAdvisorModel = any;
-export type modelSupportsAdvisor = any;
+export type ADVISOR_TOOL_INSTRUCTIONS = any
+export type getExperimentAdvisorModels = any
+export type isAdvisorEnabled = any
+export type isValidAdvisorModel = any
+export type modelSupportsAdvisor = any
diff --git a/src/services/api/src/utils/agentContext.ts b/src/services/api/src/utils/agentContext.ts
index 92f1d4946..7625c79ba 100644
--- a/src/services/api/src/utils/agentContext.ts
+++ b/src/services/api/src/utils/agentContext.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getAgentContext = any;
+export type getAgentContext = any
diff --git a/src/services/api/src/utils/auth.ts b/src/services/api/src/utils/auth.ts
index ee66093d8..2d75731d2 100644
--- a/src/services/api/src/utils/auth.ts
+++ b/src/services/api/src/utils/auth.ts
@@ -1,12 +1,12 @@
 // Auto-generated type stub — replace with real implementation
-export type getAnthropicApiKeyWithSource = any;
-export type getClaudeAIOAuthTokens = any;
-export type getOauthAccountInfo = any;
-export type isClaudeAISubscriber = any;
-export type checkAndRefreshOAuthTokenIfNeeded = any;
-export type getAnthropicApiKey = any;
-export type getApiKeyFromApiKeyHelper = any;
-export type refreshAndGetAwsCredentials = any;
-export type refreshGcpCredentialsIfNeeded = any;
-export type isConsumerSubscriber = any;
-export type hasProfileScope = any;
+export type getAnthropicApiKeyWithSource = any
+export type getClaudeAIOAuthTokens = any
+export type getOauthAccountInfo = any
+export type isClaudeAISubscriber = any
+export type checkAndRefreshOAuthTokenIfNeeded = any
+export type getAnthropicApiKey = any
+export type getApiKeyFromApiKeyHelper = any
+export type refreshAndGetAwsCredentials = any
+export type refreshGcpCredentialsIfNeeded = any
+export type isConsumerSubscriber = any
+export type hasProfileScope = any
diff --git a/src/services/api/src/utils/aws.ts b/src/services/api/src/utils/aws.ts
index 1929aaf98..43956e4fa 100644
--- a/src/services/api/src/utils/aws.ts
+++ b/src/services/api/src/utils/aws.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type isAwsCredentialsProviderError = any;
+export type isAwsCredentialsProviderError = any
diff --git a/src/services/api/src/utils/betas.ts b/src/services/api/src/utils/betas.ts
index 20d09935e..26dcfc68e 100644
--- a/src/services/api/src/utils/betas.ts
+++ b/src/services/api/src/utils/betas.ts
@@ -1,5 +1,5 @@
 // Auto-generated type stub — replace with real implementation
-export type getToolSearchBetaHeader = any;
-export type modelSupportsStructuredOutputs = any;
-export type shouldIncludeFirstPartyOnlyBetas = any;
-export type shouldUseGlobalCacheScope = any;
+export type getToolSearchBetaHeader = any
+export type modelSupportsStructuredOutputs = any
+export type shouldIncludeFirstPartyOnlyBetas = any
+export type shouldUseGlobalCacheScope = any
diff --git a/src/services/api/src/utils/claudeInChrome/common.ts b/src/services/api/src/utils/claudeInChrome/common.ts
index 26f787dab..c31c3dc82 100644
--- a/src/services/api/src/utils/claudeInChrome/common.ts
+++ b/src/services/api/src/utils/claudeInChrome/common.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type CLAUDE_IN_CHROME_MCP_SERVER_NAME = any;
+export type CLAUDE_IN_CHROME_MCP_SERVER_NAME = any
diff --git a/src/services/api/src/utils/claudeInChrome/prompt.ts b/src/services/api/src/utils/claudeInChrome/prompt.ts
index 5029b1cc6..fdd67785b 100644
--- a/src/services/api/src/utils/claudeInChrome/prompt.ts
+++ b/src/services/api/src/utils/claudeInChrome/prompt.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type CHROME_TOOL_SEARCH_INSTRUCTIONS = any;
+export type CHROME_TOOL_SEARCH_INSTRUCTIONS = any
diff --git a/src/services/api/src/utils/context.ts b/src/services/api/src/utils/context.ts
index 3840f431a..589418478 100644
--- a/src/services/api/src/utils/context.ts
+++ b/src/services/api/src/utils/context.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getMaxThinkingTokensForModel = any;
+export type getMaxThinkingTokensForModel = any
diff --git a/src/services/api/src/utils/debug.ts b/src/services/api/src/utils/debug.ts
index c64d5960c..5a0f1d515 100644
--- a/src/services/api/src/utils/debug.ts
+++ b/src/services/api/src/utils/debug.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type logForDebugging = any;
+export type logForDebugging = any
diff --git a/src/services/api/src/utils/diagLogs.ts b/src/services/api/src/utils/diagLogs.ts
index b016581ff..c9614ae3b 100644
--- a/src/services/api/src/utils/diagLogs.ts
+++ b/src/services/api/src/utils/diagLogs.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type logForDiagnosticsNoPII = any;
+export type logForDiagnosticsNoPII = any
diff --git a/src/services/api/src/utils/effort.ts b/src/services/api/src/utils/effort.ts
index c3acecb56..085af3cd9 100644
--- a/src/services/api/src/utils/effort.ts
+++ b/src/services/api/src/utils/effort.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type EffortValue = 'low' | 'medium' | 'high' | 'max' | number;
-export type modelSupportsEffort = (model: string) => boolean;
-export type EffortLevel = 'low' | 'medium' | 'high' | 'max';
+export type EffortValue = 'low' | 'medium' | 'high' | 'max' | number
+export type modelSupportsEffort = (model: string) => boolean
+export type EffortLevel = 'low' | 'medium' | 'high' | 'max'
diff --git a/src/services/api/src/utils/fastMode.ts b/src/services/api/src/utils/fastMode.ts
index 1228a5815..07576ac89 100644
--- a/src/services/api/src/utils/fastMode.ts
+++ b/src/services/api/src/utils/fastMode.ts
@@ -1,5 +1,5 @@
 // Auto-generated type stub — replace with real implementation
-export type isFastModeAvailable = any;
-export type isFastModeCooldown = any;
-export type isFastModeEnabled = any;
-export type isFastModeSupportedByModel = any;
+export type isFastModeAvailable = any
+export type isFastModeCooldown = any
+export type isFastModeEnabled = any
+export type isFastModeSupportedByModel = any
diff --git a/src/services/api/src/utils/generators.ts b/src/services/api/src/utils/generators.ts
index 5a7707488..8ff432161 100644
--- a/src/services/api/src/utils/generators.ts
+++ b/src/services/api/src/utils/generators.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type returnValue = any;
+export type returnValue = any
diff --git a/src/services/api/src/utils/gracefulShutdown.ts b/src/services/api/src/utils/gracefulShutdown.ts
index 28329ba76..e6caf3522 100644
--- a/src/services/api/src/utils/gracefulShutdown.ts
+++ b/src/services/api/src/utils/gracefulShutdown.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type gracefulShutdown = any;
+export type gracefulShutdown = any
diff --git a/src/services/api/src/utils/hash.ts b/src/services/api/src/utils/hash.ts
index 6aaf94a67..387aa74a0 100644
--- a/src/services/api/src/utils/hash.ts
+++ b/src/services/api/src/utils/hash.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type djb2Hash = any;
+export type djb2Hash = any
diff --git a/src/services/api/src/utils/headlessProfiler.ts b/src/services/api/src/utils/headlessProfiler.ts
index 123f78a48..c16a0e523 100644
--- a/src/services/api/src/utils/headlessProfiler.ts
+++ b/src/services/api/src/utils/headlessProfiler.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type headlessProfilerCheckpoint = any;
+export type headlessProfilerCheckpoint = any
diff --git a/src/services/api/src/utils/http.ts b/src/services/api/src/utils/http.ts
index 22100b2eb..f5f93c618 100644
--- a/src/services/api/src/utils/http.ts
+++ b/src/services/api/src/utils/http.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getUserAgent = any;
+export type getUserAgent = any
diff --git a/src/services/api/src/utils/log.ts b/src/services/api/src/utils/log.ts
index cf30e90da..30df9cbcb 100644
--- a/src/services/api/src/utils/log.ts
+++ b/src/services/api/src/utils/log.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type logError = any;
+export type logError = any
diff --git a/src/services/api/src/utils/mcpInstructionsDelta.ts b/src/services/api/src/utils/mcpInstructionsDelta.ts
index 5da03fccc..7b4c4070d 100644
--- a/src/services/api/src/utils/mcpInstructionsDelta.ts
+++ b/src/services/api/src/utils/mcpInstructionsDelta.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type isMcpInstructionsDeltaEnabled = any;
+export type isMcpInstructionsDeltaEnabled = any
diff --git a/src/services/api/src/utils/messages.ts b/src/services/api/src/utils/messages.ts
index 27c84668c..09fbc7dd9 100644
--- a/src/services/api/src/utils/messages.ts
+++ b/src/services/api/src/utils/messages.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type createAssistantAPIErrorMessage = any;
-export type NO_RESPONSE_REQUESTED = any;
-export type createSystemAPIErrorMessage = any;
+export type createAssistantAPIErrorMessage = any
+export type NO_RESPONSE_REQUESTED = any
+export type createSystemAPIErrorMessage = any
diff --git a/src/services/api/src/utils/model/model.ts b/src/services/api/src/utils/model/model.ts
index 401fe0248..2974ce161 100644
--- a/src/services/api/src/utils/model/model.ts
+++ b/src/services/api/src/utils/model/model.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type getDefaultMainLoopModelSetting = any;
-export type isNonCustomOpusModel = any;
-export type getSmallFastModel = any;
+export type getDefaultMainLoopModelSetting = any
+export type isNonCustomOpusModel = any
+export type getSmallFastModel = any
diff --git a/src/services/api/src/utils/model/modelStrings.ts b/src/services/api/src/utils/model/modelStrings.ts
index 1265ece0e..a58abdf93 100644
--- a/src/services/api/src/utils/model/modelStrings.ts
+++ b/src/services/api/src/utils/model/modelStrings.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getModelStrings = any;
+export type getModelStrings = any
diff --git a/src/services/api/src/utils/model/providers.ts b/src/services/api/src/utils/model/providers.ts
index f8e248dfa..0d6d4841a 100644
--- a/src/services/api/src/utils/model/providers.ts
+++ b/src/services/api/src/utils/model/providers.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type getAPIProvider = any;
-export type getAPIProviderForStatsig = any;
-export type isFirstPartyAnthropicBaseUrl = any;
+export type getAPIProvider = any
+export type getAPIProviderForStatsig = any
+export type isFirstPartyAnthropicBaseUrl = any
diff --git a/src/services/api/src/utils/modelCost.ts b/src/services/api/src/utils/modelCost.ts
index a37f5df38..dffb6f217 100644
--- a/src/services/api/src/utils/modelCost.ts
+++ b/src/services/api/src/utils/modelCost.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type calculateUSDCost = any;
+export type calculateUSDCost = any
diff --git a/src/services/api/src/utils/permissions/PermissionMode.ts b/src/services/api/src/utils/permissions/PermissionMode.ts
index 1bc6199f9..799935c26 100644
--- a/src/services/api/src/utils/permissions/PermissionMode.ts
+++ b/src/services/api/src/utils/permissions/PermissionMode.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type PermissionMode = any;
+export type PermissionMode = any
diff --git a/src/services/api/src/utils/permissions/filesystem.ts b/src/services/api/src/utils/permissions/filesystem.ts
index ef39cc7f8..43512f2ec 100644
--- a/src/services/api/src/utils/permissions/filesystem.ts
+++ b/src/services/api/src/utils/permissions/filesystem.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getClaudeTempDir = any;
+export type getClaudeTempDir = any
diff --git a/src/services/api/src/utils/privacyLevel.ts b/src/services/api/src/utils/privacyLevel.ts
index 9d1c3506f..cd0906bc0 100644
--- a/src/services/api/src/utils/privacyLevel.ts
+++ b/src/services/api/src/utils/privacyLevel.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type isEssentialTrafficOnly = any;
+export type isEssentialTrafficOnly = any
diff --git a/src/services/api/src/utils/process.ts b/src/services/api/src/utils/process.ts
index 1085e5d63..f9dfb47b3 100644
--- a/src/services/api/src/utils/process.ts
+++ b/src/services/api/src/utils/process.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type writeToStderr = any;
+export type writeToStderr = any
diff --git a/src/services/api/src/utils/proxy.ts b/src/services/api/src/utils/proxy.ts
index e93b33d2d..c6017d936 100644
--- a/src/services/api/src/utils/proxy.ts
+++ b/src/services/api/src/utils/proxy.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getProxyFetchOptions = any;
+export type getProxyFetchOptions = any
diff --git a/src/services/api/src/utils/queryProfiler.ts b/src/services/api/src/utils/queryProfiler.ts
index 1283fcc9e..d2f1fa133 100644
--- a/src/services/api/src/utils/queryProfiler.ts
+++ b/src/services/api/src/utils/queryProfiler.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type endQueryProfile = any;
-export type queryCheckpoint = any;
+export type endQueryProfile = any
+export type queryCheckpoint = any
diff --git a/src/services/api/src/utils/slowOperations.ts b/src/services/api/src/utils/slowOperations.ts
index b888efc24..72ec74769 100644
--- a/src/services/api/src/utils/slowOperations.ts
+++ b/src/services/api/src/utils/slowOperations.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type jsonStringify = any;
+export type jsonStringify = any
diff --git a/src/services/api/src/utils/telemetry/events.ts b/src/services/api/src/utils/telemetry/events.ts
index 4ae001883..4a7e479c7 100644
--- a/src/services/api/src/utils/telemetry/events.ts
+++ b/src/services/api/src/utils/telemetry/events.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type logOTelEvent = any;
+export type logOTelEvent = any
diff --git a/src/services/api/src/utils/telemetry/sessionTracing.ts b/src/services/api/src/utils/telemetry/sessionTracing.ts
index 094d0f999..5ae799b55 100644
--- a/src/services/api/src/utils/telemetry/sessionTracing.ts
+++ b/src/services/api/src/utils/telemetry/sessionTracing.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type endLLMRequestSpan = any;
-export type isBetaTracingEnabled = any;
-export type Span = any;
+export type endLLMRequestSpan = any
+export type isBetaTracingEnabled = any
+export type Span = any
diff --git a/src/services/api/src/utils/thinking.ts b/src/services/api/src/utils/thinking.ts
index ea79bd179..ccff6b6f9 100644
--- a/src/services/api/src/utils/thinking.ts
+++ b/src/services/api/src/utils/thinking.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type modelSupportsAdaptiveThinking = any;
-export type modelSupportsThinking = any;
-export type ThinkingConfig = any;
+export type modelSupportsAdaptiveThinking = any
+export type modelSupportsThinking = any
+export type ThinkingConfig = any
diff --git a/src/services/api/src/utils/toolSearch.ts b/src/services/api/src/utils/toolSearch.ts
index 3df7e9955..fb679f84e 100644
--- a/src/services/api/src/utils/toolSearch.ts
+++ b/src/services/api/src/utils/toolSearch.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type extractDiscoveredToolNames = any;
-export type isDeferredToolsDeltaEnabled = any;
-export type isToolSearchEnabled = any;
+export type extractDiscoveredToolNames = any
+export type isDeferredToolsDeltaEnabled = any
+export type isToolSearchEnabled = any
diff --git a/src/services/api/withRetry.ts b/src/services/api/withRetry.ts
index 5ec9ad080..3e844d744 100644
--- a/src/services/api/withRetry.ts
+++ b/src/services/api/withRetry.ts
@@ -539,10 +539,7 @@ export function getRetryDelay(
     }
   }
 
-  const baseDelay = Math.min(
-    BASE_DELAY_MS * Math.pow(2, attempt - 1),
-    maxDelayMs,
-  )
+  const baseDelay = Math.min(BASE_DELAY_MS * 2 ** (attempt - 1), maxDelayMs)
   const jitter = Math.random() * 0.25 * baseDelay
   return baseDelay + jitter
 }
diff --git a/src/services/claudeAiLimits.ts b/src/services/claudeAiLimits.ts
index 979f4f72d..178f13613 100644
--- a/src/services/claudeAiLimits.ts
+++ b/src/services/claudeAiLimits.ts
@@ -205,7 +205,6 @@ async function makeTestQuery() {
   })
   const messages: MessageParam[] = [{ role: 'user', content: 'quota' }]
   const betas = getModelBetas(model)
-  // biome-ignore lint/plugin: quota check needs raw response access via asResponse()
   return anthropic.beta.messages
     .create({
       model,
diff --git a/src/services/compact/__tests__/grouping.test.ts b/src/services/compact/__tests__/grouping.test.ts
index fac5aa56d..973589d8f 100644
--- a/src/services/compact/__tests__/grouping.test.ts
+++ b/src/services/compact/__tests__/grouping.test.ts
@@ -1,121 +1,115 @@
-import { describe, expect, test } from "bun:test";
-import { groupMessagesByApiRound } from "../grouping";
+import { describe, expect, test } from 'bun:test'
+import { groupMessagesByApiRound } from '../grouping'
 
-function makeMsg(type: "user" | "assistant" | "system", id: string): any {
+function makeMsg(type: 'user' | 'assistant' | 'system', id: string): any {
   return {
     type,
     message: { id, content: `${type}-${id}` },
-  };
+  }
 }
 
-describe("groupMessagesByApiRound", () => {
+describe('groupMessagesByApiRound', () => {
   // Boundary fires when: assistant msg with NEW id AND current group has items
-  test("splits before first assistant if user messages precede it", () => {
-    const messages = [makeMsg("user", "u1"), makeMsg("assistant", "a1")];
-    const groups = groupMessagesByApiRound(messages);
+  test('splits before first assistant if user messages precede it', () => {
+    const messages = [makeMsg('user', 'u1'), makeMsg('assistant', 'a1')]
+    const groups = groupMessagesByApiRound(messages)
     // user msgs form group 1, assistant starts group 2
-    expect(groups).toHaveLength(2);
-    expect(groups[0]).toHaveLength(1);
-    expect(groups[1]).toHaveLength(1);
-  });
+    expect(groups).toHaveLength(2)
+    expect(groups[0]).toHaveLength(1)
+    expect(groups[1]).toHaveLength(1)
+  })
 
-  test("single assistant message forms one group", () => {
-    const messages = [makeMsg("assistant", "a1")];
-    const groups = groupMessagesByApiRound(messages);
-    expect(groups).toHaveLength(1);
-  });
+  test('single assistant message forms one group', () => {
+    const messages = [makeMsg('assistant', 'a1')]
+    const groups = groupMessagesByApiRound(messages)
+    expect(groups).toHaveLength(1)
+  })
 
-  test("splits at new assistant message ID", () => {
+  test('splits at new assistant message ID', () => {
     const messages = [
-      makeMsg("user", "u1"),
-      makeMsg("assistant", "a1"),
-      makeMsg("assistant", "a2"),
-    ];
-    const groups = groupMessagesByApiRound(messages);
-    expect(groups).toHaveLength(3);
-  });
+      makeMsg('user', 'u1'),
+      makeMsg('assistant', 'a1'),
+      makeMsg('assistant', 'a2'),
+    ]
+    const groups = groupMessagesByApiRound(messages)
+    expect(groups).toHaveLength(3)
+  })
 
-  test("keeps same-ID assistant messages in same group (streaming chunks)", () => {
+  test('keeps same-ID assistant messages in same group (streaming chunks)', () => {
     const messages = [
-      makeMsg("assistant", "a1"),
-      makeMsg("assistant", "a1"),
-      makeMsg("assistant", "a1"),
-    ];
-    const groups = groupMessagesByApiRound(messages);
-    expect(groups).toHaveLength(1);
-    expect(groups[0]).toHaveLength(3);
-  });
+      makeMsg('assistant', 'a1'),
+      makeMsg('assistant', 'a1'),
+      makeMsg('assistant', 'a1'),
+    ]
+    const groups = groupMessagesByApiRound(messages)
+    expect(groups).toHaveLength(1)
+    expect(groups[0]).toHaveLength(3)
+  })
 
-  test("returns empty array for empty input", () => {
-    expect(groupMessagesByApiRound([])).toEqual([]);
-  });
+  test('returns empty array for empty input', () => {
+    expect(groupMessagesByApiRound([])).toEqual([])
+  })
 
-  test("handles all user messages (no assistant)", () => {
-    const messages = [makeMsg("user", "u1"), makeMsg("user", "u2")];
-    const groups = groupMessagesByApiRound(messages);
-    expect(groups).toHaveLength(1);
-  });
+  test('handles all user messages (no assistant)', () => {
+    const messages = [makeMsg('user', 'u1'), makeMsg('user', 'u2')]
+    const groups = groupMessagesByApiRound(messages)
+    expect(groups).toHaveLength(1)
+  })
 
-  test("three API rounds produce correct groups", () => {
+  test('three API rounds produce correct groups', () => {
     const messages = [
-      makeMsg("user", "u1"),
-      makeMsg("assistant", "a1"),
-      makeMsg("user", "u2"),
-      makeMsg("assistant", "a2"),
-      makeMsg("user", "u3"),
-      makeMsg("assistant", "a3"),
-    ];
-    const groups = groupMessagesByApiRound(messages);
+      makeMsg('user', 'u1'),
+      makeMsg('assistant', 'a1'),
+      makeMsg('user', 'u2'),
+      makeMsg('assistant', 'a2'),
+      makeMsg('user', 'u3'),
+      makeMsg('assistant', 'a3'),
+    ]
+    const groups = groupMessagesByApiRound(messages)
     // [u1], [a1, u2], [a2, u3], [a3] = 4 groups
-    expect(groups).toHaveLength(4);
-  });
+    expect(groups).toHaveLength(4)
+  })
 
-  test("consecutive user messages stay in same group", () => {
-    const messages = [makeMsg("user", "u1"), makeMsg("user", "u2")];
-    expect(groupMessagesByApiRound(messages)).toHaveLength(1);
-  });
+  test('consecutive user messages stay in same group', () => {
+    const messages = [makeMsg('user', 'u1'), makeMsg('user', 'u2')]
+    expect(groupMessagesByApiRound(messages)).toHaveLength(1)
+  })
 
-  test("does not produce empty groups", () => {
-    const messages = [
-      makeMsg("assistant", "a1"),
-      makeMsg("assistant", "a2"),
-    ];
-    const groups = groupMessagesByApiRound(messages);
+  test('does not produce empty groups', () => {
+    const messages = [makeMsg('assistant', 'a1'), makeMsg('assistant', 'a2')]
+    const groups = groupMessagesByApiRound(messages)
     for (const group of groups) {
-      expect(group.length).toBeGreaterThan(0);
+      expect(group.length).toBeGreaterThan(0)
     }
-  });
+  })
 
-  test("handles single message", () => {
-    expect(groupMessagesByApiRound([makeMsg("user", "u1")])).toHaveLength(1);
-  });
+  test('handles single message', () => {
+    expect(groupMessagesByApiRound([makeMsg('user', 'u1')])).toHaveLength(1)
+  })
 
-  test("preserves message order within groups", () => {
-    const messages = [makeMsg("assistant", "a1"), makeMsg("user", "u2")];
-    const groups = groupMessagesByApiRound(messages);
-    expect(groups[0]![0]!.message!.id).toBe("a1");
-    expect(groups[0]![1]!.message!.id).toBe("u2");
-  });
+  test('preserves message order within groups', () => {
+    const messages = [makeMsg('assistant', 'a1'), makeMsg('user', 'u2')]
+    const groups = groupMessagesByApiRound(messages)
+    expect(groups[0]![0]!.message!.id).toBe('a1')
+    expect(groups[0]![1]!.message!.id).toBe('u2')
+  })
 
-  test("handles system messages", () => {
-    const messages = [
-      makeMsg("system", "s1"),
-      makeMsg("assistant", "a1"),
-    ];
+  test('handles system messages', () => {
+    const messages = [makeMsg('system', 's1'), makeMsg('assistant', 'a1')]
     // system msg is non-assistant, goes to current. Then assistant a1 is new ID
     // and current has items, so split.
-    const groups = groupMessagesByApiRound(messages);
-    expect(groups).toHaveLength(2);
-  });
+    const groups = groupMessagesByApiRound(messages)
+    expect(groups).toHaveLength(2)
+  })
 
-  test("tool_result after assistant stays in same round", () => {
+  test('tool_result after assistant stays in same round', () => {
     const messages = [
-      makeMsg("assistant", "a1"),
-      makeMsg("user", "tool_result_1"),
-      makeMsg("assistant", "a1"), // same ID = no new boundary
-    ];
-    const groups = groupMessagesByApiRound(messages);
-    expect(groups).toHaveLength(1);
-    expect(groups[0]).toHaveLength(3);
-  });
-});
+      makeMsg('assistant', 'a1'),
+      makeMsg('user', 'tool_result_1'),
+      makeMsg('assistant', 'a1'), // same ID = no new boundary
+    ]
+    const groups = groupMessagesByApiRound(messages)
+    expect(groups).toHaveLength(1)
+    expect(groups[0]).toHaveLength(3)
+  })
+})
diff --git a/src/services/compact/__tests__/prompt.test.ts b/src/services/compact/__tests__/prompt.test.ts
index dbed89847..3a758adc3 100644
--- a/src/services/compact/__tests__/prompt.test.ts
+++ b/src/services/compact/__tests__/prompt.test.ts
@@ -1,77 +1,80 @@
-import { mock, describe, expect, test } from "bun:test";
+import { mock, describe, expect, test } from 'bun:test'
 
-mock.module("bun:bundle", () => ({ feature: () => false }));
+mock.module('bun:bundle', () => ({ feature: () => false }))
 
-const { formatCompactSummary } = await import("../prompt");
+const { formatCompactSummary } = await import('../prompt')
 
-describe("formatCompactSummary", () => {
-  test("strips <analysis>...</analysis> block", () => {
-    const input = "<analysis>my thought process</analysis>\n<summary>the summary</summary>";
-    const result = formatCompactSummary(input);
-    expect(result).not.toContain("<analysis>");
-    expect(result).not.toContain("my thought process");
-  });
+describe('formatCompactSummary', () => {
+  test('strips <analysis>...</analysis> block', () => {
+    const input =
+      '<analysis>my thought process</analysis>\n<summary>the summary</summary>'
+    const result = formatCompactSummary(input)
+    expect(result).not.toContain('<analysis>')
+    expect(result).not.toContain('my thought process')
+  })
 
   test("replaces <summary>...</summary> with 'Summary:\\n' prefix", () => {
-    const input = "<summary>key points here</summary>";
-    const result = formatCompactSummary(input);
-    expect(result).toContain("Summary:");
-    expect(result).toContain("key points here");
-    expect(result).not.toContain("<summary>");
-  });
+    const input = '<summary>key points here</summary>'
+    const result = formatCompactSummary(input)
+    expect(result).toContain('Summary:')
+    expect(result).toContain('key points here')
+    expect(result).not.toContain('<summary>')
+  })
 
-  test("handles analysis + summary together", () => {
-    const input = "<analysis>thinking</analysis><summary>result</summary>";
-    const result = formatCompactSummary(input);
-    expect(result).not.toContain("thinking");
-    expect(result).toContain("result");
-  });
+  test('handles analysis + summary together', () => {
+    const input = '<analysis>thinking</analysis><summary>result</summary>'
+    const result = formatCompactSummary(input)
+    expect(result).not.toContain('thinking')
+    expect(result).toContain('result')
+  })
 
-  test("handles summary without analysis", () => {
-    const input = "<summary>just the summary</summary>";
-    const result = formatCompactSummary(input);
-    expect(result).toContain("just the summary");
-  });
+  test('handles summary without analysis', () => {
+    const input = '<summary>just the summary</summary>'
+    const result = formatCompactSummary(input)
+    expect(result).toContain('just the summary')
+  })
 
-  test("handles analysis without summary", () => {
-    const input = "<analysis>just analysis</analysis>and some text";
-    const result = formatCompactSummary(input);
-    expect(result).not.toContain("just analysis");
-    expect(result).toContain("and some text");
-  });
+  test('handles analysis without summary', () => {
+    const input = '<analysis>just analysis</analysis>and some text'
+    const result = formatCompactSummary(input)
+    expect(result).not.toContain('just analysis')
+    expect(result).toContain('and some text')
+  })
 
-  test("collapses multiple newlines to double", () => {
-    const input = "hello\n\n\n\nworld";
-    const result = formatCompactSummary(input);
-    expect(result).not.toMatch(/\n{3,}/);
-  });
+  test('collapses multiple newlines to double', () => {
+    const input = 'hello\n\n\n\nworld'
+    const result = formatCompactSummary(input)
+    expect(result).not.toMatch(/\n{3,}/)
+  })
 
-  test("trims leading/trailing whitespace", () => {
-    const input = "  \n  hello  \n  ";
-    const result = formatCompactSummary(input);
-    expect(result).toBe("hello");
-  });
+  test('trims leading/trailing whitespace', () => {
+    const input = '  \n  hello  \n  '
+    const result = formatCompactSummary(input)
+    expect(result).toBe('hello')
+  })
 
-  test("handles empty string", () => {
-    expect(formatCompactSummary("")).toBe("");
-  });
+  test('handles empty string', () => {
+    expect(formatCompactSummary('')).toBe('')
+  })
 
-  test("handles plain text without tags", () => {
-    const input = "just plain text";
-    expect(formatCompactSummary(input)).toBe("just plain text");
-  });
+  test('handles plain text without tags', () => {
+    const input = 'just plain text'
+    expect(formatCompactSummary(input)).toBe('just plain text')
+  })
 
-  test("handles multiline analysis content", () => {
-    const input = "<analysis>\nline1\nline2\nline3\n</analysis><summary>ok</summary>";
-    const result = formatCompactSummary(input);
-    expect(result).not.toContain("line1");
-    expect(result).toContain("ok");
-  });
+  test('handles multiline analysis content', () => {
+    const input =
+      '<analysis>\nline1\nline2\nline3\n</analysis><summary>ok</summary>'
+    const result = formatCompactSummary(input)
+    expect(result).not.toContain('line1')
+    expect(result).toContain('ok')
+  })
 
-  test("preserves content between analysis and summary", () => {
-    const input = "<analysis>thoughts</analysis>middle text<summary>final</summary>";
-    const result = formatCompactSummary(input);
-    expect(result).toContain("middle text");
-    expect(result).toContain("final");
-  });
-});
+  test('preserves content between analysis and summary', () => {
+    const input =
+      '<analysis>thoughts</analysis>middle text<summary>final</summary>'
+    const result = formatCompactSummary(input)
+    expect(result).toContain('middle text')
+    expect(result).toContain('final')
+  })
+})
diff --git a/src/services/compact/apiMicrocompact.ts b/src/services/compact/apiMicrocompact.ts
index 44b292dac..8ffe2c234 100644
--- a/src/services/compact/apiMicrocompact.ts
+++ b/src/services/compact/apiMicrocompact.ts
@@ -103,10 +103,10 @@ export function getAPIContextManagement(options?: {
 
   if (useClearToolResults) {
     const triggerThreshold = process.env.API_MAX_INPUT_TOKENS
-      ? parseInt(process.env.API_MAX_INPUT_TOKENS)
+      ? parseInt(process.env.API_MAX_INPUT_TOKENS, 10)
       : DEFAULT_MAX_INPUT_TOKENS
     const keepTarget = process.env.API_TARGET_INPUT_TOKENS
-      ? parseInt(process.env.API_TARGET_INPUT_TOKENS)
+      ? parseInt(process.env.API_TARGET_INPUT_TOKENS, 10)
       : DEFAULT_TARGET_INPUT_TOKENS
 
     const strategy: ContextEditStrategy = {
@@ -127,10 +127,10 @@ export function getAPIContextManagement(options?: {
 
   if (useClearToolUses) {
     const triggerThreshold = process.env.API_MAX_INPUT_TOKENS
-      ? parseInt(process.env.API_MAX_INPUT_TOKENS)
+      ? parseInt(process.env.API_MAX_INPUT_TOKENS, 10)
       : DEFAULT_MAX_INPUT_TOKENS
     const keepTarget = process.env.API_TARGET_INPUT_TOKENS
-      ? parseInt(process.env.API_TARGET_INPUT_TOKENS)
+      ? parseInt(process.env.API_TARGET_INPUT_TOKENS, 10)
       : DEFAULT_TARGET_INPUT_TOKENS
 
     const strategy: ContextEditStrategy = {
diff --git a/src/services/compact/cachedMCConfig.ts b/src/services/compact/cachedMCConfig.ts
index 67d72648c..3279fcc07 100644
--- a/src/services/compact/cachedMCConfig.ts
+++ b/src/services/compact/cachedMCConfig.ts
@@ -1,3 +1,8 @@
 // Auto-generated stub — replace with real implementation
-export {};
-export const getCachedMCConfig: () => { enabled?: boolean; systemPromptSuggestSummaries?: boolean; supportedModels?: string[]; [key: string]: unknown } = () => ({});
+export {}
+export const getCachedMCConfig: () => {
+  enabled?: boolean
+  systemPromptSuggestSummaries?: boolean
+  supportedModels?: string[]
+  [key: string]: unknown
+} = () => ({})
diff --git a/src/services/compact/cachedMicrocompact.ts b/src/services/compact/cachedMicrocompact.ts
index 471ad8dfe..81824709c 100644
--- a/src/services/compact/cachedMicrocompact.ts
+++ b/src/services/compact/cachedMicrocompact.ts
@@ -1,5 +1,5 @@
 // Auto-generated stub — replace with real implementation
-export {};
+export {}
 
 export type CachedMCState = {
   registeredTools: Set<string>
@@ -19,19 +19,33 @@ export type PinnedCacheEdits = {
   block: CacheEditsBlock
 }
 
-export const isCachedMicrocompactEnabled: () => boolean = () => false;
-export const isModelSupportedForCacheEditing: (model: string) => boolean = () => false;
-export const getCachedMCConfig: () => { triggerThreshold: number; keepRecent: number } = () => ({ triggerThreshold: 0, keepRecent: 0 });
+export const isCachedMicrocompactEnabled: () => boolean = () => false
+export const isModelSupportedForCacheEditing: (model: string) => boolean = () =>
+  false
+export const getCachedMCConfig: () => {
+  triggerThreshold: number
+  keepRecent: number
+} = () => ({ triggerThreshold: 0, keepRecent: 0 })
 export const createCachedMCState: () => CachedMCState = () => ({
   registeredTools: new Set(),
   toolOrder: [],
   deletedRefs: new Set(),
   pinnedEdits: [],
   toolsSentToAPI: false,
-});
-export const markToolsSentToAPI: (state: CachedMCState) => void = () => {};
-export const resetCachedMCState: (state: CachedMCState) => void = () => {};
-export const registerToolResult: (state: CachedMCState, toolId: string) => void = () => {};
-export const registerToolMessage: (state: CachedMCState, groupIds: string[]) => void = () => {};
-export const getToolResultsToDelete: (state: CachedMCState) => string[] = () => [];
-export const createCacheEditsBlock: (state: CachedMCState, toolIds: string[]) => CacheEditsBlock | null = () => null;
+})
+export const markToolsSentToAPI: (state: CachedMCState) => void = () => {}
+export const resetCachedMCState: (state: CachedMCState) => void = () => {}
+export const registerToolResult: (
+  state: CachedMCState,
+  toolId: string,
+) => void = () => {}
+export const registerToolMessage: (
+  state: CachedMCState,
+  groupIds: string[],
+) => void = () => {}
+export const getToolResultsToDelete: (state: CachedMCState) => string[] =
+  () => []
+export const createCacheEditsBlock: (
+  state: CachedMCState,
+  toolIds: string[],
+) => CacheEditsBlock | null = () => null
diff --git a/src/services/compact/compact.ts b/src/services/compact/compact.ts
index f46194ffb..efc892712 100644
--- a/src/services/compact/compact.ts
+++ b/src/services/compact/compact.ts
@@ -267,7 +267,9 @@ export function truncateHeadForPTLRetry(
     let acc = 0
     dropCount = 0
     for (const g of groups) {
-      acc += roughTokenCountEstimationForMessages(g as Parameters<typeof roughTokenCountEstimationForMessages>[0])
+      acc += roughTokenCountEstimationForMessages(
+        g as Parameters<typeof roughTokenCountEstimationForMessages>[0],
+      )
       dropCount++
       if (acc >= tokenGap) break
     }
@@ -762,7 +764,7 @@ export async function compactConversation(
     context.setStreamMode?.('requesting')
     context.setResponseLength?.(() => 0)
     context.onCompactProgress?.({ type: 'compact_end' })
-    context.setSDKStatus?.("" as SDKStatus)
+    context.setSDKStatus?.('' as SDKStatus)
   }
 }
 
@@ -1105,7 +1107,7 @@ export async function partialCompactConversation(
     context.setStreamMode?.('requesting')
     context.setResponseLength?.(() => 0)
     context.onCompactProgress?.({ type: 'compact_end' })
-    context.setSDKStatus?.("" as SDKStatus)
+    context.setSDKStatus?.('' as SDKStatus)
   }
 }
 
@@ -1332,8 +1334,18 @@ async function streamCompactSummary({
       let next = await streamIter.next()
 
       while (!next.done) {
-        const event = next.value as StreamEvent | AssistantMessage | SystemAPIErrorMessage
-        const streamEvent = event as { type: string; event: { type: string; content_block: { type: string }; delta: { type: string; text: string } } }
+        const event = next.value as
+          | StreamEvent
+          | AssistantMessage
+          | SystemAPIErrorMessage
+        const streamEvent = event as {
+          type: string
+          event: {
+            type: string
+            content_block: { type: string }
+            delta: { type: string; text: string }
+          }
+        }
 
         if (
           !hasStartedStreaming &&
diff --git a/src/services/compact/microCompact.ts b/src/services/compact/microCompact.ts
index 015991a4c..b392253e0 100644
--- a/src/services/compact/microCompact.ts
+++ b/src/services/compact/microCompact.ts
@@ -436,7 +436,9 @@ export function evaluateTimeBasedTrigger(
     return null
   }
   const gapMinutes =
-    (Date.now() - new Date(lastAssistant.timestamp as string | number).getTime()) / 60_000
+    (Date.now() -
+      new Date(lastAssistant.timestamp as string | number).getTime()) /
+    60_000
   if (!Number.isFinite(gapMinutes) || gapMinutes < config.gapThresholdMinutes) {
     return null
   }
diff --git a/src/services/compact/reactiveCompact.ts b/src/services/compact/reactiveCompact.ts
index 67c872cda..2a124c728 100644
--- a/src/services/compact/reactiveCompact.ts
+++ b/src/services/compact/reactiveCompact.ts
@@ -1,22 +1,25 @@
 // Auto-generated stub — replace with real implementation
-export {};
+export {}
 
-import type { Message } from 'src/types/message';
-import type { CompactionResult } from './compact.js';
+import type { Message } from 'src/types/message'
+import type { CompactionResult } from './compact.js'
 
-export const isReactiveOnlyMode: () => boolean = () => false;
+export const isReactiveOnlyMode: () => boolean = () => false
 export const reactiveCompactOnPromptTooLong: (
   messages: Message[],
   cacheSafeParams: Record<string, unknown>,
   options: { customInstructions?: string; trigger?: string },
-) => Promise<{ ok: boolean; reason?: string; result?: CompactionResult }> = async () => ({ ok: false });
-export const isReactiveCompactEnabled: () => boolean = () => false;
-export const isWithheldPromptTooLong: (message: Message) => boolean = () => false;
-export const isWithheldMediaSizeError: (message: Message) => boolean = () => false;
+) => Promise<{ ok: boolean; reason?: string; result?: CompactionResult }> =
+  async () => ({ ok: false })
+export const isReactiveCompactEnabled: () => boolean = () => false
+export const isWithheldPromptTooLong: (message: Message) => boolean = () =>
+  false
+export const isWithheldMediaSizeError: (message: Message) => boolean = () =>
+  false
 export const tryReactiveCompact: (params: {
-  hasAttempted: boolean;
-  querySource: string;
-  aborted: boolean;
-  messages: Message[];
-  cacheSafeParams: Record<string, unknown>;
-}) => Promise<CompactionResult | null> = async () => null;
+  hasAttempted: boolean
+  querySource: string
+  aborted: boolean
+  messages: Message[]
+  cacheSafeParams: Record<string, unknown>
+}) => Promise<CompactionResult | null> = async () => null
diff --git a/src/services/compact/sessionMemoryCompact.ts b/src/services/compact/sessionMemoryCompact.ts
index fae482c40..6704e0a9a 100644
--- a/src/services/compact/sessionMemoryCompact.ts
+++ b/src/services/compact/sessionMemoryCompact.ts
@@ -135,7 +135,9 @@ async function initSessionMemoryCompactConfig(): Promise<void> {
 export function hasTextBlocks(message: Message): boolean {
   if (message.type === 'assistant') {
     const content = message.message!.content
-    return Array.isArray(content) && content.some(block => block.type === 'text')
+    return (
+      Array.isArray(content) && content.some(block => block.type === 'text')
+    )
   }
   if (message.type === 'user') {
     const content = message.message!.content
diff --git a/src/services/compact/snipCompact.ts b/src/services/compact/snipCompact.ts
index ecd72176e..6ea79fd64 100644
--- a/src/services/compact/snipCompact.ts
+++ b/src/services/compact/snipCompact.ts
@@ -1,17 +1,22 @@
 // Auto-generated stub — replace with real implementation
-export {};
+export {}
 
-import type { Message } from 'src/types/message';
+import type { Message } from 'src/types/message'
 
-export const isSnipMarkerMessage: (message: Message) => boolean = () => false;
+export const isSnipMarkerMessage: (message: Message) => boolean = () => false
 export const snipCompactIfNeeded: (
   messages: Message[],
   options?: { force?: boolean },
-) => { messages: Message[]; executed: boolean; tokensFreed: number; boundaryMessage?: Message } = (messages) => ({
+) => {
+  messages: Message[]
+  executed: boolean
+  tokensFreed: number
+  boundaryMessage?: Message
+} = messages => ({
   messages,
   executed: false,
   tokensFreed: 0,
-});
-export const isSnipRuntimeEnabled: () => boolean = () => false;
-export const shouldNudgeForSnips: (messages: Message[]) => boolean = () => false;
-export const SNIP_NUDGE_TEXT: string = '';
+})
+export const isSnipRuntimeEnabled: () => boolean = () => false
+export const shouldNudgeForSnips: (messages: Message[]) => boolean = () => false
+export const SNIP_NUDGE_TEXT: string = ''
diff --git a/src/services/compact/snipProjection.ts b/src/services/compact/snipProjection.ts
index 80efe381a..63b60ef5b 100644
--- a/src/services/compact/snipProjection.ts
+++ b/src/services/compact/snipProjection.ts
@@ -1,7 +1,8 @@
 // Auto-generated stub — replace with real implementation
-export {};
+export {}
 
-import type { Message } from 'src/types/message';
+import type { Message } from 'src/types/message'
 
-export const isSnipBoundaryMessage: (message: Message) => boolean = () => false;
-export const projectSnippedView: (messages: Message[]) => Message[] = (messages) => messages;
+export const isSnipBoundaryMessage: (message: Message) => boolean = () => false
+export const projectSnippedView: (messages: Message[]) => Message[] =
+  messages => messages
diff --git a/src/services/compact/src/bootstrap/state.ts b/src/services/compact/src/bootstrap/state.ts
index a860c549e..9d8e08961 100644
--- a/src/services/compact/src/bootstrap/state.ts
+++ b/src/services/compact/src/bootstrap/state.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type markPostCompaction = any;
+export type markPostCompaction = any
diff --git a/src/services/compact/src/tools/FileEditTool/constants.ts b/src/services/compact/src/tools/FileEditTool/constants.ts
index b455c0655..f851a8bcc 100644
--- a/src/services/compact/src/tools/FileEditTool/constants.ts
+++ b/src/services/compact/src/tools/FileEditTool/constants.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type FILE_EDIT_TOOL_NAME = any;
+export type FILE_EDIT_TOOL_NAME = any
diff --git a/src/services/compact/src/tools/FileReadTool/prompt.ts b/src/services/compact/src/tools/FileReadTool/prompt.ts
index fac6439fc..e8c6709b3 100644
--- a/src/services/compact/src/tools/FileReadTool/prompt.ts
+++ b/src/services/compact/src/tools/FileReadTool/prompt.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type FILE_READ_TOOL_NAME = any;
+export type FILE_READ_TOOL_NAME = any
diff --git a/src/services/compact/src/tools/FileWriteTool/prompt.ts b/src/services/compact/src/tools/FileWriteTool/prompt.ts
index e69299d74..45cc15c49 100644
--- a/src/services/compact/src/tools/FileWriteTool/prompt.ts
+++ b/src/services/compact/src/tools/FileWriteTool/prompt.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type FILE_WRITE_TOOL_NAME = any;
+export type FILE_WRITE_TOOL_NAME = any
diff --git a/src/services/compact/src/tools/GlobTool/prompt.ts b/src/services/compact/src/tools/GlobTool/prompt.ts
index 060caf29c..5ff2b16bb 100644
--- a/src/services/compact/src/tools/GlobTool/prompt.ts
+++ b/src/services/compact/src/tools/GlobTool/prompt.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type GLOB_TOOL_NAME = any;
+export type GLOB_TOOL_NAME = any
diff --git a/src/services/compact/src/tools/GrepTool/prompt.ts b/src/services/compact/src/tools/GrepTool/prompt.ts
index 08b8a8d29..4645d4c52 100644
--- a/src/services/compact/src/tools/GrepTool/prompt.ts
+++ b/src/services/compact/src/tools/GrepTool/prompt.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type GREP_TOOL_NAME = any;
+export type GREP_TOOL_NAME = any
diff --git a/src/services/compact/src/tools/NotebookEditTool/constants.ts b/src/services/compact/src/tools/NotebookEditTool/constants.ts
index 6c6c94bad..3c1d7a0d2 100644
--- a/src/services/compact/src/tools/NotebookEditTool/constants.ts
+++ b/src/services/compact/src/tools/NotebookEditTool/constants.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type NOTEBOOK_EDIT_TOOL_NAME = any;
+export type NOTEBOOK_EDIT_TOOL_NAME = any
diff --git a/src/services/compact/src/tools/WebFetchTool/prompt.ts b/src/services/compact/src/tools/WebFetchTool/prompt.ts
index 63b342a25..83e9643c5 100644
--- a/src/services/compact/src/tools/WebFetchTool/prompt.ts
+++ b/src/services/compact/src/tools/WebFetchTool/prompt.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type WEB_FETCH_TOOL_NAME = any;
+export type WEB_FETCH_TOOL_NAME = any
diff --git a/src/services/compact/src/tools/WebSearchTool/prompt.ts b/src/services/compact/src/tools/WebSearchTool/prompt.ts
index 38871a0ba..3d3f02b32 100644
--- a/src/services/compact/src/tools/WebSearchTool/prompt.ts
+++ b/src/services/compact/src/tools/WebSearchTool/prompt.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type WEB_SEARCH_TOOL_NAME = any;
+export type WEB_SEARCH_TOOL_NAME = any
diff --git a/src/services/compact/src/utils/shell/shellToolUtils.ts b/src/services/compact/src/utils/shell/shellToolUtils.ts
index c89fe2ada..c5f7e0226 100644
--- a/src/services/compact/src/utils/shell/shellToolUtils.ts
+++ b/src/services/compact/src/utils/shell/shellToolUtils.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type SHELL_TOOL_NAMES = any;
+export type SHELL_TOOL_NAMES = any
diff --git a/src/services/contextCollapse/index.ts b/src/services/contextCollapse/index.ts
index 09fb3c501..43df12635 100644
--- a/src/services/contextCollapse/index.ts
+++ b/src/services/contextCollapse/index.ts
@@ -27,7 +27,7 @@ export interface DrainResult {
   messages: Message[]
 }
 
-export const getStats: () => ContextCollapseStats = (() => ({
+export const getStats: () => ContextCollapseStats = () => ({
   collapsedSpans: 0,
   collapsedMessages: 0,
   stagedSpans: 0,
@@ -38,29 +38,30 @@ export const getStats: () => ContextCollapseStats = (() => ({
     emptySpawnWarningEmitted: false,
     totalEmptySpawns: 0,
   },
-}));
+})
 
-export const isContextCollapseEnabled: () => boolean = (() => false);
+export const isContextCollapseEnabled: () => boolean = () => false
 
-export const subscribe: (callback: () => void) => () => void = ((_callback: () => void) => () => {});
+export const subscribe: (callback: () => void) => () => void =
+  (_callback: () => void) => () => {}
 
 export const applyCollapsesIfNeeded: (
   messages: Message[],
   toolUseContext: ToolUseContext,
   querySource: QuerySource,
-) => Promise<CollapseResult> = (async (messages: Message[]) => ({ messages }));
+) => Promise<CollapseResult> = async (messages: Message[]) => ({ messages })
 
 export const isWithheldPromptTooLong: (
   message: Message,
   isPromptTooLongMessage: (msg: Message) => boolean,
   querySource: QuerySource,
-) => boolean = (() => false);
+) => boolean = () => false
 
 export const recoverFromOverflow: (
   messages: Message[],
   querySource: QuerySource,
-) => DrainResult = ((messages: Message[]) => ({ committed: 0, messages }));
+) => DrainResult = (messages: Message[]) => ({ committed: 0, messages })
 
-export const resetContextCollapse: () => void = (() => {});
+export const resetContextCollapse: () => void = () => {}
 
-export const initContextCollapse: () => void = (() => {});
+export const initContextCollapse: () => void = () => {}
diff --git a/src/services/contextCollapse/operations.ts b/src/services/contextCollapse/operations.ts
index 731e30c40..1715657dd 100644
--- a/src/services/contextCollapse/operations.ts
+++ b/src/services/contextCollapse/operations.ts
@@ -1,4 +1,5 @@
 // Auto-generated stub — replace with real implementation
-export {};
-import type { Message } from 'src/types/message.js';
-export const projectView: (messages: Message[]) => Message[] = (messages) => messages;
+export {}
+import type { Message } from 'src/types/message.js'
+export const projectView: (messages: Message[]) => Message[] = messages =>
+  messages
diff --git a/src/services/contextCollapse/persist.ts b/src/services/contextCollapse/persist.ts
index b89c2b8e9..4150a0150 100644
--- a/src/services/contextCollapse/persist.ts
+++ b/src/services/contextCollapse/persist.ts
@@ -1,3 +1,3 @@
 // Auto-generated stub — replace with real implementation
-export {};
-export const restoreFromEntries: (...args: unknown[]) => void = () => {};
+export {}
+export const restoreFromEntries: (...args: unknown[]) => void = () => {}
diff --git a/src/services/extractMemories/extractMemories.ts b/src/services/extractMemories/extractMemories.ts
index bb2ae1103..51e532439 100644
--- a/src/services/extractMemories/extractMemories.ts
+++ b/src/services/extractMemories/extractMemories.ts
@@ -272,9 +272,7 @@ function extractWrittenPaths(agentMessages: Message[]): string[] {
 // Initialization & Closure-scoped State
 // ============================================================================
 
-type AppendSystemMessageFn = (
-  msg: SystemMessage,
-) => void
+type AppendSystemMessageFn = (msg: SystemMessage) => void
 
 /** The active extractor function, set by initExtractMemories(). */
 let extractor:
diff --git a/src/services/langfuse/client.ts b/src/services/langfuse/client.ts
index 89037c607..256cd8af8 100644
--- a/src/services/langfuse/client.ts
+++ b/src/services/langfuse/client.ts
@@ -37,7 +37,11 @@ export function initLangfuse(): boolean {
       mask: maskFn,
       environment: process.env.LANGFUSE_TRACING_ENVIRONMENT ?? 'development',
       release: MACRO.VERSION,
-      exportMode: (process.env.LANGFUSE_EXPORT_MODE as 'batched' | 'immediate' | undefined) ?? 'batched',
+      exportMode:
+        (process.env.LANGFUSE_EXPORT_MODE as
+          | 'batched'
+          | 'immediate'
+          | undefined) ?? 'batched',
       timeout: parseInt(process.env.LANGFUSE_TIMEOUT ?? '5', 10),
     })
 
diff --git a/src/services/langfuse/convert.ts b/src/services/langfuse/convert.ts
index c07de5c94..5658afc21 100644
--- a/src/services/langfuse/convert.ts
+++ b/src/services/langfuse/convert.ts
@@ -6,7 +6,11 @@
  *   output: { role: 'assistant', content: string | part[] }
  */
 
-import type { Message, AssistantMessage, UserMessage } from 'src/types/message.js'
+import type {
+  Message,
+  AssistantMessage,
+  UserMessage,
+} from 'src/types/message.js'
 
 type LangfuseContentPart =
   | { type: 'text'; text: string }
@@ -33,9 +37,17 @@ function normalizeContent(content: unknown): string | LangfuseContentPart[] {
     if (type === 'text') {
       parts.push({ type: 'text', text: String(b.text ?? '') })
     } else if (type === 'thinking' || type === 'redacted_thinking') {
-      parts.push({ type: 'thinking', thinking: String(b.thinking ?? '[redacted]') })
+      parts.push({
+        type: 'thinking',
+        thinking: String(b.thinking ?? '[redacted]'),
+      })
     } else if (type === 'tool_use') {
-      parts.push({ type: 'tool_use', id: String(b.id ?? ''), name: String(b.name ?? ''), input: b.input })
+      parts.push({
+        type: 'tool_use',
+        id: String(b.id ?? ''),
+        name: String(b.name ?? ''),
+        input: b.input,
+      })
     } else if (type === 'tool_result') {
       const resultContent = Array.isArray(b.content)
         ? (b.content as Record<string, unknown>[])
@@ -47,22 +59,40 @@ function normalizeContent(content: unknown): string | LangfuseContentPart[] {
             })
             .join('\n')
         : String(b.content ?? '')
-      parts.push({ type: 'tool_result', tool_use_id: String(b.tool_use_id ?? ''), content: resultContent })
+      parts.push({
+        type: 'tool_result',
+        tool_use_id: String(b.tool_use_id ?? ''),
+        content: resultContent,
+      })
     } else if (type === 'image') {
       parts.push({ type: 'text', text: '[image]' })
     } else if (type === 'document') {
-      const name = (b.source as Record<string, unknown> | undefined)?.filename
-        ?? (b.title as string | undefined)
-        ?? 'document'
+      const name =
+        (b.source as Record<string, unknown> | undefined)?.filename ??
+        (b.title as string | undefined) ??
+        'document'
       parts.push({ type: 'text', text: `[document: ${name}]` })
-    } else if (type === 'server_tool_use' || type === 'web_search_tool_result' || type === 'tool_search_tool_result') {
+    } else if (
+      type === 'server_tool_use' ||
+      type === 'web_search_tool_result' ||
+      type === 'tool_search_tool_result'
+    ) {
       // server-side tool blocks — keep name/id, drop raw content
-      parts.push({ type: type, id: String(b.id ?? ''), name: String(b.name ?? type) })
+      parts.push({
+        type: type,
+        id: String(b.id ?? ''),
+        name: String(b.name ?? type),
+      })
     } else {
       // unknown block: keep type + scalar fields only, drop any binary/large payloads
       const safe: Record<string, unknown> = { type: type ?? 'unknown' }
       for (const [k, v] of Object.entries(b)) {
-        if (typeof v === 'string' || typeof v === 'number' || typeof v === 'boolean') safe[k] = v
+        if (
+          typeof v === 'string' ||
+          typeof v === 'number' ||
+          typeof v === 'boolean'
+        )
+          safe[k] = v
       }
       parts.push(safe as LangfuseContentPart)
     }
@@ -108,7 +138,10 @@ export function convertOutputToLangfuse(
   if (messages.length === 0) return null
   if (messages.length === 1) {
     const msg = messages[0]!
-    return { role: 'assistant', content: normalizeContent(msg.message?.content) }
+    return {
+      role: 'assistant',
+      content: normalizeContent(msg.message?.content),
+    }
   }
   return messages.map(msg => ({
     role: 'assistant' as const,
diff --git a/src/services/langfuse/index.ts b/src/services/langfuse/index.ts
index 6d044fa5a..999f7403a 100644
--- a/src/services/langfuse/index.ts
+++ b/src/services/langfuse/index.ts
@@ -1,4 +1,21 @@
-export { initLangfuse, shutdownLangfuse, isLangfuseEnabled, getLangfuseProcessor } from './client.js'
-export { createTrace, createSubagentTrace, recordLLMObservation, recordToolObservation, endTrace, createToolBatchSpan, endToolBatchSpan } from './tracing.js'
+export {
+  initLangfuse,
+  shutdownLangfuse,
+  isLangfuseEnabled,
+  getLangfuseProcessor,
+} from './client.js'
+export {
+  createTrace,
+  createSubagentTrace,
+  recordLLMObservation,
+  recordToolObservation,
+  endTrace,
+  createToolBatchSpan,
+  endToolBatchSpan,
+} from './tracing.js'
 export type { LangfuseSpan } from './tracing.js'
-export { sanitizeToolInput, sanitizeToolOutput, sanitizeGlobal } from './sanitize.js'
+export {
+  sanitizeToolInput,
+  sanitizeToolOutput,
+  sanitizeGlobal,
+} from './sanitize.js'
diff --git a/src/services/langfuse/sanitize.ts b/src/services/langfuse/sanitize.ts
index 9a077b4e3..01b3999af 100644
--- a/src/services/langfuse/sanitize.ts
+++ b/src/services/langfuse/sanitize.ts
@@ -1,5 +1,9 @@
 const MAX_OUTPUT_LENGTH = 500
-const REDACTED_FILE_TOOLS = new Set(['FileReadTool', 'FileWriteTool', 'FileEditTool'])
+const REDACTED_FILE_TOOLS = new Set([
+  'FileReadTool',
+  'FileWriteTool',
+  'FileEditTool',
+])
 const REDACTED_SHELL_TOOLS = new Set(['BashTool', 'PowerShellTool'])
 const SENSITIVE_OUTPUT_TOOLS = new Set(['ConfigTool', 'MCPTool'])
 
@@ -8,7 +12,8 @@ const HOME_DIR_PATTERN = new RegExp(
   'g',
 )
 
-const SENSITIVE_KEY_PATTERN = /(?:api_?key|token|secret|password|credential|auth_header)/i
+const SENSITIVE_KEY_PATTERN =
+  /(?:api_?key|token|secret|password|credential|auth_header)/i
 
 export function sanitizeGlobal(data: unknown): unknown {
   if (typeof data === 'string') {
diff --git a/src/services/langfuse/tracing.ts b/src/services/langfuse/tracing.ts
index 1e06d8ae4..ea211535c 100644
--- a/src/services/langfuse/tracing.ts
+++ b/src/services/langfuse/tracing.ts
@@ -1,5 +1,9 @@
 import { startObservation, LangfuseOtelSpanAttributes } from '@langfuse/tracing'
-import type { LangfuseSpan, LangfuseGeneration, LangfuseAgent } from '@langfuse/tracing'
+import type {
+  LangfuseSpan,
+  LangfuseGeneration,
+  LangfuseAgent,
+} from '@langfuse/tracing'
 import { isLangfuseEnabled } from './client.js'
 import { sanitizeToolInput, sanitizeToolOutput } from './sanitize.js'
 import { logForDebugging } from 'src/utils/debug.js'
@@ -12,7 +16,12 @@ type RootTrace = LangfuseAgent & { _sessionId?: string; _userId?: string }
 
 /** Resolve the user ID for Langfuse traces: explicit param > env var > email > deviceId */
 function resolveLangfuseUserId(username?: string): string | undefined {
-  return username ?? process.env.LANGFUSE_USER_ID ?? getCoreUserData().email ?? getCoreUserData().deviceId
+  return (
+    username ??
+    process.env.LANGFUSE_USER_ID ??
+    getCoreUserData().email ??
+    getCoreUserData().deviceId
+  )
 }
 
 export function createTrace(params: {
@@ -26,21 +35,33 @@ export function createTrace(params: {
 }): LangfuseSpan | null {
   if (!isLangfuseEnabled()) return null
   try {
-    const traceName = params.name ?? (params.querySource ? `agent-run:${params.querySource}` : 'agent-run')
-    const rootSpan = startObservation(traceName, {
-      input: params.input,
-      metadata: {
-        provider: params.provider,
-        model: params.model,
-        agentType: 'main',
-        ...(params.querySource && { querySource: params.querySource }),
+    const traceName =
+      params.name ??
+      (params.querySource ? `agent-run:${params.querySource}` : 'agent-run')
+    const rootSpan = startObservation(
+      traceName,
+      {
+        input: params.input,
+        metadata: {
+          provider: params.provider,
+          model: params.model,
+          agentType: 'main',
+          ...(params.querySource && { querySource: params.querySource }),
+        },
       },
-    }, { asType: 'agent' }) as RootTrace
-    rootSpan.otelSpan.setAttribute(LangfuseOtelSpanAttributes.TRACE_SESSION_ID, params.sessionId)
+      { asType: 'agent' },
+    ) as RootTrace
+    rootSpan.otelSpan.setAttribute(
+      LangfuseOtelSpanAttributes.TRACE_SESSION_ID,
+      params.sessionId,
+    )
     rootSpan._sessionId = params.sessionId
     const userId = resolveLangfuseUserId(params.username)
     if (userId) {
-      rootSpan.otelSpan.setAttribute(LangfuseOtelSpanAttributes.TRACE_USER_ID, userId)
+      rootSpan.otelSpan.setAttribute(
+        LangfuseOtelSpanAttributes.TRACE_USER_ID,
+        userId,
+      )
       rootSpan._userId = userId
     }
     logForDebugging(`[langfuse] Trace created: ${rootSpan.id}`)
@@ -81,7 +102,8 @@ export function recordLLMObservation(
 ): void {
   if (!rootSpan || !isLangfuseEnabled()) return
   try {
-    const genName = PROVIDER_GENERATION_NAMES[params.provider] ?? `Chat${params.provider}`
+    const genName =
+      PROVIDER_GENERATION_NAMES[params.provider] ?? `Chat${params.provider}`
 
     // Use the global startObservation directly instead of rootSpan.startObservation().
     // The instance method only forwards asType to the global function and drops startTime,
@@ -95,7 +117,9 @@ export function recordLLMObservation(
           provider: params.provider,
           model: params.model,
         },
-        ...(params.completionStartTime && { completionStartTime: params.completionStartTime }),
+        ...(params.completionStartTime && {
+          completionStartTime: params.completionStartTime,
+        }),
       },
       {
         asType: 'generation',
@@ -107,11 +131,17 @@ export function recordLLMObservation(
     // Propagate session ID and user ID to generation span so Langfuse links it correctly
     const sessionId = (rootSpan as unknown as RootTrace)._sessionId
     if (sessionId) {
-      gen.otelSpan.setAttribute(LangfuseOtelSpanAttributes.TRACE_SESSION_ID, sessionId)
+      gen.otelSpan.setAttribute(
+        LangfuseOtelSpanAttributes.TRACE_SESSION_ID,
+        sessionId,
+      )
     }
     const userId = (rootSpan as unknown as RootTrace)._userId
     if (userId) {
-      gen.otelSpan.setAttribute(LangfuseOtelSpanAttributes.TRACE_USER_ID, userId)
+      gen.otelSpan.setAttribute(
+        LangfuseOtelSpanAttributes.TRACE_USER_ID,
+        userId,
+      )
     }
 
     // Anthropic splits input into uncached + cache_read + cache_creation.
@@ -131,7 +161,9 @@ export function recordLLMObservation(
     gen.end(params.endTime)
     logForDebugging(`[langfuse] LLM observation recorded: ${gen.id}`)
   } catch (e) {
-    logForDebugging(`[langfuse] recordLLMObservation failed: ${e}`, { level: 'error' })
+    logForDebugging(`[langfuse] recordLLMObservation failed: ${e}`, {
+      level: 'error',
+    })
   }
 }
 
@@ -172,11 +204,17 @@ export function recordToolObservation(
     // Propagate session ID and user ID to tool span so Langfuse links it correctly
     const sessionId = (rootSpan as unknown as RootTrace)._sessionId
     if (sessionId) {
-      toolObs.otelSpan.setAttribute(LangfuseOtelSpanAttributes.TRACE_SESSION_ID, sessionId)
+      toolObs.otelSpan.setAttribute(
+        LangfuseOtelSpanAttributes.TRACE_SESSION_ID,
+        sessionId,
+      )
     }
     const userId = (rootSpan as unknown as RootTrace)._userId
     if (userId) {
-      toolObs.otelSpan.setAttribute(LangfuseOtelSpanAttributes.TRACE_USER_ID, userId)
+      toolObs.otelSpan.setAttribute(
+        LangfuseOtelSpanAttributes.TRACE_USER_ID,
+        userId,
+      )
     }
 
     toolObs.update({
@@ -185,9 +223,13 @@ export function recordToolObservation(
     })
 
     toolObs.end()
-    logForDebugging(`[langfuse] Tool observation recorded: ${params.toolName} (${toolObs.id})`)
+    logForDebugging(
+      `[langfuse] Tool observation recorded: ${params.toolName} (${toolObs.id})`,
+    )
   } catch (e) {
-    logForDebugging(`[langfuse] recordToolObservation failed: ${e}`, { level: 'error' })
+    logForDebugging(`[langfuse] recordToolObservation failed: ${e}`, {
+      level: 'error',
+    })
   }
 }
 
@@ -219,17 +261,27 @@ export function createToolBatchSpan(
 
     const sessionId = (rootSpan as unknown as RootTrace)._sessionId
     if (sessionId) {
-      batchSpan.otelSpan.setAttribute(LangfuseOtelSpanAttributes.TRACE_SESSION_ID, sessionId)
+      batchSpan.otelSpan.setAttribute(
+        LangfuseOtelSpanAttributes.TRACE_SESSION_ID,
+        sessionId,
+      )
     }
     const userId = (rootSpan as unknown as RootTrace)._userId
     if (userId) {
-      batchSpan.otelSpan.setAttribute(LangfuseOtelSpanAttributes.TRACE_USER_ID, userId)
+      batchSpan.otelSpan.setAttribute(
+        LangfuseOtelSpanAttributes.TRACE_USER_ID,
+        userId,
+      )
     }
 
-    logForDebugging(`[langfuse] Tool batch span created: ${batchSpan.id} (tools=${params.toolNames.join(',')})`)
+    logForDebugging(
+      `[langfuse] Tool batch span created: ${batchSpan.id} (tools=${params.toolNames.join(',')})`,
+    )
     return batchSpan
   } catch (e) {
-    logForDebugging(`[langfuse] createToolBatchSpan failed: ${e}`, { level: 'error' })
+    logForDebugging(`[langfuse] createToolBatchSpan failed: ${e}`, {
+      level: 'error',
+    })
     return null
   }
 }
@@ -240,7 +292,9 @@ export function endToolBatchSpan(batchSpan: LangfuseSpan | null): void {
     batchSpan.end()
     logForDebugging(`[langfuse] Tool batch span ended: ${batchSpan.id}`)
   } catch (e) {
-    logForDebugging(`[langfuse] endToolBatchSpan failed: ${e}`, { level: 'error' })
+    logForDebugging(`[langfuse] endToolBatchSpan failed: ${e}`, {
+      level: 'error',
+    })
   }
 }
 
@@ -255,26 +309,40 @@ export function createSubagentTrace(params: {
 }): LangfuseSpan | null {
   if (!isLangfuseEnabled()) return null
   try {
-    const rootSpan = startObservation(`agent:${params.agentType}`, {
-      input: params.input,
-      metadata: {
-        provider: params.provider,
-        model: params.model,
-        agentType: params.agentType,
-        agentId: params.agentId,
+    const rootSpan = startObservation(
+      `agent:${params.agentType}`,
+      {
+        input: params.input,
+        metadata: {
+          provider: params.provider,
+          model: params.model,
+          agentType: params.agentType,
+          agentId: params.agentId,
+        },
       },
-    }, { asType: 'agent' }) as RootTrace
-    rootSpan.otelSpan.setAttribute(LangfuseOtelSpanAttributes.TRACE_SESSION_ID, params.sessionId)
+      { asType: 'agent' },
+    ) as RootTrace
+    rootSpan.otelSpan.setAttribute(
+      LangfuseOtelSpanAttributes.TRACE_SESSION_ID,
+      params.sessionId,
+    )
     rootSpan._sessionId = params.sessionId
     const userId = resolveLangfuseUserId(params.username)
     if (userId) {
-      rootSpan.otelSpan.setAttribute(LangfuseOtelSpanAttributes.TRACE_USER_ID, userId)
+      rootSpan.otelSpan.setAttribute(
+        LangfuseOtelSpanAttributes.TRACE_USER_ID,
+        userId,
+      )
       rootSpan._userId = userId
     }
-    logForDebugging(`[langfuse] Sub-agent trace created: ${rootSpan.id} (type=${params.agentType})`)
+    logForDebugging(
+      `[langfuse] Sub-agent trace created: ${rootSpan.id} (type=${params.agentType})`,
+    )
     return rootSpan as unknown as LangfuseSpan
   } catch (e) {
-    logForDebugging(`[langfuse] createSubagentTrace failed: ${e}`, { level: 'error' })
+    logForDebugging(`[langfuse] createSubagentTrace failed: ${e}`, {
+      level: 'error',
+    })
     return null
   }
 }
@@ -292,7 +360,9 @@ export function endTrace(
     else if (status === 'error') updatePayload.level = 'ERROR'
     if (Object.keys(updatePayload).length > 0) rootSpan.update(updatePayload)
     rootSpan.end()
-    logForDebugging(`[langfuse] Trace ended: ${rootSpan.id}${status ? ` (${status})` : ''}`)
+    logForDebugging(
+      `[langfuse] Trace ended: ${rootSpan.id}${status ? ` (${status})` : ''}`,
+    )
   } catch (e) {
     logForDebugging(`[langfuse] endTrace failed: ${e}`, { level: 'error' })
   }
diff --git a/src/services/lsp/LSPServerInstance.ts b/src/services/lsp/LSPServerInstance.ts
index b5994a5f6..75d386e32 100644
--- a/src/services/lsp/LSPServerInstance.ts
+++ b/src/services/lsp/LSPServerInstance.ts
@@ -387,7 +387,7 @@ export function createLSPServerInstance(
           isContentModifiedError &&
           attempt < MAX_RETRIES_FOR_TRANSIENT_ERRORS
         ) {
-          const delay = RETRY_BASE_DELAY_MS * Math.pow(2, attempt)
+          const delay = RETRY_BASE_DELAY_MS * 2 ** attempt
           logForDebugging(
             `LSP request '${method}' to '${name}' got ContentModified error, ` +
               `retrying in ${delay}ms (attempt ${attempt + 1}/${MAX_RETRIES_FOR_TRANSIENT_ERRORS})…`,
diff --git a/src/services/lsp/types.ts b/src/services/lsp/types.ts
index 1dfa79379..c99756713 100644
--- a/src/services/lsp/types.ts
+++ b/src/services/lsp/types.ts
@@ -1,4 +1,4 @@
 // Auto-generated stub — replace with real implementation
-export type LspServerConfig = any;
-export type ScopedLspServerConfig = any;
-export type LspServerState = any;
+export type LspServerConfig = any
+export type ScopedLspServerConfig = any
+export type LspServerState = any
diff --git a/src/services/mcp/MCPConnectionManager.tsx b/src/services/mcp/MCPConnectionManager.tsx
index 46c56b689..1b42a21f1 100644
--- a/src/services/mcp/MCPConnectionManager.tsx
+++ b/src/services/mcp/MCPConnectionManager.tsx
@@ -1,54 +1,41 @@
-import React, {
-  createContext,
-  type ReactNode,
-  useContext,
-  useMemo,
-} from 'react'
-import type { Command } from '../../commands.js'
-import type { Tool } from '../../Tool.js'
-import type {
-  MCPServerConnection,
-  ScopedMcpServerConfig,
-  ServerResource,
-} from './types.js'
-import { useManageMCPConnections } from './useManageMCPConnections.js'
+import React, { createContext, type ReactNode, useContext, useMemo } from 'react';
+import type { Command } from '../../commands.js';
+import type { Tool } from '../../Tool.js';
+import type { MCPServerConnection, ScopedMcpServerConfig, ServerResource } from './types.js';
+import { useManageMCPConnections } from './useManageMCPConnections.js';
 
 interface MCPConnectionContextValue {
   reconnectMcpServer: (serverName: string) => Promise<{
-    client: MCPServerConnection
-    tools: Tool[]
-    commands: Command[]
-    resources?: ServerResource[]
-  }>
-  toggleMcpServer: (serverName: string) => Promise<void>
+    client: MCPServerConnection;
+    tools: Tool[];
+    commands: Command[];
+    resources?: ServerResource[];
+  }>;
+  toggleMcpServer: (serverName: string) => Promise<void>;
 }
 
-const MCPConnectionContext = createContext<MCPConnectionContextValue | null>(
-  null,
-)
+const MCPConnectionContext = createContext<MCPConnectionContextValue | null>(null);
 
 export function useMcpReconnect() {
-  const context = useContext(MCPConnectionContext)
+  const context = useContext(MCPConnectionContext);
   if (!context) {
-    throw new Error('useMcpReconnect must be used within MCPConnectionManager')
+    throw new Error('useMcpReconnect must be used within MCPConnectionManager');
   }
-  return context.reconnectMcpServer
+  return context.reconnectMcpServer;
 }
 
 export function useMcpToggleEnabled() {
-  const context = useContext(MCPConnectionContext)
+  const context = useContext(MCPConnectionContext);
   if (!context) {
-    throw new Error(
-      'useMcpToggleEnabled must be used within MCPConnectionManager',
-    )
+    throw new Error('useMcpToggleEnabled must be used within MCPConnectionManager');
   }
-  return context.toggleMcpServer
+  return context.toggleMcpServer;
 }
 
 interface MCPConnectionManagerProps {
-  children: ReactNode
-  dynamicMcpConfig: Record<string, ScopedMcpServerConfig> | undefined
-  isStrictMcpConfig: boolean
+  children: ReactNode;
+  dynamicMcpConfig: Record<string, ScopedMcpServerConfig> | undefined;
+  isStrictMcpConfig: boolean;
 }
 
 // TODO (ollie): We may be able to get rid of this context by putting these function on app state
@@ -57,18 +44,8 @@ export function MCPConnectionManager({
   dynamicMcpConfig,
   isStrictMcpConfig,
 }: MCPConnectionManagerProps): React.ReactNode {
-  const { reconnectMcpServer, toggleMcpServer } = useManageMCPConnections(
-    dynamicMcpConfig,
-    isStrictMcpConfig,
-  )
-  const value = useMemo(
-    () => ({ reconnectMcpServer, toggleMcpServer }),
-    [reconnectMcpServer, toggleMcpServer],
-  )
+  const { reconnectMcpServer, toggleMcpServer } = useManageMCPConnections(dynamicMcpConfig, isStrictMcpConfig);
+  const value = useMemo(() => ({ reconnectMcpServer, toggleMcpServer }), [reconnectMcpServer, toggleMcpServer]);
 
-  return (
-    <MCPConnectionContext.Provider value={value}>
-      {children}
-    </MCPConnectionContext.Provider>
-  )
+  return <MCPConnectionContext.Provider value={value}>{children}</MCPConnectionContext.Provider>;
 }
diff --git a/src/services/mcp/__tests__/channelNotification.test.ts b/src/services/mcp/__tests__/channelNotification.test.ts
index 1e0e968f1..43011a9b5 100644
--- a/src/services/mcp/__tests__/channelNotification.test.ts
+++ b/src/services/mcp/__tests__/channelNotification.test.ts
@@ -1,10 +1,10 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from 'bun:test'
 
 // findChannelEntry extracted from ../channelNotification.ts (line 161)
 // Copied to avoid heavy import chain
 
 type ChannelEntry = {
-  kind: "server" | "plugin"
+  kind: 'server' | 'plugin'
   name: string
 }
 
@@ -12,58 +12,58 @@ function findChannelEntry(
   serverName: string,
   channels: readonly ChannelEntry[],
 ): ChannelEntry | undefined {
-  const parts = serverName.split(":")
+  const parts = serverName.split(':')
   return channels.find(c =>
-    c.kind === "server"
+    c.kind === 'server'
       ? serverName === c.name
-      : parts[0] === "plugin" && parts[1] === c.name,
+      : parts[0] === 'plugin' && parts[1] === c.name,
   )
 }
 
-describe("findChannelEntry", () => {
-  test("finds server entry by exact name match", () => {
-    const channels = [{ kind: "server" as const, name: "my-server" }]
-    expect(findChannelEntry("my-server", channels)).toBeDefined()
-    expect(findChannelEntry("my-server", channels)!.name).toBe("my-server")
+describe('findChannelEntry', () => {
+  test('finds server entry by exact name match', () => {
+    const channels = [{ kind: 'server' as const, name: 'my-server' }]
+    expect(findChannelEntry('my-server', channels)).toBeDefined()
+    expect(findChannelEntry('my-server', channels)!.name).toBe('my-server')
   })
 
-  test("finds plugin entry by matching second segment", () => {
-    const channels = [{ kind: "plugin" as const, name: "slack" }]
-    expect(findChannelEntry("plugin:slack:tg", channels)).toBeDefined()
+  test('finds plugin entry by matching second segment', () => {
+    const channels = [{ kind: 'plugin' as const, name: 'slack' }]
+    expect(findChannelEntry('plugin:slack:tg', channels)).toBeDefined()
   })
 
-  test("returns undefined for no match", () => {
-    const channels = [{ kind: "server" as const, name: "other" }]
-    expect(findChannelEntry("my-server", channels)).toBeUndefined()
+  test('returns undefined for no match', () => {
+    const channels = [{ kind: 'server' as const, name: 'other' }]
+    expect(findChannelEntry('my-server', channels)).toBeUndefined()
   })
 
-  test("handles empty channels array", () => {
-    expect(findChannelEntry("my-server", [])).toBeUndefined()
+  test('handles empty channels array', () => {
+    expect(findChannelEntry('my-server', [])).toBeUndefined()
   })
 
-  test("handles server name without colon", () => {
-    const channels = [{ kind: "server" as const, name: "simple" }]
-    expect(findChannelEntry("simple", channels)).toBeDefined()
+  test('handles server name without colon', () => {
+    const channels = [{ kind: 'server' as const, name: 'simple' }]
+    expect(findChannelEntry('simple', channels)).toBeDefined()
   })
 
   test("handles 'plugin:name' format correctly", () => {
-    const channels = [{ kind: "plugin" as const, name: "slack" }]
-    expect(findChannelEntry("plugin:slack:tg", channels)).toBeDefined()
-    expect(findChannelEntry("plugin:discord:tg", channels)).toBeUndefined()
+    const channels = [{ kind: 'plugin' as const, name: 'slack' }]
+    expect(findChannelEntry('plugin:slack:tg', channels)).toBeDefined()
+    expect(findChannelEntry('plugin:discord:tg', channels)).toBeUndefined()
   })
 
-  test("prefers exact match (server kind) over partial match", () => {
+  test('prefers exact match (server kind) over partial match', () => {
     const channels = [
-      { kind: "server" as const, name: "plugin:slack" },
-      { kind: "plugin" as const, name: "slack" },
+      { kind: 'server' as const, name: 'plugin:slack' },
+      { kind: 'plugin' as const, name: 'slack' },
     ]
-    const result = findChannelEntry("plugin:slack", channels)
+    const result = findChannelEntry('plugin:slack', channels)
     expect(result).toBeDefined()
-    expect(result!.kind).toBe("server")
+    expect(result!.kind).toBe('server')
   })
 
-  test("plugin kind does not match bare name", () => {
-    const channels = [{ kind: "plugin" as const, name: "slack" }]
-    expect(findChannelEntry("slack", channels)).toBeUndefined()
+  test('plugin kind does not match bare name', () => {
+    const channels = [{ kind: 'plugin' as const, name: 'slack' }]
+    expect(findChannelEntry('slack', channels)).toBeUndefined()
   })
 })
diff --git a/src/services/mcp/__tests__/channelPermissions.test.ts b/src/services/mcp/__tests__/channelPermissions.test.ts
index dc19af315..28c789848 100644
--- a/src/services/mcp/__tests__/channelPermissions.test.ts
+++ b/src/services/mcp/__tests__/channelPermissions.test.ts
@@ -1,165 +1,165 @@
-import { mock, describe, expect, test } from "bun:test";
+import { mock, describe, expect, test } from 'bun:test'
 
-mock.module("src/utils/slowOperations.js", () => ({
+mock.module('src/utils/slowOperations.js', () => ({
   jsonStringify: (v: unknown) => JSON.stringify(v),
-}));
-mock.module("src/services/analytics/growthbook.js", () => ({
+}))
+mock.module('src/services/analytics/growthbook.js', () => ({
   getFeatureValue_CACHED_MAY_BE_STALE: () => false,
-}));
+}))
 
 const {
   shortRequestId,
   truncateForPreview,
   PERMISSION_REPLY_RE,
   createChannelPermissionCallbacks,
-} = await import("../channelPermissions");
+} = await import('../channelPermissions')
 
-describe("shortRequestId", () => {
-  test("returns 5-char string from tool use ID", () => {
-    const result = shortRequestId("toolu_abc123");
-    expect(result).toHaveLength(5);
-  });
+describe('shortRequestId', () => {
+  test('returns 5-char string from tool use ID', () => {
+    const result = shortRequestId('toolu_abc123')
+    expect(result).toHaveLength(5)
+  })
 
-  test("is deterministic (same input = same output)", () => {
-    const a = shortRequestId("toolu_abc123");
-    const b = shortRequestId("toolu_abc123");
-    expect(a).toBe(b);
-  });
+  test('is deterministic (same input = same output)', () => {
+    const a = shortRequestId('toolu_abc123')
+    const b = shortRequestId('toolu_abc123')
+    expect(a).toBe(b)
+  })
 
-  test("different inputs produce different outputs", () => {
-    const a = shortRequestId("toolu_aaa");
-    const b = shortRequestId("toolu_bbb");
-    expect(a).not.toBe(b);
-  });
+  test('different inputs produce different outputs', () => {
+    const a = shortRequestId('toolu_aaa')
+    const b = shortRequestId('toolu_bbb')
+    expect(a).not.toBe(b)
+  })
 
   test("result contains only valid letters (no 'l')", () => {
-    const validChars = new Set("abcdefghijkmnopqrstuvwxyz");
+    const validChars = new Set('abcdefghijkmnopqrstuvwxyz')
     for (let i = 0; i < 50; i++) {
-      const result = shortRequestId(`toolu_${i}`);
+      const result = shortRequestId(`toolu_${i}`)
       for (const ch of result) {
-        expect(validChars.has(ch)).toBe(true);
+        expect(validChars.has(ch)).toBe(true)
       }
     }
-  });
+  })
 
-  test("handles empty string", () => {
-    const result = shortRequestId("");
-    expect(result).toHaveLength(5);
-  });
-});
+  test('handles empty string', () => {
+    const result = shortRequestId('')
+    expect(result).toHaveLength(5)
+  })
+})
 
-describe("truncateForPreview", () => {
-  test("returns JSON string for object input", () => {
-    const result = truncateForPreview({ key: "value" });
-    expect(result).toBe('{"key":"value"}');
-  });
+describe('truncateForPreview', () => {
+  test('returns JSON string for object input', () => {
+    const result = truncateForPreview({ key: 'value' })
+    expect(result).toBe('{"key":"value"}')
+  })
 
-  test("truncates to <=200 chars with ellipsis when input is long", () => {
-    const longObj = { data: "x".repeat(300) };
-    const result = truncateForPreview(longObj);
-    expect(result.length).toBeLessThanOrEqual(203); // 200 + '…'
-    expect(result.endsWith("…")).toBe(true);
-  });
+  test('truncates to <=200 chars with ellipsis when input is long', () => {
+    const longObj = { data: 'x'.repeat(300) }
+    const result = truncateForPreview(longObj)
+    expect(result.length).toBeLessThanOrEqual(203) // 200 + '…'
+    expect(result.endsWith('…')).toBe(true)
+  })
 
-  test("returns short input unchanged", () => {
-    const result = truncateForPreview({ a: 1 });
-    expect(result).toBe('{"a":1}');
-    expect(result.endsWith("…")).toBe(false);
-  });
+  test('returns short input unchanged', () => {
+    const result = truncateForPreview({ a: 1 })
+    expect(result).toBe('{"a":1}')
+    expect(result.endsWith('…')).toBe(false)
+  })
 
-  test("handles string input", () => {
-    const result = truncateForPreview("hello");
-    expect(result).toBe('"hello"');
-  });
+  test('handles string input', () => {
+    const result = truncateForPreview('hello')
+    expect(result).toBe('"hello"')
+  })
 
-  test("handles null input", () => {
-    const result = truncateForPreview(null);
-    expect(result).toBe("null");
-  });
+  test('handles null input', () => {
+    const result = truncateForPreview(null)
+    expect(result).toBe('null')
+  })
 
-  test("handles undefined input", () => {
-    const result = truncateForPreview(undefined);
+  test('handles undefined input', () => {
+    const result = truncateForPreview(undefined)
     // JSON.stringify(undefined) returns undefined, then .length throws → catch returns '(unserializable)'
-    expect(result).toBe("(unserializable)");
-  });
-});
+    expect(result).toBe('(unserializable)')
+  })
+})
 
-describe("PERMISSION_REPLY_RE", () => {
+describe('PERMISSION_REPLY_RE', () => {
   test("matches 'y abcde'", () => {
-    expect(PERMISSION_REPLY_RE.test("y abcde")).toBe(true);
-  });
+    expect(PERMISSION_REPLY_RE.test('y abcde')).toBe(true)
+  })
 
   test("matches 'yes abcde'", () => {
-    expect(PERMISSION_REPLY_RE.test("yes abcde")).toBe(true);
-  });
+    expect(PERMISSION_REPLY_RE.test('yes abcde')).toBe(true)
+  })
 
   test("matches 'n abcde'", () => {
-    expect(PERMISSION_REPLY_RE.test("n abcde")).toBe(true);
-  });
+    expect(PERMISSION_REPLY_RE.test('n abcde')).toBe(true)
+  })
 
   test("matches 'no abcde'", () => {
-    expect(PERMISSION_REPLY_RE.test("no abcde")).toBe(true);
-  });
+    expect(PERMISSION_REPLY_RE.test('no abcde')).toBe(true)
+  })
 
-  test("is case-insensitive", () => {
-    expect(PERMISSION_REPLY_RE.test("Y abcde")).toBe(true);
-    expect(PERMISSION_REPLY_RE.test("YES abcde")).toBe(true);
-  });
+  test('is case-insensitive', () => {
+    expect(PERMISSION_REPLY_RE.test('Y abcde')).toBe(true)
+    expect(PERMISSION_REPLY_RE.test('YES abcde')).toBe(true)
+  })
 
-  test("does not match without ID", () => {
-    expect(PERMISSION_REPLY_RE.test("yes")).toBe(false);
-  });
+  test('does not match without ID', () => {
+    expect(PERMISSION_REPLY_RE.test('yes')).toBe(false)
+  })
 
-  test("captures the ID from reply", () => {
-    const match = "y abcde".match(PERMISSION_REPLY_RE);
-    expect(match?.[2]).toBe("abcde");
-  });
-});
+  test('captures the ID from reply', () => {
+    const match = 'y abcde'.match(PERMISSION_REPLY_RE)
+    expect(match?.[2]).toBe('abcde')
+  })
+})
 
-describe("createChannelPermissionCallbacks", () => {
-  test("resolve returns false for unknown request ID", () => {
-    const cb = createChannelPermissionCallbacks();
-    expect(cb.resolve("unknown-id", "allow", "server")).toBe(false);
-  });
+describe('createChannelPermissionCallbacks', () => {
+  test('resolve returns false for unknown request ID', () => {
+    const cb = createChannelPermissionCallbacks()
+    expect(cb.resolve('unknown-id', 'allow', 'server')).toBe(false)
+  })
 
-  test("onResponse + resolve triggers handler", () => {
-    const cb = createChannelPermissionCallbacks();
-    let received: any = null;
-    cb.onResponse("test-id", (response) => {
-      received = response;
-    });
-    expect(cb.resolve("test-id", "allow", "test-server")).toBe(true);
+  test('onResponse + resolve triggers handler', () => {
+    const cb = createChannelPermissionCallbacks()
+    let received: any = null
+    cb.onResponse('test-id', response => {
+      received = response
+    })
+    expect(cb.resolve('test-id', 'allow', 'test-server')).toBe(true)
     expect(received).toEqual({
-      behavior: "allow",
-      fromServer: "test-server",
-    });
-  });
+      behavior: 'allow',
+      fromServer: 'test-server',
+    })
+  })
 
-  test("onResponse unsubscribe prevents resolve", () => {
-    const cb = createChannelPermissionCallbacks();
-    let called = false;
-    const unsub = cb.onResponse("test-id", () => {
-      called = true;
-    });
-    unsub();
-    expect(cb.resolve("test-id", "allow", "server")).toBe(false);
-    expect(called).toBe(false);
-  });
+  test('onResponse unsubscribe prevents resolve', () => {
+    const cb = createChannelPermissionCallbacks()
+    let called = false
+    const unsub = cb.onResponse('test-id', () => {
+      called = true
+    })
+    unsub()
+    expect(cb.resolve('test-id', 'allow', 'server')).toBe(false)
+    expect(called).toBe(false)
+  })
 
-  test("duplicate resolve returns false (already consumed)", () => {
-    const cb = createChannelPermissionCallbacks();
-    cb.onResponse("test-id", () => {});
-    expect(cb.resolve("test-id", "allow", "server")).toBe(true);
-    expect(cb.resolve("test-id", "allow", "server")).toBe(false);
-  });
+  test('duplicate resolve returns false (already consumed)', () => {
+    const cb = createChannelPermissionCallbacks()
+    cb.onResponse('test-id', () => {})
+    expect(cb.resolve('test-id', 'allow', 'server')).toBe(true)
+    expect(cb.resolve('test-id', 'allow', 'server')).toBe(false)
+  })
 
-  test("is case-insensitive for request IDs", () => {
-    const cb = createChannelPermissionCallbacks();
-    let received: any = null;
-    cb.onResponse("ABC", (response) => {
-      received = response;
-    });
-    expect(cb.resolve("abc", "deny", "server")).toBe(true);
-    expect(received?.behavior).toBe("deny");
-  });
-});
+  test('is case-insensitive for request IDs', () => {
+    const cb = createChannelPermissionCallbacks()
+    let received: any = null
+    cb.onResponse('ABC', response => {
+      received = response
+    })
+    expect(cb.resolve('abc', 'deny', 'server')).toBe(true)
+    expect(received?.behavior).toBe('deny')
+  })
+})
diff --git a/src/services/mcp/__tests__/envExpansion.test.ts b/src/services/mcp/__tests__/envExpansion.test.ts
index fe2032f2e..0f33378ab 100644
--- a/src/services/mcp/__tests__/envExpansion.test.ts
+++ b/src/services/mcp/__tests__/envExpansion.test.ts
@@ -1,139 +1,153 @@
-import { describe, expect, test, beforeEach, afterEach } from "bun:test";
-import { expandEnvVarsInString } from "../envExpansion";
+import { describe, expect, test, beforeEach, afterEach } from 'bun:test'
+import { expandEnvVarsInString } from '../envExpansion'
 
-describe("expandEnvVarsInString", () => {
+describe('expandEnvVarsInString', () => {
   // Save and restore env vars touched by tests
-  const savedEnv: Record<string, string | undefined> = {};
+  const savedEnv: Record<string, string | undefined> = {}
   const trackedKeys = [
-    "TEST_HOME",
-    "MISSING",
-    "TEST_A",
-    "TEST_B",
-    "TEST_EMPTY",
-    "TEST_X",
-    "VAR",
-    "TEST_FOUND",
-  ];
+    'TEST_HOME',
+    'MISSING',
+    'TEST_A',
+    'TEST_B',
+    'TEST_EMPTY',
+    'TEST_X',
+    'VAR',
+    'TEST_FOUND',
+  ]
 
   beforeEach(() => {
     for (const key of trackedKeys) {
-      savedEnv[key] = process.env[key];
+      savedEnv[key] = process.env[key]
     }
-  });
+  })
 
   afterEach(() => {
     for (const key of trackedKeys) {
       if (savedEnv[key] === undefined) {
-        delete process.env[key];
+        delete process.env[key]
       } else {
-        process.env[key] = savedEnv[key];
+        process.env[key] = savedEnv[key]
       }
     }
-  });
+  })
 
-  test("expands a single env var that exists", () => {
-    process.env.TEST_HOME = "/home/user";
-    const result = expandEnvVarsInString("${TEST_HOME}");
-    expect(result.expanded).toBe("/home/user");
-    expect(result.missingVars).toEqual([]);
-  });
+  test('expands a single env var that exists', () => {
+    process.env.TEST_HOME = '/home/user'
+    // biome-ignore lint/suspicious/noTemplateCurlyInString: ${} is test input for env var expansion, not a JS template literal
+    const result = expandEnvVarsInString('${TEST_HOME}')
+    expect(result.expanded).toBe('/home/user')
+    expect(result.missingVars).toEqual([])
+  })
 
-  test("returns original placeholder and tracks missing var when not found", () => {
-    delete process.env.MISSING;
-    const result = expandEnvVarsInString("${MISSING}");
-    expect(result.expanded).toBe("${MISSING}");
-    expect(result.missingVars).toEqual(["MISSING"]);
-  });
+  test('returns original placeholder and tracks missing var when not found', () => {
+    delete process.env.MISSING
+    // biome-ignore lint/suspicious/noTemplateCurlyInString: ${} is test input for env var expansion, not a JS template literal
+    const result = expandEnvVarsInString('${MISSING}')
+    // biome-ignore lint/suspicious/noTemplateCurlyInString: ${} is test input for env var expansion, not a JS template literal
+    expect(result.expanded).toBe('${MISSING}')
+    expect(result.missingVars).toEqual(['MISSING'])
+  })
 
-  test("uses default value when var is missing and default is provided", () => {
-    delete process.env.MISSING;
-    const result = expandEnvVarsInString("${MISSING:-fallback}");
-    expect(result.expanded).toBe("fallback");
-    expect(result.missingVars).toEqual([]);
-  });
+  test('uses default value when var is missing and default is provided', () => {
+    delete process.env.MISSING
+    // biome-ignore lint/suspicious/noTemplateCurlyInString: ${} is test input for env var expansion, not a JS template literal
+    const result = expandEnvVarsInString('${MISSING:-fallback}')
+    expect(result.expanded).toBe('fallback')
+    expect(result.missingVars).toEqual([])
+  })
 
-  test("expands multiple vars", () => {
-    process.env.TEST_A = "hello";
-    process.env.TEST_B = "world";
-    const result = expandEnvVarsInString("${TEST_A}/${TEST_B}");
-    expect(result.expanded).toBe("hello/world");
-    expect(result.missingVars).toEqual([]);
-  });
+  test('expands multiple vars', () => {
+    process.env.TEST_A = 'hello'
+    process.env.TEST_B = 'world'
+    // biome-ignore lint/suspicious/noTemplateCurlyInString: ${} is test input for env var expansion, not a JS template literal
+    const result = expandEnvVarsInString('${TEST_A}/${TEST_B}')
+    expect(result.expanded).toBe('hello/world')
+    expect(result.missingVars).toEqual([])
+  })
 
-  test("handles mix of found and missing vars", () => {
-    process.env.TEST_FOUND = "yes";
-    delete process.env.MISSING;
-    const result = expandEnvVarsInString("${TEST_FOUND}-${MISSING}");
-    expect(result.expanded).toBe("yes-${MISSING}");
-    expect(result.missingVars).toEqual(["MISSING"]);
-  });
+  test('handles mix of found and missing vars', () => {
+    process.env.TEST_FOUND = 'yes'
+    delete process.env.MISSING
+    // biome-ignore lint/suspicious/noTemplateCurlyInString: ${} is test input for env var expansion, not a JS template literal
+    const result = expandEnvVarsInString('${TEST_FOUND}-${MISSING}')
+    // biome-ignore lint/suspicious/noTemplateCurlyInString: ${} is test input for env var expansion, not a JS template literal
+    expect(result.expanded).toBe('yes-${MISSING}')
+    expect(result.missingVars).toEqual(['MISSING'])
+  })
 
-  test("returns plain string unchanged with empty missingVars", () => {
-    const result = expandEnvVarsInString("plain string");
-    expect(result.expanded).toBe("plain string");
-    expect(result.missingVars).toEqual([]);
-  });
+  test('returns plain string unchanged with empty missingVars', () => {
+    const result = expandEnvVarsInString('plain string')
+    expect(result.expanded).toBe('plain string')
+    expect(result.missingVars).toEqual([])
+  })
 
-  test("expands empty env var value", () => {
-    process.env.TEST_EMPTY = "";
-    const result = expandEnvVarsInString("${TEST_EMPTY}");
-    expect(result.expanded).toBe("");
-    expect(result.missingVars).toEqual([]);
-  });
+  test('expands empty env var value', () => {
+    process.env.TEST_EMPTY = ''
+    // biome-ignore lint/suspicious/noTemplateCurlyInString: ${} is test input for env var expansion, not a JS template literal
+    const result = expandEnvVarsInString('${TEST_EMPTY}')
+    expect(result.expanded).toBe('')
+    expect(result.missingVars).toEqual([])
+  })
 
-  test("prefers env var value over default when var exists", () => {
-    process.env.TEST_X = "real";
-    const result = expandEnvVarsInString("${TEST_X:-default}");
-    expect(result.expanded).toBe("real");
-    expect(result.missingVars).toEqual([]);
-  });
+  test('prefers env var value over default when var exists', () => {
+    process.env.TEST_X = 'real'
+    // biome-ignore lint/suspicious/noTemplateCurlyInString: ${} is test input for env var expansion, not a JS template literal
+    const result = expandEnvVarsInString('${TEST_X:-default}')
+    expect(result.expanded).toBe('real')
+    expect(result.missingVars).toEqual([])
+  })
 
-  test("handles default value containing colons", () => {
+  test('handles default value containing colons', () => {
     // split(':-', 2) means only the first :- is the delimiter
-    delete process.env.TEST_X;
-    const result = expandEnvVarsInString("${TEST_X:-value:-with:-colons}");
+    delete process.env.TEST_X
+    // biome-ignore lint/suspicious/noTemplateCurlyInString: ${} is test input for env var expansion, not a JS template literal
+    const result = expandEnvVarsInString('${TEST_X:-value:-with:-colons}')
     // The default is "value" because split(':-', 2) gives ["TEST_X", "value"]
     // Wait -- actually split(':-', 2) on "TEST_X:-value:-with:-colons" gives:
     //   ["TEST_X", "value"] because limit=2 stops at 2 pieces
-    expect(result.expanded).toBe("value");
-    expect(result.missingVars).toEqual([]);
-  });
+    expect(result.expanded).toBe('value')
+    expect(result.missingVars).toEqual([])
+  })
 
-  test("handles nested-looking syntax as literal (not supported)", () => {
+  test('handles nested-looking syntax as literal (not supported)', () => {
     // ${${VAR}} - the regex [^}]+ matches "${VAR" (up to first })
     // so varName would be "${VAR" which won't be found in env
-    delete process.env.VAR;
-    const result = expandEnvVarsInString("${${VAR}}");
+    delete process.env.VAR
+    // biome-ignore lint/suspicious/noTemplateCurlyInString: ${} is test input for env var expansion, not a JS template literal
+    const result = expandEnvVarsInString('${${VAR}}')
     // The regex \$\{([^}]+)\} matches "${${VAR}" with capture "${VAR"
     // That env var won't exist, so it stays as "${${VAR}" + remaining "}"
-    expect(result.missingVars).toEqual(["${VAR"]);
-    expect(result.expanded).toBe("${${VAR}}");
-  });
+    expect(result.missingVars).toEqual(['${VAR'])
+    // biome-ignore lint/suspicious/noTemplateCurlyInString: ${} is test input for env var expansion, not a JS template literal
+    expect(result.expanded).toBe('${${VAR}}')
+  })
 
-  test("handles empty string input", () => {
-    const result = expandEnvVarsInString("");
-    expect(result.expanded).toBe("");
-    expect(result.missingVars).toEqual([]);
-  });
+  test('handles empty string input', () => {
+    const result = expandEnvVarsInString('')
+    expect(result.expanded).toBe('')
+    expect(result.missingVars).toEqual([])
+  })
 
-  test("handles var surrounded by text", () => {
-    process.env.TEST_A = "middle";
-    const result = expandEnvVarsInString("before-${TEST_A}-after");
-    expect(result.expanded).toBe("before-middle-after");
-    expect(result.missingVars).toEqual([]);
-  });
+  test('handles var surrounded by text', () => {
+    process.env.TEST_A = 'middle'
+    // biome-ignore lint/suspicious/noTemplateCurlyInString: ${} is test input for env var expansion, not a JS template literal
+    const result = expandEnvVarsInString('before-${TEST_A}-after')
+    expect(result.expanded).toBe('before-middle-after')
+    expect(result.missingVars).toEqual([])
+  })
 
-  test("handles default value that is empty string", () => {
-    delete process.env.MISSING;
-    const result = expandEnvVarsInString("${MISSING:-}");
-    expect(result.expanded).toBe("");
-    expect(result.missingVars).toEqual([]);
-  });
+  test('handles default value that is empty string', () => {
+    delete process.env.MISSING
+    // biome-ignore lint/suspicious/noTemplateCurlyInString: ${} is test input for env var expansion, not a JS template literal
+    const result = expandEnvVarsInString('${MISSING:-}')
+    expect(result.expanded).toBe('')
+    expect(result.missingVars).toEqual([])
+  })
 
-  test("does not expand $VAR without braces", () => {
-    process.env.TEST_A = "value";
-    const result = expandEnvVarsInString("$TEST_A");
-    expect(result.expanded).toBe("$TEST_A");
-    expect(result.missingVars).toEqual([]);
-  });
-});
+  test('does not expand $VAR without braces', () => {
+    process.env.TEST_A = 'value'
+    const result = expandEnvVarsInString('$TEST_A')
+    expect(result.expanded).toBe('$TEST_A')
+    expect(result.missingVars).toEqual([])
+  })
+})
diff --git a/src/services/mcp/__tests__/filterUtils.test.ts b/src/services/mcp/__tests__/filterUtils.test.ts
index eecd8d8dc..61e37aafe 100644
--- a/src/services/mcp/__tests__/filterUtils.test.ts
+++ b/src/services/mcp/__tests__/filterUtils.test.ts
@@ -1,11 +1,11 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from 'bun:test'
 
 // parseHeaders is a pure function from ../utils.ts (line 325)
 // Copied here to avoid triggering the heavy import chain of utils.ts
 function parseHeaders(headerArray: string[]): Record<string, string> {
   const headers: Record<string, string> = {}
   for (const header of headerArray) {
-    const colonIndex = header.indexOf(":")
+    const colonIndex = header.indexOf(':')
     if (colonIndex === -1) {
       throw new Error(
         `Invalid header format: "${header}". Expected format: "Header-Name: value"`,
@@ -23,43 +23,43 @@ function parseHeaders(headerArray: string[]): Record<string, string> {
   return headers
 }
 
-describe("parseHeaders", () => {
+describe('parseHeaders', () => {
   test("parses 'Key: Value' format", () => {
-    expect(parseHeaders(["Content-Type: application/json"])).toEqual({
-      "Content-Type": "application/json",
-    });
-  });
+    expect(parseHeaders(['Content-Type: application/json'])).toEqual({
+      'Content-Type': 'application/json',
+    })
+  })
 
-  test("parses multiple headers", () => {
-    expect(parseHeaders(["Key1: val1", "Key2: val2"])).toEqual({
-      Key1: "val1",
-      Key2: "val2",
-    });
-  });
+  test('parses multiple headers', () => {
+    expect(parseHeaders(['Key1: val1', 'Key2: val2'])).toEqual({
+      Key1: 'val1',
+      Key2: 'val2',
+    })
+  })
 
-  test("trims whitespace around key and value", () => {
-    expect(parseHeaders(["  Key  :  Value  "])).toEqual({ Key: "Value" });
-  });
+  test('trims whitespace around key and value', () => {
+    expect(parseHeaders(['  Key  :  Value  '])).toEqual({ Key: 'Value' })
+  })
 
-  test("throws on missing colon", () => {
-    expect(() => parseHeaders(["no colon here"])).toThrow();
-  });
+  test('throws on missing colon', () => {
+    expect(() => parseHeaders(['no colon here'])).toThrow()
+  })
 
-  test("throws on empty key", () => {
-    expect(() => parseHeaders([": value"])).toThrow();
-  });
+  test('throws on empty key', () => {
+    expect(() => parseHeaders([': value'])).toThrow()
+  })
 
-  test("handles value with colons (like URLs)", () => {
-    expect(parseHeaders(["url: http://example.com:8080"])).toEqual({
-      url: "http://example.com:8080",
-    });
-  });
+  test('handles value with colons (like URLs)', () => {
+    expect(parseHeaders(['url: http://example.com:8080'])).toEqual({
+      url: 'http://example.com:8080',
+    })
+  })
 
-  test("returns empty object for empty array", () => {
-    expect(parseHeaders([])).toEqual({});
-  });
+  test('returns empty object for empty array', () => {
+    expect(parseHeaders([])).toEqual({})
+  })
 
-  test("handles duplicate keys (last wins)", () => {
-    expect(parseHeaders(["K: v1", "K: v2"])).toEqual({ K: "v2" });
-  });
-});
+  test('handles duplicate keys (last wins)', () => {
+    expect(parseHeaders(['K: v1', 'K: v2'])).toEqual({ K: 'v2' })
+  })
+})
diff --git a/src/services/mcp/__tests__/mcpStringUtils.test.ts b/src/services/mcp/__tests__/mcpStringUtils.test.ts
index 0b8d22bdf..3d2212558 100644
--- a/src/services/mcp/__tests__/mcpStringUtils.test.ts
+++ b/src/services/mcp/__tests__/mcpStringUtils.test.ts
@@ -1,4 +1,4 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from 'bun:test'
 import {
   mcpInfoFromString,
   buildMcpToolName,
@@ -6,135 +6,133 @@ import {
   getMcpDisplayName,
   getToolNameForPermissionCheck,
   extractMcpToolDisplayName,
-} from "../mcpStringUtils";
+} from '../mcpStringUtils'
 
 // ─── mcpInfoFromString ─────────────────────────────────────────────────
 
-describe("mcpInfoFromString", () => {
-  test("parses standard mcp tool name", () => {
-    const result = mcpInfoFromString("mcp__github__list_issues");
-    expect(result).toEqual({ serverName: "github", toolName: "list_issues" });
-  });
+describe('mcpInfoFromString', () => {
+  test('parses standard mcp tool name', () => {
+    const result = mcpInfoFromString('mcp__github__list_issues')
+    expect(result).toEqual({ serverName: 'github', toolName: 'list_issues' })
+  })
 
-  test("returns null for non-mcp string", () => {
-    expect(mcpInfoFromString("Bash")).toBeNull();
-    expect(mcpInfoFromString("grep__pattern")).toBeNull();
-  });
+  test('returns null for non-mcp string', () => {
+    expect(mcpInfoFromString('Bash')).toBeNull()
+    expect(mcpInfoFromString('grep__pattern')).toBeNull()
+  })
 
-  test("returns null when no server name", () => {
-    expect(mcpInfoFromString("mcp__")).toBeNull();
-  });
+  test('returns null when no server name', () => {
+    expect(mcpInfoFromString('mcp__')).toBeNull()
+  })
 
-  test("handles server name only (no tool)", () => {
-    const result = mcpInfoFromString("mcp__server");
-    expect(result).toEqual({ serverName: "server", toolName: undefined });
-  });
+  test('handles server name only (no tool)', () => {
+    const result = mcpInfoFromString('mcp__server')
+    expect(result).toEqual({ serverName: 'server', toolName: undefined })
+  })
 
-  test("preserves double underscores in tool name", () => {
-    const result = mcpInfoFromString("mcp__server__tool__with__underscores");
+  test('preserves double underscores in tool name', () => {
+    const result = mcpInfoFromString('mcp__server__tool__with__underscores')
     expect(result).toEqual({
-      serverName: "server",
-      toolName: "tool__with__underscores",
-    });
-  });
+      serverName: 'server',
+      toolName: 'tool__with__underscores',
+    })
+  })
 
-  test("returns null for empty string", () => {
-    expect(mcpInfoFromString("")).toBeNull();
-  });
-});
+  test('returns null for empty string', () => {
+    expect(mcpInfoFromString('')).toBeNull()
+  })
+})
 
 // ─── getMcpPrefix ──────────────────────────────────────────────────────
 
-describe("getMcpPrefix", () => {
-  test("creates prefix from server name", () => {
-    expect(getMcpPrefix("github")).toBe("mcp__github__");
-  });
+describe('getMcpPrefix', () => {
+  test('creates prefix from server name', () => {
+    expect(getMcpPrefix('github')).toBe('mcp__github__')
+  })
 
-  test("normalizes server name with special chars", () => {
-    expect(getMcpPrefix("my-server")).toBe("mcp__my-server__");
-  });
+  test('normalizes server name with special chars', () => {
+    expect(getMcpPrefix('my-server')).toBe('mcp__my-server__')
+  })
 
-  test("normalizes dots to underscores", () => {
-    expect(getMcpPrefix("my.server")).toBe("mcp__my_server__");
-  });
-});
+  test('normalizes dots to underscores', () => {
+    expect(getMcpPrefix('my.server')).toBe('mcp__my_server__')
+  })
+})
 
 // ─── buildMcpToolName ──────────────────────────────────────────────────
 
-describe("buildMcpToolName", () => {
-  test("builds fully qualified name", () => {
-    expect(buildMcpToolName("github", "list_issues")).toBe(
-      "mcp__github__list_issues"
-    );
-  });
+describe('buildMcpToolName', () => {
+  test('builds fully qualified name', () => {
+    expect(buildMcpToolName('github', 'list_issues')).toBe(
+      'mcp__github__list_issues',
+    )
+  })
 
-  test("normalizes both server and tool names", () => {
-    expect(buildMcpToolName("my.server", "my.tool")).toBe(
-      "mcp__my_server__my_tool"
-    );
-  });
-});
+  test('normalizes both server and tool names', () => {
+    expect(buildMcpToolName('my.server', 'my.tool')).toBe(
+      'mcp__my_server__my_tool',
+    )
+  })
+})
 
 // ─── getMcpDisplayName ─────────────────────────────────────────────────
 
-describe("getMcpDisplayName", () => {
-  test("strips mcp prefix from full name", () => {
-    expect(getMcpDisplayName("mcp__github__list_issues", "github")).toBe(
-      "list_issues"
-    );
-  });
+describe('getMcpDisplayName', () => {
+  test('strips mcp prefix from full name', () => {
+    expect(getMcpDisplayName('mcp__github__list_issues', 'github')).toBe(
+      'list_issues',
+    )
+  })
 
   test("returns full name if prefix doesn't match", () => {
-    expect(getMcpDisplayName("mcp__other__tool", "github")).toBe(
-      "mcp__other__tool"
-    );
-  });
-});
+    expect(getMcpDisplayName('mcp__other__tool', 'github')).toBe(
+      'mcp__other__tool',
+    )
+  })
+})
 
 // ─── getToolNameForPermissionCheck ─────────────────────────────────────
 
-describe("getToolNameForPermissionCheck", () => {
-  test("returns built MCP name for MCP tools", () => {
+describe('getToolNameForPermissionCheck', () => {
+  test('returns built MCP name for MCP tools', () => {
     const tool = {
-      name: "list_issues",
-      mcpInfo: { serverName: "github", toolName: "list_issues" },
-    };
-    expect(getToolNameForPermissionCheck(tool)).toBe(
-      "mcp__github__list_issues"
-    );
-  });
+      name: 'list_issues',
+      mcpInfo: { serverName: 'github', toolName: 'list_issues' },
+    }
+    expect(getToolNameForPermissionCheck(tool)).toBe('mcp__github__list_issues')
+  })
 
-  test("returns tool name for non-MCP tools", () => {
-    const tool = { name: "Bash" };
-    expect(getToolNameForPermissionCheck(tool)).toBe("Bash");
-  });
+  test('returns tool name for non-MCP tools', () => {
+    const tool = { name: 'Bash' }
+    expect(getToolNameForPermissionCheck(tool)).toBe('Bash')
+  })
 
-  test("returns tool name when mcpInfo is undefined", () => {
-    const tool = { name: "Write", mcpInfo: undefined };
-    expect(getToolNameForPermissionCheck(tool)).toBe("Write");
-  });
-});
+  test('returns tool name when mcpInfo is undefined', () => {
+    const tool = { name: 'Write', mcpInfo: undefined }
+    expect(getToolNameForPermissionCheck(tool)).toBe('Write')
+  })
+})
 
 // ─── extractMcpToolDisplayName ─────────────────────────────────────────
 
-describe("extractMcpToolDisplayName", () => {
-  test("extracts display name from full user-facing name", () => {
+describe('extractMcpToolDisplayName', () => {
+  test('extracts display name from full user-facing name', () => {
     expect(
-      extractMcpToolDisplayName("github - Add comment to issue (MCP)")
-    ).toBe("Add comment to issue");
-  });
+      extractMcpToolDisplayName('github - Add comment to issue (MCP)'),
+    ).toBe('Add comment to issue')
+  })
 
-  test("removes (MCP) suffix only", () => {
-    expect(extractMcpToolDisplayName("simple-tool (MCP)")).toBe("simple-tool");
-  });
+  test('removes (MCP) suffix only', () => {
+    expect(extractMcpToolDisplayName('simple-tool (MCP)')).toBe('simple-tool')
+  })
 
-  test("handles name without (MCP) suffix", () => {
-    expect(extractMcpToolDisplayName("github - List issues")).toBe(
-      "List issues"
-    );
-  });
+  test('handles name without (MCP) suffix', () => {
+    expect(extractMcpToolDisplayName('github - List issues')).toBe(
+      'List issues',
+    )
+  })
 
-  test("handles name without dash separator", () => {
-    expect(extractMcpToolDisplayName("just-a-name")).toBe("just-a-name");
-  });
-});
+  test('handles name without dash separator', () => {
+    expect(extractMcpToolDisplayName('just-a-name')).toBe('just-a-name')
+  })
+})
diff --git a/src/services/mcp/__tests__/normalization.test.ts b/src/services/mcp/__tests__/normalization.test.ts
index 9b3b6991b..49cc34557 100644
--- a/src/services/mcp/__tests__/normalization.test.ts
+++ b/src/services/mcp/__tests__/normalization.test.ts
@@ -1,59 +1,59 @@
-import { describe, expect, test } from "bun:test";
-import { normalizeNameForMCP } from "../normalization";
+import { describe, expect, test } from 'bun:test'
+import { normalizeNameForMCP } from '../normalization'
 
-describe("normalizeNameForMCP", () => {
-  test("returns simple valid name unchanged", () => {
-    expect(normalizeNameForMCP("my-server")).toBe("my-server");
-  });
+describe('normalizeNameForMCP', () => {
+  test('returns simple valid name unchanged', () => {
+    expect(normalizeNameForMCP('my-server')).toBe('my-server')
+  })
 
-  test("replaces dots with underscores", () => {
-    expect(normalizeNameForMCP("my.server.name")).toBe("my_server_name");
-  });
+  test('replaces dots with underscores', () => {
+    expect(normalizeNameForMCP('my.server.name')).toBe('my_server_name')
+  })
 
-  test("replaces spaces with underscores", () => {
-    expect(normalizeNameForMCP("my server")).toBe("my_server");
-  });
+  test('replaces spaces with underscores', () => {
+    expect(normalizeNameForMCP('my server')).toBe('my_server')
+  })
 
-  test("replaces special characters with underscores", () => {
-    expect(normalizeNameForMCP("server@v2!")).toBe("server_v2_");
-  });
+  test('replaces special characters with underscores', () => {
+    expect(normalizeNameForMCP('server@v2!')).toBe('server_v2_')
+  })
 
-  test("returns already valid name unchanged", () => {
-    expect(normalizeNameForMCP("valid_name-123")).toBe("valid_name-123");
-  });
+  test('returns already valid name unchanged', () => {
+    expect(normalizeNameForMCP('valid_name-123')).toBe('valid_name-123')
+  })
 
-  test("returns empty string for empty input", () => {
-    expect(normalizeNameForMCP("")).toBe("");
-  });
+  test('returns empty string for empty input', () => {
+    expect(normalizeNameForMCP('')).toBe('')
+  })
 
-  test("handles claude.ai prefix: collapses consecutive underscores and strips edges", () => {
+  test('handles claude.ai prefix: collapses consecutive underscores and strips edges', () => {
     // "claude.ai My Server" -> replace invalid -> "claude_ai_My_Server"
     // starts with "claude.ai " so collapse + strip -> "claude_ai_My_Server"
-    expect(normalizeNameForMCP("claude.ai My Server")).toBe(
-      "claude_ai_My_Server"
-    );
-  });
+    expect(normalizeNameForMCP('claude.ai My Server')).toBe(
+      'claude_ai_My_Server',
+    )
+  })
 
-  test("handles claude.ai prefix with consecutive invalid chars", () => {
+  test('handles claude.ai prefix with consecutive invalid chars', () => {
     // "claude.ai ...test..." -> replace invalid -> "claude_ai____test___"
     // collapse consecutive _ -> "claude_ai_test_"
     // strip leading/trailing _ -> "claude_ai_test"
-    expect(normalizeNameForMCP("claude.ai ...test...")).toBe("claude_ai_test");
-  });
+    expect(normalizeNameForMCP('claude.ai ...test...')).toBe('claude_ai_test')
+  })
 
-  test("non-claude.ai name preserves consecutive underscores", () => {
+  test('non-claude.ai name preserves consecutive underscores', () => {
     // "a..b" -> "a__b", no claude.ai prefix so no collapse
-    expect(normalizeNameForMCP("a..b")).toBe("a__b");
-  });
+    expect(normalizeNameForMCP('a..b')).toBe('a__b')
+  })
 
-  test("non-claude.ai name preserves trailing underscores", () => {
-    expect(normalizeNameForMCP("name!")).toBe("name_");
-  });
+  test('non-claude.ai name preserves trailing underscores', () => {
+    expect(normalizeNameForMCP('name!')).toBe('name_')
+  })
 
-  test("handles claude.ai prefix that results in only underscores", () => {
+  test('handles claude.ai prefix that results in only underscores', () => {
     // "claude.ai ..." -> replace invalid -> "claude_ai____"
     // collapse -> "claude_ai_"
     // strip trailing -> "claude_ai"
-    expect(normalizeNameForMCP("claude.ai ...")).toBe("claude_ai");
-  });
-});
+    expect(normalizeNameForMCP('claude.ai ...')).toBe('claude_ai')
+  })
+})
diff --git a/src/services/mcp/__tests__/officialRegistry.test.ts b/src/services/mcp/__tests__/officialRegistry.test.ts
index ffb4b94c9..468d17049 100644
--- a/src/services/mcp/__tests__/officialRegistry.test.ts
+++ b/src/services/mcp/__tests__/officialRegistry.test.ts
@@ -1,45 +1,45 @@
-import { mock, describe, expect, test, afterEach } from "bun:test";
+import { mock, describe, expect, test, afterEach } from 'bun:test'
 
-mock.module("axios", () => ({
+mock.module('axios', () => ({
   default: { get: async () => ({ data: { servers: [] } }) },
-}));
-mock.module("src/utils/debug.js", () => ({
+}))
+mock.module('src/utils/debug.js', () => ({
   logForDebugging: () => {},
-}));
-mock.module("src/utils/errors.js", () => ({
+}))
+mock.module('src/utils/errors.js', () => ({
   errorMessage: (e: any) => String(e),
-}));
+}))
 
 const { isOfficialMcpUrl, resetOfficialMcpUrlsForTesting } = await import(
-  "../officialRegistry"
-);
+  '../officialRegistry'
+)
 
-describe("isOfficialMcpUrl", () => {
+describe('isOfficialMcpUrl', () => {
   afterEach(() => {
-    resetOfficialMcpUrlsForTesting();
-  });
+    resetOfficialMcpUrlsForTesting()
+  })
 
-  test("returns false when registry not loaded (initial state)", () => {
-    resetOfficialMcpUrlsForTesting();
-    expect(isOfficialMcpUrl("https://example.com")).toBe(false);
-  });
+  test('returns false when registry not loaded (initial state)', () => {
+    resetOfficialMcpUrlsForTesting()
+    expect(isOfficialMcpUrl('https://example.com')).toBe(false)
+  })
 
-  test("returns false for non-registered URL", () => {
-    expect(isOfficialMcpUrl("https://random-server.com/mcp")).toBe(false);
-  });
+  test('returns false for non-registered URL', () => {
+    expect(isOfficialMcpUrl('https://random-server.com/mcp')).toBe(false)
+  })
 
-  test("returns false for empty string", () => {
-    expect(isOfficialMcpUrl("")).toBe(false);
-  });
-});
+  test('returns false for empty string', () => {
+    expect(isOfficialMcpUrl('')).toBe(false)
+  })
+})
 
-describe("resetOfficialMcpUrlsForTesting", () => {
-  test("can be called without error", () => {
-    expect(() => resetOfficialMcpUrlsForTesting()).not.toThrow();
-  });
+describe('resetOfficialMcpUrlsForTesting', () => {
+  test('can be called without error', () => {
+    expect(() => resetOfficialMcpUrlsForTesting()).not.toThrow()
+  })
 
-  test("clears state so subsequent lookups return false", () => {
-    resetOfficialMcpUrlsForTesting();
-    expect(isOfficialMcpUrl("https://anything.com")).toBe(false);
-  });
-});
+  test('clears state so subsequent lookups return false', () => {
+    resetOfficialMcpUrlsForTesting()
+    expect(isOfficialMcpUrl('https://anything.com')).toBe(false)
+  })
+})
diff --git a/src/services/mcp/adapter/analytics.ts b/src/services/mcp/adapter/analytics.ts
index 6b3bf46c1..c30b7b572 100644
--- a/src/services/mcp/adapter/analytics.ts
+++ b/src/services/mcp/adapter/analytics.ts
@@ -12,7 +12,13 @@ import {
 export function createMcpAnalytics(): AnalyticsSink {
   return {
     trackEvent(event: string, metadata: Record<string, unknown>) {
-      logEvent(event, metadata as Record<string, AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS>)
+      logEvent(
+        event,
+        metadata as Record<
+          string,
+          AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS
+        >,
+      )
     },
   }
 }
diff --git a/src/services/mcp/adapter/imageProcessor.ts b/src/services/mcp/adapter/imageProcessor.ts
index f8670d64a..616823360 100644
--- a/src/services/mcp/adapter/imageProcessor.ts
+++ b/src/services/mcp/adapter/imageProcessor.ts
@@ -9,7 +9,11 @@ import { maybeResizeAndDownsampleImageBuffer } from '../../../utils/imageResizer
 export function createMcpImageProcessor(): ImageProcessor {
   return {
     async resizeAndDownsample(buffer: Buffer) {
-      const result = await maybeResizeAndDownsampleImageBuffer(buffer, buffer.length, 'png')
+      const result = await maybeResizeAndDownsampleImageBuffer(
+        buffer,
+        buffer.length,
+        'png',
+      )
       return result.buffer
     },
   }
diff --git a/src/services/mcp/adapter/storage.ts b/src/services/mcp/adapter/storage.ts
index 8ba2f2526..e3455640a 100644
--- a/src/services/mcp/adapter/storage.ts
+++ b/src/services/mcp/adapter/storage.ts
@@ -2,7 +2,10 @@
 
 import type { ContentStorage } from '@claude-code-best/mcp-client'
 import { persistBinaryContent } from '../../../utils/mcpOutputStorage.js'
-import { persistToolResult, isPersistError } from '../../../utils/toolResultStorage.js'
+import {
+  persistToolResult,
+  isPersistError,
+} from '../../../utils/toolResultStorage.js'
 
 /**
  * Creates a ContentStorage implementation using the host's binary persistence.
@@ -10,7 +13,11 @@ import { persistToolResult, isPersistError } from '../../../utils/toolResultStor
 export function createMcpStorage(): ContentStorage {
   return {
     async persistBinaryContent(data: Buffer, ext: string) {
-      const result = await persistBinaryContent(data, ext, `mcp-adapter-${Date.now()}`)
+      const result = await persistBinaryContent(
+        data,
+        ext,
+        `mcp-adapter-${Date.now()}`,
+      )
       if ('error' in result) {
         throw new Error(result.error)
       }
diff --git a/src/services/mcp/auth.ts b/src/services/mcp/auth.ts
index 61c946364..72b741061 100644
--- a/src/services/mcp/auth.ts
+++ b/src/services/mcp/auth.ts
@@ -2346,7 +2346,7 @@ export class ClaudeAuthProvider implements OAuthClientProvider {
           return undefined
         }
 
-        const delayMs = 1000 * Math.pow(2, attempt - 1) // 1s, 2s, 4s
+        const delayMs = 1000 * 2 ** (attempt - 1) // 1s, 2s, 4s
         logMCPDebug(
           this.serverName,
           `Token refresh failed, retrying in ${delayMs}ms (attempt ${attempt}/${MAX_ATTEMPTS})`,
diff --git a/src/services/mcp/client.ts b/src/services/mcp/client.ts
index 00576954d..82e46b6e7 100644
--- a/src/services/mcp/client.ts
+++ b/src/services/mcp/client.ts
@@ -51,7 +51,10 @@ import {
   toolMatchesName,
 } from '../../Tool.js'
 import { ListMcpResourcesTool } from '@claude-code-best/builtin-tools/tools/ListMcpResourcesTool/ListMcpResourcesTool.js'
-import { type MCPProgress, MCPTool } from '@claude-code-best/builtin-tools/tools/MCPTool/MCPTool.js'
+import {
+  type MCPProgress,
+  MCPTool,
+} from '@claude-code-best/builtin-tools/tools/MCPTool/MCPTool.js'
 import { createMcpAuthTool } from '@claude-code-best/builtin-tools/tools/McpAuthTool/McpAuthTool.js'
 import { ReadMcpResourceTool } from '@claude-code-best/builtin-tools/tools/ReadMcpResourceTool/ReadMcpResourceTool.js'
 import { createAbortController } from '../../utils/abortController.js'
@@ -903,7 +906,8 @@ export const connectToServer = memoize(
         )
         logMCPDebug(name, `claude.ai proxy transport created successfully`)
       } else if (
-        ((serverRef as ScopedMcpServerConfig).type === 'stdio' || !(serverRef as ScopedMcpServerConfig).type) &&
+        ((serverRef as ScopedMcpServerConfig).type === 'stdio' ||
+          !(serverRef as ScopedMcpServerConfig).type) &&
         isClaudeInChromeMCPServer(name)
       ) {
         // Run the Chrome MCP server in-process to avoid spawning a ~325 MB subprocess
@@ -916,7 +920,9 @@ export const connectToServer = memoize(
         const { createLinkedTransportPair } = await import(
           './InProcessTransport.js'
         )
-        const context = createChromeContext((serverRef as McpStdioServerConfig).env)
+        const context = createChromeContext(
+          (serverRef as McpStdioServerConfig).env,
+        )
         inProcessServer = createClaudeForChromeMcpServer(context)
         const [clientTransport, serverTransport] = createLinkedTransportPair()
         await inProcessServer.connect(serverTransport)
@@ -924,7 +930,8 @@ export const connectToServer = memoize(
         logMCPDebug(name, `In-process Chrome MCP server started`)
       } else if (
         feature('CHICAGO_MCP') &&
-        ((serverRef as ScopedMcpServerConfig).type === 'stdio' || !(serverRef as ScopedMcpServerConfig).type) &&
+        ((serverRef as ScopedMcpServerConfig).type === 'stdio' ||
+          !(serverRef as ScopedMcpServerConfig).type) &&
         isComputerUseMCPServer!(name)
       ) {
         // Run the Computer Use MCP server in-process — same rationale as
@@ -941,7 +948,10 @@ export const connectToServer = memoize(
         await inProcessServer.connect(serverTransport)
         transport = clientTransport
         logMCPDebug(name, `In-process Computer Use MCP server started`)
-      } else if ((serverRef as ScopedMcpServerConfig).type === 'stdio' || !(serverRef as ScopedMcpServerConfig).type) {
+      } else if (
+        (serverRef as ScopedMcpServerConfig).type === 'stdio' ||
+        !(serverRef as ScopedMcpServerConfig).type
+      ) {
         const stdioRef = serverRef as McpStdioServerConfig
         const finalCommand =
           process.env.CLAUDE_CODE_SHELL_PREFIX || stdioRef.command
@@ -958,7 +968,9 @@ export const connectToServer = memoize(
           stderr: 'pipe', // prevents error output from the MCP server from printing to the UI
         })
       } else {
-        throw new Error(`Unsupported server type: ${(serverRef as ScopedMcpServerConfig).type}`)
+        throw new Error(
+          `Unsupported server type: ${(serverRef as ScopedMcpServerConfig).type}`,
+        )
       }
 
       // Set up stderr logging for stdio transport before connecting in case there are any stderr
@@ -1444,6 +1456,7 @@ export const connectToServer = memoize(
               }
 
               // Wait for graceful shutdown with rapid escalation (total 500ms to keep CLI responsive)
+              // biome-ignore lint/suspicious/noAsyncPromiseExecutor: async needed for sequential await inside executor
               await new Promise<void>(async resolve => {
                 let resolved = false
 
@@ -3246,8 +3259,14 @@ async function callMCPTool({
 }
 
 function extractToolUseId(message: AssistantMessage): string | undefined {
-  const firstBlock = (message.message.content as ContentBlockParam[] | undefined)?.[0]
-  if (!firstBlock || typeof firstBlock === 'string' || firstBlock.type !== 'tool_use') {
+  const firstBlock = (
+    message.message.content as ContentBlockParam[] | undefined
+  )?.[0]
+  if (
+    !firstBlock ||
+    typeof firstBlock === 'string' ||
+    firstBlock.type !== 'tool_use'
+  ) {
     return undefined
   }
   return firstBlock.id
diff --git a/src/services/mcp/config.ts b/src/services/mcp/config.ts
index dc0300dc8..e627c2840 100644
--- a/src/services/mcp/config.ts
+++ b/src/services/mcp/config.ts
@@ -1351,7 +1351,7 @@ export function parseMcpConfig(params: {
     if (
       getPlatform() === 'windows' &&
       (!configToCheck.type || configToCheck.type === 'stdio') &&
-      ('command' in configToCheck) &&
+      'command' in configToCheck &&
       (configToCheck.command === 'npx' ||
         configToCheck.command.endsWith('\\npx') ||
         configToCheck.command.endsWith('/npx'))
diff --git a/src/services/mcp/oauthPort.ts b/src/services/mcp/oauthPort.ts
index 8cf8ce66e..595b9b1a6 100644
--- a/src/services/mcp/oauthPort.ts
+++ b/src/services/mcp/oauthPort.ts
@@ -56,10 +56,7 @@ export async function findAvailablePort(): Promise<number> {
         })
       })
       return port
-    } catch {
-      // Port in use, try another random port
-      continue
-    }
+    } catch {}
   }
 
   // If random selection failed, try the fallback port
diff --git a/src/services/mcp/officialRegistry.ts b/src/services/mcp/officialRegistry.ts
index 3e26292a3..b5c973013 100644
--- a/src/services/mcp/officialRegistry.ts
+++ b/src/services/mcp/officialRegistry.ts
@@ -14,7 +14,7 @@ type RegistryResponse = {
 
 // URLs stripped of query string and trailing slash — matches the normalization
 // done by getLoggingSafeMcpBaseUrl so direct Set.has() lookup works.
-let officialUrls: Set<string> | undefined = undefined
+let officialUrls: Set<string> | undefined
 
 function normalizeUrl(url: string): string | undefined {
   try {
diff --git a/src/services/mcp/src/constants/oauth.ts b/src/services/mcp/src/constants/oauth.ts
index a1b08933a..ae2abf9b1 100644
--- a/src/services/mcp/src/constants/oauth.ts
+++ b/src/services/mcp/src/constants/oauth.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getOauthConfig = any;
+export type getOauthConfig = any
diff --git a/src/services/mcp/src/services/analytics/index.ts b/src/services/mcp/src/services/analytics/index.ts
index 142e7b6f5..2e0f796da 100644
--- a/src/services/mcp/src/services/analytics/index.ts
+++ b/src/services/mcp/src/services/analytics/index.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any;
-export type logEvent = any;
+export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any
+export type logEvent = any
diff --git a/src/services/mcp/src/services/mcp/config.ts b/src/services/mcp/src/services/mcp/config.ts
index 109c9d3cc..3f4037185 100644
--- a/src/services/mcp/src/services/mcp/config.ts
+++ b/src/services/mcp/src/services/mcp/config.ts
@@ -1,7 +1,7 @@
 // Auto-generated type stub — replace with real implementation
-export type dedupClaudeAiMcpServers = any;
-export type doesEnterpriseMcpConfigExist = any;
-export type filterMcpServersByPolicy = any;
-export type getClaudeCodeMcpConfigs = any;
-export type isMcpServerDisabled = any;
-export type setMcpServerEnabled = any;
+export type dedupClaudeAiMcpServers = any
+export type doesEnterpriseMcpConfigExist = any
+export type filterMcpServersByPolicy = any
+export type getClaudeCodeMcpConfigs = any
+export type isMcpServerDisabled = any
+export type setMcpServerEnabled = any
diff --git a/src/services/mcp/src/state/AppState.ts b/src/services/mcp/src/state/AppState.ts
index caf2928ae..fec2e89be 100644
--- a/src/services/mcp/src/state/AppState.ts
+++ b/src/services/mcp/src/state/AppState.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type AppState = any;
+export type AppState = any
diff --git a/src/services/mcp/src/types/message.ts b/src/services/mcp/src/types/message.ts
index a689141e4..de5e47b85 100644
--- a/src/services/mcp/src/types/message.ts
+++ b/src/services/mcp/src/types/message.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type AssistantMessage = any;
+export type AssistantMessage = any
diff --git a/src/services/mcp/src/types/plugin.ts b/src/services/mcp/src/types/plugin.ts
index 5129b6880..577391cf4 100644
--- a/src/services/mcp/src/types/plugin.ts
+++ b/src/services/mcp/src/types/plugin.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type PluginError = any;
+export type PluginError = any
diff --git a/src/services/mcp/src/utils/auth.ts b/src/services/mcp/src/utils/auth.ts
index 118c05735..2e9fa96c1 100644
--- a/src/services/mcp/src/utils/auth.ts
+++ b/src/services/mcp/src/utils/auth.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getClaudeAIOAuthTokens = any;
+export type getClaudeAIOAuthTokens = any
diff --git a/src/services/mcp/src/utils/config.ts b/src/services/mcp/src/utils/config.ts
index 7cf15deca..b3f5e0f8c 100644
--- a/src/services/mcp/src/utils/config.ts
+++ b/src/services/mcp/src/utils/config.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type getGlobalConfig = any;
-export type saveGlobalConfig = any;
+export type getGlobalConfig = any
+export type saveGlobalConfig = any
diff --git a/src/services/mcp/src/utils/debug.ts b/src/services/mcp/src/utils/debug.ts
index c64d5960c..5a0f1d515 100644
--- a/src/services/mcp/src/utils/debug.ts
+++ b/src/services/mcp/src/utils/debug.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type logForDebugging = any;
+export type logForDebugging = any
diff --git a/src/services/mcp/src/utils/envUtils.ts b/src/services/mcp/src/utils/envUtils.ts
index f6fa62ed7..85de6b353 100644
--- a/src/services/mcp/src/utils/envUtils.ts
+++ b/src/services/mcp/src/utils/envUtils.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type isEnvDefinedFalsy = any;
+export type isEnvDefinedFalsy = any
diff --git a/src/services/mcp/src/utils/platform.ts b/src/services/mcp/src/utils/platform.ts
index b6686f812..c7486cc77 100644
--- a/src/services/mcp/src/utils/platform.ts
+++ b/src/services/mcp/src/utils/platform.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getPlatform = any;
+export type getPlatform = any
diff --git a/src/services/mcp/useManageMCPConnections.ts b/src/services/mcp/useManageMCPConnections.ts
index 80b82d688..4b9d93e8a 100644
--- a/src/services/mcp/useManageMCPConnections.ts
+++ b/src/services/mcp/useManageMCPConnections.ts
@@ -445,7 +445,7 @@ export function useManageMCPConnections(
 
                   // Schedule next retry with exponential backoff
                   const backoffMs = Math.min(
-                    INITIAL_BACKOFF_MS * Math.pow(2, attempt - 1),
+                    INITIAL_BACKOFF_MS * 2 ** (attempt - 1),
                     MAX_BACKOFF_MS,
                   )
                   logMCPDebug(
diff --git a/src/services/mcpServerApproval.tsx b/src/services/mcpServerApproval.tsx
index 78be862f3..92b76bff6 100644
--- a/src/services/mcpServerApproval.tsx
+++ b/src/services/mcpServerApproval.tsx
@@ -1,11 +1,11 @@
-import React from 'react'
-import { MCPServerApprovalDialog } from '../components/MCPServerApprovalDialog.js'
-import { MCPServerMultiselectDialog } from '../components/MCPServerMultiselectDialog.js'
-import type { Root } from '@anthropic/ink'
-import { KeybindingSetup } from '../keybindings/KeybindingProviderSetup.js'
-import { AppStateProvider } from '../state/AppState.js'
-import { getMcpConfigsByScope } from './mcp/config.js'
-import { getProjectMcpServerStatus } from './mcp/utils.js'
+import React from 'react';
+import { MCPServerApprovalDialog } from '../components/MCPServerApprovalDialog.js';
+import { MCPServerMultiselectDialog } from '../components/MCPServerMultiselectDialog.js';
+import type { Root } from '@anthropic/ink';
+import { KeybindingSetup } from '../keybindings/KeybindingProviderSetup.js';
+import { AppStateProvider } from '../state/AppState.js';
+import { getMcpConfigsByScope } from './mcp/config.js';
+import { getProjectMcpServerStatus } from './mcp/utils.js';
 
 /**
  * Show MCP server approval dialogs for pending project servers.
@@ -13,37 +13,34 @@ import { getProjectMcpServerStatus } from './mcp/utils.js'
  * from main.tsx instead of creating a separate one).
  */
 export async function handleMcpjsonServerApprovals(root: Root): Promise<void> {
-  const { servers: projectServers } = getMcpConfigsByScope('project')
+  const { servers: projectServers } = getMcpConfigsByScope('project');
   const pendingServers = Object.keys(projectServers).filter(
     serverName => getProjectMcpServerStatus(serverName) === 'pending',
-  )
+  );
 
   if (pendingServers.length === 0) {
-    return
+    return;
   }
 
   await new Promise<void>(resolve => {
-    const done = (): void => void resolve()
+    const done = (): void => void resolve();
     if (pendingServers.length === 1 && pendingServers[0] !== undefined) {
-      const serverName = pendingServers[0]
+      const serverName = pendingServers[0];
       root.render(
         <AppStateProvider>
           <KeybindingSetup>
             <MCPServerApprovalDialog serverName={serverName} onDone={done} />
           </KeybindingSetup>
         </AppStateProvider>,
-      )
+      );
     } else {
       root.render(
         <AppStateProvider>
           <KeybindingSetup>
-            <MCPServerMultiselectDialog
-              serverNames={pendingServers}
-              onDone={done}
-            />
+            <MCPServerMultiselectDialog serverNames={pendingServers} onDone={done} />
           </KeybindingSetup>
         </AppStateProvider>,
-      )
+      );
     }
-  })
+  });
 }
diff --git a/src/services/notifier.ts b/src/services/notifier.ts
index 1eb8f99db..adf90bc09 100644
--- a/src/services/notifier.ts
+++ b/src/services/notifier.ts
@@ -136,7 +136,9 @@ async function isAppleTerminalBellDisabled(): Promise<boolean> {
     // Lazy-load plist (~280KB with xmlbuilder+@xmldom) — only hit on
     // Apple_Terminal with auto-channel, which is a small fraction of users.
     const plist = await import('plist')
-    const parsed: Record<string, unknown> = plist.parse(defaultsOutput.stdout) as any
+    const parsed: Record<string, unknown> = plist.parse(
+      defaultsOutput.stdout,
+    ) as any
     const windowSettings = parsed?.['Window Settings'] as
       | Record<string, unknown>
       | undefined
diff --git a/src/services/oauth/src/constants/oauth.ts b/src/services/oauth/src/constants/oauth.ts
index 870b6dd12..3b9a8acf2 100644
--- a/src/services/oauth/src/constants/oauth.ts
+++ b/src/services/oauth/src/constants/oauth.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type getOauthConfig = any;
-export type OAUTH_BETA_HEADER = any;
+export type getOauthConfig = any
+export type OAUTH_BETA_HEADER = any
diff --git a/src/services/oauth/src/services/analytics/index.ts b/src/services/oauth/src/services/analytics/index.ts
index ce0a9a827..eca4493cf 100644
--- a/src/services/oauth/src/services/analytics/index.ts
+++ b/src/services/oauth/src/services/analytics/index.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type logEvent = any;
-export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any;
+export type logEvent = any
+export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any
diff --git a/src/services/oauth/src/services/oauth/types.ts b/src/services/oauth/src/services/oauth/types.ts
index bc5c3d5cc..a425c54cd 100644
--- a/src/services/oauth/src/services/oauth/types.ts
+++ b/src/services/oauth/src/services/oauth/types.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type OAuthProfileResponse = any;
+export type OAuthProfileResponse = any
diff --git a/src/services/oauth/src/utils/auth.ts b/src/services/oauth/src/utils/auth.ts
index 2a02cad70..828a8702e 100644
--- a/src/services/oauth/src/utils/auth.ts
+++ b/src/services/oauth/src/utils/auth.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getAnthropicApiKey = any;
+export type getAnthropicApiKey = any
diff --git a/src/services/oauth/src/utils/config.ts b/src/services/oauth/src/utils/config.ts
index 00cdd1299..2c8c5f10c 100644
--- a/src/services/oauth/src/utils/config.ts
+++ b/src/services/oauth/src/utils/config.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getGlobalConfig = any;
+export type getGlobalConfig = any
diff --git a/src/services/oauth/src/utils/log.ts b/src/services/oauth/src/utils/log.ts
index cf30e90da..30df9cbcb 100644
--- a/src/services/oauth/src/utils/log.ts
+++ b/src/services/oauth/src/utils/log.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type logError = any;
+export type logError = any
diff --git a/src/services/oauth/types.ts b/src/services/oauth/types.ts
index b6b4785e2..4e14b12d9 100644
--- a/src/services/oauth/types.ts
+++ b/src/services/oauth/types.ts
@@ -1,12 +1,12 @@
 // Auto-generated stub — replace with real implementation
-export type BillingType = any;
-export type ReferralEligibilityResponse = any;
-export type OAuthTokens = any;
-export type SubscriptionType = any;
-export type ReferralRedemptionsResponse = any;
-export type ReferrerRewardInfo = any;
-export type OAuthProfileResponse = any;
-export type OAuthTokenExchangeResponse = any;
-export type RateLimitTier = any;
-export type UserRolesResponse = any;
-export type ReferralCampaign = any;
+export type BillingType = any
+export type ReferralEligibilityResponse = any
+export type OAuthTokens = any
+export type SubscriptionType = any
+export type ReferralRedemptionsResponse = any
+export type ReferrerRewardInfo = any
+export type OAuthProfileResponse = any
+export type OAuthTokenExchangeResponse = any
+export type RateLimitTier = any
+export type UserRolesResponse = any
+export type ReferralCampaign = any
diff --git a/src/services/plugins/pluginCliCommands.ts b/src/services/plugins/pluginCliCommands.ts
index 514a4143e..917658768 100644
--- a/src/services/plugins/pluginCliCommands.ts
+++ b/src/services/plugins/pluginCliCommands.ts
@@ -61,7 +61,6 @@ function handlePluginCommandError(
     : command === 'disable-all'
       ? 'disable all plugins'
       : `${command} plugins`
-  // biome-ignore lint/suspicious/noConsole:: intentional console output
   console.error(
     `${figures.cross} Failed to ${operation}: ${errorMessage(error)}`,
   )
@@ -105,7 +104,6 @@ export async function installPlugin(
   scope: InstallableScope = 'user',
 ): Promise<void> {
   try {
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.log(`Installing plugin "${plugin}"...`)
 
     const result = await installPluginOp(plugin, scope)
@@ -114,7 +112,6 @@ export async function installPlugin(
       throw new Error(result.message)
     }
 
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.log(`${figures.tick} ${result.message}`)
 
     // _PROTO_* routes to PII-tagged plugin_name/marketplace_name BQ columns.
@@ -162,7 +159,6 @@ export async function uninstallPlugin(
       throw new Error(result.message)
     }
 
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.log(`${figures.tick} ${result.message}`)
 
     const { name, marketplace } = parsePluginIdentifier(
@@ -203,7 +199,6 @@ export async function enablePlugin(
       throw new Error(result.message)
     }
 
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.log(`${figures.tick} ${result.message}`)
 
     const { name, marketplace } = parsePluginIdentifier(
@@ -244,7 +239,6 @@ export async function disablePlugin(
       throw new Error(result.message)
     }
 
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.log(`${figures.tick} ${result.message}`)
 
     const { name, marketplace } = parsePluginIdentifier(
@@ -280,7 +274,6 @@ export async function disableAllPlugins(): Promise<void> {
       throw new Error(result.message)
     }
 
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.log(`${figures.tick} ${result.message}`)
 
     logEvent('tengu_plugin_disabled_all_cli', {})
diff --git a/src/services/plugins/pluginOperations.ts b/src/services/plugins/pluginOperations.ts
index 4d524ed68..c2cd8c7ff 100644
--- a/src/services/plugins/pluginOperations.ts
+++ b/src/services/plugins/pluginOperations.ts
@@ -353,7 +353,6 @@ export async function installPluginOp(
         }
       } catch (error) {
         logError(toError(error))
-        continue
       }
     }
   }
diff --git a/src/services/remoteManagedSettings/securityCheck.tsx b/src/services/remoteManagedSettings/securityCheck.tsx
index f0d9b1ca7..ea8281d61 100644
--- a/src/services/remoteManagedSettings/securityCheck.tsx
+++ b/src/services/remoteManagedSettings/securityCheck.tsx
@@ -1,20 +1,20 @@
-import React from 'react'
-import { getIsInteractive } from '../../bootstrap/state.js'
-import { ManagedSettingsSecurityDialog } from '../../components/ManagedSettingsSecurityDialog/ManagedSettingsSecurityDialog.js'
+import React from 'react';
+import { getIsInteractive } from '../../bootstrap/state.js';
+import { ManagedSettingsSecurityDialog } from '../../components/ManagedSettingsSecurityDialog/ManagedSettingsSecurityDialog.js';
 import {
   extractDangerousSettings,
   hasDangerousSettings,
   hasDangerousSettingsChanged,
-} from '../../components/ManagedSettingsSecurityDialog/utils.js'
-import { wrappedRender as render } from '@anthropic/ink'
-import { KeybindingSetup } from '../../keybindings/KeybindingProviderSetup.js'
-import { AppStateProvider } from '../../state/AppState.js'
-import { gracefulShutdownSync } from '../../utils/gracefulShutdown.js'
-import { getBaseRenderOptions } from '../../utils/renderOptions.js'
-import type { SettingsJson } from '../../utils/settings/types.js'
-import { logEvent } from '../analytics/index.js'
+} from '../../components/ManagedSettingsSecurityDialog/utils.js';
+import { wrappedRender as render } from '@anthropic/ink';
+import { KeybindingSetup } from '../../keybindings/KeybindingProviderSetup.js';
+import { AppStateProvider } from '../../state/AppState.js';
+import { gracefulShutdownSync } from '../../utils/gracefulShutdown.js';
+import { getBaseRenderOptions } from '../../utils/renderOptions.js';
+import type { SettingsJson } from '../../utils/settings/types.js';
+import { logEvent } from '../analytics/index.js';
 
-export type SecurityCheckResult = 'approved' | 'rejected' | 'no_check_needed'
+export type SecurityCheckResult = 'approved' | 'rejected' | 'no_check_needed';
 
 /**
  * Check if new remote managed settings contain dangerous settings that require user approval.
@@ -29,25 +29,22 @@ export async function checkManagedSettingsSecurity(
   newSettings: SettingsJson | null,
 ): Promise<SecurityCheckResult> {
   // If new settings don't have dangerous settings, no check needed
-  if (
-    !newSettings ||
-    !hasDangerousSettings(extractDangerousSettings(newSettings))
-  ) {
-    return 'no_check_needed'
+  if (!newSettings || !hasDangerousSettings(extractDangerousSettings(newSettings))) {
+    return 'no_check_needed';
   }
 
   // If dangerous settings haven't changed, no check needed
   if (!hasDangerousSettingsChanged(cachedSettings, newSettings)) {
-    return 'no_check_needed'
+    return 'no_check_needed';
   }
 
   // Skip dialog in non-interactive mode (consistent with trust dialog behavior)
   if (!getIsInteractive()) {
-    return 'no_check_needed'
+    return 'no_check_needed';
   }
 
   // Log that dialog is being shown
-  logEvent('tengu_managed_settings_security_dialog_shown', {})
+  logEvent('tengu_managed_settings_security_dialog_shown', {});
 
   // Show blocking dialog
   return new Promise<SecurityCheckResult>(resolve => {
@@ -58,34 +55,32 @@ export async function checkManagedSettingsSecurity(
             <ManagedSettingsSecurityDialog
               settings={newSettings}
               onAccept={() => {
-                logEvent('tengu_managed_settings_security_dialog_accepted', {})
-                unmount()
-                void resolve('approved')
+                logEvent('tengu_managed_settings_security_dialog_accepted', {});
+                unmount();
+                void resolve('approved');
               }}
               onReject={() => {
-                logEvent('tengu_managed_settings_security_dialog_rejected', {})
-                unmount()
-                void resolve('rejected')
+                logEvent('tengu_managed_settings_security_dialog_rejected', {});
+                unmount();
+                void resolve('rejected');
               }}
             />
           </KeybindingSetup>
         </AppStateProvider>,
         getBaseRenderOptions(false),
-      )
-    })()
-  })
+      );
+    })();
+  });
 }
 
 /**
  * Handle the security check result by exiting if rejected
  * Returns true if we should continue, false if we should stop
  */
-export function handleSecurityCheckResult(
-  result: SecurityCheckResult,
-): boolean {
+export function handleSecurityCheckResult(result: SecurityCheckResult): boolean {
   if (result === 'rejected') {
-    gracefulShutdownSync(1)
-    return false
+    gracefulShutdownSync(1);
+    return false;
   }
-  return true
+  return true;
 }
diff --git a/src/services/sessionTranscript/sessionTranscript.ts b/src/services/sessionTranscript/sessionTranscript.ts
index 3b3b4e7b0..ca26f41e6 100644
--- a/src/services/sessionTranscript/sessionTranscript.ts
+++ b/src/services/sessionTranscript/sessionTranscript.ts
@@ -1,6 +1,10 @@
 // Auto-generated stub — replace with real implementation
-import type { Message } from '../../types/message.js';
+import type { Message } from '../../types/message.js'
 
-export {};
-export const writeSessionTranscriptSegment: (messages: Message[]) => void = (() => {});
-export const flushOnDateChange: (messages: Message[], currentDate: string) => void = (() => {});
+export {}
+export const writeSessionTranscriptSegment: (messages: Message[]) => void =
+  () => {}
+export const flushOnDateChange: (
+  messages: Message[],
+  currentDate: string,
+) => void = () => {}
diff --git a/src/services/skillSearch/featureCheck.ts b/src/services/skillSearch/featureCheck.ts
index ff8950f4b..bbdd58ef1 100644
--- a/src/services/skillSearch/featureCheck.ts
+++ b/src/services/skillSearch/featureCheck.ts
@@ -1,3 +1,3 @@
 // Auto-generated stub — replace with real implementation
-export {};
-export const isSkillSearchEnabled: () => boolean = () => false;
+export {}
+export const isSkillSearchEnabled: () => boolean = () => false
diff --git a/src/services/skillSearch/localSearch.ts b/src/services/skillSearch/localSearch.ts
index f8139d653..1f3d71693 100644
--- a/src/services/skillSearch/localSearch.ts
+++ b/src/services/skillSearch/localSearch.ts
@@ -1,3 +1,3 @@
 // Auto-generated stub — replace with real implementation
-export {};
-export const clearSkillIndexCache: () => void = () => {};
+export {}
+export const clearSkillIndexCache: () => void = () => {}
diff --git a/src/services/skillSearch/prefetch.ts b/src/services/skillSearch/prefetch.ts
index 50c8729ec..7a86a13d9 100644
--- a/src/services/skillSearch/prefetch.ts
+++ b/src/services/skillSearch/prefetch.ts
@@ -7,12 +7,12 @@ export const startSkillDiscoveryPrefetch: (
   input: string | null,
   messages: Message[],
   toolUseContext: ToolUseContext,
-) => Promise<Attachment[]> = (async () => []);
+) => Promise<Attachment[]> = async () => []
 export const collectSkillDiscoveryPrefetch: (
   pending: Promise<Attachment[]>,
-) => Promise<Attachment[]> = (async (pending) => pending);
+) => Promise<Attachment[]> = async pending => pending
 export const getTurnZeroSkillDiscovery: (
   input: string,
   messages: Message[],
   context: ToolUseContext,
-) => Promise<Attachment | null> = (async () => null);
+) => Promise<Attachment | null> = async () => null
diff --git a/src/services/skillSearch/remoteSkillLoader.ts b/src/services/skillSearch/remoteSkillLoader.ts
index db251d4ff..7bb16f9a5 100644
--- a/src/services/skillSearch/remoteSkillLoader.ts
+++ b/src/services/skillSearch/remoteSkillLoader.ts
@@ -1,17 +1,20 @@
 // Auto-generated stub — replace with real implementation
-export function loadRemoteSkill(_slug: string, _url: string): Promise<{
-  cacheHit: boolean;
-  latencyMs: number;
-  skillPath: string;
-  content: string;
-  fileCount?: number;
-  totalBytes?: number;
-  fetchMethod?: string;
+export function loadRemoteSkill(
+  _slug: string,
+  _url: string,
+): Promise<{
+  cacheHit: boolean
+  latencyMs: number
+  skillPath: string
+  content: string
+  fileCount?: number
+  totalBytes?: number
+  fetchMethod?: string
 }> {
   return Promise.resolve({
     cacheHit: false,
     latencyMs: 0,
     skillPath: '',
     content: '',
-  });
+  })
 }
diff --git a/src/services/skillSearch/remoteSkillState.ts b/src/services/skillSearch/remoteSkillState.ts
index af2f1999d..36b628ce7 100644
--- a/src/services/skillSearch/remoteSkillState.ts
+++ b/src/services/skillSearch/remoteSkillState.ts
@@ -1,3 +1,9 @@
 // Auto-generated stub — replace with real implementation
-export function stripCanonicalPrefix(_name: string): string | null { return null; }
-export function getDiscoveredRemoteSkill(_slug: string): { url: string } | undefined { return undefined; }
+export function stripCanonicalPrefix(_name: string): string | null {
+  return null
+}
+export function getDiscoveredRemoteSkill(
+  _slug: string,
+): { url: string } | undefined {
+  return undefined
+}
diff --git a/src/services/skillSearch/signals.ts b/src/services/skillSearch/signals.ts
index 0b89faefe..4d927bfd9 100644
--- a/src/services/skillSearch/signals.ts
+++ b/src/services/skillSearch/signals.ts
@@ -1,2 +1,2 @@
 // Auto-generated stub — replace with real implementation
-export type DiscoverySignal = any;
+export type DiscoverySignal = any
diff --git a/src/services/skillSearch/telemetry.ts b/src/services/skillSearch/telemetry.ts
index ce2f85b22..7c2ba1fcc 100644
--- a/src/services/skillSearch/telemetry.ts
+++ b/src/services/skillSearch/telemetry.ts
@@ -1,11 +1,11 @@
 // Auto-generated stub — replace with real implementation
 export function logRemoteSkillLoaded(_data: {
-  slug: string;
-  cacheHit: boolean;
-  latencyMs: number;
-  urlScheme: string;
-  error?: string;
-  fileCount?: number;
-  totalBytes?: number;
-  fetchMethod?: string;
+  slug: string
+  cacheHit: boolean
+  latencyMs: number
+  urlScheme: string
+  error?: string
+  fileCount?: number
+  totalBytes?: number
+  fetchMethod?: string
 }): void {}
diff --git a/src/services/src/cost-tracker.ts b/src/services/src/cost-tracker.ts
index 3f76a9113..dea78c7af 100644
--- a/src/services/src/cost-tracker.ts
+++ b/src/services/src/cost-tracker.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type addToTotalSessionCost = any;
+export type addToTotalSessionCost = any
diff --git a/src/services/src/utils/log.ts b/src/services/src/utils/log.ts
index cf30e90da..30df9cbcb 100644
--- a/src/services/src/utils/log.ts
+++ b/src/services/src/utils/log.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type logError = any;
+export type logError = any
diff --git a/src/services/src/utils/model/providers.ts b/src/services/src/utils/model/providers.ts
index df87a41b4..1379140e8 100644
--- a/src/services/src/utils/model/providers.ts
+++ b/src/services/src/utils/model/providers.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getAPIProvider = any;
+export type getAPIProvider = any
diff --git a/src/services/src/utils/modelCost.ts b/src/services/src/utils/modelCost.ts
index a37f5df38..dffb6f217 100644
--- a/src/services/src/utils/modelCost.ts
+++ b/src/services/src/utils/modelCost.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type calculateUSDCost = any;
+export type calculateUSDCost = any
diff --git a/src/services/tips/src/utils/debug.ts b/src/services/tips/src/utils/debug.ts
index c64d5960c..5a0f1d515 100644
--- a/src/services/tips/src/utils/debug.ts
+++ b/src/services/tips/src/utils/debug.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type logForDebugging = any;
+export type logForDebugging = any
diff --git a/src/services/tips/src/utils/fileHistory.ts b/src/services/tips/src/utils/fileHistory.ts
index 5c33161bd..741941819 100644
--- a/src/services/tips/src/utils/fileHistory.ts
+++ b/src/services/tips/src/utils/fileHistory.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type fileHistoryEnabled = any;
+export type fileHistoryEnabled = any
diff --git a/src/services/tips/src/utils/settings/settings.ts b/src/services/tips/src/utils/settings/settings.ts
index bdf4efb89..1d3a3064d 100644
--- a/src/services/tips/src/utils/settings/settings.ts
+++ b/src/services/tips/src/utils/settings/settings.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type getInitialSettings = any;
-export type getSettings_DEPRECATED = any;
-export type getSettingsForSource = any;
+export type getInitialSettings = any
+export type getSettings_DEPRECATED = any
+export type getSettingsForSource = any
diff --git a/src/services/tips/types.ts b/src/services/tips/types.ts
index 35071c25f..cc2ea2b85 100644
--- a/src/services/tips/types.ts
+++ b/src/services/tips/types.ts
@@ -1,3 +1,3 @@
 // Auto-generated stub — replace with real implementation
-export type Tip = any;
-export type TipContext = any;
+export type Tip = any
+export type TipContext = any
diff --git a/src/services/tokenEstimation.ts b/src/services/tokenEstimation.ts
index c59d53a3a..57ec7c8d0 100644
--- a/src/services/tokenEstimation.ts
+++ b/src/services/tokenEstimation.ts
@@ -308,7 +308,6 @@ export async function countTokensViaHaikuFallback(
       ? betas.filter(b => VERTEX_COUNT_TOKENS_ALLOWED_BETAS.has(b))
       : betas
 
-  // biome-ignore lint/plugin: token counting needs specialized parameters (thinking, betas) that sideQuery doesn't support
   const response = await anthropic.beta.messages.create({
     model: normalizeModelStringForAPI(model),
     max_tokens: containsThinking ? TOKEN_COUNT_MAX_TOKENS : 1,
diff --git a/src/services/toolUseSummary/toolUseSummaryGenerator.ts b/src/services/toolUseSummary/toolUseSummaryGenerator.ts
index 52c421944..cf138fbdd 100644
--- a/src/services/toolUseSummary/toolUseSummaryGenerator.ts
+++ b/src/services/toolUseSummary/toolUseSummaryGenerator.ts
@@ -80,7 +80,9 @@ export async function generateToolUseSummary({
       },
     })
 
-    const summary = (Array.isArray(response.message.content) ? response.message.content : [])
+    const summary = (
+      Array.isArray(response.message.content) ? response.message.content : []
+    )
       .filter(block => block.type === 'text')
       .map(block => (block.type === 'text' ? block.text : ''))
       .join('')
diff --git a/src/services/tools/StreamingToolExecutor.ts b/src/services/tools/StreamingToolExecutor.ts
index b924fdd91..f82ba6583 100644
--- a/src/services/tools/StreamingToolExecutor.ts
+++ b/src/services/tools/StreamingToolExecutor.ts
@@ -80,7 +80,10 @@ export class StreamingToolExecutor {
         { toolNames: [block.name], batchIndex: 0 },
       )
       if (this.turnSpan) {
-        this.toolUseContext = { ...this.toolUseContext, langfuseBatchSpan: this.turnSpan }
+        this.toolUseContext = {
+          ...this.toolUseContext,
+          langfuseBatchSpan: this.turnSpan,
+        }
       }
     }
     const toolDefinition = findToolByName(this.toolDefinitions, block.name)
diff --git a/src/services/tools/src/services/analytics/index.ts b/src/services/tools/src/services/analytics/index.ts
index 142e7b6f5..2e0f796da 100644
--- a/src/services/tools/src/services/analytics/index.ts
+++ b/src/services/tools/src/services/analytics/index.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any;
-export type logEvent = any;
+export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any
+export type logEvent = any
diff --git a/src/services/tools/src/services/analytics/metadata.ts b/src/services/tools/src/services/analytics/metadata.ts
index e702ce446..4e63821fa 100644
--- a/src/services/tools/src/services/analytics/metadata.ts
+++ b/src/services/tools/src/services/analytics/metadata.ts
@@ -1,9 +1,9 @@
 // Auto-generated type stub — replace with real implementation
-export type sanitizeToolNameForAnalytics = any;
-export type extractMcpToolDetails = any;
-export type extractSkillName = any;
-export type extractToolInputForTelemetry = any;
-export type getFileExtensionForAnalytics = any;
-export type getFileExtensionsFromBashCommand = any;
-export type isToolDetailsLoggingEnabled = any;
-export type mcpToolDetailsForAnalytics = any;
+export type sanitizeToolNameForAnalytics = any
+export type extractMcpToolDetails = any
+export type extractSkillName = any
+export type extractToolInputForTelemetry = any
+export type getFileExtensionForAnalytics = any
+export type getFileExtensionsFromBashCommand = any
+export type isToolDetailsLoggingEnabled = any
+export type mcpToolDetailsForAnalytics = any
diff --git a/src/services/tools/src/utils/messages.ts b/src/services/tools/src/utils/messages.ts
index edf1650fc..48f7d686f 100644
--- a/src/services/tools/src/utils/messages.ts
+++ b/src/services/tools/src/utils/messages.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type createUserMessage = any;
-export type REJECT_MESSAGE = any;
-export type withMemoryCorrectionHint = any;
+export type createUserMessage = any
+export type REJECT_MESSAGE = any
+export type withMemoryCorrectionHint = any
diff --git a/src/services/tools/toolHooks.ts b/src/services/tools/toolHooks.ts
index c1e6f702c..e5b84d2f8 100644
--- a/src/services/tools/toolHooks.ts
+++ b/src/services/tools/toolHooks.ts
@@ -99,7 +99,11 @@ export async function* runPostToolUseHooks<Input extends AnyObject, Output>(
             result.message.attachment!.type === 'hook_blocking_error'
           )
         ) {
-          yield { message: result.message as AttachmentMessage | ProgressMessage<HookProgress> }
+          yield {
+            message: result.message as
+              | AttachmentMessage
+              | ProgressMessage<HookProgress>,
+          }
         }
 
         if (result.blockingError) {
@@ -251,7 +255,11 @@ export async function* runPostToolUseFailureHooks<Input extends AnyObject>(
             result.message.attachment!.type === 'hook_blocking_error'
           )
         ) {
-          yield { message: result.message as AttachmentMessage | ProgressMessage<HookProgress> }
+          yield {
+            message: result.message as
+              | AttachmentMessage
+              | ProgressMessage<HookProgress>,
+          }
         }
 
         if (result.blockingError) {
@@ -476,7 +484,14 @@ export async function* runPreToolUseHooks(
     )) {
       try {
         if (result.message) {
-          yield { type: 'message', message: { message: result.message as AttachmentMessage | ProgressMessage<HookProgress> } }
+          yield {
+            type: 'message',
+            message: {
+              message: result.message as
+                | AttachmentMessage
+                | ProgressMessage<HookProgress>,
+            },
+          }
         }
         if (result.blockingError) {
           const denialMessage = getPreToolHookBlockingMessage(
diff --git a/src/services/tools/toolOrchestration.ts b/src/services/tools/toolOrchestration.ts
index 9e5d52449..0bef73c28 100644
--- a/src/services/tools/toolOrchestration.ts
+++ b/src/services/tools/toolOrchestration.ts
@@ -24,12 +24,13 @@ export async function* runTools(
   toolUseContext: ToolUseContext,
 ): AsyncGenerator<MessageUpdate, void> {
   // Wrap all tool calls in this turn under a single Langfuse turn span
-  const turnSpan = toolUseMessages.length > 0
-    ? createToolBatchSpan(toolUseContext.langfuseTrace ?? null, {
-        toolNames: toolUseMessages.map(b => b.name),
-        batchIndex: 0,
-      })
-    : null
+  const turnSpan =
+    toolUseMessages.length > 0
+      ? createToolBatchSpan(toolUseContext.langfuseTrace ?? null, {
+          toolNames: toolUseMessages.map(b => b.name),
+          batchIndex: 0,
+        })
+      : null
   const contextWithTurn = turnSpan
     ? { ...toolUseContext, langfuseBatchSpan: turnSpan }
     : toolUseContext
@@ -143,10 +144,12 @@ async function* runToolsSerially(
     )
     for await (const update of runToolUse(
       toolUse,
-      assistantMessages.find(_ =>
-        Array.isArray(_.message.content) && _.message.content.some(
-          _ => _.type === 'tool_use' && _.id === toolUse.id,
-        ),
+      assistantMessages.find(
+        _ =>
+          Array.isArray(_.message.content) &&
+          _.message.content.some(
+            _ => _.type === 'tool_use' && _.id === toolUse.id,
+          ),
       )!,
       canUseTool,
       currentContext,
@@ -176,10 +179,12 @@ async function* runToolsConcurrently(
       )
       yield* runToolUse(
         toolUse,
-        assistantMessages.find(_ =>
-          Array.isArray(_.message.content) && _.message.content.some(
-            _ => _.type === 'tool_use' && _.id === toolUse.id,
-          ),
+        assistantMessages.find(
+          _ =>
+            Array.isArray(_.message.content) &&
+            _.message.content.some(
+              _ => _.type === 'tool_use' && _.id === toolUse.id,
+            ),
         )!,
         canUseTool,
         toolUseContext,
diff --git a/src/services/vcr.ts b/src/services/vcr.ts
index 8ee060c1d..068b9e0ad 100644
--- a/src/services/vcr.ts
+++ b/src/services/vcr.ts
@@ -1,4 +1,7 @@
-import type { BetaContentBlock, BetaUsage } from '@anthropic-ai/sdk/resources/beta/messages/messages.mjs'
+import type {
+  BetaContentBlock,
+  BetaUsage,
+} from '@anthropic-ai/sdk/resources/beta/messages/messages.mjs'
 import { createHash, randomUUID, type UUID } from 'crypto'
 import { mkdir, readFile, writeFile } from 'fs/promises'
 import isPlainObject from 'lodash-es/isPlainObject.js'
diff --git a/src/setup.ts b/src/setup.ts
index 985e8577a..c256b1972 100644
--- a/src/setup.ts
+++ b/src/setup.ts
@@ -68,8 +68,7 @@ export async function setup(
 
   // Check for Node.js version < 18
   const nodeVersion = process.version.match(/^v(\d+)\./)?.[1]
-  if (!nodeVersion || parseInt(nodeVersion) < 18) {
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
+  if (!nodeVersion || parseInt(nodeVersion, 10) < 18) {
     console.error(
       chalk.bold.red(
         'Error: Claude Code requires Node.js version 18 or higher.',
@@ -117,14 +116,12 @@ export async function setup(
     if (isAgentSwarmsEnabled()) {
       const restoredIterm2Backup = await checkAndRestoreITerm2Backup()
       if (restoredIterm2Backup.status === 'restored') {
-        // biome-ignore lint/suspicious/noConsole:: intentional console output
         console.log(
           chalk.yellow(
             'Detected an interrupted iTerm2 setup. Your original settings have been restored. You may need to restart iTerm2 for the changes to take effect.',
           ),
         )
       } else if (restoredIterm2Backup.status === 'failed') {
-        // biome-ignore lint/suspicious/noConsole:: intentional console output
         console.error(
           chalk.red(
             `Failed to restore iTerm2 settings. Please manually restore your original settings with: defaults import com.googlecode.iterm2 ${restoredIterm2Backup.backupPath}.`,
@@ -137,14 +134,12 @@ export async function setup(
     try {
       const restoredTerminalBackup = await checkAndRestoreTerminalBackup()
       if (restoredTerminalBackup.status === 'restored') {
-        // biome-ignore lint/suspicious/noConsole:: intentional console output
         console.log(
           chalk.yellow(
             'Detected an interrupted Terminal.app setup. Your original settings have been restored. You may need to restart Terminal.app for the changes to take effect.',
           ),
         )
       } else if (restoredTerminalBackup.status === 'failed') {
-        // biome-ignore lint/suspicious/noConsole:: intentional console output
         console.error(
           chalk.red(
             `Failed to restore Terminal.app settings. Please manually restore your original settings with: defaults import com.apple.Terminal ${restoredTerminalBackup.backupPath}.`,
@@ -252,14 +247,12 @@ export async function setup(
         worktreeSession.worktreePath,
       )
       if (tmuxResult.created) {
-        // biome-ignore lint/suspicious/noConsole:: intentional console output
         console.log(
           chalk.green(
             `Created tmux session: ${chalk.bold(tmuxSessionName)}\nTo attach: ${chalk.bold(`tmux attach -t ${tmuxSessionName}`)}`,
           ),
         )
       } else {
-        // biome-ignore lint/suspicious/noConsole:: intentional console output
         console.error(
           chalk.yellow(
             `Warning: Failed to create tmux session: ${tmuxResult.error}`,
@@ -406,7 +399,6 @@ export async function setup(
       process.env.IS_SANDBOX !== '1' &&
       !isEnvTruthy(process.env.CLAUDE_CODE_BUBBLEWRAP)
     ) {
-      // biome-ignore lint/suspicious/noConsole:: intentional console output
       console.error(
         `--dangerously-skip-permissions cannot be used with root/sudo privileges for security reasons`,
       )
@@ -432,7 +424,6 @@ export async function setup(
       const isSandbox = process.env.IS_SANDBOX === '1'
       const isSandboxed = isDocker || isBubblewrap || isSandbox
       if (!isSandboxed || hasInternet) {
-        // biome-ignore lint/suspicious/noConsole:: intentional console output
         console.error(
           `--dangerously-skip-permissions can only be used in Docker/sandbox containers with no internet access but got Docker: ${isDocker}, Bubblewrap: ${isBubblewrap}, IS_SANDBOX: ${isSandbox}, hasInternet: ${hasInternet}`,
         )
diff --git a/src/skills/bundled/loremIpsum.ts b/src/skills/bundled/loremIpsum.ts
index 053306c6f..de4c1a023 100644
--- a/src/skills/bundled/loremIpsum.ts
+++ b/src/skills/bundled/loremIpsum.ts
@@ -243,7 +243,7 @@ export function registerLoremIpsumSkill(): void {
     argumentHint: '[token_count]',
     userInvocable: true,
     async getPromptForCommand(args) {
-      const parsed = parseInt(args)
+      const parsed = parseInt(args, 10)
 
       if (args && (isNaN(parsed) || parsed <= 0)) {
         return [
diff --git a/src/skills/bundled/src/tools/AgentTool/built-in/claudeCodeGuideAgent.ts b/src/skills/bundled/src/tools/AgentTool/built-in/claudeCodeGuideAgent.ts
index d9e0c872d..797432180 100644
--- a/src/skills/bundled/src/tools/AgentTool/built-in/claudeCodeGuideAgent.ts
+++ b/src/skills/bundled/src/tools/AgentTool/built-in/claudeCodeGuideAgent.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type CLAUDE_CODE_GUIDE_AGENT_TYPE = any;
+export type CLAUDE_CODE_GUIDE_AGENT_TYPE = any
diff --git a/src/skills/bundled/src/utils/claudeInChrome/setup.ts b/src/skills/bundled/src/utils/claudeInChrome/setup.ts
index 0f25ac9b8..e6ea53646 100644
--- a/src/skills/bundled/src/utils/claudeInChrome/setup.ts
+++ b/src/skills/bundled/src/utils/claudeInChrome/setup.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type shouldAutoEnableClaudeInChrome = any;
+export type shouldAutoEnableClaudeInChrome = any
diff --git a/src/skills/bundled/src/utils/settings/settings.ts b/src/skills/bundled/src/utils/settings/settings.ts
index c9d1262e3..9146102cb 100644
--- a/src/skills/bundled/src/utils/settings/settings.ts
+++ b/src/skills/bundled/src/utils/settings/settings.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getSettingsFilePathForSource = any;
+export type getSettingsFilePathForSource = any
diff --git a/src/ssh/SSHSessionManager.ts b/src/ssh/SSHSessionManager.ts
index 6a2faaefa..752b605aa 100644
--- a/src/ssh/SSHSessionManager.ts
+++ b/src/ssh/SSHSessionManager.ts
@@ -5,7 +5,10 @@ import type { RemoteMessageContent } from '../utils/teleport/api.js'
 
 export interface SSHSessionManagerOptions {
   onMessage: (sdkMessage: SDKMessage) => void
-  onPermissionRequest: (request: SSHPermissionRequest, requestId: string) => void
+  onPermissionRequest: (
+    request: SSHPermissionRequest,
+    requestId: string,
+  ) => void
   onConnected: () => void
   onReconnecting: (attempt: number, max: number) => void
   onDisconnected: () => void
@@ -26,5 +29,8 @@ export interface SSHSessionManager {
   disconnect(): void
   sendMessage(content: RemoteMessageContent): Promise<boolean>
   sendInterrupt(): void
-  respondToPermissionRequest(requestId: string, response: { behavior: string; message?: string; updatedInput?: unknown }): void
+  respondToPermissionRequest(
+    requestId: string,
+    response: { behavior: string; message?: string; updatedInput?: unknown },
+  ): void
 }
diff --git a/src/ssh/createSSHSession.ts b/src/ssh/createSSHSession.ts
index 1db14a1f3..7f2526cb1 100644
--- a/src/ssh/createSSHSession.ts
+++ b/src/ssh/createSSHSession.ts
@@ -1,6 +1,9 @@
 // Auto-generated stub — replace with real implementation
 import type { Subprocess } from 'bun'
-import type { SSHSessionManager, SSHSessionManagerOptions } from './SSHSessionManager.js'
+import type {
+  SSHSessionManager,
+  SSHSessionManagerOptions,
+} from './SSHSessionManager.js'
 
 export interface SSHAuthProxy {
   stop(): void
@@ -21,9 +24,14 @@ export class SSHSessionError extends Error {
   }
 }
 
-export const createSSHSession: (...args: unknown[]) => Promise<SSHSession> = (async () => {
-  throw new SSHSessionError('SSH sessions are not supported in this build')
-});
-export const createLocalSSHSession: (...args: unknown[]) => Promise<SSHSession> = (async () => {
-  throw new SSHSessionError('Local SSH sessions are not supported in this build')
-});
+export const createSSHSession: (...args: unknown[]) => Promise<SSHSession> =
+  async () => {
+    throw new SSHSessionError('SSH sessions are not supported in this build')
+  }
+export const createLocalSSHSession: (
+  ...args: unknown[]
+) => Promise<SSHSession> = async () => {
+  throw new SSHSessionError(
+    'Local SSH sessions are not supported in this build',
+  )
+}
diff --git a/src/state/AppState.tsx b/src/state/AppState.tsx
index 783170cc3..41119c108 100644
--- a/src/state/AppState.tsx
+++ b/src/state/AppState.tsx
@@ -1,35 +1,24 @@
-import { feature } from 'bun:bundle'
-import React, {
-  useContext,
-  useEffect,
-  useEffectEvent,
-  useState,
-  useSyncExternalStore,
-} from 'react'
-import { MailboxProvider } from '../context/mailbox.js'
-import { useSettingsChange } from '../hooks/useSettingsChange.js'
-import { logForDebugging } from '../utils/debug.js'
+import { feature } from 'bun:bundle';
+import React, { useContext, useEffect, useEffectEvent, useState, useSyncExternalStore } from 'react';
+import { MailboxProvider } from '../context/mailbox.js';
+import { useSettingsChange } from '../hooks/useSettingsChange.js';
+import { logForDebugging } from '../utils/debug.js';
 import {
   createDisabledBypassPermissionsContext,
   isBypassPermissionsModeDisabled,
-} from '../utils/permissions/permissionSetup.js'
-import { applySettingsChange } from '../utils/settings/applySettingsChange.js'
-import type { SettingSource } from '../utils/settings/constants.js'
-import { createStore } from './store.js'
+} from '../utils/permissions/permissionSetup.js';
+import { applySettingsChange } from '../utils/settings/applySettingsChange.js';
+import type { SettingSource } from '../utils/settings/constants.js';
+import { createStore } from './store.js';
 
 // DCE: voice context is ant-only. External builds get a passthrough.
 /* eslint-disable @typescript-eslint/no-require-imports */
-const VoiceProvider: (props: { children: React.ReactNode }) => React.ReactNode =
-  feature('VOICE_MODE')
-    ? require('../context/voice.js').VoiceProvider
-    : ({ children }) => children
+const VoiceProvider: (props: { children: React.ReactNode }) => React.ReactNode = feature('VOICE_MODE')
+  ? require('../context/voice.js').VoiceProvider
+  : ({ children }) => children;
 
 /* eslint-enable @typescript-eslint/no-require-imports */
-import {
-  type AppState,
-  type AppStateStore,
-  getDefaultAppState,
-} from './AppStateStore.js'
+import { type AppState, type AppStateStore, getDefaultAppState } from './AppStateStore.js';
 
 // TODO: Remove these re-exports once all callers import directly from
 // ./AppStateStore.js. Kept for back-compat during migration so .ts callers
@@ -42,40 +31,29 @@ export {
   IDLE_SPECULATION_STATE,
   type SpeculationResult,
   type SpeculationState,
-} from './AppStateStore.js'
+} from './AppStateStore.js';
 
-export const AppStoreContext = React.createContext<AppStateStore | null>(null)
+export const AppStoreContext = React.createContext<AppStateStore | null>(null);
 
 type Props = {
-  children: React.ReactNode
-  initialState?: AppState
-  onChangeAppState?: (args: { newState: AppState; oldState: AppState }) => void
-}
+  children: React.ReactNode;
+  initialState?: AppState;
+  onChangeAppState?: (args: { newState: AppState; oldState: AppState }) => void;
+};
 
-const HasAppStateContext = React.createContext<boolean>(false)
+const HasAppStateContext = React.createContext<boolean>(false);
 
-export function AppStateProvider({
-  children,
-  initialState,
-  onChangeAppState,
-}: Props): React.ReactNode {
+export function AppStateProvider({ children, initialState, onChangeAppState }: Props): React.ReactNode {
   // Don't allow nested AppStateProviders.
-  const hasAppStateContext = useContext(HasAppStateContext)
+  const hasAppStateContext = useContext(HasAppStateContext);
   if (hasAppStateContext) {
-    throw new Error(
-      'AppStateProvider can not be nested within another AppStateProvider',
-    )
+    throw new Error('AppStateProvider can not be nested within another AppStateProvider');
   }
 
   // Store is created once and never changes -- stable context value means
   // the provider never triggers re-renders. Consumers subscribe to slices
   // via useSyncExternalStore in useAppState(selector).
-  const [store] = useState(() =>
-    createStore<AppState>(
-      initialState ?? getDefaultAppState(),
-      onChangeAppState,
-    ),
-  )
+  const [store] = useState(() => createStore<AppState>(initialState ?? getDefaultAppState(), onChangeAppState));
 
   // Check on mount if bypass mode should be disabled
   // This handles the race condition where remote settings load BEFORE this component mounts,
@@ -83,31 +61,21 @@ export function AppStateProvider({
   // On subsequent sessions, the cached remote-settings.json is read during initial setup,
   // but on the first session the remote fetch may complete before React mounts.
   useEffect(() => {
-    const { toolPermissionContext } = store.getState()
-    if (
-      toolPermissionContext.isBypassPermissionsModeAvailable &&
-      isBypassPermissionsModeDisabled()
-    ) {
-      logForDebugging(
-        'Disabling bypass permissions mode on mount (remote settings loaded before mount)',
-      )
+    const { toolPermissionContext } = store.getState();
+    if (toolPermissionContext.isBypassPermissionsModeAvailable && isBypassPermissionsModeDisabled()) {
+      logForDebugging('Disabling bypass permissions mode on mount (remote settings loaded before mount)');
       store.setState(prev => ({
         ...prev,
-        toolPermissionContext: createDisabledBypassPermissionsContext(
-          prev.toolPermissionContext,
-        ),
-      }))
+        toolPermissionContext: createDisabledBypassPermissionsContext(prev.toolPermissionContext),
+      }));
     }
-    // biome-ignore lint/correctness/useExhaustiveDependencies: intentional mount-only effect
-  }, [])
+  }, []);
 
   // Listen for external settings changes and sync to AppState.
   // This ensures file watcher changes propagate through the app --
   // shared with the headless/SDK path via applySettingsChange.
-  const onSettingsChange = useEffectEvent((source: SettingSource) =>
-    applySettingsChange(source, store.setState),
-  )
-  useSettingsChange(onSettingsChange)
+  const onSettingsChange = useEffectEvent((source: SettingSource) => applySettingsChange(source, store.setState));
+  useSettingsChange(onSettingsChange);
 
   return (
     <HasAppStateContext.Provider value={true}>
@@ -117,18 +85,16 @@ export function AppStateProvider({
         </MailboxProvider>
       </AppStoreContext.Provider>
     </HasAppStateContext.Provider>
-  )
+  );
 }
 
 function useAppStore(): AppStateStore {
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const store = useContext(AppStoreContext)
+  const store = useContext(AppStoreContext);
   if (!store) {
-    throw new ReferenceError(
-      'useAppState/useSetAppState cannot be called outside of an <AppStateProvider />',
-    )
+    throw new ReferenceError('useAppState/useSetAppState cannot be called outside of an <AppStateProvider />');
   }
-  return store
+  return store;
 }
 
 /**
@@ -148,22 +114,22 @@ function useAppStore(): AppStateStore {
  * ```
  */
 export function useAppState<T>(selector: (state: AppState) => T): T {
-  const store = useAppStore()
+  const store = useAppStore();
 
   const get = () => {
-    const state = store.getState()
-    const selected = selector(state)
+    const state = store.getState();
+    const selected = selector(state);
 
     if (process.env.USER_TYPE === 'ant' && state === selected) {
       throw new Error(
         `Your selector in \`useAppState(${selector.toString()})\` returned the original state, which is not allowed. You must instead return a property for optimised rendering.`,
-      )
+      );
     }
 
-    return selected
-  }
+    return selected;
+  };
 
-  return useSyncExternalStore(store.subscribe, get, get)
+  return useSyncExternalStore(store.subscribe, get, get);
 }
 
 /**
@@ -171,30 +137,26 @@ export function useAppState<T>(selector: (state: AppState) => T): T {
  * Returns a stable reference that never changes -- components using only
  * this hook will never re-render from state changes.
  */
-export function useSetAppState(): (
-  updater: (prev: AppState) => AppState,
-) => void {
-  return useAppStore().setState
+export function useSetAppState(): (updater: (prev: AppState) => AppState) => void {
+  return useAppStore().setState;
 }
 
 /**
  * Get the store directly (for passing getState/setState to non-React code).
  */
 export function useAppStateStore(): AppStateStore {
-  return useAppStore()
+  return useAppStore();
 }
 
-const NOOP_SUBSCRIBE = () => () => {}
+const NOOP_SUBSCRIBE = () => () => {};
 
 /**
  * Safe version of useAppState that returns undefined if called outside of AppStateProvider.
  * Useful for components that may be rendered in contexts where AppStateProvider isn't available.
  */
-export function useAppStateMaybeOutsideOfProvider<T>(
-  selector: (state: AppState) => T,
-): T | undefined {
-  const store = useContext(AppStoreContext)
+export function useAppStateMaybeOutsideOfProvider<T>(selector: (state: AppState) => T): T | undefined {
+  const store = useContext(AppStoreContext);
   return useSyncExternalStore(store ? store.subscribe : NOOP_SUBSCRIBE, () =>
     store ? selector(store.getState()) : undefined,
-  )
+  );
 }
diff --git a/src/state/__tests__/store.test.ts b/src/state/__tests__/store.test.ts
index 31c376555..aefb7cdc5 100644
--- a/src/state/__tests__/store.test.ts
+++ b/src/state/__tests__/store.test.ts
@@ -1,112 +1,125 @@
-import { describe, expect, test } from "bun:test";
-import { createStore } from "../store";
+import { describe, expect, test } from 'bun:test'
+import { createStore } from '../store'
 
-describe("createStore", () => {
-  test("returns object with getState, setState, subscribe", () => {
-    const store = createStore({ count: 0 });
-    expect(typeof store.getState).toBe("function");
-    expect(typeof store.setState).toBe("function");
-    expect(typeof store.subscribe).toBe("function");
-  });
+describe('createStore', () => {
+  test('returns object with getState, setState, subscribe', () => {
+    const store = createStore({ count: 0 })
+    expect(typeof store.getState).toBe('function')
+    expect(typeof store.setState).toBe('function')
+    expect(typeof store.subscribe).toBe('function')
+  })
 
-  test("getState returns initial state", () => {
-    const store = createStore({ count: 0, name: "test" });
-    expect(store.getState()).toEqual({ count: 0, name: "test" });
-  });
+  test('getState returns initial state', () => {
+    const store = createStore({ count: 0, name: 'test' })
+    expect(store.getState()).toEqual({ count: 0, name: 'test' })
+  })
 
-  test("setState updates state via updater function", () => {
-    const store = createStore({ count: 0 });
-    store.setState(prev => ({ count: prev.count + 1 }));
-    expect(store.getState().count).toBe(1);
-  });
+  test('setState updates state via updater function', () => {
+    const store = createStore({ count: 0 })
+    store.setState(prev => ({ count: prev.count + 1 }))
+    expect(store.getState().count).toBe(1)
+  })
 
-  test("setState does not notify when state unchanged (Object.is)", () => {
-    const store = createStore({ count: 0 });
-    let notified = false;
-    store.subscribe(() => { notified = true; });
-    store.setState(prev => prev);
-    expect(notified).toBe(false);
-  });
+  test('setState does not notify when state unchanged (Object.is)', () => {
+    const store = createStore({ count: 0 })
+    let notified = false
+    store.subscribe(() => {
+      notified = true
+    })
+    store.setState(prev => prev)
+    expect(notified).toBe(false)
+  })
 
-  test("setState notifies subscribers on change", () => {
-    const store = createStore({ count: 0 });
-    let notified = false;
-    store.subscribe(() => { notified = true; });
-    store.setState(prev => ({ count: prev.count + 1 }));
-    expect(notified).toBe(true);
-  });
+  test('setState notifies subscribers on change', () => {
+    const store = createStore({ count: 0 })
+    let notified = false
+    store.subscribe(() => {
+      notified = true
+    })
+    store.setState(prev => ({ count: prev.count + 1 }))
+    expect(notified).toBe(true)
+  })
 
-  test("subscribe returns unsubscribe function", () => {
-    const store = createStore({ count: 0 });
-    const unsub = store.subscribe(() => {});
-    expect(typeof unsub).toBe("function");
-  });
+  test('subscribe returns unsubscribe function', () => {
+    const store = createStore({ count: 0 })
+    const unsub = store.subscribe(() => {})
+    expect(typeof unsub).toBe('function')
+  })
 
-  test("unsubscribe stops notifications", () => {
-    const store = createStore({ count: 0 });
-    let count = 0;
-    const unsub = store.subscribe(() => { count++; });
-    store.setState(prev => ({ count: prev.count + 1 }));
-    unsub();
-    store.setState(prev => ({ count: prev.count + 1 }));
-    expect(count).toBe(1);
-  });
+  test('unsubscribe stops notifications', () => {
+    const store = createStore({ count: 0 })
+    let count = 0
+    const unsub = store.subscribe(() => {
+      count++
+    })
+    store.setState(prev => ({ count: prev.count + 1 }))
+    unsub()
+    store.setState(prev => ({ count: prev.count + 1 }))
+    expect(count).toBe(1)
+  })
 
-  test("multiple subscribers all get notified", () => {
-    const store = createStore({ count: 0 });
-    let a = 0, b = 0;
-    store.subscribe(() => { a++; });
-    store.subscribe(() => { b++; });
-    store.setState(prev => ({ count: prev.count + 1 }));
-    expect(a).toBe(1);
-    expect(b).toBe(1);
-  });
+  test('multiple subscribers all get notified', () => {
+    const store = createStore({ count: 0 })
+    let a = 0,
+      b = 0
+    store.subscribe(() => {
+      a++
+    })
+    store.subscribe(() => {
+      b++
+    })
+    store.setState(prev => ({ count: prev.count + 1 }))
+    expect(a).toBe(1)
+    expect(b).toBe(1)
+  })
 
-  test("onChange callback is called on state change", () => {
-    let captured: any = null;
+  test('onChange callback is called on state change', () => {
+    let captured: any = null
     const store = createStore({ count: 0 }, ({ newState, oldState }) => {
-      captured = { newState, oldState };
-    });
-    store.setState(prev => ({ count: prev.count + 5 }));
-    expect(captured).not.toBeNull();
-    expect(captured.oldState.count).toBe(0);
-    expect(captured.newState.count).toBe(5);
-  });
+      captured = { newState, oldState }
+    })
+    store.setState(prev => ({ count: prev.count + 5 }))
+    expect(captured).not.toBeNull()
+    expect(captured.oldState.count).toBe(0)
+    expect(captured.newState.count).toBe(5)
+  })
 
-  test("onChange is not called when state unchanged", () => {
-    let called = false;
-    const store = createStore({ count: 0 }, () => { called = true; });
-    store.setState(prev => prev);
-    expect(called).toBe(false);
-  });
+  test('onChange is not called when state unchanged', () => {
+    let called = false
+    const store = createStore({ count: 0 }, () => {
+      called = true
+    })
+    store.setState(prev => prev)
+    expect(called).toBe(false)
+  })
 
-  test("works with complex state objects", () => {
-    const store = createStore({ items: [] as number[], name: "test" });
-    store.setState(prev => ({ ...prev, items: [1, 2, 3] }));
-    expect(store.getState().items).toEqual([1, 2, 3]);
-    expect(store.getState().name).toBe("test");
-  });
+  test('works with complex state objects', () => {
+    const store = createStore({ items: [] as number[], name: 'test' })
+    store.setState(prev => ({ ...prev, items: [1, 2, 3] }))
+    expect(store.getState().items).toEqual([1, 2, 3])
+    expect(store.getState().name).toBe('test')
+  })
 
-  test("works with primitive state", () => {
-    const store = createStore(0);
-    store.setState(() => 42);
-    expect(store.getState()).toBe(42);
-  });
+  test('works with primitive state', () => {
+    const store = createStore(0)
+    store.setState(() => 42)
+    expect(store.getState()).toBe(42)
+  })
 
-  test("updater receives previous state", () => {
-    const store = createStore({ value: 10 });
+  test('updater receives previous state', () => {
+    const store = createStore({ value: 10 })
     store.setState(prev => {
-      expect(prev.value).toBe(10);
-      return { value: prev.value * 2 };
-    });
-    expect(store.getState().value).toBe(20);
-  });
+      expect(prev.value).toBe(10)
+      return { value: prev.value * 2 }
+    })
+    expect(store.getState().value).toBe(20)
+  })
 
-  test("sequential setState calls produce final state", () => {
-    const store = createStore({ count: 0 });
-    store.setState(prev => ({ count: prev.count + 1 }));
-    store.setState(prev => ({ count: prev.count + 1 }));
-    store.setState(prev => ({ count: prev.count + 1 }));
-    expect(store.getState().count).toBe(3);
-  });
-});
+  test('sequential setState calls produce final state', () => {
+    const store = createStore({ count: 0 })
+    store.setState(prev => ({ count: prev.count + 1 }))
+    store.setState(prev => ({ count: prev.count + 1 }))
+    store.setState(prev => ({ count: prev.count + 1 }))
+    expect(store.getState().count).toBe(3)
+  })
+})
diff --git a/src/state/src/context/notifications.ts b/src/state/src/context/notifications.ts
index c212e68b7..22164fdb3 100644
--- a/src/state/src/context/notifications.ts
+++ b/src/state/src/context/notifications.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type Notification = any;
+export type Notification = any
diff --git a/src/state/src/utils/todo/types.ts b/src/state/src/utils/todo/types.ts
index 273f5ec20..36cd96132 100644
--- a/src/state/src/utils/todo/types.ts
+++ b/src/state/src/utils/todo/types.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type TodoList = any;
+export type TodoList = any
diff --git a/src/tasks/LocalAgentTask/LocalAgentTask.tsx b/src/tasks/LocalAgentTask/LocalAgentTask.tsx
index 3b65cfb82..f458d0b5a 100644
--- a/src/tasks/LocalAgentTask/LocalAgentTask.tsx
+++ b/src/tasks/LocalAgentTask/LocalAgentTask.tsx
@@ -1,5 +1,5 @@
-import type { BetaUsage } from '@anthropic-ai/sdk/resources/beta/messages/messages.mjs'
-import { getSdkAgentProgressSummariesEnabled } from '../../bootstrap/state.js'
+import type { BetaUsage } from '@anthropic-ai/sdk/resources/beta/messages/messages.mjs';
+import { getSdkAgentProgressSummariesEnabled } from '../../bootstrap/state.js';
 import {
   OUTPUT_FILE_TAG,
   STATUS_TAG,
@@ -10,69 +10,58 @@ import {
   WORKTREE_BRANCH_TAG,
   WORKTREE_PATH_TAG,
   WORKTREE_TAG,
-} from '../../constants/xml.js'
-import { abortSpeculation } from '../../services/PromptSuggestion/speculation.js'
-import type { AppState } from '../../state/AppState.js'
-import type { SetAppState, Task, TaskStateBase } from '../../Task.js'
-import { createTaskStateBase } from '../../Task.js'
-import type { Tools } from '../../Tool.js'
-import { findToolByName } from '../../Tool.js'
-import type { AgentToolResult } from '@claude-code-best/builtin-tools/tools/AgentTool/agentToolUtils.js'
-import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
-import { SYNTHETIC_OUTPUT_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/SyntheticOutputTool/SyntheticOutputTool.js'
-import { asAgentId } from '../../types/ids.js'
-import type { Message } from '../../types/message.js'
-import {
-  createAbortController,
-  createChildAbortController,
-} from '../../utils/abortController.js'
-import { registerCleanup } from '../../utils/cleanupRegistry.js'
-import { getToolSearchOrReadInfo } from '../../utils/collapseReadSearch.js'
-import { enqueuePendingNotification } from '../../utils/messageQueueManager.js'
-import { getAgentTranscriptPath } from '../../utils/sessionStorage.js'
-import {
-  evictTaskOutput,
-  getTaskOutputPath,
-  initTaskOutputAsSymlink,
-} from '../../utils/task/diskOutput.js'
-import {
-  PANEL_GRACE_MS,
-  registerTask,
-  updateTaskState,
-} from '../../utils/task/framework.js'
-import { emitTaskProgress } from '../../utils/task/sdkProgress.js'
-import type { TaskState } from '../types.js'
+} from '../../constants/xml.js';
+import { abortSpeculation } from '../../services/PromptSuggestion/speculation.js';
+import type { AppState } from '../../state/AppState.js';
+import type { SetAppState, Task, TaskStateBase } from '../../Task.js';
+import { createTaskStateBase } from '../../Task.js';
+import type { Tools } from '../../Tool.js';
+import { findToolByName } from '../../Tool.js';
+import type { AgentToolResult } from '@claude-code-best/builtin-tools/tools/AgentTool/agentToolUtils.js';
+import type { AgentDefinition } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js';
+import { SYNTHETIC_OUTPUT_TOOL_NAME } from '@claude-code-best/builtin-tools/tools/SyntheticOutputTool/SyntheticOutputTool.js';
+import { asAgentId } from '../../types/ids.js';
+import type { Message } from '../../types/message.js';
+import { createAbortController, createChildAbortController } from '../../utils/abortController.js';
+import { registerCleanup } from '../../utils/cleanupRegistry.js';
+import { getToolSearchOrReadInfo } from '../../utils/collapseReadSearch.js';
+import { enqueuePendingNotification } from '../../utils/messageQueueManager.js';
+import { getAgentTranscriptPath } from '../../utils/sessionStorage.js';
+import { evictTaskOutput, getTaskOutputPath, initTaskOutputAsSymlink } from '../../utils/task/diskOutput.js';
+import { PANEL_GRACE_MS, registerTask, updateTaskState } from '../../utils/task/framework.js';
+import { emitTaskProgress } from '../../utils/task/sdkProgress.js';
+import type { TaskState } from '../types.js';
 
 export type ToolActivity = {
-  toolName: string
-  input: Record<string, unknown>
+  toolName: string;
+  input: Record<string, unknown>;
   /** Pre-computed activity description from the tool, e.g. "Reading src/foo.ts" */
-  activityDescription?: string
+  activityDescription?: string;
   /** Pre-computed: true if this is a search operation (Grep, Glob, etc.) */
-  isSearch?: boolean
+  isSearch?: boolean;
   /** Pre-computed: true if this is a read operation (Read, cat, etc.) */
-  isRead?: boolean
-}
+  isRead?: boolean;
+};
 
 export type AgentProgress = {
-  toolUseCount: number
-  tokenCount: number
-  lastActivity?: ToolActivity
-  recentActivities?: ToolActivity[]
-  summary?: string
-}
+  toolUseCount: number;
+  tokenCount: number;
+  lastActivity?: ToolActivity;
+  recentActivities?: ToolActivity[];
+  summary?: string;
+};
 
-const MAX_RECENT_ACTIVITIES = 5
+const MAX_RECENT_ACTIVITIES = 5;
 
 export type ProgressTracker = {
-  toolUseCount: number
+  toolUseCount: number;
   // Track input and output separately to avoid double-counting.
   // input_tokens in Claude API is cumulative per turn (includes all previous context),
   // so we keep the latest value. output_tokens is per-turn, so we sum those.
-  latestInputTokens: number
-  cumulativeOutputTokens: number
-  recentActivities: ToolActivity[]
-}
+  latestInputTokens: number;
+  cumulativeOutputTokens: number;
+  recentActivities: ToolActivity[];
+};
 
 export function createProgressTracker(): ProgressTracker {
   return {
@@ -80,11 +69,11 @@ export function createProgressTracker(): ProgressTracker {
     latestInputTokens: 0,
     cumulativeOutputTokens: 0,
     recentActivities: [],
-  }
+  };
 }
 
 export function getTokenCountFromTracker(tracker: ProgressTracker): number {
-  return tracker.latestInputTokens + tracker.cumulativeOutputTokens
+  return tracker.latestInputTokens + tracker.cumulativeOutputTokens;
 }
 
 /**
@@ -92,10 +81,7 @@ export function getTokenCountFromTracker(tracker: ProgressTracker): number {
  * for a given tool name and input. Used to pre-compute descriptions
  * from Tool.getActivityDescription() at recording time.
  */
-export type ActivityDescriptionResolver = (
-  toolName: string,
-  input: Record<string, unknown>,
-) => string | undefined
+export type ActivityDescriptionResolver = (toolName: string, input: Record<string, unknown>) => string | undefined;
 
 export function updateProgressFromMessage(
   tracker: ProgressTracker,
@@ -104,39 +90,32 @@ export function updateProgressFromMessage(
   tools?: Tools,
 ): void {
   if (message.type !== 'assistant') {
-    return
+    return;
   }
-  const usage = message.message!.usage as BetaUsage
+  const usage = message.message!.usage as BetaUsage;
   // Keep latest input (it's cumulative in the API), sum outputs
   tracker.latestInputTokens =
-    (usage.input_tokens as number) +
-    (usage.cache_creation_input_tokens ?? 0) +
-    (usage.cache_read_input_tokens ?? 0)
-  tracker.cumulativeOutputTokens += usage.output_tokens as number
+    (usage.input_tokens as number) + (usage.cache_creation_input_tokens ?? 0) + (usage.cache_read_input_tokens ?? 0);
+  tracker.cumulativeOutputTokens += usage.output_tokens as number;
   for (const content of (message.message!.content ?? []) as Array<{ type: string; name?: string; input?: unknown }>) {
     if (content.type === 'tool_use') {
-      tracker.toolUseCount++
+      tracker.toolUseCount++;
       // Omit StructuredOutput from preview - it's an internal tool
       if (content.name !== SYNTHETIC_OUTPUT_TOOL_NAME) {
-        const input = content.input as Record<string, unknown>
-        const classification = tools
-          ? getToolSearchOrReadInfo(content.name!, input, tools)
-          : undefined
+        const input = content.input as Record<string, unknown>;
+        const classification = tools ? getToolSearchOrReadInfo(content.name!, input, tools) : undefined;
         tracker.recentActivities.push({
           toolName: content.name!,
           input,
-          activityDescription: resolveActivityDescription?.(
-            content.name!,
-            input,
-          ),
+          activityDescription: resolveActivityDescription?.(content.name!, input),
           isSearch: classification?.isSearch,
           isRead: classification?.isRead,
-        })
+        });
       }
     }
   }
   while (tracker.recentActivities.length > MAX_RECENT_ACTIVITIES) {
-    tracker.recentActivities.shift()
+    tracker.recentActivities.shift();
   }
 }
 
@@ -145,67 +124,58 @@ export function getProgressUpdate(tracker: ProgressTracker): AgentProgress {
     toolUseCount: tracker.toolUseCount,
     tokenCount: getTokenCountFromTracker(tracker),
     lastActivity:
-      tracker.recentActivities.length > 0
-        ? tracker.recentActivities[tracker.recentActivities.length - 1]
-        : undefined,
+      tracker.recentActivities.length > 0 ? tracker.recentActivities[tracker.recentActivities.length - 1] : undefined,
     recentActivities: [...tracker.recentActivities],
-  }
+  };
 }
 
 /**
  * Creates an ActivityDescriptionResolver from a tools list.
  * Looks up the tool by name and calls getActivityDescription if available.
  */
-export function createActivityDescriptionResolver(
-  tools: Tools,
-): ActivityDescriptionResolver {
+export function createActivityDescriptionResolver(tools: Tools): ActivityDescriptionResolver {
   return (toolName, input) => {
-    const tool = findToolByName(tools, toolName)
-    return tool?.getActivityDescription?.(input) ?? undefined
-  }
+    const tool = findToolByName(tools, toolName);
+    return tool?.getActivityDescription?.(input) ?? undefined;
+  };
 }
 
 export type LocalAgentTaskState = TaskStateBase & {
-  type: 'local_agent'
-  agentId: string
-  prompt: string
-  selectedAgent?: AgentDefinition
-  agentType: string
-  model?: string
-  abortController?: AbortController
-  unregisterCleanup?: () => void
-  error?: string
-  result?: AgentToolResult
-  progress?: AgentProgress
-  retrieved: boolean
-  messages?: Message[]
+  type: 'local_agent';
+  agentId: string;
+  prompt: string;
+  selectedAgent?: AgentDefinition;
+  agentType: string;
+  model?: string;
+  abortController?: AbortController;
+  unregisterCleanup?: () => void;
+  error?: string;
+  result?: AgentToolResult;
+  progress?: AgentProgress;
+  retrieved: boolean;
+  messages?: Message[];
   // Track what we last reported for computing deltas
-  lastReportedToolCount: number
-  lastReportedTokenCount: number
+  lastReportedToolCount: number;
+  lastReportedTokenCount: number;
   // Whether the task has been backgrounded (false = foreground running, true = backgrounded)
-  isBackgrounded: boolean
+  isBackgrounded: boolean;
   // Messages queued mid-turn via SendMessage, drained at tool-round boundaries
-  pendingMessages: string[]
+  pendingMessages: string[];
   // UI is holding this task: blocks eviction, enables stream-append, triggers
   // disk bootstrap. Set by enterTeammateView. Separate from viewingAgentTaskId
   // (which is "what am I LOOKING at") — retain is "what am I HOLDING."
-  retain: boolean
+  retain: boolean;
   // Bootstrap has read the sidechain JSONL and UUID-merged into messages.
   // One-shot per retain cycle; stream appends from there.
-  diskLoaded: boolean
+  diskLoaded: boolean;
   // Panel visibility deadline. undefined = no deadline (running or retained);
   // timestamp = hide + GC-eligible after this time. Set at terminal transition
   // and on unselect; cleared on retain.
-  evictAfter?: number
-}
+  evictAfter?: number;
+};
 
 export function isLocalAgentTask(task: unknown): task is LocalAgentTaskState {
-  return (
-    typeof task === 'object' &&
-    task !== null &&
-    'type' in task &&
-    task.type === 'local_agent'
-  )
+  return typeof task === 'object' && task !== null && 'type' in task && task.type === 'local_agent';
 }
 
 /**
@@ -215,7 +185,7 @@ export function isLocalAgentTask(task: unknown): task is LocalAgentTaskState {
  * the gate changes, change it here.
  */
 export function isPanelAgentTask(t: unknown): t is LocalAgentTaskState {
-  return isLocalAgentTask(t) && t.agentType !== 'main-session'
+  return isLocalAgentTask(t) && t.agentType !== 'main-session';
 }
 
 export function queuePendingMessage(
@@ -226,7 +196,7 @@ export function queuePendingMessage(
   updateTaskState<LocalAgentTaskState>(taskId, setAppState, task => ({
     ...task,
     pendingMessages: [...task.pendingMessages, msg],
-  }))
+  }));
 }
 
 /**
@@ -243,7 +213,7 @@ export function appendMessageToLocalAgent(
   updateTaskState<LocalAgentTaskState>(taskId, setAppState, task => ({
     ...task,
     messages: [...(task.messages ?? []), message],
-  }))
+  }));
 }
 
 export function drainPendingMessages(
@@ -251,16 +221,16 @@ export function drainPendingMessages(
   getAppState: () => AppState,
   setAppState: (f: (prev: AppState) => AppState) => void,
 ): string[] {
-  const task = getAppState().tasks[taskId]
+  const task = getAppState().tasks[taskId];
   if (!isLocalAgentTask(task) || task.pendingMessages.length === 0) {
-    return []
+    return [];
   }
-  const drained = task.pendingMessages
+  const drained = task.pendingMessages;
   updateTaskState<LocalAgentTaskState>(taskId, setAppState, t => ({
     ...t,
     pendingMessages: [],
-  }))
-  return drained
+  }));
+  return drained;
 }
 
 /**
@@ -278,72 +248,70 @@ export function enqueueAgentNotification({
   worktreePath,
   worktreeBranch,
 }: {
-  taskId: string
-  description: string
-  status: 'completed' | 'failed' | 'killed'
-  error?: string
-  setAppState: SetAppState
-  finalMessage?: string
+  taskId: string;
+  description: string;
+  status: 'completed' | 'failed' | 'killed';
+  error?: string;
+  setAppState: SetAppState;
+  finalMessage?: string;
   usage?: {
-    totalTokens: number
-    toolUses: number
-    durationMs: number
-  }
-  toolUseId?: string
-  worktreePath?: string
-  worktreeBranch?: string
+    totalTokens: number;
+    toolUses: number;
+    durationMs: number;
+  };
+  toolUseId?: string;
+  worktreePath?: string;
+  worktreeBranch?: string;
 }): void {
   // Atomically check and set notified flag to prevent duplicate notifications.
   // If the task was already marked as notified (e.g., by TaskStopTool), skip
   // enqueueing to avoid sending redundant messages to the model.
-  let shouldEnqueue = false
+  let shouldEnqueue = false;
   updateTaskState<LocalAgentTaskState>(taskId, setAppState, task => {
     if (task.notified) {
-      return task
+      return task;
     }
-    shouldEnqueue = true
+    shouldEnqueue = true;
     return {
       ...task,
       notified: true,
-    }
-  })
+    };
+  });
 
   if (!shouldEnqueue) {
-    return
+    return;
   }
 
   // Abort any active speculation — background task state changed, so speculated
   // results may reference stale task output. The prompt suggestion text is
   // preserved; only the pre-computed response is discarded.
-  abortSpeculation(setAppState)
+  abortSpeculation(setAppState);
 
   const summary =
     status === 'completed'
       ? `Agent "${description}" completed`
       : status === 'failed'
         ? `Agent "${description}" failed: ${error || 'Unknown error'}`
-        : `Agent "${description}" was stopped`
+        : `Agent "${description}" was stopped`;
 
-  const outputPath = getTaskOutputPath(taskId)
-  const toolUseIdLine = toolUseId
-    ? `\n<${TOOL_USE_ID_TAG}>${toolUseId}</${TOOL_USE_ID_TAG}>`
-    : ''
-  const resultSection = finalMessage ? `\n<result>${finalMessage}</result>` : ''
+  const outputPath = getTaskOutputPath(taskId);
+  const toolUseIdLine = toolUseId ? `\n<${TOOL_USE_ID_TAG}>${toolUseId}</${TOOL_USE_ID_TAG}>` : '';
+  const resultSection = finalMessage ? `\n<result>${finalMessage}</result>` : '';
   const usageSection = usage
     ? `\n<usage><total_tokens>${usage.totalTokens}</total_tokens><tool_uses>${usage.toolUses}</tool_uses><duration_ms>${usage.durationMs}</duration_ms></usage>`
-    : ''
+    : '';
   const worktreeSection = worktreePath
     ? `\n<${WORKTREE_TAG}><${WORKTREE_PATH_TAG}>${worktreePath}</${WORKTREE_PATH_TAG}>${worktreeBranch ? `<${WORKTREE_BRANCH_TAG}>${worktreeBranch}</${WORKTREE_BRANCH_TAG}>` : ''}</${WORKTREE_TAG}>`
-    : ''
+    : '';
 
   const message = `<${TASK_NOTIFICATION_TAG}>
 <${TASK_ID_TAG}>${taskId}</${TASK_ID_TAG}>${toolUseIdLine}
 <${OUTPUT_FILE_TAG}>${outputPath}</${OUTPUT_FILE_TAG}>
 <${STATUS_TAG}>${status}</${STATUS_TAG}>
 <${SUMMARY_TAG}>${summary}</${SUMMARY_TAG}>${resultSection}${usageSection}${worktreeSection}
-</${TASK_NOTIFICATION_TAG}>`
+</${TASK_NOTIFICATION_TAG}>`;
 
-  enqueuePendingNotification({ value: message, mode: 'task-notification' })
+  enqueuePendingNotification({ value: message, mode: 'task-notification' });
 }
 
 /**
@@ -357,22 +325,22 @@ export const LocalAgentTask: Task = {
   type: 'local_agent',
 
   async kill(taskId, setAppState) {
-    killAsyncAgent(taskId, setAppState)
+    killAsyncAgent(taskId, setAppState);
   },
-}
+};
 
 /**
  * Kill an agent task. No-op if already killed/completed.
  */
 export function killAsyncAgent(taskId: string, setAppState: SetAppState): void {
-  let killed = false
+  let killed = false;
   updateTaskState<LocalAgentTaskState>(taskId, setAppState, task => {
     if (task.status !== 'running') {
-      return task
+      return task;
     }
-    killed = true
-    task.abortController?.abort()
-    task.unregisterCleanup?.()
+    killed = true;
+    task.abortController?.abort();
+    task.unregisterCleanup?.();
     return {
       ...task,
       status: 'killed',
@@ -381,10 +349,10 @@ export function killAsyncAgent(taskId: string, setAppState: SetAppState): void {
       abortController: undefined,
       unregisterCleanup: undefined,
       selectedAgent: undefined,
-    }
-  })
+    };
+  });
   if (killed) {
-    void evictTaskOutput(taskId)
+    void evictTaskOutput(taskId);
   }
 }
 
@@ -392,13 +360,10 @@ export function killAsyncAgent(taskId: string, setAppState: SetAppState): void {
  * Kill all running agent tasks.
  * Used by ESC cancellation in coordinator mode to stop all subagents.
  */
-export function killAllRunningAgentTasks(
-  tasks: Record<string, TaskState>,
-  setAppState: SetAppState,
-): void {
+export function killAllRunningAgentTasks(tasks: Record<string, TaskState>, setAppState: SetAppState): void {
   for (const [taskId, task] of Object.entries(tasks)) {
     if (task.type === 'local_agent' && task.status === 'running') {
-      killAsyncAgent(taskId, setAppState)
+      killAsyncAgent(taskId, setAppState);
     }
   }
 }
@@ -408,19 +373,16 @@ export function killAllRunningAgentTasks(
  * Used by chat:killAgents bulk kill to suppress per-agent async notifications
  * when a single aggregate message is sent instead.
  */
-export function markAgentsNotified(
-  taskId: string,
-  setAppState: SetAppState,
-): void {
+export function markAgentsNotified(taskId: string, setAppState: SetAppState): void {
   updateTaskState<LocalAgentTaskState>(taskId, setAppState, task => {
     if (task.notified) {
-      return task
+      return task;
     }
     return {
       ...task,
       notified: true,
-    }
-  })
+    };
+  });
 }
 
 /**
@@ -428,45 +390,35 @@ export function markAgentsNotified(
  * Preserves the existing summary field so that background summarization
  * results are not clobbered by progress updates from assistant messages.
  */
-export function updateAgentProgress(
-  taskId: string,
-  progress: AgentProgress,
-  setAppState: SetAppState,
-): void {
+export function updateAgentProgress(taskId: string, progress: AgentProgress, setAppState: SetAppState): void {
   updateTaskState<LocalAgentTaskState>(taskId, setAppState, task => {
     if (task.status !== 'running') {
-      return task
+      return task;
     }
 
-    const existingSummary = task.progress?.summary
+    const existingSummary = task.progress?.summary;
     return {
       ...task,
-      progress: existingSummary
-        ? { ...progress, summary: existingSummary }
-        : progress,
-    }
-  })
+      progress: existingSummary ? { ...progress, summary: existingSummary } : progress,
+    };
+  });
 }
 
 /**
  * Update the background summary for an agent task.
  * Called by the periodic summarization service to store a 1-2 sentence progress summary.
  */
-export function updateAgentSummary(
-  taskId: string,
-  summary: string,
-  setAppState: SetAppState,
-): void {
+export function updateAgentSummary(taskId: string, summary: string, setAppState: SetAppState): void {
   let captured: {
-    tokenCount: number
-    toolUseCount: number
-    startTime: number
-    toolUseId: string | undefined
-  } | null = null
+    tokenCount: number;
+    toolUseCount: number;
+    startTime: number;
+    toolUseId: string | undefined;
+  } | null = null;
 
   updateTaskState<LocalAgentTaskState>(taskId, setAppState, task => {
     if (task.status !== 'running') {
-      return task
+      return task;
     }
 
     captured = {
@@ -474,7 +426,7 @@ export function updateAgentSummary(
       toolUseCount: task.progress?.toolUseCount ?? 0,
       startTime: task.startTime,
       toolUseId: task.toolUseId,
-    }
+    };
 
     return {
       ...task,
@@ -484,14 +436,14 @@ export function updateAgentSummary(
         tokenCount: task.progress?.tokenCount ?? 0,
         summary,
       },
-    }
-  })
+    };
+  });
 
   // Emit summary to SDK consumers (e.g. VS Code subagent panel). No-op in TUI.
   // Gate on the SDK option so coordinator-mode sessions without the flag don't
   // leak summary events to consumers who didn't opt in.
   if (captured && getSdkAgentProgressSummariesEnabled()) {
-    const { tokenCount, toolUseCount, startTime, toolUseId } = captured
+    const { tokenCount, toolUseCount, startTime, toolUseId } = captured;
     emitTaskProgress({
       taskId,
       toolUseId,
@@ -500,24 +452,21 @@ export function updateAgentSummary(
       totalTokens: tokenCount,
       toolUses: toolUseCount,
       summary,
-    })
+    });
   }
 }
 
 /**
  * Complete an agent task with result.
  */
-export function completeAgentTask(
-  result: AgentToolResult,
-  setAppState: SetAppState,
-): void {
-  const taskId = result.agentId
+export function completeAgentTask(result: AgentToolResult, setAppState: SetAppState): void {
+  const taskId = result.agentId;
   updateTaskState<LocalAgentTaskState>(taskId, setAppState, task => {
     if (task.status !== 'running') {
-      return task
+      return task;
     }
 
-    task.unregisterCleanup?.()
+    task.unregisterCleanup?.();
 
     return {
       ...task,
@@ -528,26 +477,22 @@ export function completeAgentTask(
       abortController: undefined,
       unregisterCleanup: undefined,
       selectedAgent: undefined,
-    }
-  })
-  void evictTaskOutput(taskId)
+    };
+  });
+  void evictTaskOutput(taskId);
   // Note: Notification is sent by AgentTool via enqueueAgentNotification
 }
 
 /**
  * Fail an agent task with error.
  */
-export function failAgentTask(
-  taskId: string,
-  error: string,
-  setAppState: SetAppState,
-): void {
+export function failAgentTask(taskId: string, error: string, setAppState: SetAppState): void {
   updateTaskState<LocalAgentTaskState>(taskId, setAppState, task => {
     if (task.status !== 'running') {
-      return task
+      return task;
     }
 
-    task.unregisterCleanup?.()
+    task.unregisterCleanup?.();
 
     return {
       ...task,
@@ -558,9 +503,9 @@ export function failAgentTask(
       abortController: undefined,
       unregisterCleanup: undefined,
       selectedAgent: undefined,
-    }
-  })
-  void evictTaskOutput(taskId)
+    };
+  });
+  void evictTaskOutput(taskId);
   // Note: Notification is sent by AgentTool via enqueueAgentNotification
 }
 
@@ -581,23 +526,20 @@ export function registerAsyncAgent({
   parentAbortController,
   toolUseId,
 }: {
-  agentId: string
-  description: string
-  prompt: string
-  selectedAgent: AgentDefinition
-  setAppState: SetAppState
-  parentAbortController?: AbortController
-  toolUseId?: string
+  agentId: string;
+  description: string;
+  prompt: string;
+  selectedAgent: AgentDefinition;
+  setAppState: SetAppState;
+  parentAbortController?: AbortController;
+  toolUseId?: string;
 }): LocalAgentTaskState {
-  void initTaskOutputAsSymlink(
-    agentId,
-    getAgentTranscriptPath(asAgentId(agentId)),
-  )
+  void initTaskOutputAsSymlink(agentId, getAgentTranscriptPath(asAgentId(agentId)));
 
   // Create abort controller - if parent provided, create child that auto-aborts with parent
   const abortController = parentAbortController
     ? createChildAbortController(parentAbortController)
-    : createAbortController()
+    : createAbortController();
 
   const taskState: LocalAgentTaskState = {
     ...createTaskStateBase(agentId, 'local_agent', description, toolUseId),
@@ -615,24 +557,24 @@ export function registerAsyncAgent({
     pendingMessages: [],
     retain: false,
     diskLoaded: false,
-  }
+  };
 
   // Register cleanup handler
   const unregisterCleanup = registerCleanup(async () => {
-    killAsyncAgent(agentId, setAppState)
-  })
+    killAsyncAgent(agentId, setAppState);
+  });
 
-  taskState.unregisterCleanup = unregisterCleanup
+  taskState.unregisterCleanup = unregisterCleanup;
 
   // Register task in AppState
-  registerTask(taskState, setAppState)
+  registerTask(taskState, setAppState);
 
-  return taskState
+  return taskState;
 }
 
 // Map of taskId -> resolve function for background signals
 // When backgroundAgentTask is called, it resolves the corresponding promise
-const backgroundSignalResolvers = new Map<string, () => void>()
+const backgroundSignalResolvers = new Map<string, () => void>();
 
 /**
  * Register a foreground agent task that could be backgrounded later.
@@ -648,28 +590,25 @@ export function registerAgentForeground({
   autoBackgroundMs,
   toolUseId,
 }: {
-  agentId: string
-  description: string
-  prompt: string
-  selectedAgent: AgentDefinition
-  setAppState: SetAppState
-  autoBackgroundMs?: number
-  toolUseId?: string
+  agentId: string;
+  description: string;
+  prompt: string;
+  selectedAgent: AgentDefinition;
+  setAppState: SetAppState;
+  autoBackgroundMs?: number;
+  toolUseId?: string;
 }): {
-  taskId: string
-  backgroundSignal: Promise<void>
-  cancelAutoBackground?: () => void
+  taskId: string;
+  backgroundSignal: Promise<void>;
+  cancelAutoBackground?: () => void;
 } {
-  void initTaskOutputAsSymlink(
-    agentId,
-    getAgentTranscriptPath(asAgentId(agentId)),
-  )
+  void initTaskOutputAsSymlink(agentId, getAgentTranscriptPath(asAgentId(agentId)));
 
-  const abortController = createAbortController()
+  const abortController = createAbortController();
 
   const unregisterCleanup = registerCleanup(async () => {
-    killAsyncAgent(agentId, setAppState)
-  })
+    killAsyncAgent(agentId, setAppState);
+  });
 
   const taskState: LocalAgentTaskState = {
     ...createTaskStateBase(agentId, 'local_agent', description, toolUseId),
@@ -688,27 +627,27 @@ export function registerAgentForeground({
     pendingMessages: [],
     retain: false,
     diskLoaded: false,
-  }
+  };
 
   // Create background signal promise
-  let resolveBackgroundSignal: () => void
+  let resolveBackgroundSignal: () => void;
   const backgroundSignal = new Promise<void>(resolve => {
-    resolveBackgroundSignal = resolve
-  })
-  backgroundSignalResolvers.set(agentId, resolveBackgroundSignal!)
+    resolveBackgroundSignal = resolve;
+  });
+  backgroundSignalResolvers.set(agentId, resolveBackgroundSignal!);
 
-  registerTask(taskState, setAppState)
+  registerTask(taskState, setAppState);
 
   // Auto-background after timeout if configured
-  let cancelAutoBackground: (() => void) | undefined
+  let cancelAutoBackground: (() => void) | undefined;
   if (autoBackgroundMs !== undefined && autoBackgroundMs > 0) {
     const timer = setTimeout(
       (setAppState, agentId) => {
         // Mark task as backgrounded and resolve the signal
         setAppState(prev => {
-          const prevTask = prev.tasks[agentId]
+          const prevTask = prev.tasks[agentId];
           if (!isLocalAgentTask(prevTask) || prevTask.isBackgrounded) {
-            return prev
+            return prev;
           }
           return {
             ...prev,
@@ -716,44 +655,40 @@ export function registerAgentForeground({
               ...prev.tasks,
               [agentId]: { ...prevTask, isBackgrounded: true },
             },
-          }
-        })
-        const resolver = backgroundSignalResolvers.get(agentId)
+          };
+        });
+        const resolver = backgroundSignalResolvers.get(agentId);
         if (resolver) {
-          resolver()
-          backgroundSignalResolvers.delete(agentId)
+          resolver();
+          backgroundSignalResolvers.delete(agentId);
         }
       },
       autoBackgroundMs,
       setAppState,
       agentId,
-    )
-    cancelAutoBackground = () => clearTimeout(timer)
+    );
+    cancelAutoBackground = () => clearTimeout(timer);
   }
 
-  return { taskId: agentId, backgroundSignal, cancelAutoBackground }
+  return { taskId: agentId, backgroundSignal, cancelAutoBackground };
 }
 
 /**
  * Background a specific foreground agent task.
  * @returns true if backgrounded successfully, false otherwise
  */
-export function backgroundAgentTask(
-  taskId: string,
-  getAppState: () => AppState,
-  setAppState: SetAppState,
-): boolean {
-  const state = getAppState()
-  const task = state.tasks[taskId]
+export function backgroundAgentTask(taskId: string, getAppState: () => AppState, setAppState: SetAppState): boolean {
+  const state = getAppState();
+  const task = state.tasks[taskId];
   if (!isLocalAgentTask(task) || task.isBackgrounded) {
-    return false
+    return false;
   }
 
   // Update state to mark as backgrounded
   setAppState(prev => {
-    const prevTask = prev.tasks[taskId]
+    const prevTask = prev.tasks[taskId];
     if (!isLocalAgentTask(prevTask)) {
-      return prev
+      return prev;
     }
     return {
       ...prev,
@@ -761,45 +696,42 @@ export function backgroundAgentTask(
         ...prev.tasks,
         [taskId]: { ...prevTask, isBackgrounded: true },
       },
-    }
-  })
+    };
+  });
 
   // Resolve the background signal to interrupt the agent loop
-  const resolver = backgroundSignalResolvers.get(taskId)
+  const resolver = backgroundSignalResolvers.get(taskId);
   if (resolver) {
-    resolver()
-    backgroundSignalResolvers.delete(taskId)
+    resolver();
+    backgroundSignalResolvers.delete(taskId);
   }
 
-  return true
+  return true;
 }
 
 /**
  * Unregister a foreground agent task when the agent completes without being backgrounded.
  */
-export function unregisterAgentForeground(
-  taskId: string,
-  setAppState: SetAppState,
-): void {
+export function unregisterAgentForeground(taskId: string, setAppState: SetAppState): void {
   // Clean up the background signal resolver
-  backgroundSignalResolvers.delete(taskId)
+  backgroundSignalResolvers.delete(taskId);
 
-  let cleanupFn: (() => void) | undefined
+  let cleanupFn: (() => void) | undefined;
 
   setAppState(prev => {
-    const task = prev.tasks[taskId]
+    const task = prev.tasks[taskId];
     // Only remove if it's a foreground task (not backgrounded)
     if (!isLocalAgentTask(task) || task.isBackgrounded) {
-      return prev
+      return prev;
     }
 
     // Capture cleanup function to call outside of updater
-    cleanupFn = task.unregisterCleanup
+    cleanupFn = task.unregisterCleanup;
 
-    const { [taskId]: removed, ...rest } = prev.tasks
-    return { ...prev, tasks: rest }
-  })
+    const { [taskId]: removed, ...rest } = prev.tasks;
+    return { ...prev, tasks: rest };
+  });
 
   // Call cleanup outside of the state updater (avoid side effects in updater)
-  cleanupFn?.()
+  cleanupFn?.();
 }
diff --git a/src/tasks/LocalMainSessionTask.ts b/src/tasks/LocalMainSessionTask.ts
index 27398d515..ac87e0586 100644
--- a/src/tasks/LocalMainSessionTask.ts
+++ b/src/tasks/LocalMainSessionTask.ts
@@ -210,7 +210,10 @@ export function completeMainSessionTask(
     // Set notified so evictTerminalTask/generateTaskAttachments eviction
     // guards pass; the backgrounded path sets this inside
     // enqueueMainSessionNotification's check-and-set.
-    updateTaskState<LocalMainSessionTaskState>(taskId, setAppState, task => ({ ...task, notified: true }))
+    updateTaskState<LocalMainSessionTaskState>(taskId, setAppState, task => ({
+      ...task,
+      notified: true,
+    }))
     emitTaskTerminatedSdk(taskId, success ? 'completed' : 'failed', {
       toolUseId,
       summary: 'Background session',
@@ -388,10 +391,14 @@ export function startBackgroundSession({
           // Aborted mid-stream — completeMainSessionTask won't be reached.
           // chat:killAgents path already marked notified + emitted; stopTask path did not.
           let alreadyNotified = false
-          updateTaskState<LocalMainSessionTaskState>(taskId, setAppState, task => {
-            alreadyNotified = task.notified === true
-            return alreadyNotified ? task : { ...task, notified: true }
-          })
+          updateTaskState<LocalMainSessionTaskState>(
+            taskId,
+            setAppState,
+            task => {
+              alreadyNotified = task.notified === true
+              return alreadyNotified ? task : { ...task, notified: true }
+            },
+          )
           if (!alreadyNotified) {
             emitTaskTerminatedSdk(taskId, 'stopped', {
               summary: description,
@@ -420,7 +427,12 @@ export function startBackgroundSession({
         lastRecordedUuid = msg.uuid
 
         if (msg.type === 'assistant') {
-          const contentBlocks = (msg.message?.content ?? []) as Array<{ type: string; text?: string; name?: string; input?: unknown }>
+          const contentBlocks = (msg.message?.content ?? []) as Array<{
+            type: string
+            text?: string
+            name?: string
+            input?: unknown
+          }>
           for (const block of contentBlocks) {
             if (block.type === 'text') {
               tokenCount += roughTokenCountEstimation(block.text ?? '')
diff --git a/src/tasks/LocalShellTask/LocalShellTask.tsx b/src/tasks/LocalShellTask/LocalShellTask.tsx
index 22810bff1..dd8b2138a 100644
--- a/src/tasks/LocalShellTask/LocalShellTask.tsx
+++ b/src/tasks/LocalShellTask/LocalShellTask.tsx
@@ -1,5 +1,5 @@
-import { feature } from 'bun:bundle'
-import { stat } from 'fs/promises'
+import { feature } from 'bun:bundle';
+import { stat } from 'fs/promises';
 import {
   OUTPUT_FILE_TAG,
   STATUS_TAG,
@@ -7,47 +7,31 @@ import {
   TASK_ID_TAG,
   TASK_NOTIFICATION_TAG,
   TOOL_USE_ID_TAG,
-} from '../../constants/xml.js'
-import { abortSpeculation } from '../../services/PromptSuggestion/speculation.js'
-import type { AppState } from '../../state/AppState.js'
-import type {
-  LocalShellSpawnInput,
-  SetAppState,
-  Task,
-  TaskContext,
-  TaskHandle,
-} from '../../Task.js'
-import { createTaskStateBase } from '../../Task.js'
-import type { AgentId } from '../../types/ids.js'
-import { registerCleanup } from '../../utils/cleanupRegistry.js'
-import { tailFile } from '../../utils/fsOperations.js'
-import { logError } from '../../utils/log.js'
-import { enqueuePendingNotification } from '../../utils/messageQueueManager.js'
-import type { ShellCommand } from '../../utils/ShellCommand.js'
-import {
-  evictTaskOutput,
-  getTaskOutputPath,
-} from '../../utils/task/diskOutput.js'
-import { registerTask, updateTaskState } from '../../utils/task/framework.js'
-import { escapeXml } from '../../utils/xml.js'
-import {
-  backgroundAgentTask,
-  isLocalAgentTask,
-} from '../LocalAgentTask/LocalAgentTask.js'
-import { isMainSessionTask } from '../LocalMainSessionTask.js'
-import {
-  type BashTaskKind,
-  isLocalShellTask,
-  type LocalShellTaskState,
-} from './guards.js'
-import { killTask } from './killShellTasks.js'
+} from '../../constants/xml.js';
+import { abortSpeculation } from '../../services/PromptSuggestion/speculation.js';
+import type { AppState } from '../../state/AppState.js';
+import type { LocalShellSpawnInput, SetAppState, Task, TaskContext, TaskHandle } from '../../Task.js';
+import { createTaskStateBase } from '../../Task.js';
+import type { AgentId } from '../../types/ids.js';
+import { registerCleanup } from '../../utils/cleanupRegistry.js';
+import { tailFile } from '../../utils/fsOperations.js';
+import { logError } from '../../utils/log.js';
+import { enqueuePendingNotification } from '../../utils/messageQueueManager.js';
+import type { ShellCommand } from '../../utils/ShellCommand.js';
+import { evictTaskOutput, getTaskOutputPath } from '../../utils/task/diskOutput.js';
+import { registerTask, updateTaskState } from '../../utils/task/framework.js';
+import { escapeXml } from '../../utils/xml.js';
+import { backgroundAgentTask, isLocalAgentTask } from '../LocalAgentTask/LocalAgentTask.js';
+import { isMainSessionTask } from '../LocalMainSessionTask.js';
+import { type BashTaskKind, isLocalShellTask, type LocalShellTaskState } from './guards.js';
+import { killTask } from './killShellTasks.js';
 
 /** Prefix that identifies a LocalShellTask summary to the UI collapse transform. */
-export const BACKGROUND_BASH_SUMMARY_PREFIX = 'Background command '
+export const BACKGROUND_BASH_SUMMARY_PREFIX = 'Background command ';
 
-const STALL_CHECK_INTERVAL_MS = 5_000
-const STALL_THRESHOLD_MS = 45_000
-const STALL_TAIL_BYTES = 1024
+const STALL_CHECK_INTERVAL_MS = 5_000;
+const STALL_THRESHOLD_MS = 45_000;
+const STALL_TAIL_BYTES = 1024;
 
 // Last-line patterns that suggest a command is blocked waiting for keyboard
 // input. Used to gate the stall notification — we stay silent on commands that
@@ -61,11 +45,11 @@ const PROMPT_PATTERNS = [
   /Press (any key|Enter)/i,
   /Continue\?/i,
   /Overwrite\?/i,
-]
+];
 
 export function looksLikePrompt(tail: string): boolean {
-  const lastLine = tail.trimEnd().split('\n').pop() ?? ''
-  return PROMPT_PATTERNS.some(p => p.test(lastLine))
+  const lastLine = tail.trimEnd().split('\n').pop() ?? '';
+  return PROMPT_PATTERNS.some(p => p.test(lastLine));
 }
 
 // Output-side analog of peekForStdinData (utils/process.ts): fire a one-shot
@@ -77,38 +61,36 @@ function startStallWatchdog(
   toolUseId?: string,
   agentId?: AgentId,
 ): () => void {
-  if (kind === 'monitor') return () => {}
-  const outputPath = getTaskOutputPath(taskId)
-  let lastSize = 0
-  let lastGrowth = Date.now()
-  let cancelled = false
+  if (kind === 'monitor') return () => {};
+  const outputPath = getTaskOutputPath(taskId);
+  let lastSize = 0;
+  let lastGrowth = Date.now();
+  let cancelled = false;
 
   const timer = setInterval(() => {
     void stat(outputPath).then(
       s => {
         if (s.size > lastSize) {
-          lastSize = s.size
-          lastGrowth = Date.now()
-          return
+          lastSize = s.size;
+          lastGrowth = Date.now();
+          return;
         }
-        if (Date.now() - lastGrowth < STALL_THRESHOLD_MS) return
+        if (Date.now() - lastGrowth < STALL_THRESHOLD_MS) return;
         void tailFile(outputPath, STALL_TAIL_BYTES).then(
           ({ content }) => {
-            if (cancelled) return
+            if (cancelled) return;
             if (!looksLikePrompt(content)) {
               // Not a prompt — keep watching. Reset so the next check is
               // 45s out instead of re-reading the tail on every tick.
-              lastGrowth = Date.now()
-              return
+              lastGrowth = Date.now();
+              return;
             }
             // Latch before the async-boundary-visible side effects so an
             // overlapping tick's callback sees cancelled=true and bails.
-            cancelled = true
-            clearInterval(timer)
-            const toolUseIdLine = toolUseId
-              ? `\n<${TOOL_USE_ID_TAG}>${toolUseId}</${TOOL_USE_ID_TAG}>`
-              : ''
-            const summary = `${BACKGROUND_BASH_SUMMARY_PREFIX}"${description}" appears to be waiting for interactive input`
+            cancelled = true;
+            clearInterval(timer);
+            const toolUseIdLine = toolUseId ? `\n<${TOOL_USE_ID_TAG}>${toolUseId}</${TOOL_USE_ID_TAG}>` : '';
+            const summary = `${BACKGROUND_BASH_SUMMARY_PREFIX}"${description}" appears to be waiting for interactive input`;
             // No <status> tag — print.ts treats <status> as a terminal
             // signal and an unknown value falls through to 'completed',
             // falsely closing the task for SDK consumers. Statusless
@@ -121,26 +103,26 @@ function startStallWatchdog(
 Last output:
 ${content.trimEnd()}
 
-The command is likely blocked on an interactive prompt. Kill this task and re-run with piped input (e.g., \`echo y | command\`) or a non-interactive flag if one exists.`
+The command is likely blocked on an interactive prompt. Kill this task and re-run with piped input (e.g., \`echo y | command\`) or a non-interactive flag if one exists.`;
             enqueuePendingNotification({
               value: message,
               mode: 'task-notification',
               priority: 'next',
               agentId,
-            })
+            });
           },
           () => {},
-        )
+        );
       },
       () => {}, // File may not exist yet
-    )
-  }, STALL_CHECK_INTERVAL_MS)
-  timer.unref()
+    );
+  }, STALL_CHECK_INTERVAL_MS);
+  timer.unref();
 
   return () => {
-    cancelled = true
-    clearInterval(timer)
-  }
+    cancelled = true;
+    clearInterval(timer);
+  };
 }
 
 function enqueueShellNotification(
@@ -156,25 +138,25 @@ function enqueueShellNotification(
   // Atomically check and set notified flag to prevent duplicate notifications.
   // If the task was already marked as notified (e.g., by TaskStopTool), skip
   // enqueueing to avoid sending redundant messages to the model.
-  let shouldEnqueue = false
+  let shouldEnqueue = false;
   updateTaskState(taskId, setAppState, task => {
     if (task.notified) {
-      return task
+      return task;
     }
-    shouldEnqueue = true
-    return { ...task, notified: true }
-  })
+    shouldEnqueue = true;
+    return { ...task, notified: true };
+  });
 
   if (!shouldEnqueue) {
-    return
+    return;
   }
 
   // Abort any active speculation — background task state changed, so speculated
   // results may reference stale task output. The prompt suggestion text is
   // preserved; only the pre-computed response is discarded.
-  abortSpeculation(setAppState)
+  abortSpeculation(setAppState);
 
-  let summary: string
+  let summary: string;
   if (feature('MONITOR_TOOL') && kind === 'monitor') {
     // Monitor is streaming-only (post-#22764) — the script exiting means
     // the stream ended, not "condition met". Distinct from the bash prefix
@@ -182,70 +164,68 @@ function enqueueShellNotification(
     // completed" collapse.
     switch (status) {
       case 'completed':
-        summary = `Monitor "${description}" stream ended`
-        break
+        summary = `Monitor "${description}" stream ended`;
+        break;
       case 'failed':
-        summary = `Monitor "${description}" script failed${exitCode !== undefined ? ` (exit ${exitCode})` : ''}`
-        break
+        summary = `Monitor "${description}" script failed${exitCode !== undefined ? ` (exit ${exitCode})` : ''}`;
+        break;
       case 'killed':
-        summary = `Monitor "${description}" stopped`
-        break
+        summary = `Monitor "${description}" stopped`;
+        break;
     }
   } else {
     switch (status) {
       case 'completed':
-        summary = `${BACKGROUND_BASH_SUMMARY_PREFIX}"${description}" completed${exitCode !== undefined ? ` (exit code ${exitCode})` : ''}`
-        break
+        summary = `${BACKGROUND_BASH_SUMMARY_PREFIX}"${description}" completed${exitCode !== undefined ? ` (exit code ${exitCode})` : ''}`;
+        break;
       case 'failed':
-        summary = `${BACKGROUND_BASH_SUMMARY_PREFIX}"${description}" failed${exitCode !== undefined ? ` with exit code ${exitCode}` : ''}`
-        break
+        summary = `${BACKGROUND_BASH_SUMMARY_PREFIX}"${description}" failed${exitCode !== undefined ? ` with exit code ${exitCode}` : ''}`;
+        break;
       case 'killed':
-        summary = `${BACKGROUND_BASH_SUMMARY_PREFIX}"${description}" was stopped`
-        break
+        summary = `${BACKGROUND_BASH_SUMMARY_PREFIX}"${description}" was stopped`;
+        break;
     }
   }
 
-  const outputPath = getTaskOutputPath(taskId)
-  const toolUseIdLine = toolUseId
-    ? `\n<${TOOL_USE_ID_TAG}>${toolUseId}</${TOOL_USE_ID_TAG}>`
-    : ''
+  const outputPath = getTaskOutputPath(taskId);
+  const toolUseIdLine = toolUseId ? `\n<${TOOL_USE_ID_TAG}>${toolUseId}</${TOOL_USE_ID_TAG}>` : '';
   const message = `<${TASK_NOTIFICATION_TAG}>
 <${TASK_ID_TAG}>${taskId}</${TASK_ID_TAG}>${toolUseIdLine}
 <${OUTPUT_FILE_TAG}>${outputPath}</${OUTPUT_FILE_TAG}>
 <${STATUS_TAG}>${status}</${STATUS_TAG}>
 <${SUMMARY_TAG}>${escapeXml(summary)}</${SUMMARY_TAG}>
-</${TASK_NOTIFICATION_TAG}>`
+</${TASK_NOTIFICATION_TAG}>`;
 
   enqueuePendingNotification({
     value: message,
     mode: 'task-notification',
     priority: feature('MONITOR_TOOL') ? 'next' : 'later',
     agentId,
-  })
+  });
 }
 
 export const LocalShellTask: Task = {
   name: 'LocalShellTask',
   type: 'local_bash',
   async kill(taskId, setAppState) {
-    killTask(taskId, setAppState)
+    killTask(taskId, setAppState);
   },
-}
+};
 
 export async function spawnShellTask(
   input: LocalShellSpawnInput & { shellCommand: ShellCommand },
   context: TaskContext,
 ): Promise<TaskHandle> {
-  const { command, description, shellCommand, toolUseId, agentId, kind } = input
-  const { setAppState } = context
+  const { command, description, shellCommand, toolUseId, agentId, kind } = input;
+  const { setAppState } = context;
 
   // TaskOutput owns the data — use its taskId so disk writes are consistent
-  const { taskOutput } = shellCommand
-  const taskId = taskOutput.taskId
+  const { taskOutput } = shellCommand;
+  const taskId = taskOutput.taskId;
 
   const unregisterCleanup = registerCleanup(async () => {
-    killTask(taskId, setAppState)
-  })
+    killTask(taskId, setAppState);
+  });
 
   const taskState: LocalShellTaskState = {
     ...createTaskStateBase(taskId, 'local_bash', description, toolUseId),
@@ -259,31 +239,25 @@ export async function spawnShellTask(
     isBackgrounded: true,
     agentId,
     kind,
-  }
+  };
 
-  registerTask(taskState, setAppState)
+  registerTask(taskState, setAppState);
 
   // Data flows through TaskOutput automatically — no stream listeners needed.
   // Just transition to backgrounded state so the process keeps running.
-  shellCommand.background(taskId)
+  shellCommand.background(taskId);
 
-  const cancelStallWatchdog = startStallWatchdog(
-    taskId,
-    description,
-    kind,
-    toolUseId,
-    agentId,
-  )
+  const cancelStallWatchdog = startStallWatchdog(taskId, description, kind, toolUseId, agentId);
 
   void shellCommand.result.then(async result => {
-    cancelStallWatchdog()
-    await flushAndCleanup(shellCommand)
-    let wasKilled = false
+    cancelStallWatchdog();
+    await flushAndCleanup(shellCommand);
+    let wasKilled = false;
 
     updateTaskState<LocalShellTaskState>(taskId, setAppState, task => {
       if (task.status === 'killed') {
-        wasKilled = true
-        return task
+        wasKilled = true;
+        return task;
       }
 
       return {
@@ -293,8 +267,8 @@ export async function spawnShellTask(
         shellCommand: null,
         unregisterCleanup: undefined,
         endTime: Date.now(),
-      }
-    })
+      };
+    });
 
     enqueueShellNotification(
       taskId,
@@ -305,17 +279,17 @@ export async function spawnShellTask(
       toolUseId,
       kind,
       agentId,
-    )
+    );
 
-    void evictTaskOutput(taskId)
-  })
+    void evictTaskOutput(taskId);
+  });
 
   return {
     taskId,
     cleanup: () => {
-      unregisterCleanup()
+      unregisterCleanup();
     },
-  }
+  };
 }
 
 /**
@@ -328,13 +302,13 @@ export function registerForeground(
   setAppState: SetAppState,
   toolUseId?: string,
 ): string {
-  const { command, description, shellCommand, agentId } = input
+  const { command, description, shellCommand, agentId } = input;
 
-  const taskId = shellCommand.taskOutput.taskId
+  const taskId = shellCommand.taskOutput.taskId;
 
   const unregisterCleanup = registerCleanup(async () => {
-    killTask(taskId, setAppState)
-  })
+    killTask(taskId, setAppState);
+  });
 
   const taskState: LocalShellTaskState = {
     ...createTaskStateBase(taskId, 'local_bash', description, toolUseId),
@@ -347,41 +321,37 @@ export function registerForeground(
     lastReportedTotalLines: 0,
     isBackgrounded: false, // Not yet backgrounded - running in foreground
     agentId,
-  }
+  };
 
-  registerTask(taskState, setAppState)
-  return taskId
+  registerTask(taskState, setAppState);
+  return taskId;
 }
 
 /**
  * Background a specific foreground task.
  * @returns true if backgrounded successfully, false otherwise
  */
-function backgroundTask(
-  taskId: string,
-  getAppState: () => AppState,
-  setAppState: SetAppState,
-): boolean {
+function backgroundTask(taskId: string, getAppState: () => AppState, setAppState: SetAppState): boolean {
   // Step 1: Get the task and shell command from current state
-  const state = getAppState()
-  const task = state.tasks[taskId]
+  const state = getAppState();
+  const task = state.tasks[taskId];
   if (!isLocalShellTask(task) || task.isBackgrounded || !task.shellCommand) {
-    return false
+    return false;
   }
 
-  const shellCommand = task.shellCommand
-  const description = task.description
-  const { toolUseId, kind, agentId } = task
+  const shellCommand = task.shellCommand;
+  const description = task.description;
+  const { toolUseId, kind, agentId } = task;
 
   // Transition to backgrounded — TaskOutput continues receiving data automatically
   if (!shellCommand.background(taskId)) {
-    return false
+    return false;
   }
 
   setAppState(prev => {
-    const prevTask = prev.tasks[taskId]
+    const prevTask = prev.tasks[taskId];
     if (!isLocalShellTask(prevTask) || prevTask.isBackgrounded) {
-      return prev
+      return prev;
     }
     return {
       ...prev,
@@ -389,32 +359,26 @@ function backgroundTask(
         ...prev.tasks,
         [taskId]: { ...prevTask, isBackgrounded: true },
       },
-    }
-  })
+    };
+  });
 
-  const cancelStallWatchdog = startStallWatchdog(
-    taskId,
-    description,
-    kind,
-    toolUseId,
-    agentId,
-  )
+  const cancelStallWatchdog = startStallWatchdog(taskId, description, kind, toolUseId, agentId);
 
   // Set up result handler
   void shellCommand.result.then(async result => {
-    cancelStallWatchdog()
-    await flushAndCleanup(shellCommand)
-    let wasKilled = false
-    let cleanupFn: (() => void) | undefined
+    cancelStallWatchdog();
+    await flushAndCleanup(shellCommand);
+    let wasKilled = false;
+    let cleanupFn: (() => void) | undefined;
 
     updateTaskState<LocalShellTaskState>(taskId, setAppState, t => {
       if (t.status === 'killed') {
-        wasKilled = true
-        return t
+        wasKilled = true;
+        return t;
       }
 
       // Capture cleanup function to call outside of updater
-      cleanupFn = t.unregisterCleanup
+      cleanupFn = t.unregisterCleanup;
 
       return {
         ...t,
@@ -423,41 +387,23 @@ function backgroundTask(
         shellCommand: null,
         unregisterCleanup: undefined,
         endTime: Date.now(),
-      }
-    })
+      };
+    });
 
     // Call cleanup outside of the state updater (avoid side effects in updater)
-    cleanupFn?.()
+    cleanupFn?.();
 
     if (wasKilled) {
-      enqueueShellNotification(
-        taskId,
-        description,
-        'killed',
-        result.code,
-        setAppState,
-        toolUseId,
-        kind,
-        agentId,
-      )
+      enqueueShellNotification(taskId, description, 'killed', result.code, setAppState, toolUseId, kind, agentId);
     } else {
-      const finalStatus = result.code === 0 ? 'completed' : 'failed'
-      enqueueShellNotification(
-        taskId,
-        description,
-        finalStatus,
-        result.code,
-        setAppState,
-        toolUseId,
-        kind,
-        agentId,
-      )
+      const finalStatus = result.code === 0 ? 'completed' : 'failed';
+      enqueueShellNotification(taskId, description, finalStatus, result.code, setAppState, toolUseId, kind, agentId);
     }
 
-    void evictTaskOutput(taskId)
-  })
+    void evictTaskOutput(taskId);
+  });
 
-  return true
+  return true;
 }
 
 /**
@@ -471,42 +417,35 @@ function backgroundTask(
 export function hasForegroundTasks(state: AppState): boolean {
   return Object.values(state.tasks).some(task => {
     if (isLocalShellTask(task) && !task.isBackgrounded && task.shellCommand) {
-      return true
+      return true;
     }
     // Exclude main session tasks - they display in the main view, not as foreground tasks
-    if (
-      isLocalAgentTask(task) &&
-      !task.isBackgrounded &&
-      !isMainSessionTask(task)
-    ) {
-      return true
+    if (isLocalAgentTask(task) && !task.isBackgrounded && !isMainSessionTask(task)) {
+      return true;
     }
-    return false
-  })
+    return false;
+  });
 }
 
-export function backgroundAll(
-  getAppState: () => AppState,
-  setAppState: SetAppState,
-): void {
-  const state = getAppState()
+export function backgroundAll(getAppState: () => AppState, setAppState: SetAppState): void {
+  const state = getAppState();
 
   // Background all foreground bash tasks
   const foregroundBashTaskIds = Object.keys(state.tasks).filter(id => {
-    const task = state.tasks[id]
-    return isLocalShellTask(task) && !task.isBackgrounded && task.shellCommand
-  })
+    const task = state.tasks[id];
+    return isLocalShellTask(task) && !task.isBackgrounded && task.shellCommand;
+  });
   for (const taskId of foregroundBashTaskIds) {
-    backgroundTask(taskId, getAppState, setAppState)
+    backgroundTask(taskId, getAppState, setAppState);
   }
 
   // Background all foreground agent tasks
   const foregroundAgentTaskIds = Object.keys(state.tasks).filter(id => {
-    const task = state.tasks[id]
-    return isLocalAgentTask(task) && !task.isBackgrounded
-  })
+    const task = state.tasks[id];
+    return isLocalAgentTask(task) && !task.isBackgrounded;
+  });
   for (const taskId of foregroundAgentTaskIds) {
-    backgroundAgentTask(taskId, getAppState, setAppState)
+    backgroundAgentTask(taskId, getAppState, setAppState);
   }
 }
 
@@ -526,46 +465,40 @@ export function backgroundExistingForegroundTask(
   toolUseId?: string,
 ): boolean {
   if (!shellCommand.background(taskId)) {
-    return false
+    return false;
   }
 
-  let agentId: AgentId | undefined
+  let agentId: AgentId | undefined;
   setAppState(prev => {
-    const prevTask = prev.tasks[taskId]
+    const prevTask = prev.tasks[taskId];
     if (!isLocalShellTask(prevTask) || prevTask.isBackgrounded) {
-      return prev
+      return prev;
     }
-    agentId = prevTask.agentId
+    agentId = prevTask.agentId;
     return {
       ...prev,
       tasks: {
         ...prev.tasks,
         [taskId]: { ...prevTask, isBackgrounded: true },
       },
-    }
-  })
+    };
+  });
 
-  const cancelStallWatchdog = startStallWatchdog(
-    taskId,
-    description,
-    undefined,
-    toolUseId,
-    agentId,
-  )
+  const cancelStallWatchdog = startStallWatchdog(taskId, description, undefined, toolUseId, agentId);
 
   // Set up result handler (mirrors backgroundTask's handler)
   void shellCommand.result.then(async result => {
-    cancelStallWatchdog()
-    await flushAndCleanup(shellCommand)
-    let wasKilled = false
-    let cleanupFn: (() => void) | undefined
+    cancelStallWatchdog();
+    await flushAndCleanup(shellCommand);
+    let wasKilled = false;
+    let cleanupFn: (() => void) | undefined;
 
     updateTaskState<LocalShellTaskState>(taskId, setAppState, t => {
       if (t.status === 'killed') {
-        wasKilled = true
-        return t
+        wasKilled = true;
+        return t;
       }
-      cleanupFn = t.unregisterCleanup
+      cleanupFn = t.unregisterCleanup;
       return {
         ...t,
         status: result.code === 0 ? 'completed' : 'failed',
@@ -573,31 +506,18 @@ export function backgroundExistingForegroundTask(
         shellCommand: null,
         unregisterCleanup: undefined,
         endTime: Date.now(),
-      }
-    })
+      };
+    });
 
-    cleanupFn?.()
+    cleanupFn?.();
 
-    const finalStatus = wasKilled
-      ? 'killed'
-      : result.code === 0
-        ? 'completed'
-        : 'failed'
-    enqueueShellNotification(
-      taskId,
-      description,
-      finalStatus,
-      result.code,
-      setAppState,
-      toolUseId,
-      undefined,
-      agentId,
-    )
+    const finalStatus = wasKilled ? 'killed' : result.code === 0 ? 'completed' : 'failed';
+    enqueueShellNotification(taskId, description, finalStatus, result.code, setAppState, toolUseId, undefined, agentId);
 
-    void evictTaskOutput(taskId)
-  })
+    void evictTaskOutput(taskId);
+  });
 
-  return true
+  return true;
 }
 
 /**
@@ -605,47 +525,39 @@ export function backgroundExistingForegroundTask(
  * Used when backgrounding raced with completion — the tool result already
  * carries the full output, so the <task_notification> would be redundant.
  */
-export function markTaskNotified(
-  taskId: string,
-  setAppState: SetAppState,
-): void {
-  updateTaskState(taskId, setAppState, t =>
-    t.notified ? t : { ...t, notified: true },
-  )
+export function markTaskNotified(taskId: string, setAppState: SetAppState): void {
+  updateTaskState(taskId, setAppState, t => (t.notified ? t : { ...t, notified: true }));
 }
 
 /**
  * Unregister a foreground task when the command completes without being backgrounded.
  */
-export function unregisterForeground(
-  taskId: string,
-  setAppState: SetAppState,
-): void {
-  let cleanupFn: (() => void) | undefined
+export function unregisterForeground(taskId: string, setAppState: SetAppState): void {
+  let cleanupFn: (() => void) | undefined;
 
   setAppState(prev => {
-    const task = prev.tasks[taskId]
+    const task = prev.tasks[taskId];
     // Only remove if it's a foreground task (not backgrounded)
     if (!isLocalShellTask(task) || task.isBackgrounded) {
-      return prev
+      return prev;
     }
 
     // Capture cleanup function to call outside of updater
-    cleanupFn = task.unregisterCleanup
+    cleanupFn = task.unregisterCleanup;
 
-    const { [taskId]: removed, ...rest } = prev.tasks
-    return { ...prev, tasks: rest }
-  })
+    const { [taskId]: removed, ...rest } = prev.tasks;
+    return { ...prev, tasks: rest };
+  });
 
   // Call cleanup outside of the state updater (avoid side effects in updater)
-  cleanupFn?.()
+  cleanupFn?.();
 }
 
 async function flushAndCleanup(shellCommand: ShellCommand): Promise<void> {
   try {
-    await shellCommand.taskOutput.flush()
-    shellCommand.cleanup()
+    await shellCommand.taskOutput.flush();
+    shellCommand.cleanup();
   } catch (error) {
-    logError(error)
+    logError(error);
   }
 }
diff --git a/src/tasks/LocalWorkflowTask/LocalWorkflowTask.ts b/src/tasks/LocalWorkflowTask/LocalWorkflowTask.ts
index 3d7fb78c5..b6755ba80 100644
--- a/src/tasks/LocalWorkflowTask/LocalWorkflowTask.ts
+++ b/src/tasks/LocalWorkflowTask/LocalWorkflowTask.ts
@@ -62,7 +62,12 @@ export function registerLocalWorkflowTask(
 ): string {
   const id = generateTaskId('local_workflow')
   const task: LocalWorkflowTaskState = {
-    ...createTaskStateBase(id, 'local_workflow', opts.description, opts.toolUseId),
+    ...createTaskStateBase(
+      id,
+      'local_workflow',
+      opts.description,
+      opts.toolUseId,
+    ),
     type: 'local_workflow',
     status: 'running',
     workflowName: opts.workflowName,
diff --git a/src/tasks/MonitorMcpTask/MonitorMcpTask.ts b/src/tasks/MonitorMcpTask/MonitorMcpTask.ts
index 56cea6831..49d5541ba 100644
--- a/src/tasks/MonitorMcpTask/MonitorMcpTask.ts
+++ b/src/tasks/MonitorMcpTask/MonitorMcpTask.ts
@@ -87,10 +87,7 @@ export function failMonitorMcpTask(
   }))
 }
 
-export function killMonitorMcp(
-  taskId: string,
-  setAppState: SetAppState,
-): void {
+export function killMonitorMcp(taskId: string, setAppState: SetAppState): void {
   updateTaskState<MonitorMcpTaskState>(taskId, setAppState, task => {
     if (task.status !== 'running') return task
     task.abortController?.abort()
diff --git a/src/tasks/RemoteAgentTask/RemoteAgentTask.tsx b/src/tasks/RemoteAgentTask/RemoteAgentTask.tsx
index 0d9fc1057..641c1c461 100644
--- a/src/tasks/RemoteAgentTask/RemoteAgentTask.tsx
+++ b/src/tasks/RemoteAgentTask/RemoteAgentTask.tsx
@@ -1,5 +1,5 @@
-import type { ToolUseBlock } from '@anthropic-ai/sdk/resources'
-import { getRemoteSessionUrl } from '../../constants/product.js'
+import type { ToolUseBlock } from '@anthropic-ai/sdk/resources';
+import { getRemoteSessionUrl } from '../../constants/product.js';
 import {
   OUTPUT_FILE_TAG,
   REMOTE_REVIEW_PROGRESS_TAG,
@@ -11,111 +11,89 @@ import {
   TASK_TYPE_TAG,
   TOOL_USE_ID_TAG,
   ULTRAPLAN_TAG,
-} from '../../constants/xml.js'
-import type {
-  SDKAssistantMessage,
-  SDKMessage,
-} from '../../entrypoints/agentSdkTypes.js'
-import type { MessageContent } from '../../types/message.js'
-import type {
-  SetAppState,
-  Task,
-  TaskContext,
-  TaskStateBase,
-} from '../../Task.js'
-import { createTaskStateBase, generateTaskId } from '../../Task.js'
-import { TodoWriteTool } from '@claude-code-best/builtin-tools/tools/TodoWriteTool/TodoWriteTool.js'
+} from '../../constants/xml.js';
+import type { SDKAssistantMessage, SDKMessage } from '../../entrypoints/agentSdkTypes.js';
+import type { MessageContent } from '../../types/message.js';
+import type { SetAppState, Task, TaskContext, TaskStateBase } from '../../Task.js';
+import { createTaskStateBase, generateTaskId } from '../../Task.js';
+import { TodoWriteTool } from '@claude-code-best/builtin-tools/tools/TodoWriteTool/TodoWriteTool.js';
 import {
   type BackgroundRemoteSessionPrecondition,
   checkBackgroundRemoteSessionEligibility,
-} from '../../utils/background/remote/remoteSession.js'
-export type { BackgroundRemoteSessionPrecondition }
-import { logForDebugging } from '../../utils/debug.js'
-import { logError } from '../../utils/log.js'
-import { enqueuePendingNotification } from '../../utils/messageQueueManager.js'
-import { extractTag, extractTextContent } from '../../utils/messages.js'
-import { emitTaskTerminatedSdk } from '../../utils/sdkEventQueue.js'
+} from '../../utils/background/remote/remoteSession.js';
+export type { BackgroundRemoteSessionPrecondition };
+import { logForDebugging } from '../../utils/debug.js';
+import { logError } from '../../utils/log.js';
+import { enqueuePendingNotification } from '../../utils/messageQueueManager.js';
+import { extractTag, extractTextContent } from '../../utils/messages.js';
+import { emitTaskTerminatedSdk } from '../../utils/sdkEventQueue.js';
 import {
   deleteRemoteAgentMetadata,
   listRemoteAgentMetadata,
   type RemoteAgentMetadata,
   writeRemoteAgentMetadata,
-} from '../../utils/sessionStorage.js'
-import { jsonStringify } from '../../utils/slowOperations.js'
-import {
-  appendTaskOutput,
-  evictTaskOutput,
-  getTaskOutputPath,
-  initTaskOutput,
-} from '../../utils/task/diskOutput.js'
-import { registerTask, updateTaskState } from '../../utils/task/framework.js'
-import { fetchSession } from '../../utils/teleport/api.js'
-import {
-  archiveRemoteSession,
-  pollRemoteSessionEvents,
-} from '../../utils/teleport.js'
-import type { TodoList } from '../../utils/todo/types.js'
-import type { UltraplanPhase } from '../../utils/ultraplan/ccrSession.js'
+} from '../../utils/sessionStorage.js';
+import { jsonStringify } from '../../utils/slowOperations.js';
+import { appendTaskOutput, evictTaskOutput, getTaskOutputPath, initTaskOutput } from '../../utils/task/diskOutput.js';
+import { registerTask, updateTaskState } from '../../utils/task/framework.js';
+import { fetchSession } from '../../utils/teleport/api.js';
+import { archiveRemoteSession, pollRemoteSessionEvents } from '../../utils/teleport.js';
+import type { TodoList } from '../../utils/todo/types.js';
+import type { UltraplanPhase } from '../../utils/ultraplan/ccrSession.js';
 
 export type RemoteAgentTaskState = TaskStateBase & {
-  type: 'remote_agent'
-  remoteTaskType: RemoteTaskType
+  type: 'remote_agent';
+  remoteTaskType: RemoteTaskType;
   /** Task-specific metadata (PR number, repo, etc.). */
-  remoteTaskMetadata?: RemoteTaskMetadata
-  sessionId: string // Original session ID for API calls
-  command: string
-  title: string
-  todoList: TodoList
-  log: SDKMessage[]
+  remoteTaskMetadata?: RemoteTaskMetadata;
+  sessionId: string; // Original session ID for API calls
+  command: string;
+  title: string;
+  todoList: TodoList;
+  log: SDKMessage[];
   /**
    * Long-running agent that will not be marked as complete after the first `result`.
    */
-  isLongRunning?: boolean
+  isLongRunning?: boolean;
   /**
    * When the local poller started watching this task (at spawn or on restore).
    * Review timeout clocks from here so a restore doesn't immediately time out
    * a task spawned >30min ago.
    */
-  pollStartedAt: number
+  pollStartedAt: number;
   /** True when this task was created by a teleported /ultrareview command. */
-  isRemoteReview?: boolean
+  isRemoteReview?: boolean;
   /** Parsed from the orchestrator's <remote-review-progress> heartbeat echoes. */
   reviewProgress?: {
-    stage?: 'finding' | 'verifying' | 'synthesizing'
-    bugsFound: number
-    bugsVerified: number
-    bugsRefuted: number
-  }
-  isUltraplan?: boolean
+    stage?: 'finding' | 'verifying' | 'synthesizing';
+    bugsFound: number;
+    bugsVerified: number;
+    bugsRefuted: number;
+  };
+  isUltraplan?: boolean;
   /**
    * Scanner-derived pill state. Undefined = running. `needs_input` when the
    * remote asked a clarifying question and is idle; `plan_ready` when
    * ExitPlanMode is awaiting browser approval. Surfaced in the pill badge
    * and detail dialog status line.
    */
-  ultraplanPhase?: Exclude<UltraplanPhase, 'running'>
-}
+  ultraplanPhase?: Exclude<UltraplanPhase, 'running'>;
+};
 
-const REMOTE_TASK_TYPES = [
-  'remote-agent',
-  'ultraplan',
-  'ultrareview',
-  'autofix-pr',
-  'background-pr',
-] as const
-export type RemoteTaskType = (typeof REMOTE_TASK_TYPES)[number]
+const REMOTE_TASK_TYPES = ['remote-agent', 'ultraplan', 'ultrareview', 'autofix-pr', 'background-pr'] as const;
+export type RemoteTaskType = (typeof REMOTE_TASK_TYPES)[number];
 
 function isRemoteTaskType(v: string | undefined): v is RemoteTaskType {
-  return (REMOTE_TASK_TYPES as readonly string[]).includes(v ?? '')
+  return (REMOTE_TASK_TYPES as readonly string[]).includes(v ?? '');
 }
 
 export type AutofixPrRemoteTaskMetadata = {
-  owner: string
-  repo: string
-  prNumber: number
-}
+  owner: string;
+  repo: string;
+  prNumber: number;
+};
 
-export type RemoteTaskMetadata = AutofixPrRemoteTaskMetadata
+export type RemoteTaskMetadata = AutofixPrRemoteTaskMetadata;
 
 /**
  * Called on every poll tick for tasks with a matching remoteTaskType. Return a
@@ -124,35 +102,27 @@ export type RemoteTaskMetadata = AutofixPrRemoteTaskMetadata
  */
 export type RemoteTaskCompletionChecker = (
   remoteTaskMetadata: RemoteTaskMetadata | undefined,
-) => Promise<string | null>
+) => Promise<string | null>;
 
-const completionCheckers = new Map<
-  RemoteTaskType,
-  RemoteTaskCompletionChecker
->()
+const completionCheckers = new Map<RemoteTaskType, RemoteTaskCompletionChecker>();
 
 /**
  * Register a completion checker for a remote task type. Invoked on every poll
  * tick; survives --resume via the sidecar's remoteTaskType + remoteTaskMetadata.
  */
-export function registerCompletionChecker(
-  remoteTaskType: RemoteTaskType,
-  checker: RemoteTaskCompletionChecker,
-): void {
-  completionCheckers.set(remoteTaskType, checker)
+export function registerCompletionChecker(remoteTaskType: RemoteTaskType, checker: RemoteTaskCompletionChecker): void {
+  completionCheckers.set(remoteTaskType, checker);
 }
 
 /**
  * Persist a remote-agent metadata entry to the session sidecar.
  * Fire-and-forget — persistence failures must not block task registration.
  */
-async function persistRemoteAgentMetadata(
-  meta: RemoteAgentMetadata,
-): Promise<void> {
+async function persistRemoteAgentMetadata(meta: RemoteAgentMetadata): Promise<void> {
   try {
-    await writeRemoteAgentMetadata(meta.taskId, meta)
+    await writeRemoteAgentMetadata(meta.taskId, meta);
   } catch (e) {
-    logForDebugging(`persistRemoteAgentMetadata failed: ${String(e)}`)
+    logForDebugging(`persistRemoteAgentMetadata failed: ${String(e)}`);
   }
 }
 
@@ -163,21 +133,21 @@ async function persistRemoteAgentMetadata(
  */
 async function removeRemoteAgentMetadata(taskId: string): Promise<void> {
   try {
-    await deleteRemoteAgentMetadata(taskId)
+    await deleteRemoteAgentMetadata(taskId);
   } catch (e) {
-    logForDebugging(`removeRemoteAgentMetadata failed: ${String(e)}`)
+    logForDebugging(`removeRemoteAgentMetadata failed: ${String(e)}`);
   }
 }
 
 // Precondition error result
 export type RemoteAgentPreconditionResult =
   | {
-      eligible: true
+      eligible: true;
     }
   | {
-      eligible: false
-      errors: BackgroundRemoteSessionPrecondition[]
-    }
+      eligible: false;
+      errors: BackgroundRemoteSessionPrecondition[];
+    };
 
 /**
  * Check eligibility for creating a remote agent session.
@@ -185,34 +155,32 @@ export type RemoteAgentPreconditionResult =
 export async function checkRemoteAgentEligibility({
   skipBundle = false,
 }: {
-  skipBundle?: boolean
+  skipBundle?: boolean;
 } = {}): Promise<RemoteAgentPreconditionResult> {
-  const errors = await checkBackgroundRemoteSessionEligibility({ skipBundle })
+  const errors = await checkBackgroundRemoteSessionEligibility({ skipBundle });
   if (errors.length > 0) {
-    return { eligible: false, errors }
+    return { eligible: false, errors };
   }
-  return { eligible: true }
+  return { eligible: true };
 }
 
 /**
  * Format precondition error for display.
  */
-export function formatPreconditionError(
-  error: BackgroundRemoteSessionPrecondition,
-): string {
+export function formatPreconditionError(error: BackgroundRemoteSessionPrecondition): string {
   switch (error.type) {
     case 'not_logged_in':
-      return 'Please run /login and sign in with your Claude.ai account (not Console).'
+      return 'Please run /login and sign in with your Claude.ai account (not Console).';
     case 'no_remote_environment':
-      return 'No cloud environment available. Set one up at https://claude.ai/code/onboarding?magic=env-setup'
+      return 'No cloud environment available. Set one up at https://claude.ai/code/onboarding?magic=env-setup';
     case 'not_in_git_repo':
-      return 'Background tasks require a git repository. Initialize git or run from a git repository.'
+      return 'Background tasks require a git repository. Initialize git or run from a git repository.';
     case 'no_git_remote':
-      return 'Background tasks require a GitHub remote. Add one with `git remote add origin REPO_URL`.'
+      return 'Background tasks require a GitHub remote. Add one with `git remote add origin REPO_URL`.';
     case 'github_app_not_installed':
-      return 'The Claude GitHub app must be installed on this repository first.\nhttps://github.com/apps/claude/installations/new'
+      return 'The Claude GitHub app must be installed on this repository first.\nhttps://github.com/apps/claude/installations/new';
     case 'policy_blocked':
-      return "Remote sessions are disabled by your organization's policy. Contact your organization admin to enable them."
+      return "Remote sessions are disabled by your organization's policy. Contact your organization admin to enable them.";
   }
 }
 
@@ -227,29 +195,22 @@ function enqueueRemoteNotification(
   toolUseId?: string,
 ): void {
   // Atomically check and set notified flag to prevent duplicate notifications.
-  if (!markTaskNotified(taskId, setAppState)) return
+  if (!markTaskNotified(taskId, setAppState)) return;
 
-  const statusText =
-    status === 'completed'
-      ? 'completed successfully'
-      : status === 'failed'
-        ? 'failed'
-        : 'was stopped'
+  const statusText = status === 'completed' ? 'completed successfully' : status === 'failed' ? 'failed' : 'was stopped';
 
-  const toolUseIdLine = toolUseId
-    ? `\n<${TOOL_USE_ID_TAG}>${toolUseId}</${TOOL_USE_ID_TAG}>`
-    : ''
+  const toolUseIdLine = toolUseId ? `\n<${TOOL_USE_ID_TAG}>${toolUseId}</${TOOL_USE_ID_TAG}>` : '';
 
-  const outputPath = getTaskOutputPath(taskId)
+  const outputPath = getTaskOutputPath(taskId);
   const message = `<${TASK_NOTIFICATION_TAG}>
 <${TASK_ID_TAG}>${taskId}</${TASK_ID_TAG}>${toolUseIdLine}
 <${TASK_TYPE_TAG}>remote_agent</${TASK_TYPE_TAG}>
 <${OUTPUT_FILE_TAG}>${outputPath}</${OUTPUT_FILE_TAG}>
 <${STATUS_TAG}>${status}</${STATUS_TAG}>
 <${SUMMARY_TAG}>Remote task "${title}" ${statusText}</${SUMMARY_TAG}>
-</${TASK_NOTIFICATION_TAG}>`
+</${TASK_NOTIFICATION_TAG}>`;
 
-  enqueuePendingNotification({ value: message, mode: 'task-notification' })
+  enqueuePendingNotification({ value: message, mode: 'task-notification' });
 }
 
 /**
@@ -257,15 +218,15 @@ function enqueueRemoteNotification(
  * flag (caller should enqueue), false if already notified (caller should skip).
  */
 function markTaskNotified(taskId: string, setAppState: SetAppState): boolean {
-  let shouldEnqueue = false
+  let shouldEnqueue = false;
   updateTaskState(taskId, setAppState, task => {
     if (task.notified) {
-      return task
+      return task;
     }
-    shouldEnqueue = true
-    return { ...task, notified: true }
-  })
-  return shouldEnqueue
+    shouldEnqueue = true;
+    return { ...task, notified: true };
+  });
+  return shouldEnqueue;
 }
 
 /**
@@ -275,18 +236,18 @@ function markTaskNotified(taskId: string, setAppState: SetAppState): boolean {
 export function extractPlanFromLog(log: SDKMessage[]): string | null {
   // Walk backwards through assistant messages to find <ultraplan> content
   for (let i = log.length - 1; i >= 0; i--) {
-    const msg = log[i] as SDKAssistantMessage
-    if (msg?.type !== 'assistant') continue
-    const content = msg.message?.content as MessageContent | undefined
-    if (!content) continue
+    const msg = log[i] as SDKAssistantMessage;
+    if (msg?.type !== 'assistant') continue;
+    const content = msg.message?.content as MessageContent | undefined;
+    if (!content) continue;
     const fullText = extractTextContent(
       typeof content === 'string' ? [{ type: 'text' as const, text: content }] : content,
       '\n',
-    )
-    const plan = extractTag(fullText, ULTRAPLAN_TAG)
-    if (plan?.trim()) return plan.trim()
+    );
+    const plan = extractTag(fullText, ULTRAPLAN_TAG);
+    if (plan?.trim()) return plan.trim();
   }
-  return null
+  return null;
 }
 
 /**
@@ -300,18 +261,18 @@ export function enqueueUltraplanFailureNotification(
   reason: string,
   setAppState: SetAppState,
 ): void {
-  if (!markTaskNotified(taskId, setAppState)) return
+  if (!markTaskNotified(taskId, setAppState)) return;
 
-  const sessionUrl = getRemoteTaskSessionUrl(sessionId)
+  const sessionUrl = getRemoteTaskSessionUrl(sessionId);
   const message = `<${TASK_NOTIFICATION_TAG}>
 <${TASK_ID_TAG}>${taskId}</${TASK_ID_TAG}>
 <${TASK_TYPE_TAG}>remote_agent</${TASK_TYPE_TAG}>
 <${STATUS_TAG}>failed</${STATUS_TAG}>
 <${SUMMARY_TAG}>Ultraplan failed: ${reason}</${SUMMARY_TAG}>
 </${TASK_NOTIFICATION_TAG}>
-The remote Ultraplan session did not produce a plan (${reason}). Inspect the session at ${sessionUrl} and tell the user to retry locally with plan mode.`
+The remote Ultraplan session did not produce a plan (${reason}). Inspect the session at ${sessionUrl} and tell the user to retry locally with plan mode.`;
 
-  enqueuePendingNotification({ value: message, mode: 'task-notification' })
+  enqueuePendingNotification({ value: message, mode: 'task-notification' });
 }
 
 /**
@@ -329,61 +290,54 @@ The remote Ultraplan session did not produce a plan (${reason}). Inspect the ses
  */
 function extractReviewFromLog(log: SDKMessage[]): string | null {
   for (let i = log.length - 1; i >= 0; i--) {
-    const msg = log[i]
+    const msg = log[i];
     // The final echo before hook exit may land in either the last
     // hook_progress or the terminal hook_response depending on buffering;
     // both have flat stdout.
-    if (
-      msg?.type === 'system' &&
-      (msg.subtype === 'hook_progress' || msg.subtype === 'hook_response')
-    ) {
-      const tagged = extractTag(msg.stdout as string, REMOTE_REVIEW_TAG)
-      if (tagged?.trim()) return tagged.trim()
+    if (msg?.type === 'system' && (msg.subtype === 'hook_progress' || msg.subtype === 'hook_response')) {
+      const tagged = extractTag(msg.stdout as string, REMOTE_REVIEW_TAG);
+      if (tagged?.trim()) return tagged.trim();
     }
   }
 
   for (let i = log.length - 1; i >= 0; i--) {
-    const msg = log[i]
-    if (msg?.type !== 'assistant') continue
-    const content = (msg as SDKAssistantMessage).message?.content as MessageContent | undefined
-    if (!content) continue
+    const msg = log[i];
+    if (msg?.type !== 'assistant') continue;
+    const content = (msg as SDKAssistantMessage).message?.content as MessageContent | undefined;
+    if (!content) continue;
     const fullText = extractTextContent(
       typeof content === 'string' ? [{ type: 'text' as const, text: content }] : content,
       '\n',
-    )
-    const tagged = extractTag(fullText, REMOTE_REVIEW_TAG)
-    if (tagged?.trim()) return tagged.trim()
+    );
+    const tagged = extractTag(fullText, REMOTE_REVIEW_TAG);
+    if (tagged?.trim()) return tagged.trim();
   }
 
   // Hook-stdout concat fallback: a single echo should land in one event, but
   // large JSON payloads can flush across two if the pipe buffer fills
   // mid-write. Per-message scan above misses a tag split across events.
   const hookStdout = log
-    .filter(
-      msg =>
-        msg.type === 'system' &&
-        (msg.subtype === 'hook_progress' || msg.subtype === 'hook_response'),
-    )
+    .filter(msg => msg.type === 'system' && (msg.subtype === 'hook_progress' || msg.subtype === 'hook_response'))
     .map(msg => msg.stdout as string)
-    .join('')
-  const hookTagged = extractTag(hookStdout, REMOTE_REVIEW_TAG)
-  if (hookTagged?.trim()) return hookTagged.trim()
+    .join('');
+  const hookTagged = extractTag(hookStdout, REMOTE_REVIEW_TAG);
+  if (hookTagged?.trim()) return hookTagged.trim();
 
   // Fallback: concatenate all assistant text in chronological order.
   const allText = log
     .filter((msg): msg is SDKAssistantMessage => msg.type === 'assistant')
     .map(msg => {
-      const content = msg.message?.content as MessageContent | undefined
-      if (!content) return ''
+      const content = msg.message?.content as MessageContent | undefined;
+      if (!content) return '';
       return extractTextContent(
         typeof content === 'string' ? [{ type: 'text' as const, text: content }] : content,
         '\n',
-      )
+      );
     })
     .join('\n')
-    .trim()
+    .trim();
 
-  return allText || null
+  return allText || null;
 }
 
 /**
@@ -399,43 +353,36 @@ function extractReviewFromLog(log: SDKMessage[]): string | null {
 function extractReviewTagFromLog(log: SDKMessage[]): string | null {
   // hook_progress / hook_response per-message scan (bughunter path)
   for (let i = log.length - 1; i >= 0; i--) {
-    const msg = log[i]
-    if (
-      msg?.type === 'system' &&
-      (msg.subtype === 'hook_progress' || msg.subtype === 'hook_response')
-    ) {
-      const tagged = extractTag(msg.stdout as string, REMOTE_REVIEW_TAG)
-      if (tagged?.trim()) return tagged.trim()
+    const msg = log[i];
+    if (msg?.type === 'system' && (msg.subtype === 'hook_progress' || msg.subtype === 'hook_response')) {
+      const tagged = extractTag(msg.stdout as string, REMOTE_REVIEW_TAG);
+      if (tagged?.trim()) return tagged.trim();
     }
   }
 
   // assistant text per-message scan (prompt mode)
   for (let i = log.length - 1; i >= 0; i--) {
-    const msg = log[i]
-    if (msg?.type !== 'assistant') continue
-    const content = (msg as SDKAssistantMessage).message?.content as MessageContent | undefined
-    if (!content) continue
+    const msg = log[i];
+    if (msg?.type !== 'assistant') continue;
+    const content = (msg as SDKAssistantMessage).message?.content as MessageContent | undefined;
+    if (!content) continue;
     const fullText = extractTextContent(
       typeof content === 'string' ? [{ type: 'text' as const, text: content }] : content,
       '\n',
-    )
-    const tagged = extractTag(fullText, REMOTE_REVIEW_TAG)
-    if (tagged?.trim()) return tagged.trim()
+    );
+    const tagged = extractTag(fullText, REMOTE_REVIEW_TAG);
+    if (tagged?.trim()) return tagged.trim();
   }
 
   // Hook-stdout concat fallback for split tags
   const hookStdout = log
-    .filter(
-      msg =>
-        msg.type === 'system' &&
-        (msg.subtype === 'hook_progress' || msg.subtype === 'hook_response'),
-    )
+    .filter(msg => msg.type === 'system' && (msg.subtype === 'hook_progress' || msg.subtype === 'hook_response'))
     .map(msg => msg.stdout as string)
-    .join('')
-  const hookTagged = extractTag(hookStdout, REMOTE_REVIEW_TAG)
-  if (hookTagged?.trim()) return hookTagged.trim()
+    .join('');
+  const hookTagged = extractTag(hookStdout, REMOTE_REVIEW_TAG);
+  if (hookTagged?.trim()) return hookTagged.trim();
 
-  return null
+  return null;
 }
 
 /**
@@ -444,12 +391,8 @@ function extractReviewTagFromLog(log: SDKMessage[]): string | null {
  * turn — no file indirection, no mode change. Session is kept alive so the
  * claude.ai URL stays a durable record the user can revisit; TTL handles cleanup.
  */
-function enqueueRemoteReviewNotification(
-  taskId: string,
-  reviewContent: string,
-  setAppState: SetAppState,
-): void {
-  if (!markTaskNotified(taskId, setAppState)) return
+function enqueueRemoteReviewNotification(taskId: string, reviewContent: string, setAppState: SetAppState): void {
+  if (!markTaskNotified(taskId, setAppState)) return;
 
   const message = `<${TASK_NOTIFICATION_TAG}>
 <${TASK_ID_TAG}>${taskId}</${TASK_ID_TAG}>
@@ -459,20 +402,16 @@ function enqueueRemoteReviewNotification(
 </${TASK_NOTIFICATION_TAG}>
 The remote review produced the following findings:
 
-${reviewContent}`
+${reviewContent}`;
 
-  enqueuePendingNotification({ value: message, mode: 'task-notification' })
+  enqueuePendingNotification({ value: message, mode: 'task-notification' });
 }
 
 /**
  * Enqueue a remote-review failure notification.
  */
-function enqueueRemoteReviewFailureNotification(
-  taskId: string,
-  reason: string,
-  setAppState: SetAppState,
-): void {
-  if (!markTaskNotified(taskId, setAppState)) return
+function enqueueRemoteReviewFailureNotification(taskId: string, reason: string, setAppState: SetAppState): void {
+  if (!markTaskNotified(taskId, setAppState)) return;
 
   const message = `<${TASK_NOTIFICATION_TAG}>
 <${TASK_ID_TAG}>${taskId}</${TASK_ID_TAG}>
@@ -480,9 +419,9 @@ function enqueueRemoteReviewFailureNotification(
 <${STATUS_TAG}>failed</${STATUS_TAG}>
 <${SUMMARY_TAG}>Remote review failed: ${reason}</${SUMMARY_TAG}>
 </${TASK_NOTIFICATION_TAG}>
-Remote review did not produce output (${reason}). Tell the user to retry /ultrareview, or use /review for a local review instead.`
+Remote review did not produce output (${reason}). Tell the user to retry /ultrareview, or use /review for a local review instead.`;
 
-  enqueuePendingNotification({ value: message, mode: 'task-notification' })
+  enqueuePendingNotification({ value: message, mode: 'task-notification' });
 }
 
 /**
@@ -492,30 +431,33 @@ function extractTodoListFromLog(log: SDKMessage[]): TodoList {
   const todoListMessage = log.findLast(
     (msg): msg is SDKAssistantMessage =>
       msg.type === 'assistant' &&
-      (Array.isArray((msg as SDKAssistantMessage).message?.content)) &&
+      Array.isArray((msg as SDKAssistantMessage).message?.content) &&
       (((msg as SDKAssistantMessage).message?.content ?? []) as Array<{ type: string; name?: string }>).some(
         block => block.type === 'tool_use' && block.name === TodoWriteTool.name,
       ),
-  )
+  );
   if (!todoListMessage) {
-    return []
+    return [];
   }
 
-  const contentBlocks = (todoListMessage.message?.content ?? []) as Array<{ type: string; name?: string; input?: unknown }>
+  const contentBlocks = (todoListMessage.message?.content ?? []) as Array<{
+    type: string;
+    name?: string;
+    input?: unknown;
+  }>;
   const input = contentBlocks.find(
-    (block): block is ToolUseBlock =>
-      block.type === 'tool_use' && block.name === TodoWriteTool.name,
-  )?.input
+    (block): block is ToolUseBlock => block.type === 'tool_use' && block.name === TodoWriteTool.name,
+  )?.input;
   if (!input) {
-    return []
+    return [];
   }
 
-  const parsedInput = TodoWriteTool.inputSchema.safeParse(input)
+  const parsedInput = TodoWriteTool.inputSchema.safeParse(input);
   if (!parsedInput.success) {
-    return []
+    return [];
   }
 
-  return parsedInput.data.todos
+  return parsedInput.data.todos;
 }
 
 /**
@@ -524,19 +466,19 @@ function extractTodoListFromLog(log: SDKMessage[]): TodoList {
  * Callers remain responsible for custom pre-registration logic (git dialogs, transcript upload, teleport options).
  */
 export function registerRemoteAgentTask(options: {
-  remoteTaskType: RemoteTaskType
-  session: { id: string; title: string }
-  command: string
-  context: TaskContext
-  toolUseId?: string
-  isRemoteReview?: boolean
-  isUltraplan?: boolean
-  isLongRunning?: boolean
-  remoteTaskMetadata?: RemoteTaskMetadata
+  remoteTaskType: RemoteTaskType;
+  session: { id: string; title: string };
+  command: string;
+  context: TaskContext;
+  toolUseId?: string;
+  isRemoteReview?: boolean;
+  isUltraplan?: boolean;
+  isLongRunning?: boolean;
+  remoteTaskMetadata?: RemoteTaskMetadata;
 }): {
-  taskId: string
-  sessionId: string
-  cleanup: () => void
+  taskId: string;
+  sessionId: string;
+  cleanup: () => void;
 } {
   const {
     remoteTaskType,
@@ -548,13 +490,13 @@ export function registerRemoteAgentTask(options: {
     isUltraplan,
     isLongRunning,
     remoteTaskMetadata,
-  } = options
-  const taskId = generateTaskId('remote_agent')
+  } = options;
+  const taskId = generateTaskId('remote_agent');
 
   // Create the output file before registering the task.
   // RemoteAgentTask uses appendTaskOutput() (not TaskOutput), so
   // the file must exist for readers before any output arrives.
-  void initTaskOutput(taskId)
+  void initTaskOutput(taskId);
 
   const taskState: RemoteAgentTaskState = {
     ...createTaskStateBase(taskId, 'remote_agent', session.title, toolUseId),
@@ -571,9 +513,9 @@ export function registerRemoteAgentTask(options: {
     isLongRunning,
     pollStartedAt: Date.now(),
     remoteTaskMetadata,
-  }
+  };
 
-  registerTask(taskState, context.setAppState)
+  registerTask(taskState, context.setAppState);
 
   // Persist identity to the session sidecar so --resume can reconnect to
   // still-running remote sessions. Status is not stored — it's fetched
@@ -590,19 +532,19 @@ export function registerRemoteAgentTask(options: {
     isRemoteReview,
     isLongRunning,
     remoteTaskMetadata,
-  })
+  });
 
   // Ultraplan lifecycle is owned by startDetachedPoll in ultraplan.tsx. Generic
   // polling still runs so session.log populates for the detail view's progress
   // counts; the result-lookup guard below prevents early completion.
   // TODO(#23985): fold ExitPlanModeScanner into this poller, drop startDetachedPoll.
-  const stopPolling = startRemoteSessionPolling(taskId, context)
+  const stopPolling = startRemoteSessionPolling(taskId, context);
 
   return {
     taskId,
     sessionId: session.id,
     cleanup: stopPolling,
-  }
+  };
 }
 
 /**
@@ -614,27 +556,23 @@ export function registerRemoteAgentTask(options: {
  * removed. Must run after switchSession() so getSessionId() points at the
  * resumed session's sidecar directory.
  */
-export async function restoreRemoteAgentTasks(
-  context: TaskContext,
-): Promise<void> {
+export async function restoreRemoteAgentTasks(context: TaskContext): Promise<void> {
   try {
-    await restoreRemoteAgentTasksImpl(context)
+    await restoreRemoteAgentTasksImpl(context);
   } catch (e) {
-    logForDebugging(`restoreRemoteAgentTasks failed: ${String(e)}`)
+    logForDebugging(`restoreRemoteAgentTasks failed: ${String(e)}`);
   }
 }
 
-async function restoreRemoteAgentTasksImpl(
-  context: TaskContext,
-): Promise<void> {
-  const persisted = await listRemoteAgentMetadata()
-  if (persisted.length === 0) return
+async function restoreRemoteAgentTasksImpl(context: TaskContext): Promise<void> {
+  const persisted = await listRemoteAgentMetadata();
+  if (persisted.length === 0) return;
 
   for (const meta of persisted) {
-    let remoteStatus: string
+    let remoteStatus: string;
     try {
-      const session = await fetchSession(meta.sessionId)
-      remoteStatus = session.session_status
+      const session = await fetchSession(meta.sessionId);
+      remoteStatus = session.session_status;
     } catch (e) {
       // Only 404 means the CCR session is truly gone. Auth errors (401,
       // missing OAuth token) are recoverable via /login — the remote
@@ -642,35 +580,24 @@ async function restoreRemoteAgentTasksImpl(
       // 4xx (validateStatus treats <500 as success), so isTransientNetworkError
       // can't distinguish them; match the 404 message instead.
       if (e instanceof Error && e.message.startsWith('Session not found:')) {
-        logForDebugging(
-          `restoreRemoteAgentTasks: dropping ${meta.taskId} (404: ${String(e)})`,
-        )
-        void removeRemoteAgentMetadata(meta.taskId)
+        logForDebugging(`restoreRemoteAgentTasks: dropping ${meta.taskId} (404: ${String(e)})`);
+        void removeRemoteAgentMetadata(meta.taskId);
       } else {
-        logForDebugging(
-          `restoreRemoteAgentTasks: skipping ${meta.taskId} (recoverable: ${String(e)})`,
-        )
+        logForDebugging(`restoreRemoteAgentTasks: skipping ${meta.taskId} (recoverable: ${String(e)})`);
       }
-      continue
+      continue;
     }
 
     if (remoteStatus === 'archived') {
       // Session ended while the local client was offline. Don't resurrect.
-      void removeRemoteAgentMetadata(meta.taskId)
-      continue
+      void removeRemoteAgentMetadata(meta.taskId);
+      continue;
     }
 
     const taskState: RemoteAgentTaskState = {
-      ...createTaskStateBase(
-        meta.taskId,
-        'remote_agent',
-        meta.title,
-        meta.toolUseId,
-      ),
+      ...createTaskStateBase(meta.taskId, 'remote_agent', meta.title, meta.toolUseId),
       type: 'remote_agent',
-      remoteTaskType: isRemoteTaskType(meta.remoteTaskType)
-        ? meta.remoteTaskType
-        : 'remote-agent',
+      remoteTaskType: isRemoteTaskType(meta.remoteTaskType) ? meta.remoteTaskType : 'remote-agent',
       status: 'running',
       sessionId: meta.sessionId,
       command: meta.command,
@@ -682,14 +609,12 @@ async function restoreRemoteAgentTasksImpl(
       isLongRunning: meta.isLongRunning,
       startTime: meta.spawnedAt,
       pollStartedAt: Date.now(),
-      remoteTaskMetadata: meta.remoteTaskMetadata as
-        | RemoteTaskMetadata
-        | undefined,
-    }
+      remoteTaskMetadata: meta.remoteTaskMetadata as RemoteTaskMetadata | undefined,
+    };
 
-    registerTask(taskState, context.setAppState)
-    void initTaskOutput(meta.taskId)
-    startRemoteSessionPolling(meta.taskId, context)
+    registerTask(taskState, context.setAppState);
+    void initTaskOutput(meta.taskId);
+    startRemoteSessionPolling(meta.taskId, context);
   }
 }
 
@@ -697,104 +622,79 @@ async function restoreRemoteAgentTasksImpl(
  * Start polling for remote session updates.
  * Returns a cleanup function to stop polling.
  */
-function startRemoteSessionPolling(
-  taskId: string,
-  context: TaskContext,
-): () => void {
-  let isRunning = true
-  const POLL_INTERVAL_MS = 1000
-  const REMOTE_REVIEW_TIMEOUT_MS = 30 * 60 * 1000
+function startRemoteSessionPolling(taskId: string, context: TaskContext): () => void {
+  let isRunning = true;
+  const POLL_INTERVAL_MS = 1000;
+  const REMOTE_REVIEW_TIMEOUT_MS = 30 * 60 * 1000;
   // Remote sessions flip to 'idle' between tool turns. With 100+ rapid
   // turns, a 1s poll WILL catch a transient idle mid-run. Require stable
   // idle (no log growth for N consecutive polls) before believing it.
-  const STABLE_IDLE_POLLS = 5
-  let consecutiveIdlePolls = 0
-  let lastEventId: string | null = null
-  let accumulatedLog: SDKMessage[] = []
+  const STABLE_IDLE_POLLS = 5;
+  let consecutiveIdlePolls = 0;
+  let lastEventId: string | null = null;
+  let accumulatedLog: SDKMessage[] = [];
   // Cached across ticks so we don't re-scan the full log. Tag appears once
   // at end of run; scanning only the delta (response.newEvents) is O(new).
-  let cachedReviewContent: string | null = null
+  let cachedReviewContent: string | null = null;
 
   const poll = async (): Promise<void> => {
-    if (!isRunning) return
+    if (!isRunning) return;
 
     try {
-      const appState = context.getAppState()
-      const task = appState.tasks?.[taskId] as RemoteAgentTaskState | undefined
+      const appState = context.getAppState();
+      const task = appState.tasks?.[taskId] as RemoteAgentTaskState | undefined;
       if (!task || task.status !== 'running') {
         // Task was killed externally (TaskStopTool) or already terminal.
         // Session left alive so the claude.ai URL stays valid — the run_hunt.sh
         // post_stage() calls land as assistant events there, and the user may
         // want to revisit them after closing the terminal. TTL reaps it.
-        return
+        return;
       }
 
-      const response = await pollRemoteSessionEvents(
-        task.sessionId,
-        lastEventId,
-      )
-      lastEventId = response.lastEventId
-      const logGrew = response.newEvents.length > 0
+      const response = await pollRemoteSessionEvents(task.sessionId, lastEventId);
+      lastEventId = response.lastEventId;
+      const logGrew = response.newEvents.length > 0;
       if (logGrew) {
-        accumulatedLog = [...accumulatedLog, ...response.newEvents]
+        accumulatedLog = [...accumulatedLog, ...response.newEvents];
         const deltaText = response.newEvents
           .map(msg => {
             if (msg.type === 'assistant') {
-              const content = (msg as SDKAssistantMessage).message?.content
-              if (!content || typeof content === 'string') return ''
+              const content = (msg as SDKAssistantMessage).message?.content;
+              if (!content || typeof content === 'string') return '';
               return (content as Array<{ type: string; text?: string }>)
                 .filter(block => block.type === 'text')
                 .map(block => ('text' in block ? block.text : ''))
-                .join('\n')
+                .join('\n');
             }
-            return jsonStringify(msg)
+            return jsonStringify(msg);
           })
-          .join('\n')
+          .join('\n');
         if (deltaText) {
-          appendTaskOutput(taskId, deltaText + '\n')
+          appendTaskOutput(taskId, deltaText + '\n');
         }
       }
 
       if (response.sessionStatus === 'archived') {
         updateTaskState<RemoteAgentTaskState>(taskId, context.setAppState, t =>
-          t.status === 'running'
-            ? { ...t, status: 'completed', endTime: Date.now() }
-            : t,
-        )
-        enqueueRemoteNotification(
-          taskId,
-          task.title,
-          'completed',
-          context.setAppState,
-          task.toolUseId,
-        )
-        void evictTaskOutput(taskId)
-        void removeRemoteAgentMetadata(taskId)
-        return
+          t.status === 'running' ? { ...t, status: 'completed', endTime: Date.now() } : t,
+        );
+        enqueueRemoteNotification(taskId, task.title, 'completed', context.setAppState, task.toolUseId);
+        void evictTaskOutput(taskId);
+        void removeRemoteAgentMetadata(taskId);
+        return;
       }
 
-      const checker = completionCheckers.get(task.remoteTaskType)
+      const checker = completionCheckers.get(task.remoteTaskType);
       if (checker) {
-        const completionResult = await checker(task.remoteTaskMetadata)
+        const completionResult = await checker(task.remoteTaskMetadata);
         if (completionResult !== null) {
-          updateTaskState<RemoteAgentTaskState>(
-            taskId,
-            context.setAppState,
-            t =>
-              t.status === 'running'
-                ? { ...t, status: 'completed', endTime: Date.now() }
-                : t,
-          )
-          enqueueRemoteNotification(
-            taskId,
-            completionResult,
-            'completed',
-            context.setAppState,
-            task.toolUseId,
-          )
-          void evictTaskOutput(taskId)
-          void removeRemoteAgentMetadata(taskId)
-          return
+          updateTaskState<RemoteAgentTaskState>(taskId, context.setAppState, t =>
+            t.status === 'running' ? { ...t, status: 'completed', endTime: Date.now() } : t,
+          );
+          enqueueRemoteNotification(taskId, completionResult, 'completed', context.setAppState, task.toolUseId);
+          void evictTaskOutput(taskId);
+          void removeRemoteAgentMetadata(taskId);
+          return;
         }
       }
 
@@ -803,9 +703,7 @@ function startRemoteSessionPolling(
       // Long-running monitors (autofix-pr) emit result per notification cycle,
       // so the same skip applies.
       const result =
-        task.isUltraplan || task.isLongRunning
-          ? undefined
-          : accumulatedLog.findLast(msg => msg.type === 'result')
+        task.isUltraplan || task.isLongRunning ? undefined : accumulatedLog.findLast(msg => msg.type === 'result');
 
       // For remote-review: <remote-review> in hook_progress stdout is the
       // bughunter path's completion signal. Scan only the delta to stay O(new);
@@ -815,41 +713,36 @@ function startRemoteSessionPolling(
       // nothing. Require STABLE_IDLE_POLLS consecutive idle polls with no log
       // growth.
       if (task.isRemoteReview && logGrew && cachedReviewContent === null) {
-        cachedReviewContent = extractReviewTagFromLog(response.newEvents)
+        cachedReviewContent = extractReviewTagFromLog(response.newEvents);
       }
       // Parse live progress counts from the orchestrator's heartbeat echoes.
       // hook_progress stdout is cumulative (every echo since hook start), so
       // each event contains all progress tags. Grab the LAST occurrence —
       // extractTag returns the first match which would always be the earliest
       // value (0/0).
-      let newProgress: RemoteAgentTaskState['reviewProgress']
+      let newProgress: RemoteAgentTaskState['reviewProgress'];
       if (task.isRemoteReview && logGrew) {
-        const open = `<${REMOTE_REVIEW_PROGRESS_TAG}>`
-        const close = `</${REMOTE_REVIEW_PROGRESS_TAG}>`
+        const open = `<${REMOTE_REVIEW_PROGRESS_TAG}>`;
+        const close = `</${REMOTE_REVIEW_PROGRESS_TAG}>`;
         for (const ev of response.newEvents) {
-          if (
-            ev.type === 'system' &&
-            (ev.subtype === 'hook_progress' || ev.subtype === 'hook_response')
-          ) {
-            const s = ev.stdout as string
-            const closeAt = s.lastIndexOf(close)
-            const openAt = closeAt === -1 ? -1 : s.lastIndexOf(open, closeAt)
+          if (ev.type === 'system' && (ev.subtype === 'hook_progress' || ev.subtype === 'hook_response')) {
+            const s = ev.stdout as string;
+            const closeAt = s.lastIndexOf(close);
+            const openAt = closeAt === -1 ? -1 : s.lastIndexOf(open, closeAt);
             if (openAt !== -1 && closeAt > openAt) {
               try {
-                const p = JSON.parse(
-                  s.slice(openAt + open.length, closeAt),
-                ) as {
-                  stage?: 'finding' | 'verifying' | 'synthesizing'
-                  bugs_found?: number
-                  bugs_verified?: number
-                  bugs_refuted?: number
-                }
+                const p = JSON.parse(s.slice(openAt + open.length, closeAt)) as {
+                  stage?: 'finding' | 'verifying' | 'synthesizing';
+                  bugs_found?: number;
+                  bugs_verified?: number;
+                  bugs_refuted?: number;
+                };
                 newProgress = {
                   stage: p.stage,
                   bugsFound: p.bugs_found ?? 0,
                   bugsVerified: p.bugs_verified ?? 0,
                   bugsRefuted: p.bugs_refuted ?? 0,
-                }
+                };
               } catch {
                 // ignore malformed progress
               }
@@ -865,15 +758,14 @@ function startRemoteSessionPolling(
           msg.type === 'assistant' ||
           (task.isRemoteReview &&
             msg.type === 'system' &&
-            (msg.subtype === 'hook_progress' ||
-              msg.subtype === 'hook_response')),
-      )
+            (msg.subtype === 'hook_progress' || msg.subtype === 'hook_response')),
+      );
       if (response.sessionStatus === 'idle' && !logGrew && hasAnyOutput) {
-        consecutiveIdlePolls++
+        consecutiveIdlePolls++;
       } else {
-        consecutiveIdlePolls = 0
+        consecutiveIdlePolls = 0;
       }
-      const stableIdle = consecutiveIdlePolls >= STABLE_IDLE_POLLS
+      const stableIdle = consecutiveIdlePolls >= STABLE_IDLE_POLLS;
       // stableIdle is a prompt-mode completion signal (Claude stops writing
       // → session idles → done). In bughunter mode the session is "idle" the
       // entire time the SessionStart hook runs; the previous guard checked
@@ -891,21 +783,14 @@ function startRemoteSessionPolling(
       const hasSessionStartHook = accumulatedLog.some(
         m =>
           m.type === 'system' &&
-          (m.subtype === 'hook_started' ||
-            m.subtype === 'hook_progress' ||
-            m.subtype === 'hook_response') &&
+          (m.subtype === 'hook_started' || m.subtype === 'hook_progress' || m.subtype === 'hook_response') &&
           (m as { hook_event?: string }).hook_event === 'SessionStart',
-      )
-      const hasAssistantEvents = accumulatedLog.some(
-        m => m.type === 'assistant',
-      )
+      );
+      const hasAssistantEvents = accumulatedLog.some(m => m.type === 'assistant');
       const sessionDone =
         task.isRemoteReview &&
-        (cachedReviewContent !== null ||
-          (!hasSessionStartHook && stableIdle && hasAssistantEvents))
-      const reviewTimedOut =
-        task.isRemoteReview &&
-        Date.now() - task.pollStartedAt > REMOTE_REVIEW_TIMEOUT_MS
+        (cachedReviewContent !== null || (!hasSessionStartHook && stableIdle && hasAssistantEvents));
+      const reviewTimedOut = task.isRemoteReview && Date.now() - task.pollStartedAt > REMOTE_REVIEW_TIMEOUT_MS;
       const newStatus = result
         ? result.subtype === 'success'
           ? ('completed' as const)
@@ -914,53 +799,44 @@ function startRemoteSessionPolling(
           ? ('completed' as const)
           : accumulatedLog.length > 0
             ? ('running' as const)
-            : ('starting' as const)
+            : ('starting' as const);
 
       // Update task state. Guard against terminal states — if stopTask raced
       // while pollRemoteSessionEvents was in-flight (status set to 'killed',
       // notified set to true), bail without overwriting status or proceeding to
       // side effects (notification, permission-mode flip).
-      let raceTerminated = false
-      updateTaskState<RemoteAgentTaskState>(
-        taskId,
-        context.setAppState,
-        prevTask => {
-          if (prevTask.status !== 'running') {
-            raceTerminated = true
-            return prevTask
-          }
-          // No log growth and status unchanged → nothing to report. Return
-          // same ref so updateTaskState skips the spread and 18 s.tasks
-          // subscribers (REPL, Spinner, PromptInput, ...) don't re-render.
-          // newProgress only arrives via log growth (heartbeat echo is a
-          // hook_progress event), so !logGrew already covers no-update.
-          const statusUnchanged =
-            newStatus === 'running' || newStatus === 'starting'
-          if (!logGrew && statusUnchanged) {
-            return prevTask
-          }
-          return {
-            ...prevTask,
-            status: newStatus === 'starting' ? 'running' : newStatus,
-            log: accumulatedLog,
-            // Only re-scan for TodoWrite when log grew — log is append-only,
-            // so no growth means no new tool_use blocks. Avoids findLast +
-            // some + find + safeParse every second when idle.
-            todoList: logGrew
-              ? extractTodoListFromLog(accumulatedLog)
-              : prevTask.todoList,
-            reviewProgress: newProgress ?? prevTask.reviewProgress,
-            endTime:
-              result || sessionDone || reviewTimedOut ? Date.now() : undefined,
-          }
-        },
-      )
-      if (raceTerminated) return
+      let raceTerminated = false;
+      updateTaskState<RemoteAgentTaskState>(taskId, context.setAppState, prevTask => {
+        if (prevTask.status !== 'running') {
+          raceTerminated = true;
+          return prevTask;
+        }
+        // No log growth and status unchanged → nothing to report. Return
+        // same ref so updateTaskState skips the spread and 18 s.tasks
+        // subscribers (REPL, Spinner, PromptInput, ...) don't re-render.
+        // newProgress only arrives via log growth (heartbeat echo is a
+        // hook_progress event), so !logGrew already covers no-update.
+        const statusUnchanged = newStatus === 'running' || newStatus === 'starting';
+        if (!logGrew && statusUnchanged) {
+          return prevTask;
+        }
+        return {
+          ...prevTask,
+          status: newStatus === 'starting' ? 'running' : newStatus,
+          log: accumulatedLog,
+          // Only re-scan for TodoWrite when log grew — log is append-only,
+          // so no growth means no new tool_use blocks. Avoids findLast +
+          // some + find + safeParse every second when idle.
+          todoList: logGrew ? extractTodoListFromLog(accumulatedLog) : prevTask.todoList,
+          reviewProgress: newProgress ?? prevTask.reviewProgress,
+          endTime: result || sessionDone || reviewTimedOut ? Date.now() : undefined,
+        };
+      });
+      if (raceTerminated) return;
 
       // Send notification if task completed or timed out
       if (result || sessionDone || reviewTimedOut) {
-        const finalStatus =
-          result && result.subtype !== 'success' ? 'failed' : 'completed'
+        const finalStatus = result && result.subtype !== 'success' ? 'failed' : 'completed';
 
         // For remote-review tasks: inject the review text directly into the
         // message queue. No mode change, no file indirection — the local model
@@ -972,63 +848,46 @@ function startRemoteSessionPolling(
           // cachedReviewContent hit the tag in the delta scan. Full-log scan
           // catches the stableIdle path where the tag arrived in an earlier
           // tick but the delta scan wasn't wired yet (first poll after resume).
-          const reviewContent =
-            cachedReviewContent ?? extractReviewFromLog(accumulatedLog)
+          const reviewContent = cachedReviewContent ?? extractReviewFromLog(accumulatedLog);
           if (reviewContent && finalStatus === 'completed') {
-            enqueueRemoteReviewNotification(
-              taskId,
-              reviewContent,
-              context.setAppState,
-            )
-            void evictTaskOutput(taskId)
-            void removeRemoteAgentMetadata(taskId)
-            return // Stop polling
+            enqueueRemoteReviewNotification(taskId, reviewContent, context.setAppState);
+            void evictTaskOutput(taskId);
+            void removeRemoteAgentMetadata(taskId);
+            return; // Stop polling
           }
 
           // No output or remote error — mark failed with a review-specific message.
           updateTaskState(taskId, context.setAppState, t => ({
             ...t,
             status: 'failed',
-          }))
+          }));
           const reason =
             result && result.subtype !== 'success'
               ? 'remote session returned an error'
               : reviewTimedOut && !sessionDone
                 ? 'remote session exceeded 30 minutes'
-                : 'no review output — orchestrator may have exited early'
-          enqueueRemoteReviewFailureNotification(
-            taskId,
-            reason,
-            context.setAppState,
-          )
-          void evictTaskOutput(taskId)
-          void removeRemoteAgentMetadata(taskId)
-          return // Stop polling
+                : 'no review output — orchestrator may have exited early';
+          enqueueRemoteReviewFailureNotification(taskId, reason, context.setAppState);
+          void evictTaskOutput(taskId);
+          void removeRemoteAgentMetadata(taskId);
+          return; // Stop polling
         }
 
-        enqueueRemoteNotification(
-          taskId,
-          task.title,
-          finalStatus,
-          context.setAppState,
-          task.toolUseId,
-        )
-        void evictTaskOutput(taskId)
-        void removeRemoteAgentMetadata(taskId)
-        return // Stop polling
+        enqueueRemoteNotification(taskId, task.title, finalStatus, context.setAppState, task.toolUseId);
+        void evictTaskOutput(taskId);
+        void removeRemoteAgentMetadata(taskId);
+        return; // Stop polling
       }
     } catch (error) {
-      logError(error)
+      logError(error);
       // Reset so an API error doesn't let non-consecutive idle polls accumulate.
-      consecutiveIdlePolls = 0
+      consecutiveIdlePolls = 0;
 
       // Check review timeout even when the API call fails — without this,
       // persistent API errors skip the timeout check and poll forever.
       try {
-        const appState = context.getAppState()
-        const task = appState.tasks?.[taskId] as
-          | RemoteAgentTaskState
-          | undefined
+        const appState = context.getAppState();
+        const task = appState.tasks?.[taskId] as RemoteAgentTaskState | undefined;
         if (
           task?.isRemoteReview &&
           task.status === 'running' &&
@@ -1038,15 +897,11 @@ function startRemoteSessionPolling(
             ...t,
             status: 'failed',
             endTime: Date.now(),
-          }))
-          enqueueRemoteReviewFailureNotification(
-            taskId,
-            'remote session exceeded 30 minutes',
-            context.setAppState,
-          )
-          void evictTaskOutput(taskId)
-          void removeRemoteAgentMetadata(taskId)
-          return // Stop polling
+          }));
+          enqueueRemoteReviewFailureNotification(taskId, 'remote session exceeded 30 minutes', context.setAppState);
+          void evictTaskOutput(taskId);
+          void removeRemoteAgentMetadata(taskId);
+          return; // Stop polling
         }
       } catch {
         // Best effort — if getAppState fails, continue polling
@@ -1055,17 +910,17 @@ function startRemoteSessionPolling(
 
     // Continue polling
     if (isRunning) {
-      setTimeout(poll, POLL_INTERVAL_MS)
+      setTimeout(poll, POLL_INTERVAL_MS);
     }
-  }
+  };
 
   // Start polling
-  void poll()
+  void poll();
 
   // Return cleanup function
   return () => {
-    isRunning = false
-  }
+    isRunning = false;
+  };
 }
 
 /**
@@ -1079,25 +934,25 @@ export const RemoteAgentTask: Task = {
   name: 'RemoteAgentTask',
   type: 'remote_agent',
   async kill(taskId, setAppState) {
-    let toolUseId: string | undefined
-    let description: string | undefined
-    let sessionId: string | undefined
-    let killed = false
+    let toolUseId: string | undefined;
+    let description: string | undefined;
+    let sessionId: string | undefined;
+    let killed = false;
     updateTaskState<RemoteAgentTaskState>(taskId, setAppState, task => {
       if (task.status !== 'running') {
-        return task
+        return task;
       }
-      toolUseId = task.toolUseId
-      description = task.description
-      sessionId = task.sessionId
-      killed = true
+      toolUseId = task.toolUseId;
+      description = task.description;
+      sessionId = task.sessionId;
+      killed = true;
       return {
         ...task,
         status: 'killed',
         notified: true,
         endTime: Date.now(),
-      }
-    })
+      };
+    });
 
     // Close the task_started bookend for SDK consumers. The poll loop's
     // early-return when status!=='running' won't emit a notification.
@@ -1105,26 +960,24 @@ export const RemoteAgentTask: Task = {
       emitTaskTerminatedSdk(taskId, 'stopped', {
         toolUseId,
         summary: description,
-      })
+      });
       // Archive the remote session so it stops consuming cloud resources.
       if (sessionId) {
         void archiveRemoteSession(sessionId).catch(e =>
           logForDebugging(`RemoteAgentTask archive failed: ${String(e)}`),
-        )
+        );
       }
     }
 
-    void evictTaskOutput(taskId)
-    void removeRemoteAgentMetadata(taskId)
-    logForDebugging(
-      `RemoteAgentTask ${taskId} killed, archiving session ${sessionId ?? 'unknown'}`,
-    )
+    void evictTaskOutput(taskId);
+    void removeRemoteAgentMetadata(taskId);
+    logForDebugging(`RemoteAgentTask ${taskId} killed, archiving session ${sessionId ?? 'unknown'}`);
   },
-}
+};
 
 /**
  * Get the session URL for a remote task.
  */
 export function getRemoteTaskSessionUrl(sessionId: string): string {
-  return getRemoteSessionUrl(sessionId, process.env.SESSION_INGRESS_URL)
+  return getRemoteSessionUrl(sessionId, process.env.SESSION_INGRESS_URL);
 }
diff --git a/src/tools.ts b/src/tools.ts
index 9c956ff65..3417ca1b6 100644
--- a/src/tools.ts
+++ b/src/tools.ts
@@ -15,7 +15,8 @@ import { BriefTool } from '@claude-code-best/builtin-tools/tools/BriefTool/Brief
 /* eslint-disable custom-rules/no-process-env-top-level, @typescript-eslint/no-require-imports */
 const REPLTool =
   process.env.USER_TYPE === 'ant'
-    ? require('@claude-code-best/builtin-tools/tools/REPLTool/REPLTool.js').REPLTool
+    ? require('@claude-code-best/builtin-tools/tools/REPLTool/REPLTool.js')
+        .REPLTool
     : null
 const SuggestBackgroundPRTool =
   process.env.USER_TYPE === 'ant'
@@ -24,21 +25,28 @@ const SuggestBackgroundPRTool =
     : null
 const SleepTool =
   feature('PROACTIVE') || feature('KAIROS')
-    ? require('@claude-code-best/builtin-tools/tools/SleepTool/SleepTool.js').SleepTool
+    ? require('@claude-code-best/builtin-tools/tools/SleepTool/SleepTool.js')
+        .SleepTool
     : null
 const cronTools = [
-  require('@claude-code-best/builtin-tools/tools/ScheduleCronTool/CronCreateTool.js').CronCreateTool,
-  require('@claude-code-best/builtin-tools/tools/ScheduleCronTool/CronDeleteTool.js').CronDeleteTool,
-  require('@claude-code-best/builtin-tools/tools/ScheduleCronTool/CronListTool.js').CronListTool,
+  require('@claude-code-best/builtin-tools/tools/ScheduleCronTool/CronCreateTool.js')
+    .CronCreateTool,
+  require('@claude-code-best/builtin-tools/tools/ScheduleCronTool/CronDeleteTool.js')
+    .CronDeleteTool,
+  require('@claude-code-best/builtin-tools/tools/ScheduleCronTool/CronListTool.js')
+    .CronListTool,
 ]
 const RemoteTriggerTool = feature('AGENT_TRIGGERS_REMOTE')
-  ? require('@claude-code-best/builtin-tools/tools/RemoteTriggerTool/RemoteTriggerTool.js').RemoteTriggerTool
+  ? require('@claude-code-best/builtin-tools/tools/RemoteTriggerTool/RemoteTriggerTool.js')
+      .RemoteTriggerTool
   : null
 const MonitorTool = feature('MONITOR_TOOL')
-  ? require('@claude-code-best/builtin-tools/tools/MonitorTool/MonitorTool.js').MonitorTool
+  ? require('@claude-code-best/builtin-tools/tools/MonitorTool/MonitorTool.js')
+      .MonitorTool
   : null
 const SendUserFileTool = feature('KAIROS')
-  ? require('@claude-code-best/builtin-tools/tools/SendUserFileTool/SendUserFileTool.js').SendUserFileTool
+  ? require('@claude-code-best/builtin-tools/tools/SendUserFileTool/SendUserFileTool.js')
+      .SendUserFileTool
   : null
 const PushNotificationTool =
   feature('KAIROS') || feature('KAIROS_PUSH_NOTIFICATION')
@@ -46,7 +54,8 @@ const PushNotificationTool =
         .PushNotificationTool
     : null
 const SubscribePRTool = feature('KAIROS_GITHUB_WEBHOOKS')
-  ? require('@claude-code-best/builtin-tools/tools/SubscribePRTool/SubscribePRTool.js').SubscribePRTool
+  ? require('@claude-code-best/builtin-tools/tools/SubscribePRTool/SubscribePRTool.js')
+      .SubscribePRTool
   : null
 /* eslint-enable custom-rules/no-process-env-top-level, @typescript-eslint/no-require-imports */
 import { TaskOutputTool } from '@claude-code-best/builtin-tools/tools/TaskOutputTool/TaskOutputTool.js'
@@ -103,35 +112,41 @@ import { feature } from 'bun:bundle'
 // Dead code elimination: conditional import for OVERFLOW_TEST_TOOL
 /* eslint-disable custom-rules/no-process-env-top-level, @typescript-eslint/no-require-imports */
 const OverflowTestTool = feature('OVERFLOW_TEST_TOOL')
-  ? require('@claude-code-best/builtin-tools/tools/OverflowTestTool/OverflowTestTool.js').OverflowTestTool
+  ? require('@claude-code-best/builtin-tools/tools/OverflowTestTool/OverflowTestTool.js')
+      .OverflowTestTool
   : null
 const CtxInspectTool = feature('CONTEXT_COLLAPSE')
-  ? require('@claude-code-best/builtin-tools/tools/CtxInspectTool/CtxInspectTool.js').CtxInspectTool
+  ? require('@claude-code-best/builtin-tools/tools/CtxInspectTool/CtxInspectTool.js')
+      .CtxInspectTool
   : null
 const TerminalCaptureTool = feature('TERMINAL_PANEL')
   ? require('@claude-code-best/builtin-tools/tools/TerminalCaptureTool/TerminalCaptureTool.js')
       .TerminalCaptureTool
   : null
 const WebBrowserTool = feature('WEB_BROWSER_TOOL')
-  ? require('@claude-code-best/builtin-tools/tools/WebBrowserTool/WebBrowserTool.js').WebBrowserTool
+  ? require('@claude-code-best/builtin-tools/tools/WebBrowserTool/WebBrowserTool.js')
+      .WebBrowserTool
   : null
 const coordinatorModeModule = feature('COORDINATOR_MODE')
   ? (require('./coordinator/coordinatorMode.js') as typeof import('./coordinator/coordinatorMode.js'))
   : null
 const SnipTool = feature('HISTORY_SNIP')
-  ? require('@claude-code-best/builtin-tools/tools/SnipTool/SnipTool.js').SnipTool
+  ? require('@claude-code-best/builtin-tools/tools/SnipTool/SnipTool.js')
+      .SnipTool
   : null
 const ReviewArtifactTool = feature('REVIEW_ARTIFACT')
   ? require('@claude-code-best/builtin-tools/tools/ReviewArtifactTool/ReviewArtifactTool.js')
       .ReviewArtifactTool
   : null
 const ListPeersTool = feature('UDS_INBOX')
-  ? require('@claude-code-best/builtin-tools/tools/ListPeersTool/ListPeersTool.js').ListPeersTool
+  ? require('@claude-code-best/builtin-tools/tools/ListPeersTool/ListPeersTool.js')
+      .ListPeersTool
   : null
 const WorkflowTool = feature('WORKFLOW_SCRIPTS')
   ? (() => {
       require('@claude-code-best/builtin-tools/tools/WorkflowTool/bundled/index.js').initBundledWorkflows()
-      return require('@claude-code-best/builtin-tools/tools/WorkflowTool/WorkflowTool.js').WorkflowTool
+      return require('@claude-code-best/builtin-tools/tools/WorkflowTool/WorkflowTool.js')
+        .WorkflowTool
     })()
   : null
 /* eslint-enable custom-rules/no-process-env-top-level, @typescript-eslint/no-require-imports */
diff --git a/src/types/connectorText.ts b/src/types/connectorText.ts
index a9aa0853d..b6ffca496 100644
--- a/src/types/connectorText.ts
+++ b/src/types/connectorText.ts
@@ -1,4 +1,19 @@
 // Auto-generated stub — replace with real implementation
-export type ConnectorTextBlock = { type: string; connector_text: string; signature?: string; [key: string]: unknown };
-export type ConnectorTextDelta = { type: string; connector_text: string; text?: string; thinking?: string; signature?: string; [key: string]: unknown };
-export const isConnectorTextBlock: (block: unknown) => block is ConnectorTextBlock = (_block): _block is ConnectorTextBlock => false;
+export type ConnectorTextBlock = {
+  type: string
+  connector_text: string
+  signature?: string
+  [key: string]: unknown
+}
+export type ConnectorTextDelta = {
+  type: string
+  connector_text: string
+  text?: string
+  thinking?: string
+  signature?: string
+  [key: string]: unknown
+}
+export const isConnectorTextBlock: (
+  block: unknown,
+) => block is ConnectorTextBlock = (_block): _block is ConnectorTextBlock =>
+  false
diff --git a/src/types/fileSuggestion.ts b/src/types/fileSuggestion.ts
index c92a18b96..7a384688a 100644
--- a/src/types/fileSuggestion.ts
+++ b/src/types/fileSuggestion.ts
@@ -1,2 +1,2 @@
 // Auto-generated stub — replace with real implementation
-export type FileSuggestionCommandInput = any;
+export type FileSuggestionCommandInput = any
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index df6cc7bd2..539126983 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -21,7 +21,9 @@ declare namespace MACRO {
 // These are referenced inside `MACRO(() => ...)` or `false && ...` blocks.
 
 // Model resolution (internal)
-declare function resolveAntModel(model: string): import('../utils/model/antModels.js').AntModel | undefined
+declare function resolveAntModel(
+  model: string,
+): import('../utils/model/antModels.js').AntModel | undefined
 declare function getAntModels(): import('../utils/model/antModels.js').AntModel[]
 declare function getAntModelOverrideConfig(): {
   defaultSystemPromptSuffix?: string
@@ -31,7 +33,13 @@ declare function getAntModelOverrideConfig(): {
 // Companion reactions handled by src/buddy/companionReact.ts (direct import)
 
 // Metrics (internal)
-type ApiMetricEntry = { ttftMs: number; firstTokenTime: number; lastTokenTime: number; responseLengthBaseline: number; endResponseLength: number }
+type ApiMetricEntry = {
+  ttftMs: number
+  firstTokenTime: number
+  lastTokenTime: number
+  responseLengthBaseline: number
+  endResponseLength: number
+}
 declare const apiMetricsRef: React.RefObject<ApiMetricEntry[]> | null
 declare function computeTtftText(metrics: ApiMetricEntry[]): string
 
@@ -53,7 +61,10 @@ declare const HOOK_TIMING_DISPLAY_THRESHOLD_MS: number
 declare type T = unknown
 
 // Tungsten (internal)
-declare function TungstenPill(props?: { key?: string; selected?: boolean }): JSX.Element | null
+declare function TungstenPill(props?: {
+  key?: string
+  selected?: boolean
+}): JSX.Element | null
 
 // ============================================================================
 // Build-time constants BUILD_TARGET/BUILD_ENV/INTERFACE_TYPE — removed (zero runtime usage)
diff --git a/src/types/ink-elements.d.ts b/src/types/ink-elements.d.ts
index f98f08e53..86542b155 100644
--- a/src/types/ink-elements.d.ts
+++ b/src/types/ink-elements.d.ts
@@ -1,45 +1,52 @@
 // Type declarations for custom Ink JSX elements
 // Note: The detailed prop types are defined in ink-jsx.d.ts via React module augmentation.
 // This file provides the global JSX namespace fallback declarations.
-import type { ReactNode, Ref } from 'react';
-import type { ClickEvent, FocusEvent, KeyboardEvent, Styles, TextStyles, DOMElement } from '@anthropic/ink';
+import type { ReactNode, Ref } from 'react'
+import type {
+  ClickEvent,
+  FocusEvent,
+  KeyboardEvent,
+  Styles,
+  TextStyles,
+  DOMElement,
+} from '@anthropic/ink'
 
 declare global {
   namespace JSX {
     interface IntrinsicElements {
       'ink-box': {
-        ref?: Ref<DOMElement>;
-        tabIndex?: number;
-        autoFocus?: boolean;
-        onClick?: (event: ClickEvent) => void;
-        onFocus?: (event: FocusEvent) => void;
-        onFocusCapture?: (event: FocusEvent) => void;
-        onBlur?: (event: FocusEvent) => void;
-        onBlurCapture?: (event: FocusEvent) => void;
-        onMouseEnter?: () => void;
-        onMouseLeave?: () => void;
-        onKeyDown?: (event: KeyboardEvent) => void;
-        onKeyDownCapture?: (event: KeyboardEvent) => void;
-        style?: Styles;
-        stickyScroll?: boolean;
-        children?: ReactNode;
-      };
+        ref?: Ref<DOMElement>
+        tabIndex?: number
+        autoFocus?: boolean
+        onClick?: (event: ClickEvent) => void
+        onFocus?: (event: FocusEvent) => void
+        onFocusCapture?: (event: FocusEvent) => void
+        onBlur?: (event: FocusEvent) => void
+        onBlurCapture?: (event: FocusEvent) => void
+        onMouseEnter?: () => void
+        onMouseLeave?: () => void
+        onKeyDown?: (event: KeyboardEvent) => void
+        onKeyDownCapture?: (event: KeyboardEvent) => void
+        style?: Styles
+        stickyScroll?: boolean
+        children?: ReactNode
+      }
       'ink-text': {
-        style?: Styles;
-        textStyles?: TextStyles;
-        children?: ReactNode;
-      };
+        style?: Styles
+        textStyles?: TextStyles
+        children?: ReactNode
+      }
       'ink-link': {
-        href?: string;
-        children?: ReactNode;
-      };
+        href?: string
+        children?: ReactNode
+      }
       'ink-raw-ansi': {
-        rawText?: string;
-        rawWidth?: number;
-        rawHeight?: number;
-      };
+        rawText?: string
+        rawWidth?: number
+        rawHeight?: number
+      }
     }
   }
 }
 
-export {};
+export {}
diff --git a/src/types/ink-jsx.d.ts b/src/types/ink-jsx.d.ts
index 2c8911c71..7b4c6168b 100644
--- a/src/types/ink-jsx.d.ts
+++ b/src/types/ink-jsx.d.ts
@@ -8,43 +8,50 @@
  * This file must be a module (have an import/export) for `declare module`
  * augmentation to work correctly.
  */
-import type { ReactNode, Ref } from 'react';
-import type { ClickEvent, FocusEvent, KeyboardEvent, Styles, TextStyles, DOMElement } from '@anthropic/ink';
+import type { ReactNode, Ref } from 'react'
+import type {
+  ClickEvent,
+  FocusEvent,
+  KeyboardEvent,
+  Styles,
+  TextStyles,
+  DOMElement,
+} from '@anthropic/ink'
 
 declare module 'react' {
   namespace JSX {
     interface IntrinsicElements {
       'ink-box': {
-        ref?: Ref<DOMElement>;
-        tabIndex?: number;
-        autoFocus?: boolean;
-        onClick?: (event: ClickEvent) => void;
-        onFocus?: (event: FocusEvent) => void;
-        onFocusCapture?: (event: FocusEvent) => void;
-        onBlur?: (event: FocusEvent) => void;
-        onBlurCapture?: (event: FocusEvent) => void;
-        onMouseEnter?: () => void;
-        onMouseLeave?: () => void;
-        onKeyDown?: (event: KeyboardEvent) => void;
-        onKeyDownCapture?: (event: KeyboardEvent) => void;
-        style?: Styles;
-        stickyScroll?: boolean;
-        children?: ReactNode;
-      };
+        ref?: Ref<DOMElement>
+        tabIndex?: number
+        autoFocus?: boolean
+        onClick?: (event: ClickEvent) => void
+        onFocus?: (event: FocusEvent) => void
+        onFocusCapture?: (event: FocusEvent) => void
+        onBlur?: (event: FocusEvent) => void
+        onBlurCapture?: (event: FocusEvent) => void
+        onMouseEnter?: () => void
+        onMouseLeave?: () => void
+        onKeyDown?: (event: KeyboardEvent) => void
+        onKeyDownCapture?: (event: KeyboardEvent) => void
+        style?: Styles
+        stickyScroll?: boolean
+        children?: ReactNode
+      }
       'ink-text': {
-        style?: Styles;
-        textStyles?: TextStyles;
-        children?: ReactNode;
-      };
+        style?: Styles
+        textStyles?: TextStyles
+        children?: ReactNode
+      }
       'ink-link': {
-        href?: string;
-        children?: ReactNode;
-      };
+        href?: string
+        children?: ReactNode
+      }
       'ink-raw-ansi': {
-        rawText?: string;
-        rawWidth?: number;
-        rawHeight?: number;
-      };
+        rawText?: string
+        rawWidth?: number
+        rawHeight?: number
+      }
     }
   }
 }
diff --git a/src/types/internal-modules.d.ts b/src/types/internal-modules.d.ts
index 6f94d93e9..7d2606df9 100644
--- a/src/types/internal-modules.d.ts
+++ b/src/types/internal-modules.d.ts
@@ -7,25 +7,44 @@
 // ============================================================================
 // bun:bundle — compile-time macros
 // ============================================================================
-declare module "bun:bundle" {
-    export function feature(name: string): boolean;
+declare module 'bun:bundle' {
+  export function feature(name: string): boolean
 }
 
-declare module "bun:ffi" {
-    export function dlopen<T extends Record<string, { args: readonly string[]; returns: string }>>(path: string, symbols: T): { symbols: { [K in keyof T]: (...args: unknown[]) => unknown }; close(): void };
+declare module 'bun:ffi' {
+  export function dlopen<
+    T extends Record<string, { args: readonly string[]; returns: string }>,
+  >(
+    path: string,
+    symbols: T,
+  ): {
+    symbols: { [K in keyof T]: (...args: unknown[]) => unknown }
+    close(): void
+  }
 }
 
 // Third-party modules without @types packages
 declare module 'bidi-js' {
-  function getEmbeddingLevels(text: string, defaultDirection?: string): { paragraphLevel: number; levels: Uint8Array }
-  function getReorderSegments(text: string, embeddingLevels: { paragraphLevel: number; levels: Uint8Array }, start?: number, end?: number): [number, number][]
+  function getEmbeddingLevels(
+    text: string,
+    defaultDirection?: string,
+  ): { paragraphLevel: number; levels: Uint8Array }
+  function getReorderSegments(
+    text: string,
+    embeddingLevels: { paragraphLevel: number; levels: Uint8Array },
+    start?: number,
+    end?: number,
+  ): [number, number][]
   function getVisualOrder(reorderSegments: [number, number][]): number[]
   export { getEmbeddingLevels, getReorderSegments, getVisualOrder }
   export default { getEmbeddingLevels, getReorderSegments, getVisualOrder }
 }
 
 declare module 'asciichart' {
-  function plot(series: number[] | number[][], config?: Record<string, unknown>): string
+  function plot(
+    series: number[] | number[][],
+    config?: Record<string, unknown>,
+  ): string
   export { plot }
   export default { plot }
 }
diff --git a/src/types/message.ts b/src/types/message.ts
index 567bae475..b88b5e820 100644
--- a/src/types/message.ts
+++ b/src/types/message.ts
@@ -16,7 +16,14 @@ import type {
  * Individual message subtypes (UserMessage, AssistantMessage, etc.) extend
  * this with narrower `type` literals and additional fields.
  */
-export type MessageType = 'user' | 'assistant' | 'system' | 'attachment' | 'progress' | 'grouped_tool_use' | 'collapsed_read_search'
+export type MessageType =
+  | 'user'
+  | 'assistant'
+  | 'system'
+  | 'attachment'
+  | 'progress'
+  | 'grouped_tool_use'
+  | 'collapsed_read_search'
 
 /** A single content element inside message.content arrays. */
 export type ContentItem = ContentBlockParam | ContentBlock
@@ -37,7 +44,14 @@ export type Message = {
   isCompactSummary?: boolean
   toolUseResult?: unknown
   isVisibleInTranscriptOnly?: boolean
-  attachment?: { type: string; toolUseID?: string; [key: string]: unknown; addedNames: string[]; addedLines: string[]; removedNames: string[] }
+  attachment?: {
+    type: string
+    toolUseID?: string
+    [key: string]: unknown
+    addedNames: string[]
+    addedLines: string[]
+    removedNames: string[]
+  }
   message?: {
     role?: string
     id?: string
@@ -52,8 +66,12 @@ export type AssistantMessage = Message & {
   type: 'assistant'
   message: NonNullable<Message['message']>
 }
-export type AttachmentMessage<T = { type: string; [key: string]: unknown }> = Message & { type: 'attachment'; attachment: T }
-export type ProgressMessage<T = unknown> = Message & { type: 'progress'; data: T }
+export type AttachmentMessage<T = { type: string; [key: string]: unknown }> =
+  Message & { type: 'attachment'; attachment: T }
+export type ProgressMessage<T = unknown> = Message & {
+  type: 'progress'
+  data: T
+}
 export type SystemLocalCommandMessage = Message & { type: 'system' }
 export type SystemMessage = Message & { type: 'system' }
 export type UserMessage = Message & {
@@ -126,7 +144,14 @@ export type RenderableMessage =
   | AssistantMessage
   | UserMessage
   | (Message & { type: 'system' })
-  | (Message & { type: 'attachment'; attachment: { type: string; memories?: { path: string; content: string; mtimeMs: number }[]; [key: string]: unknown } })
+  | (Message & {
+      type: 'attachment'
+      attachment: {
+        type: string
+        memories?: { path: string; content: string; mtimeMs: number }[]
+        [key: string]: unknown
+      }
+    })
   | (Message & { type: 'progress' })
   | GroupedToolUseMessage
   | CollapsedReadSearchGroup
diff --git a/src/types/messageQueueTypes.ts b/src/types/messageQueueTypes.ts
index 6543963b2..63d7a1569 100644
--- a/src/types/messageQueueTypes.ts
+++ b/src/types/messageQueueTypes.ts
@@ -7,4 +7,4 @@ export type QueueOperationMessage = {
   content?: string
   [key: string]: unknown
 }
-export type QueueOperation = 'enqueue' | 'dequeue' | 'remove' | string;
+export type QueueOperation = 'enqueue' | 'dequeue' | 'remove' | string
diff --git a/src/types/notebook.ts b/src/types/notebook.ts
index 3ac9b2a02..012b8fd2d 100644
--- a/src/types/notebook.ts
+++ b/src/types/notebook.ts
@@ -1,8 +1,8 @@
 // Auto-generated stub — replace with real implementation
-export type NotebookCell = any;
-export type NotebookContent = any;
-export type NotebookCellOutput = any;
-export type NotebookCellSource = any;
-export type NotebookCellSourceOutput = any;
-export type NotebookOutputImage = any;
-export type NotebookCellType = any;
+export type NotebookCell = any
+export type NotebookContent = any
+export type NotebookCellOutput = any
+export type NotebookCellSource = any
+export type NotebookCellSourceOutput = any
+export type NotebookOutputImage = any
+export type NotebookCellType = any
diff --git a/src/types/sdk-stubs.d.ts b/src/types/sdk-stubs.d.ts
index 6633a5eb1..272d6f85c 100644
--- a/src/types/sdk-stubs.d.ts
+++ b/src/types/sdk-stubs.d.ts
@@ -9,7 +9,7 @@
 // ============================================================================
 // coreTypes.generated.js — Generated from coreSchemas.ts Zod schemas
 // ============================================================================
-declare module "*/sdk/coreTypes.generated.js" {
+declare module '*/sdk/coreTypes.generated.js' {
   // Usage & Model
   export type ModelUsage = {
     inputTokens: number
@@ -32,20 +32,20 @@ declare module "*/sdk/coreTypes.generated.js" {
   export type McpServerConfigForProcessTransport = {
     command: string
     args: string[]
-    type?: "stdio"
+    type?: 'stdio'
     env?: Record<string, string>
   } & { scope: string; pluginSource?: string }
   export type McpServerStatus = {
     name: string
-    status: "connected" | "disconnected" | "error"
+    status: 'connected' | 'disconnected' | 'error'
     [key: string]: unknown
   }
 
   // Permissions
   export type PermissionMode = string
   export type PermissionResult =
-    | { behavior: "allow" }
-    | { behavior: "deny"; message?: string }
+    | { behavior: 'allow' }
+    | { behavior: 'deny'; message?: string }
   export type PermissionUpdate = {
     path: string
     permission: string
@@ -91,21 +91,56 @@ declare module "*/sdk/coreTypes.generated.js" {
 
   // SDK Message types
   export type SDKMessage = { type: string; [key: string]: unknown }
-  export type SDKUserMessage = { type: "user"; content: unknown; uuid: string; [key: string]: unknown }
+  export type SDKUserMessage = {
+    type: 'user'
+    content: unknown
+    uuid: string
+    [key: string]: unknown
+  }
   export type SDKUserMessageReplay = SDKUserMessage
-  export type SDKAssistantMessage = { type: "assistant"; content: unknown; [key: string]: unknown }
-  export type SDKAssistantErrorMessage = { type: "assistant_error"; error: unknown; [key: string]: unknown }
-  export type SDKAssistantMessageError = 'authentication_failed' | 'billing_error' | 'rate_limit' | 'invalid_request' | 'server_error' | 'unknown' | 'max_output_tokens'
-  export type SDKPartialAssistantMessage = { type: "partial_assistant"; [key: string]: unknown }
-  export type SDKResultMessage = { type: "result"; [key: string]: unknown }
-  export type SDKResultSuccess = { type: "result_success"; [key: string]: unknown }
-  export type SDKSystemMessage = { type: "system"; [key: string]: unknown }
-  export type SDKStatusMessage = { type: "status"; [key: string]: unknown }
-  export type SDKToolProgressMessage = { type: "tool_progress"; [key: string]: unknown }
-  export type SDKCompactBoundaryMessage = { type: "compact_boundary"; [key: string]: unknown }
-  export type SDKPermissionDenial = { type: "permission_denial"; [key: string]: unknown }
-  export type SDKRateLimitInfo = { type: "rate_limit"; [key: string]: unknown }
-  export type SDKStatus = "active" | "idle" | "error" | string
+  export type SDKAssistantMessage = {
+    type: 'assistant'
+    content: unknown
+    [key: string]: unknown
+  }
+  export type SDKAssistantErrorMessage = {
+    type: 'assistant_error'
+    error: unknown
+    [key: string]: unknown
+  }
+  export type SDKAssistantMessageError =
+    | 'authentication_failed'
+    | 'billing_error'
+    | 'rate_limit'
+    | 'invalid_request'
+    | 'server_error'
+    | 'unknown'
+    | 'max_output_tokens'
+  export type SDKPartialAssistantMessage = {
+    type: 'partial_assistant'
+    [key: string]: unknown
+  }
+  export type SDKResultMessage = { type: 'result'; [key: string]: unknown }
+  export type SDKResultSuccess = {
+    type: 'result_success'
+    [key: string]: unknown
+  }
+  export type SDKSystemMessage = { type: 'system'; [key: string]: unknown }
+  export type SDKStatusMessage = { type: 'status'; [key: string]: unknown }
+  export type SDKToolProgressMessage = {
+    type: 'tool_progress'
+    [key: string]: unknown
+  }
+  export type SDKCompactBoundaryMessage = {
+    type: 'compact_boundary'
+    [key: string]: unknown
+  }
+  export type SDKPermissionDenial = {
+    type: 'permission_denial'
+    [key: string]: unknown
+  }
+  export type SDKRateLimitInfo = { type: 'rate_limit'; [key: string]: unknown }
+  export type SDKStatus = 'active' | 'idle' | 'error' | string
   export type SDKSessionInfo = {
     sessionId: string
     summary?: string
diff --git a/src/types/src/entrypoints/agentSdkTypes.ts b/src/types/src/entrypoints/agentSdkTypes.ts
index d06fee6e9..9e22e8af6 100644
--- a/src/types/src/entrypoints/agentSdkTypes.ts
+++ b/src/types/src/entrypoints/agentSdkTypes.ts
@@ -1,8 +1,8 @@
 // Auto-generated type stub — replace with real implementation
-export type HookEvent = any;
-export type HOOK_EVENTS = any;
-export type HookInput = any;
-export type PermissionUpdate = any;
-export type HookJSONOutput = any;
-export type AsyncHookJSONOutput = any;
-export type SyncHookJSONOutput = any;
+export type HookEvent = any
+export type HOOK_EVENTS = any
+export type HookInput = any
+export type PermissionUpdate = any
+export type HookJSONOutput = any
+export type AsyncHookJSONOutput = any
+export type SyncHookJSONOutput = any
diff --git a/src/types/src/types/message.ts b/src/types/src/types/message.ts
index 585895d8e..5febc8ae0 100644
--- a/src/types/src/types/message.ts
+++ b/src/types/src/types/message.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type Message = any;
+export type Message = any
diff --git a/src/types/src/utils/fileHistory.ts b/src/types/src/utils/fileHistory.ts
index f1dbe566a..1a0a69b20 100644
--- a/src/types/src/utils/fileHistory.ts
+++ b/src/types/src/utils/fileHistory.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type FileHistorySnapshot = any;
+export type FileHistorySnapshot = any
diff --git a/src/types/src/utils/permissions/PermissionResult.ts b/src/types/src/utils/permissions/PermissionResult.ts
index 4ffc39c69..454f0e1ff 100644
--- a/src/types/src/utils/permissions/PermissionResult.ts
+++ b/src/types/src/utils/permissions/PermissionResult.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type PermissionResult = any;
+export type PermissionResult = any
diff --git a/src/types/src/utils/permissions/PermissionRule.ts b/src/types/src/utils/permissions/PermissionRule.ts
index 2b6b7b27a..67b1e38ef 100644
--- a/src/types/src/utils/permissions/PermissionRule.ts
+++ b/src/types/src/utils/permissions/PermissionRule.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type permissionBehaviorSchema = any;
+export type permissionBehaviorSchema = any
diff --git a/src/types/src/utils/permissions/PermissionUpdateSchema.ts b/src/types/src/utils/permissions/PermissionUpdateSchema.ts
index a56a548e6..408c8896a 100644
--- a/src/types/src/utils/permissions/PermissionUpdateSchema.ts
+++ b/src/types/src/utils/permissions/PermissionUpdateSchema.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type permissionUpdateSchema = any;
+export type permissionUpdateSchema = any
diff --git a/src/types/src/utils/toolResultStorage.ts b/src/types/src/utils/toolResultStorage.ts
index 2229baa6d..e1f51f493 100644
--- a/src/types/src/utils/toolResultStorage.ts
+++ b/src/types/src/utils/toolResultStorage.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type ContentReplacementRecord = any;
+export type ContentReplacementRecord = any
diff --git a/src/types/statusLine.ts b/src/types/statusLine.ts
index 059480875..4467e526b 100644
--- a/src/types/statusLine.ts
+++ b/src/types/statusLine.ts
@@ -1,2 +1,2 @@
 // Auto-generated stub — replace with real implementation
-export type StatusLineCommandInput = any;
+export type StatusLineCommandInput = any
diff --git a/src/types/tools.ts b/src/types/tools.ts
index 218d782f6..b022c61da 100644
--- a/src/types/tools.ts
+++ b/src/types/tools.ts
@@ -1,12 +1,12 @@
 // Auto-generated stub — replace with real implementation
-export type AgentToolProgress = any;
-export type BashProgress = any;
-export type MCPProgress = any;
-export type REPLToolProgress = any;
-export type SkillToolProgress = any;
-export type TaskOutputProgress = any;
-export type ToolProgressData = any;
-export type WebSearchProgress = any;
-export type ShellProgress = any;
-export type PowerShellProgress = any;
-export type SdkWorkflowProgress = any;
+export type AgentToolProgress = any
+export type BashProgress = any
+export type MCPProgress = any
+export type REPLToolProgress = any
+export type SkillToolProgress = any
+export type TaskOutputProgress = any
+export type ToolProgressData = any
+export type WebSearchProgress = any
+export type ShellProgress = any
+export type PowerShellProgress = any
+export type SdkWorkflowProgress = any
diff --git a/src/types/utils.ts b/src/types/utils.ts
index 208e5dd8a..66f5cbb18 100644
--- a/src/types/utils.ts
+++ b/src/types/utils.ts
@@ -1,3 +1,3 @@
 // Auto-generated stub — replace with real implementation
-export type DeepImmutable<T> = T;
-export type Permutations<T> = T[];
+export type DeepImmutable<T> = T
+export type Permutations<T> = T[]
diff --git a/src/utils/__tests__/CircularBuffer.test.ts b/src/utils/__tests__/CircularBuffer.test.ts
index 96d5b6ec3..07866dcd2 100644
--- a/src/utils/__tests__/CircularBuffer.test.ts
+++ b/src/utils/__tests__/CircularBuffer.test.ts
@@ -1,102 +1,102 @@
-import { describe, expect, test } from "bun:test";
-import { CircularBuffer } from "../CircularBuffer";
+import { describe, expect, test } from 'bun:test'
+import { CircularBuffer } from '../CircularBuffer'
 
-describe("CircularBuffer", () => {
-  test("starts empty", () => {
-    const buf = new CircularBuffer<number>(5);
-    expect(buf.length()).toBe(0);
-    expect(buf.toArray()).toEqual([]);
-  });
+describe('CircularBuffer', () => {
+  test('starts empty', () => {
+    const buf = new CircularBuffer<number>(5)
+    expect(buf.length()).toBe(0)
+    expect(buf.toArray()).toEqual([])
+  })
 
-  test("adds items up to capacity", () => {
-    const buf = new CircularBuffer<number>(3);
-    buf.add(1);
-    buf.add(2);
-    buf.add(3);
-    expect(buf.length()).toBe(3);
-    expect(buf.toArray()).toEqual([1, 2, 3]);
-  });
+  test('adds items up to capacity', () => {
+    const buf = new CircularBuffer<number>(3)
+    buf.add(1)
+    buf.add(2)
+    buf.add(3)
+    expect(buf.length()).toBe(3)
+    expect(buf.toArray()).toEqual([1, 2, 3])
+  })
 
-  test("evicts oldest when full", () => {
-    const buf = new CircularBuffer<number>(3);
-    buf.add(1);
-    buf.add(2);
-    buf.add(3);
-    buf.add(4);
-    expect(buf.length()).toBe(3);
-    expect(buf.toArray()).toEqual([2, 3, 4]);
-  });
+  test('evicts oldest when full', () => {
+    const buf = new CircularBuffer<number>(3)
+    buf.add(1)
+    buf.add(2)
+    buf.add(3)
+    buf.add(4)
+    expect(buf.length()).toBe(3)
+    expect(buf.toArray()).toEqual([2, 3, 4])
+  })
 
-  test("evicts multiple oldest items", () => {
-    const buf = new CircularBuffer<number>(2);
-    buf.add(1);
-    buf.add(2);
-    buf.add(3);
-    buf.add(4);
-    buf.add(5);
-    expect(buf.toArray()).toEqual([4, 5]);
-  });
+  test('evicts multiple oldest items', () => {
+    const buf = new CircularBuffer<number>(2)
+    buf.add(1)
+    buf.add(2)
+    buf.add(3)
+    buf.add(4)
+    buf.add(5)
+    expect(buf.toArray()).toEqual([4, 5])
+  })
 
-  test("addAll adds multiple items", () => {
-    const buf = new CircularBuffer<number>(5);
-    buf.addAll([1, 2, 3]);
-    expect(buf.toArray()).toEqual([1, 2, 3]);
-  });
+  test('addAll adds multiple items', () => {
+    const buf = new CircularBuffer<number>(5)
+    buf.addAll([1, 2, 3])
+    expect(buf.toArray()).toEqual([1, 2, 3])
+  })
 
-  test("addAll with overflow", () => {
-    const buf = new CircularBuffer<number>(3);
-    buf.addAll([1, 2, 3, 4, 5]);
-    expect(buf.toArray()).toEqual([3, 4, 5]);
-  });
+  test('addAll with overflow', () => {
+    const buf = new CircularBuffer<number>(3)
+    buf.addAll([1, 2, 3, 4, 5])
+    expect(buf.toArray()).toEqual([3, 4, 5])
+  })
 
-  test("getRecent returns last N items", () => {
-    const buf = new CircularBuffer<number>(5);
-    buf.addAll([1, 2, 3, 4, 5]);
-    expect(buf.getRecent(3)).toEqual([3, 4, 5]);
-  });
+  test('getRecent returns last N items', () => {
+    const buf = new CircularBuffer<number>(5)
+    buf.addAll([1, 2, 3, 4, 5])
+    expect(buf.getRecent(3)).toEqual([3, 4, 5])
+  })
 
-  test("getRecent returns fewer when not enough items", () => {
-    const buf = new CircularBuffer<number>(5);
-    buf.add(1);
-    buf.add(2);
-    expect(buf.getRecent(5)).toEqual([1, 2]);
-  });
+  test('getRecent returns fewer when not enough items', () => {
+    const buf = new CircularBuffer<number>(5)
+    buf.add(1)
+    buf.add(2)
+    expect(buf.getRecent(5)).toEqual([1, 2])
+  })
 
-  test("getRecent works after wraparound", () => {
-    const buf = new CircularBuffer<number>(3);
-    buf.addAll([1, 2, 3, 4, 5]);
-    expect(buf.getRecent(2)).toEqual([4, 5]);
-  });
+  test('getRecent works after wraparound', () => {
+    const buf = new CircularBuffer<number>(3)
+    buf.addAll([1, 2, 3, 4, 5])
+    expect(buf.getRecent(2)).toEqual([4, 5])
+  })
 
-  test("clear resets buffer", () => {
-    const buf = new CircularBuffer<number>(5);
-    buf.addAll([1, 2, 3]);
-    buf.clear();
-    expect(buf.length()).toBe(0);
-    expect(buf.toArray()).toEqual([]);
-  });
+  test('clear resets buffer', () => {
+    const buf = new CircularBuffer<number>(5)
+    buf.addAll([1, 2, 3])
+    buf.clear()
+    expect(buf.length()).toBe(0)
+    expect(buf.toArray()).toEqual([])
+  })
 
-  test("works with string type", () => {
-    const buf = new CircularBuffer<string>(2);
-    buf.add("a");
-    buf.add("b");
-    buf.add("c");
-    expect(buf.toArray()).toEqual(["b", "c"]);
-  });
+  test('works with string type', () => {
+    const buf = new CircularBuffer<string>(2)
+    buf.add('a')
+    buf.add('b')
+    buf.add('c')
+    expect(buf.toArray()).toEqual(['b', 'c'])
+  })
 
-  test("capacity=1 keeps only the most recent item", () => {
-    const buf = new CircularBuffer<number>(1);
-    buf.add(10);
-    expect(buf.toArray()).toEqual([10]);
-    buf.add(20);
-    expect(buf.toArray()).toEqual([20]);
-    buf.add(30);
-    expect(buf.toArray()).toEqual([30]);
-    expect(buf.getRecent(1)).toEqual([30]);
-  });
+  test('capacity=1 keeps only the most recent item', () => {
+    const buf = new CircularBuffer<number>(1)
+    buf.add(10)
+    expect(buf.toArray()).toEqual([10])
+    buf.add(20)
+    expect(buf.toArray()).toEqual([20])
+    buf.add(30)
+    expect(buf.toArray()).toEqual([30])
+    expect(buf.getRecent(1)).toEqual([30])
+  })
 
-  test("getRecent on empty buffer returns empty array", () => {
-    const buf = new CircularBuffer<number>(5);
-    expect(buf.getRecent(3)).toEqual([]);
-  });
-});
+  test('getRecent on empty buffer returns empty array', () => {
+    const buf = new CircularBuffer<number>(5)
+    expect(buf.getRecent(3)).toEqual([])
+  })
+})
diff --git a/src/utils/__tests__/abortController.test.ts b/src/utils/__tests__/abortController.test.ts
index 1f18ada41..f3665c089 100644
--- a/src/utils/__tests__/abortController.test.ts
+++ b/src/utils/__tests__/abortController.test.ts
@@ -1,106 +1,106 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from 'bun:test'
 import {
   createAbortController,
   createChildAbortController,
-} from "../abortController";
+} from '../abortController'
 
-describe("createAbortController", () => {
-  test("returns an AbortController that is not aborted", () => {
-    const controller = createAbortController();
-    expect(controller.signal.aborted).toBe(false);
-  });
+describe('createAbortController', () => {
+  test('returns an AbortController that is not aborted', () => {
+    const controller = createAbortController()
+    expect(controller.signal.aborted).toBe(false)
+  })
 
-  test("aborting the controller sets signal.aborted", () => {
-    const controller = createAbortController();
-    controller.abort();
-    expect(controller.signal.aborted).toBe(true);
-  });
+  test('aborting the controller sets signal.aborted', () => {
+    const controller = createAbortController()
+    controller.abort()
+    expect(controller.signal.aborted).toBe(true)
+  })
 
-  test("abort reason is propagated", () => {
-    const controller = createAbortController();
-    controller.abort("custom reason");
-    expect(controller.signal.reason).toBe("custom reason");
-  });
+  test('abort reason is propagated', () => {
+    const controller = createAbortController()
+    controller.abort('custom reason')
+    expect(controller.signal.reason).toBe('custom reason')
+  })
 
-  test("accepts custom maxListeners without error", () => {
-    const controller = createAbortController(100);
-    expect(controller.signal.aborted).toBe(false);
-  });
-});
+  test('accepts custom maxListeners without error', () => {
+    const controller = createAbortController(100)
+    expect(controller.signal.aborted).toBe(false)
+  })
+})
 
-describe("createChildAbortController", () => {
-  test("child is not aborted initially", () => {
-    const parent = createAbortController();
-    const child = createChildAbortController(parent);
-    expect(child.signal.aborted).toBe(false);
-    expect(parent.signal.aborted).toBe(false);
-  });
+describe('createChildAbortController', () => {
+  test('child is not aborted initially', () => {
+    const parent = createAbortController()
+    const child = createChildAbortController(parent)
+    expect(child.signal.aborted).toBe(false)
+    expect(parent.signal.aborted).toBe(false)
+  })
 
-  test("parent abort propagates to child", () => {
-    const parent = createAbortController();
-    const child = createChildAbortController(parent);
-    parent.abort("parent reason");
-    expect(child.signal.aborted).toBe(true);
-    expect(child.signal.reason).toBe("parent reason");
-  });
+  test('parent abort propagates to child', () => {
+    const parent = createAbortController()
+    const child = createChildAbortController(parent)
+    parent.abort('parent reason')
+    expect(child.signal.aborted).toBe(true)
+    expect(child.signal.reason).toBe('parent reason')
+  })
 
-  test("child abort does NOT propagate to parent", () => {
-    const parent = createAbortController();
-    const child = createChildAbortController(parent);
-    child.abort("child reason");
-    expect(child.signal.aborted).toBe(true);
-    expect(parent.signal.aborted).toBe(false);
-  });
+  test('child abort does NOT propagate to parent', () => {
+    const parent = createAbortController()
+    const child = createChildAbortController(parent)
+    child.abort('child reason')
+    expect(child.signal.aborted).toBe(true)
+    expect(parent.signal.aborted).toBe(false)
+  })
 
-  test("already-aborted parent immediately aborts child", () => {
-    const parent = createAbortController();
-    parent.abort("pre-abort");
-    const child = createChildAbortController(parent);
-    expect(child.signal.aborted).toBe(true);
-    expect(child.signal.reason).toBe("pre-abort");
-  });
+  test('already-aborted parent immediately aborts child', () => {
+    const parent = createAbortController()
+    parent.abort('pre-abort')
+    const child = createChildAbortController(parent)
+    expect(child.signal.aborted).toBe(true)
+    expect(child.signal.reason).toBe('pre-abort')
+  })
 
-  test("multiple children are independent", () => {
-    const parent = createAbortController();
-    const child1 = createChildAbortController(parent);
-    const child2 = createChildAbortController(parent);
-    child1.abort("child1");
-    expect(child1.signal.aborted).toBe(true);
-    expect(child2.signal.aborted).toBe(false);
+  test('multiple children are independent', () => {
+    const parent = createAbortController()
+    const child1 = createChildAbortController(parent)
+    const child2 = createChildAbortController(parent)
+    child1.abort('child1')
+    expect(child1.signal.aborted).toBe(true)
+    expect(child2.signal.aborted).toBe(false)
     // Aborting child1 did not affect child2 or parent
-    expect(parent.signal.aborted).toBe(false);
-  });
+    expect(parent.signal.aborted).toBe(false)
+  })
 
-  test("parent abort propagates to all children", () => {
-    const parent = createAbortController();
-    const child1 = createChildAbortController(parent);
-    const child2 = createChildAbortController(parent);
-    parent.abort("all go down");
-    expect(child1.signal.aborted).toBe(true);
-    expect(child2.signal.aborted).toBe(true);
-  });
+  test('parent abort propagates to all children', () => {
+    const parent = createAbortController()
+    const child1 = createChildAbortController(parent)
+    const child2 = createChildAbortController(parent)
+    parent.abort('all go down')
+    expect(child1.signal.aborted).toBe(true)
+    expect(child2.signal.aborted).toBe(true)
+  })
 
-  test("grandchild abort propagation", () => {
-    const grandparent = createAbortController();
-    const parent = createChildAbortController(grandparent);
-    const child = createChildAbortController(parent);
-    grandparent.abort("chain");
-    expect(parent.signal.aborted).toBe(true);
-    expect(child.signal.aborted).toBe(true);
-  });
+  test('grandchild abort propagation', () => {
+    const grandparent = createAbortController()
+    const parent = createChildAbortController(grandparent)
+    const child = createChildAbortController(parent)
+    grandparent.abort('chain')
+    expect(parent.signal.aborted).toBe(true)
+    expect(child.signal.aborted).toBe(true)
+  })
 
-  test("child abort then parent abort — child stays aborted with original reason", () => {
-    const parent = createAbortController();
-    const child = createChildAbortController(parent);
-    child.abort("child first");
-    parent.abort("parent later");
-    expect(child.signal.reason).toBe("child first");
-    expect(parent.signal.reason).toBe("parent later");
-  });
+  test('child abort then parent abort — child stays aborted with original reason', () => {
+    const parent = createAbortController()
+    const child = createChildAbortController(parent)
+    child.abort('child first')
+    parent.abort('parent later')
+    expect(child.signal.reason).toBe('child first')
+    expect(parent.signal.reason).toBe('parent later')
+  })
 
-  test("accepts custom maxListeners for child", () => {
-    const parent = createAbortController();
-    const child = createChildAbortController(parent, 200);
-    expect(child.signal.aborted).toBe(false);
-  });
-});
+  test('accepts custom maxListeners for child', () => {
+    const parent = createAbortController()
+    const child = createChildAbortController(parent, 200)
+    expect(child.signal.aborted).toBe(false)
+  })
+})
diff --git a/src/utils/__tests__/argumentSubstitution.test.ts b/src/utils/__tests__/argumentSubstitution.test.ts
index 75b0b54bd..74c7040e9 100644
--- a/src/utils/__tests__/argumentSubstitution.test.ts
+++ b/src/utils/__tests__/argumentSubstitution.test.ts
@@ -1,145 +1,141 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from 'bun:test'
 import {
   parseArguments,
   parseArgumentNames,
   generateProgressiveArgumentHint,
   substituteArguments,
-} from "../argumentSubstitution";
+} from '../argumentSubstitution'
 
 // ─── parseArguments ─────────────────────────────────────────────────────
 
-describe("parseArguments", () => {
-  test("splits simple arguments", () => {
-    expect(parseArguments("foo bar baz")).toEqual(["foo", "bar", "baz"]);
-  });
+describe('parseArguments', () => {
+  test('splits simple arguments', () => {
+    expect(parseArguments('foo bar baz')).toEqual(['foo', 'bar', 'baz'])
+  })
 
-  test("handles quoted strings", () => {
+  test('handles quoted strings', () => {
     expect(parseArguments('foo "hello world" baz')).toEqual([
-      "foo",
-      "hello world",
-      "baz",
-    ]);
-  });
+      'foo',
+      'hello world',
+      'baz',
+    ])
+  })
 
-  test("handles single-quoted strings", () => {
+  test('handles single-quoted strings', () => {
     expect(parseArguments("foo 'hello world' baz")).toEqual([
-      "foo",
-      "hello world",
-      "baz",
-    ]);
-  });
+      'foo',
+      'hello world',
+      'baz',
+    ])
+  })
 
-  test("handles escaped quotes inside quoted strings", () => {
+  test('handles escaped quotes inside quoted strings', () => {
     expect(parseArguments('foo "hello \\"world\\"" baz')).toEqual([
-      "foo",
+      'foo',
       'hello "world"',
-      "baz",
-    ]);
-  });
+      'baz',
+    ])
+  })
 
-  test("returns empty for empty string", () => {
-    expect(parseArguments("")).toEqual([]);
-  });
+  test('returns empty for empty string', () => {
+    expect(parseArguments('')).toEqual([])
+  })
 
-  test("returns empty for whitespace only", () => {
-    expect(parseArguments("   ")).toEqual([]);
-  });
-});
+  test('returns empty for whitespace only', () => {
+    expect(parseArguments('   ')).toEqual([])
+  })
+})
 
 // ─── parseArgumentNames ─────────────────────────────────────────────────
 
-describe("parseArgumentNames", () => {
-  test("parses space-separated string", () => {
-    expect(parseArgumentNames("foo bar baz")).toEqual(["foo", "bar", "baz"]);
-  });
+describe('parseArgumentNames', () => {
+  test('parses space-separated string', () => {
+    expect(parseArgumentNames('foo bar baz')).toEqual(['foo', 'bar', 'baz'])
+  })
 
-  test("accepts array input", () => {
-    expect(parseArgumentNames(["foo", "bar"])).toEqual(["foo", "bar"]);
-  });
+  test('accepts array input', () => {
+    expect(parseArgumentNames(['foo', 'bar'])).toEqual(['foo', 'bar'])
+  })
 
-  test("filters out numeric-only names", () => {
-    expect(parseArgumentNames("foo 123 bar")).toEqual(["foo", "bar"]);
-  });
+  test('filters out numeric-only names', () => {
+    expect(parseArgumentNames('foo 123 bar')).toEqual(['foo', 'bar'])
+  })
 
-  test("filters out empty strings", () => {
-    expect(parseArgumentNames(["foo", "", "bar"])).toEqual(["foo", "bar"]);
-  });
+  test('filters out empty strings', () => {
+    expect(parseArgumentNames(['foo', '', 'bar'])).toEqual(['foo', 'bar'])
+  })
 
-  test("returns empty for undefined", () => {
-    expect(parseArgumentNames(undefined)).toEqual([]);
-  });
-});
+  test('returns empty for undefined', () => {
+    expect(parseArgumentNames(undefined)).toEqual([])
+  })
+})
 
 // ─── generateProgressiveArgumentHint ────────────────────────────────────
 
-describe("generateProgressiveArgumentHint", () => {
-  test("shows remaining arguments", () => {
-    expect(generateProgressiveArgumentHint(["a", "b", "c"], ["x"])).toBe(
-      "[b] [c]"
-    );
-  });
+describe('generateProgressiveArgumentHint', () => {
+  test('shows remaining arguments', () => {
+    expect(generateProgressiveArgumentHint(['a', 'b', 'c'], ['x'])).toBe(
+      '[b] [c]',
+    )
+  })
 
-  test("returns undefined when all filled", () => {
-    expect(
-      generateProgressiveArgumentHint(["a"], ["x"])
-    ).toBeUndefined();
-  });
+  test('returns undefined when all filled', () => {
+    expect(generateProgressiveArgumentHint(['a'], ['x'])).toBeUndefined()
+  })
 
-  test("shows all when none typed", () => {
-    expect(generateProgressiveArgumentHint(["a", "b"], [])).toBe("[a] [b]");
-  });
-});
+  test('shows all when none typed', () => {
+    expect(generateProgressiveArgumentHint(['a', 'b'], [])).toBe('[a] [b]')
+  })
+})
 
 // ─── substituteArguments ────────────────────────────────────────────────
 
-describe("substituteArguments", () => {
-  test("replaces $ARGUMENTS with full args", () => {
-    expect(substituteArguments("run $ARGUMENTS", "foo bar")).toBe(
-      "run foo bar"
-    );
-  });
+describe('substituteArguments', () => {
+  test('replaces $ARGUMENTS with full args', () => {
+    expect(substituteArguments('run $ARGUMENTS', 'foo bar')).toBe('run foo bar')
+  })
 
-  test("replaces indexed $ARGUMENTS[0]", () => {
-    expect(substituteArguments("run $ARGUMENTS[0]", "foo bar")).toBe("run foo");
-  });
+  test('replaces indexed $ARGUMENTS[0]', () => {
+    expect(substituteArguments('run $ARGUMENTS[0]', 'foo bar')).toBe('run foo')
+  })
 
-  test("replaces shorthand $0, $1", () => {
-    expect(substituteArguments("$0 and $1", "hello world")).toBe(
-      "hello and world"
-    );
-  });
+  test('replaces shorthand $0, $1', () => {
+    expect(substituteArguments('$0 and $1', 'hello world')).toBe(
+      'hello and world',
+    )
+  })
 
-  test("replaces out-of-range index with empty string", () => {
-    expect(substituteArguments("$5", "hello world")).toBe("");
-  });
+  test('replaces out-of-range index with empty string', () => {
+    expect(substituteArguments('$5', 'hello world')).toBe('')
+  })
 
-  test("reuses same placeholder multiple times", () => {
-    expect(substituteArguments("cmd $0 $1 $0", "alpha beta")).toBe(
-      "cmd alpha beta alpha"
-    );
-  });
+  test('reuses same placeholder multiple times', () => {
+    expect(substituteArguments('cmd $0 $1 $0', 'alpha beta')).toBe(
+      'cmd alpha beta alpha',
+    )
+  })
 
-  test("replaces named arguments", () => {
-    expect(
-      substituteArguments("file: $name", "test.txt", true, ["name"])
-    ).toBe("file: test.txt");
-  });
+  test('replaces named arguments', () => {
+    expect(substituteArguments('file: $name', 'test.txt', true, ['name'])).toBe(
+      'file: test.txt',
+    )
+  })
 
-  test("returns content unchanged for undefined args", () => {
-    expect(substituteArguments("hello", undefined)).toBe("hello");
-  });
+  test('returns content unchanged for undefined args', () => {
+    expect(substituteArguments('hello', undefined)).toBe('hello')
+  })
 
-  test("appends ARGUMENTS when no placeholder found", () => {
-    expect(substituteArguments("run this", "extra")).toBe(
-      "run this\n\nARGUMENTS: extra"
-    );
-  });
+  test('appends ARGUMENTS when no placeholder found', () => {
+    expect(substituteArguments('run this', 'extra')).toBe(
+      'run this\n\nARGUMENTS: extra',
+    )
+  })
 
-  test("does not append when appendIfNoPlaceholder is false", () => {
-    expect(substituteArguments("run this", "extra", false)).toBe("run this");
-  });
+  test('does not append when appendIfNoPlaceholder is false', () => {
+    expect(substituteArguments('run this', 'extra', false)).toBe('run this')
+  })
 
-  test("does not append for empty args string", () => {
-    expect(substituteArguments("run this", "")).toBe("run this");
-  });
-});
+  test('does not append for empty args string', () => {
+    expect(substituteArguments('run this', '')).toBe('run this')
+  })
+})
diff --git a/src/utils/__tests__/array.test.ts b/src/utils/__tests__/array.test.ts
index 16f45bde9..e5d8735c6 100644
--- a/src/utils/__tests__/array.test.ts
+++ b/src/utils/__tests__/array.test.ts
@@ -1,58 +1,58 @@
-import { describe, expect, test } from "bun:test";
-import { count, intersperse, uniq } from "../array";
+import { describe, expect, test } from 'bun:test'
+import { count, intersperse, uniq } from '../array'
 
-describe("intersperse", () => {
-	test("inserts separator between elements", () => {
-		const result = intersperse([1, 2, 3], () => 0);
-		expect(result).toEqual([1, 0, 2, 0, 3]);
-	});
+describe('intersperse', () => {
+  test('inserts separator between elements', () => {
+    const result = intersperse([1, 2, 3], () => 0)
+    expect(result).toEqual([1, 0, 2, 0, 3])
+  })
 
-	test("returns empty array for empty input", () => {
-		expect(intersperse([], () => 0)).toEqual([]);
-	});
+  test('returns empty array for empty input', () => {
+    expect(intersperse([], () => 0)).toEqual([])
+  })
 
-	test("returns single element without separator", () => {
-		expect(intersperse([1], () => 0)).toEqual([1]);
-	});
+  test('returns single element without separator', () => {
+    expect(intersperse([1], () => 0)).toEqual([1])
+  })
 
-	test("passes index to separator function", () => {
-		const result = intersperse(["a", "b", "c"], (i) => `sep-${i}`);
-		expect(result).toEqual(["a", "sep-1", "b", "sep-2", "c"]);
-	});
-});
+  test('passes index to separator function', () => {
+    const result = intersperse(['a', 'b', 'c'], i => `sep-${i}`)
+    expect(result).toEqual(['a', 'sep-1', 'b', 'sep-2', 'c'])
+  })
+})
 
-describe("count", () => {
-	test("counts matching elements", () => {
-		expect(count([1, 2, 3, 4, 5], (x) => x > 3)).toBe(2);
-	});
+describe('count', () => {
+  test('counts matching elements', () => {
+    expect(count([1, 2, 3, 4, 5], x => x > 3)).toBe(2)
+  })
 
-	test("returns 0 for empty array", () => {
-		expect(count([], () => true)).toBe(0);
-	});
+  test('returns 0 for empty array', () => {
+    expect(count([], () => true)).toBe(0)
+  })
 
-	test("returns 0 when nothing matches", () => {
-		expect(count([1, 2, 3], (x) => x > 10)).toBe(0);
-	});
+  test('returns 0 when nothing matches', () => {
+    expect(count([1, 2, 3], x => x > 10)).toBe(0)
+  })
 
-	test("counts all when everything matches", () => {
-		expect(count([1, 2, 3], () => true)).toBe(3);
-	});
-});
+  test('counts all when everything matches', () => {
+    expect(count([1, 2, 3], () => true)).toBe(3)
+  })
+})
 
-describe("uniq", () => {
-	test("removes duplicates", () => {
-		expect(uniq([1, 2, 2, 3, 3, 3])).toEqual([1, 2, 3]);
-	});
+describe('uniq', () => {
+  test('removes duplicates', () => {
+    expect(uniq([1, 2, 2, 3, 3, 3])).toEqual([1, 2, 3])
+  })
 
-	test("preserves order of first occurrence", () => {
-		expect(uniq([3, 1, 2, 1, 3])).toEqual([3, 1, 2]);
-	});
+  test('preserves order of first occurrence', () => {
+    expect(uniq([3, 1, 2, 1, 3])).toEqual([3, 1, 2])
+  })
 
-	test("handles empty array", () => {
-		expect(uniq([])).toEqual([]);
-	});
+  test('handles empty array', () => {
+    expect(uniq([])).toEqual([])
+  })
 
-	test("works with strings", () => {
-		expect(uniq(["a", "b", "a"])).toEqual(["a", "b"]);
-	});
-});
+  test('works with strings', () => {
+    expect(uniq(['a', 'b', 'a'])).toEqual(['a', 'b'])
+  })
+})
diff --git a/src/utils/__tests__/bufferedWriter.test.ts b/src/utils/__tests__/bufferedWriter.test.ts
index d5d6ab35f..80039938b 100644
--- a/src/utils/__tests__/bufferedWriter.test.ts
+++ b/src/utils/__tests__/bufferedWriter.test.ts
@@ -1,117 +1,117 @@
-import { describe, expect, test } from "bun:test";
-import { createBufferedWriter } from "../bufferedWriter";
+import { describe, expect, test } from 'bun:test'
+import { createBufferedWriter } from '../bufferedWriter'
 
-describe("createBufferedWriter", () => {
-  test("immediateMode calls writeFn directly", () => {
-    const written: string[] = [];
+describe('createBufferedWriter', () => {
+  test('immediateMode calls writeFn directly', () => {
+    const written: string[] = []
     const writer = createBufferedWriter({
-      writeFn: (c) => written.push(c),
+      writeFn: c => written.push(c),
       immediateMode: true,
-    });
-    writer.write("a");
-    writer.write("b");
-    expect(written).toEqual(["a", "b"]);
-  });
+    })
+    writer.write('a')
+    writer.write('b')
+    expect(written).toEqual(['a', 'b'])
+  })
 
-  test("buffered mode accumulates until flush", () => {
-    const written: string[] = [];
+  test('buffered mode accumulates until flush', () => {
+    const written: string[] = []
     const writer = createBufferedWriter({
-      writeFn: (c) => written.push(c),
-    });
-    writer.write("hello ");
-    writer.write("world");
-    expect(written).toEqual([]);
-    writer.flush();
-    expect(written).toEqual(["hello world"]);
-  });
+      writeFn: c => written.push(c),
+    })
+    writer.write('hello ')
+    writer.write('world')
+    expect(written).toEqual([])
+    writer.flush()
+    expect(written).toEqual(['hello world'])
+  })
 
-  test("flush with empty buffer does not call writeFn", () => {
-    const written: string[] = [];
+  test('flush with empty buffer does not call writeFn', () => {
+    const written: string[] = []
     const writer = createBufferedWriter({
-      writeFn: (c) => written.push(c),
-    });
-    writer.flush();
-    expect(written).toEqual([]);
-  });
+      writeFn: c => written.push(c),
+    })
+    writer.flush()
+    expect(written).toEqual([])
+  })
 
-  test("flush clears the buffer", () => {
-    const written: string[] = [];
+  test('flush clears the buffer', () => {
+    const written: string[] = []
     const writer = createBufferedWriter({
-      writeFn: (c) => written.push(c),
-    });
-    writer.write("data");
-    writer.flush();
-    writer.flush(); // second flush should be no-op
-    expect(written).toEqual(["data"]);
-  });
+      writeFn: c => written.push(c),
+    })
+    writer.write('data')
+    writer.flush()
+    writer.flush() // second flush should be no-op
+    expect(written).toEqual(['data'])
+  })
 
-  test("overflow triggers deferred flush when maxBufferSize reached", () => {
-    const written: string[] = [];
+  test('overflow triggers deferred flush when maxBufferSize reached', () => {
+    const written: string[] = []
     const writer = createBufferedWriter({
-      writeFn: (c) => written.push(c),
+      writeFn: c => written.push(c),
       maxBufferSize: 2,
-    });
-    writer.write("a");
-    writer.write("b");
+    })
+    writer.write('a')
+    writer.write('b')
     // 2 writes = maxBufferSize, triggers flushDeferred via setImmediate
-    expect(written).toEqual([]);
-  });
+    expect(written).toEqual([])
+  })
 
-  test("overflow triggers deferred flush when maxBufferBytes reached", () => {
-    const written: string[] = [];
+  test('overflow triggers deferred flush when maxBufferBytes reached', () => {
+    const written: string[] = []
     const writer = createBufferedWriter({
-      writeFn: (c) => written.push(c),
+      writeFn: c => written.push(c),
       maxBufferBytes: 5,
-    });
-    writer.write("abc");
-    writer.write("def");
+    })
+    writer.write('abc')
+    writer.write('def')
     // total 6 bytes > 5, triggers flushDeferred
-    expect(written).toEqual([]);
-  });
+    expect(written).toEqual([])
+  })
 
-  test("dispose flushes remaining buffer", () => {
-    const written: string[] = [];
+  test('dispose flushes remaining buffer', () => {
+    const written: string[] = []
     const writer = createBufferedWriter({
-      writeFn: (c) => written.push(c),
-    });
-    writer.write("final");
-    writer.dispose();
-    expect(written).toEqual(["final"]);
-  });
+      writeFn: c => written.push(c),
+    })
+    writer.write('final')
+    writer.dispose()
+    expect(written).toEqual(['final'])
+  })
 
-  test("dispose flushes pending overflow", () => {
-    const written: string[] = [];
+  test('dispose flushes pending overflow', () => {
+    const written: string[] = []
     const writer = createBufferedWriter({
-      writeFn: (c) => written.push(c),
+      writeFn: c => written.push(c),
       maxBufferSize: 1,
-    });
-    writer.write("overflow-data");
+    })
+    writer.write('overflow-data')
     // overflow triggered but deferred; dispose should flush it synchronously
-    writer.dispose();
-    expect(written).toEqual(["overflow-data"]);
-  });
+    writer.dispose()
+    expect(written).toEqual(['overflow-data'])
+  })
 
-  test("coalesced overflow — multiple overflows merge before write", () => {
-    const written: string[] = [];
+  test('coalesced overflow — multiple overflows merge before write', () => {
+    const written: string[] = []
     const writer = createBufferedWriter({
-      writeFn: (c) => written.push(c),
+      writeFn: c => written.push(c),
       maxBufferSize: 1,
-    });
-    writer.write("a"); // triggers first overflow (deferred)
-    writer.write("b"); // pendingOverflow exists, coalesces
-    writer.dispose();   // flushes coalesced overflow
-    expect(written).toEqual(["ab"]);
-  });
+    })
+    writer.write('a') // triggers first overflow (deferred)
+    writer.write('b') // pendingOverflow exists, coalesces
+    writer.dispose() // flushes coalesced overflow
+    expect(written).toEqual(['ab'])
+  })
 
-  test("multiple flushes produce concatenated writes", () => {
-    const written: string[] = [];
+  test('multiple flushes produce concatenated writes', () => {
+    const written: string[] = []
     const writer = createBufferedWriter({
-      writeFn: (c) => written.push(c),
-    });
-    writer.write("batch1");
-    writer.flush();
-    writer.write("batch2");
-    writer.flush();
-    expect(written).toEqual(["batch1", "batch2"]);
-  });
-});
+      writeFn: c => written.push(c),
+    })
+    writer.write('batch1')
+    writer.flush()
+    writer.write('batch2')
+    writer.flush()
+    expect(written).toEqual(['batch1', 'batch2'])
+  })
+})
diff --git a/src/utils/__tests__/claudemd.test.ts b/src/utils/__tests__/claudemd.test.ts
index b514332c9..2d2edae21 100644
--- a/src/utils/__tests__/claudemd.test.ts
+++ b/src/utils/__tests__/claudemd.test.ts
@@ -1,148 +1,148 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from 'bun:test'
 import {
   stripHtmlComments,
   isMemoryFilePath,
   getLargeMemoryFiles,
   MAX_MEMORY_CHARACTER_COUNT,
   type MemoryFileInfo,
-} from "../claudemd";
+} from '../claudemd'
 
-function mockMemoryFile(overrides: Partial<MemoryFileInfo> = {}): MemoryFileInfo {
+function mockMemoryFile(
+  overrides: Partial<MemoryFileInfo> = {},
+): MemoryFileInfo {
   return {
-    path: "/project/CLAUDE.md",
-    type: "Project",
-    content: "test content",
+    path: '/project/CLAUDE.md',
+    type: 'Project',
+    content: 'test content',
     ...overrides,
-  };
+  }
 }
 
-describe("stripHtmlComments", () => {
-  test("strips block-level HTML comments (own line)", () => {
+describe('stripHtmlComments', () => {
+  test('strips block-level HTML comments (own line)', () => {
     // CommonMark type-2 HTML blocks: comment must start at beginning of line
-    const result = stripHtmlComments("text\n<!-- block comment -->\nmore");
-    expect(result.content).not.toContain("block comment");
-    expect(result.stripped).toBe(true);
-  });
+    const result = stripHtmlComments('text\n<!-- block comment -->\nmore')
+    expect(result.content).not.toContain('block comment')
+    expect(result.stripped).toBe(true)
+  })
 
-  test("returns stripped: false when no comments", () => {
-    const result = stripHtmlComments("no comments here");
-    expect(result.stripped).toBe(false);
-    expect(result.content).toBe("no comments here");
-  });
+  test('returns stripped: false when no comments', () => {
+    const result = stripHtmlComments('no comments here')
+    expect(result.stripped).toBe(false)
+    expect(result.content).toBe('no comments here')
+  })
 
-  test("returns stripped: true when block comments exist", () => {
-    const result = stripHtmlComments("hello\n<!-- world -->\nend");
-    expect(result.stripped).toBe(true);
-  });
+  test('returns stripped: true when block comments exist', () => {
+    const result = stripHtmlComments('hello\n<!-- world -->\nend')
+    expect(result.stripped).toBe(true)
+  })
 
-  test("handles empty string", () => {
-    const result = stripHtmlComments("");
-    expect(result.content).toBe("");
-    expect(result.stripped).toBe(false);
-  });
+  test('handles empty string', () => {
+    const result = stripHtmlComments('')
+    expect(result.content).toBe('')
+    expect(result.stripped).toBe(false)
+  })
 
-  test("handles multiple block comments", () => {
-    const result = stripHtmlComments(
-      "a\n<!-- c1 -->\nb\n<!-- c2 -->\nc"
-    );
-    expect(result.content).not.toContain("c1");
-    expect(result.content).not.toContain("c2");
-    expect(result.stripped).toBe(true);
-  });
+  test('handles multiple block comments', () => {
+    const result = stripHtmlComments('a\n<!-- c1 -->\nb\n<!-- c2 -->\nc')
+    expect(result.content).not.toContain('c1')
+    expect(result.content).not.toContain('c2')
+    expect(result.stripped).toBe(true)
+  })
 
-  test("preserves code block content", () => {
-    const input = "text\n```html\n<!-- not stripped -->\n```\nmore";
-    const result = stripHtmlComments(input);
-    expect(result.content).toContain("<!-- not stripped -->");
-  });
+  test('preserves code block content', () => {
+    const input = 'text\n```html\n<!-- not stripped -->\n```\nmore'
+    const result = stripHtmlComments(input)
+    expect(result.content).toContain('<!-- not stripped -->')
+  })
 
-  test("preserves inline comments within paragraphs", () => {
+  test('preserves inline comments within paragraphs', () => {
     // Inline comments are NOT stripped (CommonMark paragraph semantics)
-    const result = stripHtmlComments("text <!-- inline --> more");
-    expect(result.content).toContain("<!-- inline -->");
-    expect(result.stripped).toBe(false);
-  });
+    const result = stripHtmlComments('text <!-- inline --> more')
+    expect(result.content).toContain('<!-- inline -->')
+    expect(result.stripped).toBe(false)
+  })
 
-  test("leaves unclosed HTML comment unchanged", () => {
-    const result = stripHtmlComments("<!-- no close some text");
-    expect(result.content).toBe("<!-- no close some text");
-    expect(result.stripped).toBe(false);
-  });
+  test('leaves unclosed HTML comment unchanged', () => {
+    const result = stripHtmlComments('<!-- no close some text')
+    expect(result.content).toBe('<!-- no close some text')
+    expect(result.stripped).toBe(false)
+  })
 
-  test("strips comment and keeps same-line residual content", () => {
-    const result = stripHtmlComments("<!-- note -->some text");
-    expect(result.content).toContain("some text");
-    expect(result.content).not.toContain("<!--");
-    expect(result.stripped).toBe(true);
-  });
-});
+  test('strips comment and keeps same-line residual content', () => {
+    const result = stripHtmlComments('<!-- note -->some text')
+    expect(result.content).toContain('some text')
+    expect(result.content).not.toContain('<!--')
+    expect(result.stripped).toBe(true)
+  })
+})
 
-describe("isMemoryFilePath", () => {
-  test("returns true for CLAUDE.md path", () => {
-    expect(isMemoryFilePath("/project/CLAUDE.md")).toBe(true);
-  });
+describe('isMemoryFilePath', () => {
+  test('returns true for CLAUDE.md path', () => {
+    expect(isMemoryFilePath('/project/CLAUDE.md')).toBe(true)
+  })
 
-  test("returns true for CLAUDE.local.md path", () => {
-    expect(isMemoryFilePath("/project/CLAUDE.local.md")).toBe(true);
-  });
+  test('returns true for CLAUDE.local.md path', () => {
+    expect(isMemoryFilePath('/project/CLAUDE.local.md')).toBe(true)
+  })
 
-  test("returns true for .claude/rules/ path", () => {
-    expect(isMemoryFilePath("/project/.claude/rules/foo.md")).toBe(true);
-  });
+  test('returns true for .claude/rules/ path', () => {
+    expect(isMemoryFilePath('/project/.claude/rules/foo.md')).toBe(true)
+  })
 
-  test("returns false for regular file", () => {
-    expect(isMemoryFilePath("/project/src/main.ts")).toBe(false);
-  });
+  test('returns false for regular file', () => {
+    expect(isMemoryFilePath('/project/src/main.ts')).toBe(false)
+  })
 
-  test("returns false for unrelated .md file", () => {
-    expect(isMemoryFilePath("/project/README.md")).toBe(false);
-  });
+  test('returns false for unrelated .md file', () => {
+    expect(isMemoryFilePath('/project/README.md')).toBe(false)
+  })
 
-  test("returns false for .claude directory non-rules file", () => {
-    expect(isMemoryFilePath("/project/.claude/settings.json")).toBe(false);
-  });
+  test('returns false for .claude directory non-rules file', () => {
+    expect(isMemoryFilePath('/project/.claude/settings.json')).toBe(false)
+  })
 
-  test("returns false for lowercase claude.md (case-sensitive match)", () => {
-    expect(isMemoryFilePath("/project/claude.md")).toBe(false);
-  });
+  test('returns false for lowercase claude.md (case-sensitive match)', () => {
+    expect(isMemoryFilePath('/project/claude.md')).toBe(false)
+  })
 
-  test("returns false for non-.md file in .claude/rules/", () => {
-    expect(isMemoryFilePath(".claude/rules/foo.txt")).toBe(false);
-  });
-});
+  test('returns false for non-.md file in .claude/rules/', () => {
+    expect(isMemoryFilePath('.claude/rules/foo.txt')).toBe(false)
+  })
+})
 
-describe("getLargeMemoryFiles", () => {
-  test("returns files exceeding threshold", () => {
-    const largeContent = "x".repeat(MAX_MEMORY_CHARACTER_COUNT + 1);
+describe('getLargeMemoryFiles', () => {
+  test('returns files exceeding threshold', () => {
+    const largeContent = 'x'.repeat(MAX_MEMORY_CHARACTER_COUNT + 1)
     const files = [
-      mockMemoryFile({ content: "small" }),
-      mockMemoryFile({ content: largeContent, path: "/big.md" }),
-    ];
-    const result = getLargeMemoryFiles(files);
-    expect(result).toHaveLength(1);
-    expect(result[0].path).toBe("/big.md");
-  });
+      mockMemoryFile({ content: 'small' }),
+      mockMemoryFile({ content: largeContent, path: '/big.md' }),
+    ]
+    const result = getLargeMemoryFiles(files)
+    expect(result).toHaveLength(1)
+    expect(result[0].path).toBe('/big.md')
+  })
 
-  test("returns empty array when all files are small", () => {
+  test('returns empty array when all files are small', () => {
     const files = [
-      mockMemoryFile({ content: "small" }),
-      mockMemoryFile({ content: "also small" }),
-    ];
-    expect(getLargeMemoryFiles(files)).toEqual([]);
-  });
+      mockMemoryFile({ content: 'small' }),
+      mockMemoryFile({ content: 'also small' }),
+    ]
+    expect(getLargeMemoryFiles(files)).toEqual([])
+  })
 
-  test("correctly identifies threshold boundary", () => {
-    const atThreshold = "x".repeat(MAX_MEMORY_CHARACTER_COUNT);
-    const overThreshold = "x".repeat(MAX_MEMORY_CHARACTER_COUNT + 1);
+  test('correctly identifies threshold boundary', () => {
+    const atThreshold = 'x'.repeat(MAX_MEMORY_CHARACTER_COUNT)
+    const overThreshold = 'x'.repeat(MAX_MEMORY_CHARACTER_COUNT + 1)
     const files = [
       mockMemoryFile({ content: atThreshold }),
       mockMemoryFile({ content: overThreshold }),
-    ];
-    const result = getLargeMemoryFiles(files);
-    expect(result).toHaveLength(1);
-  });
+    ]
+    const result = getLargeMemoryFiles(files)
+    expect(result).toHaveLength(1)
+  })
 
-  test("returns empty array for empty input", () => {
-    expect(getLargeMemoryFiles([])).toEqual([]);
-  });
-});
+  test('returns empty array for empty input', () => {
+    expect(getLargeMemoryFiles([])).toEqual([])
+  })
+})
diff --git a/src/utils/__tests__/collapseHookSummaries.test.ts b/src/utils/__tests__/collapseHookSummaries.test.ts
index 214c5f697..96820c757 100644
--- a/src/utils/__tests__/collapseHookSummaries.test.ts
+++ b/src/utils/__tests__/collapseHookSummaries.test.ts
@@ -1,136 +1,138 @@
-import { describe, expect, test } from "bun:test";
-import { collapseHookSummaries } from "../collapseHookSummaries";
+import { describe, expect, test } from 'bun:test'
+import { collapseHookSummaries } from '../collapseHookSummaries'
 
-function makeHookSummary(overrides: Partial<{
-  hookLabel: string;
-  hookCount: number;
-  hookInfos: any[];
-  hookErrors: any[];
-  preventedContinuation: boolean;
-  hasOutput: boolean;
-  totalDurationMs: number;
-}> = {}): any {
+function makeHookSummary(
+  overrides: Partial<{
+    hookLabel: string
+    hookCount: number
+    hookInfos: any[]
+    hookErrors: any[]
+    preventedContinuation: boolean
+    hasOutput: boolean
+    totalDurationMs: number
+  }> = {},
+): any {
   return {
-    type: "system",
-    subtype: "stop_hook_summary",
-    hookLabel: overrides.hookLabel ?? "PostToolUse",
+    type: 'system',
+    subtype: 'stop_hook_summary',
+    hookLabel: overrides.hookLabel ?? 'PostToolUse',
     hookCount: overrides.hookCount ?? 1,
     hookInfos: overrides.hookInfos ?? [],
     hookErrors: overrides.hookErrors ?? [],
     preventedContinuation: overrides.preventedContinuation ?? false,
     hasOutput: overrides.hasOutput ?? false,
     totalDurationMs: overrides.totalDurationMs ?? 10,
-  };
+  }
 }
 
 function makeNonHookMessage(): any {
-  return { type: "user", message: { content: "hello" } };
+  return { type: 'user', message: { content: 'hello' } }
 }
 
-describe("collapseHookSummaries", () => {
-  test("returns same messages when no hook summaries", () => {
-    const messages = [makeNonHookMessage(), makeNonHookMessage()];
-    expect(collapseHookSummaries(messages)).toEqual(messages);
-  });
+describe('collapseHookSummaries', () => {
+  test('returns same messages when no hook summaries', () => {
+    const messages = [makeNonHookMessage(), makeNonHookMessage()]
+    expect(collapseHookSummaries(messages)).toEqual(messages)
+  })
 
-  test("collapses consecutive messages with same hookLabel", () => {
+  test('collapses consecutive messages with same hookLabel', () => {
     const messages = [
-      makeHookSummary({ hookLabel: "PostToolUse", hookCount: 1 }),
-      makeHookSummary({ hookLabel: "PostToolUse", hookCount: 2 }),
-    ];
-    const result = collapseHookSummaries(messages);
-    expect(result).toHaveLength(1);
-    expect(result[0].hookCount).toBe(3);
-  });
+      makeHookSummary({ hookLabel: 'PostToolUse', hookCount: 1 }),
+      makeHookSummary({ hookLabel: 'PostToolUse', hookCount: 2 }),
+    ]
+    const result = collapseHookSummaries(messages)
+    expect(result).toHaveLength(1)
+    expect(result[0].hookCount).toBe(3)
+  })
 
-  test("does not collapse messages with different hookLabels", () => {
+  test('does not collapse messages with different hookLabels', () => {
     const messages = [
-      makeHookSummary({ hookLabel: "PostToolUse" }),
-      makeHookSummary({ hookLabel: "PreToolUse" }),
-    ];
-    const result = collapseHookSummaries(messages);
-    expect(result).toHaveLength(2);
-  });
+      makeHookSummary({ hookLabel: 'PostToolUse' }),
+      makeHookSummary({ hookLabel: 'PreToolUse' }),
+    ]
+    const result = collapseHookSummaries(messages)
+    expect(result).toHaveLength(2)
+  })
 
-  test("aggregates hookCount across collapsed messages", () => {
+  test('aggregates hookCount across collapsed messages', () => {
     const messages = [
-      makeHookSummary({ hookLabel: "A", hookCount: 3 }),
-      makeHookSummary({ hookLabel: "A", hookCount: 5 }),
-    ];
-    const result = collapseHookSummaries(messages);
-    expect(result[0].hookCount).toBe(8);
-  });
+      makeHookSummary({ hookLabel: 'A', hookCount: 3 }),
+      makeHookSummary({ hookLabel: 'A', hookCount: 5 }),
+    ]
+    const result = collapseHookSummaries(messages)
+    expect(result[0].hookCount).toBe(8)
+  })
 
-  test("merges hookInfos arrays", () => {
-    const info1 = { tool: "Read" };
-    const info2 = { tool: "Write" };
+  test('merges hookInfos arrays', () => {
+    const info1 = { tool: 'Read' }
+    const info2 = { tool: 'Write' }
     const messages = [
-      makeHookSummary({ hookLabel: "A", hookInfos: [info1] }),
-      makeHookSummary({ hookLabel: "A", hookInfos: [info2] }),
-    ];
-    const result = collapseHookSummaries(messages);
-    expect(result[0].hookInfos).toEqual([info1, info2]);
-  });
+      makeHookSummary({ hookLabel: 'A', hookInfos: [info1] }),
+      makeHookSummary({ hookLabel: 'A', hookInfos: [info2] }),
+    ]
+    const result = collapseHookSummaries(messages)
+    expect(result[0].hookInfos).toEqual([info1, info2])
+  })
 
-  test("merges hookErrors arrays", () => {
-    const err1 = new Error("e1");
-    const err2 = new Error("e2");
+  test('merges hookErrors arrays', () => {
+    const err1 = new Error('e1')
+    const err2 = new Error('e2')
     const messages = [
-      makeHookSummary({ hookLabel: "A", hookErrors: [err1] }),
-      makeHookSummary({ hookLabel: "A", hookErrors: [err2] }),
-    ];
-    const result = collapseHookSummaries(messages);
-    expect(result[0].hookErrors).toHaveLength(2);
-  });
+      makeHookSummary({ hookLabel: 'A', hookErrors: [err1] }),
+      makeHookSummary({ hookLabel: 'A', hookErrors: [err2] }),
+    ]
+    const result = collapseHookSummaries(messages)
+    expect(result[0].hookErrors).toHaveLength(2)
+  })
 
-  test("takes max totalDurationMs", () => {
+  test('takes max totalDurationMs', () => {
     const messages = [
-      makeHookSummary({ hookLabel: "A", totalDurationMs: 50 }),
-      makeHookSummary({ hookLabel: "A", totalDurationMs: 100 }),
-      makeHookSummary({ hookLabel: "A", totalDurationMs: 75 }),
-    ];
-    const result = collapseHookSummaries(messages);
-    expect(result[0].totalDurationMs).toBe(100);
-  });
+      makeHookSummary({ hookLabel: 'A', totalDurationMs: 50 }),
+      makeHookSummary({ hookLabel: 'A', totalDurationMs: 100 }),
+      makeHookSummary({ hookLabel: 'A', totalDurationMs: 75 }),
+    ]
+    const result = collapseHookSummaries(messages)
+    expect(result[0].totalDurationMs).toBe(100)
+  })
 
-  test("takes any truthy preventContinuation", () => {
+  test('takes any truthy preventContinuation', () => {
     const messages = [
-      makeHookSummary({ hookLabel: "A", preventedContinuation: false }),
-      makeHookSummary({ hookLabel: "A", preventedContinuation: true }),
-    ];
-    const result = collapseHookSummaries(messages);
-    expect(result[0].preventedContinuation).toBe(true);
-  });
+      makeHookSummary({ hookLabel: 'A', preventedContinuation: false }),
+      makeHookSummary({ hookLabel: 'A', preventedContinuation: true }),
+    ]
+    const result = collapseHookSummaries(messages)
+    expect(result[0].preventedContinuation).toBe(true)
+  })
 
-  test("leaves single hook summary unchanged", () => {
-    const msg = makeHookSummary({ hookLabel: "PostToolUse", hookCount: 5 });
-    const result = collapseHookSummaries([msg]);
-    expect(result).toHaveLength(1);
-    expect(result[0].hookCount).toBe(5);
-  });
+  test('leaves single hook summary unchanged', () => {
+    const msg = makeHookSummary({ hookLabel: 'PostToolUse', hookCount: 5 })
+    const result = collapseHookSummaries([msg])
+    expect(result).toHaveLength(1)
+    expect(result[0].hookCount).toBe(5)
+  })
 
-  test("handles three consecutive same-label summaries", () => {
+  test('handles three consecutive same-label summaries', () => {
     const messages = [
-      makeHookSummary({ hookLabel: "X", hookCount: 1 }),
-      makeHookSummary({ hookLabel: "X", hookCount: 1 }),
-      makeHookSummary({ hookLabel: "X", hookCount: 1 }),
-    ];
-    const result = collapseHookSummaries(messages);
-    expect(result).toHaveLength(1);
-    expect(result[0].hookCount).toBe(3);
-  });
+      makeHookSummary({ hookLabel: 'X', hookCount: 1 }),
+      makeHookSummary({ hookLabel: 'X', hookCount: 1 }),
+      makeHookSummary({ hookLabel: 'X', hookCount: 1 }),
+    ]
+    const result = collapseHookSummaries(messages)
+    expect(result).toHaveLength(1)
+    expect(result[0].hookCount).toBe(3)
+  })
 
-  test("preserves non-hook messages in between", () => {
+  test('preserves non-hook messages in between', () => {
     const messages = [
-      makeHookSummary({ hookLabel: "A" }),
+      makeHookSummary({ hookLabel: 'A' }),
       makeNonHookMessage(),
-      makeHookSummary({ hookLabel: "A" }),
-    ];
-    const result = collapseHookSummaries(messages);
-    expect(result).toHaveLength(3);
-  });
+      makeHookSummary({ hookLabel: 'A' }),
+    ]
+    const result = collapseHookSummaries(messages)
+    expect(result).toHaveLength(3)
+  })
 
-  test("returns empty array for empty input", () => {
-    expect(collapseHookSummaries([])).toEqual([]);
-  });
-});
+  test('returns empty array for empty input', () => {
+    expect(collapseHookSummaries([])).toEqual([])
+  })
+})
diff --git a/src/utils/__tests__/collapseTeammateShutdowns.test.ts b/src/utils/__tests__/collapseTeammateShutdowns.test.ts
index b1e625edb..bf12fc59f 100644
--- a/src/utils/__tests__/collapseTeammateShutdowns.test.ts
+++ b/src/utils/__tests__/collapseTeammateShutdowns.test.ts
@@ -1,94 +1,111 @@
-import { describe, expect, test } from "bun:test";
-import { collapseTeammateShutdowns } from "../collapseTeammateShutdowns";
+import { describe, expect, test } from 'bun:test'
+import { collapseTeammateShutdowns } from '../collapseTeammateShutdowns'
 
-function makeShutdownMsg(uuid = "1"): any {
+function makeShutdownMsg(uuid = '1'): any {
   return {
-    type: "attachment",
+    type: 'attachment',
     uuid,
     timestamp: Date.now(),
     attachment: {
-      type: "task_status",
-      taskType: "in_process_teammate",
-      status: "completed",
+      type: 'task_status',
+      taskType: 'in_process_teammate',
+      status: 'completed',
     },
-  };
+  }
 }
 
 function makeNonShutdownMsg(): any {
-  return { type: "user", message: { content: "hello" } };
+  return { type: 'user', message: { content: 'hello' } }
 }
 
-describe("collapseTeammateShutdowns", () => {
-  test("returns same messages when no teammate shutdowns", () => {
-    const msgs = [makeNonShutdownMsg(), makeNonShutdownMsg()];
-    expect(collapseTeammateShutdowns(msgs)).toEqual(msgs);
-  });
+describe('collapseTeammateShutdowns', () => {
+  test('returns same messages when no teammate shutdowns', () => {
+    const msgs = [makeNonShutdownMsg(), makeNonShutdownMsg()]
+    expect(collapseTeammateShutdowns(msgs)).toEqual(msgs)
+  })
 
-  test("leaves single shutdown message unchanged", () => {
-    const msgs = [makeShutdownMsg()];
-    const result = collapseTeammateShutdowns(msgs);
-    expect(result).toHaveLength(1);
-    expect(result[0]).toEqual(msgs[0]);
-  });
+  test('leaves single shutdown message unchanged', () => {
+    const msgs = [makeShutdownMsg()]
+    const result = collapseTeammateShutdowns(msgs)
+    expect(result).toHaveLength(1)
+    expect(result[0]).toEqual(msgs[0])
+  })
 
-  test("collapses consecutive shutdown messages into batch", () => {
-    const msgs = [makeShutdownMsg("1"), makeShutdownMsg("2")];
-    const result = collapseTeammateShutdowns(msgs);
-    expect(result).toHaveLength(1);
-    expect((result[0] as any).attachment.type).toBe("teammate_shutdown_batch");
-  });
+  test('collapses consecutive shutdown messages into batch', () => {
+    const msgs = [makeShutdownMsg('1'), makeShutdownMsg('2')]
+    const result = collapseTeammateShutdowns(msgs)
+    expect(result).toHaveLength(1)
+    expect((result[0] as any).attachment.type).toBe('teammate_shutdown_batch')
+  })
 
-  test("batch attachment has correct count", () => {
-    const msgs = [makeShutdownMsg("1"), makeShutdownMsg("2"), makeShutdownMsg("3")];
-    const result = collapseTeammateShutdowns(msgs);
-    expect((result[0] as any).attachment.count).toBe(3);
-  });
+  test('batch attachment has correct count', () => {
+    const msgs = [
+      makeShutdownMsg('1'),
+      makeShutdownMsg('2'),
+      makeShutdownMsg('3'),
+    ]
+    const result = collapseTeammateShutdowns(msgs)
+    expect((result[0] as any).attachment.count).toBe(3)
+  })
 
-  test("does not collapse non-consecutive shutdowns", () => {
-    const msgs = [makeShutdownMsg("1"), makeNonShutdownMsg(), makeShutdownMsg("2")];
-    const result = collapseTeammateShutdowns(msgs);
-    expect(result).toHaveLength(3);
-    expect((result[0] as any).attachment.type).toBe("task_status");
-    expect((result[2] as any).attachment.type).toBe("task_status");
-  });
+  test('does not collapse non-consecutive shutdowns', () => {
+    const msgs = [
+      makeShutdownMsg('1'),
+      makeNonShutdownMsg(),
+      makeShutdownMsg('2'),
+    ]
+    const result = collapseTeammateShutdowns(msgs)
+    expect(result).toHaveLength(3)
+    expect((result[0] as any).attachment.type).toBe('task_status')
+    expect((result[2] as any).attachment.type).toBe('task_status')
+  })
 
-  test("preserves non-shutdown messages between shutdowns", () => {
-    const msgs = [makeShutdownMsg("1"), makeNonShutdownMsg(), makeShutdownMsg("2")];
-    const result = collapseTeammateShutdowns(msgs);
-    expect(result[1]).toEqual(makeNonShutdownMsg());
-  });
+  test('preserves non-shutdown messages between shutdowns', () => {
+    const msgs = [
+      makeShutdownMsg('1'),
+      makeNonShutdownMsg(),
+      makeShutdownMsg('2'),
+    ]
+    const result = collapseTeammateShutdowns(msgs)
+    expect(result[1]).toEqual(makeNonShutdownMsg())
+  })
 
-  test("handles empty array", () => {
-    expect(collapseTeammateShutdowns([])).toEqual([]);
-  });
+  test('handles empty array', () => {
+    expect(collapseTeammateShutdowns([])).toEqual([])
+  })
 
-  test("handles mixed message types", () => {
-    const msgs = [makeNonShutdownMsg(), makeShutdownMsg("1"), makeShutdownMsg("2"), makeNonShutdownMsg()];
-    const result = collapseTeammateShutdowns(msgs);
-    expect(result).toHaveLength(3);
-    expect((result[1] as any).attachment.type).toBe("teammate_shutdown_batch");
-  });
+  test('handles mixed message types', () => {
+    const msgs = [
+      makeNonShutdownMsg(),
+      makeShutdownMsg('1'),
+      makeShutdownMsg('2'),
+      makeNonShutdownMsg(),
+    ]
+    const result = collapseTeammateShutdowns(msgs)
+    expect(result).toHaveLength(3)
+    expect((result[1] as any).attachment.type).toBe('teammate_shutdown_batch')
+  })
 
-  test("collapses more than 2 consecutive shutdowns", () => {
-    const msgs = Array.from({ length: 5 }, (_, i) => makeShutdownMsg(String(i)));
-    const result = collapseTeammateShutdowns(msgs);
-    expect(result).toHaveLength(1);
-    expect((result[0] as any).attachment.count).toBe(5);
-  });
+  test('collapses more than 2 consecutive shutdowns', () => {
+    const msgs = Array.from({ length: 5 }, (_, i) => makeShutdownMsg(String(i)))
+    const result = collapseTeammateShutdowns(msgs)
+    expect(result).toHaveLength(1)
+    expect((result[0] as any).attachment.count).toBe(5)
+  })
 
-  test("non-teammate task_status messages are not collapsed", () => {
+  test('non-teammate task_status messages are not collapsed', () => {
     const nonTeammate: any = {
-      type: "attachment",
-      uuid: "x",
+      type: 'attachment',
+      uuid: 'x',
       timestamp: Date.now(),
       attachment: {
-        type: "task_status",
-        taskType: "subagent",
-        status: "completed",
+        type: 'task_status',
+        taskType: 'subagent',
+        status: 'completed',
       },
-    };
-    const msgs = [nonTeammate, { ...nonTeammate, uuid: "y" }];
-    const result = collapseTeammateShutdowns(msgs);
-    expect(result).toHaveLength(2);
-  });
-});
+    }
+    const msgs = [nonTeammate, { ...nonTeammate, uuid: 'y' }]
+    const result = collapseTeammateShutdowns(msgs)
+    expect(result).toHaveLength(2)
+  })
+})
diff --git a/src/utils/__tests__/configConstants.test.ts b/src/utils/__tests__/configConstants.test.ts
index d045e961c..a8619526e 100644
--- a/src/utils/__tests__/configConstants.test.ts
+++ b/src/utils/__tests__/configConstants.test.ts
@@ -1,70 +1,70 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from 'bun:test'
 import {
   NOTIFICATION_CHANNELS,
   EDITOR_MODES,
   TEAMMATE_MODES,
-} from "../configConstants";
+} from '../configConstants'
 
-describe("NOTIFICATION_CHANNELS", () => {
-  test("contains expected channels", () => {
-    expect(NOTIFICATION_CHANNELS).toContain("auto");
-    expect(NOTIFICATION_CHANNELS).toContain("iterm2");
-    expect(NOTIFICATION_CHANNELS).toContain("terminal_bell");
-    expect(NOTIFICATION_CHANNELS).toContain("kitty");
-    expect(NOTIFICATION_CHANNELS).toContain("ghostty");
-  });
+describe('NOTIFICATION_CHANNELS', () => {
+  test('contains expected channels', () => {
+    expect(NOTIFICATION_CHANNELS).toContain('auto')
+    expect(NOTIFICATION_CHANNELS).toContain('iterm2')
+    expect(NOTIFICATION_CHANNELS).toContain('terminal_bell')
+    expect(NOTIFICATION_CHANNELS).toContain('kitty')
+    expect(NOTIFICATION_CHANNELS).toContain('ghostty')
+  })
 
-  test("is readonly array", () => {
-    expect(Array.isArray(NOTIFICATION_CHANNELS)).toBe(true);
+  test('is readonly array', () => {
+    expect(Array.isArray(NOTIFICATION_CHANNELS)).toBe(true)
     // TypeScript enforces readonly at compile time; runtime is still a plain array
-    expect(NOTIFICATION_CHANNELS.length).toBeGreaterThan(0);
-  });
+    expect(NOTIFICATION_CHANNELS.length).toBeGreaterThan(0)
+  })
 
-  test("includes all documented channels", () => {
+  test('includes all documented channels', () => {
     expect(NOTIFICATION_CHANNELS).toEqual([
-      "auto",
-      "iterm2",
-      "iterm2_with_bell",
-      "terminal_bell",
-      "kitty",
-      "ghostty",
-      "notifications_disabled",
-    ]);
-  });
+      'auto',
+      'iterm2',
+      'iterm2_with_bell',
+      'terminal_bell',
+      'kitty',
+      'ghostty',
+      'notifications_disabled',
+    ])
+  })
 
-  test("has no duplicate entries", () => {
-    const unique = new Set(NOTIFICATION_CHANNELS);
-    expect(unique.size).toBe(NOTIFICATION_CHANNELS.length);
-  });
-});
+  test('has no duplicate entries', () => {
+    const unique = new Set(NOTIFICATION_CHANNELS)
+    expect(unique.size).toBe(NOTIFICATION_CHANNELS.length)
+  })
+})
 
-describe("EDITOR_MODES", () => {
+describe('EDITOR_MODES', () => {
   test("contains 'normal' and 'vim'", () => {
-    expect(EDITOR_MODES).toContain("normal");
-    expect(EDITOR_MODES).toContain("vim");
-  });
+    expect(EDITOR_MODES).toContain('normal')
+    expect(EDITOR_MODES).toContain('vim')
+  })
 
-  test("has exactly 2 entries", () => {
-    expect(EDITOR_MODES).toHaveLength(2);
-  });
+  test('has exactly 2 entries', () => {
+    expect(EDITOR_MODES).toHaveLength(2)
+  })
 
-  test("is ordered: normal, vim", () => {
-    expect(EDITOR_MODES).toEqual(["normal", "vim"]);
-  });
-});
+  test('is ordered: normal, vim', () => {
+    expect(EDITOR_MODES).toEqual(['normal', 'vim'])
+  })
+})
 
-describe("TEAMMATE_MODES", () => {
+describe('TEAMMATE_MODES', () => {
   test("contains 'auto', 'tmux', 'in-process'", () => {
-    expect(TEAMMATE_MODES).toContain("auto");
-    expect(TEAMMATE_MODES).toContain("tmux");
-    expect(TEAMMATE_MODES).toContain("in-process");
-  });
+    expect(TEAMMATE_MODES).toContain('auto')
+    expect(TEAMMATE_MODES).toContain('tmux')
+    expect(TEAMMATE_MODES).toContain('in-process')
+  })
 
-  test("has exactly 3 entries", () => {
-    expect(TEAMMATE_MODES).toHaveLength(3);
-  });
+  test('has exactly 3 entries', () => {
+    expect(TEAMMATE_MODES).toHaveLength(3)
+  })
 
-  test("is ordered: auto, tmux, in-process", () => {
-    expect(TEAMMATE_MODES).toEqual(["auto", "tmux", "in-process"]);
-  });
-});
+  test('is ordered: auto, tmux, in-process', () => {
+    expect(TEAMMATE_MODES).toEqual(['auto', 'tmux', 'in-process'])
+  })
+})
diff --git a/src/utils/__tests__/contentArray.test.ts b/src/utils/__tests__/contentArray.test.ts
index 13a0540fd..d28739a22 100644
--- a/src/utils/__tests__/contentArray.test.ts
+++ b/src/utils/__tests__/contentArray.test.ts
@@ -1,72 +1,72 @@
-import { describe, expect, test } from "bun:test";
-import { insertBlockAfterToolResults } from "../contentArray";
+import { describe, expect, test } from 'bun:test'
+import { insertBlockAfterToolResults } from '../contentArray'
 
-describe("insertBlockAfterToolResults", () => {
-  test("inserts after last tool_result", () => {
+describe('insertBlockAfterToolResults', () => {
+  test('inserts after last tool_result', () => {
     const content: any[] = [
-      { type: "tool_result", content: "r1" },
-      { type: "text", text: "hello" },
-    ];
-    insertBlockAfterToolResults(content, { type: "text", text: "inserted" });
-    expect(content[1]).toEqual({ type: "text", text: "inserted" });
-    expect(content).toHaveLength(3);
-  });
+      { type: 'tool_result', content: 'r1' },
+      { type: 'text', text: 'hello' },
+    ]
+    insertBlockAfterToolResults(content, { type: 'text', text: 'inserted' })
+    expect(content[1]).toEqual({ type: 'text', text: 'inserted' })
+    expect(content).toHaveLength(3)
+  })
 
-  test("inserts after last of multiple tool_results", () => {
+  test('inserts after last of multiple tool_results', () => {
     const content: any[] = [
-      { type: "tool_result", content: "r1" },
-      { type: "tool_result", content: "r2" },
-      { type: "text", text: "end" },
-    ];
-    insertBlockAfterToolResults(content, { type: "text", text: "new" });
-    expect(content[2]).toEqual({ type: "text", text: "new" });
-  });
+      { type: 'tool_result', content: 'r1' },
+      { type: 'tool_result', content: 'r2' },
+      { type: 'text', text: 'end' },
+    ]
+    insertBlockAfterToolResults(content, { type: 'text', text: 'new' })
+    expect(content[2]).toEqual({ type: 'text', text: 'new' })
+  })
 
-  test("appends continuation when inserted block would be last", () => {
-    const content: any[] = [{ type: "tool_result", content: "r1" }];
-    insertBlockAfterToolResults(content, { type: "text", text: "new" });
-    expect(content).toHaveLength(3); // original + inserted + continuation
-    expect(content[2]).toEqual({ type: "text", text: "." });
-  });
+  test('appends continuation when inserted block would be last', () => {
+    const content: any[] = [{ type: 'tool_result', content: 'r1' }]
+    insertBlockAfterToolResults(content, { type: 'text', text: 'new' })
+    expect(content).toHaveLength(3) // original + inserted + continuation
+    expect(content[2]).toEqual({ type: 'text', text: '.' })
+  })
 
-  test("inserts before last block when no tool_results", () => {
+  test('inserts before last block when no tool_results', () => {
     const content: any[] = [
-      { type: "text", text: "a" },
-      { type: "text", text: "b" },
-    ];
-    insertBlockAfterToolResults(content, { type: "text", text: "new" });
-    expect(content[1]).toEqual({ type: "text", text: "new" });
-    expect(content).toHaveLength(3);
-  });
+      { type: 'text', text: 'a' },
+      { type: 'text', text: 'b' },
+    ]
+    insertBlockAfterToolResults(content, { type: 'text', text: 'new' })
+    expect(content[1]).toEqual({ type: 'text', text: 'new' })
+    expect(content).toHaveLength(3)
+  })
 
-  test("handles empty array", () => {
-    const content: any[] = [];
-    insertBlockAfterToolResults(content, { type: "text", text: "new" });
-    expect(content).toHaveLength(1);
-    expect(content[0]).toEqual({ type: "text", text: "new" });
-  });
+  test('handles empty array', () => {
+    const content: any[] = []
+    insertBlockAfterToolResults(content, { type: 'text', text: 'new' })
+    expect(content).toHaveLength(1)
+    expect(content[0]).toEqual({ type: 'text', text: 'new' })
+  })
 
-  test("handles single element array with no tool_result", () => {
-    const content: any[] = [{ type: "text", text: "only" }];
-    insertBlockAfterToolResults(content, { type: "text", text: "new" });
-    expect(content[0]).toEqual({ type: "text", text: "new" });
-    expect(content[1]).toEqual({ type: "text", text: "only" });
-  });
+  test('handles single element array with no tool_result', () => {
+    const content: any[] = [{ type: 'text', text: 'only' }]
+    insertBlockAfterToolResults(content, { type: 'text', text: 'new' })
+    expect(content[0]).toEqual({ type: 'text', text: 'new' })
+    expect(content[1]).toEqual({ type: 'text', text: 'only' })
+  })
 
-  test("inserts after last tool_result with mixed interleaving", () => {
+  test('inserts after last tool_result with mixed interleaving', () => {
     const content: any[] = [
-      { type: "tool_result", content: "r1" },
-      { type: "text", text: "mid1" },
-      { type: "tool_result", content: "r2" },
-      { type: "text", text: "mid2" },
-      { type: "tool_result", content: "r3" },
-      { type: "text", text: "end" },
-    ];
-    insertBlockAfterToolResults(content, { type: "text", text: "inserted" });
+      { type: 'tool_result', content: 'r1' },
+      { type: 'text', text: 'mid1' },
+      { type: 'tool_result', content: 'r2' },
+      { type: 'text', text: 'mid2' },
+      { type: 'tool_result', content: 'r3' },
+      { type: 'text', text: 'end' },
+    ]
+    insertBlockAfterToolResults(content, { type: 'text', text: 'inserted' })
     // Inserted after r3 (index 4), so at index 5
-    expect(content[5]).toEqual({ type: "text", text: "inserted" });
+    expect(content[5]).toEqual({ type: 'text', text: 'inserted' })
     // Original end text should shift to index 6
-    expect(content[6]).toEqual({ type: "text", text: "end" });
-    expect(content).toHaveLength(7);
-  });
-});
+    expect(content[6]).toEqual({ type: 'text', text: 'end' })
+    expect(content).toHaveLength(7)
+  })
+})
diff --git a/src/utils/__tests__/controlMessageCompat.test.ts b/src/utils/__tests__/controlMessageCompat.test.ts
index af82e428e..91fe48ec4 100644
--- a/src/utils/__tests__/controlMessageCompat.test.ts
+++ b/src/utils/__tests__/controlMessageCompat.test.ts
@@ -1,103 +1,103 @@
-import { describe, expect, test } from "bun:test";
-import { normalizeControlMessageKeys } from "../controlMessageCompat";
+import { describe, expect, test } from 'bun:test'
+import { normalizeControlMessageKeys } from '../controlMessageCompat'
 
-describe("normalizeControlMessageKeys", () => {
+describe('normalizeControlMessageKeys', () => {
   // --- basic camelCase to snake_case ---
-  test("converts requestId to request_id", () => {
-    const obj = { requestId: "123" };
-    const result = normalizeControlMessageKeys(obj);
-    expect(result).toEqual({ request_id: "123" });
-    expect((result as any).requestId).toBeUndefined();
-  });
+  test('converts requestId to request_id', () => {
+    const obj = { requestId: '123' }
+    const result = normalizeControlMessageKeys(obj)
+    expect(result).toEqual({ request_id: '123' })
+    expect((result as any).requestId).toBeUndefined()
+  })
 
-  test("leaves request_id unchanged", () => {
-    const obj = { request_id: "123" };
-    normalizeControlMessageKeys(obj);
-    expect(obj).toEqual({ request_id: "123" });
-  });
+  test('leaves request_id unchanged', () => {
+    const obj = { request_id: '123' }
+    normalizeControlMessageKeys(obj)
+    expect(obj).toEqual({ request_id: '123' })
+  })
 
   // --- both present: snake_case wins ---
-  test("keeps snake_case when both requestId and request_id exist", () => {
-    const obj = { requestId: "camel", request_id: "snake" };
-    const result = normalizeControlMessageKeys(obj) as any;
-    expect(result.request_id).toBe("snake");
+  test('keeps snake_case when both requestId and request_id exist', () => {
+    const obj = { requestId: 'camel', request_id: 'snake' }
+    const result = normalizeControlMessageKeys(obj) as any
+    expect(result.request_id).toBe('snake')
     // requestId is NOT deleted when request_id already exists
     // because the condition `!('request_id' in record)` prevents the branch
-    expect(result.requestId).toBe("camel");
-  });
+    expect(result.requestId).toBe('camel')
+  })
 
   // --- nested response ---
-  test("normalizes nested response.requestId", () => {
-    const obj = { response: { requestId: "456" } };
-    normalizeControlMessageKeys(obj);
-    expect((obj as any).response.request_id).toBe("456");
-    expect((obj as any).response.requestId).toBeUndefined();
-  });
+  test('normalizes nested response.requestId', () => {
+    const obj = { response: { requestId: '456' } }
+    normalizeControlMessageKeys(obj)
+    expect((obj as any).response.request_id).toBe('456')
+    expect((obj as any).response.requestId).toBeUndefined()
+  })
 
-  test("leaves nested response.request_id unchanged", () => {
-    const obj = { response: { request_id: "789" } };
-    normalizeControlMessageKeys(obj);
-    expect((obj as any).response.request_id).toBe("789");
-  });
+  test('leaves nested response.request_id unchanged', () => {
+    const obj = { response: { request_id: '789' } }
+    normalizeControlMessageKeys(obj)
+    expect((obj as any).response.request_id).toBe('789')
+  })
 
-  test("nested response: snake_case wins when both present", () => {
+  test('nested response: snake_case wins when both present', () => {
     const obj = {
-      response: { requestId: "camel", request_id: "snake" },
-    };
-    normalizeControlMessageKeys(obj);
-    expect((obj as any).response.request_id).toBe("snake");
-    expect((obj as any).response.requestId).toBe("camel");
-  });
+      response: { requestId: 'camel', request_id: 'snake' },
+    }
+    normalizeControlMessageKeys(obj)
+    expect((obj as any).response.request_id).toBe('snake')
+    expect((obj as any).response.requestId).toBe('camel')
+  })
 
   // --- non-object inputs ---
-  test("returns null as-is", () => {
-    expect(normalizeControlMessageKeys(null)).toBeNull();
-  });
+  test('returns null as-is', () => {
+    expect(normalizeControlMessageKeys(null)).toBeNull()
+  })
 
-  test("returns undefined as-is", () => {
-    expect(normalizeControlMessageKeys(undefined)).toBeUndefined();
-  });
+  test('returns undefined as-is', () => {
+    expect(normalizeControlMessageKeys(undefined)).toBeUndefined()
+  })
 
-  test("returns string as-is", () => {
-    expect(normalizeControlMessageKeys("hello")).toBe("hello");
-  });
+  test('returns string as-is', () => {
+    expect(normalizeControlMessageKeys('hello')).toBe('hello')
+  })
 
-  test("returns number as-is", () => {
-    expect(normalizeControlMessageKeys(42)).toBe(42);
-  });
+  test('returns number as-is', () => {
+    expect(normalizeControlMessageKeys(42)).toBe(42)
+  })
 
   // --- empty and edge cases ---
-  test("empty object is unchanged", () => {
-    const obj = {};
-    normalizeControlMessageKeys(obj);
-    expect(obj).toEqual({});
-  });
+  test('empty object is unchanged', () => {
+    const obj = {}
+    normalizeControlMessageKeys(obj)
+    expect(obj).toEqual({})
+  })
 
-  test("mutates the original object in place", () => {
-    const obj: Record<string, unknown> = { requestId: "abc", other: "data" };
-    const result = normalizeControlMessageKeys(obj);
-    expect(result).toBe(obj); // same reference
-    expect(obj).toEqual({ request_id: "abc", other: "data" });
-  });
+  test('mutates the original object in place', () => {
+    const obj: Record<string, unknown> = { requestId: 'abc', other: 'data' }
+    const result = normalizeControlMessageKeys(obj)
+    expect(result).toBe(obj) // same reference
+    expect(obj).toEqual({ request_id: 'abc', other: 'data' })
+  })
 
-  test("does not affect other keys on the object", () => {
-    const obj = { requestId: "123", type: "control_request", payload: {} };
-    normalizeControlMessageKeys(obj);
-    expect((obj as any).type).toBe("control_request");
-    expect((obj as any).payload).toEqual({});
-    expect((obj as any).request_id).toBe("123");
-  });
+  test('does not affect other keys on the object', () => {
+    const obj = { requestId: '123', type: 'control_request', payload: {} }
+    normalizeControlMessageKeys(obj)
+    expect((obj as any).type).toBe('control_request')
+    expect((obj as any).payload).toEqual({})
+    expect((obj as any).request_id).toBe('123')
+  })
 
-  test("handles response being null", () => {
-    const obj = { response: null, requestId: "x" };
-    normalizeControlMessageKeys(obj);
-    expect((obj as any).request_id).toBe("x");
-    expect((obj as any).response).toBeNull();
-  });
+  test('handles response being null', () => {
+    const obj = { response: null, requestId: 'x' }
+    normalizeControlMessageKeys(obj)
+    expect((obj as any).request_id).toBe('x')
+    expect((obj as any).response).toBeNull()
+  })
 
-  test("handles response being a non-object (string)", () => {
-    const obj = { response: "not-an-object" };
-    normalizeControlMessageKeys(obj);
-    expect((obj as any).response).toBe("not-an-object");
-  });
-});
+  test('handles response being a non-object (string)', () => {
+    const obj = { response: 'not-an-object' }
+    normalizeControlMessageKeys(obj)
+    expect((obj as any).response).toBe('not-an-object')
+  })
+})
diff --git a/src/utils/__tests__/cron.test.ts b/src/utils/__tests__/cron.test.ts
index 62dbb2560..5856b4b3d 100644
--- a/src/utils/__tests__/cron.test.ts
+++ b/src/utils/__tests__/cron.test.ts
@@ -1,253 +1,255 @@
-import { describe, expect, test } from "bun:test";
-import { parseCronExpression, computeNextCronRun, cronToHuman } from "../cron";
+import { describe, expect, test } from 'bun:test'
+import { parseCronExpression, computeNextCronRun, cronToHuman } from '../cron'
 
-describe("parseCronExpression", () => {
-  describe("valid expressions", () => {
-    test("parses wildcard fields", () => {
-      const result = parseCronExpression("* * * * *");
-      expect(result).not.toBeNull();
-      expect(result!.minute).toHaveLength(60);
-      expect(result!.hour).toHaveLength(24);
-      expect(result!.dayOfMonth).toHaveLength(31);
-      expect(result!.month).toHaveLength(12);
-      expect(result!.dayOfWeek).toHaveLength(7);
-    });
+describe('parseCronExpression', () => {
+  describe('valid expressions', () => {
+    test('parses wildcard fields', () => {
+      const result = parseCronExpression('* * * * *')
+      expect(result).not.toBeNull()
+      expect(result!.minute).toHaveLength(60)
+      expect(result!.hour).toHaveLength(24)
+      expect(result!.dayOfMonth).toHaveLength(31)
+      expect(result!.month).toHaveLength(12)
+      expect(result!.dayOfWeek).toHaveLength(7)
+    })
 
-    test("parses specific values", () => {
-      const result = parseCronExpression("30 14 1 6 3");
-      expect(result).not.toBeNull();
-      expect(result!.minute).toEqual([30]);
-      expect(result!.hour).toEqual([14]);
-      expect(result!.dayOfMonth).toEqual([1]);
-      expect(result!.month).toEqual([6]);
-      expect(result!.dayOfWeek).toEqual([3]);
-    });
+    test('parses specific values', () => {
+      const result = parseCronExpression('30 14 1 6 3')
+      expect(result).not.toBeNull()
+      expect(result!.minute).toEqual([30])
+      expect(result!.hour).toEqual([14])
+      expect(result!.dayOfMonth).toEqual([1])
+      expect(result!.month).toEqual([6])
+      expect(result!.dayOfWeek).toEqual([3])
+    })
 
-    test("parses step syntax", () => {
-      const result = parseCronExpression("*/5 * * * *");
-      expect(result).not.toBeNull();
-      expect(result!.minute).toEqual([0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55]);
-    });
+    test('parses step syntax', () => {
+      const result = parseCronExpression('*/5 * * * *')
+      expect(result).not.toBeNull()
+      expect(result!.minute).toEqual([
+        0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55,
+      ])
+    })
 
-    test("parses range syntax", () => {
-      const result = parseCronExpression("1-5 * * * *");
-      expect(result).not.toBeNull();
-      expect(result!.minute).toEqual([1, 2, 3, 4, 5]);
-    });
+    test('parses range syntax', () => {
+      const result = parseCronExpression('1-5 * * * *')
+      expect(result).not.toBeNull()
+      expect(result!.minute).toEqual([1, 2, 3, 4, 5])
+    })
 
-    test("parses range with step", () => {
-      const result = parseCronExpression("1-10/3 * * * *");
-      expect(result).not.toBeNull();
-      expect(result!.minute).toEqual([1, 4, 7, 10]);
-    });
+    test('parses range with step', () => {
+      const result = parseCronExpression('1-10/3 * * * *')
+      expect(result).not.toBeNull()
+      expect(result!.minute).toEqual([1, 4, 7, 10])
+    })
 
-    test("parses comma-separated list", () => {
-      const result = parseCronExpression("1,15,30 * * * *");
-      expect(result).not.toBeNull();
-      expect(result!.minute).toEqual([1, 15, 30]);
-    });
+    test('parses comma-separated list', () => {
+      const result = parseCronExpression('1,15,30 * * * *')
+      expect(result).not.toBeNull()
+      expect(result!.minute).toEqual([1, 15, 30])
+    })
 
-    test("parses day-of-week 7 as Sunday alias", () => {
-      const result = parseCronExpression("0 0 * * 7");
-      expect(result).not.toBeNull();
-      expect(result!.dayOfWeek).toEqual([0]);
-    });
+    test('parses day-of-week 7 as Sunday alias', () => {
+      const result = parseCronExpression('0 0 * * 7')
+      expect(result).not.toBeNull()
+      expect(result!.dayOfWeek).toEqual([0])
+    })
 
-    test("parses range with day-of-week 7", () => {
-      const result = parseCronExpression("0 0 * * 5-7");
-      expect(result).not.toBeNull();
-      expect(result!.dayOfWeek).toEqual([0, 5, 6]);
-    });
+    test('parses range with day-of-week 7', () => {
+      const result = parseCronExpression('0 0 * * 5-7')
+      expect(result).not.toBeNull()
+      expect(result!.dayOfWeek).toEqual([0, 5, 6])
+    })
 
-    test("parses complex combined expression", () => {
-      const result = parseCronExpression("0,30 9-17 * * 1-5");
-      expect(result).not.toBeNull();
-      expect(result!.minute).toEqual([0, 30]);
-      expect(result!.hour).toEqual([9, 10, 11, 12, 13, 14, 15, 16, 17]);
-      expect(result!.dayOfWeek).toEqual([1, 2, 3, 4, 5]);
-    });
-  });
+    test('parses complex combined expression', () => {
+      const result = parseCronExpression('0,30 9-17 * * 1-5')
+      expect(result).not.toBeNull()
+      expect(result!.minute).toEqual([0, 30])
+      expect(result!.hour).toEqual([9, 10, 11, 12, 13, 14, 15, 16, 17])
+      expect(result!.dayOfWeek).toEqual([1, 2, 3, 4, 5])
+    })
+  })
 
-  describe("invalid expressions", () => {
-    test("returns null for wrong field count", () => {
-      expect(parseCronExpression("* * *")).toBeNull();
-    });
+  describe('invalid expressions', () => {
+    test('returns null for wrong field count', () => {
+      expect(parseCronExpression('* * *')).toBeNull()
+    })
 
-    test("returns null for out-of-range values", () => {
-      expect(parseCronExpression("60 * * * *")).toBeNull();
-    });
+    test('returns null for out-of-range values', () => {
+      expect(parseCronExpression('60 * * * *')).toBeNull()
+    })
 
-    test("returns null for invalid step", () => {
-      expect(parseCronExpression("*/0 * * * *")).toBeNull();
-    });
+    test('returns null for invalid step', () => {
+      expect(parseCronExpression('*/0 * * * *')).toBeNull()
+    })
 
-    test("returns null for reversed range", () => {
-      expect(parseCronExpression("10-5 * * * *")).toBeNull();
-    });
+    test('returns null for reversed range', () => {
+      expect(parseCronExpression('10-5 * * * *')).toBeNull()
+    })
 
-    test("returns null for empty string", () => {
-      expect(parseCronExpression("")).toBeNull();
-    });
+    test('returns null for empty string', () => {
+      expect(parseCronExpression('')).toBeNull()
+    })
 
-    test("returns null for non-numeric tokens", () => {
-      expect(parseCronExpression("abc * * * *")).toBeNull();
-    });
-  });
+    test('returns null for non-numeric tokens', () => {
+      expect(parseCronExpression('abc * * * *')).toBeNull()
+    })
+  })
 
-  describe("field range validation", () => {
-    test("minute: 0-59", () => {
-      expect(parseCronExpression("0 * * * *")).not.toBeNull();
-      expect(parseCronExpression("59 * * * *")).not.toBeNull();
-      expect(parseCronExpression("60 * * * *")).toBeNull();
-    });
+  describe('field range validation', () => {
+    test('minute: 0-59', () => {
+      expect(parseCronExpression('0 * * * *')).not.toBeNull()
+      expect(parseCronExpression('59 * * * *')).not.toBeNull()
+      expect(parseCronExpression('60 * * * *')).toBeNull()
+    })
 
-    test("hour: 0-23", () => {
-      expect(parseCronExpression("* 0 * * *")).not.toBeNull();
-      expect(parseCronExpression("* 23 * * *")).not.toBeNull();
-      expect(parseCronExpression("* 24 * * *")).toBeNull();
-    });
+    test('hour: 0-23', () => {
+      expect(parseCronExpression('* 0 * * *')).not.toBeNull()
+      expect(parseCronExpression('* 23 * * *')).not.toBeNull()
+      expect(parseCronExpression('* 24 * * *')).toBeNull()
+    })
 
-    test("dayOfMonth: 1-31", () => {
-      expect(parseCronExpression("* * 1 * *")).not.toBeNull();
-      expect(parseCronExpression("* * 31 * *")).not.toBeNull();
-      expect(parseCronExpression("* * 0 * *")).toBeNull();
-      expect(parseCronExpression("* * 32 * *")).toBeNull();
-    });
+    test('dayOfMonth: 1-31', () => {
+      expect(parseCronExpression('* * 1 * *')).not.toBeNull()
+      expect(parseCronExpression('* * 31 * *')).not.toBeNull()
+      expect(parseCronExpression('* * 0 * *')).toBeNull()
+      expect(parseCronExpression('* * 32 * *')).toBeNull()
+    })
 
-    test("month: 1-12", () => {
-      expect(parseCronExpression("* * * 1 *")).not.toBeNull();
-      expect(parseCronExpression("* * * 12 *")).not.toBeNull();
-      expect(parseCronExpression("* * * 0 *")).toBeNull();
-      expect(parseCronExpression("* * * 13 *")).toBeNull();
-    });
+    test('month: 1-12', () => {
+      expect(parseCronExpression('* * * 1 *')).not.toBeNull()
+      expect(parseCronExpression('* * * 12 *')).not.toBeNull()
+      expect(parseCronExpression('* * * 0 *')).toBeNull()
+      expect(parseCronExpression('* * * 13 *')).toBeNull()
+    })
 
-    test("dayOfWeek: 0-6 (plus 7 alias)", () => {
-      expect(parseCronExpression("* * * * 0")).not.toBeNull();
-      expect(parseCronExpression("* * * * 6")).not.toBeNull();
-      expect(parseCronExpression("* * * * 7")).not.toBeNull(); // alias for 0
-      expect(parseCronExpression("* * * * 8")).toBeNull();
-    });
-  });
-});
+    test('dayOfWeek: 0-6 (plus 7 alias)', () => {
+      expect(parseCronExpression('* * * * 0')).not.toBeNull()
+      expect(parseCronExpression('* * * * 6')).not.toBeNull()
+      expect(parseCronExpression('* * * * 7')).not.toBeNull() // alias for 0
+      expect(parseCronExpression('* * * * 8')).toBeNull()
+    })
+  })
+})
 
-describe("computeNextCronRun", () => {
-  test("finds next minute", () => {
-    const fields = parseCronExpression("31 14 * * *")!;
-    const from = new Date(2026, 0, 15, 14, 30, 45); // 14:30:45
-    const next = computeNextCronRun(fields, from);
-    expect(next).not.toBeNull();
-    expect(next!.getHours()).toBe(14);
-    expect(next!.getMinutes()).toBe(31);
-  });
+describe('computeNextCronRun', () => {
+  test('finds next minute', () => {
+    const fields = parseCronExpression('31 14 * * *')!
+    const from = new Date(2026, 0, 15, 14, 30, 45) // 14:30:45
+    const next = computeNextCronRun(fields, from)
+    expect(next).not.toBeNull()
+    expect(next!.getHours()).toBe(14)
+    expect(next!.getMinutes()).toBe(31)
+  })
 
-  test("finds next hour", () => {
-    const fields = parseCronExpression("0 15 * * *")!;
-    const from = new Date(2026, 0, 15, 14, 30);
-    const next = computeNextCronRun(fields, from);
-    expect(next).not.toBeNull();
-    expect(next!.getHours()).toBe(15);
-    expect(next!.getMinutes()).toBe(0);
-  });
+  test('finds next hour', () => {
+    const fields = parseCronExpression('0 15 * * *')!
+    const from = new Date(2026, 0, 15, 14, 30)
+    const next = computeNextCronRun(fields, from)
+    expect(next).not.toBeNull()
+    expect(next!.getHours()).toBe(15)
+    expect(next!.getMinutes()).toBe(0)
+  })
 
-  test("rolls to next day", () => {
-    const fields = parseCronExpression("0 10 * * *")!;
-    const from = new Date(2026, 0, 15, 14, 30);
-    const next = computeNextCronRun(fields, from);
-    expect(next).not.toBeNull();
-    expect(next!.getDate()).toBe(16);
-    expect(next!.getHours()).toBe(10);
-  });
+  test('rolls to next day', () => {
+    const fields = parseCronExpression('0 10 * * *')!
+    const from = new Date(2026, 0, 15, 14, 30)
+    const next = computeNextCronRun(fields, from)
+    expect(next).not.toBeNull()
+    expect(next!.getDate()).toBe(16)
+    expect(next!.getHours()).toBe(10)
+  })
 
-  test("is strictly after from date", () => {
-    const fields = parseCronExpression("30 14 * * *")!;
-    const from = new Date(2026, 0, 15, 14, 30, 0); // exactly on cron time
-    const next = computeNextCronRun(fields, from);
-    expect(next).not.toBeNull();
-    expect(next!.getTime()).toBeGreaterThan(from.getTime());
-  });
+  test('is strictly after from date', () => {
+    const fields = parseCronExpression('30 14 * * *')!
+    const from = new Date(2026, 0, 15, 14, 30, 0) // exactly on cron time
+    const next = computeNextCronRun(fields, from)
+    expect(next).not.toBeNull()
+    expect(next!.getTime()).toBeGreaterThan(from.getTime())
+  })
 
-  test("every 5 minutes from arbitrary time", () => {
-    const fields = parseCronExpression("*/5 * * * *")!;
-    const from = new Date(2026, 0, 15, 14, 32);
-    const next = computeNextCronRun(fields, from);
-    expect(next).not.toBeNull();
-    expect(next!.getMinutes()).toBe(35);
-  });
+  test('every 5 minutes from arbitrary time', () => {
+    const fields = parseCronExpression('*/5 * * * *')!
+    const from = new Date(2026, 0, 15, 14, 32)
+    const next = computeNextCronRun(fields, from)
+    expect(next).not.toBeNull()
+    expect(next!.getMinutes()).toBe(35)
+  })
 
-  test("every minute", () => {
-    const fields = parseCronExpression("* * * * *")!;
-    const from = new Date(2026, 0, 15, 14, 32, 45);
-    const next = computeNextCronRun(fields, from);
-    expect(next).not.toBeNull();
-    expect(next!.getMinutes()).toBe(33);
-  });
+  test('every minute', () => {
+    const fields = parseCronExpression('* * * * *')!
+    const from = new Date(2026, 0, 15, 14, 32, 45)
+    const next = computeNextCronRun(fields, from)
+    expect(next).not.toBeNull()
+    expect(next!.getMinutes()).toBe(33)
+  })
 
-  test("handles step across midnight", () => {
-    const fields = parseCronExpression("0 0 * * *")!;
-    const from = new Date(2026, 0, 15, 23, 59);
-    const next = computeNextCronRun(fields, from);
-    expect(next).not.toBeNull();
-    expect(next!.getHours()).toBe(0);
-    expect(next!.getDate()).toBe(16);
-  });
+  test('handles step across midnight', () => {
+    const fields = parseCronExpression('0 0 * * *')!
+    const from = new Date(2026, 0, 15, 23, 59)
+    const next = computeNextCronRun(fields, from)
+    expect(next).not.toBeNull()
+    expect(next!.getHours()).toBe(0)
+    expect(next!.getDate()).toBe(16)
+  })
 
-  test("OR semantics when both dom and dow constrained", () => {
+  test('OR semantics when both dom and dow constrained', () => {
     // dom=15, dow=3(Wed) - matches 15th OR Wednesday
-    const fields = parseCronExpression("0 0 15 * 3")!;
-    const from = new Date(2026, 0, 12, 0, 0); // Monday Jan 12
-    const next = computeNextCronRun(fields, from);
-    expect(next).not.toBeNull();
+    const fields = parseCronExpression('0 0 15 * 3')!
+    const from = new Date(2026, 0, 12, 0, 0) // Monday Jan 12
+    const next = computeNextCronRun(fields, from)
+    expect(next).not.toBeNull()
     // Should match the first of either: next Wednesday(Jan 14) or 15th(Jan 15)
-    const dayOfWeek = next!.getDay();
-    const dayOfMonth = next!.getDate();
-    expect(dayOfWeek === 3 || dayOfMonth === 15).toBe(true);
-  });
-});
+    const dayOfWeek = next!.getDay()
+    const dayOfMonth = next!.getDate()
+    expect(dayOfWeek === 3 || dayOfMonth === 15).toBe(true)
+  })
+})
 
-describe("cronToHuman", () => {
-  test("every N minutes", () => {
-    expect(cronToHuman("*/5 * * * *")).toBe("Every 5 minutes");
-  });
+describe('cronToHuman', () => {
+  test('every N minutes', () => {
+    expect(cronToHuman('*/5 * * * *')).toBe('Every 5 minutes')
+  })
 
-  test("every minute", () => {
-    expect(cronToHuman("*/1 * * * *")).toBe("Every minute");
-  });
+  test('every minute', () => {
+    expect(cronToHuman('*/1 * * * *')).toBe('Every minute')
+  })
 
-  test("every hour at :00", () => {
-    expect(cronToHuman("0 * * * *")).toBe("Every hour");
-  });
+  test('every hour at :00', () => {
+    expect(cronToHuman('0 * * * *')).toBe('Every hour')
+  })
 
-  test("every hour at :30", () => {
-    expect(cronToHuman("30 * * * *")).toBe("Every hour at :30");
-  });
+  test('every hour at :30', () => {
+    expect(cronToHuman('30 * * * *')).toBe('Every hour at :30')
+  })
 
-  test("every N hours", () => {
-    expect(cronToHuman("0 */2 * * *")).toBe("Every 2 hours");
-  });
+  test('every N hours', () => {
+    expect(cronToHuman('0 */2 * * *')).toBe('Every 2 hours')
+  })
 
-  test("daily at specific time", () => {
-    const result = cronToHuman("30 9 * * *");
-    expect(result).toContain("Every day at");
-    expect(result).toContain("9:30");
-  });
+  test('daily at specific time', () => {
+    const result = cronToHuman('30 9 * * *')
+    expect(result).toContain('Every day at')
+    expect(result).toContain('9:30')
+  })
 
-  test("specific day of week", () => {
-    const result = cronToHuman("0 9 * * 3");
-    expect(result).toContain("Wednesday");
-    expect(result).toContain("9:00");
-  });
+  test('specific day of week', () => {
+    const result = cronToHuman('0 9 * * 3')
+    expect(result).toContain('Wednesday')
+    expect(result).toContain('9:00')
+  })
 
-  test("weekdays", () => {
-    const result = cronToHuman("0 9 * * 1-5");
-    expect(result).toContain("Weekdays");
-    expect(result).toContain("9:00");
-  });
+  test('weekdays', () => {
+    const result = cronToHuman('0 9 * * 1-5')
+    expect(result).toContain('Weekdays')
+    expect(result).toContain('9:00')
+  })
 
-  test("returns raw cron for complex patterns", () => {
-    expect(cronToHuman("0,30 9-17 * * 1-5")).toBe("0,30 9-17 * * 1-5");
-  });
+  test('returns raw cron for complex patterns', () => {
+    expect(cronToHuman('0,30 9-17 * * 1-5')).toBe('0,30 9-17 * * 1-5')
+  })
 
-  test("returns raw cron for wrong field count", () => {
-    expect(cronToHuman("* * *")).toBe("* * *");
-  });
-});
+  test('returns raw cron for wrong field count', () => {
+    expect(cronToHuman('* * *')).toBe('* * *')
+  })
+})
diff --git a/src/utils/__tests__/cronScheduler.baseline.test.ts b/src/utils/__tests__/cronScheduler.baseline.test.ts
index 696510337..0b8f53225 100644
--- a/src/utils/__tests__/cronScheduler.baseline.test.ts
+++ b/src/utils/__tests__/cronScheduler.baseline.test.ts
@@ -8,7 +8,13 @@ describe('cronScheduler baseline helpers', () => {
   test('isRecurringTaskAged returns false when maxAgeMs is zero', () => {
     expect(
       isRecurringTaskAged(
-        { id: 'a', cron: '* * * * *', prompt: 'x', createdAt: 0, recurring: true },
+        {
+          id: 'a',
+          cron: '* * * * *',
+          prompt: 'x',
+          createdAt: 0,
+          recurring: true,
+        },
         10_000,
         0,
       ),
@@ -41,7 +47,13 @@ describe('cronScheduler baseline helpers', () => {
 
     expect(
       isRecurringTaskAged(
-        { id: 'c', cron: '* * * * *', prompt: 'x', createdAt: 0, recurring: true },
+        {
+          id: 'c',
+          cron: '* * * * *',
+          prompt: 'x',
+          createdAt: 0,
+          recurring: true,
+        },
         10_000,
         100,
       ),
diff --git a/src/utils/__tests__/cronTasks.baseline.test.ts b/src/utils/__tests__/cronTasks.baseline.test.ts
index 1acfb993c..3696d76bf 100644
--- a/src/utils/__tests__/cronTasks.baseline.test.ts
+++ b/src/utils/__tests__/cronTasks.baseline.test.ts
@@ -41,7 +41,12 @@ afterEach(async () => {
 
 describe('cronTasks baseline', () => {
   test('session-only cron tasks remain in memory and do not create the cron file', async () => {
-    const id = await addCronTask('* * * * *', 'session-only prompt', true, false)
+    const id = await addCronTask(
+      '* * * * *',
+      'session-only prompt',
+      true,
+      false,
+    )
 
     const tasks = await listAllCronTasks()
 
@@ -107,7 +112,12 @@ describe('cronTasks baseline', () => {
 
   test('daemon-style listAllCronTasks(dir) excludes session-only tasks', async () => {
     await addCronTask('* * * * *', 'session prompt', true, false)
-    const durableId = await addCronTask('* * * * *', 'durable prompt', true, true)
+    const durableId = await addCronTask(
+      '* * * * *',
+      'durable prompt',
+      true,
+      true,
+    )
 
     const sessionView = await listAllCronTasks()
     const daemonView = await listAllCronTasks(tempDir)
@@ -130,7 +140,12 @@ describe('cronTasks baseline', () => {
   })
 
   test('removeCronTasks with dir does not mutate session-only task storage', async () => {
-    const sessionId = await addCronTask('* * * * *', 'keep session task', true, false)
+    const sessionId = await addCronTask(
+      '* * * * *',
+      'keep session task',
+      true,
+      false,
+    )
     await addCronTask('* * * * *', 'durable prompt', true, true)
 
     await removeCronTasks([sessionId], tempDir)
@@ -194,7 +209,11 @@ describe('cronTasks baseline', () => {
   test('jitteredNextCronRunMs returns the exact next fire time when no second match exists in range', () => {
     const fromMs = new Date('2026-04-12T10:00:00').getTime()
     const exact = nextCronRunMs('0 0 29 2 *', fromMs)
-    const jittered = oneShotJitteredNextCronRunMs('0 0 29 2 *', fromMs, '89abcdef')
+    const jittered = oneShotJitteredNextCronRunMs(
+      '0 0 29 2 *',
+      fromMs,
+      '89abcdef',
+    )
 
     expect(exact).not.toBeNull()
     expect(jittered).not.toBeNull()
diff --git a/src/utils/__tests__/detectRepository.test.ts b/src/utils/__tests__/detectRepository.test.ts
index c21ae227d..d57214e4b 100644
--- a/src/utils/__tests__/detectRepository.test.ts
+++ b/src/utils/__tests__/detectRepository.test.ts
@@ -1,108 +1,122 @@
-import { describe, expect, test } from "bun:test";
-import { parseGitRemote, parseGitHubRepository } from "../detectRepository";
+import { describe, expect, test } from 'bun:test'
+import { parseGitRemote, parseGitHubRepository } from '../detectRepository'
 
-describe("parseGitRemote", () => {
+describe('parseGitRemote', () => {
   // HTTPS
-  test("parses HTTPS URL: https://github.com/owner/repo.git", () => {
-    const result = parseGitRemote("https://github.com/owner/repo.git");
-    expect(result).toEqual({ host: "github.com", owner: "owner", name: "repo" });
-  });
+  test('parses HTTPS URL: https://github.com/owner/repo.git', () => {
+    const result = parseGitRemote('https://github.com/owner/repo.git')
+    expect(result).toEqual({ host: 'github.com', owner: 'owner', name: 'repo' })
+  })
 
-  test("parses HTTPS URL without .git suffix", () => {
-    const result = parseGitRemote("https://github.com/owner/repo");
-    expect(result).toEqual({ host: "github.com", owner: "owner", name: "repo" });
-  });
+  test('parses HTTPS URL without .git suffix', () => {
+    const result = parseGitRemote('https://github.com/owner/repo')
+    expect(result).toEqual({ host: 'github.com', owner: 'owner', name: 'repo' })
+  })
 
-  test("parses HTTPS URL with subdirectory path (only takes first 2 segments)", () => {
-    const result = parseGitRemote("https://github.com/owner/repo.git");
-    expect(result).not.toBeNull();
-    expect(result!.name).toBe("repo");
-  });
+  test('parses HTTPS URL with subdirectory path (only takes first 2 segments)', () => {
+    const result = parseGitRemote('https://github.com/owner/repo.git')
+    expect(result).not.toBeNull()
+    expect(result!.name).toBe('repo')
+  })
 
   // SSH
-  test("parses SSH URL: git@github.com:owner/repo.git", () => {
-    const result = parseGitRemote("git@github.com:owner/repo.git");
-    expect(result).toEqual({ host: "github.com", owner: "owner", name: "repo" });
-  });
+  test('parses SSH URL: git@github.com:owner/repo.git', () => {
+    const result = parseGitRemote('git@github.com:owner/repo.git')
+    expect(result).toEqual({ host: 'github.com', owner: 'owner', name: 'repo' })
+  })
 
-  test("parses SSH URL without .git suffix", () => {
-    const result = parseGitRemote("git@github.com:owner/repo");
-    expect(result).toEqual({ host: "github.com", owner: "owner", name: "repo" });
-  });
+  test('parses SSH URL without .git suffix', () => {
+    const result = parseGitRemote('git@github.com:owner/repo')
+    expect(result).toEqual({ host: 'github.com', owner: 'owner', name: 'repo' })
+  })
 
   // ssh://
-  test("parses ssh:// URL: ssh://git@github.com/owner/repo.git", () => {
-    const result = parseGitRemote("ssh://git@github.com/owner/repo.git");
-    expect(result).toEqual({ host: "github.com", owner: "owner", name: "repo" });
-  });
+  test('parses ssh:// URL: ssh://git@github.com/owner/repo.git', () => {
+    const result = parseGitRemote('ssh://git@github.com/owner/repo.git')
+    expect(result).toEqual({ host: 'github.com', owner: 'owner', name: 'repo' })
+  })
 
   // git://
-  test("parses git:// URL", () => {
-    const result = parseGitRemote("git://github.com/owner/repo.git");
-    expect(result).toEqual({ host: "github.com", owner: "owner", name: "repo" });
-  });
+  test('parses git:// URL', () => {
+    const result = parseGitRemote('git://github.com/owner/repo.git')
+    expect(result).toEqual({ host: 'github.com', owner: 'owner', name: 'repo' })
+  })
 
   // Boundary
-  test("returns null for invalid URL", () => {
-    expect(parseGitRemote("not-a-url")).toBeNull();
-  });
+  test('returns null for invalid URL', () => {
+    expect(parseGitRemote('not-a-url')).toBeNull()
+  })
 
-  test("returns null for empty string", () => {
-    expect(parseGitRemote("")).toBeNull();
-  });
+  test('returns null for empty string', () => {
+    expect(parseGitRemote('')).toBeNull()
+  })
 
-  test("handles GHE hostname", () => {
-    const result = parseGitRemote("https://ghe.corp.com/team/project.git");
-    expect(result).toEqual({ host: "ghe.corp.com", owner: "team", name: "project" });
-  });
+  test('handles GHE hostname', () => {
+    const result = parseGitRemote('https://ghe.corp.com/team/project.git')
+    expect(result).toEqual({
+      host: 'ghe.corp.com',
+      owner: 'team',
+      name: 'project',
+    })
+  })
 
-  test("handles port number in URL", () => {
-    const result = parseGitRemote("https://github.com:443/owner/repo.git");
-    expect(result).not.toBeNull();
-    expect(result!.owner).toBe("owner");
-    expect(result!.name).toBe("repo");
-  });
+  test('handles port number in URL', () => {
+    const result = parseGitRemote('https://github.com:443/owner/repo.git')
+    expect(result).not.toBeNull()
+    expect(result!.owner).toBe('owner')
+    expect(result!.name).toBe('repo')
+  })
 
-  test("rejects SSH config alias without real hostname", () => {
-    expect(parseGitRemote("git@github.com-work:owner/repo.git")).toBeNull();
-  });
+  test('rejects SSH config alias without real hostname', () => {
+    expect(parseGitRemote('git@github.com-work:owner/repo.git')).toBeNull()
+  })
 
-  test("handles repo names with dots", () => {
-    const result = parseGitRemote("https://github.com/owner/cc.kurs.web.git");
-    expect(result).toEqual({ host: "github.com", owner: "owner", name: "cc.kurs.web" });
-  });
-});
+  test('handles repo names with dots', () => {
+    const result = parseGitRemote('https://github.com/owner/cc.kurs.web.git')
+    expect(result).toEqual({
+      host: 'github.com',
+      owner: 'owner',
+      name: 'cc.kurs.web',
+    })
+  })
+})
 
-describe("parseGitHubRepository", () => {
+describe('parseGitHubRepository', () => {
   test("extracts 'owner/repo' from valid remote URL", () => {
-    expect(parseGitHubRepository("https://github.com/owner/repo.git")).toBe("owner/repo");
-  });
+    expect(parseGitHubRepository('https://github.com/owner/repo.git')).toBe(
+      'owner/repo',
+    )
+  })
 
   test("handles plain 'owner/repo' string input", () => {
-    expect(parseGitHubRepository("owner/repo")).toBe("owner/repo");
-  });
+    expect(parseGitHubRepository('owner/repo')).toBe('owner/repo')
+  })
 
-  test("returns null for non-GitHub host", () => {
-    expect(parseGitHubRepository("https://gitlab.com/owner/repo.git")).toBeNull();
-  });
+  test('returns null for non-GitHub host', () => {
+    expect(
+      parseGitHubRepository('https://gitlab.com/owner/repo.git'),
+    ).toBeNull()
+  })
 
-  test("returns null for invalid input", () => {
-    expect(parseGitHubRepository("not-valid")).toBeNull();
-  });
+  test('returns null for invalid input', () => {
+    expect(parseGitHubRepository('not-valid')).toBeNull()
+  })
 
-  test("is case-sensitive for owner/repo", () => {
-    expect(parseGitHubRepository("Owner/Repo")).toBe("Owner/Repo");
-  });
+  test('is case-sensitive for owner/repo', () => {
+    expect(parseGitHubRepository('Owner/Repo')).toBe('Owner/Repo')
+  })
 
-  test("handles SSH format for github.com", () => {
-    expect(parseGitHubRepository("git@github.com:owner/repo.git")).toBe("owner/repo");
-  });
+  test('handles SSH format for github.com', () => {
+    expect(parseGitHubRepository('git@github.com:owner/repo.git')).toBe(
+      'owner/repo',
+    )
+  })
 
-  test("returns null for GHE SSH URL", () => {
-    expect(parseGitHubRepository("git@ghe.corp.com:owner/repo.git")).toBeNull();
-  });
+  test('returns null for GHE SSH URL', () => {
+    expect(parseGitHubRepository('git@ghe.corp.com:owner/repo.git')).toBeNull()
+  })
 
-  test("handles plain owner/repo with .git suffix", () => {
-    expect(parseGitHubRepository("owner/repo.git")).toBe("owner/repo");
-  });
-});
+  test('handles plain owner/repo with .git suffix', () => {
+    expect(parseGitHubRepository('owner/repo.git')).toBe('owner/repo')
+  })
+})
diff --git a/src/utils/__tests__/diff.test.ts b/src/utils/__tests__/diff.test.ts
index a7e7be981..a113cf6dc 100644
--- a/src/utils/__tests__/diff.test.ts
+++ b/src/utils/__tests__/diff.test.ts
@@ -1,117 +1,130 @@
-import { describe, expect, test } from "bun:test";
-import { adjustHunkLineNumbers, getPatchFromContents } from "../diff";
+import { describe, expect, test } from 'bun:test'
+import { adjustHunkLineNumbers, getPatchFromContents } from '../diff'
 
-describe("adjustHunkLineNumbers", () => {
-  test("shifts hunk line numbers by offset", () => {
+describe('adjustHunkLineNumbers', () => {
+  test('shifts hunk line numbers by offset', () => {
     const hunks = [
-      { oldStart: 1, oldLines: 3, newStart: 1, newLines: 4, lines: [" a", "-b", "+c", "+d", " e"] },
-    ] as any[];
-    const result = adjustHunkLineNumbers(hunks, 10);
-    expect(result[0].oldStart).toBe(11);
-    expect(result[0].newStart).toBe(11);
-  });
+      {
+        oldStart: 1,
+        oldLines: 3,
+        newStart: 1,
+        newLines: 4,
+        lines: [' a', '-b', '+c', '+d', ' e'],
+      },
+    ] as any[]
+    const result = adjustHunkLineNumbers(hunks, 10)
+    expect(result[0].oldStart).toBe(11)
+    expect(result[0].newStart).toBe(11)
+  })
 
-  test("returns original hunks for zero offset", () => {
+  test('returns original hunks for zero offset', () => {
     const hunks = [
       { oldStart: 5, oldLines: 2, newStart: 5, newLines: 2, lines: [] },
-    ] as any[];
-    const result = adjustHunkLineNumbers(hunks, 0);
-    expect(result).toBe(hunks); // same reference
-  });
+    ] as any[]
+    const result = adjustHunkLineNumbers(hunks, 0)
+    expect(result).toBe(hunks) // same reference
+  })
 
-  test("handles negative offset", () => {
+  test('handles negative offset', () => {
     const hunks = [
       { oldStart: 10, oldLines: 2, newStart: 10, newLines: 2, lines: [] },
-    ] as any[];
-    const result = adjustHunkLineNumbers(hunks, -5);
-    expect(result[0].oldStart).toBe(5);
-    expect(result[0].newStart).toBe(5);
-  });
+    ] as any[]
+    const result = adjustHunkLineNumbers(hunks, -5)
+    expect(result[0].oldStart).toBe(5)
+    expect(result[0].newStart).toBe(5)
+  })
 
-  test("handles empty hunks array", () => {
-    expect(adjustHunkLineNumbers([], 10)).toEqual([]);
-  });
-});
+  test('handles empty hunks array', () => {
+    expect(adjustHunkLineNumbers([], 10)).toEqual([])
+  })
+})
 
-describe("getPatchFromContents", () => {
-  test("returns hunks for different content", () => {
+describe('getPatchFromContents', () => {
+  test('returns hunks for different content', () => {
     const hunks = getPatchFromContents({
-      filePath: "test.txt",
-      oldContent: "hello\nworld",
-      newContent: "hello\nplanet",
-    });
-    expect(hunks.length).toBe(1);
-    const allLines = hunks[0].lines;
-    expect(allLines).toContain("-world");
-    expect(allLines).toContain("+planet");
-  });
+      filePath: 'test.txt',
+      oldContent: 'hello\nworld',
+      newContent: 'hello\nplanet',
+    })
+    expect(hunks.length).toBe(1)
+    const allLines = hunks[0].lines
+    expect(allLines).toContain('-world')
+    expect(allLines).toContain('+planet')
+  })
 
-  test("returns empty hunks for identical content", () => {
+  test('returns empty hunks for identical content', () => {
     const hunks = getPatchFromContents({
-      filePath: "test.txt",
-      oldContent: "same content",
-      newContent: "same content",
-    });
-    expect(hunks).toEqual([]);
-  });
+      filePath: 'test.txt',
+      oldContent: 'same content',
+      newContent: 'same content',
+    })
+    expect(hunks).toEqual([])
+  })
 
-  test("handles content with ampersands", () => {
+  test('handles content with ampersands', () => {
     const hunks = getPatchFromContents({
-      filePath: "test.txt",
-      oldContent: "a & b",
-      newContent: "a & c",
-    });
-    expect(hunks.length).toBeGreaterThan(0);
+      filePath: 'test.txt',
+      oldContent: 'a & b',
+      newContent: 'a & c',
+    })
+    expect(hunks.length).toBeGreaterThan(0)
     // Verify ampersands are unescaped in the output
-    const allLines = hunks.flatMap((h: any) => h.lines);
-    expect(allLines.some((l: string) => l.includes("&"))).toBe(true);
-  });
+    const allLines = hunks.flatMap((h: any) => h.lines)
+    expect(allLines.some((l: string) => l.includes('&'))).toBe(true)
+  })
 
-  test("handles empty old content (new file)", () => {
+  test('handles empty old content (new file)', () => {
     const hunks = getPatchFromContents({
-      filePath: "test.txt",
-      oldContent: "",
-      newContent: "new content",
-    });
-    expect(hunks.length).toBeGreaterThan(0);
-    const allLines = hunks.flatMap((h: any) => h.lines);
-    expect(allLines.some((l: string) => l.startsWith("+"))).toBe(true);
-  });
+      filePath: 'test.txt',
+      oldContent: '',
+      newContent: 'new content',
+    })
+    expect(hunks.length).toBeGreaterThan(0)
+    const allLines = hunks.flatMap((h: any) => h.lines)
+    expect(allLines.some((l: string) => l.startsWith('+'))).toBe(true)
+  })
 
-  test("handles content with dollar signs", () => {
+  test('handles content with dollar signs', () => {
     const hunks = getPatchFromContents({
-      filePath: "test.txt",
-      oldContent: "price: $5",
-      newContent: "price: $10",
-    });
-    expect(hunks.length).toBeGreaterThan(0);
-    const allLines = hunks.flatMap((h: any) => h.lines);
-    expect(allLines.some((l: string) => l.includes("$"))).toBe(true);
+      filePath: 'test.txt',
+      oldContent: 'price: $5',
+      newContent: 'price: $10',
+    })
+    expect(hunks.length).toBeGreaterThan(0)
+    const allLines = hunks.flatMap((h: any) => h.lines)
+    expect(allLines.some((l: string) => l.includes('$'))).toBe(true)
     // Verify dollar signs are unescaped (not the token)
-    expect(allLines.some((l: string) => l.includes("<<:DOLLAR_TOKEN:>>"))).toBe(false);
-  });
+    expect(allLines.some((l: string) => l.includes('<<:DOLLAR_TOKEN:>>'))).toBe(
+      false,
+    )
+  })
 
-  test("handles deleting all content", () => {
+  test('handles deleting all content', () => {
     const hunks = getPatchFromContents({
-      filePath: "test.txt",
-      oldContent: "line1\nline2\nline3",
-      newContent: "",
-    });
-    expect(hunks.length).toBeGreaterThan(0);
-    const allLines = hunks.flatMap((h: any) => h.lines);
-    expect(allLines.some((l: string) => l.startsWith("-"))).toBe(true);
-    expect(allLines.every((l: string) => l.startsWith("-") || l.startsWith(" ") || l.startsWith("\\"))).toBe(true);
-  });
+      filePath: 'test.txt',
+      oldContent: 'line1\nline2\nline3',
+      newContent: '',
+    })
+    expect(hunks.length).toBeGreaterThan(0)
+    const allLines = hunks.flatMap((h: any) => h.lines)
+    expect(allLines.some((l: string) => l.startsWith('-'))).toBe(true)
+    expect(
+      allLines.every(
+        (l: string) =>
+          l.startsWith('-') || l.startsWith(' ') || l.startsWith('\\'),
+      ),
+    ).toBe(true)
+  })
 
-  test("ignoreWhitespace treats indentation changes as identical", () => {
-    const old = "function foo() {\n  return 42;\n}\n";
-    const nw = "function foo() {\n\treturn 42;\n}\n";
+  test('ignoreWhitespace treats indentation changes as identical', () => {
+    const old = 'function foo() {\n  return 42;\n}\n'
+    const nw = 'function foo() {\n\treturn 42;\n}\n'
     const hunks = getPatchFromContents({
-      filePath: "test.txt",
+      filePath: 'test.txt',
       oldContent: old,
       newContent: nw,
       ignoreWhitespace: true,
-    });
-    expect(hunks).toEqual([]);
-  });
-});
+    })
+    expect(hunks).toEqual([])
+  })
+})
diff --git a/src/utils/__tests__/directMemberMessage.test.ts b/src/utils/__tests__/directMemberMessage.test.ts
index 1a2974135..3c2105e07 100644
--- a/src/utils/__tests__/directMemberMessage.test.ts
+++ b/src/utils/__tests__/directMemberMessage.test.ts
@@ -1,110 +1,119 @@
-import { describe, expect, test } from "bun:test";
-import { parseDirectMemberMessage, sendDirectMemberMessage } from "../directMemberMessage";
+import { describe, expect, test } from 'bun:test'
+import {
+  parseDirectMemberMessage,
+  sendDirectMemberMessage,
+} from '../directMemberMessage'
 
-describe("parseDirectMemberMessage", () => {
+describe('parseDirectMemberMessage', () => {
   test("parses '@agent-name hello world'", () => {
-    const result = parseDirectMemberMessage("@agent-name hello world");
-    expect(result).toEqual({ recipientName: "agent-name", message: "hello world" });
-  });
+    const result = parseDirectMemberMessage('@agent-name hello world')
+    expect(result).toEqual({
+      recipientName: 'agent-name',
+      message: 'hello world',
+    })
+  })
 
   test("parses '@agent-name single-word'", () => {
-    const result = parseDirectMemberMessage("@agent-name single-word");
-    expect(result).toEqual({ recipientName: "agent-name", message: "single-word" });
-  });
+    const result = parseDirectMemberMessage('@agent-name single-word')
+    expect(result).toEqual({
+      recipientName: 'agent-name',
+      message: 'single-word',
+    })
+  })
 
-  test("returns null for non-matching input", () => {
-    expect(parseDirectMemberMessage("hello world")).toBeNull();
-  });
+  test('returns null for non-matching input', () => {
+    expect(parseDirectMemberMessage('hello world')).toBeNull()
+  })
 
-  test("returns null for empty string", () => {
-    expect(parseDirectMemberMessage("")).toBeNull();
-  });
+  test('returns null for empty string', () => {
+    expect(parseDirectMemberMessage('')).toBeNull()
+  })
 
   test("returns null for '@name' without message", () => {
-    expect(parseDirectMemberMessage("@name")).toBeNull();
-  });
+    expect(parseDirectMemberMessage('@name')).toBeNull()
+  })
 
   test("handles hyphenated agent names like '@my-agent msg'", () => {
-    const result = parseDirectMemberMessage("@my-agent msg");
-    expect(result).toEqual({ recipientName: "my-agent", message: "msg" });
-  });
+    const result = parseDirectMemberMessage('@my-agent msg')
+    expect(result).toEqual({ recipientName: 'my-agent', message: 'msg' })
+  })
 
-  test("handles multiline message content", () => {
-    const result = parseDirectMemberMessage("@agent line1\nline2");
-    expect(result).toEqual({ recipientName: "agent", message: "line1\nline2" });
-  });
+  test('handles multiline message content', () => {
+    const result = parseDirectMemberMessage('@agent line1\nline2')
+    expect(result).toEqual({ recipientName: 'agent', message: 'line1\nline2' })
+  })
 
-  test("extracts correct recipientName and message", () => {
-    const result = parseDirectMemberMessage("@alice please fix the bug");
-    expect(result?.recipientName).toBe("alice");
-    expect(result?.message).toBe("please fix the bug");
-  });
+  test('extracts correct recipientName and message', () => {
+    const result = parseDirectMemberMessage('@alice please fix the bug')
+    expect(result?.recipientName).toBe('alice')
+    expect(result?.message).toBe('please fix the bug')
+  })
 
-  test("trims message whitespace", () => {
-    const result = parseDirectMemberMessage("@agent   hello   ");
-    expect(result?.message).toBe("hello");
-  });
-});
+  test('trims message whitespace', () => {
+    const result = parseDirectMemberMessage('@agent   hello   ')
+    expect(result?.message).toBe('hello')
+  })
+})
 
-describe("sendDirectMemberMessage", () => {
-  test("returns error when no team context", async () => {
-    const result = await sendDirectMemberMessage("agent", "hello", null as any);
-    expect(result).toEqual({ success: false, error: "no_team_context" });
-  });
+describe('sendDirectMemberMessage', () => {
+  test('returns error when no team context', async () => {
+    const result = await sendDirectMemberMessage('agent', 'hello', null as any)
+    expect(result).toEqual({ success: false, error: 'no_team_context' })
+  })
 
-  test("returns error for unknown recipient", async () => {
+  test('returns error for unknown recipient', async () => {
     const teamContext = {
-      teamName: "team1",
-      teammates: { alice: { name: "alice" } },
-    };
+      teamName: 'team1',
+      teammates: { alice: { name: 'alice' } },
+    }
     const result = await sendDirectMemberMessage(
-      "bob",
-      "hello",
+      'bob',
+      'hello',
       teamContext as any,
       async () => {},
-    );
+    )
     expect(result).toEqual({
       success: false,
-      error: "unknown_recipient",
-      recipientName: "bob",
-    });
-  });
+      error: 'unknown_recipient',
+      recipientName: 'bob',
+    })
+  })
 
-  test("calls writeToMailbox with correct args for valid recipient", async () => {
-    let mailboxArgs: any = null;
+  test('calls writeToMailbox with correct args for valid recipient', async () => {
+    let mailboxArgs: any = null
     const teamContext = {
-      teamName: "team1",
-      teammates: { alice: { name: "alice" } },
-    };
+      teamName: 'team1',
+      teammates: { alice: { name: 'alice' } },
+    }
     const result = await sendDirectMemberMessage(
-      "alice",
-      "hello",
+      'alice',
+      'hello',
       teamContext as any,
       async (recipient, msg, team) => {
-        mailboxArgs = { recipient, msg, team };
+        mailboxArgs = { recipient, msg, team }
       },
-    );
-    expect(result).toEqual({ success: true, recipientName: "alice" });
-    expect(mailboxArgs.recipient).toBe("alice");
-    expect(mailboxArgs.msg.text).toBe("hello");
-    expect(mailboxArgs.msg.from).toBe("user");
-    expect(mailboxArgs.team).toBe("team1");
-  });
+    )
+    expect(result).toEqual({ success: true, recipientName: 'alice' })
+    expect(mailboxArgs.recipient).toBe('alice')
+    expect(mailboxArgs.msg.text).toBe('hello')
+    expect(mailboxArgs.msg.from).toBe('user')
+    expect(mailboxArgs.team).toBe('team1')
+  })
 
-  test("returns success for valid message", async () => {
+  test('returns success for valid message', async () => {
     const teamContext = {
-      teamName: "team1",
-      teammates: { bob: { name: "bob" } },
-    };
+      teamName: 'team1',
+      teammates: { bob: { name: 'bob' } },
+    }
     const result = await sendDirectMemberMessage(
-      "bob",
-      "test message",
+      'bob',
+      'test message',
       teamContext as any,
       async () => {},
-    );
-    expect(result.success).toBe(true);
+    )
+    expect(result.success).toBe(true)
     if (result.success) {
-      expect(result.recipientName).toBe("bob");
+      expect(result.recipientName).toBe('bob')
     }
-  });
-});
+  })
+})
diff --git a/src/utils/__tests__/displayTags.test.ts b/src/utils/__tests__/displayTags.test.ts
index 46ed46e85..a9c7978eb 100644
--- a/src/utils/__tests__/displayTags.test.ts
+++ b/src/utils/__tests__/displayTags.test.ts
@@ -1,134 +1,128 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from 'bun:test'
 import {
   stripDisplayTags,
   stripDisplayTagsAllowEmpty,
   stripIdeContextTags,
-} from "../displayTags";
+} from '../displayTags'
 
-describe("stripDisplayTags", () => {
-  test("strips a single system tag and returns remaining text", () => {
+describe('stripDisplayTags', () => {
+  test('strips a single system tag and returns remaining text', () => {
     expect(
-      stripDisplayTags("<system-reminder>secret stuff</system-reminder>text")
-    ).toBe("text");
-  });
+      stripDisplayTags('<system-reminder>secret stuff</system-reminder>text'),
+    ).toBe('text')
+  })
 
-  test("strips multiple tags and preserves text between them", () => {
+  test('strips multiple tags and preserves text between them', () => {
     const input =
-      "<hook-output>data</hook-output>hello <task-info>info</task-info>world";
-    expect(stripDisplayTags(input)).toBe("hello world");
-  });
+      '<hook-output>data</hook-output>hello <task-info>info</task-info>world'
+    expect(stripDisplayTags(input)).toBe('hello world')
+  })
 
-  test("preserves uppercase JSX component names", () => {
-    expect(stripDisplayTags("fix the <Button> layout")).toBe(
-      "fix the <Button> layout"
-    );
-  });
+  test('preserves uppercase JSX component names', () => {
+    expect(stripDisplayTags('fix the <Button> layout')).toBe(
+      'fix the <Button> layout',
+    )
+  })
 
-  test("preserves angle brackets in prose (when x < y)", () => {
-    expect(stripDisplayTags("when x < y")).toBe("when x < y");
-  });
+  test('preserves angle brackets in prose (when x < y)', () => {
+    expect(stripDisplayTags('when x < y')).toBe('when x < y')
+  })
 
-  test("preserves DOCTYPE declarations", () => {
-    expect(stripDisplayTags("<!DOCTYPE html>")).toBe("<!DOCTYPE html>");
-  });
+  test('preserves DOCTYPE declarations', () => {
+    expect(stripDisplayTags('<!DOCTYPE html>')).toBe('<!DOCTYPE html>')
+  })
 
-  test("returns original text when stripping would result in empty", () => {
-    const input = "<system-reminder>all tags</system-reminder>";
-    expect(stripDisplayTags(input)).toBe(input);
-  });
+  test('returns original text when stripping would result in empty', () => {
+    const input = '<system-reminder>all tags</system-reminder>'
+    expect(stripDisplayTags(input)).toBe(input)
+  })
 
-  test("strips tags with attributes", () => {
-    expect(
-      stripDisplayTags('<context type="ide">data</context>hello')
-    ).toBe("hello");
-  });
+  test('strips tags with attributes', () => {
+    expect(stripDisplayTags('<context type="ide">data</context>hello')).toBe(
+      'hello',
+    )
+  })
 
-  test("handles multi-line tag content", () => {
-    const input = "<info>\nline1\nline2\n</info>remaining";
-    expect(stripDisplayTags(input)).toBe("remaining");
-  });
+  test('handles multi-line tag content', () => {
+    const input = '<info>\nline1\nline2\n</info>remaining'
+    expect(stripDisplayTags(input)).toBe('remaining')
+  })
 
-  test("returns trimmed result", () => {
-    expect(
-      stripDisplayTags("  <tag>content</tag>  hello  ")
-    ).toBe("hello");
-  });
+  test('returns trimmed result', () => {
+    expect(stripDisplayTags('  <tag>content</tag>  hello  ')).toBe('hello')
+  })
 
-  test("handles empty string input", () => {
+  test('handles empty string input', () => {
     // Empty string is falsy, so stripDisplayTags returns original
-    expect(stripDisplayTags("")).toBe("");
-  });
+    expect(stripDisplayTags('')).toBe('')
+  })
 
-  test("handles whitespace-only input", () => {
+  test('handles whitespace-only input', () => {
     // After trim, result is empty string which is falsy, returns original
-    expect(stripDisplayTags("   ")).toBe("   ");
-  });
-});
+    expect(stripDisplayTags('   ')).toBe('   ')
+  })
+})
 
-describe("stripDisplayTagsAllowEmpty", () => {
-  test("returns empty string when all content is tags", () => {
+describe('stripDisplayTagsAllowEmpty', () => {
+  test('returns empty string when all content is tags', () => {
     expect(
-      stripDisplayTagsAllowEmpty("<system-reminder>stuff</system-reminder>")
-    ).toBe("");
-  });
+      stripDisplayTagsAllowEmpty('<system-reminder>stuff</system-reminder>'),
+    ).toBe('')
+  })
 
-  test("strips tags and returns remaining text", () => {
-    expect(
-      stripDisplayTagsAllowEmpty("<tag>content</tag>hello")
-    ).toBe("hello");
-  });
+  test('strips tags and returns remaining text', () => {
+    expect(stripDisplayTagsAllowEmpty('<tag>content</tag>hello')).toBe('hello')
+  })
 
-  test("returns empty string for empty input", () => {
-    expect(stripDisplayTagsAllowEmpty("")).toBe("");
-  });
+  test('returns empty string for empty input', () => {
+    expect(stripDisplayTagsAllowEmpty('')).toBe('')
+  })
 
-  test("returns empty string for whitespace-only content after strip", () => {
-    expect(
-      stripDisplayTagsAllowEmpty("<tag>content</tag>  ")
-    ).toBe("");
-  });
-});
+  test('returns empty string for whitespace-only content after strip', () => {
+    expect(stripDisplayTagsAllowEmpty('<tag>content</tag>  ')).toBe('')
+  })
+})
 
-describe("stripIdeContextTags", () => {
-  test("strips ide_opened_file tags", () => {
+describe('stripIdeContextTags', () => {
+  test('strips ide_opened_file tags', () => {
     expect(
       stripIdeContextTags(
-        "<ide_opened_file>path/to/file.ts</ide_opened_file>hello"
-      )
-    ).toBe("hello");
-  });
+        '<ide_opened_file>path/to/file.ts</ide_opened_file>hello',
+      ),
+    ).toBe('hello')
+  })
 
-  test("strips ide_selection tags", () => {
+  test('strips ide_selection tags', () => {
     expect(
-      stripIdeContextTags("<ide_selection>selected code</ide_selection>world")
-    ).toBe("world");
-  });
+      stripIdeContextTags('<ide_selection>selected code</ide_selection>world'),
+    ).toBe('world')
+  })
 
-  test("strips ide tags with attributes", () => {
+  test('strips ide tags with attributes', () => {
     expect(
       stripIdeContextTags(
-        '<ide_opened_file path="foo.ts">content</ide_opened_file>text'
-      )
-    ).toBe("text");
-  });
+        '<ide_opened_file path="foo.ts">content</ide_opened_file>text',
+      ),
+    ).toBe('text')
+  })
 
-  test("preserves other lowercase tags", () => {
+  test('preserves other lowercase tags', () => {
     expect(
-      stripIdeContextTags("<system-reminder>data</system-reminder>hello")
-    ).toBe("<system-reminder>data</system-reminder>hello");
-  });
+      stripIdeContextTags('<system-reminder>data</system-reminder>hello'),
+    ).toBe('<system-reminder>data</system-reminder>hello')
+  })
 
-  test("preserves user-typed HTML like <code>", () => {
-    expect(stripIdeContextTags("use <code>foo</code> here")).toBe(
-      "use <code>foo</code> here"
-    );
-  });
+  test('preserves user-typed HTML like <code>', () => {
+    expect(stripIdeContextTags('use <code>foo</code> here')).toBe(
+      'use <code>foo</code> here',
+    )
+  })
 
-  test("strips only IDE tags while preserving other tags and text", () => {
+  test('strips only IDE tags while preserving other tags and text', () => {
     const input =
-      "<ide_opened_file>f.ts</ide_opened_file><system-reminder>x</system-reminder>text";
+      '<ide_opened_file>f.ts</ide_opened_file><system-reminder>x</system-reminder>text'
     expect(stripIdeContextTags(input)).toBe(
-      "<system-reminder>x</system-reminder>text"
-    );
-  });
-});
+      '<system-reminder>x</system-reminder>text',
+    )
+  })
+})
diff --git a/src/utils/__tests__/effort.test.ts b/src/utils/__tests__/effort.test.ts
index 71709097a..50bc5bdcd 100644
--- a/src/utils/__tests__/effort.test.ts
+++ b/src/utils/__tests__/effort.test.ts
@@ -1,23 +1,23 @@
-import { describe, expect, test, beforeEach, afterEach, mock } from "bun:test";
+import { describe, expect, test, beforeEach, afterEach, mock } from 'bun:test'
 
 // Mock heavy dependencies to avoid import chain issues
-mock.module("src/utils/thinking.js", () => ({
+mock.module('src/utils/thinking.js', () => ({
   isUltrathinkEnabled: () => false,
-}));
-mock.module("src/utils/settings/settings.js", () => ({
+}))
+mock.module('src/utils/settings/settings.js', () => ({
   getInitialSettings: () => ({}),
-}));
-mock.module("src/utils/auth.js", () => ({
+}))
+mock.module('src/utils/auth.js', () => ({
   isProSubscriber: () => false,
   isMaxSubscriber: () => false,
   isTeamSubscriber: () => false,
-}));
-mock.module("src/services/analytics/growthbook.js", () => ({
+}))
+mock.module('src/services/analytics/growthbook.js', () => ({
   getFeatureValue_CACHED_MAY_BE_STALE: () => null,
-}));
-mock.module("src/utils/model/modelSupportOverrides.js", () => ({
+}))
+mock.module('src/utils/model/modelSupportOverrides.js', () => ({
   get3PModelCapabilityOverride: () => undefined,
-}));
+}))
 
 const {
   isEffortLevel,
@@ -27,229 +27,249 @@ const {
   getEffortLevelDescription,
   resolvePickerEffortPersistence,
   EFFORT_LEVELS,
-} = await import("src/utils/effort.js");
+} = await import('src/utils/effort.js')
 
 // ─── EFFORT_LEVELS constant ────────────────────────────────────────────
 
-describe("EFFORT_LEVELS", () => {
-  test("contains the four canonical levels", () => {
-    expect(EFFORT_LEVELS).toEqual(["low", "medium", "high", "max"]);
-  });
-});
+describe('EFFORT_LEVELS', () => {
+  test('contains the four canonical levels', () => {
+    expect(EFFORT_LEVELS).toEqual(['low', 'medium', 'high', 'max'])
+  })
+})
 
 // ─── isEffortLevel ─────────────────────────────────────────────────────
 
-describe("isEffortLevel", () => {
+describe('isEffortLevel', () => {
   test("returns true for 'low'", () => {
-    expect(isEffortLevel("low")).toBe(true);
-  });
+    expect(isEffortLevel('low')).toBe(true)
+  })
 
   test("returns true for 'medium'", () => {
-    expect(isEffortLevel("medium")).toBe(true);
-  });
+    expect(isEffortLevel('medium')).toBe(true)
+  })
 
   test("returns true for 'high'", () => {
-    expect(isEffortLevel("high")).toBe(true);
-  });
+    expect(isEffortLevel('high')).toBe(true)
+  })
 
   test("returns true for 'max'", () => {
-    expect(isEffortLevel("max")).toBe(true);
-  });
+    expect(isEffortLevel('max')).toBe(true)
+  })
 
   test("returns false for 'invalid'", () => {
-    expect(isEffortLevel("invalid")).toBe(false);
-  });
+    expect(isEffortLevel('invalid')).toBe(false)
+  })
 
-  test("returns false for empty string", () => {
-    expect(isEffortLevel("")).toBe(false);
-  });
-});
+  test('returns false for empty string', () => {
+    expect(isEffortLevel('')).toBe(false)
+  })
+})
 
 // ─── parseEffortValue ──────────────────────────────────────────────────
 
-describe("parseEffortValue", () => {
-  test("returns undefined for undefined", () => {
-    expect(parseEffortValue(undefined)).toBeUndefined();
-  });
+describe('parseEffortValue', () => {
+  test('returns undefined for undefined', () => {
+    expect(parseEffortValue(undefined)).toBeUndefined()
+  })
 
-  test("returns undefined for null", () => {
-    expect(parseEffortValue(null)).toBeUndefined();
-  });
+  test('returns undefined for null', () => {
+    expect(parseEffortValue(null)).toBeUndefined()
+  })
 
-  test("returns undefined for empty string", () => {
-    expect(parseEffortValue("")).toBeUndefined();
-  });
+  test('returns undefined for empty string', () => {
+    expect(parseEffortValue('')).toBeUndefined()
+  })
 
-  test("returns number for integer input", () => {
-    expect(parseEffortValue(42)).toBe(42);
-  });
+  test('returns number for integer input', () => {
+    expect(parseEffortValue(42)).toBe(42)
+  })
 
-  test("returns string for valid effort level string", () => {
-    expect(parseEffortValue("low")).toBe("low");
-    expect(parseEffortValue("medium")).toBe("medium");
-    expect(parseEffortValue("high")).toBe("high");
-    expect(parseEffortValue("max")).toBe("max");
-  });
+  test('returns string for valid effort level string', () => {
+    expect(parseEffortValue('low')).toBe('low')
+    expect(parseEffortValue('medium')).toBe('medium')
+    expect(parseEffortValue('high')).toBe('high')
+    expect(parseEffortValue('max')).toBe('max')
+  })
 
-  test("parses numeric string to number", () => {
-    expect(parseEffortValue("42")).toBe(42);
-  });
+  test('parses numeric string to number', () => {
+    expect(parseEffortValue('42')).toBe(42)
+  })
 
-  test("returns undefined for invalid string", () => {
-    expect(parseEffortValue("invalid")).toBeUndefined();
-  });
+  test('returns undefined for invalid string', () => {
+    expect(parseEffortValue('invalid')).toBeUndefined()
+  })
 
-  test("non-integer number falls through to string parsing (parseInt truncates)", () => {
+  test('non-integer number falls through to string parsing (parseInt truncates)', () => {
     // 3.14 fails isValidNumericEffort, then String(3.14) -> "3.14" -> parseInt = 3
-    expect(parseEffortValue(3.14)).toBe(3);
-  });
+    expect(parseEffortValue(3.14)).toBe(3)
+  })
 
-  test("handles case-insensitive effort level strings", () => {
-    expect(parseEffortValue("LOW")).toBe("low");
-    expect(parseEffortValue("HIGH")).toBe("high");
-  });
-});
+  test('handles case-insensitive effort level strings', () => {
+    expect(parseEffortValue('LOW')).toBe('low')
+    expect(parseEffortValue('HIGH')).toBe('high')
+  })
+})
 
 // ─── isValidNumericEffort ──────────────────────────────────────────────
 
-describe("isValidNumericEffort", () => {
-  test("returns true for integer", () => {
-    expect(isValidNumericEffort(50)).toBe(true);
-  });
+describe('isValidNumericEffort', () => {
+  test('returns true for integer', () => {
+    expect(isValidNumericEffort(50)).toBe(true)
+  })
 
-  test("returns true for zero", () => {
-    expect(isValidNumericEffort(0)).toBe(true);
-  });
+  test('returns true for zero', () => {
+    expect(isValidNumericEffort(0)).toBe(true)
+  })
 
-  test("returns true for negative integer", () => {
-    expect(isValidNumericEffort(-1)).toBe(true);
-  });
+  test('returns true for negative integer', () => {
+    expect(isValidNumericEffort(-1)).toBe(true)
+  })
 
-  test("returns false for float", () => {
-    expect(isValidNumericEffort(3.14)).toBe(false);
-  });
+  test('returns false for float', () => {
+    expect(isValidNumericEffort(3.14)).toBe(false)
+  })
 
-  test("returns false for NaN", () => {
-    expect(isValidNumericEffort(NaN)).toBe(false);
-  });
+  test('returns false for NaN', () => {
+    expect(isValidNumericEffort(NaN)).toBe(false)
+  })
 
-  test("returns false for Infinity", () => {
-    expect(isValidNumericEffort(Infinity)).toBe(false);
-  });
-});
+  test('returns false for Infinity', () => {
+    expect(isValidNumericEffort(Infinity)).toBe(false)
+  })
+})
 
 // ─── convertEffortValueToLevel ─────────────────────────────────────────
 
-describe("convertEffortValueToLevel", () => {
-  test("returns valid effort level string as-is", () => {
-    expect(convertEffortValueToLevel("low")).toBe("low");
-    expect(convertEffortValueToLevel("medium")).toBe("medium");
-    expect(convertEffortValueToLevel("high")).toBe("high");
-    expect(convertEffortValueToLevel("max")).toBe("max");
-  });
+describe('convertEffortValueToLevel', () => {
+  test('returns valid effort level string as-is', () => {
+    expect(convertEffortValueToLevel('low')).toBe('low')
+    expect(convertEffortValueToLevel('medium')).toBe('medium')
+    expect(convertEffortValueToLevel('high')).toBe('high')
+    expect(convertEffortValueToLevel('max')).toBe('max')
+  })
 
   test("returns 'high' for unknown string", () => {
-    expect(convertEffortValueToLevel("unknown" as any)).toBe("high");
-  });
+    expect(convertEffortValueToLevel('unknown' as any)).toBe('high')
+  })
 
   test("non-ant numeric value returns 'high'", () => {
-    const saved = process.env.USER_TYPE;
-    delete process.env.USER_TYPE;
+    const saved = process.env.USER_TYPE
+    delete process.env.USER_TYPE
 
-    expect(convertEffortValueToLevel(50)).toBe("high");
-    expect(convertEffortValueToLevel(100)).toBe("high");
+    expect(convertEffortValueToLevel(50)).toBe('high')
+    expect(convertEffortValueToLevel(100)).toBe('high')
 
-    process.env.USER_TYPE = saved;
-  });
+    process.env.USER_TYPE = saved
+  })
 
-  describe("ant numeric mapping", () => {
-    let savedUserType: string | undefined;
+  describe('ant numeric mapping', () => {
+    let savedUserType: string | undefined
 
     beforeEach(() => {
-      savedUserType = process.env.USER_TYPE;
-      process.env.USER_TYPE = "ant";
-    });
+      savedUserType = process.env.USER_TYPE
+      process.env.USER_TYPE = 'ant'
+    })
 
     afterEach(() => {
       if (savedUserType === undefined) {
-        delete process.env.USER_TYPE;
+        delete process.env.USER_TYPE
       } else {
-        process.env.USER_TYPE = savedUserType;
+        process.env.USER_TYPE = savedUserType
       }
-    });
+    })
 
     test("value <= 50 maps to 'low'", () => {
-      expect(convertEffortValueToLevel(50)).toBe("low");
-      expect(convertEffortValueToLevel(0)).toBe("low");
-      expect(convertEffortValueToLevel(-10)).toBe("low");
-    });
+      expect(convertEffortValueToLevel(50)).toBe('low')
+      expect(convertEffortValueToLevel(0)).toBe('low')
+      expect(convertEffortValueToLevel(-10)).toBe('low')
+    })
 
     test("value 51-85 maps to 'medium'", () => {
-      expect(convertEffortValueToLevel(51)).toBe("medium");
-      expect(convertEffortValueToLevel(85)).toBe("medium");
-    });
+      expect(convertEffortValueToLevel(51)).toBe('medium')
+      expect(convertEffortValueToLevel(85)).toBe('medium')
+    })
 
     test("value 86-100 maps to 'high'", () => {
-      expect(convertEffortValueToLevel(86)).toBe("high");
-      expect(convertEffortValueToLevel(100)).toBe("high");
-    });
+      expect(convertEffortValueToLevel(86)).toBe('high')
+      expect(convertEffortValueToLevel(100)).toBe('high')
+    })
 
     test("value > 100 maps to 'max'", () => {
-      expect(convertEffortValueToLevel(101)).toBe("max");
-      expect(convertEffortValueToLevel(200)).toBe("max");
-    });
-  });
-});
+      expect(convertEffortValueToLevel(101)).toBe('max')
+      expect(convertEffortValueToLevel(200)).toBe('max')
+    })
+  })
+})
 
 // ─── getEffortLevelDescription ─────────────────────────────────────────
 
-describe("getEffortLevelDescription", () => {
+describe('getEffortLevelDescription', () => {
   test("returns description for 'low'", () => {
-    const desc = getEffortLevelDescription("low");
-    expect(desc).toContain("Quick");
-  });
+    const desc = getEffortLevelDescription('low')
+    expect(desc).toContain('Quick')
+  })
 
   test("returns description for 'medium'", () => {
-    const desc = getEffortLevelDescription("medium");
-    expect(desc).toContain("Balanced");
-  });
+    const desc = getEffortLevelDescription('medium')
+    expect(desc).toContain('Balanced')
+  })
 
   test("returns description for 'high'", () => {
-    const desc = getEffortLevelDescription("high");
-    expect(desc).toContain("Comprehensive");
-  });
+    const desc = getEffortLevelDescription('high')
+    expect(desc).toContain('Comprehensive')
+  })
 
   test("returns description for 'max'", () => {
-    const desc = getEffortLevelDescription("max");
-    expect(desc).toContain("Maximum");
-  });
-});
+    const desc = getEffortLevelDescription('max')
+    expect(desc).toContain('Maximum')
+  })
+})
 
 // ─── resolvePickerEffortPersistence ────────────────────────────────────
 
-describe("resolvePickerEffortPersistence", () => {
-  test("returns undefined when picked matches model default and no prior persistence", () => {
-    const result = resolvePickerEffortPersistence("high", "high", undefined, false);
-    expect(result).toBeUndefined();
-  });
+describe('resolvePickerEffortPersistence', () => {
+  test('returns undefined when picked matches model default and no prior persistence', () => {
+    const result = resolvePickerEffortPersistence(
+      'high',
+      'high',
+      undefined,
+      false,
+    )
+    expect(result).toBeUndefined()
+  })
 
-  test("returns picked when it differs from model default", () => {
-    const result = resolvePickerEffortPersistence("low", "high", undefined, false);
-    expect(result).toBe("low");
-  });
+  test('returns picked when it differs from model default', () => {
+    const result = resolvePickerEffortPersistence(
+      'low',
+      'high',
+      undefined,
+      false,
+    )
+    expect(result).toBe('low')
+  })
 
-  test("returns picked when priorPersisted is set (even if same as default)", () => {
-    const result = resolvePickerEffortPersistence("high", "high", "high", false);
-    expect(result).toBe("high");
-  });
+  test('returns picked when priorPersisted is set (even if same as default)', () => {
+    const result = resolvePickerEffortPersistence('high', 'high', 'high', false)
+    expect(result).toBe('high')
+  })
 
-  test("returns picked when toggledInPicker is true (even if same as default)", () => {
-    const result = resolvePickerEffortPersistence("high", "high", undefined, true);
-    expect(result).toBe("high");
-  });
+  test('returns picked when toggledInPicker is true (even if same as default)', () => {
+    const result = resolvePickerEffortPersistence(
+      'high',
+      'high',
+      undefined,
+      true,
+    )
+    expect(result).toBe('high')
+  })
 
-  test("returns undefined picked value when no explicit and matches default", () => {
-    const result = resolvePickerEffortPersistence(undefined, "high" as any, undefined, false);
-    expect(result).toBeUndefined();
-  });
-});
+  test('returns undefined picked value when no explicit and matches default', () => {
+    const result = resolvePickerEffortPersistence(
+      undefined,
+      'high' as any,
+      undefined,
+      false,
+    )
+    expect(result).toBeUndefined()
+  })
+})
diff --git a/src/utils/__tests__/envUtils.test.ts b/src/utils/__tests__/envUtils.test.ts
index cd37067b5..9bce1c227 100644
--- a/src/utils/__tests__/envUtils.test.ts
+++ b/src/utils/__tests__/envUtils.test.ts
@@ -1,4 +1,4 @@
-import { describe, expect, test, beforeEach, afterEach } from "bun:test";
+import { describe, expect, test, beforeEach, afterEach } from 'bun:test'
 import {
   isEnvTruthy,
   isEnvDefinedFalsy,
@@ -10,324 +10,333 @@ import {
   isBareMode,
   shouldMaintainProjectWorkingDir,
   getClaudeConfigHomeDir,
-} from "../envUtils";
+} from '../envUtils'
 
 // ─── isEnvTruthy ───────────────────────────────────────────────────────
 
-describe("isEnvTruthy", () => {
+describe('isEnvTruthy', () => {
   test("returns true for '1'", () => {
-    expect(isEnvTruthy("1")).toBe(true);
-  });
+    expect(isEnvTruthy('1')).toBe(true)
+  })
 
   test("returns true for 'true'", () => {
-    expect(isEnvTruthy("true")).toBe(true);
-  });
+    expect(isEnvTruthy('true')).toBe(true)
+  })
 
   test("returns true for 'TRUE'", () => {
-    expect(isEnvTruthy("TRUE")).toBe(true);
-  });
+    expect(isEnvTruthy('TRUE')).toBe(true)
+  })
 
   test("returns true for 'yes'", () => {
-    expect(isEnvTruthy("yes")).toBe(true);
-  });
+    expect(isEnvTruthy('yes')).toBe(true)
+  })
 
   test("returns true for 'on'", () => {
-    expect(isEnvTruthy("on")).toBe(true);
-  });
+    expect(isEnvTruthy('on')).toBe(true)
+  })
 
-  test("returns true for boolean true", () => {
-    expect(isEnvTruthy(true)).toBe(true);
-  });
+  test('returns true for boolean true', () => {
+    expect(isEnvTruthy(true)).toBe(true)
+  })
 
   test("returns false for '0'", () => {
-    expect(isEnvTruthy("0")).toBe(false);
-  });
+    expect(isEnvTruthy('0')).toBe(false)
+  })
 
   test("returns false for 'false'", () => {
-    expect(isEnvTruthy("false")).toBe(false);
-  });
+    expect(isEnvTruthy('false')).toBe(false)
+  })
 
-  test("returns false for empty string", () => {
-    expect(isEnvTruthy("")).toBe(false);
-  });
+  test('returns false for empty string', () => {
+    expect(isEnvTruthy('')).toBe(false)
+  })
 
-  test("returns false for undefined", () => {
-    expect(isEnvTruthy(undefined)).toBe(false);
-  });
+  test('returns false for undefined', () => {
+    expect(isEnvTruthy(undefined)).toBe(false)
+  })
 
-  test("returns false for boolean false", () => {
-    expect(isEnvTruthy(false)).toBe(false);
-  });
+  test('returns false for boolean false', () => {
+    expect(isEnvTruthy(false)).toBe(false)
+  })
 
   test("returns true for ' true ' (trimmed)", () => {
-    expect(isEnvTruthy(" true ")).toBe(true);
-  });
-});
+    expect(isEnvTruthy(' true ')).toBe(true)
+  })
+})
 
 // ─── isEnvDefinedFalsy ─────────────────────────────────────────────────
 
-describe("isEnvDefinedFalsy", () => {
+describe('isEnvDefinedFalsy', () => {
   test("returns true for '0'", () => {
-    expect(isEnvDefinedFalsy("0")).toBe(true);
-  });
+    expect(isEnvDefinedFalsy('0')).toBe(true)
+  })
 
   test("returns true for 'false'", () => {
-    expect(isEnvDefinedFalsy("false")).toBe(true);
-  });
+    expect(isEnvDefinedFalsy('false')).toBe(true)
+  })
 
   test("returns true for 'no'", () => {
-    expect(isEnvDefinedFalsy("no")).toBe(true);
-  });
+    expect(isEnvDefinedFalsy('no')).toBe(true)
+  })
 
   test("returns true for 'off'", () => {
-    expect(isEnvDefinedFalsy("off")).toBe(true);
-  });
+    expect(isEnvDefinedFalsy('off')).toBe(true)
+  })
 
-  test("returns true for boolean false", () => {
-    expect(isEnvDefinedFalsy(false)).toBe(true);
-  });
+  test('returns true for boolean false', () => {
+    expect(isEnvDefinedFalsy(false)).toBe(true)
+  })
 
-  test("returns false for undefined", () => {
-    expect(isEnvDefinedFalsy(undefined)).toBe(false);
-  });
+  test('returns false for undefined', () => {
+    expect(isEnvDefinedFalsy(undefined)).toBe(false)
+  })
 
   test("returns false for '1'", () => {
-    expect(isEnvDefinedFalsy("1")).toBe(false);
-  });
+    expect(isEnvDefinedFalsy('1')).toBe(false)
+  })
 
   test("returns false for 'true'", () => {
-    expect(isEnvDefinedFalsy("true")).toBe(false);
-  });
+    expect(isEnvDefinedFalsy('true')).toBe(false)
+  })
 
-  test("returns false for empty string", () => {
-    expect(isEnvDefinedFalsy("")).toBe(false);
-  });
-});
+  test('returns false for empty string', () => {
+    expect(isEnvDefinedFalsy('')).toBe(false)
+  })
+})
 
 // ─── parseEnvVars ──────────────────────────────────────────────────────
 
-describe("parseEnvVars", () => {
-  test("parses KEY=VALUE pairs", () => {
-    const result = parseEnvVars(["FOO=bar", "BAZ=qux"]);
-    expect(result).toEqual({ FOO: "bar", BAZ: "qux" });
-  });
+describe('parseEnvVars', () => {
+  test('parses KEY=VALUE pairs', () => {
+    const result = parseEnvVars(['FOO=bar', 'BAZ=qux'])
+    expect(result).toEqual({ FOO: 'bar', BAZ: 'qux' })
+  })
 
-  test("handles value with equals sign", () => {
-    const result = parseEnvVars(["URL=http://host?a=1&b=2"]);
-    expect(result).toEqual({ URL: "http://host?a=1&b=2" });
-  });
+  test('handles value with equals sign', () => {
+    const result = parseEnvVars(['URL=http://host?a=1&b=2'])
+    expect(result).toEqual({ URL: 'http://host?a=1&b=2' })
+  })
 
-  test("returns empty object for undefined", () => {
-    expect(parseEnvVars(undefined)).toEqual({});
-  });
+  test('returns empty object for undefined', () => {
+    expect(parseEnvVars(undefined)).toEqual({})
+  })
 
-  test("returns empty object for empty array", () => {
-    expect(parseEnvVars([])).toEqual({});
-  });
+  test('returns empty object for empty array', () => {
+    expect(parseEnvVars([])).toEqual({})
+  })
 
-  test("throws for missing value", () => {
-    expect(() => parseEnvVars(["NOVALUE"])).toThrow("Invalid environment variable format");
-  });
+  test('throws for missing value', () => {
+    expect(() => parseEnvVars(['NOVALUE'])).toThrow(
+      'Invalid environment variable format',
+    )
+  })
 
-  test("throws for empty key", () => {
-    expect(() => parseEnvVars(["=value"])).toThrow("Invalid environment variable format");
-  });
-});
+  test('throws for empty key', () => {
+    expect(() => parseEnvVars(['=value'])).toThrow(
+      'Invalid environment variable format',
+    )
+  })
+})
 
 // ─── hasNodeOption ─────────────────────────────────────────────────────
 
-describe("hasNodeOption", () => {
-  const saved = process.env.NODE_OPTIONS;
+describe('hasNodeOption', () => {
+  const saved = process.env.NODE_OPTIONS
   afterEach(() => {
-    if (saved === undefined) delete process.env.NODE_OPTIONS;
-    else process.env.NODE_OPTIONS = saved;
-  });
+    if (saved === undefined) delete process.env.NODE_OPTIONS
+    else process.env.NODE_OPTIONS = saved
+  })
 
-  test("returns true when flag present", () => {
-    process.env.NODE_OPTIONS = "--max-old-space-size=4096 --inspect";
-    expect(hasNodeOption("--inspect")).toBe(true);
-  });
+  test('returns true when flag present', () => {
+    process.env.NODE_OPTIONS = '--max-old-space-size=4096 --inspect'
+    expect(hasNodeOption('--inspect')).toBe(true)
+  })
 
-  test("returns false when flag absent", () => {
-    process.env.NODE_OPTIONS = "--max-old-space-size=4096";
-    expect(hasNodeOption("--inspect")).toBe(false);
-  });
+  test('returns false when flag absent', () => {
+    process.env.NODE_OPTIONS = '--max-old-space-size=4096'
+    expect(hasNodeOption('--inspect')).toBe(false)
+  })
 
-  test("returns false when NODE_OPTIONS not set", () => {
-    delete process.env.NODE_OPTIONS;
-    expect(hasNodeOption("--inspect")).toBe(false);
-  });
+  test('returns false when NODE_OPTIONS not set', () => {
+    delete process.env.NODE_OPTIONS
+    expect(hasNodeOption('--inspect')).toBe(false)
+  })
 
-  test("does not match partial flags", () => {
-    process.env.NODE_OPTIONS = "--inspect-brk";
-    expect(hasNodeOption("--inspect")).toBe(false);
-  });
-});
+  test('does not match partial flags', () => {
+    process.env.NODE_OPTIONS = '--inspect-brk'
+    expect(hasNodeOption('--inspect')).toBe(false)
+  })
+})
 
 // ─── getAWSRegion ──────────────────────────────────────────────────────
 
-describe("getAWSRegion", () => {
-  const savedRegion = process.env.AWS_REGION;
-  const savedDefault = process.env.AWS_DEFAULT_REGION;
+describe('getAWSRegion', () => {
+  const savedRegion = process.env.AWS_REGION
+  const savedDefault = process.env.AWS_DEFAULT_REGION
 
   afterEach(() => {
-    if (savedRegion === undefined) delete process.env.AWS_REGION;
-    else process.env.AWS_REGION = savedRegion;
-    if (savedDefault === undefined) delete process.env.AWS_DEFAULT_REGION;
-    else process.env.AWS_DEFAULT_REGION = savedDefault;
-  });
+    if (savedRegion === undefined) delete process.env.AWS_REGION
+    else process.env.AWS_REGION = savedRegion
+    if (savedDefault === undefined) delete process.env.AWS_DEFAULT_REGION
+    else process.env.AWS_DEFAULT_REGION = savedDefault
+  })
 
-  test("uses AWS_REGION when set", () => {
-    process.env.AWS_REGION = "eu-west-1";
-    expect(getAWSRegion()).toBe("eu-west-1");
-  });
+  test('uses AWS_REGION when set', () => {
+    process.env.AWS_REGION = 'eu-west-1'
+    expect(getAWSRegion()).toBe('eu-west-1')
+  })
 
-  test("falls back to AWS_DEFAULT_REGION", () => {
-    delete process.env.AWS_REGION;
-    process.env.AWS_DEFAULT_REGION = "ap-northeast-1";
-    expect(getAWSRegion()).toBe("ap-northeast-1");
-  });
+  test('falls back to AWS_DEFAULT_REGION', () => {
+    delete process.env.AWS_REGION
+    process.env.AWS_DEFAULT_REGION = 'ap-northeast-1'
+    expect(getAWSRegion()).toBe('ap-northeast-1')
+  })
 
-  test("defaults to us-east-1", () => {
-    delete process.env.AWS_REGION;
-    delete process.env.AWS_DEFAULT_REGION;
-    expect(getAWSRegion()).toBe("us-east-1");
-  });
-});
+  test('defaults to us-east-1', () => {
+    delete process.env.AWS_REGION
+    delete process.env.AWS_DEFAULT_REGION
+    expect(getAWSRegion()).toBe('us-east-1')
+  })
+})
 
 // ─── getDefaultVertexRegion ────────────────────────────────────────────
 
-describe("getDefaultVertexRegion", () => {
-  const saved = process.env.CLOUD_ML_REGION;
+describe('getDefaultVertexRegion', () => {
+  const saved = process.env.CLOUD_ML_REGION
   afterEach(() => {
-    if (saved === undefined) delete process.env.CLOUD_ML_REGION;
-    else process.env.CLOUD_ML_REGION = saved;
-  });
+    if (saved === undefined) delete process.env.CLOUD_ML_REGION
+    else process.env.CLOUD_ML_REGION = saved
+  })
 
-  test("uses CLOUD_ML_REGION when set", () => {
-    process.env.CLOUD_ML_REGION = "europe-west4";
-    expect(getDefaultVertexRegion()).toBe("europe-west4");
-  });
+  test('uses CLOUD_ML_REGION when set', () => {
+    process.env.CLOUD_ML_REGION = 'europe-west4'
+    expect(getDefaultVertexRegion()).toBe('europe-west4')
+  })
 
-  test("defaults to us-east5", () => {
-    delete process.env.CLOUD_ML_REGION;
-    expect(getDefaultVertexRegion()).toBe("us-east5");
-  });
-});
+  test('defaults to us-east5', () => {
+    delete process.env.CLOUD_ML_REGION
+    expect(getDefaultVertexRegion()).toBe('us-east5')
+  })
+})
 
 // ─── getVertexRegionForModel ───────────────────────────────────────────
 
-describe("getVertexRegionForModel", () => {
+describe('getVertexRegionForModel', () => {
   const envKeys = [
-    "VERTEX_REGION_CLAUDE_HAIKU_4_5",
-    "VERTEX_REGION_CLAUDE_4_0_SONNET",
-    "VERTEX_REGION_CLAUDE_4_6_SONNET",
-    "CLOUD_ML_REGION",
-  ];
-  const saved: Record<string, string | undefined> = {};
+    'VERTEX_REGION_CLAUDE_HAIKU_4_5',
+    'VERTEX_REGION_CLAUDE_4_0_SONNET',
+    'VERTEX_REGION_CLAUDE_4_6_SONNET',
+    'CLOUD_ML_REGION',
+  ]
+  const saved: Record<string, string | undefined> = {}
 
   beforeEach(() => {
-    for (const k of envKeys) saved[k] = process.env[k];
-  });
+    for (const k of envKeys) saved[k] = process.env[k]
+  })
   afterEach(() => {
     for (const k of envKeys) {
-      if (saved[k] === undefined) delete process.env[k];
-      else process.env[k] = saved[k];
+      if (saved[k] === undefined) delete process.env[k]
+      else process.env[k] = saved[k]
     }
-  });
+  })
 
-  test("returns model-specific override when set", () => {
-    process.env.VERTEX_REGION_CLAUDE_HAIKU_4_5 = "us-central1";
-    expect(getVertexRegionForModel("claude-haiku-4-5-20251001")).toBe("us-central1");
-  });
+  test('returns model-specific override when set', () => {
+    process.env.VERTEX_REGION_CLAUDE_HAIKU_4_5 = 'us-central1'
+    expect(getVertexRegionForModel('claude-haiku-4-5-20251001')).toBe(
+      'us-central1',
+    )
+  })
 
-  test("falls back to default vertex region when override not set", () => {
-    delete process.env.VERTEX_REGION_CLAUDE_4_0_SONNET;
-    delete process.env.CLOUD_ML_REGION;
-    expect(getVertexRegionForModel("claude-sonnet-4-some-variant")).toBe("us-east5");
-  });
+  test('falls back to default vertex region when override not set', () => {
+    delete process.env.VERTEX_REGION_CLAUDE_4_0_SONNET
+    delete process.env.CLOUD_ML_REGION
+    expect(getVertexRegionForModel('claude-sonnet-4-some-variant')).toBe(
+      'us-east5',
+    )
+  })
 
-  test("returns default region for unknown model prefix", () => {
-    delete process.env.CLOUD_ML_REGION;
-    expect(getVertexRegionForModel("unknown-model-123")).toBe("us-east5");
-  });
+  test('returns default region for unknown model prefix', () => {
+    delete process.env.CLOUD_ML_REGION
+    expect(getVertexRegionForModel('unknown-model-123')).toBe('us-east5')
+  })
 
-  test("returns default region for undefined model", () => {
-    delete process.env.CLOUD_ML_REGION;
-    expect(getVertexRegionForModel(undefined)).toBe("us-east5");
-  });
-});
+  test('returns default region for undefined model', () => {
+    delete process.env.CLOUD_ML_REGION
+    expect(getVertexRegionForModel(undefined)).toBe('us-east5')
+  })
+})
 
 // ─── isBareMode ────────────────────────────────────────────────────────
 
-describe("isBareMode", () => {
-  const saved = process.env.CLAUDE_CODE_SIMPLE;
-  const originalArgv = [...process.argv];
+describe('isBareMode', () => {
+  const saved = process.env.CLAUDE_CODE_SIMPLE
+  const originalArgv = [...process.argv]
 
   afterEach(() => {
-    if (saved === undefined) delete process.env.CLAUDE_CODE_SIMPLE;
-    else process.env.CLAUDE_CODE_SIMPLE = saved;
-    process.argv.length = 0;
-    process.argv.push(...originalArgv);
-  });
+    if (saved === undefined) delete process.env.CLAUDE_CODE_SIMPLE
+    else process.env.CLAUDE_CODE_SIMPLE = saved
+    process.argv.length = 0
+    process.argv.push(...originalArgv)
+  })
 
-  test("returns true when CLAUDE_CODE_SIMPLE=1", () => {
-    process.env.CLAUDE_CODE_SIMPLE = "1";
-    expect(isBareMode()).toBe(true);
-  });
+  test('returns true when CLAUDE_CODE_SIMPLE=1', () => {
+    process.env.CLAUDE_CODE_SIMPLE = '1'
+    expect(isBareMode()).toBe(true)
+  })
 
-  test("returns true when --bare in argv", () => {
-    process.argv.push("--bare");
-    expect(isBareMode()).toBe(true);
-  });
+  test('returns true when --bare in argv', () => {
+    process.argv.push('--bare')
+    expect(isBareMode()).toBe(true)
+  })
 
-  test("returns false when neither set", () => {
-    delete process.env.CLAUDE_CODE_SIMPLE;
+  test('returns false when neither set', () => {
+    delete process.env.CLAUDE_CODE_SIMPLE
     // argv doesn't have --bare by default
-    expect(isBareMode()).toBe(false);
-  });
-});
+    expect(isBareMode()).toBe(false)
+  })
+})
 
 // ─── shouldMaintainProjectWorkingDir ───────────────────────────────────
 
-describe("shouldMaintainProjectWorkingDir", () => {
-  const saved = process.env.CLAUDE_BASH_MAINTAIN_PROJECT_WORKING_DIR;
+describe('shouldMaintainProjectWorkingDir', () => {
+  const saved = process.env.CLAUDE_BASH_MAINTAIN_PROJECT_WORKING_DIR
 
   afterEach(() => {
-    if (saved === undefined) delete process.env.CLAUDE_BASH_MAINTAIN_PROJECT_WORKING_DIR;
-    else process.env.CLAUDE_BASH_MAINTAIN_PROJECT_WORKING_DIR = saved;
-  });
+    if (saved === undefined)
+      delete process.env.CLAUDE_BASH_MAINTAIN_PROJECT_WORKING_DIR
+    else process.env.CLAUDE_BASH_MAINTAIN_PROJECT_WORKING_DIR = saved
+  })
 
-  test("returns true when set to truthy", () => {
-    process.env.CLAUDE_BASH_MAINTAIN_PROJECT_WORKING_DIR = "1";
-    expect(shouldMaintainProjectWorkingDir()).toBe(true);
-  });
+  test('returns true when set to truthy', () => {
+    process.env.CLAUDE_BASH_MAINTAIN_PROJECT_WORKING_DIR = '1'
+    expect(shouldMaintainProjectWorkingDir()).toBe(true)
+  })
 
-  test("returns false when not set", () => {
-    delete process.env.CLAUDE_BASH_MAINTAIN_PROJECT_WORKING_DIR;
-    expect(shouldMaintainProjectWorkingDir()).toBe(false);
-  });
-});
+  test('returns false when not set', () => {
+    delete process.env.CLAUDE_BASH_MAINTAIN_PROJECT_WORKING_DIR
+    expect(shouldMaintainProjectWorkingDir()).toBe(false)
+  })
+})
 
 // ─── getClaudeConfigHomeDir ────────────────────────────────────────────
 
-describe("getClaudeConfigHomeDir", () => {
-  const saved = process.env.CLAUDE_CONFIG_DIR;
+describe('getClaudeConfigHomeDir', () => {
+  const saved = process.env.CLAUDE_CONFIG_DIR
 
   afterEach(() => {
-    if (saved === undefined) delete process.env.CLAUDE_CONFIG_DIR;
-    else process.env.CLAUDE_CONFIG_DIR = saved;
-  });
+    if (saved === undefined) delete process.env.CLAUDE_CONFIG_DIR
+    else process.env.CLAUDE_CONFIG_DIR = saved
+  })
 
-  test("uses CLAUDE_CONFIG_DIR when set", () => {
-    process.env.CLAUDE_CONFIG_DIR = "/tmp/test-claude";
+  test('uses CLAUDE_CONFIG_DIR when set', () => {
+    process.env.CLAUDE_CONFIG_DIR = '/tmp/test-claude'
     // Memoized by CLAUDE_CONFIG_DIR key, so changing env gives fresh value
-    expect(getClaudeConfigHomeDir()).toBe("/tmp/test-claude");
-  });
+    expect(getClaudeConfigHomeDir()).toBe('/tmp/test-claude')
+  })
 
-  test("returns a string ending with .claude by default", () => {
-    delete process.env.CLAUDE_CONFIG_DIR;
-    const result = getClaudeConfigHomeDir();
-    expect(result).toMatch(/\.claude$/);
-  });
-});
+  test('returns a string ending with .claude by default', () => {
+    delete process.env.CLAUDE_CONFIG_DIR
+    const result = getClaudeConfigHomeDir()
+    expect(result).toMatch(/\.claude$/)
+  })
+})
diff --git a/src/utils/__tests__/envValidation.test.ts b/src/utils/__tests__/envValidation.test.ts
index 984d5cfde..408482108 100644
--- a/src/utils/__tests__/envValidation.test.ts
+++ b/src/utils/__tests__/envValidation.test.ts
@@ -1,106 +1,106 @@
-import { mock, describe, expect, test } from "bun:test";
+import { mock, describe, expect, test } from 'bun:test'
 
 // Mock debug.ts to cut bootstrap/state dependency chain
-mock.module("src/utils/debug.ts", () => ({
+mock.module('src/utils/debug.ts', () => ({
   logForDebugging: () => {},
   isDebugMode: () => false,
   isDebugToStdErr: () => false,
   getDebugFilePath: () => null,
   getDebugFilter: () => null,
-  getMinDebugLogLevel: () => "debug",
-  getDebugLogPath: () => "/tmp/mock-debug.log",
+  getMinDebugLogLevel: () => 'debug',
+  getDebugLogPath: () => '/tmp/mock-debug.log',
   flushDebugLogs: async () => {},
   enableDebugLogging: () => false,
   setHasFormattedOutput: () => {},
   getHasFormattedOutput: () => false,
   logAntError: () => {},
-}));
+}))
 
-const { validateBoundedIntEnvVar } = await import("../envValidation");
+const { validateBoundedIntEnvVar } = await import('../envValidation')
 
-describe("validateBoundedIntEnvVar", () => {
-  test("returns default when value is undefined", () => {
-    const result = validateBoundedIntEnvVar("TEST_VAR", undefined, 100, 1000);
-    expect(result).toEqual({ effective: 100, status: "valid" });
-  });
+describe('validateBoundedIntEnvVar', () => {
+  test('returns default when value is undefined', () => {
+    const result = validateBoundedIntEnvVar('TEST_VAR', undefined, 100, 1000)
+    expect(result).toEqual({ effective: 100, status: 'valid' })
+  })
 
-  test("returns default when value is empty string", () => {
-    const result = validateBoundedIntEnvVar("TEST_VAR", "", 100, 1000);
-    expect(result).toEqual({ effective: 100, status: "valid" });
-  });
+  test('returns default when value is empty string', () => {
+    const result = validateBoundedIntEnvVar('TEST_VAR', '', 100, 1000)
+    expect(result).toEqual({ effective: 100, status: 'valid' })
+  })
 
-  test("returns parsed value when valid and within limit", () => {
-    const result = validateBoundedIntEnvVar("TEST_VAR", "500", 100, 1000);
-    expect(result).toEqual({ effective: 500, status: "valid" });
-  });
+  test('returns parsed value when valid and within limit', () => {
+    const result = validateBoundedIntEnvVar('TEST_VAR', '500', 100, 1000)
+    expect(result).toEqual({ effective: 500, status: 'valid' })
+  })
 
-  test("caps value at upper limit", () => {
-    const result = validateBoundedIntEnvVar("TEST_VAR", "2000", 100, 1000);
-    expect(result.effective).toBe(1000);
-    expect(result.status).toBe("capped");
-    expect(result.message).toBe("Capped from 2000 to 1000");
-  });
+  test('caps value at upper limit', () => {
+    const result = validateBoundedIntEnvVar('TEST_VAR', '2000', 100, 1000)
+    expect(result.effective).toBe(1000)
+    expect(result.status).toBe('capped')
+    expect(result.message).toBe('Capped from 2000 to 1000')
+  })
 
-  test("returns default for non-numeric value", () => {
-    const result = validateBoundedIntEnvVar("TEST_VAR", "abc", 100, 1000);
-    expect(result.effective).toBe(100);
-    expect(result.status).toBe("invalid");
-    expect(result.message).toBe('Invalid value "abc" (using default: 100)');
-  });
+  test('returns default for non-numeric value', () => {
+    const result = validateBoundedIntEnvVar('TEST_VAR', 'abc', 100, 1000)
+    expect(result.effective).toBe(100)
+    expect(result.status).toBe('invalid')
+    expect(result.message).toBe('Invalid value "abc" (using default: 100)')
+  })
 
-  test("returns default for zero", () => {
-    const result = validateBoundedIntEnvVar("TEST_VAR", "0", 100, 1000);
-    expect(result.effective).toBe(100);
-    expect(result.status).toBe("invalid");
-  });
+  test('returns default for zero', () => {
+    const result = validateBoundedIntEnvVar('TEST_VAR', '0', 100, 1000)
+    expect(result.effective).toBe(100)
+    expect(result.status).toBe('invalid')
+  })
 
-  test("returns default for negative value", () => {
-    const result = validateBoundedIntEnvVar("TEST_VAR", "-5", 100, 1000);
-    expect(result.effective).toBe(100);
-    expect(result.status).toBe("invalid");
-  });
+  test('returns default for negative value', () => {
+    const result = validateBoundedIntEnvVar('TEST_VAR', '-5', 100, 1000)
+    expect(result.effective).toBe(100)
+    expect(result.status).toBe('invalid')
+  })
 
-  test("handles value at exact upper limit", () => {
-    const result = validateBoundedIntEnvVar("TEST_VAR", "1000", 100, 1000);
-    expect(result.effective).toBe(1000);
-    expect(result.status).toBe("valid");
-  });
+  test('handles value at exact upper limit', () => {
+    const result = validateBoundedIntEnvVar('TEST_VAR', '1000', 100, 1000)
+    expect(result.effective).toBe(1000)
+    expect(result.status).toBe('valid')
+  })
 
-  test("handles value of 1 (no lower bound check, only parsed > 0)", () => {
-    const result = validateBoundedIntEnvVar("TEST_VAR", "1", 100, 1000);
-    expect(result.effective).toBe(1);
-    expect(result.status).toBe("valid");
-  });
+  test('handles value of 1 (no lower bound check, only parsed > 0)', () => {
+    const result = validateBoundedIntEnvVar('TEST_VAR', '1', 100, 1000)
+    expect(result.effective).toBe(1)
+    expect(result.status).toBe('valid')
+  })
 
-  test("truncates float input via parseInt", () => {
-    const result = validateBoundedIntEnvVar("TEST_VAR", "50.7", 100, 1000);
-    expect(result.effective).toBe(50);
-    expect(result.status).toBe("valid");
-  });
+  test('truncates float input via parseInt', () => {
+    const result = validateBoundedIntEnvVar('TEST_VAR', '50.7', 100, 1000)
+    expect(result.effective).toBe(50)
+    expect(result.status).toBe('valid')
+  })
 
-  test("handles whitespace in value", () => {
-    const result = validateBoundedIntEnvVar("TEST_VAR", " 500 ", 100, 1000);
-    expect(result.effective).toBe(500);
-    expect(result.status).toBe("valid");
-  });
+  test('handles whitespace in value', () => {
+    const result = validateBoundedIntEnvVar('TEST_VAR', ' 500 ', 100, 1000)
+    expect(result.effective).toBe(500)
+    expect(result.status).toBe('valid')
+  })
 
-  test("value=1 with high defaultValue returns 1 (no lower bound enforcement)", () => {
+  test('value=1 with high defaultValue returns 1 (no lower bound enforcement)', () => {
     // Function only checks parsed > 0 and parsed <= upperLimit
     // It does NOT enforce that parsed >= defaultValue
-    const result = validateBoundedIntEnvVar("TEST_VAR", "1", 100, 1000);
-    expect(result.effective).toBe(1);
-    expect(result.status).toBe("valid");
-  });
+    const result = validateBoundedIntEnvVar('TEST_VAR', '1', 100, 1000)
+    expect(result.effective).toBe(1)
+    expect(result.status).toBe('valid')
+  })
 
-  test("caps very large number at upper limit", () => {
-    const result = validateBoundedIntEnvVar("TEST_VAR", "999999999", 100, 1000);
-    expect(result.effective).toBe(1000);
-    expect(result.status).toBe("capped");
-  });
+  test('caps very large number at upper limit', () => {
+    const result = validateBoundedIntEnvVar('TEST_VAR', '999999999', 100, 1000)
+    expect(result.effective).toBe(1000)
+    expect(result.status).toBe('capped')
+  })
 
-  test("treats NaN-producing strings as invalid", () => {
-    const result = validateBoundedIntEnvVar("TEST_VAR", "NaN", 100, 1000);
-    expect(result.effective).toBe(100);
-    expect(result.status).toBe("invalid");
-  });
-});
+  test('treats NaN-producing strings as invalid', () => {
+    const result = validateBoundedIntEnvVar('TEST_VAR', 'NaN', 100, 1000)
+    expect(result.effective).toBe(100)
+    expect(result.status).toBe('invalid')
+  })
+})
diff --git a/src/utils/__tests__/errors.test.ts b/src/utils/__tests__/errors.test.ts
index c8b5b2309..661ba6044 100644
--- a/src/utils/__tests__/errors.test.ts
+++ b/src/utils/__tests__/errors.test.ts
@@ -1,4 +1,4 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from 'bun:test'
 import {
   AbortError,
   ClaudeError,
@@ -16,274 +16,292 @@ import {
   shortErrorStack,
   isFsInaccessible,
   classifyAxiosError,
-} from "../errors";
+} from '../errors'
 
 // ─── Error classes ──────────────────────────────────────────────────────
 
-describe("ClaudeError", () => {
-  test("sets name to constructor name", () => {
-    const e = new ClaudeError("test");
-    expect(e.name).toBe("ClaudeError");
-    expect(e.message).toBe("test");
-  });
-});
+describe('ClaudeError', () => {
+  test('sets name to constructor name', () => {
+    const e = new ClaudeError('test')
+    expect(e.name).toBe('ClaudeError')
+    expect(e.message).toBe('test')
+  })
+})
 
-describe("AbortError", () => {
-  test("sets name to AbortError", () => {
-    const e = new AbortError("cancelled");
-    expect(e.name).toBe("AbortError");
-  });
-});
+describe('AbortError', () => {
+  test('sets name to AbortError', () => {
+    const e = new AbortError('cancelled')
+    expect(e.name).toBe('AbortError')
+  })
+})
 
-describe("ConfigParseError", () => {
-  test("stores filePath and defaultConfig", () => {
-    const e = new ConfigParseError("bad", "/tmp/cfg", { x: 1 });
-    expect(e.filePath).toBe("/tmp/cfg");
-    expect(e.defaultConfig).toEqual({ x: 1 });
-  });
-});
+describe('ConfigParseError', () => {
+  test('stores filePath and defaultConfig', () => {
+    const e = new ConfigParseError('bad', '/tmp/cfg', { x: 1 })
+    expect(e.filePath).toBe('/tmp/cfg')
+    expect(e.defaultConfig).toEqual({ x: 1 })
+  })
+})
 
-describe("ShellError", () => {
-  test("stores stdout, stderr, code, interrupted", () => {
-    const e = new ShellError("out", "err", 1, false);
-    expect(e.stdout).toBe("out");
-    expect(e.stderr).toBe("err");
-    expect(e.code).toBe(1);
-    expect(e.interrupted).toBe(false);
-  });
-});
+describe('ShellError', () => {
+  test('stores stdout, stderr, code, interrupted', () => {
+    const e = new ShellError('out', 'err', 1, false)
+    expect(e.stdout).toBe('out')
+    expect(e.stderr).toBe('err')
+    expect(e.code).toBe(1)
+    expect(e.interrupted).toBe(false)
+  })
+})
 
-describe("TelemetrySafeError", () => {
-  test("uses message as telemetryMessage by default", () => {
-    const e =
-      new TelemetrySafeError_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS("msg");
-    expect(e.telemetryMessage).toBe("msg");
-  });
+describe('TelemetrySafeError', () => {
+  test('uses message as telemetryMessage by default', () => {
+    const e = new TelemetrySafeError_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS(
+      'msg',
+    )
+    expect(e.telemetryMessage).toBe('msg')
+  })
 
-  test("uses separate telemetryMessage when provided", () => {
-    const e =
-      new TelemetrySafeError_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS(
-        "full msg",
-        "safe msg"
-      );
-    expect(e.message).toBe("full msg");
-    expect(e.telemetryMessage).toBe("safe msg");
-  });
-});
+  test('uses separate telemetryMessage when provided', () => {
+    const e = new TelemetrySafeError_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS(
+      'full msg',
+      'safe msg',
+    )
+    expect(e.message).toBe('full msg')
+    expect(e.telemetryMessage).toBe('safe msg')
+  })
+})
 
 // ─── isAbortError ───────────────────────────────────────────────────────
 
-describe("isAbortError", () => {
-  test("returns true for AbortError instance", () => {
-    expect(isAbortError(new AbortError())).toBe(true);
-  });
+describe('isAbortError', () => {
+  test('returns true for AbortError instance', () => {
+    expect(isAbortError(new AbortError())).toBe(true)
+  })
 
-  test("returns true for DOMException-style abort", () => {
-    const e = new Error("aborted");
-    e.name = "AbortError";
-    expect(isAbortError(e)).toBe(true);
-  });
+  test('returns true for DOMException-style abort', () => {
+    const e = new Error('aborted')
+    e.name = 'AbortError'
+    expect(isAbortError(e)).toBe(true)
+  })
 
-  test("returns false for regular error", () => {
-    expect(isAbortError(new Error("nope"))).toBe(false);
-  });
+  test('returns false for regular error', () => {
+    expect(isAbortError(new Error('nope'))).toBe(false)
+  })
 
-  test("returns false for non-error", () => {
-    expect(isAbortError("string")).toBe(false);
-    expect(isAbortError(null)).toBe(false);
-  });
-});
+  test('returns false for non-error', () => {
+    expect(isAbortError('string')).toBe(false)
+    expect(isAbortError(null)).toBe(false)
+  })
+})
 
 // ─── hasExactErrorMessage ───────────────────────────────────────────────
 
-describe("hasExactErrorMessage", () => {
-  test("returns true for matching message", () => {
-    expect(hasExactErrorMessage(new Error("test"), "test")).toBe(true);
-  });
+describe('hasExactErrorMessage', () => {
+  test('returns true for matching message', () => {
+    expect(hasExactErrorMessage(new Error('test'), 'test')).toBe(true)
+  })
 
-  test("returns false for different message", () => {
-    expect(hasExactErrorMessage(new Error("a"), "b")).toBe(false);
-  });
+  test('returns false for different message', () => {
+    expect(hasExactErrorMessage(new Error('a'), 'b')).toBe(false)
+  })
 
-  test("returns false for non-Error", () => {
-    expect(hasExactErrorMessage("string", "string")).toBe(false);
-  });
-});
+  test('returns false for non-Error', () => {
+    expect(hasExactErrorMessage('string', 'string')).toBe(false)
+  })
+})
 
 // ─── toError ────────────────────────────────────────────────────────────
 
-describe("toError", () => {
-  test("returns Error as-is", () => {
-    const e = new Error("test");
-    expect(toError(e)).toBe(e);
-  });
+describe('toError', () => {
+  test('returns Error as-is', () => {
+    const e = new Error('test')
+    expect(toError(e)).toBe(e)
+  })
 
-  test("wraps string in Error", () => {
-    const e = toError("oops");
-    expect(e).toBeInstanceOf(Error);
-    expect(e.message).toBe("oops");
-  });
+  test('wraps string in Error', () => {
+    const e = toError('oops')
+    expect(e).toBeInstanceOf(Error)
+    expect(e.message).toBe('oops')
+  })
 
-  test("wraps number in Error", () => {
-    expect(toError(42).message).toBe("42");
-  });
-});
+  test('wraps number in Error', () => {
+    expect(toError(42).message).toBe('42')
+  })
+})
 
 // ─── errorMessage ───────────────────────────────────────────────────────
 
-describe("errorMessage", () => {
-  test("extracts message from Error", () => {
-    expect(errorMessage(new Error("hello"))).toBe("hello");
-  });
+describe('errorMessage', () => {
+  test('extracts message from Error', () => {
+    expect(errorMessage(new Error('hello'))).toBe('hello')
+  })
 
-  test("stringifies non-Error", () => {
-    expect(errorMessage(42)).toBe("42");
-    expect(errorMessage(null)).toBe("null");
-  });
-});
+  test('stringifies non-Error', () => {
+    expect(errorMessage(42)).toBe('42')
+    expect(errorMessage(null)).toBe('null')
+  })
+})
 
 // ─── getErrnoCode / isENOENT / getErrnoPath ────────────────────────────
 
-describe("getErrnoCode", () => {
-  test("extracts code from errno-like error", () => {
-    const e = Object.assign(new Error(), { code: "ENOENT" });
-    expect(getErrnoCode(e)).toBe("ENOENT");
-  });
+describe('getErrnoCode', () => {
+  test('extracts code from errno-like error', () => {
+    const e = Object.assign(new Error(), { code: 'ENOENT' })
+    expect(getErrnoCode(e)).toBe('ENOENT')
+  })
 
-  test("returns undefined for no code", () => {
-    expect(getErrnoCode(new Error())).toBeUndefined();
-  });
+  test('returns undefined for no code', () => {
+    expect(getErrnoCode(new Error())).toBeUndefined()
+  })
 
-  test("returns undefined for non-string code", () => {
-    expect(getErrnoCode({ code: 123 })).toBeUndefined();
-  });
+  test('returns undefined for non-string code', () => {
+    expect(getErrnoCode({ code: 123 })).toBeUndefined()
+  })
 
-  test("returns undefined for non-object", () => {
-    expect(getErrnoCode(null)).toBeUndefined();
-    expect(getErrnoCode("string")).toBeUndefined();
-  });
-});
+  test('returns undefined for non-object', () => {
+    expect(getErrnoCode(null)).toBeUndefined()
+    expect(getErrnoCode('string')).toBeUndefined()
+  })
+})
 
-describe("isENOENT", () => {
-  test("returns true for ENOENT", () => {
-    expect(isENOENT(Object.assign(new Error(), { code: "ENOENT" }))).toBe(true);
-  });
+describe('isENOENT', () => {
+  test('returns true for ENOENT', () => {
+    expect(isENOENT(Object.assign(new Error(), { code: 'ENOENT' }))).toBe(true)
+  })
 
-  test("returns false for other codes", () => {
-    expect(isENOENT(Object.assign(new Error(), { code: "EACCES" }))).toBe(
-      false
-    );
-  });
-});
+  test('returns false for other codes', () => {
+    expect(isENOENT(Object.assign(new Error(), { code: 'EACCES' }))).toBe(false)
+  })
+})
 
-describe("getErrnoPath", () => {
-  test("extracts path from errno error", () => {
-    const e = Object.assign(new Error(), { path: "/tmp/file" });
-    expect(getErrnoPath(e)).toBe("/tmp/file");
-  });
+describe('getErrnoPath', () => {
+  test('extracts path from errno error', () => {
+    const e = Object.assign(new Error(), { path: '/tmp/file' })
+    expect(getErrnoPath(e)).toBe('/tmp/file')
+  })
 
-  test("returns undefined when no path", () => {
-    expect(getErrnoPath(new Error())).toBeUndefined();
-  });
-});
+  test('returns undefined when no path', () => {
+    expect(getErrnoPath(new Error())).toBeUndefined()
+  })
+})
 
 // ─── shortErrorStack ────────────────────────────────────────────────────
 
-describe("shortErrorStack", () => {
-  test("returns string for non-Error", () => {
-    expect(shortErrorStack("oops")).toBe("oops");
-  });
+describe('shortErrorStack', () => {
+  test('returns string for non-Error', () => {
+    expect(shortErrorStack('oops')).toBe('oops')
+  })
 
-  test("returns message when no stack", () => {
-    const e = new Error("test");
-    e.stack = undefined;
-    expect(shortErrorStack(e)).toBe("test");
-  });
+  test('returns message when no stack', () => {
+    const e = new Error('test')
+    e.stack = undefined
+    expect(shortErrorStack(e)).toBe('test')
+  })
 
-  test("truncates long stacks", () => {
-    const e = new Error("test");
-    const frames = Array.from({ length: 20 }, (_, i) => `    at frame${i}`);
-    e.stack = `Error: test\n${frames.join("\n")}`;
-    const result = shortErrorStack(e, 3);
-    const lines = result.split("\n");
-    expect(lines).toHaveLength(4); // header + 3 frames
-  });
+  test('truncates long stacks', () => {
+    const e = new Error('test')
+    const frames = Array.from({ length: 20 }, (_, i) => `    at frame${i}`)
+    e.stack = `Error: test\n${frames.join('\n')}`
+    const result = shortErrorStack(e, 3)
+    const lines = result.split('\n')
+    expect(lines).toHaveLength(4) // header + 3 frames
+  })
 
-  test("preserves short stacks", () => {
-    const e = new Error("test");
-    e.stack = "Error: test\n    at frame1\n    at frame2";
-    expect(shortErrorStack(e, 5)).toBe(e.stack);
-  });
-});
+  test('preserves short stacks', () => {
+    const e = new Error('test')
+    e.stack = 'Error: test\n    at frame1\n    at frame2'
+    expect(shortErrorStack(e, 5)).toBe(e.stack)
+  })
+})
 
 // ─── isFsInaccessible ──────────────────────────────────────────────────
 
-describe("isFsInaccessible", () => {
-  test("returns true for ENOENT", () => {
-    expect(isFsInaccessible(Object.assign(new Error(), { code: "ENOENT" }))).toBe(true);
-  });
+describe('isFsInaccessible', () => {
+  test('returns true for ENOENT', () => {
+    expect(
+      isFsInaccessible(Object.assign(new Error(), { code: 'ENOENT' })),
+    ).toBe(true)
+  })
 
-  test("returns true for EACCES", () => {
-    expect(isFsInaccessible(Object.assign(new Error(), { code: "EACCES" }))).toBe(true);
-  });
+  test('returns true for EACCES', () => {
+    expect(
+      isFsInaccessible(Object.assign(new Error(), { code: 'EACCES' })),
+    ).toBe(true)
+  })
 
-  test("returns true for EPERM", () => {
-    expect(isFsInaccessible(Object.assign(new Error(), { code: "EPERM" }))).toBe(true);
-  });
+  test('returns true for EPERM', () => {
+    expect(
+      isFsInaccessible(Object.assign(new Error(), { code: 'EPERM' })),
+    ).toBe(true)
+  })
 
-  test("returns true for ENOTDIR", () => {
-    expect(isFsInaccessible(Object.assign(new Error(), { code: "ENOTDIR" }))).toBe(true);
-  });
+  test('returns true for ENOTDIR', () => {
+    expect(
+      isFsInaccessible(Object.assign(new Error(), { code: 'ENOTDIR' })),
+    ).toBe(true)
+  })
 
-  test("returns true for ELOOP", () => {
-    expect(isFsInaccessible(Object.assign(new Error(), { code: "ELOOP" }))).toBe(true);
-  });
+  test('returns true for ELOOP', () => {
+    expect(
+      isFsInaccessible(Object.assign(new Error(), { code: 'ELOOP' })),
+    ).toBe(true)
+  })
 
-  test("returns false for other codes", () => {
-    expect(isFsInaccessible(Object.assign(new Error(), { code: "EEXIST" }))).toBe(false);
-  });
-});
+  test('returns false for other codes', () => {
+    expect(
+      isFsInaccessible(Object.assign(new Error(), { code: 'EEXIST' })),
+    ).toBe(false)
+  })
+})
 
 // ─── classifyAxiosError ─────────────────────────────────────────────────
 
-describe("classifyAxiosError", () => {
+describe('classifyAxiosError', () => {
   test("returns 'other' for non-axios error", () => {
-    expect(classifyAxiosError(new Error("test")).kind).toBe("other");
-  });
+    expect(classifyAxiosError(new Error('test')).kind).toBe('other')
+  })
 
   test("returns 'auth' for 401", () => {
-    const e = { isAxiosError: true, response: { status: 401 }, message: "unauth" };
-    expect(classifyAxiosError(e).kind).toBe("auth");
-  });
+    const e = {
+      isAxiosError: true,
+      response: { status: 401 },
+      message: 'unauth',
+    }
+    expect(classifyAxiosError(e).kind).toBe('auth')
+  })
 
   test("returns 'auth' for 403", () => {
-    const e = { isAxiosError: true, response: { status: 403 }, message: "forbidden" };
-    expect(classifyAxiosError(e).kind).toBe("auth");
-  });
+    const e = {
+      isAxiosError: true,
+      response: { status: 403 },
+      message: 'forbidden',
+    }
+    expect(classifyAxiosError(e).kind).toBe('auth')
+  })
 
   test("returns 'timeout' for ECONNABORTED", () => {
-    const e = { isAxiosError: true, code: "ECONNABORTED", message: "timeout" };
-    expect(classifyAxiosError(e).kind).toBe("timeout");
-  });
+    const e = { isAxiosError: true, code: 'ECONNABORTED', message: 'timeout' }
+    expect(classifyAxiosError(e).kind).toBe('timeout')
+  })
 
   test("returns 'network' for ECONNREFUSED", () => {
-    const e = { isAxiosError: true, code: "ECONNREFUSED", message: "refused" };
-    expect(classifyAxiosError(e).kind).toBe("network");
-  });
+    const e = { isAxiosError: true, code: 'ECONNREFUSED', message: 'refused' }
+    expect(classifyAxiosError(e).kind).toBe('network')
+  })
 
   test("returns 'network' for ENOTFOUND", () => {
-    const e = { isAxiosError: true, code: "ENOTFOUND", message: "nope" };
-    expect(classifyAxiosError(e).kind).toBe("network");
-  });
+    const e = { isAxiosError: true, code: 'ENOTFOUND', message: 'nope' }
+    expect(classifyAxiosError(e).kind).toBe('network')
+  })
 
   test("returns 'http' for other axios errors", () => {
-    const e = { isAxiosError: true, response: { status: 500 }, message: "err" };
-    const result = classifyAxiosError(e);
-    expect(result.kind).toBe("http");
-    expect(result.status).toBe(500);
-  });
+    const e = { isAxiosError: true, response: { status: 500 }, message: 'err' }
+    const result = classifyAxiosError(e)
+    expect(result.kind).toBe('http')
+    expect(result.status).toBe(500)
+  })
 
   test("returns 'other' for null", () => {
-    expect(classifyAxiosError(null).kind).toBe("other");
-  });
-});
+    expect(classifyAxiosError(null).kind).toBe('other')
+  })
+})
diff --git a/src/utils/__tests__/file.test.ts b/src/utils/__tests__/file.test.ts
index 972f6e86d..1eebbcb8a 100644
--- a/src/utils/__tests__/file.test.ts
+++ b/src/utils/__tests__/file.test.ts
@@ -1,92 +1,92 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from 'bun:test'
 import {
   convertLeadingTabsToSpaces,
   addLineNumbers,
   stripLineNumberPrefix,
   pathsEqual,
   normalizePathForComparison,
-} from "../file";
+} from '../file'
 
-describe("convertLeadingTabsToSpaces", () => {
-  test("converts leading tabs to 2 spaces each", () => {
-    expect(convertLeadingTabsToSpaces("\t\thello")).toBe("    hello");
-  });
+describe('convertLeadingTabsToSpaces', () => {
+  test('converts leading tabs to 2 spaces each', () => {
+    expect(convertLeadingTabsToSpaces('\t\thello')).toBe('    hello')
+  })
 
-  test("only converts leading tabs", () => {
-    expect(convertLeadingTabsToSpaces("\thello\tworld")).toBe("  hello\tworld");
-  });
+  test('only converts leading tabs', () => {
+    expect(convertLeadingTabsToSpaces('\thello\tworld')).toBe('  hello\tworld')
+  })
 
-  test("returns unchanged if no tabs", () => {
-    expect(convertLeadingTabsToSpaces("no tabs")).toBe("no tabs");
-  });
+  test('returns unchanged if no tabs', () => {
+    expect(convertLeadingTabsToSpaces('no tabs')).toBe('no tabs')
+  })
 
-  test("handles empty string", () => {
-    expect(convertLeadingTabsToSpaces("")).toBe("");
-  });
+  test('handles empty string', () => {
+    expect(convertLeadingTabsToSpaces('')).toBe('')
+  })
 
-  test("handles multiline content", () => {
-    const input = "\tline1\n\t\tline2\nline3";
-    const expected = "  line1\n    line2\nline3";
-    expect(convertLeadingTabsToSpaces(input)).toBe(expected);
-  });
-});
+  test('handles multiline content', () => {
+    const input = '\tline1\n\t\tline2\nline3'
+    const expected = '  line1\n    line2\nline3'
+    expect(convertLeadingTabsToSpaces(input)).toBe(expected)
+  })
+})
 
-describe("addLineNumbers", () => {
-  test("adds line numbers starting from 1", () => {
-    const result = addLineNumbers({ content: "a\nb\nc", startLine: 1 });
-    expect(result).toMatch(/^\s*1[→\t]a\n\s*2[→\t]b\n\s*3[→\t]c$/);
-  });
+describe('addLineNumbers', () => {
+  test('adds line numbers starting from 1', () => {
+    const result = addLineNumbers({ content: 'a\nb\nc', startLine: 1 })
+    expect(result).toMatch(/^\s*1[→\t]a\n\s*2[→\t]b\n\s*3[→\t]c$/)
+  })
 
-  test("returns empty string for empty content", () => {
-    expect(addLineNumbers({ content: "", startLine: 1 })).toBe("");
-  });
+  test('returns empty string for empty content', () => {
+    expect(addLineNumbers({ content: '', startLine: 1 })).toBe('')
+  })
 
-  test("respects startLine offset", () => {
-    const result = addLineNumbers({ content: "hello", startLine: 10 });
-    expect(result).toMatch(/^\s*10[→\t]hello$/);
-  });
-});
+  test('respects startLine offset', () => {
+    const result = addLineNumbers({ content: 'hello', startLine: 10 })
+    expect(result).toMatch(/^\s*10[→\t]hello$/)
+  })
+})
 
-describe("stripLineNumberPrefix", () => {
-  test("strips arrow-separated prefix", () => {
-    expect(stripLineNumberPrefix("     1→content")).toBe("content");
-  });
+describe('stripLineNumberPrefix', () => {
+  test('strips arrow-separated prefix', () => {
+    expect(stripLineNumberPrefix('     1→content')).toBe('content')
+  })
 
-  test("strips tab-separated prefix", () => {
-    expect(stripLineNumberPrefix("1\tcontent")).toBe("content");
-  });
+  test('strips tab-separated prefix', () => {
+    expect(stripLineNumberPrefix('1\tcontent')).toBe('content')
+  })
 
-  test("returns line unchanged if no prefix", () => {
-    expect(stripLineNumberPrefix("no prefix")).toBe("no prefix");
-  });
+  test('returns line unchanged if no prefix', () => {
+    expect(stripLineNumberPrefix('no prefix')).toBe('no prefix')
+  })
 
-  test("handles large line numbers", () => {
-    expect(stripLineNumberPrefix("123456→content")).toBe("content");
-  });
-});
+  test('handles large line numbers', () => {
+    expect(stripLineNumberPrefix('123456→content')).toBe('content')
+  })
+})
 
-describe("normalizePathForComparison", () => {
-  test("normalizes redundant separators", () => {
-    const result = normalizePathForComparison("/a//b/c");
-    expect(result).toBe("/a/b/c");
-  });
+describe('normalizePathForComparison', () => {
+  test('normalizes redundant separators', () => {
+    const result = normalizePathForComparison('/a//b/c')
+    expect(result).toBe('/a/b/c')
+  })
 
-  test("resolves dot segments", () => {
-    const result = normalizePathForComparison("/a/./b/../c");
-    expect(result).toBe("/a/c");
-  });
-});
+  test('resolves dot segments', () => {
+    const result = normalizePathForComparison('/a/./b/../c')
+    expect(result).toBe('/a/c')
+  })
+})
 
-describe("pathsEqual", () => {
-  test("returns true for identical paths", () => {
-    expect(pathsEqual("/a/b/c", "/a/b/c")).toBe(true);
-  });
+describe('pathsEqual', () => {
+  test('returns true for identical paths', () => {
+    expect(pathsEqual('/a/b/c', '/a/b/c')).toBe(true)
+  })
 
-  test("returns true for equivalent paths with dot segments", () => {
-    expect(pathsEqual("/a/./b", "/a/b")).toBe(true);
-  });
+  test('returns true for equivalent paths with dot segments', () => {
+    expect(pathsEqual('/a/./b', '/a/b')).toBe(true)
+  })
 
-  test("returns false for different paths", () => {
-    expect(pathsEqual("/a/b", "/a/c")).toBe(false);
-  });
-});
+  test('returns false for different paths', () => {
+    expect(pathsEqual('/a/b', '/a/c')).toBe(false)
+  })
+})
diff --git a/src/utils/__tests__/fingerprint.test.ts b/src/utils/__tests__/fingerprint.test.ts
index f1dffa100..9e3a61b60 100644
--- a/src/utils/__tests__/fingerprint.test.ts
+++ b/src/utils/__tests__/fingerprint.test.ts
@@ -1,122 +1,121 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from 'bun:test'
 import {
   FINGERPRINT_SALT,
   extractFirstMessageText,
   computeFingerprint,
-} from "../fingerprint";
+} from '../fingerprint'
 
-describe("FINGERPRINT_SALT", () => {
+describe('FINGERPRINT_SALT', () => {
   test("has expected value '59cf53e54c78'", () => {
-    expect(FINGERPRINT_SALT).toBe("59cf53e54c78");
-  });
-});
+    expect(FINGERPRINT_SALT).toBe('59cf53e54c78')
+  })
+})
 
-describe("extractFirstMessageText", () => {
-  test("extracts text from first user message", () => {
-    const messages = [
-      { type: "user", message: { content: "hello world" } },
-    ];
-    expect(extractFirstMessageText(messages as any)).toBe("hello world");
-  });
+describe('extractFirstMessageText', () => {
+  test('extracts text from first user message', () => {
+    const messages = [{ type: 'user', message: { content: 'hello world' } }]
+    expect(extractFirstMessageText(messages as any)).toBe('hello world')
+  })
 
-  test("extracts text from single user message with array content", () => {
+  test('extracts text from single user message with array content', () => {
     const messages = [
       {
-        type: "user",
-        message: {
-          content: [{ type: "text", text: "hello" }, { type: "image", url: "x" }],
-        },
-      },
-    ];
-    expect(extractFirstMessageText(messages as any)).toBe("hello");
-  });
-
-  test("returns empty string when no user messages", () => {
-    const messages = [
-      { type: "assistant", message: { content: "hi" } },
-    ];
-    expect(extractFirstMessageText(messages as any)).toBe("");
-  });
-
-  test("skips assistant messages", () => {
-    const messages = [
-      { type: "assistant", message: { content: "hi" } },
-      { type: "user", message: { content: "hello" } },
-    ];
-    expect(extractFirstMessageText(messages as any)).toBe("hello");
-  });
-
-  test("handles mixed content blocks (text + image)", () => {
-    const messages = [
-      {
-        type: "user",
+        type: 'user',
         message: {
           content: [
-            { type: "image", url: "http://example.com/img.png" },
-            { type: "text", text: "after image" },
+            { type: 'text', text: 'hello' },
+            { type: 'image', url: 'x' },
           ],
         },
       },
-    ];
-    expect(extractFirstMessageText(messages as any)).toBe("after image");
-  });
+    ]
+    expect(extractFirstMessageText(messages as any)).toBe('hello')
+  })
 
-  test("returns empty string for empty array", () => {
-    expect(extractFirstMessageText([])).toBe("");
-  });
+  test('returns empty string when no user messages', () => {
+    const messages = [{ type: 'assistant', message: { content: 'hi' } }]
+    expect(extractFirstMessageText(messages as any)).toBe('')
+  })
 
-  test("returns empty string when content has no text block", () => {
+  test('skips assistant messages', () => {
+    const messages = [
+      { type: 'assistant', message: { content: 'hi' } },
+      { type: 'user', message: { content: 'hello' } },
+    ]
+    expect(extractFirstMessageText(messages as any)).toBe('hello')
+  })
+
+  test('handles mixed content blocks (text + image)', () => {
     const messages = [
       {
-        type: "user",
+        type: 'user',
         message: {
-          content: [{ type: "image", url: "x" }],
+          content: [
+            { type: 'image', url: 'http://example.com/img.png' },
+            { type: 'text', text: 'after image' },
+          ],
         },
       },
-    ];
-    expect(extractFirstMessageText(messages as any)).toBe("");
-  });
-});
+    ]
+    expect(extractFirstMessageText(messages as any)).toBe('after image')
+  })
 
-describe("computeFingerprint", () => {
-  test("returns deterministic 3-char hex string", () => {
-    const result = computeFingerprint("test message", "1.0.0");
-    expect(result).toHaveLength(3);
-    expect(result).toMatch(/^[0-9a-f]{3}$/);
-  });
+  test('returns empty string for empty array', () => {
+    expect(extractFirstMessageText([])).toBe('')
+  })
 
-  test("same input produces same fingerprint", () => {
-    const a = computeFingerprint("same input", "1.0.0");
-    const b = computeFingerprint("same input", "1.0.0");
-    expect(a).toBe(b);
-  });
+  test('returns empty string when content has no text block', () => {
+    const messages = [
+      {
+        type: 'user',
+        message: {
+          content: [{ type: 'image', url: 'x' }],
+        },
+      },
+    ]
+    expect(extractFirstMessageText(messages as any)).toBe('')
+  })
+})
 
-  test("different message text produces different fingerprint", () => {
-    const a = computeFingerprint("hello world from test one", "1.0.0");
-    const b = computeFingerprint("goodbye world from test two", "1.0.0");
-    expect(a).not.toBe(b);
-  });
+describe('computeFingerprint', () => {
+  test('returns deterministic 3-char hex string', () => {
+    const result = computeFingerprint('test message', '1.0.0')
+    expect(result).toHaveLength(3)
+    expect(result).toMatch(/^[0-9a-f]{3}$/)
+  })
 
-  test("different version produces different fingerprint", () => {
-    const a = computeFingerprint("same text", "1.0.0");
-    const b = computeFingerprint("same text", "2.0.0");
-    expect(a).not.toBe(b);
-  });
+  test('same input produces same fingerprint', () => {
+    const a = computeFingerprint('same input', '1.0.0')
+    const b = computeFingerprint('same input', '1.0.0')
+    expect(a).toBe(b)
+  })
 
-  test("handles short strings (length < 21)", () => {
-    const result = computeFingerprint("hi", "1.0.0");
-    expect(result).toHaveLength(3);
-    expect(result).toMatch(/^[0-9a-f]{3}$/);
-  });
+  test('different message text produces different fingerprint', () => {
+    const a = computeFingerprint('hello world from test one', '1.0.0')
+    const b = computeFingerprint('goodbye world from test two', '1.0.0')
+    expect(a).not.toBe(b)
+  })
 
-  test("handles empty string", () => {
-    const result = computeFingerprint("", "1.0.0");
-    expect(result).toHaveLength(3);
-    expect(result).toMatch(/^[0-9a-f]{3}$/);
-  });
+  test('different version produces different fingerprint', () => {
+    const a = computeFingerprint('same text', '1.0.0')
+    const b = computeFingerprint('same text', '2.0.0')
+    expect(a).not.toBe(b)
+  })
 
-  test("fingerprint is valid hex", () => {
-    const result = computeFingerprint("any message here for testing", "3.5.1");
-    expect(result).toMatch(/^[0-9a-f]{3}$/);
-  });
-});
+  test('handles short strings (length < 21)', () => {
+    const result = computeFingerprint('hi', '1.0.0')
+    expect(result).toHaveLength(3)
+    expect(result).toMatch(/^[0-9a-f]{3}$/)
+  })
+
+  test('handles empty string', () => {
+    const result = computeFingerprint('', '1.0.0')
+    expect(result).toHaveLength(3)
+    expect(result).toMatch(/^[0-9a-f]{3}$/)
+  })
+
+  test('fingerprint is valid hex', () => {
+    const result = computeFingerprint('any message here for testing', '3.5.1')
+    expect(result).toMatch(/^[0-9a-f]{3}$/)
+  })
+})
diff --git a/src/utils/__tests__/format.test.ts b/src/utils/__tests__/format.test.ts
index 444d79b84..91b700d4c 100644
--- a/src/utils/__tests__/format.test.ts
+++ b/src/utils/__tests__/format.test.ts
@@ -1,4 +1,4 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from 'bun:test'
 import {
   formatFileSize,
   formatSecondsShort,
@@ -8,291 +8,291 @@ import {
   formatRelativeTime,
   formatRelativeTimeAgo,
   formatLogMetadata,
-} from "../format";
+} from '../format'
 
-describe("formatFileSize", () => {
-  test("formats bytes", () => {
-    expect(formatFileSize(500)).toBe("500 bytes");
-  });
+describe('formatFileSize', () => {
+  test('formats bytes', () => {
+    expect(formatFileSize(500)).toBe('500 bytes')
+  })
 
-  test("formats kilobytes", () => {
-    expect(formatFileSize(1536)).toBe("1.5KB");
-  });
+  test('formats kilobytes', () => {
+    expect(formatFileSize(1536)).toBe('1.5KB')
+  })
 
-  test("formats megabytes", () => {
-    expect(formatFileSize(1.5 * 1024 * 1024)).toBe("1.5MB");
-  });
+  test('formats megabytes', () => {
+    expect(formatFileSize(1.5 * 1024 * 1024)).toBe('1.5MB')
+  })
 
-  test("formats gigabytes", () => {
-    expect(formatFileSize(2 * 1024 * 1024 * 1024)).toBe("2GB");
-  });
+  test('formats gigabytes', () => {
+    expect(formatFileSize(2 * 1024 * 1024 * 1024)).toBe('2GB')
+  })
 
-  test("removes trailing .0", () => {
-    expect(formatFileSize(1024)).toBe("1KB");
-  });
-});
+  test('removes trailing .0', () => {
+    expect(formatFileSize(1024)).toBe('1KB')
+  })
+})
 
-describe("formatSecondsShort", () => {
-  test("formats milliseconds to seconds", () => {
-    expect(formatSecondsShort(1234)).toBe("1.2s");
-  });
+describe('formatSecondsShort', () => {
+  test('formats milliseconds to seconds', () => {
+    expect(formatSecondsShort(1234)).toBe('1.2s')
+  })
 
-  test("formats zero", () => {
-    expect(formatSecondsShort(0)).toBe("0.0s");
-  });
+  test('formats zero', () => {
+    expect(formatSecondsShort(0)).toBe('0.0s')
+  })
 
-  test("formats sub-second", () => {
-    expect(formatSecondsShort(500)).toBe("0.5s");
-  });
-});
+  test('formats sub-second', () => {
+    expect(formatSecondsShort(500)).toBe('0.5s')
+  })
+})
 
-describe("formatDuration", () => {
-  test("formats 0 as 0s", () => {
-    expect(formatDuration(0)).toBe("0s");
-  });
+describe('formatDuration', () => {
+  test('formats 0 as 0s', () => {
+    expect(formatDuration(0)).toBe('0s')
+  })
 
-  test("formats seconds", () => {
-    expect(formatDuration(5000)).toBe("5s");
-  });
+  test('formats seconds', () => {
+    expect(formatDuration(5000)).toBe('5s')
+  })
 
-  test("formats minutes and seconds", () => {
-    expect(formatDuration(125000)).toBe("2m 5s");
-  });
+  test('formats minutes and seconds', () => {
+    expect(formatDuration(125000)).toBe('2m 5s')
+  })
 
-  test("formats hours", () => {
-    expect(formatDuration(3661000)).toBe("1h 1m 1s");
-  });
+  test('formats hours', () => {
+    expect(formatDuration(3661000)).toBe('1h 1m 1s')
+  })
 
-  test("formats days", () => {
-    expect(formatDuration(90000000)).toBe("1d 1h 0m");
-  });
+  test('formats days', () => {
+    expect(formatDuration(90000000)).toBe('1d 1h 0m')
+  })
 
-  test("hideTrailingZeros removes zero components", () => {
-    expect(formatDuration(3600000, { hideTrailingZeros: true })).toBe("1h");
-    expect(formatDuration(60000, { hideTrailingZeros: true })).toBe("1m");
-  });
+  test('hideTrailingZeros removes zero components', () => {
+    expect(formatDuration(3600000, { hideTrailingZeros: true })).toBe('1h')
+    expect(formatDuration(60000, { hideTrailingZeros: true })).toBe('1m')
+  })
 
-  test("mostSignificantOnly returns largest unit", () => {
-    expect(formatDuration(90000000, { mostSignificantOnly: true })).toBe("1d");
-    expect(formatDuration(3661000, { mostSignificantOnly: true })).toBe("1h");
-  });
-});
+  test('mostSignificantOnly returns largest unit', () => {
+    expect(formatDuration(90000000, { mostSignificantOnly: true })).toBe('1d')
+    expect(formatDuration(3661000, { mostSignificantOnly: true })).toBe('1h')
+  })
+})
 
-describe("formatNumber", () => {
-  test("formats small numbers as-is", () => {
-    expect(formatNumber(900)).toBe("900");
-  });
+describe('formatNumber', () => {
+  test('formats small numbers as-is', () => {
+    expect(formatNumber(900)).toBe('900')
+  })
 
-  test("formats thousands with k suffix", () => {
-    expect(formatNumber(1321)).toBe("1.3k");
-  });
+  test('formats thousands with k suffix', () => {
+    expect(formatNumber(1321)).toBe('1.3k')
+  })
 
-  test("formats millions", () => {
-    expect(formatNumber(1500000)).toBe("1.5m");
-  });
+  test('formats millions', () => {
+    expect(formatNumber(1500000)).toBe('1.5m')
+  })
 
-  test("formats 0 as-is", () => {
-    expect(formatNumber(0)).toBe("0");
-  });
+  test('formats 0 as-is', () => {
+    expect(formatNumber(0)).toBe('0')
+  })
 
-  test("formats billions", () => {
-    expect(formatNumber(1500000000)).toBe("1.5b");
-  });
-});
+  test('formats billions', () => {
+    expect(formatNumber(1500000000)).toBe('1.5b')
+  })
+})
 
-describe("formatTokens", () => {
-  test("removes .0 from formatted number", () => {
-    expect(formatTokens(1000)).toBe("1k");
-  });
+describe('formatTokens', () => {
+  test('removes .0 from formatted number', () => {
+    expect(formatTokens(1000)).toBe('1k')
+  })
 
-  test("formats small numbers", () => {
-    expect(formatTokens(500)).toBe("500");
-  });
+  test('formats small numbers', () => {
+    expect(formatTokens(500)).toBe('500')
+  })
 
-  test("formats 1000 without .0", () => {
-    expect(formatTokens(1000)).toBe("1k");
-  });
+  test('formats 1000 without .0', () => {
+    expect(formatTokens(1000)).toBe('1k')
+  })
 
-  test("formats 1500 as 1.5k", () => {
-    expect(formatTokens(1500)).toBe("1.5k");
-  });
-});
+  test('formats 1500 as 1.5k', () => {
+    expect(formatTokens(1500)).toBe('1.5k')
+  })
+})
 
-describe("formatRelativeTime", () => {
-  const now = new Date("2026-01-15T12:00:00Z");
+describe('formatRelativeTime', () => {
+  const now = new Date('2026-01-15T12:00:00Z')
 
-  test("formats seconds ago", () => {
-    const date = new Date("2026-01-15T11:59:30Z");
-    expect(formatRelativeTime(date, { now })).toBe("30s ago");
-  });
+  test('formats seconds ago', () => {
+    const date = new Date('2026-01-15T11:59:30Z')
+    expect(formatRelativeTime(date, { now })).toBe('30s ago')
+  })
 
-  test("formats minutes ago", () => {
-    const date = new Date("2026-01-15T11:55:00Z");
-    expect(formatRelativeTime(date, { now })).toBe("5m ago");
-  });
+  test('formats minutes ago', () => {
+    const date = new Date('2026-01-15T11:55:00Z')
+    expect(formatRelativeTime(date, { now })).toBe('5m ago')
+  })
 
-  test("formats future time", () => {
-    const date = new Date("2026-01-15T13:00:00Z");
-    expect(formatRelativeTime(date, { now })).toBe("in 1h");
-  });
+  test('formats future time', () => {
+    const date = new Date('2026-01-15T13:00:00Z')
+    expect(formatRelativeTime(date, { now })).toBe('in 1h')
+  })
 
-  test("handles zero difference", () => {
-    expect(formatRelativeTime(now, { now })).toBe("0s ago");
-  });
+  test('handles zero difference', () => {
+    expect(formatRelativeTime(now, { now })).toBe('0s ago')
+  })
 
-  test("formats hours ago", () => {
-    const date = new Date("2026-01-15T09:00:00Z");
-    expect(formatRelativeTime(date, { now })).toBe("3h ago");
-  });
+  test('formats hours ago', () => {
+    const date = new Date('2026-01-15T09:00:00Z')
+    expect(formatRelativeTime(date, { now })).toBe('3h ago')
+  })
 
-  test("formats days ago", () => {
-    const date = new Date("2026-01-13T12:00:00Z");
-    expect(formatRelativeTime(date, { now })).toBe("2d ago");
-  });
+  test('formats days ago', () => {
+    const date = new Date('2026-01-13T12:00:00Z')
+    expect(formatRelativeTime(date, { now })).toBe('2d ago')
+  })
 
-  test("formats weeks ago", () => {
-    const date = new Date("2026-01-01T12:00:00Z");
-    expect(formatRelativeTime(date, { now })).toBe("2w ago");
-  });
-});
+  test('formats weeks ago', () => {
+    const date = new Date('2026-01-01T12:00:00Z')
+    expect(formatRelativeTime(date, { now })).toBe('2w ago')
+  })
+})
 
-describe("formatRelativeTimeAgo", () => {
-  const now = new Date("2026-01-15T12:00:00Z");
+describe('formatRelativeTimeAgo', () => {
+  const now = new Date('2026-01-15T12:00:00Z')
 
   test("formats past date with 'ago' suffix", () => {
-    const date = new Date("2026-01-15T11:59:30Z");
-    const result = formatRelativeTimeAgo(date, { now });
-    expect(result).toBe("30s ago");
-  });
+    const date = new Date('2026-01-15T11:59:30Z')
+    const result = formatRelativeTimeAgo(date, { now })
+    expect(result).toBe('30s ago')
+  })
 
   test("formats future date without 'ago' suffix", () => {
-    const date = new Date("2026-01-15T13:00:00Z");
-    const result = formatRelativeTimeAgo(date, { now });
-    expect(result).toBe("in 1h");
-  });
+    const date = new Date('2026-01-15T13:00:00Z')
+    const result = formatRelativeTimeAgo(date, { now })
+    expect(result).toBe('in 1h')
+  })
 
-  test("formats minutes ago", () => {
-    const date = new Date("2026-01-15T11:55:00Z");
-    const result = formatRelativeTimeAgo(date, { now });
-    expect(result).toBe("5m ago");
-  });
+  test('formats minutes ago', () => {
+    const date = new Date('2026-01-15T11:55:00Z')
+    const result = formatRelativeTimeAgo(date, { now })
+    expect(result).toBe('5m ago')
+  })
 
-  test("formats hours ago", () => {
-    const date = new Date("2026-01-15T09:00:00Z");
-    const result = formatRelativeTimeAgo(date, { now });
-    expect(result).toBe("3h ago");
-  });
+  test('formats hours ago', () => {
+    const date = new Date('2026-01-15T09:00:00Z')
+    const result = formatRelativeTimeAgo(date, { now })
+    expect(result).toBe('3h ago')
+  })
 
-  test("formats days ago", () => {
-    const date = new Date("2026-01-13T12:00:00Z");
-    const result = formatRelativeTimeAgo(date, { now });
-    expect(result).toBe("2d ago");
-  });
+  test('formats days ago', () => {
+    const date = new Date('2026-01-13T12:00:00Z')
+    const result = formatRelativeTimeAgo(date, { now })
+    expect(result).toBe('2d ago')
+  })
 
-  test("handles date equal to now as past", () => {
+  test('handles date equal to now as past', () => {
     // date === now, treated as past (not future)
-    const result = formatRelativeTimeAgo(now, { now });
-    expect(result).toBe("0s ago");
-  });
+    const result = formatRelativeTimeAgo(now, { now })
+    expect(result).toBe('0s ago')
+  })
 
-  test("uses numeric always for past dates", () => {
+  test('uses numeric always for past dates', () => {
     // Should always use numeric format for past dates
-    const date = new Date("2026-01-15T11:59:00Z");
-    const result = formatRelativeTimeAgo(date, { now });
-    expect(result).toContain("ago");
-  });
+    const date = new Date('2026-01-15T11:59:00Z')
+    const result = formatRelativeTimeAgo(date, { now })
+    expect(result).toContain('ago')
+  })
 
   test("future date does not contain 'ago'", () => {
-    const date = new Date("2026-01-15T14:00:00Z");
-    const result = formatRelativeTimeAgo(date, { now });
-    expect(result).not.toContain("ago");
-  });
-});
+    const date = new Date('2026-01-15T14:00:00Z')
+    const result = formatRelativeTimeAgo(date, { now })
+    expect(result).not.toContain('ago')
+  })
+})
 
-describe("formatLogMetadata", () => {
+describe('formatLogMetadata', () => {
   // Use a date very recently in the past so it always shows "Xs ago" or similar
-  const modified = new Date(Date.now() - 5 * 60 * 1000); // 5 minutes ago
+  const modified = new Date(Date.now() - 5 * 60 * 1000) // 5 minutes ago
 
-  test("includes relative time and message count", () => {
+  test('includes relative time and message count', () => {
     const result = formatLogMetadata({
       modified,
       messageCount: 10,
-    });
-    expect(result).toContain("ago");
-    expect(result).toContain("10 messages");
-  });
+    })
+    expect(result).toContain('ago')
+    expect(result).toContain('10 messages')
+  })
 
-  test("uses fileSize instead of messageCount when provided", () => {
+  test('uses fileSize instead of messageCount when provided', () => {
     const result = formatLogMetadata({
       modified,
       messageCount: 5,
       fileSize: 1536,
-    });
-    expect(result).toContain("1.5KB");
-    expect(result).not.toContain("messages");
-  });
+    })
+    expect(result).toContain('1.5KB')
+    expect(result).not.toContain('messages')
+  })
 
-  test("includes gitBranch when provided", () => {
+  test('includes gitBranch when provided', () => {
     const result = formatLogMetadata({
       modified,
       messageCount: 3,
-      gitBranch: "main",
-    });
-    expect(result).toContain("main");
-  });
+      gitBranch: 'main',
+    })
+    expect(result).toContain('main')
+  })
 
-  test("omits gitBranch when not provided", () => {
+  test('omits gitBranch when not provided', () => {
     const result = formatLogMetadata({
       modified,
       messageCount: 3,
-    });
+    })
     // Should not have a dangling separator from missing branch
-    expect(result).not.toMatch(/^ · | · $/);
-  });
+    expect(result).not.toMatch(/^ · | · $/)
+  })
 
-  test("includes tag when provided", () => {
+  test('includes tag when provided', () => {
     const result = formatLogMetadata({
       modified,
       messageCount: 3,
-      tag: "my-tag",
-    });
-    expect(result).toContain("#my-tag");
-  });
+      tag: 'my-tag',
+    })
+    expect(result).toContain('#my-tag')
+  })
 
-  test("includes agentSetting when provided", () => {
+  test('includes agentSetting when provided', () => {
     const result = formatLogMetadata({
       modified,
       messageCount: 3,
-      agentSetting: "custom-agent",
-    });
-    expect(result).toContain("@custom-agent");
-  });
+      agentSetting: 'custom-agent',
+    })
+    expect(result).toContain('@custom-agent')
+  })
 
-  test("includes prNumber when provided", () => {
+  test('includes prNumber when provided', () => {
     const result = formatLogMetadata({
       modified,
       messageCount: 3,
       prNumber: 42,
-    });
-    expect(result).toContain("#42");
-  });
+    })
+    expect(result).toContain('#42')
+  })
 
-  test("includes prRepository with prNumber when both provided", () => {
+  test('includes prRepository with prNumber when both provided', () => {
     const result = formatLogMetadata({
       modified,
       messageCount: 3,
       prNumber: 99,
-      prRepository: "owner/repo",
-    });
-    expect(result).toContain("owner/repo#99");
-  });
+      prRepository: 'owner/repo',
+    })
+    expect(result).toContain('owner/repo#99')
+  })
 
   test("parts are joined with ' · ' separator", () => {
     const result = formatLogMetadata({
       modified,
       messageCount: 5,
-      gitBranch: "feat/x",
-    });
-    expect(result).toContain(" · ");
-  });
-});
+      gitBranch: 'feat/x',
+    })
+    expect(result).toContain(' · ')
+  })
+})
diff --git a/src/utils/__tests__/formatBriefTimestamp.test.ts b/src/utils/__tests__/formatBriefTimestamp.test.ts
index dc0b557bb..fccfb798a 100644
--- a/src/utils/__tests__/formatBriefTimestamp.test.ts
+++ b/src/utils/__tests__/formatBriefTimestamp.test.ts
@@ -1,86 +1,86 @@
-import { describe, expect, test, beforeAll, afterAll } from "bun:test";
-import { formatBriefTimestamp } from "../formatBriefTimestamp";
+import { describe, expect, test, beforeAll, afterAll } from 'bun:test'
+import { formatBriefTimestamp } from '../formatBriefTimestamp'
 
-let savedLcAll: string | undefined;
+let savedLcAll: string | undefined
 beforeAll(() => {
-  savedLcAll = process.env.LC_ALL;
-  process.env.LC_ALL = "en_US.UTF-8";
-});
+  savedLcAll = process.env.LC_ALL
+  process.env.LC_ALL = 'en_US.UTF-8'
+})
 afterAll(() => {
-  if (savedLcAll === undefined) delete process.env.LC_ALL;
-  else process.env.LC_ALL = savedLcAll;
-});
+  if (savedLcAll === undefined) delete process.env.LC_ALL
+  else process.env.LC_ALL = savedLcAll
+})
 
-describe("formatBriefTimestamp", () => {
+describe('formatBriefTimestamp', () => {
   // Fixed "now" for deterministic tests: 2026-04-02T14:00:00Z (Thursday)
-  const now = new Date("2026-04-02T14:00:00Z");
+  const now = new Date('2026-04-02T14:00:00Z')
 
-  test("same day timestamp returns time only (contains colon)", () => {
-    const result = formatBriefTimestamp("2026-04-02T10:30:00Z", now);
-    expect(result).toContain(":");
+  test('same day timestamp returns time only (contains colon)', () => {
+    const result = formatBriefTimestamp('2026-04-02T10:30:00Z', now)
+    expect(result).toContain(':')
     // Should NOT contain a weekday name since it's the same day
     expect(result).not.toMatch(
-      /Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday/
-    );
-  });
+      /Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday/,
+    )
+  })
 
-  test("yesterday returns weekday and time", () => {
+  test('yesterday returns weekday and time', () => {
     // 2026-04-01 is Wednesday
-    const result = formatBriefTimestamp("2026-04-01T16:15:00Z", now);
-    expect(result).toContain("Wednesday");
-    expect(result).toContain(":");
-  });
+    const result = formatBriefTimestamp('2026-04-01T16:15:00Z', now)
+    expect(result).toContain('Wednesday')
+    expect(result).toContain(':')
+  })
 
-  test("3 days ago returns weekday and time", () => {
+  test('3 days ago returns weekday and time', () => {
     // 2026-03-30 is Monday
-    const result = formatBriefTimestamp("2026-03-30T09:00:00Z", now);
-    expect(result).toContain("Monday");
-    expect(result).toContain(":");
-  });
+    const result = formatBriefTimestamp('2026-03-30T09:00:00Z', now)
+    expect(result).toContain('Monday')
+    expect(result).toContain(':')
+  })
 
-  test("6 days ago returns weekday and time (still within 6-day window)", () => {
+  test('6 days ago returns weekday and time (still within 6-day window)', () => {
     // 2026-03-27 is Friday
-    const result = formatBriefTimestamp("2026-03-27T12:00:00Z", now);
-    expect(result).toContain("Friday");
-    expect(result).toContain(":");
-  });
+    const result = formatBriefTimestamp('2026-03-27T12:00:00Z', now)
+    expect(result).toContain('Friday')
+    expect(result).toContain(':')
+  })
 
-  test("7+ days ago returns weekday, month, day, and time", () => {
+  test('7+ days ago returns weekday, month, day, and time', () => {
     // 2026-03-20 is Friday, 13 days ago
-    const result = formatBriefTimestamp("2026-03-20T14:30:00Z", now);
-    expect(result).toContain("Friday");
-    expect(result).toContain(":");
+    const result = formatBriefTimestamp('2026-03-20T14:30:00Z', now)
+    expect(result).toContain('Friday')
+    expect(result).toContain(':')
     // Should contain month abbreviation (Mar)
-    expect(result).toMatch(/Mar/);
-  });
+    expect(result).toMatch(/Mar/)
+  })
 
-  test("much older date returns full format with month", () => {
-    const result = formatBriefTimestamp("2025-12-25T08:00:00Z", now);
-    expect(result).toContain(":");
-    expect(result).toMatch(/Dec/);
-  });
+  test('much older date returns full format with month', () => {
+    const result = formatBriefTimestamp('2025-12-25T08:00:00Z', now)
+    expect(result).toContain(':')
+    expect(result).toMatch(/Dec/)
+  })
 
-  test("invalid ISO string returns empty string", () => {
-    expect(formatBriefTimestamp("not-a-date", now)).toBe("");
-  });
+  test('invalid ISO string returns empty string', () => {
+    expect(formatBriefTimestamp('not-a-date', now)).toBe('')
+  })
 
-  test("empty string returns empty string", () => {
-    expect(formatBriefTimestamp("", now)).toBe("");
-  });
+  test('empty string returns empty string', () => {
+    expect(formatBriefTimestamp('', now)).toBe('')
+  })
 
-  test("same day early morning returns time format", () => {
-    const result = formatBriefTimestamp("2026-04-02T01:05:00Z", now);
-    expect(result).toContain(":");
+  test('same day early morning returns time format', () => {
+    const result = formatBriefTimestamp('2026-04-02T01:05:00Z', now)
+    expect(result).toContain(':')
     // Should be time-only format
-    expect(result.length).toBeLessThan(20);
-  });
+    expect(result.length).toBeLessThan(20)
+  })
 
-  test("uses current time as default when now is not provided", () => {
+  test('uses current time as default when now is not provided', () => {
     // Just verify it returns a non-empty string for a recent timestamp
-    const recent = new Date();
-    recent.setMinutes(recent.getMinutes() - 5);
-    const result = formatBriefTimestamp(recent.toISOString());
-    expect(result).not.toBe("");
-    expect(result).toContain(":");
-  });
-});
+    const recent = new Date()
+    recent.setMinutes(recent.getMinutes() - 5)
+    const result = formatBriefTimestamp(recent.toISOString())
+    expect(result).not.toBe('')
+    expect(result).toContain(':')
+  })
+})
diff --git a/src/utils/__tests__/frontmatterParser.test.ts b/src/utils/__tests__/frontmatterParser.test.ts
index 79b6049b2..2885c6964 100644
--- a/src/utils/__tests__/frontmatterParser.test.ts
+++ b/src/utils/__tests__/frontmatterParser.test.ts
@@ -1,164 +1,167 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from 'bun:test'
 import {
   parseFrontmatter,
   splitPathInFrontmatter,
   parsePositiveIntFromFrontmatter,
   parseBooleanFrontmatter,
   parseShellFrontmatter,
-} from "../frontmatterParser";
+} from '../frontmatterParser'
 
-describe("parseFrontmatter", () => {
-  test("parses valid frontmatter", () => {
+describe('parseFrontmatter', () => {
+  test('parses valid frontmatter', () => {
     const md = `---
 description: A test
 type: user
 ---
-Content here`;
-    const result = parseFrontmatter(md);
-    expect(result.frontmatter.description).toBe("A test");
-    expect(result.frontmatter.type).toBe("user");
-    expect(result.content).toBe("Content here");
-  });
+Content here`
+    const result = parseFrontmatter(md)
+    expect(result.frontmatter.description).toBe('A test')
+    expect(result.frontmatter.type).toBe('user')
+    expect(result.content).toBe('Content here')
+  })
 
-  test("returns empty frontmatter when none exists", () => {
-    const md = "Just content, no frontmatter";
-    const result = parseFrontmatter(md);
-    expect(result.frontmatter).toEqual({});
-    expect(result.content).toBe(md);
-  });
+  test('returns empty frontmatter when none exists', () => {
+    const md = 'Just content, no frontmatter'
+    const result = parseFrontmatter(md)
+    expect(result.frontmatter).toEqual({})
+    expect(result.content).toBe(md)
+  })
 
-  test("handles empty frontmatter block", () => {
+  test('handles empty frontmatter block', () => {
     const md = `---
 ---
-Content`;
-    const result = parseFrontmatter(md);
-    expect(result.frontmatter).toEqual({});
-    expect(result.content).toBe("Content");
-  });
+Content`
+    const result = parseFrontmatter(md)
+    expect(result.frontmatter).toEqual({})
+    expect(result.content).toBe('Content')
+  })
 
-  test("handles frontmatter with list values", () => {
+  test('handles frontmatter with list values', () => {
     const md = `---
 allowed-tools:
   - Bash
   - Read
 ---
-Content`;
-    const result = parseFrontmatter(md);
-    expect(result.frontmatter["allowed-tools"]).toEqual(["Bash", "Read"]);
-  });
-});
+Content`
+    const result = parseFrontmatter(md)
+    expect(result.frontmatter['allowed-tools']).toEqual(['Bash', 'Read'])
+  })
+})
 
-describe("splitPathInFrontmatter", () => {
-  test("splits comma-separated paths", () => {
-    expect(splitPathInFrontmatter("a, b, c")).toEqual(["a", "b", "c"]);
-  });
+describe('splitPathInFrontmatter', () => {
+  test('splits comma-separated paths', () => {
+    expect(splitPathInFrontmatter('a, b, c')).toEqual(['a', 'b', 'c'])
+  })
 
-  test("expands brace patterns", () => {
-    expect(splitPathInFrontmatter("src/*.{ts,tsx}")).toEqual([
-      "src/*.ts",
-      "src/*.tsx",
-    ]);
-  });
+  test('expands brace patterns', () => {
+    expect(splitPathInFrontmatter('src/*.{ts,tsx}')).toEqual([
+      'src/*.ts',
+      'src/*.tsx',
+    ])
+  })
 
-  test("handles nested brace expansion", () => {
-    expect(splitPathInFrontmatter("{a,b}/{c,d}")).toEqual([
-      "a/c", "a/d", "b/c", "b/d",
-    ]);
-  });
+  test('handles nested brace expansion', () => {
+    expect(splitPathInFrontmatter('{a,b}/{c,d}')).toEqual([
+      'a/c',
+      'a/d',
+      'b/c',
+      'b/d',
+    ])
+  })
 
-  test("handles array input", () => {
-    expect(splitPathInFrontmatter(["a", "b"])).toEqual(["a", "b"]);
-  });
+  test('handles array input', () => {
+    expect(splitPathInFrontmatter(['a', 'b'])).toEqual(['a', 'b'])
+  })
 
-  test("returns empty array for non-string", () => {
-    expect(splitPathInFrontmatter(123 as any)).toEqual([]);
-  });
+  test('returns empty array for non-string', () => {
+    expect(splitPathInFrontmatter(123 as any)).toEqual([])
+  })
 
-  test("preserves braces in comma-separated list", () => {
-    expect(splitPathInFrontmatter("a, src/*.{ts,tsx}")).toEqual([
-      "a",
-      "src/*.ts",
-      "src/*.tsx",
-    ]);
-  });
-});
+  test('preserves braces in comma-separated list', () => {
+    expect(splitPathInFrontmatter('a, src/*.{ts,tsx}')).toEqual([
+      'a',
+      'src/*.ts',
+      'src/*.tsx',
+    ])
+  })
+})
 
-describe("parsePositiveIntFromFrontmatter", () => {
-  test("returns number for positive integer", () => {
-    expect(parsePositiveIntFromFrontmatter(5)).toBe(5);
-  });
+describe('parsePositiveIntFromFrontmatter', () => {
+  test('returns number for positive integer', () => {
+    expect(parsePositiveIntFromFrontmatter(5)).toBe(5)
+  })
 
-  test("parses string number", () => {
-    expect(parsePositiveIntFromFrontmatter("10")).toBe(10);
-  });
+  test('parses string number', () => {
+    expect(parsePositiveIntFromFrontmatter('10')).toBe(10)
+  })
 
-  test("returns undefined for zero", () => {
-    expect(parsePositiveIntFromFrontmatter(0)).toBeUndefined();
-  });
+  test('returns undefined for zero', () => {
+    expect(parsePositiveIntFromFrontmatter(0)).toBeUndefined()
+  })
 
-  test("returns undefined for negative number", () => {
-    expect(parsePositiveIntFromFrontmatter(-1)).toBeUndefined();
-  });
+  test('returns undefined for negative number', () => {
+    expect(parsePositiveIntFromFrontmatter(-1)).toBeUndefined()
+  })
 
-  test("returns undefined for float", () => {
-    expect(parsePositiveIntFromFrontmatter(1.5)).toBeUndefined();
-  });
+  test('returns undefined for float', () => {
+    expect(parsePositiveIntFromFrontmatter(1.5)).toBeUndefined()
+  })
 
-  test("returns undefined for null/undefined", () => {
-    expect(parsePositiveIntFromFrontmatter(null)).toBeUndefined();
-    expect(parsePositiveIntFromFrontmatter(undefined)).toBeUndefined();
-  });
+  test('returns undefined for null/undefined', () => {
+    expect(parsePositiveIntFromFrontmatter(null)).toBeUndefined()
+    expect(parsePositiveIntFromFrontmatter(undefined)).toBeUndefined()
+  })
 
-  test("returns undefined for non-numeric string", () => {
-    expect(parsePositiveIntFromFrontmatter("abc")).toBeUndefined();
-  });
-});
+  test('returns undefined for non-numeric string', () => {
+    expect(parsePositiveIntFromFrontmatter('abc')).toBeUndefined()
+  })
+})
 
-describe("parseBooleanFrontmatter", () => {
-  test("returns true for boolean true", () => {
-    expect(parseBooleanFrontmatter(true)).toBe(true);
-  });
+describe('parseBooleanFrontmatter', () => {
+  test('returns true for boolean true', () => {
+    expect(parseBooleanFrontmatter(true)).toBe(true)
+  })
 
   test("returns true for string 'true'", () => {
-    expect(parseBooleanFrontmatter("true")).toBe(true);
-  });
+    expect(parseBooleanFrontmatter('true')).toBe(true)
+  })
 
-  test("returns false for boolean false", () => {
-    expect(parseBooleanFrontmatter(false)).toBe(false);
-  });
+  test('returns false for boolean false', () => {
+    expect(parseBooleanFrontmatter(false)).toBe(false)
+  })
 
   test("returns false for string 'false'", () => {
-    expect(parseBooleanFrontmatter("false")).toBe(false);
-  });
+    expect(parseBooleanFrontmatter('false')).toBe(false)
+  })
 
-  test("returns false for null/undefined", () => {
-    expect(parseBooleanFrontmatter(null)).toBe(false);
-    expect(parseBooleanFrontmatter(undefined)).toBe(false);
-  });
-});
+  test('returns false for null/undefined', () => {
+    expect(parseBooleanFrontmatter(null)).toBe(false)
+    expect(parseBooleanFrontmatter(undefined)).toBe(false)
+  })
+})
 
-describe("parseShellFrontmatter", () => {
+describe('parseShellFrontmatter', () => {
   test("returns bash for 'bash'", () => {
-    expect(parseShellFrontmatter("bash", "test")).toBe("bash");
-  });
+    expect(parseShellFrontmatter('bash', 'test')).toBe('bash')
+  })
 
   test("returns powershell for 'powershell'", () => {
-    expect(parseShellFrontmatter("powershell", "test")).toBe("powershell");
-  });
+    expect(parseShellFrontmatter('powershell', 'test')).toBe('powershell')
+  })
 
-  test("returns undefined for null", () => {
-    expect(parseShellFrontmatter(null, "test")).toBeUndefined();
-  });
+  test('returns undefined for null', () => {
+    expect(parseShellFrontmatter(null, 'test')).toBeUndefined()
+  })
 
-  test("returns undefined for unrecognized value", () => {
-    expect(parseShellFrontmatter("zsh", "test")).toBeUndefined();
-  });
+  test('returns undefined for unrecognized value', () => {
+    expect(parseShellFrontmatter('zsh', 'test')).toBeUndefined()
+  })
 
-  test("is case insensitive", () => {
-    expect(parseShellFrontmatter("BASH", "test")).toBe("bash");
-  });
+  test('is case insensitive', () => {
+    expect(parseShellFrontmatter('BASH', 'test')).toBe('bash')
+  })
 
-  test("returns undefined for empty string", () => {
-    expect(parseShellFrontmatter("", "test")).toBeUndefined();
-  });
-});
+  test('returns undefined for empty string', () => {
+    expect(parseShellFrontmatter('', 'test')).toBeUndefined()
+  })
+})
diff --git a/src/utils/__tests__/generators.test.ts b/src/utils/__tests__/generators.test.ts
index 9d96b8a36..02d71182e 100644
--- a/src/utils/__tests__/generators.test.ts
+++ b/src/utils/__tests__/generators.test.ts
@@ -1,114 +1,114 @@
-import { describe, expect, test } from "bun:test";
-import { lastX, returnValue, all, toArray, fromArray } from "../generators";
+import { describe, expect, test } from 'bun:test'
+import { lastX, returnValue, all, toArray, fromArray } from '../generators'
 
 async function* range(n: number): AsyncGenerator<number, void> {
   for (let i = 0; i < n; i++) {
-    yield i;
+    yield i
   }
 }
 
-describe("lastX", () => {
-  test("returns last yielded value", async () => {
-    const result = await lastX(range(5));
-    expect(result).toBe(4);
-  });
+describe('lastX', () => {
+  test('returns last yielded value', async () => {
+    const result = await lastX(range(5))
+    expect(result).toBe(4)
+  })
 
-  test("returns only value from single-yield generator", async () => {
-    const result = await lastX(range(1));
-    expect(result).toBe(0);
-  });
+  test('returns only value from single-yield generator', async () => {
+    const result = await lastX(range(1))
+    expect(result).toBe(0)
+  })
 
-  test("throws on empty generator", async () => {
-    await expect(lastX(range(0))).rejects.toThrow("No items in generator");
-  });
-});
+  test('throws on empty generator', async () => {
+    await expect(lastX(range(0))).rejects.toThrow('No items in generator')
+  })
+})
 
-describe("returnValue", () => {
-  test("returns generator return value", async () => {
+describe('returnValue', () => {
+  test('returns generator return value', async () => {
     async function* gen(): AsyncGenerator<number, string> {
-      yield 1;
-      return "done";
+      yield 1
+      return 'done'
     }
-    const result = await returnValue(gen());
-    expect(result).toBe("done");
-  });
+    const result = await returnValue(gen())
+    expect(result).toBe('done')
+  })
 
-  test("returns undefined for void return", async () => {
+  test('returns undefined for void return', async () => {
     async function* gen(): AsyncGenerator<number, void> {
-      yield 1;
+      yield 1
     }
-    const result = await returnValue(gen());
-    expect(result).toBeUndefined();
-  });
-});
+    const result = await returnValue(gen())
+    expect(result).toBeUndefined()
+  })
+})
 
-describe("toArray", () => {
-  test("collects all yielded values", async () => {
-    const result = await toArray(range(4));
-    expect(result).toEqual([0, 1, 2, 3]);
-  });
+describe('toArray', () => {
+  test('collects all yielded values', async () => {
+    const result = await toArray(range(4))
+    expect(result).toEqual([0, 1, 2, 3])
+  })
 
-  test("returns empty array for empty generator", async () => {
-    const result = await toArray(fromArray([]));
-    expect(result).toEqual([]);
-  });
+  test('returns empty array for empty generator', async () => {
+    const result = await toArray(fromArray([]))
+    expect(result).toEqual([])
+  })
 
-  test("preserves order", async () => {
-    const result = await toArray(fromArray(["c", "b", "a"]));
-    expect(result).toEqual(["c", "b", "a"]);
-  });
-});
+  test('preserves order', async () => {
+    const result = await toArray(fromArray(['c', 'b', 'a']))
+    expect(result).toEqual(['c', 'b', 'a'])
+  })
+})
 
-describe("fromArray", () => {
-  test("yields all array elements", async () => {
-    const result = await toArray(fromArray([10, 20, 30]));
-    expect(result).toEqual([10, 20, 30]);
-  });
+describe('fromArray', () => {
+  test('yields all array elements', async () => {
+    const result = await toArray(fromArray([10, 20, 30]))
+    expect(result).toEqual([10, 20, 30])
+  })
 
-  test("yields nothing for empty array", async () => {
-    const result = await toArray(fromArray([]));
-    expect(result).toEqual([]);
-  });
-});
+  test('yields nothing for empty array', async () => {
+    const result = await toArray(fromArray([]))
+    expect(result).toEqual([])
+  })
+})
 
-describe("all", () => {
-  test("merges multiple generators preserving yield order", async () => {
-    const gen1 = fromArray([1, 2]);
-    const gen2 = fromArray([3, 4]);
-    const result = await toArray(all([gen1, gen2]));
+describe('all', () => {
+  test('merges multiple generators preserving yield order', async () => {
+    const gen1 = fromArray([1, 2])
+    const gen2 = fromArray([3, 4])
+    const result = await toArray(all([gen1, gen2]))
     // All values from both generators should be present
-    expect(result.sort()).toEqual([1, 2, 3, 4]);
-  });
+    expect(result.sort()).toEqual([1, 2, 3, 4])
+  })
 
-  test("respects concurrency cap", async () => {
-    const gen1 = fromArray([1]);
-    const gen2 = fromArray([2]);
-    const gen3 = fromArray([3]);
-    const result = await toArray(all([gen1, gen2, gen3], 2));
-    expect(result.sort()).toEqual([1, 2, 3]);
-  });
+  test('respects concurrency cap', async () => {
+    const gen1 = fromArray([1])
+    const gen2 = fromArray([2])
+    const gen3 = fromArray([3])
+    const result = await toArray(all([gen1, gen2, gen3], 2))
+    expect(result.sort()).toEqual([1, 2, 3])
+  })
 
-  test("handles empty generator array", async () => {
-    const result = await toArray(all([]));
-    expect(result).toEqual([]);
-  });
+  test('handles empty generator array', async () => {
+    const result = await toArray(all([]))
+    expect(result).toEqual([])
+  })
 
-  test("handles single generator", async () => {
-    const result = await toArray(all([fromArray([42])]));
-    expect(result).toEqual([42]);
-  });
+  test('handles single generator', async () => {
+    const result = await toArray(all([fromArray([42])]))
+    expect(result).toEqual([42])
+  })
 
-  test("handles generators of different lengths", async () => {
-    const gen1 = fromArray([1, 2, 3]);
-    const gen2 = fromArray([10]);
-    const result = await toArray(all([gen1, gen2]));
+  test('handles generators of different lengths', async () => {
+    const gen1 = fromArray([1, 2, 3])
+    const gen2 = fromArray([10])
+    const result = await toArray(all([gen1, gen2]))
     // all() merges concurrently, just verify all values are present
-    expect([...result].sort((a, b) => a - b)).toEqual([1, 2, 3, 10]);
-  });
+    expect([...result].sort((a, b) => a - b)).toEqual([1, 2, 3, 10])
+  })
 
-  test("yields all values from all generators", async () => {
-    const gens = [fromArray([1]), fromArray([2]), fromArray([3])];
-    const result = await toArray(all(gens));
-    expect(result).toHaveLength(3);
-  });
-});
+  test('yields all values from all generators', async () => {
+    const gens = [fromArray([1]), fromArray([2]), fromArray([3])]
+    const result = await toArray(all(gens))
+    expect(result).toHaveLength(3)
+  })
+})
diff --git a/src/utils/__tests__/git.test.ts b/src/utils/__tests__/git.test.ts
index 480c81aca..258005f9f 100644
--- a/src/utils/__tests__/git.test.ts
+++ b/src/utils/__tests__/git.test.ts
@@ -1,124 +1,122 @@
-import { describe, expect, test } from "bun:test";
-import { normalizeGitRemoteUrl } from "../git";
+import { describe, expect, test } from 'bun:test'
+import { normalizeGitRemoteUrl } from '../git'
 
-describe("normalizeGitRemoteUrl", () => {
-  describe("SSH format (git@host:owner/repo)", () => {
-    test("normalizes basic SSH URL", () => {
-      expect(normalizeGitRemoteUrl("git@github.com:owner/repo.git")).toBe(
-        "github.com/owner/repo"
-      );
-    });
+describe('normalizeGitRemoteUrl', () => {
+  describe('SSH format (git@host:owner/repo)', () => {
+    test('normalizes basic SSH URL', () => {
+      expect(normalizeGitRemoteUrl('git@github.com:owner/repo.git')).toBe(
+        'github.com/owner/repo',
+      )
+    })
 
-    test("handles SSH URL without .git suffix", () => {
-      expect(normalizeGitRemoteUrl("git@github.com:owner/repo")).toBe(
-        "github.com/owner/repo"
-      );
-    });
+    test('handles SSH URL without .git suffix', () => {
+      expect(normalizeGitRemoteUrl('git@github.com:owner/repo')).toBe(
+        'github.com/owner/repo',
+      )
+    })
 
-    test("handles nested paths", () => {
-      expect(normalizeGitRemoteUrl("git@gitlab.com:group/sub/repo.git")).toBe(
-        "gitlab.com/group/sub/repo"
-      );
-    });
-  });
+    test('handles nested paths', () => {
+      expect(normalizeGitRemoteUrl('git@gitlab.com:group/sub/repo.git')).toBe(
+        'gitlab.com/group/sub/repo',
+      )
+    })
+  })
 
-  describe("HTTPS format", () => {
-    test("normalizes basic HTTPS URL", () => {
+  describe('HTTPS format', () => {
+    test('normalizes basic HTTPS URL', () => {
+      expect(normalizeGitRemoteUrl('https://github.com/owner/repo.git')).toBe(
+        'github.com/owner/repo',
+      )
+    })
+
+    test('handles HTTPS without .git suffix', () => {
+      expect(normalizeGitRemoteUrl('https://github.com/owner/repo')).toBe(
+        'github.com/owner/repo',
+      )
+    })
+
+    test('handles HTTP URL', () => {
+      expect(normalizeGitRemoteUrl('http://github.com/owner/repo.git')).toBe(
+        'github.com/owner/repo',
+      )
+    })
+
+    test('handles HTTPS with auth', () => {
       expect(
-        normalizeGitRemoteUrl("https://github.com/owner/repo.git")
-      ).toBe("github.com/owner/repo");
-    });
+        normalizeGitRemoteUrl('https://user@github.com/owner/repo.git'),
+      ).toBe('github.com/owner/repo')
+    })
+  })
 
-    test("handles HTTPS without .git suffix", () => {
-      expect(normalizeGitRemoteUrl("https://github.com/owner/repo")).toBe(
-        "github.com/owner/repo"
-      );
-    });
+  describe('ssh:// format', () => {
+    test('normalizes ssh:// URL', () => {
+      expect(normalizeGitRemoteUrl('ssh://git@github.com/owner/repo')).toBe(
+        'github.com/owner/repo',
+      )
+    })
 
-    test("handles HTTP URL", () => {
-      expect(normalizeGitRemoteUrl("http://github.com/owner/repo.git")).toBe(
-        "github.com/owner/repo"
-      );
-    });
+    test('handles ssh:// with .git suffix', () => {
+      expect(normalizeGitRemoteUrl('ssh://git@github.com/owner/repo.git')).toBe(
+        'github.com/owner/repo',
+      )
+    })
+  })
 
-    test("handles HTTPS with auth", () => {
-      expect(
-        normalizeGitRemoteUrl("https://user@github.com/owner/repo.git")
-      ).toBe("github.com/owner/repo");
-    });
-  });
-
-  describe("ssh:// format", () => {
-    test("normalizes ssh:// URL", () => {
-      expect(
-        normalizeGitRemoteUrl("ssh://git@github.com/owner/repo")
-      ).toBe("github.com/owner/repo");
-    });
-
-    test("handles ssh:// with .git suffix", () => {
-      expect(
-        normalizeGitRemoteUrl("ssh://git@github.com/owner/repo.git")
-      ).toBe("github.com/owner/repo");
-    });
-  });
-
-  describe("CCR proxy URLs", () => {
-    test("handles legacy proxy format (assumes github.com)", () => {
+  describe('CCR proxy URLs', () => {
+    test('handles legacy proxy format (assumes github.com)', () => {
       expect(
         normalizeGitRemoteUrl(
-          "http://local_proxy@127.0.0.1:16583/git/owner/repo"
-        )
-      ).toBe("github.com/owner/repo");
-    });
+          'http://local_proxy@127.0.0.1:16583/git/owner/repo',
+        ),
+      ).toBe('github.com/owner/repo')
+    })
 
-    test("handles GHE proxy format (host in path)", () => {
+    test('handles GHE proxy format (host in path)', () => {
       expect(
         normalizeGitRemoteUrl(
-          "http://local_proxy@127.0.0.1:16583/git/ghe.company.com/owner/repo"
-        )
-      ).toBe("ghe.company.com/owner/repo");
-    });
+          'http://local_proxy@127.0.0.1:16583/git/ghe.company.com/owner/repo',
+        ),
+      ).toBe('ghe.company.com/owner/repo')
+    })
 
-    test("handles localhost proxy", () => {
+    test('handles localhost proxy', () => {
       expect(
-        normalizeGitRemoteUrl(
-          "http://proxy@localhost:8080/git/owner/repo"
-        )
-      ).toBe("github.com/owner/repo");
-    });
-  });
+        normalizeGitRemoteUrl('http://proxy@localhost:8080/git/owner/repo'),
+      ).toBe('github.com/owner/repo')
+    })
+  })
 
-  describe("case normalization", () => {
-    test("converts to lowercase", () => {
-      expect(normalizeGitRemoteUrl("git@GitHub.COM:Owner/Repo.git")).toBe(
-        "github.com/owner/repo"
-      );
-    });
+  describe('case normalization', () => {
+    test('converts to lowercase', () => {
+      expect(normalizeGitRemoteUrl('git@GitHub.COM:Owner/Repo.git')).toBe(
+        'github.com/owner/repo',
+      )
+    })
 
-    test("converts HTTPS to lowercase", () => {
-      expect(
-        normalizeGitRemoteUrl("https://GitHub.COM/Owner/Repo.git")
-      ).toBe("github.com/owner/repo");
-    });
-  });
+    test('converts HTTPS to lowercase', () => {
+      expect(normalizeGitRemoteUrl('https://GitHub.COM/Owner/Repo.git')).toBe(
+        'github.com/owner/repo',
+      )
+    })
+  })
 
-  describe("edge cases", () => {
-    test("returns null for empty string", () => {
-      expect(normalizeGitRemoteUrl("")).toBeNull();
-    });
+  describe('edge cases', () => {
+    test('returns null for empty string', () => {
+      expect(normalizeGitRemoteUrl('')).toBeNull()
+    })
 
-    test("returns null for whitespace only", () => {
-      expect(normalizeGitRemoteUrl("   ")).toBeNull();
-    });
+    test('returns null for whitespace only', () => {
+      expect(normalizeGitRemoteUrl('   ')).toBeNull()
+    })
 
-    test("returns null for unrecognized format", () => {
-      expect(normalizeGitRemoteUrl("not-a-url")).toBeNull();
-    });
+    test('returns null for unrecognized format', () => {
+      expect(normalizeGitRemoteUrl('not-a-url')).toBeNull()
+    })
 
-    test("trims whitespace before parsing", () => {
-      expect(
-        normalizeGitRemoteUrl("  git@github.com:owner/repo.git  ")
-      ).toBe("github.com/owner/repo");
-    });
-  });
-});
+    test('trims whitespace before parsing', () => {
+      expect(normalizeGitRemoteUrl('  git@github.com:owner/repo.git  ')).toBe(
+        'github.com/owner/repo',
+      )
+    })
+  })
+})
diff --git a/src/utils/__tests__/gitDiff.test.ts b/src/utils/__tests__/gitDiff.test.ts
index 82e1890ba..c1e2261b4 100644
--- a/src/utils/__tests__/gitDiff.test.ts
+++ b/src/utils/__tests__/gitDiff.test.ts
@@ -1,286 +1,294 @@
-import { describe, expect, test } from "bun:test";
-import { parseGitNumstat, parseGitDiff, parseShortstat } from "../gitDiff";
+import { describe, expect, test } from 'bun:test'
+import { parseGitNumstat, parseGitDiff, parseShortstat } from '../gitDiff'
 
-describe("parseGitNumstat", () => {
-  test("parses single file", () => {
-    const result = parseGitNumstat("5\t3\tsrc/foo.ts");
+describe('parseGitNumstat', () => {
+  test('parses single file', () => {
+    const result = parseGitNumstat('5\t3\tsrc/foo.ts')
     expect(result.stats).toEqual({
       filesCount: 1,
       linesAdded: 5,
       linesRemoved: 3,
-    });
-    expect(result.perFileStats.get("src/foo.ts")).toEqual({
+    })
+    expect(result.perFileStats.get('src/foo.ts')).toEqual({
       added: 5,
       removed: 3,
       isBinary: false,
-    });
-  });
+    })
+  })
 
-  test("parses multiple files", () => {
-    const input = "10\t2\ta.ts\n3\t0\tb.ts\n0\t7\tc.ts";
-    const result = parseGitNumstat(input);
+  test('parses multiple files', () => {
+    const input = '10\t2\ta.ts\n3\t0\tb.ts\n0\t7\tc.ts'
+    const result = parseGitNumstat(input)
     expect(result.stats).toEqual({
       filesCount: 3,
       linesAdded: 13,
       linesRemoved: 9,
-    });
-    expect(result.perFileStats.size).toBe(3);
-  });
+    })
+    expect(result.perFileStats.size).toBe(3)
+  })
 
-  test("handles binary file with dash counts", () => {
-    const result = parseGitNumstat("-\t-\timage.png");
-    expect(result.perFileStats.get("image.png")).toEqual({
+  test('handles binary file with dash counts', () => {
+    const result = parseGitNumstat('-\t-\timage.png')
+    expect(result.perFileStats.get('image.png')).toEqual({
       added: 0,
       removed: 0,
       isBinary: true,
-    });
-  });
+    })
+  })
 
-  test("handles rename format", () => {
-    const result = parseGitNumstat("1\t0\told.txt => new.txt");
-    const entry = result.perFileStats.get("old.txt => new.txt");
-    expect(entry).not.toBeUndefined();
-    expect(entry!.added).toBe(1);
-    expect(entry!.isBinary).toBe(false);
-  });
+  test('handles rename format', () => {
+    const result = parseGitNumstat('1\t0\told.txt => new.txt')
+    const entry = result.perFileStats.get('old.txt => new.txt')
+    expect(entry).not.toBeUndefined()
+    expect(entry!.added).toBe(1)
+    expect(entry!.isBinary).toBe(false)
+  })
 
-  test("handles filename with tabs", () => {
-    const result = parseGitNumstat('1\t0\t"tab\tfile.txt"');
+  test('handles filename with tabs', () => {
+    const result = parseGitNumstat('1\t0\t"tab\tfile.txt"')
     // parts.slice(2).join('\t') preserves the rest
-    expect(result.stats.filesCount).toBe(1);
-  });
+    expect(result.stats.filesCount).toBe(1)
+  })
 
-  test("returns empty for empty string", () => {
-    const result = parseGitNumstat("");
+  test('returns empty for empty string', () => {
+    const result = parseGitNumstat('')
     expect(result.stats).toEqual({
       filesCount: 0,
       linesAdded: 0,
       linesRemoved: 0,
-    });
-    expect(result.perFileStats.size).toBe(0);
-  });
+    })
+    expect(result.perFileStats.size).toBe(0)
+  })
 
-  test("skips lines with fewer than 3 tab-separated parts", () => {
-    const result = parseGitNumstat("invalid-line\n5\t3\tsrc/foo.ts");
-    expect(result.stats.filesCount).toBe(1);
-  });
+  test('skips lines with fewer than 3 tab-separated parts', () => {
+    const result = parseGitNumstat('invalid-line\n5\t3\tsrc/foo.ts')
+    expect(result.stats.filesCount).toBe(1)
+  })
 
-  test("handles zero additions and zero deletions", () => {
-    const result = parseGitNumstat("0\t0\tempty-change.ts");
-    expect(result.perFileStats.get("empty-change.ts")).toEqual({
+  test('handles zero additions and zero deletions', () => {
+    const result = parseGitNumstat('0\t0\tempty-change.ts')
+    expect(result.perFileStats.get('empty-change.ts')).toEqual({
       added: 0,
       removed: 0,
       isBinary: false,
-    });
-  });
-});
+    })
+  })
+})
 
-describe("parseGitDiff", () => {
-  test("parses single file with one hunk", () => {
+describe('parseGitDiff', () => {
+  test('parses single file with one hunk', () => {
     const input = [
-      "diff --git a/foo.ts b/foo.ts",
-      "index abc..def 100644",
-      "--- a/foo.ts",
-      "+++ b/foo.ts",
-      "@@ -1,3 +1,4 @@",
-      " line1",
-      "+added",
-      " line2",
-      " line3",
-    ].join("\n");
+      'diff --git a/foo.ts b/foo.ts',
+      'index abc..def 100644',
+      '--- a/foo.ts',
+      '+++ b/foo.ts',
+      '@@ -1,3 +1,4 @@',
+      ' line1',
+      '+added',
+      ' line2',
+      ' line3',
+    ].join('\n')
 
-    const result = parseGitDiff(input);
-    expect(result.size).toBe(1);
-    const hunks = result.get("foo.ts")!;
-    expect(hunks).toHaveLength(1);
-    expect(hunks[0].oldStart).toBe(1);
-    expect(hunks[0].oldLines).toBe(3);
-    expect(hunks[0].newStart).toBe(1);
-    expect(hunks[0].newLines).toBe(4);
-    expect(hunks[0].lines).toEqual([" line1", "+added", " line2", " line3"]);
-  });
+    const result = parseGitDiff(input)
+    expect(result.size).toBe(1)
+    const hunks = result.get('foo.ts')!
+    expect(hunks).toHaveLength(1)
+    expect(hunks[0].oldStart).toBe(1)
+    expect(hunks[0].oldLines).toBe(3)
+    expect(hunks[0].newStart).toBe(1)
+    expect(hunks[0].newLines).toBe(4)
+    expect(hunks[0].lines).toEqual([' line1', '+added', ' line2', ' line3'])
+  })
 
-  test("parses multiple hunks in one file", () => {
+  test('parses multiple hunks in one file', () => {
     const input = [
-      "diff --git a/bar.ts b/bar.ts",
-      "index abc..def 100644",
-      "--- a/bar.ts",
-      "+++ b/bar.ts",
-      "@@ -1,2 +1,3 @@",
-      " a",
-      "+b",
-      " c",
-      "@@ -10,2 +11,2 @@",
-      " d",
-      "-e",
-      "+f",
-    ].join("\n");
+      'diff --git a/bar.ts b/bar.ts',
+      'index abc..def 100644',
+      '--- a/bar.ts',
+      '+++ b/bar.ts',
+      '@@ -1,2 +1,3 @@',
+      ' a',
+      '+b',
+      ' c',
+      '@@ -10,2 +11,2 @@',
+      ' d',
+      '-e',
+      '+f',
+    ].join('\n')
 
-    const result = parseGitDiff(input);
-    const hunks = result.get("bar.ts")!;
-    expect(hunks).toHaveLength(2);
-    expect(hunks[0].oldStart).toBe(1);
-    expect(hunks[1].oldStart).toBe(10);
-  });
+    const result = parseGitDiff(input)
+    const hunks = result.get('bar.ts')!
+    expect(hunks).toHaveLength(2)
+    expect(hunks[0].oldStart).toBe(1)
+    expect(hunks[1].oldStart).toBe(10)
+  })
 
-  test("skips binary files marker", () => {
+  test('skips binary files marker', () => {
     const input = [
-      "diff --git a/img.png b/img.png",
-      "Binary files a/img.png and b/img.png differ",
-    ].join("\n");
+      'diff --git a/img.png b/img.png',
+      'Binary files a/img.png and b/img.png differ',
+    ].join('\n')
 
-    const result = parseGitDiff(input);
+    const result = parseGitDiff(input)
     // Binary file has no hunks, so it's not in the result
-    expect(result.size).toBe(0);
-  });
+    expect(result.size).toBe(0)
+  })
 
-  test("parses new file mode", () => {
+  test('parses new file mode', () => {
     const input = [
-      "diff --git a/new.ts b/new.ts",
-      "new file mode 100644",
-      "--- /dev/null",
-      "+++ b/new.ts",
-      "@@ -0,0 +1,2 @@",
-      "+line1",
-      "+line2",
-    ].join("\n");
+      'diff --git a/new.ts b/new.ts',
+      'new file mode 100644',
+      '--- /dev/null',
+      '+++ b/new.ts',
+      '@@ -0,0 +1,2 @@',
+      '+line1',
+      '+line2',
+    ].join('\n')
 
-    const result = parseGitDiff(input);
-    const hunks = result.get("new.ts")!;
-    expect(hunks).toHaveLength(1);
-    expect(hunks[0].lines).toEqual(["+line1", "+line2"]);
-  });
+    const result = parseGitDiff(input)
+    const hunks = result.get('new.ts')!
+    expect(hunks).toHaveLength(1)
+    expect(hunks[0].lines).toEqual(['+line1', '+line2'])
+  })
 
-  test("parses deleted file", () => {
+  test('parses deleted file', () => {
     const input = [
-      "diff --git a/old.ts b/old.ts",
-      "deleted file mode 100644",
-      "--- a/old.ts",
-      "+++ /dev/null",
-      "@@ -1,2 +0,0 @@",
-      "-line1",
-      "-line2",
-    ].join("\n");
+      'diff --git a/old.ts b/old.ts',
+      'deleted file mode 100644',
+      '--- a/old.ts',
+      '+++ /dev/null',
+      '@@ -1,2 +0,0 @@',
+      '-line1',
+      '-line2',
+    ].join('\n')
 
-    const result = parseGitDiff(input);
-    const hunks = result.get("old.ts")!;
-    expect(hunks).toHaveLength(1);
-  });
+    const result = parseGitDiff(input)
+    const hunks = result.get('old.ts')!
+    expect(hunks).toHaveLength(1)
+  })
 
-  test("returns empty map for empty input", () => {
-    const result = parseGitDiff("");
-    expect(result.size).toBe(0);
-  });
+  test('returns empty map for empty input', () => {
+    const result = parseGitDiff('')
+    expect(result.size).toBe(0)
+  })
 
-  test("handles multiple files", () => {
+  test('handles multiple files', () => {
     const input = [
-      "diff --git a/a.ts b/a.ts",
-      "--- a/a.ts",
-      "+++ b/a.ts",
-      "@@ -1 +1 @@",
-      "-old",
-      "+new",
-      "diff --git a/b.ts b/b.ts",
-      "--- a/b.ts",
-      "+++ b/b.ts",
-      "@@ -1 +1 @@",
-      "-x",
-      "+y",
-    ].join("\n");
+      'diff --git a/a.ts b/a.ts',
+      '--- a/a.ts',
+      '+++ b/a.ts',
+      '@@ -1 +1 @@',
+      '-old',
+      '+new',
+      'diff --git a/b.ts b/b.ts',
+      '--- a/b.ts',
+      '+++ b/b.ts',
+      '@@ -1 +1 @@',
+      '-x',
+      '+y',
+    ].join('\n')
 
-    const result = parseGitDiff(input);
-    expect(result.size).toBe(2);
-    expect(result.has("a.ts")).toBe(true);
-    expect(result.has("b.ts")).toBe(true);
-  });
+    const result = parseGitDiff(input)
+    expect(result.size).toBe(2)
+    expect(result.has('a.ts')).toBe(true)
+    expect(result.has('b.ts')).toBe(true)
+  })
 
-  test("skips hunk without comma (single line)", () => {
+  test('skips hunk without comma (single line)', () => {
     const input = [
-      "diff --git a/solo.ts b/solo.ts",
-      "--- a/solo.ts",
-      "+++ b/solo.ts",
-      "@@ -1 +1 @@",
-      "-old",
-      "+new",
-    ].join("\n");
+      'diff --git a/solo.ts b/solo.ts',
+      '--- a/solo.ts',
+      '+++ b/solo.ts',
+      '@@ -1 +1 @@',
+      '-old',
+      '+new',
+    ].join('\n')
 
-    const result = parseGitDiff(input);
-    const hunks = result.get("solo.ts")!;
-    expect(hunks[0].oldLines).toBe(1); // default when no comma
-    expect(hunks[0].newLines).toBe(1);
-  });
-});
+    const result = parseGitDiff(input)
+    const hunks = result.get('solo.ts')!
+    expect(hunks[0].oldLines).toBe(1) // default when no comma
+    expect(hunks[0].newLines).toBe(1)
+  })
+})
 
-describe("parseShortstat", () => {
-  test("parses full shortstat with insertions and deletions", () => {
-    const result = parseShortstat(" 3 files changed, 10 insertions(+), 5 deletions(-)");
+describe('parseShortstat', () => {
+  test('parses full shortstat with insertions and deletions', () => {
+    const result = parseShortstat(
+      ' 3 files changed, 10 insertions(+), 5 deletions(-)',
+    )
     expect(result).toEqual({
       filesCount: 3,
       linesAdded: 10,
       linesRemoved: 5,
-    });
-  });
+    })
+  })
 
-  test("parses single file", () => {
-    const result = parseShortstat(" 1 file changed, 2 insertions(+), 1 deletion(-)");
+  test('parses single file', () => {
+    const result = parseShortstat(
+      ' 1 file changed, 2 insertions(+), 1 deletion(-)',
+    )
     expect(result).toEqual({
       filesCount: 1,
       linesAdded: 2,
       linesRemoved: 1,
-    });
-  });
+    })
+  })
 
-  test("parses insertions only", () => {
-    const result = parseShortstat(" 2 files changed, 5 insertions(+)");
+  test('parses insertions only', () => {
+    const result = parseShortstat(' 2 files changed, 5 insertions(+)')
     expect(result).toEqual({
       filesCount: 2,
       linesAdded: 5,
       linesRemoved: 0,
-    });
-  });
+    })
+  })
 
-  test("parses deletions only", () => {
-    const result = parseShortstat(" 1 file changed, 3 deletions(-)");
+  test('parses deletions only', () => {
+    const result = parseShortstat(' 1 file changed, 3 deletions(-)')
     expect(result).toEqual({
       filesCount: 1,
       linesAdded: 0,
       linesRemoved: 3,
-    });
-  });
+    })
+  })
 
-  test("parses files changed only (no insertions or deletions)", () => {
-    const result = parseShortstat(" 2 files changed");
+  test('parses files changed only (no insertions or deletions)', () => {
+    const result = parseShortstat(' 2 files changed')
     expect(result).toEqual({
       filesCount: 2,
       linesAdded: 0,
       linesRemoved: 0,
-    });
-  });
+    })
+  })
 
-  test("returns null for empty string", () => {
-    expect(parseShortstat("")).toBeNull();
-  });
+  test('returns null for empty string', () => {
+    expect(parseShortstat('')).toBeNull()
+  })
 
-  test("returns null for non-matching string", () => {
-    expect(parseShortstat("nothing to see here")).toBeNull();
-  });
+  test('returns null for non-matching string', () => {
+    expect(parseShortstat('nothing to see here')).toBeNull()
+  })
 
-  test("handles large numbers", () => {
-    const result = parseShortstat(" 100 files changed, 50000 insertions(+), 30000 deletions(-)");
+  test('handles large numbers', () => {
+    const result = parseShortstat(
+      ' 100 files changed, 50000 insertions(+), 30000 deletions(-)',
+    )
     expect(result).toEqual({
       filesCount: 100,
       linesAdded: 50000,
       linesRemoved: 30000,
-    });
-  });
+    })
+  })
 
-  test("handles zero insertions and deletions explicitly", () => {
+  test('handles zero insertions and deletions explicitly', () => {
     // git can output "0 insertions(+), 0 deletions(-)"
-    const result = parseShortstat(" 1 file changed, 0 insertions(+), 0 deletions(-)");
+    const result = parseShortstat(
+      ' 1 file changed, 0 insertions(+), 0 deletions(-)',
+    )
     expect(result).toEqual({
       filesCount: 1,
       linesAdded: 0,
       linesRemoved: 0,
-    });
-  });
-});
+    })
+  })
+})
diff --git a/src/utils/__tests__/glob.test.ts b/src/utils/__tests__/glob.test.ts
index 39994479e..6547a0774 100644
--- a/src/utils/__tests__/glob.test.ts
+++ b/src/utils/__tests__/glob.test.ts
@@ -1,40 +1,40 @@
-import { describe, expect, test } from "bun:test";
-import { extractGlobBaseDirectory } from "../glob";
+import { describe, expect, test } from 'bun:test'
+import { extractGlobBaseDirectory } from '../glob'
 
-describe("extractGlobBaseDirectory", () => {
-  test("extracts base dir from glob with *", () => {
-    const result = extractGlobBaseDirectory("src/utils/*.ts");
-    expect(result.baseDir).toBe("src/utils");
-    expect(result.relativePattern).toBe("*.ts");
-  });
+describe('extractGlobBaseDirectory', () => {
+  test('extracts base dir from glob with *', () => {
+    const result = extractGlobBaseDirectory('src/utils/*.ts')
+    expect(result.baseDir).toBe('src/utils')
+    expect(result.relativePattern).toBe('*.ts')
+  })
 
-  test("extracts base dir from glob with **", () => {
-    const result = extractGlobBaseDirectory("src/**/*.ts");
-    expect(result.baseDir).toBe("src");
-    expect(result.relativePattern).toBe("**/*.ts");
-  });
+  test('extracts base dir from glob with **', () => {
+    const result = extractGlobBaseDirectory('src/**/*.ts')
+    expect(result.baseDir).toBe('src')
+    expect(result.relativePattern).toBe('**/*.ts')
+  })
 
-  test("returns dirname for literal path", () => {
-    const result = extractGlobBaseDirectory("src/utils/file.ts");
-    expect(result.baseDir).toBe("src/utils");
-    expect(result.relativePattern).toBe("file.ts");
-  });
+  test('returns dirname for literal path', () => {
+    const result = extractGlobBaseDirectory('src/utils/file.ts')
+    expect(result.baseDir).toBe('src/utils')
+    expect(result.relativePattern).toBe('file.ts')
+  })
 
-  test("handles glob starting with pattern", () => {
-    const result = extractGlobBaseDirectory("*.ts");
-    expect(result.baseDir).toBe("");
-    expect(result.relativePattern).toBe("*.ts");
-  });
+  test('handles glob starting with pattern', () => {
+    const result = extractGlobBaseDirectory('*.ts')
+    expect(result.baseDir).toBe('')
+    expect(result.relativePattern).toBe('*.ts')
+  })
 
-  test("handles braces pattern", () => {
-    const result = extractGlobBaseDirectory("src/{a,b}/*.ts");
-    expect(result.baseDir).toBe("src");
-    expect(result.relativePattern).toBe("{a,b}/*.ts");
-  });
+  test('handles braces pattern', () => {
+    const result = extractGlobBaseDirectory('src/{a,b}/*.ts')
+    expect(result.baseDir).toBe('src')
+    expect(result.relativePattern).toBe('{a,b}/*.ts')
+  })
 
-  test("handles question mark pattern", () => {
-    const result = extractGlobBaseDirectory("src/?.ts");
-    expect(result.baseDir).toBe("src");
-    expect(result.relativePattern).toBe("?.ts");
-  });
-});
+  test('handles question mark pattern', () => {
+    const result = extractGlobBaseDirectory('src/?.ts')
+    expect(result.baseDir).toBe('src')
+    expect(result.relativePattern).toBe('?.ts')
+  })
+})
diff --git a/src/utils/__tests__/groupToolUses.test.ts b/src/utils/__tests__/groupToolUses.test.ts
index af77814d3..002fa662a 100644
--- a/src/utils/__tests__/groupToolUses.test.ts
+++ b/src/utils/__tests__/groupToolUses.test.ts
@@ -1,152 +1,152 @@
-import { describe, expect, test } from "bun:test";
-import { applyGrouping } from "../groupToolUses";
+import { describe, expect, test } from 'bun:test'
+import { applyGrouping } from '../groupToolUses'
 
 // Helper: build minimal tool-use assistant message
 function makeToolUseMsg(
   uuid: string,
   messageId: string,
   toolUseId: string,
-  toolName: string
+  toolName: string,
 ): any {
   return {
-    type: "assistant",
+    type: 'assistant',
     uuid,
     timestamp: Date.now(),
     message: {
       id: messageId,
-      content: [{ type: "tool_use", id: toolUseId, name: toolName, input: {} }],
+      content: [{ type: 'tool_use', id: toolUseId, name: toolName, input: {} }],
     },
-  };
+  }
 }
 
 // Helper: build minimal tool-result user message
 function makeToolResultMsg(uuid: string, toolUseId: string): any {
   return {
-    type: "user",
+    type: 'user',
     uuid,
     timestamp: Date.now(),
     message: {
-      content: [{ type: "tool_result", tool_use_id: toolUseId, content: "ok" }],
+      content: [{ type: 'tool_result', tool_use_id: toolUseId, content: 'ok' }],
     },
-  };
+  }
 }
 
 // Helper: build minimal text assistant message
 function makeTextMsg(uuid: string, text: string): any {
   return {
-    type: "assistant",
+    type: 'assistant',
     uuid,
     timestamp: Date.now(),
-    message: { id: `msg-${uuid}`, content: [{ type: "text", text }] },
-  };
+    message: { id: `msg-${uuid}`, content: [{ type: 'text', text }] },
+  }
 }
 
 // Minimal tool definitions
-const groupableTool: any = { name: "Grep", renderGroupedToolUse: true };
-const nonGroupableTool: any = { name: "Bash", renderGroupedToolUse: undefined };
+const groupableTool: any = { name: 'Grep', renderGroupedToolUse: true }
+const nonGroupableTool: any = { name: 'Bash', renderGroupedToolUse: undefined }
 
 // ─── applyGrouping ────────────────────────────────────────────────────
 
-describe("applyGrouping", () => {
-  test("returns all messages in verbose mode", () => {
+describe('applyGrouping', () => {
+  test('returns all messages in verbose mode', () => {
     const msgs = [
-      makeToolUseMsg("u1", "m1", "tu1", "Grep"),
-      makeToolUseMsg("u2", "m1", "tu2", "Grep"),
-    ];
-    const result = applyGrouping(msgs, [groupableTool], true);
-    expect(result.messages).toHaveLength(2);
-    expect(result.messages).toBe(msgs); // same reference
-  });
+      makeToolUseMsg('u1', 'm1', 'tu1', 'Grep'),
+      makeToolUseMsg('u2', 'm1', 'tu2', 'Grep'),
+    ]
+    const result = applyGrouping(msgs, [groupableTool], true)
+    expect(result.messages).toHaveLength(2)
+    expect(result.messages).toBe(msgs) // same reference
+  })
 
-  test("does not group when tool lacks renderGroupedToolUse", () => {
+  test('does not group when tool lacks renderGroupedToolUse', () => {
     const msgs = [
-      makeToolUseMsg("u1", "m1", "tu1", "Bash"),
-      makeToolUseMsg("u2", "m1", "tu2", "Bash"),
-    ];
-    const result = applyGrouping(msgs, [nonGroupableTool]);
-    expect(result.messages).toHaveLength(2);
+      makeToolUseMsg('u1', 'm1', 'tu1', 'Bash'),
+      makeToolUseMsg('u2', 'm1', 'tu2', 'Bash'),
+    ]
+    const result = applyGrouping(msgs, [nonGroupableTool])
+    expect(result.messages).toHaveLength(2)
     // Both messages should pass through as-is
-    expect(result.messages[0]).toBe(msgs[0]);
-  });
+    expect(result.messages[0]).toBe(msgs[0])
+  })
 
-  test("does not group single tool use", () => {
-    const msgs = [makeToolUseMsg("u1", "m1", "tu1", "Grep")];
-    const result = applyGrouping(msgs, [groupableTool]);
-    expect(result.messages).toHaveLength(1);
-    expect((result.messages[0] as any).type).toBe("assistant");
-  });
+  test('does not group single tool use', () => {
+    const msgs = [makeToolUseMsg('u1', 'm1', 'tu1', 'Grep')]
+    const result = applyGrouping(msgs, [groupableTool])
+    expect(result.messages).toHaveLength(1)
+    expect((result.messages[0] as any).type).toBe('assistant')
+  })
 
-  test("groups 2+ tool uses of same type from same message", () => {
+  test('groups 2+ tool uses of same type from same message', () => {
     const msgs = [
-      makeToolUseMsg("u1", "m1", "tu1", "Grep"),
-      makeToolUseMsg("u2", "m1", "tu2", "Grep"),
-      makeToolUseMsg("u3", "m1", "tu3", "Grep"),
-    ];
-    const result = applyGrouping(msgs, [groupableTool]);
-    expect(result.messages).toHaveLength(1);
-    const grouped = result.messages[0] as any;
-    expect(grouped.type).toBe("grouped_tool_use");
-    expect(grouped.toolName).toBe("Grep");
-    expect(grouped.messages).toHaveLength(3);
-  });
+      makeToolUseMsg('u1', 'm1', 'tu1', 'Grep'),
+      makeToolUseMsg('u2', 'm1', 'tu2', 'Grep'),
+      makeToolUseMsg('u3', 'm1', 'tu3', 'Grep'),
+    ]
+    const result = applyGrouping(msgs, [groupableTool])
+    expect(result.messages).toHaveLength(1)
+    const grouped = result.messages[0] as any
+    expect(grouped.type).toBe('grouped_tool_use')
+    expect(grouped.toolName).toBe('Grep')
+    expect(grouped.messages).toHaveLength(3)
+  })
 
-  test("does not group tool uses from different messages", () => {
+  test('does not group tool uses from different messages', () => {
     const msgs = [
-      makeToolUseMsg("u1", "m1", "tu1", "Grep"),
-      makeToolUseMsg("u2", "m2", "tu2", "Grep"),
-    ];
-    const result = applyGrouping(msgs, [groupableTool]);
+      makeToolUseMsg('u1', 'm1', 'tu1', 'Grep'),
+      makeToolUseMsg('u2', 'm2', 'tu2', 'Grep'),
+    ]
+    const result = applyGrouping(msgs, [groupableTool])
     // Each belongs to a different message.id, so no group (< 2 per group)
-    expect(result.messages).toHaveLength(2);
-  });
+    expect(result.messages).toHaveLength(2)
+  })
 
-  test("collects tool results for grouped uses", () => {
+  test('collects tool results for grouped uses', () => {
     const msgs = [
-      makeToolUseMsg("u1", "m1", "tu1", "Grep"),
-      makeToolUseMsg("u2", "m1", "tu2", "Grep"),
-      makeToolResultMsg("u3", "tu1"),
-      makeToolResultMsg("u4", "tu2"),
-    ];
-    const result = applyGrouping(msgs, [groupableTool]);
-    const grouped = result.messages[0] as any;
-    expect(grouped.type).toBe("grouped_tool_use");
-    expect(grouped.results).toHaveLength(2);
-  });
+      makeToolUseMsg('u1', 'm1', 'tu1', 'Grep'),
+      makeToolUseMsg('u2', 'm1', 'tu2', 'Grep'),
+      makeToolResultMsg('u3', 'tu1'),
+      makeToolResultMsg('u4', 'tu2'),
+    ]
+    const result = applyGrouping(msgs, [groupableTool])
+    const grouped = result.messages[0] as any
+    expect(grouped.type).toBe('grouped_tool_use')
+    expect(grouped.results).toHaveLength(2)
+  })
 
-  test("skips user messages whose tool_results are all grouped", () => {
+  test('skips user messages whose tool_results are all grouped', () => {
     const msgs = [
-      makeToolUseMsg("u1", "m1", "tu1", "Grep"),
-      makeToolUseMsg("u2", "m1", "tu2", "Grep"),
-      makeToolResultMsg("u3", "tu1"),
-      makeToolResultMsg("u4", "tu2"),
-    ];
-    const result = applyGrouping(msgs, [groupableTool]);
+      makeToolUseMsg('u1', 'm1', 'tu1', 'Grep'),
+      makeToolUseMsg('u2', 'm1', 'tu2', 'Grep'),
+      makeToolResultMsg('u3', 'tu1'),
+      makeToolResultMsg('u4', 'tu2'),
+    ]
+    const result = applyGrouping(msgs, [groupableTool])
     // Only the grouped message should remain — result messages are consumed
-    expect(result.messages).toHaveLength(1);
-  });
+    expect(result.messages).toHaveLength(1)
+  })
 
-  test("preserves non-grouped messages alongside groups", () => {
+  test('preserves non-grouped messages alongside groups', () => {
     const msgs = [
-      makeTextMsg("u0", "thinking..."),
-      makeToolUseMsg("u1", "m1", "tu1", "Grep"),
-      makeToolUseMsg("u2", "m1", "tu2", "Grep"),
-      makeTextMsg("u3", "done"),
-    ];
-    const result = applyGrouping(msgs, [groupableTool]);
-    expect(result.messages).toHaveLength(3); // text + grouped + text
-    expect((result.messages[0] as any).type).toBe("assistant");
-    expect((result.messages[1] as any).type).toBe("grouped_tool_use");
-    expect((result.messages[2] as any).type).toBe("assistant");
-  });
+      makeTextMsg('u0', 'thinking...'),
+      makeToolUseMsg('u1', 'm1', 'tu1', 'Grep'),
+      makeToolUseMsg('u2', 'm1', 'tu2', 'Grep'),
+      makeTextMsg('u3', 'done'),
+    ]
+    const result = applyGrouping(msgs, [groupableTool])
+    expect(result.messages).toHaveLength(3) // text + grouped + text
+    expect((result.messages[0] as any).type).toBe('assistant')
+    expect((result.messages[1] as any).type).toBe('grouped_tool_use')
+    expect((result.messages[2] as any).type).toBe('assistant')
+  })
 
-  test("handles empty messages array", () => {
-    const result = applyGrouping([], [groupableTool]);
-    expect(result.messages).toHaveLength(0);
-  });
+  test('handles empty messages array', () => {
+    const result = applyGrouping([], [groupableTool])
+    expect(result.messages).toHaveLength(0)
+  })
 
-  test("handles empty tools array", () => {
-    const msgs = [makeToolUseMsg("u1", "m1", "tu1", "Grep")];
-    const result = applyGrouping(msgs, []);
-    expect(result.messages).toHaveLength(1);
-  });
-});
+  test('handles empty tools array', () => {
+    const msgs = [makeToolUseMsg('u1', 'm1', 'tu1', 'Grep')]
+    const result = applyGrouping(msgs, [])
+    expect(result.messages).toHaveLength(1)
+  })
+})
diff --git a/src/utils/__tests__/hash.test.ts b/src/utils/__tests__/hash.test.ts
index 5381ee150..e3539be00 100644
--- a/src/utils/__tests__/hash.test.ts
+++ b/src/utils/__tests__/hash.test.ts
@@ -1,76 +1,76 @@
-import { describe, expect, test } from "bun:test";
-import { djb2Hash, hashContent, hashPair } from "../hash";
+import { describe, expect, test } from 'bun:test'
+import { djb2Hash, hashContent, hashPair } from '../hash'
 
-describe("djb2Hash", () => {
-  test("returns a number", () => {
-    expect(typeof djb2Hash("hello")).toBe("number");
-  });
+describe('djb2Hash', () => {
+  test('returns a number', () => {
+    expect(typeof djb2Hash('hello')).toBe('number')
+  })
 
-  test("returns 0 for empty string", () => {
-    expect(djb2Hash("")).toBe(0);
-  });
+  test('returns 0 for empty string', () => {
+    expect(djb2Hash('')).toBe(0)
+  })
 
-  test("is deterministic", () => {
-    expect(djb2Hash("test")).toBe(djb2Hash("test"));
-  });
+  test('is deterministic', () => {
+    expect(djb2Hash('test')).toBe(djb2Hash('test'))
+  })
 
-  test("different strings produce different hashes", () => {
-    expect(djb2Hash("abc")).not.toBe(djb2Hash("def"));
-  });
+  test('different strings produce different hashes', () => {
+    expect(djb2Hash('abc')).not.toBe(djb2Hash('def'))
+  })
 
-  test("returns 32-bit integer", () => {
-    const hash = djb2Hash("some long string to hash");
-    expect(Number.isSafeInteger(hash)).toBe(true);
-  });
+  test('returns 32-bit integer', () => {
+    const hash = djb2Hash('some long string to hash')
+    expect(Number.isSafeInteger(hash)).toBe(true)
+  })
 
   test("has known answer for 'hello'", () => {
-    expect(djb2Hash("hello")).toBe(99162322);
-  });
-});
+    expect(djb2Hash('hello')).toBe(99162322)
+  })
+})
 
-describe("hashContent", () => {
-  test("returns a string", () => {
-    expect(typeof hashContent("hello")).toBe("string");
-  });
+describe('hashContent', () => {
+  test('returns a string', () => {
+    expect(typeof hashContent('hello')).toBe('string')
+  })
 
-  test("is deterministic", () => {
-    expect(hashContent("test")).toBe(hashContent("test"));
-  });
+  test('is deterministic', () => {
+    expect(hashContent('test')).toBe(hashContent('test'))
+  })
 
-  test("different strings produce different hashes", () => {
-    expect(hashContent("abc")).not.toBe(hashContent("def"));
-  });
+  test('different strings produce different hashes', () => {
+    expect(hashContent('abc')).not.toBe(hashContent('def'))
+  })
 
-  test("returns numeric string for empty string", () => {
-    expect(hashContent("")).toMatch(/^\d+$/);
-  });
+  test('returns numeric string for empty string', () => {
+    expect(hashContent('')).toMatch(/^\d+$/)
+  })
 
-  test("returns numeric string format", () => {
-    expect(hashContent("hello")).toMatch(/^\d+$/);
-  });
-});
+  test('returns numeric string format', () => {
+    expect(hashContent('hello')).toMatch(/^\d+$/)
+  })
+})
 
-describe("hashPair", () => {
-  test("returns a string", () => {
-    expect(typeof hashPair("a", "b")).toBe("string");
-  });
+describe('hashPair', () => {
+  test('returns a string', () => {
+    expect(typeof hashPair('a', 'b')).toBe('string')
+  })
 
-  test("is deterministic", () => {
-    expect(hashPair("a", "b")).toBe(hashPair("a", "b"));
-  });
+  test('is deterministic', () => {
+    expect(hashPair('a', 'b')).toBe(hashPair('a', 'b'))
+  })
 
-  test("order matters", () => {
-    expect(hashPair("a", "b")).not.toBe(hashPair("b", "a"));
-  });
+  test('order matters', () => {
+    expect(hashPair('a', 'b')).not.toBe(hashPair('b', 'a'))
+  })
 
-  test("disambiguates different splits", () => {
-    expect(hashPair("ts", "code")).not.toBe(hashPair("tsc", "ode"));
-  });
+  test('disambiguates different splits', () => {
+    expect(hashPair('ts', 'code')).not.toBe(hashPair('tsc', 'ode'))
+  })
 
-  test("handles empty strings", () => {
-    expect(hashPair("", "")).toMatch(/^\d+$/);
-    expect(hashPair("", "a")).toMatch(/^\d+$/);
-    expect(hashPair("a", "")).toMatch(/^\d+$/);
-    expect(hashPair("", "a")).not.toBe(hashPair("a", ""));
-  });
-});
+  test('handles empty strings', () => {
+    expect(hashPair('', '')).toMatch(/^\d+$/)
+    expect(hashPair('', 'a')).toMatch(/^\d+$/)
+    expect(hashPair('a', '')).toMatch(/^\d+$/)
+    expect(hashPair('', 'a')).not.toBe(hashPair('a', ''))
+  })
+})
diff --git a/src/utils/__tests__/horizontalScroll.test.ts b/src/utils/__tests__/horizontalScroll.test.ts
index 0ed9f7cf5..36231ca3d 100644
--- a/src/utils/__tests__/horizontalScroll.test.ts
+++ b/src/utils/__tests__/horizontalScroll.test.ts
@@ -1,163 +1,163 @@
-import { describe, expect, test } from "bun:test";
-import { calculateHorizontalScrollWindow } from "../horizontalScroll";
+import { describe, expect, test } from 'bun:test'
+import { calculateHorizontalScrollWindow } from '../horizontalScroll'
 
-describe("calculateHorizontalScrollWindow", () => {
+describe('calculateHorizontalScrollWindow', () => {
   // Basic scenarios
-  test("all items fit within available width", () => {
-    const result = calculateHorizontalScrollWindow([10, 10, 10], 50, 3, 1);
+  test('all items fit within available width', () => {
+    const result = calculateHorizontalScrollWindow([10, 10, 10], 50, 3, 1)
     expect(result).toEqual({
       startIndex: 0,
       endIndex: 3,
       showLeftArrow: false,
       showRightArrow: false,
-    });
-  });
+    })
+  })
 
-  test("single item selected within view", () => {
-    const result = calculateHorizontalScrollWindow([20], 50, 3, 0);
+  test('single item selected within view', () => {
+    const result = calculateHorizontalScrollWindow([20], 50, 3, 0)
     expect(result).toEqual({
       startIndex: 0,
       endIndex: 1,
       showLeftArrow: false,
       showRightArrow: false,
-    });
-  });
+    })
+  })
 
-  test("selected item at beginning", () => {
-    const widths = [10, 10, 10, 10, 10];
-    const result = calculateHorizontalScrollWindow(widths, 25, 3, 0);
-    expect(result.startIndex).toBe(0);
-    expect(result.showLeftArrow).toBe(false);
-    expect(result.showRightArrow).toBe(true);
-    expect(result.endIndex).toBeGreaterThan(0);
-  });
+  test('selected item at beginning', () => {
+    const widths = [10, 10, 10, 10, 10]
+    const result = calculateHorizontalScrollWindow(widths, 25, 3, 0)
+    expect(result.startIndex).toBe(0)
+    expect(result.showLeftArrow).toBe(false)
+    expect(result.showRightArrow).toBe(true)
+    expect(result.endIndex).toBeGreaterThan(0)
+  })
 
-  test("selected item at end", () => {
-    const widths = [10, 10, 10, 10, 10];
-    const result = calculateHorizontalScrollWindow(widths, 25, 3, 4);
-    expect(result.endIndex).toBe(5);
-    expect(result.showRightArrow).toBe(false);
-    expect(result.showLeftArrow).toBe(true);
-  });
+  test('selected item at end', () => {
+    const widths = [10, 10, 10, 10, 10]
+    const result = calculateHorizontalScrollWindow(widths, 25, 3, 4)
+    expect(result.endIndex).toBe(5)
+    expect(result.showRightArrow).toBe(false)
+    expect(result.showLeftArrow).toBe(true)
+  })
 
-  test("selected item beyond visible range scrolls right", () => {
-    const widths = [10, 10, 10, 10, 10];
-    const result = calculateHorizontalScrollWindow(widths, 20, 3, 4);
-    expect(result.startIndex).toBeLessThanOrEqual(4);
-    expect(result.endIndex).toBeGreaterThan(4);
-  });
+  test('selected item beyond visible range scrolls right', () => {
+    const widths = [10, 10, 10, 10, 10]
+    const result = calculateHorizontalScrollWindow(widths, 20, 3, 4)
+    expect(result.startIndex).toBeLessThanOrEqual(4)
+    expect(result.endIndex).toBeGreaterThan(4)
+  })
 
-  test("selected item before visible range scrolls left", () => {
-    const widths = [10, 10, 10, 10, 10];
+  test('selected item before visible range scrolls left', () => {
+    const widths = [10, 10, 10, 10, 10]
     // Select last item first (simulates initial scroll to end)
-    const result = calculateHorizontalScrollWindow(widths, 20, 3, 0);
-    expect(result.startIndex).toBe(0);
-  });
+    const result = calculateHorizontalScrollWindow(widths, 20, 3, 0)
+    expect(result.startIndex).toBe(0)
+  })
 
   // Arrow indicators
-  test("showLeftArrow when items hidden on left", () => {
-    const widths = [10, 10, 10, 10, 10];
-    const result = calculateHorizontalScrollWindow(widths, 15, 3, 4);
-    expect(result.showLeftArrow).toBe(true);
-  });
+  test('showLeftArrow when items hidden on left', () => {
+    const widths = [10, 10, 10, 10, 10]
+    const result = calculateHorizontalScrollWindow(widths, 15, 3, 4)
+    expect(result.showLeftArrow).toBe(true)
+  })
 
-  test("showRightArrow when items hidden on right", () => {
-    const widths = [10, 10, 10, 10, 10];
-    const result = calculateHorizontalScrollWindow(widths, 15, 3, 0);
-    expect(result.showRightArrow).toBe(true);
-  });
+  test('showRightArrow when items hidden on right', () => {
+    const widths = [10, 10, 10, 10, 10]
+    const result = calculateHorizontalScrollWindow(widths, 15, 3, 0)
+    expect(result.showRightArrow).toBe(true)
+  })
 
-  test("no arrows when all items visible", () => {
-    const result = calculateHorizontalScrollWindow([10, 10], 50, 3, 0);
-    expect(result.showLeftArrow).toBe(false);
-    expect(result.showRightArrow).toBe(false);
-  });
+  test('no arrows when all items visible', () => {
+    const result = calculateHorizontalScrollWindow([10, 10], 50, 3, 0)
+    expect(result.showLeftArrow).toBe(false)
+    expect(result.showRightArrow).toBe(false)
+  })
 
-  test("both arrows when items hidden on both sides", () => {
-    const widths = [10, 10, 10, 10, 10, 10, 10];
+  test('both arrows when items hidden on both sides', () => {
+    const widths = [10, 10, 10, 10, 10, 10, 10]
     // Select middle item with limited width
-    const result = calculateHorizontalScrollWindow(widths, 20, 3, 3);
+    const result = calculateHorizontalScrollWindow(widths, 20, 3, 3)
     // Both arrows may or may not show depending on exact fit
-    expect(result.startIndex).toBeLessThanOrEqual(3);
-    expect(result.endIndex).toBeGreaterThan(3);
-  });
+    expect(result.startIndex).toBeLessThanOrEqual(3)
+    expect(result.endIndex).toBeGreaterThan(3)
+  })
 
   // Boundary conditions
-  test("empty itemWidths array", () => {
-    const result = calculateHorizontalScrollWindow([], 50, 3, 0);
+  test('empty itemWidths array', () => {
+    const result = calculateHorizontalScrollWindow([], 50, 3, 0)
     expect(result).toEqual({
       startIndex: 0,
       endIndex: 0,
       showLeftArrow: false,
       showRightArrow: false,
-    });
-  });
+    })
+  })
 
-  test("single item", () => {
-    const result = calculateHorizontalScrollWindow([30], 50, 3, 0);
+  test('single item', () => {
+    const result = calculateHorizontalScrollWindow([30], 50, 3, 0)
     expect(result).toEqual({
       startIndex: 0,
       endIndex: 1,
       showLeftArrow: false,
       showRightArrow: false,
-    });
-  });
+    })
+  })
 
-  test("available width is 0", () => {
-    const result = calculateHorizontalScrollWindow([10, 10], 0, 3, 0);
+  test('available width is 0', () => {
+    const result = calculateHorizontalScrollWindow([10, 10], 0, 3, 0)
     // With 0 width, nothing fits except maybe the selected
-    expect(result.startIndex).toBe(0);
-  });
+    expect(result.startIndex).toBe(0)
+  })
 
-  test("item wider than available width", () => {
-    const result = calculateHorizontalScrollWindow([100], 50, 3, 0);
+  test('item wider than available width', () => {
+    const result = calculateHorizontalScrollWindow([100], 50, 3, 0)
     // Total width > available, but only one item
-    expect(result.startIndex).toBe(0);
-    expect(result.endIndex).toBe(1);
-  });
+    expect(result.startIndex).toBe(0)
+    expect(result.endIndex).toBe(1)
+  })
 
-  test("all items same width", () => {
-    const widths = [10, 10, 10, 10];
-    const result = calculateHorizontalScrollWindow(widths, 25, 3, 2);
-    expect(result.startIndex).toBeLessThanOrEqual(2);
-    expect(result.endIndex).toBeGreaterThan(2);
-  });
+  test('all items same width', () => {
+    const widths = [10, 10, 10, 10]
+    const result = calculateHorizontalScrollWindow(widths, 25, 3, 2)
+    expect(result.startIndex).toBeLessThanOrEqual(2)
+    expect(result.endIndex).toBeGreaterThan(2)
+  })
 
-  test("varying item widths", () => {
-    const widths = [5, 20, 5, 20, 5];
-    const result = calculateHorizontalScrollWindow(widths, 20, 3, 2);
-    expect(result.startIndex).toBeLessThanOrEqual(2);
-    expect(result.endIndex).toBeGreaterThan(2);
-  });
+  test('varying item widths', () => {
+    const widths = [5, 20, 5, 20, 5]
+    const result = calculateHorizontalScrollWindow(widths, 20, 3, 2)
+    expect(result.startIndex).toBeLessThanOrEqual(2)
+    expect(result.endIndex).toBeGreaterThan(2)
+  })
 
-  test("firstItemHasSeparator adds separator width to first item", () => {
-    const widths = [10, 10, 10, 10, 10];
-    const withSep = calculateHorizontalScrollWindow(widths, 20, 3, 4, true);
-    const withoutSep = calculateHorizontalScrollWindow(widths, 20, 3, 4, false);
+  test('firstItemHasSeparator adds separator width to first item', () => {
+    const widths = [10, 10, 10, 10, 10]
+    const withSep = calculateHorizontalScrollWindow(widths, 20, 3, 4, true)
+    const withoutSep = calculateHorizontalScrollWindow(widths, 20, 3, 4, false)
     // Both should include selected index 4
-    expect(withSep.endIndex).toBe(5);
-    expect(withoutSep.endIndex).toBe(5);
-  });
+    expect(withSep.endIndex).toBe(5)
+    expect(withoutSep.endIndex).toBe(5)
+  })
 
-  test("selectedIdx in middle of overflow", () => {
-    const widths = [10, 10, 10, 10, 10, 10, 10];
-    const result = calculateHorizontalScrollWindow(widths, 25, 3, 3);
-    expect(result.startIndex).toBeLessThanOrEqual(3);
-    expect(result.endIndex).toBeGreaterThan(3);
-  });
+  test('selectedIdx in middle of overflow', () => {
+    const widths = [10, 10, 10, 10, 10, 10, 10]
+    const result = calculateHorizontalScrollWindow(widths, 25, 3, 3)
+    expect(result.startIndex).toBeLessThanOrEqual(3)
+    expect(result.endIndex).toBeGreaterThan(3)
+  })
 
-  test("scroll snaps to show selected at left edge", () => {
-    const widths = [10, 10, 10, 10, 10];
+  test('scroll snaps to show selected at left edge', () => {
+    const widths = [10, 10, 10, 10, 10]
     // Jump to last item which forces scroll
-    const result = calculateHorizontalScrollWindow(widths, 20, 3, 4);
-    expect(result.startIndex).toBeLessThanOrEqual(4);
-    expect(result.endIndex).toBe(5);
-  });
+    const result = calculateHorizontalScrollWindow(widths, 20, 3, 4)
+    expect(result.startIndex).toBeLessThanOrEqual(4)
+    expect(result.endIndex).toBe(5)
+  })
 
-  test("scroll snaps to show selected at right edge", () => {
-    const widths = [10, 10, 10, 10, 10];
-    const result = calculateHorizontalScrollWindow(widths, 20, 3, 4);
-    expect(result.endIndex).toBe(5);
-    expect(result.startIndex).toBeGreaterThan(0);
-  });
-});
+  test('scroll snaps to show selected at right edge', () => {
+    const widths = [10, 10, 10, 10, 10]
+    const result = calculateHorizontalScrollWindow(widths, 20, 3, 4)
+    expect(result.endIndex).toBe(5)
+    expect(result.startIndex).toBeGreaterThan(0)
+  })
+})
diff --git a/src/utils/__tests__/hyperlink.test.ts b/src/utils/__tests__/hyperlink.test.ts
index cd3c2c30d..2503b1e99 100644
--- a/src/utils/__tests__/hyperlink.test.ts
+++ b/src/utils/__tests__/hyperlink.test.ts
@@ -1,99 +1,99 @@
-import { describe, expect, test } from "bun:test";
-import { createHyperlink, OSC8_START, OSC8_END } from "../hyperlink";
+import { describe, expect, test } from 'bun:test'
+import { createHyperlink, OSC8_START, OSC8_END } from '../hyperlink'
 
 // ─── OSC8 constants ────────────────────────────────────────────────────
 
-describe("OSC8 constants", () => {
-  test("OSC8_START is the correct escape sequence", () => {
-    expect(OSC8_START).toBe("\x1b]8;;");
-  });
+describe('OSC8 constants', () => {
+  test('OSC8_START is the correct escape sequence', () => {
+    expect(OSC8_START).toBe('\x1b]8;;')
+  })
 
-  test("OSC8_END is the BEL character", () => {
-    expect(OSC8_END).toBe("\x07");
-  });
-});
+  test('OSC8_END is the BEL character', () => {
+    expect(OSC8_END).toBe('\x07')
+  })
+})
 
 // ─── createHyperlink ───────────────────────────────────────────────────
 
-describe("createHyperlink", () => {
-  test("supported + no content: wraps URL in OSC 8 with URL as display text", () => {
-    const url = "https://example.com";
-    const result = createHyperlink(url, undefined, { supportsHyperlinks: true });
+describe('createHyperlink', () => {
+  test('supported + no content: wraps URL in OSC 8 with URL as display text', () => {
+    const url = 'https://example.com'
+    const result = createHyperlink(url, undefined, { supportsHyperlinks: true })
 
-    expect(result).toContain(OSC8_START);
-    expect(result).toContain(OSC8_END);
+    expect(result).toContain(OSC8_START)
+    expect(result).toContain(OSC8_END)
     // Structure: OSC8_START + url + OSC8_END + coloredText + OSC8_START + OSC8_END
-    expect(result).toStartWith(`${OSC8_START}${url}${OSC8_END}`);
-    expect(result).toEndWith(`${OSC8_START}${OSC8_END}`);
-  });
+    expect(result).toStartWith(`${OSC8_START}${url}${OSC8_END}`)
+    expect(result).toEndWith(`${OSC8_START}${OSC8_END}`)
+  })
 
-  test("supported + content: shows content as link text", () => {
-    const url = "https://example.com";
-    const content = "click here";
-    const result = createHyperlink(url, content, { supportsHyperlinks: true });
+  test('supported + content: shows content as link text', () => {
+    const url = 'https://example.com'
+    const content = 'click here'
+    const result = createHyperlink(url, content, { supportsHyperlinks: true })
 
-    expect(result).toStartWith(`${OSC8_START}${url}${OSC8_END}`);
-    expect(result).toContain("click here");
-    expect(result).toEndWith(`${OSC8_START}${OSC8_END}`);
-  });
+    expect(result).toStartWith(`${OSC8_START}${url}${OSC8_END}`)
+    expect(result).toContain('click here')
+    expect(result).toEndWith(`${OSC8_START}${OSC8_END}`)
+  })
 
-  test("not supported: returns plain URL regardless of content", () => {
-    const url = "https://example.com";
-    const result = createHyperlink(url, "some content", {
+  test('not supported: returns plain URL regardless of content', () => {
+    const url = 'https://example.com'
+    const result = createHyperlink(url, 'some content', {
       supportsHyperlinks: false,
-    });
+    })
 
-    expect(result).toBe(url);
-  });
+    expect(result).toBe(url)
+  })
 
-  test("not supported + no content: returns plain URL", () => {
-    const url = "https://example.com/path?q=1";
+  test('not supported + no content: returns plain URL', () => {
+    const url = 'https://example.com/path?q=1'
     const result = createHyperlink(url, undefined, {
       supportsHyperlinks: false,
-    });
+    })
 
-    expect(result).toBe(url);
-  });
+    expect(result).toBe(url)
+  })
 
-  test("URL with special characters works when supported", () => {
-    const url = "https://example.com/path?a=1&b=2#section";
-    const result = createHyperlink(url, undefined, { supportsHyperlinks: true });
+  test('URL with special characters works when supported', () => {
+    const url = 'https://example.com/path?a=1&b=2#section'
+    const result = createHyperlink(url, undefined, { supportsHyperlinks: true })
 
-    expect(result).toStartWith(`${OSC8_START}${url}${OSC8_END}`);
-    expect(result).toEndWith(`${OSC8_START}${OSC8_END}`);
-  });
+    expect(result).toStartWith(`${OSC8_START}${url}${OSC8_END}`)
+    expect(result).toEndWith(`${OSC8_START}${OSC8_END}`)
+  })
 
-  test("URL with special characters works when not supported", () => {
-    const url = "https://example.com/path?a=1&b=2#section";
+  test('URL with special characters works when not supported', () => {
+    const url = 'https://example.com/path?a=1&b=2#section'
     const result = createHyperlink(url, undefined, {
       supportsHyperlinks: false,
-    });
+    })
 
-    expect(result).toBe(url);
-  });
+    expect(result).toBe(url)
+  })
 
-  test("supported link text contains the display content", () => {
-    const result = createHyperlink("https://example.com", "text", {
+  test('supported link text contains the display content', () => {
+    const result = createHyperlink('https://example.com', 'text', {
       supportsHyperlinks: true,
-    });
+    })
 
     // The colored text portion is between the two OSC8 sequences
     const inner = result.slice(
       `${OSC8_START}https://example.com${OSC8_END}`.length,
-      result.length - `${OSC8_START}${OSC8_END}`.length
-    );
+      result.length - `${OSC8_START}${OSC8_END}`.length,
+    )
     // chalk.blue may or may not emit ANSI depending on environment,
     // but the display text must always be present
-    expect(inner).toContain("text");
-  });
+    expect(inner).toContain('text')
+  })
 
-  test("empty content string is treated as display text when supported", () => {
-    const url = "https://example.com";
-    const result = createHyperlink(url, "", { supportsHyperlinks: true });
+  test('empty content string is treated as display text when supported', () => {
+    const url = 'https://example.com'
+    const result = createHyperlink(url, '', { supportsHyperlinks: true })
 
     // Empty string is falsy, so displayText falls back to url
     // Actually: content ?? url — "" is not null/undefined, so "" is used
-    expect(result).toStartWith(`${OSC8_START}${url}${OSC8_END}`);
-    expect(result).toEndWith(`${OSC8_START}${OSC8_END}`);
-  });
-});
+    expect(result).toStartWith(`${OSC8_START}${url}${OSC8_END}`)
+    expect(result).toEndWith(`${OSC8_START}${OSC8_END}`)
+  })
+})
diff --git a/src/utils/__tests__/json.test.ts b/src/utils/__tests__/json.test.ts
index 42a624b10..b065047c4 100644
--- a/src/utils/__tests__/json.test.ts
+++ b/src/utils/__tests__/json.test.ts
@@ -1,153 +1,153 @@
-import { mock, describe, expect, test } from "bun:test";
+import { mock, describe, expect, test } from 'bun:test'
 
 // Mock log.ts to cut the heavy dependency chain (log.ts → bootstrap/state.ts → analytics)
-mock.module("src/utils/log.ts", () => ({
+mock.module('src/utils/log.ts', () => ({
   logError: () => {},
   logToFile: () => {},
-  getLogDisplayTitle: () => "",
+  getLogDisplayTitle: () => '',
   logEvent: () => {},
-}));
+}))
 
 const { safeParseJSON, safeParseJSONC, parseJSONL, addItemToJSONCArray } =
-  await import("../json");
+  await import('../json')
 
 // ─── safeParseJSON ──────────────────────────────────────────────────────
 
-describe("safeParseJSON", () => {
-  test("parses valid object", () => {
-    expect(safeParseJSON('{"a":1}')).toEqual({ a: 1 });
-  });
+describe('safeParseJSON', () => {
+  test('parses valid object', () => {
+    expect(safeParseJSON('{"a":1}')).toEqual({ a: 1 })
+  })
 
-  test("parses valid array", () => {
-    expect(safeParseJSON("[1,2,3]")).toEqual([1, 2, 3]);
-  });
+  test('parses valid array', () => {
+    expect(safeParseJSON('[1,2,3]')).toEqual([1, 2, 3])
+  })
 
-  test("parses string value", () => {
-    expect(safeParseJSON('"hello"')).toBe("hello");
-  });
+  test('parses string value', () => {
+    expect(safeParseJSON('"hello"')).toBe('hello')
+  })
 
-  test("parses number value", () => {
-    expect(safeParseJSON("42")).toBe(42);
-  });
+  test('parses number value', () => {
+    expect(safeParseJSON('42')).toBe(42)
+  })
 
-  test("parses boolean value", () => {
-    expect(safeParseJSON("true")).toBe(true);
-  });
+  test('parses boolean value', () => {
+    expect(safeParseJSON('true')).toBe(true)
+  })
 
-  test("parses null value", () => {
-    expect(safeParseJSON("null")).toBeNull();
-  });
+  test('parses null value', () => {
+    expect(safeParseJSON('null')).toBeNull()
+  })
 
-  test("returns null for invalid JSON", () => {
-    expect(safeParseJSON("{bad}")).toBeNull();
-  });
+  test('returns null for invalid JSON', () => {
+    expect(safeParseJSON('{bad}')).toBeNull()
+  })
 
-  test("returns null for empty string", () => {
-    expect(safeParseJSON("")).toBeNull();
-  });
+  test('returns null for empty string', () => {
+    expect(safeParseJSON('')).toBeNull()
+  })
 
-  test("returns null for undefined input", () => {
-    expect(safeParseJSON(undefined as any)).toBeNull();
-  });
+  test('returns null for undefined input', () => {
+    expect(safeParseJSON(undefined as any)).toBeNull()
+  })
 
-  test("returns null for null input", () => {
-    expect(safeParseJSON(null as any)).toBeNull();
-  });
+  test('returns null for null input', () => {
+    expect(safeParseJSON(null as any)).toBeNull()
+  })
 
-  test("handles JSON with BOM", () => {
-    expect(safeParseJSON('\uFEFF{"a":1}')).toEqual({ a: 1 });
-  });
+  test('handles JSON with BOM', () => {
+    expect(safeParseJSON('\uFEFF{"a":1}')).toEqual({ a: 1 })
+  })
 
-  test("parses nested objects", () => {
-    const input = '{"a":{"b":{"c":1}}}';
-    expect(safeParseJSON(input)).toEqual({ a: { b: { c: 1 } } });
-  });
-});
+  test('parses nested objects', () => {
+    const input = '{"a":{"b":{"c":1}}}'
+    expect(safeParseJSON(input)).toEqual({ a: { b: { c: 1 } } })
+  })
+})
 
 // ─── safeParseJSONC ─────────────────────────────────────────────────────
 
-describe("safeParseJSONC", () => {
-  test("parses standard JSON", () => {
-    expect(safeParseJSONC('{"a":1}')).toEqual({ a: 1 });
-  });
+describe('safeParseJSONC', () => {
+  test('parses standard JSON', () => {
+    expect(safeParseJSONC('{"a":1}')).toEqual({ a: 1 })
+  })
 
-  test("parses JSON with single-line comments", () => {
-    expect(safeParseJSONC('{\n// comment\n"a":1\n}')).toEqual({ a: 1 });
-  });
+  test('parses JSON with single-line comments', () => {
+    expect(safeParseJSONC('{\n// comment\n"a":1\n}')).toEqual({ a: 1 })
+  })
 
-  test("parses JSON with block comments", () => {
-    expect(safeParseJSONC('{\n/* comment */\n"a":1\n}')).toEqual({ a: 1 });
-  });
+  test('parses JSON with block comments', () => {
+    expect(safeParseJSONC('{\n/* comment */\n"a":1\n}')).toEqual({ a: 1 })
+  })
 
-  test("parses JSON with trailing commas", () => {
-    expect(safeParseJSONC('{"a":1,}')).toEqual({ a: 1 });
-  });
+  test('parses JSON with trailing commas', () => {
+    expect(safeParseJSONC('{"a":1,}')).toEqual({ a: 1 })
+  })
 
-  test("returns null for null input", () => {
-    expect(safeParseJSONC(null as any)).toBeNull();
-  });
+  test('returns null for null input', () => {
+    expect(safeParseJSONC(null as any)).toBeNull()
+  })
 
-  test("returns null for empty string", () => {
-    expect(safeParseJSONC("")).toBeNull();
-  });
-});
+  test('returns null for empty string', () => {
+    expect(safeParseJSONC('')).toBeNull()
+  })
+})
 
 // ─── parseJSONL ─────────────────────────────────────────────────────────
 
-describe("parseJSONL", () => {
-  test("parses multiple lines", () => {
-    const result = parseJSONL('{"a":1}\n{"b":2}');
-    expect(result).toEqual([{ a: 1 }, { b: 2 }]);
-  });
+describe('parseJSONL', () => {
+  test('parses multiple lines', () => {
+    const result = parseJSONL('{"a":1}\n{"b":2}')
+    expect(result).toEqual([{ a: 1 }, { b: 2 }])
+  })
 
-  test("returns empty array for empty string", () => {
-    expect(parseJSONL("")).toEqual([]);
-  });
+  test('returns empty array for empty string', () => {
+    expect(parseJSONL('')).toEqual([])
+  })
 
-  test("parses single line", () => {
-    expect(parseJSONL('{"a":1}')).toEqual([{ a: 1 }]);
-  });
+  test('parses single line', () => {
+    expect(parseJSONL('{"a":1}')).toEqual([{ a: 1 }])
+  })
 
-  test("accepts Buffer input", () => {
-    const buf = Buffer.from('{"x":1}\n{"y":2}');
-    const result = parseJSONL(buf as any);
-    expect(result).toEqual([{ x: 1 }, { y: 2 }]);
-  });
+  test('accepts Buffer input', () => {
+    const buf = Buffer.from('{"x":1}\n{"y":2}')
+    const result = parseJSONL(buf as any)
+    expect(result).toEqual([{ x: 1 }, { y: 2 }])
+  })
 
   // NOTE: Skipping malformed-line test — Bun.JSONL.parseChunk hangs
   // indefinitely in its error-recovery loop when encountering bad lines.
-});
+})
 
 // ─── addItemToJSONCArray ────────────────────────────────────────────────
 
-describe("addItemToJSONCArray", () => {
-  test("appends to existing array", () => {
-    const result = addItemToJSONCArray('["a","b"]', "c");
-    const parsed = JSON.parse(result);
-    expect(parsed).toEqual(["a", "b", "c"]);
-  });
+describe('addItemToJSONCArray', () => {
+  test('appends to existing array', () => {
+    const result = addItemToJSONCArray('["a","b"]', 'c')
+    const parsed = JSON.parse(result)
+    expect(parsed).toEqual(['a', 'b', 'c'])
+  })
 
-  test("appends to empty array", () => {
-    const result = addItemToJSONCArray("[]", "item");
-    const parsed = JSON.parse(result);
-    expect(parsed).toEqual(["item"]);
-  });
+  test('appends to empty array', () => {
+    const result = addItemToJSONCArray('[]', 'item')
+    const parsed = JSON.parse(result)
+    expect(parsed).toEqual(['item'])
+  })
 
-  test("creates array from empty content", () => {
-    const result = addItemToJSONCArray("", "first");
-    const parsed = JSON.parse(result);
-    expect(parsed).toEqual(["first"]);
-  });
+  test('creates array from empty content', () => {
+    const result = addItemToJSONCArray('', 'first')
+    const parsed = JSON.parse(result)
+    expect(parsed).toEqual(['first'])
+  })
 
-  test("handles object item", () => {
-    const result = addItemToJSONCArray("[]", { key: "val" });
-    const parsed = JSON.parse(result);
-    expect(parsed).toEqual([{ key: "val" }]);
-  });
+  test('handles object item', () => {
+    const result = addItemToJSONCArray('[]', { key: 'val' })
+    const parsed = JSON.parse(result)
+    expect(parsed).toEqual([{ key: 'val' }])
+  })
 
-  test("wraps item in new array for non-array content", () => {
-    const result = addItemToJSONCArray('{"a":1}', "item");
-    const parsed = JSON.parse(result);
-    expect(parsed).toEqual(["item"]);
-  });
-});
+  test('wraps item in new array for non-array content', () => {
+    const result = addItemToJSONCArray('{"a":1}', 'item')
+    const parsed = JSON.parse(result)
+    expect(parsed).toEqual(['item'])
+  })
+})
diff --git a/src/utils/__tests__/lanBeacon.test.ts b/src/utils/__tests__/lanBeacon.test.ts
index 7a5f42e89..561f89cca 100644
--- a/src/utils/__tests__/lanBeacon.test.ts
+++ b/src/utils/__tests__/lanBeacon.test.ts
@@ -21,10 +21,14 @@ const { LanBeacon } = await import('../lanBeacon.js')
 
 type MockCall = [string, ...unknown[]]
 
-function getMessageHandler(): ((msg: Buffer, rinfo: { address: string; port: number }) => void) | undefined {
+function getMessageHandler():
+  | ((msg: Buffer, rinfo: { address: string; port: number }) => void)
+  | undefined {
   const calls = mockSocket.on.mock.calls as unknown as MockCall[]
   const call = calls.find(c => c[0] === 'message')
-  return call?.[1] as ((msg: Buffer, rinfo: { address: string; port: number }) => void) | undefined
+  return call?.[1] as
+    | ((msg: Buffer, rinfo: { address: string; port: number }) => void)
+    | undefined
 }
 
 describe('LanBeacon', () => {
@@ -155,7 +159,10 @@ describe('LanBeacon', () => {
     beacon.updateAnnounce({ role: 'sub' })
     beacon.start()
     // The send call should include the updated role
-    const sendCalls = mockSocket.send.mock.calls as unknown as [Buffer, ...unknown[]][]
+    const sendCalls = mockSocket.send.mock.calls as unknown as [
+      Buffer,
+      ...unknown[],
+    ][]
     const sendCall = sendCalls[0]
     if (sendCall) {
       const payload = JSON.parse(sendCall[0].toString())
diff --git a/src/utils/__tests__/lazySchema.test.ts b/src/utils/__tests__/lazySchema.test.ts
index 99029615d..99eea3a46 100644
--- a/src/utils/__tests__/lazySchema.test.ts
+++ b/src/utils/__tests__/lazySchema.test.ts
@@ -1,54 +1,54 @@
-import { describe, expect, test } from "bun:test";
-import { lazySchema } from "../lazySchema";
+import { describe, expect, test } from 'bun:test'
+import { lazySchema } from '../lazySchema'
 
-describe("lazySchema", () => {
-  test("returns a function", () => {
-    const factory = lazySchema(() => 42);
-    expect(typeof factory).toBe("function");
-  });
+describe('lazySchema', () => {
+  test('returns a function', () => {
+    const factory = lazySchema(() => 42)
+    expect(typeof factory).toBe('function')
+  })
 
-  test("calls factory on first invocation", () => {
-    let callCount = 0;
+  test('calls factory on first invocation', () => {
+    let callCount = 0
     const factory = lazySchema(() => {
-      callCount++;
-      return "result";
-    });
-    factory();
-    expect(callCount).toBe(1);
-  });
+      callCount++
+      return 'result'
+    })
+    factory()
+    expect(callCount).toBe(1)
+  })
 
-  test("returns cached result on subsequent invocations", () => {
-    const factory = lazySchema(() => ({ value: Math.random() }));
-    const first = factory();
-    const second = factory();
-    expect(first).toBe(second);
-  });
+  test('returns cached result on subsequent invocations', () => {
+    const factory = lazySchema(() => ({ value: Math.random() }))
+    const first = factory()
+    const second = factory()
+    expect(first).toBe(second)
+  })
 
-  test("factory is called only once", () => {
-    let callCount = 0;
+  test('factory is called only once', () => {
+    let callCount = 0
     const factory = lazySchema(() => {
-      callCount++;
-      return "cached";
-    });
-    factory();
-    factory();
-    factory();
-    expect(callCount).toBe(1);
-  });
+      callCount++
+      return 'cached'
+    })
+    factory()
+    factory()
+    factory()
+    expect(callCount).toBe(1)
+  })
 
-  test("works with different return types", () => {
-    const numFactory = lazySchema(() => 123);
-    expect(numFactory()).toBe(123);
+  test('works with different return types', () => {
+    const numFactory = lazySchema(() => 123)
+    expect(numFactory()).toBe(123)
 
-    const arrFactory = lazySchema(() => [1, 2, 3]);
-    expect(arrFactory()).toEqual([1, 2, 3]);
-  });
+    const arrFactory = lazySchema(() => [1, 2, 3])
+    expect(arrFactory()).toEqual([1, 2, 3])
+  })
 
-  test("each call to lazySchema returns independent cache", () => {
-    const a = lazySchema(() => ({ id: "a" }));
-    const b = lazySchema(() => ({ id: "b" }));
-    expect(a()).not.toBe(b());
-    expect(a().id).toBe("a");
-    expect(b().id).toBe("b");
-  });
-});
+  test('each call to lazySchema returns independent cache', () => {
+    const a = lazySchema(() => ({ id: 'a' }))
+    const b = lazySchema(() => ({ id: 'b' }))
+    expect(a()).not.toBe(b())
+    expect(a().id).toBe('a')
+    expect(b().id).toBe('b')
+  })
+})
diff --git a/src/utils/__tests__/markdown.test.ts b/src/utils/__tests__/markdown.test.ts
index f3ec1d6b9..86e2e40a6 100644
--- a/src/utils/__tests__/markdown.test.ts
+++ b/src/utils/__tests__/markdown.test.ts
@@ -1,58 +1,58 @@
-import { describe, expect, test } from "bun:test";
-import { padAligned } from "../markdown";
+import { describe, expect, test } from 'bun:test'
+import { padAligned } from '../markdown'
 
-describe("padAligned", () => {
-  test("left-aligns: pads with spaces on right", () => {
-    const result = padAligned("hello", 5, 10, "left");
-    expect(result).toBe("hello     ");
-    expect(result.length).toBe(10);
-  });
+describe('padAligned', () => {
+  test('left-aligns: pads with spaces on right', () => {
+    const result = padAligned('hello', 5, 10, 'left')
+    expect(result).toBe('hello     ')
+    expect(result.length).toBe(10)
+  })
 
-  test("right-aligns: pads with spaces on left", () => {
-    const result = padAligned("hello", 5, 10, "right");
-    expect(result).toBe("     hello");
-    expect(result.length).toBe(10);
-  });
+  test('right-aligns: pads with spaces on left', () => {
+    const result = padAligned('hello', 5, 10, 'right')
+    expect(result).toBe('     hello')
+    expect(result.length).toBe(10)
+  })
 
-  test("center-aligns: pads with spaces on both sides", () => {
-    const result = padAligned("hi", 2, 6, "center");
-    expect(result).toBe("  hi  ");
-    expect(result.length).toBe(6);
-  });
+  test('center-aligns: pads with spaces on both sides', () => {
+    const result = padAligned('hi', 2, 6, 'center')
+    expect(result).toBe('  hi  ')
+    expect(result.length).toBe(6)
+  })
 
-  test("no padding when displayWidth equals targetWidth", () => {
-    const result = padAligned("hello", 5, 5, "left");
-    expect(result).toBe("hello");
-  });
+  test('no padding when displayWidth equals targetWidth', () => {
+    const result = padAligned('hello', 5, 5, 'left')
+    expect(result).toBe('hello')
+  })
 
-  test("handles content wider than targetWidth", () => {
-    const result = padAligned("hello world", 11, 5, "left");
-    expect(result).toBe("hello world");
-  });
+  test('handles content wider than targetWidth', () => {
+    const result = padAligned('hello world', 11, 5, 'left')
+    expect(result).toBe('hello world')
+  })
 
-  test("null/undefined align defaults to left", () => {
-    expect(padAligned("hi", 2, 5, null)).toBe("hi   ");
-    expect(padAligned("hi", 2, 5, undefined)).toBe("hi   ");
-  });
+  test('null/undefined align defaults to left', () => {
+    expect(padAligned('hi', 2, 5, null)).toBe('hi   ')
+    expect(padAligned('hi', 2, 5, undefined)).toBe('hi   ')
+  })
 
-  test("handles empty string content", () => {
-    const result = padAligned("", 0, 5, "center");
-    expect(result).toBe("     ");
-  });
+  test('handles empty string content', () => {
+    const result = padAligned('', 0, 5, 'center')
+    expect(result).toBe('     ')
+  })
 
-  test("handles zero displayWidth", () => {
-    const result = padAligned("", 0, 3, "left");
-    expect(result).toBe("   ");
-  });
+  test('handles zero displayWidth', () => {
+    const result = padAligned('', 0, 3, 'left')
+    expect(result).toBe('   ')
+  })
 
-  test("handles zero targetWidth", () => {
-    const result = padAligned("hello", 5, 0, "left");
-    expect(result).toBe("hello");
-  });
+  test('handles zero targetWidth', () => {
+    const result = padAligned('hello', 5, 0, 'left')
+    expect(result).toBe('hello')
+  })
 
-  test("center alignment with odd padding distribution", () => {
-    const result = padAligned("hi", 2, 7, "center");
-    expect(result).toBe("  hi   ");
-    expect(result.length).toBe(7);
-  });
-});
+  test('center alignment with odd padding distribution', () => {
+    const result = padAligned('hi', 2, 7, 'center')
+    expect(result).toBe('  hi   ')
+    expect(result.length).toBe(7)
+  })
+})
diff --git a/src/utils/__tests__/memoize.test.ts b/src/utils/__tests__/memoize.test.ts
index 22ed0d15c..a0cacaf7b 100644
--- a/src/utils/__tests__/memoize.test.ts
+++ b/src/utils/__tests__/memoize.test.ts
@@ -1,240 +1,240 @@
-import { mock, describe, expect, test, beforeEach } from "bun:test";
+import { mock, describe, expect, test, beforeEach } from 'bun:test'
 
 // Mock heavy deps before importing memoize
-mock.module("src/utils/log.ts", () => ({
+mock.module('src/utils/log.ts', () => ({
   logError: () => {},
   logToFile: () => {},
-  getLogDisplayTitle: () => "",
+  getLogDisplayTitle: () => '',
   logEvent: () => {},
-}));
-mock.module("src/utils/slowOperations.ts", () => ({
+}))
+mock.module('src/utils/slowOperations.ts', () => ({
   jsonStringify: JSON.stringify,
   jsonParse: JSON.parse,
   slowLogging: { enabled: false },
   clone: (v: any) => structuredClone(v),
   cloneDeep: (v: any) => structuredClone(v),
-  callerFrame: () => "",
+  callerFrame: () => '',
   SLOW_OPERATION_THRESHOLD_MS: 100,
   writeFileSync_DEPRECATED: () => {},
-}));
+}))
 
 const { memoizeWithTTL, memoizeWithTTLAsync, memoizeWithLRU } = await import(
-  "../memoize"
-);
+  '../memoize'
+)
 
 // ─── memoizeWithTTL ────────────────────────────────────────────────────
 
-describe("memoizeWithTTL", () => {
-  test("returns cached value on second call", () => {
-    let calls = 0;
+describe('memoizeWithTTL', () => {
+  test('returns cached value on second call', () => {
+    let calls = 0
     const fn = memoizeWithTTL((x: number) => {
-      calls++;
-      return x * 2;
-    }, 60_000);
+      calls++
+      return x * 2
+    }, 60_000)
 
-    expect(fn(5)).toBe(10);
-    expect(fn(5)).toBe(10);
-    expect(calls).toBe(1);
-  });
+    expect(fn(5)).toBe(10)
+    expect(fn(5)).toBe(10)
+    expect(calls).toBe(1)
+  })
 
-  test("different args get separate cache entries", () => {
-    let calls = 0;
+  test('different args get separate cache entries', () => {
+    let calls = 0
     const fn = memoizeWithTTL((x: number) => {
-      calls++;
-      return x + 1;
-    }, 60_000);
+      calls++
+      return x + 1
+    }, 60_000)
 
-    expect(fn(1)).toBe(2);
-    expect(fn(2)).toBe(3);
-    expect(calls).toBe(2);
-  });
+    expect(fn(1)).toBe(2)
+    expect(fn(2)).toBe(3)
+    expect(calls).toBe(2)
+  })
 
-  test("cache.clear empties the cache", () => {
-    let calls = 0;
+  test('cache.clear empties the cache', () => {
+    let calls = 0
     const fn = memoizeWithTTL(() => {
-      calls++;
-      return "val";
-    }, 60_000);
+      calls++
+      return 'val'
+    }, 60_000)
 
-    fn();
-    fn.cache.clear();
-    fn();
-    expect(calls).toBe(2);
-  });
+    fn()
+    fn.cache.clear()
+    fn()
+    expect(calls).toBe(2)
+  })
 
-  test("returns stale value and triggers background refresh after TTL", async () => {
-    let calls = 0;
+  test('returns stale value and triggers background refresh after TTL', async () => {
+    let calls = 0
     const fn = memoizeWithTTL((x: number) => {
-      calls++;
-      return x * calls;
-    }, 1); // 1ms TTL
+      calls++
+      return x * calls
+    }, 1) // 1ms TTL
 
-    const first = fn(10);
-    expect(first).toBe(10); // calls=1, 10*1
+    const first = fn(10)
+    expect(first).toBe(10) // calls=1, 10*1
 
     // Wait for TTL to expire
-    await new Promise((r) => setTimeout(r, 10));
+    await new Promise(r => setTimeout(r, 10))
 
     // Should return stale value (10) and trigger background refresh
-    const second = fn(10);
-    expect(second).toBe(10); // stale value returned immediately
+    const second = fn(10)
+    expect(second).toBe(10) // stale value returned immediately
 
     // Wait for background refresh microtask
-    await new Promise((r) => setTimeout(r, 10));
+    await new Promise(r => setTimeout(r, 10))
 
     // Now cache should have refreshed value (calls=2 during refresh, 10*2=20)
-    const third = fn(10);
-    expect(third).toBe(20);
-  });
-});
+    const third = fn(10)
+    expect(third).toBe(20)
+  })
+})
 
 // ─── memoizeWithTTLAsync ───────────────────────────────────────────────
 
-describe("memoizeWithTTLAsync", () => {
-  test("caches async result", async () => {
-    let calls = 0;
+describe('memoizeWithTTLAsync', () => {
+  test('caches async result', async () => {
+    let calls = 0
     const fn = memoizeWithTTLAsync(async (x: number) => {
-      calls++;
-      return x * 2;
-    }, 60_000);
+      calls++
+      return x * 2
+    }, 60_000)
 
-    expect(await fn(5)).toBe(10);
-    expect(await fn(5)).toBe(10);
-    expect(calls).toBe(1);
-  });
+    expect(await fn(5)).toBe(10)
+    expect(await fn(5)).toBe(10)
+    expect(calls).toBe(1)
+  })
 
-  test("deduplicates concurrent cold-miss calls", async () => {
-    let calls = 0;
+  test('deduplicates concurrent cold-miss calls', async () => {
+    let calls = 0
     const fn = memoizeWithTTLAsync(async (x: number) => {
-      calls++;
-      await new Promise((r) => setTimeout(r, 20));
-      return x;
-    }, 60_000);
+      calls++
+      await new Promise(r => setTimeout(r, 20))
+      return x
+    }, 60_000)
 
-    const [a, b, c] = await Promise.all([fn(1), fn(1), fn(1)]);
-    expect(a).toBe(1);
-    expect(b).toBe(1);
-    expect(c).toBe(1);
-    expect(calls).toBe(1);
-  });
+    const [a, b, c] = await Promise.all([fn(1), fn(1), fn(1)])
+    expect(a).toBe(1)
+    expect(b).toBe(1)
+    expect(c).toBe(1)
+    expect(calls).toBe(1)
+  })
 
-  test("cache.clear forces re-computation", async () => {
-    let calls = 0;
+  test('cache.clear forces re-computation', async () => {
+    let calls = 0
     const fn = memoizeWithTTLAsync(async () => {
-      calls++;
-      return "v";
-    }, 60_000);
+      calls++
+      return 'v'
+    }, 60_000)
 
-    await fn();
-    fn.cache.clear();
-    await fn();
-    expect(calls).toBe(2);
-  });
+    await fn()
+    fn.cache.clear()
+    await fn()
+    expect(calls).toBe(2)
+  })
 
-  test("returns stale value on TTL expiry", async () => {
-    let calls = 0;
+  test('returns stale value on TTL expiry', async () => {
+    let calls = 0
     const fn = memoizeWithTTLAsync(async () => {
-      calls++;
-      return calls;
-    }, 1); // 1ms TTL
+      calls++
+      return calls
+    }, 1) // 1ms TTL
 
-    const first = await fn();
-    expect(first).toBe(1);
+    const first = await fn()
+    expect(first).toBe(1)
 
-    await new Promise((r) => setTimeout(r, 10));
+    await new Promise(r => setTimeout(r, 10))
 
     // Should return stale value (1) immediately
-    const second = await fn();
-    expect(second).toBe(1);
-  });
-});
+    const second = await fn()
+    expect(second).toBe(1)
+  })
+})
 
 // ─── memoizeWithLRU ────────────────────────────────────────────────────
 
-describe("memoizeWithLRU", () => {
-  test("caches results by key", () => {
-    let calls = 0;
+describe('memoizeWithLRU', () => {
+  test('caches results by key', () => {
+    let calls = 0
     const fn = memoizeWithLRU(
       (x: number) => {
-        calls++;
-        return x * 2;
+        calls++
+        return x * 2
       },
-      (x) => String(x),
-      10
-    );
+      x => String(x),
+      10,
+    )
 
-    expect(fn(5)).toBe(10);
-    expect(fn(5)).toBe(10);
-    expect(calls).toBe(1);
-  });
+    expect(fn(5)).toBe(10)
+    expect(fn(5)).toBe(10)
+    expect(calls).toBe(1)
+  })
 
-  test("evicts least recently used when max reached", () => {
-    let calls = 0;
+  test('evicts least recently used when max reached', () => {
+    let calls = 0
     const fn = memoizeWithLRU(
       (x: number) => {
-        calls++;
-        return x;
+        calls++
+        return x
       },
-      (x) => String(x),
-      3
-    );
+      x => String(x),
+      3,
+    )
 
-    fn(1);
-    fn(2);
-    fn(3);
-    expect(calls).toBe(3);
+    fn(1)
+    fn(2)
+    fn(3)
+    expect(calls).toBe(3)
 
-    fn(4); // evicts key "1"
-    expect(fn.cache.has("1")).toBe(false);
-    expect(fn.cache.has("4")).toBe(true);
-  });
+    fn(4) // evicts key "1"
+    expect(fn.cache.has('1')).toBe(false)
+    expect(fn.cache.has('4')).toBe(true)
+  })
 
-  test("cache.size returns current size", () => {
+  test('cache.size returns current size', () => {
     const fn = memoizeWithLRU(
       (x: number) => x,
-      (x) => String(x),
-      10
-    );
+      x => String(x),
+      10,
+    )
 
-    fn(1);
-    fn(2);
-    expect(fn.cache.size()).toBe(2);
-  });
+    fn(1)
+    fn(2)
+    expect(fn.cache.size()).toBe(2)
+  })
 
-  test("cache.delete removes entry", () => {
+  test('cache.delete removes entry', () => {
     const fn = memoizeWithLRU(
       (x: number) => x,
-      (x) => String(x),
-      10
-    );
+      x => String(x),
+      10,
+    )
 
-    fn(1);
-    expect(fn.cache.has("1")).toBe(true);
-    fn.cache.delete("1");
-    expect(fn.cache.has("1")).toBe(false);
-  });
+    fn(1)
+    expect(fn.cache.has('1')).toBe(true)
+    fn.cache.delete('1')
+    expect(fn.cache.has('1')).toBe(false)
+  })
 
-  test("cache.get returns value without updating recency", () => {
+  test('cache.get returns value without updating recency', () => {
     const fn = memoizeWithLRU(
       (x: number) => x * 10,
-      (x) => String(x),
-      10
-    );
+      x => String(x),
+      10,
+    )
 
-    fn(5);
-    expect(fn.cache.get("5")).toBe(50);
-  });
+    fn(5)
+    expect(fn.cache.get('5')).toBe(50)
+  })
 
-  test("cache.clear empties everything", () => {
+  test('cache.clear empties everything', () => {
     const fn = memoizeWithLRU(
       (x: number) => x,
-      (x) => String(x),
-      10
-    );
+      x => String(x),
+      10,
+    )
 
-    fn(1);
-    fn(2);
-    fn.cache.clear();
-    expect(fn.cache.size()).toBe(0);
-  });
-});
+    fn(1)
+    fn(2)
+    fn.cache.clear()
+    expect(fn.cache.size()).toBe(0)
+  })
+})
diff --git a/src/utils/__tests__/messages.test.ts b/src/utils/__tests__/messages.test.ts
index 31d2eb55b..142262172 100644
--- a/src/utils/__tests__/messages.test.ts
+++ b/src/utils/__tests__/messages.test.ts
@@ -1,4 +1,4 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from 'bun:test'
 import {
   deriveShortMessageId,
   INTERRUPT_MESSAGE,
@@ -27,483 +27,488 @@ import {
   AUTO_REJECT_MESSAGE,
   DONT_ASK_REJECT_MESSAGE,
   SYNTHETIC_MODEL,
-} from "../messages";
-import type { Message, AssistantMessage, UserMessage } from "../../types/message";
+} from '../messages'
+import type {
+  Message,
+  AssistantMessage,
+  UserMessage,
+} from '../../types/message'
 
 // ─── Helpers ─────────────────────────────────────────────────────────────
 
 function makeAssistantMsg(
-  contentBlocks: Array<{ type: string; text?: string; [key: string]: any }>
+  contentBlocks: Array<{ type: string; text?: string; [key: string]: any }>,
 ): AssistantMessage {
   return createAssistantMessage({
     content: contentBlocks as any,
-  });
+  })
 }
 
 function makeUserMsg(text: string): UserMessage {
-  return createUserMessage({ content: text });
+  return createUserMessage({ content: text })
 }
 
 // ─── deriveShortMessageId ───────────────────────────────────────────────
 
-describe("deriveShortMessageId", () => {
-  test("returns 6-char string", () => {
-    const id = deriveShortMessageId("550e8400-e29b-41d4-a716-446655440000");
-    expect(id).toHaveLength(6);
-  });
+describe('deriveShortMessageId', () => {
+  test('returns 6-char string', () => {
+    const id = deriveShortMessageId('550e8400-e29b-41d4-a716-446655440000')
+    expect(id).toHaveLength(6)
+  })
 
-  test("is deterministic for same input", () => {
-    const uuid = "a0b1c2d3-e4f5-6789-abcd-ef0123456789";
-    expect(deriveShortMessageId(uuid)).toBe(deriveShortMessageId(uuid));
-  });
+  test('is deterministic for same input', () => {
+    const uuid = 'a0b1c2d3-e4f5-6789-abcd-ef0123456789'
+    expect(deriveShortMessageId(uuid)).toBe(deriveShortMessageId(uuid))
+  })
 
-  test("produces different IDs for different UUIDs", () => {
-    const id1 = deriveShortMessageId("00000000-0000-0000-0000-000000000001");
-    const id2 = deriveShortMessageId("ffffffff-ffff-ffff-ffff-ffffffffffff");
-    expect(id1).not.toBe(id2);
-  });
-});
+  test('produces different IDs for different UUIDs', () => {
+    const id1 = deriveShortMessageId('00000000-0000-0000-0000-000000000001')
+    const id2 = deriveShortMessageId('ffffffff-ffff-ffff-ffff-ffffffffffff')
+    expect(id1).not.toBe(id2)
+  })
+})
 
 // ─── Constants ──────────────────────────────────────────────────────────
 
-describe("message constants", () => {
-  test("SYNTHETIC_MESSAGES contains expected messages", () => {
-    expect(SYNTHETIC_MESSAGES.has(INTERRUPT_MESSAGE)).toBe(true);
-    expect(SYNTHETIC_MESSAGES.has(INTERRUPT_MESSAGE_FOR_TOOL_USE)).toBe(true);
-    expect(SYNTHETIC_MESSAGES.has(CANCEL_MESSAGE)).toBe(true);
-    expect(SYNTHETIC_MESSAGES.has(REJECT_MESSAGE)).toBe(true);
-    expect(SYNTHETIC_MESSAGES.has(NO_RESPONSE_REQUESTED)).toBe(true);
-  });
+describe('message constants', () => {
+  test('SYNTHETIC_MESSAGES contains expected messages', () => {
+    expect(SYNTHETIC_MESSAGES.has(INTERRUPT_MESSAGE)).toBe(true)
+    expect(SYNTHETIC_MESSAGES.has(INTERRUPT_MESSAGE_FOR_TOOL_USE)).toBe(true)
+    expect(SYNTHETIC_MESSAGES.has(CANCEL_MESSAGE)).toBe(true)
+    expect(SYNTHETIC_MESSAGES.has(REJECT_MESSAGE)).toBe(true)
+    expect(SYNTHETIC_MESSAGES.has(NO_RESPONSE_REQUESTED)).toBe(true)
+  })
 
-  test("SYNTHETIC_MODEL is <synthetic>", () => {
-    expect(SYNTHETIC_MODEL).toBe("<synthetic>");
-  });
-});
+  test('SYNTHETIC_MODEL is <synthetic>', () => {
+    expect(SYNTHETIC_MODEL).toBe('<synthetic>')
+  })
+})
 
 // ─── Message factories ──────────────────────────────────────────────────
 
-describe("createAssistantMessage", () => {
-  test("creates assistant message with string content", () => {
-    const msg = createAssistantMessage({ content: "hello" });
-    expect(msg.type).toBe("assistant");
-    expect(msg.message!.role).toBe("assistant");
-    expect(msg.message!.content![0] as any).toBeTruthy();
-    expect((msg.message!.content![0] as any).text).toBe("hello");
-  });
+describe('createAssistantMessage', () => {
+  test('creates assistant message with string content', () => {
+    const msg = createAssistantMessage({ content: 'hello' })
+    expect(msg.type).toBe('assistant')
+    expect(msg.message!.role).toBe('assistant')
+    expect(msg.message!.content![0] as any).toBeTruthy()
+    expect((msg.message!.content![0] as any).text).toBe('hello')
+  })
 
-  test("creates assistant message with content blocks", () => {
-    const blocks = [{ type: "text" as const, text: "hello" }];
-    const msg = createAssistantMessage({ content: blocks as any });
-    expect(msg.type).toBe("assistant");
-    expect(msg.message.content).toHaveLength(1);
-  });
+  test('creates assistant message with content blocks', () => {
+    const blocks = [{ type: 'text' as const, text: 'hello' }]
+    const msg = createAssistantMessage({ content: blocks as any })
+    expect(msg.type).toBe('assistant')
+    expect(msg.message.content).toHaveLength(1)
+  })
 
-  test("generates unique uuid per call", () => {
-    const msg1 = createAssistantMessage({ content: "a" });
-    const msg2 = createAssistantMessage({ content: "b" });
-    expect(msg1.uuid).not.toBe(msg2.uuid);
-  });
+  test('generates unique uuid per call', () => {
+    const msg1 = createAssistantMessage({ content: 'a' })
+    const msg2 = createAssistantMessage({ content: 'b' })
+    expect(msg1.uuid).not.toBe(msg2.uuid)
+  })
 
-  test("has isApiErrorMessage false", () => {
-    const msg = createAssistantMessage({ content: "test" });
-    expect(msg.isApiErrorMessage).toBe(false);
-  });
-});
+  test('has isApiErrorMessage false', () => {
+    const msg = createAssistantMessage({ content: 'test' })
+    expect(msg.isApiErrorMessage).toBe(false)
+  })
+})
 
-describe("createAssistantAPIErrorMessage", () => {
-  test("sets isApiErrorMessage to true", () => {
-    const msg = createAssistantAPIErrorMessage({ content: "error" });
-    expect(msg.isApiErrorMessage).toBe(true);
-  });
+describe('createAssistantAPIErrorMessage', () => {
+  test('sets isApiErrorMessage to true', () => {
+    const msg = createAssistantAPIErrorMessage({ content: 'error' })
+    expect(msg.isApiErrorMessage).toBe(true)
+  })
 
-  test("includes error details", () => {
+  test('includes error details', () => {
     const msg = createAssistantAPIErrorMessage({
-      content: "fail",
-      errorDetails: "rate limited",
-    });
-    expect(msg.errorDetails).toBe("rate limited");
-  });
-});
+      content: 'fail',
+      errorDetails: 'rate limited',
+    })
+    expect(msg.errorDetails).toBe('rate limited')
+  })
+})
 
-describe("createUserMessage", () => {
-  test("creates user message with string content", () => {
-    const msg = createUserMessage({ content: "hello" });
-    expect(msg.type).toBe("user");
-    expect(msg.message.role).toBe("user");
-    expect(msg.message.content).toBe("hello");
-  });
+describe('createUserMessage', () => {
+  test('creates user message with string content', () => {
+    const msg = createUserMessage({ content: 'hello' })
+    expect(msg.type).toBe('user')
+    expect(msg.message.role).toBe('user')
+    expect(msg.message.content).toBe('hello')
+  })
 
-  test("generates unique uuid", () => {
-    const msg1 = createUserMessage({ content: "a" });
-    const msg2 = createUserMessage({ content: "b" });
-    expect(msg1.uuid).not.toBe(msg2.uuid);
-  });
+  test('generates unique uuid', () => {
+    const msg1 = createUserMessage({ content: 'a' })
+    const msg2 = createUserMessage({ content: 'b' })
+    expect(msg1.uuid).not.toBe(msg2.uuid)
+  })
 
-  test("uses provided uuid when given", () => {
+  test('uses provided uuid when given', () => {
     const msg = createUserMessage({
-      content: "test",
-      uuid: "custom-uuid-1234-5678-abcd-ef0123456789",
-    });
-    expect(msg.uuid).toBe("custom-uuid-1234-5678-abcd-ef0123456789");
-  });
+      content: 'test',
+      uuid: 'custom-uuid-1234-5678-abcd-ef0123456789',
+    })
+    expect(msg.uuid).toBe('custom-uuid-1234-5678-abcd-ef0123456789')
+  })
 
-  test("sets isMeta flag", () => {
-    const msg = createUserMessage({ content: "test", isMeta: true });
-    expect(msg.isMeta).toBe(true);
-  });
-});
+  test('sets isMeta flag', () => {
+    const msg = createUserMessage({ content: 'test', isMeta: true })
+    expect(msg.isMeta).toBe(true)
+  })
+})
 
-describe("createUserInterruptionMessage", () => {
-  test("creates interrupt message without tool use", () => {
-    const msg = createUserInterruptionMessage({});
-    expect(msg.type).toBe("user");
-    expect((msg.message.content as any)[0].text).toBe(INTERRUPT_MESSAGE);
-  });
+describe('createUserInterruptionMessage', () => {
+  test('creates interrupt message without tool use', () => {
+    const msg = createUserInterruptionMessage({})
+    expect(msg.type).toBe('user')
+    expect((msg.message.content as any)[0].text).toBe(INTERRUPT_MESSAGE)
+  })
 
-  test("creates interrupt message with tool use", () => {
-    const msg = createUserInterruptionMessage({ toolUse: true });
+  test('creates interrupt message with tool use', () => {
+    const msg = createUserInterruptionMessage({ toolUse: true })
     expect((msg.message.content as any)[0].text).toBe(
-      INTERRUPT_MESSAGE_FOR_TOOL_USE
-    );
-  });
-});
+      INTERRUPT_MESSAGE_FOR_TOOL_USE,
+    )
+  })
+})
 
-describe("prepareUserContent", () => {
-  test("returns string when no preceding blocks", () => {
+describe('prepareUserContent', () => {
+  test('returns string when no preceding blocks', () => {
     const result = prepareUserContent({
-      inputString: "hello",
+      inputString: 'hello',
       precedingInputBlocks: [],
-    });
-    expect(result).toBe("hello");
-  });
+    })
+    expect(result).toBe('hello')
+  })
 
-  test("returns array when preceding blocks exist", () => {
-    const blocks = [{ type: "image" as const, source: {} } as any];
+  test('returns array when preceding blocks exist', () => {
+    const blocks = [{ type: 'image' as const, source: {} } as any]
     const result = prepareUserContent({
-      inputString: "describe this",
+      inputString: 'describe this',
       precedingInputBlocks: blocks,
-    });
-    expect(Array.isArray(result)).toBe(true);
-    expect((result as any[]).length).toBe(2);
-    expect((result as any[])[1].text).toBe("describe this");
-  });
-});
+    })
+    expect(Array.isArray(result)).toBe(true)
+    expect((result as any[]).length).toBe(2)
+    expect((result as any[])[1].text).toBe('describe this')
+  })
+})
 
-describe("createToolResultStopMessage", () => {
-  test("creates tool result with error flag", () => {
-    const result = createToolResultStopMessage("tool-123");
-    expect(result.type).toBe("tool_result");
-    expect(result.is_error).toBe(true);
-    expect(result.tool_use_id).toBe("tool-123");
-    expect(result.content).toBe(CANCEL_MESSAGE);
-  });
-});
+describe('createToolResultStopMessage', () => {
+  test('creates tool result with error flag', () => {
+    const result = createToolResultStopMessage('tool-123')
+    expect(result.type).toBe('tool_result')
+    expect(result.is_error).toBe(true)
+    expect(result.tool_use_id).toBe('tool-123')
+    expect(result.content).toBe(CANCEL_MESSAGE)
+  })
+})
 
 // ─── isSyntheticMessage ─────────────────────────────────────────────────
 
-describe("isSyntheticMessage", () => {
-  test("identifies interrupt message as synthetic", () => {
+describe('isSyntheticMessage', () => {
+  test('identifies interrupt message as synthetic', () => {
     const msg: any = {
-      type: "user",
-      message: { content: [{ type: "text", text: INTERRUPT_MESSAGE }] },
-    };
-    expect(isSyntheticMessage(msg)).toBe(true);
-  });
+      type: 'user',
+      message: { content: [{ type: 'text', text: INTERRUPT_MESSAGE }] },
+    }
+    expect(isSyntheticMessage(msg)).toBe(true)
+  })
 
-  test("identifies cancel message as synthetic", () => {
+  test('identifies cancel message as synthetic', () => {
     const msg: any = {
-      type: "user",
-      message: { content: [{ type: "text", text: CANCEL_MESSAGE }] },
-    };
-    expect(isSyntheticMessage(msg)).toBe(true);
-  });
+      type: 'user',
+      message: { content: [{ type: 'text', text: CANCEL_MESSAGE }] },
+    }
+    expect(isSyntheticMessage(msg)).toBe(true)
+  })
 
-  test("returns false for normal user message", () => {
+  test('returns false for normal user message', () => {
     const msg: any = {
-      type: "user",
-      message: { content: [{ type: "text", text: "hello" }] },
-    };
-    expect(isSyntheticMessage(msg)).toBe(false);
-  });
+      type: 'user',
+      message: { content: [{ type: 'text', text: 'hello' }] },
+    }
+    expect(isSyntheticMessage(msg)).toBe(false)
+  })
 
-  test("returns false for progress message", () => {
+  test('returns false for progress message', () => {
     const msg: any = {
-      type: "progress",
-      message: { content: [{ type: "text", text: INTERRUPT_MESSAGE }] },
-    };
-    expect(isSyntheticMessage(msg)).toBe(false);
-  });
+      type: 'progress',
+      message: { content: [{ type: 'text', text: INTERRUPT_MESSAGE }] },
+    }
+    expect(isSyntheticMessage(msg)).toBe(false)
+  })
 
-  test("returns false for string content", () => {
+  test('returns false for string content', () => {
     const msg: any = {
-      type: "user",
+      type: 'user',
       message: { content: INTERRUPT_MESSAGE },
-    };
-    expect(isSyntheticMessage(msg)).toBe(false);
-  });
-});
+    }
+    expect(isSyntheticMessage(msg)).toBe(false)
+  })
+})
 
 // ─── getLastAssistantMessage ────────────────────────────────────────────
 
-describe("getLastAssistantMessage", () => {
-  test("returns last assistant message", () => {
-    const a1 = makeAssistantMsg([{ type: "text", text: "first" }]);
-    const u = makeUserMsg("mid");
-    const a2 = makeAssistantMsg([{ type: "text", text: "last" }]);
-    const result = getLastAssistantMessage([a1, u, a2]);
-    expect(result).toBe(a2);
-  });
+describe('getLastAssistantMessage', () => {
+  test('returns last assistant message', () => {
+    const a1 = makeAssistantMsg([{ type: 'text', text: 'first' }])
+    const u = makeUserMsg('mid')
+    const a2 = makeAssistantMsg([{ type: 'text', text: 'last' }])
+    const result = getLastAssistantMessage([a1, u, a2])
+    expect(result).toBe(a2)
+  })
 
-  test("returns undefined for empty array", () => {
-    expect(getLastAssistantMessage([])).toBeUndefined();
-  });
+  test('returns undefined for empty array', () => {
+    expect(getLastAssistantMessage([])).toBeUndefined()
+  })
 
-  test("returns undefined when no assistant messages", () => {
-    const u = makeUserMsg("hello");
-    expect(getLastAssistantMessage([u])).toBeUndefined();
-  });
-});
+  test('returns undefined when no assistant messages', () => {
+    const u = makeUserMsg('hello')
+    expect(getLastAssistantMessage([u])).toBeUndefined()
+  })
+})
 
 // ─── hasToolCallsInLastAssistantTurn ────────────────────────────────────
 
-describe("hasToolCallsInLastAssistantTurn", () => {
-  test("returns true when last assistant has tool_use", () => {
+describe('hasToolCallsInLastAssistantTurn', () => {
+  test('returns true when last assistant has tool_use', () => {
     const msg = makeAssistantMsg([
-      { type: "text", text: "let me check" },
-      { type: "tool_use", id: "t1", name: "Bash", input: {} },
-    ]);
-    expect(hasToolCallsInLastAssistantTurn([msg])).toBe(true);
-  });
+      { type: 'text', text: 'let me check' },
+      { type: 'tool_use', id: 't1', name: 'Bash', input: {} },
+    ])
+    expect(hasToolCallsInLastAssistantTurn([msg])).toBe(true)
+  })
 
-  test("returns false when last assistant has only text", () => {
-    const msg = makeAssistantMsg([{ type: "text", text: "done" }]);
-    expect(hasToolCallsInLastAssistantTurn([msg])).toBe(false);
-  });
+  test('returns false when last assistant has only text', () => {
+    const msg = makeAssistantMsg([{ type: 'text', text: 'done' }])
+    expect(hasToolCallsInLastAssistantTurn([msg])).toBe(false)
+  })
 
-  test("returns false for empty messages", () => {
-    expect(hasToolCallsInLastAssistantTurn([])).toBe(false);
-  });
-});
+  test('returns false for empty messages', () => {
+    expect(hasToolCallsInLastAssistantTurn([])).toBe(false)
+  })
+})
 
 // ─── extractTag ─────────────────────────────────────────────────────────
 
-describe("extractTag", () => {
-  test("extracts simple tag content", () => {
-    expect(extractTag("<foo>bar</foo>", "foo")).toBe("bar");
-  });
+describe('extractTag', () => {
+  test('extracts simple tag content', () => {
+    expect(extractTag('<foo>bar</foo>', 'foo')).toBe('bar')
+  })
 
-  test("extracts tag with attributes", () => {
-    expect(extractTag('<foo class="a">bar</foo>', "foo")).toBe("bar");
-  });
+  test('extracts tag with attributes', () => {
+    expect(extractTag('<foo class="a">bar</foo>', 'foo')).toBe('bar')
+  })
 
-  test("handles multiline content", () => {
-    expect(extractTag("<foo>\nline1\nline2\n</foo>", "foo")).toBe(
-      "\nline1\nline2\n"
-    );
-  });
+  test('handles multiline content', () => {
+    expect(extractTag('<foo>\nline1\nline2\n</foo>', 'foo')).toBe(
+      '\nline1\nline2\n',
+    )
+  })
 
-  test("returns null for missing tag", () => {
-    expect(extractTag("<foo>bar</foo>", "baz")).toBeNull();
-  });
+  test('returns null for missing tag', () => {
+    expect(extractTag('<foo>bar</foo>', 'baz')).toBeNull()
+  })
 
-  test("returns null for empty html", () => {
-    expect(extractTag("", "foo")).toBeNull();
-  });
+  test('returns null for empty html', () => {
+    expect(extractTag('', 'foo')).toBeNull()
+  })
 
-  test("returns null for empty tagName", () => {
-    expect(extractTag("<foo>bar</foo>", "")).toBeNull();
-  });
+  test('returns null for empty tagName', () => {
+    expect(extractTag('<foo>bar</foo>', '')).toBeNull()
+  })
 
-  test("is case-insensitive", () => {
-    expect(extractTag("<FOO>bar</FOO>", "foo")).toBe("bar");
-  });
-});
+  test('is case-insensitive', () => {
+    expect(extractTag('<FOO>bar</FOO>', 'foo')).toBe('bar')
+  })
+})
 
 // ─── isNotEmptyMessage ──────────────────────────────────────────────────
 
-describe("isNotEmptyMessage", () => {
-  test("returns true for message with text content", () => {
+describe('isNotEmptyMessage', () => {
+  test('returns true for message with text content', () => {
     const msg: any = {
-      type: "user",
-      message: { content: "hello" },
-    };
-    expect(isNotEmptyMessage(msg)).toBe(true);
-  });
+      type: 'user',
+      message: { content: 'hello' },
+    }
+    expect(isNotEmptyMessage(msg)).toBe(true)
+  })
 
-  test("returns false for empty string content", () => {
+  test('returns false for empty string content', () => {
     const msg: any = {
-      type: "user",
-      message: { content: "  " },
-    };
-    expect(isNotEmptyMessage(msg)).toBe(false);
-  });
+      type: 'user',
+      message: { content: '  ' },
+    }
+    expect(isNotEmptyMessage(msg)).toBe(false)
+  })
 
-  test("returns false for empty content array", () => {
+  test('returns false for empty content array', () => {
     const msg: any = {
-      type: "user",
+      type: 'user',
       message: { content: [] },
-    };
-    expect(isNotEmptyMessage(msg)).toBe(false);
-  });
+    }
+    expect(isNotEmptyMessage(msg)).toBe(false)
+  })
 
-  test("returns true for progress message", () => {
+  test('returns true for progress message', () => {
     const msg: any = {
-      type: "progress",
+      type: 'progress',
       message: { content: [] },
-    };
-    expect(isNotEmptyMessage(msg)).toBe(true);
-  });
+    }
+    expect(isNotEmptyMessage(msg)).toBe(true)
+  })
 
-  test("returns true for multi-block content", () => {
+  test('returns true for multi-block content', () => {
     const msg: any = {
-      type: "user",
+      type: 'user',
       message: {
         content: [
-          { type: "text", text: "a" },
-          { type: "text", text: "b" },
+          { type: 'text', text: 'a' },
+          { type: 'text', text: 'b' },
         ],
       },
-    };
-    expect(isNotEmptyMessage(msg)).toBe(true);
-  });
+    }
+    expect(isNotEmptyMessage(msg)).toBe(true)
+  })
 
-  test("returns true for non-text block", () => {
+  test('returns true for non-text block', () => {
     const msg: any = {
-      type: "user",
+      type: 'user',
       message: {
-        content: [{ type: "tool_use", id: "t1", name: "Bash", input: {} }],
+        content: [{ type: 'tool_use', id: 't1', name: 'Bash', input: {} }],
       },
-    };
-    expect(isNotEmptyMessage(msg)).toBe(true);
-  });
+    }
+    expect(isNotEmptyMessage(msg)).toBe(true)
+  })
 
-  test("returns false for whitespace-only text block in content array", () => {
+  test('returns false for whitespace-only text block in content array', () => {
     const msg: any = {
-      type: "user",
+      type: 'user',
       message: {
-        content: [{ type: "text", text: "  " }],
+        content: [{ type: 'text', text: '  ' }],
       },
-    };
-    expect(isNotEmptyMessage(msg)).toBe(false);
-  });
-});
+    }
+    expect(isNotEmptyMessage(msg)).toBe(false)
+  })
+})
 
 // ─── deriveUUID ─────────────────────────────────────────────────────────
 
-describe("deriveUUID", () => {
-  test("produces deterministic output", () => {
-    const parent = "550e8400-e29b-41d4-a716-446655440000" as any;
-    expect(deriveUUID(parent, 0)).toBe(deriveUUID(parent, 0));
-  });
+describe('deriveUUID', () => {
+  test('produces deterministic output', () => {
+    const parent = '550e8400-e29b-41d4-a716-446655440000' as any
+    expect(deriveUUID(parent, 0)).toBe(deriveUUID(parent, 0))
+  })
 
-  test("produces different output for different indices", () => {
-    const parent = "550e8400-e29b-41d4-a716-446655440000" as any;
-    expect(deriveUUID(parent, 0)).not.toBe(deriveUUID(parent, 1));
-  });
+  test('produces different output for different indices', () => {
+    const parent = '550e8400-e29b-41d4-a716-446655440000' as any
+    expect(deriveUUID(parent, 0)).not.toBe(deriveUUID(parent, 1))
+  })
 
-  test("preserves UUID-like length", () => {
-    const parent = "550e8400-e29b-41d4-a716-446655440000" as any;
-    const derived = deriveUUID(parent, 5);
-    expect(derived.length).toBe(parent.length);
-  });
-});
+  test('preserves UUID-like length', () => {
+    const parent = '550e8400-e29b-41d4-a716-446655440000' as any
+    const derived = deriveUUID(parent, 5)
+    expect(derived.length).toBe(parent.length)
+  })
+})
 
 // ─── isClassifierDenial ─────────────────────────────────────────────────
 
-describe("isClassifierDenial", () => {
-  test("returns true for classifier denial prefix", () => {
+describe('isClassifierDenial', () => {
+  test('returns true for classifier denial prefix', () => {
     expect(
       isClassifierDenial(
-        "Permission for this action has been denied. Reason: unsafe"
-      )
-    ).toBe(true);
-  });
+        'Permission for this action has been denied. Reason: unsafe',
+      ),
+    ).toBe(true)
+  })
 
-  test("returns false for normal content", () => {
-    expect(isClassifierDenial("hello world")).toBe(false);
-  });
-});
+  test('returns false for normal content', () => {
+    expect(isClassifierDenial('hello world')).toBe(false)
+  })
+})
 
 // ─── Message builder functions ──────────────────────────────────────────
 
-describe("AUTO_REJECT_MESSAGE", () => {
-  test("includes tool name", () => {
-    const msg = AUTO_REJECT_MESSAGE("Bash");
-    expect(msg).toContain("Bash");
-    expect(msg).toContain("denied");
-  });
-});
+describe('AUTO_REJECT_MESSAGE', () => {
+  test('includes tool name', () => {
+    const msg = AUTO_REJECT_MESSAGE('Bash')
+    expect(msg).toContain('Bash')
+    expect(msg).toContain('denied')
+  })
+})
 
-describe("DONT_ASK_REJECT_MESSAGE", () => {
-  test("includes tool name and dont ask mode", () => {
-    const msg = DONT_ASK_REJECT_MESSAGE("Write");
-    expect(msg).toContain("Write");
-    expect(msg).toContain("don't ask mode");
-  });
-});
+describe('DONT_ASK_REJECT_MESSAGE', () => {
+  test('includes tool name and dont ask mode', () => {
+    const msg = DONT_ASK_REJECT_MESSAGE('Write')
+    expect(msg).toContain('Write')
+    expect(msg).toContain("don't ask mode")
+  })
+})
 
-describe("buildYoloRejectionMessage", () => {
-  test("includes reason", () => {
-    const msg = buildYoloRejectionMessage("potentially destructive");
-    expect(msg).toContain("potentially destructive");
-    expect(msg).toContain("denied");
-  });
-});
+describe('buildYoloRejectionMessage', () => {
+  test('includes reason', () => {
+    const msg = buildYoloRejectionMessage('potentially destructive')
+    expect(msg).toContain('potentially destructive')
+    expect(msg).toContain('denied')
+  })
+})
 
-describe("buildClassifierUnavailableMessage", () => {
-  test("includes tool name and model", () => {
-    const msg = buildClassifierUnavailableMessage("Bash", "classifier-v1");
-    expect(msg).toContain("Bash");
-    expect(msg).toContain("classifier-v1");
-    expect(msg).toContain("unavailable");
-  });
-});
+describe('buildClassifierUnavailableMessage', () => {
+  test('includes tool name and model', () => {
+    const msg = buildClassifierUnavailableMessage('Bash', 'classifier-v1')
+    expect(msg).toContain('Bash')
+    expect(msg).toContain('classifier-v1')
+    expect(msg).toContain('unavailable')
+  })
+})
 
 // ─── normalizeMessages ──────────────────────────────────────────────────
 
-describe("normalizeMessages", () => {
-  test("splits multi-block assistant message into individual messages", () => {
+describe('normalizeMessages', () => {
+  test('splits multi-block assistant message into individual messages', () => {
     const msg = makeAssistantMsg([
-      { type: "text", text: "first" },
-      { type: "text", text: "second" },
-    ]);
-    const normalized = normalizeMessages([msg]);
-    expect(normalized.length).toBe(2);
+      { type: 'text', text: 'first' },
+      { type: 'text', text: 'second' },
+    ])
+    const normalized = normalizeMessages([msg])
+    expect(normalized.length).toBe(2)
     // Verify each split message contains only one content block
-    expect(normalized[0].message.content).toHaveLength(1);
-    expect((normalized[0].message.content as any[])[0].text).toBe("first");
-    expect(normalized[1].message.content).toHaveLength(1);
-    expect((normalized[1].message.content as any[])[0].text).toBe("second");
-  });
+    expect(normalized[0].message.content).toHaveLength(1)
+    expect((normalized[0].message.content as any[])[0].text).toBe('first')
+    expect(normalized[1].message.content).toHaveLength(1)
+    expect((normalized[1].message.content as any[])[0].text).toBe('second')
+  })
 
-  test("handles empty array", () => {
-    const result = normalizeMessages([] as AssistantMessage[]);
-    expect(result).toEqual([]);
-  });
+  test('handles empty array', () => {
+    const result = normalizeMessages([] as AssistantMessage[])
+    expect(result).toEqual([])
+  })
 
-  test("preserves single-block message", () => {
-    const msg = makeAssistantMsg([{ type: "text", text: "hello" }]);
-    const normalized = normalizeMessages([msg]);
-    expect(normalized.length).toBe(1);
-  });
-});
+  test('preserves single-block message', () => {
+    const msg = makeAssistantMsg([{ type: 'text', text: 'hello' }])
+    const normalized = normalizeMessages([msg])
+    expect(normalized.length).toBe(1)
+  })
+})
 
-describe("normalizeMessagesForAPI", () => {
-  test("preserves Gemini thought signature metadata on tool_use blocks", () => {
+describe('normalizeMessagesForAPI', () => {
+  test('preserves Gemini thought signature metadata on tool_use blocks', () => {
     const assistant = makeAssistantMsg([
       {
-        type: "tool_use",
-        id: "tool-1",
-        name: "Bash",
-        input: { command: "pwd" },
-        _geminiThoughtSignature: "sig-123",
+        type: 'tool_use',
+        id: 'tool-1',
+        name: 'Bash',
+        input: { command: 'pwd' },
+        _geminiThoughtSignature: 'sig-123',
       },
-    ]);
+    ])
 
-    const normalized = normalizeMessagesForAPI([assistant]);
-    const block = (normalized[0] as AssistantMessage).message!.content![0] as any;
+    const normalized = normalizeMessagesForAPI([assistant])
+    const block = (normalized[0] as AssistantMessage).message!
+      .content![0] as any
 
-    expect(block.type).toBe("tool_use");
-    expect(block._geminiThoughtSignature).toBe("sig-123");
-  });
-});
+    expect(block.type).toBe('tool_use')
+    expect(block._geminiThoughtSignature).toBe('sig-123')
+  })
+})
diff --git a/src/utils/__tests__/modelCost.test.ts b/src/utils/__tests__/modelCost.test.ts
index f2606a5c6..b3b7c2ba6 100644
--- a/src/utils/__tests__/modelCost.test.ts
+++ b/src/utils/__tests__/modelCost.test.ts
@@ -1,4 +1,4 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from 'bun:test'
 
 // formatPrice and COST_TIER constants are pure data/functions from modelCost.ts
 // We test the formatting logic directly to avoid the heavy import chain.
@@ -18,63 +18,63 @@ function formatModelPricing(costs: {
   return `${formatPrice(costs.inputTokens)}/${formatPrice(costs.outputTokens)} per Mtok`
 }
 
-describe("COST_TIER constant values", () => {
+describe('COST_TIER constant values', () => {
   // These verify the documented pricing from https://platform.claude.com/docs/en/about-claude/pricing
-  test("COST_TIER_3_15: $3/$15 (Sonnet tier)", () => {
+  test('COST_TIER_3_15: $3/$15 (Sonnet tier)', () => {
     expect(formatModelPricing({ inputTokens: 3, outputTokens: 15 })).toBe(
-      "$3/$15 per Mtok",
+      '$3/$15 per Mtok',
     )
   })
 
-  test("COST_TIER_15_75: $15/$75 (Opus 4/4.1 tier)", () => {
+  test('COST_TIER_15_75: $15/$75 (Opus 4/4.1 tier)', () => {
     expect(formatModelPricing({ inputTokens: 15, outputTokens: 75 })).toBe(
-      "$15/$75 per Mtok",
+      '$15/$75 per Mtok',
     )
   })
 
-  test("COST_TIER_5_25: $5/$25 (Opus 4.5/4.6 tier)", () => {
+  test('COST_TIER_5_25: $5/$25 (Opus 4.5/4.6 tier)', () => {
     expect(formatModelPricing({ inputTokens: 5, outputTokens: 25 })).toBe(
-      "$5/$25 per Mtok",
+      '$5/$25 per Mtok',
     )
   })
 
-  test("COST_TIER_30_150: $30/$150 (Fast Opus 4.6)", () => {
+  test('COST_TIER_30_150: $30/$150 (Fast Opus 4.6)', () => {
     expect(formatModelPricing({ inputTokens: 30, outputTokens: 150 })).toBe(
-      "$30/$150 per Mtok",
+      '$30/$150 per Mtok',
     )
   })
 
-  test("COST_HAIKU_35: $0.80/$4 (Haiku 3.5)", () => {
+  test('COST_HAIKU_35: $0.80/$4 (Haiku 3.5)', () => {
     expect(formatModelPricing({ inputTokens: 0.8, outputTokens: 4 })).toBe(
-      "$0.80/$4 per Mtok",
+      '$0.80/$4 per Mtok',
     )
   })
 
-  test("COST_HAIKU_45: $1/$5 (Haiku 4.5)", () => {
+  test('COST_HAIKU_45: $1/$5 (Haiku 4.5)', () => {
     expect(formatModelPricing({ inputTokens: 1, outputTokens: 5 })).toBe(
-      "$1/$5 per Mtok",
+      '$1/$5 per Mtok',
     )
   })
 })
 
-describe("formatPrice", () => {
+describe('formatPrice', () => {
   test("formats integers without decimals: 3 → '$3'", () => {
-    expect(formatPrice(3)).toBe("$3")
+    expect(formatPrice(3)).toBe('$3')
   })
 
   test("formats floats with 2 decimals: 0.8 → '$0.80'", () => {
-    expect(formatPrice(0.8)).toBe("$0.80")
+    expect(formatPrice(0.8)).toBe('$0.80')
   })
 
   test("formats large integers: 150 → '$150'", () => {
-    expect(formatPrice(150)).toBe("$150")
+    expect(formatPrice(150)).toBe('$150')
   })
 
   test("formats 1 as integer: '$1'", () => {
-    expect(formatPrice(1)).toBe("$1")
+    expect(formatPrice(1)).toBe('$1')
   })
 
   test("formats mixed decimal: 22.5 → '$22.50'", () => {
-    expect(formatPrice(22.5)).toBe("$22.50")
+    expect(formatPrice(22.5)).toBe('$22.50')
   })
 })
diff --git a/src/utils/__tests__/notebook.test.ts b/src/utils/__tests__/notebook.test.ts
index 703747c17..f8e69c99f 100644
--- a/src/utils/__tests__/notebook.test.ts
+++ b/src/utils/__tests__/notebook.test.ts
@@ -1,170 +1,170 @@
-import { describe, expect, test } from "bun:test";
-import { parseCellId, mapNotebookCellsToToolResult } from "../notebook";
+import { describe, expect, test } from 'bun:test'
+import { parseCellId, mapNotebookCellsToToolResult } from '../notebook'
 
 // ─── parseCellId ───────────────────────────────────────────────────────
 
-describe("parseCellId", () => {
-  test("parses cell-0 to 0", () => {
-    expect(parseCellId("cell-0")).toBe(0);
-  });
+describe('parseCellId', () => {
+  test('parses cell-0 to 0', () => {
+    expect(parseCellId('cell-0')).toBe(0)
+  })
 
-  test("parses cell-5 to 5", () => {
-    expect(parseCellId("cell-5")).toBe(5);
-  });
+  test('parses cell-5 to 5', () => {
+    expect(parseCellId('cell-5')).toBe(5)
+  })
 
-  test("parses cell-100 to 100", () => {
-    expect(parseCellId("cell-100")).toBe(100);
-  });
+  test('parses cell-100 to 100', () => {
+    expect(parseCellId('cell-100')).toBe(100)
+  })
 
-  test("returns undefined for cell- (no number)", () => {
-    expect(parseCellId("cell-")).toBeUndefined();
-  });
+  test('returns undefined for cell- (no number)', () => {
+    expect(parseCellId('cell-')).toBeUndefined()
+  })
 
-  test("returns undefined for cell-abc (non-numeric)", () => {
-    expect(parseCellId("cell-abc")).toBeUndefined();
-  });
+  test('returns undefined for cell-abc (non-numeric)', () => {
+    expect(parseCellId('cell-abc')).toBeUndefined()
+  })
 
-  test("returns undefined for other-format", () => {
-    expect(parseCellId("other-format")).toBeUndefined();
-  });
+  test('returns undefined for other-format', () => {
+    expect(parseCellId('other-format')).toBeUndefined()
+  })
 
-  test("returns undefined for empty string", () => {
-    expect(parseCellId("")).toBeUndefined();
-  });
+  test('returns undefined for empty string', () => {
+    expect(parseCellId('')).toBeUndefined()
+  })
 
-  test("returns undefined for prefix-only match like cell-0-extra", () => {
+  test('returns undefined for prefix-only match like cell-0-extra', () => {
     // regex is /^cell-(\d+)$/ so trailing text should fail
-    expect(parseCellId("cell-0-extra")).toBeUndefined();
-  });
+    expect(parseCellId('cell-0-extra')).toBeUndefined()
+  })
 
-  test("returns undefined for negative numbers", () => {
-    expect(parseCellId("cell--1")).toBeUndefined();
-  });
+  test('returns undefined for negative numbers', () => {
+    expect(parseCellId('cell--1')).toBeUndefined()
+  })
 
-  test("parses leading zeros correctly", () => {
-    expect(parseCellId("cell-007")).toBe(7);
-  });
-});
+  test('parses leading zeros correctly', () => {
+    expect(parseCellId('cell-007')).toBe(7)
+  })
+})
 
 // ─── mapNotebookCellsToToolResult ──────────────────────────────────────
 
-describe("mapNotebookCellsToToolResult", () => {
-  test("returns tool result with correct tool_use_id", () => {
+describe('mapNotebookCellsToToolResult', () => {
+  test('returns tool result with correct tool_use_id', () => {
     const data = [
       {
-        cellType: "code",
+        cellType: 'code',
         source: 'print("hello")',
-        cell_id: "cell-0",
-        language: "python",
+        cell_id: 'cell-0',
+        language: 'python',
       },
-    ];
+    ]
 
-    const result = mapNotebookCellsToToolResult(data, "tool-123");
-    expect(result.tool_use_id).toBe("tool-123");
-    expect(result.type).toBe("tool_result");
-  });
+    const result = mapNotebookCellsToToolResult(data, 'tool-123')
+    expect(result.tool_use_id).toBe('tool-123')
+    expect(result.type).toBe('tool_result')
+  })
 
-  test("content array contains text blocks for cell content", () => {
+  test('content array contains text blocks for cell content', () => {
     const data = [
       {
-        cellType: "code",
+        cellType: 'code',
         source: 'x = 1',
-        cell_id: "cell-0",
-        language: "python",
+        cell_id: 'cell-0',
+        language: 'python',
       },
-    ];
+    ]
 
-    const result = mapNotebookCellsToToolResult(data, "tool-1");
-    expect(result.content).toBeInstanceOf(Array);
-    expect(result.content!.length).toBeGreaterThanOrEqual(1);
+    const result = mapNotebookCellsToToolResult(data, 'tool-1')
+    expect(result.content).toBeInstanceOf(Array)
+    expect(result.content!.length).toBeGreaterThanOrEqual(1)
 
-    const firstBlock = result.content![0] as { type: string; text: string };
-    expect(firstBlock.type).toBe("text");
-    expect(firstBlock.text).toContain('cell id="cell-0"');
-    expect(firstBlock.text).toContain("x = 1");
-  });
+    const firstBlock = result.content![0] as { type: string; text: string }
+    expect(firstBlock.type).toBe('text')
+    expect(firstBlock.text).toContain('cell id="cell-0"')
+    expect(firstBlock.text).toContain('x = 1')
+  })
 
-  test("merges adjacent text blocks from multiple cells", () => {
+  test('merges adjacent text blocks from multiple cells', () => {
     const data = [
       {
-        cellType: "code",
-        source: "a = 1",
-        cell_id: "cell-0",
-        language: "python",
+        cellType: 'code',
+        source: 'a = 1',
+        cell_id: 'cell-0',
+        language: 'python',
       },
       {
-        cellType: "code",
-        source: "b = 2",
-        cell_id: "cell-1",
-        language: "python",
+        cellType: 'code',
+        source: 'b = 2',
+        cell_id: 'cell-1',
+        language: 'python',
       },
-    ];
+    ]
 
-    const result = mapNotebookCellsToToolResult(data, "tool-2");
+    const result = mapNotebookCellsToToolResult(data, 'tool-2')
     // Two adjacent text blocks should be merged into one
     const textBlocks = (result.content as any[]).filter(
-      (b: any) => b.type === "text"
-    );
-    expect(textBlocks).toHaveLength(1);
-  });
+      (b: any) => b.type === 'text',
+    )
+    expect(textBlocks).toHaveLength(1)
+  })
 
-  test("preserves image blocks without merging", () => {
+  test('preserves image blocks without merging', () => {
     const data = [
       {
-        cellType: "code",
-        source: "plot()",
-        cell_id: "cell-0",
-        language: "python",
+        cellType: 'code',
+        source: 'plot()',
+        cell_id: 'cell-0',
+        language: 'python',
         outputs: [
           {
-            output_type: "display_data",
-            text: "",
+            output_type: 'display_data',
+            text: '',
             image: {
-              image_data: "iVBORw0KGgo=",
-              media_type: "image/png" as const,
+              image_data: 'iVBORw0KGgo=',
+              media_type: 'image/png' as const,
             },
           },
         ],
       },
       {
-        cellType: "code",
-        source: "print(1)",
-        cell_id: "cell-1",
-        language: "python",
+        cellType: 'code',
+        source: 'print(1)',
+        cell_id: 'cell-1',
+        language: 'python',
       },
-    ];
+    ]
 
-    const result = mapNotebookCellsToToolResult(data, "tool-3");
-    const types = (result.content as any[]).map((b: any) => b.type);
-    expect(types).toContain("image");
-  });
+    const result = mapNotebookCellsToToolResult(data, 'tool-3')
+    const types = (result.content as any[]).map((b: any) => b.type)
+    expect(types).toContain('image')
+  })
 
-  test("markdown cell includes cell_type metadata", () => {
+  test('markdown cell includes cell_type metadata', () => {
     const data = [
       {
-        cellType: "markdown",
-        source: "# Title",
-        cell_id: "cell-0",
+        cellType: 'markdown',
+        source: '# Title',
+        cell_id: 'cell-0',
       },
-    ];
+    ]
 
-    const result = mapNotebookCellsToToolResult(data, "tool-4");
-    const textBlock = result.content![0] as { type: string; text: string };
-    expect(textBlock.text).toContain("<cell_type>markdown</cell_type>");
-  });
+    const result = mapNotebookCellsToToolResult(data, 'tool-4')
+    const textBlock = result.content![0] as { type: string; text: string }
+    expect(textBlock.text).toContain('<cell_type>markdown</cell_type>')
+  })
 
-  test("non-python code cell includes language metadata", () => {
+  test('non-python code cell includes language metadata', () => {
     const data = [
       {
-        cellType: "code",
-        source: "val x = 1",
-        cell_id: "cell-0",
-        language: "scala",
+        cellType: 'code',
+        source: 'val x = 1',
+        cell_id: 'cell-0',
+        language: 'scala',
       },
-    ];
+    ]
 
-    const result = mapNotebookCellsToToolResult(data, "tool-5");
-    const textBlock = result.content![0] as { type: string; text: string };
-    expect(textBlock.text).toContain("<language>scala</language>");
-  });
-});
+    const result = mapNotebookCellsToToolResult(data, 'tool-5')
+    const textBlock = result.content![0] as { type: string; text: string }
+    expect(textBlock.text).toContain('<language>scala</language>')
+  })
+})
diff --git a/src/utils/__tests__/objectGroupBy.test.ts b/src/utils/__tests__/objectGroupBy.test.ts
index c0de1d420..2e6379264 100644
--- a/src/utils/__tests__/objectGroupBy.test.ts
+++ b/src/utils/__tests__/objectGroupBy.test.ts
@@ -1,55 +1,55 @@
-import { describe, expect, test } from "bun:test";
-import { objectGroupBy } from "../objectGroupBy";
+import { describe, expect, test } from 'bun:test'
+import { objectGroupBy } from '../objectGroupBy'
 
-describe("objectGroupBy", () => {
-  test("groups items by key", () => {
-    const result = objectGroupBy([1, 2, 3, 4], (n) =>
-      n % 2 === 0 ? "even" : "odd"
-    );
-    expect(result.even).toEqual([2, 4]);
-    expect(result.odd).toEqual([1, 3]);
-  });
+describe('objectGroupBy', () => {
+  test('groups items by key', () => {
+    const result = objectGroupBy([1, 2, 3, 4], n =>
+      n % 2 === 0 ? 'even' : 'odd',
+    )
+    expect(result.even).toEqual([2, 4])
+    expect(result.odd).toEqual([1, 3])
+  })
 
-  test("returns empty object for empty input", () => {
-    const result = objectGroupBy([], () => "key");
-    expect(Object.keys(result)).toHaveLength(0);
-  });
+  test('returns empty object for empty input', () => {
+    const result = objectGroupBy([], () => 'key')
+    expect(Object.keys(result)).toHaveLength(0)
+  })
 
-  test("handles single group", () => {
-    const result = objectGroupBy(["a", "b", "c"], () => "all");
-    expect(result.all).toEqual(["a", "b", "c"]);
-  });
+  test('handles single group', () => {
+    const result = objectGroupBy(['a', 'b', 'c'], () => 'all')
+    expect(result.all).toEqual(['a', 'b', 'c'])
+  })
 
-  test("passes index to keySelector", () => {
-    const result = objectGroupBy(["a", "b", "c", "d"], (_, i) =>
-      i < 2 ? "first" : "second"
-    );
-    expect(result.first).toEqual(["a", "b"]);
-    expect(result.second).toEqual(["c", "d"]);
-  });
+  test('passes index to keySelector', () => {
+    const result = objectGroupBy(['a', 'b', 'c', 'd'], (_, i) =>
+      i < 2 ? 'first' : 'second',
+    )
+    expect(result.first).toEqual(['a', 'b'])
+    expect(result.second).toEqual(['c', 'd'])
+  })
 
-  test("works with objects", () => {
+  test('works with objects', () => {
     const items = [
-      { name: "Alice", role: "admin" },
-      { name: "Bob", role: "user" },
-      { name: "Charlie", role: "admin" },
-    ];
-    const result = objectGroupBy(items, (item) => item.role);
-    expect(result.admin).toHaveLength(2);
-    expect(result.user).toHaveLength(1);
-  });
+      { name: 'Alice', role: 'admin' },
+      { name: 'Bob', role: 'user' },
+      { name: 'Charlie', role: 'admin' },
+    ]
+    const result = objectGroupBy(items, item => item.role)
+    expect(result.admin).toHaveLength(2)
+    expect(result.user).toHaveLength(1)
+  })
 
-  test("handles key function returning undefined", () => {
-    const result = objectGroupBy([1, 2, 3], () => undefined as any);
-    expect(result["undefined"]).toEqual([1, 2, 3]);
-  });
+  test('handles key function returning undefined', () => {
+    const result = objectGroupBy([1, 2, 3], () => undefined as any)
+    expect(result['undefined']).toEqual([1, 2, 3])
+  })
 
-  test("handles keys with special characters", () => {
+  test('handles keys with special characters', () => {
     const result = objectGroupBy(
-      [{ key: "a/b" }, { key: "a.b" }, { key: "a/b" }],
-      (item) => item.key
-    );
-    expect(result["a/b"]).toHaveLength(2);
-    expect(result["a.b"]).toHaveLength(1);
-  });
-});
+      [{ key: 'a/b' }, { key: 'a.b' }, { key: 'a/b' }],
+      item => item.key,
+    )
+    expect(result['a/b']).toHaveLength(2)
+    expect(result['a.b']).toHaveLength(1)
+  })
+})
diff --git a/src/utils/__tests__/path.test.ts b/src/utils/__tests__/path.test.ts
index 532cf3e88..e25e58c23 100644
--- a/src/utils/__tests__/path.test.ts
+++ b/src/utils/__tests__/path.test.ts
@@ -1,249 +1,249 @@
-import { describe, expect, test } from "bun:test";
-import { tmpdir } from "os";
-import { resolve } from "path";
+import { describe, expect, test } from 'bun:test'
+import { tmpdir } from 'os'
+import { resolve } from 'path'
 import {
   getFsImplementation,
   setFsImplementation,
   setOriginalFsImplementation,
   type FsOperations,
-} from "../fsOperations";
+} from '../fsOperations'
 import {
   containsPathTraversal,
   expandPath,
   normalizePathForConfigKey,
   toRelativePath,
   getDirectoryForPath,
-} from "../path";
+} from '../path'
 
 // ─── containsPathTraversal ──────────────────────────────────────────────
 
-describe("containsPathTraversal", () => {
-  test("detects ../ at start", () => {
-    expect(containsPathTraversal("../foo")).toBe(true);
-  });
+describe('containsPathTraversal', () => {
+  test('detects ../ at start', () => {
+    expect(containsPathTraversal('../foo')).toBe(true)
+  })
 
-  test("detects ../ in middle", () => {
-    expect(containsPathTraversal("foo/../bar")).toBe(true);
-  });
+  test('detects ../ in middle', () => {
+    expect(containsPathTraversal('foo/../bar')).toBe(true)
+  })
 
-  test("detects .. at end", () => {
-    expect(containsPathTraversal("foo/..")).toBe(true);
-  });
+  test('detects .. at end', () => {
+    expect(containsPathTraversal('foo/..')).toBe(true)
+  })
 
-  test("detects standalone ..", () => {
-    expect(containsPathTraversal("..")).toBe(true);
-  });
+  test('detects standalone ..', () => {
+    expect(containsPathTraversal('..')).toBe(true)
+  })
 
-  test("detects backslash traversal", () => {
-    expect(containsPathTraversal("foo\\..\\bar")).toBe(true);
-  });
+  test('detects backslash traversal', () => {
+    expect(containsPathTraversal('foo\\..\\bar')).toBe(true)
+  })
 
-  test("returns false for normal path", () => {
-    expect(containsPathTraversal("foo/bar/baz")).toBe(false);
-  });
+  test('returns false for normal path', () => {
+    expect(containsPathTraversal('foo/bar/baz')).toBe(false)
+  })
 
-  test("returns false for single dot", () => {
-    expect(containsPathTraversal("./foo")).toBe(false);
-  });
+  test('returns false for single dot', () => {
+    expect(containsPathTraversal('./foo')).toBe(false)
+  })
 
-  test("returns false for ... in filename", () => {
-    expect(containsPathTraversal("foo/...bar")).toBe(false);
-  });
+  test('returns false for ... in filename', () => {
+    expect(containsPathTraversal('foo/...bar')).toBe(false)
+  })
 
-  test("returns false for empty string", () => {
-    expect(containsPathTraversal("")).toBe(false);
-  });
+  test('returns false for empty string', () => {
+    expect(containsPathTraversal('')).toBe(false)
+  })
 
-  test("returns false for dotdot in filename without separator", () => {
-    expect(containsPathTraversal("foo..bar")).toBe(false);
-  });
+  test('returns false for dotdot in filename without separator', () => {
+    expect(containsPathTraversal('foo..bar')).toBe(false)
+  })
 
-  test("detects backslash traversal foo\\..\\bar", () => {
-    expect(containsPathTraversal("foo\\..\\bar")).toBe(true);
-  });
+  test('detects backslash traversal foo\\..\\bar', () => {
+    expect(containsPathTraversal('foo\\..\\bar')).toBe(true)
+  })
 
-  test("detects .. at end of absolute path", () => {
-    expect(containsPathTraversal("/path/to/..")).toBe(true);
-  });
-});
+  test('detects .. at end of absolute path', () => {
+    expect(containsPathTraversal('/path/to/..')).toBe(true)
+  })
+})
 
 // ─── expandPath ─────────────────────────────────────────────────────────
 
-describe("expandPath", () => {
-  test("expands ~/ to home directory", () => {
-    const result = expandPath("~/Documents");
-    expect(result).not.toContain("~");
-    expect(result).toContain("Documents");
-  });
+describe('expandPath', () => {
+  test('expands ~/ to home directory', () => {
+    const result = expandPath('~/Documents')
+    expect(result).not.toContain('~')
+    expect(result).toContain('Documents')
+  })
 
-  test("expands bare ~ to home directory", () => {
-    const result = expandPath("~");
-    expect(result).not.toContain("~");
+  test('expands bare ~ to home directory', () => {
+    const result = expandPath('~')
+    expect(result).not.toContain('~')
     // Should equal home directory
-    const { homedir } = require("os");
-    expect(result).toBe(homedir());
-  });
+    const { homedir } = require('os')
+    expect(result).toBe(homedir())
+  })
 
-  test("passes absolute paths through normalized", () => {
-    expect(expandPath("/usr/local/bin")).toBe("/usr/local/bin");
-  });
+  test('passes absolute paths through normalized', () => {
+    expect(expandPath('/usr/local/bin')).toBe('/usr/local/bin')
+  })
 
-  test("resolves relative path against baseDir", () => {
-    expect(expandPath("src", "/project")).toBe("/project/src");
-  });
+  test('resolves relative path against baseDir', () => {
+    expect(expandPath('src', '/project')).toBe('/project/src')
+  })
 
-  test("returns baseDir for empty string", () => {
-    expect(expandPath("", "/project")).toBe("/project");
-  });
+  test('returns baseDir for empty string', () => {
+    expect(expandPath('', '/project')).toBe('/project')
+  })
 
-  test("returns cwd-based path for empty string without baseDir", () => {
-    const result = expandPath("");
+  test('returns cwd-based path for empty string without baseDir', () => {
+    const result = expandPath('')
     // Should be a valid absolute path (cwd normalized)
-    const { isAbsolute } = require("path");
-    expect(isAbsolute(result)).toBe(true);
-  });
-});
+    const { isAbsolute } = require('path')
+    expect(isAbsolute(result)).toBe(true)
+  })
+})
 
 // ─── normalizePathForConfigKey ──────────────────────────────────────────
 
-describe("normalizePathForConfigKey", () => {
-  test("normalizes forward slashes (no change on POSIX)", () => {
-    expect(normalizePathForConfigKey("foo/bar/baz")).toBe("foo/bar/baz");
-  });
+describe('normalizePathForConfigKey', () => {
+  test('normalizes forward slashes (no change on POSIX)', () => {
+    expect(normalizePathForConfigKey('foo/bar/baz')).toBe('foo/bar/baz')
+  })
 
-  test("resolves dot segments", () => {
-    expect(normalizePathForConfigKey("foo/./bar")).toBe("foo/bar");
-  });
+  test('resolves dot segments', () => {
+    expect(normalizePathForConfigKey('foo/./bar')).toBe('foo/bar')
+  })
 
-  test("resolves double-dot segments", () => {
-    expect(normalizePathForConfigKey("foo/bar/../baz")).toBe("foo/baz");
-  });
+  test('resolves double-dot segments', () => {
+    expect(normalizePathForConfigKey('foo/bar/../baz')).toBe('foo/baz')
+  })
 
-  test("handles absolute path", () => {
-    const result = normalizePathForConfigKey("/Users/test/project");
-    expect(result).toBe("/Users/test/project");
-  });
+  test('handles absolute path', () => {
+    const result = normalizePathForConfigKey('/Users/test/project')
+    expect(result).toBe('/Users/test/project')
+  })
 
-  test("converts backslashes to forward slashes", () => {
-    const result = normalizePathForConfigKey("foo\\bar\\baz");
-    expect(result).toBe("foo/bar/baz");
-  });
+  test('converts backslashes to forward slashes', () => {
+    const result = normalizePathForConfigKey('foo\\bar\\baz')
+    expect(result).toBe('foo/bar/baz')
+  })
 
-  test("normalizes mixed separators foo/bar\\baz", () => {
-    const result = normalizePathForConfigKey("foo/bar\\baz");
-    expect(result).toBe("foo/bar/baz");
-  });
+  test('normalizes mixed separators foo/bar\\baz', () => {
+    const result = normalizePathForConfigKey('foo/bar\\baz')
+    expect(result).toBe('foo/bar/baz')
+  })
 
-  test("normalizes redundant separators foo//bar", () => {
-    const result = normalizePathForConfigKey("foo//bar");
-    expect(result).toBe("foo/bar");
-  });
-});
+  test('normalizes redundant separators foo//bar', () => {
+    const result = normalizePathForConfigKey('foo//bar')
+    expect(result).toBe('foo/bar')
+  })
+})
 
 // ─── toRelativePath ─────────────────────────────────────────────────────
 
-describe("toRelativePath", () => {
-  test("returns relative path for a child of cwd", () => {
+describe('toRelativePath', () => {
+  test('returns relative path for a child of cwd', () => {
     // Build a path that is inside the current working directory.
     // resolve() returns an absolute path, and toRelativePath should give
     // back just the final segment (or relative form without ..).
-    const abs = resolve(process.cwd(), "package.json");
-    const result = toRelativePath(abs);
-    expect(result).toBe("package.json");
-    expect(result).not.toContain("..");
-  });
+    const abs = resolve(process.cwd(), 'package.json')
+    const result = toRelativePath(abs)
+    expect(result).toBe('package.json')
+    expect(result).not.toContain('..')
+  })
 
-  test("returns absolute path when target is outside cwd", () => {
+  test('returns absolute path when target is outside cwd', () => {
     // A well-known absolute path that is always outside any typical cwd
     // (any absolute path that doesn't start with process.cwd() will work)
-    const cwd = process.cwd();
+    const cwd = process.cwd()
     // Build a path guaranteed to be outside cwd by going to the root's parent
     // of cwd, then a sibling directory with an unlikely name
-    const outsidePath = resolve(cwd, "../../__unlikely_dir_xyz__");
-    const result = toRelativePath(outsidePath);
+    const outsidePath = resolve(cwd, '../../__unlikely_dir_xyz__')
+    const result = toRelativePath(outsidePath)
     // relative(cwd, outsidePath) will start with '../..' so function returns absolute
-    expect(result).toBe(outsidePath);
-  });
+    expect(result).toBe(outsidePath)
+  })
 
-  test("returns empty string for cwd itself", () => {
-    const cwd = process.cwd();
-    const result = toRelativePath(cwd);
+  test('returns empty string for cwd itself', () => {
+    const cwd = process.cwd()
+    const result = toRelativePath(cwd)
     // relative(cwd, cwd) === '' which does not start with '..'
-    expect(result).toBe("");
-  });
+    expect(result).toBe('')
+  })
 
-  test("returns a string for any absolute path", () => {
-    const abs = resolve(process.cwd(), "src");
-    const result = toRelativePath(abs);
-    expect(typeof result).toBe("string");
-  });
-});
+  test('returns a string for any absolute path', () => {
+    const abs = resolve(process.cwd(), 'src')
+    const result = toRelativePath(abs)
+    expect(typeof result).toBe('string')
+  })
+})
 
 // ─── getDirectoryForPath ─────────────────────────────────────────────────
 
-describe("getDirectoryForPath", () => {
-  test("returns the path itself when given an existing directory", () => {
-    setOriginalFsImplementation();
-    const dir = resolve(tmpdir(), "ccb-existing-dir");
-    const baseFs = getFsImplementation();
+describe('getDirectoryForPath', () => {
+  test('returns the path itself when given an existing directory', () => {
+    setOriginalFsImplementation()
+    const dir = resolve(tmpdir(), 'ccb-existing-dir')
+    const baseFs = getFsImplementation()
     setFsImplementation({
       ...baseFs,
       statSync: ((path: string) => {
         if (path === dir) {
-          return { isDirectory: () => true } as any;
+          return { isDirectory: () => true } as any
         }
-        return baseFs.statSync(path);
-      }) as FsOperations["statSync"],
-    });
+        return baseFs.statSync(path)
+      }) as FsOperations['statSync'],
+    })
     try {
-      const result = getDirectoryForPath(dir);
-      expect(result).toBe(dir);
+      const result = getDirectoryForPath(dir)
+      expect(result).toBe(dir)
     } finally {
-      setOriginalFsImplementation();
+      setOriginalFsImplementation()
     }
-  });
+  })
 
-  test("returns parent directory for a known file", () => {
-    setOriginalFsImplementation();
-    const expectedParent = resolve(tmpdir(), "ccb-file-parent");
-    const file = resolve(expectedParent, "sample.txt");
-    const baseFs = getFsImplementation();
+  test('returns parent directory for a known file', () => {
+    setOriginalFsImplementation()
+    const expectedParent = resolve(tmpdir(), 'ccb-file-parent')
+    const file = resolve(expectedParent, 'sample.txt')
+    const baseFs = getFsImplementation()
     setFsImplementation({
       ...baseFs,
       statSync: ((path: string) => {
         if (path === file) {
-          return { isDirectory: () => false } as any;
+          return { isDirectory: () => false } as any
         }
-        return baseFs.statSync(path);
-      }) as FsOperations["statSync"],
-    });
+        return baseFs.statSync(path)
+      }) as FsOperations['statSync'],
+    })
     try {
-      const result = getDirectoryForPath(file);
-      expect(result).toBe(expectedParent);
+      const result = getDirectoryForPath(file)
+      expect(result).toBe(expectedParent)
     } finally {
-      setOriginalFsImplementation();
+      setOriginalFsImplementation()
     }
-  });
+  })
 
-  test("returns parent directory for a non-existent path", () => {
-    setOriginalFsImplementation();
-    const expectedParent = resolve(tmpdir(), "ccb-missing-parent");
-    const nonExistent = resolve(expectedParent, "does-not-exist-xyz123.ts");
-    const baseFs = getFsImplementation();
+  test('returns parent directory for a non-existent path', () => {
+    setOriginalFsImplementation()
+    const expectedParent = resolve(tmpdir(), 'ccb-missing-parent')
+    const nonExistent = resolve(expectedParent, 'does-not-exist-xyz123.ts')
+    const baseFs = getFsImplementation()
     setFsImplementation({
       ...baseFs,
       statSync: ((path: string) => {
         if (path === nonExistent) {
-          throw new Error("ENOENT");
+          throw new Error('ENOENT')
         }
-        return baseFs.statSync(path);
-      }) as FsOperations["statSync"],
-    });
+        return baseFs.statSync(path)
+      }) as FsOperations['statSync'],
+    })
     try {
-      const result = getDirectoryForPath(nonExistent);
-      expect(result).toBe(expectedParent);
+      const result = getDirectoryForPath(nonExistent)
+      expect(result).toBe(expectedParent)
     } finally {
-      setOriginalFsImplementation();
+      setOriginalFsImplementation()
     }
-  });
-});
+  })
+})
diff --git a/src/utils/__tests__/privacyLevel.test.ts b/src/utils/__tests__/privacyLevel.test.ts
index 9cfbfd531..74175dbbe 100644
--- a/src/utils/__tests__/privacyLevel.test.ts
+++ b/src/utils/__tests__/privacyLevel.test.ts
@@ -1,110 +1,115 @@
-import { afterEach, describe, expect, test } from "bun:test";
+import { afterEach, describe, expect, test } from 'bun:test'
 import {
   getPrivacyLevel,
   isEssentialTrafficOnly,
   isTelemetryDisabled,
   getEssentialTrafficOnlyReason,
-} from "../privacyLevel";
+} from '../privacyLevel'
 
-describe("getPrivacyLevel", () => {
-  const originalDisableNonessential = process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC;
-  const originalDisableTelemetry = process.env.DISABLE_TELEMETRY;
+describe('getPrivacyLevel', () => {
+  const originalDisableNonessential =
+    process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC
+  const originalDisableTelemetry = process.env.DISABLE_TELEMETRY
 
   afterEach(() => {
-    delete process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC;
-    delete process.env.DISABLE_TELEMETRY;
+    delete process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC
+    delete process.env.DISABLE_TELEMETRY
     if (originalDisableNonessential !== undefined) {
-      process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC = originalDisableNonessential;
+      process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC =
+        originalDisableNonessential
     }
     if (originalDisableTelemetry !== undefined) {
-      process.env.DISABLE_TELEMETRY = originalDisableTelemetry;
+      process.env.DISABLE_TELEMETRY = originalDisableTelemetry
     }
-  });
+  })
 
   test("returns 'default' when no env vars set", () => {
-    delete process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC;
-    delete process.env.DISABLE_TELEMETRY;
-    expect(getPrivacyLevel()).toBe("default");
-  });
+    delete process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC
+    delete process.env.DISABLE_TELEMETRY
+    expect(getPrivacyLevel()).toBe('default')
+  })
 
   test("returns 'essential-traffic' when CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC is set", () => {
-    process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC = "1";
-    delete process.env.DISABLE_TELEMETRY;
-    expect(getPrivacyLevel()).toBe("essential-traffic");
-  });
+    process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC = '1'
+    delete process.env.DISABLE_TELEMETRY
+    expect(getPrivacyLevel()).toBe('essential-traffic')
+  })
 
   test("returns 'no-telemetry' when DISABLE_TELEMETRY is set", () => {
-    delete process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC;
-    process.env.DISABLE_TELEMETRY = "1";
-    expect(getPrivacyLevel()).toBe("no-telemetry");
-  });
+    delete process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC
+    process.env.DISABLE_TELEMETRY = '1'
+    expect(getPrivacyLevel()).toBe('no-telemetry')
+  })
 
   test("'essential-traffic' takes priority over 'no-telemetry'", () => {
-    process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC = "1";
-    process.env.DISABLE_TELEMETRY = "1";
-    expect(getPrivacyLevel()).toBe("essential-traffic");
-  });
-});
+    process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC = '1'
+    process.env.DISABLE_TELEMETRY = '1'
+    expect(getPrivacyLevel()).toBe('essential-traffic')
+  })
+})
 
-describe("isEssentialTrafficOnly", () => {
-  const original = process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC;
+describe('isEssentialTrafficOnly', () => {
+  const original = process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC
 
   afterEach(() => {
-    delete process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC;
-    if (original !== undefined) process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC = original;
-  });
+    delete process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC
+    if (original !== undefined)
+      process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC = original
+  })
 
   test("returns true for 'essential-traffic' level", () => {
-    process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC = "1";
-    expect(isEssentialTrafficOnly()).toBe(true);
-  });
+    process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC = '1'
+    expect(isEssentialTrafficOnly()).toBe(true)
+  })
 
   test("returns false for 'default' level", () => {
-    delete process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC;
-    delete process.env.DISABLE_TELEMETRY;
-    expect(isEssentialTrafficOnly()).toBe(false);
-  });
+    delete process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC
+    delete process.env.DISABLE_TELEMETRY
+    expect(isEssentialTrafficOnly()).toBe(false)
+  })
 
   test("returns false for 'no-telemetry' level", () => {
-    delete process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC;
-    process.env.DISABLE_TELEMETRY = "1";
-    expect(isEssentialTrafficOnly()).toBe(false);
-  });
-});
+    delete process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC
+    process.env.DISABLE_TELEMETRY = '1'
+    expect(isEssentialTrafficOnly()).toBe(false)
+  })
+})
 
-describe("isTelemetryDisabled", () => {
+describe('isTelemetryDisabled', () => {
   afterEach(() => {
-    delete process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC;
-    delete process.env.DISABLE_TELEMETRY;
-  });
+    delete process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC
+    delete process.env.DISABLE_TELEMETRY
+  })
 
   test("returns true for 'no-telemetry' level", () => {
-    process.env.DISABLE_TELEMETRY = "1";
-    expect(isTelemetryDisabled()).toBe(true);
-  });
+    process.env.DISABLE_TELEMETRY = '1'
+    expect(isTelemetryDisabled()).toBe(true)
+  })
 
   test("returns true for 'essential-traffic' level", () => {
-    process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC = "1";
-    expect(isTelemetryDisabled()).toBe(true);
-  });
+    process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC = '1'
+    expect(isTelemetryDisabled()).toBe(true)
+  })
 
   test("returns false for 'default' level", () => {
-    expect(isTelemetryDisabled()).toBe(false);
-  });
-});
+    expect(isTelemetryDisabled()).toBe(false)
+  })
+})
 
-describe("getEssentialTrafficOnlyReason", () => {
+describe('getEssentialTrafficOnlyReason', () => {
   afterEach(() => {
-    delete process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC;
-  });
+    delete process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC
+  })
 
-  test("returns env var name when restricted", () => {
-    process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC = "1";
-    expect(getEssentialTrafficOnlyReason()).toBe("CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC");
-  });
+  test('returns env var name when restricted', () => {
+    process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC = '1'
+    expect(getEssentialTrafficOnlyReason()).toBe(
+      'CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC',
+    )
+  })
 
-  test("returns null when unrestricted", () => {
-    delete process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC;
-    expect(getEssentialTrafficOnlyReason()).toBeNull();
-  });
-});
+  test('returns null when unrestricted', () => {
+    delete process.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC
+    expect(getEssentialTrafficOnlyReason()).toBeNull()
+  })
+})
diff --git a/src/utils/__tests__/sanitization.test.ts b/src/utils/__tests__/sanitization.test.ts
index c55db962a..a002898e3 100644
--- a/src/utils/__tests__/sanitization.test.ts
+++ b/src/utils/__tests__/sanitization.test.ts
@@ -1,75 +1,75 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from 'bun:test'
 import {
   partiallySanitizeUnicode,
   recursivelySanitizeUnicode,
-} from "../sanitization";
+} from '../sanitization'
 
 // ─── partiallySanitizeUnicode ───────────────────────────────────────────
 
-describe("partiallySanitizeUnicode", () => {
-  test("preserves normal ASCII text", () => {
-    expect(partiallySanitizeUnicode("hello world")).toBe("hello world");
-  });
+describe('partiallySanitizeUnicode', () => {
+  test('preserves normal ASCII text', () => {
+    expect(partiallySanitizeUnicode('hello world')).toBe('hello world')
+  })
 
-  test("preserves CJK characters", () => {
-    expect(partiallySanitizeUnicode("你好世界")).toBe("你好世界");
-  });
+  test('preserves CJK characters', () => {
+    expect(partiallySanitizeUnicode('你好世界')).toBe('你好世界')
+  })
 
-  test("removes zero-width spaces", () => {
-    expect(partiallySanitizeUnicode("hello\u200Bworld")).toBe("helloworld");
-  });
+  test('removes zero-width spaces', () => {
+    expect(partiallySanitizeUnicode('hello\u200Bworld')).toBe('helloworld')
+  })
 
-  test("removes BOM", () => {
-    expect(partiallySanitizeUnicode("\uFEFFhello")).toBe("hello");
-  });
+  test('removes BOM', () => {
+    expect(partiallySanitizeUnicode('\uFEFFhello')).toBe('hello')
+  })
 
-  test("removes directional formatting", () => {
-    expect(partiallySanitizeUnicode("hello\u202Aworld")).toBe("helloworld");
-  });
+  test('removes directional formatting', () => {
+    expect(partiallySanitizeUnicode('hello\u202Aworld')).toBe('helloworld')
+  })
 
-  test("removes private use area characters", () => {
-    expect(partiallySanitizeUnicode("hello\uE000world")).toBe("helloworld");
-  });
+  test('removes private use area characters', () => {
+    expect(partiallySanitizeUnicode('hello\uE000world')).toBe('helloworld')
+  })
 
-  test("handles empty string", () => {
-    expect(partiallySanitizeUnicode("")).toBe("");
-  });
+  test('handles empty string', () => {
+    expect(partiallySanitizeUnicode('')).toBe('')
+  })
 
-  test("handles string with only dangerous characters", () => {
-    const result = partiallySanitizeUnicode("\u200B\u200C\u200D\uFEFF");
-    expect(result.length).toBeLessThanOrEqual(1); // ZWJ may survive NFKC
-  });
-});
+  test('handles string with only dangerous characters', () => {
+    const result = partiallySanitizeUnicode('\u200B\u200C\u200D\uFEFF')
+    expect(result.length).toBeLessThanOrEqual(1) // ZWJ may survive NFKC
+  })
+})
 
 // ─── recursivelySanitizeUnicode ─────────────────────────────────────────
 
-describe("recursivelySanitizeUnicode", () => {
-  test("sanitizes string values", () => {
-    expect(recursivelySanitizeUnicode("hello\u200Bworld")).toBe("helloworld");
-  });
+describe('recursivelySanitizeUnicode', () => {
+  test('sanitizes string values', () => {
+    expect(recursivelySanitizeUnicode('hello\u200Bworld')).toBe('helloworld')
+  })
 
-  test("sanitizes array elements", () => {
-    const result = recursivelySanitizeUnicode(["a\u200Bb", "c\uFEFFd"]);
-    expect(result).toEqual(["ab", "cd"]);
-  });
+  test('sanitizes array elements', () => {
+    const result = recursivelySanitizeUnicode(['a\u200Bb', 'c\uFEFFd'])
+    expect(result).toEqual(['ab', 'cd'])
+  })
 
-  test("sanitizes object values recursively", () => {
+  test('sanitizes object values recursively', () => {
     const result = recursivelySanitizeUnicode({
-      key: "val\u200Bue",
-      nested: { inner: "te\uFEFFst" },
-    });
-    expect(result).toEqual({ key: "value", nested: { inner: "test" } });
-  });
+      key: 'val\u200Bue',
+      nested: { inner: 'te\uFEFFst' },
+    })
+    expect(result).toEqual({ key: 'value', nested: { inner: 'test' } })
+  })
 
-  test("preserves numbers", () => {
-    expect(recursivelySanitizeUnicode(42)).toBe(42);
-  });
+  test('preserves numbers', () => {
+    expect(recursivelySanitizeUnicode(42)).toBe(42)
+  })
 
-  test("preserves booleans", () => {
-    expect(recursivelySanitizeUnicode(true)).toBe(true);
-  });
+  test('preserves booleans', () => {
+    expect(recursivelySanitizeUnicode(true)).toBe(true)
+  })
 
-  test("preserves null", () => {
-    expect(recursivelySanitizeUnicode(null)).toBeNull();
-  });
-});
+  test('preserves null', () => {
+    expect(recursivelySanitizeUnicode(null)).toBeNull()
+  })
+})
diff --git a/src/utils/__tests__/semanticBoolean.test.ts b/src/utils/__tests__/semanticBoolean.test.ts
index e0fa5fa8c..6a8a12025 100644
--- a/src/utils/__tests__/semanticBoolean.test.ts
+++ b/src/utils/__tests__/semanticBoolean.test.ts
@@ -1,48 +1,48 @@
-import { describe, expect, test } from "bun:test";
-import { z } from "zod/v4";
-import { semanticBoolean } from "../semanticBoolean";
+import { describe, expect, test } from 'bun:test'
+import { z } from 'zod/v4'
+import { semanticBoolean } from '../semanticBoolean'
 
-describe("semanticBoolean", () => {
-  test("parses boolean true to true", () => {
-    expect(semanticBoolean().parse(true)).toBe(true);
-  });
+describe('semanticBoolean', () => {
+  test('parses boolean true to true', () => {
+    expect(semanticBoolean().parse(true)).toBe(true)
+  })
 
-  test("parses boolean false to false", () => {
-    expect(semanticBoolean().parse(false)).toBe(false);
-  });
+  test('parses boolean false to false', () => {
+    expect(semanticBoolean().parse(false)).toBe(false)
+  })
 
   test("parses string 'true' to true", () => {
-    expect(semanticBoolean().parse("true")).toBe(true);
-  });
+    expect(semanticBoolean().parse('true')).toBe(true)
+  })
 
   test("parses string 'false' to false", () => {
-    expect(semanticBoolean().parse("false")).toBe(false);
-  });
+    expect(semanticBoolean().parse('false')).toBe(false)
+  })
 
   test("rejects string 'TRUE' (case-sensitive)", () => {
-    expect(() => semanticBoolean().parse("TRUE")).toThrow();
-  });
+    expect(() => semanticBoolean().parse('TRUE')).toThrow()
+  })
 
   test("rejects string 'FALSE' (case-sensitive)", () => {
-    expect(() => semanticBoolean().parse("FALSE")).toThrow();
-  });
+    expect(() => semanticBoolean().parse('FALSE')).toThrow()
+  })
 
-  test("rejects number 1", () => {
-    expect(() => semanticBoolean().parse(1)).toThrow();
-  });
+  test('rejects number 1', () => {
+    expect(() => semanticBoolean().parse(1)).toThrow()
+  })
 
-  test("rejects null", () => {
-    expect(() => semanticBoolean().parse(null)).toThrow();
-  });
+  test('rejects null', () => {
+    expect(() => semanticBoolean().parse(null)).toThrow()
+  })
 
-  test("rejects undefined", () => {
-    expect(() => semanticBoolean().parse(undefined)).toThrow();
-  });
+  test('rejects undefined', () => {
+    expect(() => semanticBoolean().parse(undefined)).toThrow()
+  })
 
-  test("works with custom inner schema (z.boolean().optional())", () => {
-    const schema = semanticBoolean(z.boolean().optional());
-    expect(schema.parse(true)).toBe(true);
-    expect(schema.parse("false")).toBe(false);
-    expect(schema.parse(undefined)).toBeUndefined();
-  });
-});
+  test('works with custom inner schema (z.boolean().optional())', () => {
+    const schema = semanticBoolean(z.boolean().optional())
+    expect(schema.parse(true)).toBe(true)
+    expect(schema.parse('false')).toBe(false)
+    expect(schema.parse(undefined)).toBeUndefined()
+  })
+})
diff --git a/src/utils/__tests__/semanticNumber.test.ts b/src/utils/__tests__/semanticNumber.test.ts
index f713fdebd..84747098b 100644
--- a/src/utils/__tests__/semanticNumber.test.ts
+++ b/src/utils/__tests__/semanticNumber.test.ts
@@ -1,52 +1,52 @@
-import { describe, expect, test } from "bun:test";
-import { z } from "zod/v4";
-import { semanticNumber } from "../semanticNumber";
+import { describe, expect, test } from 'bun:test'
+import { z } from 'zod/v4'
+import { semanticNumber } from '../semanticNumber'
 
-describe("semanticNumber", () => {
-  test("parses number 42", () => {
-    expect(semanticNumber().parse(42)).toBe(42);
-  });
+describe('semanticNumber', () => {
+  test('parses number 42', () => {
+    expect(semanticNumber().parse(42)).toBe(42)
+  })
 
-  test("parses number 0", () => {
-    expect(semanticNumber().parse(0)).toBe(0);
-  });
+  test('parses number 0', () => {
+    expect(semanticNumber().parse(0)).toBe(0)
+  })
 
-  test("parses negative number -5", () => {
-    expect(semanticNumber().parse(-5)).toBe(-5);
-  });
+  test('parses negative number -5', () => {
+    expect(semanticNumber().parse(-5)).toBe(-5)
+  })
 
-  test("parses float 3.14", () => {
-    expect(semanticNumber().parse(3.14)).toBeCloseTo(3.14);
-  });
+  test('parses float 3.14', () => {
+    expect(semanticNumber().parse(3.14)).toBeCloseTo(3.14)
+  })
 
   test("parses string '42' to 42", () => {
-    expect(semanticNumber().parse("42")).toBe(42);
-  });
+    expect(semanticNumber().parse('42')).toBe(42)
+  })
 
   test("parses string '-7.5' to -7.5", () => {
-    expect(semanticNumber().parse("-7.5")).toBe(-7.5);
-  });
+    expect(semanticNumber().parse('-7.5')).toBe(-7.5)
+  })
 
   test("rejects string 'abc'", () => {
-    expect(() => semanticNumber().parse("abc")).toThrow();
-  });
+    expect(() => semanticNumber().parse('abc')).toThrow()
+  })
 
   test("rejects empty string ''", () => {
-    expect(() => semanticNumber().parse("")).toThrow();
-  });
+    expect(() => semanticNumber().parse('')).toThrow()
+  })
 
-  test("rejects null", () => {
-    expect(() => semanticNumber().parse(null)).toThrow();
-  });
+  test('rejects null', () => {
+    expect(() => semanticNumber().parse(null)).toThrow()
+  })
 
-  test("rejects boolean true", () => {
-    expect(() => semanticNumber().parse(true)).toThrow();
-  });
+  test('rejects boolean true', () => {
+    expect(() => semanticNumber().parse(true)).toThrow()
+  })
 
-  test("works with custom inner schema (z.number().int().min(0))", () => {
-    const schema = semanticNumber(z.number().int().min(0));
-    expect(schema.parse(5)).toBe(5);
-    expect(schema.parse("10")).toBe(10);
-    expect(() => schema.parse(-1)).toThrow();
-  });
-});
+  test('works with custom inner schema (z.number().int().min(0))', () => {
+    const schema = semanticNumber(z.number().int().min(0))
+    expect(schema.parse(5)).toBe(5)
+    expect(schema.parse('10')).toBe(10)
+    expect(() => schema.parse(-1)).toThrow()
+  })
+})
diff --git a/src/utils/__tests__/semver.test.ts b/src/utils/__tests__/semver.test.ts
index a907a4ed4..88b972777 100644
--- a/src/utils/__tests__/semver.test.ts
+++ b/src/utils/__tests__/semver.test.ts
@@ -1,114 +1,114 @@
-import { describe, expect, test } from "bun:test";
-import { gt, gte, lt, lte, satisfies, order } from "../semver";
+import { describe, expect, test } from 'bun:test'
+import { gt, gte, lt, lte, satisfies, order } from '../semver'
 
-describe("gt", () => {
-  test("returns true when a > b", () => {
-    expect(gt("2.0.0", "1.0.0")).toBe(true);
-  });
+describe('gt', () => {
+  test('returns true when a > b', () => {
+    expect(gt('2.0.0', '1.0.0')).toBe(true)
+  })
 
-  test("returns false when a < b", () => {
-    expect(gt("1.0.0", "2.0.0")).toBe(false);
-  });
+  test('returns false when a < b', () => {
+    expect(gt('1.0.0', '2.0.0')).toBe(false)
+  })
 
-  test("returns false when equal", () => {
-    expect(gt("1.0.0", "1.0.0")).toBe(false);
-  });
+  test('returns false when equal', () => {
+    expect(gt('1.0.0', '1.0.0')).toBe(false)
+  })
 
-  test("returns false for 0.0.0 vs 0.0.0", () => {
-    expect(gt("0.0.0", "0.0.0")).toBe(false);
-  });
+  test('returns false for 0.0.0 vs 0.0.0', () => {
+    expect(gt('0.0.0', '0.0.0')).toBe(false)
+  })
 
-  test("release is greater than pre-release", () => {
-    expect(gt("1.0.0", "1.0.0-alpha")).toBe(true);
-  });
-});
+  test('release is greater than pre-release', () => {
+    expect(gt('1.0.0', '1.0.0-alpha')).toBe(true)
+  })
+})
 
-describe("gte", () => {
-  test("returns true when a > b", () => {
-    expect(gte("2.0.0", "1.0.0")).toBe(true);
-  });
+describe('gte', () => {
+  test('returns true when a > b', () => {
+    expect(gte('2.0.0', '1.0.0')).toBe(true)
+  })
 
-  test("returns true when equal", () => {
-    expect(gte("1.0.0", "1.0.0")).toBe(true);
-  });
+  test('returns true when equal', () => {
+    expect(gte('1.0.0', '1.0.0')).toBe(true)
+  })
 
-  test("returns false when a < b", () => {
-    expect(gte("1.0.0", "2.0.0")).toBe(false);
-  });
-});
+  test('returns false when a < b', () => {
+    expect(gte('1.0.0', '2.0.0')).toBe(false)
+  })
+})
 
-describe("lt", () => {
-  test("returns true when a < b", () => {
-    expect(lt("1.0.0", "2.0.0")).toBe(true);
-  });
+describe('lt', () => {
+  test('returns true when a < b', () => {
+    expect(lt('1.0.0', '2.0.0')).toBe(true)
+  })
 
-  test("returns false when a > b", () => {
-    expect(lt("2.0.0", "1.0.0")).toBe(false);
-  });
+  test('returns false when a > b', () => {
+    expect(lt('2.0.0', '1.0.0')).toBe(false)
+  })
 
-  test("returns false when equal", () => {
-    expect(lt("1.0.0", "1.0.0")).toBe(false);
-  });
-});
+  test('returns false when equal', () => {
+    expect(lt('1.0.0', '1.0.0')).toBe(false)
+  })
+})
 
-describe("lte", () => {
-  test("returns true when a < b", () => {
-    expect(lte("1.0.0", "2.0.0")).toBe(true);
-  });
+describe('lte', () => {
+  test('returns true when a < b', () => {
+    expect(lte('1.0.0', '2.0.0')).toBe(true)
+  })
 
-  test("returns true when equal", () => {
-    expect(lte("1.0.0", "1.0.0")).toBe(true);
-  });
+  test('returns true when equal', () => {
+    expect(lte('1.0.0', '1.0.0')).toBe(true)
+  })
 
-  test("returns false when a > b", () => {
-    expect(lte("2.0.0", "1.0.0")).toBe(false);
-  });
-});
+  test('returns false when a > b', () => {
+    expect(lte('2.0.0', '1.0.0')).toBe(false)
+  })
+})
 
-describe("satisfies", () => {
-  test("matches exact version", () => {
-    expect(satisfies("1.2.3", "1.2.3")).toBe(true);
-  });
+describe('satisfies', () => {
+  test('matches exact version', () => {
+    expect(satisfies('1.2.3', '1.2.3')).toBe(true)
+  })
 
-  test("matches range", () => {
-    expect(satisfies("1.2.3", ">=1.0.0")).toBe(true);
-  });
+  test('matches range', () => {
+    expect(satisfies('1.2.3', '>=1.0.0')).toBe(true)
+  })
 
-  test("does not match out-of-range version", () => {
-    expect(satisfies("0.9.0", ">=1.0.0")).toBe(false);
-  });
+  test('does not match out-of-range version', () => {
+    expect(satisfies('0.9.0', '>=1.0.0')).toBe(false)
+  })
 
-  test("matches caret range", () => {
-    expect(satisfies("1.2.3", "^1.0.0")).toBe(true);
-  });
+  test('matches caret range', () => {
+    expect(satisfies('1.2.3', '^1.0.0')).toBe(true)
+  })
 
-  test("does not match major bump in caret", () => {
-    expect(satisfies("2.0.0", "^1.0.0")).toBe(false);
-  });
+  test('does not match major bump in caret', () => {
+    expect(satisfies('2.0.0', '^1.0.0')).toBe(false)
+  })
 
-  test("matches tilde range", () => {
-    expect(satisfies("1.2.5", "~1.2.3")).toBe(true);
-  });
+  test('matches tilde range', () => {
+    expect(satisfies('1.2.5', '~1.2.3')).toBe(true)
+  })
 
-  test("matches wildcard range", () => {
-    expect(satisfies("2.0.0", "*")).toBe(true);
-  });
-});
+  test('matches wildcard range', () => {
+    expect(satisfies('2.0.0', '*')).toBe(true)
+  })
+})
 
-describe("order", () => {
-  test("returns 1 when a > b", () => {
-    expect(order("2.0.0", "1.0.0")).toBe(1);
-  });
+describe('order', () => {
+  test('returns 1 when a > b', () => {
+    expect(order('2.0.0', '1.0.0')).toBe(1)
+  })
 
-  test("returns -1 when a < b", () => {
-    expect(order("1.0.0", "2.0.0")).toBe(-1);
-  });
+  test('returns -1 when a < b', () => {
+    expect(order('1.0.0', '2.0.0')).toBe(-1)
+  })
 
-  test("returns 0 when equal", () => {
-    expect(order("1.0.0", "1.0.0")).toBe(0);
-  });
+  test('returns 0 when equal', () => {
+    expect(order('1.0.0', '1.0.0')).toBe(0)
+  })
 
-  test("compares patch versions", () => {
-    expect(order("1.0.1", "1.0.0")).toBe(1);
-  });
-});
+  test('compares patch versions', () => {
+    expect(order('1.0.1', '1.0.0')).toBe(1)
+  })
+})
diff --git a/src/utils/__tests__/sequential.test.ts b/src/utils/__tests__/sequential.test.ts
index 5cccb8311..29c9fbaf9 100644
--- a/src/utils/__tests__/sequential.test.ts
+++ b/src/utils/__tests__/sequential.test.ts
@@ -1,99 +1,99 @@
-import { describe, expect, test } from "bun:test";
-import { sequential } from "../sequential";
+import { describe, expect, test } from 'bun:test'
+import { sequential } from '../sequential'
 
-describe("sequential", () => {
-  test("wraps async function, returns same result", async () => {
-    const fn = sequential(async (x: number) => x * 2);
-    expect(await fn(5)).toBe(10);
-  });
+describe('sequential', () => {
+  test('wraps async function, returns same result', async () => {
+    const fn = sequential(async (x: number) => x * 2)
+    expect(await fn(5)).toBe(10)
+  })
 
-  test("single call resolves normally", async () => {
-    const fn = sequential(async () => "ok");
-    expect(await fn()).toBe("ok");
-  });
+  test('single call resolves normally', async () => {
+    const fn = sequential(async () => 'ok')
+    expect(await fn()).toBe('ok')
+  })
 
-  test("concurrent calls execute sequentially (FIFO order)", async () => {
-    const order: number[] = [];
+  test('concurrent calls execute sequentially (FIFO order)', async () => {
+    const order: number[] = []
     const fn = sequential(async (n: number) => {
-      order.push(n);
-      await new Promise(r => setTimeout(r, 10));
-      return n;
-    });
+      order.push(n)
+      await new Promise(r => setTimeout(r, 10))
+      return n
+    })
 
-    const results = await Promise.all([fn(1), fn(2), fn(3)]);
-    expect(results).toEqual([1, 2, 3]);
-    expect(order).toEqual([1, 2, 3]);
-  });
+    const results = await Promise.all([fn(1), fn(2), fn(3)])
+    expect(results).toEqual([1, 2, 3])
+    expect(order).toEqual([1, 2, 3])
+  })
 
-  test("preserves arguments correctly", async () => {
-    const fn = sequential(async (a: number, b: string) => `${a}-${b}`);
-    expect(await fn(42, "test")).toBe("42-test");
-  });
+  test('preserves arguments correctly', async () => {
+    const fn = sequential(async (a: number, b: string) => `${a}-${b}`)
+    expect(await fn(42, 'test')).toBe('42-test')
+  })
 
-  test("error in first call does not block subsequent calls", async () => {
-    let callCount = 0;
+  test('error in first call does not block subsequent calls', async () => {
+    let callCount = 0
     const fn = sequential(async () => {
-      callCount++;
-      if (callCount === 1) throw new Error("first fail");
-      return "ok";
-    });
+      callCount++
+      if (callCount === 1) throw new Error('first fail')
+      return 'ok'
+    })
 
-    await expect(fn()).rejects.toThrow("first fail");
-    expect(await fn()).toBe("ok");
-  });
+    await expect(fn()).rejects.toThrow('first fail')
+    expect(await fn()).toBe('ok')
+  })
 
-  test("preserves rejection reason", async () => {
+  test('preserves rejection reason', async () => {
     const fn = sequential(async () => {
-      throw new Error("specific error");
-    });
-    await expect(fn()).rejects.toThrow("specific error");
-  });
+      throw new Error('specific error')
+    })
+    await expect(fn()).rejects.toThrow('specific error')
+  })
 
-  test("multiple args passed correctly", async () => {
-    const fn = sequential(async (a: number, b: number, c: number) => a + b + c);
-    expect(await fn(1, 2, 3)).toBe(6);
-  });
+  test('multiple args passed correctly', async () => {
+    const fn = sequential(async (a: number, b: number, c: number) => a + b + c)
+    expect(await fn(1, 2, 3)).toBe(6)
+  })
 
-  test("returns different wrapper for each call to sequential", () => {
-    const fn1 = sequential(async () => 1);
-    const fn2 = sequential(async () => 2);
-    expect(fn1).not.toBe(fn2);
-  });
+  test('returns different wrapper for each call to sequential', () => {
+    const fn1 = sequential(async () => 1)
+    const fn2 = sequential(async () => 2)
+    expect(fn1).not.toBe(fn2)
+  })
 
-  test("handles rapid concurrent calls", async () => {
-    const order: number[] = [];
+  test('handles rapid concurrent calls', async () => {
+    const order: number[] = []
     const fn = sequential(async (n: number) => {
-      order.push(n);
-      return n;
-    });
+      order.push(n)
+      return n
+    })
 
-    const promises = Array.from({ length: 10 }, (_, i) => fn(i));
-    const results = await Promise.all(promises);
-    expect(results).toEqual([0, 1, 2, 3, 4, 5, 6, 7, 8, 9]);
-    expect(order).toEqual([0, 1, 2, 3, 4, 5, 6, 7, 8, 9]);
-  });
+    const promises = Array.from({ length: 10 }, (_, i) => fn(i))
+    const results = await Promise.all(promises)
+    expect(results).toEqual([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])
+    expect(order).toEqual([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])
+  })
 
-  test("execution order matches call order", async () => {
-    const log: string[] = [];
+  test('execution order matches call order', async () => {
+    const log: string[] = []
     const fn = sequential(async (label: string) => {
-      log.push(`start:${label}`);
-      await new Promise(r => setTimeout(r, 5));
-      log.push(`end:${label}`);
-      return label;
-    });
+      log.push(`start:${label}`)
+      await new Promise(r => setTimeout(r, 5))
+      log.push(`end:${label}`)
+      return label
+    })
 
-    await Promise.all([fn("a"), fn("b")]);
-    expect(log[0]).toBe("start:a");
-    expect(log[1]).toBe("end:a");
-    expect(log[2]).toBe("start:b");
-    expect(log[3]).toBe("end:b");
-  });
+    await Promise.all([fn('a'), fn('b')])
+    expect(log[0]).toBe('start:a')
+    expect(log[1]).toBe('end:a')
+    expect(log[2]).toBe('start:b')
+    expect(log[3]).toBe('end:b')
+  })
 
-  test("works with functions returning different types", async () => {
+  test('works with functions returning different types', async () => {
     const fn = sequential(async (x: number): Promise<string | number> => {
-      return x > 0 ? "positive" : x;
-    });
-    expect(await fn(5)).toBe("positive");
-    expect(await fn(-1)).toBe(-1);
-  });
-});
+      return x > 0 ? 'positive' : x
+    })
+    expect(await fn(5)).toBe('positive')
+    expect(await fn(-1)).toBe(-1)
+  })
+})
diff --git a/src/utils/__tests__/set.test.ts b/src/utils/__tests__/set.test.ts
index fd176e0a4..b85682aca 100644
--- a/src/utils/__tests__/set.test.ts
+++ b/src/utils/__tests__/set.test.ts
@@ -1,63 +1,63 @@
-import { describe, expect, test } from "bun:test";
-import { difference, every, intersects, union } from "../set";
+import { describe, expect, test } from 'bun:test'
+import { difference, every, intersects, union } from '../set'
 
-describe("difference", () => {
-	test("returns elements in a but not in b", () => {
-		const result = difference(new Set([1, 2, 3]), new Set([2, 3, 4]));
-		expect(result).toEqual(new Set([1]));
-	});
+describe('difference', () => {
+  test('returns elements in a but not in b', () => {
+    const result = difference(new Set([1, 2, 3]), new Set([2, 3, 4]))
+    expect(result).toEqual(new Set([1]))
+  })
 
-	test("returns empty set when a is subset of b", () => {
-		expect(difference(new Set([1, 2]), new Set([1, 2, 3]))).toEqual(new Set());
-	});
+  test('returns empty set when a is subset of b', () => {
+    expect(difference(new Set([1, 2]), new Set([1, 2, 3]))).toEqual(new Set())
+  })
 
-	test("returns a when b is empty", () => {
-		expect(difference(new Set([1, 2]), new Set())).toEqual(new Set([1, 2]));
-	});
-});
+  test('returns a when b is empty', () => {
+    expect(difference(new Set([1, 2]), new Set())).toEqual(new Set([1, 2]))
+  })
+})
 
-describe("intersects", () => {
-	test("returns true when sets share elements", () => {
-		expect(intersects(new Set([1, 2]), new Set([2, 3]))).toBe(true);
-	});
+describe('intersects', () => {
+  test('returns true when sets share elements', () => {
+    expect(intersects(new Set([1, 2]), new Set([2, 3]))).toBe(true)
+  })
 
-	test("returns false when sets are disjoint", () => {
-		expect(intersects(new Set([1, 2]), new Set([3, 4]))).toBe(false);
-	});
+  test('returns false when sets are disjoint', () => {
+    expect(intersects(new Set([1, 2]), new Set([3, 4]))).toBe(false)
+  })
 
-	test("returns false for empty sets", () => {
-		expect(intersects(new Set(), new Set([1]))).toBe(false);
-		expect(intersects(new Set([1]), new Set())).toBe(false);
-	});
-});
+  test('returns false for empty sets', () => {
+    expect(intersects(new Set(), new Set([1]))).toBe(false)
+    expect(intersects(new Set([1]), new Set())).toBe(false)
+  })
+})
 
-describe("every", () => {
-	test("returns true when a is subset of b", () => {
-		expect(every(new Set([1, 2]), new Set([1, 2, 3]))).toBe(true);
-	});
+describe('every', () => {
+  test('returns true when a is subset of b', () => {
+    expect(every(new Set([1, 2]), new Set([1, 2, 3]))).toBe(true)
+  })
 
-	test("returns false when a has elements not in b", () => {
-		expect(every(new Set([1, 4]), new Set([1, 2, 3]))).toBe(false);
-	});
+  test('returns false when a has elements not in b', () => {
+    expect(every(new Set([1, 4]), new Set([1, 2, 3]))).toBe(false)
+  })
 
-	test("returns true for empty a", () => {
-		expect(every(new Set(), new Set([1, 2]))).toBe(true);
-	});
-});
+  test('returns true for empty a', () => {
+    expect(every(new Set(), new Set([1, 2]))).toBe(true)
+  })
+})
 
-describe("union", () => {
-	test("combines both sets", () => {
-		const result = union(new Set([1, 2]), new Set([3, 4]));
-		expect(result).toEqual(new Set([1, 2, 3, 4]));
-	});
+describe('union', () => {
+  test('combines both sets', () => {
+    const result = union(new Set([1, 2]), new Set([3, 4]))
+    expect(result).toEqual(new Set([1, 2, 3, 4]))
+  })
 
-	test("deduplicates shared elements", () => {
-		const result = union(new Set([1, 2]), new Set([2, 3]));
-		expect(result).toEqual(new Set([1, 2, 3]));
-	});
+  test('deduplicates shared elements', () => {
+    const result = union(new Set([1, 2]), new Set([2, 3]))
+    expect(result).toEqual(new Set([1, 2, 3]))
+  })
 
-	test("handles empty sets", () => {
-		expect(union(new Set(), new Set([1]))).toEqual(new Set([1]));
-		expect(union(new Set([1]), new Set())).toEqual(new Set([1]));
-	});
-});
+  test('handles empty sets', () => {
+    expect(union(new Set(), new Set([1]))).toEqual(new Set([1]))
+    expect(union(new Set([1]), new Set())).toEqual(new Set([1]))
+  })
+})
diff --git a/src/utils/__tests__/slashCommandParsing.test.ts b/src/utils/__tests__/slashCommandParsing.test.ts
index 066483026..dbf7008e0 100644
--- a/src/utils/__tests__/slashCommandParsing.test.ts
+++ b/src/utils/__tests__/slashCommandParsing.test.ts
@@ -1,58 +1,58 @@
-import { describe, expect, test } from "bun:test";
-import { parseSlashCommand } from "../slashCommandParsing";
+import { describe, expect, test } from 'bun:test'
+import { parseSlashCommand } from '../slashCommandParsing'
 
-describe("parseSlashCommand", () => {
-  test("parses simple command", () => {
-    const result = parseSlashCommand("/search foo bar");
+describe('parseSlashCommand', () => {
+  test('parses simple command', () => {
+    const result = parseSlashCommand('/search foo bar')
     expect(result).toEqual({
-      commandName: "search",
-      args: "foo bar",
+      commandName: 'search',
+      args: 'foo bar',
       isMcp: false,
-    });
-  });
+    })
+  })
 
-  test("parses command without args", () => {
-    const result = parseSlashCommand("/help");
+  test('parses command without args', () => {
+    const result = parseSlashCommand('/help')
     expect(result).toEqual({
-      commandName: "help",
-      args: "",
+      commandName: 'help',
+      args: '',
       isMcp: false,
-    });
-  });
+    })
+  })
 
-  test("parses MCP command", () => {
-    const result = parseSlashCommand("/tool (MCP) arg1 arg2");
+  test('parses MCP command', () => {
+    const result = parseSlashCommand('/tool (MCP) arg1 arg2')
     expect(result).toEqual({
-      commandName: "tool (MCP)",
-      args: "arg1 arg2",
+      commandName: 'tool (MCP)',
+      args: 'arg1 arg2',
       isMcp: true,
-    });
-  });
+    })
+  })
 
-  test("parses MCP command without args", () => {
-    const result = parseSlashCommand("/tool (MCP)");
+  test('parses MCP command without args', () => {
+    const result = parseSlashCommand('/tool (MCP)')
     expect(result).toEqual({
-      commandName: "tool (MCP)",
-      args: "",
+      commandName: 'tool (MCP)',
+      args: '',
       isMcp: true,
-    });
-  });
+    })
+  })
 
-  test("returns null for non-slash input", () => {
-    expect(parseSlashCommand("hello")).toBeNull();
-  });
+  test('returns null for non-slash input', () => {
+    expect(parseSlashCommand('hello')).toBeNull()
+  })
 
-  test("returns null for empty string", () => {
-    expect(parseSlashCommand("")).toBeNull();
-  });
+  test('returns null for empty string', () => {
+    expect(parseSlashCommand('')).toBeNull()
+  })
 
-  test("returns null for just slash", () => {
-    expect(parseSlashCommand("/")).toBeNull();
-  });
+  test('returns null for just slash', () => {
+    expect(parseSlashCommand('/')).toBeNull()
+  })
 
-  test("trims whitespace before parsing", () => {
-    const result = parseSlashCommand("  /search foo  ");
-    expect(result!.commandName).toBe("search");
-    expect(result!.args).toBe("foo");
-  });
-});
+  test('trims whitespace before parsing', () => {
+    const result = parseSlashCommand('  /search foo  ')
+    expect(result!.commandName).toBe('search')
+    expect(result!.args).toBe('foo')
+  })
+})
diff --git a/src/utils/__tests__/sleep.test.ts b/src/utils/__tests__/sleep.test.ts
index 65d8fed14..dd660766b 100644
--- a/src/utils/__tests__/sleep.test.ts
+++ b/src/utils/__tests__/sleep.test.ts
@@ -1,130 +1,126 @@
-import { describe, expect, test } from "bun:test";
-import { sleep, withTimeout } from "../sleep";
-import { sequential } from "../sequential";
+import { describe, expect, test } from 'bun:test'
+import { sleep, withTimeout } from '../sleep'
+import { sequential } from '../sequential'
 
 // ─── sleep ─────────────────────────────────────────────────────────────
 
-describe("sleep", () => {
-  test("resolves after timeout", async () => {
-    const start = Date.now();
-    await sleep(50);
-    expect(Date.now() - start).toBeGreaterThanOrEqual(40);
-  });
+describe('sleep', () => {
+  test('resolves after timeout', async () => {
+    const start = Date.now()
+    await sleep(50)
+    expect(Date.now() - start).toBeGreaterThanOrEqual(40)
+  })
 
-  test("resolves immediately when signal already aborted", async () => {
-    const ac = new AbortController();
-    ac.abort();
-    const start = Date.now();
-    await sleep(10_000, ac.signal);
-    expect(Date.now() - start).toBeLessThan(50);
-  });
+  test('resolves immediately when signal already aborted', async () => {
+    const ac = new AbortController()
+    ac.abort()
+    const start = Date.now()
+    await sleep(10_000, ac.signal)
+    expect(Date.now() - start).toBeLessThan(50)
+  })
 
-  test("resolves early on abort (default: no throw)", async () => {
-    const ac = new AbortController();
-    const start = Date.now();
-    const p = sleep(10_000, ac.signal);
-    setTimeout(() => ac.abort(), 30);
-    await p;
-    expect(Date.now() - start).toBeLessThan(200);
-  });
+  test('resolves early on abort (default: no throw)', async () => {
+    const ac = new AbortController()
+    const start = Date.now()
+    const p = sleep(10_000, ac.signal)
+    setTimeout(() => ac.abort(), 30)
+    await p
+    expect(Date.now() - start).toBeLessThan(200)
+  })
 
-  test("rejects on abort with throwOnAbort", async () => {
-    const ac = new AbortController();
-    ac.abort();
+  test('rejects on abort with throwOnAbort', async () => {
+    const ac = new AbortController()
+    ac.abort()
     await expect(
-      sleep(10_000, ac.signal, { throwOnAbort: true })
-    ).rejects.toThrow("aborted");
-  });
+      sleep(10_000, ac.signal, { throwOnAbort: true }),
+    ).rejects.toThrow('aborted')
+  })
 
-  test("rejects with custom abortError", async () => {
-    const ac = new AbortController();
-    ac.abort();
-    const customErr = () => new Error("custom abort");
+  test('rejects with custom abortError', async () => {
+    const ac = new AbortController()
+    ac.abort()
+    const customErr = () => new Error('custom abort')
     await expect(
-      sleep(10_000, ac.signal, { abortError: customErr })
-    ).rejects.toThrow("custom abort");
-  });
+      sleep(10_000, ac.signal, { abortError: customErr }),
+    ).rejects.toThrow('custom abort')
+  })
 
-  test("throwOnAbort rejects on mid-sleep abort", async () => {
-    const ac = new AbortController();
-    const p = sleep(10_000, ac.signal, { throwOnAbort: true });
-    setTimeout(() => ac.abort(), 20);
-    await expect(p).rejects.toThrow("aborted");
-  });
+  test('throwOnAbort rejects on mid-sleep abort', async () => {
+    const ac = new AbortController()
+    const p = sleep(10_000, ac.signal, { throwOnAbort: true })
+    setTimeout(() => ac.abort(), 20)
+    await expect(p).rejects.toThrow('aborted')
+  })
 
-  test("works without signal", async () => {
-    await sleep(10);
+  test('works without signal', async () => {
+    await sleep(10)
     // just verify it resolves
-  });
-});
+  })
+})
 
 // ─── withTimeout ───────────────────────────────────────────────────────
 
-describe("withTimeout", () => {
-  test("resolves when promise completes before timeout", async () => {
-    const result = await withTimeout(
-      Promise.resolve(42),
-      1000,
-      "timed out"
-    );
-    expect(result).toBe(42);
-  });
+describe('withTimeout', () => {
+  test('resolves when promise completes before timeout', async () => {
+    const result = await withTimeout(Promise.resolve(42), 1000, 'timed out')
+    expect(result).toBe(42)
+  })
 
-  test("rejects when promise takes too long", async () => {
-    const slow = new Promise((resolve) => setTimeout(resolve, 5000));
-    await expect(
-      withTimeout(slow, 50, "operation timed out")
-    ).rejects.toThrow("operation timed out");
-  });
+  test('rejects when promise takes too long', async () => {
+    const slow = new Promise(resolve => setTimeout(resolve, 5000))
+    await expect(withTimeout(slow, 50, 'operation timed out')).rejects.toThrow(
+      'operation timed out',
+    )
+  })
 
-  test("rejects propagate through", async () => {
+  test('rejects propagate through', async () => {
     await expect(
-      withTimeout(Promise.reject(new Error("inner")), 1000, "timeout")
-    ).rejects.toThrow("inner");
-  });
-});
+      withTimeout(Promise.reject(new Error('inner')), 1000, 'timeout'),
+    ).rejects.toThrow('inner')
+  })
+})
 
 // ─── sequential ────────────────────────────────────────────────────────
 
-describe("sequential", () => {
-  test("executes calls in order", async () => {
-    const order: number[] = [];
+describe('sequential', () => {
+  test('executes calls in order', async () => {
+    const order: number[] = []
     const fn = sequential(async (n: number) => {
-      await sleep(10);
-      order.push(n);
-      return n;
-    });
+      await sleep(10)
+      order.push(n)
+      return n
+    })
 
-    const results = await Promise.all([fn(1), fn(2), fn(3)]);
-    expect(order).toEqual([1, 2, 3]);
-    expect(results).toEqual([1, 2, 3]);
-  });
+    const results = await Promise.all([fn(1), fn(2), fn(3)])
+    expect(order).toEqual([1, 2, 3])
+    expect(results).toEqual([1, 2, 3])
+  })
 
-  test("returns correct result for each call", async () => {
-    const fn = sequential(async (x: number) => x * 2);
-    const r1 = await fn(5);
-    const r2 = await fn(10);
-    expect(r1).toBe(10);
-    expect(r2).toBe(20);
-  });
+  test('returns correct result for each call', async () => {
+    const fn = sequential(async (x: number) => x * 2)
+    const r1 = await fn(5)
+    const r2 = await fn(10)
+    expect(r1).toBe(10)
+    expect(r2).toBe(20)
+  })
 
-  test("propagates errors without blocking queue", async () => {
+  test('propagates errors without blocking queue', async () => {
     const fn = sequential(async (x: number) => {
-      if (x === 2) throw new Error("fail");
-      return x;
-    });
+      if (x === 2) throw new Error('fail')
+      return x
+    })
 
-    const p1 = fn(1);
-    const p2 = fn(2);
-    const p3 = fn(3);
+    const p1 = fn(1)
+    const p2 = fn(2)
+    const p3 = fn(3)
 
-    expect(await p1).toBe(1);
-    await expect(p2).rejects.toThrow("fail");
-    expect(await p3).toBe(3);
-  });
+    expect(await p1).toBe(1)
+    await expect(p2).rejects.toThrow('fail')
+    expect(await p3).toBe(3)
+  })
 
-  test("handles single call", async () => {
-    const fn = sequential(async (s: string) => s.toUpperCase());
-    expect(await fn("hello")).toBe("HELLO");
-  });
-});
+  test('handles single call', async () => {
+    const fn = sequential(async (s: string) => s.toUpperCase())
+    expect(await fn('hello')).toBe('HELLO')
+  })
+})
diff --git a/src/utils/__tests__/sliceAnsi.test.ts b/src/utils/__tests__/sliceAnsi.test.ts
index 340cbbe7d..77e6c252d 100644
--- a/src/utils/__tests__/sliceAnsi.test.ts
+++ b/src/utils/__tests__/sliceAnsi.test.ts
@@ -1,108 +1,110 @@
-import { mock, describe, expect, test } from "bun:test";
+import { mock, describe, expect, test } from 'bun:test'
 
 // Mock ink/stringWidth to avoid heavy Ink import chain
-mock.module("src/ink/stringWidth.js", () => ({
+mock.module('src/ink/stringWidth.js', () => ({
   stringWidth: (str: string) => {
     // Simplified width calculation for test purposes
-    let width = 0;
+    let width = 0
     for (const char of str) {
-      const code = char.codePointAt(0)!;
+      const code = char.codePointAt(0)!
       // CJK Unified Ideographs and common full-width ranges
       if (
         (code >= 0x4e00 && code <= 0x9fff) || // CJK
         (code >= 0x3000 && code <= 0x303f) || // CJK Symbols
         (code >= 0xff01 && code <= 0xff60) || // Fullwidth Forms
-        (code >= 0xf900 && code <= 0xfaff)    // CJK Compatibility
+        (code >= 0xf900 && code <= 0xfaff) // CJK Compatibility
       ) {
-        width += 2;
+        width += 2
       } else if (code > 0) {
-        width += 1;
+        width += 1
       }
     }
-    return width;
+    return width
   },
-}));
+}))
 
-const sliceAnsi = (await import("../sliceAnsi")).default;
+const sliceAnsi = (await import('../sliceAnsi')).default
 
-describe("sliceAnsi", () => {
-  test("plain text slice identical to String.slice", () => {
-    expect(sliceAnsi("hello world", 0, 5)).toBe("hello");
-    expect(sliceAnsi("hello world", 6)).toBe("world");
-  });
+describe('sliceAnsi', () => {
+  test('plain text slice identical to String.slice', () => {
+    expect(sliceAnsi('hello world', 0, 5)).toBe('hello')
+    expect(sliceAnsi('hello world', 6)).toBe('world')
+  })
 
-  test("slice entire string", () => {
-    expect(sliceAnsi("abc", 0)).toBe("abc");
-  });
+  test('slice entire string', () => {
+    expect(sliceAnsi('abc', 0)).toBe('abc')
+  })
 
-  test("empty slice (start === end)", () => {
-    expect(sliceAnsi("abc", 2, 2)).toBe("");
-  });
+  test('empty slice (start === end)', () => {
+    expect(sliceAnsi('abc', 2, 2)).toBe('')
+  })
 
-  test("preserves ANSI color codes within slice", () => {
-    const input = "\x1b[31mred\x1b[0m normal";
-    const result = sliceAnsi(input, 0, 3);
-    expect(result).toContain("\x1b[31m");
-    expect(result).toContain("red");
-  });
+  test('preserves ANSI color codes within slice', () => {
+    const input = '\x1b[31mred\x1b[0m normal'
+    const result = sliceAnsi(input, 0, 3)
+    expect(result).toContain('\x1b[31m')
+    expect(result).toContain('red')
+  })
 
-  test("closes opened ANSI styles at slice end", () => {
-    const input = "\x1b[31mhello world\x1b[0m";
-    const result = sliceAnsi(input, 0, 5);
-    expect(result).toContain("\x1b[31m");
-    expect(result).toContain("hello");
+  test('closes opened ANSI styles at slice end', () => {
+    const input = '\x1b[31mhello world\x1b[0m'
+    const result = sliceAnsi(input, 0, 5)
+    expect(result).toContain('\x1b[31m')
+    expect(result).toContain('hello')
     // undoAnsiCodes uses specific close codes (e.g. \x1b[39m for foreground)
-    expect(result).toMatch(new RegExp("\\x1b\\[\\d+m"));
+    // biome-ignore lint/suspicious/noControlCharactersInRegex: intentional ANSI escape code regex in test
+    expect(result).toMatch(/\x1b\[\d+m/)
     // The result should start with open code and end with a close code
-    const withoutText = result.replace("hello", "");
+    const withoutText = result.replace('hello', '')
     // Should have at least one open and one close code
-    expect(withoutText.length).toBeGreaterThan(0);
-  });
+    expect(withoutText.length).toBeGreaterThan(0)
+  })
 
-  test("slice starting mid-ANSI skips codes before start", () => {
-    const input = "\x1b[31mhello\x1b[0m \x1b[32mworld\x1b[0m";
-    const result = sliceAnsi(input, 6, 11);
-    expect(result).toContain("world");
-    expect(result).toContain("\x1b[32m");
-    expect(result).not.toContain("\x1b[31m");
-  });
+  test('slice starting mid-ANSI skips codes before start', () => {
+    const input = '\x1b[31mhello\x1b[0m \x1b[32mworld\x1b[0m'
+    const result = sliceAnsi(input, 6, 11)
+    expect(result).toContain('world')
+    expect(result).toContain('\x1b[32m')
+    expect(result).not.toContain('\x1b[31m')
+  })
 
-  test("slice of plain text from middle", () => {
-    expect(sliceAnsi("abcdefgh", 2, 5)).toBe("cde");
-  });
+  test('slice of plain text from middle', () => {
+    expect(sliceAnsi('abcdefgh', 2, 5)).toBe('cde')
+  })
 
-  test("slice past end of string returns everything", () => {
-    expect(sliceAnsi("abc", 0, 100)).toBe("abc");
-  });
+  test('slice past end of string returns everything', () => {
+    expect(sliceAnsi('abc', 0, 100)).toBe('abc')
+  })
 
-  test("slice starting at end returns empty", () => {
-    expect(sliceAnsi("abc", 3)).toBe("");
-  });
+  test('slice starting at end returns empty', () => {
+    expect(sliceAnsi('abc', 3)).toBe('')
+  })
 
-  test("handles empty string", () => {
-    expect(sliceAnsi("", 0, 5)).toBe("");
-  });
+  test('handles empty string', () => {
+    expect(sliceAnsi('', 0, 5)).toBe('')
+  })
 
-  test("multiple ANSI codes nested", () => {
-    const input = "\x1b[1m\x1b[31mbold red\x1b[0m\x1b[0m";
-    const result = sliceAnsi(input, 0, 4);
-    expect(result).toContain("bold");
+  test('multiple ANSI codes nested', () => {
+    const input = '\x1b[1m\x1b[31mbold red\x1b[0m\x1b[0m'
+    const result = sliceAnsi(input, 0, 4)
+    expect(result).toContain('bold')
     // Both styles should be opened and then closed
-    expect(result).toContain("\x1b[1m");
-    expect(result).toContain("\x1b[31m");
-  });
+    expect(result).toContain('\x1b[1m')
+    expect(result).toContain('\x1b[31m')
+  })
 
-  test("slice with no end parameter returns to end of string", () => {
-    expect(sliceAnsi("hello world", 6)).toBe("world");
-  });
+  test('slice with no end parameter returns to end of string', () => {
+    expect(sliceAnsi('hello world', 6)).toBe('world')
+  })
 
-  test("ANSI codes at boundaries are handled correctly", () => {
-    const input = "a\x1b[31mb\x1b[0mc";
+  test('ANSI codes at boundaries are handled correctly', () => {
+    const input = 'a\x1b[31mb\x1b[0mc'
     // "abc" visually, position: a=0, b=1, c=2
-    const result = sliceAnsi(input, 1, 2);
+    const result = sliceAnsi(input, 1, 2)
     // undoAnsiCodes uses \x1b[39m for foreground reset, not \x1b[0m
-    expect(result).toContain("b");
-    expect(result).toContain("\x1b[31m");
-    expect(result).toMatch(new RegExp("\\x1b\\[\\d+m.*\\x1b\\[\\d+m")); // open + close codes
-  });
-});
+    expect(result).toContain('b')
+    expect(result).toContain('\x1b[31m')
+    // biome-ignore lint/suspicious/noControlCharactersInRegex: intentional ANSI escape code regex in test
+    expect(result).toMatch(/\x1b\[\d+m.*\x1b\[\d+m/) // open + close codes
+  })
+})
diff --git a/src/utils/__tests__/stream.test.ts b/src/utils/__tests__/stream.test.ts
index c3ed179f6..55e3388b1 100644
--- a/src/utils/__tests__/stream.test.ts
+++ b/src/utils/__tests__/stream.test.ts
@@ -1,162 +1,164 @@
-import { describe, expect, test } from "bun:test";
-import { Stream } from "../stream";
+import { describe, expect, test } from 'bun:test'
+import { Stream } from '../stream'
 
-describe("Stream", () => {
-  test("enqueue then read resolves with the value", async () => {
-    const stream = new Stream<number>();
-    stream[Symbol.asyncIterator]();
-    stream.enqueue(42);
-    const result = await stream.next();
-    expect(result).toEqual({ done: false, value: 42 });
-  });
+describe('Stream', () => {
+  test('enqueue then read resolves with the value', async () => {
+    const stream = new Stream<number>()
+    stream[Symbol.asyncIterator]()
+    stream.enqueue(42)
+    const result = await stream.next()
+    expect(result).toEqual({ done: false, value: 42 })
+  })
 
-  test("enqueue multiple then drain in order", async () => {
-    const stream = new Stream<string>();
-    stream[Symbol.asyncIterator]();
-    stream.enqueue("a");
-    stream.enqueue("b");
-    stream.enqueue("c");
-    expect(await stream.next()).toEqual({ done: false, value: "a" });
-    expect(await stream.next()).toEqual({ done: false, value: "b" });
-    expect(await stream.next()).toEqual({ done: false, value: "c" });
-  });
+  test('enqueue multiple then drain in order', async () => {
+    const stream = new Stream<string>()
+    stream[Symbol.asyncIterator]()
+    stream.enqueue('a')
+    stream.enqueue('b')
+    stream.enqueue('c')
+    expect(await stream.next()).toEqual({ done: false, value: 'a' })
+    expect(await stream.next()).toEqual({ done: false, value: 'b' })
+    expect(await stream.next()).toEqual({ done: false, value: 'c' })
+  })
 
-  test("next() blocks until enqueue provides a value", async () => {
-    const stream = new Stream<number>();
-    stream[Symbol.asyncIterator]();
-    const promise = stream.next();
+  test('next() blocks until enqueue provides a value', async () => {
+    const stream = new Stream<number>()
+    stream[Symbol.asyncIterator]()
+    const promise = stream.next()
     // Not resolved yet — enqueue after a microtask
-    stream.enqueue(99);
-    const result = await promise;
-    expect(result).toEqual({ done: false, value: 99 });
-  });
+    stream.enqueue(99)
+    const result = await promise
+    expect(result).toEqual({ done: false, value: 99 })
+  })
 
-  test("done() resolves pending reader with done:true", async () => {
-    const stream = new Stream<number>();
-    stream[Symbol.asyncIterator]();
-    const promise = stream.next();
-    stream.done();
-    expect(await promise).toEqual({ done: true, value: undefined });
-  });
+  test('done() resolves pending reader with done:true', async () => {
+    const stream = new Stream<number>()
+    stream[Symbol.asyncIterator]()
+    const promise = stream.next()
+    stream.done()
+    expect(await promise).toEqual({ done: true, value: undefined })
+  })
 
-  test("done() with no pending reader — subsequent next returns done:true", async () => {
-    const stream = new Stream<number>();
-    stream[Symbol.asyncIterator]();
-    stream.done();
-    expect(await stream.next()).toEqual({ done: true, value: undefined });
-  });
+  test('done() with no pending reader — subsequent next returns done:true', async () => {
+    const stream = new Stream<number>()
+    stream[Symbol.asyncIterator]()
+    stream.done()
+    expect(await stream.next()).toEqual({ done: true, value: undefined })
+  })
 
-  test("error() rejects pending reader", async () => {
-    const stream = new Stream<number>();
-    stream[Symbol.asyncIterator]();
-    const promise = stream.next();
-    stream.error(new Error("boom"));
-    expect(promise).rejects.toThrow("boom");
-  });
+  test('error() rejects pending reader', async () => {
+    const stream = new Stream<number>()
+    stream[Symbol.asyncIterator]()
+    const promise = stream.next()
+    stream.error(new Error('boom'))
+    expect(promise).rejects.toThrow('boom')
+  })
 
-  test("error() after done — hasError is set but next returns done:true (isDone checked first)", async () => {
-    const stream = new Stream<number>();
-    stream[Symbol.asyncIterator]();
-    stream.done();
-    stream.error(new Error("late error"));
+  test('error() after done — hasError is set but next returns done:true (isDone checked first)', async () => {
+    const stream = new Stream<number>()
+    stream[Symbol.asyncIterator]()
+    stream.done()
+    stream.error(new Error('late error'))
     // next() checks isDone before hasError, so it returns done:true
-    expect(await stream.next()).toEqual({ done: true, value: undefined });
-  });
+    expect(await stream.next()).toEqual({ done: true, value: undefined })
+  })
 
-  test("enqueue after done — queue is checked before isDone, value is consumed", async () => {
-    const stream = new Stream<number>();
-    stream[Symbol.asyncIterator]();
-    stream.done();
-    stream.enqueue(1);
+  test('enqueue after done — queue is checked before isDone, value is consumed', async () => {
+    const stream = new Stream<number>()
+    stream[Symbol.asyncIterator]()
+    stream.done()
+    stream.enqueue(1)
     // next() checks queue.length > 0 first, so enqueued value is returned
-    expect(await stream.next()).toEqual({ done: false, value: 1 });
+    expect(await stream.next()).toEqual({ done: false, value: 1 })
     // After draining queue, done takes effect
-    expect(await stream.next()).toEqual({ done: true, value: undefined });
-  });
+    expect(await stream.next()).toEqual({ done: true, value: undefined })
+  })
 
-  test("return() marks stream as done and calls returned callback", async () => {
-    let called = false;
-    const stream = new Stream<number>(() => { called = true; });
-    stream[Symbol.asyncIterator]();
-    const result = await stream.return();
-    expect(result).toEqual({ done: true, value: undefined });
-    expect(called).toBe(true);
+  test('return() marks stream as done and calls returned callback', async () => {
+    let called = false
+    const stream = new Stream<number>(() => {
+      called = true
+    })
+    stream[Symbol.asyncIterator]()
+    const result = await stream.return()
+    expect(result).toEqual({ done: true, value: undefined })
+    expect(called).toBe(true)
     // Subsequent next returns done
-    expect(await stream.next()).toEqual({ done: true, value: undefined });
-  });
+    expect(await stream.next()).toEqual({ done: true, value: undefined })
+  })
 
-  test("return() without callback still works", async () => {
-    const stream = new Stream<number>();
-    stream[Symbol.asyncIterator]();
-    const result = await stream.return();
-    expect(result).toEqual({ done: true, value: undefined });
-  });
+  test('return() without callback still works', async () => {
+    const stream = new Stream<number>()
+    stream[Symbol.asyncIterator]()
+    const result = await stream.return()
+    expect(result).toEqual({ done: true, value: undefined })
+  })
 
-  test("Symbol.asyncIterator throws on second call", () => {
-    const stream = new Stream<number>();
-    stream[Symbol.asyncIterator]();
+  test('Symbol.asyncIterator throws on second call', () => {
+    const stream = new Stream<number>()
+    stream[Symbol.asyncIterator]()
     expect(() => stream[Symbol.asyncIterator]()).toThrow(
-      "Stream can only be iterated once"
-    );
-  });
+      'Stream can only be iterated once',
+    )
+  })
 
-  test("for-await-of iteration drains queued values then ends", async () => {
-    const stream = new Stream<string>();
-    stream.enqueue("x");
-    stream.enqueue("y");
-    stream.done();
-    const results: string[] = [];
+  test('for-await-of iteration drains queued values then ends', async () => {
+    const stream = new Stream<string>()
+    stream.enqueue('x')
+    stream.enqueue('y')
+    stream.done()
+    const results: string[] = []
     for await (const value of stream) {
-      results.push(value);
+      results.push(value)
     }
-    expect(results).toEqual(["x", "y"]);
-  });
+    expect(results).toEqual(['x', 'y'])
+  })
 
-  test("for-await-of blocks until done", async () => {
-    const stream = new Stream<number>();
-    const results: number[] = [];
+  test('for-await-of blocks until done', async () => {
+    const stream = new Stream<number>()
+    const results: number[] = []
 
     const iterPromise = (async () => {
       for await (const v of stream) {
-        results.push(v);
+        results.push(v)
       }
-    })();
+    })()
 
     // Enqueue after a tick
-    await Promise.resolve();
-    stream.enqueue(1);
-    stream.enqueue(2);
-    stream.done();
+    await Promise.resolve()
+    stream.enqueue(1)
+    stream.enqueue(2)
+    stream.done()
 
-    await iterPromise;
-    expect(results).toEqual([1, 2]);
-  });
+    await iterPromise
+    expect(results).toEqual([1, 2])
+  })
 
-  test("error during for-await-of rejects the loop", async () => {
-    const stream = new Stream<number>();
+  test('error during for-await-of rejects the loop', async () => {
+    const stream = new Stream<number>()
     const iterPromise = (async () => {
       for await (const _ of stream) {
         // will error before any value
       }
-    })();
-    stream.error(new Error("stream broken"));
-    expect(iterPromise).rejects.toThrow("stream broken");
-  });
+    })()
+    stream.error(new Error('stream broken'))
+    expect(iterPromise).rejects.toThrow('stream broken')
+  })
 
-  test("concurrent enqueue from multiple sources does not lose data", async () => {
-    const stream = new Stream<number>();
+  test('concurrent enqueue from multiple sources does not lose data', async () => {
+    const stream = new Stream<number>()
     // Rapid sequential enqueue
     for (let i = 0; i < 100; i++) {
-      stream.enqueue(i);
+      stream.enqueue(i)
     }
-    stream.done();
+    stream.done()
 
-    const results: number[] = [];
+    const results: number[] = []
     for await (const v of stream) {
-      results.push(v);
+      results.push(v)
     }
-    expect(results.length).toBe(100);
-    expect(results[0]).toBe(0);
-    expect(results[99]).toBe(99);
-  });
-});
+    expect(results.length).toBe(100)
+    expect(results[0]).toBe(0)
+    expect(results[99]).toBe(99)
+  })
+})
diff --git a/src/utils/__tests__/stringUtils.test.ts b/src/utils/__tests__/stringUtils.test.ts
index 730374daf..c60951ebe 100644
--- a/src/utils/__tests__/stringUtils.test.ts
+++ b/src/utils/__tests__/stringUtils.test.ts
@@ -1,4 +1,4 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from 'bun:test'
 import {
   escapeRegExp,
   capitalize,
@@ -10,186 +10,187 @@ import {
   safeJoinLines,
   EndTruncatingAccumulator,
   truncateToLines,
-} from "../stringUtils";
+} from '../stringUtils'
 
-describe("escapeRegExp", () => {
-  test("escapes special regex chars", () => {
-    expect(escapeRegExp("a.b*c?d")).toBe("a\\.b\\*c\\?d");
-  });
+describe('escapeRegExp', () => {
+  test('escapes special regex chars', () => {
+    expect(escapeRegExp('a.b*c?d')).toBe('a\\.b\\*c\\?d')
+  })
 
-  test("escapes brackets and parens", () => {
-    expect(escapeRegExp("[foo](bar)")).toBe("\\[foo\\]\\(bar\\)");
-  });
+  test('escapes brackets and parens', () => {
+    expect(escapeRegExp('[foo](bar)')).toBe('\\[foo\\]\\(bar\\)')
+  })
 
-  test("escapes all special chars", () => {
-    expect(escapeRegExp("^${}()|[]\\.*+?")).toBe(
-      "\\^\\$\\{\\}\\(\\)\\|\\[\\]\\\\\\.\\*\\+\\?"
-    );
-  });
+  test('escapes all special chars', () => {
+    // biome-ignore lint/suspicious/noTemplateCurlyInString: ${} is test input for escapeRegExp, not a JS template literal
+    expect(escapeRegExp('^${}()|[]\\.*+?')).toBe(
+      '\\^\\$\\{\\}\\(\\)\\|\\[\\]\\\\\\.\\*\\+\\?',
+    )
+  })
 
-  test("returns normal string unchanged", () => {
-    expect(escapeRegExp("hello")).toBe("hello");
-  });
-});
+  test('returns normal string unchanged', () => {
+    expect(escapeRegExp('hello')).toBe('hello')
+  })
+})
 
-describe("capitalize", () => {
-  test("uppercases first char", () => {
-    expect(capitalize("hello")).toBe("Hello");
-  });
+describe('capitalize', () => {
+  test('uppercases first char', () => {
+    expect(capitalize('hello')).toBe('Hello')
+  })
 
-  test("does NOT lowercase rest", () => {
-    expect(capitalize("fooBar")).toBe("FooBar");
-  });
+  test('does NOT lowercase rest', () => {
+    expect(capitalize('fooBar')).toBe('FooBar')
+  })
 
-  test("handles single char", () => {
-    expect(capitalize("a")).toBe("A");
-  });
+  test('handles single char', () => {
+    expect(capitalize('a')).toBe('A')
+  })
 
-  test("handles empty string", () => {
-    expect(capitalize("")).toBe("");
-  });
-});
+  test('handles empty string', () => {
+    expect(capitalize('')).toBe('')
+  })
+})
 
-describe("plural", () => {
-  test("returns singular for 1", () => {
-    expect(plural(1, "file")).toBe("file");
-  });
+describe('plural', () => {
+  test('returns singular for 1', () => {
+    expect(plural(1, 'file')).toBe('file')
+  })
 
-  test("returns plural for 0", () => {
-    expect(plural(0, "file")).toBe("files");
-  });
+  test('returns plural for 0', () => {
+    expect(plural(0, 'file')).toBe('files')
+  })
 
-  test("returns plural for many", () => {
-    expect(plural(3, "file")).toBe("files");
-  });
+  test('returns plural for many', () => {
+    expect(plural(3, 'file')).toBe('files')
+  })
 
-  test("uses custom plural form", () => {
-    expect(plural(2, "entry", "entries")).toBe("entries");
-  });
-});
+  test('uses custom plural form', () => {
+    expect(plural(2, 'entry', 'entries')).toBe('entries')
+  })
+})
 
-describe("firstLineOf", () => {
-  test("returns first line of multiline string", () => {
-    expect(firstLineOf("line1\nline2\nline3")).toBe("line1");
-  });
+describe('firstLineOf', () => {
+  test('returns first line of multiline string', () => {
+    expect(firstLineOf('line1\nline2\nline3')).toBe('line1')
+  })
 
-  test("returns whole string if no newline", () => {
-    expect(firstLineOf("single line")).toBe("single line");
-  });
+  test('returns whole string if no newline', () => {
+    expect(firstLineOf('single line')).toBe('single line')
+  })
 
-  test("returns empty string for leading newline", () => {
-    expect(firstLineOf("\nline2")).toBe("");
-  });
-});
+  test('returns empty string for leading newline', () => {
+    expect(firstLineOf('\nline2')).toBe('')
+  })
+})
 
-describe("countCharInString", () => {
-  test("counts occurrences of a character", () => {
-    expect(countCharInString("hello world", "l")).toBe(3);
-  });
+describe('countCharInString', () => {
+  test('counts occurrences of a character', () => {
+    expect(countCharInString('hello world', 'l')).toBe(3)
+  })
 
-  test("returns 0 for no match", () => {
-    expect(countCharInString("hello", "z")).toBe(0);
-  });
+  test('returns 0 for no match', () => {
+    expect(countCharInString('hello', 'z')).toBe(0)
+  })
 
-  test("counts from start offset", () => {
-    expect(countCharInString("aabaa", "a", 2)).toBe(2);
-  });
+  test('counts from start offset', () => {
+    expect(countCharInString('aabaa', 'a', 2)).toBe(2)
+  })
 
-  test("returns 0 for empty string", () => {
-    expect(countCharInString("", "a")).toBe(0);
-  });
-});
+  test('returns 0 for empty string', () => {
+    expect(countCharInString('', 'a')).toBe(0)
+  })
+})
 
-describe("normalizeFullWidthDigits", () => {
-  test("converts full-width digits to half-width", () => {
-    expect(normalizeFullWidthDigits("０１２３４５６７８９")).toBe("0123456789");
-  });
+describe('normalizeFullWidthDigits', () => {
+  test('converts full-width digits to half-width', () => {
+    expect(normalizeFullWidthDigits('０１２３４５６７８９')).toBe('0123456789')
+  })
 
-  test("leaves half-width digits unchanged", () => {
-    expect(normalizeFullWidthDigits("0123")).toBe("0123");
-  });
+  test('leaves half-width digits unchanged', () => {
+    expect(normalizeFullWidthDigits('0123')).toBe('0123')
+  })
 
-  test("handles mixed content", () => {
-    expect(normalizeFullWidthDigits("test１２３")).toBe("test123");
-  });
-});
+  test('handles mixed content', () => {
+    expect(normalizeFullWidthDigits('test１２３')).toBe('test123')
+  })
+})
 
-describe("normalizeFullWidthSpace", () => {
-  test("converts full-width space to half-width", () => {
-    expect(normalizeFullWidthSpace("a\u3000b")).toBe("a b");
-  });
+describe('normalizeFullWidthSpace', () => {
+  test('converts full-width space to half-width', () => {
+    expect(normalizeFullWidthSpace('a\u3000b')).toBe('a b')
+  })
 
-  test("leaves normal spaces unchanged", () => {
-    expect(normalizeFullWidthSpace("a b")).toBe("a b");
-  });
-});
+  test('leaves normal spaces unchanged', () => {
+    expect(normalizeFullWidthSpace('a b')).toBe('a b')
+  })
+})
 
-describe("safeJoinLines", () => {
-  test("joins lines with delimiter", () => {
-    expect(safeJoinLines(["a", "b", "c"], ",")).toBe("a,b,c");
-  });
+describe('safeJoinLines', () => {
+  test('joins lines with delimiter', () => {
+    expect(safeJoinLines(['a', 'b', 'c'], ',')).toBe('a,b,c')
+  })
 
-  test("truncates when exceeding maxSize", () => {
-    const result = safeJoinLines(["hello", "world", "foo"], ",", 12);
-    expect(result.length).toBeLessThanOrEqual(12 + "...[truncated]".length);
-    expect(result).toContain("...[truncated]");
-  });
+  test('truncates when exceeding maxSize', () => {
+    const result = safeJoinLines(['hello', 'world', 'foo'], ',', 12)
+    expect(result.length).toBeLessThanOrEqual(12 + '...[truncated]'.length)
+    expect(result).toContain('...[truncated]')
+  })
 
-  test("returns empty string for empty input", () => {
-    expect(safeJoinLines([])).toBe("");
-  });
-});
+  test('returns empty string for empty input', () => {
+    expect(safeJoinLines([])).toBe('')
+  })
+})
 
-describe("EndTruncatingAccumulator", () => {
-  test("accumulates text", () => {
-    const acc = new EndTruncatingAccumulator(100);
-    acc.append("hello ");
-    acc.append("world");
-    expect(acc.toString()).toBe("hello world");
-  });
+describe('EndTruncatingAccumulator', () => {
+  test('accumulates text', () => {
+    const acc = new EndTruncatingAccumulator(100)
+    acc.append('hello ')
+    acc.append('world')
+    expect(acc.toString()).toBe('hello world')
+  })
 
-  test("truncates when exceeding maxSize", () => {
-    const acc = new EndTruncatingAccumulator(10);
-    acc.append("12345678901234567890");
-    expect(acc.truncated).toBe(true);
-    expect(acc.length).toBe(10);
-  });
+  test('truncates when exceeding maxSize', () => {
+    const acc = new EndTruncatingAccumulator(10)
+    acc.append('12345678901234567890')
+    expect(acc.truncated).toBe(true)
+    expect(acc.length).toBe(10)
+  })
 
-  test("reports total bytes received", () => {
-    const acc = new EndTruncatingAccumulator(5);
-    acc.append("1234567890");
-    expect(acc.totalBytes).toBe(10);
-  });
+  test('reports total bytes received', () => {
+    const acc = new EndTruncatingAccumulator(5)
+    acc.append('1234567890')
+    expect(acc.totalBytes).toBe(10)
+  })
 
-  test("clear resets state", () => {
-    const acc = new EndTruncatingAccumulator(100);
-    acc.append("hello");
-    acc.clear();
-    expect(acc.toString()).toBe("");
-    expect(acc.length).toBe(0);
-    expect(acc.truncated).toBe(false);
-  });
+  test('clear resets state', () => {
+    const acc = new EndTruncatingAccumulator(100)
+    acc.append('hello')
+    acc.clear()
+    expect(acc.toString()).toBe('')
+    expect(acc.length).toBe(0)
+    expect(acc.truncated).toBe(false)
+  })
 
-  test("stops accepting data once truncated and full", () => {
-    const acc = new EndTruncatingAccumulator(5);
-    acc.append("12345");
-    acc.append("67890");
-    expect(acc.length).toBe(5);
-    acc.append("more");
-    expect(acc.length).toBe(5);
-  });
-});
+  test('stops accepting data once truncated and full', () => {
+    const acc = new EndTruncatingAccumulator(5)
+    acc.append('12345')
+    acc.append('67890')
+    expect(acc.length).toBe(5)
+    acc.append('more')
+    expect(acc.length).toBe(5)
+  })
+})
 
-describe("truncateToLines", () => {
-  test("returns text unchanged if within limit", () => {
-    expect(truncateToLines("a\nb\nc", 5)).toBe("a\nb\nc");
-  });
+describe('truncateToLines', () => {
+  test('returns text unchanged if within limit', () => {
+    expect(truncateToLines('a\nb\nc', 5)).toBe('a\nb\nc')
+  })
 
-  test("truncates text exceeding limit", () => {
-    expect(truncateToLines("a\nb\nc\nd\ne", 3)).toBe("a\nb\nc…");
-  });
+  test('truncates text exceeding limit', () => {
+    expect(truncateToLines('a\nb\nc\nd\ne', 3)).toBe('a\nb\nc…')
+  })
 
-  test("handles single line", () => {
-    expect(truncateToLines("hello", 1)).toBe("hello");
-  });
-});
+  test('handles single line', () => {
+    expect(truncateToLines('hello', 1)).toBe('hello')
+  })
+})
diff --git a/src/utils/__tests__/systemPrompt.test.ts b/src/utils/__tests__/systemPrompt.test.ts
index f7c9eddd3..177f262bc 100644
--- a/src/utils/__tests__/systemPrompt.test.ts
+++ b/src/utils/__tests__/systemPrompt.test.ts
@@ -1,7 +1,7 @@
-import { describe, expect, test } from "bun:test";
-import { buildEffectiveSystemPrompt } from "../systemPrompt";
+import { describe, expect, test } from 'bun:test'
+import { buildEffectiveSystemPrompt } from '../systemPrompt'
 
-const defaultPrompt = ["You are a helpful assistant.", "Follow instructions."];
+const defaultPrompt = ['You are a helpful assistant.', 'Follow instructions.']
 
 function buildPrompt(overrides: Record<string, unknown> = {}) {
   return buildEffectiveSystemPrompt({
@@ -11,78 +11,78 @@ function buildPrompt(overrides: Record<string, unknown> = {}) {
     defaultSystemPrompt: defaultPrompt,
     appendSystemPrompt: undefined,
     ...overrides,
-  });
+  })
 }
 
-describe("buildEffectiveSystemPrompt", () => {
-  test("returns default system prompt when no overrides", () => {
-    const result = buildPrompt();
-    expect(Array.from(result)).toEqual(defaultPrompt);
-  });
+describe('buildEffectiveSystemPrompt', () => {
+  test('returns default system prompt when no overrides', () => {
+    const result = buildPrompt()
+    expect(Array.from(result)).toEqual(defaultPrompt)
+  })
 
-  test("overrideSystemPrompt replaces everything", () => {
-    const result = buildPrompt({ overrideSystemPrompt: "override" });
-    expect(Array.from(result)).toEqual(["override"]);
-  });
+  test('overrideSystemPrompt replaces everything', () => {
+    const result = buildPrompt({ overrideSystemPrompt: 'override' })
+    expect(Array.from(result)).toEqual(['override'])
+  })
 
-  test("customSystemPrompt replaces default", () => {
-    const result = buildPrompt({ customSystemPrompt: "custom" });
-    expect(Array.from(result)).toEqual(["custom"]);
-  });
+  test('customSystemPrompt replaces default', () => {
+    const result = buildPrompt({ customSystemPrompt: 'custom' })
+    expect(Array.from(result)).toEqual(['custom'])
+  })
 
-  test("appendSystemPrompt is appended after main prompt", () => {
-    const result = buildPrompt({ appendSystemPrompt: "appended" });
-    expect(Array.from(result)).toEqual([...defaultPrompt, "appended"]);
-  });
+  test('appendSystemPrompt is appended after main prompt', () => {
+    const result = buildPrompt({ appendSystemPrompt: 'appended' })
+    expect(Array.from(result)).toEqual([...defaultPrompt, 'appended'])
+  })
 
-  test("agent definition replaces default prompt", () => {
+  test('agent definition replaces default prompt', () => {
     const agentDef = {
-      getSystemPrompt: () => "agent prompt",
-      agentType: "custom",
-    } as any;
-    const result = buildPrompt({ mainThreadAgentDefinition: agentDef });
-    expect(Array.from(result)).toEqual(["agent prompt"]);
-  });
+      getSystemPrompt: () => 'agent prompt',
+      agentType: 'custom',
+    } as any
+    const result = buildPrompt({ mainThreadAgentDefinition: agentDef })
+    expect(Array.from(result)).toEqual(['agent prompt'])
+  })
 
-  test("agent definition with append combines both", () => {
+  test('agent definition with append combines both', () => {
     const agentDef = {
-      getSystemPrompt: () => "agent prompt",
-      agentType: "custom",
-    } as any;
+      getSystemPrompt: () => 'agent prompt',
+      agentType: 'custom',
+    } as any
     const result = buildPrompt({
       mainThreadAgentDefinition: agentDef,
-      appendSystemPrompt: "extra",
-    });
-    expect(Array.from(result)).toEqual(["agent prompt", "extra"]);
-  });
+      appendSystemPrompt: 'extra',
+    })
+    expect(Array.from(result)).toEqual(['agent prompt', 'extra'])
+  })
 
-  test("override takes precedence over agent and custom", () => {
+  test('override takes precedence over agent and custom', () => {
     const agentDef = {
-      getSystemPrompt: () => "agent prompt",
-      agentType: "custom",
-    } as any;
+      getSystemPrompt: () => 'agent prompt',
+      agentType: 'custom',
+    } as any
     const result = buildPrompt({
       mainThreadAgentDefinition: agentDef,
-      customSystemPrompt: "custom",
-      appendSystemPrompt: "extra",
-      overrideSystemPrompt: "override",
-    });
-    expect(Array.from(result)).toEqual(["override"]);
-  });
+      customSystemPrompt: 'custom',
+      appendSystemPrompt: 'extra',
+      overrideSystemPrompt: 'override',
+    })
+    expect(Array.from(result)).toEqual(['override'])
+  })
 
-  test("returns array of strings", () => {
-    const result = buildPrompt();
-    expect(Array.isArray(result)).toBe(true);
+  test('returns array of strings', () => {
+    const result = buildPrompt()
+    expect(Array.isArray(result)).toBe(true)
     for (const item of result) {
-      expect(typeof item).toBe("string");
+      expect(typeof item).toBe('string')
     }
-  });
+  })
 
-  test("custom + append combines both", () => {
+  test('custom + append combines both', () => {
     const result = buildPrompt({
-      customSystemPrompt: "custom",
-      appendSystemPrompt: "extra",
-    });
-    expect(Array.from(result)).toEqual(["custom", "extra"]);
-  });
-});
+      customSystemPrompt: 'custom',
+      appendSystemPrompt: 'extra',
+    })
+    expect(Array.from(result)).toEqual(['custom', 'extra'])
+  })
+})
diff --git a/src/utils/__tests__/taggedId.test.ts b/src/utils/__tests__/taggedId.test.ts
index 445abce6f..82f45cd25 100644
--- a/src/utils/__tests__/taggedId.test.ts
+++ b/src/utils/__tests__/taggedId.test.ts
@@ -1,104 +1,91 @@
-import { describe, expect, test } from "bun:test";
-import { toTaggedId } from "../taggedId";
+import { describe, expect, test } from 'bun:test'
+import { toTaggedId } from '../taggedId'
 
 const BASE_58_CHARS =
-  "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
+  '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'
 
-describe("toTaggedId", () => {
+describe('toTaggedId', () => {
   test("zero UUID produces all base58 '1's (first char)", () => {
-    const result = toTaggedId(
-      "user",
-      "00000000-0000-0000-0000-000000000000"
-    );
+    const result = toTaggedId('user', '00000000-0000-0000-0000-000000000000')
     // base58 of 0 is all '1's (the first base58 character)
-    expect(result).toBe("user_01" + "1".repeat(22));
-  });
+    expect(result).toBe('user_01' + '1'.repeat(22))
+  })
 
-  test("format is tag_01 + 22 base58 chars", () => {
-    const result = toTaggedId(
-      "user",
-      "550e8400-e29b-41d4-a716-446655440000"
-    );
+  test('format is tag_01 + 22 base58 chars', () => {
+    const result = toTaggedId('user', '550e8400-e29b-41d4-a716-446655440000')
     expect(result).toMatch(
-      new RegExp(`^user_01[${BASE_58_CHARS.replace(/[-]/g, "\\-")}]{22}$`)
-    );
-  });
+      new RegExp(`^user_01[${BASE_58_CHARS.replace(/[-]/g, '\\-')}]{22}$`),
+    )
+  })
 
-  test("output starts with the provided tag", () => {
-    const result = toTaggedId("org", "550e8400-e29b-41d4-a716-446655440000");
-    expect(result.startsWith("org_01")).toBe(true);
-  });
+  test('output starts with the provided tag', () => {
+    const result = toTaggedId('org', '550e8400-e29b-41d4-a716-446655440000')
+    expect(result.startsWith('org_01')).toBe(true)
+  })
 
-  test("UUID with hyphens equals UUID without hyphens", () => {
+  test('UUID with hyphens equals UUID without hyphens', () => {
     const withHyphens = toTaggedId(
-      "user",
-      "550e8400-e29b-41d4-a716-446655440000"
-    );
+      'user',
+      '550e8400-e29b-41d4-a716-446655440000',
+    )
     const withoutHyphens = toTaggedId(
-      "user",
-      "550e8400e29b41d4a716446655440000"
-    );
-    expect(withHyphens).toBe(withoutHyphens);
-  });
+      'user',
+      '550e8400e29b41d4a716446655440000',
+    )
+    expect(withHyphens).toBe(withoutHyphens)
+  })
 
-  test("different tags produce different prefixes", () => {
-    const uuid = "550e8400-e29b-41d4-a716-446655440000";
-    const userResult = toTaggedId("user", uuid);
-    const orgResult = toTaggedId("org", uuid);
-    const msgResult = toTaggedId("msg", uuid);
+  test('different tags produce different prefixes', () => {
+    const uuid = '550e8400-e29b-41d4-a716-446655440000'
+    const userResult = toTaggedId('user', uuid)
+    const orgResult = toTaggedId('org', uuid)
+    const msgResult = toTaggedId('msg', uuid)
     // They share the same base58 suffix but different prefixes
-    expect(userResult.slice(userResult.indexOf("_01") + 3)).toBe(
-      orgResult.slice(orgResult.indexOf("_01") + 3)
-    );
-    expect(userResult).not.toBe(orgResult);
-    expect(orgResult).not.toBe(msgResult);
-  });
+    expect(userResult.slice(userResult.indexOf('_01') + 3)).toBe(
+      orgResult.slice(orgResult.indexOf('_01') + 3),
+    )
+    expect(userResult).not.toBe(orgResult)
+    expect(orgResult).not.toBe(msgResult)
+  })
 
-  test("different UUIDs produce different encoded parts", () => {
-    const result1 = toTaggedId(
-      "user",
-      "550e8400-e29b-41d4-a716-446655440000"
-    );
-    const result2 = toTaggedId(
-      "user",
-      "661f9500-f3ac-52e5-b827-557766550111"
-    );
-    expect(result1).not.toBe(result2);
-  });
+  test('different UUIDs produce different encoded parts', () => {
+    const result1 = toTaggedId('user', '550e8400-e29b-41d4-a716-446655440000')
+    const result2 = toTaggedId('user', '661f9500-f3ac-52e5-b827-557766550111')
+    expect(result1).not.toBe(result2)
+  })
 
-  test("encoded part is always exactly 22 characters", () => {
+  test('encoded part is always exactly 22 characters', () => {
     const uuids = [
-      "00000000-0000-0000-0000-000000000000",
-      "ffffffff-ffff-ffff-ffff-ffffffffffff",
-      "550e8400-e29b-41d4-a716-446655440000",
-      "00000000-0000-0000-0000-000000000001",
-    ];
+      '00000000-0000-0000-0000-000000000000',
+      'ffffffff-ffff-ffff-ffff-ffffffffffff',
+      '550e8400-e29b-41d4-a716-446655440000',
+      '00000000-0000-0000-0000-000000000001',
+    ]
     for (const uuid of uuids) {
-      const result = toTaggedId("test", uuid);
-      const encoded = result.slice("test_01".length);
-      expect(encoded).toHaveLength(22);
+      const result = toTaggedId('test', uuid)
+      const encoded = result.slice('test_01'.length)
+      expect(encoded).toHaveLength(22)
     }
-  });
+  })
 
-  test("throws on invalid UUID (too short)", () => {
-    expect(() => toTaggedId("user", "abcdef")).toThrow("Invalid UUID hex length");
-  });
+  test('throws on invalid UUID (too short)', () => {
+    expect(() => toTaggedId('user', 'abcdef')).toThrow(
+      'Invalid UUID hex length',
+    )
+  })
 
-  test("throws on invalid UUID (too long)", () => {
+  test('throws on invalid UUID (too long)', () => {
     expect(() =>
-      toTaggedId("user", "550e8400e29b41d4a716446655440000ff")
-    ).toThrow("Invalid UUID hex length");
-  });
+      toTaggedId('user', '550e8400e29b41d4a716446655440000ff'),
+    ).toThrow('Invalid UUID hex length')
+  })
 
   test("max UUID (all f's) produces valid base58 output", () => {
-    const result = toTaggedId(
-      "user",
-      "ffffffff-ffff-ffff-ffff-ffffffffffff"
-    );
-    expect(result.startsWith("user_01")).toBe(true);
-    const encoded = result.slice("user_01".length);
+    const result = toTaggedId('user', 'ffffffff-ffff-ffff-ffff-ffffffffffff')
+    expect(result.startsWith('user_01')).toBe(true)
+    const encoded = result.slice('user_01'.length)
     for (const ch of encoded) {
-      expect(BASE_58_CHARS).toContain(ch);
+      expect(BASE_58_CHARS).toContain(ch)
     }
-  });
-});
+  })
+})
diff --git a/src/utils/__tests__/textHighlighting.test.ts b/src/utils/__tests__/textHighlighting.test.ts
index dc7ccaf96..2b3d7eb63 100644
--- a/src/utils/__tests__/textHighlighting.test.ts
+++ b/src/utils/__tests__/textHighlighting.test.ts
@@ -1,131 +1,141 @@
-import { describe, expect, test } from "bun:test";
-import { segmentTextByHighlights, type TextHighlight } from "../textHighlighting";
+import { describe, expect, test } from 'bun:test'
+import {
+  segmentTextByHighlights,
+  type TextHighlight,
+} from '../textHighlighting'
 
-describe("segmentTextByHighlights", () => {
+describe('segmentTextByHighlights', () => {
   // Basic
-  test("returns single segment with no highlights", () => {
-    const segments = segmentTextByHighlights("hello world", []);
-    expect(segments).toHaveLength(1);
-    expect(segments[0].text).toBe("hello world");
-    expect(segments[0].highlight).toBeUndefined();
-  });
+  test('returns single segment with no highlights', () => {
+    const segments = segmentTextByHighlights('hello world', [])
+    expect(segments).toHaveLength(1)
+    expect(segments[0].text).toBe('hello world')
+    expect(segments[0].highlight).toBeUndefined()
+  })
 
-  test("returns highlighted segment for single highlight", () => {
+  test('returns highlighted segment for single highlight', () => {
     const highlights: TextHighlight[] = [
       { start: 0, end: 5, color: undefined, priority: 0 },
-    ];
-    const segments = segmentTextByHighlights("hello world", highlights);
-    expect(segments.length).toBeGreaterThanOrEqual(2);
-    expect(segments.some(s => s.highlight !== undefined)).toBe(true);
-  });
+    ]
+    const segments = segmentTextByHighlights('hello world', highlights)
+    expect(segments.length).toBeGreaterThanOrEqual(2)
+    expect(segments.some(s => s.highlight !== undefined)).toBe(true)
+  })
 
-  test("returns three segments for highlight in the middle", () => {
+  test('returns three segments for highlight in the middle', () => {
     const highlights: TextHighlight[] = [
       { start: 3, end: 7, color: undefined, priority: 0 },
-    ];
-    const segments = segmentTextByHighlights("hello world", highlights);
-    expect(segments.length).toBeGreaterThanOrEqual(2);
-  });
+    ]
+    const segments = segmentTextByHighlights('hello world', highlights)
+    expect(segments.length).toBeGreaterThanOrEqual(2)
+  })
 
-  test("highlight covering entire text", () => {
+  test('highlight covering entire text', () => {
     const highlights: TextHighlight[] = [
       { start: 0, end: 5, color: undefined, priority: 0 },
-    ];
-    const segments = segmentTextByHighlights("hello", highlights);
-    expect(segments).toHaveLength(1);
-    expect(segments[0].highlight).toBeDefined();
-  });
+    ]
+    const segments = segmentTextByHighlights('hello', highlights)
+    expect(segments).toHaveLength(1)
+    expect(segments[0].highlight).toBeDefined()
+  })
 
   // Multiple highlights
-  test("handles non-overlapping highlights", () => {
+  test('handles non-overlapping highlights', () => {
     const highlights: TextHighlight[] = [
       { start: 0, end: 3, color: undefined, priority: 0 },
       { start: 6, end: 9, color: undefined, priority: 0 },
-    ];
-    const segments = segmentTextByHighlights("abcXYZdef", highlights);
-    const highlighted = segments.filter(s => s.highlight);
-    expect(highlighted.length).toBe(2);
-  });
+    ]
+    const segments = segmentTextByHighlights('abcXYZdef', highlights)
+    const highlighted = segments.filter(s => s.highlight)
+    expect(highlighted.length).toBe(2)
+  })
 
-  test("handles overlapping highlights (priority-based)", () => {
+  test('handles overlapping highlights (priority-based)', () => {
     const highlights: TextHighlight[] = [
       { start: 0, end: 5, color: undefined, priority: 0 },
       { start: 3, end: 8, color: undefined, priority: 1 },
-    ];
-    const segments = segmentTextByHighlights("hello world", highlights);
+    ]
+    const segments = segmentTextByHighlights('hello world', highlights)
     // Overlapping: higher priority wins or they don't overlap
-    expect(segments.length).toBeGreaterThan(0);
-  });
+    expect(segments.length).toBeGreaterThan(0)
+  })
 
-  test("handles adjacent highlights", () => {
+  test('handles adjacent highlights', () => {
     const highlights: TextHighlight[] = [
       { start: 0, end: 3, color: undefined, priority: 0 },
       { start: 3, end: 6, color: undefined, priority: 0 },
-    ];
-    const segments = segmentTextByHighlights("abcdef", highlights);
-    const highlighted = segments.filter(s => s.highlight);
-    expect(highlighted.length).toBe(2);
-  });
+    ]
+    const segments = segmentTextByHighlights('abcdef', highlights)
+    const highlighted = segments.filter(s => s.highlight)
+    expect(highlighted.length).toBe(2)
+  })
 
   // Boundary
-  test("highlight starting at 0", () => {
+  test('highlight starting at 0', () => {
     const highlights: TextHighlight[] = [
       { start: 0, end: 3, color: undefined, priority: 0 },
-    ];
-    const segments = segmentTextByHighlights("abcdef", highlights);
-    expect(segments[0].start).toBe(0);
-  });
+    ]
+    const segments = segmentTextByHighlights('abcdef', highlights)
+    expect(segments[0].start).toBe(0)
+  })
 
-  test("highlight ending at text length", () => {
-    const text = "hello";
+  test('highlight ending at text length', () => {
+    const text = 'hello'
     const highlights: TextHighlight[] = [
       { start: 3, end: 5, color: undefined, priority: 0 },
-    ];
-    const segments = segmentTextByHighlights(text, highlights);
-    expect(segments.length).toBeGreaterThan(0);
-  });
+    ]
+    const segments = segmentTextByHighlights(text, highlights)
+    expect(segments.length).toBeGreaterThan(0)
+  })
 
-  test("empty highlights array returns single segment", () => {
-    const segments = segmentTextByHighlights("text", []);
-    expect(segments).toHaveLength(1);
-    expect(segments[0].highlight).toBeUndefined();
-  });
+  test('empty highlights array returns single segment', () => {
+    const segments = segmentTextByHighlights('text', [])
+    expect(segments).toHaveLength(1)
+    expect(segments[0].highlight).toBeUndefined()
+  })
 
   // Properties
-  test("preserves highlight color property", () => {
+  test('preserves highlight color property', () => {
     const highlights: TextHighlight[] = [
-      { start: 0, end: 3, color: "primary" as any, priority: 0 },
-    ];
-    const segments = segmentTextByHighlights("abc", highlights);
-    const highlighted = segments.find(s => s.highlight);
-    expect(highlighted?.highlight?.color as string).toBe("primary");
-  });
+      { start: 0, end: 3, color: 'primary' as any, priority: 0 },
+    ]
+    const segments = segmentTextByHighlights('abc', highlights)
+    const highlighted = segments.find(s => s.highlight)
+    expect(highlighted?.highlight?.color as string).toBe('primary')
+  })
 
-  test("preserves highlight priority property", () => {
+  test('preserves highlight priority property', () => {
     const highlights: TextHighlight[] = [
       { start: 0, end: 3, color: undefined, priority: 5 },
-    ];
-    const segments = segmentTextByHighlights("abc", highlights);
-    const highlighted = segments.find(s => s.highlight);
-    expect(highlighted?.highlight?.priority).toBe(5);
-  });
+    ]
+    const segments = segmentTextByHighlights('abc', highlights)
+    const highlighted = segments.find(s => s.highlight)
+    expect(highlighted?.highlight?.priority).toBe(5)
+  })
 
-  test("preserves dimColor and inverse flags", () => {
+  test('preserves dimColor and inverse flags', () => {
     const highlights: TextHighlight[] = [
-      { start: 0, end: 3, color: undefined, priority: 0, dimColor: true, inverse: true },
-    ];
-    const segments = segmentTextByHighlights("abc", highlights);
-    const highlighted = segments.find(s => s.highlight);
-    expect(highlighted?.highlight?.dimColor).toBe(true);
-    expect(highlighted?.highlight?.inverse).toBe(true);
-  });
+      {
+        start: 0,
+        end: 3,
+        color: undefined,
+        priority: 0,
+        dimColor: true,
+        inverse: true,
+      },
+    ]
+    const segments = segmentTextByHighlights('abc', highlights)
+    const highlighted = segments.find(s => s.highlight)
+    expect(highlighted?.highlight?.dimColor).toBe(true)
+    expect(highlighted?.highlight?.inverse).toBe(true)
+  })
 
-  test("highlights with start === end are skipped", () => {
+  test('highlights with start === end are skipped', () => {
     const highlights: TextHighlight[] = [
       { start: 3, end: 3, color: undefined, priority: 0 },
-    ];
-    const segments = segmentTextByHighlights("abcdef", highlights);
-    expect(segments).toHaveLength(1);
-    expect(segments[0].highlight).toBeUndefined();
-  });
-});
+    ]
+    const segments = segmentTextByHighlights('abcdef', highlights)
+    expect(segments).toHaveLength(1)
+    expect(segments[0].highlight).toBeUndefined()
+  })
+})
diff --git a/src/utils/__tests__/tokenBudget.test.ts b/src/utils/__tests__/tokenBudget.test.ts
index 016b39583..99e6dfc02 100644
--- a/src/utils/__tests__/tokenBudget.test.ts
+++ b/src/utils/__tests__/tokenBudget.test.ts
@@ -1,150 +1,150 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from 'bun:test'
 import {
   parseTokenBudget,
   findTokenBudgetPositions,
   getBudgetContinuationMessage,
-} from "../tokenBudget";
+} from '../tokenBudget'
 
-describe("parseTokenBudget", () => {
+describe('parseTokenBudget', () => {
   // --- shorthand at start ---
-  test("parses +500k at start", () => {
-    expect(parseTokenBudget("+500k")).toBe(500_000);
-  });
+  test('parses +500k at start', () => {
+    expect(parseTokenBudget('+500k')).toBe(500_000)
+  })
 
-  test("parses +2.5M at start", () => {
-    expect(parseTokenBudget("+2.5M")).toBe(2_500_000);
-  });
+  test('parses +2.5M at start', () => {
+    expect(parseTokenBudget('+2.5M')).toBe(2_500_000)
+  })
 
-  test("parses +1b at start", () => {
-    expect(parseTokenBudget("+1b")).toBe(1_000_000_000);
-  });
+  test('parses +1b at start', () => {
+    expect(parseTokenBudget('+1b')).toBe(1_000_000_000)
+  })
 
-  test("parses shorthand with leading whitespace", () => {
-    expect(parseTokenBudget("  +500k")).toBe(500_000);
-  });
+  test('parses shorthand with leading whitespace', () => {
+    expect(parseTokenBudget('  +500k')).toBe(500_000)
+  })
 
   // --- shorthand at end ---
-  test("parses +1.5m at end of sentence", () => {
-    expect(parseTokenBudget("do this +1.5m")).toBe(1_500_000);
-  });
+  test('parses +1.5m at end of sentence', () => {
+    expect(parseTokenBudget('do this +1.5m')).toBe(1_500_000)
+  })
 
-  test("parses shorthand at end with trailing period", () => {
-    expect(parseTokenBudget("please continue +100k.")).toBe(100_000);
-  });
+  test('parses shorthand at end with trailing period', () => {
+    expect(parseTokenBudget('please continue +100k.')).toBe(100_000)
+  })
 
-  test("parses shorthand at end with trailing whitespace", () => {
-    expect(parseTokenBudget("keep going +250k  ")).toBe(250_000);
-  });
+  test('parses shorthand at end with trailing whitespace', () => {
+    expect(parseTokenBudget('keep going +250k  ')).toBe(250_000)
+  })
 
   // --- verbose ---
   test("parses 'use 2M tokens'", () => {
-    expect(parseTokenBudget("use 2M tokens")).toBe(2_000_000);
-  });
+    expect(parseTokenBudget('use 2M tokens')).toBe(2_000_000)
+  })
 
   test("parses 'spend 500k tokens'", () => {
-    expect(parseTokenBudget("spend 500k tokens")).toBe(500_000);
-  });
+    expect(parseTokenBudget('spend 500k tokens')).toBe(500_000)
+  })
 
   test("parses verbose with singular 'token'", () => {
-    expect(parseTokenBudget("use 1k token")).toBe(1_000);
-  });
+    expect(parseTokenBudget('use 1k token')).toBe(1_000)
+  })
 
-  test("parses verbose embedded in sentence", () => {
-    expect(parseTokenBudget("please use 3.5m tokens for this task")).toBe(
-      3_500_000
-    );
-  });
+  test('parses verbose embedded in sentence', () => {
+    expect(parseTokenBudget('please use 3.5m tokens for this task')).toBe(
+      3_500_000,
+    )
+  })
 
   // --- no match (returns null) ---
-  test("returns null for plain text", () => {
-    expect(parseTokenBudget("hello world")).toBeNull();
-  });
+  test('returns null for plain text', () => {
+    expect(parseTokenBudget('hello world')).toBeNull()
+  })
 
-  test("returns null for bare number without +", () => {
-    expect(parseTokenBudget("500k")).toBeNull();
-  });
+  test('returns null for bare number without +', () => {
+    expect(parseTokenBudget('500k')).toBeNull()
+  })
 
-  test("returns null for number without suffix", () => {
-    expect(parseTokenBudget("+500")).toBeNull();
-  });
+  test('returns null for number without suffix', () => {
+    expect(parseTokenBudget('+500')).toBeNull()
+  })
 
-  test("returns null for empty string", () => {
-    expect(parseTokenBudget("")).toBeNull();
-  });
+  test('returns null for empty string', () => {
+    expect(parseTokenBudget('')).toBeNull()
+  })
 
   // --- case insensitivity ---
-  test("is case insensitive for suffix", () => {
-    expect(parseTokenBudget("+500K")).toBe(500_000);
-    expect(parseTokenBudget("+2m")).toBe(2_000_000);
-    expect(parseTokenBudget("+1B")).toBe(1_000_000_000);
-  });
+  test('is case insensitive for suffix', () => {
+    expect(parseTokenBudget('+500K')).toBe(500_000)
+    expect(parseTokenBudget('+2m')).toBe(2_000_000)
+    expect(parseTokenBudget('+1B')).toBe(1_000_000_000)
+  })
 
   // --- priority: start shorthand wins over end/verbose ---
-  test("start shorthand takes priority over verbose in same text", () => {
-    expect(parseTokenBudget("+100k use 2M tokens")).toBe(100_000);
-  });
-});
+  test('start shorthand takes priority over verbose in same text', () => {
+    expect(parseTokenBudget('+100k use 2M tokens')).toBe(100_000)
+  })
+})
 
-describe("findTokenBudgetPositions", () => {
-  test("returns single position for +500k at start", () => {
-    const positions = findTokenBudgetPositions("+500k");
-    expect(positions).toHaveLength(1);
-    expect(positions[0]!.start).toBe(0);
-    expect(positions[0]!.end).toBe(5);
-  });
+describe('findTokenBudgetPositions', () => {
+  test('returns single position for +500k at start', () => {
+    const positions = findTokenBudgetPositions('+500k')
+    expect(positions).toHaveLength(1)
+    expect(positions[0]!.start).toBe(0)
+    expect(positions[0]!.end).toBe(5)
+  })
 
-  test("returns position for shorthand at end", () => {
-    const text = "do this +100k";
-    const positions = findTokenBudgetPositions(text);
-    expect(positions).toHaveLength(1);
-    expect(positions[0]!.start).toBe(8);
-    expect(text.slice(positions[0]!.start, positions[0]!.end)).toBe("+100k");
-  });
+  test('returns position for shorthand at end', () => {
+    const text = 'do this +100k'
+    const positions = findTokenBudgetPositions(text)
+    expect(positions).toHaveLength(1)
+    expect(positions[0]!.start).toBe(8)
+    expect(text.slice(positions[0]!.start, positions[0]!.end)).toBe('+100k')
+  })
 
-  test("returns position for verbose match", () => {
-    const text = "please use 2M tokens here";
-    const positions = findTokenBudgetPositions(text);
-    expect(positions).toHaveLength(1);
+  test('returns position for verbose match', () => {
+    const text = 'please use 2M tokens here'
+    const positions = findTokenBudgetPositions(text)
+    expect(positions).toHaveLength(1)
     expect(text.slice(positions[0]!.start, positions[0]!.end)).toBe(
-      "use 2M tokens"
-    );
-  });
+      'use 2M tokens',
+    )
+  })
 
-  test("returns multiple positions for combined shorthand + verbose", () => {
-    const text = "use 2M tokens and then +500k";
-    const positions = findTokenBudgetPositions(text);
-    expect(positions.length).toBeGreaterThanOrEqual(2);
-  });
+  test('returns multiple positions for combined shorthand + verbose', () => {
+    const text = 'use 2M tokens and then +500k'
+    const positions = findTokenBudgetPositions(text)
+    expect(positions.length).toBeGreaterThanOrEqual(2)
+  })
 
-  test("returns empty array for no match", () => {
-    expect(findTokenBudgetPositions("hello world")).toEqual([]);
-  });
+  test('returns empty array for no match', () => {
+    expect(findTokenBudgetPositions('hello world')).toEqual([])
+  })
 
-  test("does not double-count when +500k matches both start and end", () => {
-    const positions = findTokenBudgetPositions("+500k");
-    expect(positions).toHaveLength(1);
-  });
-});
+  test('does not double-count when +500k matches both start and end', () => {
+    const positions = findTokenBudgetPositions('+500k')
+    expect(positions).toHaveLength(1)
+  })
+})
 
-describe("getBudgetContinuationMessage", () => {
-  test("formats a continuation message with correct values", () => {
-    const msg = getBudgetContinuationMessage(50, 250_000, 500_000);
-    expect(msg).toContain("50%");
-    expect(msg).toContain("250,000");
-    expect(msg).toContain("500,000");
-    expect(msg).toContain("Keep working");
-    expect(msg).toContain("do not summarize");
-  });
+describe('getBudgetContinuationMessage', () => {
+  test('formats a continuation message with correct values', () => {
+    const msg = getBudgetContinuationMessage(50, 250_000, 500_000)
+    expect(msg).toContain('50%')
+    expect(msg).toContain('250,000')
+    expect(msg).toContain('500,000')
+    expect(msg).toContain('Keep working')
+    expect(msg).toContain('do not summarize')
+  })
 
-  test("formats zero values", () => {
-    const msg = getBudgetContinuationMessage(0, 0, 100_000);
-    expect(msg).toContain("0%");
-    expect(msg).toContain("0 / 100,000");
-  });
+  test('formats zero values', () => {
+    const msg = getBudgetContinuationMessage(0, 0, 100_000)
+    expect(msg).toContain('0%')
+    expect(msg).toContain('0 / 100,000')
+  })
 
-  test("formats large numbers with commas", () => {
-    const msg = getBudgetContinuationMessage(75, 7_500_000, 10_000_000);
-    expect(msg).toContain("7,500,000");
-    expect(msg).toContain("10,000,000");
-  });
-});
+  test('formats large numbers with commas', () => {
+    const msg = getBudgetContinuationMessage(75, 7_500_000, 10_000_000)
+    expect(msg).toContain('7,500,000')
+    expect(msg).toContain('10,000,000')
+  })
+})
diff --git a/src/utils/__tests__/tokens.test.ts b/src/utils/__tests__/tokens.test.ts
index 21aca1d32..7e9607f15 100644
--- a/src/utils/__tests__/tokens.test.ts
+++ b/src/utils/__tests__/tokens.test.ts
@@ -1,25 +1,25 @@
-import { mock, describe, expect, test } from "bun:test";
+import { mock, describe, expect, test } from 'bun:test'
 
 // Mock heavy dependency chain: tokenEstimation.ts → log.ts → bootstrap/state.ts
-mock.module("src/utils/log.ts", () => ({
+mock.module('src/utils/log.ts', () => ({
   logError: () => {},
   logToFile: () => {},
-  getLogDisplayTitle: () => "",
+  getLogDisplayTitle: () => '',
   logEvent: () => {},
   logMCPError: () => {},
   logMCPDebug: () => {},
-  dateToFilename: (d: Date) => d.toISOString().replace(/[:.]/g, "-"),
-  getLogFilePath: () => "/tmp/mock-log",
+  dateToFilename: (d: Date) => d.toISOString().replace(/[:.]/g, '-'),
+  getLogFilePath: () => '/tmp/mock-log',
   attachErrorLogSink: () => {},
   getInMemoryErrors: () => [],
   loadErrorLogs: async () => [],
   getErrorLogByIndex: async () => null,
   captureAPIRequest: () => {},
   _resetErrorLogForTesting: () => {},
-}));
+}))
 
 // Mock tokenEstimation to avoid pulling in API provider deps
-mock.module("src/services/tokenEstimation.ts", () => ({
+mock.module('src/services/tokenEstimation.ts', () => ({
   roughTokenCountEstimation: (text: string) => Math.ceil(text.length / 4),
   roughTokenCountEstimationForMessages: (msgs: any[]) => msgs.length * 100,
   roughTokenCountEstimationForMessage: () => 100,
@@ -28,19 +28,19 @@ mock.module("src/services/tokenEstimation.ts", () => ({
   countTokensWithAPI: async () => 0,
   countMessagesTokensWithAPI: async () => 0,
   countTokensViaHaikuFallback: async () => 0,
-}));
+}))
 
 // Mock slowOperations to avoid bun:bundle import
-mock.module("src/utils/slowOperations.ts", () => ({
+mock.module('src/utils/slowOperations.ts', () => ({
   jsonStringify: JSON.stringify,
   jsonParse: JSON.parse,
   slowLogging: { enabled: false },
   clone: (v: any) => structuredClone(v),
   cloneDeep: (v: any) => structuredClone(v),
-  callerFrame: () => "",
+  callerFrame: () => '',
   SLOW_OPERATION_THRESHOLD_MS: 100,
   writeFileSync_DEPRECATED: () => {},
-}));
+}))
 
 const {
   getTokenCountFromUsage,
@@ -50,7 +50,7 @@ const {
   getCurrentUsage,
   doesMostRecentAssistantMessageExceed200k,
   getAssistantMessageContentLength,
-} = await import("../tokens");
+} = await import('../tokens')
 
 // ─── Helpers ────────────────────────────────────────────────────────────
 
@@ -58,16 +58,16 @@ function makeAssistantMessage(
   content: any[],
   usage?: any,
   model?: string,
-  id?: string
+  id?: string,
 ) {
   return {
-    type: "assistant" as const,
+    type: 'assistant' as const,
     uuid: `test-${Math.random()}`,
     message: {
       id: id ?? `msg_${Math.random()}`,
-      role: "assistant" as const,
+      role: 'assistant' as const,
       content,
-      model: model ?? "claude-sonnet-4-20250514",
+      model: model ?? 'claude-sonnet-4-20250514',
       usage: usage ?? {
         input_tokens: 100,
         output_tokens: 50,
@@ -76,221 +76,221 @@ function makeAssistantMessage(
       },
     },
     isApiErrorMessage: false,
-  };
+  }
 }
 
 function makeUserMessage(text: string) {
   return {
-    type: "user" as const,
+    type: 'user' as const,
     uuid: `test-${Math.random()}`,
-    message: { role: "user" as const, content: text },
-  };
+    message: { role: 'user' as const, content: text },
+  }
 }
 
 // ─── getTokenCountFromUsage ─────────────────────────────────────────────
 
-describe("getTokenCountFromUsage", () => {
-  test("sums all token fields", () => {
+describe('getTokenCountFromUsage', () => {
+  test('sums all token fields', () => {
     const usage = {
       input_tokens: 100,
       output_tokens: 50,
       cache_creation_input_tokens: 20,
       cache_read_input_tokens: 10,
-    };
-    expect(getTokenCountFromUsage(usage as any)).toBe(180);
-  });
+    }
+    expect(getTokenCountFromUsage(usage as any)).toBe(180)
+  })
 
-  test("handles missing cache fields", () => {
+  test('handles missing cache fields', () => {
     const usage = {
       input_tokens: 100,
       output_tokens: 50,
-    };
-    expect(getTokenCountFromUsage(usage as any)).toBe(150);
-  });
+    }
+    expect(getTokenCountFromUsage(usage as any)).toBe(150)
+  })
 
-  test("handles zero values", () => {
+  test('handles zero values', () => {
     const usage = {
       input_tokens: 0,
       output_tokens: 0,
       cache_creation_input_tokens: 0,
       cache_read_input_tokens: 0,
-    };
-    expect(getTokenCountFromUsage(usage as any)).toBe(0);
-  });
-});
+    }
+    expect(getTokenCountFromUsage(usage as any)).toBe(0)
+  })
+})
 
 // ─── getTokenUsage ──────────────────────────────────────────────────────
 
-describe("getTokenUsage", () => {
-  test("returns usage for valid assistant message", () => {
-    const msg = makeAssistantMessage([{ type: "text", text: "hello" }]);
-    const usage = getTokenUsage(msg as any);
-    expect(usage).toBeDefined();
-    expect(usage!.input_tokens).toBe(100);
-  });
+describe('getTokenUsage', () => {
+  test('returns usage for valid assistant message', () => {
+    const msg = makeAssistantMessage([{ type: 'text', text: 'hello' }])
+    const usage = getTokenUsage(msg as any)
+    expect(usage).toBeDefined()
+    expect(usage!.input_tokens).toBe(100)
+  })
 
-  test("returns undefined for user message", () => {
-    const msg = makeUserMessage("hello");
-    expect(getTokenUsage(msg as any)).toBeUndefined();
-  });
+  test('returns undefined for user message', () => {
+    const msg = makeUserMessage('hello')
+    expect(getTokenUsage(msg as any)).toBeUndefined()
+  })
 
-  test("returns undefined for synthetic model", () => {
+  test('returns undefined for synthetic model', () => {
     const msg = makeAssistantMessage(
-      [{ type: "text", text: "hello" }],
+      [{ type: 'text', text: 'hello' }],
       { input_tokens: 10, output_tokens: 5 },
-      "<synthetic>"
-    );
-    expect(getTokenUsage(msg as any)).toBeUndefined();
-  });
-});
+      '<synthetic>',
+    )
+    expect(getTokenUsage(msg as any)).toBeUndefined()
+  })
+})
 
 // ─── tokenCountFromLastAPIResponse ──────────────────────────────────────
 
-describe("tokenCountFromLastAPIResponse", () => {
-  test("returns token count from last assistant message", () => {
+describe('tokenCountFromLastAPIResponse', () => {
+  test('returns token count from last assistant message', () => {
     const msgs = [
-      makeAssistantMessage([{ type: "text", text: "hi" }], {
+      makeAssistantMessage([{ type: 'text', text: 'hi' }], {
         input_tokens: 200,
         output_tokens: 100,
         cache_creation_input_tokens: 50,
         cache_read_input_tokens: 25,
       }),
-    ];
-    expect(tokenCountFromLastAPIResponse(msgs as any)).toBe(375);
-  });
+    ]
+    expect(tokenCountFromLastAPIResponse(msgs as any)).toBe(375)
+  })
 
-  test("returns 0 for empty messages", () => {
-    expect(tokenCountFromLastAPIResponse([])).toBe(0);
-  });
+  test('returns 0 for empty messages', () => {
+    expect(tokenCountFromLastAPIResponse([])).toBe(0)
+  })
 
-  test("skips user messages to find last assistant", () => {
+  test('skips user messages to find last assistant', () => {
     const msgs = [
-      makeAssistantMessage([{ type: "text", text: "hi" }], {
+      makeAssistantMessage([{ type: 'text', text: 'hi' }], {
         input_tokens: 100,
         output_tokens: 50,
       }),
-      makeUserMessage("reply"),
-    ];
-    expect(tokenCountFromLastAPIResponse(msgs as any)).toBe(150);
-  });
-});
+      makeUserMessage('reply'),
+    ]
+    expect(tokenCountFromLastAPIResponse(msgs as any)).toBe(150)
+  })
+})
 
 // ─── messageTokenCountFromLastAPIResponse ───────────────────────────────
 
-describe("messageTokenCountFromLastAPIResponse", () => {
-  test("returns output_tokens from last assistant", () => {
+describe('messageTokenCountFromLastAPIResponse', () => {
+  test('returns output_tokens from last assistant', () => {
     const msgs = [
-      makeAssistantMessage([{ type: "text", text: "hi" }], {
+      makeAssistantMessage([{ type: 'text', text: 'hi' }], {
         input_tokens: 200,
         output_tokens: 75,
       }),
-    ];
-    expect(messageTokenCountFromLastAPIResponse(msgs as any)).toBe(75);
-  });
+    ]
+    expect(messageTokenCountFromLastAPIResponse(msgs as any)).toBe(75)
+  })
 
-  test("returns 0 for empty messages", () => {
-    expect(messageTokenCountFromLastAPIResponse([])).toBe(0);
-  });
-});
+  test('returns 0 for empty messages', () => {
+    expect(messageTokenCountFromLastAPIResponse([])).toBe(0)
+  })
+})
 
 // ─── getCurrentUsage ────────────────────────────────────────────────────
 
-describe("getCurrentUsage", () => {
-  test("returns usage object from last assistant", () => {
+describe('getCurrentUsage', () => {
+  test('returns usage object from last assistant', () => {
     const msgs = [
-      makeAssistantMessage([{ type: "text", text: "hi" }], {
+      makeAssistantMessage([{ type: 'text', text: 'hi' }], {
         input_tokens: 100,
         output_tokens: 50,
         cache_creation_input_tokens: 10,
         cache_read_input_tokens: 5,
       }),
-    ];
-    const usage = getCurrentUsage(msgs as any);
+    ]
+    const usage = getCurrentUsage(msgs as any)
     expect(usage).toEqual({
       input_tokens: 100,
       output_tokens: 50,
       cache_creation_input_tokens: 10,
       cache_read_input_tokens: 5,
-    });
-  });
+    })
+  })
 
-  test("returns null for empty messages", () => {
-    expect(getCurrentUsage([])).toBeNull();
-  });
+  test('returns null for empty messages', () => {
+    expect(getCurrentUsage([])).toBeNull()
+  })
 
-  test("defaults cache fields to 0", () => {
+  test('defaults cache fields to 0', () => {
     const msgs = [
-      makeAssistantMessage([{ type: "text", text: "hi" }], {
+      makeAssistantMessage([{ type: 'text', text: 'hi' }], {
         input_tokens: 100,
         output_tokens: 50,
       }),
-    ];
-    const usage = getCurrentUsage(msgs as any);
-    expect(usage!.cache_creation_input_tokens).toBe(0);
-    expect(usage!.cache_read_input_tokens).toBe(0);
-  });
-});
+    ]
+    const usage = getCurrentUsage(msgs as any)
+    expect(usage!.cache_creation_input_tokens).toBe(0)
+    expect(usage!.cache_read_input_tokens).toBe(0)
+  })
+})
 
 // ─── doesMostRecentAssistantMessageExceed200k ───────────────────────────
 
-describe("doesMostRecentAssistantMessageExceed200k", () => {
-  test("returns false when under 200k", () => {
+describe('doesMostRecentAssistantMessageExceed200k', () => {
+  test('returns false when under 200k', () => {
     const msgs = [
-      makeAssistantMessage([{ type: "text", text: "hi" }], {
+      makeAssistantMessage([{ type: 'text', text: 'hi' }], {
         input_tokens: 1000,
         output_tokens: 500,
       }),
-    ];
-    expect(doesMostRecentAssistantMessageExceed200k(msgs as any)).toBe(false);
-  });
+    ]
+    expect(doesMostRecentAssistantMessageExceed200k(msgs as any)).toBe(false)
+  })
 
-  test("returns true when over 200k", () => {
+  test('returns true when over 200k', () => {
     const msgs = [
-      makeAssistantMessage([{ type: "text", text: "hi" }], {
+      makeAssistantMessage([{ type: 'text', text: 'hi' }], {
         input_tokens: 190000,
         output_tokens: 15000,
       }),
-    ];
-    expect(doesMostRecentAssistantMessageExceed200k(msgs as any)).toBe(true);
-  });
+    ]
+    expect(doesMostRecentAssistantMessageExceed200k(msgs as any)).toBe(true)
+  })
 
-  test("returns false for empty messages", () => {
-    expect(doesMostRecentAssistantMessageExceed200k([])).toBe(false);
-  });
-});
+  test('returns false for empty messages', () => {
+    expect(doesMostRecentAssistantMessageExceed200k([])).toBe(false)
+  })
+})
 
 // ─── getAssistantMessageContentLength ───────────────────────────────────
 
-describe("getAssistantMessageContentLength", () => {
-  test("counts text content length", () => {
-    const msg = makeAssistantMessage([{ type: "text", text: "hello" }]);
-    expect(getAssistantMessageContentLength(msg as any)).toBe(5);
-  });
+describe('getAssistantMessageContentLength', () => {
+  test('counts text content length', () => {
+    const msg = makeAssistantMessage([{ type: 'text', text: 'hello' }])
+    expect(getAssistantMessageContentLength(msg as any)).toBe(5)
+  })
 
-  test("counts multiple blocks", () => {
+  test('counts multiple blocks', () => {
     const msg = makeAssistantMessage([
-      { type: "text", text: "hello" },
-      { type: "text", text: "world" },
-    ]);
-    expect(getAssistantMessageContentLength(msg as any)).toBe(10);
-  });
+      { type: 'text', text: 'hello' },
+      { type: 'text', text: 'world' },
+    ])
+    expect(getAssistantMessageContentLength(msg as any)).toBe(10)
+  })
 
-  test("counts thinking content", () => {
+  test('counts thinking content', () => {
     const msg = makeAssistantMessage([
-      { type: "thinking", thinking: "let me think" },
-    ]);
-    expect(getAssistantMessageContentLength(msg as any)).toBe(12);
-  });
+      { type: 'thinking', thinking: 'let me think' },
+    ])
+    expect(getAssistantMessageContentLength(msg as any)).toBe(12)
+  })
 
-  test("returns 0 for empty content", () => {
-    const msg = makeAssistantMessage([]);
-    expect(getAssistantMessageContentLength(msg as any)).toBe(0);
-  });
+  test('returns 0 for empty content', () => {
+    const msg = makeAssistantMessage([])
+    expect(getAssistantMessageContentLength(msg as any)).toBe(0)
+  })
 
-  test("counts tool_use input", () => {
+  test('counts tool_use input', () => {
     const msg = makeAssistantMessage([
-      { type: "tool_use", id: "t1", name: "Bash", input: { command: "ls" } },
-    ]);
-    expect(getAssistantMessageContentLength(msg as any)).toBeGreaterThan(0);
-  });
-});
+      { type: 'tool_use', id: 't1', name: 'Bash', input: { command: 'ls' } },
+    ])
+    expect(getAssistantMessageContentLength(msg as any)).toBeGreaterThan(0)
+  })
+})
diff --git a/src/utils/__tests__/treeify.test.ts b/src/utils/__tests__/treeify.test.ts
index 8f62caa70..e0e3d36fb 100644
--- a/src/utils/__tests__/treeify.test.ts
+++ b/src/utils/__tests__/treeify.test.ts
@@ -1,109 +1,109 @@
-import { mock, describe, expect, test } from "bun:test";
+import { mock, describe, expect, test } from 'bun:test'
 
-mock.module("figures", () => ({
+mock.module('figures', () => ({
   default: {
-    lineUpDownRight: "├",
-    lineUpRight: "└",
-    lineVertical: "│",
+    lineUpDownRight: '├',
+    lineUpRight: '└',
+    lineVertical: '│',
   },
-}));
+}))
 
-mock.module("src/ink.js", () => ({
+mock.module('src/ink.js', () => ({
   color: (colorKey: string, themeName: string) => (text: string) => text,
-}));
+}))
 
-const { treeify } = await import("../treeify");
+const { treeify } = await import('../treeify')
 
-describe("treeify", () => {
-  test("renders flat tree with two keys", () => {
-    const result = treeify({ a: "value-a", b: "value-b" });
-    const lines = result.split("\n");
-    expect(lines.length).toBe(2);
-    expect(lines[0]).toContain("a");
-    expect(lines[0]).toContain("value-a");
-    expect(lines[1]).toContain("b");
-    expect(lines[1]).toContain("value-b");
-  });
+describe('treeify', () => {
+  test('renders flat tree with two keys', () => {
+    const result = treeify({ a: 'value-a', b: 'value-b' })
+    const lines = result.split('\n')
+    expect(lines.length).toBe(2)
+    expect(lines[0]).toContain('a')
+    expect(lines[0]).toContain('value-a')
+    expect(lines[1]).toContain('b')
+    expect(lines[1]).toContain('value-b')
+  })
 
-  test("uses branch character for non-last items", () => {
-    const result = treeify({ a: "1", b: "2" });
+  test('uses branch character for non-last items', () => {
+    const result = treeify({ a: '1', b: '2' })
     // First item uses ├ (branch), last uses └ (lastBranch)
-    expect(result).toContain("├");
-    expect(result).toContain("└");
-  });
+    expect(result).toContain('├')
+    expect(result).toContain('└')
+  })
 
-  test("uses lastBranch for single item", () => {
-    const result = treeify({ only: "val" });
-    expect(result).toContain("└");
-    expect(result).not.toContain("├");
-  });
+  test('uses lastBranch for single item', () => {
+    const result = treeify({ only: 'val' })
+    expect(result).toContain('└')
+    expect(result).not.toContain('├')
+  })
 
-  test("renders nested objects", () => {
-    const result = treeify({ parent: { child: "val" } });
-    expect(result).toContain("parent");
-    expect(result).toContain("child");
-    expect(result).toContain("val");
-  });
+  test('renders nested objects', () => {
+    const result = treeify({ parent: { child: 'val' } })
+    expect(result).toContain('parent')
+    expect(result).toContain('child')
+    expect(result).toContain('val')
+  })
 
-  test("renders arrays with length", () => {
-    const result = treeify({ items: ["1", "2", "3"] } as any);
-    expect(result).toContain("items");
-    expect(result).toContain("[Array(3)]");
-  });
+  test('renders arrays with length', () => {
+    const result = treeify({ items: ['1', '2', '3'] } as any)
+    expect(result).toContain('items')
+    expect(result).toContain('[Array(3)]')
+  })
 
-  test("detects circular references", () => {
-    const obj: Record<string, unknown> = { name: "root" };
-    obj.self = obj;
-    const result = treeify(obj as any);
-    expect(result).toContain("[Circular]");
-  });
+  test('detects circular references', () => {
+    const obj: Record<string, unknown> = { name: 'root' }
+    obj.self = obj
+    const result = treeify(obj as any)
+    expect(result).toContain('[Circular]')
+  })
 
-  test("returns (empty) for empty object", () => {
-    const result = treeify({});
-    expect(result).toBe("(empty)");
-  });
+  test('returns (empty) for empty object', () => {
+    const result = treeify({})
+    expect(result).toBe('(empty)')
+  })
 
-  test("hideFunctions filters out function values", () => {
-    const obj = { name: "test", fn: () => {} };
-    const result = treeify(obj as any, { hideFunctions: true });
-    expect(result).toContain("name");
-    expect(result).not.toContain("fn");
-  });
+  test('hideFunctions filters out function values', () => {
+    const obj = { name: 'test', fn: () => {} }
+    const result = treeify(obj as any, { hideFunctions: true })
+    expect(result).toContain('name')
+    expect(result).not.toContain('fn')
+  })
 
-  test("showValues false hides leaf values", () => {
-    const obj = { name: "test" };
-    const result = treeify(obj, { showValues: false });
-    expect(result).toContain("name");
-    expect(result).not.toContain("test");
-  });
+  test('showValues false hides leaf values', () => {
+    const obj = { name: 'test' }
+    const result = treeify(obj, { showValues: false })
+    expect(result).toContain('name')
+    expect(result).not.toContain('test')
+  })
 
-  test("showValues true shows function as [Function]", () => {
-    const obj = { fn: () => {} };
-    const result = treeify(obj as any, { showValues: true });
-    expect(result).toContain("[Function]");
-  });
+  test('showValues true shows function as [Function]', () => {
+    const obj = { fn: () => {} }
+    const result = treeify(obj as any, { showValues: true })
+    expect(result).toContain('[Function]')
+  })
 
-  test("deep nesting produces correct indentation", () => {
-    const obj = { a: { b: { c: "deep" } } };
-    const result = treeify(obj);
-    const lines = result.split("\n");
-    expect(lines.length).toBe(3);
+  test('deep nesting produces correct indentation', () => {
+    const obj = { a: { b: { c: 'deep' } } }
+    const result = treeify(obj)
+    const lines = result.split('\n')
+    expect(lines.length).toBe(3)
     // Each level adds indentation
-    expect(lines[2].length).toBeGreaterThan(lines[1].length);
-  });
+    expect(lines[2].length).toBeGreaterThan(lines[1].length)
+  })
 
-  test("handles empty string key with string value", () => {
-    const obj = { " ": "whitespace-key" };
-    const result = treeify(obj);
-    expect(result).toContain("whitespace-key");
-  });
+  test('handles empty string key with string value', () => {
+    const obj = { ' ': 'whitespace-key' }
+    const result = treeify(obj)
+    expect(result).toContain('whitespace-key')
+  })
 
-  test("handles mixed object and primitive values", () => {
-    const obj = { name: "test", nested: { inner: "val" }, count: 5 };
-    const result = treeify(obj as any);
-    expect(result).toContain("name");
-    expect(result).toContain("nested");
-    expect(result).toContain("inner");
-    expect(result).toContain("count");
-  });
-});
+  test('handles mixed object and primitive values', () => {
+    const obj = { name: 'test', nested: { inner: 'val' }, count: 5 }
+    const result = treeify(obj as any)
+    expect(result).toContain('name')
+    expect(result).toContain('nested')
+    expect(result).toContain('inner')
+    expect(result).toContain('count')
+  })
+})
diff --git a/src/utils/__tests__/truncate.test.ts b/src/utils/__tests__/truncate.test.ts
index a1335ce87..5ef98cab2 100644
--- a/src/utils/__tests__/truncate.test.ts
+++ b/src/utils/__tests__/truncate.test.ts
@@ -1,26 +1,26 @@
-import { describe, expect, mock, test } from "bun:test";
+import { describe, expect, mock, test } from 'bun:test'
 
-mock.module("src/ink/stringWidth.js", () => ({
+mock.module('src/ink/stringWidth.js', () => ({
   stringWidth: (str: string) => {
-    let width = 0;
+    let width = 0
     for (const char of str) {
-      const code = char.codePointAt(0)!;
+      const code = char.codePointAt(0)!
       if (
         (code >= 0x4e00 && code <= 0x9fff) ||
         (code >= 0x3000 && code <= 0x303f) ||
         (code >= 0xff01 && code <= 0xff60) ||
         (code >= 0xf900 && code <= 0xfaff)
       ) {
-        width += 2;
+        width += 2
       } else if (code >= 0x1f300 && code <= 0x1faff) {
-        width += 2;
+        width += 2
       } else if (code > 0) {
-        width += 1;
+        width += 1
       }
     }
-    return width;
+    return width
   },
-}));
+}))
 import {
   truncatePathMiddle,
   truncateToWidth,
@@ -28,185 +28,185 @@ import {
   truncateToWidthNoEllipsis,
   truncate,
   wrapText,
-} from "../truncate";
+} from '../truncate'
 
 // ─── truncateToWidth ────────────────────────────────────────────────────
 
-describe("truncateToWidth", () => {
-  test("returns original when within limit", () => {
-    expect(truncateToWidth("hello", 10)).toBe("hello");
-  });
+describe('truncateToWidth', () => {
+  test('returns original when within limit', () => {
+    expect(truncateToWidth('hello', 10)).toBe('hello')
+  })
 
-  test("truncates long string with ellipsis", () => {
-    const result = truncateToWidth("hello world", 8);
-    expect(result).toBe("hello w…");
-  });
+  test('truncates long string with ellipsis', () => {
+    const result = truncateToWidth('hello world', 8)
+    expect(result).toBe('hello w…')
+  })
 
-  test("returns ellipsis for maxWidth 1", () => {
-    expect(truncateToWidth("hello", 1)).toBe("…");
-  });
+  test('returns ellipsis for maxWidth 1', () => {
+    expect(truncateToWidth('hello', 1)).toBe('…')
+  })
 
-  test("handles empty string", () => {
-    expect(truncateToWidth("", 10)).toBe("");
-  });
+  test('handles empty string', () => {
+    expect(truncateToWidth('', 10)).toBe('')
+  })
 
   // ── CJK / wide-character tests ──
 
-  test("truncates CJK string at width boundary (2 per char)", () => {
-    expect(truncateToWidth("你好世界", 4)).toBe("你…");
-  });
+  test('truncates CJK string at width boundary (2 per char)', () => {
+    expect(truncateToWidth('你好世界', 4)).toBe('你…')
+  })
 
-  test("truncates CJK string preserving full characters", () => {
-    expect(truncateToWidth("你好世界", 6)).toBe("你好…");
-  });
+  test('truncates CJK string preserving full characters', () => {
+    expect(truncateToWidth('你好世界', 6)).toBe('你好…')
+  })
 
-  test("passes through CJK string when within limit", () => {
-    expect(truncateToWidth("你好", 4)).toBe("你好");
-  });
+  test('passes through CJK string when within limit', () => {
+    expect(truncateToWidth('你好', 4)).toBe('你好')
+  })
 
-  test("handles mixed ASCII + CJK", () => {
-    expect(truncateToWidth("hello你好", 8)).toBe("hello你…");
-  });
+  test('handles mixed ASCII + CJK', () => {
+    expect(truncateToWidth('hello你好', 8)).toBe('hello你…')
+  })
 
-  test("passes through mixed ASCII + CJK at exact limit", () => {
-    expect(truncateToWidth("hello你好", 9)).toBe("hello你好");
-  });
+  test('passes through mixed ASCII + CJK at exact limit', () => {
+    expect(truncateToWidth('hello你好', 9)).toBe('hello你好')
+  })
 
-  test("truncates string containing emoji", () => {
-    const result = truncateToWidth("hello 👋 world", 10);
-    expect(result).toBe("hello 👋 …");
-  });
+  test('truncates string containing emoji', () => {
+    const result = truncateToWidth('hello 👋 world', 10)
+    expect(result).toBe('hello 👋 …')
+  })
 
-  test("passes through single emoji at sufficient width", () => {
-    expect(truncateToWidth("👋", 2)).toBe("👋");
-  });
-});
+  test('passes through single emoji at sufficient width', () => {
+    expect(truncateToWidth('👋', 2)).toBe('👋')
+  })
+})
 
 // ─── truncateStartToWidth ───────────────────────────────────────────────
 
-describe("truncateStartToWidth", () => {
-  test("returns original when within limit", () => {
-    expect(truncateStartToWidth("hello", 10)).toBe("hello");
-  });
+describe('truncateStartToWidth', () => {
+  test('returns original when within limit', () => {
+    expect(truncateStartToWidth('hello', 10)).toBe('hello')
+  })
 
-  test("truncates from start with ellipsis prefix", () => {
-    expect(truncateStartToWidth("hello world", 8)).toBe("…o world");
-  });
+  test('truncates from start with ellipsis prefix', () => {
+    expect(truncateStartToWidth('hello world', 8)).toBe('…o world')
+  })
 
-  test("returns ellipsis for maxWidth 1", () => {
-    expect(truncateStartToWidth("hello", 1)).toBe("…");
-  });
+  test('returns ellipsis for maxWidth 1', () => {
+    expect(truncateStartToWidth('hello', 1)).toBe('…')
+  })
 
-  test("truncates CJK from start", () => {
-    expect(truncateStartToWidth("你好世界", 4)).toBe("…界");
-  });
+  test('truncates CJK from start', () => {
+    expect(truncateStartToWidth('你好世界', 4)).toBe('…界')
+  })
 
-  test("truncates CJK from start preserving characters", () => {
-    expect(truncateStartToWidth("你好世界", 6)).toBe("…世界");
-  });
-});
+  test('truncates CJK from start preserving characters', () => {
+    expect(truncateStartToWidth('你好世界', 6)).toBe('…世界')
+  })
+})
 
 // ─── truncateToWidthNoEllipsis ──────────────────────────────────────────
 
-describe("truncateToWidthNoEllipsis", () => {
-  test("returns original when within limit", () => {
-    expect(truncateToWidthNoEllipsis("hello", 10)).toBe("hello");
-  });
+describe('truncateToWidthNoEllipsis', () => {
+  test('returns original when within limit', () => {
+    expect(truncateToWidthNoEllipsis('hello', 10)).toBe('hello')
+  })
 
-  test("truncates without ellipsis", () => {
-    const result = truncateToWidthNoEllipsis("hello world", 5);
-    expect(result).toBe("hello");
-    expect(result.includes("…")).toBe(false);
-  });
+  test('truncates without ellipsis', () => {
+    const result = truncateToWidthNoEllipsis('hello world', 5)
+    expect(result).toBe('hello')
+    expect(result.includes('…')).toBe(false)
+  })
 
-  test("returns empty for maxWidth 0", () => {
-    expect(truncateToWidthNoEllipsis("hello", 0)).toBe("");
-  });
+  test('returns empty for maxWidth 0', () => {
+    expect(truncateToWidthNoEllipsis('hello', 0)).toBe('')
+  })
 
-  test("truncates CJK without ellipsis", () => {
-    expect(truncateToWidthNoEllipsis("你好世界", 4)).toBe("你好");
-  });
-});
+  test('truncates CJK without ellipsis', () => {
+    expect(truncateToWidthNoEllipsis('你好世界', 4)).toBe('你好')
+  })
+})
 
 // ─── truncatePathMiddle ─────────────────────────────────────────────────
 
-describe("truncatePathMiddle", () => {
-  test("returns original when path fits", () => {
-    expect(truncatePathMiddle("src/index.ts", 50)).toBe("src/index.ts");
-  });
+describe('truncatePathMiddle', () => {
+  test('returns original when path fits', () => {
+    expect(truncatePathMiddle('src/index.ts', 50)).toBe('src/index.ts')
+  })
 
-  test("truncates middle of long path", () => {
-    const path = "src/components/deeply/nested/folder/MyComponent.tsx";
-    const result = truncatePathMiddle(path, 30);
-    expect(result).toContain("…");
-    expect(result.endsWith("MyComponent.tsx")).toBe(true);
-  });
+  test('truncates middle of long path', () => {
+    const path = 'src/components/deeply/nested/folder/MyComponent.tsx'
+    const result = truncatePathMiddle(path, 30)
+    expect(result).toContain('…')
+    expect(result.endsWith('MyComponent.tsx')).toBe(true)
+  })
 
-  test("returns ellipsis for maxLength 0", () => {
-    expect(truncatePathMiddle("src/index.ts", 0)).toBe("…");
-  });
+  test('returns ellipsis for maxLength 0', () => {
+    expect(truncatePathMiddle('src/index.ts', 0)).toBe('…')
+  })
 
-  test("handles path without slashes", () => {
-    const result = truncatePathMiddle("verylongfilename.ts", 10);
-    expect(result).toContain("…");
-  });
+  test('handles path without slashes', () => {
+    const result = truncatePathMiddle('verylongfilename.ts', 10)
+    expect(result).toContain('…')
+  })
 
-  test("handles short maxLength < 5", () => {
-    expect(truncatePathMiddle("src/components/foo.ts", 4)).toBe("src…");
-  });
+  test('handles short maxLength < 5', () => {
+    expect(truncatePathMiddle('src/components/foo.ts', 4)).toBe('src…')
+  })
 
-  test("handles very short maxLength 1", () => {
-    expect(truncatePathMiddle("/a/b", 1)).toBe("…");
-  });
-});
+  test('handles very short maxLength 1', () => {
+    expect(truncatePathMiddle('/a/b', 1)).toBe('…')
+  })
+})
 
 // ─── truncate ───────────────────────────────────────────────────────────
 
-describe("truncate", () => {
-  test("returns original when within limit", () => {
-    expect(truncate("hello", 10)).toBe("hello");
-  });
+describe('truncate', () => {
+  test('returns original when within limit', () => {
+    expect(truncate('hello', 10)).toBe('hello')
+  })
 
-  test("truncates long string", () => {
-    const result = truncate("hello world foo bar", 10);
-    expect(result).toContain("…");
-  });
+  test('truncates long string', () => {
+    const result = truncate('hello world foo bar', 10)
+    expect(result).toContain('…')
+  })
 
-  test("truncates at newline in singleLine mode", () => {
-    const result = truncate("first line\nsecond line", 50, true);
-    expect(result).toBe("first line…");
-  });
+  test('truncates at newline in singleLine mode', () => {
+    const result = truncate('first line\nsecond line', 50, true)
+    expect(result).toBe('first line…')
+  })
 
-  test("does not truncate at newline when singleLine is false", () => {
-    const result = truncate("first\nsecond", 50, false);
-    expect(result).toBe("first\nsecond");
-  });
+  test('does not truncate at newline when singleLine is false', () => {
+    const result = truncate('first\nsecond', 50, false)
+    expect(result).toBe('first\nsecond')
+  })
 
-  test("truncates singleLine when first line exceeds maxWidth", () => {
-    const result = truncate("a very long first line\nsecond", 10, true);
-    expect(result).toContain("…");
-    expect(result).not.toContain("\n");
-  });
-});
+  test('truncates singleLine when first line exceeds maxWidth', () => {
+    const result = truncate('a very long first line\nsecond', 10, true)
+    expect(result).toContain('…')
+    expect(result).not.toContain('\n')
+  })
+})
 
 // ─── wrapText ───────────────────────────────────────────────────────────
 
-describe("wrapText", () => {
-  test("wraps text at specified width", () => {
-    const result = wrapText("hello world", 6);
-    expect(result.length).toBeGreaterThan(1);
-  });
+describe('wrapText', () => {
+  test('wraps text at specified width', () => {
+    const result = wrapText('hello world', 6)
+    expect(result.length).toBeGreaterThan(1)
+  })
 
-  test("returns single line when text fits", () => {
-    expect(wrapText("hello", 10)).toEqual(["hello"]);
-  });
+  test('returns single line when text fits', () => {
+    expect(wrapText('hello', 10)).toEqual(['hello'])
+  })
 
-  test("handles empty string", () => {
-    expect(wrapText("", 10)).toEqual([]);
-  });
+  test('handles empty string', () => {
+    expect(wrapText('', 10)).toEqual([])
+  })
 
-  test("wraps each character on width 1", () => {
-    const result = wrapText("abc", 1);
-    expect(result).toEqual(["a", "b", "c"]);
-  });
-});
+  test('wraps each character on width 1', () => {
+    const result = wrapText('abc', 1)
+    expect(result).toEqual(['a', 'b', 'c'])
+  })
+})
diff --git a/src/utils/__tests__/userPromptKeywords.test.ts b/src/utils/__tests__/userPromptKeywords.test.ts
index 124598dbd..edcbee8c3 100644
--- a/src/utils/__tests__/userPromptKeywords.test.ts
+++ b/src/utils/__tests__/userPromptKeywords.test.ts
@@ -1,76 +1,76 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from 'bun:test'
 import {
   matchesNegativeKeyword,
   matchesKeepGoingKeyword,
-} from "../userPromptKeywords";
+} from '../userPromptKeywords'
 
-describe("matchesNegativeKeyword", () => {
+describe('matchesNegativeKeyword', () => {
   test("matches 'wtf'", () => {
-    expect(matchesNegativeKeyword("wtf is going on")).toBe(true);
-  });
+    expect(matchesNegativeKeyword('wtf is going on')).toBe(true)
+  })
 
   test("matches 'shit'", () => {
-    expect(matchesNegativeKeyword("this is shit")).toBe(true);
-  });
+    expect(matchesNegativeKeyword('this is shit')).toBe(true)
+  })
 
   test("matches 'fucking broken'", () => {
-    expect(matchesNegativeKeyword("this is fucking broken")).toBe(true);
-  });
+    expect(matchesNegativeKeyword('this is fucking broken')).toBe(true)
+  })
 
   test("does not match normal input like 'fix the bug'", () => {
-    expect(matchesNegativeKeyword("fix the bug")).toBe(false);
-  });
+    expect(matchesNegativeKeyword('fix the bug')).toBe(false)
+  })
 
-  test("is case-insensitive", () => {
-    expect(matchesNegativeKeyword("WTF is this")).toBe(true);
-    expect(matchesNegativeKeyword("This Sucks")).toBe(true);
-  });
+  test('is case-insensitive', () => {
+    expect(matchesNegativeKeyword('WTF is this')).toBe(true)
+    expect(matchesNegativeKeyword('This Sucks')).toBe(true)
+  })
 
-  test("matches partial word in sentence", () => {
-    expect(matchesNegativeKeyword("please help, damn it")).toBe(true);
-  });
-});
+  test('matches partial word in sentence', () => {
+    expect(matchesNegativeKeyword('please help, damn it')).toBe(true)
+  })
+})
 
-describe("matchesKeepGoingKeyword", () => {
+describe('matchesKeepGoingKeyword', () => {
   test("matches exact 'continue'", () => {
-    expect(matchesKeepGoingKeyword("continue")).toBe(true);
-  });
+    expect(matchesKeepGoingKeyword('continue')).toBe(true)
+  })
 
   test("matches 'keep going'", () => {
-    expect(matchesKeepGoingKeyword("keep going")).toBe(true);
-  });
+    expect(matchesKeepGoingKeyword('keep going')).toBe(true)
+  })
 
   test("matches 'go on'", () => {
-    expect(matchesKeepGoingKeyword("go on")).toBe(true);
-  });
+    expect(matchesKeepGoingKeyword('go on')).toBe(true)
+  })
 
   test("does not match 'cont'", () => {
-    expect(matchesKeepGoingKeyword("cont")).toBe(false);
-  });
+    expect(matchesKeepGoingKeyword('cont')).toBe(false)
+  })
 
-  test("does not match empty string", () => {
-    expect(matchesKeepGoingKeyword("")).toBe(false);
-  });
+  test('does not match empty string', () => {
+    expect(matchesKeepGoingKeyword('')).toBe(false)
+  })
 
   test("matches within larger sentence 'please continue'", () => {
     // 'continue' must be the entire prompt (lowercased), not a substring
-    expect(matchesKeepGoingKeyword("please continue")).toBe(false);
-  });
+    expect(matchesKeepGoingKeyword('please continue')).toBe(false)
+  })
 
   test("matches 'keep going' in sentence", () => {
-    expect(matchesKeepGoingKeyword("please keep going")).toBe(true);
-  });
+    expect(matchesKeepGoingKeyword('please keep going')).toBe(true)
+  })
 
   test("matches 'go on' in sentence", () => {
-    expect(matchesKeepGoingKeyword("yes, go on")).toBe(true);
-  });
+    expect(matchesKeepGoingKeyword('yes, go on')).toBe(true)
+  })
 
   test("is case-insensitive for 'continue'", () => {
-    expect(matchesKeepGoingKeyword("Continue")).toBe(true);
-    expect(matchesKeepGoingKeyword("CONTINUE")).toBe(true);
-  });
+    expect(matchesKeepGoingKeyword('Continue')).toBe(true)
+    expect(matchesKeepGoingKeyword('CONTINUE')).toBe(true)
+  })
 
   test("is case-insensitive for 'keep going'", () => {
-    expect(matchesKeepGoingKeyword("Keep Going")).toBe(true);
-  });
-});
+    expect(matchesKeepGoingKeyword('Keep Going')).toBe(true)
+  })
+})
diff --git a/src/utils/__tests__/uuid.test.ts b/src/utils/__tests__/uuid.test.ts
index ff6b22df4..35662676b 100644
--- a/src/utils/__tests__/uuid.test.ts
+++ b/src/utils/__tests__/uuid.test.ts
@@ -1,51 +1,51 @@
-import { describe, expect, test } from "bun:test";
-import { validateUuid, createAgentId } from "../uuid";
+import { describe, expect, test } from 'bun:test'
+import { validateUuid, createAgentId } from '../uuid'
 
-describe("validateUuid", () => {
-  test("validates correct UUID", () => {
-    const result = validateUuid("550e8400-e29b-41d4-a716-446655440000");
-    expect(result).toBe("550e8400-e29b-41d4-a716-446655440000");
-  });
+describe('validateUuid', () => {
+  test('validates correct UUID', () => {
+    const result = validateUuid('550e8400-e29b-41d4-a716-446655440000')
+    expect(result).toBe('550e8400-e29b-41d4-a716-446655440000')
+  })
 
-  test("validates uppercase UUID", () => {
-    const result = validateUuid("550E8400-E29B-41D4-A716-446655440000");
-    expect(result).toBe("550E8400-E29B-41D4-A716-446655440000");
-  });
+  test('validates uppercase UUID', () => {
+    const result = validateUuid('550E8400-E29B-41D4-A716-446655440000')
+    expect(result).toBe('550E8400-E29B-41D4-A716-446655440000')
+  })
 
-  test("returns null for non-string", () => {
-    expect(validateUuid(123)).toBeNull();
-    expect(validateUuid(null)).toBeNull();
-    expect(validateUuid(undefined)).toBeNull();
-  });
+  test('returns null for non-string', () => {
+    expect(validateUuid(123)).toBeNull()
+    expect(validateUuid(null)).toBeNull()
+    expect(validateUuid(undefined)).toBeNull()
+  })
 
-  test("returns null for invalid UUID format", () => {
-    expect(validateUuid("not-a-uuid")).toBeNull();
-    expect(validateUuid("550e8400-e29b-41d4-a716")).toBeNull();
-    expect(validateUuid("550e8400e29b41d4a716446655440000")).toBeNull();
-  });
+  test('returns null for invalid UUID format', () => {
+    expect(validateUuid('not-a-uuid')).toBeNull()
+    expect(validateUuid('550e8400-e29b-41d4-a716')).toBeNull()
+    expect(validateUuid('550e8400e29b41d4a716446655440000')).toBeNull()
+  })
 
-  test("returns null for empty string", () => {
-    expect(validateUuid("")).toBeNull();
-  });
+  test('returns null for empty string', () => {
+    expect(validateUuid('')).toBeNull()
+  })
 
-  test("returns null for UUID with invalid chars", () => {
-    expect(validateUuid("550e8400-e29b-41d4-a716-44665544000g")).toBeNull();
-  });
+  test('returns null for UUID with invalid chars', () => {
+    expect(validateUuid('550e8400-e29b-41d4-a716-44665544000g')).toBeNull()
+  })
 
-  test("returns null for UUID with leading/trailing whitespace", () => {
-    expect(validateUuid(" 550e8400-e29b-41d4-a716-446655440000")).toBeNull();
-    expect(validateUuid("550e8400-e29b-41d4-a716-446655440000 ")).toBeNull();
-  });
-});
+  test('returns null for UUID with leading/trailing whitespace', () => {
+    expect(validateUuid(' 550e8400-e29b-41d4-a716-446655440000')).toBeNull()
+    expect(validateUuid('550e8400-e29b-41d4-a716-446655440000 ')).toBeNull()
+  })
+})
 
-describe("createAgentId", () => {
-  test("generates id without label in correct format", () => {
-    const id = createAgentId();
-    expect(id).toMatch(/^a[0-9a-f]{16}$/);
-  });
+describe('createAgentId', () => {
+  test('generates id without label in correct format', () => {
+    const id = createAgentId()
+    expect(id).toMatch(/^a[0-9a-f]{16}$/)
+  })
 
-  test("generates id with label in correct format", () => {
-    const id = createAgentId("compact");
-    expect(id).toMatch(/^acompact-[0-9a-f]{16}$/);
-  });
-});
+  test('generates id with label in correct format', () => {
+    const id = createAgentId('compact')
+    expect(id).toMatch(/^acompact-[0-9a-f]{16}$/)
+  })
+})
diff --git a/src/utils/__tests__/windowsPaths.test.ts b/src/utils/__tests__/windowsPaths.test.ts
index f70b21428..f6ae13947 100644
--- a/src/utils/__tests__/windowsPaths.test.ts
+++ b/src/utils/__tests__/windowsPaths.test.ts
@@ -1,116 +1,111 @@
-import { describe, expect, test } from "bun:test";
-import {
-  windowsPathToPosixPath,
-  posixPathToWindowsPath,
-} from "../windowsPaths";
+import { describe, expect, test } from 'bun:test'
+import { windowsPathToPosixPath, posixPathToWindowsPath } from '../windowsPaths'
 
 // ─── windowsPathToPosixPath ────────────────────────────────────────────
 
-describe("windowsPathToPosixPath", () => {
-  test("converts drive letter path to posix", () => {
-    expect(windowsPathToPosixPath("C:\\Users\\foo")).toBe("/c/Users/foo");
-  });
+describe('windowsPathToPosixPath', () => {
+  test('converts drive letter path to posix', () => {
+    expect(windowsPathToPosixPath('C:\\Users\\foo')).toBe('/c/Users/foo')
+  })
 
-  test("lowercases the drive letter", () => {
-    expect(windowsPathToPosixPath("D:\\Work\\project")).toBe(
-      "/d/Work/project"
-    );
-  });
+  test('lowercases the drive letter', () => {
+    expect(windowsPathToPosixPath('D:\\Work\\project')).toBe('/d/Work/project')
+  })
 
-  test("handles lowercase drive letter input", () => {
-    expect(windowsPathToPosixPath("e:\\data")).toBe("/e/data");
-  });
+  test('handles lowercase drive letter input', () => {
+    expect(windowsPathToPosixPath('e:\\data')).toBe('/e/data')
+  })
 
-  test("converts UNC path", () => {
-    expect(windowsPathToPosixPath("\\\\server\\share\\dir")).toBe(
-      "//server/share/dir"
-    );
-  });
+  test('converts UNC path', () => {
+    expect(windowsPathToPosixPath('\\\\server\\share\\dir')).toBe(
+      '//server/share/dir',
+    )
+  })
 
-  test("converts root drive path", () => {
-    expect(windowsPathToPosixPath("D:\\")).toBe("/d/");
-  });
+  test('converts root drive path', () => {
+    expect(windowsPathToPosixPath('D:\\')).toBe('/d/')
+  })
 
-  test("converts relative path by flipping backslashes", () => {
-    expect(windowsPathToPosixPath("src\\main.ts")).toBe("src/main.ts");
-  });
+  test('converts relative path by flipping backslashes', () => {
+    expect(windowsPathToPosixPath('src\\main.ts')).toBe('src/main.ts')
+  })
 
-  test("handles forward slashes in windows drive path", () => {
+  test('handles forward slashes in windows drive path', () => {
     // The regex matches both / and \\ after drive letter
-    expect(windowsPathToPosixPath("C:/Users/foo")).toBe("/c/Users/foo");
-  });
+    expect(windowsPathToPosixPath('C:/Users/foo')).toBe('/c/Users/foo')
+  })
 
-  test("already-posix relative path passes through", () => {
-    expect(windowsPathToPosixPath("src/main.ts")).toBe("src/main.ts");
-  });
+  test('already-posix relative path passes through', () => {
+    expect(windowsPathToPosixPath('src/main.ts')).toBe('src/main.ts')
+  })
 
-  test("handles deeply nested path", () => {
+  test('handles deeply nested path', () => {
     expect(
-      windowsPathToPosixPath("C:\\Users\\me\\Documents\\project\\src\\index.ts")
-    ).toBe("/c/Users/me/Documents/project/src/index.ts");
-  });
-});
+      windowsPathToPosixPath(
+        'C:\\Users\\me\\Documents\\project\\src\\index.ts',
+      ),
+    ).toBe('/c/Users/me/Documents/project/src/index.ts')
+  })
+})
 
 // ─── posixPathToWindowsPath ────────────────────────────────────────────
 
-describe("posixPathToWindowsPath", () => {
-  test("converts MSYS2/Git Bash drive path to windows", () => {
-    expect(posixPathToWindowsPath("/c/Users/foo")).toBe("C:\\Users\\foo");
-  });
+describe('posixPathToWindowsPath', () => {
+  test('converts MSYS2/Git Bash drive path to windows', () => {
+    expect(posixPathToWindowsPath('/c/Users/foo')).toBe('C:\\Users\\foo')
+  })
 
-  test("uppercases the drive letter", () => {
-    expect(posixPathToWindowsPath("/d/Work/project")).toBe(
-      "D:\\Work\\project"
-    );
-  });
+  test('uppercases the drive letter', () => {
+    expect(posixPathToWindowsPath('/d/Work/project')).toBe('D:\\Work\\project')
+  })
 
-  test("converts cygdrive path", () => {
-    expect(posixPathToWindowsPath("/cygdrive/d/work")).toBe("D:\\work");
-  });
+  test('converts cygdrive path', () => {
+    expect(posixPathToWindowsPath('/cygdrive/d/work')).toBe('D:\\work')
+  })
 
-  test("converts cygdrive root path", () => {
-    expect(posixPathToWindowsPath("/cygdrive/c/")).toBe("C:\\");
-  });
+  test('converts cygdrive root path', () => {
+    expect(posixPathToWindowsPath('/cygdrive/c/')).toBe('C:\\')
+  })
 
-  test("converts UNC posix path to windows UNC", () => {
-    expect(posixPathToWindowsPath("//server/share/dir")).toBe(
-      "\\\\server\\share\\dir"
-    );
-  });
+  test('converts UNC posix path to windows UNC', () => {
+    expect(posixPathToWindowsPath('//server/share/dir')).toBe(
+      '\\\\server\\share\\dir',
+    )
+  })
 
-  test("converts root drive posix path", () => {
-    expect(posixPathToWindowsPath("/d/")).toBe("D:\\");
-  });
+  test('converts root drive posix path', () => {
+    expect(posixPathToWindowsPath('/d/')).toBe('D:\\')
+  })
 
-  test("converts bare drive mount (no trailing slash)", () => {
+  test('converts bare drive mount (no trailing slash)', () => {
     // /d matches the regex ^\/([A-Za-z])(\/|$) where $2 is empty
-    expect(posixPathToWindowsPath("/d")).toBe("D:\\");
-  });
+    expect(posixPathToWindowsPath('/d')).toBe('D:\\')
+  })
 
-  test("converts relative path by flipping forward slashes", () => {
-    expect(posixPathToWindowsPath("src/main.ts")).toBe("src\\main.ts");
-  });
+  test('converts relative path by flipping forward slashes', () => {
+    expect(posixPathToWindowsPath('src/main.ts')).toBe('src\\main.ts')
+  })
 
-  test("handles already-windows relative path", () => {
+  test('handles already-windows relative path', () => {
     // No leading / or //, just flips / to backslash
-    expect(posixPathToWindowsPath("foo\\bar")).toBe("foo\\bar");
-  });
-});
+    expect(posixPathToWindowsPath('foo\\bar')).toBe('foo\\bar')
+  })
+})
 
 // ─── round-trip conversions ────────────────────────────────────────────
 
-describe("round-trip conversions", () => {
-  test("drive path round-trips windows -> posix -> windows", () => {
-    const original = "C:\\Users\\foo\\bar";
-    const posix = windowsPathToPosixPath(original);
-    const back = posixPathToWindowsPath(posix);
-    expect(back).toBe(original);
-  });
+describe('round-trip conversions', () => {
+  test('drive path round-trips windows -> posix -> windows', () => {
+    const original = 'C:\\Users\\foo\\bar'
+    const posix = windowsPathToPosixPath(original)
+    const back = posixPathToWindowsPath(posix)
+    expect(back).toBe(original)
+  })
 
-  test("drive path round-trips posix -> windows -> posix", () => {
-    const original = "/c/Users/foo/bar";
-    const win = posixPathToWindowsPath(original);
-    const back = windowsPathToPosixPath(win);
-    expect(back).toBe(original);
-  });
-});
+  test('drive path round-trips posix -> windows -> posix', () => {
+    const original = '/c/Users/foo/bar'
+    const win = posixPathToWindowsPath(original)
+    const back = windowsPathToPosixPath(win)
+    expect(back).toBe(original)
+  })
+})
diff --git a/src/utils/__tests__/withResolvers.test.ts b/src/utils/__tests__/withResolvers.test.ts
index 06fb3d53c..386246c68 100644
--- a/src/utils/__tests__/withResolvers.test.ts
+++ b/src/utils/__tests__/withResolvers.test.ts
@@ -1,58 +1,58 @@
-import { describe, expect, test } from "bun:test";
-import { withResolvers } from "../withResolvers";
+import { describe, expect, test } from 'bun:test'
+import { withResolvers } from '../withResolvers'
 
-describe("withResolvers", () => {
-  test("returns object with promise, resolve, reject", () => {
-    const result = withResolvers<string>();
-    expect(result).toHaveProperty("promise");
-    expect(result).toHaveProperty("resolve");
-    expect(result).toHaveProperty("reject");
-    expect(typeof result.resolve).toBe("function");
-    expect(typeof result.reject).toBe("function");
-  });
+describe('withResolvers', () => {
+  test('returns object with promise, resolve, reject', () => {
+    const result = withResolvers<string>()
+    expect(result).toHaveProperty('promise')
+    expect(result).toHaveProperty('resolve')
+    expect(result).toHaveProperty('reject')
+    expect(typeof result.resolve).toBe('function')
+    expect(typeof result.reject).toBe('function')
+  })
 
-  test("promise resolves when resolve is called", async () => {
-    const { promise, resolve } = withResolvers<string>();
-    resolve("hello");
-    const result = await promise;
-    expect(result).toBe("hello");
-  });
+  test('promise resolves when resolve is called', async () => {
+    const { promise, resolve } = withResolvers<string>()
+    resolve('hello')
+    const result = await promise
+    expect(result).toBe('hello')
+  })
 
-  test("promise rejects when reject is called", async () => {
-    const { promise, reject } = withResolvers<string>();
-    reject(new Error("fail"));
-    await expect(promise).rejects.toThrow("fail");
-  });
+  test('promise rejects when reject is called', async () => {
+    const { promise, reject } = withResolvers<string>()
+    reject(new Error('fail'))
+    await expect(promise).rejects.toThrow('fail')
+  })
 
-  test("resolve passes value through", async () => {
-    const { promise, resolve } = withResolvers<number>();
-    resolve(42);
-    expect(await promise).toBe(42);
-  });
+  test('resolve passes value through', async () => {
+    const { promise, resolve } = withResolvers<number>()
+    resolve(42)
+    expect(await promise).toBe(42)
+  })
 
-  test("reject passes error through", async () => {
-    const { promise, reject } = withResolvers<void>();
-    const err = new Error("custom error");
-    reject(err);
-    await expect(promise).rejects.toBe(err);
-  });
+  test('reject passes error through', async () => {
+    const { promise, reject } = withResolvers<void>()
+    const err = new Error('custom error')
+    reject(err)
+    await expect(promise).rejects.toBe(err)
+  })
 
-  test("promise is instanceof Promise", () => {
-    const { promise } = withResolvers<void>();
-    expect(promise).toBeInstanceOf(Promise);
-  });
+  test('promise is instanceof Promise', () => {
+    const { promise } = withResolvers<void>()
+    expect(promise).toBeInstanceOf(Promise)
+  })
 
-  test("works with generic type parameter", async () => {
-    const { promise, resolve } = withResolvers<{ name: string }>();
-    resolve({ name: "test" });
-    const result = await promise;
-    expect(result.name).toBe("test");
-  });
+  test('works with generic type parameter', async () => {
+    const { promise, resolve } = withResolvers<{ name: string }>()
+    resolve({ name: 'test' })
+    const result = await promise
+    expect(result.name).toBe('test')
+  })
 
-  test("resolve/reject can be called asynchronously", async () => {
-    const { promise, resolve } = withResolvers<number>();
-    setTimeout(() => resolve(99), 10);
-    const result = await promise;
-    expect(result).toBe(99);
-  });
-});
+  test('resolve/reject can be called asynchronously', async () => {
+    const { promise, resolve } = withResolvers<number>()
+    setTimeout(() => resolve(99), 10)
+    const result = await promise
+    expect(result).toBe(99)
+  })
+})
diff --git a/src/utils/__tests__/words.test.ts b/src/utils/__tests__/words.test.ts
index 364b1bc38..5240aaa9a 100644
--- a/src/utils/__tests__/words.test.ts
+++ b/src/utils/__tests__/words.test.ts
@@ -1,85 +1,85 @@
-import { describe, expect, test } from "bun:test";
-import { generateWordSlug, generateShortWordSlug } from "../words";
+import { describe, expect, test } from 'bun:test'
+import { generateWordSlug, generateShortWordSlug } from '../words'
 
-describe("generateWordSlug", () => {
-  test("returns three-part hyphenated slug", () => {
-    const slug = generateWordSlug();
-    const parts = slug.split("-");
-    expect(parts.length).toBe(3);
-  });
+describe('generateWordSlug', () => {
+  test('returns three-part hyphenated slug', () => {
+    const slug = generateWordSlug()
+    const parts = slug.split('-')
+    expect(parts.length).toBe(3)
+  })
 
-  test("all parts are non-empty", () => {
+  test('all parts are non-empty', () => {
     for (let i = 0; i < 10; i++) {
-      const slug = generateWordSlug();
-      const parts = slug.split("-");
+      const slug = generateWordSlug()
+      const parts = slug.split('-')
       for (const part of parts) {
-        expect(part.length).toBeGreaterThan(0);
+        expect(part.length).toBeGreaterThan(0)
       }
     }
-  });
+  })
 
-  test("all parts are lowercase", () => {
+  test('all parts are lowercase', () => {
     for (let i = 0; i < 10; i++) {
-      const slug = generateWordSlug();
-      expect(slug).toBe(slug.toLowerCase());
+      const slug = generateWordSlug()
+      expect(slug).toBe(slug.toLowerCase())
     }
-  });
+  })
 
-  test("no consecutive hyphens", () => {
+  test('no consecutive hyphens', () => {
     for (let i = 0; i < 10; i++) {
-      const slug = generateWordSlug();
-      expect(slug).not.toContain("--");
+      const slug = generateWordSlug()
+      expect(slug).not.toContain('--')
     }
-  });
+  })
 
-  test("multiple calls produce varied results", () => {
-    const slugs = new Set<string>();
+  test('multiple calls produce varied results', () => {
+    const slugs = new Set<string>()
     for (let i = 0; i < 20; i++) {
-      slugs.add(generateWordSlug());
+      slugs.add(generateWordSlug())
     }
     // With 50+ adjectives × 50+ verbs × 50+ nouns, 20 calls should produce mostly unique slugs
-    expect(slugs.size).toBeGreaterThan(10);
-  });
+    expect(slugs.size).toBeGreaterThan(10)
+  })
 
-  test("slug matches adjective-verb-noun pattern", () => {
-    const slug = generateWordSlug();
-    expect(slug).toMatch(/^[a-z]+-[a-z]+-[a-z]+$/);
-  });
-});
+  test('slug matches adjective-verb-noun pattern', () => {
+    const slug = generateWordSlug()
+    expect(slug).toMatch(/^[a-z]+-[a-z]+-[a-z]+$/)
+  })
+})
 
-describe("generateShortWordSlug", () => {
-  test("returns two-part hyphenated slug", () => {
-    const slug = generateShortWordSlug();
-    const parts = slug.split("-");
-    expect(parts.length).toBe(2);
-  });
+describe('generateShortWordSlug', () => {
+  test('returns two-part hyphenated slug', () => {
+    const slug = generateShortWordSlug()
+    const parts = slug.split('-')
+    expect(parts.length).toBe(2)
+  })
 
-  test("all parts are non-empty", () => {
+  test('all parts are non-empty', () => {
     for (let i = 0; i < 10; i++) {
-      const slug = generateShortWordSlug();
-      const parts = slug.split("-");
+      const slug = generateShortWordSlug()
+      const parts = slug.split('-')
       for (const part of parts) {
-        expect(part.length).toBeGreaterThan(0);
+        expect(part.length).toBeGreaterThan(0)
       }
     }
-  });
+  })
 
-  test("all parts are lowercase", () => {
+  test('all parts are lowercase', () => {
     for (let i = 0; i < 10; i++) {
-      const slug = generateShortWordSlug();
-      expect(slug).toBe(slug.toLowerCase());
+      const slug = generateShortWordSlug()
+      expect(slug).toBe(slug.toLowerCase())
     }
-  });
+  })
 
-  test("slug matches adjective-noun pattern", () => {
-    const slug = generateShortWordSlug();
-    expect(slug).toMatch(/^[a-z]+-[a-z]+$/);
-  });
+  test('slug matches adjective-noun pattern', () => {
+    const slug = generateShortWordSlug()
+    expect(slug).toMatch(/^[a-z]+-[a-z]+$/)
+  })
 
-  test("no consecutive hyphens", () => {
+  test('no consecutive hyphens', () => {
     for (let i = 0; i < 10; i++) {
-      const slug = generateShortWordSlug();
-      expect(slug).not.toContain("--");
+      const slug = generateShortWordSlug()
+      expect(slug).not.toContain('--')
     }
-  });
-});
+  })
+})
diff --git a/src/utils/__tests__/xdg.test.ts b/src/utils/__tests__/xdg.test.ts
index f64adb48b..62c9cca66 100644
--- a/src/utils/__tests__/xdg.test.ts
+++ b/src/utils/__tests__/xdg.test.ts
@@ -1,84 +1,84 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from 'bun:test'
 import {
   getXDGStateHome,
   getXDGCacheHome,
   getXDGDataHome,
   getUserBinDir,
-} from "../xdg";
+} from '../xdg'
 
-describe("getXDGStateHome", () => {
-  test("returns ~/.local/state by default", () => {
-    const result = getXDGStateHome({ homedir: "/home/user" });
-    expect(result).toBe("/home/user/.local/state");
-  });
+describe('getXDGStateHome', () => {
+  test('returns ~/.local/state by default', () => {
+    const result = getXDGStateHome({ homedir: '/home/user' })
+    expect(result).toBe('/home/user/.local/state')
+  })
 
-  test("respects XDG_STATE_HOME env var", () => {
+  test('respects XDG_STATE_HOME env var', () => {
     const result = getXDGStateHome({
-      homedir: "/home/user",
-      env: { XDG_STATE_HOME: "/custom/state" },
-    });
-    expect(result).toBe("/custom/state");
-  });
+      homedir: '/home/user',
+      env: { XDG_STATE_HOME: '/custom/state' },
+    })
+    expect(result).toBe('/custom/state')
+  })
 
-  test("uses custom homedir from options", () => {
-    const result = getXDGStateHome({ homedir: "/opt/home" });
-    expect(result).toBe("/opt/home/.local/state");
-  });
-});
+  test('uses custom homedir from options', () => {
+    const result = getXDGStateHome({ homedir: '/opt/home' })
+    expect(result).toBe('/opt/home/.local/state')
+  })
+})
 
-describe("getXDGCacheHome", () => {
-  test("returns ~/.cache by default", () => {
-    const result = getXDGCacheHome({ homedir: "/home/user" });
-    expect(result).toBe("/home/user/.cache");
-  });
+describe('getXDGCacheHome', () => {
+  test('returns ~/.cache by default', () => {
+    const result = getXDGCacheHome({ homedir: '/home/user' })
+    expect(result).toBe('/home/user/.cache')
+  })
 
-  test("respects XDG_CACHE_HOME env var", () => {
+  test('respects XDG_CACHE_HOME env var', () => {
     const result = getXDGCacheHome({
-      homedir: "/home/user",
-      env: { XDG_CACHE_HOME: "/tmp/cache" },
-    });
-    expect(result).toBe("/tmp/cache");
-  });
-});
+      homedir: '/home/user',
+      env: { XDG_CACHE_HOME: '/tmp/cache' },
+    })
+    expect(result).toBe('/tmp/cache')
+  })
+})
 
-describe("getXDGDataHome", () => {
-  test("returns ~/.local/share by default", () => {
-    const result = getXDGDataHome({ homedir: "/home/user" });
-    expect(result).toBe("/home/user/.local/share");
-  });
+describe('getXDGDataHome', () => {
+  test('returns ~/.local/share by default', () => {
+    const result = getXDGDataHome({ homedir: '/home/user' })
+    expect(result).toBe('/home/user/.local/share')
+  })
 
-  test("respects XDG_DATA_HOME env var", () => {
+  test('respects XDG_DATA_HOME env var', () => {
     const result = getXDGDataHome({
-      homedir: "/home/user",
-      env: { XDG_DATA_HOME: "/custom/data" },
-    });
-    expect(result).toBe("/custom/data");
-  });
-});
+      homedir: '/home/user',
+      env: { XDG_DATA_HOME: '/custom/data' },
+    })
+    expect(result).toBe('/custom/data')
+  })
+})
 
-describe("getUserBinDir", () => {
-  test("returns ~/.local/bin", () => {
-    const result = getUserBinDir({ homedir: "/home/user" });
-    expect(result).toBe("/home/user/.local/bin");
-  });
+describe('getUserBinDir', () => {
+  test('returns ~/.local/bin', () => {
+    const result = getUserBinDir({ homedir: '/home/user' })
+    expect(result).toBe('/home/user/.local/bin')
+  })
 
-  test("uses custom homedir from options", () => {
-    const result = getUserBinDir({ homedir: "/opt/me" });
-    expect(result).toBe("/opt/me/.local/bin");
-  });
-});
+  test('uses custom homedir from options', () => {
+    const result = getUserBinDir({ homedir: '/opt/me' })
+    expect(result).toBe('/opt/me/.local/bin')
+  })
+})
 
-describe("path construction", () => {
-  test("all paths end with correct subdirectory", () => {
-    const home = "/home/test";
-    expect(getXDGStateHome({ homedir: home })).toMatch(/\.local\/state$/);
-    expect(getXDGCacheHome({ homedir: home })).toMatch(/\.cache$/);
-    expect(getXDGDataHome({ homedir: home })).toMatch(/\.local\/share$/);
-    expect(getUserBinDir({ homedir: home })).toMatch(/\.local\/bin$/);
-  });
+describe('path construction', () => {
+  test('all paths end with correct subdirectory', () => {
+    const home = '/home/test'
+    expect(getXDGStateHome({ homedir: home })).toMatch(/\.local\/state$/)
+    expect(getXDGCacheHome({ homedir: home })).toMatch(/\.cache$/)
+    expect(getXDGDataHome({ homedir: home })).toMatch(/\.local\/share$/)
+    expect(getUserBinDir({ homedir: home })).toMatch(/\.local\/bin$/)
+  })
 
-  test("respects HOME via homedir override", () => {
-    const result = getXDGStateHome({ homedir: "/Users/me" });
-    expect(result).toBe("/Users/me/.local/state");
-  });
-});
+  test('respects HOME via homedir override', () => {
+    const result = getXDGStateHome({ homedir: '/Users/me' })
+    expect(result).toBe('/Users/me/.local/state')
+  })
+})
diff --git a/src/utils/__tests__/xml.test.ts b/src/utils/__tests__/xml.test.ts
index 73ce9e5af..410b6a0ba 100644
--- a/src/utils/__tests__/xml.test.ts
+++ b/src/utils/__tests__/xml.test.ts
@@ -1,42 +1,42 @@
-import { describe, expect, test } from "bun:test";
-import { escapeXml, escapeXmlAttr } from "../xml";
+import { describe, expect, test } from 'bun:test'
+import { escapeXml, escapeXmlAttr } from '../xml'
 
-describe("escapeXml", () => {
-  test("escapes ampersand", () => {
-    expect(escapeXml("a & b")).toBe("a &amp; b");
-  });
+describe('escapeXml', () => {
+  test('escapes ampersand', () => {
+    expect(escapeXml('a & b')).toBe('a &amp; b')
+  })
 
-  test("escapes less-than", () => {
-    expect(escapeXml("<div>")).toBe("&lt;div&gt;");
-  });
+  test('escapes less-than', () => {
+    expect(escapeXml('<div>')).toBe('&lt;div&gt;')
+  })
 
-  test("escapes greater-than", () => {
-    expect(escapeXml("a > b")).toBe("a &gt; b");
-  });
+  test('escapes greater-than', () => {
+    expect(escapeXml('a > b')).toBe('a &gt; b')
+  })
 
-  test("escapes multiple special chars", () => {
-    expect(escapeXml("<a & b>")).toBe("&lt;a &amp; b&gt;");
-  });
+  test('escapes multiple special chars', () => {
+    expect(escapeXml('<a & b>')).toBe('&lt;a &amp; b&gt;')
+  })
 
-  test("returns empty string unchanged", () => {
-    expect(escapeXml("")).toBe("");
-  });
+  test('returns empty string unchanged', () => {
+    expect(escapeXml('')).toBe('')
+  })
 
-  test("returns normal text unchanged", () => {
-    expect(escapeXml("hello world")).toBe("hello world");
-  });
-});
+  test('returns normal text unchanged', () => {
+    expect(escapeXml('hello world')).toBe('hello world')
+  })
+})
 
-describe("escapeXmlAttr", () => {
-  test("escapes double quotes", () => {
-    expect(escapeXmlAttr('say "hello"')).toBe("say &quot;hello&quot;");
-  });
+describe('escapeXmlAttr', () => {
+  test('escapes double quotes', () => {
+    expect(escapeXmlAttr('say "hello"')).toBe('say &quot;hello&quot;')
+  })
 
-  test("escapes single quotes", () => {
-    expect(escapeXmlAttr("it's")).toBe("it&apos;s");
-  });
+  test('escapes single quotes', () => {
+    expect(escapeXmlAttr("it's")).toBe('it&apos;s')
+  })
 
-  test("escapes all special chars", () => {
-    expect(escapeXmlAttr('<a & "b">')).toBe("&lt;a &amp; &quot;b&quot;&gt;");
-  });
-});
+  test('escapes all special chars', () => {
+    expect(escapeXmlAttr('<a & "b">')).toBe('&lt;a &amp; &quot;b&quot;&gt;')
+  })
+})
diff --git a/src/utils/__tests__/zodToJsonSchema.test.ts b/src/utils/__tests__/zodToJsonSchema.test.ts
index c4c125ea5..d57b01449 100644
--- a/src/utils/__tests__/zodToJsonSchema.test.ts
+++ b/src/utils/__tests__/zodToJsonSchema.test.ts
@@ -1,73 +1,73 @@
-import { describe, expect, test } from "bun:test";
-import z from "zod/v4";
-import { zodToJsonSchema } from "../zodToJsonSchema";
+import { describe, expect, test } from 'bun:test'
+import z from 'zod/v4'
+import { zodToJsonSchema } from '../zodToJsonSchema'
 
-describe("zodToJsonSchema", () => {
-  test("converts string schema", () => {
-    const schema = z.string();
-    const result = zodToJsonSchema(schema);
-    expect(result.type).toBe("string");
-  });
+describe('zodToJsonSchema', () => {
+  test('converts string schema', () => {
+    const schema = z.string()
+    const result = zodToJsonSchema(schema)
+    expect(result.type).toBe('string')
+  })
 
-  test("converts number schema", () => {
-    const schema = z.number();
-    const result = zodToJsonSchema(schema);
-    expect(result.type).toBe("number");
-  });
+  test('converts number schema', () => {
+    const schema = z.number()
+    const result = zodToJsonSchema(schema)
+    expect(result.type).toBe('number')
+  })
 
-  test("converts object schema with properties", () => {
+  test('converts object schema with properties', () => {
     const schema = z.object({
       name: z.string(),
       age: z.number(),
-    });
-    const result = zodToJsonSchema(schema);
-    expect(result.type).toBe("object");
-    expect(result.properties).toBeDefined();
-    expect((result.properties as any).name).toEqual({ type: "string" });
-    expect((result.properties as any).age).toEqual({ type: "number" });
-  });
+    })
+    const result = zodToJsonSchema(schema)
+    expect(result.type).toBe('object')
+    expect(result.properties).toBeDefined()
+    expect((result.properties as any).name).toEqual({ type: 'string' })
+    expect((result.properties as any).age).toEqual({ type: 'number' })
+  })
 
-  test("converts enum schema", () => {
-    const schema = z.enum(["a", "b", "c"]);
-    const result = zodToJsonSchema(schema);
-    expect(result.enum).toEqual(["a", "b", "c"]);
-  });
+  test('converts enum schema', () => {
+    const schema = z.enum(['a', 'b', 'c'])
+    const result = zodToJsonSchema(schema)
+    expect(result.enum).toEqual(['a', 'b', 'c'])
+  })
 
-  test("converts optional fields", () => {
+  test('converts optional fields', () => {
     const schema = z.object({
       required: z.string(),
       optional: z.string().optional(),
-    });
-    const result = zodToJsonSchema(schema);
-    expect(result.required).toEqual(["required"]);
-    expect(result.required).not.toContain("optional");
-  });
+    })
+    const result = zodToJsonSchema(schema)
+    expect(result.required).toEqual(['required'])
+    expect(result.required).not.toContain('optional')
+  })
 
-  test("caches results for same schema reference", () => {
-    const schema = z.string();
-    const first = zodToJsonSchema(schema);
-    const second = zodToJsonSchema(schema);
-    expect(first).toBe(second); // same reference (cached)
-  });
+  test('caches results for same schema reference', () => {
+    const schema = z.string()
+    const first = zodToJsonSchema(schema)
+    const second = zodToJsonSchema(schema)
+    expect(first).toBe(second) // same reference (cached)
+  })
 
-  test("different schemas get different results", () => {
-    const s1 = z.string();
-    const s2 = z.number();
-    const r1 = zodToJsonSchema(s1);
-    const r2 = zodToJsonSchema(s2);
-    expect(r1).not.toBe(r2);
-    expect(r1.type).not.toBe(r2.type);
-  });
+  test('different schemas get different results', () => {
+    const s1 = z.string()
+    const s2 = z.number()
+    const r1 = zodToJsonSchema(s1)
+    const r2 = zodToJsonSchema(s2)
+    expect(r1).not.toBe(r2)
+    expect(r1.type).not.toBe(r2.type)
+  })
 
-  test("converts array schema", () => {
-    const schema = z.array(z.string());
-    const result = zodToJsonSchema(schema);
-    expect(result.type).toBe("array");
-    expect((result.items as any).type).toBe("string");
-  });
+  test('converts array schema', () => {
+    const schema = z.array(z.string())
+    const result = zodToJsonSchema(schema)
+    expect(result.type).toBe('array')
+    expect((result.items as any).type).toBe('string')
+  })
 
-  test("converts boolean schema", () => {
-    const result = zodToJsonSchema(z.boolean());
-    expect(result.type).toBe("boolean");
-  });
-});
+  test('converts boolean schema', () => {
+    const result = zodToJsonSchema(z.boolean())
+    expect(result.type).toBe('boolean')
+  })
+})
diff --git a/src/utils/analyzeContext.ts b/src/utils/analyzeContext.ts
index 329ba6508..9c379728a 100644
--- a/src/utils/analyzeContext.ts
+++ b/src/utils/analyzeContext.ts
@@ -384,7 +384,9 @@ async function countBuiltInToolTokens(
 
   // Check if tool search is enabled
   const { isToolSearchEnabled } = await import('./toolSearch.js')
-  const { isDeferredTool } = await import('@claude-code-best/builtin-tools/tools/ToolSearchTool/prompt.js')
+  const { isDeferredTool } = await import(
+    '@claude-code-best/builtin-tools/tools/ToolSearchTool/prompt.js'
+  )
   const isDeferred = await isToolSearchEnabled(
     model ?? '',
     tools,
@@ -668,7 +670,9 @@ export async function countMcpToolTokens(
   // Check if tool search is enabled - if so, MCP tools are deferred
   // isToolSearchEnabled handles threshold calculation internally for TstAuto mode
   const { isToolSearchEnabled } = await import('./toolSearch.js')
-  const { isDeferredTool } = await import('@claude-code-best/builtin-tools/tools/ToolSearchTool/prompt.js')
+  const { isDeferredTool } = await import(
+    '@claude-code-best/builtin-tools/tools/ToolSearchTool/prompt.js'
+  )
 
   const isDeferred = await isToolSearchEnabled(
     model,
@@ -786,12 +790,18 @@ function processAssistantMessage(
   breakdown: MessageBreakdown,
 ): void {
   // Process each content block individually
-  const contentBlocks = Array.isArray(msg.message!.content) ? msg.message!.content : []
+  const contentBlocks = Array.isArray(msg.message!.content)
+    ? msg.message!.content
+    : []
   for (const block of contentBlocks) {
     const blockStr = jsonStringify(block)
     const blockTokens = roughTokenCountEstimation(blockStr)
 
-    if (typeof block !== 'string' && 'type' in block && block.type === 'tool_use') {
+    if (
+      typeof block !== 'string' &&
+      'type' in block &&
+      block.type === 'tool_use'
+    ) {
       breakdown.toolCallTokens += blockTokens
       const toolName = ('name' in block ? block.name : undefined) || 'unknown'
       breakdown.toolCallsByType.set(
@@ -819,7 +829,7 @@ function processUserMessage(
   }
 
   // Process each content block individually
-  for (const block of (msg.message!.content ?? [])) {
+  for (const block of msg.message!.content ?? []) {
     const blockStr = jsonStringify(block)
     const blockTokens = roughTokenCountEstimation(blockStr)
 
@@ -875,10 +885,16 @@ async function approximateMessageTokens(
   for (const msg of microcompactResult.messages) {
     if (msg.type === 'assistant' && Array.isArray(msg.message!.content)) {
       for (const block of msg.message!.content) {
-        if (typeof block !== 'string' && 'type' in block && block.type === 'tool_use') {
+        if (
+          typeof block !== 'string' &&
+          'type' in block &&
+          block.type === 'tool_use'
+        ) {
           const toolUseId = 'id' in block ? (block.id as string) : undefined
           const toolName =
-            (('name' in block ? block.name : undefined) as string | undefined) || 'unknown'
+            (('name' in block ? block.name : undefined) as
+              | string
+              | undefined) || 'unknown'
           if (toolUseId) {
             toolUseIdToName.set(toolUseId, toolName)
           }
diff --git a/src/utils/ansiToPng.ts b/src/utils/ansiToPng.ts
index 499ecedc6..452afab50 100644
--- a/src/utils/ansiToPng.ts
+++ b/src/utils/ansiToPng.ts
@@ -172,10 +172,10 @@ function fillBackground(px: Uint8Array, bg: AnsiColor): void {
 // not the classic VGA dither pattern. Alpha-blend toward background for the
 // same look.
 const SHADE_ALPHA: Record<number, number> = {
-  0x2591: 0.25, // ░
-  0x2592: 0.5, // ▒
-  0x2593: 0.75, // ▓
-  0x2588: 1.0, // █
+  9617: 0.25, // ░
+  9618: 0.5, // ▒
+  9619: 0.75, // ▓
+  9608: 1.0, // █
 }
 
 function blitShade(
diff --git a/src/utils/api.ts b/src/utils/api.ts
index 8cc347457..feb79566b 100644
--- a/src/utils/api.ts
+++ b/src/utils/api.ts
@@ -360,9 +360,7 @@ export function splitSysPromptPrefix(
   }
 
   if (useGlobalCacheFeature) {
-    const boundaryIndex = systemPrompt.findIndex(
-      s => s === SYSTEM_PROMPT_DYNAMIC_BOUNDARY,
-    )
+    const boundaryIndex = systemPrompt.indexOf(SYSTEM_PROMPT_DYNAMIC_BOUNDARY)
     if (boundaryIndex !== -1) {
       let attributionHeader: string | undefined
       let systemPromptPrefix: string | undefined
diff --git a/src/utils/attachments.ts b/src/utils/attachments.ts
index eccd59ebd..f6bde4dd9 100644
--- a/src/utils/attachments.ts
+++ b/src/utils/attachments.ts
@@ -803,11 +803,12 @@ export async function getAttachments(
         !options?.skipSkillDiscovery
           ? [
               maybe('skill_discovery', async () => {
-                const result = await skillSearchModules.prefetch.getTurnZeroSkillDiscovery(
-                  input,
-                  messages ?? [],
-                  context,
-                )
+                const result =
+                  await skillSearchModules.prefetch.getTurnZeroSkillDiscovery(
+                    input,
+                    messages ?? [],
+                    context,
+                  )
                 return result ? [result] : []
               }),
             ]
@@ -996,11 +997,13 @@ export async function getAttachments(
 
   clearTimeout(timeoutId)
   // Defensive: a getter leaking [undefined] crashes .map(a => a.type) below.
-  return ([
-    ...userAttachmentResults.flat(),
-    ...threadAttachmentResults.flat(),
-    ...mainThreadAttachmentResults.flat(),
-  ] as Attachment[]).filter(a => a !== undefined && a !== null)
+  return (
+    [
+      ...userAttachmentResults.flat(),
+      ...threadAttachmentResults.flat(),
+      ...mainThreadAttachmentResults.flat(),
+    ] as Attachment[]
+  ).filter(a => a !== undefined && a !== null)
 }
 
 async function maybe<A>(label: string, f: () => Promise<A[]>): Promise<A[]> {
@@ -1527,7 +1530,8 @@ export function getAgentListingDeltaAttachment(
     if (msg.type !== 'attachment') continue
     if (msg.attachment!.type !== 'agent_listing_delta') continue
     for (const t of msg.attachment!.addedTypes as string[]) announced.add(t)
-    for (const t of msg.attachment!.removedTypes as string[]) announced.delete(t)
+    for (const t of msg.attachment!.removedTypes as string[])
+      announced.delete(t)
   }
 
   const currentTypes = new Set(filtered.map(a => a.agentType))
@@ -1750,7 +1754,6 @@ export function memoryFilesToAttachments(
         isPartialView: memoryFile.contentDiffersFromDisk,
       })
 
-
       // Fire InstructionsLoaded hook for audit/observability (fire-and-forget)
       if (shouldFireHook && isInstructionsMemoryType(memoryFile.type)) {
         const loadReason = memoryFile.globs
@@ -2257,7 +2260,11 @@ export function collectSurfacedMemories(messages: ReadonlyArray<Message>): {
   let totalBytes = 0
   for (const m of messages) {
     if (m.type === 'attachment' && m.attachment!.type === 'relevant_memories') {
-      for (const mem of m.attachment!.memories as { path: string; content: string; mtimeMs: number }[]) {
+      for (const mem of m.attachment!.memories as {
+        path: string
+        content: string
+        mtimeMs: number
+      }[]) {
         paths.add(mem.path)
         totalBytes += mem.content.length
       }
@@ -2474,7 +2481,11 @@ export function collectRecentSuccessfulTools(
     if (!m) continue
     if (isHumanTurn(m) && m !== lastUserMessage) break
     if (m.type === 'assistant' && typeof m.message!.content !== 'string') {
-      for (const block of m.message!.content as Array<{type: string; id: string; name: string}>) {
+      for (const block of m.message!.content as Array<{
+        type: string
+        id: string
+        name: string
+      }>) {
         if (block.type === 'tool_use') useIdToName.set(block.id, block.name)
       }
     } else if (
@@ -2482,7 +2493,7 @@ export function collectRecentSuccessfulTools(
       'message' in m &&
       Array.isArray(m.message!.content)
     ) {
-      for (const block of m.message!.content as Array<{type: string}>) {
+      for (const block of m.message!.content as Array<{ type: string }>) {
         if (isToolResultBlock(block)) {
           resultByUseId.set(block.tool_use_id, block.is_error === true)
         }
@@ -2503,7 +2514,6 @@ export function collectRecentSuccessfulTools(
   return [...succeeded].filter(t => !failed.has(t))
 }
 
-
 /**
  * Filters prefetched memory attachments to exclude memories the model already
  * has in context via FileRead/Write/Edit tool calls (any iteration this turn)
@@ -3983,7 +3993,6 @@ export function getContextEfficiencyAttachment(
   return [{ type: 'context_efficiency' }]
 }
 
-
 function isFileReadDenied(
   filePath: string,
   toolPermissionContext: ToolPermissionContext,
diff --git a/src/utils/attributionHooks.ts b/src/utils/attributionHooks.ts
index 3ce54f977..81d003028 100644
--- a/src/utils/attributionHooks.ts
+++ b/src/utils/attributionHooks.ts
@@ -1,4 +1,4 @@
 // Auto-generated stub — replace with real implementation
-export const clearAttributionCaches: () => void = () => {};
-export const sweepFileContentCache: () => void = () => {};
-export const registerAttributionHooks: () => void = () => {};
+export const clearAttributionCaches: () => void = () => {}
+export const sweepFileContentCache: () => void = () => {}
+export const registerAttributionHooks: () => void = () => {}
diff --git a/src/utils/attributionTrailer.ts b/src/utils/attributionTrailer.ts
index 6761691e3..14385d8fb 100644
--- a/src/utils/attributionTrailer.ts
+++ b/src/utils/attributionTrailer.ts
@@ -1,3 +1,6 @@
 // Auto-generated stub — replace with real implementation
-export {};
-export const buildPRTrailers: (attributionData: unknown, attribution: unknown) => string[] = () => [];
+export {}
+export const buildPRTrailers: (
+  attributionData: unknown,
+  attribution: unknown,
+) => string[] = () => []
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
index aa722cf07..9473b0d6b 100644
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -514,7 +514,6 @@ async function _runAndCache(
   } catch (e) {
     if (epoch !== _apiKeyHelperEpoch) return ' '
     const detail = e instanceof Error ? e.message : String(e)
-    // biome-ignore lint/suspicious/noConsole: user-configured script failed; must be visible without --debug
     console.error(chalk.red(`apiKeyHelper failed: ${detail}`))
     logForDebugging(`Error getting API key from apiKeyHelper: ${detail}`, {
       level: 'error',
@@ -690,7 +689,6 @@ export function refreshAwsAuth(awsAuthRefresh: string): Promise<boolean> {
           : chalk.red(
               'Error running awsAuthRefresh (in settings or ~/.claude.json):',
             )
-        // biome-ignore lint/suspicious/noConsole:: intentional console output
         console.error(message)
         authStatusManager.endAuthentication(false)
         void resolve(false)
@@ -769,10 +767,8 @@ async function getAwsCredsFromCredentialExport(): Promise<{
         'Error getting AWS credentials from awsCredentialExport (in settings or ~/.claude.json):',
       )
       if (e instanceof Error) {
-        // biome-ignore lint/suspicious/noConsole:: intentional console output
         console.error(message, e.message)
       } else {
-        // biome-ignore lint/suspicious/noConsole:: intentional console output
         console.error(message, e)
       }
       return null
@@ -958,7 +954,6 @@ export function refreshGcpAuth(gcpAuthRefresh: string): Promise<boolean> {
           : chalk.red(
               'Error running gcpAuthRefresh (in settings or ~/.claude.json):',
             )
-        // biome-ignore lint/suspicious/noConsole:: intentional console output
         console.error(message)
         authStatusManager.endAuthentication(false)
         void resolve(false)
@@ -1779,6 +1774,7 @@ export function getOtelHeadersFromHelper(): Record<string, string> {
   const debounceMs = parseInt(
     process.env.CLAUDE_CODE_OTEL_HEADERS_HELPER_DEBOUNCE_MS ||
       DEFAULT_OTEL_HEADERS_DEBOUNCE_MS.toString(),
+    10,
   )
   if (
     cachedOtelHeaders &&
diff --git a/src/utils/autoRunIssue.tsx b/src/utils/autoRunIssue.tsx
index 3a6275bb5..49459e13d 100644
--- a/src/utils/autoRunIssue.tsx
+++ b/src/utils/autoRunIssue.tsx
@@ -1,36 +1,32 @@
-import * as React from 'react'
-import { useEffect, useRef } from 'react'
-import { KeyboardShortcutHint } from '@anthropic/ink'
-import { Box, Text } from '@anthropic/ink'
-import { useKeybinding } from '../keybindings/useKeybinding.js'
+import * as React from 'react';
+import { useEffect, useRef } from 'react';
+import { KeyboardShortcutHint } from '@anthropic/ink';
+import { Box, Text } from '@anthropic/ink';
+import { useKeybinding } from '../keybindings/useKeybinding.js';
 
 type Props = {
-  onRun: () => void
-  onCancel: () => void
-  reason: string
-}
+  onRun: () => void;
+  onCancel: () => void;
+  reason: string;
+};
 
 /**
  * Component that shows a notification about running /issue command
  * with the ability to cancel via ESC key
  */
-export function AutoRunIssueNotification({
-  onRun,
-  onCancel,
-  reason,
-}: Props): React.ReactNode {
-  const hasRunRef = useRef(false)
+export function AutoRunIssueNotification({ onRun, onCancel, reason }: Props): React.ReactNode {
+  const hasRunRef = useRef(false);
 
   // Handle ESC key to cancel
-  useKeybinding('confirm:no', onCancel, { context: 'Confirmation' })
+  useKeybinding('confirm:no', onCancel, { context: 'Confirmation' });
 
   // Run /issue immediately on mount
   useEffect(() => {
     if (!hasRunRef.current) {
-      hasRunRef.current = true
-      onRun()
+      hasRunRef.current = true;
+      onRun();
     }
-  }, [onRun])
+  }, [onRun]);
 
   return (
     <Box flexDirection="column" marginTop={1}>
@@ -46,10 +42,10 @@ export function AutoRunIssueNotification({
         <Text dimColor>Reason: {reason}</Text>
       </Box>
     </Box>
-  )
+  );
 }
 
-export type AutoRunIssueReason = 'feedback_survey_bad' | 'feedback_survey_good'
+export type AutoRunIssueReason = 'feedback_survey_bad' | 'feedback_survey_good';
 
 /**
  * Determines if /issue should auto-run for Ant users
@@ -57,16 +53,16 @@ export type AutoRunIssueReason = 'feedback_survey_bad' | 'feedback_survey_good'
 export function shouldAutoRunIssue(reason: AutoRunIssueReason): boolean {
   // Only for Ant users
   if (process.env.USER_TYPE !== 'ant') {
-    return false
+    return false;
   }
 
   switch (reason) {
     case 'feedback_survey_bad':
-      return false
+      return false;
     case 'feedback_survey_good':
-      return false
+      return false;
     default:
-      return false
+      return false;
   }
 }
 
@@ -77,9 +73,9 @@ export function shouldAutoRunIssue(reason: AutoRunIssueReason): boolean {
 export function getAutoRunCommand(reason: AutoRunIssueReason): string {
   // Only ant builds have the /good-claude command
   if (process.env.USER_TYPE === 'ant' && reason === 'feedback_survey_good') {
-    return '/good-claude'
+    return '/good-claude';
   }
-  return '/issue'
+  return '/issue';
 }
 
 /**
@@ -88,10 +84,10 @@ export function getAutoRunCommand(reason: AutoRunIssueReason): string {
 export function getAutoRunIssueReasonText(reason: AutoRunIssueReason): string {
   switch (reason) {
     case 'feedback_survey_bad':
-      return 'You responded "Bad" to the feedback survey'
+      return 'You responded "Bad" to the feedback survey';
     case 'feedback_survey_good':
-      return 'You responded "Good" to the feedback survey'
+      return 'You responded "Good" to the feedback survey';
     default:
-      return 'Unknown reason'
+      return 'Unknown reason';
   }
 }
diff --git a/src/utils/autoUpdater.ts b/src/utils/autoUpdater.ts
index 2a5fc6f97..af866eec6 100644
--- a/src/utils/autoUpdater.ts
+++ b/src/utils/autoUpdater.ts
@@ -81,7 +81,6 @@ export async function assertMinVersion(): Promise<void> {
       versionConfig.minVersion &&
       lt(MACRO.VERSION, versionConfig.minVersion)
     ) {
-      // biome-ignore lint/suspicious/noConsole:: intentional console output
       console.error(`
 It looks like your version of Claude Code (${MACRO.VERSION}) needs an update.
 A newer version (${versionConfig.minVersion} or higher) is required to continue.
@@ -478,7 +477,6 @@ export async function installGlobalPackage(
         currentVersion:
           MACRO.VERSION as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
       })
-      // biome-ignore lint/suspicious/noConsole:: intentional console output
       console.error(`
 Error: Windows NPM detected in WSL
 
diff --git a/src/utils/background/remote/src/constants/oauth.ts b/src/utils/background/remote/src/constants/oauth.ts
index a1b08933a..ae2abf9b1 100644
--- a/src/utils/background/remote/src/constants/oauth.ts
+++ b/src/utils/background/remote/src/constants/oauth.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getOauthConfig = any;
+export type getOauthConfig = any
diff --git a/src/utils/background/remote/src/entrypoints/agentSdkTypes.ts b/src/utils/background/remote/src/entrypoints/agentSdkTypes.ts
index d4bdb4fb4..bcba4541a 100644
--- a/src/utils/background/remote/src/entrypoints/agentSdkTypes.ts
+++ b/src/utils/background/remote/src/entrypoints/agentSdkTypes.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type SDKMessage = any;
+export type SDKMessage = any
diff --git a/src/utils/background/remote/src/services/oauth/client.ts b/src/utils/background/remote/src/services/oauth/client.ts
index 5a7055fbe..e9033865f 100644
--- a/src/utils/background/remote/src/services/oauth/client.ts
+++ b/src/utils/background/remote/src/services/oauth/client.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getOrganizationUUID = any;
+export type getOrganizationUUID = any
diff --git a/src/utils/bash/ShellSnapshot.ts b/src/utils/bash/ShellSnapshot.ts
index d26f052cb..8d91ba454 100644
--- a/src/utils/bash/ShellSnapshot.ts
+++ b/src/utils/bash/ShellSnapshot.ts
@@ -421,6 +421,7 @@ export const createAndSaveSnapshot = async (
 
   logForDebugging(`Creating shell snapshot for ${shellType} (${binShell})`)
 
+  // biome-ignore lint/suspicious/noAsyncPromiseExecutor: async needed for sequential awaits inside executor
   return new Promise(async resolve => {
     try {
       const configFile = getConfigFile(binShell)
diff --git a/src/utils/bash/ast.ts b/src/utils/bash/ast.ts
index fc2eca88a..cc799ac1b 100644
--- a/src/utils/bash/ast.ts
+++ b/src/utils/bash/ast.ts
@@ -251,6 +251,7 @@ const BRACE_EXPANSION_RE = /\{[^{}\s]*(,|\.\.)[^{}\s]*\}/
  * word boundaries.
  */
 // eslint-disable-next-line no-control-regex
+// biome-ignore lint/suspicious/noControlCharactersInRegex: intentional control character detection regex
 const CONTROL_CHAR_RE = /[\x00-\x08\x0B-\x1F\x7F]/
 
 /**
@@ -720,7 +721,6 @@ function collectCommands(
         child.type === 'select' ||
         child.type === ';'
       ) {
-        continue // structural tokens
       } else if (child.type === 'command_substitution') {
         // `for i in $(seq 1 3)` — inner cmd IS extracted and rule-checked.
         const err = collectCommandSubstitution(child, commands, varScope)
@@ -1792,7 +1792,6 @@ function walkVariableAssignment(
       // node. Without this case it falls through to walkArgument below
       // → tooComplex on unknown type `+=`.
       isAppend = child.type === '+='
-      continue
     } else if (child.type === 'command_substitution') {
       // $() as the variable's value. The output becomes a STRING stored in
       // the variable — it's NOT a positional argument (no path/flag concern).
@@ -1899,6 +1898,7 @@ function walkVariableAssignment(
       return {
         kind: 'too-complex',
         reason:
+          // biome-ignore lint/suspicious/noTemplateCurlyInString: ${VAR} is bash syntax documentation, not a JS template literal
           'PS4 value outside safe charset — only ${VAR} refs and [A-Za-z0-9 _+:.=/[]-] allowed',
         nodeType: 'variable_assignment',
       }
diff --git a/src/utils/bash/bashParser.ts b/src/utils/bash/bashParser.ts
index 6c442348a..34277c6d7 100644
--- a/src/utils/bash/bashParser.ts
+++ b/src/utils/bash/bashParser.ts
@@ -853,15 +853,11 @@ function parseStatements(P: ParseState, terminator: string | null): TsNode[] {
             after.value === 'done' ||
             after.value === 'esac'))
       ) {
-        // Trailing separator — don't include it at program level unless
-        // there's content after. But at inner levels we keep it.
-        continue
       }
     } else if (sep.type === 'NEWLINE') {
       if (P.L.heredocs.length > 0) {
         scanHeredocBodies(P)
       }
-      continue
     } else {
       restoreLex(P.L, save2)
     }
diff --git a/src/utils/bash/shellQuote.ts b/src/utils/bash/shellQuote.ts
index 771f129d3..3187ef363 100644
--- a/src/utils/bash/shellQuote.ts
+++ b/src/utils/bash/shellQuote.ts
@@ -257,7 +257,6 @@ export function hasShellQuoteSingleQuoteBug(command: string): boolean {
           return true
         }
       }
-      continue
     }
   }
 
diff --git a/src/utils/bash/src/components/PromptInput/PromptInputFooterSuggestions.ts b/src/utils/bash/src/components/PromptInput/PromptInputFooterSuggestions.ts
index d0fd674c7..503d88641 100644
--- a/src/utils/bash/src/components/PromptInput/PromptInputFooterSuggestions.ts
+++ b/src/utils/bash/src/components/PromptInput/PromptInputFooterSuggestions.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type SuggestionItem = any;
+export type SuggestionItem = any
diff --git a/src/utils/bash/src/services/analytics/index.ts b/src/utils/bash/src/services/analytics/index.ts
index 60402f927..c095b5a65 100644
--- a/src/utils/bash/src/services/analytics/index.ts
+++ b/src/utils/bash/src/services/analytics/index.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type logEvent = any;
+export type logEvent = any
diff --git a/src/utils/betas.ts b/src/utils/betas.ts
index 3a48a943a..2b1e77d67 100644
--- a/src/utils/betas.ts
+++ b/src/utils/betas.ts
@@ -68,7 +68,6 @@ export function filterAllowedSdkBetas(
   }
 
   if (isClaudeAISubscriber()) {
-    // biome-ignore lint/suspicious/noConsole: intentional warning
     console.warn(
       'Warning: Custom betas are only available for API key users. Ignoring provided betas.',
     )
@@ -77,7 +76,6 @@ export function filterAllowedSdkBetas(
 
   const { allowed, disallowed } = partitionBetasByAllowlist(sdkBetas)
   for (const beta of disallowed) {
-    // biome-ignore lint/suspicious/noConsole: intentional warning
     console.warn(
       `Warning: Beta header '${beta}' is not allowed. Only the following betas are supported: ${ALLOWED_SDK_BETAS.join(', ')}`,
     )
diff --git a/src/utils/ccshareResume.ts b/src/utils/ccshareResume.ts
index 297f08b36..c4c708bb2 100644
--- a/src/utils/ccshareResume.ts
+++ b/src/utils/ccshareResume.ts
@@ -1,4 +1,7 @@
 // Auto-generated stub — replace with real implementation
-import type { LogOption } from 'src/types/logs.js';
-export const parseCcshareId: (resume: string) => string | null = () => null;
-export const loadCcshare: (ccshareId: string) => Promise<LogOption> = async () => { throw new Error('ccshare not implemented'); };
+import type { LogOption } from 'src/types/logs.js'
+export const parseCcshareId: (resume: string) => string | null = () => null
+export const loadCcshare: (ccshareId: string) => Promise<LogOption> =
+  async () => {
+    throw new Error('ccshare not implemented')
+  }
diff --git a/src/utils/claudeInChrome/setup.ts b/src/utils/claudeInChrome/setup.ts
index 4f251b5cd..bafd42b68 100644
--- a/src/utils/claudeInChrome/setup.ts
+++ b/src/utils/claudeInChrome/setup.ts
@@ -67,7 +67,7 @@ export function shouldEnableClaudeInChrome(chromeFlag?: boolean): boolean {
   return false
 }
 
-let shouldAutoEnable: boolean | undefined = undefined
+let shouldAutoEnable: boolean | undefined
 
 export function shouldAutoEnableClaudeInChrome(): boolean {
   if (shouldAutoEnable !== undefined) {
diff --git a/src/utils/claudeInChrome/toolRendering.tsx b/src/utils/claudeInChrome/toolRendering.tsx
index 362cb3dcd..8ce7dbf52 100644
--- a/src/utils/claudeInChrome/toolRendering.tsx
+++ b/src/utils/claudeInChrome/toolRendering.tsx
@@ -1,13 +1,13 @@
-import * as React from 'react'
-import { MessageResponse } from '../../components/MessageResponse.js'
-import { supportsHyperlinks } from '@anthropic/ink'
-import { Link, Text } from '@anthropic/ink'
-import { renderToolResultMessage as renderDefaultMCPToolResultMessage } from '@claude-code-best/builtin-tools/tools/MCPTool/UI.js'
-import type { MCPToolResult } from '../../utils/mcpValidation.js'
-import { truncateToWidth } from '../format.js'
-import { trackClaudeInChromeTabId } from './common.js'
+import * as React from 'react';
+import { MessageResponse } from '../../components/MessageResponse.js';
+import { supportsHyperlinks } from '@anthropic/ink';
+import { Link, Text } from '@anthropic/ink';
+import { renderToolResultMessage as renderDefaultMCPToolResultMessage } from '@claude-code-best/builtin-tools/tools/MCPTool/UI.js';
+import type { MCPToolResult } from '../../utils/mcpValidation.js';
+import { truncateToWidth } from '../format.js';
+import { trackClaudeInChromeTabId } from './common.js';
 
-export type { Tool } from '@modelcontextprotocol/sdk/types.js'
+export type { Tool } from '@modelcontextprotocol/sdk/types.js';
 
 /**
  * All tool names from BROWSER_TOOLS in @ant/claude-for-chrome-mcp.
@@ -30,44 +30,44 @@ export type ChromeToolName =
   | 'read_console_messages'
   | 'read_network_requests'
   | 'shortcuts_list'
-  | 'shortcuts_execute'
+  | 'shortcuts_execute';
 
-const CHROME_EXTENSION_FOCUS_TAB_URL_BASE = 'https://clau.de/chrome/tab/'
+const CHROME_EXTENSION_FOCUS_TAB_URL_BASE = 'https://clau.de/chrome/tab/';
 
 function renderChromeToolUseMessage(
   input: Record<string, unknown>,
   toolName: ChromeToolName,
   verbose: boolean,
 ): React.ReactNode {
-  const tabId = input.tabId
+  const tabId = input.tabId;
   if (typeof tabId === 'number') {
-    trackClaudeInChromeTabId(tabId)
+    trackClaudeInChromeTabId(tabId);
   }
 
   // Build secondary info based on tool type and input
-  const secondaryInfo: string[] = []
+  const secondaryInfo: string[] = [];
 
   switch (toolName) {
     case 'navigate':
       if (typeof input.url === 'string') {
         try {
-          const url = new URL(input.url)
-          secondaryInfo.push(url.hostname)
+          const url = new URL(input.url);
+          secondaryInfo.push(url.hostname);
         } catch {
-          secondaryInfo.push(truncateToWidth(input.url, 30))
+          secondaryInfo.push(truncateToWidth(input.url, 30));
         }
       }
-      break
+      break;
 
     case 'find':
       if (typeof input.query === 'string') {
-        secondaryInfo.push(`pattern: ${truncateToWidth(input.query, 30)}`)
+        secondaryInfo.push(`pattern: ${truncateToWidth(input.query, 30)}`);
       }
-      break
+      break;
 
     case 'computer':
       if (typeof input.action === 'string') {
-        const action = input.action
+        const action = input.action;
         if (
           action === 'left_click' ||
           action === 'right_click' ||
@@ -75,71 +75,68 @@ function renderChromeToolUseMessage(
           action === 'middle_click'
         ) {
           if (typeof input.ref === 'string') {
-            secondaryInfo.push(`${action} on ${input.ref}`)
+            secondaryInfo.push(`${action} on ${input.ref}`);
           } else if (Array.isArray(input.coordinate)) {
-            secondaryInfo.push(`${action} at (${input.coordinate.join(', ')})`)
+            secondaryInfo.push(`${action} at (${input.coordinate.join(', ')})`);
           } else {
-            secondaryInfo.push(action)
+            secondaryInfo.push(action);
           }
         } else if (action === 'type' && typeof input.text === 'string') {
-          secondaryInfo.push(`type "${truncateToWidth(input.text, 15)}"`)
+          secondaryInfo.push(`type "${truncateToWidth(input.text, 15)}"`);
         } else if (action === 'key' && typeof input.text === 'string') {
-          secondaryInfo.push(`key ${input.text}`)
-        } else if (
-          action === 'scroll' &&
-          typeof input.scroll_direction === 'string'
-        ) {
-          secondaryInfo.push(`scroll ${input.scroll_direction}`)
+          secondaryInfo.push(`key ${input.text}`);
+        } else if (action === 'scroll' && typeof input.scroll_direction === 'string') {
+          secondaryInfo.push(`scroll ${input.scroll_direction}`);
         } else if (action === 'wait' && typeof input.duration === 'number') {
-          secondaryInfo.push(`wait ${input.duration}s`)
+          secondaryInfo.push(`wait ${input.duration}s`);
         } else if (action === 'left_click_drag') {
-          secondaryInfo.push('drag')
+          secondaryInfo.push('drag');
         } else {
-          secondaryInfo.push(action)
+          secondaryInfo.push(action);
         }
       }
-      break
+      break;
 
     case 'gif_creator':
       if (typeof input.action === 'string') {
-        secondaryInfo.push(`${input.action}`)
+        secondaryInfo.push(`${input.action}`);
       }
-      break
+      break;
 
     case 'resize_window':
       if (typeof input.width === 'number' && typeof input.height === 'number') {
-        secondaryInfo.push(`${input.width}x${input.height}`)
+        secondaryInfo.push(`${input.width}x${input.height}`);
       }
-      break
+      break;
 
     case 'read_console_messages':
       if (typeof input.pattern === 'string') {
-        secondaryInfo.push(`pattern: ${truncateToWidth(input.pattern, 20)}`)
+        secondaryInfo.push(`pattern: ${truncateToWidth(input.pattern, 20)}`);
       }
       if (input.onlyErrors === true) {
-        secondaryInfo.push('errors only')
+        secondaryInfo.push('errors only');
       }
-      break
+      break;
 
     case 'read_network_requests':
       if (typeof input.urlPattern === 'string') {
-        secondaryInfo.push(`pattern: ${truncateToWidth(input.urlPattern, 20)}`)
+        secondaryInfo.push(`pattern: ${truncateToWidth(input.urlPattern, 20)}`);
       }
-      break
+      break;
 
     case 'shortcuts_execute':
       if (typeof input.shortcutId === 'string') {
-        secondaryInfo.push(`shortcut_id: ${input.shortcutId}`)
+        secondaryInfo.push(`shortcut_id: ${input.shortcutId}`);
       }
-      break
+      break;
 
     case 'javascript_tool':
       // In verbose mode, show the full code
       if (verbose && typeof input.text === 'string') {
-        return input.text
+        return input.text;
       }
       // In non-verbose mode, return empty string to preserve View Tab layout
-      return ''
+      return '';
 
     case 'tabs_create_mcp':
     case 'tabs_context_mcp':
@@ -151,10 +148,10 @@ function renderChromeToolUseMessage(
     case 'update_plan':
       // These tools don't have meaningful secondary info to show inline.
       // Return empty string (not null) to ensure tool header still renders.
-      return ''
+      return '';
   }
 
-  return secondaryInfo.join(', ') || null
+  return secondaryInfo.join(', ') || null;
 }
 
 /**
@@ -166,21 +163,17 @@ function renderChromeToolUseMessage(
  */
 function renderChromeViewTabLink(input: unknown): React.ReactNode {
   if (!supportsHyperlinks()) {
-    return null
+    return null;
   }
   if (typeof input !== 'object' || input === null || !('tabId' in input)) {
-    return null
+    return null;
   }
   const tabId =
-    typeof input.tabId === 'number'
-      ? input.tabId
-      : typeof input.tabId === 'string'
-        ? parseInt(input.tabId, 10)
-        : NaN
+    typeof input.tabId === 'number' ? input.tabId : typeof input.tabId === 'string' ? parseInt(input.tabId, 10) : NaN;
   if (isNaN(tabId)) {
-    return null
+    return null;
   }
-  const linkUrl = `${CHROME_EXTENSION_FOCUS_TAB_URL_BASE}${tabId}`
+  const linkUrl = `${CHROME_EXTENSION_FOCUS_TAB_URL_BASE}${tabId}`;
   return (
     <Text>
       {' '}
@@ -188,7 +181,7 @@ function renderChromeViewTabLink(input: unknown): React.ReactNode {
         <Text color="subtle">[View Tab]</Text>
       </Link>
     </Text>
-  )
+  );
 }
 
 /**
@@ -202,62 +195,62 @@ export function renderChromeToolResultMessage(
   verbose: boolean,
 ): React.ReactNode {
   if (verbose) {
-    return renderDefaultMCPToolResultMessage(output, [], { verbose })
+    return renderDefaultMCPToolResultMessage(output, [], { verbose });
   }
 
-  let summary: string | null = null
+  let summary: string | null = null;
   switch (toolName) {
     case 'navigate':
-      summary = 'Navigation completed'
-      break
+      summary = 'Navigation completed';
+      break;
     case 'tabs_create_mcp':
-      summary = 'Tab created'
-      break
+      summary = 'Tab created';
+      break;
     case 'tabs_context_mcp':
-      summary = 'Tabs read'
-      break
+      summary = 'Tabs read';
+      break;
     case 'form_input':
-      summary = 'Input completed'
-      break
+      summary = 'Input completed';
+      break;
     case 'computer':
-      summary = 'Action completed'
-      break
+      summary = 'Action completed';
+      break;
     case 'resize_window':
-      summary = 'Window resized'
-      break
+      summary = 'Window resized';
+      break;
     case 'find':
-      summary = 'Search completed'
-      break
+      summary = 'Search completed';
+      break;
     case 'gif_creator':
-      summary = 'GIF action completed'
-      break
+      summary = 'GIF action completed';
+      break;
     case 'read_console_messages':
-      summary = 'Console messages retrieved'
-      break
+      summary = 'Console messages retrieved';
+      break;
     case 'read_network_requests':
-      summary = 'Network requests retrieved'
-      break
+      summary = 'Network requests retrieved';
+      break;
     case 'shortcuts_list':
-      summary = 'Shortcuts retrieved'
-      break
+      summary = 'Shortcuts retrieved';
+      break;
     case 'shortcuts_execute':
-      summary = 'Shortcut executed'
-      break
+      summary = 'Shortcut executed';
+      break;
     case 'javascript_tool':
-      summary = 'Script executed'
-      break
+      summary = 'Script executed';
+      break;
     case 'read_page':
-      summary = 'Page read'
-      break
+      summary = 'Page read';
+      break;
     case 'upload_image':
-      summary = 'Image uploaded'
-      break
+      summary = 'Image uploaded';
+      break;
     case 'get_page_text':
-      summary = 'Page text retrieved'
-      break
+      summary = 'Page text retrieved';
+      break;
     case 'update_plan':
-      summary = 'Plan updated'
-      break
+      summary = 'Plan updated';
+      break;
   }
 
   if (summary) {
@@ -265,10 +258,10 @@ export function renderChromeToolResultMessage(
       <MessageResponse height={1}>
         <Text dimColor>{summary}</Text>
       </MessageResponse>
-    )
+    );
   }
 
-  return null
+  return null;
 }
 
 /**
@@ -276,36 +269,26 @@ export function renderChromeToolResultMessage(
  * rendering for chrome tools in a single spread operation.
  */
 export function getClaudeInChromeMCPToolOverrides(toolName: string): {
-  userFacingName: (input?: Record<string, unknown>) => string
-  renderToolUseMessage: (
-    input: Record<string, unknown>,
-    options: { verbose: boolean },
-  ) => React.ReactNode
-  renderToolUseTag: (input: Partial<Record<string, unknown>>) => React.ReactNode
+  userFacingName: (input?: Record<string, unknown>) => string;
+  renderToolUseMessage: (input: Record<string, unknown>, options: { verbose: boolean }) => React.ReactNode;
+  renderToolUseTag: (input: Partial<Record<string, unknown>>) => React.ReactNode;
   renderToolResultMessage: (
     output: string | MCPToolResult,
     progressMessagesForMessage: unknown[],
     options: { verbose: boolean },
-  ) => React.ReactNode
+  ) => React.ReactNode;
 } {
   return {
     userFacingName(_input?: Record<string, unknown>) {
       // Trim the _mcp postfix that show up in some of the tool names
-      const displayName = toolName.replace(/_mcp$/, '')
-      return `Claude in Chrome[${displayName}]`
+      const displayName = toolName.replace(/_mcp$/, '');
+      return `Claude in Chrome[${displayName}]`;
     },
-    renderToolUseMessage(
-      input: Record<string, unknown>,
-      { verbose }: { verbose: boolean },
-    ): React.ReactNode {
-      return renderChromeToolUseMessage(
-        input,
-        toolName as ChromeToolName,
-        verbose,
-      )
+    renderToolUseMessage(input: Record<string, unknown>, { verbose }: { verbose: boolean }): React.ReactNode {
+      return renderChromeToolUseMessage(input, toolName as ChromeToolName, verbose);
     },
     renderToolUseTag(input: Partial<Record<string, unknown>>): React.ReactNode {
-      return renderChromeViewTabLink(input)
+      return renderChromeViewTabLink(input);
     },
     renderToolResultMessage(
       output: string | MCPToolResult,
@@ -313,19 +296,13 @@ export function getClaudeInChromeMCPToolOverrides(toolName: string): {
       { verbose }: { verbose: boolean },
     ): React.ReactNode {
       if (!isMCPToolResult(output)) {
-        return null
+        return null;
       }
-      return renderChromeToolResultMessage(
-        output,
-        toolName as ChromeToolName,
-        verbose,
-      )
+      return renderChromeToolResultMessage(output, toolName as ChromeToolName, verbose);
     },
-  }
+  };
 }
 
-function isMCPToolResult(
-  output: string | MCPToolResult,
-): output is MCPToolResult {
-  return typeof output === 'object' && output !== null
+function isMCPToolResult(output: string | MCPToolResult): output is MCPToolResult {
+  return typeof output === 'object' && output !== null;
 }
diff --git a/src/utils/claudemd.ts b/src/utils/claudemd.ts
index 1a9f5202d..89710315f 100644
--- a/src/utils/claudemd.ts
+++ b/src/utils/claudemd.ts
@@ -1442,10 +1442,7 @@ export function isMemoryFilePath(filePath: string): boolean {
   }
 
   // .md files in .claude/rules/ directories
-  if (
-    name.endsWith('.md') &&
-    normalizedPath.includes('/.claude/rules/')
-  ) {
+  if (name.endsWith('.md') && normalizedPath.includes('/.claude/rules/')) {
     return true
   }
 
diff --git a/src/utils/cliHighlight.ts b/src/utils/cliHighlight.ts
index e87663c1f..c4ab07110 100644
--- a/src/utils/cliHighlight.ts
+++ b/src/utils/cliHighlight.ts
@@ -18,14 +18,18 @@ export type CliHighlight = {
 // faulted in.
 let cliHighlightPromise: Promise<CliHighlight | null> | undefined
 
-let loadedGetLanguage: ((name: string) => { name: string } | undefined) | undefined
+let loadedGetLanguage:
+  | ((name: string) => { name: string } | undefined)
+  | undefined
 
 async function loadCliHighlight(): Promise<CliHighlight | null> {
   try {
     const cliHighlight = await import('cli-highlight')
     // cache hit — cli-highlight already loaded highlight.js
     const highlightJs = await import('highlight.js')
-    loadedGetLanguage = (highlightJs as { getLanguage?: typeof loadedGetLanguage }).getLanguage
+    loadedGetLanguage = (
+      highlightJs as { getLanguage?: typeof loadedGetLanguage }
+    ).getLanguage
     return {
       highlight: cliHighlight.highlight,
       supportsLanguage: cliHighlight.supportsLanguage,
diff --git a/src/utils/collapseBackgroundBashNotifications.ts b/src/utils/collapseBackgroundBashNotifications.ts
index 19fa863c9..62022c21f 100644
--- a/src/utils/collapseBackgroundBashNotifications.ts
+++ b/src/utils/collapseBackgroundBashNotifications.ts
@@ -15,8 +15,11 @@ function isCompletedBackgroundBash(
   msg: RenderableMessage,
 ): msg is NormalizedUserMessage {
   if (msg.type !== 'user') return false
-  const content0 = Array.isArray(msg.message.content) ? msg.message.content[0] : undefined
-  if (!content0 || typeof content0 === 'string' || content0?.type !== 'text') return false
+  const content0 = Array.isArray(msg.message.content)
+    ? msg.message.content[0]
+    : undefined
+  if (!content0 || typeof content0 === 'string' || content0?.type !== 'text')
+    return false
   if (!content0.text.includes(`<${TASK_NOTIFICATION_TAG}`)) return false
   // Only collapse successful completions — failed/killed stay visible individually.
   if (extractTag(content0.text, STATUS_TAG) !== 'completed') return false
diff --git a/src/utils/collapseReadSearch.ts b/src/utils/collapseReadSearch.ts
index 6f80a36fa..eb3c4c342 100644
--- a/src/utils/collapseReadSearch.ts
+++ b/src/utils/collapseReadSearch.ts
@@ -28,7 +28,9 @@ import type {
  * Safely get the first content item from a MessageContent value.
  * Returns undefined for string content or empty arrays.
  */
-function getFirstContentItem(content: MessageContent | undefined): ContentItem | undefined {
+function getFirstContentItem(
+  content: MessageContent | undefined,
+): ContentItem | undefined {
   if (!content || typeof content === 'string') return undefined
   return content[0]
 }
@@ -325,16 +327,25 @@ function getCollapsibleToolInfo(
   if (msg.type === 'assistant') {
     const content = getFirstContentItem(msg.message?.content)
     if (!content) return null
-    const info = getSearchOrReadFromContent(content as { type: string; name?: string; input?: unknown }, tools)
+    const info = getSearchOrReadFromContent(
+      content as { type: string; name?: string; input?: unknown },
+      tools,
+    )
     if (info && content.type === 'tool_use') {
-      const toolUse = content as { type: 'tool_use'; name: string; input: unknown }
+      const toolUse = content as {
+        type: 'tool_use'
+        name: string
+        input: unknown
+      }
       return { name: toolUse.name, input: toolUse.input, ...info }
     }
   }
   if (msg.type === 'grouped_tool_use') {
     // For grouped tool uses, check the first message's input
     const firstContent = getFirstContentItem(msg.messages[0]?.message?.content)
-    const firstToolUse = firstContent as { type: string; input?: unknown } | undefined
+    const firstToolUse = firstContent as
+      | { type: string; input?: unknown }
+      | undefined
     const info = getSearchOrReadFromContent(
       firstToolUse
         ? { type: 'tool_use', name: msg.toolName, input: firstToolUse.input }
@@ -354,7 +365,11 @@ function getCollapsibleToolInfo(
 function isTextBreaker(msg: RenderableMessage): boolean {
   if (msg.type === 'assistant') {
     const content = getFirstContentItem(msg.message?.content)
-    if (content && content.type === 'text' && (content as { type: 'text'; text: string }).text.trim().length > 0) {
+    if (
+      content &&
+      content.type === 'text' &&
+      (content as { type: 'text'; text: string }).text.trim().length > 0
+    ) {
       return true
     }
   }
@@ -372,8 +387,13 @@ function isNonCollapsibleToolUse(
   if (msg.type === 'assistant') {
     const content = getFirstContentItem(msg.message?.content)
     if (
-      content && content.type === 'tool_use' &&
-      !isToolSearchOrRead((content as { name: string }).name, (content as { input: unknown }).input, tools)
+      content &&
+      content.type === 'tool_use' &&
+      !isToolSearchOrRead(
+        (content as { name: string }).name,
+        (content as { input: unknown }).input,
+        tools,
+      )
     ) {
       return true
     }
@@ -381,8 +401,13 @@ function isNonCollapsibleToolUse(
   if (msg.type === 'grouped_tool_use') {
     const firstContent = getFirstContentItem(msg.messages[0]?.message?.content)
     if (
-      firstContent && firstContent.type === 'tool_use' &&
-      !isToolSearchOrRead(msg.toolName, (firstContent as { input: unknown }).input, tools)
+      firstContent &&
+      firstContent.type === 'tool_use' &&
+      !isToolSearchOrRead(
+        msg.toolName,
+        (firstContent as { input: unknown }).input,
+        tools,
+      )
     ) {
       return true
     }
@@ -408,7 +433,10 @@ function shouldSkipMessage(msg: RenderableMessage): boolean {
   if (msg.type === 'assistant') {
     const content = getFirstContentItem(msg.message?.content)
     // Skip thinking blocks and other non-text, non-tool content
-    if (content && (content.type === 'thinking' || content.type === 'redacted_thinking')) {
+    if (
+      content &&
+      (content.type === 'thinking' || content.type === 'redacted_thinking')
+    ) {
       return true
     }
   }
@@ -433,15 +461,25 @@ function isCollapsibleToolUse(
   if (msg.type === 'assistant') {
     const content = getFirstContentItem(msg.message?.content)
     return (
-      content !== undefined && content.type === 'tool_use' &&
-      isToolSearchOrRead((content as { name: string }).name, (content as { input: unknown }).input, tools)
+      content !== undefined &&
+      content.type === 'tool_use' &&
+      isToolSearchOrRead(
+        (content as { name: string }).name,
+        (content as { input: unknown }).input,
+        tools,
+      )
     )
   }
   if (msg.type === 'grouped_tool_use') {
     const firstContent = getFirstContentItem(msg.messages[0]?.message?.content)
     return (
-      firstContent !== undefined && firstContent.type === 'tool_use' &&
-      isToolSearchOrRead(msg.toolName, (firstContent as { input: unknown }).input, tools)
+      firstContent !== undefined &&
+      firstContent.type === 'tool_use' &&
+      isToolSearchOrRead(
+        msg.toolName,
+        (firstContent as { input: unknown }).input,
+        tools,
+      )
     )
   }
   return false
@@ -552,7 +590,9 @@ function getFilePathsFromReadMessage(msg: RenderableMessage): string[] {
   if (msg.type === 'assistant') {
     const content = getFirstContentItem(msg.message?.content)
     if (content && content.type === 'tool_use') {
-      const input = (content as { input: unknown }).input as { file_path?: string } | undefined
+      const input = (content as { input: unknown }).input as
+        | { file_path?: string }
+        | undefined
       if (input?.file_path) {
         paths.push(input.file_path)
       }
@@ -561,7 +601,9 @@ function getFilePathsFromReadMessage(msg: RenderableMessage): string[] {
     for (const m of msg.messages) {
       const content = getFirstContentItem(m.message?.content)
       if (content && content.type === 'tool_use') {
-        const input = (content as { input: unknown }).input as { file_path?: string } | undefined
+        const input = (content as { input: unknown }).input as
+          | { file_path?: string }
+          | undefined
         if (input?.file_path) {
           paths.push(input.file_path)
         }
diff --git a/src/utils/computerUse/escHotkey.ts b/src/utils/computerUse/escHotkey.ts
index f58bdff0f..b0f5c23f9 100644
--- a/src/utils/computerUse/escHotkey.ts
+++ b/src/utils/computerUse/escHotkey.ts
@@ -41,7 +41,7 @@ export function registerEscHotkey(onEscape: () => void): boolean {
 export function unregisterEscHotkey(): void {
   if (!registered) return
   try {
-    (requireComputerUseSwift() as any).hotkey?.unregister()
+    ;(requireComputerUseSwift() as any).hotkey?.unregister()
   } finally {
     releasePump()
     registered = false
@@ -51,5 +51,5 @@ export function unregisterEscHotkey(): void {
 
 export function notifyExpectedEscape(): void {
   if (!registered) return
-  (requireComputerUseSwift() as any).hotkey?.notifyExpectedEscape()
+  ;(requireComputerUseSwift() as any).hotkey?.notifyExpectedEscape()
 }
diff --git a/src/utils/computerUse/executor.ts b/src/utils/computerUse/executor.ts
index 1c5ba247d..92cff1070 100644
--- a/src/utils/computerUse/executor.ts
+++ b/src/utils/computerUse/executor.ts
@@ -69,18 +69,26 @@ function computeTargetDims(
 
 async function readClipboardViaPbpaste(): Promise<string> {
   if (process.platform === 'win32') {
-    const { stdout, code } = await execFileNoThrow('powershell', ['-NoProfile', '-Command', 'Get-Clipboard'], {
-      useCwd: false,
-    })
+    const { stdout, code } = await execFileNoThrow(
+      'powershell',
+      ['-NoProfile', '-Command', 'Get-Clipboard'],
+      {
+        useCwd: false,
+      },
+    )
     if (code !== 0) {
       throw new Error(`PowerShell Get-Clipboard exited with code ${code}`)
     }
     return stdout
   }
   if (process.platform === 'linux') {
-    const { stdout, code } = await execFileNoThrow('xclip', ['-selection', 'clipboard', '-o'], {
-      useCwd: false,
-    })
+    const { stdout, code } = await execFileNoThrow(
+      'xclip',
+      ['-selection', 'clipboard', '-o'],
+      {
+        useCwd: false,
+      },
+    )
     if (code !== 0) {
       throw new Error(`xclip exited with code ${code}`)
     }
@@ -97,19 +105,31 @@ async function readClipboardViaPbpaste(): Promise<string> {
 
 async function writeClipboardViaPbcopy(text: string): Promise<void> {
   if (process.platform === 'win32') {
-    const { code } = await execFileNoThrow('powershell', ['-NoProfile', '-Command', `Set-Clipboard -Value '${text.replace(/'/g, "''")}'`], {
-      useCwd: false,
-    })
+    const { code } = await execFileNoThrow(
+      'powershell',
+      [
+        '-NoProfile',
+        '-Command',
+        `Set-Clipboard -Value '${text.replace(/'/g, "''")}'`,
+      ],
+      {
+        useCwd: false,
+      },
+    )
     if (code !== 0) {
       throw new Error(`PowerShell Set-Clipboard exited with code ${code}`)
     }
     return
   }
   if (process.platform === 'linux') {
-    const { code } = await execFileNoThrow('xclip', ['-selection', 'clipboard'], {
-      input: text,
-      useCwd: false,
-    })
+    const { code } = await execFileNoThrow(
+      'xclip',
+      ['-selection', 'clipboard'],
+      {
+        input: text,
+        useCwd: false,
+      },
+    )
     if (code !== 0) {
       throw new Error(`xclip exited with code ${code}`)
     }
@@ -276,7 +296,7 @@ async function animatedMove(
   const totalFrames = Math.floor(durationSec * frameRate)
   for (let frame = 1; frame <= totalFrames; frame++) {
     const t = frame / totalFrames
-    const eased = 1 - Math.pow(1 - t, 3)
+    const eased = 1 - (1 - t) ** 3
     await input.moveMouse(
       Math.round(start.x + deltaX * eased),
       Math.round(start.y + deltaY * eased),
@@ -301,7 +321,8 @@ export function createCliExecutor(opts: {
   // No macOS code paths, no drainRunLoop, no @ant packages.
   if (process.platform !== 'darwin') {
     // eslint-disable-next-line @typescript-eslint/no-require-imports
-    const { createCrossPlatformExecutor } = require('./executorCrossPlatform.js') as typeof import('./executorCrossPlatform.js')
+    const { createCrossPlatformExecutor } =
+      require('./executorCrossPlatform.js') as typeof import('./executorCrossPlatform.js')
     return createCrossPlatformExecutor(opts)
   }
 
@@ -428,7 +449,10 @@ export function createCliExecutor(opts: {
       // Ensure the result has fields expected by toolCalls.ts (hidden, displayId).
       // macOS native returns these from Swift; our cross-platform ComputerUseAPI
       // returns {base64, width, height} — fill in the missing fields.
-      const baseResult = raw as Partial<ResolvePrepareCaptureResult> & { width?: number; height?: number }
+      const baseResult = raw as Partial<ResolvePrepareCaptureResult> & {
+        width?: number
+        height?: number
+      }
       return {
         ...raw,
         displayWidth: baseResult.displayWidth ?? baseResult.width,
@@ -436,7 +460,8 @@ export function createCliExecutor(opts: {
         originX: baseResult.originX ?? 0,
         originY: baseResult.originY ?? 0,
         hidden: baseResult.hidden ?? [],
-        displayId: baseResult.displayId ?? opts.preferredDisplayId ?? d.displayId,
+        displayId:
+          baseResult.displayId ?? opts.preferredDisplayId ?? d.displayId,
       } as ResolvePrepareCaptureResult
     },
 
diff --git a/src/utils/computerUse/hostAdapter.ts b/src/utils/computerUse/hostAdapter.ts
index ae99d0b18..e01ab30d7 100644
--- a/src/utils/computerUse/hostAdapter.ts
+++ b/src/utils/computerUse/hostAdapter.ts
@@ -35,7 +35,11 @@ class DebugLogger implements Logger {
 function checkAccessibilityJXA(): boolean {
   try {
     const result = Bun.spawnSync({
-      cmd: ['osascript', '-e', 'tell application "System Events" to get name of every process whose background only is false'],
+      cmd: [
+        'osascript',
+        '-e',
+        'tell application "System Events" to get name of every process whose background only is false',
+      ],
       stdout: 'pipe',
       stderr: 'pipe',
     })
diff --git a/src/utils/computerUse/platforms/darwin.ts b/src/utils/computerUse/platforms/darwin.ts
index 1f62c20a7..edc2fe486 100644
--- a/src/utils/computerUse/platforms/darwin.ts
+++ b/src/utils/computerUse/platforms/darwin.ts
@@ -71,7 +71,13 @@ const input: InputPlatform = {
 const screenshot: ScreenshotPlatform = {
   async captureScreen(displayId) {
     const swift = requireComputerUseSwift()
-    return swift.screenshot.captureExcluding([], undefined, undefined, undefined, displayId)
+    return swift.screenshot.captureExcluding(
+      [],
+      undefined,
+      undefined,
+      undefined,
+      displayId,
+    )
   },
 
   async captureRegion(x, y, w, h) {
@@ -110,7 +116,7 @@ const apps: AppsPlatform = {
     const running = swift.apps.listRunning()
     return running.map((app: any) => ({
       id: app.bundleId ?? '',
-      pid: 0,  // macOS listRunning doesn't expose PID through this API
+      pid: 0, // macOS listRunning doesn't expose PID through this API
       title: app.displayName ?? '',
     }))
   },
diff --git a/src/utils/computerUse/platforms/index.ts b/src/utils/computerUse/platforms/index.ts
index 5a332a18d..da6d444f3 100644
--- a/src/utils/computerUse/platforms/index.ts
+++ b/src/utils/computerUse/platforms/index.ts
@@ -5,7 +5,13 @@
  * Each backend implements the same unified interface.
  */
 
-import type { InputPlatform, ScreenshotPlatform, DisplayPlatform, AppsPlatform, WindowManagementPlatform } from './types.js'
+import type {
+  InputPlatform,
+  ScreenshotPlatform,
+  DisplayPlatform,
+  AppsPlatform,
+  WindowManagementPlatform,
+} from './types.js'
 
 export interface Platform {
   input: InputPlatform
@@ -37,5 +43,18 @@ export function loadPlatform(): Platform {
   return cached!
 }
 
-export type { InputPlatform, ScreenshotPlatform, DisplayPlatform, AppsPlatform, WindowManagementPlatform } from './types.js'
-export type { WindowHandle, ScreenshotResult, DisplayInfo, InstalledApp, FrontmostAppInfo, WindowAction } from './types.js'
+export type {
+  InputPlatform,
+  ScreenshotPlatform,
+  DisplayPlatform,
+  AppsPlatform,
+  WindowManagementPlatform,
+} from './types.js'
+export type {
+  WindowHandle,
+  ScreenshotResult,
+  DisplayInfo,
+  InstalledApp,
+  FrontmostAppInfo,
+  WindowAction,
+} from './types.js'
diff --git a/src/utils/computerUse/platforms/linux.ts b/src/utils/computerUse/platforms/linux.ts
index b58f6c72d..eab5e60d4 100644
--- a/src/utils/computerUse/platforms/linux.ts
+++ b/src/utils/computerUse/platforms/linux.ts
@@ -41,7 +41,11 @@ async function runAsync(cmd: string[]): Promise<string> {
 }
 
 function commandExists(name: string): boolean {
-  const result = Bun.spawnSync({ cmd: ['which', name], stdout: 'pipe', stderr: 'pipe' })
+  const result = Bun.spawnSync({
+    cmd: ['which', name],
+    stdout: 'pipe',
+    stderr: 'pipe',
+  })
   return result.exitCode === 0
 }
 
@@ -50,23 +54,75 @@ function commandExists(name: string): boolean {
 // ---------------------------------------------------------------------------
 
 const KEY_MAP: Record<string, string> = {
-  return: 'Return', enter: 'Return', tab: 'Tab', space: 'space',
-  backspace: 'BackSpace', delete: 'Delete', escape: 'Escape', esc: 'Escape',
-  left: 'Left', up: 'Up', right: 'Right', down: 'Down',
-  home: 'Home', end: 'End', pageup: 'Prior', pagedown: 'Next',
-  f1: 'F1', f2: 'F2', f3: 'F3', f4: 'F4', f5: 'F5', f6: 'F6',
-  f7: 'F7', f8: 'F8', f9: 'F9', f10: 'F10', f11: 'F11', f12: 'F12',
-  shift: 'shift', lshift: 'shift', rshift: 'shift',
-  control: 'ctrl', ctrl: 'ctrl', lcontrol: 'ctrl', rcontrol: 'ctrl',
-  alt: 'alt', option: 'alt', lalt: 'alt', ralt: 'alt',
-  win: 'super', meta: 'super', command: 'super', cmd: 'super', super: 'super',
-  insert: 'Insert', printscreen: 'Print', pause: 'Pause',
-  numlock: 'Num_Lock', capslock: 'Caps_Lock', scrolllock: 'Scroll_Lock',
+  return: 'Return',
+  enter: 'Return',
+  tab: 'Tab',
+  space: 'space',
+  backspace: 'BackSpace',
+  delete: 'Delete',
+  escape: 'Escape',
+  esc: 'Escape',
+  left: 'Left',
+  up: 'Up',
+  right: 'Right',
+  down: 'Down',
+  home: 'Home',
+  end: 'End',
+  pageup: 'Prior',
+  pagedown: 'Next',
+  f1: 'F1',
+  f2: 'F2',
+  f3: 'F3',
+  f4: 'F4',
+  f5: 'F5',
+  f6: 'F6',
+  f7: 'F7',
+  f8: 'F8',
+  f9: 'F9',
+  f10: 'F10',
+  f11: 'F11',
+  f12: 'F12',
+  shift: 'shift',
+  lshift: 'shift',
+  rshift: 'shift',
+  control: 'ctrl',
+  ctrl: 'ctrl',
+  lcontrol: 'ctrl',
+  rcontrol: 'ctrl',
+  alt: 'alt',
+  option: 'alt',
+  lalt: 'alt',
+  ralt: 'alt',
+  win: 'super',
+  meta: 'super',
+  command: 'super',
+  cmd: 'super',
+  super: 'super',
+  insert: 'Insert',
+  printscreen: 'Print',
+  pause: 'Pause',
+  numlock: 'Num_Lock',
+  capslock: 'Caps_Lock',
+  scrolllock: 'Scroll_Lock',
 }
 
 const MODIFIER_KEYS = new Set([
-  'shift', 'lshift', 'rshift', 'control', 'ctrl', 'lcontrol', 'rcontrol',
-  'alt', 'option', 'lalt', 'ralt', 'win', 'meta', 'command', 'cmd', 'super',
+  'shift',
+  'lshift',
+  'rshift',
+  'control',
+  'ctrl',
+  'lcontrol',
+  'rcontrol',
+  'alt',
+  'option',
+  'lalt',
+  'ralt',
+  'win',
+  'meta',
+  'command',
+  'cmd',
+  'super',
 ])
 
 function mapKey(name: string): string {
@@ -83,11 +139,23 @@ function mouseButtonNum(button: 'left' | 'right' | 'middle'): string {
 
 const input: InputPlatform = {
   async moveMouse(x, y) {
-    run(['xdotool', 'mousemove', '--sync', String(Math.round(x)), String(Math.round(y))])
+    run([
+      'xdotool',
+      'mousemove',
+      '--sync',
+      String(Math.round(x)),
+      String(Math.round(y)),
+    ])
   },
 
   async click(x, y, button) {
-    run(['xdotool', 'mousemove', '--sync', String(Math.round(x)), String(Math.round(y))])
+    run([
+      'xdotool',
+      'mousemove',
+      '--sync',
+      String(Math.round(x)),
+      String(Math.round(y)),
+    ])
     run(['xdotool', 'click', mouseButtonNum(button)])
   },
 
@@ -125,11 +193,13 @@ const input: InputPlatform = {
     if (direction === 'vertical') {
       const btn = amount >= 0 ? '5' : '4'
       const repeats = Math.abs(Math.round(amount))
-      if (repeats > 0) run(['xdotool', 'click', '--repeat', String(repeats), btn])
+      if (repeats > 0)
+        run(['xdotool', 'click', '--repeat', String(repeats), btn])
     } else {
       const btn = amount >= 0 ? '7' : '6'
       const repeats = Math.abs(Math.round(amount))
-      if (repeats > 0) run(['xdotool', 'click', '--repeat', String(repeats), btn])
+      if (repeats > 0)
+        run(['xdotool', 'click', '--repeat', String(repeats), btn])
     }
   },
 
@@ -153,7 +223,11 @@ const input: InputPlatform = {
 const SCREENSHOT_TMP = '/tmp/cu-screenshot-tmp.png'
 const SCREENSHOT_JPG = '/tmp/cu-screenshot.jpg'
 
-async function pngToJpegBase64(pngPath: string, width: number, height: number): Promise<ScreenshotResult> {
+async function pngToJpegBase64(
+  pngPath: string,
+  width: number,
+  height: number,
+): Promise<ScreenshotResult> {
   // Try ImageMagick convert first
   if (commandExists('convert')) {
     await runAsync(['convert', pngPath, '-quality', '75', SCREENSHOT_JPG])
@@ -189,7 +263,13 @@ const screenshot: ScreenshotPlatform = {
 
   async captureRegion(x, y, w, h) {
     try {
-      await runAsync(['scrot', '-a', `${x},${y},${w},${h}`, '-o', SCREENSHOT_TMP])
+      await runAsync([
+        'scrot',
+        '-a',
+        `${x},${y},${w},${h}`,
+        '-o',
+        SCREENSHOT_TMP,
+      ])
       return pngToJpegBase64(SCREENSHOT_TMP, w, h)
     } catch {
       return { base64: '', width: w, height: h }
@@ -282,7 +362,9 @@ const apps: AppsPlatform = {
           const title = parts.slice(4).join(' ')
 
           let exePath = ''
-          try { exePath = run(['readlink', '-f', `/proc/${pid}/exe`]) } catch {}
+          try {
+            exePath = run(['readlink', '-f', `/proc/${pid}/exe`])
+          } catch {}
 
           handles.push({
             id: windowId ?? '',
@@ -294,11 +376,13 @@ const apps: AppsPlatform = {
 
         // Deduplicate by id
         const seen = new Set<string>()
-        return handles.filter(h => {
-          if (seen.has(h.id)) return false
-          seen.add(h.id)
-          return true
-        }).slice(0, 50)
+        return handles
+          .filter(h => {
+            if (seen.has(h.id)) return false
+            seen.add(h.id)
+            return true
+          })
+          .slice(0, 50)
       }
 
       // Fallback: xdotool search
@@ -307,7 +391,9 @@ const apps: AppsPlatform = {
       for (const windowId of raw.split('\n').filter(Boolean).slice(0, 50)) {
         const title = run(['xdotool', 'getwindowname', windowId])
         let pid = 0
-        try { pid = Number(run(['xdotool', 'getwindowpid', windowId])) } catch {}
+        try {
+          pid = Number(run(['xdotool', 'getwindowpid', windowId]))
+        } catch {}
         if (title) {
           handles.push({ id: windowId, pid, title })
         }
@@ -331,7 +417,9 @@ const apps: AppsPlatform = {
         let files: string
         try {
           files = run(['find', dir, '-name', '*.desktop', '-maxdepth', '1'])
-        } catch { continue }
+        } catch {
+          continue
+        }
 
         for (const filepath of files.split('\n').filter(Boolean)) {
           try {
@@ -350,7 +438,9 @@ const apps: AppsPlatform = {
               displayName: name,
               path: exec.split(/\s+/)[0] ?? '',
             })
-          } catch { /* skip unreadable */ }
+          } catch {
+            /* skip unreadable */
+          }
         }
       }
 
@@ -367,7 +457,9 @@ const apps: AppsPlatform = {
         await runAsync(['gtk-launch', desktopName])
         return
       }
-    } catch { /* fall through */ }
+    } catch {
+      /* fall through */
+    }
     await runAsync(['xdg-open', name])
   },
 
@@ -380,12 +472,19 @@ const apps: AppsPlatform = {
       if (!pidStr) return null
 
       let exePath = ''
-      try { exePath = run(['readlink', '-f', `/proc/${pidStr}/exe`]) } catch {}
+      try {
+        exePath = run(['readlink', '-f', `/proc/${pidStr}/exe`])
+      } catch {}
       let appName = ''
-      try { appName = run(['cat', `/proc/${pidStr}/comm`]) } catch {}
+      try {
+        appName = run(['cat', `/proc/${pidStr}/comm`])
+      } catch {}
 
       if (!exePath && !appName) return null
-      return { id: exePath || `/proc/${pidStr}/exe`, appName: appName || 'unknown' }
+      return {
+        id: exePath || `/proc/${pidStr}/exe`,
+        appName: appName || 'unknown',
+      }
     } catch {
       return null
     }
@@ -400,7 +499,9 @@ const apps: AppsPlatform = {
 
       const windowTitle = run(['xdotool', 'getwindowname', windowId])
       let pid = 0
-      try { pid = Number(run(['xdotool', 'getwindowpid', windowId])) } catch {}
+      try {
+        pid = Number(run(['xdotool', 'getwindowpid', windowId]))
+      } catch {}
 
       return { id: windowId, pid, title: windowTitle }
     } catch {
diff --git a/src/utils/computerUse/platforms/win32.ts b/src/utils/computerUse/platforms/win32.ts
index fbf50d9c6..1e8e96ec1 100644
--- a/src/utils/computerUse/platforms/win32.ts
+++ b/src/utils/computerUse/platforms/win32.ts
@@ -269,7 +269,12 @@ const input: InputPlatform = {
         button as 'left' | 'right',
       )
       if (!ok) {
-        getWm().sendClick(boundHwnd, Math.round(x), Math.round(y), button as 'left' | 'right')
+        getWm().sendClick(
+          boundHwnd,
+          Math.round(x),
+          Math.round(y),
+          button as 'left' | 'right',
+        )
       }
       return
     }
diff --git a/src/utils/computerUse/toolRendering.tsx b/src/utils/computerUse/toolRendering.tsx
index 0295e19e3..a1574e9c0 100644
--- a/src/utils/computerUse/toolRendering.tsx
+++ b/src/utils/computerUse/toolRendering.tsx
@@ -1,22 +1,22 @@
-import * as React from 'react'
-import { MessageResponse } from '../../components/MessageResponse.js'
-import { Text } from '@anthropic/ink'
-import { truncateToWidth } from '../format.js'
-import type { MCPToolResult } from '../mcpValidation.js'
+import * as React from 'react';
+import { MessageResponse } from '../../components/MessageResponse.js';
+import { Text } from '@anthropic/ink';
+import { truncateToWidth } from '../format.js';
+import type { MCPToolResult } from '../mcpValidation.js';
 
 type CuToolInput = Record<string, unknown> & {
-  coordinate?: [number, number]
-  start_coordinate?: [number, number]
-  text?: string
-  apps?: Array<{ displayName?: string }>
-  region?: [number, number, number, number]
-  direction?: string
-  amount?: number
-  duration?: number
-}
+  coordinate?: [number, number];
+  start_coordinate?: [number, number];
+  text?: string;
+  apps?: Array<{ displayName?: string }>;
+  region?: [number, number, number, number];
+  direction?: string;
+  amount?: number;
+  duration?: number;
+};
 
 function fmtCoord(c: [number, number] | undefined): string {
-  return c ? `(${c[0]}, ${c[1]})` : ''
+  return c ? `(${c[0]}, ${c[1]})` : '';
 }
 
 const RESULT_SUMMARY: Readonly<Partial<Record<string, string>>> = {
@@ -34,7 +34,7 @@ const RESULT_SUMMARY: Readonly<Partial<Record<string, string>>> = {
   scroll: 'Scrolled',
   left_click_drag: 'Dragged',
   open_application: 'Opened',
-}
+};
 
 /**
  * Rendering overrides for `mcp__computer-use__*` tools. Spread into the MCP
@@ -42,20 +42,17 @@ const RESULT_SUMMARY: Readonly<Partial<Record<string, string>>> = {
  * Mirror of `getClaudeInChromeMCPToolOverrides`.
  */
 export function getComputerUseMCPRenderingOverrides(toolName: string): {
-  userFacingName: () => string
-  renderToolUseMessage: (
-    input: Record<string, unknown>,
-    options: { verbose: boolean },
-  ) => React.ReactNode
+  userFacingName: () => string;
+  renderToolUseMessage: (input: Record<string, unknown>, options: { verbose: boolean }) => React.ReactNode;
   renderToolResultMessage: (
     output: MCPToolResult,
     progressMessages: unknown[],
     options: { verbose: boolean },
-  ) => React.ReactNode
+  ) => React.ReactNode;
 } {
   return {
     userFacingName() {
-      return `Computer Use[${toolName}]`
+      return `Computer Use[${toolName}]`;
     },
 
     // AssistantToolUseMessage.tsx contract: null hides the ENTIRE row, '' shows
@@ -69,7 +66,7 @@ export function getComputerUseMCPRenderingOverrides(toolName: string): {
         case 'cursor_position':
         case 'list_granted_applications':
         case 'read_clipboard':
-          return ''
+          return '';
 
         case 'left_click':
         case 'right_click':
@@ -77,21 +74,19 @@ export function getComputerUseMCPRenderingOverrides(toolName: string): {
         case 'double_click':
         case 'triple_click':
         case 'mouse_move':
-          return fmtCoord(input.coordinate)
+          return fmtCoord(input.coordinate);
 
         case 'left_click_drag':
           return input.start_coordinate
             ? `${fmtCoord(input.start_coordinate)} → ${fmtCoord(input.coordinate)}`
-            : `to ${fmtCoord(input.coordinate)}`
+            : `to ${fmtCoord(input.coordinate)}`;
 
         case 'type':
-          return typeof input.text === 'string'
-            ? `"${truncateToWidth(input.text, 40)}"`
-            : ''
+          return typeof input.text === 'string' ? `"${truncateToWidth(input.text, 40)}"` : '';
 
         case 'key':
         case 'hold_key':
-          return typeof input.text === 'string' ? input.text : ''
+          return typeof input.text === 'string' ? input.text : '';
 
         case 'scroll':
           return [
@@ -100,58 +95,50 @@ export function getComputerUseMCPRenderingOverrides(toolName: string): {
             input.coordinate && `at ${fmtCoord(input.coordinate)}`,
           ]
             .filter(Boolean)
-            .join(' ')
+            .join(' ');
 
         case 'zoom': {
-          const r = input.region
-          return Array.isArray(r) && r.length === 4
-            ? `[${r[0]}, ${r[1]}, ${r[2]}, ${r[3]}]`
-            : ''
+          const r = input.region;
+          return Array.isArray(r) && r.length === 4 ? `[${r[0]}, ${r[1]}, ${r[2]}, ${r[3]}]` : '';
         }
 
         case 'wait':
-          return typeof input.duration === 'number' ? `${input.duration}s` : ''
+          return typeof input.duration === 'number' ? `${input.duration}s` : '';
 
         case 'write_clipboard':
-          return typeof input.text === 'string'
-            ? `"${truncateToWidth(input.text, 40)}"`
-            : ''
+          return typeof input.text === 'string' ? `"${truncateToWidth(input.text, 40)}"` : '';
 
         case 'open_application':
-          return typeof input.bundle_id === 'string'
-            ? String(input.bundle_id)
-            : ''
+          return typeof input.bundle_id === 'string' ? String(input.bundle_id) : '';
 
         case 'request_access': {
-          const apps = input.apps
-          if (!Array.isArray(apps)) return ''
-          const names = apps
-            .map(a => (typeof a?.displayName === 'string' ? a.displayName : ''))
-            .filter(Boolean)
-          return names.join(', ')
+          const apps = input.apps;
+          if (!Array.isArray(apps)) return '';
+          const names = apps.map(a => (typeof a?.displayName === 'string' ? a.displayName : '')).filter(Boolean);
+          return names.join(', ');
         }
 
         case 'computer_batch': {
-          const actions = input.actions
-          return Array.isArray(actions) ? `${actions.length} actions` : ''
+          const actions = input.actions;
+          return Array.isArray(actions) ? `${actions.length} actions` : '';
         }
 
         default:
-          return ''
+          return '';
       }
     },
 
     renderToolResultMessage(output, _progress, { verbose }) {
-      if (verbose || typeof output !== 'object' || output === null) return null
+      if (verbose || typeof output !== 'object' || output === null) return null;
 
       // Non-verbose: one-line dim summary, like Chrome's pattern.
-      const summary = RESULT_SUMMARY[toolName]
-      if (!summary) return null
+      const summary = RESULT_SUMMARY[toolName];
+      if (!summary) return null;
       return (
         <MessageResponse height={1}>
           <Text dimColor>{summary}</Text>
         </MessageResponse>
-      )
+      );
     },
-  }
+  };
 }
diff --git a/src/utils/computerUse/win32/bridgeClient.ts b/src/utils/computerUse/win32/bridgeClient.ts
index 3e97e8b9f..090f58b27 100644
--- a/src/utils/computerUse/win32/bridgeClient.ts
+++ b/src/utils/computerUse/win32/bridgeClient.ts
@@ -134,7 +134,7 @@ export async function call<T = unknown>(
         const writable = stdin as unknown as Writable
         writable.write(JSON.stringify(req) + '\n')
         if (typeof (writable as any).flush === 'function') {
-          (writable as any).flush()
+          ;(writable as any).flush()
         }
       }
     } catch (err) {
diff --git a/src/utils/computerUse/win32/comExcel.ts b/src/utils/computerUse/win32/comExcel.ts
index 26dde56a7..7f9dc7bd2 100644
--- a/src/utils/computerUse/win32/comExcel.ts
+++ b/src/utils/computerUse/win32/comExcel.ts
@@ -56,7 +56,9 @@ function excelCleanup(hasWorkbook = true): string {
   const parts: string[] = []
   if (hasWorkbook) parts.push('if ($wb) { $wb.Close($false) }')
   parts.push('$excel.Quit()')
-  parts.push('[System.Runtime.InteropServices.Marshal]::ReleaseComObject($excel) | Out-Null')
+  parts.push(
+    '[System.Runtime.InteropServices.Marshal]::ReleaseComObject($excel) | Out-Null',
+  )
   return parts.join('\n    ')
 }
 
@@ -107,8 +109,12 @@ try {
   const parsed = JSON.parse(raw)
 
   // Normalize: PowerShell single-element arrays become objects
-  const sheets: SheetInfo[] = Array.isArray(parsed.sheets) ? parsed.sheets : [parsed.sheets]
-  const sheetNames: string[] = Array.isArray(parsed.sheetNames) ? parsed.sheetNames : [parsed.sheetNames]
+  const sheets: SheetInfo[] = Array.isArray(parsed.sheets)
+    ? parsed.sheets
+    : [parsed.sheets]
+  const sheetNames: string[] = Array.isArray(parsed.sheetNames)
+    ? parsed.sheetNames
+    : [parsed.sheetNames]
 
   return {
     sheets: sheets.map((s: any) => ({
@@ -279,9 +285,7 @@ try {
  * Save workbook. If savePath is given, SaveAs to that path; otherwise Save in place.
  */
 export function saveExcel(filePath: string, savePath?: string): boolean {
-  const saveCmd = savePath
-    ? `$wb.SaveAs('${escPath(savePath)}')`
-    : '$wb.Save()'
+  const saveCmd = savePath ? `$wb.SaveAs('${escPath(savePath)}')` : '$wb.Save()'
   const script = `
 ${EXCEL_INIT}
 try {
diff --git a/src/utils/computerUse/win32/comWord.ts b/src/utils/computerUse/win32/comWord.ts
index 3cae5e2b0..a29e60c82 100644
--- a/src/utils/computerUse/win32/comWord.ts
+++ b/src/utils/computerUse/win32/comWord.ts
@@ -192,10 +192,7 @@ export async function openWord(filePath: string): Promise<WordDocInfo> {
 // ---------------------------------------------------------------------------
 
 export async function readText(filePath: string): Promise<string> {
-  const script = wrapWordScript(
-    `Write-Output $doc.Content.Text`,
-    filePath,
-  )
+  const script = wrapWordScript(`Write-Output $doc.Content.Text`, filePath)
   return runPs(script)
 }
 
@@ -210,8 +207,12 @@ export async function appendText(
 ): Promise<boolean> {
   const fontSetup = opts
     ? [
-        opts.bold !== undefined ? `$sel.Font.Bold = ${opts.bold ? '-1' : '0'}` : '',
-        opts.italic !== undefined ? `$sel.Font.Italic = ${opts.italic ? '-1' : '0'}` : '',
+        opts.bold !== undefined
+          ? `$sel.Font.Bold = ${opts.bold ? '-1' : '0'}`
+          : '',
+        opts.italic !== undefined
+          ? `$sel.Font.Italic = ${opts.italic ? '-1' : '0'}`
+          : '',
         opts.fontSize !== undefined ? `$sel.Font.Size = ${opts.fontSize}` : '',
         opts.fontName ? `$sel.Font.Name = '${psEscape(opts.fontName)}'` : '',
       ]
@@ -324,10 +325,7 @@ export async function insertTable(
 ): Promise<boolean> {
   // Build PowerShell array literal for the data
   const psData = data
-    .map(
-      (row) =>
-        ',@(' + row.map((cell) => `'${psEscape(cell)}'`).join(',') + ')',
-    )
+    .map(row => ',@(' + row.map(cell => `'${psEscape(cell)}'`).join(',') + ')')
     .join('\n    ')
 
   const body = `
diff --git a/src/utils/computerUse/wrapper.tsx b/src/utils/computerUse/wrapper.tsx
index 5571f0437..4f34a1897 100644
--- a/src/utils/computerUse/wrapper.tsx
+++ b/src/utils/computerUse/wrapper.tsx
@@ -24,28 +24,25 @@ import {
   type CuPermissionResponse,
   DEFAULT_GRANT_FLAGS,
   type ScreenshotDims,
-} from '@ant/computer-use-mcp'
-import * as React from 'react'
-import { getSessionId } from '../../bootstrap/state.js'
-import { ComputerUseApproval } from '../../components/permissions/ComputerUseApproval/ComputerUseApproval.js'
-import type { Tool, ToolUseContext } from '../../Tool.js'
-import { logForDebugging } from '../debug.js'
-import { detectImageFormatFromBase64 } from '../imageResizer.js'
-import {
-  checkComputerUseLock,
-  tryAcquireComputerUseLock,
-} from './computerUseLock.js'
-import { registerEscHotkey } from './escHotkey.js'
-import { getChicagoCoordinateMode } from './gates.js'
-import { getComputerUseHostAdapter } from './hostAdapter.js'
-import { getComputerUseMCPRenderingOverrides } from './toolRendering.js'
+} from '@ant/computer-use-mcp';
+import * as React from 'react';
+import { getSessionId } from '../../bootstrap/state.js';
+import { ComputerUseApproval } from '../../components/permissions/ComputerUseApproval/ComputerUseApproval.js';
+import type { Tool, ToolUseContext } from '../../Tool.js';
+import { logForDebugging } from '../debug.js';
+import { detectImageFormatFromBase64 } from '../imageResizer.js';
+import { checkComputerUseLock, tryAcquireComputerUseLock } from './computerUseLock.js';
+import { registerEscHotkey } from './escHotkey.js';
+import { getChicagoCoordinateMode } from './gates.js';
+import { getComputerUseHostAdapter } from './hostAdapter.js';
+import { getComputerUseMCPRenderingOverrides } from './toolRendering.js';
 
-type CallOverride = Pick<Tool, 'call'>['call']
+type CallOverride = Pick<Tool, 'call'>['call'];
 
 type Binding = {
-  ctx: ComputerUseSessionContext
-  dispatch: (name: string, args: unknown) => Promise<CuCallToolResult>
-}
+  ctx: ComputerUseSessionContext;
+  dispatch: (name: string, args: unknown) => Promise<CuCallToolResult>;
+};
 
 /**
  * Cached binding — built on first `.call()`, reused for process lifetime.
@@ -60,37 +57,31 @@ type Binding = {
  * its internal screenshot blob survives, but `ToolUseContext` is per-call.
  * Tests will need to either inject the cache or run serially.
  */
-let binding: Binding | undefined
-let currentToolUseContext: ToolUseContext | undefined
+let binding: Binding | undefined;
+let currentToolUseContext: ToolUseContext | undefined;
 
 function tuc(): ToolUseContext {
   // Safe: `binding` is only populated when `currentToolUseContext` is set.
   // Called only from within `ctx` callbacks, which only fire during dispatch.
-  return currentToolUseContext!
+  return currentToolUseContext!;
 }
 
 function formatLockHeld(holder: string): string {
-  return `Computer use is in use by another Claude session (${holder.slice(0, 8)}…). Wait for that session to finish or run /exit there.`
+  return `Computer use is in use by another Claude session (${holder.slice(0, 8)}…). Wait for that session to finish or run /exit there.`;
 }
 
 export function buildSessionContext(): ComputerUseSessionContext {
   return {
     // ── Read state fresh via the per-call ref ─────────────────────────────
-    getAllowedApps: () =>
-      tuc().getAppState().computerUseMcpState?.allowedApps ?? [],
-    getGrantFlags: () =>
-      tuc().getAppState().computerUseMcpState?.grantFlags ??
-      DEFAULT_GRANT_FLAGS,
+    getAllowedApps: () => tuc().getAppState().computerUseMcpState?.allowedApps ?? [],
+    getGrantFlags: () => tuc().getAppState().computerUseMcpState?.grantFlags ?? DEFAULT_GRANT_FLAGS,
     // cc-2 has no Settings page for user-denied apps yet.
     getUserDeniedBundleIds: () => [],
-    getSelectedDisplayId: () =>
-      tuc().getAppState().computerUseMcpState?.selectedDisplayId,
-    getDisplayPinnedByModel: () =>
-      tuc().getAppState().computerUseMcpState?.displayPinnedByModel ?? false,
-    getDisplayResolvedForApps: () =>
-      tuc().getAppState().computerUseMcpState?.displayResolvedForApps,
+    getSelectedDisplayId: () => tuc().getAppState().computerUseMcpState?.selectedDisplayId,
+    getDisplayPinnedByModel: () => tuc().getAppState().computerUseMcpState?.displayPinnedByModel ?? false,
+    getDisplayResolvedForApps: () => tuc().getAppState().computerUseMcpState?.displayResolvedForApps,
     getLastScreenshotDims: (): ScreenshotDims | undefined => {
-      const d = tuc().getAppState().computerUseMcpState?.lastScreenshotDims
+      const d = tuc().getAppState().computerUseMcpState?.lastScreenshotDims;
       return d
         ? {
             ...d,
@@ -98,7 +89,7 @@ export function buildSessionContext(): ComputerUseSessionContext {
             originX: d.originX ?? 0,
             originY: d.originY ?? 0,
           }
-        : undefined
+        : undefined;
     },
 
     // ── Write-backs ────────────────────────────────────────────────────────
@@ -112,16 +103,14 @@ export function buildSessionContext(): ComputerUseSessionContext {
     // Package does the merge (dedupe + truthy-only flags). We just persist.
     onAllowedAppsChanged: (apps, flags) =>
       tuc().setAppState(prev => {
-        const cu = prev.computerUseMcpState
-        const prevApps = cu?.allowedApps
-        const prevFlags = cu?.grantFlags
-        const sameApps =
-          prevApps?.length === apps.length &&
-          apps.every((a, i) => prevApps[i]?.bundleId === a.bundleId)
+        const cu = prev.computerUseMcpState;
+        const prevApps = cu?.allowedApps;
+        const prevFlags = cu?.grantFlags;
+        const sameApps = prevApps?.length === apps.length && apps.every((a, i) => prevApps[i]?.bundleId === a.bundleId);
         const sameFlags =
           prevFlags?.clipboardRead === flags.clipboardRead &&
           prevFlags?.clipboardWrite === flags.clipboardWrite &&
-          prevFlags?.systemKeyCombos === flags.systemKeyCombos
+          prevFlags?.systemKeyCombos === flags.systemKeyCombos;
         return sameApps && sameFlags
           ? prev
           : {
@@ -131,23 +120,23 @@ export function buildSessionContext(): ComputerUseSessionContext {
                 allowedApps: [...apps],
                 grantFlags: flags,
               },
-            }
+            };
       }),
 
     onAppsHidden: ids => {
-      if (ids.length === 0) return
+      if (ids.length === 0) return;
       tuc().setAppState(prev => {
-        const cu = prev.computerUseMcpState
-        const existing = cu?.hiddenDuringTurn
-        if (existing && ids.every(id => existing.has(id))) return prev
+        const cu = prev.computerUseMcpState;
+        const existing = cu?.hiddenDuringTurn;
+        if (existing && ids.every(id => existing.has(id))) return prev;
         return {
           ...prev,
           computerUseMcpState: {
             ...cu,
             hiddenDuringTurn: new Set([...(existing ?? []), ...ids]),
           },
-        }
-      })
+        };
+      });
     },
 
     // Resolver writeback only fires under a pin when Swift fell back to main
@@ -156,13 +145,9 @@ export function buildSessionContext(): ComputerUseSessionContext {
     // was true, onDisplayResolvedForApps re-sets the key in the same tick.
     onResolvedDisplayUpdated: id =>
       tuc().setAppState(prev => {
-        const cu = prev.computerUseMcpState
-        if (
-          cu?.selectedDisplayId === id &&
-          !cu.displayPinnedByModel &&
-          cu.displayResolvedForApps === undefined
-        ) {
-          return prev
+        const cu = prev.computerUseMcpState;
+        if (cu?.selectedDisplayId === id && !cu.displayPinnedByModel && cu.displayResolvedForApps === undefined) {
+          return prev;
         }
         return {
           ...prev,
@@ -172,22 +157,22 @@ export function buildSessionContext(): ComputerUseSessionContext {
             displayPinnedByModel: false,
             displayResolvedForApps: undefined,
           },
-        }
+        };
       }),
 
     // switch_display(name) pins; switch_display("auto") unpins and clears the
     // app-set key so the next screenshot auto-resolves fresh.
     onDisplayPinned: id =>
       tuc().setAppState(prev => {
-        const cu = prev.computerUseMcpState
-        const pinned = id !== undefined
-        const nextResolvedFor = pinned ? cu?.displayResolvedForApps : undefined
+        const cu = prev.computerUseMcpState;
+        const pinned = id !== undefined;
+        const nextResolvedFor = pinned ? cu?.displayResolvedForApps : undefined;
         if (
           cu?.selectedDisplayId === id &&
           cu?.displayPinnedByModel === pinned &&
           cu?.displayResolvedForApps === nextResolvedFor
         ) {
-          return prev
+          return prev;
         }
         return {
           ...prev,
@@ -197,23 +182,23 @@ export function buildSessionContext(): ComputerUseSessionContext {
             displayPinnedByModel: pinned,
             displayResolvedForApps: nextResolvedFor,
           },
-        }
+        };
       }),
 
     onDisplayResolvedForApps: key =>
       tuc().setAppState(prev => {
-        const cu = prev.computerUseMcpState
-        if (cu?.displayResolvedForApps === key) return prev
+        const cu = prev.computerUseMcpState;
+        if (cu?.displayResolvedForApps === key) return prev;
         return {
           ...prev,
           computerUseMcpState: { ...cu, displayResolvedForApps: key },
-        }
+        };
       }),
 
     onScreenshotCaptured: dims =>
       tuc().setAppState(prev => {
-        const cu = prev.computerUseMcpState
-        const p = cu?.lastScreenshotDims
+        const cu = prev.computerUseMcpState;
+        const p = cu?.lastScreenshotDims;
         return p?.width === dims.width &&
           p?.height === dims.height &&
           p?.displayWidth === dims.displayWidth &&
@@ -225,7 +210,7 @@ export function buildSessionContext(): ComputerUseSessionContext {
           : {
               ...prev,
               computerUseMcpState: { ...cu, lastScreenshotDims: dims },
-            }
+            };
       }),
 
     // ── Lock — async, direct file-lock calls ───────────────────────────────
@@ -234,14 +219,14 @@ export function buildSessionContext(): ComputerUseSessionContext {
     // awaits `acquireCuLock`. `defersLockAcquire` is the PACKAGE's set —
     // the local copy is gone.
     checkCuLock: async () => {
-      const c = await checkComputerUseLock()
+      const c = await checkComputerUseLock();
       switch (c.kind) {
         case 'free':
-          return { holder: undefined, isSelf: false }
+          return { holder: undefined, isSelf: false };
         case 'held_by_self':
-          return { holder: getSessionId(), isSelf: true }
+          return { holder: getSessionId(), isSelf: true };
         case 'blocked':
-          return { holder: c.by, isSelf: false }
+          return { holder: c.by, isSelf: false };
       }
     },
 
@@ -252,9 +237,9 @@ export function buildSessionContext(): ComputerUseSessionContext {
     // but is possible under parallel tool-use interleaving — don't spam the
     // notification in that case.
     acquireCuLock: async () => {
-      const r = await tryAcquireComputerUseLock()
+      const r = await tryAcquireComputerUseLock();
       if (r.kind === 'blocked') {
-        throw new Error(formatLockHeld(r.by))
+        throw new Error(formatLockHeld(r.by));
       }
       if (r.fresh) {
         // Global Escape → abort. Consumes the event (PI defense — prompt
@@ -262,34 +247,30 @@ export function buildSessionContext(): ComputerUseSessionContext {
         // CFRunLoopSource is processed by the drainRunLoop pump, so this
         // holds a pump retain until unregisterEscHotkey() in cleanup.ts.
         const escRegistered = registerEscHotkey(() => {
-          logForDebugging('[cu-esc] user escape, aborting turn')
-          tuc().abortController.abort()
-        })
+          logForDebugging('[cu-esc] user escape, aborting turn');
+          tuc().abortController.abort();
+        });
         tuc().sendOSNotification?.({
           message: escRegistered
             ? 'Claude is using your computer · press Esc to stop'
             : 'Claude is using your computer · press Ctrl+C to stop',
           notificationType: 'computer_use_enter',
-        })
+        });
       }
     },
 
     formatLockHeldMessage: formatLockHeld,
-  }
+  };
 }
 
 function getOrBind(): Binding {
-  if (binding) return binding
-  const ctx = buildSessionContext()
+  if (binding) return binding;
+  const ctx = buildSessionContext();
   binding = {
     ctx,
-    dispatch: bindSessionContext(
-      getComputerUseHostAdapter(),
-      getChicagoCoordinateMode(),
-      ctx,
-    ),
-  }
-  return binding
+    dispatch: bindSessionContext(getComputerUseHostAdapter(), getChicagoCoordinateMode(), ctx),
+  };
+  return binding;
 }
 
 /**
@@ -297,25 +278,19 @@ function getOrBind(): Binding {
  * tool: rendering overrides from `toolRendering.tsx` plus a `.call()` that
  * dispatches through the cached binder.
  */
-type ComputerUseMCPToolOverrides = ReturnType<
-  typeof getComputerUseMCPRenderingOverrides
-> & {
-  call: CallOverride
-}
+type ComputerUseMCPToolOverrides = ReturnType<typeof getComputerUseMCPRenderingOverrides> & {
+  call: CallOverride;
+};
 
-export function getComputerUseMCPToolOverrides(
-  toolName: string,
-): ComputerUseMCPToolOverrides {
+export function getComputerUseMCPToolOverrides(toolName: string): ComputerUseMCPToolOverrides {
   const call: CallOverride = async (args, context: ToolUseContext) => {
-    currentToolUseContext = context
-    const { dispatch } = getOrBind()
+    currentToolUseContext = context;
+    const { dispatch } = getOrBind();
 
-    const { telemetry, ...result } = await dispatch(toolName, args)
+    const { telemetry, ...result } = await dispatch(toolName, args);
 
     if (telemetry?.error_kind) {
-      logForDebugging(
-        `[Computer Use MCP] ${toolName} error_kind=${telemetry.error_kind}`,
-      )
+      logForDebugging(`[Computer Use MCP] ${toolName} error_kind=${telemetry.error_kind}`);
     }
 
     // MCP content blocks → Anthropic API blocks. CU only produces text and
@@ -340,14 +315,14 @@ export function getComputerUseMCPToolOverrides(
                 text: item.type === 'text' ? item.text : '',
               },
         )
-      : result.content
-    return { data }
-  }
+      : result.content;
+    return { data };
+  };
 
   return {
     ...getComputerUseMCPRenderingOverrides(toolName),
     call,
-  }
+  };
 }
 
 /**
@@ -357,43 +332,41 @@ export function getComputerUseMCPToolOverrides(
  * The merge-into-AppState that used to live here (dedupe + truthy-only flags)
  * is now in the package's `bindSessionContext` → `onAllowedAppsChanged`.
  */
-async function runPermissionDialog(
-  req: CuPermissionRequest,
-): Promise<CuPermissionResponse> {
-  const context = tuc()
-  const setToolJSX = context.setToolJSX
+async function runPermissionDialog(req: CuPermissionRequest): Promise<CuPermissionResponse> {
+  const context = tuc();
+  const setToolJSX = context.setToolJSX;
   if (!setToolJSX) {
     // Shouldn't happen — main.tsx gate excludes non-interactive. Fail safe.
-    return { granted: [], denied: [], flags: DEFAULT_GRANT_FLAGS }
+    return { granted: [], denied: [], flags: DEFAULT_GRANT_FLAGS };
   }
 
   try {
     return await new Promise<CuPermissionResponse>((resolve, reject) => {
-      const signal = context.abortController.signal
+      const signal = context.abortController.signal;
       // If already aborted, addEventListener won't fire — reject now so the
       // promise doesn't hang waiting for a user who Ctrl+C'd.
       if (signal.aborted) {
-        reject(new Error('Computer Use permission dialog aborted'))
-        return
+        reject(new Error('Computer Use permission dialog aborted'));
+        return;
       }
       const onAbort = (): void => {
-        signal.removeEventListener('abort', onAbort)
-        reject(new Error('Computer Use permission dialog aborted'))
-      }
-      signal.addEventListener('abort', onAbort)
+        signal.removeEventListener('abort', onAbort);
+        reject(new Error('Computer Use permission dialog aborted'));
+      };
+      signal.addEventListener('abort', onAbort);
 
       setToolJSX({
         jsx: React.createElement(ComputerUseApproval, {
           request: req,
           onDone: (resp: CuPermissionResponse) => {
-            signal.removeEventListener('abort', onAbort)
-            resolve(resp)
+            signal.removeEventListener('abort', onAbort);
+            resolve(resp);
           },
         }),
         shouldHidePromptInput: true,
-      })
-    })
+      });
+    });
   } finally {
-    setToolJSX(null)
+    setToolJSX(null);
   }
 }
diff --git a/src/utils/conversationRecovery.ts b/src/utils/conversationRecovery.ts
index 51c36520c..d88c82888 100644
--- a/src/utils/conversationRecovery.ts
+++ b/src/utils/conversationRecovery.ts
@@ -320,7 +320,10 @@ function detectTurnInterruption(
       return { kind: 'interrupted_turn' }
     }
     // Plain text user prompt — CC hadn't started responding
-    return { kind: 'interrupted_prompt', message: lastMessage as NormalizedUserMessage }
+    return {
+      kind: 'interrupted_prompt',
+      message: lastMessage as NormalizedUserMessage,
+    }
   }
 
   if (lastMessage.type === 'attachment') {
@@ -362,7 +365,13 @@ function isTerminalToolResult(
     const msgContent = msg.message!.content
     if (!Array.isArray(msgContent)) continue
     for (const b of msgContent) {
-      if (typeof b !== 'string' && 'type' in b && b.type === 'tool_use' && 'id' in b && b.id === toolUseId) {
+      if (
+        typeof b !== 'string' &&
+        'type' in b &&
+        b.type === 'tool_use' &&
+        'id' in b &&
+        b.id === toolUseId
+      ) {
         return (
           ('name' in b ? b.name : undefined) === BRIEF_TOOL_NAME ||
           ('name' in b ? b.name : undefined) === LEGACY_BRIEF_TOOL_NAME ||
@@ -387,7 +396,11 @@ export function restoreSkillStateFromMessages(messages: Message[]): void {
       continue
     }
     if (message.attachment!.type === 'invoked_skills') {
-      const skills = message.attachment!.skills as Array<{ name?: string; path?: string; content?: string }>;
+      const skills = message.attachment!.skills as Array<{
+        name?: string
+        path?: string
+        content?: string
+      }>
       for (const skill of skills) {
         if (skill.name && skill.path && skill.content) {
           // Resume only happens for the main session, so agentId is null
diff --git a/src/utils/debug.ts b/src/utils/debug.ts
index 2cac5e55f..f70e9a68d 100644
--- a/src/utils/debug.ts
+++ b/src/utils/debug.ts
@@ -83,9 +83,7 @@ export const getDebugFilter = memoize((): DebugFilter | null => {
 })
 
 export const isDebugToStdErr = memoize((): boolean => {
-  return (
-    process.argv.includes('--debug-to-stderr')
-  )
+  return process.argv.includes('--debug-to-stderr')
 })
 
 export const getDebugFilePath = memoize((): string | null => {
diff --git a/src/utils/deepLink/protocolHandler.ts b/src/utils/deepLink/protocolHandler.ts
index 511754dc7..18dbf62ed 100644
--- a/src/utils/deepLink/protocolHandler.ts
+++ b/src/utils/deepLink/protocolHandler.ts
@@ -42,7 +42,6 @@ export async function handleDeepLinkUri(uri: string): Promise<number> {
     action = parseDeepLink(uri)
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error)
-    // biome-ignore lint/suspicious/noConsole: intentional error output
     console.error(`Deep link error: ${message}`)
     return 1
   }
@@ -65,7 +64,6 @@ export async function handleDeepLinkUri(uri: string): Promise<number> {
     lastFetchMs: lastFetch?.getTime(),
   })
   if (!launched) {
-    // biome-ignore lint/suspicious/noConsole: intentional error output
     console.error(
       'Failed to open a terminal. Make sure a supported terminal emulator is installed.',
     )
@@ -98,7 +96,7 @@ export async function handleUrlSchemeLaunch(): Promise<number | null> {
     if (!url) {
       return null
     }
-    return await handleDeepLinkUri(await url as string)
+    return await handleDeepLinkUri((await url) as string)
   } catch {
     // NAPI module not available, or handleDeepLinkUri rejected — not a URL launch
     return null
diff --git a/src/utils/deepLink/src/services/analytics/growthbook.ts b/src/utils/deepLink/src/services/analytics/growthbook.ts
index e380906ea..7967fd3ee 100644
--- a/src/utils/deepLink/src/services/analytics/growthbook.ts
+++ b/src/utils/deepLink/src/services/analytics/growthbook.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getFeatureValue_CACHED_MAY_BE_STALE = any;
+export type getFeatureValue_CACHED_MAY_BE_STALE = any
diff --git a/src/utils/deepLink/src/services/analytics/index.ts b/src/utils/deepLink/src/services/analytics/index.ts
index 142e7b6f5..2e0f796da 100644
--- a/src/utils/deepLink/src/services/analytics/index.ts
+++ b/src/utils/deepLink/src/services/analytics/index.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any;
-export type logEvent = any;
+export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any
+export type logEvent = any
diff --git a/src/utils/earlyInput.ts b/src/utils/earlyInput.ts
index a5d58db5e..8090daa43 100644
--- a/src/utils/earlyInput.ts
+++ b/src/utils/earlyInput.ts
@@ -114,22 +114,44 @@ function processChunk(str: string): void {
       if (next === 0x5b /* [ */) {
         i++ // skip '['
         // Skip parameter bytes (0x30-0x3F) and intermediate bytes (0x20-0x2F)
-        while (i < str.length && str.charCodeAt(i)! >= 0x20 && str.charCodeAt(i)! <= 0x3f) {
+        while (
+          i < str.length &&
+          str.charCodeAt(i)! >= 0x20 &&
+          str.charCodeAt(i)! <= 0x3f
+        ) {
           i++
         }
         // Skip the final byte (0x40-0x7E)
-        if (i < str.length && str.charCodeAt(i)! >= 0x40 && str.charCodeAt(i)! <= 0x7e) i++
+        if (
+          i < str.length &&
+          str.charCodeAt(i)! >= 0x40 &&
+          str.charCodeAt(i)! <= 0x7e
+        )
+          i++
         continue
       }
 
       // String sequences: DCS (P), OSC (]), SOS (X), PM (^)
       // These end with BEL (0x07) or ST (ESC \)
-      if (next === 0x50 /* P */ || next === 0x5d /* ] */ || next === 0x58 /* X */ || next === 0x5e /* ^ */) {
+      if (
+        next === 0x50 /* P */ ||
+        next === 0x5d /* ] */ ||
+        next === 0x58 /* X */ ||
+        next === 0x5e /* ^ */
+      ) {
         i++ // skip the introducer
         while (i < str.length) {
-          if (str.charCodeAt(i) === 0x07) { i++; break } // BEL terminates
-          if (str.charCodeAt(i) === 0x1b && i + 1 < str.length && str.charCodeAt(i + 1)! === 0x5c) {
-            i += 2; break // ESC \ (ST) terminates
+          if (str.charCodeAt(i) === 0x07) {
+            i++
+            break
+          } // BEL terminates
+          if (
+            str.charCodeAt(i) === 0x1b &&
+            i + 1 < str.length &&
+            str.charCodeAt(i + 1)! === 0x5c
+          ) {
+            i += 2
+            break // ESC \ (ST) terminates
           }
           i++
         }
diff --git a/src/utils/eventLoopStallDetector.ts b/src/utils/eventLoopStallDetector.ts
index 998b5477f..e1495a026 100644
--- a/src/utils/eventLoopStallDetector.ts
+++ b/src/utils/eventLoopStallDetector.ts
@@ -1,3 +1,3 @@
 // Auto-generated stub — replace with real implementation
-export {};
-export const startEventLoopStallDetector: () => void = () => {};
+export {}
+export const startEventLoopStallDetector: () => void = () => {}
diff --git a/src/utils/exportRenderer.tsx b/src/utils/exportRenderer.tsx
index df4bc7ffc..a0df2c198 100644
--- a/src/utils/exportRenderer.tsx
+++ b/src/utils/exportRenderer.tsx
@@ -1,28 +1,24 @@
-import React, { useRef } from 'react'
-import stripAnsi from 'strip-ansi'
-import { Messages } from '../components/Messages.js'
-import { KeybindingProvider } from '../keybindings/KeybindingContext.js'
-import { loadKeybindingsSyncWithWarnings } from '../keybindings/loadUserBindings.js'
-import type { KeybindingContextName } from '../keybindings/types.js'
-import { AppStateProvider } from '../state/AppState.js'
-import type { Tools } from '../Tool.js'
-import type { Message } from '../types/message.js'
-import { renderToAnsiString } from './staticRender.js'
+import React, { useRef } from 'react';
+import stripAnsi from 'strip-ansi';
+import { Messages } from '../components/Messages.js';
+import { KeybindingProvider } from '../keybindings/KeybindingContext.js';
+import { loadKeybindingsSyncWithWarnings } from '../keybindings/loadUserBindings.js';
+import type { KeybindingContextName } from '../keybindings/types.js';
+import { AppStateProvider } from '../state/AppState.js';
+import type { Tools } from '../Tool.js';
+import type { Message } from '../types/message.js';
+import { renderToAnsiString } from './staticRender.js';
 
 /**
  * Minimal keybinding provider for static/headless renders.
  * Provides keybinding context without the ChordInterceptor (which uses useInput
  * and would hang in headless renders with no stdin).
  */
-function StaticKeybindingProvider({
-  children,
-}: {
-  children: React.ReactNode
-}): React.ReactNode {
-  const { bindings } = loadKeybindingsSyncWithWarnings()
-  const pendingChordRef = useRef(null)
-  const handlerRegistryRef = useRef(new Map())
-  const activeContexts = useRef(new Set<KeybindingContextName>()).current
+function StaticKeybindingProvider({ children }: { children: React.ReactNode }): React.ReactNode {
+  const { bindings } = loadKeybindingsSyncWithWarnings();
+  const pendingChordRef = useRef(null);
+  const handlerRegistryRef = useRef(new Map());
+  const activeContexts = useRef(new Set<KeybindingContextName>()).current;
 
   return (
     <KeybindingProvider
@@ -37,7 +33,7 @@ function StaticKeybindingProvider({
     >
       {children}
     </KeybindingProvider>
-  )
+  );
 }
 
 // Upper-bound how many NormalizedMessages a Message can produce.
@@ -45,9 +41,9 @@ function StaticKeybindingProvider({
 // NormalizedMessages — 1:1 with block count. String content = 1 block.
 // AttachmentMessage etc. have no .message and normalize to ≤1.
 function normalizedUpperBound(m: Message): number {
-  if (!('message' in m)) return 1
-  const c = m.message!.content
-  return Array.isArray(c) ? c.length : 1
+  if (!('message' in m)) return 1;
+  const c = m.message!.content;
+  return Array.isArray(c) ? c.length : 1;
 }
 
 /**
@@ -72,10 +68,10 @@ export async function streamRenderedMessages(
     chunkSize = 40,
     onProgress,
   }: {
-    columns?: number
-    verbose?: boolean
-    chunkSize?: number
-    onProgress?: (rendered: number) => void
+    columns?: number;
+    verbose?: boolean;
+    chunkSize?: number;
+    onProgress?: (rendered: number) => void;
   } = {},
 ): Promise<void> {
   const renderChunk = (range: readonly [number, number]) =>
@@ -101,20 +97,20 @@ export async function streamRenderedMessages(
         </StaticKeybindingProvider>
       </AppStateProvider>,
       columns,
-    )
+    );
 
   // renderRange indexes into the post-collapse array whose length we can't
   // see from here — normalize splits each Message into one NormalizedMessage
   // per content block (unbounded per message), collapse merges some back.
   // Ceiling is the exact normalize output count + chunkSize so the loop
   // always reaches the empty slice where break fires (collapse only shrinks).
-  let ceiling = chunkSize
-  for (const m of messages) ceiling += normalizedUpperBound(m)
+  let ceiling = chunkSize;
+  for (const m of messages) ceiling += normalizedUpperBound(m);
   for (let offset = 0; offset < ceiling; offset += chunkSize) {
-    const ansi = await renderChunk([offset, offset + chunkSize])
-    if (stripAnsi(ansi).trim() === '') break
-    await sink(ansi)
-    onProgress?.(offset + chunkSize)
+    const ansi = await renderChunk([offset, offset + chunkSize]);
+    if (stripAnsi(ansi).trim() === '') break;
+    await sink(ansi);
+    onProgress?.(offset + chunkSize);
   }
 }
 
@@ -127,12 +123,7 @@ export async function renderMessagesToPlainText(
   tools: Tools = [],
   columns?: number,
 ): Promise<string> {
-  const parts: string[] = []
-  await streamRenderedMessages(
-    messages,
-    tools,
-    chunk => void parts.push(stripAnsi(chunk)),
-    { columns },
-  )
-  return parts.join('')
+  const parts: string[] = [];
+  await streamRenderedMessages(messages, tools, chunk => void parts.push(stripAnsi(chunk)), { columns });
+  return parts.join('');
 }
diff --git a/src/utils/fileHistory.ts b/src/utils/fileHistory.ts
index 4e227d997..79eb0958b 100644
--- a/src/utils/fileHistory.ts
+++ b/src/utils/fileHistory.ts
@@ -1109,7 +1109,6 @@ async function readFileAsyncOrNull(path: string): Promise<string | null> {
 const ENABLE_DUMP_STATE = false
 function maybeDumpStateForDebug(state: FileHistoryState): void {
   if (ENABLE_DUMP_STATE) {
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.error(inspect(state, false, 5))
   }
 }
diff --git a/src/utils/filePersistence/filePersistence.ts b/src/utils/filePersistence/filePersistence.ts
index e7076bd73..219efc6c4 100644
--- a/src/utils/filePersistence/filePersistence.ts
+++ b/src/utils/filePersistence/filePersistence.ts
@@ -224,7 +224,8 @@ async function executeBYOCPersistence(
     } else {
       failedFiles.push({
         filename: result.path,
-        error: (result as { path: string; error: string; success: false }).error,
+        error: (result as { path: string; error: string; success: false })
+          .error,
       })
     }
   }
diff --git a/src/utils/filePersistence/outputsScanner.ts b/src/utils/filePersistence/outputsScanner.ts
index f1ce6516f..fbc4d8008 100644
--- a/src/utils/filePersistence/outputsScanner.ts
+++ b/src/utils/filePersistence/outputsScanner.ts
@@ -66,10 +66,10 @@ export async function findModifiedFiles(
   // Use recursive flag to get all entries in one call
   let entries: Awaited<ReturnType<typeof fs.readdir>> | any[]
   try {
-    entries = await fs.readdir(outputsDir, {
+    entries = (await fs.readdir(outputsDir, {
       withFileTypes: true,
       recursive: true,
-    }) as any[]
+    })) as any[]
   } catch {
     // Directory doesn't exist or is not accessible
     return []
diff --git a/src/utils/filePersistence/types.ts b/src/utils/filePersistence/types.ts
index 35d3e00c9..986f1ffa3 100644
--- a/src/utils/filePersistence/types.ts
+++ b/src/utils/filePersistence/types.ts
@@ -1,5 +1,5 @@
 export const FILE_COUNT_LIMIT = 10000
-export const OUTPUTS_SUBDIR = ".claude-code/outputs"
+export const OUTPUTS_SUBDIR = '.claude-code/outputs'
 export const DEFAULT_UPLOAD_CONCURRENCY = 5
 
 export interface FailedPersistence {
diff --git a/src/utils/forkedAgent.ts b/src/utils/forkedAgent.ts
index c6717b1ff..abb015bda 100644
--- a/src/utils/forkedAgent.ts
+++ b/src/utils/forkedAgent.ts
@@ -242,7 +242,9 @@ export function extractResultText(
   if (!lastAssistantMessage) return defaultText
 
   const textContent = extractTextContent(
-    Array.isArray(lastAssistantMessage.message.content) ? lastAssistantMessage.message.content : [],
+    Array.isArray(lastAssistantMessage.message.content)
+      ? lastAssistantMessage.message.content
+      : [],
     '\n',
   )
 
@@ -561,7 +563,10 @@ export async function runForkedAgent({
           (message as any).event?.type === 'message_delta' &&
           (message as any).event.usage
         ) {
-          const turnUsage = updateUsage({ ...EMPTY_USAGE }, (message as any).event.usage)
+          const turnUsage = updateUsage(
+            { ...EMPTY_USAGE },
+            (message as any).event.usage,
+          )
           totalUsage = accumulateUsage(totalUsage, turnUsage)
         }
         continue
diff --git a/src/utils/fsOperations.ts b/src/utils/fsOperations.ts
index e6e855836..cef6200c2 100644
--- a/src/utils/fsOperations.ts
+++ b/src/utils/fsOperations.ts
@@ -454,7 +454,7 @@ export const NodeFsOperations: FsOperations = {
 
   readSync(fsPath, options) {
     using _ = slowLogging`fs.readSync(${fsPath}, ${options.length} bytes)`
-    let fd: number | undefined = undefined
+    let fd: number | undefined
     try {
       fd = fs.openSync(fsPath, 'r')
       const buffer = Buffer.alloc(options.length)
diff --git a/src/utils/generators.ts b/src/utils/generators.ts
index 9070a34ce..69d1088c2 100644
--- a/src/utils/generators.ts
+++ b/src/utils/generators.ts
@@ -22,7 +22,9 @@ export async function returnValue<A>(
 }
 
 type QueuedGenerator<A> = {
+  // biome-ignore lint/suspicious/noConfusingVoidType: void matches AsyncGenerator<A, void> return type
   done: boolean | void
+  // biome-ignore lint/suspicious/noConfusingVoidType: void matches AsyncGenerator<A, void> yield type
   value: A | void
   generator: AsyncGenerator<A, void>
   promise: Promise<QueuedGenerator<A>>
diff --git a/src/utils/git/__tests__/gitConfigParser.test.ts b/src/utils/git/__tests__/gitConfigParser.test.ts
index 1a64d0f17..c59c958e0 100644
--- a/src/utils/git/__tests__/gitConfigParser.test.ts
+++ b/src/utils/git/__tests__/gitConfigParser.test.ts
@@ -1,138 +1,132 @@
-import { describe, expect, test } from "bun:test";
-import { parseConfigString } from "../gitConfigParser";
+import { describe, expect, test } from 'bun:test'
+import { parseConfigString } from '../gitConfigParser'
 
-describe("parseConfigString", () => {
-  test("parses simple remote url", () => {
-    const config = '[remote "origin"]\n\turl = https://github.com/user/repo.git';
-    expect(parseConfigString(config, "remote", "origin", "url")).toBe(
-      "https://github.com/user/repo.git"
-    );
-  });
+describe('parseConfigString', () => {
+  test('parses simple remote url', () => {
+    const config = '[remote "origin"]\n\turl = https://github.com/user/repo.git'
+    expect(parseConfigString(config, 'remote', 'origin', 'url')).toBe(
+      'https://github.com/user/repo.git',
+    )
+  })
 
-  test("section matching is case-insensitive", () => {
-    const config = '[REMOTE "origin"]\n\turl = https://example.com';
-    expect(parseConfigString(config, "remote", "origin", "url")).toBe(
-      "https://example.com"
-    );
-  });
+  test('section matching is case-insensitive', () => {
+    const config = '[REMOTE "origin"]\n\turl = https://example.com'
+    expect(parseConfigString(config, 'remote', 'origin', 'url')).toBe(
+      'https://example.com',
+    )
+  })
 
-  test("subsection matching is case-sensitive", () => {
-    const config = '[remote "Origin"]\n\turl = https://example.com';
-    expect(parseConfigString(config, "remote", "origin", "url")).toBeNull();
-  });
+  test('subsection matching is case-sensitive', () => {
+    const config = '[remote "Origin"]\n\turl = https://example.com'
+    expect(parseConfigString(config, 'remote', 'origin', 'url')).toBeNull()
+  })
 
-  test("subsection matching is case-sensitive (positive)", () => {
-    const config = '[remote "Origin"]\n\turl = https://example.com';
-    expect(parseConfigString(config, "remote", "Origin", "url")).toBe(
-      "https://example.com"
-    );
-  });
+  test('subsection matching is case-sensitive (positive)', () => {
+    const config = '[remote "Origin"]\n\turl = https://example.com'
+    expect(parseConfigString(config, 'remote', 'Origin', 'url')).toBe(
+      'https://example.com',
+    )
+  })
 
-  test("key matching is case-insensitive", () => {
-    const config = '[remote "origin"]\n\tURL = https://example.com';
-    expect(parseConfigString(config, "remote", "origin", "url")).toBe(
-      "https://example.com"
-    );
-  });
+  test('key matching is case-insensitive', () => {
+    const config = '[remote "origin"]\n\tURL = https://example.com'
+    expect(parseConfigString(config, 'remote', 'origin', 'url')).toBe(
+      'https://example.com',
+    )
+  })
 
-  test("parses quoted value with spaces", () => {
-    const config = '[user]\n\tname = "John Doe"';
-    expect(parseConfigString(config, "user", null, "name")).toBe("John Doe");
-  });
+  test('parses quoted value with spaces', () => {
+    const config = '[user]\n\tname = "John Doe"'
+    expect(parseConfigString(config, 'user', null, 'name')).toBe('John Doe')
+  })
 
-  test("handles escape sequence \\n inside quotes", () => {
-    const config = '[user]\n\tname = "line1\\nline2"';
-    expect(parseConfigString(config, "user", null, "name")).toBe(
-      "line1\nline2"
-    );
-  });
+  test('handles escape sequence \\n inside quotes', () => {
+    const config = '[user]\n\tname = "line1\\nline2"'
+    expect(parseConfigString(config, 'user', null, 'name')).toBe('line1\nline2')
+  })
 
-  test("handles escape sequence \\t inside quotes", () => {
-    const config = '[user]\n\tname = "col1\\tcol2"';
-    expect(parseConfigString(config, "user", null, "name")).toBe(
-      "col1\tcol2"
-    );
-  });
+  test('handles escape sequence \\t inside quotes', () => {
+    const config = '[user]\n\tname = "col1\\tcol2"'
+    expect(parseConfigString(config, 'user', null, 'name')).toBe('col1\tcol2')
+  })
 
-  test("handles escape sequence \\\\ inside quotes", () => {
-    const config = '[user]\n\tname = "back\\\\slash"';
-    expect(parseConfigString(config, "user", null, "name")).toBe("back\\slash");
-  });
+  test('handles escape sequence \\\\ inside quotes', () => {
+    const config = '[user]\n\tname = "back\\\\slash"'
+    expect(parseConfigString(config, 'user', null, 'name')).toBe('back\\slash')
+  })
 
-  test("handles escape sequence \\\" inside quotes", () => {
-    const config = '[user]\n\tname = "say \\"hello\\""';
-    expect(parseConfigString(config, "user", null, "name")).toBe('say "hello"');
-  });
+  test('handles escape sequence \\" inside quotes', () => {
+    const config = '[user]\n\tname = "say \\"hello\\""'
+    expect(parseConfigString(config, 'user', null, 'name')).toBe('say "hello"')
+  })
 
-  test("strips inline comment with #", () => {
-    const config = '[remote "origin"]\n\turl = https://example.com # comment';
-    expect(parseConfigString(config, "remote", "origin", "url")).toBe(
-      "https://example.com"
-    );
-  });
+  test('strips inline comment with #', () => {
+    const config = '[remote "origin"]\n\turl = https://example.com # comment'
+    expect(parseConfigString(config, 'remote', 'origin', 'url')).toBe(
+      'https://example.com',
+    )
+  })
 
-  test("strips inline comment with ;", () => {
-    const config = '[remote "origin"]\n\turl = https://example.com ; comment';
-    expect(parseConfigString(config, "remote", "origin", "url")).toBe(
-      "https://example.com"
-    );
-  });
+  test('strips inline comment with ;', () => {
+    const config = '[remote "origin"]\n\turl = https://example.com ; comment'
+    expect(parseConfigString(config, 'remote', 'origin', 'url')).toBe(
+      'https://example.com',
+    )
+  })
 
-  test("finds value in correct section among multiple sections", () => {
+  test('finds value in correct section among multiple sections', () => {
     const config = [
       '[remote "origin"]',
-      "\turl = https://origin.example.com",
+      '\turl = https://origin.example.com',
       '[remote "upstream"]',
-      "\turl = https://upstream.example.com",
-    ].join("\n");
-    expect(parseConfigString(config, "remote", "upstream", "url")).toBe(
-      "https://upstream.example.com"
-    );
-  });
+      '\turl = https://upstream.example.com',
+    ].join('\n')
+    expect(parseConfigString(config, 'remote', 'upstream', 'url')).toBe(
+      'https://upstream.example.com',
+    )
+  })
 
-  test("returns null for missing key", () => {
-    const config = '[remote "origin"]\n\turl = https://example.com';
+  test('returns null for missing key', () => {
+    const config = '[remote "origin"]\n\turl = https://example.com'
+    expect(parseConfigString(config, 'remote', 'origin', 'pushurl')).toBeNull()
+  })
+
+  test('returns null for missing section', () => {
+    const config = '[remote "origin"]\n\turl = https://example.com'
+    expect(parseConfigString(config, 'branch', 'main', 'merge')).toBeNull()
+  })
+
+  test('returns null for boolean key (no = sign)', () => {
+    const config = '[core]\n\tbare'
+    expect(parseConfigString(config, 'core', null, 'bare')).toBeNull()
+  })
+
+  test('returns null for empty config string', () => {
+    expect(parseConfigString('', 'remote', 'origin', 'url')).toBeNull()
+  })
+
+  test('handles section without subsection', () => {
+    const config = '[core]\n\trepositoryformatversion = 0'
     expect(
-      parseConfigString(config, "remote", "origin", "pushurl")
-    ).toBeNull();
-  });
+      parseConfigString(config, 'core', null, 'repositoryformatversion'),
+    ).toBe('0')
+  })
 
-  test("returns null for missing section", () => {
-    const config = '[remote "origin"]\n\turl = https://example.com';
-    expect(parseConfigString(config, "branch", "main", "merge")).toBeNull();
-  });
-
-  test("returns null for boolean key (no = sign)", () => {
-    const config = "[core]\n\tbare";
-    expect(parseConfigString(config, "core", null, "bare")).toBeNull();
-  });
-
-  test("returns null for empty config string", () => {
-    expect(parseConfigString("", "remote", "origin", "url")).toBeNull();
-  });
-
-  test("handles section without subsection", () => {
-    const config = "[core]\n\trepositoryformatversion = 0";
-    expect(
-      parseConfigString(config, "core", null, "repositoryformatversion")
-    ).toBe("0");
-  });
-
-  test("does not match section without subsection when subsection is requested", () => {
-    const config = "[core]\n\tbare = false";
+  test('does not match section without subsection when subsection is requested', () => {
+    const config = '[core]\n\tbare = false'
     // Looking for [core "something"] but config has [core]
-    expect(parseConfigString(config, "core", "something", "bare")).toBeNull();
-  });
+    expect(parseConfigString(config, 'core', 'something', 'bare')).toBeNull()
+  })
 
-  test("skips comment-only lines", () => {
+  test('skips comment-only lines', () => {
     const config = [
-      "# This is a comment",
-      "; This is also a comment",
+      '# This is a comment',
+      '; This is also a comment',
       '[remote "origin"]',
-      "\turl = https://example.com",
-    ].join("\n");
-    expect(parseConfigString(config, "remote", "origin", "url")).toBe(
-      "https://example.com"
-    );
-  });
-});
+      '\turl = https://example.com',
+    ].join('\n')
+    expect(parseConfigString(config, 'remote', 'origin', 'url')).toBe(
+      'https://example.com',
+    )
+  })
+})
diff --git a/src/utils/gracefulShutdown.ts b/src/utils/gracefulShutdown.ts
index 8b8a5b9c7..506d78cd7 100644
--- a/src/utils/gracefulShutdown.ts
+++ b/src/utils/gracefulShutdown.ts
@@ -10,7 +10,21 @@ import {
   getSessionId,
   isSessionPersistenceDisabled,
 } from '../bootstrap/state.js'
-import { DISABLE_KITTY_KEYBOARD, DISABLE_MODIFY_OTHER_KEYS, DBP, DFE, DISABLE_MOUSE_TRACKING, EXIT_ALT_SCREEN, SHOW_CURSOR, CLEAR_ITERM2_PROGRESS, CLEAR_TAB_STATUS, CLEAR_TERMINAL_TITLE, instances, supportsTabStatus, wrapForMultiplexer } from '@anthropic/ink'
+import {
+  DISABLE_KITTY_KEYBOARD,
+  DISABLE_MODIFY_OTHER_KEYS,
+  DBP,
+  DFE,
+  DISABLE_MOUSE_TRACKING,
+  EXIT_ALT_SCREEN,
+  SHOW_CURSOR,
+  CLEAR_ITERM2_PROGRESS,
+  CLEAR_TAB_STATUS,
+  CLEAR_TERMINAL_TITLE,
+  instances,
+  supportsTabStatus,
+  wrapForMultiplexer,
+} from '@anthropic/ink'
 import { shutdownDatadog } from '../services/analytics/datadog.js'
 import { shutdown1PEventLogging } from '../services/analytics/firstPartyEventLogger.js'
 import {
@@ -486,7 +500,11 @@ export async function gracefulShutdown(
   // Lost analytics on slow networks are acceptable; a hanging exit is not.
   try {
     await Promise.race([
-      Promise.all([shutdown1PEventLogging(), shutdownDatadog(), closeSentry(2000)]),
+      Promise.all([
+        shutdown1PEventLogging(),
+        shutdownDatadog(),
+        closeSentry(2000),
+      ]),
       sleep(500),
     ])
   } catch {
diff --git a/src/utils/groupToolUses.ts b/src/utils/groupToolUses.ts
index 427131675..333d9c5a8 100644
--- a/src/utils/groupToolUses.ts
+++ b/src/utils/groupToolUses.ts
@@ -1,5 +1,8 @@
 import type { BetaToolUseBlock } from '@anthropic-ai/sdk/resources/beta/messages/messages.mjs'
-import type { ContentBlockParam, ToolResultBlockParam } from '@anthropic-ai/sdk/resources/messages/messages.mjs'
+import type {
+  ContentBlockParam,
+  ToolResultBlockParam,
+} from '@anthropic-ai/sdk/resources/messages/messages.mjs'
 import type { Tools } from '../Tool.js'
 import type {
   GroupedToolUseMessage,
@@ -34,8 +37,18 @@ function getToolsWithGrouping(tools: Tools): Set<string> {
 function getToolUseInfo(
   msg: MessageWithoutProgress,
 ): { messageId: string; toolUseId: string; toolName: string } | null {
-  if (msg.type === 'assistant' && msg.message?.content && Array.isArray(msg.message.content) && (msg.message.content[0] as { type?: string })?.type === 'tool_use') {
-    const content = msg.message.content[0] as unknown as { type: 'tool_use'; id: string; name: string; [key: string]: unknown }
+  if (
+    msg.type === 'assistant' &&
+    msg.message?.content &&
+    Array.isArray(msg.message.content) &&
+    (msg.message.content[0] as { type?: string })?.type === 'tool_use'
+  ) {
+    const content = msg.message.content[0] as unknown as {
+      type: 'tool_use'
+      id: string
+      name: string
+      [key: string]: unknown
+    }
     return {
       messageId: msg.message.id as string,
       toolUseId: content.id,
@@ -104,13 +117,22 @@ export function applyGrouping(
   const resultsByToolUseId = new Map<string, NormalizedUserMessage>()
 
   for (const msg of messages) {
-    if (msg.type === 'user' && msg.message?.content && Array.isArray(msg.message.content)) {
+    if (
+      msg.type === 'user' &&
+      msg.message?.content &&
+      Array.isArray(msg.message.content)
+    ) {
       for (const content of msg.message.content) {
         if (
           (content as { type?: string }).type === 'tool_result' &&
-          groupedToolUseIds.has((content as { tool_use_id: string }).tool_use_id)
+          groupedToolUseIds.has(
+            (content as { tool_use_id: string }).tool_use_id,
+          )
         ) {
-          resultsByToolUseId.set((content as { tool_use_id: string }).tool_use_id, msg as NormalizedUserMessage)
+          resultsByToolUseId.set(
+            (content as { tool_use_id: string }).tool_use_id,
+            msg as NormalizedUserMessage,
+          )
         }
       }
     }
@@ -161,10 +183,14 @@ export function applyGrouping(
     }
 
     // Skip user messages whose tool_results are all grouped
-    if (msg.type === 'user' && msg.message?.content && Array.isArray(msg.message.content)) {
-      const toolResults = (msg.message.content as Array<ContentBlockParam>).filter(
-        (c): c is ToolResultBlockParam => c.type === 'tool_result',
-      )
+    if (
+      msg.type === 'user' &&
+      msg.message?.content &&
+      Array.isArray(msg.message.content)
+    ) {
+      const toolResults = (
+        msg.message.content as Array<ContentBlockParam>
+      ).filter((c): c is ToolResultBlockParam => c.type === 'tool_result')
       if (toolResults.length > 0) {
         const allGrouped = toolResults.every(tr =>
           groupedToolUseIds.has(tr.tool_use_id),
diff --git a/src/utils/highlightMatch.tsx b/src/utils/highlightMatch.tsx
index 23945f976..1f2148407 100644
--- a/src/utils/highlightMatch.tsx
+++ b/src/utils/highlightMatch.tsx
@@ -1,5 +1,5 @@
-import * as React from 'react'
-import { Text } from '@anthropic/ink'
+import * as React from 'react';
+import { Text } from '@anthropic/ink';
 
 /**
  * Inverse-highlight every occurrence of `query` in `text` (case-insensitive).
@@ -7,23 +7,23 @@ import { Text } from '@anthropic/ink'
  * and preview panes.
  */
 export function highlightMatch(text: string, query: string): React.ReactNode {
-  if (!query) return text
-  const queryLower = query.toLowerCase()
-  const textLower = text.toLowerCase()
-  const parts: React.ReactNode[] = []
-  let offset = 0
-  let idx = textLower.indexOf(queryLower, offset)
-  if (idx === -1) return text
+  if (!query) return text;
+  const queryLower = query.toLowerCase();
+  const textLower = text.toLowerCase();
+  const parts: React.ReactNode[] = [];
+  let offset = 0;
+  let idx = textLower.indexOf(queryLower, offset);
+  if (idx === -1) return text;
   while (idx !== -1) {
-    if (idx > offset) parts.push(text.slice(offset, idx))
+    if (idx > offset) parts.push(text.slice(offset, idx));
     parts.push(
       <Text key={idx} inverse>
         {text.slice(idx, idx + query.length)}
       </Text>,
-    )
-    offset = idx + query.length
-    idx = textLower.indexOf(queryLower, offset)
+    );
+    offset = idx + query.length;
+    idx = textLower.indexOf(queryLower, offset);
   }
-  if (offset < text.length) parts.push(text.slice(offset))
-  return <>{parts}</>
+  if (offset < text.length) parts.push(text.slice(offset));
+  return <>{parts}</>;
 }
diff --git a/src/utils/hooks.ts b/src/utils/hooks.ts
index bf0327ccb..76cf71630 100644
--- a/src/utils/hooks.ts
+++ b/src/utils/hooks.ts
@@ -1235,7 +1235,6 @@ async function execCommandHook(
                 child.stdin.destroy()
               }
             })
-            continue
           }
         } catch {
           // Not JSON, just a normal line
@@ -1615,7 +1614,6 @@ function getPluginHookCounts(
   return counts
 }
 
-
 /**
  * Build a map of {hookType: count} from matched hooks.
  */
@@ -1750,7 +1748,7 @@ export async function getMatchingHooks(
 
     // If you change the criteria below, then you must change
     // src/utils/hooks/hooksConfigManager.ts as well.
-    let matchQuery: string | undefined = undefined
+    let matchQuery: string | undefined
     switch (hookInput.hook_event_name) {
       case 'PreToolUse':
       case 'PostToolUse':
@@ -3390,7 +3388,8 @@ async function executeHooksOutsideREPL({
             hookEvent === 'WorktreeCreate'
               ? httpJson &&
                 isSyncHookJSONOutput(httpJson) &&
-                typedHttpJson?.hookSpecificOutput?.hookEventName === 'WorktreeCreate'
+                typedHttpJson?.hookSpecificOutput?.hookEventName ===
+                  'WorktreeCreate'
                 ? typedHttpJson.hookSpecificOutput.worktreePath
                 : ''
               : httpResult.body
@@ -3484,11 +3483,14 @@ async function executeHooksOutsideREPL({
           isSyncHookJSONOutput(json) &&
           typedJson?.hookSpecificOutput &&
           'watchPaths' in typedJson.hookSpecificOutput
-            ? (typedJson.hookSpecificOutput as { watchPaths?: string[] }).watchPaths
+            ? (typedJson.hookSpecificOutput as { watchPaths?: string[] })
+                .watchPaths
             : undefined
 
         const systemMessage =
-          json && isSyncHookJSONOutput(json) ? typedJson?.systemMessage : undefined
+          json && isSyncHookJSONOutput(json)
+            ? typedJson?.systemMessage
+            : undefined
 
         return {
           command: hook.command,
@@ -3748,7 +3750,10 @@ export async function executeStopFailureHooks(
   const rawContent = lastMessage.message?.content
   const lastAssistantText =
     (Array.isArray(rawContent)
-      ? extractTextContent(rawContent as readonly { readonly type: string }[], '\n').trim()
+      ? extractTextContent(
+          rawContent as readonly { readonly type: string }[],
+          '\n',
+        ).trim()
       : typeof rawContent === 'string'
         ? rawContent.trim()
         : '') || undefined
@@ -3812,7 +3817,10 @@ export async function* executeStopHooks(
   const lastAssistantContent = lastAssistantMessage?.message?.content
   const lastAssistantText = lastAssistantMessage
     ? (Array.isArray(lastAssistantContent)
-        ? extractTextContent(lastAssistantContent as readonly { readonly type: string }[], '\n').trim()
+        ? extractTextContent(
+            lastAssistantContent as readonly { readonly type: string }[],
+            '\n',
+          ).trim()
         : typeof lastAssistantContent === 'string'
           ? lastAssistantContent.trim()
           : '') || undefined
@@ -4594,10 +4602,15 @@ function parseElicitationHookOutput(
       return {}
     }
 
-    const typedSpecific = specific as { action: string; content?: Record<string, unknown> }
+    const typedSpecific = specific as {
+      action: string
+      content?: Record<string, unknown>
+    }
     const response: ElicitationResponse = {
       action: typedSpecific.action as ElicitationResponse['action'],
-      content: typedSpecific.content as ElicitationResponse['content'] | undefined,
+      content: typedSpecific.content as
+        | ElicitationResponse['content']
+        | undefined,
     }
 
     const out: {
diff --git a/src/utils/hooks/apiQueryHookHelper.ts b/src/utils/hooks/apiQueryHookHelper.ts
index 53b3d5999..73088f6a8 100644
--- a/src/utils/hooks/apiQueryHookHelper.ts
+++ b/src/utils/hooks/apiQueryHookHelper.ts
@@ -108,7 +108,9 @@ export function createApiQueryHook<TResult>(
       })
 
       // Parse response
-      const content = extractTextContent(Array.isArray(response.message.content) ? response.message.content : []).trim()
+      const content = extractTextContent(
+        Array.isArray(response.message.content) ? response.message.content : [],
+      ).trim()
 
       try {
         const result = config.parseResponse(content, context)
diff --git a/src/utils/hooks/execAgentHook.ts b/src/utils/hooks/execAgentHook.ts
index 290e68ed4..3c843445f 100644
--- a/src/utils/hooks/execAgentHook.ts
+++ b/src/utils/hooks/execAgentHook.ts
@@ -213,7 +213,9 @@ When done, return your result using the ${SYNTHETIC_OUTPUT_TOOL_NAME} tool with:
           message.type === 'attachment' &&
           (message as any).attachment.type === 'structured_output'
         ) {
-          const parsed = hookResponseSchema().safeParse((message as any).attachment.data)
+          const parsed = hookResponseSchema().safeParse(
+            (message as any).attachment.data,
+          )
           if (parsed.success) {
             structuredOutputResult = parsed.data
             logForDebugging(
diff --git a/src/utils/hooks/execHttpHook.ts b/src/utils/hooks/execHttpHook.ts
index b1e582266..aedee7371 100644
--- a/src/utils/hooks/execHttpHook.ts
+++ b/src/utils/hooks/execHttpHook.ts
@@ -75,6 +75,7 @@ function urlMatchesPattern(url: string, pattern: string): boolean {
  */
 function sanitizeHeaderValue(value: string): string {
   // eslint-disable-next-line no-control-regex
+  // biome-ignore lint/suspicious/noControlCharactersInRegex: intentional control character sanitization
   return value.replace(/[\r\n\x00]/g, '')
 }
 
diff --git a/src/utils/hooks/execPromptHook.ts b/src/utils/hooks/execPromptHook.ts
index db5eb1a67..45ab0e334 100644
--- a/src/utils/hooks/execPromptHook.ts
+++ b/src/utils/hooks/execPromptHook.ts
@@ -102,7 +102,9 @@ Your response must be a JSON object matching one of the following schemas:
       cleanupSignal()
 
       // Extract text content from response
-      const content = extractTextContent(Array.isArray(response.message.content) ? response.message.content : [])
+      const content = extractTextContent(
+        Array.isArray(response.message.content) ? response.message.content : [],
+      )
 
       // Update response length for spinner display
       toolUseContext.setResponseLength(length => length + content.length)
diff --git a/src/utils/hooks/hooksConfigManager.ts b/src/utils/hooks/hooksConfigManager.ts
index 0990d8247..e4b9a80dc 100644
--- a/src/utils/hooks/hooksConfigManager.ts
+++ b/src/utils/hooks/hooksConfigManager.ts
@@ -327,7 +327,7 @@ export function groupHooksByEventAndMatcher(
       const eventGroup = grouped[hookEvent]
       if (!eventGroup) continue
 
-      for (const matcher of (matchers ?? [])) {
+      for (const matcher of matchers ?? []) {
         const matcherKey = matcher.matcher || ''
 
         // Only PluginHookMatcher has pluginRoot; HookCallbackMatcher (internal
diff --git a/src/utils/hooks/skillImprovement.ts b/src/utils/hooks/skillImprovement.ts
index 9d6066c9b..386687b79 100644
--- a/src/utils/hooks/skillImprovement.ts
+++ b/src/utils/hooks/skillImprovement.ts
@@ -249,7 +249,9 @@ Rules:
     },
   })
 
-  const responseText = extractTextContent(Array.isArray(response.message.content) ? response.message.content : []).trim()
+  const responseText = extractTextContent(
+    Array.isArray(response.message.content) ? response.message.content : [],
+  ).trim()
 
   const updatedContent = extractTag(responseText, 'updated_file')
   if (!updatedContent) {
diff --git a/src/utils/hooks/src/entrypoints/agentSdkTypes.ts b/src/utils/hooks/src/entrypoints/agentSdkTypes.ts
index 8dbc64c4c..fd01b339e 100644
--- a/src/utils/hooks/src/entrypoints/agentSdkTypes.ts
+++ b/src/utils/hooks/src/entrypoints/agentSdkTypes.ts
@@ -1,5 +1,5 @@
 // Auto-generated type stub — replace with real implementation
-export type HookEvent = any;
-export type AsyncHookJSONOutput = any;
-export type SyncHookJSONOutput = any;
-export type HOOK_EVENTS = any;
+export type HookEvent = any
+export type AsyncHookJSONOutput = any
+export type SyncHookJSONOutput = any
+export type HOOK_EVENTS = any
diff --git a/src/utils/hooks/src/entrypoints/sdk/coreTypes.ts b/src/utils/hooks/src/entrypoints/sdk/coreTypes.ts
index 263795d50..c6fefd007 100644
--- a/src/utils/hooks/src/entrypoints/sdk/coreTypes.ts
+++ b/src/utils/hooks/src/entrypoints/sdk/coreTypes.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type HOOK_EVENTS = any;
+export type HOOK_EVENTS = any
diff --git a/src/utils/hooks/src/state/AppState.ts b/src/utils/hooks/src/state/AppState.ts
index caf2928ae..fec2e89be 100644
--- a/src/utils/hooks/src/state/AppState.ts
+++ b/src/utils/hooks/src/state/AppState.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type AppState = any;
+export type AppState = any
diff --git a/src/utils/hooks/src/types/message.ts b/src/utils/hooks/src/types/message.ts
index 585895d8e..5febc8ae0 100644
--- a/src/utils/hooks/src/types/message.ts
+++ b/src/utils/hooks/src/types/message.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type Message = any;
+export type Message = any
diff --git a/src/utils/ide.ts b/src/utils/ide.ts
index fe6d55d7b..3d2aaeef1 100644
--- a/src/utils/ide.ts
+++ b/src/utils/ide.ts
@@ -379,7 +379,7 @@ async function readIdeLockfile(path: string): Promise<IdeLockfileInfo | null> {
 
     return {
       workspaceFolders,
-      port: parseInt(port),
+      port: parseInt(port, 10),
       pid,
       ideName,
       useWebSocket,
@@ -669,7 +669,7 @@ export async function detectIDEs(
   try {
     // Get the CLAUDE_CODE_SSE_PORT if set
     const ssePort = process.env.CLAUDE_CODE_SSE_PORT
-    const envPort = ssePort ? parseInt(ssePort) : null
+    const envPort = ssePort ? parseInt(ssePort, 10) : null
 
     // Get the current working directory, normalized to NFC for consistent
     // comparison. macOS returns NFD paths (decomposed Unicode), while IDEs
@@ -1006,7 +1006,7 @@ function getVSCodeIDECommandByParentProcess(): string | null {
       if (!ppidStr) {
         break
       }
-      pid = parseInt(ppidStr.trim())
+      pid = parseInt(ppidStr.trim(), 10)
     }
 
     return null
diff --git a/src/utils/imagePaste.ts b/src/utils/imagePaste.ts
index 4f6005d3b..85a2a1001 100644
--- a/src/utils/imagePaste.ts
+++ b/src/utils/imagePaste.ts
@@ -108,7 +108,8 @@ export async function hasImageInClipboard(): Promise<boolean> {
       const { getNativeModule } = await import('image-processor-napi')
       const nativeModule = getNativeModule()
       if (nativeModule && 'hasClipboardImage' in nativeModule) {
-        const hasImage = (nativeModule as unknown as Record<string, Function>).hasClipboardImage
+        const hasImage = (nativeModule as unknown as Record<string, Function>)
+          .hasClipboardImage
         if (hasImage) return hasImage()
       }
     } catch (e) {
@@ -137,9 +138,11 @@ export async function getImageFromClipboard(): Promise<ImageWithDimensions | nul
     try {
       const { getNativeModule } = await import('image-processor-napi')
       const nativeModule = getNativeModule()
-      const readClipboard = nativeModule && 'readClipboardImage' in nativeModule
-        ? (nativeModule as unknown as Record<string, Function>).readClipboardImage
-        : undefined
+      const readClipboard =
+        nativeModule && 'readClipboardImage' in nativeModule
+          ? (nativeModule as unknown as Record<string, Function>)
+              .readClipboardImage
+          : undefined
       if (!readClipboard) {
         throw new Error('native clipboard reader unavailable')
       }
diff --git a/src/utils/jetbrains.ts b/src/utils/jetbrains.ts
index dc9005589..c4980472c 100644
--- a/src/utils/jetbrains.ts
+++ b/src/utils/jetbrains.ts
@@ -120,10 +120,7 @@ async function detectPluginDirectories(ideName: string): Promise<string[]> {
           }
         }
       }
-    } catch {
-      // Ignore errors from stale IDE directories (ENOENT, EACCES, etc.)
-      continue
-    }
+    } catch {}
   }
 
   return foundDirectories.filter(
diff --git a/src/utils/log.ts b/src/utils/log.ts
index da9b1d66d..7d15b2fb3 100644
--- a/src/utils/log.ts
+++ b/src/utils/log.ts
@@ -158,7 +158,6 @@ const isHardFailMode = memoize((): boolean => {
 export function logError(error: unknown): void {
   const err = toError(error)
   if (feature('HARD_FAIL') && isHardFailMode()) {
-    // biome-ignore lint/suspicious/noConsole:: intentional crash output
     console.error('[HARD FAIL] logError called with:', err.stack || err.message)
     // eslint-disable-next-line custom-rules/no-process-exit
     process.exit(1)
@@ -231,7 +230,7 @@ export async function getErrorLogByIndex(
 async function loadLogList(path: string): Promise<LogOption[]> {
   let files: Awaited<ReturnType<typeof readdir>>
   try {
-    files = await readdir(path, { withFileTypes: true }) as any
+    files = (await readdir(path, { withFileTypes: true })) as any
   } catch {
     logError(new Error(`No logs found at ${path}`))
     return []
diff --git a/src/utils/mcp/dateTimeParser.ts b/src/utils/mcp/dateTimeParser.ts
index 756c16223..ffe351070 100644
--- a/src/utils/mcp/dateTimeParser.ts
+++ b/src/utils/mcp/dateTimeParser.ts
@@ -80,7 +80,9 @@ Parse the user's input into ISO 8601 format. Return ONLY the formatted string, o
     })
 
     // Extract text from result
-    const parsedText = extractTextContent(Array.isArray(result.message.content) ? result.message.content : []).trim()
+    const parsedText = extractTextContent(
+      Array.isArray(result.message.content) ? result.message.content : [],
+    ).trim()
 
     // Validate that we got something usable
     if (!parsedText || parsedText === 'INVALID') {
diff --git a/src/utils/messages.ts b/src/utils/messages.ts
index ab1bd122a..dc9addea2 100644
--- a/src/utils/messages.ts
+++ b/src/utils/messages.ts
@@ -315,7 +315,9 @@ export function isSyntheticMessage(message: Message): boolean {
     message.type !== 'system' &&
     Array.isArray(message.message?.content) &&
     message.message?.content[0]?.type === 'text' &&
-    SYNTHETIC_MESSAGES.has((message.message?.content[0] as { text: string }).text)
+    SYNTHETIC_MESSAGES.has(
+      (message.message?.content[0] as { text: string }).text,
+    )
   )
 }
 
@@ -754,7 +756,9 @@ export function normalizeMessages(messages: Message[]): NormalizedMessage[] {
     switch (message.type) {
       case 'assistant': {
         const aMsg = message as AssistantMessage
-        const assistantContent = Array.isArray(aMsg.message.content) ? aMsg.message.content : []
+        const assistantContent = Array.isArray(aMsg.message.content)
+          ? aMsg.message.content
+          : []
         isNewChain = isNewChain || assistantContent.length > 1
         return assistantContent.map((_, index) => {
           const uuid = isNewChain
@@ -813,10 +817,17 @@ export function normalizeMessages(messages: Message[]): NormalizedMessage[] {
             ...createUserMessage({
               content: [_],
               toolUseResult: uMsg.toolUseResult,
-              mcpMeta: uMsg.mcpMeta as { _meta?: Record<string, unknown>; structuredContent?: Record<string, unknown> },
+              mcpMeta: uMsg.mcpMeta as {
+                _meta?: Record<string, unknown>
+                structuredContent?: Record<string, unknown>
+              },
               isMeta: uMsg.isMeta === true ? true : undefined,
-              isVisibleInTranscriptOnly: uMsg.isVisibleInTranscriptOnly === true ? true : undefined,
-              isVirtual: (uMsg.isVirtual as boolean | undefined) === true ? true : undefined,
+              isVisibleInTranscriptOnly:
+                uMsg.isVisibleInTranscriptOnly === true ? true : undefined,
+              isVirtual:
+                (uMsg.isVirtual as boolean | undefined) === true
+                  ? true
+                  : undefined,
               timestamp: uMsg.timestamp as string | undefined,
               imagePasteIds: imageId !== undefined ? [imageId] : undefined,
               origin: uMsg.origin as MessageOrigin | undefined,
@@ -842,7 +853,9 @@ export function isToolUseRequestMessage(
     message.type === 'assistant' &&
     // Note: stop_reason === 'tool_use' is unreliable -- it's not always set correctly
     Array.isArray(message.message?.content) &&
-    (message.message?.content as Array<{type: string}>).some(_ => _.type === 'tool_use')
+    (message.message?.content as Array<{ type: string }>).some(
+      _ => _.type === 'tool_use',
+    )
   )
 }
 
@@ -856,7 +869,8 @@ export function isToolUseResultMessage(
   return (
     message.type === 'user' &&
     ((Array.isArray(message.message?.content) &&
-      (message.message?.content as Array<{type: string}>)[0]?.type === 'tool_result') ||
+      (message.message?.content as Array<{ type: string }>)[0]?.type ===
+        'tool_result') ||
       Boolean(message.toolUseResult))
   )
 }
@@ -930,7 +944,8 @@ export function reorderMessagesInUI(
       Array.isArray(message.message.content) &&
       message.message.content[0]?.type === 'tool_result'
     ) {
-      const toolUseID = (message.message.content[0] as ToolResultBlockParam).tool_use_id
+      const toolUseID = (message.message.content[0] as ToolResultBlockParam)
+        .tool_use_id
       if (!toolUseGroups.has(toolUseID)) {
         toolUseGroups.set(toolUseID, {
           toolUse: null,
@@ -958,7 +973,6 @@ export function reorderMessagesInUI(
         })
       }
       toolUseGroups.get(toolUseID)!.postHooks.push(message)
-      continue
     }
   }
 
@@ -1062,8 +1076,10 @@ function getInProgressHookCount(
     messages,
     _ =>
       _.type === 'progress' &&
-      (_.data as { type: string; hookEvent: HookEvent }).type === 'hook_progress' &&
-      (_.data as { type: string; hookEvent: HookEvent }).hookEvent === hookEvent &&
+      (_.data as { type: string; hookEvent: HookEvent }).type ===
+        'hook_progress' &&
+      (_.data as { type: string; hookEvent: HookEvent }).hookEvent ===
+        hookEvent &&
       _.parentToolUseID === toolUseID,
   )
 }
@@ -1112,11 +1128,21 @@ export function getToolResultIDs(normalizedMessages: NormalizedMessage[]): {
 } {
   return Object.fromEntries(
     normalizedMessages.flatMap(_ =>
-      _.type === 'user' && Array.isArray(_.message?.content) && (_.message?.content as Array<{type:string}>)[0]?.type === 'tool_result'
+      _.type === 'user' &&
+      Array.isArray(_.message?.content) &&
+      (_.message?.content as Array<{ type: string }>)[0]?.type === 'tool_result'
         ? [
             [
-              ((_.message?.content as Array<{type:string}>)[0] as ToolResultBlockParam).tool_use_id,
-              ((_.message?.content as Array<{type:string}>)[0] as ToolResultBlockParam).is_error ?? false,
+              (
+                (
+                  _.message?.content as Array<{ type: string }>
+                )[0] as ToolResultBlockParam
+              ).tool_use_id,
+              (
+                (
+                  _.message?.content as Array<{ type: string }>
+                )[0] as ToolResultBlockParam
+              ).is_error ?? false,
             ],
           ]
         : ([] as [string, boolean][]),
@@ -1137,7 +1163,9 @@ export function getSiblingToolUseIDs(
     (_): _ is AssistantMessage =>
       _.type === 'assistant' &&
       Array.isArray(_.message?.content) &&
-      (_.message?.content as Array<{type:string; id?:string}>).some(block => block.type === 'tool_use' && block.id === toolUseID),
+      (_.message?.content as Array<{ type: string; id?: string }>).some(
+        block => block.type === 'tool_use' && block.id === toolUseID,
+      ),
   )
   if (!unnormalizedMessage) {
     return new Set()
@@ -1152,7 +1180,9 @@ export function getSiblingToolUseIDs(
   return new Set(
     siblingMessages.flatMap(_ =>
       Array.isArray(_.message?.content)
-        ? (_.message?.content as Array<{type:string; id?:string}>).filter(_ => _.type === 'tool_use').map(_ => _.id!)
+        ? (_.message?.content as Array<{ type: string; id?: string }>)
+            .filter(_ => _.type === 'tool_use')
+            .map(_ => _.id!)
         : [],
     ),
   )
@@ -1205,7 +1235,10 @@ export function buildMessageLookups(
             const toolUseContent = content as ToolUseBlock
             toolUseIDs.add(toolUseContent.id)
             toolUseIDToMessageID.set(toolUseContent.id, id)
-            toolUseByToolUseID.set(toolUseContent.id, content as ToolUseBlockParam)
+            toolUseByToolUseID.set(
+              toolUseContent.id,
+              content as ToolUseBlockParam,
+            )
           }
         }
       }
@@ -1256,7 +1289,7 @@ export function buildMessageLookups(
 
     // Build tool result lookup and resolved/errored sets
     if (msg.type === 'user' && Array.isArray(msg.message?.content)) {
-      for (const content of (msg.message?.content ?? [])) {
+      for (const content of msg.message?.content ?? []) {
         if (typeof content !== 'string' && content.type === 'tool_result') {
           const tr = content as ToolResultBlockParam
           toolResultByToolUseID.set(tr.tool_use_id, msg)
@@ -1269,7 +1302,7 @@ export function buildMessageLookups(
     }
 
     if (msg.type === 'assistant' && Array.isArray(msg.message?.content)) {
-      for (const content of (msg.message?.content ?? [])) {
+      for (const content of msg.message?.content ?? []) {
         if (typeof content === 'string') continue
         // Track all server-side *_tool_result blocks (advisor, web_search,
         // code_execution, mcp, etc.) — any block with tool_use_id is a result.
@@ -1409,7 +1442,10 @@ export function buildSubagentLookups(
     if (msg.type === 'assistant' && Array.isArray(msg.message.content)) {
       for (const content of msg.message.content) {
         if (typeof content !== 'string' && content.type === 'tool_use') {
-          toolUseByToolUseID.set((content as ToolUseBlock).id, content as ToolUseBlockParam)
+          toolUseByToolUseID.set(
+            (content as ToolUseBlock).id,
+            content as ToolUseBlockParam,
+          )
         }
       }
     } else if (msg.type === 'user' && Array.isArray(msg.message.content)) {
@@ -1493,9 +1529,10 @@ export function getToolUseIDs(
         (_): _ is NormalizedAssistantMessage<BetaToolUseBlock> =>
           _.type === 'assistant' &&
           Array.isArray(_.message?.content) &&
-          (_.message?.content as Array<{type:string}>)[0]?.type === 'tool_use',
+          (_.message?.content as Array<{ type: string }>)[0]?.type ===
+            'tool_use',
       )
-      .map(_ => ((_.message?.content as Array<BetaToolUseBlock>)[0]).id),
+      .map(_ => (_.message?.content as Array<BetaToolUseBlock>)[0].id),
   )
 }
 
@@ -1525,7 +1562,8 @@ export function reorderAttachmentsForAPI(messages: Message[]): Message[] {
         message.type === 'assistant' ||
         (message.type === 'user' &&
           Array.isArray(message.message?.content) &&
-          (message.message?.content as Array<{type:string}>)[0]?.type === 'tool_result')
+          (message.message?.content as Array<{ type: string }>)[0]?.type ===
+            'tool_result')
 
       if (isStoppingPoint && pendingAttachments.length > 0) {
         // Hit a stopping point — attachments stop here (go after the stopping point).
@@ -1768,10 +1806,15 @@ export function stripToolReferenceBlocksFromUserMessage(
 export function stripCallerFieldFromAssistantMessage(
   message: AssistantMessage,
 ): AssistantMessage {
-  const contentArr = Array.isArray(message.message.content) ? message.message.content : []
+  const contentArr = Array.isArray(message.message.content)
+    ? message.message.content
+    : []
   const hasCallerField = contentArr.some(
     block =>
-      typeof block !== 'string' && block.type === 'tool_use' && 'caller' in block && block.caller !== null,
+      typeof block !== 'string' &&
+      block.type === 'tool_use' &&
+      'caller' in block &&
+      block.caller !== null,
   )
 
   if (!hasCallerField) {
@@ -2237,11 +2280,16 @@ export function normalizeMessagesForAPI(
             ...message,
             message: {
               ...message.message,
-              content: (Array.isArray(message.message.content) ? message.message.content : []).map(block => {
+              content: (Array.isArray(message.message.content)
+                ? message.message.content
+                : []
+              ).map(block => {
                 if (typeof block === 'string') return block
                 if (block.type === 'tool_use') {
                   const toolUseBlk = block as ToolUseBlock
-                  const tool = tools.find(t => toolMatchesName(t, toolUseBlk.name))
+                  const tool = tools.find(t =>
+                    toolMatchesName(t, toolUseBlk.name),
+                  )
                   const normalizedInput = tool
                     ? normalizeToolInputForAPI(
                         tool,
@@ -2262,8 +2310,9 @@ export function normalizeMessagesForAPI(
                   // When tool search is NOT enabled, strip tool-search-only fields
                   // like 'caller', but preserve other provider metadata attached to
                   // the block (for example Gemini thought signatures on tool_use).
-                  const { caller: _caller, ...toolUseRest } = block as ToolUseBlock &
-                    Record<string, unknown> & { caller?: unknown }
+                  const { caller: _caller, ...toolUseRest } =
+                    block as ToolUseBlock &
+                      Record<string, unknown> & { caller?: unknown }
                   return {
                     ...toolUseRest,
                     type: 'tool_use' as const,
@@ -2293,7 +2342,6 @@ export function normalizeMessagesForAPI(
                 result[i] = mergeAssistantMessages(msg, normalizedMessage)
                 return
               }
-              continue
             }
           }
 
@@ -2407,8 +2455,12 @@ export function mergeUserMessagesAndToolResults(
   a: UserMessage,
   b: UserMessage,
 ): UserMessage {
-  const lastContent = normalizeUserTextContent(a.message.content as string | ContentBlockParam[])
-  const currentContent = normalizeUserTextContent(b.message.content as string | ContentBlockParam[])
+  const lastContent = normalizeUserTextContent(
+    a.message.content as string | ContentBlockParam[],
+  )
+  const currentContent = normalizeUserTextContent(
+    b.message.content as string | ContentBlockParam[],
+  )
   return {
     ...a,
     message: {
@@ -2442,12 +2494,18 @@ function isToolResultMessage(msg: Message): boolean {
   }
   const content = msg.message?.content
   if (!content || typeof content === 'string') return false
-  return (content as Array<{type:string}>).some(block => block.type === 'tool_result')
+  return (content as Array<{ type: string }>).some(
+    block => block.type === 'tool_result',
+  )
 }
 
 export function mergeUserMessages(a: UserMessage, b: UserMessage): UserMessage {
-  const lastContent = normalizeUserTextContent(a.message.content as string | ContentBlockParam[])
-  const currentContent = normalizeUserTextContent(b.message.content as string | ContentBlockParam[])
+  const lastContent = normalizeUserTextContent(
+    a.message.content as string | ContentBlockParam[],
+  )
+  const currentContent = normalizeUserTextContent(
+    b.message.content as string | ContentBlockParam[],
+  )
   if (feature('HISTORY_SNIP')) {
     // A merged message is only meta if ALL merged messages are meta. If any
     // operand is real user content, the result must not be flagged isMeta
@@ -2807,9 +2865,15 @@ export function getToolUseID(message: NormalizedMessage): string | null {
       }
       return null
     case 'assistant': {
-      const aContent = Array.isArray(message.message?.content) ? message.message?.content : []
+      const aContent = Array.isArray(message.message?.content)
+        ? message.message?.content
+        : []
       const firstBlock = aContent![0]
-      if (!firstBlock || typeof firstBlock === 'string' || firstBlock.type !== 'tool_use') {
+      if (
+        !firstBlock ||
+        typeof firstBlock === 'string' ||
+        firstBlock.type !== 'tool_use'
+      ) {
         return null
       }
       return (firstBlock as ToolUseBlock).id
@@ -2818,9 +2882,15 @@ export function getToolUseID(message: NormalizedMessage): string | null {
       if (message.sourceToolUseID) {
         return message.sourceToolUseID as string
       }
-      const uContent = Array.isArray(message.message?.content) ? message.message?.content : []
+      const uContent = Array.isArray(message.message?.content)
+        ? message.message?.content
+        : []
       const firstUBlock = uContent![0]
-      if (!firstUBlock || typeof firstUBlock === 'string' || firstUBlock.type !== 'tool_result') {
+      if (
+        !firstUBlock ||
+        typeof firstUBlock === 'string' ||
+        firstUBlock.type !== 'tool_result'
+      ) {
         return null
       }
       return (firstUBlock as ToolResultBlockParam).tool_use_id
@@ -2849,7 +2919,11 @@ export function filterUnresolvedToolUses(messages: Message[]): Message[] {
     if (msg.type !== 'user' && msg.type !== 'assistant') continue
     const content = msg.message?.content
     if (!Array.isArray(content)) continue
-    for (const block of content as Array<{type:string; id?:string; tool_use_id?:string}>) {
+    for (const block of content as Array<{
+      type: string
+      id?: string
+      tool_use_id?: string
+    }>) {
       if (block.type === 'tool_use') {
         toolUseIds.add(block.id!)
       }
@@ -2873,7 +2947,7 @@ export function filterUnresolvedToolUses(messages: Message[]): Message[] {
     const content = msg.message?.content
     if (!Array.isArray(content)) return true
     const toolUseBlockIds: string[] = []
-    for (const b of content as Array<{type:string; id?:string}>) {
+    for (const b of content as Array<{ type: string; id?: string }>) {
       if (b.type === 'tool_use') {
         toolUseBlockIds.push(b.id!)
       }
@@ -2892,7 +2966,7 @@ export function getAssistantMessageText(message: Message): string | null {
   // For content blocks array, extract and concatenate text blocks
   if (Array.isArray(message.message?.content)) {
     return (
-      (message.message?.content as Array<{type:string; text?:string}>)
+      (message.message?.content as Array<{ type: string; text?: string }>)
         .filter(block => block.type === 'text')
         .map(block => block.text ?? '')
         .join('\n')
@@ -3007,11 +3081,17 @@ export function handleMessageFromStream(
     // Capture complete thinking blocks for real-time display in transcript mode
     if (message.type === 'assistant') {
       const assistMsg = message as Message
-      const contentArr = Array.isArray(assistMsg.message?.content) ? assistMsg.message.content : []
+      const contentArr = Array.isArray(assistMsg.message?.content)
+        ? assistMsg.message.content
+        : []
       const thinkingBlock = contentArr.find(
         block => typeof block !== 'string' && block.type === 'thinking',
       )
-      if (thinkingBlock && typeof thinkingBlock !== 'string' && thinkingBlock.type === 'thinking') {
+      if (
+        thinkingBlock &&
+        typeof thinkingBlock !== 'string' &&
+        thinkingBlock.type === 'thinking'
+      ) {
         const tb = thinkingBlock as ThinkingBlock
         onStreamingThinking?.(() => ({
           thinking: tb.thinking,
@@ -3034,7 +3114,28 @@ export function handleMessageFromStream(
   }
 
   // At this point, message is a stream event with an `event` property
-  const streamMsg = message as { type: string; event: { type: string; content_block: { type: string; id?: string; name?: string; input?: Record<string, unknown> }; index: number; delta: { type: string; text: string; partial_json: string; thinking: string }; [key: string]: unknown }; ttftMs?: number; [key: string]: unknown }
+  const streamMsg = message as {
+    type: string
+    event: {
+      type: string
+      content_block: {
+        type: string
+        id?: string
+        name?: string
+        input?: Record<string, unknown>
+      }
+      index: number
+      delta: {
+        type: string
+        text: string
+        partial_json: string
+        thinking: string
+      }
+      [key: string]: unknown
+    }
+    ttftMs?: number
+    [key: string]: unknown
+  }
 
   if (streamMsg.event.type === 'message_start') {
     if (streamMsg.ttftMs != null) {
@@ -3549,7 +3650,6 @@ Read the team config to discover your teammates' names. Check the task list peri
     }
   }
 
-
   // skill_discovery handled here (not in the switch) so the 'skill_discovery'
   // string literal lives inside a feature()-guarded block. A case label can't
   // be gated, but this pattern can — same approach as teammate_mailbox above.
@@ -3570,7 +3670,6 @@ Read the team config to discover your teammates' names. Check the task list peri
   }
 
   // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check -- teammate_mailbox/team_context/skill_discovery/bagel_console handled above
-  // biome-ignore lint/nursery/useExhaustiveSwitchCases: teammate_mailbox/team_context/max_turns_reached/skill_discovery/bagel_console handled above, can't add case for dead code elimination
   switch (attachment.type) {
     case 'directory': {
       return wrapMessagesInSystemReminder([
@@ -3789,8 +3888,7 @@ Read the team config to discover your teammates' names. Check the task list peri
     case 'queued_command': {
       // Prefer explicit origin carried from the queue; fall back to commandMode
       // for task notifications (which predate origin).
-      const origin =
-        (attachment.origin ??
+      const origin = (attachment.origin ??
         (attachment.commandMode === 'task-notification'
           ? { kind: 'task-notification' }
           : undefined)) as MessageOrigin | undefined
@@ -4076,7 +4174,10 @@ You have exited auto mode. The user may now want to interact more directly. You
     case 'async_hook_response': {
       const response = attachment.response as {
         systemMessage?: string | ContentBlockParam[]
-        hookSpecificOutput?: { additionalContext?: string | ContentBlockParam[]; [key: string]: unknown }
+        hookSpecificOutput?: {
+          additionalContext?: string | ContentBlockParam[]
+          [key: string]: unknown
+        }
         [key: string]: unknown
       }
       const messages: UserMessage[] = []
@@ -4099,7 +4200,9 @@ You have exited auto mode. The user may now want to interact more directly. You
       ) {
         messages.push(
           createUserMessage({
-            content: response.hookSpecificOutput.additionalContext as string | ContentBlockParam[],
+            content: response.hookSpecificOutput.additionalContext as
+              | string
+              | ContentBlockParam[],
             isMeta: true,
           }),
         )
@@ -4733,7 +4836,7 @@ export function shouldShowUserMessage(
 export function isThinkingMessage(message: Message): boolean {
   if (message.type !== 'assistant') return false
   if (!Array.isArray(message.message?.content)) return false
-  return (message.message?.content as Array<{type:string}>).every(
+  return (message.message?.content as Array<{ type: string }>).every(
     block => block.type === 'thinking' || block.type === 'redacted_thinking',
   )
 }
@@ -4751,7 +4854,9 @@ export function countToolCalls(
   for (const msg of messages) {
     if (!msg) continue
     if (msg.type === 'assistant' && Array.isArray(msg.message?.content)) {
-      const hasToolUse = (msg.message?.content as Array<{type:string; name?:string}>).some(
+      const hasToolUse = (
+        msg.message?.content as Array<{ type: string; name?: string }>
+      ).some(
         (block): block is ToolUseBlock =>
           block.type === 'tool_use' && block.name === toolName,
       )
@@ -4780,7 +4885,13 @@ export function hasSuccessfulToolCall(
     const msg = messages[i]
     if (!msg) continue
     if (msg.type === 'assistant' && Array.isArray(msg.message?.content)) {
-      const toolUse = (msg.message?.content as Array<{type:string; name?:string; id?:string}>).find(
+      const toolUse = (
+        msg.message?.content as Array<{
+          type: string
+          name?: string
+          id?: string
+        }>
+      ).find(
         (block): block is ToolUseBlock =>
           block.type === 'tool_use' && block.name === toolName,
       )
@@ -4798,7 +4909,13 @@ export function hasSuccessfulToolCall(
     const msg = messages[i]
     if (!msg) continue
     if (msg.type === 'user' && Array.isArray(msg.message?.content)) {
-      const toolResult = (msg.message?.content as Array<{type:string; tool_use_id?:string; is_error?:boolean}>).find(
+      const toolResult = (
+        msg.message?.content as Array<{
+          type: string
+          tool_use_id?: string
+          is_error?: boolean
+        }>
+      ).find(
         (block): block is ToolResultBlockParam =>
           block.type === 'tool_result' &&
           block.tool_use_id === mostRecentToolUseId,
@@ -4844,7 +4961,11 @@ function filterTrailingThinkingFromLastAssistant(
   const content = lastMessage.message.content
   if (!Array.isArray(content)) return messages
   const lastBlock = content.at(-1)
-  if (!lastBlock || typeof lastBlock === 'string' || !isThinkingBlock(lastBlock)) {
+  if (
+    !lastBlock ||
+    typeof lastBlock === 'string' ||
+    !isThinkingBlock(lastBlock)
+  ) {
     return messages
   }
 
@@ -4964,7 +5085,10 @@ export function filterWhitespaceOnlyAssistantMessages(
   for (const message of filtered) {
     const prev = merged.at(-1)
     if (message.type === 'user' && prev?.type === 'user') {
-      merged[merged.length - 1] = mergeUserMessages(prev as UserMessage, message as UserMessage) // lvalue
+      merged[merged.length - 1] = mergeUserMessages(
+        prev as UserMessage,
+        message as UserMessage,
+      ) // lvalue
     } else {
       merged.push(message)
     }
@@ -5060,7 +5184,7 @@ export function filterOrphanedThinkingOnlyMessages(
     const content = msg.message?.content
     if (!Array.isArray(content)) continue
 
-    const hasNonThinking = (content as Array<{type:string}>).some(
+    const hasNonThinking = (content as Array<{ type: string }>).some(
       block => block.type !== 'thinking' && block.type !== 'redacted_thinking',
     )
     if (hasNonThinking && msg.message?.id) {
@@ -5080,7 +5204,7 @@ export function filterOrphanedThinkingOnlyMessages(
     }
 
     // Check if ALL content blocks are thinking blocks
-    const allThinking = (content as Array<{type:string}>).every(
+    const allThinking = (content as Array<{ type: string }>).every(
       block => block.type === 'thinking' || block.type === 'redacted_thinking',
     )
 
@@ -5259,8 +5383,15 @@ export function ensureToolResultPairing(
     // Collect server-side tool result IDs (*_tool_result blocks have tool_use_id).
     const serverResultIds = new Set<string>()
     const aMsg5 = msg as AssistantMessage
-    for (const c of aMsg5.message.content as (ContentBlockParam | ContentBlock)[]) {
-      if (typeof c !== 'string' && 'tool_use_id' in c && typeof (c as { tool_use_id: string }).tool_use_id === 'string') {
+    for (const c of aMsg5.message.content as (
+      | ContentBlockParam
+      | ContentBlock
+    )[]) {
+      if (
+        typeof c !== 'string' &&
+        'tool_use_id' in c &&
+        typeof (c as { tool_use_id: string }).tool_use_id === 'string'
+      ) {
         serverResultIds.add((c as { tool_use_id: string }).tool_use_id)
       }
     }
@@ -5278,7 +5409,9 @@ export function ensureToolResultPairing(
     // has no matching *_tool_result and the API rejects with e.g. "advisor
     // tool use without corresponding advisor_tool_result".
     const seenToolUseIds = new Set<string>()
-    const assistantContent = Array.isArray(aMsg5.message.content) ? aMsg5.message.content : []
+    const assistantContent = Array.isArray(aMsg5.message.content)
+      ? aMsg5.message.content
+      : []
     const finalContent = assistantContent.filter(block => {
       if (typeof block === 'string') return true
       if (block.type === 'tool_use') {
@@ -5290,7 +5423,8 @@ export function ensureToolResultPairing(
         seenToolUseIds.add((block as ToolUseBlock).id)
       }
       if (
-        ((block.type as string) === 'server_tool_use' || (block.type as string) === 'mcp_tool_use') &&
+        ((block.type as string) === 'server_tool_use' ||
+          (block.type as string) === 'mcp_tool_use') &&
         !serverResultIds.has((block as { id: string }).id)
       ) {
         repaired = true
@@ -5300,7 +5434,8 @@ export function ensureToolResultPairing(
     })
 
     const assistantContentChanged =
-      finalContent.length !== (aMsg5.message.content as (ContentBlockParam | ContentBlock)[]).length
+      finalContent.length !==
+      (aMsg5.message.content as (ContentBlockParam | ContentBlock)[]).length
 
     // If stripping orphaned server tool uses empties the content array,
     // insert a placeholder so the API doesn't reject empty assistant content.
@@ -5388,8 +5523,13 @@ export function ensureToolResultPairing(
       let content: (ContentBlockParam | ContentBlock)[] = Array.isArray(
         nextUserMsg.message.content,
       )
-        ? nextUserMsg.message.content as (ContentBlockParam | ContentBlock)[]
-        : [{ type: 'text' as const, text: (nextUserMsg.message.content as string | undefined) ?? '' }]
+        ? (nextUserMsg.message.content as (ContentBlockParam | ContentBlock)[])
+        : [
+            {
+              type: 'text' as const,
+              text: (nextUserMsg.message.content as string | undefined) ?? '',
+            },
+          ]
 
       // Strip orphaned tool_results and dedupe duplicate tool_result IDs
       if (orphanedIds.length > 0 || hasDuplicateToolResults) {
@@ -5461,13 +5601,18 @@ export function ensureToolResultPairing(
     // Capture diagnostic info to help identify root cause
     const messageTypes = messages.map((m, idx) => {
       if (m.type === 'assistant') {
-        const contentArr = Array.isArray(m.message.content) ? m.message.content : []
+        const contentArr = Array.isArray(m.message.content)
+          ? m.message.content
+          : []
         const toolUses = contentArr
           .filter(b => typeof b !== 'string' && b.type === 'tool_use')
           .map(b => (b as ToolUseBlock | ToolUseBlockParam).id)
         const serverToolUses = contentArr
           .filter(
-            b => typeof b !== 'string' && ((b.type as string) === 'server_tool_use' || (b.type as string) === 'mcp_tool_use'),
+            b =>
+              typeof b !== 'string' &&
+              ((b.type as string) === 'server_tool_use' ||
+                (b.type as string) === 'mcp_tool_use'),
           )
           .map(b => (b as { id: string }).id)
         const parts = [
@@ -5528,8 +5673,12 @@ export function stripAdvisorBlocks(
   let changed = false
   const result = messages.map(msg => {
     if (msg.type !== 'assistant') return msg
-    const content = Array.isArray(msg.message.content) ? msg.message.content : []
-    const filtered = content.filter(b => typeof b !== 'string' && !isAdvisorBlock(b))
+    const content = Array.isArray(msg.message.content)
+      ? msg.message.content
+      : []
+    const filtered = content.filter(
+      b => typeof b !== 'string' && !isAdvisorBlock(b),
+    )
     if (filtered.length === content.length) return msg
     changed = true
     if (
diff --git a/src/utils/messages/mappers.ts b/src/utils/messages/mappers.ts
index c8d4e1046..8f2bff8b0 100644
--- a/src/utils/messages/mappers.ts
+++ b/src/utils/messages/mappers.ts
@@ -50,7 +50,7 @@ export function toInternalMessages(
             isMeta: message.isSynthetic,
           } as unknown as Message,
         ]
-      // Handle compact boundary messages
+        // Handle compact boundary messages
         if (message.subtype === 'compact_boundary') {
           const compactMsg = message
           return [
@@ -79,7 +79,9 @@ type SDKCompactMetadata = SDKCompactBoundaryMessage['compact_metadata']
 export function toSDKCompactMetadata(
   meta: CompactMetadata,
 ): SDKCompactMetadata {
-  const seg = meta.preservedSegment as { headUuid: UUID; anchorUuid: UUID; tailUuid: UUID } | undefined
+  const seg = meta.preservedSegment as
+    | { headUuid: UUID; anchorUuid: UUID; tailUuid: UUID }
+    | undefined
   return {
     trigger: meta.trigger,
     pre_tokens: meta.preTokens,
@@ -99,7 +101,16 @@ export function toSDKCompactMetadata(
 export function fromSDKCompactMetadata(
   meta: SDKCompactMetadata,
 ): CompactMetadata {
-  const m = meta as { preserved_segment?: { head_uuid: string; anchor_uuid: string; tail_uuid: string }; trigger?: string; pre_tokens?: number; [key: string]: unknown }
+  const m = meta as {
+    preserved_segment?: {
+      head_uuid: string
+      anchor_uuid: string
+      tail_uuid: string
+    }
+    trigger?: string
+    pre_tokens?: number
+    [key: string]: unknown
+  }
   const seg = m.preserved_segment
   return {
     trigger: m.trigger,
@@ -121,7 +132,9 @@ export function toSDKMessages(messages: Message[]): SDKMessage[] {
         return [
           {
             type: 'assistant',
-            message: normalizeAssistantMessageForSDK(message as AssistantMessage),
+            message: normalizeAssistantMessageForSDK(
+              message as AssistantMessage,
+            ),
             session_id: getSessionId(),
             parent_tool_use_id: null,
             uuid: message.uuid,
@@ -155,7 +168,9 @@ export function toSDKMessages(messages: Message[]): SDKMessage[] {
               subtype: 'compact_boundary' as const,
               session_id: getSessionId(),
               uuid: message.uuid,
-              compact_metadata: toSDKCompactMetadata(message.compactMetadata as CompactMetadata),
+              compact_metadata: toSDKCompactMetadata(
+                message.compactMetadata as CompactMetadata,
+              ),
             },
           ]
         }
@@ -165,8 +180,12 @@ export function toSDKMessages(messages: Message[]): SDKMessage[] {
         // not leak to the RC web UI.
         if (
           message.subtype === 'local_command' &&
-          ((message.content as string).includes(`<${LOCAL_COMMAND_STDOUT_TAG}>`) ||
-            (message.content as string).includes(`<${LOCAL_COMMAND_STDERR_TAG}>`))
+          ((message.content as string).includes(
+            `<${LOCAL_COMMAND_STDOUT_TAG}>`,
+          ) ||
+            (message.content as string).includes(
+              `<${LOCAL_COMMAND_STDERR_TAG}>`,
+            ))
         ) {
           return [
             localCommandOutputToSDKAssistantMessage(
diff --git a/src/utils/messages/src/bootstrap/state.ts b/src/utils/messages/src/bootstrap/state.ts
index 9acff45f8..9063f6527 100644
--- a/src/utils/messages/src/bootstrap/state.ts
+++ b/src/utils/messages/src/bootstrap/state.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type getSessionId = any;
-export type getSdkBetas = any;
+export type getSessionId = any
+export type getSdkBetas = any
diff --git a/src/utils/messages/src/constants/outputStyles.ts b/src/utils/messages/src/constants/outputStyles.ts
index 42c1edbfa..bd22fa5e4 100644
--- a/src/utils/messages/src/constants/outputStyles.ts
+++ b/src/utils/messages/src/constants/outputStyles.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type DEFAULT_OUTPUT_STYLE_NAME = any;
+export type DEFAULT_OUTPUT_STYLE_NAME = any
diff --git a/src/utils/messages/src/constants/xml.ts b/src/utils/messages/src/constants/xml.ts
index 4b3d2947b..a5ee51cce 100644
--- a/src/utils/messages/src/constants/xml.ts
+++ b/src/utils/messages/src/constants/xml.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type LOCAL_COMMAND_STDERR_TAG = any;
-export type LOCAL_COMMAND_STDOUT_TAG = any;
+export type LOCAL_COMMAND_STDERR_TAG = any
+export type LOCAL_COMMAND_STDOUT_TAG = any
diff --git a/src/utils/messages/src/entrypoints/agentSdkTypes.ts b/src/utils/messages/src/entrypoints/agentSdkTypes.ts
index 59874aee6..9af513ee8 100644
--- a/src/utils/messages/src/entrypoints/agentSdkTypes.ts
+++ b/src/utils/messages/src/entrypoints/agentSdkTypes.ts
@@ -1,7 +1,7 @@
 // Auto-generated type stub — replace with real implementation
-export type SDKAssistantMessage = any;
-export type SDKCompactBoundaryMessage = any;
-export type SDKMessage = any;
-export type SDKRateLimitInfo = any;
-export type ApiKeySource = any;
-export type PermissionMode = any;
+export type SDKAssistantMessage = any
+export type SDKCompactBoundaryMessage = any
+export type SDKMessage = any
+export type SDKRateLimitInfo = any
+export type ApiKeySource = any
+export type PermissionMode = any
diff --git a/src/utils/messages/src/services/claudeAiLimits.ts b/src/utils/messages/src/services/claudeAiLimits.ts
index 42797958c..4e2a189f5 100644
--- a/src/utils/messages/src/services/claudeAiLimits.ts
+++ b/src/utils/messages/src/services/claudeAiLimits.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type ClaudeAILimits = any;
+export type ClaudeAILimits = any
diff --git a/src/utils/messages/src/tools/AgentTool/constants.ts b/src/utils/messages/src/tools/AgentTool/constants.ts
index 4c701619f..763bdab7d 100644
--- a/src/utils/messages/src/tools/AgentTool/constants.ts
+++ b/src/utils/messages/src/tools/AgentTool/constants.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type AGENT_TOOL_NAME = any;
-export type LEGACY_AGENT_TOOL_NAME = any;
+export type AGENT_TOOL_NAME = any
+export type LEGACY_AGENT_TOOL_NAME = any
diff --git a/src/utils/messages/src/tools/ExitPlanModeTool/constants.ts b/src/utils/messages/src/tools/ExitPlanModeTool/constants.ts
index f0f7cce97..c13288624 100644
--- a/src/utils/messages/src/tools/ExitPlanModeTool/constants.ts
+++ b/src/utils/messages/src/tools/ExitPlanModeTool/constants.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type EXIT_PLAN_MODE_V2_TOOL_NAME = any;
+export type EXIT_PLAN_MODE_V2_TOOL_NAME = any
diff --git a/src/utils/messages/src/types/message.ts b/src/utils/messages/src/types/message.ts
index 36aae2ce9..afe785c8b 100644
--- a/src/utils/messages/src/types/message.ts
+++ b/src/utils/messages/src/types/message.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type AssistantMessage = any;
-export type CompactMetadata = any;
-export type Message = any;
+export type AssistantMessage = any
+export type CompactMetadata = any
+export type Message = any
diff --git a/src/utils/messages/src/types/utils.ts b/src/utils/messages/src/types/utils.ts
index b620f7a26..bd2466369 100644
--- a/src/utils/messages/src/types/utils.ts
+++ b/src/utils/messages/src/types/utils.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type DeepImmutable = any;
+export type DeepImmutable = any
diff --git a/src/utils/model/__tests__/aliases.test.ts b/src/utils/model/__tests__/aliases.test.ts
index b15a78a8b..349992b4f 100644
--- a/src/utils/model/__tests__/aliases.test.ts
+++ b/src/utils/model/__tests__/aliases.test.ts
@@ -1,70 +1,70 @@
-import { describe, expect, test } from "bun:test";
-import { isModelAlias, isModelFamilyAlias } from "../aliases";
+import { describe, expect, test } from 'bun:test'
+import { isModelAlias, isModelFamilyAlias } from '../aliases'
 
-describe("isModelAlias", () => {
+describe('isModelAlias', () => {
   test('returns true for "sonnet"', () => {
-    expect(isModelAlias("sonnet")).toBe(true);
-  });
+    expect(isModelAlias('sonnet')).toBe(true)
+  })
 
   test('returns true for "opus"', () => {
-    expect(isModelAlias("opus")).toBe(true);
-  });
+    expect(isModelAlias('opus')).toBe(true)
+  })
 
   test('returns true for "haiku"', () => {
-    expect(isModelAlias("haiku")).toBe(true);
-  });
+    expect(isModelAlias('haiku')).toBe(true)
+  })
 
   test('returns true for "best"', () => {
-    expect(isModelAlias("best")).toBe(true);
-  });
+    expect(isModelAlias('best')).toBe(true)
+  })
 
   test('returns true for "sonnet[1m]"', () => {
-    expect(isModelAlias("sonnet[1m]")).toBe(true);
-  });
+    expect(isModelAlias('sonnet[1m]')).toBe(true)
+  })
 
   test('returns true for "opus[1m]"', () => {
-    expect(isModelAlias("opus[1m]")).toBe(true);
-  });
+    expect(isModelAlias('opus[1m]')).toBe(true)
+  })
 
   test('returns true for "opusplan"', () => {
-    expect(isModelAlias("opusplan")).toBe(true);
-  });
+    expect(isModelAlias('opusplan')).toBe(true)
+  })
 
-  test("returns false for full model ID", () => {
-    expect(isModelAlias("claude-sonnet-4-6-20250514")).toBe(false);
-  });
+  test('returns false for full model ID', () => {
+    expect(isModelAlias('claude-sonnet-4-6-20250514')).toBe(false)
+  })
 
-  test("returns false for unknown string", () => {
-    expect(isModelAlias("gpt-4")).toBe(false);
-  });
+  test('returns false for unknown string', () => {
+    expect(isModelAlias('gpt-4')).toBe(false)
+  })
 
-  test("is case-sensitive", () => {
-    expect(isModelAlias("Sonnet")).toBe(false);
-  });
-});
+  test('is case-sensitive', () => {
+    expect(isModelAlias('Sonnet')).toBe(false)
+  })
+})
 
-describe("isModelFamilyAlias", () => {
+describe('isModelFamilyAlias', () => {
   test('returns true for "sonnet"', () => {
-    expect(isModelFamilyAlias("sonnet")).toBe(true);
-  });
+    expect(isModelFamilyAlias('sonnet')).toBe(true)
+  })
 
   test('returns true for "opus"', () => {
-    expect(isModelFamilyAlias("opus")).toBe(true);
-  });
+    expect(isModelFamilyAlias('opus')).toBe(true)
+  })
 
   test('returns true for "haiku"', () => {
-    expect(isModelFamilyAlias("haiku")).toBe(true);
-  });
+    expect(isModelFamilyAlias('haiku')).toBe(true)
+  })
 
   test('returns false for "best"', () => {
-    expect(isModelFamilyAlias("best")).toBe(false);
-  });
+    expect(isModelFamilyAlias('best')).toBe(false)
+  })
 
   test('returns false for "opusplan"', () => {
-    expect(isModelFamilyAlias("opusplan")).toBe(false);
-  });
+    expect(isModelFamilyAlias('opusplan')).toBe(false)
+  })
 
   test('returns false for "sonnet[1m]"', () => {
-    expect(isModelFamilyAlias("sonnet[1m]")).toBe(false);
-  });
-});
+    expect(isModelFamilyAlias('sonnet[1m]')).toBe(false)
+  })
+})
diff --git a/src/utils/model/__tests__/model.test.ts b/src/utils/model/__tests__/model.test.ts
index 8fd036c2f..62e79e8f8 100644
--- a/src/utils/model/__tests__/model.test.ts
+++ b/src/utils/model/__tests__/model.test.ts
@@ -1,92 +1,92 @@
-import { describe, expect, test } from "bun:test";
-import { firstPartyNameToCanonical } from "../model";
+import { describe, expect, test } from 'bun:test'
+import { firstPartyNameToCanonical } from '../model'
 
-describe("firstPartyNameToCanonical", () => {
-  test("maps opus-4-6 full name to canonical", () => {
-    expect(firstPartyNameToCanonical("claude-opus-4-6-20250514")).toBe(
-      "claude-opus-4-6"
-    );
-  });
+describe('firstPartyNameToCanonical', () => {
+  test('maps opus-4-6 full name to canonical', () => {
+    expect(firstPartyNameToCanonical('claude-opus-4-6-20250514')).toBe(
+      'claude-opus-4-6',
+    )
+  })
 
-  test("maps sonnet-4-6 full name", () => {
-    expect(firstPartyNameToCanonical("claude-sonnet-4-6-20250514")).toBe(
-      "claude-sonnet-4-6"
-    );
-  });
+  test('maps sonnet-4-6 full name', () => {
+    expect(firstPartyNameToCanonical('claude-sonnet-4-6-20250514')).toBe(
+      'claude-sonnet-4-6',
+    )
+  })
 
-  test("maps haiku-4-5", () => {
-    expect(firstPartyNameToCanonical("claude-haiku-4-5-20251001")).toBe(
-      "claude-haiku-4-5"
-    );
-  });
+  test('maps haiku-4-5', () => {
+    expect(firstPartyNameToCanonical('claude-haiku-4-5-20251001')).toBe(
+      'claude-haiku-4-5',
+    )
+  })
 
-  test("maps 3P provider format", () => {
-    expect(
-      firstPartyNameToCanonical("us.anthropic.claude-opus-4-6-v1:0")
-    ).toBe("claude-opus-4-6");
-  });
+  test('maps 3P provider format', () => {
+    expect(firstPartyNameToCanonical('us.anthropic.claude-opus-4-6-v1:0')).toBe(
+      'claude-opus-4-6',
+    )
+  })
 
-  test("maps claude-3-7-sonnet", () => {
-    expect(firstPartyNameToCanonical("claude-3-7-sonnet-20250219")).toBe(
-      "claude-3-7-sonnet"
-    );
-  });
+  test('maps claude-3-7-sonnet', () => {
+    expect(firstPartyNameToCanonical('claude-3-7-sonnet-20250219')).toBe(
+      'claude-3-7-sonnet',
+    )
+  })
 
-  test("maps claude-3-5-sonnet", () => {
-    expect(firstPartyNameToCanonical("claude-3-5-sonnet-20241022")).toBe(
-      "claude-3-5-sonnet"
-    );
-  });
+  test('maps claude-3-5-sonnet', () => {
+    expect(firstPartyNameToCanonical('claude-3-5-sonnet-20241022')).toBe(
+      'claude-3-5-sonnet',
+    )
+  })
 
-  test("maps claude-3-5-haiku", () => {
-    expect(firstPartyNameToCanonical("claude-3-5-haiku-20241022")).toBe(
-      "claude-3-5-haiku"
-    );
-  });
+  test('maps claude-3-5-haiku', () => {
+    expect(firstPartyNameToCanonical('claude-3-5-haiku-20241022')).toBe(
+      'claude-3-5-haiku',
+    )
+  })
 
-  test("maps claude-3-opus", () => {
-    expect(firstPartyNameToCanonical("claude-3-opus-20240229")).toBe(
-      "claude-3-opus"
-    );
-  });
+  test('maps claude-3-opus', () => {
+    expect(firstPartyNameToCanonical('claude-3-opus-20240229')).toBe(
+      'claude-3-opus',
+    )
+  })
 
-  test("is case insensitive", () => {
-    expect(firstPartyNameToCanonical("Claude-Opus-4-6-20250514")).toBe(
-      "claude-opus-4-6"
-    );
-  });
+  test('is case insensitive', () => {
+    expect(firstPartyNameToCanonical('Claude-Opus-4-6-20250514')).toBe(
+      'claude-opus-4-6',
+    )
+  })
 
-  test("falls back to input for unknown model", () => {
-    expect(firstPartyNameToCanonical("unknown-model")).toBe("unknown-model");
-  });
+  test('falls back to input for unknown model', () => {
+    expect(firstPartyNameToCanonical('unknown-model')).toBe('unknown-model')
+  })
 
-  test("differentiates opus-4 vs opus-4-5 vs opus-4-6", () => {
-    expect(firstPartyNameToCanonical("claude-opus-4-20240101")).toBe(
-      "claude-opus-4"
-    );
-    expect(firstPartyNameToCanonical("claude-opus-4-5-20240101")).toBe(
-      "claude-opus-4-5"
-    );
-    expect(firstPartyNameToCanonical("claude-opus-4-6-20240101")).toBe(
-      "claude-opus-4-6"
-    );
-  });
+  test('differentiates opus-4 vs opus-4-5 vs opus-4-6', () => {
+    expect(firstPartyNameToCanonical('claude-opus-4-20240101')).toBe(
+      'claude-opus-4',
+    )
+    expect(firstPartyNameToCanonical('claude-opus-4-5-20240101')).toBe(
+      'claude-opus-4-5',
+    )
+    expect(firstPartyNameToCanonical('claude-opus-4-6-20240101')).toBe(
+      'claude-opus-4-6',
+    )
+  })
 
-  test("maps opus-4-1", () => {
-    expect(firstPartyNameToCanonical("claude-opus-4-1-20240101")).toBe(
-      "claude-opus-4-1"
-    );
-  });
+  test('maps opus-4-1', () => {
+    expect(firstPartyNameToCanonical('claude-opus-4-1-20240101')).toBe(
+      'claude-opus-4-1',
+    )
+  })
 
-  test("maps sonnet-4-5", () => {
-    expect(firstPartyNameToCanonical("claude-sonnet-4-5-20240101")).toBe(
-      "claude-sonnet-4-5"
-    );
-  });
+  test('maps sonnet-4-5', () => {
+    expect(firstPartyNameToCanonical('claude-sonnet-4-5-20240101')).toBe(
+      'claude-sonnet-4-5',
+    )
+  })
 
-  test("maps sonnet-4", () => {
-    expect(firstPartyNameToCanonical("claude-sonnet-4-20240101")).toBe(
-      "claude-sonnet-4"
-    );
-  });
-});
+  test('maps sonnet-4', () => {
+    expect(firstPartyNameToCanonical('claude-sonnet-4-20240101')).toBe(
+      'claude-sonnet-4',
+    )
+  })
+})
diff --git a/src/utils/model/__tests__/providers.test.ts b/src/utils/model/__tests__/providers.test.ts
index 0ed816f9e..f34ae42c4 100644
--- a/src/utils/model/__tests__/providers.test.ts
+++ b/src/utils/model/__tests__/providers.test.ts
@@ -1,173 +1,173 @@
-import { describe, expect, test, beforeEach, afterEach } from "bun:test";
-import { mock } from "bun:test";
+import { describe, expect, test, beforeEach, afterEach } from 'bun:test'
+import { mock } from 'bun:test'
 
-let mockedModelType: "gemini" | undefined;
+let mockedModelType: 'gemini' | undefined
 
-mock.module("../../settings/settings.js", () => ({
+mock.module('../../settings/settings.js', () => ({
   getInitialSettings: () =>
     mockedModelType ? { modelType: mockedModelType } : {},
-}));
+}))
 
-const { getAPIProvider, isFirstPartyAnthropicBaseUrl } =
-  await import("../providers");
+const { getAPIProvider, isFirstPartyAnthropicBaseUrl } = await import(
+  '../providers'
+)
 
-describe("getAPIProvider", () => {
+describe('getAPIProvider', () => {
   const envKeys = [
-    "CLAUDE_CODE_USE_GEMINI",
-    "CLAUDE_CODE_USE_BEDROCK",
-    "CLAUDE_CODE_USE_VERTEX",
-    "CLAUDE_CODE_USE_FOUNDRY",
-    "CLAUDE_CODE_USE_OPENAI",
-  ] as const;
-  const savedEnv: Record<string, string | undefined> = {};
-
+    'CLAUDE_CODE_USE_GEMINI',
+    'CLAUDE_CODE_USE_BEDROCK',
+    'CLAUDE_CODE_USE_VERTEX',
+    'CLAUDE_CODE_USE_FOUNDRY',
+    'CLAUDE_CODE_USE_OPENAI',
+  ] as const
+  const savedEnv: Record<string, string | undefined> = {}
 
   beforeEach(() => {
     // Save and clear environment variables
-    mockedModelType = undefined;
+    mockedModelType = undefined
     for (const key of envKeys) {
-      savedEnv[key] = process.env[key];
-      delete process.env[key];
+      savedEnv[key] = process.env[key]
+      delete process.env[key]
     }
-  });
+  })
 
   afterEach(() => {
     // Restore environment variables
-    mockedModelType = undefined;
+    mockedModelType = undefined
     for (const key of envKeys) {
       if (savedEnv[key] !== undefined) {
-        process.env[key] = savedEnv[key];
+        process.env[key] = savedEnv[key]
       } else {
-        delete process.env[key];
+        delete process.env[key]
       }
     }
-  });
+  })
 
   test('returns "firstParty" by default', () => {
-    expect(getAPIProvider()).toBe("firstParty");
-  });
+    expect(getAPIProvider()).toBe('firstParty')
+  })
 
   test('returns "gemini" when modelType is gemini', () => {
-    mockedModelType = "gemini";
-    expect(getAPIProvider()).toBe("gemini");
-  });
+    mockedModelType = 'gemini'
+    expect(getAPIProvider()).toBe('gemini')
+  })
 
-  test("modelType takes precedence over environment variables", () => {
-    mockedModelType = "gemini";
-    process.env.CLAUDE_CODE_USE_BEDROCK = "1";
-    expect(getAPIProvider()).toBe("gemini");
-  });
+  test('modelType takes precedence over environment variables', () => {
+    mockedModelType = 'gemini'
+    process.env.CLAUDE_CODE_USE_BEDROCK = '1'
+    expect(getAPIProvider()).toBe('gemini')
+  })
 
   test('returns "gemini" when CLAUDE_CODE_USE_GEMINI is set', () => {
-    process.env.CLAUDE_CODE_USE_GEMINI = "1";
-    expect(getAPIProvider()).toBe("gemini");
-  });
+    process.env.CLAUDE_CODE_USE_GEMINI = '1'
+    expect(getAPIProvider()).toBe('gemini')
+  })
 
   test('returns "bedrock" when CLAUDE_CODE_USE_BEDROCK is set', () => {
-    process.env.CLAUDE_CODE_USE_BEDROCK = "1";
-    expect(getAPIProvider()).toBe("bedrock");
-  });
+    process.env.CLAUDE_CODE_USE_BEDROCK = '1'
+    expect(getAPIProvider()).toBe('bedrock')
+  })
 
   test('returns "vertex" when CLAUDE_CODE_USE_VERTEX is set', () => {
-    process.env.CLAUDE_CODE_USE_VERTEX = "1";
-    expect(getAPIProvider()).toBe("vertex");
-  });
+    process.env.CLAUDE_CODE_USE_VERTEX = '1'
+    expect(getAPIProvider()).toBe('vertex')
+  })
 
   test('returns "foundry" when CLAUDE_CODE_USE_FOUNDRY is set', () => {
-    process.env.CLAUDE_CODE_USE_FOUNDRY = "1";
-    expect(getAPIProvider()).toBe("foundry");
-  });
+    process.env.CLAUDE_CODE_USE_FOUNDRY = '1'
+    expect(getAPIProvider()).toBe('foundry')
+  })
 
-  test("bedrock takes precedence over gemini", () => {
-    process.env.CLAUDE_CODE_USE_BEDROCK = "1";
-    process.env.CLAUDE_CODE_USE_GEMINI = "1";
-    expect(getAPIProvider()).toBe("bedrock");
-  });
+  test('bedrock takes precedence over gemini', () => {
+    process.env.CLAUDE_CODE_USE_BEDROCK = '1'
+    process.env.CLAUDE_CODE_USE_GEMINI = '1'
+    expect(getAPIProvider()).toBe('bedrock')
+  })
 
-  test("bedrock takes precedence over vertex", () => {
-    process.env.CLAUDE_CODE_USE_BEDROCK = "1";
-    process.env.CLAUDE_CODE_USE_VERTEX = "1";
-    expect(getAPIProvider()).toBe("bedrock");
-  });
+  test('bedrock takes precedence over vertex', () => {
+    process.env.CLAUDE_CODE_USE_BEDROCK = '1'
+    process.env.CLAUDE_CODE_USE_VERTEX = '1'
+    expect(getAPIProvider()).toBe('bedrock')
+  })
 
-  test("bedrock wins when all three env vars are set", () => {
-    process.env.CLAUDE_CODE_USE_BEDROCK = "1";
-    process.env.CLAUDE_CODE_USE_VERTEX = "1";
-    process.env.CLAUDE_CODE_USE_FOUNDRY = "1";
-    expect(getAPIProvider()).toBe("bedrock");
-  });
+  test('bedrock wins when all three env vars are set', () => {
+    process.env.CLAUDE_CODE_USE_BEDROCK = '1'
+    process.env.CLAUDE_CODE_USE_VERTEX = '1'
+    process.env.CLAUDE_CODE_USE_FOUNDRY = '1'
+    expect(getAPIProvider()).toBe('bedrock')
+  })
 
   test('"true" is truthy', () => {
-    process.env.CLAUDE_CODE_USE_BEDROCK = "true";
-    expect(getAPIProvider()).toBe("bedrock");
-  });
+    process.env.CLAUDE_CODE_USE_BEDROCK = 'true'
+    expect(getAPIProvider()).toBe('bedrock')
+  })
 
   test('"0" is not truthy', () => {
-    process.env.CLAUDE_CODE_USE_BEDROCK = "0";
-    expect(getAPIProvider()).toBe("firstParty");
-  });
+    process.env.CLAUDE_CODE_USE_BEDROCK = '0'
+    expect(getAPIProvider()).toBe('firstParty')
+  })
 
   test('empty string is not truthy', () => {
-    process.env.CLAUDE_CODE_USE_BEDROCK = "";
-    expect(getAPIProvider()).toBe("firstParty");
-  });
-});
+    process.env.CLAUDE_CODE_USE_BEDROCK = ''
+    expect(getAPIProvider()).toBe('firstParty')
+  })
+})
 
-describe("isFirstPartyAnthropicBaseUrl", () => {
-  const originalBaseUrl = process.env.ANTHROPIC_BASE_URL;
-  const originalUserType = process.env.USER_TYPE;
+describe('isFirstPartyAnthropicBaseUrl', () => {
+  const originalBaseUrl = process.env.ANTHROPIC_BASE_URL
+  const originalUserType = process.env.USER_TYPE
 
   afterEach(() => {
     if (originalBaseUrl !== undefined) {
-      process.env.ANTHROPIC_BASE_URL = originalBaseUrl;
+      process.env.ANTHROPIC_BASE_URL = originalBaseUrl
     } else {
-      delete process.env.ANTHROPIC_BASE_URL;
+      delete process.env.ANTHROPIC_BASE_URL
     }
     if (originalUserType !== undefined) {
-      process.env.USER_TYPE = originalUserType;
+      process.env.USER_TYPE = originalUserType
     } else {
-      delete process.env.USER_TYPE;
+      delete process.env.USER_TYPE
     }
-  });
+  })
 
-  test("returns true when ANTHROPIC_BASE_URL is not set", () => {
-    delete process.env.ANTHROPIC_BASE_URL;
-    expect(isFirstPartyAnthropicBaseUrl()).toBe(true);
-  });
+  test('returns true when ANTHROPIC_BASE_URL is not set', () => {
+    delete process.env.ANTHROPIC_BASE_URL
+    expect(isFirstPartyAnthropicBaseUrl()).toBe(true)
+  })
 
-  test("returns true for api.anthropic.com", () => {
-    process.env.ANTHROPIC_BASE_URL = "https://api.anthropic.com";
-    expect(isFirstPartyAnthropicBaseUrl()).toBe(true);
-  });
+  test('returns true for api.anthropic.com', () => {
+    process.env.ANTHROPIC_BASE_URL = 'https://api.anthropic.com'
+    expect(isFirstPartyAnthropicBaseUrl()).toBe(true)
+  })
 
-  test("returns false for custom URL", () => {
-    process.env.ANTHROPIC_BASE_URL = "https://my-proxy.com";
-    expect(isFirstPartyAnthropicBaseUrl()).toBe(false);
-  });
+  test('returns false for custom URL', () => {
+    process.env.ANTHROPIC_BASE_URL = 'https://my-proxy.com'
+    expect(isFirstPartyAnthropicBaseUrl()).toBe(false)
+  })
 
-  test("returns false for invalid URL", () => {
-    process.env.ANTHROPIC_BASE_URL = "not-a-url";
-    expect(isFirstPartyAnthropicBaseUrl()).toBe(false);
-  });
+  test('returns false for invalid URL', () => {
+    process.env.ANTHROPIC_BASE_URL = 'not-a-url'
+    expect(isFirstPartyAnthropicBaseUrl()).toBe(false)
+  })
 
-  test("returns true for staging URL when USER_TYPE is ant", () => {
-    process.env.ANTHROPIC_BASE_URL = "https://api-staging.anthropic.com";
-    process.env.USER_TYPE = "ant";
-    expect(isFirstPartyAnthropicBaseUrl()).toBe(true);
-  });
+  test('returns true for staging URL when USER_TYPE is ant', () => {
+    process.env.ANTHROPIC_BASE_URL = 'https://api-staging.anthropic.com'
+    process.env.USER_TYPE = 'ant'
+    expect(isFirstPartyAnthropicBaseUrl()).toBe(true)
+  })
 
-  test("returns true for URL with path", () => {
-    process.env.ANTHROPIC_BASE_URL = "https://api.anthropic.com/v1";
-    expect(isFirstPartyAnthropicBaseUrl()).toBe(true);
-  });
+  test('returns true for URL with path', () => {
+    process.env.ANTHROPIC_BASE_URL = 'https://api.anthropic.com/v1'
+    expect(isFirstPartyAnthropicBaseUrl()).toBe(true)
+  })
 
-  test("returns true for trailing slash", () => {
-    process.env.ANTHROPIC_BASE_URL = "https://api.anthropic.com/";
-    expect(isFirstPartyAnthropicBaseUrl()).toBe(true);
-  });
+  test('returns true for trailing slash', () => {
+    process.env.ANTHROPIC_BASE_URL = 'https://api.anthropic.com/'
+    expect(isFirstPartyAnthropicBaseUrl()).toBe(true)
+  })
 
-  test("returns false for subdomain attack", () => {
-    process.env.ANTHROPIC_BASE_URL = "https://evil-api.anthropic.com";
-    expect(isFirstPartyAnthropicBaseUrl()).toBe(false);
-  });
-});
+  test('returns false for subdomain attack', () => {
+    process.env.ANTHROPIC_BASE_URL = 'https://evil-api.anthropic.com'
+    expect(isFirstPartyAnthropicBaseUrl()).toBe(false)
+  })
+})
diff --git a/src/utils/model/model.ts b/src/utils/model/model.ts
index 791daeb6b..5060c3cd6 100644
--- a/src/utils/model/model.ts
+++ b/src/utils/model/model.ts
@@ -139,10 +139,7 @@ export function getDefaultOpusModel(): ModelName {
 export function getDefaultSonnetModel(): ModelName {
   const provider = getAPIProvider()
   // For OpenAI provider, check OPENAI_DEFAULT_SONNET_MODEL first
-  if (
-    provider === 'openai' &&
-    process.env.OPENAI_DEFAULT_SONNET_MODEL
-  ) {
+  if (provider === 'openai' && process.env.OPENAI_DEFAULT_SONNET_MODEL) {
     return process.env.OPENAI_DEFAULT_SONNET_MODEL
   }
   // For Gemini provider, check GEMINI_DEFAULT_SONNET_MODEL
diff --git a/src/utils/model/modelOptions.ts b/src/utils/model/modelOptions.ts
index 6d84a187f..9b073c060 100644
--- a/src/utils/model/modelOptions.ts
+++ b/src/utils/model/modelOptions.ts
@@ -82,8 +82,8 @@ function getCustomSonnetOption(): ModelOption | undefined {
     provider === 'openai'
       ? process.env.OPENAI_DEFAULT_SONNET_MODEL
       : provider === 'gemini'
-      ? process.env.GEMINI_DEFAULT_SONNET_MODEL
-      : process.env.ANTHROPIC_DEFAULT_SONNET_MODEL
+        ? process.env.GEMINI_DEFAULT_SONNET_MODEL
+        : process.env.ANTHROPIC_DEFAULT_SONNET_MODEL
   // When a 3P user has a custom sonnet model string, show it directly
   if (is3P && customSonnetModel) {
     const is1m = has1mContext(customSonnetModel)
@@ -92,14 +92,14 @@ function getCustomSonnetOption(): ModelOption | undefined {
       provider === 'openai'
         ? process.env.OPENAI_DEFAULT_SONNET_MODEL_NAME
         : provider === 'gemini'
-        ? process.env.GEMINI_DEFAULT_SONNET_MODEL_NAME
-        : process.env.ANTHROPIC_DEFAULT_SONNET_MODEL_NAME
+          ? process.env.GEMINI_DEFAULT_SONNET_MODEL_NAME
+          : process.env.ANTHROPIC_DEFAULT_SONNET_MODEL_NAME
     const descEnv =
       provider === 'openai'
         ? process.env.OPENAI_DEFAULT_SONNET_MODEL_DESCRIPTION
         : provider === 'gemini'
-        ? process.env.GEMINI_DEFAULT_SONNET_MODEL_DESCRIPTION
-        : process.env.ANTHROPIC_DEFAULT_SONNET_MODEL_DESCRIPTION
+          ? process.env.GEMINI_DEFAULT_SONNET_MODEL_DESCRIPTION
+          : process.env.ANTHROPIC_DEFAULT_SONNET_MODEL_DESCRIPTION
     return {
       value: 'sonnet',
       label: nameEnv ?? customSonnetModel,
@@ -131,8 +131,8 @@ function getCustomOpusOption(): ModelOption | undefined {
     provider === 'openai'
       ? process.env.OPENAI_DEFAULT_OPUS_MODEL
       : provider === 'gemini'
-      ? process.env.GEMINI_DEFAULT_OPUS_MODEL
-      : process.env.ANTHROPIC_DEFAULT_OPUS_MODEL
+        ? process.env.GEMINI_DEFAULT_OPUS_MODEL
+        : process.env.ANTHROPIC_DEFAULT_OPUS_MODEL
   // When a 3P user has a custom opus model string, show it directly
   if (is3P && customOpusModel) {
     const is1m = has1mContext(customOpusModel)
@@ -141,14 +141,14 @@ function getCustomOpusOption(): ModelOption | undefined {
       provider === 'openai'
         ? process.env.OPENAI_DEFAULT_OPUS_MODEL_NAME
         : provider === 'gemini'
-        ? process.env.GEMINI_DEFAULT_OPUS_MODEL_NAME
-        : process.env.ANTHROPIC_DEFAULT_OPUS_MODEL_NAME
+          ? process.env.GEMINI_DEFAULT_OPUS_MODEL_NAME
+          : process.env.ANTHROPIC_DEFAULT_OPUS_MODEL_NAME
     const descEnv =
       provider === 'openai'
         ? process.env.OPENAI_DEFAULT_OPUS_MODEL_DESCRIPTION
         : provider === 'gemini'
-        ? process.env.GEMINI_DEFAULT_OPUS_MODEL_DESCRIPTION
-        : process.env.ANTHROPIC_DEFAULT_OPUS_MODEL_DESCRIPTION
+          ? process.env.GEMINI_DEFAULT_OPUS_MODEL_DESCRIPTION
+          : process.env.ANTHROPIC_DEFAULT_OPUS_MODEL_DESCRIPTION
     return {
       value: 'opus',
       label: nameEnv ?? customOpusModel,
@@ -207,8 +207,8 @@ function getCustomHaikuOption(): ModelOption | undefined {
     provider === 'openai'
       ? process.env.OPENAI_DEFAULT_HAIKU_MODEL
       : provider === 'gemini'
-      ? process.env.GEMINI_DEFAULT_HAIKU_MODEL
-      : process.env.ANTHROPIC_DEFAULT_HAIKU_MODEL
+        ? process.env.GEMINI_DEFAULT_HAIKU_MODEL
+        : process.env.ANTHROPIC_DEFAULT_HAIKU_MODEL
   // When a 3P user has a custom haiku model string, show it directly
   if (is3P && customHaikuModel) {
     // Use appropriate NAME/DESCRIPTION env vars based on provider
@@ -216,14 +216,14 @@ function getCustomHaikuOption(): ModelOption | undefined {
       provider === 'openai'
         ? process.env.OPENAI_DEFAULT_HAIKU_MODEL_NAME
         : provider === 'gemini'
-        ? process.env.GEMINI_DEFAULT_HAIKU_MODEL_NAME
-        : process.env.ANTHROPIC_DEFAULT_HAIKU_MODEL_NAME
+          ? process.env.GEMINI_DEFAULT_HAIKU_MODEL_NAME
+          : process.env.ANTHROPIC_DEFAULT_HAIKU_MODEL_NAME
     const descEnv =
       provider === 'openai'
         ? process.env.OPENAI_DEFAULT_HAIKU_MODEL_DESCRIPTION
         : provider === 'gemini'
-        ? process.env.GEMINI_DEFAULT_HAIKU_MODEL_DESCRIPTION
-        : process.env.ANTHROPIC_DEFAULT_HAIKU_MODEL_DESCRIPTION
+          ? process.env.GEMINI_DEFAULT_HAIKU_MODEL_DESCRIPTION
+          : process.env.ANTHROPIC_DEFAULT_HAIKU_MODEL_DESCRIPTION
     return {
       value: 'haiku',
       label: nameEnv ?? customHaikuModel,
diff --git a/src/utils/model/src/bootstrap/state.ts b/src/utils/model/src/bootstrap/state.ts
index 492747a3f..98690fb07 100644
--- a/src/utils/model/src/bootstrap/state.ts
+++ b/src/utils/model/src/bootstrap/state.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type getModelStrings = any;
-export type setModelStrings = any;
+export type getModelStrings = any
+export type setModelStrings = any
diff --git a/src/utils/model/src/services/analytics/growthbook.ts b/src/utils/model/src/services/analytics/growthbook.ts
index e380906ea..7967fd3ee 100644
--- a/src/utils/model/src/services/analytics/growthbook.ts
+++ b/src/utils/model/src/services/analytics/growthbook.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getFeatureValue_CACHED_MAY_BE_STALE = any;
+export type getFeatureValue_CACHED_MAY_BE_STALE = any
diff --git a/src/utils/model/src/services/claudeAiLimits.ts b/src/utils/model/src/services/claudeAiLimits.ts
index 85b6bcc6a..a11b0daac 100644
--- a/src/utils/model/src/services/claudeAiLimits.ts
+++ b/src/utils/model/src/services/claudeAiLimits.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type OverageDisabledReason = any;
+export type OverageDisabledReason = any
diff --git a/src/utils/model/validateModel.ts b/src/utils/model/validateModel.ts
index 14b816756..45e49939a 100644
--- a/src/utils/model/validateModel.ts
+++ b/src/utils/model/validateModel.ts
@@ -51,7 +51,6 @@ export async function validateModel(
     return { valid: true }
   }
 
-
   // Try to make an actual API call with minimal parameters
   try {
     await sideQuery({
diff --git a/src/utils/nativeInstaller/installer.ts b/src/utils/nativeInstaller/installer.ts
index 3a3b770b9..f11981528 100644
--- a/src/utils/nativeInstaller/installer.ts
+++ b/src/utils/nativeInstaller/installer.ts
@@ -223,10 +223,7 @@ async function tryWithVersionLock(
       attempts++
       if (attempts < maxAttempts) {
         // Wait before retrying with exponential backoff
-        const timeout = Math.min(
-          minTimeout * Math.pow(2, attempts - 1),
-          maxTimeout,
-        )
+        const timeout = Math.min(minTimeout * 2 ** (attempts - 1), maxTimeout)
         await sleep(timeout)
       }
     }
diff --git a/src/utils/nativeInstaller/src/services/analytics/index.ts b/src/utils/nativeInstaller/src/services/analytics/index.ts
index 142e7b6f5..2e0f796da 100644
--- a/src/utils/nativeInstaller/src/services/analytics/index.ts
+++ b/src/utils/nativeInstaller/src/services/analytics/index.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any;
-export type logEvent = any;
+export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any
+export type logEvent = any
diff --git a/src/utils/path.ts b/src/utils/path.ts
index bc323e2bd..dbfe78c33 100644
--- a/src/utils/path.ts
+++ b/src/utils/path.ts
@@ -1,5 +1,13 @@
 import { homedir } from 'os'
-import { dirname, isAbsolute, join, normalize, posix, relative, resolve } from 'path'
+import {
+  dirname,
+  isAbsolute,
+  join,
+  normalize,
+  posix,
+  relative,
+  resolve,
+} from 'path'
 import { getCwd } from './cwd.js'
 import { getFsImplementation } from './fsOperations.js'
 import { getPlatform } from './platform.js'
diff --git a/src/utils/permissions/__tests__/PermissionMode.test.ts b/src/utils/permissions/__tests__/PermissionMode.test.ts
index f2a127f0c..3e1d805b5 100644
--- a/src/utils/permissions/__tests__/PermissionMode.test.ts
+++ b/src/utils/permissions/__tests__/PermissionMode.test.ts
@@ -1,23 +1,23 @@
-import { mock, describe, expect, test, beforeEach, afterEach } from "bun:test";
+import { mock, describe, expect, test, beforeEach, afterEach } from 'bun:test'
 
 // Mock slowOperations to cut bootstrap/state dependency chain
 // (figures.js → env.js → fsOperations.js → slowOperations.js → bootstrap/state.js)
-mock.module("src/utils/slowOperations.ts", () => ({
+mock.module('src/utils/slowOperations.ts', () => ({
   jsonStringify: JSON.stringify,
   jsonParse: JSON.parse,
   slowLogging: { enabled: false },
   clone: (v: any) => structuredClone(v),
   cloneDeep: (v: any) => structuredClone(v),
-  callerFrame: () => "",
+  callerFrame: () => '',
   SLOW_OPERATION_THRESHOLD_MS: 100,
   writeFileSync_DEPRECATED: () => {},
-}));
-mock.module("src/utils/log.ts", () => ({
+}))
+mock.module('src/utils/log.ts', () => ({
   logError: () => {},
   logToFile: () => {},
-  getLogDisplayTitle: () => "",
+  getLogDisplayTitle: () => '',
   logEvent: () => {},
-}));
+}))
 
 const {
   isExternalPermissionMode,
@@ -30,202 +30,206 @@ const {
   getModeColor,
   PERMISSION_MODES,
   EXTERNAL_PERMISSION_MODES,
-} = await import("../PermissionMode");
+} = await import('../PermissionMode')
 
 // ─── PERMISSION_MODES / EXTERNAL_PERMISSION_MODES ──────────────────────
 
-describe("PERMISSION_MODES", () => {
-  test("includes all external modes", () => {
+describe('PERMISSION_MODES', () => {
+  test('includes all external modes', () => {
     for (const m of EXTERNAL_PERMISSION_MODES) {
-      expect(PERMISSION_MODES).toContain(m);
+      expect(PERMISSION_MODES).toContain(m)
     }
-  });
+  })
 
-  test("includes default, plan, acceptEdits, bypassPermissions, dontAsk", () => {
-    expect(PERMISSION_MODES).toContain("default");
-    expect(PERMISSION_MODES).toContain("plan");
-    expect(PERMISSION_MODES).toContain("acceptEdits");
-    expect(PERMISSION_MODES).toContain("bypassPermissions");
-    expect(PERMISSION_MODES).toContain("dontAsk");
-  });
-});
+  test('includes default, plan, acceptEdits, bypassPermissions, dontAsk', () => {
+    expect(PERMISSION_MODES).toContain('default')
+    expect(PERMISSION_MODES).toContain('plan')
+    expect(PERMISSION_MODES).toContain('acceptEdits')
+    expect(PERMISSION_MODES).toContain('bypassPermissions')
+    expect(PERMISSION_MODES).toContain('dontAsk')
+  })
+})
 
 // ─── permissionModeFromString ──────────────────────────────────────────
 
-describe("permissionModeFromString", () => {
-  test("returns valid mode for known string", () => {
-    expect(permissionModeFromString("plan")).toBe("plan");
-    expect(permissionModeFromString("default")).toBe("default");
-    expect(permissionModeFromString("dontAsk")).toBe("dontAsk");
-    expect(permissionModeFromString("acceptEdits")).toBe("acceptEdits");
-    expect(permissionModeFromString("bypassPermissions")).toBe("bypassPermissions");
-  });
+describe('permissionModeFromString', () => {
+  test('returns valid mode for known string', () => {
+    expect(permissionModeFromString('plan')).toBe('plan')
+    expect(permissionModeFromString('default')).toBe('default')
+    expect(permissionModeFromString('dontAsk')).toBe('dontAsk')
+    expect(permissionModeFromString('acceptEdits')).toBe('acceptEdits')
+    expect(permissionModeFromString('bypassPermissions')).toBe(
+      'bypassPermissions',
+    )
+  })
 
   test("returns 'default' for unknown string", () => {
-    expect(permissionModeFromString("unknown")).toBe("default");
-    expect(permissionModeFromString("")).toBe("default");
-  });
+    expect(permissionModeFromString('unknown')).toBe('default')
+    expect(permissionModeFromString('')).toBe('default')
+  })
 
-  test("is case sensitive — uppercase returns default", () => {
-    expect(permissionModeFromString("PLAN")).toBe("default");
-    expect(permissionModeFromString("Default")).toBe("default");
-    expect(permissionModeFromString("PLAN")).toBe("default");
-  });
+  test('is case sensitive — uppercase returns default', () => {
+    expect(permissionModeFromString('PLAN')).toBe('default')
+    expect(permissionModeFromString('Default')).toBe('default')
+    expect(permissionModeFromString('PLAN')).toBe('default')
+  })
 
-  test("returns mode for all known external modes", () => {
+  test('returns mode for all known external modes', () => {
     for (const mode of EXTERNAL_PERMISSION_MODES) {
-      expect(permissionModeFromString(mode)).toBe(mode);
+      expect(permissionModeFromString(mode)).toBe(mode)
     }
-  });
-});
+  })
+})
 
 // ─── permissionModeTitle ───────────────────────────────────────────────
 
-describe("permissionModeTitle", () => {
-  test("returns title for known modes", () => {
-    expect(permissionModeTitle("default")).toBe("Default");
-    expect(permissionModeTitle("plan")).toBe("Plan Mode");
-    expect(permissionModeTitle("acceptEdits")).toBe("Accept edits");
-    expect(permissionModeTitle("bypassPermissions")).toBe("Bypass Permissions");
-    expect(permissionModeTitle("dontAsk")).toBe("Don't Ask");
-  });
+describe('permissionModeTitle', () => {
+  test('returns title for known modes', () => {
+    expect(permissionModeTitle('default')).toBe('Default')
+    expect(permissionModeTitle('plan')).toBe('Plan Mode')
+    expect(permissionModeTitle('acceptEdits')).toBe('Accept edits')
+    expect(permissionModeTitle('bypassPermissions')).toBe('Bypass Permissions')
+    expect(permissionModeTitle('dontAsk')).toBe("Don't Ask")
+  })
 
-  test("falls back to Default for unknown mode", () => {
-    expect(permissionModeTitle("nonexistent" as any)).toBe("Default");
-  });
-});
+  test('falls back to Default for unknown mode', () => {
+    expect(permissionModeTitle('nonexistent' as any)).toBe('Default')
+  })
+})
 
 // ─── permissionModeShortTitle ──────────────────────────────────────────
 
-describe("permissionModeShortTitle", () => {
-  test("returns short title for known modes", () => {
-    expect(permissionModeShortTitle("default")).toBe("Default");
-    expect(permissionModeShortTitle("plan")).toBe("Plan");
-    expect(permissionModeShortTitle("bypassPermissions")).toBe("Bypass");
-    expect(permissionModeShortTitle("dontAsk")).toBe("DontAsk");
-    expect(permissionModeShortTitle("acceptEdits")).toBe("Accept");
-  });
-});
+describe('permissionModeShortTitle', () => {
+  test('returns short title for known modes', () => {
+    expect(permissionModeShortTitle('default')).toBe('Default')
+    expect(permissionModeShortTitle('plan')).toBe('Plan')
+    expect(permissionModeShortTitle('bypassPermissions')).toBe('Bypass')
+    expect(permissionModeShortTitle('dontAsk')).toBe('DontAsk')
+    expect(permissionModeShortTitle('acceptEdits')).toBe('Accept')
+  })
+})
 
 // ─── permissionModeSymbol ──────────────────────────────────────────────
 
-describe("permissionModeSymbol", () => {
-  test("returns empty string for default", () => {
-    expect(permissionModeSymbol("default")).toBe("");
-  });
+describe('permissionModeSymbol', () => {
+  test('returns empty string for default', () => {
+    expect(permissionModeSymbol('default')).toBe('')
+  })
 
-  test("returns non-empty for non-default modes", () => {
-    expect(permissionModeSymbol("plan").length).toBeGreaterThan(0);
-    expect(permissionModeSymbol("acceptEdits").length).toBeGreaterThan(0);
-  });
-});
+  test('returns non-empty for non-default modes', () => {
+    expect(permissionModeSymbol('plan').length).toBeGreaterThan(0)
+    expect(permissionModeSymbol('acceptEdits').length).toBeGreaterThan(0)
+  })
+})
 
 // ─── getModeColor ──────────────────────────────────────────────────────
 
-describe("getModeColor", () => {
+describe('getModeColor', () => {
   test("returns 'text' for default", () => {
-    expect(getModeColor("default")).toBe("text");
-  });
+    expect(getModeColor('default')).toBe('text')
+  })
 
   test("returns 'planMode' for plan", () => {
-    expect(getModeColor("plan")).toBe("planMode");
-  });
+    expect(getModeColor('plan')).toBe('planMode')
+  })
 
   test("returns 'error' for bypassPermissions", () => {
-    expect(getModeColor("bypassPermissions")).toBe("error");
-  });
+    expect(getModeColor('bypassPermissions')).toBe('error')
+  })
 
   test("returns 'error' for dontAsk", () => {
-    expect(getModeColor("dontAsk")).toBe("error");
-  });
+    expect(getModeColor('dontAsk')).toBe('error')
+  })
 
   test("returns 'autoAccept' for acceptEdits", () => {
-    expect(getModeColor("acceptEdits")).toBe("autoAccept");
-  });
-});
+    expect(getModeColor('acceptEdits')).toBe('autoAccept')
+  })
+})
 
 // ─── isDefaultMode ─────────────────────────────────────────────────────
 
-describe("isDefaultMode", () => {
+describe('isDefaultMode', () => {
   test("returns true for 'default'", () => {
-    expect(isDefaultMode("default")).toBe(true);
-  });
+    expect(isDefaultMode('default')).toBe(true)
+  })
 
-  test("returns true for undefined", () => {
-    expect(isDefaultMode(undefined)).toBe(true);
-  });
+  test('returns true for undefined', () => {
+    expect(isDefaultMode(undefined)).toBe(true)
+  })
 
-  test("returns false for other modes", () => {
-    expect(isDefaultMode("plan")).toBe(false);
-    expect(isDefaultMode("dontAsk")).toBe(false);
-  });
-});
+  test('returns false for other modes', () => {
+    expect(isDefaultMode('plan')).toBe(false)
+    expect(isDefaultMode('dontAsk')).toBe(false)
+  })
+})
 
 // ─── toExternalPermissionMode ──────────────────────────────────────────
 
-describe("toExternalPermissionMode", () => {
-  test("maps default to default", () => {
-    expect(toExternalPermissionMode("default")).toBe("default");
-  });
+describe('toExternalPermissionMode', () => {
+  test('maps default to default', () => {
+    expect(toExternalPermissionMode('default')).toBe('default')
+  })
 
-  test("maps plan to plan", () => {
-    expect(toExternalPermissionMode("plan")).toBe("plan");
-  });
+  test('maps plan to plan', () => {
+    expect(toExternalPermissionMode('plan')).toBe('plan')
+  })
 
-  test("maps dontAsk to dontAsk", () => {
-    expect(toExternalPermissionMode("dontAsk")).toBe("dontAsk");
-  });
+  test('maps dontAsk to dontAsk', () => {
+    expect(toExternalPermissionMode('dontAsk')).toBe('dontAsk')
+  })
 
-  test("maps acceptEdits to acceptEdits", () => {
-    expect(toExternalPermissionMode("acceptEdits")).toBe("acceptEdits");
-  });
+  test('maps acceptEdits to acceptEdits', () => {
+    expect(toExternalPermissionMode('acceptEdits')).toBe('acceptEdits')
+  })
 
-  test("maps bypassPermissions to bypassPermissions", () => {
-    expect(toExternalPermissionMode("bypassPermissions")).toBe("bypassPermissions");
-  });
-});
+  test('maps bypassPermissions to bypassPermissions', () => {
+    expect(toExternalPermissionMode('bypassPermissions')).toBe(
+      'bypassPermissions',
+    )
+  })
+})
 
 // ─── isExternalPermissionMode ──────────────────────────────────────────
 
-describe("isExternalPermissionMode", () => {
-  test("returns true for external modes (non-ant)", () => {
+describe('isExternalPermissionMode', () => {
+  test('returns true for external modes (non-ant)', () => {
     // USER_TYPE is not 'ant' in tests, so always true
-    expect(isExternalPermissionMode("default")).toBe(true);
-    expect(isExternalPermissionMode("plan")).toBe(true);
-  });
+    expect(isExternalPermissionMode('default')).toBe(true)
+    expect(isExternalPermissionMode('plan')).toBe(true)
+  })
 
   describe("when USER_TYPE is 'ant'", () => {
-    const savedUserType = process.env.USER_TYPE;
+    const savedUserType = process.env.USER_TYPE
 
     beforeEach(() => {
-      process.env.USER_TYPE = "ant";
-    });
+      process.env.USER_TYPE = 'ant'
+    })
 
     afterEach(() => {
       if (savedUserType !== undefined) {
-        process.env.USER_TYPE = savedUserType;
+        process.env.USER_TYPE = savedUserType
       } else {
-        delete process.env.USER_TYPE;
+        delete process.env.USER_TYPE
       }
-    });
+    })
 
     test("returns false for 'auto' (ant-only mode)", () => {
-      expect(isExternalPermissionMode("auto")).toBe(false);
-    });
+      expect(isExternalPermissionMode('auto')).toBe(false)
+    })
 
     test("returns false for 'bubble' (ant-only mode)", () => {
-      expect(isExternalPermissionMode("bubble")).toBe(false);
-    });
+      expect(isExternalPermissionMode('bubble')).toBe(false)
+    })
 
-    test("returns true for standard external modes", () => {
-      expect(isExternalPermissionMode("default")).toBe(true);
-      expect(isExternalPermissionMode("plan")).toBe(true);
-      expect(isExternalPermissionMode("dontAsk")).toBe(true);
-    });
+    test('returns true for standard external modes', () => {
+      expect(isExternalPermissionMode('default')).toBe(true)
+      expect(isExternalPermissionMode('plan')).toBe(true)
+      expect(isExternalPermissionMode('dontAsk')).toBe(true)
+    })
 
-    test("returns true for acceptEdits and bypassPermissions", () => {
-      expect(isExternalPermissionMode("acceptEdits")).toBe(true);
-      expect(isExternalPermissionMode("bypassPermissions")).toBe(true);
-    });
-  });
-});
+    test('returns true for acceptEdits and bypassPermissions', () => {
+      expect(isExternalPermissionMode('acceptEdits')).toBe(true)
+      expect(isExternalPermissionMode('bypassPermissions')).toBe(true)
+    })
+  })
+})
diff --git a/src/utils/permissions/__tests__/dangerousPatterns.test.ts b/src/utils/permissions/__tests__/dangerousPatterns.test.ts
index b9d5eecc1..6ce0348a2 100644
--- a/src/utils/permissions/__tests__/dangerousPatterns.test.ts
+++ b/src/utils/permissions/__tests__/dangerousPatterns.test.ts
@@ -1,93 +1,93 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from 'bun:test'
 import {
   CROSS_PLATFORM_CODE_EXEC,
   DANGEROUS_BASH_PATTERNS,
-} from "../dangerousPatterns";
+} from '../dangerousPatterns'
 
-describe("CROSS_PLATFORM_CODE_EXEC", () => {
-  test("is a non-empty readonly array of strings", () => {
-    expect(CROSS_PLATFORM_CODE_EXEC.length).toBeGreaterThan(0);
+describe('CROSS_PLATFORM_CODE_EXEC', () => {
+  test('is a non-empty readonly array of strings', () => {
+    expect(CROSS_PLATFORM_CODE_EXEC.length).toBeGreaterThan(0)
     for (const p of CROSS_PLATFORM_CODE_EXEC) {
-      expect(typeof p).toBe("string");
+      expect(typeof p).toBe('string')
     }
-  });
+  })
 
-  test("includes core interpreters", () => {
-    expect(CROSS_PLATFORM_CODE_EXEC).toContain("python");
-    expect(CROSS_PLATFORM_CODE_EXEC).toContain("node");
-    expect(CROSS_PLATFORM_CODE_EXEC).toContain("ruby");
-    expect(CROSS_PLATFORM_CODE_EXEC).toContain("perl");
-  });
+  test('includes core interpreters', () => {
+    expect(CROSS_PLATFORM_CODE_EXEC).toContain('python')
+    expect(CROSS_PLATFORM_CODE_EXEC).toContain('node')
+    expect(CROSS_PLATFORM_CODE_EXEC).toContain('ruby')
+    expect(CROSS_PLATFORM_CODE_EXEC).toContain('perl')
+  })
 
-  test("includes package runners", () => {
-    expect(CROSS_PLATFORM_CODE_EXEC).toContain("npx");
-    expect(CROSS_PLATFORM_CODE_EXEC).toContain("bunx");
-  });
+  test('includes package runners', () => {
+    expect(CROSS_PLATFORM_CODE_EXEC).toContain('npx')
+    expect(CROSS_PLATFORM_CODE_EXEC).toContain('bunx')
+  })
 
-  test("includes shells", () => {
-    expect(CROSS_PLATFORM_CODE_EXEC).toContain("bash");
-    expect(CROSS_PLATFORM_CODE_EXEC).toContain("sh");
-  });
+  test('includes shells', () => {
+    expect(CROSS_PLATFORM_CODE_EXEC).toContain('bash')
+    expect(CROSS_PLATFORM_CODE_EXEC).toContain('sh')
+  })
 
-  test("has no duplicate entries", () => {
+  test('has no duplicate entries', () => {
     expect(new Set(CROSS_PLATFORM_CODE_EXEC).size).toBe(
-      CROSS_PLATFORM_CODE_EXEC.length
-    );
-  });
+      CROSS_PLATFORM_CODE_EXEC.length,
+    )
+  })
 
-  test("contains expected interpreters", () => {
+  test('contains expected interpreters', () => {
     const expected = [
-      "node",
-      "python",
-      "python3",
-      "ruby",
-      "perl",
-      "php",
-      "lua",
-      "deno",
-      "npx",
-      "bunx",
-      "tsx",
-    ];
-    const set = new Set(CROSS_PLATFORM_CODE_EXEC);
+      'node',
+      'python',
+      'python3',
+      'ruby',
+      'perl',
+      'php',
+      'lua',
+      'deno',
+      'npx',
+      'bunx',
+      'tsx',
+    ]
+    const set = new Set(CROSS_PLATFORM_CODE_EXEC)
     for (const entry of expected) {
-      expect(set.has(entry as any)).toBe(true);
+      expect(set.has(entry as any)).toBe(true)
     }
-  });
-});
+  })
+})
 
-describe("DANGEROUS_BASH_PATTERNS", () => {
-  test("includes all cross-platform patterns", () => {
+describe('DANGEROUS_BASH_PATTERNS', () => {
+  test('includes all cross-platform patterns', () => {
     for (const p of CROSS_PLATFORM_CODE_EXEC) {
-      expect(DANGEROUS_BASH_PATTERNS).toContain(p);
+      expect(DANGEROUS_BASH_PATTERNS).toContain(p)
     }
-  });
+  })
 
-  test("includes unix-specific patterns", () => {
-    expect(DANGEROUS_BASH_PATTERNS).toContain("zsh");
-    expect(DANGEROUS_BASH_PATTERNS).toContain("fish");
-    expect(DANGEROUS_BASH_PATTERNS).toContain("eval");
-    expect(DANGEROUS_BASH_PATTERNS).toContain("exec");
-    expect(DANGEROUS_BASH_PATTERNS).toContain("sudo");
-    expect(DANGEROUS_BASH_PATTERNS).toContain("xargs");
-    expect(DANGEROUS_BASH_PATTERNS).toContain("env");
-  });
+  test('includes unix-specific patterns', () => {
+    expect(DANGEROUS_BASH_PATTERNS).toContain('zsh')
+    expect(DANGEROUS_BASH_PATTERNS).toContain('fish')
+    expect(DANGEROUS_BASH_PATTERNS).toContain('eval')
+    expect(DANGEROUS_BASH_PATTERNS).toContain('exec')
+    expect(DANGEROUS_BASH_PATTERNS).toContain('sudo')
+    expect(DANGEROUS_BASH_PATTERNS).toContain('xargs')
+    expect(DANGEROUS_BASH_PATTERNS).toContain('env')
+  })
 
-  test("all elements are strings", () => {
+  test('all elements are strings', () => {
     for (const p of DANGEROUS_BASH_PATTERNS) {
-      expect(typeof p).toBe("string");
+      expect(typeof p).toBe('string')
     }
-  });
+  })
 
-  test("has no duplicate entries", () => {
+  test('has no duplicate entries', () => {
     expect(new Set(DANGEROUS_BASH_PATTERNS).size).toBe(
-      DANGEROUS_BASH_PATTERNS.length
-    );
-  });
+      DANGEROUS_BASH_PATTERNS.length,
+    )
+  })
 
-  test("empty string does not match any pattern", () => {
+  test('empty string does not match any pattern', () => {
     for (const pattern of DANGEROUS_BASH_PATTERNS) {
-      expect("".startsWith(pattern)).toBe(false);
+      expect(''.startsWith(pattern)).toBe(false)
     }
-  });
-});
+  })
+})
diff --git a/src/utils/permissions/__tests__/permissionRuleParser.test.ts b/src/utils/permissions/__tests__/permissionRuleParser.test.ts
index fef799e14..7490b8f79 100644
--- a/src/utils/permissions/__tests__/permissionRuleParser.test.ts
+++ b/src/utils/permissions/__tests__/permissionRuleParser.test.ts
@@ -1,152 +1,152 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from 'bun:test'
 import {
   escapeRuleContent,
   unescapeRuleContent,
   permissionRuleValueFromString,
   permissionRuleValueToString,
   normalizeLegacyToolName,
-} from "../permissionRuleParser";
+} from '../permissionRuleParser'
 
-describe("escapeRuleContent", () => {
-  test("escapes backslashes first", () => {
-    expect(escapeRuleContent("a\\b")).toBe("a\\\\b");
-  });
+describe('escapeRuleContent', () => {
+  test('escapes backslashes first', () => {
+    expect(escapeRuleContent('a\\b')).toBe('a\\\\b')
+  })
 
-  test("escapes opening parentheses", () => {
-    expect(escapeRuleContent("fn(x)")).toBe("fn\\(x\\)");
-  });
+  test('escapes opening parentheses', () => {
+    expect(escapeRuleContent('fn(x)')).toBe('fn\\(x\\)')
+  })
 
-  test("escapes backslash before parens correctly", () => {
+  test('escapes backslash before parens correctly', () => {
     expect(escapeRuleContent('echo "test\\nvalue"')).toBe(
-      'echo "test\\\\nvalue"'
-    );
-  });
+      'echo "test\\\\nvalue"',
+    )
+  })
 
-  test("returns unchanged string with no special chars", () => {
-    expect(escapeRuleContent("npm install")).toBe("npm install");
-  });
+  test('returns unchanged string with no special chars', () => {
+    expect(escapeRuleContent('npm install')).toBe('npm install')
+  })
 
-  test("handles empty string", () => {
-    expect(escapeRuleContent("")).toBe("");
-  });
-});
+  test('handles empty string', () => {
+    expect(escapeRuleContent('')).toBe('')
+  })
+})
 
-describe("unescapeRuleContent", () => {
-  test("unescapes parentheses", () => {
-    expect(unescapeRuleContent("fn\\(x\\)")).toBe("fn(x)");
-  });
+describe('unescapeRuleContent', () => {
+  test('unescapes parentheses', () => {
+    expect(unescapeRuleContent('fn\\(x\\)')).toBe('fn(x)')
+  })
 
-  test("unescapes backslashes", () => {
-    expect(unescapeRuleContent("a\\\\b")).toBe("a\\b");
-  });
+  test('unescapes backslashes', () => {
+    expect(unescapeRuleContent('a\\\\b')).toBe('a\\b')
+  })
 
-  test("roundtrips with escapeRuleContent", () => {
-    const original = 'python -c "print(1)"';
-    expect(unescapeRuleContent(escapeRuleContent(original))).toBe(original);
-  });
+  test('roundtrips with escapeRuleContent', () => {
+    const original = 'python -c "print(1)"'
+    expect(unescapeRuleContent(escapeRuleContent(original))).toBe(original)
+  })
 
-  test("handles content with backslash-paren combo", () => {
-    const original = 'echo "test\\nvalue"';
-    expect(unescapeRuleContent(escapeRuleContent(original))).toBe(original);
-  });
+  test('handles content with backslash-paren combo', () => {
+    const original = 'echo "test\\nvalue"'
+    expect(unescapeRuleContent(escapeRuleContent(original))).toBe(original)
+  })
 
-  test("returns unchanged string with no escapes", () => {
-    expect(unescapeRuleContent("npm install")).toBe("npm install");
-  });
-});
+  test('returns unchanged string with no escapes', () => {
+    expect(unescapeRuleContent('npm install')).toBe('npm install')
+  })
+})
 
-describe("permissionRuleValueFromString", () => {
-  test("parses tool name only", () => {
-    expect(permissionRuleValueFromString("Bash")).toEqual({
-      toolName: "Bash",
-    });
-  });
+describe('permissionRuleValueFromString', () => {
+  test('parses tool name only', () => {
+    expect(permissionRuleValueFromString('Bash')).toEqual({
+      toolName: 'Bash',
+    })
+  })
 
-  test("parses tool name with content", () => {
-    expect(permissionRuleValueFromString("Bash(npm install)")).toEqual({
-      toolName: "Bash",
-      ruleContent: "npm install",
-    });
-  });
+  test('parses tool name with content', () => {
+    expect(permissionRuleValueFromString('Bash(npm install)')).toEqual({
+      toolName: 'Bash',
+      ruleContent: 'npm install',
+    })
+  })
 
-  test("handles escaped parens in content", () => {
+  test('handles escaped parens in content', () => {
     const result = permissionRuleValueFromString(
-      'Bash(python -c "print\\(1\\)")'
-    );
-    expect(result.toolName).toBe("Bash");
-    expect(result.ruleContent).toBe('python -c "print(1)"');
-  });
+      'Bash(python -c "print\\(1\\)")',
+    )
+    expect(result.toolName).toBe('Bash')
+    expect(result.ruleContent).toBe('python -c "print(1)"')
+  })
 
-  test("treats empty content as tool-wide rule", () => {
-    expect(permissionRuleValueFromString("Bash()")).toEqual({
-      toolName: "Bash",
-    });
-  });
+  test('treats empty content as tool-wide rule', () => {
+    expect(permissionRuleValueFromString('Bash()')).toEqual({
+      toolName: 'Bash',
+    })
+  })
 
-  test("treats wildcard content as tool-wide rule", () => {
-    expect(permissionRuleValueFromString("Bash(*)")).toEqual({
-      toolName: "Bash",
-    });
-  });
+  test('treats wildcard content as tool-wide rule', () => {
+    expect(permissionRuleValueFromString('Bash(*)')).toEqual({
+      toolName: 'Bash',
+    })
+  })
 
-  test("normalizes legacy tool names", () => {
-    const result = permissionRuleValueFromString("Task");
-    expect(result.toolName).toBe("Agent");
-  });
+  test('normalizes legacy tool names', () => {
+    const result = permissionRuleValueFromString('Task')
+    expect(result.toolName).toBe('Agent')
+  })
 
-  test("handles MCP-style tool names", () => {
-    expect(permissionRuleValueFromString("mcp__server__tool")).toEqual({
-      toolName: "mcp__server__tool",
-    });
-  });
-});
+  test('handles MCP-style tool names', () => {
+    expect(permissionRuleValueFromString('mcp__server__tool')).toEqual({
+      toolName: 'mcp__server__tool',
+    })
+  })
+})
 
-describe("permissionRuleValueToString", () => {
-  test("formats tool name only", () => {
-    expect(permissionRuleValueToString({ toolName: "Bash" })).toBe("Bash");
-  });
+describe('permissionRuleValueToString', () => {
+  test('formats tool name only', () => {
+    expect(permissionRuleValueToString({ toolName: 'Bash' })).toBe('Bash')
+  })
 
-  test("formats tool name with content", () => {
+  test('formats tool name with content', () => {
     expect(
       permissionRuleValueToString({
-        toolName: "Bash",
-        ruleContent: "npm install",
-      })
-    ).toBe("Bash(npm install)");
-  });
+        toolName: 'Bash',
+        ruleContent: 'npm install',
+      }),
+    ).toBe('Bash(npm install)')
+  })
 
-  test("escapes parens in content", () => {
+  test('escapes parens in content', () => {
     expect(
       permissionRuleValueToString({
-        toolName: "Bash",
+        toolName: 'Bash',
         ruleContent: 'python -c "print(1)"',
-      })
-    ).toBe('Bash(python -c "print\\(1\\)")');
-  });
+      }),
+    ).toBe('Bash(python -c "print\\(1\\)")')
+  })
 
-  test("roundtrips with permissionRuleValueFromString", () => {
-    const original = { toolName: "Bash", ruleContent: "npm install" };
-    const str = permissionRuleValueToString(original);
-    const parsed = permissionRuleValueFromString(str);
-    expect(parsed).toEqual(original);
-  });
-});
+  test('roundtrips with permissionRuleValueFromString', () => {
+    const original = { toolName: 'Bash', ruleContent: 'npm install' }
+    const str = permissionRuleValueToString(original)
+    const parsed = permissionRuleValueFromString(str)
+    expect(parsed).toEqual(original)
+  })
+})
 
-describe("normalizeLegacyToolName", () => {
-  test("maps Task to Agent", () => {
-    expect(normalizeLegacyToolName("Task")).toBe("Agent");
-  });
+describe('normalizeLegacyToolName', () => {
+  test('maps Task to Agent', () => {
+    expect(normalizeLegacyToolName('Task')).toBe('Agent')
+  })
 
-  test("maps KillShell to TaskStop", () => {
-    expect(normalizeLegacyToolName("KillShell")).toBe("TaskStop");
-  });
+  test('maps KillShell to TaskStop', () => {
+    expect(normalizeLegacyToolName('KillShell')).toBe('TaskStop')
+  })
 
-  test("returns unknown name as-is", () => {
-    expect(normalizeLegacyToolName("UnknownTool")).toBe("UnknownTool");
-  });
+  test('returns unknown name as-is', () => {
+    expect(normalizeLegacyToolName('UnknownTool')).toBe('UnknownTool')
+  })
 
-  test("preserves current canonical names", () => {
-    expect(normalizeLegacyToolName("Bash")).toBe("Bash");
-    expect(normalizeLegacyToolName("Agent")).toBe("Agent");
-  });
-});
+  test('preserves current canonical names', () => {
+    expect(normalizeLegacyToolName('Bash')).toBe('Bash')
+    expect(normalizeLegacyToolName('Agent')).toBe('Agent')
+  })
+})
diff --git a/src/utils/permissions/__tests__/permissions.test.ts b/src/utils/permissions/__tests__/permissions.test.ts
index ebf21dfbf..649b06489 100644
--- a/src/utils/permissions/__tests__/permissions.test.ts
+++ b/src/utils/permissions/__tests__/permissions.test.ts
@@ -1,165 +1,165 @@
-import { mock, describe, expect, test } from "bun:test";
+import { mock, describe, expect, test } from 'bun:test'
 
 // Mock log.ts to cut the heavy dependency chain
-mock.module("src/utils/log.ts", () => ({
+mock.module('src/utils/log.ts', () => ({
   logError: () => {},
   logToFile: () => {},
-  getLogDisplayTitle: () => "",
+  getLogDisplayTitle: () => '',
   logEvent: () => {},
   logMCPError: () => {},
   logMCPDebug: () => {},
-  dateToFilename: (d: Date) => d.toISOString().replace(/[:.]/g, "-"),
-  getLogFilePath: () => "/tmp/mock-log",
+  dateToFilename: (d: Date) => d.toISOString().replace(/[:.]/g, '-'),
+  getLogFilePath: () => '/tmp/mock-log',
   attachErrorLogSink: () => {},
   getInMemoryErrors: () => [],
   loadErrorLogs: async () => [],
   getErrorLogByIndex: async () => null,
   captureAPIRequest: () => {},
   _resetErrorLogForTesting: () => {},
-}));
+}))
 
 // Mock slowOperations to avoid bun:bundle
-mock.module("src/utils/slowOperations.ts", () => ({
+mock.module('src/utils/slowOperations.ts', () => ({
   jsonStringify: JSON.stringify,
   jsonParse: JSON.parse,
   slowLogging: { enabled: false },
   clone: (v: any) => structuredClone(v),
   cloneDeep: (v: any) => structuredClone(v),
-  callerFrame: () => "",
+  callerFrame: () => '',
   SLOW_OPERATION_THRESHOLD_MS: 100,
   writeFileSync_DEPRECATED: () => {},
-}));
+}))
 
 const {
   getDenyRuleForTool,
   getAskRuleForTool,
   getDenyRuleForAgent,
   filterDeniedAgents,
-} = await import("../permissions");
+} = await import('../permissions')
 
-import { getEmptyToolPermissionContext } from "../../../Tool";
+import { getEmptyToolPermissionContext } from '../../../Tool'
 
 // ─── Helper ─────────────────────────────────────────────────────────────
 
-function makeContext(opts: {
-  denyRules?: string[];
-  askRules?: string[];
-}) {
-  const ctx = getEmptyToolPermissionContext();
-  const deny: Record<string, string[]> = {};
-  const ask: Record<string, string[]> = {};
+function makeContext(opts: { denyRules?: string[]; askRules?: string[] }) {
+  const ctx = getEmptyToolPermissionContext()
+  const deny: Record<string, string[]> = {}
+  const ask: Record<string, string[]> = {}
 
   // alwaysDenyRules stores raw rule strings — getDenyRules() calls
   // permissionRuleValueFromString internally
   if (opts.denyRules?.length) {
-    deny["localSettings"] = opts.denyRules;
+    deny['localSettings'] = opts.denyRules
   }
   if (opts.askRules?.length) {
-    ask["localSettings"] = opts.askRules;
+    ask['localSettings'] = opts.askRules
   }
 
   return {
     ...ctx,
     alwaysDenyRules: deny,
     alwaysAskRules: ask,
-  } as any;
+  } as any
 }
 
-function makeTool(name: string, mcpInfo?: { serverName: string; toolName: string }) {
-  return { name, mcpInfo };
+function makeTool(
+  name: string,
+  mcpInfo?: { serverName: string; toolName: string },
+) {
+  return { name, mcpInfo }
 }
 
 // ─── getDenyRuleForTool ─────────────────────────────────────────────────
 
-describe("getDenyRuleForTool", () => {
-  test("returns null when no deny rules", () => {
-    const ctx = makeContext({});
-    expect(getDenyRuleForTool(ctx, makeTool("Bash"))).toBeNull();
-  });
+describe('getDenyRuleForTool', () => {
+  test('returns null when no deny rules', () => {
+    const ctx = makeContext({})
+    expect(getDenyRuleForTool(ctx, makeTool('Bash'))).toBeNull()
+  })
 
-  test("returns matching deny rule for tool", () => {
-    const ctx = makeContext({ denyRules: ["Bash"] });
-    const result = getDenyRuleForTool(ctx, makeTool("Bash"));
-    expect(result).not.toBeNull();
-    expect(result!.ruleValue.toolName).toBe("Bash");
-  });
+  test('returns matching deny rule for tool', () => {
+    const ctx = makeContext({ denyRules: ['Bash'] })
+    const result = getDenyRuleForTool(ctx, makeTool('Bash'))
+    expect(result).not.toBeNull()
+    expect(result!.ruleValue.toolName).toBe('Bash')
+  })
 
-  test("returns null for non-matching tool", () => {
-    const ctx = makeContext({ denyRules: ["Bash"] });
-    expect(getDenyRuleForTool(ctx, makeTool("Read"))).toBeNull();
-  });
+  test('returns null for non-matching tool', () => {
+    const ctx = makeContext({ denyRules: ['Bash'] })
+    expect(getDenyRuleForTool(ctx, makeTool('Read'))).toBeNull()
+  })
 
-  test("rule with content does not match whole-tool deny", () => {
+  test('rule with content does not match whole-tool deny', () => {
     // getDenyRuleForTool uses toolMatchesRule which requires ruleContent === undefined
     // Rules like "Bash(rm -rf)" only match specific invocations, not the entire tool
-    const ctx = makeContext({ denyRules: ["Bash(rm -rf)"] });
-    const result = getDenyRuleForTool(ctx, makeTool("Bash"));
-    expect(result).toBeNull();
-  });
-});
+    const ctx = makeContext({ denyRules: ['Bash(rm -rf)'] })
+    const result = getDenyRuleForTool(ctx, makeTool('Bash'))
+    expect(result).toBeNull()
+  })
+})
 
 // ─── getAskRuleForTool ──────────────────────────────────────────────────
 
-describe("getAskRuleForTool", () => {
-  test("returns null when no ask rules", () => {
-    const ctx = makeContext({});
-    expect(getAskRuleForTool(ctx, makeTool("Bash"))).toBeNull();
-  });
+describe('getAskRuleForTool', () => {
+  test('returns null when no ask rules', () => {
+    const ctx = makeContext({})
+    expect(getAskRuleForTool(ctx, makeTool('Bash'))).toBeNull()
+  })
 
-  test("returns matching ask rule", () => {
-    const ctx = makeContext({ askRules: ["Write"] });
-    const result = getAskRuleForTool(ctx, makeTool("Write"));
-    expect(result).not.toBeNull();
-  });
+  test('returns matching ask rule', () => {
+    const ctx = makeContext({ askRules: ['Write'] })
+    const result = getAskRuleForTool(ctx, makeTool('Write'))
+    expect(result).not.toBeNull()
+  })
 
-  test("returns null for non-matching tool", () => {
-    const ctx = makeContext({ askRules: ["Write"] });
-    expect(getAskRuleForTool(ctx, makeTool("Bash"))).toBeNull();
-  });
-});
+  test('returns null for non-matching tool', () => {
+    const ctx = makeContext({ askRules: ['Write'] })
+    expect(getAskRuleForTool(ctx, makeTool('Bash'))).toBeNull()
+  })
+})
 
 // ─── getDenyRuleForAgent ────────────────────────────────────────────────
 
-describe("getDenyRuleForAgent", () => {
-  test("returns null when no deny rules", () => {
-    const ctx = makeContext({});
-    expect(getDenyRuleForAgent(ctx, "Agent", "Explore")).toBeNull();
-  });
+describe('getDenyRuleForAgent', () => {
+  test('returns null when no deny rules', () => {
+    const ctx = makeContext({})
+    expect(getDenyRuleForAgent(ctx, 'Agent', 'Explore')).toBeNull()
+  })
 
-  test("returns matching deny rule for agent type", () => {
-    const ctx = makeContext({ denyRules: ["Agent(Explore)"] });
-    const result = getDenyRuleForAgent(ctx, "Agent", "Explore");
-    expect(result).not.toBeNull();
-  });
+  test('returns matching deny rule for agent type', () => {
+    const ctx = makeContext({ denyRules: ['Agent(Explore)'] })
+    const result = getDenyRuleForAgent(ctx, 'Agent', 'Explore')
+    expect(result).not.toBeNull()
+  })
 
-  test("returns null for non-matching agent type", () => {
-    const ctx = makeContext({ denyRules: ["Agent(Explore)"] });
-    expect(getDenyRuleForAgent(ctx, "Agent", "Research")).toBeNull();
-  });
-});
+  test('returns null for non-matching agent type', () => {
+    const ctx = makeContext({ denyRules: ['Agent(Explore)'] })
+    expect(getDenyRuleForAgent(ctx, 'Agent', 'Research')).toBeNull()
+  })
+})
 
 // ─── filterDeniedAgents ─────────────────────────────────────────────────
 
-describe("filterDeniedAgents", () => {
-  test("returns all agents when no deny rules", () => {
-    const ctx = makeContext({});
-    const agents = [{ agentType: "Explore" }, { agentType: "Research" }];
-    expect(filterDeniedAgents(agents, ctx, "Agent")).toEqual(agents);
-  });
+describe('filterDeniedAgents', () => {
+  test('returns all agents when no deny rules', () => {
+    const ctx = makeContext({})
+    const agents = [{ agentType: 'Explore' }, { agentType: 'Research' }]
+    expect(filterDeniedAgents(agents, ctx, 'Agent')).toEqual(agents)
+  })
 
-  test("filters out denied agent type", () => {
-    const ctx = makeContext({ denyRules: ["Agent(Explore)"] });
-    const agents = [{ agentType: "Explore" }, { agentType: "Research" }];
-    const result = filterDeniedAgents(agents, ctx, "Agent");
-    expect(result).toHaveLength(1);
-    expect(result[0]!.agentType).toBe("Research");
-  });
+  test('filters out denied agent type', () => {
+    const ctx = makeContext({ denyRules: ['Agent(Explore)'] })
+    const agents = [{ agentType: 'Explore' }, { agentType: 'Research' }]
+    const result = filterDeniedAgents(agents, ctx, 'Agent')
+    expect(result).toHaveLength(1)
+    expect(result[0]!.agentType).toBe('Research')
+  })
 
-  test("returns empty array when all agents denied", () => {
+  test('returns empty array when all agents denied', () => {
     const ctx = makeContext({
-      denyRules: ["Agent(Explore)", "Agent(Research)"],
-    });
-    const agents = [{ agentType: "Explore" }, { agentType: "Research" }];
-    expect(filterDeniedAgents(agents, ctx, "Agent")).toEqual([]);
-  });
-});
+      denyRules: ['Agent(Explore)', 'Agent(Research)'],
+    })
+    const agents = [{ agentType: 'Explore' }, { agentType: 'Research' }]
+    expect(filterDeniedAgents(agents, ctx, 'Agent')).toEqual([])
+  })
+})
diff --git a/src/utils/permissions/__tests__/shellRuleMatching.test.ts b/src/utils/permissions/__tests__/shellRuleMatching.test.ts
index 01b1fb31c..195bc8676 100644
--- a/src/utils/permissions/__tests__/shellRuleMatching.test.ts
+++ b/src/utils/permissions/__tests__/shellRuleMatching.test.ts
@@ -1,4 +1,4 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from 'bun:test'
 import {
   permissionRuleExtractPrefix,
   hasWildcards,
@@ -6,140 +6,142 @@ import {
   parsePermissionRule,
   suggestionForExactCommand,
   suggestionForPrefix,
-} from "../shellRuleMatching";
+} from '../shellRuleMatching'
 
 // ─── permissionRuleExtractPrefix ────────────────────────────────────────
 
-describe("permissionRuleExtractPrefix", () => {
-  test("extracts prefix from legacy :* syntax", () => {
-    expect(permissionRuleExtractPrefix("npm:*")).toBe("npm");
-  });
+describe('permissionRuleExtractPrefix', () => {
+  test('extracts prefix from legacy :* syntax', () => {
+    expect(permissionRuleExtractPrefix('npm:*')).toBe('npm')
+  })
 
-  test("extracts multi-word prefix", () => {
-    expect(permissionRuleExtractPrefix("git commit:*")).toBe("git commit");
-  });
+  test('extracts multi-word prefix', () => {
+    expect(permissionRuleExtractPrefix('git commit:*')).toBe('git commit')
+  })
 
-  test("returns null for non-prefix rule", () => {
-    expect(permissionRuleExtractPrefix("npm install")).toBeNull();
-  });
+  test('returns null for non-prefix rule', () => {
+    expect(permissionRuleExtractPrefix('npm install')).toBeNull()
+  })
 
-  test("returns null for empty string", () => {
-    expect(permissionRuleExtractPrefix("")).toBeNull();
-  });
+  test('returns null for empty string', () => {
+    expect(permissionRuleExtractPrefix('')).toBeNull()
+  })
 
-  test("returns null for wildcard without colon", () => {
-    expect(permissionRuleExtractPrefix("npm *")).toBeNull();
-  });
-});
+  test('returns null for wildcard without colon', () => {
+    expect(permissionRuleExtractPrefix('npm *')).toBeNull()
+  })
+})
 
 // ─── hasWildcards ───────────────────────────────────────────────────────
 
-describe("hasWildcards", () => {
-  test("returns true for unescaped wildcard", () => {
-    expect(hasWildcards("git *")).toBe(true);
-  });
+describe('hasWildcards', () => {
+  test('returns true for unescaped wildcard', () => {
+    expect(hasWildcards('git *')).toBe(true)
+  })
 
-  test("returns false for legacy :* syntax", () => {
-    expect(hasWildcards("npm:*")).toBe(false);
-  });
+  test('returns false for legacy :* syntax', () => {
+    expect(hasWildcards('npm:*')).toBe(false)
+  })
 
-  test("returns false for escaped wildcard", () => {
-    expect(hasWildcards("git \\*")).toBe(false);
-  });
+  test('returns false for escaped wildcard', () => {
+    expect(hasWildcards('git \\*')).toBe(false)
+  })
 
-  test("returns true for * with even backslashes", () => {
-    expect(hasWildcards("git \\\\*")).toBe(true);
-  });
+  test('returns true for * with even backslashes', () => {
+    expect(hasWildcards('git \\\\*')).toBe(true)
+  })
 
-  test("returns false for no wildcards", () => {
-    expect(hasWildcards("npm install")).toBe(false);
-  });
+  test('returns false for no wildcards', () => {
+    expect(hasWildcards('npm install')).toBe(false)
+  })
 
-  test("returns false for empty string", () => {
-    expect(hasWildcards("")).toBe(false);
-  });
-});
+  test('returns false for empty string', () => {
+    expect(hasWildcards('')).toBe(false)
+  })
+})
 
 // ─── matchWildcardPattern ───────────────────────────────────────────────
 
-describe("matchWildcardPattern", () => {
-  test("matches simple wildcard", () => {
-    expect(matchWildcardPattern("git *", "git add")).toBe(true);
-  });
+describe('matchWildcardPattern', () => {
+  test('matches simple wildcard', () => {
+    expect(matchWildcardPattern('git *', 'git add')).toBe(true)
+  })
 
-  test("matches bare command when pattern ends with space-wildcard", () => {
-    expect(matchWildcardPattern("git *", "git")).toBe(true);
-  });
+  test('matches bare command when pattern ends with space-wildcard', () => {
+    expect(matchWildcardPattern('git *', 'git')).toBe(true)
+  })
 
-  test("rejects non-matching command", () => {
-    expect(matchWildcardPattern("git *", "npm install")).toBe(false);
-  });
+  test('rejects non-matching command', () => {
+    expect(matchWildcardPattern('git *', 'npm install')).toBe(false)
+  })
 
-  test("matches middle wildcard", () => {
-    expect(matchWildcardPattern("git * --verbose", "git add --verbose")).toBe(true);
-  });
+  test('matches middle wildcard', () => {
+    expect(matchWildcardPattern('git * --verbose', 'git add --verbose')).toBe(
+      true,
+    )
+  })
 
-  test("handles escaped asterisk as literal", () => {
-    expect(matchWildcardPattern("echo \\*", "echo *")).toBe(true);
-    expect(matchWildcardPattern("echo \\*", "echo hello")).toBe(false);
-  });
+  test('handles escaped asterisk as literal', () => {
+    expect(matchWildcardPattern('echo \\*', 'echo *')).toBe(true)
+    expect(matchWildcardPattern('echo \\*', 'echo hello')).toBe(false)
+  })
 
-  test("case-insensitive matching", () => {
-    expect(matchWildcardPattern("Git *", "git add", true)).toBe(true);
-  });
+  test('case-insensitive matching', () => {
+    expect(matchWildcardPattern('Git *', 'git add', true)).toBe(true)
+  })
 
-  test("exact match without wildcards", () => {
-    expect(matchWildcardPattern("npm install", "npm install")).toBe(true);
-    expect(matchWildcardPattern("npm install", "npm update")).toBe(false);
-  });
+  test('exact match without wildcards', () => {
+    expect(matchWildcardPattern('npm install', 'npm install')).toBe(true)
+    expect(matchWildcardPattern('npm install', 'npm update')).toBe(false)
+  })
 
-  test("handles regex special characters in pattern", () => {
-    expect(matchWildcardPattern("echo (hello)", "echo (hello)")).toBe(true);
-  });
-});
+  test('handles regex special characters in pattern', () => {
+    expect(matchWildcardPattern('echo (hello)', 'echo (hello)')).toBe(true)
+  })
+})
 
 // ─── parsePermissionRule ────────────────────────────────────────────────
 
-describe("parsePermissionRule", () => {
-  test("parses exact command", () => {
-    const result = parsePermissionRule("npm install");
-    expect(result).toEqual({ type: "exact", command: "npm install" });
-  });
+describe('parsePermissionRule', () => {
+  test('parses exact command', () => {
+    const result = parsePermissionRule('npm install')
+    expect(result).toEqual({ type: 'exact', command: 'npm install' })
+  })
 
-  test("parses legacy prefix syntax", () => {
-    const result = parsePermissionRule("npm:*");
-    expect(result).toEqual({ type: "prefix", prefix: "npm" });
-  });
+  test('parses legacy prefix syntax', () => {
+    const result = parsePermissionRule('npm:*')
+    expect(result).toEqual({ type: 'prefix', prefix: 'npm' })
+  })
 
-  test("parses wildcard pattern", () => {
-    const result = parsePermissionRule("git *");
-    expect(result).toEqual({ type: "wildcard", pattern: "git *" });
-  });
+  test('parses wildcard pattern', () => {
+    const result = parsePermissionRule('git *')
+    expect(result).toEqual({ type: 'wildcard', pattern: 'git *' })
+  })
 
-  test("escaped wildcard is treated as exact", () => {
-    const result = parsePermissionRule("echo \\*");
-    expect(result.type).toBe("exact");
-  });
-});
+  test('escaped wildcard is treated as exact', () => {
+    const result = parsePermissionRule('echo \\*')
+    expect(result.type).toBe('exact')
+  })
+})
 
 // ─── suggestionForExactCommand ──────────────────────────────────────────
 
-describe("suggestionForExactCommand", () => {
-  test("creates addRules suggestion", () => {
-    const result = suggestionForExactCommand("Bash", "npm install");
-    expect(result).toHaveLength(1);
-    expect(result[0]!.type).toBe("addRules");
-    expect((result[0] as any).rules[0]!.toolName).toBe("Bash");
-    expect((result[0] as any).rules[0]!.ruleContent).toBe("npm install");
-    expect((result[0] as any).behavior).toBe("allow");
-  });
-});
+describe('suggestionForExactCommand', () => {
+  test('creates addRules suggestion', () => {
+    const result = suggestionForExactCommand('Bash', 'npm install')
+    expect(result).toHaveLength(1)
+    expect(result[0]!.type).toBe('addRules')
+    expect((result[0] as any).rules[0]!.toolName).toBe('Bash')
+    expect((result[0] as any).rules[0]!.ruleContent).toBe('npm install')
+    expect((result[0] as any).behavior).toBe('allow')
+  })
+})
 
 // ─── suggestionForPrefix ────────────────────────────────────────────────
 
-describe("suggestionForPrefix", () => {
-  test("creates prefix suggestion with :*", () => {
-    const result = suggestionForPrefix("Bash", "npm");
-    expect((result[0] as any).rules[0]!.ruleContent).toBe("npm:*");
-  });
-});
+describe('suggestionForPrefix', () => {
+  test('creates prefix suggestion with :*', () => {
+    const result = suggestionForPrefix('Bash', 'npm')
+    expect((result[0] as any).rules[0]!.ruleContent).toBe('npm:*')
+  })
+})
diff --git a/src/utils/permissions/filesystem.ts b/src/utils/permissions/filesystem.ts
index 2340492cd..e82c6190b 100644
--- a/src/utils/permissions/filesystem.ts
+++ b/src/utils/permissions/filesystem.ts
@@ -1325,7 +1325,11 @@ export function checkWritePermissionForTool<Input extends AnyObject>(
           },
         ]
       : generateSuggestions(path, 'write', toolPermissionContext, pathsToCheck)
-    const failedCheck = safetyCheck as { safe: false; message: string; classifierApprovable: boolean }
+    const failedCheck = safetyCheck as {
+      safe: false
+      message: string
+      classifierApprovable: boolean
+    }
     return {
       behavior: 'ask',
       message: failedCheck.message,
diff --git a/src/utils/permissions/getNextPermissionMode.ts b/src/utils/permissions/getNextPermissionMode.ts
index cbe958e1e..340cf40d4 100644
--- a/src/utils/permissions/getNextPermissionMode.ts
+++ b/src/utils/permissions/getNextPermissionMode.ts
@@ -71,7 +71,6 @@ export function getNextPermissionMode(
       // Not exposed in UI cycle yet, but return default if somehow reached
       return 'default'
 
-
     default:
       // Covers auto (when TRANSCRIPT_CLASSIFIER is enabled) and any future modes — always fall back to default
       return 'default'
diff --git a/src/utils/permissions/pathValidation.ts b/src/utils/permissions/pathValidation.ts
index 01326c9be..c8fdf7f8f 100644
--- a/src/utils/permissions/pathValidation.ts
+++ b/src/utils/permissions/pathValidation.ts
@@ -112,8 +112,12 @@ export function isPathInSandboxWriteAllowlist(resolvedPath: string): boolean {
   // their resolution to avoid N × config.length redundant syscalls per
   // command with N write targets (matching getResolvedWorkingDirPaths).
   const pathsToCheck = getPathsForPermissionCheck(resolvedPath)
-  const resolvedAllow = allowOnly.flatMap(getResolvedSandboxConfigPath) as string[]
-  const resolvedDeny = denyWithinAllow.flatMap(getResolvedSandboxConfigPath) as string[]
+  const resolvedAllow = allowOnly.flatMap(
+    getResolvedSandboxConfigPath,
+  ) as string[]
+  const resolvedDeny = denyWithinAllow.flatMap(
+    getResolvedSandboxConfigPath,
+  ) as string[]
   return pathsToCheck.every(p => {
     for (const denyPath of resolvedDeny) {
       if (pathInWorkingPath(p, denyPath)) return false
@@ -184,7 +188,11 @@ export function isPathAllowed(
       precomputedPathsToCheck,
     )
     if (!safetyCheck.safe) {
-      const failedCheck = safetyCheck as { safe: false; message: string; classifierApprovable: boolean }
+      const failedCheck = safetyCheck as {
+        safe: false
+        message: string
+        classifierApprovable: boolean
+      }
       return {
         allowed: false,
         decisionReason: {
diff --git a/src/utils/permissions/permissionExplainer.ts b/src/utils/permissions/permissionExplainer.ts
index 60e623a84..d0398fef2 100644
--- a/src/utils/permissions/permissionExplainer.ts
+++ b/src/utils/permissions/permissionExplainer.ts
@@ -113,7 +113,9 @@ function extractConversationContext(
 
   for (const msg of assistantMessages.reverse()) {
     // Extract text content from assistant message
-    const textBlocks = (Array.isArray(msg.message.content) ? msg.message.content : [])
+    const textBlocks = (
+      Array.isArray(msg.message.content) ? msg.message.content : []
+    )
       .filter(c => c.type === 'text')
       .map(c => ('text' in c ? c.text : ''))
       .join(' ')
diff --git a/src/utils/permissions/permissionSetup.ts b/src/utils/permissions/permissionSetup.ts
index 7275307f9..cc2f4833c 100644
--- a/src/utils/permissions/permissionSetup.ts
+++ b/src/utils/permissions/permissionSetup.ts
@@ -1310,8 +1310,11 @@ export function getAutoModeUnavailableReason(): AutoModeUnavailableReason | null
  */
 export type AutoModeEnabledState = 'enabled' | 'disabled' | 'opt-in'
 
-const AUTO_MODE_ENABLED_DEFAULT: AutoModeEnabledState =
-  feature('TRANSCRIPT_CLASSIFIER') ? 'enabled' : 'disabled'
+const AUTO_MODE_ENABLED_DEFAULT: AutoModeEnabledState = feature(
+  'TRANSCRIPT_CLASSIFIER',
+)
+  ? 'enabled'
+  : 'disabled'
 
 function parseAutoModeEnabledState(value: unknown): AutoModeEnabledState {
   if (value === 'enabled' || value === 'disabled' || value === 'opt-in') {
diff --git a/src/utils/permissions/permissions.ts b/src/utils/permissions/permissions.ts
index e023a4eb7..496c6aac1 100644
--- a/src/utils/permissions/permissions.ts
+++ b/src/utils/permissions/permissions.ts
@@ -479,7 +479,6 @@ export const hasPermissionsToUseTool: CanUseToolFn = async (
 ): Promise<PermissionDecision> => {
   const result = await hasPermissionsToUseToolInner(tool, input, context)
 
-
   // Reset consecutive denials on any allowed tool use in auto mode.
   // This ensures that a successful tool use (even one auto-allowed by rules)
   // breaks the consecutive denial streak.
diff --git a/src/utils/permissions/src/Tool.ts b/src/utils/permissions/src/Tool.ts
index 9f3d854f0..ce2a01e77 100644
--- a/src/utils/permissions/src/Tool.ts
+++ b/src/utils/permissions/src/Tool.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type ToolPermissionContext = any;
-export type Tool = any;
-export type ToolUseContext = any;
+export type ToolPermissionContext = any
+export type Tool = any
+export type ToolUseContext = any
diff --git a/src/utils/permissions/src/memdir/paths.ts b/src/utils/permissions/src/memdir/paths.ts
index 2411afd7f..8ec69afde 100644
--- a/src/utils/permissions/src/memdir/paths.ts
+++ b/src/utils/permissions/src/memdir/paths.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type hasAutoMemPathOverride = any;
-export type isAutoMemPath = any;
+export type hasAutoMemPathOverride = any
+export type isAutoMemPath = any
diff --git a/src/utils/permissions/src/services/analytics/growthbook.ts b/src/utils/permissions/src/services/analytics/growthbook.ts
index 8b70dad0a..40a387bb1 100644
--- a/src/utils/permissions/src/services/analytics/growthbook.ts
+++ b/src/utils/permissions/src/services/analytics/growthbook.ts
@@ -1,5 +1,5 @@
 // Auto-generated type stub — replace with real implementation
-export type checkSecurityRestrictionGate = any;
-export type checkStatsigFeatureGate_CACHED_MAY_BE_STALE = any;
-export type getDynamicConfig_BLOCKS_ON_INIT = any;
-export type getFeatureValue_CACHED_MAY_BE_STALE = any;
+export type checkSecurityRestrictionGate = any
+export type checkStatsigFeatureGate_CACHED_MAY_BE_STALE = any
+export type getDynamicConfig_BLOCKS_ON_INIT = any
+export type getFeatureValue_CACHED_MAY_BE_STALE = any
diff --git a/src/utils/permissions/src/state/AppState.ts b/src/utils/permissions/src/state/AppState.ts
index 994ed9cc4..9b7e33650 100644
--- a/src/utils/permissions/src/state/AppState.ts
+++ b/src/utils/permissions/src/state/AppState.ts
@@ -1,5 +1,5 @@
 // Auto-generated type stub — replace with real implementation
-export type AppState = any;
-export type useAppState = any;
-export type useAppStateStore = any;
-export type useSetAppState = any;
+export type AppState = any
+export type useAppState = any
+export type useAppStateStore = any
+export type useSetAppState = any
diff --git a/src/utils/permissions/src/tools/AgentTool/agentMemory.ts b/src/utils/permissions/src/tools/AgentTool/agentMemory.ts
index 0cd1375dd..d05a1b9ca 100644
--- a/src/utils/permissions/src/tools/AgentTool/agentMemory.ts
+++ b/src/utils/permissions/src/tools/AgentTool/agentMemory.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type isAgentMemoryPath = any;
+export type isAgentMemoryPath = any
diff --git a/src/utils/permissions/src/tools/FileEditTool/constants.ts b/src/utils/permissions/src/tools/FileEditTool/constants.ts
index 34c77efd8..bb8209892 100644
--- a/src/utils/permissions/src/tools/FileEditTool/constants.ts
+++ b/src/utils/permissions/src/tools/FileEditTool/constants.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type CLAUDE_FOLDER_PERMISSION_PATTERN = any;
-export type FILE_EDIT_TOOL_NAME = any;
-export type GLOBAL_CLAUDE_FOLDER_PERMISSION_PATTERN = any;
+export type CLAUDE_FOLDER_PERMISSION_PATTERN = any
+export type FILE_EDIT_TOOL_NAME = any
+export type GLOBAL_CLAUDE_FOLDER_PERMISSION_PATTERN = any
diff --git a/src/utils/permissions/yoloClassifier.ts b/src/utils/permissions/yoloClassifier.ts
index 8f0b3cc4f..7b5d7e541 100644
--- a/src/utils/permissions/yoloClassifier.ts
+++ b/src/utils/permissions/yoloClassifier.ts
@@ -302,7 +302,10 @@ export type TranscriptEntry = {
 export function buildTranscriptEntries(messages: Message[]): TranscriptEntry[] {
   const transcript: TranscriptEntry[] = []
   for (const msg of messages) {
-    if (msg.type === 'attachment' && msg.attachment!.type === 'queued_command') {
+    if (
+      msg.type === 'attachment' &&
+      msg.attachment!.type === 'queued_command'
+    ) {
       const prompt = msg.attachment!.prompt
       let text: string | null = null
       if (typeof prompt === 'string') {
@@ -340,7 +343,7 @@ export function buildTranscriptEntries(messages: Message[]): TranscriptEntry[] {
       }
     } else if (msg.type === 'assistant') {
       const blocks: TranscriptBlock[] = []
-      for (const block of (msg.message!.content ?? [])) {
+      for (const block of msg.message!.content ?? []) {
         // Only include tool_use blocks — assistant text is model-authored
         // and could be crafted to influence the classifier's decision.
         if (typeof block !== 'string' && block.type === 'tool_use') {
diff --git a/src/utils/pipeMuteState.ts b/src/utils/pipeMuteState.ts
index a906507b2..9053a63c9 100644
--- a/src/utils/pipeMuteState.ts
+++ b/src/utils/pipeMuteState.ts
@@ -70,7 +70,9 @@ export function clearSendOverrides(): void {
 
 export function subscribeSendOverride(listener: () => void): () => void {
   _sendOverrideListeners.add(listener)
-  return () => { _sendOverrideListeners.delete(listener) }
+  return () => {
+    _sendOverrideListeners.delete(listener)
+  }
 }
 
 export function getSendOverrideVersion(): number {
diff --git a/src/utils/pipePermissionRelay.ts b/src/utils/pipePermissionRelay.ts
index c32815d6e..19f9837d5 100644
--- a/src/utils/pipePermissionRelay.ts
+++ b/src/utils/pipePermissionRelay.ts
@@ -41,9 +41,7 @@ export function getPipeRelay(): PipeRelayFn | null {
   return _pipeRelay
 }
 
-function getPipeSender():
-  | ((message: PipeMessage) => void)
-  | null {
+function getPipeSender(): ((message: PipeMessage) => void) | null {
   return _pipeRelay ?? null
 }
 
diff --git a/src/utils/plans.ts b/src/utils/plans.ts
index 22ca6906f..7a01557b0 100644
--- a/src/utils/plans.ts
+++ b/src/utils/plans.ts
@@ -367,7 +367,7 @@ export async function persistFileSnapshotIfRemote(): Promise<void> {
     // Snapshot plan file
     const plan = getPlan()
     if (plan) {
-      (snapshotFiles as any[]).push({
+      ;(snapshotFiles as any[]).push({
         key: 'plan',
         path: getPlanFilePath(),
         content: plan,
diff --git a/src/utils/plugins/installedPluginsManager.ts b/src/utils/plugins/installedPluginsManager.ts
index f0bf98180..076597716 100644
--- a/src/utils/plugins/installedPluginsManager.ts
+++ b/src/utils/plugins/installedPluginsManager.ts
@@ -1188,7 +1188,7 @@ export async function migrateFromEnabledPlugins(): Promise<void> {
 
         let installPath: string
         let version = 'unknown'
-        let gitCommitSha: string | undefined = undefined
+        let gitCommitSha: string | undefined
 
         if (typeof entry.source === 'string') {
           installPath = join(marketplaceInstallLocation, entry.source)
diff --git a/src/utils/plugins/loadPluginHooks.ts b/src/utils/plugins/loadPluginHooks.ts
index 283b59c1d..c4e732bd3 100644
--- a/src/utils/plugins/loadPluginHooks.ts
+++ b/src/utils/plugins/loadPluginHooks.ts
@@ -69,7 +69,7 @@ function convertPluginHooksToMatchers(
       continue
     }
 
-    for (const matcher of (matchers ?? [])) {
+    for (const matcher of matchers ?? []) {
       if (matcher.hooks.length > 0) {
         pluginMatchers[hookEvent].push({
           matcher: matcher.matcher,
diff --git a/src/utils/plugins/mcpbHandler.ts b/src/utils/plugins/mcpbHandler.ts
index ff344e60e..0ce913f28 100644
--- a/src/utils/plugins/mcpbHandler.ts
+++ b/src/utils/plugins/mcpbHandler.ts
@@ -1,6 +1,4 @@
-import type {
-  McpbManifestAny as McpbManifest,
-} from '@anthropic-ai/mcpb'
+import type { McpbManifestAny as McpbManifest } from '@anthropic-ai/mcpb'
 type McpbUserConfigurationOption = any
 import axios from 'axios'
 import { createHash } from 'crypto'
diff --git a/src/utils/plugins/officialMarketplaceStartupCheck.ts b/src/utils/plugins/officialMarketplaceStartupCheck.ts
index d8fb2eba4..8fd0b9eef 100644
--- a/src/utils/plugins/officialMarketplaceStartupCheck.ts
+++ b/src/utils/plugins/officialMarketplaceStartupCheck.ts
@@ -66,7 +66,7 @@ export const RETRY_CONFIG = {
 function calculateNextRetryDelay(retryCount: number): number {
   const delay =
     RETRY_CONFIG.INITIAL_DELAY_MS *
-    Math.pow(RETRY_CONFIG.BACKOFF_MULTIPLIER, retryCount)
+    RETRY_CONFIG.BACKOFF_MULTIPLIER ** retryCount
   return Math.min(delay, RETRY_CONFIG.MAX_DELAY_MS)
 }
 
diff --git a/src/utils/plugins/performStartupChecks.tsx b/src/utils/plugins/performStartupChecks.tsx
index f4589dd93..d5867906a 100644
--- a/src/utils/plugins/performStartupChecks.tsx
+++ b/src/utils/plugins/performStartupChecks.tsx
@@ -1,14 +1,11 @@
-import { performBackgroundPluginInstallations } from '../../services/plugins/PluginInstallationManager.js'
-import type { AppState } from '../../state/AppState.js'
-import { checkHasTrustDialogAccepted } from '../config.js'
-import { logForDebugging } from '../debug.js'
-import {
-  clearMarketplacesCache,
-  registerSeedMarketplaces,
-} from './marketplaceManager.js'
-import { clearPluginCache } from './pluginLoader.js'
+import { performBackgroundPluginInstallations } from '../../services/plugins/PluginInstallationManager.js';
+import type { AppState } from '../../state/AppState.js';
+import { checkHasTrustDialogAccepted } from '../config.js';
+import { logForDebugging } from '../debug.js';
+import { clearMarketplacesCache, registerSeedMarketplaces } from './marketplaceManager.js';
+import { clearPluginCache } from './pluginLoader.js';
 
-type SetAppState = (f: (prevState: AppState) => AppState) => void
+type SetAppState = (f: (prevState: AppState) => AppState) => void;
 
 /**
  * Perform plugin startup checks and initiate background installations
@@ -25,21 +22,17 @@ type SetAppState = (f: (prevState: AppState) => AppState) => void
  *
  * @param setAppState Function to update app state with installation progress
  */
-export async function performStartupChecks(
-  setAppState: SetAppState,
-): Promise<void> {
-  logForDebugging('performStartupChecks called')
+export async function performStartupChecks(setAppState: SetAppState): Promise<void> {
+  logForDebugging('performStartupChecks called');
 
   // Check if the current directory has been trusted
   if (!checkHasTrustDialogAccepted()) {
-    logForDebugging(
-      'Trust not accepted for current directory - skipping plugin installations',
-    )
-    return
+    logForDebugging('Trust not accepted for current directory - skipping plugin installations');
+    return;
   }
 
   try {
-    logForDebugging('Starting background plugin installations')
+    logForDebugging('Starting background plugin installations');
 
     // Register seed marketplaces (CLAUDE_CODE_PLUGIN_SEED_DIR) before diffing.
     // Idempotent; no-op if seed not configured. Without this, background install
@@ -48,30 +41,28 @@ export async function performStartupChecks(
     // If registration changed state, clear caches so earlier plugin-load passes
     // (e.g. getAllMcpConfigs during REPL init) don't keep stale "marketplace
     // not found" results.
-    const seedChanged = await registerSeedMarketplaces()
+    const seedChanged = await registerSeedMarketplaces();
     if (seedChanged) {
-      clearMarketplacesCache()
-      clearPluginCache('performStartupChecks: seed marketplaces changed')
+      clearMarketplacesCache();
+      clearPluginCache('performStartupChecks: seed marketplaces changed');
       // Set needsRefresh so useManagePlugins notifies the user to run
       // /reload-plugins. Without this signal, the initial plugin-load
       // (which raced and cached "marketplace not found") would persist
       // until the user manually reloads.
       setAppState(prev => {
-        if (prev.plugins.needsRefresh) return prev
+        if (prev.plugins.needsRefresh) return prev;
         return {
           ...prev,
           plugins: { ...prev.plugins, needsRefresh: true },
-        }
-      })
+        };
+      });
     }
 
     // Start background installations without waiting
     // This will update AppState as installations progress
-    await performBackgroundPluginInstallations(setAppState)
+    await performBackgroundPluginInstallations(setAppState);
   } catch (error) {
     // Even if something fails here, don't block startup
-    logForDebugging(
-      `Error initiating background plugin installations: ${error}`,
-    )
+    logForDebugging(`Error initiating background plugin installations: ${error}`);
   }
 }
diff --git a/src/utils/plugins/pluginInstallationHelpers.ts b/src/utils/plugins/pluginInstallationHelpers.ts
index 4fd95841c..c64b8e6c2 100644
--- a/src/utils/plugins/pluginInstallationHelpers.ts
+++ b/src/utils/plugins/pluginInstallationHelpers.ts
@@ -408,7 +408,11 @@ export async function installResolvedPlugin({
     allowedCrossMarketplaces,
   )
   if (!resolution.ok) {
-    return { ok: false, reason: 'resolution-failed', resolution: resolution as ResolutionResult & { ok: false } }
+    return {
+      ok: false,
+      reason: 'resolution-failed',
+      resolution: resolution as ResolutionResult & { ok: false },
+    }
   }
 
   // ── Policy guard for transitive dependencies ──
diff --git a/src/utils/plugins/pluginLoader.ts b/src/utils/plugins/pluginLoader.ts
index 00ee20b35..c05038ba3 100644
--- a/src/utils/plugins/pluginLoader.ts
+++ b/src/utils/plugins/pluginLoader.ts
@@ -1862,12 +1862,16 @@ function mergeHooksSettings(
 
   const merged = { ...base }
 
-  for (const [event, matchers] of Object.entries(additional) as [string, HookMatcher[]][]) {
+  for (const [event, matchers] of Object.entries(additional) as [
+    string,
+    HookMatcher[],
+  ][]) {
     if (!merged[event as keyof HooksSettings]) {
       merged[event as keyof HooksSettings] = matchers
     } else {
       // Merge matchers for this event
-      const existing = ((merged[event as keyof HooksSettings] as unknown) ?? []) as HookMatcher[]
+      const existing = ((merged[event as keyof HooksSettings] as unknown) ??
+        []) as HookMatcher[]
       merged[event as keyof HooksSettings] = [...existing, ...matchers]
     }
   }
diff --git a/src/utils/plugins/refresh.ts b/src/utils/plugins/refresh.ts
index b3a24fbe2..7629cbc43 100644
--- a/src/utils/plugins/refresh.ts
+++ b/src/utils/plugins/refresh.ts
@@ -164,9 +164,17 @@ export async function refreshActivePlugins(
     if (!p.hooksConfig) return sum
     return (
       sum +
-      (Object.values(p.hooksConfig) as Array<Array<{ hooks: unknown[] }> | undefined>).reduce(
+      (
+        Object.values(p.hooksConfig) as Array<
+          Array<{ hooks: unknown[] }> | undefined
+        >
+      ).reduce(
         (s, matchers) =>
-          s + (matchers?.reduce((h: number, m: { hooks: { length: number } }) => h + m.hooks.length, 0) ?? 0),
+          s +
+          (matchers?.reduce(
+            (h: number, m: { hooks: { length: number } }) => h + m.hooks.length,
+            0,
+          ) ?? 0),
         0,
       )
     )
diff --git a/src/utils/plugins/schemas.ts b/src/utils/plugins/schemas.ts
index b92fb80e9..c63975522 100644
--- a/src/utils/plugins/schemas.ts
+++ b/src/utils/plugins/schemas.ts
@@ -645,6 +645,7 @@ const PluginManifestUserConfigSchema = lazySchema(() =>
       .describe(
         'User-configurable values this plugin needs. Prompted at enable time. ' +
           'Non-sensitive values saved to settings.json; sensitive values to secure storage ' +
+          // biome-ignore lint/suspicious/noTemplateCurlyInString: ${user_config.KEY} is plugin config syntax documentation, not a JS template literal
           '(macOS keychain or .credentials.json). Available as ${user_config.KEY} in ' +
           'MCP/LSP server config, hook commands, and (non-sensitive only) skill/agent content. ' +
           'Note: sensitive values share a single keychain entry with OAuth tokens — keep ' +
@@ -690,6 +691,7 @@ const PluginManifestChannelsSchema = lazySchema(() =>
               .optional()
               .describe(
                 'Fields to prompt the user for when enabling this plugin in assistant mode. ' +
+                  // biome-ignore lint/suspicious/noTemplateCurlyInString: ${user_config.KEY} is plugin config syntax documentation, not a JS template literal
                   'Saved values are substituted into ${user_config.KEY} references in the mcpServers env.',
               ),
           })
diff --git a/src/utils/plugins/src/entrypoints/agentSdkTypes.ts b/src/utils/plugins/src/entrypoints/agentSdkTypes.ts
index 2ad98a3ad..0d880a5cf 100644
--- a/src/utils/plugins/src/entrypoints/agentSdkTypes.ts
+++ b/src/utils/plugins/src/entrypoints/agentSdkTypes.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type HookEvent = any;
+export type HookEvent = any
diff --git a/src/utils/postCommitAttribution.ts b/src/utils/postCommitAttribution.ts
index b078505ab..4f592e37e 100644
--- a/src/utils/postCommitAttribution.ts
+++ b/src/utils/postCommitAttribution.ts
@@ -1,3 +1,6 @@
 // Auto-generated stub — replace with real implementation
-export {};
-export const installPrepareCommitMsgHook: (worktreePath: string, worktreeHooksDir?: string) => Promise<void> = async () => {};
+export {}
+export const installPrepareCommitMsgHook: (
+  worktreePath: string,
+  worktreeHooksDir?: string,
+) => Promise<void> = async () => {}
diff --git a/src/utils/powershell/parser.ts b/src/utils/powershell/parser.ts
index a815403b6..4dbb6af4a 100644
--- a/src/utils/powershell/parser.ts
+++ b/src/utils/powershell/parser.ts
@@ -1702,6 +1702,7 @@ export function getPipelineSegments(
  */
 export function isNullRedirectionTarget(target: string): boolean {
   const t = target.trim().toLowerCase()
+  // biome-ignore lint/suspicious/noTemplateCurlyInString: ${null} is PowerShell syntax, not a JS template literal
   return t === '$null' || t === '${null}'
 }
 
diff --git a/src/utils/preflightChecks.tsx b/src/utils/preflightChecks.tsx
index 82093703d..0f3a67b62 100644
--- a/src/utils/preflightChecks.tsx
+++ b/src/utils/preflightChecks.tsx
@@ -1,49 +1,47 @@
-import React, { useEffect, useState } from 'react'
-import { useTimeout } from '../hooks/useTimeout.js'
-import { Box, Text } from '@anthropic/ink'
-import { Spinner } from '../components/Spinner.js'
+import React, { useEffect, useState } from 'react';
+import { useTimeout } from '../hooks/useTimeout.js';
+import { Box, Text } from '@anthropic/ink';
+import { Spinner } from '../components/Spinner.js';
 
 export interface PreflightCheckResult {
-  success: boolean
-  error?: string
-  sslHint?: string
+  success: boolean;
+  error?: string;
+  sslHint?: string;
 }
 
 async function checkEndpoints(): Promise<PreflightCheckResult> {
   // Skip connectivity check — users may use third-party API providers
   // (OpenAI, Gemini, Grok, etc.) or be behind restricted networks.
-  return { success: true }
+  return { success: true };
 }
 
 interface PreflightStepProps {
-  onSuccess: () => void
+  onSuccess: () => void;
 }
 
-export function PreflightStep({
-  onSuccess,
-}: PreflightStepProps): React.ReactNode {
-  const [result, setResult] = useState<PreflightCheckResult | null>(null)
-  const [isChecking, setIsChecking] = useState(true)
+export function PreflightStep({ onSuccess }: PreflightStepProps): React.ReactNode {
+  const [result, setResult] = useState<PreflightCheckResult | null>(null);
+  const [isChecking, setIsChecking] = useState(true);
 
   // delay showing the check since it's so fast that we normally
   // want to just immediately show the next step without a flash
-  const showSpinner = useTimeout(1000) && isChecking
+  const showSpinner = useTimeout(1000) && isChecking;
 
   useEffect(() => {
     async function run() {
-      const checkResult = await checkEndpoints()
-      setResult(checkResult)
-      setIsChecking(false)
+      const checkResult = await checkEndpoints();
+      setResult(checkResult);
+      setIsChecking(false);
     }
-    void run()
-  }, [])
+    void run();
+  }, []);
 
   useEffect(() => {
     if (result?.success) {
-      onSuccess()
+      onSuccess();
     }
     // Failure branch removed — preflight check always succeeds
-  }, [result, onSuccess])
+  }, [result, onSuccess]);
 
   return (
     <Box flexDirection="column" gap={1} paddingLeft={1}>
@@ -62,5 +60,5 @@ export function PreflightStep({
         )
       )}
     </Box>
-  )
+  );
 }
diff --git a/src/utils/process.ts b/src/utils/process.ts
index 10ec2271e..1ac0a2551 100644
--- a/src/utils/process.ts
+++ b/src/utils/process.ts
@@ -36,7 +36,6 @@ export function writeToStderr(data: string): void {
 // Write error to stderr and exit with code 1. Consolidates the
 // console.error + process.exit(1) pattern used in entrypoint fast-paths.
 export function exitWithError(message: string): never {
-  // biome-ignore lint/suspicious/noConsole:: intentional console output
   console.error(message)
   // eslint-disable-next-line custom-rules/no-process-exit
   process.exit(1)
diff --git a/src/utils/processUserInput/processBashCommand.tsx b/src/utils/processUserInput/processBashCommand.tsx
index 3c30ba4b4..29a2eb4f3 100644
--- a/src/utils/processUserInput/processBashCommand.tsx
+++ b/src/utils/processUserInput/processBashCommand.tsx
@@ -1,28 +1,24 @@
-import type { ContentBlockParam } from '@anthropic-ai/sdk/resources'
-import { randomUUID } from 'crypto'
-import * as React from 'react'
-import { BashModeProgress } from 'src/components/BashModeProgress.js'
-import type { SetToolJSXFn } from 'src/Tool.js'
-import { BashTool } from '@claude-code-best/builtin-tools/tools/BashTool/BashTool.js'
-import type {
-  AttachmentMessage,
-  SystemMessage,
-  UserMessage,
-} from 'src/types/message.js'
-import type { ShellProgress } from 'src/types/tools.js'
-import { logEvent } from '../../services/analytics/index.js'
-import { errorMessage, ShellError } from '../errors.js'
+import type { ContentBlockParam } from '@anthropic-ai/sdk/resources';
+import { randomUUID } from 'crypto';
+import * as React from 'react';
+import { BashModeProgress } from 'src/components/BashModeProgress.js';
+import type { SetToolJSXFn } from 'src/Tool.js';
+import { BashTool } from '@claude-code-best/builtin-tools/tools/BashTool/BashTool.js';
+import type { AttachmentMessage, SystemMessage, UserMessage } from 'src/types/message.js';
+import type { ShellProgress } from 'src/types/tools.js';
+import { logEvent } from '../../services/analytics/index.js';
+import { errorMessage, ShellError } from '../errors.js';
 import {
   createSyntheticUserCaveatMessage,
   createUserInterruptionMessage,
   createUserMessage,
   prepareUserContent,
-} from '../messages.js'
-import { resolveDefaultShell } from '../shell/resolveDefaultShell.js'
-import { isPowerShellToolEnabled } from '../shell/shellToolUtils.js'
-import { processToolResultBlock } from '../toolResultStorage.js'
-import { escapeXml } from '../xml.js'
-import type { ProcessUserInputContext } from './processUserInput.js'
+} from '../messages.js';
+import { resolveDefaultShell } from '../shell/resolveDefaultShell.js';
+import { isPowerShellToolEnabled } from '../shell/shellToolUtils.js';
+import { processToolResultBlock } from '../toolResultStorage.js';
+import { escapeXml } from '../xml.js';
+import type { ProcessUserInputContext } from './processUserInput.js';
 
 export async function processBashCommand(
   inputString: string,
@@ -31,67 +27,56 @@ export async function processBashCommand(
   context: ProcessUserInputContext,
   setToolJSX: SetToolJSXFn,
 ): Promise<{
-  messages: (UserMessage | AttachmentMessage | SystemMessage)[]
-  shouldQuery: boolean
+  messages: (UserMessage | AttachmentMessage | SystemMessage)[];
+  shouldQuery: boolean;
 }> {
   // Shell routing (docs/design/ps-shell-selection.md §5.2): consult
   // defaultShell, fall back to bash. isPowerShellToolEnabled() applies the
   // same platform + env-var gate as tools.ts so input-box routing matches
   // tool-list visibility. Computed up front so telemetry records the
   // actual shell, not the raw setting.
-  const usePowerShell =
-    isPowerShellToolEnabled() && resolveDefaultShell() === 'powershell'
+  const usePowerShell = isPowerShellToolEnabled() && resolveDefaultShell() === 'powershell';
 
-  logEvent('tengu_input_bash', { powershell: usePowerShell })
+  logEvent('tengu_input_bash', { powershell: usePowerShell });
 
   const userMessage = createUserMessage({
     content: prepareUserContent({
       inputString: `<bash-input>${inputString}</bash-input>`,
       precedingInputBlocks,
     }),
-  })
+  });
 
   // ctrl+b to background indicator
-  let jsx: React.ReactNode
+  let jsx: React.ReactNode;
 
   // Just show initial UI
   setToolJSX({
-    jsx: (
-      <BashModeProgress
-        input={inputString}
-        progress={null}
-        verbose={context.options.verbose}
-      />
-    ),
+    jsx: <BashModeProgress input={inputString} progress={null} verbose={context.options.verbose} />,
     shouldHidePromptInput: false,
-  })
+  });
 
   try {
     const bashModeContext: ProcessUserInputContext = {
       ...context,
       // TODO: Clean up this hack
       setToolJSX: _ => {
-        jsx = _?.jsx
+        jsx = _?.jsx;
       },
-    }
+    };
 
     // Progress UI — shared across both shell backends (both emit ShellProgress)
     const onProgress = (progress: { data: ShellProgress }) => {
       setToolJSX({
         jsx: (
           <>
-            <BashModeProgress
-              input={inputString!}
-              progress={progress.data}
-              verbose={context.options.verbose}
-            />
+            <BashModeProgress input={inputString!} progress={progress.data} verbose={context.options.verbose} />
             {jsx}
           </>
         ),
         shouldHidePromptInput: false,
         showSpinner: false,
-      })
-    }
+      });
+    };
 
     // User-initiated `!` commands run outside sandbox. Both shell tools honor
     // dangerouslyDisableSandbox (checked against areUnsandboxedCommandsAllowed()
@@ -99,16 +84,15 @@ export async function processBashCommand(
     // native, shouldUseSandbox() returns false regardless (unsupported platform).
     // Lazy-require PowerShellTool so its ~300KB chunk only loads when the
     // user has actually selected the powershell default shell.
-    type PSMod = typeof import('@claude-code-best/builtin-tools/tools/PowerShellTool/PowerShellTool.js')
-    let PowerShellTool: PSMod['PowerShellTool'] | null = null
+    type PSMod = typeof import('@claude-code-best/builtin-tools/tools/PowerShellTool/PowerShellTool.js');
+    let PowerShellTool: PSMod['PowerShellTool'] | null = null;
     if (usePowerShell) {
       /* eslint-disable @typescript-eslint/no-require-imports */
-      PowerShellTool = (
-        require('@claude-code-best/builtin-tools/tools/PowerShellTool/PowerShellTool.js') as PSMod
-      ).PowerShellTool
+      PowerShellTool = (require('@claude-code-best/builtin-tools/tools/PowerShellTool/PowerShellTool.js') as PSMod)
+        .PowerShellTool;
       /* eslint-enable @typescript-eslint/no-require-imports */
     }
-    const shellTool = PowerShellTool ?? BashTool
+    const shellTool = PowerShellTool ?? BashTool;
 
     const response = PowerShellTool
       ? await PowerShellTool.call(
@@ -127,31 +111,24 @@ export async function processBashCommand(
           undefined,
           undefined,
           onProgress,
-        )
-    const data = response.data
+        );
+    const data = response.data;
 
     if (!data) {
-      throw new Error('No result received from shell command')
+      throw new Error('No result received from shell command');
     }
 
-    const stderr = data.stderr
+    const stderr = data.stderr;
     // Reuse the same formatting pipeline as inline !`cmd` bash (promptShellExecution)
     // and model-initiated Bash. When BashTool.call() persists large output to disk,
     // data.persistedOutputPath is set and the formatter wraps in <persisted-output>.
     // Pass stderr:'' to keep it separate for the <bash-stderr> UI tag.
-    const mapped = await processToolResultBlock(
-      shellTool,
-      { ...data, stderr: '' },
-      randomUUID(),
-    )
+    const mapped = await processToolResultBlock(shellTool, { ...data, stderr: '' }, randomUUID());
     // mapped.content may contain our own <persisted-output> wrapper (trusted
     // XML from buildLargeToolResultMessage). Escaping it would turn structural
     // tags into &lt;persisted-output&gt;, breaking the model's parse and
     // UserBashOutputMessage's extractTag. Escape the raw fallback only.
-    const stdout =
-      typeof mapped.content === 'string'
-        ? mapped.content
-        : escapeXml(data.stdout)
+    const stdout = typeof mapped.content === 'string' ? mapped.content : escapeXml(data.stdout);
     return {
       messages: [
         createSyntheticUserCaveatMessage(),
@@ -162,7 +139,7 @@ export async function processBashCommand(
         }),
       ],
       shouldQuery: false,
-    }
+    };
   } catch (e) {
     if (e instanceof ShellError) {
       if (e.interrupted) {
@@ -174,7 +151,7 @@ export async function processBashCommand(
             ...attachmentMessages,
           ],
           shouldQuery: false,
-        }
+        };
       }
       return {
         messages: [
@@ -186,7 +163,7 @@ export async function processBashCommand(
           }),
         ],
         shouldQuery: false,
-      }
+      };
     }
     return {
       messages: [
@@ -198,8 +175,8 @@ export async function processBashCommand(
         }),
       ],
       shouldQuery: false,
-    }
+    };
   } finally {
-    setToolJSX(null)
+    setToolJSX(null);
   }
 }
diff --git a/src/utils/processUserInput/processSlashCommand.tsx b/src/utils/processUserInput/processSlashCommand.tsx
index 6ee4bfe93..36bf88c54 100644
--- a/src/utils/processUserInput/processSlashCommand.tsx
+++ b/src/utils/processUserInput/processSlashCommand.tsx
@@ -1,10 +1,7 @@
-import { feature } from 'bun:bundle'
-import type {
-  ContentBlockParam,
-  TextBlockParam,
-} from '@anthropic-ai/sdk/resources'
-import { randomUUID } from 'crypto'
-import { setPromptId } from 'src/bootstrap/state.js'
+import { feature } from 'bun:bundle';
+import type { ContentBlockParam, TextBlockParam } from '@anthropic-ai/sdk/resources';
+import { randomUUID } from 'crypto';
+import { setPromptId } from 'src/bootstrap/state.js';
 import {
   builtInCommandNames,
   type Command,
@@ -14,9 +11,9 @@ import {
   getCommandName,
   hasCommand,
   type PromptCommand,
-} from 'src/commands.js'
-import { NO_CONTENT_MESSAGE } from 'src/constants/messages.js'
-import type { SetToolJSXFn, ToolUseContext } from 'src/Tool.js'
+} from 'src/commands.js';
+import { NO_CONTENT_MESSAGE } from 'src/constants/messages.js';
+import type { SetToolJSXFn, ToolUseContext } from 'src/Tool.js';
 import type {
   AssistantMessage,
   AttachmentMessage,
@@ -24,42 +21,36 @@ import type {
   NormalizedUserMessage,
   ProgressMessage,
   UserMessage,
-} from 'src/types/message.js'
-import { addInvokedSkill, getSessionId } from '../../bootstrap/state.js'
-import { COMMAND_MESSAGE_TAG, COMMAND_NAME_TAG } from '../../constants/xml.js'
-import type { CanUseToolFn } from '../../hooks/useCanUseTool.js'
+} from 'src/types/message.js';
+import { addInvokedSkill, getSessionId } from '../../bootstrap/state.js';
+import { COMMAND_MESSAGE_TAG, COMMAND_NAME_TAG } from '../../constants/xml.js';
+import type { CanUseToolFn } from '../../hooks/useCanUseTool.js';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_PII_TAGGED,
   logEvent,
-} from '../../services/analytics/index.js'
-import { getDumpPromptsPath } from '../../services/api/dumpPrompts.js'
-import { buildPostCompactMessages } from '../../services/compact/compact.js'
-import { resetMicrocompactState } from '../../services/compact/microCompact.js'
-import type { Progress as AgentProgress } from '@claude-code-best/builtin-tools/tools/AgentTool/AgentTool.js'
-import { runAgent } from '@claude-code-best/builtin-tools/tools/AgentTool/runAgent.js'
-import { renderToolUseProgressMessage } from '@claude-code-best/builtin-tools/tools/AgentTool/UI.js'
-import type { CommandResultDisplay } from '../../types/command.js'
-import { createAbortController } from '../abortController.js'
-import { getAgentContext } from '../agentContext.js'
-import {
-  createAttachmentMessage,
-  getAttachmentMessages,
-} from '../attachments.js'
-import { logForDebugging } from '../debug.js'
-import { isEnvTruthy } from '../envUtils.js'
-import { AbortError, MalformedCommandError } from '../errors.js'
-import { getDisplayPath } from '../file.js'
-import {
-  extractResultText,
-  prepareForkedCommandContext,
-} from '../forkedAgent.js'
-import { getFsImplementation } from '../fsOperations.js'
-import { isFullscreenEnvEnabled } from '../fullscreen.js'
-import { toArray } from '../generators.js'
-import { registerSkillHooks } from '../hooks/registerSkillHooks.js'
-import { logError } from '../log.js'
-import { enqueuePendingNotification } from '../messageQueueManager.js'
+} from '../../services/analytics/index.js';
+import { getDumpPromptsPath } from '../../services/api/dumpPrompts.js';
+import { buildPostCompactMessages } from '../../services/compact/compact.js';
+import { resetMicrocompactState } from '../../services/compact/microCompact.js';
+import type { Progress as AgentProgress } from '@claude-code-best/builtin-tools/tools/AgentTool/AgentTool.js';
+import { runAgent } from '@claude-code-best/builtin-tools/tools/AgentTool/runAgent.js';
+import { renderToolUseProgressMessage } from '@claude-code-best/builtin-tools/tools/AgentTool/UI.js';
+import type { CommandResultDisplay } from '../../types/command.js';
+import { createAbortController } from '../abortController.js';
+import { getAgentContext } from '../agentContext.js';
+import { createAttachmentMessage, getAttachmentMessages } from '../attachments.js';
+import { logForDebugging } from '../debug.js';
+import { isEnvTruthy } from '../envUtils.js';
+import { AbortError, MalformedCommandError } from '../errors.js';
+import { getDisplayPath } from '../file.js';
+import { extractResultText, prepareForkedCommandContext } from '../forkedAgent.js';
+import { getFsImplementation } from '../fsOperations.js';
+import { isFullscreenEnvEnabled } from '../fullscreen.js';
+import { toArray } from '../generators.js';
+import { registerSkillHooks } from '../hooks/registerSkillHooks.js';
+import { logError } from '../log.js';
+import { enqueuePendingNotification } from '../messageQueueManager.js';
 import {
   createCommandInputMessage,
   createSyntheticUserCaveatMessage,
@@ -71,40 +62,31 @@ import {
   isSystemLocalCommandMessage,
   normalizeMessages,
   prepareUserContent,
-} from '../messages.js'
-import type { ModelAlias } from '../model/aliases.js'
-import { parseToolListFromCLI } from '../permissions/permissionSetup.js'
-import { hasPermissionsToUseTool } from '../permissions/permissions.js'
-import {
-  isOfficialMarketplaceName,
-  parsePluginIdentifier,
-} from '../plugins/pluginIdentifier.js'
-import {
-  isRestrictedToPluginOnly,
-  isSourceAdminTrusted,
-} from '../settings/pluginOnlyPolicy.js'
-import { parseSlashCommand } from '../slashCommandParsing.js'
-import { sleep } from '../sleep.js'
-import { recordSkillUsage } from '../suggestions/skillUsageTracking.js'
-import { logOTelEvent, redactIfDisabled } from '../telemetry/events.js'
-import { buildPluginCommandTelemetryFields } from '../telemetry/pluginTelemetry.js'
-import { getAssistantMessageContentLength } from '../tokens.js'
-import { createAgentId } from '../uuid.js'
-import { getWorkload } from '../workloadContext.js'
-import type {
-  ProcessUserInputBaseResult,
-  ProcessUserInputContext,
-} from './processUserInput.js'
+} from '../messages.js';
+import type { ModelAlias } from '../model/aliases.js';
+import { parseToolListFromCLI } from '../permissions/permissionSetup.js';
+import { hasPermissionsToUseTool } from '../permissions/permissions.js';
+import { isOfficialMarketplaceName, parsePluginIdentifier } from '../plugins/pluginIdentifier.js';
+import { isRestrictedToPluginOnly, isSourceAdminTrusted } from '../settings/pluginOnlyPolicy.js';
+import { parseSlashCommand } from '../slashCommandParsing.js';
+import { sleep } from '../sleep.js';
+import { recordSkillUsage } from '../suggestions/skillUsageTracking.js';
+import { logOTelEvent, redactIfDisabled } from '../telemetry/events.js';
+import { buildPluginCommandTelemetryFields } from '../telemetry/pluginTelemetry.js';
+import { getAssistantMessageContentLength } from '../tokens.js';
+import { createAgentId } from '../uuid.js';
+import { getWorkload } from '../workloadContext.js';
+import type { ProcessUserInputBaseResult, ProcessUserInputContext } from './processUserInput.js';
 
 type SlashCommandResult = ProcessUserInputBaseResult & {
-  command: Command
-}
+  command: Command;
+};
 
 // Poll interval and deadline for MCP settle before launching a background
 // forked subagent. MCP servers typically connect within 1-3s of startup;
 // 10s headroom covers slow SSE handshakes.
-const MCP_SETTLE_POLL_MS = 200
-const MCP_SETTLE_TIMEOUT_MS = 10_000
+const MCP_SETTLE_POLL_MS = 200;
+const MCP_SETTLE_TIMEOUT_MS = 10_000;
 
 /**
  * Executes a slash command with context: fork in a sub-agent.
@@ -117,39 +99,33 @@ async function executeForkedSlashCommand(
   setToolJSX: SetToolJSXFn,
   canUseTool: CanUseToolFn,
 ): Promise<SlashCommandResult> {
-  const agentId = createAgentId()
+  const agentId = createAgentId();
 
   const pluginMarketplace = command.pluginInfo
     ? parsePluginIdentifier(command.pluginInfo.repository).marketplace
-    : undefined
+    : undefined;
   logEvent('tengu_slash_command_forked', {
-    command_name:
-      command.name as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-    invocation_trigger:
-      'user-slash' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+    command_name: command.name as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+    invocation_trigger: 'user-slash' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
     ...(command.pluginInfo && {
-      _PROTO_plugin_name: command.pluginInfo.pluginManifest
-        .name as AnalyticsMetadata_I_VERIFIED_THIS_IS_PII_TAGGED,
+      _PROTO_plugin_name: command.pluginInfo.pluginManifest.name as AnalyticsMetadata_I_VERIFIED_THIS_IS_PII_TAGGED,
       ...(pluginMarketplace && {
-        _PROTO_marketplace_name:
-          pluginMarketplace as AnalyticsMetadata_I_VERIFIED_THIS_IS_PII_TAGGED,
+        _PROTO_marketplace_name: pluginMarketplace as AnalyticsMetadata_I_VERIFIED_THIS_IS_PII_TAGGED,
       }),
       ...buildPluginCommandTelemetryFields(command.pluginInfo),
     }),
-  })
+  });
 
-  const { skillContent, modifiedGetAppState, baseAgent, promptMessages } =
-    await prepareForkedCommandContext(command, args, context)
+  const { skillContent, modifiedGetAppState, baseAgent, promptMessages } = await prepareForkedCommandContext(
+    command,
+    args,
+    context,
+  );
 
   // Merge skill's effort into the agent definition so runAgent applies it
-  const agentDefinition =
-    command.effort !== undefined
-      ? { ...baseAgent, effort: command.effort }
-      : baseAgent
+  const agentDefinition = command.effort !== undefined ? { ...baseAgent, effort: command.effort } : baseAgent;
 
-  logForDebugging(
-    `Executing forked slash command /${command.name} with agent ${agentDefinition.agentType}`,
-  )
+  logForDebugging(`Executing forked slash command /${command.name} with agent ${agentDefinition.agentType}`);
 
   // Assistant mode: fire-and-forget. Launch subagent in background, return
   // immediately, re-enqueue the result as an isMeta prompt when done.
@@ -167,8 +143,8 @@ async function executeForkedSlashCommand(
     // Standalone abortController — background subagents survive main-thread
     // ESC (same policy as AgentTool's async path). They're cron-driven; if
     // killed mid-run they just re-fire on the next schedule.
-    const bgAbortController = createAbortController()
-    const commandName = getCommandName(command)
+    const bgAbortController = createAbortController();
+    const commandName = getCommandName(command);
 
     // Workload: handlePromptSubmit wraps the entire turn in runWithWorkload
     // (AsyncLocalStorage). ALS context is captured when this `void` fires
@@ -179,7 +155,7 @@ async function executeForkedSlashCommand(
     // handlePromptSubmit → fresh runWithWorkload boundary (which always
     // establishes a new context, even for `undefined`) → so it needs its
     // own QueuedCommand.workload tag to preserve attribution.
-    const spawnTimeWorkload = getWorkload()
+    const spawnTimeWorkload = getWorkload();
 
     // Re-enter the queue as a hidden prompt. isMeta: hides from queue
     // preview + placeholder + transcript. skipSlashCommands: prevents
@@ -195,7 +171,7 @@ async function executeForkedSlashCommand(
         isMeta: true,
         skipSlashCommands: true,
         workload: spawnTimeWorkload,
-      })
+      });
 
     void (async () => {
       // Wait for MCP servers to settle. Scheduled tasks fire at startup and
@@ -204,16 +180,15 @@ async function executeForkedSlashCommand(
       // accidentally avoided this — tasks serialized, so task N's drain
       // happened after task N-1's 30s run, by which time MCP was up.
       // Poll until no 'pending' clients remain, then refresh.
-      const deadline = Date.now() + MCP_SETTLE_TIMEOUT_MS
+      const deadline = Date.now() + MCP_SETTLE_TIMEOUT_MS;
       while (Date.now() < deadline) {
-        const s = context.getAppState()
-        if (!s.mcp.clients.some(c => c.type === 'pending')) break
-        await sleep(MCP_SETTLE_POLL_MS)
+        const s = context.getAppState();
+        if (!s.mcp.clients.some(c => c.type === 'pending')) break;
+        await sleep(MCP_SETTLE_POLL_MS);
       }
-      const freshTools =
-        context.options.refreshTools?.() ?? context.options.tools
+      const freshTools = context.options.refreshTools?.() ?? context.options.tools;
 
-      const agentMessages: Message[] = []
+      const agentMessages: Message[] = [];
       for await (const message of runAgent({
         agentDefinition,
         promptMessages,
@@ -229,40 +204,34 @@ async function executeForkedSlashCommand(
         availableTools: freshTools,
         override: { agentId },
       })) {
-        agentMessages.push(message)
+        agentMessages.push(message);
       }
-      const resultText = extractResultText(agentMessages, 'Command completed')
-      logForDebugging(
-        `Background forked command /${commandName} completed (agent ${agentId})`,
-      )
-      enqueueResult(
-        `<scheduled-task-result command="/${commandName}">\n${resultText}\n</scheduled-task-result>`,
-      )
+      const resultText = extractResultText(agentMessages, 'Command completed');
+      logForDebugging(`Background forked command /${commandName} completed (agent ${agentId})`);
+      enqueueResult(`<scheduled-task-result command="/${commandName}">\n${resultText}\n</scheduled-task-result>`);
     })().catch(err => {
-      logError(err)
+      logError(err);
       enqueueResult(
         `<scheduled-task-result command="/${commandName}" status="failed">\n${err instanceof Error ? err.message : String(err)}\n</scheduled-task-result>`,
-      )
-    })
+      );
+    });
 
     // Nothing to render, nothing to query — the background runner re-enters
     // the queue on its own schedule.
-    return { messages: [], shouldQuery: false, command }
+    return { messages: [], shouldQuery: false, command };
   }
 
   // Collect messages from the forked agent
-  const agentMessages: Message[] = []
+  const agentMessages: Message[] = [];
 
   // Build progress messages for the agent progress UI
-  const progressMessages: ProgressMessage<AgentProgress>[] = []
-  const parentToolUseID = `forked-command-${command.name}`
-  let toolUseCounter = 0
+  const progressMessages: ProgressMessage<AgentProgress>[] = [];
+  const parentToolUseID = `forked-command-${command.name}`;
+  let toolUseCounter = 0;
 
   // Helper to create a progress message from an agent message
-  const createProgressMessage = (
-    message: AssistantMessage | NormalizedUserMessage,
-  ): ProgressMessage<AgentProgress> => {
-    toolUseCounter++
+  const createProgressMessage = (message: AssistantMessage | NormalizedUserMessage): ProgressMessage<AgentProgress> => {
+    toolUseCounter++;
     return {
       type: 'progress',
       data: {
@@ -275,8 +244,8 @@ async function executeForkedSlashCommand(
       toolUseID: `${parentToolUseID}-${toolUseCounter}`,
       timestamp: new Date().toISOString(),
       uuid: randomUUID(),
-    }
-  }
+    };
+  };
 
   // Helper to update progress display using agent progress UI
   const updateProgress = (): void => {
@@ -288,11 +257,11 @@ async function executeForkedSlashCommand(
       shouldHidePromptInput: false,
       shouldContinueAnimation: true,
       showSpinner: true,
-    })
-  }
+    });
+  };
 
   // Show initial "Initializing…" state
-  updateProgress()
+  updateProgress();
 
   // Run the sub-agent
   try {
@@ -309,47 +278,45 @@ async function executeForkedSlashCommand(
       model: command.model as ModelAlias | undefined,
       availableTools: context.options.tools,
     })) {
-      agentMessages.push(message)
-      const normalizedNew = normalizeMessages([message])
+      agentMessages.push(message);
+      const normalizedNew = normalizeMessages([message]);
 
       // Add progress message for assistant messages (which contain tool uses)
       if (message.type === 'assistant') {
         // Increment token count in spinner for assistant messages
-        const contentLength = getAssistantMessageContentLength(message as AssistantMessage)
+        const contentLength = getAssistantMessageContentLength(message as AssistantMessage);
         if (contentLength > 0) {
-          context.setResponseLength(len => len + contentLength)
+          context.setResponseLength(len => len + contentLength);
         }
 
-        const normalizedMsg = normalizedNew[0]
+        const normalizedMsg = normalizedNew[0];
         if (normalizedMsg && normalizedMsg.type === 'assistant') {
-          progressMessages.push(createProgressMessage(message as AssistantMessage))
-          updateProgress()
+          progressMessages.push(createProgressMessage(message as AssistantMessage));
+          updateProgress();
         }
       }
 
       // Add progress message for user messages (which contain tool results)
       if (message.type === 'user') {
-        const normalizedMsg = normalizedNew[0]
+        const normalizedMsg = normalizedNew[0];
         if (normalizedMsg && normalizedMsg.type === 'user') {
-          progressMessages.push(createProgressMessage(normalizedMsg as AssistantMessage))
-          updateProgress()
+          progressMessages.push(createProgressMessage(normalizedMsg as AssistantMessage));
+          updateProgress();
         }
       }
     }
   } finally {
     // Clear the progress display
-    setToolJSX(null)
+    setToolJSX(null);
   }
 
-  let resultText = extractResultText(agentMessages, 'Command completed')
+  let resultText = extractResultText(agentMessages, 'Command completed');
 
-  logForDebugging(
-    `Forked slash command /${command.name} completed with agent ${agentId}`,
-  )
+  logForDebugging(`Forked slash command /${command.name} completed with agent ${agentId}`);
 
   // Prepend debug log for ant users so it appears inside the command output
   if (process.env.USER_TYPE === 'ant') {
-    resultText = `[ANT-ONLY] API calls: ${getDisplayPath(getDumpPromptsPath(agentId))}\n${resultText}`
+    resultText = `[ANT-ONLY] API calls: ${getDisplayPath(getDumpPromptsPath(agentId))}\n${resultText}`;
   }
 
   // Return the result as a user message (simulates the agent's output)
@@ -363,14 +330,14 @@ async function executeForkedSlashCommand(
     createUserMessage({
       content: `<local-command-stdout>\n${resultText}\n</local-command-stdout>`,
     }),
-  ]
+  ];
 
   return {
     messages,
     shouldQuery: false,
     command,
     resultText,
-  }
+  };
 }
 
 /**
@@ -383,7 +350,7 @@ async function executeForkedSlashCommand(
 export function looksLikeCommand(commandName: string): boolean {
   // Command names should only contain [a-zA-Z0-9:_-]
   // If it contains other characters, it's probably a file path or other input
-  return !/[^a-zA-Z0-9:\-_]/.test(commandName)
+  return !/[^a-zA-Z0-9:\-_]/.test(commandName);
 }
 
 export async function processSlashCommand(
@@ -397,10 +364,10 @@ export async function processSlashCommand(
   isAlreadyProcessing?: boolean,
   canUseTool?: CanUseToolFn,
 ): Promise<ProcessUserInputBaseResult> {
-  const parsed = parseSlashCommand(inputString)
+  const parsed = parseSlashCommand(inputString);
   if (!parsed) {
-    logEvent('tengu_input_slash_missing', {})
-    const errorMessage = 'Commands are in the form `/command [args]`'
+    logEvent('tengu_input_slash_missing', {});
+    const errorMessage = 'Commands are in the form `/command [args]`';
     return {
       messages: [
         createSyntheticUserCaveatMessage(),
@@ -414,35 +381,30 @@ export async function processSlashCommand(
       ],
       shouldQuery: false,
       resultText: errorMessage,
-    }
+    };
   }
 
-  const { commandName, args: parsedArgs, isMcp } = parsed
+  const { commandName, args: parsedArgs, isMcp } = parsed;
 
-  const sanitizedCommandName = isMcp
-    ? 'mcp'
-    : !builtInCommandNames().has(commandName)
-      ? 'custom'
-      : commandName
+  const sanitizedCommandName = isMcp ? 'mcp' : !builtInCommandNames().has(commandName) ? 'custom' : commandName;
 
   // Check if it's a real command before processing
   if (!hasCommand(commandName, context.options.commands)) {
     // Check if this looks like a command name vs a file path or other input
     // Also check if it's an actual file path that exists
-    let isFilePath = false
+    let isFilePath = false;
     try {
-      await getFsImplementation().stat(`/${commandName}`)
-      isFilePath = true
+      await getFsImplementation().stat(`/${commandName}`);
+      isFilePath = true;
     } catch {
       // Not a file path — treat as command name
     }
     if (looksLikeCommand(commandName) && !isFilePath) {
       logEvent('tengu_input_slash_invalid', {
-        input:
-          commandName as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
+        input: commandName as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
 
-      const unknownMessage = `Unknown skill: ${commandName}`
+      const unknownMessage = `Unknown skill: ${commandName}`;
       return {
         messages: [
           createSyntheticUserCaveatMessage(),
@@ -455,29 +417,22 @@ export async function processSlashCommand(
           }),
           // gh-32591: preserve args so the user can copy/resubmit without
           // retyping. System warning is UI-only (filtered before API).
-          ...(parsedArgs
-            ? [
-                createSystemMessage(
-                  `Args from unknown skill: ${parsedArgs}`,
-                  'warning',
-                ),
-              ]
-            : []),
+          ...(parsedArgs ? [createSystemMessage(`Args from unknown skill: ${parsedArgs}`, 'warning')] : []),
         ],
         shouldQuery: false,
         resultText: unknownMessage,
-      }
+      };
     }
 
-    const promptId = randomUUID()
-    setPromptId(promptId)
-    logEvent('tengu_input_prompt', {})
+    const promptId = randomUUID();
+    setPromptId(promptId);
+    logEvent('tengu_input_prompt', {});
     // Log user prompt event for OTLP
     void logOTelEvent('user_prompt', {
       prompt_length: String(inputString.length),
       prompt: redactIfDisabled(inputString),
       'prompt.id': promptId,
-    })
+    });
     return {
       messages: [
         createUserMessage({
@@ -487,7 +442,7 @@ export async function processSlashCommand(
         ...attachmentMessages,
       ],
       shouldQuery: true,
-    }
+    };
   }
 
   // Track slash command usage for feature discovery
@@ -512,66 +467,54 @@ export async function processSlashCommand(
     isAlreadyProcessing,
     canUseTool,
     uuid,
-  )
+  );
 
   // Local slash commands that skip messages
   if (newMessages.length === 0) {
     const eventData: Record<string, boolean | number | undefined> = {
-      input:
-        sanitizedCommandName as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-    }
+      input: sanitizedCommandName as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+    };
 
     // Add plugin metadata if this is a plugin command
     if (returnedCommand.type === 'prompt' && returnedCommand.pluginInfo) {
-      const { pluginManifest, repository } = returnedCommand.pluginInfo
-      const { marketplace } = parsePluginIdentifier(repository)
-      const isOfficial = isOfficialMarketplaceName(marketplace)
+      const { pluginManifest, repository } = returnedCommand.pluginInfo;
+      const { marketplace } = parsePluginIdentifier(repository);
+      const isOfficial = isOfficialMarketplaceName(marketplace);
       // _PROTO_* routes to PII-tagged plugin_name/marketplace_name BQ columns
       // (unredacted, all users); plugin_name/plugin_repository stay in
       // additional_metadata as redacted variants for general-access dashboards.
-      eventData._PROTO_plugin_name =
-        pluginManifest.name as AnalyticsMetadata_I_VERIFIED_THIS_IS_PII_TAGGED
+      eventData._PROTO_plugin_name = pluginManifest.name as AnalyticsMetadata_I_VERIFIED_THIS_IS_PII_TAGGED;
       if (marketplace) {
-        eventData._PROTO_marketplace_name =
-          marketplace as AnalyticsMetadata_I_VERIFIED_THIS_IS_PII_TAGGED
+        eventData._PROTO_marketplace_name = marketplace as AnalyticsMetadata_I_VERIFIED_THIS_IS_PII_TAGGED;
       }
       eventData.plugin_repository = (
         isOfficial ? repository : 'third-party'
-      ) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS
+      ) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS;
       eventData.plugin_name = (
         isOfficial ? pluginManifest.name : 'third-party'
-      ) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS
+      ) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS;
       if (isOfficial && pluginManifest.version) {
-        eventData.plugin_version =
-          pluginManifest.version as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS
+        eventData.plugin_version = pluginManifest.version as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS;
       }
-      Object.assign(
-        eventData,
-        buildPluginCommandTelemetryFields(returnedCommand.pluginInfo),
-      )
+      Object.assign(eventData, buildPluginCommandTelemetryFields(returnedCommand.pluginInfo));
     }
 
     logEvent('tengu_input_command', {
       ...eventData,
-      invocation_trigger:
-        'user-slash' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      invocation_trigger: 'user-slash' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
       ...(process.env.USER_TYPE === 'ant' && {
-        skill_name:
-          commandName as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        skill_name: commandName as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
         ...(returnedCommand.type === 'prompt' && {
-          skill_source:
-            returnedCommand.source as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          skill_source: returnedCommand.source as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
         }),
         ...(returnedCommand.loadedFrom && {
-          skill_loaded_from:
-            returnedCommand.loadedFrom as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          skill_loaded_from: returnedCommand.loadedFrom as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
         }),
         ...(returnedCommand.kind && {
-          skill_kind:
-            returnedCommand.kind as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          skill_kind: returnedCommand.kind as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
         }),
       }),
-    })
+    });
     return {
       messages: [],
       shouldQuery: false,
@@ -579,7 +522,7 @@ export async function processSlashCommand(
       model,
       nextInput,
       submitNextInput,
-    }
+    };
   }
 
   // For invalid commands, preserve both the user message and error
@@ -591,15 +534,12 @@ export async function processSlashCommand(
   ) {
     // Don't log as invalid if it looks like a common file path
     const looksLikeFilePath =
-      inputString.startsWith('/var') ||
-      inputString.startsWith('/tmp') ||
-      inputString.startsWith('/private')
+      inputString.startsWith('/var') || inputString.startsWith('/tmp') || inputString.startsWith('/private');
 
     if (!looksLikeFilePath) {
       logEvent('tengu_input_slash_invalid', {
-        input:
-          commandName as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
+        input: commandName as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
     }
 
     return {
@@ -608,75 +548,58 @@ export async function processSlashCommand(
       allowedTools,
 
       model,
-    }
+    };
   }
 
   // A valid command
   const eventData: Record<string, boolean | number | undefined> = {
-    input:
-      sanitizedCommandName as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-  }
+    input: sanitizedCommandName as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+  };
 
   // Add plugin metadata if this is a plugin command
   if (returnedCommand.type === 'prompt' && returnedCommand.pluginInfo) {
-    const { pluginManifest, repository } = returnedCommand.pluginInfo
-    const { marketplace } = parsePluginIdentifier(repository)
-    const isOfficial = isOfficialMarketplaceName(marketplace)
-    eventData._PROTO_plugin_name =
-      pluginManifest.name as AnalyticsMetadata_I_VERIFIED_THIS_IS_PII_TAGGED
+    const { pluginManifest, repository } = returnedCommand.pluginInfo;
+    const { marketplace } = parsePluginIdentifier(repository);
+    const isOfficial = isOfficialMarketplaceName(marketplace);
+    eventData._PROTO_plugin_name = pluginManifest.name as AnalyticsMetadata_I_VERIFIED_THIS_IS_PII_TAGGED;
     if (marketplace) {
-      eventData._PROTO_marketplace_name =
-        marketplace as AnalyticsMetadata_I_VERIFIED_THIS_IS_PII_TAGGED
+      eventData._PROTO_marketplace_name = marketplace as AnalyticsMetadata_I_VERIFIED_THIS_IS_PII_TAGGED;
     }
     eventData.plugin_repository = (
       isOfficial ? repository : 'third-party'
-    ) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS
+    ) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS;
     eventData.plugin_name = (
       isOfficial ? pluginManifest.name : 'third-party'
-    ) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS
+    ) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS;
     if (isOfficial && pluginManifest.version) {
-      eventData.plugin_version =
-        pluginManifest.version as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS
+      eventData.plugin_version = pluginManifest.version as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS;
     }
-    Object.assign(
-      eventData,
-      buildPluginCommandTelemetryFields(returnedCommand.pluginInfo),
-    )
+    Object.assign(eventData, buildPluginCommandTelemetryFields(returnedCommand.pluginInfo));
   }
 
   logEvent('tengu_input_command', {
     ...eventData,
-    invocation_trigger:
-      'user-slash' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+    invocation_trigger: 'user-slash' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
     ...(process.env.USER_TYPE === 'ant' && {
-      skill_name:
-        commandName as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      skill_name: commandName as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
       ...(returnedCommand.type === 'prompt' && {
-        skill_source:
-          returnedCommand.source as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        skill_source: returnedCommand.source as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
       }),
       ...(returnedCommand.loadedFrom && {
-        skill_loaded_from:
-          returnedCommand.loadedFrom as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        skill_loaded_from: returnedCommand.loadedFrom as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
       }),
       ...(returnedCommand.kind && {
-        skill_kind:
-          returnedCommand.kind as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        skill_kind: returnedCommand.kind as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
       }),
     }),
-  })
+  });
 
   // Check if this is a compact result which handle their own synthetic caveat message ordering
-  const isCompactResult =
-    newMessages.length > 0 &&
-    newMessages[0] &&
-    isCompactBoundaryMessage(newMessages[0])
+  const isCompactResult = newMessages.length > 0 && newMessages[0] && isCompactBoundaryMessage(newMessages[0]);
 
   return {
     messages:
-      messageShouldQuery ||
-      newMessages.every(isSystemLocalCommandMessage) ||
-      isCompactResult
+      messageShouldQuery || newMessages.every(isSystemLocalCommandMessage) || isCompactResult
         ? newMessages
         : [createSyntheticUserCaveatMessage(), ...newMessages],
     shouldQuery: messageShouldQuery,
@@ -686,7 +609,7 @@ export async function processSlashCommand(
     resultText,
     nextInput,
     submitNextInput,
-  }
+  };
 }
 
 async function getMessagesForSlashCommand(
@@ -700,11 +623,11 @@ async function getMessagesForSlashCommand(
   canUseTool?: CanUseToolFn,
   uuid?: string,
 ): Promise<SlashCommandResult> {
-  const command = getCommand(commandName, context.options.commands)
+  const command = getCommand(commandName, context.options.commands);
 
   // Track skill usage for ranking (only for prompt commands that are user-invocable)
   if (command.type === 'prompt' && command.userInvocable !== false) {
-    recordSkillUsage(commandName)
+    recordSkillUsage(commandName);
   }
 
   // Check if the command is user-invocable
@@ -724,25 +647,25 @@ async function getMessagesForSlashCommand(
       ],
       shouldQuery: false,
       command,
-    }
+    };
   }
 
   try {
     switch (command.type) {
       case 'local-jsx': {
         return new Promise<SlashCommandResult>(resolve => {
-          let doneWasCalled = false
+          let doneWasCalled = false;
           const onDone = (
             result?: string,
             options?: {
-              display?: CommandResultDisplay
-              shouldQuery?: boolean
-              metaMessages?: string[]
-              nextInput?: string
-              submitNextInput?: boolean
+              display?: CommandResultDisplay;
+              shouldQuery?: boolean;
+              metaMessages?: string[];
+              nextInput?: string;
+              submitNextInput?: boolean;
             },
           ) => {
-            doneWasCalled = true
+            doneWasCalled = true;
             // If display is 'skip', don't add any messages to the conversation
             if (options?.display === 'skip') {
               void resolve({
@@ -751,14 +674,14 @@ async function getMessagesForSlashCommand(
                 command,
                 nextInput: options?.nextInput,
                 submitNextInput: options?.submitNextInput,
-              })
-              return
+              });
+              return;
             }
 
             // Meta messages are model-visible but hidden from the user
-            const metaMessages = (options?.metaMessages ?? []).map(
-              (content: string) => createUserMessage({ content, isMeta: true }),
-            )
+            const metaMessages = (options?.metaMessages ?? []).map((content: string) =>
+              createUserMessage({ content, isMeta: true }),
+            );
 
             // In fullscreen the command just showed as a centered modal
             // pane — the transient notification is enough feedback. The
@@ -771,9 +694,7 @@ async function getMessagesForSlashCommand(
             // usage, /rename, /proactive) use display:system for actual
             // output that must reach the transcript.
             const skipTranscript =
-              isFullscreenEnvEnabled() &&
-              typeof result === 'string' &&
-              result.endsWith(' dismissed')
+              isFullscreenEnvEnabled() && typeof result === 'string' && result.endsWith(' dismissed');
 
             void resolve({
               messages:
@@ -781,12 +702,8 @@ async function getMessagesForSlashCommand(
                   ? skipTranscript
                     ? metaMessages
                     : [
-                        createCommandInputMessage(
-                          formatCommandInput(command, args),
-                        ),
-                        createCommandInputMessage(
-                          `<local-command-stdout>${result}</local-command-stdout>`,
-                        ),
+                        createCommandInputMessage(formatCommandInput(command, args)),
+                        createCommandInputMessage(`<local-command-stdout>${result}</local-command-stdout>`),
                         ...metaMessages,
                       ]
                   : [
@@ -809,21 +726,21 @@ async function getMessagesForSlashCommand(
               command,
               nextInput: options?.nextInput,
               submitNextInput: options?.submitNextInput,
-            })
-          }
+            });
+          };
 
           void command
             .load()
             .then(mod => mod.call(onDone, { ...context, canUseTool }, args))
             .then(jsx => {
-              if (jsx == null) return
+              if (jsx == null) return;
               if (context.options.isNonInteractiveSession) {
                 void resolve({
                   messages: [],
                   shouldQuery: false,
                   command,
-                })
-                return
+                });
+                return;
               }
               // Guard: if onDone fired during mod.call() (early-exit path
               // that calls onDone then returns JSX), skip setToolJSX. This
@@ -832,51 +749,51 @@ async function getMessagesForSlashCommand(
               // its setToolJSX({clearLocalJSX: true}) before we get here.
               // Setting isLocalJSXCommand after clear leaves it stuck true,
               // blocking useQueueProcessor and TextInput focus.
-              if (doneWasCalled) return
+              if (doneWasCalled) return;
               setToolJSX({
                 jsx,
                 shouldHidePromptInput: true,
                 showSpinner: false,
                 isLocalJSXCommand: true,
                 isImmediate: command.immediate === true,
-              })
+              });
             })
             .catch(e => {
               // If load()/call() throws and onDone never fired, the outer
               // Promise hangs forever, leaving queryGuard stuck in
               // 'dispatching' and deadlocking the queue processor.
-              logError(e)
-              if (doneWasCalled) return
-              doneWasCalled = true
+              logError(e);
+              if (doneWasCalled) return;
+              doneWasCalled = true;
               setToolJSX({
                 jsx: null,
                 shouldHidePromptInput: false,
                 clearLocalJSX: true,
-              })
-              void resolve({ messages: [], shouldQuery: false, command })
-            })
-        })
+              });
+              void resolve({ messages: [], shouldQuery: false, command });
+            });
+        });
       }
       case 'local': {
-        const displayArgs = command.isSensitive && args.trim() ? '***' : args
+        const displayArgs = command.isSensitive && args.trim() ? '***' : args;
         const userMessage = createUserMessage({
           content: prepareUserContent({
             inputString: formatCommandInput(command, displayArgs),
             precedingInputBlocks,
           }),
-        })
+        });
 
         try {
-          const syntheticCaveatMessage = createSyntheticUserCaveatMessage()
-          const mod = await command.load()
-          const result = await mod.call(args, context)
+          const syntheticCaveatMessage = createSyntheticUserCaveatMessage();
+          const mod = await command.load();
+          const result = await mod.call(args, context);
 
           if (result.type === 'skip') {
             return {
               messages: [],
               shouldQuery: false,
               command,
-            }
+            };
           }
 
           // Use discriminated union to handle different result types
@@ -899,52 +816,43 @@ async function getMessagesForSlashCommand(
                     }),
                   ]
                 : []),
-            ]
+            ];
             const compactionResultWithSlashMessages = {
               ...result.compactionResult,
-              messagesToKeep: [
-                ...(result.compactionResult.messagesToKeep ?? []),
-                ...slashCommandMessages,
-              ],
-            }
+              messagesToKeep: [...(result.compactionResult.messagesToKeep ?? []), ...slashCommandMessages],
+            };
             // Reset microcompact state since full compact replaces all
             // messages — old tool IDs are no longer relevant. Budget state
             // (on toolUseContext) needs no reset: stale entries are inert
             // (UUIDs never repeat, so they're never looked up).
-            resetMicrocompactState()
+            resetMicrocompactState();
             return {
-              messages: buildPostCompactMessages(
-                compactionResultWithSlashMessages,
-              ) as AssistantMessage[],
+              messages: buildPostCompactMessages(compactionResultWithSlashMessages) as AssistantMessage[],
               shouldQuery: false,
               command,
-            }
+            };
           }
 
           // Text result — use system message so it doesn't render as a user bubble
           return {
             messages: [
               userMessage,
-              createCommandInputMessage(
-                `<local-command-stdout>${result.value}</local-command-stdout>`,
-              ),
+              createCommandInputMessage(`<local-command-stdout>${result.value}</local-command-stdout>`),
             ],
             shouldQuery: false,
             command,
             resultText: result.value,
-          }
+          };
         } catch (e) {
-          logError(e)
+          logError(e);
           return {
             messages: [
               userMessage,
-              createCommandInputMessage(
-                `<local-command-stderr>${String(e)}</local-command-stderr>`,
-              ),
+              createCommandInputMessage(`<local-command-stderr>${String(e)}</local-command-stderr>`),
             ],
             shouldQuery: false,
             command,
-          }
+          };
         }
       }
       case 'prompt': {
@@ -958,7 +866,7 @@ async function getMessagesForSlashCommand(
               precedingInputBlocks,
               setToolJSX,
               canUseTool ?? hasPermissionsToUseTool,
-            )
+            );
           }
 
           return await getMessagesForPromptSlashCommand(
@@ -968,7 +876,7 @@ async function getMessagesForSlashCommand(
             precedingInputBlocks,
             imageContentBlocks,
             uuid,
-          )
+          );
         } catch (e) {
           // Handle abort errors specially to show proper "Interrupted" message
           if (e instanceof AbortError) {
@@ -984,7 +892,7 @@ async function getMessagesForSlashCommand(
               ],
               shouldQuery: false,
               command,
-            }
+            };
           }
           return {
             messages: [
@@ -1000,7 +908,7 @@ async function getMessagesForSlashCommand(
             ],
             shouldQuery: false,
             command,
-          }
+          };
         }
       }
     }
@@ -1017,46 +925,40 @@ async function getMessagesForSlashCommand(
         ],
         shouldQuery: false,
         command,
-      }
+      };
     }
-    throw e
+    throw e;
   }
 }
 
 function formatCommandInput(command: CommandBase, args: string): string {
-  return formatCommandInputTags(getCommandName(command), args)
+  return formatCommandInputTags(getCommandName(command), args);
 }
 
 /**
  * Formats the metadata for a skill loading message.
  * Used by the Skill tool and for subagent skill preloading.
  */
-export function formatSkillLoadingMetadata(
-  skillName: string,
-  _progressMessage: string = 'loading',
-): string {
+export function formatSkillLoadingMetadata(skillName: string, _progressMessage: string = 'loading'): string {
   // Use skill name only - UserCommandMessage renders as "Skill(name)"
   return [
     `<${COMMAND_MESSAGE_TAG}>${skillName}</${COMMAND_MESSAGE_TAG}>`,
     `<${COMMAND_NAME_TAG}>${skillName}</${COMMAND_NAME_TAG}>`,
     `<skill-format>true</skill-format>`,
-  ].join('\n')
+  ].join('\n');
 }
 
 /**
  * Formats the metadata for a slash command loading message.
  */
-function formatSlashCommandLoadingMetadata(
-  commandName: string,
-  args?: string,
-): string {
+function formatSlashCommandLoadingMetadata(commandName: string, args?: string): string {
   return [
     `<${COMMAND_MESSAGE_TAG}>${commandName}</${COMMAND_MESSAGE_TAG}>`,
     `<${COMMAND_NAME_TAG}>/${commandName}</${COMMAND_NAME_TAG}>`,
     args ? `<command-args>${args}</command-args>` : null,
   ]
     .filter(Boolean)
-    .join('\n')
+    .join('\n');
 }
 
 /**
@@ -1064,26 +966,19 @@ function formatSlashCommandLoadingMetadata(
  * User-invocable skills use slash command format (/name), while model-only
  * skills use the skill format ("The X skill is running").
  */
-function formatCommandLoadingMetadata(
-  command: CommandBase & PromptCommand,
-  args?: string,
-): string {
+function formatCommandLoadingMetadata(command: CommandBase & PromptCommand, args?: string): string {
   // Use command.name (the qualified name including plugin prefix, e.g.
   // "product-management:feature-spec") instead of userFacingName() which may
   // strip the plugin prefix via displayName fallback.
   // User-invocable skills should show as /command-name like regular slash commands
   if (command.userInvocable !== false) {
-    return formatSlashCommandLoadingMetadata(command.name, args)
+    return formatSlashCommandLoadingMetadata(command.name, args);
   }
   // Model-only skills (userInvocable: false) show as "The X skill is running"
-  if (
-    command.loadedFrom === 'skills' ||
-    command.loadedFrom === 'plugin' ||
-    command.loadedFrom === 'mcp'
-  ) {
-    return formatSkillLoadingMetadata(command.name, command.progressMessage)
+  if (command.loadedFrom === 'skills' || command.loadedFrom === 'plugin' || command.loadedFrom === 'mcp') {
+    return formatSkillLoadingMetadata(command.name, command.progressMessage);
   }
-  return formatSlashCommandLoadingMetadata(command.name, args)
+  return formatSlashCommandLoadingMetadata(command.name, args);
 }
 
 export async function processPromptSlashCommand(
@@ -1093,22 +988,16 @@ export async function processPromptSlashCommand(
   context: ToolUseContext,
   imageContentBlocks: ContentBlockParam[] = [],
 ): Promise<SlashCommandResult> {
-  const command = findCommand(commandName, commands)
+  const command = findCommand(commandName, commands);
   if (!command) {
-    throw new MalformedCommandError(`Unknown command: ${commandName}`)
+    throw new MalformedCommandError(`Unknown command: ${commandName}`);
   }
   if (command.type !== 'prompt') {
     throw new Error(
       `Unexpected ${command.type} command. Expected 'prompt' command. Use /${commandName} directly in the main conversation.`,
-    )
+    );
   }
-  return getMessagesForPromptSlashCommand(
-    command,
-    args,
-    context,
-    [],
-    imageContentBlocks,
-  )
+  return getMessagesForPromptSlashCommand(command, args, context, [], imageContentBlocks);
 }
 
 async function getMessagesForPromptSlashCommand(
@@ -1128,33 +1017,23 @@ async function getMessagesForPromptSlashCommand(
   // parent env, so we also check !context.agentId: agentId is only set for
   // subagents, letting workers fall through to getPromptForCommand and receive
   // the real skill content when they invoke the Skill tool.
-  if (
-    feature('COORDINATOR_MODE') &&
-    isEnvTruthy(process.env.CLAUDE_CODE_COORDINATOR_MODE) &&
-    !context.agentId
-  ) {
-    const metadata = formatCommandLoadingMetadata(command, args)
-    const parts: string[] = [
-      `Skill "/${command.name}" is available for workers.`,
-    ]
+  if (feature('COORDINATOR_MODE') && isEnvTruthy(process.env.CLAUDE_CODE_COORDINATOR_MODE) && !context.agentId) {
+    const metadata = formatCommandLoadingMetadata(command, args);
+    const parts: string[] = [`Skill "/${command.name}" is available for workers.`];
     if (command.description) {
-      parts.push(`Description: ${command.description}`)
+      parts.push(`Description: ${command.description}`);
     }
     if (command.whenToUse) {
-      parts.push(`When to use: ${command.whenToUse}`)
+      parts.push(`When to use: ${command.whenToUse}`);
     }
-    const skillAllowedTools = command.allowedTools ?? []
+    const skillAllowedTools = command.allowedTools ?? [];
     if (skillAllowedTools.length > 0) {
-      parts.push(
-        `This skill grants workers additional tool permissions: ${skillAllowedTools.join(', ')}`,
-      )
+      parts.push(`This skill grants workers additional tool permissions: ${skillAllowedTools.join(', ')}`);
     }
     parts.push(
       `\nInstruct a worker to use this skill by including "Use the /${command.name} skill" in your Agent prompt. The worker has access to the Skill tool and will receive the skill's content and permissions when it invokes it.`,
-    )
-    const summaryContent: ContentBlockParam[] = [
-      { type: 'text', text: parts.join('\n') },
-    ]
+    );
+    const summaryContent: ContentBlockParam[] = [{ type: 'text', text: parts.join('\n') }];
     return {
       messages: [
         createUserMessage({ content: metadata, uuid }),
@@ -1164,55 +1043,45 @@ async function getMessagesForPromptSlashCommand(
       model: command.model,
       effort: command.effort,
       command,
-    }
+    };
   }
 
-  const result = await command.getPromptForCommand(args, context)
+  const result = await command.getPromptForCommand(args, context);
 
   // Register skill hooks if defined. Under ["hooks"]-only (skills not locked),
   // user skills still load and reach this point — block hook REGISTRATION here
   // where source is known. Mirrors the agent frontmatter gate in runAgent.ts.
-  const hooksAllowedForThisSkill =
-    !isRestrictedToPluginOnly('hooks') || isSourceAdminTrusted(command.source)
+  const hooksAllowedForThisSkill = !isRestrictedToPluginOnly('hooks') || isSourceAdminTrusted(command.source);
   if (command.hooks && hooksAllowedForThisSkill) {
-    const sessionId = getSessionId()
+    const sessionId = getSessionId();
     registerSkillHooks(
       context.setAppState,
       sessionId,
       command.hooks,
       command.name,
       command.type === 'prompt' ? command.skillRoot : undefined,
-    )
+    );
   }
 
   // Record skill invocation for compaction preservation, scoped by agent context.
   // Skills are tagged with their agentId so only skills belonging to the current
   // agent are restored during compaction (preventing cross-agent leaks).
-  const skillPath = command.source
-    ? `${command.source}:${command.name}`
-    : command.name
+  const skillPath = command.source ? `${command.source}:${command.name}` : command.name;
   const skillContent = result
     .filter((b): b is TextBlockParam => b.type === 'text')
     .map(b => b.text)
-    .join('\n\n')
-  addInvokedSkill(
-    command.name,
-    skillPath,
-    skillContent,
-    getAgentContext()?.agentId ?? null,
-  )
+    .join('\n\n');
+  addInvokedSkill(command.name, skillPath, skillContent, getAgentContext()?.agentId ?? null);
 
-  const metadata = formatCommandLoadingMetadata(command, args)
+  const metadata = formatCommandLoadingMetadata(command, args);
 
-  const additionalAllowedTools = parseToolListFromCLI(
-    command.allowedTools ?? [],
-  )
+  const additionalAllowedTools = parseToolListFromCLI(command.allowedTools ?? []);
 
   // Create content for the main message, including any pasted images
   const mainMessageContent: ContentBlockParam[] =
     imageContentBlocks.length > 0 || precedingInputBlocks.length > 0
       ? [...imageContentBlocks, ...precedingInputBlocks, ...result]
-      : result
+      : result;
 
   // Extract attachments from command arguments (@-mentions, MCP resources,
   // agent mentions in SKILL.md). skipSkillDiscovery prevents the SKILL.md
@@ -1232,7 +1101,7 @@ async function getMessagesForPromptSlashCommand(
       'repl_main_thread',
       { skipSkillDiscovery: true },
     ),
-  )
+  );
 
   const messages = [
     createUserMessage({
@@ -1249,7 +1118,7 @@ async function getMessagesForPromptSlashCommand(
       allowedTools: additionalAllowedTools,
       model: command.model,
     }),
-  ]
+  ];
 
   return {
     messages,
@@ -1258,5 +1127,5 @@ async function getMessagesForPromptSlashCommand(
     model: command.model,
     effort: command.effort,
     command,
-  }
+  };
 }
diff --git a/src/utils/processUserInput/processUserInput.ts b/src/utils/processUserInput/processUserInput.ts
index 82afc7dd9..9a7a5f932 100644
--- a/src/utils/processUserInput/processUserInput.ts
+++ b/src/utils/processUserInput/processUserInput.ts
@@ -251,7 +251,9 @@ export async function processUserInput({
             ...hookResult.message,
             attachment: {
               ...hookResult.message.attachment!,
-              content: applyTruncation(hookResult.message.attachment!.content as string),
+              content: applyTruncation(
+                hookResult.message.attachment!.content as string,
+              ),
             },
           } as AttachmentMessage)
           break
diff --git a/src/utils/processUserInput/src/Tool.ts b/src/utils/processUserInput/src/Tool.ts
index 56e1f7036..4e5d5e0ef 100644
--- a/src/utils/processUserInput/src/Tool.ts
+++ b/src/utils/processUserInput/src/Tool.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type SetToolJSXFn = any;
-export type ToolUseContext = any;
+export type SetToolJSXFn = any
+export type ToolUseContext = any
diff --git a/src/utils/processUserInput/src/bootstrap/state.ts b/src/utils/processUserInput/src/bootstrap/state.ts
index c79c908f1..dcdad876f 100644
--- a/src/utils/processUserInput/src/bootstrap/state.ts
+++ b/src/utils/processUserInput/src/bootstrap/state.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type setPromptId = any;
+export type setPromptId = any
diff --git a/src/utils/processUserInput/src/commands.ts b/src/utils/processUserInput/src/commands.ts
index f8826ed74..f4fdc260d 100644
--- a/src/utils/processUserInput/src/commands.ts
+++ b/src/utils/processUserInput/src/commands.ts
@@ -1,9 +1,9 @@
 // Auto-generated type stub — replace with real implementation
-export type builtInCommandNames = any;
-export type Command = any;
-export type CommandBase = any;
-export type findCommand = any;
-export type getCommand = any;
-export type getCommandName = any;
-export type hasCommand = any;
-export type PromptCommand = any;
+export type builtInCommandNames = any
+export type Command = any
+export type CommandBase = any
+export type findCommand = any
+export type getCommand = any
+export type getCommandName = any
+export type hasCommand = any
+export type PromptCommand = any
diff --git a/src/utils/processUserInput/src/components/BashModeProgress.ts b/src/utils/processUserInput/src/components/BashModeProgress.ts
index c1db5a924..c07eefbe2 100644
--- a/src/utils/processUserInput/src/components/BashModeProgress.ts
+++ b/src/utils/processUserInput/src/components/BashModeProgress.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type BashModeProgress = any;
+export type BashModeProgress = any
diff --git a/src/utils/processUserInput/src/constants/messages.ts b/src/utils/processUserInput/src/constants/messages.ts
index 7c5ff73d9..0462eb52b 100644
--- a/src/utils/processUserInput/src/constants/messages.ts
+++ b/src/utils/processUserInput/src/constants/messages.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type NO_CONTENT_MESSAGE = any;
+export type NO_CONTENT_MESSAGE = any
diff --git a/src/utils/processUserInput/src/constants/querySource.ts b/src/utils/processUserInput/src/constants/querySource.ts
index 61a17200d..09b2d0921 100644
--- a/src/utils/processUserInput/src/constants/querySource.ts
+++ b/src/utils/processUserInput/src/constants/querySource.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type QuerySource = any;
+export type QuerySource = any
diff --git a/src/utils/processUserInput/src/services/analytics/index.ts b/src/utils/processUserInput/src/services/analytics/index.ts
index 60402f927..c095b5a65 100644
--- a/src/utils/processUserInput/src/services/analytics/index.ts
+++ b/src/utils/processUserInput/src/services/analytics/index.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type logEvent = any;
+export type logEvent = any
diff --git a/src/utils/processUserInput/src/tools/BashTool/BashTool.ts b/src/utils/processUserInput/src/tools/BashTool/BashTool.ts
index 7a3ea3cc5..0e57d5e17 100644
--- a/src/utils/processUserInput/src/tools/BashTool/BashTool.ts
+++ b/src/utils/processUserInput/src/tools/BashTool/BashTool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type BashTool = any;
+export type BashTool = any
diff --git a/src/utils/processUserInput/src/types/message.ts b/src/utils/processUserInput/src/types/message.ts
index ddb10eb20..84428fc8a 100644
--- a/src/utils/processUserInput/src/types/message.ts
+++ b/src/utils/processUserInput/src/types/message.ts
@@ -1,8 +1,8 @@
 // Auto-generated type stub — replace with real implementation
-export type AttachmentMessage<T = any> = any;
-export type SystemMessage = any;
-export type UserMessage = any;
-export type AssistantMessage = any;
-export type Message = any;
-export type NormalizedUserMessage = any;
-export type ProgressMessage<T = any> = any;
+export type AttachmentMessage<T = any> = any
+export type SystemMessage = any
+export type UserMessage = any
+export type AssistantMessage = any
+export type Message = any
+export type NormalizedUserMessage = any
+export type ProgressMessage<T = any> = any
diff --git a/src/utils/processUserInput/src/types/tools.ts b/src/utils/processUserInput/src/types/tools.ts
index df558fc7f..8651aacf8 100644
--- a/src/utils/processUserInput/src/types/tools.ts
+++ b/src/utils/processUserInput/src/types/tools.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type ShellProgress = any;
+export type ShellProgress = any
diff --git a/src/utils/processUserInput/src/utils/messages.ts b/src/utils/processUserInput/src/utils/messages.ts
index fcafd5386..fd8f48cca 100644
--- a/src/utils/processUserInput/src/utils/messages.ts
+++ b/src/utils/processUserInput/src/utils/messages.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getContentText = any;
+export type getContentText = any
diff --git a/src/utils/promptEditor.ts b/src/utils/promptEditor.ts
index 0b0a65241..fa23b2818 100644
--- a/src/utils/promptEditor.ts
+++ b/src/utils/promptEditor.ts
@@ -114,7 +114,7 @@ function recollapsePastedContent(
   // Find pasted content in the edited text and re-collapse it
   for (const [id, content] of Object.entries(pastedContents)) {
     if (content.type === 'text') {
-      const pasteId = parseInt(id)
+      const pasteId = parseInt(id, 10)
       const contentStr = content.content
 
       // Check if this exact content exists in the edited prompt
diff --git a/src/utils/protectedNamespace.ts b/src/utils/protectedNamespace.ts
index 3cb94bec1..bcd28d6e9 100644
--- a/src/utils/protectedNamespace.ts
+++ b/src/utils/protectedNamespace.ts
@@ -1,3 +1,3 @@
 // Auto-generated stub — replace with real implementation
-export {};
-export const checkProtectedNamespace: () => boolean = () => false;
+export {}
+export const checkProtectedNamespace: () => boolean = () => false
diff --git a/src/utils/queryHelpers.ts b/src/utils/queryHelpers.ts
index a2d26ec38..8f8679778 100644
--- a/src/utils/queryHelpers.ts
+++ b/src/utils/queryHelpers.ts
@@ -69,7 +69,9 @@ export function isResultSuccessful(
 
   if (message.type === 'assistant') {
     const content = message.message!.content
-    const lastContent = Array.isArray(content) ? content[content.length - 1] : undefined
+    const lastContent = Array.isArray(content)
+      ? content[content.length - 1]
+      : undefined
     return (
       lastContent?.type === 'text' ||
       lastContent?.type === 'thinking' ||
@@ -127,7 +129,12 @@ export function* normalizeMessage(message: Message): Generator<SDKMessage> {
       }
       return
     case 'progress': {
-      const progressData = message.data as { type: string; message: Message; elapsedTimeSeconds: number; taskId: string }
+      const progressData = message.data as {
+        type: string
+        message: Message
+        elapsedTimeSeconds: number
+        taskId: string
+      }
       if (
         progressData.type === 'agent_progress' ||
         progressData.type === 'skill_progress'
@@ -158,7 +165,10 @@ export function* normalizeMessage(message: Message): Generator<SDKMessage> {
                 timestamp: _.timestamp,
                 isSynthetic: _.isMeta || _.isVisibleInTranscriptOnly,
                 tool_use_result: _.mcpMeta
-                  ? { content: _.toolUseResult, ...(_.mcpMeta as Record<string, unknown>) }
+                  ? {
+                      content: _.toolUseResult,
+                      ...(_.mcpMeta as Record<string, unknown>),
+                    }
                   : _.toolUseResult,
               }
               break
@@ -222,7 +232,10 @@ export function* normalizeMessage(message: Message): Generator<SDKMessage> {
           timestamp: _.timestamp,
           isSynthetic: _.isMeta || _.isVisibleInTranscriptOnly,
           tool_use_result: _.mcpMeta
-            ? { content: _.toolUseResult, ...(_.mcpMeta as Record<string, unknown>) }
+            ? {
+                content: _.toolUseResult,
+                ...(_.mcpMeta as Record<string, unknown>),
+              }
             : _.toolUseResult,
         }
       }
@@ -272,7 +285,10 @@ export async function* handleOrphanedPermission(
   // Create ToolUseBlock with the updated input if permission was allowed
   let finalInput = toolInput
   if (permissionResult.behavior === 'allow') {
-    const allowResult = permissionResult as { behavior: 'allow'; updatedInput?: unknown }
+    const allowResult = permissionResult as {
+      behavior: 'allow'
+      updatedInput?: unknown
+    }
     if (allowResult.updatedInput !== undefined) {
       finalInput = allowResult.updatedInput
     } else {
@@ -291,7 +307,9 @@ export async function* handleOrphanedPermission(
     if (permissionResult.behavior === 'allow') {
       return {
         behavior: 'allow' as const,
-        updatedInput: (permissionResult as { updatedInput?: Record<string, unknown> }).updatedInput,
+        updatedInput: (
+          permissionResult as { updatedInput?: Record<string, unknown> }
+        ).updatedInput,
         decisionReason: {
           type: 'mode' as const,
           mode: 'default' as const,
@@ -472,7 +490,9 @@ export function extractReadFilesFromMessages(
 
             // Cache the file content with the message timestamp
             if (message.timestamp) {
-              const timestamp = new Date(message.timestamp as string | number).getTime()
+              const timestamp = new Date(
+                message.timestamp as string | number,
+              ).getTime()
               cache.set(readFilePath, {
                 content: fileContent,
                 timestamp,
@@ -485,7 +505,9 @@ export function extractReadFilesFromMessages(
           // Handle Write tool results - use content from the tool input
           const writeToolData = fileWriteToolUseIds.get(content.tool_use_id)
           if (writeToolData && message.timestamp) {
-            const timestamp = new Date(message.timestamp as string | number).getTime()
+            const timestamp = new Date(
+              message.timestamp as string | number,
+            ).getTime()
             cache.set(writeToolData.filePath, {
               content: writeToolData.content,
               timestamp,
diff --git a/src/utils/ripgrep.ts b/src/utils/ripgrep.ts
index 683da0516..9999d6fde 100644
--- a/src/utils/ripgrep.ts
+++ b/src/utils/ripgrep.ts
@@ -504,7 +504,7 @@ export const countFilesRoundedRg = memoize(
       if (count === 0) return 0
 
       const magnitude = Math.floor(Math.log10(count))
-      const power = Math.pow(10, magnitude)
+      const power = 10 ** magnitude
 
       // Round to nearest power of 10
       // e.g., 8 -> 10, 42 -> 100, 350 -> 100, 750 -> 1000
diff --git a/src/utils/sandbox/src/tools/BashTool/toolName.ts b/src/utils/sandbox/src/tools/BashTool/toolName.ts
index 2da8eb7a9..738010863 100644
--- a/src/utils/sandbox/src/tools/BashTool/toolName.ts
+++ b/src/utils/sandbox/src/tools/BashTool/toolName.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type BASH_TOOL_NAME = any;
+export type BASH_TOOL_NAME = any
diff --git a/src/utils/sandbox/src/tools/FileEditTool/constants.ts b/src/utils/sandbox/src/tools/FileEditTool/constants.ts
index b455c0655..f851a8bcc 100644
--- a/src/utils/sandbox/src/tools/FileEditTool/constants.ts
+++ b/src/utils/sandbox/src/tools/FileEditTool/constants.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type FILE_EDIT_TOOL_NAME = any;
+export type FILE_EDIT_TOOL_NAME = any
diff --git a/src/utils/sandbox/src/tools/FileReadTool/prompt.ts b/src/utils/sandbox/src/tools/FileReadTool/prompt.ts
index fac6439fc..e8c6709b3 100644
--- a/src/utils/sandbox/src/tools/FileReadTool/prompt.ts
+++ b/src/utils/sandbox/src/tools/FileReadTool/prompt.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type FILE_READ_TOOL_NAME = any;
+export type FILE_READ_TOOL_NAME = any
diff --git a/src/utils/sandbox/src/tools/WebFetchTool/prompt.ts b/src/utils/sandbox/src/tools/WebFetchTool/prompt.ts
index 63b342a25..83e9643c5 100644
--- a/src/utils/sandbox/src/tools/WebFetchTool/prompt.ts
+++ b/src/utils/sandbox/src/tools/WebFetchTool/prompt.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type WEB_FETCH_TOOL_NAME = any;
+export type WEB_FETCH_TOOL_NAME = any
diff --git a/src/utils/sdkHeapDumpMonitor.ts b/src/utils/sdkHeapDumpMonitor.ts
index 949cf8d16..3befdb2e5 100644
--- a/src/utils/sdkHeapDumpMonitor.ts
+++ b/src/utils/sdkHeapDumpMonitor.ts
@@ -1,3 +1,3 @@
 // Auto-generated stub — replace with real implementation
-export {};
-export const startSdkMemoryMonitor: () => void = () => {};
+export {}
+export const startSdkMemoryMonitor: () => void = () => {}
diff --git a/src/utils/secureStorage/keychainPrefetch.ts b/src/utils/secureStorage/keychainPrefetch.ts
index 061c2b16c..426e547e8 100644
--- a/src/utils/secureStorage/keychainPrefetch.ts
+++ b/src/utils/secureStorage/keychainPrefetch.ts
@@ -52,7 +52,6 @@ function spawnSecurity(serviceName: string): Promise<SpawnResult> {
         // Exit 44 (entry not found) is a valid "no key" result and safe to
         // prime as null. But timeout (err.killed) means the keychain MAY have
         // a key we couldn't fetch — don't prime, let sync spawn retry.
-        // biome-ignore lint/nursery/noFloatingPromises: resolve() is not a floating promise
         resolve({
           stdout: err ? null : stdout?.trim() || null,
           timedOut: Boolean(err && 'killed' in err && err.killed),
diff --git a/src/utils/secureStorage/src/constants/oauth.ts b/src/utils/secureStorage/src/constants/oauth.ts
index a1b08933a..ae2abf9b1 100644
--- a/src/utils/secureStorage/src/constants/oauth.ts
+++ b/src/utils/secureStorage/src/constants/oauth.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getOauthConfig = any;
+export type getOauthConfig = any
diff --git a/src/utils/secureStorage/types.ts b/src/utils/secureStorage/types.ts
index 5a959bf39..263361dca 100644
--- a/src/utils/secureStorage/types.ts
+++ b/src/utils/secureStorage/types.ts
@@ -1,3 +1,3 @@
 // Auto-generated stub — replace with real implementation
-export type SecureStorage = any;
-export type SecureStorageData = any;
+export type SecureStorage = any
+export type SecureStorageData = any
diff --git a/src/utils/sentry.ts b/src/utils/sentry.ts
index 8ea72a19c..63d1359d7 100644
--- a/src/utils/sentry.ts
+++ b/src/utils/sentry.ts
@@ -31,7 +31,9 @@ export function initSentry(): void {
     dsn,
     release: typeof MACRO !== 'undefined' ? MACRO.VERSION : undefined,
     environment:
-      typeof BUILD_ENV !== 'undefined' ? (BUILD_ENV as string) : process.env.NODE_ENV || 'development',
+      typeof BUILD_ENV !== 'undefined'
+        ? (BUILD_ENV as string)
+        : process.env.NODE_ENV || 'development',
 
     // Limit breadcrumbs and attachments to control payload size
     maxBreadcrumbs: 20,
@@ -88,7 +90,10 @@ export function initSentry(): void {
  * Capture an exception and send it to Sentry.
  * No-op if Sentry has not been initialized.
  */
-export function captureException(error: unknown, context?: Record<string, unknown>): void {
+export function captureException(
+  error: unknown,
+  context?: Record<string, unknown>,
+): void {
   if (!initialized) {
     return
   }
@@ -125,7 +130,11 @@ export function setTag(key: string, value: string): void {
  * Set user context in Sentry for error attribution.
  * No-op if Sentry has not been initialized.
  */
-export function setUser(user: { id?: string; email?: string; username?: string }): void {
+export function setUser(user: {
+  id?: string
+  email?: string
+  username?: string
+}): void {
   if (!initialized) {
     return
   }
diff --git a/src/utils/sessionDataUploader.ts b/src/utils/sessionDataUploader.ts
index 5de795518..af8c792b7 100644
--- a/src/utils/sessionDataUploader.ts
+++ b/src/utils/sessionDataUploader.ts
@@ -1,3 +1,3 @@
 // Auto-generated stub — replace with real implementation
-export {};
-export const createSessionTurnUploader: () => void = () => {};
+export {}
+export const createSessionTurnUploader: () => void = () => {}
diff --git a/src/utils/sessionEnvironment.ts b/src/utils/sessionEnvironment.ts
index 1e4a40810..cb6d78c47 100644
--- a/src/utils/sessionEnvironment.ts
+++ b/src/utils/sessionEnvironment.ts
@@ -10,7 +10,7 @@ import { getPlatform } from './platform.js'
 // undefined = not yet loaded (need to check disk)
 // null = checked disk, no files exist (don't check again)
 // string = loaded and cached (use cached value)
-let sessionEnvScript: string | null | undefined = undefined
+let sessionEnvScript: string | null | undefined
 
 export async function getSessionEnvDirPath(): Promise<string> {
   const sessionEnvDir = join(
diff --git a/src/utils/sessionFileAccessHooks.ts b/src/utils/sessionFileAccessHooks.ts
index 4ddcae3b4..eb678c6b0 100644
--- a/src/utils/sessionFileAccessHooks.ts
+++ b/src/utils/sessionFileAccessHooks.ts
@@ -165,7 +165,10 @@ async function handleSessionFileAccess(
   }
 
   // Memdir access tracking
-  const filePath = getFilePathFromInput(input.tool_name as string, input.tool_input as string)
+  const filePath = getFilePathFromInput(
+    input.tool_name as string,
+    input.tool_input as string,
+  )
   if (filePath && isAutoMemFile(filePath)) {
     logEvent('tengu_memdir_accessed', {
       tool: input.tool_name as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
diff --git a/src/utils/sessionStorage.ts b/src/utils/sessionStorage.ts
index 994cdd42d..5398c739e 100644
--- a/src/utils/sessionStorage.ts
+++ b/src/utils/sessionStorage.ts
@@ -2148,7 +2148,9 @@ function recoverOrphanedParallelToolResults(
       m.type === 'user' &&
       m.parentUuid &&
       Array.isArray(m.message!.content) &&
-      (m.message!.content as Array<{type: string}>).some(b => b.type === 'tool_result')
+      (m.message!.content as Array<{ type: string }>).some(
+        b => b.type === 'tool_result',
+      )
     ) {
       const group = toolResultsByAsst.get(m.parentUuid)
       if (group) group.push(m)
@@ -4371,7 +4373,11 @@ function collectReplIds(messages: readonly Message[]): Set<string> {
   const ids = new Set<string>()
   for (const m of messages) {
     if (m.type === 'assistant' && Array.isArray(m.message!.content)) {
-      for (const b of m.message!.content as Array<{type: string; name: string; id: string}>) {
+      for (const b of m.message!.content as Array<{
+        type: string
+        name: string
+        id: string
+      }>) {
         if (b.type === 'tool_use' && b.name === REPL_TOOL_NAME) {
           ids.add(b.id)
         }
@@ -4490,7 +4496,7 @@ export async function findUnresolvedToolUse(
       if (message.type === 'assistant') {
         const content = message.message!.content
         if (Array.isArray(content)) {
-          for (const block of content as Array<{type: string; id: string}>) {
+          for (const block of content as Array<{ type: string; id: string }>) {
             if (block.type === 'tool_use' && block.id === toolUseId) {
               toolUseMessage = message
               break
@@ -4500,7 +4506,10 @@ export async function findUnresolvedToolUse(
       } else if (message.type === 'user') {
         const content = message.message!.content
         if (Array.isArray(content)) {
-          for (const block of content as Array<{type: string; tool_use_id: string}>) {
+          for (const block of content as Array<{
+            type: string
+            tool_use_id: string
+          }>) {
             if (
               block.type === 'tool_result' &&
               block.tool_use_id === toolUseId
@@ -4900,9 +4909,7 @@ function extractFirstPromptFromChunk(chunk: string): string {
         }
         return result
       }
-    } catch {
-      continue
-    }
+    } catch {}
   }
   // Session started with a slash command but had no subsequent real message —
   // use the clean command name so the session still appears in the resume picker
diff --git a/src/utils/sessionStoragePortable.ts b/src/utils/sessionStoragePortable.ts
index 4439fb31e..8cdd637bb 100644
--- a/src/utils/sessionStoragePortable.ts
+++ b/src/utils/sessionStoragePortable.ts
@@ -193,9 +193,7 @@ export function extractFirstPromptFromHead(head: string): string {
         }
         return result
       }
-    } catch {
-      continue
-    }
+    } catch {}
   }
   if (commandFallback) return commandFallback
   return ''
diff --git a/src/utils/sessionTitle.ts b/src/utils/sessionTitle.ts
index ba413e8d0..52fbe7093 100644
--- a/src/utils/sessionTitle.ts
+++ b/src/utils/sessionTitle.ts
@@ -35,7 +35,12 @@ export function extractConversationText(messages: Message[]): string {
   for (const msg of messages) {
     if (msg.type !== 'user' && msg.type !== 'assistant') continue
     if ('isMeta' in msg && msg.isMeta) continue
-    if ('origin' in msg && (msg as any).origin && (msg as any).origin.kind !== 'human') continue
+    if (
+      'origin' in msg &&
+      (msg as any).origin &&
+      (msg as any).origin.kind !== 'human'
+    )
+      continue
     const content = msg.message!.content
     if (typeof content === 'string') {
       parts.push(content)
diff --git a/src/utils/settings/__tests__/config.test.ts b/src/utils/settings/__tests__/config.test.ts
index f01b81f23..8e4786d46 100644
--- a/src/utils/settings/__tests__/config.test.ts
+++ b/src/utils/settings/__tests__/config.test.ts
@@ -1,4 +1,4 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from 'bun:test'
 import {
   SettingsSchema,
   EnvironmentVariablesSchema,
@@ -9,7 +9,7 @@ import {
   isMcpServerCommandEntry,
   isMcpServerUrlEntry,
   CUSTOMIZATION_SURFACES,
-} from "../types";
+} from '../types'
 import {
   SETTING_SOURCES,
   SOURCES,
@@ -19,465 +19,458 @@ import {
   getSettingSourceDisplayNameLowercase,
   getSettingSourceDisplayNameCapitalized,
   parseSettingSourcesFlag,
-} from "../constants";
+} from '../constants'
 import {
   formatZodError,
   filterInvalidPermissionRules,
   validateSettingsFileContent,
-} from "../validation";
+} from '../validation'
 
 // ─── Settings Schema Validation ──────────────────────────────────────────
 
-describe("SettingsSchema", () => {
-  test("accepts empty object", () => {
-    const result = SettingsSchema().safeParse({});
-    expect(result.success).toBe(true);
-  });
+describe('SettingsSchema', () => {
+  test('accepts empty object', () => {
+    const result = SettingsSchema().safeParse({})
+    expect(result.success).toBe(true)
+  })
 
-  test("accepts model string", () => {
-    const result = SettingsSchema().safeParse({ model: "sonnet" });
-    expect(result.success).toBe(true);
-  });
+  test('accepts model string', () => {
+    const result = SettingsSchema().safeParse({ model: 'sonnet' })
+    expect(result.success).toBe(true)
+  })
 
-  test("accepts permissions block with allow rules", () => {
+  test('accepts permissions block with allow rules', () => {
     const result = SettingsSchema().safeParse({
-      permissions: { allow: ["Bash(npm install)"] },
-    });
-    expect(result.success).toBe(true);
-  });
+      permissions: { allow: ['Bash(npm install)'] },
+    })
+    expect(result.success).toBe(true)
+  })
 
-  test("accepts permissions block with deny rules", () => {
+  test('accepts permissions block with deny rules', () => {
     const result = SettingsSchema().safeParse({
-      permissions: { deny: ["Bash(rm -rf *)"] },
-    });
-    expect(result.success).toBe(true);
-  });
+      permissions: { deny: ['Bash(rm -rf *)'] },
+    })
+    expect(result.success).toBe(true)
+  })
 
-  test("accepts env variables", () => {
+  test('accepts env variables', () => {
     const result = SettingsSchema().safeParse({
-      env: { FOO: "bar", DEBUG: "1" },
-    });
-    expect(result.success).toBe(true);
-  });
+      env: { FOO: 'bar', DEBUG: '1' },
+    })
+    expect(result.success).toBe(true)
+  })
 
-  test("accepts hooks configuration", () => {
+  test('accepts hooks configuration', () => {
     const result = SettingsSchema().safeParse({
       hooks: {
         PreToolUse: [
           {
-            matcher: "Bash",
-            hooks: [{ type: "command", command: "echo test" }],
+            matcher: 'Bash',
+            hooks: [{ type: 'command', command: 'echo test' }],
           },
         ],
       },
-    });
-    expect(result.success).toBe(true);
-  });
+    })
+    expect(result.success).toBe(true)
+  })
 
-  test("accepts attribution settings", () => {
+  test('accepts attribution settings', () => {
     const result = SettingsSchema().safeParse({
       attribution: {
-        commit: "Generated by AI",
-        pr: "AI-generated PR",
+        commit: 'Generated by AI',
+        pr: 'AI-generated PR',
       },
-    });
-    expect(result.success).toBe(true);
-  });
+    })
+    expect(result.success).toBe(true)
+  })
 
-  test("accepts worktree settings", () => {
+  test('accepts worktree settings', () => {
     const result = SettingsSchema().safeParse({
       worktree: {
-        symlinkDirectories: ["node_modules", ".cache"],
-        sparsePaths: ["src/"],
+        symlinkDirectories: ['node_modules', '.cache'],
+        sparsePaths: ['src/'],
       },
-    });
-    expect(result.success).toBe(true);
-  });
+    })
+    expect(result.success).toBe(true)
+  })
 
-  test("accepts $schema field", () => {
+  test('accepts $schema field', () => {
     const result = SettingsSchema().safeParse({
       $schema: CLAUDE_CODE_SETTINGS_SCHEMA_URL,
-    });
-    expect(result.success).toBe(true);
-  });
+    })
+    expect(result.success).toBe(true)
+  })
 
-  test("passes through unknown keys (passthrough mode)", () => {
-    const result = SettingsSchema().safeParse({ unknownKey: "value" });
-    expect(result.success).toBe(true);
+  test('passes through unknown keys (passthrough mode)', () => {
+    const result = SettingsSchema().safeParse({ unknownKey: 'value' })
+    expect(result.success).toBe(true)
     if (result.success) {
-      expect((result.data as any).unknownKey).toBe("value");
+      expect((result.data as any).unknownKey).toBe('value')
     }
-  });
+  })
 
-  test("coerces env var numbers to strings", () => {
-    const result = EnvironmentVariablesSchema().safeParse({ PORT: 3000 });
-    expect(result.success).toBe(true);
+  test('coerces env var numbers to strings', () => {
+    const result = EnvironmentVariablesSchema().safeParse({ PORT: 3000 })
+    expect(result.success).toBe(true)
     if (result.success) {
-      expect(result.data.PORT).toBe("3000");
+      expect(result.data.PORT).toBe('3000')
     }
-  });
+  })
 
-  test("accepts boolean settings", () => {
+  test('accepts boolean settings', () => {
     const result = SettingsSchema().safeParse({
       includeCoAuthoredBy: true,
       respectGitignore: false,
       disableAllHooks: true,
-    });
-    expect(result.success).toBe(true);
-  });
+    })
+    expect(result.success).toBe(true)
+  })
 
-  test("accepts cleanupPeriodDays", () => {
-    const result = SettingsSchema().safeParse({ cleanupPeriodDays: 30 });
-    expect(result.success).toBe(true);
-  });
+  test('accepts cleanupPeriodDays', () => {
+    const result = SettingsSchema().safeParse({ cleanupPeriodDays: 30 })
+    expect(result.success).toBe(true)
+  })
 
-  test("rejects negative cleanupPeriodDays", () => {
-    const result = SettingsSchema().safeParse({ cleanupPeriodDays: -1 });
-    expect(result.success).toBe(false);
-  });
+  test('rejects negative cleanupPeriodDays', () => {
+    const result = SettingsSchema().safeParse({ cleanupPeriodDays: -1 })
+    expect(result.success).toBe(false)
+  })
 
-  test("accepts statusLine configuration", () => {
+  test('accepts statusLine configuration', () => {
     const result = SettingsSchema().safeParse({
-      statusLine: { type: "command", command: "echo status" },
-    });
-    expect(result.success).toBe(true);
-  });
+      statusLine: { type: 'command', command: 'echo status' },
+    })
+    expect(result.success).toBe(true)
+  })
 
-  test("accepts sshConfigs", () => {
+  test('accepts sshConfigs', () => {
     const result = SettingsSchema().safeParse({
       sshConfigs: [
         {
-          id: "dev-server",
-          name: "Development Server",
-          sshHost: "dev.example.com",
+          id: 'dev-server',
+          name: 'Development Server',
+          sshHost: 'dev.example.com',
           sshPort: 22,
         },
       ],
-    });
-    expect(result.success).toBe(true);
-  });
-});
+    })
+    expect(result.success).toBe(true)
+  })
+})
 
 // ─── Permissions Schema ─────────────────────────────────────────────────
 
-describe("PermissionsSchema", () => {
-  test("accepts defaultMode", () => {
+describe('PermissionsSchema', () => {
+  test('accepts defaultMode', () => {
     const result = PermissionsSchema().safeParse({
-      defaultMode: "acceptEdits",
-    });
-    expect(result.success).toBe(true);
-  });
+      defaultMode: 'acceptEdits',
+    })
+    expect(result.success).toBe(true)
+  })
 
-  test("accepts additionalDirectories", () => {
+  test('accepts additionalDirectories', () => {
     const result = PermissionsSchema().safeParse({
-      additionalDirectories: ["/tmp/extra"],
-    });
-    expect(result.success).toBe(true);
-  });
+      additionalDirectories: ['/tmp/extra'],
+    })
+    expect(result.success).toBe(true)
+  })
 
-  test("accepts disableBypassPermissionsMode", () => {
+  test('accepts disableBypassPermissionsMode', () => {
     const result = PermissionsSchema().safeParse({
-      disableBypassPermissionsMode: "disable",
-    });
-    expect(result.success).toBe(true);
-  });
-});
+      disableBypassPermissionsMode: 'disable',
+    })
+    expect(result.success).toBe(true)
+  })
+})
 
 // ─── AllowedMcpServerEntrySchema ────────────────────────────────────────
 
-describe("AllowedMcpServerEntrySchema", () => {
-  test("accepts serverName entry", () => {
+describe('AllowedMcpServerEntrySchema', () => {
+  test('accepts serverName entry', () => {
     const result = AllowedMcpServerEntrySchema().safeParse({
-      serverName: "my-server",
-    });
-    expect(result.success).toBe(true);
-  });
+      serverName: 'my-server',
+    })
+    expect(result.success).toBe(true)
+  })
 
-  test("accepts serverCommand entry", () => {
+  test('accepts serverCommand entry', () => {
     const result = AllowedMcpServerEntrySchema().safeParse({
-      serverCommand: ["npx", "mcp-server"],
-    });
-    expect(result.success).toBe(true);
-  });
+      serverCommand: ['npx', 'mcp-server'],
+    })
+    expect(result.success).toBe(true)
+  })
 
-  test("accepts serverUrl entry", () => {
+  test('accepts serverUrl entry', () => {
     const result = AllowedMcpServerEntrySchema().safeParse({
-      serverUrl: "https://*.example.com/*",
-    });
-    expect(result.success).toBe(true);
-  });
+      serverUrl: 'https://*.example.com/*',
+    })
+    expect(result.success).toBe(true)
+  })
 
-  test("rejects entry with no fields", () => {
-    const result = AllowedMcpServerEntrySchema().safeParse({});
-    expect(result.success).toBe(false);
-  });
+  test('rejects entry with no fields', () => {
+    const result = AllowedMcpServerEntrySchema().safeParse({})
+    expect(result.success).toBe(false)
+  })
 
-  test("rejects entry with multiple fields", () => {
+  test('rejects entry with multiple fields', () => {
     const result = AllowedMcpServerEntrySchema().safeParse({
-      serverName: "my-server",
-      serverUrl: "https://example.com",
-    });
-    expect(result.success).toBe(false);
-  });
+      serverName: 'my-server',
+      serverUrl: 'https://example.com',
+    })
+    expect(result.success).toBe(false)
+  })
 
-  test("rejects invalid serverName characters", () => {
+  test('rejects invalid serverName characters', () => {
     const result = AllowedMcpServerEntrySchema().safeParse({
-      serverName: "my server with spaces",
-    });
-    expect(result.success).toBe(false);
-  });
+      serverName: 'my server with spaces',
+    })
+    expect(result.success).toBe(false)
+  })
 
-  test("rejects empty serverCommand array", () => {
+  test('rejects empty serverCommand array', () => {
     const result = AllowedMcpServerEntrySchema().safeParse({
       serverCommand: [],
-    });
-    expect(result.success).toBe(false);
-  });
-});
+    })
+    expect(result.success).toBe(false)
+  })
+})
 
 // ─── Type guards ─────────────────────────────────────────────────────────
 
-describe("MCP server entry type guards", () => {
-  test("isMcpServerNameEntry identifies name entry", () => {
-    expect(isMcpServerNameEntry({ serverName: "test" })).toBe(true);
-  });
+describe('MCP server entry type guards', () => {
+  test('isMcpServerNameEntry identifies name entry', () => {
+    expect(isMcpServerNameEntry({ serverName: 'test' })).toBe(true)
+  })
 
-  test("isMcpServerNameEntry rejects non-name entry", () => {
-    expect(isMcpServerNameEntry({ serverUrl: "https://example.com" })).toBe(
-      false
-    );
-  });
+  test('isMcpServerNameEntry rejects non-name entry', () => {
+    expect(isMcpServerNameEntry({ serverUrl: 'https://example.com' })).toBe(
+      false,
+    )
+  })
 
-  test("isMcpServerCommandEntry identifies command entry", () => {
-    expect(isMcpServerCommandEntry({ serverCommand: ["npx", "srv"] })).toBe(
-      true
-    );
-  });
+  test('isMcpServerCommandEntry identifies command entry', () => {
+    expect(isMcpServerCommandEntry({ serverCommand: ['npx', 'srv'] })).toBe(
+      true,
+    )
+  })
 
-  test("isMcpServerCommandEntry rejects non-command entry", () => {
-    expect(isMcpServerCommandEntry({ serverName: "test" })).toBe(false);
-  });
+  test('isMcpServerCommandEntry rejects non-command entry', () => {
+    expect(isMcpServerCommandEntry({ serverName: 'test' })).toBe(false)
+  })
 
-  test("isMcpServerUrlEntry identifies url entry", () => {
-    expect(
-      isMcpServerUrlEntry({ serverUrl: "https://example.com" })
-    ).toBe(true);
-  });
+  test('isMcpServerUrlEntry identifies url entry', () => {
+    expect(isMcpServerUrlEntry({ serverUrl: 'https://example.com' })).toBe(true)
+  })
 
-  test("isMcpServerUrlEntry rejects non-url entry", () => {
-    expect(isMcpServerUrlEntry({ serverName: "test" })).toBe(false);
-  });
-});
+  test('isMcpServerUrlEntry rejects non-url entry', () => {
+    expect(isMcpServerUrlEntry({ serverName: 'test' })).toBe(false)
+  })
+})
 
 // ─── Constants ──────────────────────────────────────────────────────────
 
-describe("SETTING_SOURCES", () => {
-  test("contains all five sources in order", () => {
+describe('SETTING_SOURCES', () => {
+  test('contains all five sources in order', () => {
     expect(SETTING_SOURCES).toEqual([
-      "userSettings",
-      "projectSettings",
-      "localSettings",
-      "flagSettings",
-      "policySettings",
-    ]);
-  });
-});
+      'userSettings',
+      'projectSettings',
+      'localSettings',
+      'flagSettings',
+      'policySettings',
+    ])
+  })
+})
 
-describe("SOURCES (editable)", () => {
-  test("contains three editable sources", () => {
+describe('SOURCES (editable)', () => {
+  test('contains three editable sources', () => {
     expect(SOURCES).toEqual([
-      "localSettings",
-      "projectSettings",
-      "userSettings",
-    ]);
-  });
-});
+      'localSettings',
+      'projectSettings',
+      'userSettings',
+    ])
+  })
+})
 
-describe("CUSTOMIZATION_SURFACES", () => {
-  test("contains expected surfaces", () => {
-    expect(CUSTOMIZATION_SURFACES).toEqual([
-      "skills",
-      "agents",
-      "hooks",
-      "mcp",
-    ]);
-  });
-});
+describe('CUSTOMIZATION_SURFACES', () => {
+  test('contains expected surfaces', () => {
+    expect(CUSTOMIZATION_SURFACES).toEqual(['skills', 'agents', 'hooks', 'mcp'])
+  })
+})
 
-describe("getSettingSourceName", () => {
-  test("maps userSettings to user", () => {
-    expect(getSettingSourceName("userSettings")).toBe("user");
-  });
+describe('getSettingSourceName', () => {
+  test('maps userSettings to user', () => {
+    expect(getSettingSourceName('userSettings')).toBe('user')
+  })
 
-  test("maps projectSettings to project", () => {
-    expect(getSettingSourceName("projectSettings")).toBe("project");
-  });
+  test('maps projectSettings to project', () => {
+    expect(getSettingSourceName('projectSettings')).toBe('project')
+  })
 
-  test("maps localSettings to project, gitignored", () => {
-    expect(getSettingSourceName("localSettings")).toBe("project, gitignored");
-  });
+  test('maps localSettings to project, gitignored', () => {
+    expect(getSettingSourceName('localSettings')).toBe('project, gitignored')
+  })
 
-  test("maps flagSettings to cli flag", () => {
-    expect(getSettingSourceName("flagSettings")).toBe("cli flag");
-  });
+  test('maps flagSettings to cli flag', () => {
+    expect(getSettingSourceName('flagSettings')).toBe('cli flag')
+  })
 
-  test("maps policySettings to managed", () => {
-    expect(getSettingSourceName("policySettings")).toBe("managed");
-  });
-});
+  test('maps policySettings to managed', () => {
+    expect(getSettingSourceName('policySettings')).toBe('managed')
+  })
+})
 
-describe("getSourceDisplayName", () => {
-  test("maps userSettings to User", () => {
-    expect(getSourceDisplayName("userSettings")).toBe("User");
-  });
+describe('getSourceDisplayName', () => {
+  test('maps userSettings to User', () => {
+    expect(getSourceDisplayName('userSettings')).toBe('User')
+  })
 
-  test("maps plugin to Plugin", () => {
-    expect(getSourceDisplayName("plugin")).toBe("Plugin");
-  });
+  test('maps plugin to Plugin', () => {
+    expect(getSourceDisplayName('plugin')).toBe('Plugin')
+  })
 
-  test("maps built-in to Built-in", () => {
-    expect(getSourceDisplayName("built-in")).toBe("Built-in");
-  });
-});
+  test('maps built-in to Built-in', () => {
+    expect(getSourceDisplayName('built-in')).toBe('Built-in')
+  })
+})
 
-describe("getSettingSourceDisplayNameLowercase", () => {
-  test("maps policySettings correctly", () => {
-    expect(getSettingSourceDisplayNameLowercase("policySettings")).toBe(
-      "enterprise managed settings"
-    );
-  });
+describe('getSettingSourceDisplayNameLowercase', () => {
+  test('maps policySettings correctly', () => {
+    expect(getSettingSourceDisplayNameLowercase('policySettings')).toBe(
+      'enterprise managed settings',
+    )
+  })
 
-  test("maps cliArg correctly", () => {
-    expect(getSettingSourceDisplayNameLowercase("cliArg")).toBe("CLI argument");
-  });
+  test('maps cliArg correctly', () => {
+    expect(getSettingSourceDisplayNameLowercase('cliArg')).toBe('CLI argument')
+  })
 
-  test("maps session correctly", () => {
-    expect(getSettingSourceDisplayNameLowercase("session")).toBe(
-      "current session"
-    );
-  });
-});
+  test('maps session correctly', () => {
+    expect(getSettingSourceDisplayNameLowercase('session')).toBe(
+      'current session',
+    )
+  })
+})
 
-describe("getSettingSourceDisplayNameCapitalized", () => {
-  test("maps userSettings correctly", () => {
-    expect(getSettingSourceDisplayNameCapitalized("userSettings")).toBe(
-      "User settings"
-    );
-  });
+describe('getSettingSourceDisplayNameCapitalized', () => {
+  test('maps userSettings correctly', () => {
+    expect(getSettingSourceDisplayNameCapitalized('userSettings')).toBe(
+      'User settings',
+    )
+  })
 
-  test("maps command correctly", () => {
-    expect(getSettingSourceDisplayNameCapitalized("command")).toBe(
-      "Command configuration"
-    );
-  });
-});
+  test('maps command correctly', () => {
+    expect(getSettingSourceDisplayNameCapitalized('command')).toBe(
+      'Command configuration',
+    )
+  })
+})
 
-describe("parseSettingSourcesFlag", () => {
-  test("parses comma-separated sources", () => {
-    expect(parseSettingSourcesFlag("user,project,local")).toEqual([
-      "userSettings",
-      "projectSettings",
-      "localSettings",
-    ]);
-  });
+describe('parseSettingSourcesFlag', () => {
+  test('parses comma-separated sources', () => {
+    expect(parseSettingSourcesFlag('user,project,local')).toEqual([
+      'userSettings',
+      'projectSettings',
+      'localSettings',
+    ])
+  })
 
-  test("parses single source", () => {
-    expect(parseSettingSourcesFlag("user")).toEqual(["userSettings"]);
-  });
+  test('parses single source', () => {
+    expect(parseSettingSourcesFlag('user')).toEqual(['userSettings'])
+  })
 
-  test("returns empty array for empty string", () => {
-    expect(parseSettingSourcesFlag("")).toEqual([]);
-  });
+  test('returns empty array for empty string', () => {
+    expect(parseSettingSourcesFlag('')).toEqual([])
+  })
 
-  test("trims whitespace", () => {
-    expect(parseSettingSourcesFlag("user , project")).toEqual([
-      "userSettings",
-      "projectSettings",
-    ]);
-  });
+  test('trims whitespace', () => {
+    expect(parseSettingSourcesFlag('user , project')).toEqual([
+      'userSettings',
+      'projectSettings',
+    ])
+  })
 
-  test("throws for invalid source name", () => {
-    expect(() => parseSettingSourcesFlag("invalid")).toThrow(
-      "Invalid setting source"
-    );
-  });
-});
+  test('throws for invalid source name', () => {
+    expect(() => parseSettingSourcesFlag('invalid')).toThrow(
+      'Invalid setting source',
+    )
+  })
+})
 
 // ─── Validation ─────────────────────────────────────────────────────────
 
-describe("filterInvalidPermissionRules", () => {
-  test("returns empty for non-object input", () => {
-    expect(filterInvalidPermissionRules(null, "test.json")).toEqual([]);
-    expect(filterInvalidPermissionRules("string", "test.json")).toEqual([]);
-  });
+describe('filterInvalidPermissionRules', () => {
+  test('returns empty for non-object input', () => {
+    expect(filterInvalidPermissionRules(null, 'test.json')).toEqual([])
+    expect(filterInvalidPermissionRules('string', 'test.json')).toEqual([])
+  })
 
-  test("returns empty when no permissions", () => {
-    expect(filterInvalidPermissionRules({}, "test.json")).toEqual([]);
-  });
+  test('returns empty when no permissions', () => {
+    expect(filterInvalidPermissionRules({}, 'test.json')).toEqual([])
+  })
 
-  test("filters non-string rules and returns warnings", () => {
-    const data = { permissions: { allow: ["Bash", 123, "Read"] } };
-    const warnings = filterInvalidPermissionRules(data, "test.json");
-    expect(warnings.length).toBe(1);
-    expect(warnings[0]!.path).toBe("permissions.allow");
-    expect((data.permissions as any).allow).toEqual(["Bash", "Read"]);
-  });
+  test('filters non-string rules and returns warnings', () => {
+    const data = { permissions: { allow: ['Bash', 123, 'Read'] } }
+    const warnings = filterInvalidPermissionRules(data, 'test.json')
+    expect(warnings.length).toBe(1)
+    expect(warnings[0]!.path).toBe('permissions.allow')
+    expect((data.permissions as any).allow).toEqual(['Bash', 'Read'])
+  })
 
-  test("preserves valid rules", () => {
+  test('preserves valid rules', () => {
     const data = {
-      permissions: { allow: ["Bash(npm install)", "Read", "Write"] },
-    };
-    const warnings = filterInvalidPermissionRules(data, "test.json");
-    expect(warnings).toEqual([]);
+      permissions: { allow: ['Bash(npm install)', 'Read', 'Write'] },
+    }
+    const warnings = filterInvalidPermissionRules(data, 'test.json')
+    expect(warnings).toEqual([])
     expect((data.permissions as any).allow).toEqual([
-      "Bash(npm install)",
-      "Read",
-      "Write",
-    ]);
-  });
-});
+      'Bash(npm install)',
+      'Read',
+      'Write',
+    ])
+  })
+})
 
-describe("validateSettingsFileContent", () => {
-  test("accepts valid JSON settings", () => {
-    const result = validateSettingsFileContent('{"model": "sonnet"}');
-    expect(result.isValid).toBe(true);
-  });
+describe('validateSettingsFileContent', () => {
+  test('accepts valid JSON settings', () => {
+    const result = validateSettingsFileContent('{"model": "sonnet"}')
+    expect(result.isValid).toBe(true)
+  })
 
-  test("accepts empty object", () => {
-    const result = validateSettingsFileContent("{}");
-    expect(result.isValid).toBe(true);
-  });
+  test('accepts empty object', () => {
+    const result = validateSettingsFileContent('{}')
+    expect(result.isValid).toBe(true)
+  })
 
-  test("rejects invalid JSON", () => {
-    const result = validateSettingsFileContent("not json");
-    expect(result.isValid).toBe(false);
+  test('rejects invalid JSON', () => {
+    const result = validateSettingsFileContent('not json')
+    expect(result.isValid).toBe(false)
     if (!result.isValid) {
-      expect((result as any).error).toContain("Invalid JSON");
+      expect((result as any).error).toContain('Invalid JSON')
     }
-  });
+  })
 
-  test("rejects unknown keys in strict mode", () => {
-    const result = validateSettingsFileContent('{"unknownField": true}');
-    expect(result.isValid).toBe(false);
-  });
-});
+  test('rejects unknown keys in strict mode', () => {
+    const result = validateSettingsFileContent('{"unknownField": true}')
+    expect(result.isValid).toBe(false)
+  })
+})
 
-describe("formatZodError", () => {
-  test("formats invalid type error", () => {
-    const result = SettingsSchema().safeParse({ model: 123 });
-    expect(result.success).toBe(false);
+describe('formatZodError', () => {
+  test('formats invalid type error', () => {
+    const result = SettingsSchema().safeParse({ model: 123 })
+    expect(result.success).toBe(false)
     if (!result.success) {
-      const errors = formatZodError(result.error, "settings.json");
-      expect(errors.length).toBeGreaterThan(0);
-      expect(errors[0]!.file).toBe("settings.json");
-      expect(errors[0]!.path).toContain("model");
+      const errors = formatZodError(result.error, 'settings.json')
+      expect(errors.length).toBeGreaterThan(0)
+      expect(errors[0]!.file).toBe('settings.json')
+      expect(errors[0]!.path).toContain('model')
     }
-  });
-});
+  })
+})
 
-describe("gemini settings", () => {
-  test("accepts gemini modelType", () => {
-    const result = SettingsSchema().safeParse({ modelType: "gemini" });
-    expect(result.success).toBe(true);
-  });
-});
+describe('gemini settings', () => {
+  test('accepts gemini modelType', () => {
+    const result = SettingsSchema().safeParse({ modelType: 'gemini' })
+    expect(result.success).toBe(true)
+  })
+})
diff --git a/src/utils/settings/mdm/rawRead.ts b/src/utils/settings/mdm/rawRead.ts
index 18aeacafd..689e8f834 100644
--- a/src/utils/settings/mdm/rawRead.ts
+++ b/src/utils/settings/mdm/rawRead.ts
@@ -39,7 +39,6 @@ function execFilePromise(
       args,
       { encoding: 'utf-8', timeout: MDM_SUBPROCESS_TIMEOUT_MS },
       (err, stdout) => {
-        // biome-ignore lint/nursery/noFloatingPromises: resolve() is not a floating promise
         resolve({ stdout: stdout ?? '', code: err ? 1 : 0 })
       },
     )
diff --git a/src/utils/settings/src/Tool.ts b/src/utils/settings/src/Tool.ts
index ed896638d..bbca0bd5e 100644
--- a/src/utils/settings/src/Tool.ts
+++ b/src/utils/settings/src/Tool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type ValidationResult = any;
+export type ValidationResult = any
diff --git a/src/utils/settings/src/services/mcp/types.ts b/src/utils/settings/src/services/mcp/types.ts
index f604edd2e..11f265958 100644
--- a/src/utils/settings/src/services/mcp/types.ts
+++ b/src/utils/settings/src/services/mcp/types.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type ConfigScope = any;
+export type ConfigScope = any
diff --git a/src/utils/settings/types.ts b/src/utils/settings/types.ts
index 127880c1a..e37a87adb 100644
--- a/src/utils/settings/types.ts
+++ b/src/utils/settings/types.ts
@@ -1159,4 +1159,3 @@ export type PluginConfig = {
     [serverName: string]: UserConfigValues
   }
 }
-
diff --git a/src/utils/shell/__tests__/outputLimits.test.ts b/src/utils/shell/__tests__/outputLimits.test.ts
index 7abd319ff..73142f68e 100644
--- a/src/utils/shell/__tests__/outputLimits.test.ts
+++ b/src/utils/shell/__tests__/outputLimits.test.ts
@@ -1,67 +1,67 @@
-import { mock, describe, expect, test, afterEach } from "bun:test";
+import { mock, describe, expect, test, afterEach } from 'bun:test'
 
 // Mock debug.ts to cut the bootstrap/state dependency chain
-mock.module("src/utils/debug.ts", () => ({
+mock.module('src/utils/debug.ts', () => ({
   logForDebugging: () => {},
   isDebugMode: () => false,
   isDebugToStdErr: () => false,
   getDebugFilePath: () => null,
   getDebugFilter: () => null,
-  getMinDebugLogLevel: () => "debug",
-  getDebugLogPath: () => "/tmp/mock-debug.log",
+  getMinDebugLogLevel: () => 'debug',
+  getDebugLogPath: () => '/tmp/mock-debug.log',
   flushDebugLogs: async () => {},
   enableDebugLogging: () => false,
   setHasFormattedOutput: () => {},
   getHasFormattedOutput: () => false,
   logAntError: () => {},
-}));
+}))
 
 const {
   getMaxOutputLength,
   BASH_MAX_OUTPUT_UPPER_LIMIT,
   BASH_MAX_OUTPUT_DEFAULT,
-} = await import("../outputLimits");
+} = await import('../outputLimits')
 
-describe("outputLimits constants", () => {
-  test("BASH_MAX_OUTPUT_UPPER_LIMIT is 150000", () => {
-    expect(BASH_MAX_OUTPUT_UPPER_LIMIT).toBe(150_000);
-  });
+describe('outputLimits constants', () => {
+  test('BASH_MAX_OUTPUT_UPPER_LIMIT is 150000', () => {
+    expect(BASH_MAX_OUTPUT_UPPER_LIMIT).toBe(150_000)
+  })
 
-  test("BASH_MAX_OUTPUT_DEFAULT is 30000", () => {
-    expect(BASH_MAX_OUTPUT_DEFAULT).toBe(30_000);
-  });
-});
+  test('BASH_MAX_OUTPUT_DEFAULT is 30000', () => {
+    expect(BASH_MAX_OUTPUT_DEFAULT).toBe(30_000)
+  })
+})
 
-describe("getMaxOutputLength", () => {
-  const saved = process.env.BASH_MAX_OUTPUT_LENGTH;
+describe('getMaxOutputLength', () => {
+  const saved = process.env.BASH_MAX_OUTPUT_LENGTH
 
   afterEach(() => {
-    if (saved === undefined) delete process.env.BASH_MAX_OUTPUT_LENGTH;
-    else process.env.BASH_MAX_OUTPUT_LENGTH = saved;
-  });
+    if (saved === undefined) delete process.env.BASH_MAX_OUTPUT_LENGTH
+    else process.env.BASH_MAX_OUTPUT_LENGTH = saved
+  })
 
-  test("returns default when env not set", () => {
-    delete process.env.BASH_MAX_OUTPUT_LENGTH;
-    expect(getMaxOutputLength()).toBe(30_000);
-  });
+  test('returns default when env not set', () => {
+    delete process.env.BASH_MAX_OUTPUT_LENGTH
+    expect(getMaxOutputLength()).toBe(30_000)
+  })
 
-  test("returns parsed value when valid", () => {
-    process.env.BASH_MAX_OUTPUT_LENGTH = "50000";
-    expect(getMaxOutputLength()).toBe(50_000);
-  });
+  test('returns parsed value when valid', () => {
+    process.env.BASH_MAX_OUTPUT_LENGTH = '50000'
+    expect(getMaxOutputLength()).toBe(50_000)
+  })
 
-  test("caps at upper limit", () => {
-    process.env.BASH_MAX_OUTPUT_LENGTH = "999999";
-    expect(getMaxOutputLength()).toBe(150_000);
-  });
+  test('caps at upper limit', () => {
+    process.env.BASH_MAX_OUTPUT_LENGTH = '999999'
+    expect(getMaxOutputLength()).toBe(150_000)
+  })
 
-  test("returns default for invalid value", () => {
-    process.env.BASH_MAX_OUTPUT_LENGTH = "not-a-number";
-    expect(getMaxOutputLength()).toBe(30_000);
-  });
+  test('returns default for invalid value', () => {
+    process.env.BASH_MAX_OUTPUT_LENGTH = 'not-a-number'
+    expect(getMaxOutputLength()).toBe(30_000)
+  })
 
-  test("returns default for negative value", () => {
-    process.env.BASH_MAX_OUTPUT_LENGTH = "-1";
-    expect(getMaxOutputLength()).toBe(30_000);
-  });
-});
+  test('returns default for negative value', () => {
+    process.env.BASH_MAX_OUTPUT_LENGTH = '-1'
+    expect(getMaxOutputLength()).toBe(30_000)
+  })
+})
diff --git a/src/utils/shell/prefix.ts b/src/utils/shell/prefix.ts
index e97a37b76..3949878e5 100644
--- a/src/utils/shell/prefix.ts
+++ b/src/utils/shell/prefix.ts
@@ -203,7 +203,6 @@ async function getCommandPrefixImpl(
         if (nonInteractive) {
           process.stderr.write(jsonStringify({ level: 'warn', message }) + '\n')
         } else {
-          // biome-ignore lint/suspicious/noConsole: intentional warning
           console.warn(chalk.yellow(`⚠️  ${message}`))
         }
       },
diff --git a/src/utils/sideQuery.ts b/src/utils/sideQuery.ts
index 4e6d4d731..859b5e962 100644
--- a/src/utils/sideQuery.ts
+++ b/src/utils/sideQuery.ts
@@ -178,7 +178,6 @@ export async function sideQuery(opts: SideQueryOptions): Promise<BetaMessage> {
 
   const normalizedModel = normalizeModelStringForAPI(model)
   const start = Date.now()
-  // biome-ignore lint/plugin: this IS the wrapper that handles OAuth attribution
   const response = await client.beta.messages.create(
     {
       model: normalizedModel,
diff --git a/src/utils/sideQuestion.ts b/src/utils/sideQuestion.ts
index 4d2755e20..1ddf12646 100644
--- a/src/utils/sideQuestion.ts
+++ b/src/utils/sideQuestion.ts
@@ -125,7 +125,12 @@ ${question}`
 function extractSideQuestionResponse(messages: Message[]): string | null {
   // Flatten all assistant content blocks across the per-block messages.
   const assistantBlocks = messages.flatMap(m =>
-    m.type === 'assistant' ? (m.message!.content as unknown as Array<{ type: string; [key: string]: unknown }>) : [],
+    m.type === 'assistant'
+      ? (m.message!.content as unknown as Array<{
+          type: string
+          [key: string]: unknown
+        }>)
+      : [],
   )
 
   if (assistantBlocks.length > 0) {
diff --git a/src/utils/sinks.ts b/src/utils/sinks.ts
index ba3999587..bd6acaeb2 100644
--- a/src/utils/sinks.ts
+++ b/src/utils/sinks.ts
@@ -1,4 +1,3 @@
-
 import { initializeErrorLogSink } from './errorLogSink.js'
 import { initializeAnalyticsSink } from '../services/analytics/sink.js'
 
diff --git a/src/utils/sliceAnsi.ts b/src/utils/sliceAnsi.ts
index 565a5f8cd..7b7d25e18 100644
--- a/src/utils/sliceAnsi.ts
+++ b/src/utils/sliceAnsi.ts
@@ -43,7 +43,13 @@ export default function sliceAnsi(
     // pass start/end in display cells (via stringWidth), so position must
     // track the same units.
     const width =
-      token.type === 'ansi' ? 0 : token.type === 'char' ? (token.fullWidth ? 2 : stringWidth(token.value)) : 0
+      token.type === 'ansi'
+        ? 0
+        : token.type === 'char'
+          ? token.fullWidth
+            ? 2
+            : stringWidth(token.value)
+          : 0
 
     // Break AFTER trailing zero-width marks — a combining mark attaches to
     // the preceding base char, so "भा" (भ + ा, 1 display cell) sliced at
diff --git a/src/utils/slowOperations.ts b/src/utils/slowOperations.ts
index 1cb454940..66e917895 100644
--- a/src/utils/slowOperations.ts
+++ b/src/utils/slowOperations.ts
@@ -6,7 +6,6 @@ import {
   fsyncSync,
   openSync,
 } from 'fs'
-// biome-ignore lint: This file IS the cloneDeep wrapper - it must import the original
 import lodashCloneDeep from 'lodash-es/cloneDeep.js'
 import { addSlowOperation } from '../bootstrap/state.js'
 import { logForDebugging } from './debug.js'
@@ -132,6 +131,7 @@ function slowLoggingAnt(
   ..._values: unknown[]
 ): AntSlowLogger {
   // eslint-disable-next-line prefer-rest-params
+  // biome-ignore lint/complexity/noArguments: intentional use of arguments object for AntSlowLogger
   return new AntSlowLogger(arguments)
 }
 
@@ -152,9 +152,12 @@ function slowLoggingExternal(): Disposable {
  * using _ = slowLogging`structuredClone(${value})`
  * const result = structuredClone(value)
  */
-export const slowLogging: {
-  (strings: TemplateStringsArray, ...values: unknown[]): Disposable
-} = feature('SLOW_OPERATION_LOGGING') ? slowLoggingAnt : slowLoggingExternal
+export const slowLogging: (
+  strings: TemplateStringsArray,
+  ...values: unknown[]
+) => Disposable = feature('SLOW_OPERATION_LOGGING')
+  ? slowLoggingAnt
+  : slowLoggingExternal
 
 // --- Wrapped operations ---
 
diff --git a/src/utils/src/bootstrap/state.ts b/src/utils/src/bootstrap/state.ts
index 7c1a523bf..1ab8f44db 100644
--- a/src/utils/src/bootstrap/state.ts
+++ b/src/utils/src/bootstrap/state.ts
@@ -1,5 +1,5 @@
 // Auto-generated type stub — replace with real implementation
-export type getOriginalCwd = any;
-export type getSessionId = any;
-export type getIsNonInteractiveSession = any;
-export type isSessionPersistenceDisabled = any;
+export type getOriginalCwd = any
+export type getSessionId = any
+export type getIsNonInteractiveSession = any
+export type isSessionPersistenceDisabled = any
diff --git a/src/utils/src/constants/oauth.ts b/src/utils/src/constants/oauth.ts
index 4a2c8878d..874738805 100644
--- a/src/utils/src/constants/oauth.ts
+++ b/src/utils/src/constants/oauth.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type getOauthConfig = any;
-export type OAUTH_BETA_HEADER = any;
-export type CLAUDE_AI_PROFILE_SCOPE = any;
+export type getOauthConfig = any
+export type OAUTH_BETA_HEADER = any
+export type CLAUDE_AI_PROFILE_SCOPE = any
diff --git a/src/utils/src/constants/prompts.ts b/src/utils/src/constants/prompts.ts
index 5f6f23012..2520db868 100644
--- a/src/utils/src/constants/prompts.ts
+++ b/src/utils/src/constants/prompts.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type getSystemPrompt = any;
-export type SYSTEM_PROMPT_DYNAMIC_BOUNDARY = any;
+export type getSystemPrompt = any
+export type SYSTEM_PROMPT_DYNAMIC_BOUNDARY = any
diff --git a/src/utils/src/constants/querySource.ts b/src/utils/src/constants/querySource.ts
index 61a17200d..09b2d0921 100644
--- a/src/utils/src/constants/querySource.ts
+++ b/src/utils/src/constants/querySource.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type QuerySource = any;
+export type QuerySource = any
diff --git a/src/utils/src/context.ts b/src/utils/src/context.ts
index f303aa8c4..062b639b1 100644
--- a/src/utils/src/context.ts
+++ b/src/utils/src/context.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type getSystemContext = any;
-export type getUserContext = any;
+export type getSystemContext = any
+export type getUserContext = any
diff --git a/src/utils/src/entrypoints/agentSdkTypes.ts b/src/utils/src/entrypoints/agentSdkTypes.ts
index 982295636..9557c5397 100644
--- a/src/utils/src/entrypoints/agentSdkTypes.ts
+++ b/src/utils/src/entrypoints/agentSdkTypes.ts
@@ -1,37 +1,37 @@
 // Auto-generated type stub — replace with real implementation
-export type ExitReason = any;
-export type HookEvent = any;
-export type SDKAssistantMessageError = any;
-export type ModelUsage = any;
-export type SDKMessage = any;
-export type SyncHookJSONOutput = any;
-export type HookInput = any;
-export type HookJSONOutput = any;
-export type NotificationHookInput = any;
-export type PostToolUseHookInput = any;
-export type PostToolUseFailureHookInput = any;
-export type PermissionDeniedHookInput = any;
-export type PreCompactHookInput = any;
-export type PostCompactHookInput = any;
-export type PreToolUseHookInput = any;
-export type SessionStartHookInput = any;
-export type SessionEndHookInput = any;
-export type SetupHookInput = any;
-export type StopHookInput = any;
-export type StopFailureHookInput = any;
-export type SubagentStartHookInput = any;
-export type SubagentStopHookInput = any;
-export type TeammateIdleHookInput = any;
-export type TaskCreatedHookInput = any;
-export type TaskCompletedHookInput = any;
-export type ConfigChangeHookInput = any;
-export type CwdChangedHookInput = any;
-export type FileChangedHookInput = any;
-export type InstructionsLoadedHookInput = any;
-export type UserPromptSubmitHookInput = any;
-export type PermissionRequestHookInput = any;
-export type ElicitationHookInput = any;
-export type ElicitationResultHookInput = any;
-export type PermissionUpdate = any;
-export type AsyncHookJSONOutput = any;
-export type SDKAssistantMessage = any;
+export type ExitReason = any
+export type HookEvent = any
+export type SDKAssistantMessageError = any
+export type ModelUsage = any
+export type SDKMessage = any
+export type SyncHookJSONOutput = any
+export type HookInput = any
+export type HookJSONOutput = any
+export type NotificationHookInput = any
+export type PostToolUseHookInput = any
+export type PostToolUseFailureHookInput = any
+export type PermissionDeniedHookInput = any
+export type PreCompactHookInput = any
+export type PostCompactHookInput = any
+export type PreToolUseHookInput = any
+export type SessionStartHookInput = any
+export type SessionEndHookInput = any
+export type SetupHookInput = any
+export type StopHookInput = any
+export type StopFailureHookInput = any
+export type SubagentStartHookInput = any
+export type SubagentStopHookInput = any
+export type TeammateIdleHookInput = any
+export type TaskCreatedHookInput = any
+export type TaskCompletedHookInput = any
+export type ConfigChangeHookInput = any
+export type CwdChangedHookInput = any
+export type FileChangedHookInput = any
+export type InstructionsLoadedHookInput = any
+export type UserPromptSubmitHookInput = any
+export type PermissionRequestHookInput = any
+export type ElicitationHookInput = any
+export type ElicitationResultHookInput = any
+export type PermissionUpdate = any
+export type AsyncHookJSONOutput = any
+export type SDKAssistantMessage = any
diff --git a/src/utils/src/entrypoints/sdk/controlTypes.ts b/src/utils/src/entrypoints/sdk/controlTypes.ts
index bd1b0590d..0558ada22 100644
--- a/src/utils/src/entrypoints/sdk/controlTypes.ts
+++ b/src/utils/src/entrypoints/sdk/controlTypes.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type StdoutMessage = any;
+export type StdoutMessage = any
diff --git a/src/utils/src/entrypoints/sdk/runtimeTypes.ts b/src/utils/src/entrypoints/sdk/runtimeTypes.ts
index 9ce95c99b..d55a29a1a 100644
--- a/src/utils/src/entrypoints/sdk/runtimeTypes.ts
+++ b/src/utils/src/entrypoints/sdk/runtimeTypes.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type EffortLevel = 'low' | 'medium' | 'high' | 'max';
+export type EffortLevel = 'low' | 'medium' | 'high' | 'max'
diff --git a/src/utils/src/services/analytics/config.ts b/src/utils/src/services/analytics/config.ts
index a74c40666..fab156bed 100644
--- a/src/utils/src/services/analytics/config.ts
+++ b/src/utils/src/services/analytics/config.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type isAnalyticsDisabled = any;
+export type isAnalyticsDisabled = any
diff --git a/src/utils/src/services/analytics/growthbook.ts b/src/utils/src/services/analytics/growthbook.ts
index 5b9ce0380..ca94cb301 100644
--- a/src/utils/src/services/analytics/growthbook.ts
+++ b/src/utils/src/services/analytics/growthbook.ts
@@ -1,5 +1,5 @@
 // Auto-generated type stub — replace with real implementation
-export type checkGate_CACHED_OR_BLOCKING = any;
-export type getFeatureValue_CACHED_MAY_BE_STALE = any;
-export type checkStatsigFeatureGate_CACHED_MAY_BE_STALE = any;
-export type getDynamicConfig_BLOCKS_ON_INIT = any;
+export type checkGate_CACHED_OR_BLOCKING = any
+export type getFeatureValue_CACHED_MAY_BE_STALE = any
+export type checkStatsigFeatureGate_CACHED_MAY_BE_STALE = any
+export type getDynamicConfig_BLOCKS_ON_INIT = any
diff --git a/src/utils/src/services/analytics/index.ts b/src/utils/src/services/analytics/index.ts
index 142e7b6f5..2e0f796da 100644
--- a/src/utils/src/services/analytics/index.ts
+++ b/src/utils/src/services/analytics/index.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any;
-export type logEvent = any;
+export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any
+export type logEvent = any
diff --git a/src/utils/src/services/analytics/metadata.ts b/src/utils/src/services/analytics/metadata.ts
index b00cab5f1..a72480cb0 100644
--- a/src/utils/src/services/analytics/metadata.ts
+++ b/src/utils/src/services/analytics/metadata.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any;
-export type sanitizeToolNameForAnalytics = any;
+export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any
+export type sanitizeToolNameForAnalytics = any
diff --git a/src/utils/src/services/compact/microCompact.ts b/src/utils/src/services/compact/microCompact.ts
index 26c0c27cf..bd9426240 100644
--- a/src/utils/src/services/compact/microCompact.ts
+++ b/src/utils/src/services/compact/microCompact.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type microcompactMessages = any;
+export type microcompactMessages = any
diff --git a/src/utils/src/services/mcp/client.ts b/src/utils/src/services/mcp/client.ts
index 65f6d1153..66576e782 100644
--- a/src/utils/src/services/mcp/client.ts
+++ b/src/utils/src/services/mcp/client.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type prefetchAllMcpResources = any;
+export type prefetchAllMcpResources = any
diff --git a/src/utils/src/services/mcp/types.ts b/src/utils/src/services/mcp/types.ts
index 8d1c88e90..0efce811d 100644
--- a/src/utils/src/services/mcp/types.ts
+++ b/src/utils/src/services/mcp/types.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type ScopedMcpServerConfig = any;
+export type ScopedMcpServerConfig = any
diff --git a/src/utils/src/services/mcp/vscodeSdkMcp.ts b/src/utils/src/services/mcp/vscodeSdkMcp.ts
index ac040b3c9..9fab00af2 100644
--- a/src/utils/src/services/mcp/vscodeSdkMcp.ts
+++ b/src/utils/src/services/mcp/vscodeSdkMcp.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type notifyVscodeFileUpdated = any;
+export type notifyVscodeFileUpdated = any
diff --git a/src/utils/src/services/policyLimits/index.ts b/src/utils/src/services/policyLimits/index.ts
index 887817d1a..d46f0fab1 100644
--- a/src/utils/src/services/policyLimits/index.ts
+++ b/src/utils/src/services/policyLimits/index.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type isPolicyAllowed = any;
+export type isPolicyAllowed = any
diff --git a/src/utils/src/tools.ts b/src/utils/src/tools.ts
index f9dcbf2e5..7dee8a4c7 100644
--- a/src/utils/src/tools.ts
+++ b/src/utils/src/tools.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getTools = any;
+export type getTools = any
diff --git a/src/utils/src/tools/AgentTool/built-in/exploreAgent.ts b/src/utils/src/tools/AgentTool/built-in/exploreAgent.ts
index 22214f18c..2b7ee861b 100644
--- a/src/utils/src/tools/AgentTool/built-in/exploreAgent.ts
+++ b/src/utils/src/tools/AgentTool/built-in/exploreAgent.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type EXPLORE_AGENT = any;
+export type EXPLORE_AGENT = any
diff --git a/src/utils/src/tools/AgentTool/built-in/planAgent.ts b/src/utils/src/tools/AgentTool/built-in/planAgent.ts
index 6ff4323b2..6f6e19d6f 100644
--- a/src/utils/src/tools/AgentTool/built-in/planAgent.ts
+++ b/src/utils/src/tools/AgentTool/built-in/planAgent.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type PLAN_AGENT = any;
+export type PLAN_AGENT = any
diff --git a/src/utils/src/tools/AgentTool/builtInAgents.ts b/src/utils/src/tools/AgentTool/builtInAgents.ts
index 8358c0b6b..95fce9108 100644
--- a/src/utils/src/tools/AgentTool/builtInAgents.ts
+++ b/src/utils/src/tools/AgentTool/builtInAgents.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type areExplorePlanAgentsEnabled = any;
+export type areExplorePlanAgentsEnabled = any
diff --git a/src/utils/src/tools/AgentTool/constants.ts b/src/utils/src/tools/AgentTool/constants.ts
index c5969e5de..a835a0b7e 100644
--- a/src/utils/src/tools/AgentTool/constants.ts
+++ b/src/utils/src/tools/AgentTool/constants.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type AGENT_TOOL_NAME = any;
+export type AGENT_TOOL_NAME = any
diff --git a/src/utils/src/tools/AskUserQuestionTool/prompt.ts b/src/utils/src/tools/AskUserQuestionTool/prompt.ts
index 93098f1a8..3c3e73e35 100644
--- a/src/utils/src/tools/AskUserQuestionTool/prompt.ts
+++ b/src/utils/src/tools/AskUserQuestionTool/prompt.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type ASK_USER_QUESTION_TOOL_NAME = any;
+export type ASK_USER_QUESTION_TOOL_NAME = any
diff --git a/src/utils/src/tools/BashTool/BashTool.ts b/src/utils/src/tools/BashTool/BashTool.ts
index 7a3ea3cc5..0e57d5e17 100644
--- a/src/utils/src/tools/BashTool/BashTool.ts
+++ b/src/utils/src/tools/BashTool/BashTool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type BashTool = any;
+export type BashTool = any
diff --git a/src/utils/src/tools/ExitPlanModeTool/ExitPlanModeV2Tool.ts b/src/utils/src/tools/ExitPlanModeTool/ExitPlanModeV2Tool.ts
index f9708d2b3..1e7971d36 100644
--- a/src/utils/src/tools/ExitPlanModeTool/ExitPlanModeV2Tool.ts
+++ b/src/utils/src/tools/ExitPlanModeTool/ExitPlanModeV2Tool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type ExitPlanModeV2Tool = any;
+export type ExitPlanModeV2Tool = any
diff --git a/src/utils/src/tools/FileEditTool/FileEditTool.ts b/src/utils/src/tools/FileEditTool/FileEditTool.ts
index 0d3bc60eb..5493abf9c 100644
--- a/src/utils/src/tools/FileEditTool/FileEditTool.ts
+++ b/src/utils/src/tools/FileEditTool/FileEditTool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type FileEditTool = any;
+export type FileEditTool = any
diff --git a/src/utils/src/tools/FileEditTool/constants.ts b/src/utils/src/tools/FileEditTool/constants.ts
index b455c0655..f851a8bcc 100644
--- a/src/utils/src/tools/FileEditTool/constants.ts
+++ b/src/utils/src/tools/FileEditTool/constants.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type FILE_EDIT_TOOL_NAME = any;
+export type FILE_EDIT_TOOL_NAME = any
diff --git a/src/utils/src/tools/FileEditTool/utils.ts b/src/utils/src/tools/FileEditTool/utils.ts
index 5a2f3c0af..c11fab89d 100644
--- a/src/utils/src/tools/FileEditTool/utils.ts
+++ b/src/utils/src/tools/FileEditTool/utils.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type normalizeFileEditInput = any;
-export type stripTrailingWhitespace = any;
-export type getSnippetForTwoFileDiff = any;
+export type normalizeFileEditInput = any
+export type stripTrailingWhitespace = any
+export type getSnippetForTwoFileDiff = any
diff --git a/src/utils/src/tools/FileReadTool/limits.ts b/src/utils/src/tools/FileReadTool/limits.ts
index a094e85b8..9070b0db4 100644
--- a/src/utils/src/tools/FileReadTool/limits.ts
+++ b/src/utils/src/tools/FileReadTool/limits.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getDefaultFileReadingLimits = any;
+export type getDefaultFileReadingLimits = any
diff --git a/src/utils/src/tools/FileReadTool/prompt.ts b/src/utils/src/tools/FileReadTool/prompt.ts
index a8a0962eb..2de7ffef2 100644
--- a/src/utils/src/tools/FileReadTool/prompt.ts
+++ b/src/utils/src/tools/FileReadTool/prompt.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type FILE_READ_TOOL_NAME = any;
-export type MAX_LINES_TO_READ = any;
+export type FILE_READ_TOOL_NAME = any
+export type MAX_LINES_TO_READ = any
diff --git a/src/utils/src/tools/FileWriteTool/FileWriteTool.ts b/src/utils/src/tools/FileWriteTool/FileWriteTool.ts
index 9417a7a94..8e268cd91 100644
--- a/src/utils/src/tools/FileWriteTool/FileWriteTool.ts
+++ b/src/utils/src/tools/FileWriteTool/FileWriteTool.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type FileWriteTool = any;
+export type FileWriteTool = any
diff --git a/src/utils/src/tools/FileWriteTool/prompt.ts b/src/utils/src/tools/FileWriteTool/prompt.ts
index e69299d74..45cc15c49 100644
--- a/src/utils/src/tools/FileWriteTool/prompt.ts
+++ b/src/utils/src/tools/FileWriteTool/prompt.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type FILE_WRITE_TOOL_NAME = any;
+export type FILE_WRITE_TOOL_NAME = any
diff --git a/src/utils/src/tools/GlobTool/prompt.ts b/src/utils/src/tools/GlobTool/prompt.ts
index 060caf29c..5ff2b16bb 100644
--- a/src/utils/src/tools/GlobTool/prompt.ts
+++ b/src/utils/src/tools/GlobTool/prompt.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type GLOB_TOOL_NAME = any;
+export type GLOB_TOOL_NAME = any
diff --git a/src/utils/src/tools/GrepTool/prompt.ts b/src/utils/src/tools/GrepTool/prompt.ts
index 08b8a8d29..4645d4c52 100644
--- a/src/utils/src/tools/GrepTool/prompt.ts
+++ b/src/utils/src/tools/GrepTool/prompt.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type GREP_TOOL_NAME = any;
+export type GREP_TOOL_NAME = any
diff --git a/src/utils/src/tools/LSPTool/prompt.ts b/src/utils/src/tools/LSPTool/prompt.ts
index 9be378e3c..646628407 100644
--- a/src/utils/src/tools/LSPTool/prompt.ts
+++ b/src/utils/src/tools/LSPTool/prompt.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type LSP_TOOL_NAME = any;
+export type LSP_TOOL_NAME = any
diff --git a/src/utils/src/tools/ListMcpResourcesTool/prompt.ts b/src/utils/src/tools/ListMcpResourcesTool/prompt.ts
index 987c4a383..43ea34889 100644
--- a/src/utils/src/tools/ListMcpResourcesTool/prompt.ts
+++ b/src/utils/src/tools/ListMcpResourcesTool/prompt.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type LIST_MCP_RESOURCES_TOOL_NAME = any;
+export type LIST_MCP_RESOURCES_TOOL_NAME = any
diff --git a/src/utils/src/tools/NotebookEditTool/constants.ts b/src/utils/src/tools/NotebookEditTool/constants.ts
index 6c6c94bad..3c1d7a0d2 100644
--- a/src/utils/src/tools/NotebookEditTool/constants.ts
+++ b/src/utils/src/tools/NotebookEditTool/constants.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type NOTEBOOK_EDIT_TOOL_NAME = any;
+export type NOTEBOOK_EDIT_TOOL_NAME = any
diff --git a/src/utils/src/tools/TaskStopTool/prompt.ts b/src/utils/src/tools/TaskStopTool/prompt.ts
index 28c2e71db..d3cff1f79 100644
--- a/src/utils/src/tools/TaskStopTool/prompt.ts
+++ b/src/utils/src/tools/TaskStopTool/prompt.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type TASK_STOP_TOOL_NAME = any;
+export type TASK_STOP_TOOL_NAME = any
diff --git a/src/utils/src/tools/WebSearchTool/prompt.ts b/src/utils/src/tools/WebSearchTool/prompt.ts
index 38871a0ba..3d3f02b32 100644
--- a/src/utils/src/tools/WebSearchTool/prompt.ts
+++ b/src/utils/src/tools/WebSearchTool/prompt.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type WEB_SEARCH_TOOL_NAME = any;
+export type WEB_SEARCH_TOOL_NAME = any
diff --git a/src/utils/src/types/ids.ts b/src/utils/src/types/ids.ts
index ba0dcc8a1..e64b5672b 100644
--- a/src/utils/src/types/ids.ts
+++ b/src/utils/src/types/ids.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type AgentId = any;
-export type SessionId = any;
+export type AgentId = any
+export type SessionId = any
diff --git a/src/utils/src/types/logs.ts b/src/utils/src/types/logs.ts
index 729b9b474..83adb9fff 100644
--- a/src/utils/src/types/logs.ts
+++ b/src/utils/src/types/logs.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type LogOption = any;
+export type LogOption = any
diff --git a/src/utils/src/types/message.ts b/src/utils/src/types/message.ts
index b7e8d1779..8aa9f934d 100644
--- a/src/utils/src/types/message.ts
+++ b/src/utils/src/types/message.ts
@@ -1,8 +1,8 @@
 // Auto-generated type stub — replace with real implementation
-export type AssistantMessage = any;
-export type AttachmentMessage<T = any> = any;
-export type SystemFileSnapshotMessage = any;
-export type UserMessage = any;
-export type Message = any;
-export type MessageOrigin = any;
-export type HookResultMessage = any;
+export type AssistantMessage = any
+export type AttachmentMessage<T = any> = any
+export type SystemFileSnapshotMessage = any
+export type UserMessage = any
+export type Message = any
+export type MessageOrigin = any
+export type HookResultMessage = any
diff --git a/src/utils/src/types/textInputTypes.ts b/src/utils/src/types/textInputTypes.ts
index 976f11a1b..9b957a07a 100644
--- a/src/utils/src/types/textInputTypes.ts
+++ b/src/utils/src/types/textInputTypes.ts
@@ -1,4 +1,4 @@
 // Auto-generated type stub — replace with real implementation
-export type QueuedCommand = any;
-export type getImagePasteIds = any;
-export type isValidImagePaste = any;
+export type QueuedCommand = any
+export type getImagePasteIds = any
+export type isValidImagePaste = any
diff --git a/src/utils/src/types/utils.ts b/src/utils/src/types/utils.ts
index 96cc5d26d..135d35483 100644
--- a/src/utils/src/types/utils.ts
+++ b/src/utils/src/types/utils.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type Permutations = any;
-export type DeepImmutable = any;
+export type Permutations = any
+export type DeepImmutable = any
diff --git a/src/utils/src/utils/cwd.ts b/src/utils/src/utils/cwd.ts
index 76c192ed8..4bd56a824 100644
--- a/src/utils/src/utils/cwd.ts
+++ b/src/utils/src/utils/cwd.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getCwd = any;
+export type getCwd = any
diff --git a/src/utils/src/utils/messages.ts b/src/utils/src/utils/messages.ts
index f77394204..c79baec05 100644
--- a/src/utils/src/utils/messages.ts
+++ b/src/utils/src/utils/messages.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type extractTextContent = any;
+export type extractTextContent = any
diff --git a/src/utils/src/utils/model/modelStrings.ts b/src/utils/src/utils/model/modelStrings.ts
index 1265ece0e..a58abdf93 100644
--- a/src/utils/src/utils/model/modelStrings.ts
+++ b/src/utils/src/utils/model/modelStrings.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getModelStrings = any;
+export type getModelStrings = any
diff --git a/src/utils/src/utils/model/providers.ts b/src/utils/src/utils/model/providers.ts
index df87a41b4..1379140e8 100644
--- a/src/utils/src/utils/model/providers.ts
+++ b/src/utils/src/utils/model/providers.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getAPIProvider = any;
+export type getAPIProvider = any
diff --git a/src/utils/src/utils/secureStorage/macOsKeychainHelpers.ts b/src/utils/src/utils/secureStorage/macOsKeychainHelpers.ts
index 9a57f4079..402efe525 100644
--- a/src/utils/src/utils/secureStorage/macOsKeychainHelpers.ts
+++ b/src/utils/src/utils/secureStorage/macOsKeychainHelpers.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getMacOsKeychainStorageServiceName = any;
+export type getMacOsKeychainStorageServiceName = any
diff --git a/src/utils/src/utils/shell/shellToolUtils.ts b/src/utils/src/utils/shell/shellToolUtils.ts
index c89fe2ada..c5f7e0226 100644
--- a/src/utils/src/utils/shell/shellToolUtils.ts
+++ b/src/utils/src/utils/shell/shellToolUtils.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type SHELL_TOOL_NAMES = any;
+export type SHELL_TOOL_NAMES = any
diff --git a/src/utils/src/utils/stringUtils.ts b/src/utils/src/utils/stringUtils.ts
index ac925fccf..84bd3925d 100644
--- a/src/utils/src/utils/stringUtils.ts
+++ b/src/utils/src/utils/stringUtils.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type capitalize = any;
+export type capitalize = any
diff --git a/src/utils/staticRender.tsx b/src/utils/staticRender.tsx
index 2f066fe96..65f1ff0ad 100644
--- a/src/utils/staticRender.tsx
+++ b/src/utils/staticRender.tsx
@@ -1,8 +1,8 @@
-import * as React from 'react'
-import { useLayoutEffect } from 'react'
-import { PassThrough } from 'stream'
-import stripAnsi from 'strip-ansi'
-import { wrappedRender as render, useApp } from '@anthropic/ink'
+import * as React from 'react';
+import { useLayoutEffect } from 'react';
+import { PassThrough } from 'stream';
+import stripAnsi from 'strip-ansi';
+import { wrappedRender as render, useApp } from '@anthropic/ink';
 
 // This is a workaround for the fact that Ink doesn't support multiple <Static>
 // components in the same render tree. Instead of using a <Static> we just render
@@ -14,26 +14,22 @@ import { wrappedRender as render, useApp } from '@anthropic/ink'
  * before exiting. This is more robust than process.nextTick() for React 19's
  * async render cycle.
  */
-function RenderOnceAndExit({
-  children,
-}: {
-  children: React.ReactNode
-}): React.ReactNode {
-  const { exit } = useApp()
+function RenderOnceAndExit({ children }: { children: React.ReactNode }): React.ReactNode {
+  const { exit } = useApp();
 
   // useLayoutEffect runs synchronously after React commits DOM mutations.
   // setTimeout(0) defers exit to allow Ink to flush output to the stream.
   useLayoutEffect(() => {
-    const timer = setTimeout(exit, 0)
-    return () => clearTimeout(timer)
-  }, [exit])
+    const timer = setTimeout(exit, 0);
+    return () => clearTimeout(timer);
+  }, [exit]);
 
-  return <>{children}</>
+  return <>{children}</>;
 }
 
 // DEC synchronized update markers used by terminals
-const SYNC_START = '\x1B[?2026h'
-const SYNC_END = '\x1B[?2026l'
+const SYNC_START = '\x1B[?2026h';
+const SYNC_END = '\x1B[?2026l';
 
 /**
  * Extracts content from the first complete frame in Ink's output.
@@ -41,64 +37,56 @@ const SYNC_END = '\x1B[?2026l'
  * update sequences ([?2026h ... [?2026l). We only want the first frame's content.
  */
 function extractFirstFrame(output: string): string {
-  const startIndex = output.indexOf(SYNC_START)
-  if (startIndex === -1) return output
+  const startIndex = output.indexOf(SYNC_START);
+  if (startIndex === -1) return output;
 
-  const contentStart = startIndex + SYNC_START.length
-  const endIndex = output.indexOf(SYNC_END, contentStart)
-  if (endIndex === -1) return output
+  const contentStart = startIndex + SYNC_START.length;
+  const endIndex = output.indexOf(SYNC_END, contentStart);
+  if (endIndex === -1) return output;
 
-  return output.slice(contentStart, endIndex)
+  return output.slice(contentStart, endIndex);
 }
 
 /**
  * Renders a React node to a string with ANSI escape codes (for terminal output).
  */
-export function renderToAnsiString(
-  node: React.ReactNode,
-  columns?: number,
-): Promise<string> {
+export function renderToAnsiString(node: React.ReactNode, columns?: number): Promise<string> {
+  // biome-ignore lint/suspicious/noAsyncPromiseExecutor: async needed for sequential awaits inside executor
   return new Promise(async resolve => {
-    let output = ''
+    let output = '';
 
     // Capture all writes. Set .columns so Ink (ink.tsx:~165) picks up a
     // chosen width instead of PassThrough's undefined → 80 fallback —
     // useful for rendering at terminal width for file dumps that should
     // match what the user sees on screen.
-    const stream = new PassThrough()
+    const stream = new PassThrough();
     if (columns !== undefined) {
-      ;(stream as unknown as { columns: number }).columns = columns
+      (stream as unknown as { columns: number }).columns = columns;
     }
     stream.on('data', chunk => {
-      output += chunk.toString()
-    })
+      output += chunk.toString();
+    });
 
     // Render the component wrapped in RenderOnceAndExit
     // Non-TTY stdout (PassThrough) gives full-frame output instead of diffs
-    const instance = await render(
-      <RenderOnceAndExit>{node}</RenderOnceAndExit>,
-      {
-        stdout: stream as unknown as NodeJS.WriteStream,
-        patchConsole: false,
-      },
-    )
+    const instance = await render(<RenderOnceAndExit>{node}</RenderOnceAndExit>, {
+      stdout: stream as unknown as NodeJS.WriteStream,
+      patchConsole: false,
+    });
 
     // Wait for the component to exit naturally
-    await instance.waitUntilExit()
+    await instance.waitUntilExit();
 
     // Extract only the first frame's content to avoid duplication
     // (Ink outputs multiple frames in non-TTY mode)
-    await resolve(extractFirstFrame(output))
-  })
+    await resolve(extractFirstFrame(output));
+  });
 }
 
 /**
  * Renders a React node to a plain text string (ANSI codes stripped).
  */
-export async function renderToString(
-  node: React.ReactNode,
-  columns?: number,
-): Promise<string> {
-  const output = await renderToAnsiString(node, columns)
-  return stripAnsi(output)
+export async function renderToString(node: React.ReactNode, columns?: number): Promise<string> {
+  const output = await renderToAnsiString(node, columns);
+  return stripAnsi(output);
 }
diff --git a/src/utils/stats.ts b/src/utils/stats.ts
index d23e93e6f..59f769eeb 100644
--- a/src/utils/stats.ts
+++ b/src/utils/stats.ts
@@ -793,7 +793,7 @@ function processedStatsToClaudeCodeStats(
     hourEntries.length > 0
       ? parseInt(
           hourEntries.reduce((max, [hour, count]) =>
-            count > parseInt(max[1].toString()) ? [hour, count] : max,
+            count > parseInt(max[1].toString(), 10) ? [hour, count] : max,
           )[0],
           10,
         )
diff --git a/src/utils/status.tsx b/src/utils/status.tsx
index b4cb087c2..794206696 100644
--- a/src/utils/status.tsx
+++ b/src/utils/status.tsx
@@ -1,69 +1,46 @@
-import chalk from 'chalk'
-import figures from 'figures'
-import * as React from 'react'
-import { color, Text } from '@anthropic/ink'
-import type { MCPServerConnection } from '../services/mcp/types.js'
-import { getAccountInformation, isClaudeAISubscriber } from './auth.js'
-import {
-  getLargeMemoryFiles,
-  getMemoryFiles,
-  MAX_MEMORY_CHARACTER_COUNT,
-} from './claudemd.js'
-import { getDoctorDiagnostic } from './doctorDiagnostic.js'
-import {
-  getAWSRegion,
-  getDefaultVertexRegion,
-  isEnvTruthy,
-} from './envUtils.js'
-import { getDisplayPath } from './file.js'
-import { formatNumber } from './format.js'
-import {
-  getIdeClientName,
-  type IDEExtensionInstallationStatus,
-  isJetBrainsIde,
-  toIDEDisplayName,
-} from './ide.js'
-import {
-  getClaudeAiUserDefaultModelDescription,
-  modelDisplayString,
-} from './model/model.js'
-import { getAPIProvider } from './model/providers.js'
-import { getMTLSConfig } from './mtls.js'
-import { checkInstall } from './nativeInstaller/index.js'
-import { getProxyUrl } from './proxy.js'
-import { SandboxManager } from './sandbox/sandbox-adapter.js'
-import { getSettingsWithAllErrors } from './settings/allErrors.js'
-import {
-  getEnabledSettingSources,
-  getSettingSourceDisplayNameCapitalized,
-} from './settings/constants.js'
-import {
-  getManagedFileSettingsPresence,
-  getPolicySettingsOrigin,
-  getSettingsForSource,
-} from './settings/settings.js'
-import type { ThemeName } from './theme.js'
+import chalk from 'chalk';
+import figures from 'figures';
+import * as React from 'react';
+import { color, Text } from '@anthropic/ink';
+import type { MCPServerConnection } from '../services/mcp/types.js';
+import { getAccountInformation, isClaudeAISubscriber } from './auth.js';
+import { getLargeMemoryFiles, getMemoryFiles, MAX_MEMORY_CHARACTER_COUNT } from './claudemd.js';
+import { getDoctorDiagnostic } from './doctorDiagnostic.js';
+import { getAWSRegion, getDefaultVertexRegion, isEnvTruthy } from './envUtils.js';
+import { getDisplayPath } from './file.js';
+import { formatNumber } from './format.js';
+import { getIdeClientName, type IDEExtensionInstallationStatus, isJetBrainsIde, toIDEDisplayName } from './ide.js';
+import { getClaudeAiUserDefaultModelDescription, modelDisplayString } from './model/model.js';
+import { getAPIProvider } from './model/providers.js';
+import { getMTLSConfig } from './mtls.js';
+import { checkInstall } from './nativeInstaller/index.js';
+import { getProxyUrl } from './proxy.js';
+import { SandboxManager } from './sandbox/sandbox-adapter.js';
+import { getSettingsWithAllErrors } from './settings/allErrors.js';
+import { getEnabledSettingSources, getSettingSourceDisplayNameCapitalized } from './settings/constants.js';
+import { getManagedFileSettingsPresence, getPolicySettingsOrigin, getSettingsForSource } from './settings/settings.js';
+import type { ThemeName } from './theme.js';
 
 export type Property = {
-  label?: string
-  value: React.ReactNode | Array<string>
-}
+  label?: string;
+  value: React.ReactNode | Array<string>;
+};
 
-export type Diagnostic = React.ReactNode
+export type Diagnostic = React.ReactNode;
 
 export function buildSandboxProperties(): Property[] {
   if (process.env.USER_TYPE !== 'ant') {
-    return []
+    return [];
   }
 
-  const isSandboxed = SandboxManager.isSandboxingEnabled()
+  const isSandboxed = SandboxManager.isSandboxingEnabled();
 
   return [
     {
       label: 'Bash Sandbox',
       value: isSandboxed ? 'Enabled' : 'Disabled',
     },
-  ]
+  ];
 }
 
 export function buildIDEProperties(
@@ -71,13 +48,11 @@ export function buildIDEProperties(
   ideInstallationStatus: IDEExtensionInstallationStatus | null = null,
   theme: ThemeName,
 ): Property[] {
-  const ideClient = mcpClients?.find(client => client.name === 'ide')
+  const ideClient = mcpClients?.find(client => client.name === 'ide');
 
   if (ideInstallationStatus) {
-    const ideName = toIDEDisplayName(ideInstallationStatus.ideType)
-    const pluginOrExtension = isJetBrainsIde(ideInstallationStatus.ideType)
-      ? 'plugin'
-      : 'extension'
+    const ideName = toIDEDisplayName(ideInstallationStatus.ideType);
+    const pluginOrExtension = isJetBrainsIde(ideInstallationStatus.ideType) ? 'plugin' : 'extension';
 
     if (ideInstallationStatus.error) {
       return [
@@ -85,34 +60,31 @@ export function buildIDEProperties(
           label: 'IDE',
           value: (
             <Text>
-              {color('error', theme)(figures.cross)} Error installing {ideName}{' '}
-              {pluginOrExtension}: {ideInstallationStatus.error}
+              {color('error', theme)(figures.cross)} Error installing {ideName} {pluginOrExtension}:{' '}
+              {ideInstallationStatus.error}
               {'\n'}Please restart your IDE and try again.
             </Text>
           ),
         },
-      ]
+      ];
     }
 
     if (ideInstallationStatus.installed) {
       if (ideClient && ideClient.type === 'connected') {
-        if (
-          ideInstallationStatus.installedVersion !==
-          ideClient.serverInfo?.version
-        ) {
+        if (ideInstallationStatus.installedVersion !== ideClient.serverInfo?.version) {
           return [
             {
               label: 'IDE',
               value: `Connected to ${ideName} ${pluginOrExtension} version ${ideInstallationStatus.installedVersion} (server version: ${ideClient.serverInfo?.version})`,
             },
-          ]
+          ];
         } else {
           return [
             {
               label: 'IDE',
               value: `Connected to ${ideName} ${pluginOrExtension} version ${ideInstallationStatus.installedVersion}`,
             },
-          ]
+          ];
         }
       } else {
         return [
@@ -120,196 +92,183 @@ export function buildIDEProperties(
             label: 'IDE',
             value: `Installed ${ideName} ${pluginOrExtension}`,
           },
-        ]
+        ];
       }
     }
   } else if (ideClient) {
-    const ideName = getIdeClientName(ideClient) ?? 'IDE'
+    const ideName = getIdeClientName(ideClient) ?? 'IDE';
     if (ideClient.type === 'connected') {
       return [
         {
           label: 'IDE',
           value: `Connected to ${ideName} extension`,
         },
-      ]
+      ];
     } else {
       return [
         {
           label: 'IDE',
           value: `${color('error', theme)(figures.cross)} Not connected to ${ideName}`,
         },
-      ]
+      ];
     }
   }
 
-  return []
+  return [];
 }
 
-export function buildMcpProperties(
-  clients: MCPServerConnection[] = [],
-  theme: ThemeName,
-): Property[] {
-  const servers = clients.filter(client => client.name !== 'ide')
+export function buildMcpProperties(clients: MCPServerConnection[] = [], theme: ThemeName): Property[] {
+  const servers = clients.filter(client => client.name !== 'ide');
   if (!servers.length) {
-    return []
+    return [];
   }
 
   // Summary instead of a full server list — 20+ servers wrapped onto many
   // rows, dominating the Status pane. Show counts by state + /mcp hint.
-  const byState = { connected: 0, pending: 0, needsAuth: 0, failed: 0 }
+  const byState = { connected: 0, pending: 0, needsAuth: 0, failed: 0 };
   for (const s of servers) {
-    if (s.type === 'connected') byState.connected++
-    else if (s.type === 'pending') byState.pending++
-    else if (s.type === 'needs-auth') byState.needsAuth++
-    else byState.failed++
+    if (s.type === 'connected') byState.connected++;
+    else if (s.type === 'pending') byState.pending++;
+    else if (s.type === 'needs-auth') byState.needsAuth++;
+    else byState.failed++;
   }
-  const parts: string[] = []
-  if (byState.connected)
-    parts.push(color('success', theme)(`${byState.connected} connected`))
-  if (byState.needsAuth)
-    parts.push(color('warning', theme)(`${byState.needsAuth} need auth`))
-  if (byState.pending)
-    parts.push(color('inactive', theme)(`${byState.pending} pending`))
-  if (byState.failed)
-    parts.push(color('error', theme)(`${byState.failed} failed`))
+  const parts: string[] = [];
+  if (byState.connected) parts.push(color('success', theme)(`${byState.connected} connected`));
+  if (byState.needsAuth) parts.push(color('warning', theme)(`${byState.needsAuth} need auth`));
+  if (byState.pending) parts.push(color('inactive', theme)(`${byState.pending} pending`));
+  if (byState.failed) parts.push(color('error', theme)(`${byState.failed} failed`));
 
   return [
     {
       label: 'MCP servers',
       value: `${parts.join(', ')} ${color('inactive', theme)('· /mcp')}`,
     },
-  ]
+  ];
 }
 
 export async function buildMemoryDiagnostics(): Promise<Diagnostic[]> {
-  const files = await getMemoryFiles()
-  const largeFiles = getLargeMemoryFiles(files)
+  const files = await getMemoryFiles();
+  const largeFiles = getLargeMemoryFiles(files);
 
-  const diagnostics: Diagnostic[] = []
+  const diagnostics: Diagnostic[] = [];
 
   largeFiles.forEach(file => {
-    const displayPath = getDisplayPath(file.path)
+    const displayPath = getDisplayPath(file.path);
     diagnostics.push(
       `Large ${displayPath} will impact performance (${formatNumber(file.content.length)} chars > ${formatNumber(MAX_MEMORY_CHARACTER_COUNT)})`,
-    )
-  })
+    );
+  });
 
-  return diagnostics
+  return diagnostics;
 }
 
 export function buildSettingSourcesProperties(): Property[] {
-  const enabledSources = getEnabledSettingSources()
+  const enabledSources = getEnabledSettingSources();
 
   // Filter to only sources that actually have settings loaded
   const sourcesWithSettings = enabledSources.filter(source => {
-    const settings = getSettingsForSource(source)
-    return settings !== null && Object.keys(settings).length > 0
-  })
+    const settings = getSettingsForSource(source);
+    return settings !== null && Object.keys(settings).length > 0;
+  });
 
   // Map internal names to user-friendly names
   // For policySettings, distinguish between remote and local (or skip if neither exists)
   const sourceNames = sourcesWithSettings
     .map(source => {
       if (source === 'policySettings') {
-        const origin = getPolicySettingsOrigin()
+        const origin = getPolicySettingsOrigin();
         if (origin === null) {
-          return null // Skip - no policy settings exist
+          return null; // Skip - no policy settings exist
         }
         switch (origin) {
           case 'remote':
-            return 'Enterprise managed settings (remote)'
+            return 'Enterprise managed settings (remote)';
           case 'plist':
-            return 'Enterprise managed settings (plist)'
+            return 'Enterprise managed settings (plist)';
           case 'hklm':
-            return 'Enterprise managed settings (HKLM)'
+            return 'Enterprise managed settings (HKLM)';
           case 'file': {
-            const { hasBase, hasDropIns } = getManagedFileSettingsPresence()
+            const { hasBase, hasDropIns } = getManagedFileSettingsPresence();
             if (hasBase && hasDropIns) {
-              return 'Enterprise managed settings (file + drop-ins)'
+              return 'Enterprise managed settings (file + drop-ins)';
             }
             if (hasDropIns) {
-              return 'Enterprise managed settings (drop-ins)'
+              return 'Enterprise managed settings (drop-ins)';
             }
-            return 'Enterprise managed settings (file)'
+            return 'Enterprise managed settings (file)';
           }
           case 'hkcu':
-            return 'Enterprise managed settings (HKCU)'
+            return 'Enterprise managed settings (HKCU)';
         }
       }
-      return getSettingSourceDisplayNameCapitalized(source)
+      return getSettingSourceDisplayNameCapitalized(source);
     })
-    .filter((name): name is string => name !== null)
+    .filter((name): name is string => name !== null);
 
   return [
     {
       label: 'Setting sources',
       value: sourceNames,
     },
-  ]
+  ];
 }
 
 export async function buildInstallationDiagnostics(): Promise<Diagnostic[]> {
-  const installWarnings = await checkInstall()
-  return installWarnings.map(warning => warning.message)
+  const installWarnings = await checkInstall();
+  return installWarnings.map(warning => warning.message);
 }
 
-export async function buildInstallationHealthDiagnostics(): Promise<
-  Diagnostic[]
-> {
-  const diagnostic = await getDoctorDiagnostic()
-  const items: Diagnostic[] = []
+export async function buildInstallationHealthDiagnostics(): Promise<Diagnostic[]> {
+  const diagnostic = await getDoctorDiagnostic();
+  const items: Diagnostic[] = [];
 
-  const { errors: validationErrors } = getSettingsWithAllErrors()
+  const { errors: validationErrors } = getSettingsWithAllErrors();
   if (validationErrors.length > 0) {
-    const invalidFiles = Array.from(
-      new Set(validationErrors.map(error => error.file)),
-    )
-    const fileList = invalidFiles.join(', ')
+    const invalidFiles = Array.from(new Set(validationErrors.map(error => error.file)));
+    const fileList = invalidFiles.join(', ');
 
-    items.push(
-      `Found invalid settings files: ${fileList}. They will be ignored.`,
-    )
+    items.push(`Found invalid settings files: ${fileList}. They will be ignored.`);
   }
 
   // Add warnings from doctor diagnostic (includes leftover installations, config mismatches, etc.)
   diagnostic.warnings.forEach(warning => {
-    items.push(warning.issue)
-  })
+    items.push(warning.issue);
+  });
 
   if (diagnostic.hasUpdatePermissions === false) {
-    items.push('No write permissions for auto-updates (requires sudo)')
+    items.push('No write permissions for auto-updates (requires sudo)');
   }
 
-  return items
+  return items;
 }
 
 export function buildAccountProperties(): Property[] {
-  const accountInfo = getAccountInformation()
+  const accountInfo = getAccountInformation();
   if (!accountInfo) {
-    return []
+    return [];
   }
 
-  const properties: Property[] = []
+  const properties: Property[] = [];
 
   if (accountInfo.subscription) {
     properties.push({
       label: 'Login method',
       value: `${accountInfo.subscription} Account`,
-    })
+    });
   }
 
   if (accountInfo.tokenSource) {
     properties.push({
       label: 'Auth token',
       value: accountInfo.tokenSource,
-    })
+    });
   }
 
   if (accountInfo.apiKeySource) {
     properties.push({
       label: 'API key',
       value: accountInfo.apiKeySource,
-    })
+    });
   }
 
   // Hide sensitive account info in demo mode
@@ -317,22 +276,22 @@ export function buildAccountProperties(): Property[] {
     properties.push({
       label: 'Organization',
       value: accountInfo.organization,
-    })
+    });
   }
   if (accountInfo.email && !process.env.IS_DEMO) {
     properties.push({
       label: 'Email',
       value: accountInfo.email,
-    })
+    });
   }
 
-  return properties
+  return properties;
 }
 
 export function buildAPIProviderProperties(): Property[] {
-  const apiProvider = getAPIProvider()
+  const apiProvider = getAPIProvider();
 
-  const properties: Property[] = []
+  const properties: Property[] = [];
 
   if (apiProvider !== 'firstParty') {
     const providerLabel = {
@@ -342,152 +301,151 @@ export function buildAPIProviderProperties(): Property[] {
       gemini: 'Gemini API',
       grok: 'Grok API',
       openai: 'OpenAI API',
-    }[apiProvider]
+    }[apiProvider];
     properties.push({
       label: 'API provider',
       value: providerLabel,
-    })
+    });
   }
 
   if (apiProvider === 'firstParty') {
-    const anthropicBaseUrl = process.env.ANTHROPIC_BASE_URL
+    const anthropicBaseUrl = process.env.ANTHROPIC_BASE_URL;
     if (anthropicBaseUrl) {
       properties.push({
         label: 'Anthropic base URL',
         value: anthropicBaseUrl,
-      })
+      });
     }
   } else if (apiProvider === 'bedrock') {
-    const bedrockBaseUrl = process.env.BEDROCK_BASE_URL
+    const bedrockBaseUrl = process.env.BEDROCK_BASE_URL;
     if (bedrockBaseUrl) {
       properties.push({
         label: 'Bedrock base URL',
         value: bedrockBaseUrl,
-      })
+      });
     }
 
     properties.push({
       label: 'AWS region',
       value: getAWSRegion(),
-    })
+    });
 
     if (isEnvTruthy(process.env.CLAUDE_CODE_SKIP_BEDROCK_AUTH)) {
       properties.push({
         value: 'AWS auth skipped',
-      })
+      });
     }
   } else if (apiProvider === 'vertex') {
-    const vertexBaseUrl = process.env.VERTEX_BASE_URL
+    const vertexBaseUrl = process.env.VERTEX_BASE_URL;
     if (vertexBaseUrl) {
       properties.push({
         label: 'Vertex base URL',
         value: vertexBaseUrl,
-      })
+      });
     }
 
-    const gcpProject = process.env.ANTHROPIC_VERTEX_PROJECT_ID
+    const gcpProject = process.env.ANTHROPIC_VERTEX_PROJECT_ID;
     if (gcpProject) {
       properties.push({
         label: 'GCP project',
         value: gcpProject,
-      })
+      });
     }
 
     properties.push({
       label: 'Default region',
       value: getDefaultVertexRegion(),
-    })
+    });
 
     if (isEnvTruthy(process.env.CLAUDE_CODE_SKIP_VERTEX_AUTH)) {
       properties.push({
         value: 'GCP auth skipped',
-      })
+      });
     }
   } else if (apiProvider === 'foundry') {
-    const foundryBaseUrl = process.env.ANTHROPIC_FOUNDRY_BASE_URL
+    const foundryBaseUrl = process.env.ANTHROPIC_FOUNDRY_BASE_URL;
     if (foundryBaseUrl) {
       properties.push({
         label: 'Microsoft Foundry base URL',
         value: foundryBaseUrl,
-      })
+      });
     }
 
-    const foundryResource = process.env.ANTHROPIC_FOUNDRY_RESOURCE
+    const foundryResource = process.env.ANTHROPIC_FOUNDRY_RESOURCE;
     if (foundryResource) {
       properties.push({
         label: 'Microsoft Foundry resource',
         value: foundryResource,
-      })
+      });
     }
 
     if (isEnvTruthy(process.env.CLAUDE_CODE_SKIP_FOUNDRY_AUTH)) {
       properties.push({
         value: 'Microsoft Foundry auth skipped',
-      })
+      });
     }
   } else if (apiProvider === 'gemini') {
-    const geminiBaseUrl =
-      process.env.GEMINI_BASE_URL || 'https://generativelanguage.googleapis.com/v1beta'
+    const geminiBaseUrl = process.env.GEMINI_BASE_URL || 'https://generativelanguage.googleapis.com/v1beta';
     properties.push({
       label: 'Gemini base URL',
       value: geminiBaseUrl,
-    })
+    });
   } else if (apiProvider === 'grok') {
-    const grokBaseUrl = process.env.GROK_BASE_URL
+    const grokBaseUrl = process.env.GROK_BASE_URL;
     properties.push({
       label: 'Grok base URL',
       value: grokBaseUrl,
-    })
+    });
   } else if (apiProvider === 'openai') {
-    const openaiBaseUrl = process.env.OPENAI_BASE_URL
+    const openaiBaseUrl = process.env.OPENAI_BASE_URL;
     properties.push({
       label: 'OpenAI base URL',
       value: openaiBaseUrl,
-    })
+    });
   }
 
-  const proxyUrl = getProxyUrl()
+  const proxyUrl = getProxyUrl();
   if (proxyUrl) {
     properties.push({
       label: 'Proxy',
       value: proxyUrl,
-    })
+    });
   }
 
-  const mtlsConfig = getMTLSConfig()
+  const mtlsConfig = getMTLSConfig();
   if (process.env.NODE_EXTRA_CA_CERTS) {
     properties.push({
       label: 'Additional CA cert(s)',
       value: process.env.NODE_EXTRA_CA_CERTS,
-    })
+    });
   }
   if (mtlsConfig) {
     if (mtlsConfig.cert && process.env.CLAUDE_CODE_CLIENT_CERT) {
       properties.push({
         label: 'mTLS client cert',
         value: process.env.CLAUDE_CODE_CLIENT_CERT,
-      })
+      });
     }
 
     if (mtlsConfig.key && process.env.CLAUDE_CODE_CLIENT_KEY) {
       properties.push({
         label: 'mTLS client key',
         value: process.env.CLAUDE_CODE_CLIENT_KEY,
-      })
+      });
     }
   }
 
-  return properties
+  return properties;
 }
 
 export function getModelDisplayLabel(mainLoopModel: string | null): string {
-  let modelLabel = modelDisplayString(mainLoopModel)
+  let modelLabel = modelDisplayString(mainLoopModel);
 
   if (mainLoopModel === null && isClaudeAISubscriber()) {
-    const description = getClaudeAiUserDefaultModelDescription()
+    const description = getClaudeAiUserDefaultModelDescription();
 
-    modelLabel = `${chalk.bold('Default')} ${description}`
+    modelLabel = `${chalk.bold('Default')} ${description}`;
   }
 
-  return modelLabel
+  return modelLabel;
 }
diff --git a/src/utils/statusNoticeDefinitions.tsx b/src/utils/statusNoticeDefinitions.tsx
index af480c882..adbf861c4 100644
--- a/src/utils/statusNoticeDefinitions.tsx
+++ b/src/utils/statusNoticeDefinitions.tsx
@@ -1,49 +1,38 @@
 // biome-ignore-all assist/source/organizeImports: ANT-ONLY import markers must not be reordered
-import { Box, Text } from '@anthropic/ink'
-import * as React from 'react'
-import {
-  getLargeMemoryFiles,
-  MAX_MEMORY_CHARACTER_COUNT,
-  type MemoryFileInfo,
-} from './claudemd.js'
-import figures from 'figures'
-import { getCwd } from './cwd.js'
-import { relative } from 'path'
-import { formatNumber } from './format.js'
-import type { getGlobalConfig } from './config.js'
+import { Box, Text } from '@anthropic/ink';
+import * as React from 'react';
+import { getLargeMemoryFiles, MAX_MEMORY_CHARACTER_COUNT, type MemoryFileInfo } from './claudemd.js';
+import figures from 'figures';
+import { getCwd } from './cwd.js';
+import { relative } from 'path';
+import { formatNumber } from './format.js';
+import type { getGlobalConfig } from './config.js';
 import {
   getAnthropicApiKeyWithSource,
   getApiKeyFromConfigOrMacOSKeychain,
   getAuthTokenSource,
   isClaudeAISubscriber,
-} from './auth.js'
-import type { AgentDefinitionsResult } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js'
-import {
-  getAgentDescriptionsTotalTokens,
-  AGENT_DESCRIPTIONS_THRESHOLD,
-} from './statusNoticeHelpers.js'
-import {
-  isSupportedJetBrainsTerminal,
-  toIDEDisplayName,
-  getTerminalIdeType,
-} from './ide.js'
-import { isJetBrainsPluginInstalledCachedSync } from './jetbrains.js'
+} from './auth.js';
+import type { AgentDefinitionsResult } from '@claude-code-best/builtin-tools/tools/AgentTool/loadAgentsDir.js';
+import { getAgentDescriptionsTotalTokens, AGENT_DESCRIPTIONS_THRESHOLD } from './statusNoticeHelpers.js';
+import { isSupportedJetBrainsTerminal, toIDEDisplayName, getTerminalIdeType } from './ide.js';
+import { isJetBrainsPluginInstalledCachedSync } from './jetbrains.js';
 
 // Types
-export type StatusNoticeType = 'warning' | 'info'
+export type StatusNoticeType = 'warning' | 'info';
 
 export type StatusNoticeContext = {
-  config: ReturnType<typeof getGlobalConfig>
-  agentDefinitions?: AgentDefinitionsResult
-  memoryFiles: MemoryFileInfo[]
-}
+  config: ReturnType<typeof getGlobalConfig>;
+  agentDefinitions?: AgentDefinitionsResult;
+  memoryFiles: MemoryFileInfo[];
+};
 
 export type StatusNoticeDefinition = {
-  id: string
-  type: StatusNoticeType
-  isActive: (context: StatusNoticeContext) => boolean
-  render: (context: StatusNoticeContext) => React.ReactNode
-}
+  id: string;
+  type: StatusNoticeType;
+  isActive: (context: StatusNoticeContext) => boolean;
+  render: (context: StatusNoticeContext) => React.ReactNode;
+};
 
 // Individual notice definitions
 const largeMemoryFilesNotice: StatusNoticeDefinition = {
@@ -51,56 +40,50 @@ const largeMemoryFilesNotice: StatusNoticeDefinition = {
   type: 'warning',
   isActive: ctx => getLargeMemoryFiles(ctx.memoryFiles).length > 0,
   render: ctx => {
-    const largeMemoryFiles = getLargeMemoryFiles(ctx.memoryFiles)
+    const largeMemoryFiles = getLargeMemoryFiles(ctx.memoryFiles);
     return (
       <>
         {largeMemoryFiles.map(file => {
-          const displayPath = file.path.startsWith(getCwd())
-            ? relative(getCwd(), file.path)
-            : file.path
+          const displayPath = file.path.startsWith(getCwd()) ? relative(getCwd(), file.path) : file.path;
 
           return (
             <Box key={file.path} flexDirection="row">
               <Text color="warning">{figures.warning}</Text>
               <Text color="warning">
-                Large <Text bold>{displayPath}</Text> will impact performance (
-                {formatNumber(file.content.length)} chars &gt;{' '}
-                {formatNumber(MAX_MEMORY_CHARACTER_COUNT)})
-                <Text dimColor> · /memory to edit</Text>
+                Large <Text bold>{displayPath}</Text> will impact performance ({formatNumber(file.content.length)} chars
+                &gt; {formatNumber(MAX_MEMORY_CHARACTER_COUNT)})<Text dimColor> · /memory to edit</Text>
               </Text>
             </Box>
-          )
+          );
         })}
       </>
-    )
+    );
   },
-}
+};
 
 const claudeAiSubscriberExternalTokenNotice: StatusNoticeDefinition = {
   id: 'claude-ai-external-token',
   type: 'warning',
   isActive: () => {
-    const authTokenInfo = getAuthTokenSource()
+    const authTokenInfo = getAuthTokenSource();
     return (
       isClaudeAISubscriber() &&
-      (authTokenInfo.source === 'ANTHROPIC_AUTH_TOKEN' ||
-        authTokenInfo.source === 'apiKeyHelper')
-    )
+      (authTokenInfo.source === 'ANTHROPIC_AUTH_TOKEN' || authTokenInfo.source === 'apiKeyHelper')
+    );
   },
   render: () => {
-    const authTokenInfo = getAuthTokenSource()
+    const authTokenInfo = getAuthTokenSource();
     return (
       <Box flexDirection="row" marginTop={1}>
         <Text color="warning">{figures.warning}</Text>
         <Text color="warning">
-          Auth conflict: Using {authTokenInfo.source} instead of Claude account
-          subscription token. Either unset {authTokenInfo.source}, or run
-          `claude /logout`.
+          Auth conflict: Using {authTokenInfo.source} instead of Claude account subscription token. Either unset{' '}
+          {authTokenInfo.source}, or run `claude /logout`.
         </Text>
       </Box>
-    )
+    );
   },
-}
+};
 
 const apiKeyConflictNotice: StatusNoticeDefinition = {
   id: 'api-key-conflict',
@@ -108,27 +91,27 @@ const apiKeyConflictNotice: StatusNoticeDefinition = {
   isActive: () => {
     const { source: apiKeySource } = getAnthropicApiKeyWithSource({
       skipRetrievingKeyFromApiKeyHelper: true,
-    })
+    });
     return (
       !!getApiKeyFromConfigOrMacOSKeychain() &&
       (apiKeySource === 'ANTHROPIC_API_KEY' || apiKeySource === 'apiKeyHelper')
-    )
+    );
   },
   render: () => {
     const { source: apiKeySource } = getAnthropicApiKeyWithSource({
       skipRetrievingKeyFromApiKeyHelper: true,
-    })
+    });
     return (
       <Box flexDirection="row" marginTop={1}>
         <Text color="warning">{figures.warning}</Text>
         <Text color="warning">
-          Auth conflict: Using {apiKeySource} instead of Anthropic Console key.
-          Either unset {apiKeySource}, or run `claude /logout`.
+          Auth conflict: Using {apiKeySource} instead of Anthropic Console key. Either unset {apiKeySource}, or run
+          `claude /logout`.
         </Text>
       </Box>
-    )
+    );
   },
-}
+};
 
 const bothAuthMethodsNotice: StatusNoticeDefinition = {
   id: 'both-auth-methods',
@@ -136,38 +119,31 @@ const bothAuthMethodsNotice: StatusNoticeDefinition = {
   isActive: () => {
     const { source: apiKeySource } = getAnthropicApiKeyWithSource({
       skipRetrievingKeyFromApiKeyHelper: true,
-    })
-    const authTokenInfo = getAuthTokenSource()
+    });
+    const authTokenInfo = getAuthTokenSource();
     return (
       apiKeySource !== 'none' &&
       authTokenInfo.source !== 'none' &&
-      !(
-        apiKeySource === 'apiKeyHelper' &&
-        authTokenInfo.source === 'apiKeyHelper'
-      )
-    )
+      !(apiKeySource === 'apiKeyHelper' && authTokenInfo.source === 'apiKeyHelper')
+    );
   },
   render: () => {
     const { source: apiKeySource } = getAnthropicApiKeyWithSource({
       skipRetrievingKeyFromApiKeyHelper: true,
-    })
-    const authTokenInfo = getAuthTokenSource()
+    });
+    const authTokenInfo = getAuthTokenSource();
     return (
       <Box flexDirection="column" marginTop={1}>
         <Box flexDirection="row">
           <Text color="warning">{figures.warning}</Text>
           <Text color="warning">
-            Auth conflict: Both a token ({authTokenInfo.source}) and an API key
-            ({apiKeySource}) are set. This may lead to unexpected behavior.
+            Auth conflict: Both a token ({authTokenInfo.source}) and an API key ({apiKeySource}) are set. This may lead
+            to unexpected behavior.
           </Text>
         </Box>
         <Box flexDirection="column" marginLeft={3}>
           <Text color="warning">
-            · Trying to use{' '}
-            {authTokenInfo.source === 'claude.ai'
-              ? 'claude.ai'
-              : authTokenInfo.source}
-            ?{' '}
+            · Trying to use {authTokenInfo.source === 'claude.ai' ? 'claude.ai' : authTokenInfo.source}?{' '}
             {apiKeySource === 'ANTHROPIC_API_KEY'
               ? 'Unset the ANTHROPIC_API_KEY environment variable, or claude /logout then say "No" to the API key approval before login.'
               : apiKeySource === 'apiKeyHelper'
@@ -182,36 +158,31 @@ const bothAuthMethodsNotice: StatusNoticeDefinition = {
           </Text>
         </Box>
       </Box>
-    )
+    );
   },
-}
+};
 
 const largeAgentDescriptionsNotice: StatusNoticeDefinition = {
   id: 'large-agent-descriptions',
   type: 'warning',
   isActive: context => {
-    const totalTokens = getAgentDescriptionsTotalTokens(
-      context.agentDefinitions,
-    )
-    return totalTokens > AGENT_DESCRIPTIONS_THRESHOLD
+    const totalTokens = getAgentDescriptionsTotalTokens(context.agentDefinitions);
+    return totalTokens > AGENT_DESCRIPTIONS_THRESHOLD;
   },
   render: context => {
-    const totalTokens = getAgentDescriptionsTotalTokens(
-      context.agentDefinitions,
-    )
+    const totalTokens = getAgentDescriptionsTotalTokens(context.agentDefinitions);
     return (
       <Box flexDirection="row">
         <Text color="warning">{figures.warning}</Text>
         <Text color="warning">
           Large cumulative agent descriptions will impact performance (~
-          {formatNumber(totalTokens)} tokens &gt;{' '}
-          {formatNumber(AGENT_DESCRIPTIONS_THRESHOLD)})
+          {formatNumber(totalTokens)} tokens &gt; {formatNumber(AGENT_DESCRIPTIONS_THRESHOLD)})
           <Text dimColor> · /agents to manage</Text>
         </Text>
       </Box>
-    )
+    );
   },
-}
+};
 
 const jetbrainsPluginNotice: StatusNoticeDefinition = {
   id: 'jetbrains-plugin-install',
@@ -219,33 +190,31 @@ const jetbrainsPluginNotice: StatusNoticeDefinition = {
   isActive: context => {
     // Only show if running in JetBrains built-in terminal
     if (!isSupportedJetBrainsTerminal()) {
-      return false
+      return false;
     }
     // Don't show if auto-install is disabled
-    const shouldAutoInstall = context.config.autoInstallIdeExtension ?? true
+    const shouldAutoInstall = context.config.autoInstallIdeExtension ?? true;
     if (!shouldAutoInstall) {
-      return false
+      return false;
     }
     // Check if plugin is already installed (cached to avoid repeated filesystem checks)
-    const ideType = getTerminalIdeType()
-    return ideType !== null && !isJetBrainsPluginInstalledCachedSync(ideType)
+    const ideType = getTerminalIdeType();
+    return ideType !== null && !isJetBrainsPluginInstalledCachedSync(ideType);
   },
   render: () => {
-    const ideType = getTerminalIdeType()
-    const ideName = toIDEDisplayName(ideType)
+    const ideType = getTerminalIdeType();
+    const ideName = toIDEDisplayName(ideType);
     return (
       <Box flexDirection="row" gap={1} marginLeft={1}>
         <Text color="ide">{figures.arrowUp}</Text>
         <Text>
-          Install the <Text color="ide">{ideName}</Text> plugin from the
-          JetBrains Marketplace:{' '}
+          Install the <Text color="ide">{ideName}</Text> plugin from the JetBrains Marketplace:{' '}
           <Text bold>https://docs.claude.com/s/claude-code-jetbrains</Text>
         </Text>
       </Box>
-    )
+    );
   },
-}
-
+};
 
 // All notice definitions
 export const statusNoticeDefinitions: StatusNoticeDefinition[] = [
@@ -255,11 +224,9 @@ export const statusNoticeDefinitions: StatusNoticeDefinition[] = [
   apiKeyConflictNotice,
   bothAuthMethodsNotice,
   jetbrainsPluginNotice,
-]
+];
 
 // Helper functions for external use
-export function getActiveNotices(
-  context: StatusNoticeContext,
-): StatusNoticeDefinition[] {
-  return statusNoticeDefinitions.filter(notice => notice.isActive(context))
+export function getActiveNotices(context: StatusNoticeContext): StatusNoticeDefinition[] {
+  return statusNoticeDefinitions.filter(notice => notice.isActive(context));
 }
diff --git a/src/utils/streamlinedTransform.ts b/src/utils/streamlinedTransform.ts
index 06dcd9b5b..b0d8364a7 100644
--- a/src/utils/streamlinedTransform.ts
+++ b/src/utils/streamlinedTransform.ts
@@ -137,14 +137,18 @@ export function createStreamlinedTransformer(): (
   ): StdoutMessage | null {
     switch (message.type) {
       case 'assistant': {
-        const messageContent = (message as unknown as SDKAssistantMessage).message
+        const messageContent = (message as unknown as SDKAssistantMessage)
+          .message
         const content = messageContent?.content
         const text = Array.isArray(content)
           ? extractTextContent(content, '\n').trim()
           : ''
 
         // Accumulate tool counts from this message
-        accumulateToolUses(message as unknown as SDKAssistantMessage, cumulativeCounts)
+        accumulateToolUses(
+          message as unknown as SDKAssistantMessage,
+          cumulativeCounts,
+        )
 
         if (text.length > 0) {
           // Text message: emit text only, reset counts
diff --git a/src/utils/suggestions/skillUsageTracking.ts b/src/utils/suggestions/skillUsageTracking.ts
index 85f0f6dcd..ce13830eb 100644
--- a/src/utils/suggestions/skillUsageTracking.ts
+++ b/src/utils/suggestions/skillUsageTracking.ts
@@ -48,7 +48,7 @@ export function getSkillUsageScore(skillName: string): number {
 
   // Recency decay: halve score every 7 days
   const daysSinceUse = (Date.now() - usage.lastUsedAt) / (1000 * 60 * 60 * 24)
-  const recencyFactor = Math.pow(0.5, daysSinceUse / 7)
+  const recencyFactor = 0.5 ** (daysSinceUse / 7)
 
   // Minimum recency factor of 0.1 to avoid completely dropping old but heavily used skills
   return usage.usageCount * Math.max(recencyFactor, 0.1)
diff --git a/src/utils/suggestions/src/components/PromptInput/PromptInputFooterSuggestions.ts b/src/utils/suggestions/src/components/PromptInput/PromptInputFooterSuggestions.ts
index d0fd674c7..503d88641 100644
--- a/src/utils/suggestions/src/components/PromptInput/PromptInputFooterSuggestions.ts
+++ b/src/utils/suggestions/src/components/PromptInput/PromptInputFooterSuggestions.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type SuggestionItem = any;
+export type SuggestionItem = any
diff --git a/src/utils/suggestions/src/utils/cwd.ts b/src/utils/suggestions/src/utils/cwd.ts
index 76c192ed8..4bd56a824 100644
--- a/src/utils/suggestions/src/utils/cwd.ts
+++ b/src/utils/suggestions/src/utils/cwd.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getCwd = any;
+export type getCwd = any
diff --git a/src/utils/suggestions/src/utils/fsOperations.ts b/src/utils/suggestions/src/utils/fsOperations.ts
index d30ccea0a..276e80162 100644
--- a/src/utils/suggestions/src/utils/fsOperations.ts
+++ b/src/utils/suggestions/src/utils/fsOperations.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getFsImplementation = any;
+export type getFsImplementation = any
diff --git a/src/utils/suggestions/src/utils/log.ts b/src/utils/suggestions/src/utils/log.ts
index cf30e90da..30df9cbcb 100644
--- a/src/utils/suggestions/src/utils/log.ts
+++ b/src/utils/suggestions/src/utils/log.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type logError = any;
+export type logError = any
diff --git a/src/utils/suggestions/src/utils/path.ts b/src/utils/suggestions/src/utils/path.ts
index a965844dd..2d783dc63 100644
--- a/src/utils/suggestions/src/utils/path.ts
+++ b/src/utils/suggestions/src/utils/path.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type expandPath = any;
+export type expandPath = any
diff --git a/src/utils/swarm/It2SetupPrompt.tsx b/src/utils/swarm/It2SetupPrompt.tsx
index 166c984c7..ad9402e3c 100644
--- a/src/utils/swarm/It2SetupPrompt.tsx
+++ b/src/utils/swarm/It2SetupPrompt.tsx
@@ -1,14 +1,11 @@
-import React, { useCallback, useEffect, useState } from 'react'
-import {
-  type OptionWithDescription,
-  Select,
-} from '../../components/CustomSelect/index.js'
-import { Pane } from '@anthropic/ink'
-import { Spinner } from '../../components/Spinner.js'
-import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js'
+import React, { useCallback, useEffect, useState } from 'react';
+import { type OptionWithDescription, Select } from '../../components/CustomSelect/index.js';
+import { Pane } from '@anthropic/ink';
+import { Spinner } from '../../components/Spinner.js';
+import { useExitOnCtrlCDWithKeybindings } from '../../hooks/useExitOnCtrlCDWithKeybindings.js';
 // eslint-disable-next-line custom-rules/prefer-use-keybindings -- enter to proceed through setup steps
-import { Box, Text, useInput } from '@anthropic/ink'
-import { useKeybinding } from '../../keybindings/useKeybinding.js'
+import { Box, Text, useInput } from '@anthropic/ink';
+import { useKeybinding } from '../../keybindings/useKeybinding.js';
 import {
   detectPythonPackageManager,
   getPythonApiInstructions,
@@ -17,7 +14,7 @@ import {
   type PythonPackageManager,
   setPreferTmuxOverIterm2,
   verifyIt2Setup,
-} from './backends/it2Setup.js'
+} from './backends/it2Setup.js';
 
 type SetupStep =
   | 'initial'
@@ -27,103 +24,99 @@ type SetupStep =
   | 'api-instructions'
   | 'verifying'
   | 'success'
-  | 'failed'
+  | 'failed';
 
 type Props = {
-  onDone: (result: 'installed' | 'use-tmux' | 'cancelled') => void
-  tmuxAvailable: boolean
-}
+  onDone: (result: 'installed' | 'use-tmux' | 'cancelled') => void;
+  tmuxAvailable: boolean;
+};
 
-export function It2SetupPrompt({
-  onDone,
-  tmuxAvailable,
-}: Props): React.ReactNode {
-  const [step, setStep] = useState<SetupStep>('initial')
-  const [packageManager, setPackageManager] =
-    useState<PythonPackageManager | null>(null)
-  const [error, setError] = useState<string | null>(null)
-  const exitState = useExitOnCtrlCDWithKeybindings()
+export function It2SetupPrompt({ onDone, tmuxAvailable }: Props): React.ReactNode {
+  const [step, setStep] = useState<SetupStep>('initial');
+  const [packageManager, setPackageManager] = useState<PythonPackageManager | null>(null);
+  const [error, setError] = useState<string | null>(null);
+  const exitState = useExitOnCtrlCDWithKeybindings();
 
   // Detect package manager on mount
   useEffect(() => {
     void detectPythonPackageManager().then(pm => {
-      setPackageManager(pm)
-    })
-  }, [])
+      setPackageManager(pm);
+    });
+  }, []);
 
   const handleCancel = useCallback(() => {
-    onDone('cancelled')
-  }, [onDone])
+    onDone('cancelled');
+  }, [onDone]);
 
   useKeybinding('confirm:no', handleCancel, {
     context: 'Confirmation',
     isActive: step !== 'installing' && step !== 'verifying',
-  })
+  });
 
   // Handle keyboard input for verification step
   useInput((_input, key) => {
     if (step === 'api-instructions' && key.return) {
-      setStep('verifying')
+      setStep('verifying');
       void verifyIt2Setup().then(result => {
         if (result.success) {
-          markIt2SetupComplete()
-          setStep('success')
-          setTimeout(onDone, 1500, 'installed' as const)
+          markIt2SetupComplete();
+          setStep('success');
+          setTimeout(onDone, 1500, 'installed' as const);
         } else {
-          setError(result.error || 'Verification failed')
-          setStep('failed')
+          setError(result.error || 'Verification failed');
+          setStep('failed');
         }
-      })
+      });
     }
-  })
+  });
 
   // Handle installation
   async function handleInstall(): Promise<void> {
     if (!packageManager) {
-      setError('No Python package manager found (uvx, pipx, or pip)')
-      setStep('failed')
-      return
+      setError('No Python package manager found (uvx, pipx, or pip)');
+      setStep('failed');
+      return;
     }
 
-    setStep('installing')
-    const result = await installIt2(packageManager)
+    setStep('installing');
+    const result = await installIt2(packageManager);
 
     if (result.success) {
       // Show Python API instructions
-      setStep('api-instructions')
+      setStep('api-instructions');
     } else {
-      setError(result.error || 'Installation failed')
-      setStep('install-failed')
+      setError(result.error || 'Installation failed');
+      setStep('install-failed');
     }
   }
 
   // Handle using tmux instead
   function handleUseTmux(): void {
-    setPreferTmuxOverIterm2(true)
-    onDone('use-tmux')
+    setPreferTmuxOverIterm2(true);
+    onDone('use-tmux');
   }
 
   // Render based on current step
   const renderContent = (): React.ReactNode => {
     switch (step) {
       case 'initial':
-        return renderInitialPrompt()
+        return renderInitialPrompt();
       case 'installing':
-        return renderInstalling()
+        return renderInstalling();
       case 'install-failed':
-        return renderInstallFailed()
+        return renderInstallFailed();
       case 'api-instructions':
-        return renderApiInstructions()
+        return renderApiInstructions();
       case 'verifying':
-        return renderVerifying()
+        return renderVerifying();
       case 'success':
-        return renderSuccess()
+        return renderSuccess();
       case 'failed':
-        return renderFailed()
+        return renderFailed();
       default:
-        return null
+        return null;
     }
-  }
+  };
 
   function renderInitialPrompt(): React.ReactNode {
     const options: OptionWithDescription<string>[] = [
@@ -134,53 +127,49 @@ export function It2SetupPrompt({
           ? `Uses ${packageManager} to install the it2 CLI tool`
           : 'Requires Python (uvx, pipx, or pip)',
       },
-    ]
+    ];
 
     if (tmuxAvailable) {
       options.push({
         label: 'Use tmux instead',
         value: 'tmux',
         description: 'Opens teammates in a separate tmux session',
-      })
+      });
     }
 
     options.push({
       label: 'Cancel',
       value: 'cancel',
       description: 'Skip teammate spawning for now',
-    })
+    });
 
     return (
       <Box flexDirection="column" gap={1}>
         <Text>
-          To use native iTerm2 split panes for teammates, you need the{' '}
-          <Text bold>it2</Text> CLI tool.
-        </Text>
-        <Text dimColor>
-          This enables teammates to appear as split panes within your current
-          window.
+          To use native iTerm2 split panes for teammates, you need the <Text bold>it2</Text> CLI tool.
         </Text>
+        <Text dimColor>This enables teammates to appear as split panes within your current window.</Text>
         <Box marginTop={1}>
           <Select
             options={options}
             onChange={value => {
               switch (value) {
                 case 'install':
-                  void handleInstall()
-                  break
+                  void handleInstall();
+                  break;
                 case 'tmux':
-                  handleUseTmux()
-                  break
+                  handleUseTmux();
+                  break;
                 case 'cancel':
-                  onDone('cancelled')
-                  break
+                  onDone('cancelled');
+                  break;
               }
             }}
             onCancel={() => onDone('cancelled')}
           />
         </Box>
       </Box>
-    )
+    );
   }
 
   function renderInstalling(): React.ReactNode {
@@ -192,7 +181,7 @@ export function It2SetupPrompt({
         </Box>
         <Text dimColor>This may take a moment.</Text>
       </Box>
-    )
+    );
   }
 
   function renderInstallFailed(): React.ReactNode {
@@ -202,21 +191,21 @@ export function It2SetupPrompt({
         value: 'retry',
         description: 'Retry the installation',
       },
-    ]
+    ];
 
     if (tmuxAvailable) {
       options.push({
         label: 'Use tmux instead',
         value: 'tmux',
         description: 'Falls back to tmux for teammate panes',
-      })
+      });
     }
 
     options.push({
       label: 'Cancel',
       value: 'cancel',
       description: 'Skip teammate spawning for now',
-    })
+    });
 
     return (
       <Box flexDirection="column" gap={1}>
@@ -236,25 +225,25 @@ export function It2SetupPrompt({
             onChange={value => {
               switch (value) {
                 case 'retry':
-                  void handleInstall()
-                  break
+                  void handleInstall();
+                  break;
                 case 'tmux':
-                  handleUseTmux()
-                  break
+                  handleUseTmux();
+                  break;
                 case 'cancel':
-                  onDone('cancelled')
-                  break
+                  onDone('cancelled');
+                  break;
               }
             }}
             onCancel={() => onDone('cancelled')}
           />
         </Box>
       </Box>
-    )
+    );
   }
 
   function renderApiInstructions(): React.ReactNode {
-    const instructions = getPythonApiInstructions()
+    const instructions = getPythonApiInstructions();
     return (
       <Box flexDirection="column" gap={1}>
         <Text color="success">✓ it2 installed successfully</Text>
@@ -267,7 +256,7 @@ export function It2SetupPrompt({
           <Text dimColor>Press Enter when ready to verify…</Text>
         </Box>
       </Box>
-    )
+    );
   }
 
   function renderVerifying(): React.ReactNode {
@@ -276,7 +265,7 @@ export function It2SetupPrompt({
         <Spinner />
         <Text> Verifying it2 can communicate with iTerm2…</Text>
       </Box>
-    )
+    );
   }
 
   function renderSuccess(): React.ReactNode {
@@ -285,7 +274,7 @@ export function It2SetupPrompt({
         <Text color="success">✓ iTerm2 split pane support is ready</Text>
         <Text dimColor>Teammates will now appear as split panes.</Text>
       </Box>
-    )
+    );
   }
 
   function renderFailed(): React.ReactNode {
@@ -295,21 +284,21 @@ export function It2SetupPrompt({
         value: 'retry',
         description: 'Verify the connection again',
       },
-    ]
+    ];
 
     if (tmuxAvailable) {
       options.push({
         label: 'Use tmux instead',
         value: 'tmux',
         description: 'Falls back to tmux for teammate panes',
-      })
+      });
     }
 
     options.push({
       label: 'Cancel',
       value: 'cancel',
       description: 'Skip teammate spawning for now',
-    })
+    });
 
     return (
       <Box flexDirection="column" gap={1}>
@@ -326,31 +315,31 @@ export function It2SetupPrompt({
             onChange={value => {
               switch (value) {
                 case 'retry':
-                  setStep('verifying')
+                  setStep('verifying');
                   void verifyIt2Setup().then(result => {
                     if (result.success) {
-                      markIt2SetupComplete()
-                      setStep('success')
-                      setTimeout(onDone, 1500, 'installed' as const)
+                      markIt2SetupComplete();
+                      setStep('success');
+                      setTimeout(onDone, 1500, 'installed' as const);
                     } else {
-                      setError(result.error || 'Verification failed')
-                      setStep('failed')
+                      setError(result.error || 'Verification failed');
+                      setStep('failed');
                     }
-                  })
-                  break
+                  });
+                  break;
                 case 'tmux':
-                  handleUseTmux()
-                  break
+                  handleUseTmux();
+                  break;
                 case 'cancel':
-                  onDone('cancelled')
-                  break
+                  onDone('cancelled');
+                  break;
               }
             }}
             onCancel={() => onDone('cancelled')}
           />
         </Box>
       </Box>
-    )
+    );
   }
 
   return (
@@ -360,18 +349,12 @@ export function It2SetupPrompt({
           iTerm2 Split Pane Setup
         </Text>
         {renderContent()}
-        {step !== 'installing' &&
-          step !== 'verifying' &&
-          step !== 'success' && (
-            <Text dimColor italic>
-              {exitState.pending ? (
-                <>Press {exitState.keyName} again to exit</>
-              ) : (
-                <>Esc to cancel</>
-              )}
-            </Text>
-          )}
+        {step !== 'installing' && step !== 'verifying' && step !== 'success' && (
+          <Text dimColor italic>
+            {exitState.pending ? <>Press {exitState.keyName} again to exit</> : <>Esc to cancel</>}
+          </Text>
+        )}
       </Box>
     </Pane>
-  )
+  );
 }
diff --git a/src/utils/swarm/inProcessRunner.ts b/src/utils/swarm/inProcessRunner.ts
index 1735500b4..a7133deaa 100644
--- a/src/utils/swarm/inProcessRunner.ts
+++ b/src/utils/swarm/inProcessRunner.ts
@@ -1246,8 +1246,13 @@ export async function runInProcessTeammate(
                 // Track in-progress tool use IDs for animation in transcript view
                 let inProgressToolUseIDs = task.inProgressToolUseIDs
                 if (message.type === 'assistant') {
-                  for (const block of (Array.isArray(message.message!.content) ? message.message!.content : [])) {
-                    if (typeof block !== 'string' && block.type === 'tool_use') {
+                  for (const block of Array.isArray(message.message!.content)
+                    ? message.message!.content
+                    : []) {
+                    if (
+                      typeof block !== 'string' &&
+                      block.type === 'tool_use'
+                    ) {
                       inProgressToolUseIDs = new Set([
                         ...(inProgressToolUseIDs ?? []),
                         block.id,
@@ -1318,7 +1323,10 @@ export async function runInProcessTeammate(
           setAppState,
         )
         if (currentAutonomyRunId) {
-          await markAutonomyRunFailed(currentAutonomyRunId, ERROR_MESSAGE_USER_ABORT)
+          await markAutonomyRunFailed(
+            currentAutonomyRunId,
+            ERROR_MESSAGE_USER_ABORT,
+          )
           currentAutonomyRunId = undefined
         }
       } else if (currentAutonomyRunId) {
diff --git a/src/utils/systemThemeWatcher.ts b/src/utils/systemThemeWatcher.ts
index 3c61f952c..d010aa4da 100644
--- a/src/utils/systemThemeWatcher.ts
+++ b/src/utils/systemThemeWatcher.ts
@@ -1,3 +1,8 @@
 // Auto-generated stub — replace with real implementation
-export {};
-export const watchSystemTheme: (querier: unknown, setTheme: React.Dispatch<React.SetStateAction<import('./systemTheme.js').SystemTheme>>) => (() => void) = () => () => {};
+export {}
+export const watchSystemTheme: (
+  querier: unknown,
+  setTheme: React.Dispatch<
+    React.SetStateAction<import('./systemTheme.js').SystemTheme>
+  >,
+) => () => void = () => () => {}
diff --git a/src/utils/teammate.ts b/src/utils/teammate.ts
index d7baa81f2..f9bbdc01a 100644
--- a/src/utils/teammate.ts
+++ b/src/utils/teammate.ts
@@ -262,7 +262,6 @@ export function waitForTeammatesToBecomeIdle(
     const onIdle = (): void => {
       remaining--
       if (remaining === 0) {
-        // biome-ignore lint/nursery/noFloatingPromises: resolve is a callback, not a Promise
         resolve()
       }
     }
diff --git a/src/utils/teammateMailbox.ts b/src/utils/teammateMailbox.ts
index eb72fcc21..5caa904a6 100644
--- a/src/utils/teammateMailbox.ts
+++ b/src/utils/teammateMailbox.ts
@@ -1161,7 +1161,12 @@ export function getLastPeerDmSummary(messages: Message[]): string | undefined {
     if (!Array.isArray(content)) continue
     for (const block of content) {
       if (typeof block === 'string') continue
-      const b = block as unknown as { type: string; name?: string; input?: Record<string, unknown>; [key: string]: unknown }
+      const b = block as unknown as {
+        type: string
+        name?: string
+        input?: Record<string, unknown>
+        [key: string]: unknown
+      }
       if (
         b.type === 'tool_use' &&
         b.name === SEND_MESSAGE_TOOL_NAME &&
@@ -1177,7 +1182,7 @@ export function getLastPeerDmSummary(messages: Message[]): string | undefined {
         const to = b.input.to as string
         const summary =
           'summary' in b.input && typeof b.input.summary === 'string'
-            ? b.input.summary as string
+            ? (b.input.summary as string)
             : (b.input.message as string).slice(0, 80)
         return `[to ${to}] ${summary}`
       }
diff --git a/src/utils/telemetry/instrumentation.ts b/src/utils/telemetry/instrumentation.ts
index 224f04815..fffe84def 100644
--- a/src/utils/telemetry/instrumentation.ts
+++ b/src/utils/telemetry/instrumentation.ts
@@ -132,6 +132,7 @@ async function getOtlpReaders() {
   const exportInterval = parseInt(
     process.env.OTEL_METRIC_EXPORT_INTERVAL ||
       DEFAULT_METRICS_EXPORT_INTERVAL_MS.toString(),
+    10,
   )
 
   const exporters = []
@@ -527,6 +528,7 @@ export async function initializeTelemetry() {
     const shutdownTelemetry = async () => {
       const timeoutMs = parseInt(
         process.env.CLAUDE_CODE_OTEL_SHUTDOWN_TIMEOUT_MS || '2000',
+        10,
       )
       try {
         endInteractionSpan()
@@ -589,6 +591,7 @@ export async function initializeTelemetry() {
               scheduledDelayMillis: parseInt(
                 process.env.OTEL_LOGS_EXPORT_INTERVAL ||
                   DEFAULT_LOGS_EXPORT_INTERVAL_MS.toString(),
+                10,
               ),
             }),
         ),
@@ -635,6 +638,7 @@ export async function initializeTelemetry() {
             scheduledDelayMillis: parseInt(
               process.env.OTEL_TRACES_EXPORT_INTERVAL ||
                 DEFAULT_TRACES_EXPORT_INTERVAL_MS.toString(),
+              10,
             ),
           }),
       )
@@ -654,6 +658,7 @@ export async function initializeTelemetry() {
   const shutdownTelemetry = async () => {
     const timeoutMs = parseInt(
       process.env.CLAUDE_CODE_OTEL_SHUTDOWN_TIMEOUT_MS || '2000',
+      10,
     )
 
     try {
@@ -712,6 +717,7 @@ export async function flushTelemetry(): Promise<void> {
 
   const timeoutMs = parseInt(
     process.env.CLAUDE_CODE_OTEL_FLUSH_TIMEOUT_MS || '5000',
+    10,
   )
 
   try {
diff --git a/src/utils/telemetry/src/bootstrap/state.ts b/src/utils/telemetry/src/bootstrap/state.ts
index 88e65b64f..e16b4f955 100644
--- a/src/utils/telemetry/src/bootstrap/state.ts
+++ b/src/utils/telemetry/src/bootstrap/state.ts
@@ -1,10 +1,10 @@
 // Auto-generated type stub — replace with real implementation
-export type getEventLogger = any;
-export type getPromptId = any;
-export type getLoggerProvider = any;
-export type getMeterProvider = any;
-export type getTracerProvider = any;
-export type setEventLogger = any;
-export type setLoggerProvider = any;
-export type setMeterProvider = any;
-export type setTracerProvider = any;
+export type getEventLogger = any
+export type getPromptId = any
+export type getLoggerProvider = any
+export type getMeterProvider = any
+export type getTracerProvider = any
+export type setEventLogger = any
+export type setLoggerProvider = any
+export type setMeterProvider = any
+export type setTracerProvider = any
diff --git a/src/utils/telemetry/src/services/api/metricsOptOut.ts b/src/utils/telemetry/src/services/api/metricsOptOut.ts
index abe38aa99..8e6bcf906 100644
--- a/src/utils/telemetry/src/services/api/metricsOptOut.ts
+++ b/src/utils/telemetry/src/services/api/metricsOptOut.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type checkMetricsEnabled = any;
+export type checkMetricsEnabled = any
diff --git a/src/utils/telemetry/src/utils/auth.ts b/src/utils/telemetry/src/utils/auth.ts
index 250437a55..27ae07826 100644
--- a/src/utils/telemetry/src/utils/auth.ts
+++ b/src/utils/telemetry/src/utils/auth.ts
@@ -1,5 +1,5 @@
 // Auto-generated type stub — replace with real implementation
-export type getOtelHeadersFromHelper = any;
-export type getSubscriptionType = any;
-export type is1PApiCustomer = any;
-export type isClaudeAISubscriber = any;
+export type getOtelHeadersFromHelper = any
+export type getSubscriptionType = any
+export type is1PApiCustomer = any
+export type isClaudeAISubscriber = any
diff --git a/src/utils/telemetry/src/utils/platform.ts b/src/utils/telemetry/src/utils/platform.ts
index da6332eed..ded3f47a6 100644
--- a/src/utils/telemetry/src/utils/platform.ts
+++ b/src/utils/telemetry/src/utils/platform.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type getPlatform = any;
-export type getWslVersion = any;
+export type getPlatform = any
+export type getWslVersion = any
diff --git a/src/utils/teleport.tsx b/src/utils/teleport.tsx
index e3330880c..96cf898e1 100644
--- a/src/utils/teleport.tsx
+++ b/src/utils/teleport.tsx
@@ -1,62 +1,45 @@
-import axios from 'axios'
-import chalk from 'chalk'
-import { randomUUID } from 'crypto'
-import React from 'react'
-import { getOriginalCwd, getSessionId } from 'src/bootstrap/state.js'
-import { checkGate_CACHED_OR_BLOCKING } from 'src/services/analytics/growthbook.js'
+import axios from 'axios';
+import chalk from 'chalk';
+import { randomUUID } from 'crypto';
+import React from 'react';
+import { getOriginalCwd, getSessionId } from 'src/bootstrap/state.js';
+import { checkGate_CACHED_OR_BLOCKING } from 'src/services/analytics/growthbook.js';
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
-} from 'src/services/analytics/index.js'
-import { isPolicyAllowed } from 'src/services/policyLimits/index.js'
-import { z } from 'zod/v4'
-import {
-  getTeleportErrors,
-  TeleportError,
-  type TeleportLocalErrorType,
-} from '../components/TeleportError.js'
-import { getOauthConfig } from '../constants/oauth.js'
-import type { SDKMessage } from '../entrypoints/agentSdkTypes.js'
-import type { Root } from '@anthropic/ink'
-import { KeybindingSetup } from '../keybindings/KeybindingProviderSetup.js'
-import { queryHaiku } from '../services/api/claude.js'
-import {
-  getSessionLogsViaOAuth,
-  getTeleportEvents,
-} from '../services/api/sessionIngress.js'
-import { getOrganizationUUID } from '../services/oauth/client.js'
-import { AppStateProvider } from '../state/AppState.js'
-import type { Message, SystemMessage } from '../types/message.js'
-import type { PermissionMode } from '../types/permissions.js'
-import {
-  checkAndRefreshOAuthTokenIfNeeded,
-  getClaudeAIOAuthTokens,
-} from './auth.js'
-import { checkGithubAppInstalled } from './background/remote/preconditions.js'
-import {
-  deserializeMessages,
-  type TeleportRemoteResponse,
-} from './conversationRecovery.js'
-import { getCwd } from './cwd.js'
-import { logForDebugging } from './debug.js'
-import {
-  detectCurrentRepositoryWithHost,
-  parseGitHubRepository,
-  parseGitRemote,
-} from './detectRepository.js'
-import { isEnvTruthy } from './envUtils.js'
-import { TeleportOperationError, toError } from './errors.js'
-import { execFileNoThrow } from './execFileNoThrow.js'
-import { truncateToWidth } from './format.js'
-import { findGitRoot, getDefaultBranch, getIsClean, gitExe } from './git.js'
-import { safeParseJSON } from './json.js'
-import { logError } from './log.js'
-import { createSystemMessage, createUserMessage } from './messages.js'
-import { getMainLoopModel } from './model/model.js'
-import { isTranscriptMessage } from './sessionStorage.js'
-import { getSettings_DEPRECATED } from './settings/settings.js'
-import { jsonStringify } from './slowOperations.js'
-import { asSystemPrompt } from './systemPromptType.js'
+} from 'src/services/analytics/index.js';
+import { isPolicyAllowed } from 'src/services/policyLimits/index.js';
+import { z } from 'zod/v4';
+import { getTeleportErrors, TeleportError, type TeleportLocalErrorType } from '../components/TeleportError.js';
+import { getOauthConfig } from '../constants/oauth.js';
+import type { SDKMessage } from '../entrypoints/agentSdkTypes.js';
+import type { Root } from '@anthropic/ink';
+import { KeybindingSetup } from '../keybindings/KeybindingProviderSetup.js';
+import { queryHaiku } from '../services/api/claude.js';
+import { getSessionLogsViaOAuth, getTeleportEvents } from '../services/api/sessionIngress.js';
+import { getOrganizationUUID } from '../services/oauth/client.js';
+import { AppStateProvider } from '../state/AppState.js';
+import type { Message, SystemMessage } from '../types/message.js';
+import type { PermissionMode } from '../types/permissions.js';
+import { checkAndRefreshOAuthTokenIfNeeded, getClaudeAIOAuthTokens } from './auth.js';
+import { checkGithubAppInstalled } from './background/remote/preconditions.js';
+import { deserializeMessages, type TeleportRemoteResponse } from './conversationRecovery.js';
+import { getCwd } from './cwd.js';
+import { logForDebugging } from './debug.js';
+import { detectCurrentRepositoryWithHost, parseGitHubRepository, parseGitRemote } from './detectRepository.js';
+import { isEnvTruthy } from './envUtils.js';
+import { TeleportOperationError, toError } from './errors.js';
+import { execFileNoThrow } from './execFileNoThrow.js';
+import { truncateToWidth } from './format.js';
+import { findGitRoot, getDefaultBranch, getIsClean, gitExe } from './git.js';
+import { safeParseJSON } from './json.js';
+import { logError } from './log.js';
+import { createSystemMessage, createUserMessage } from './messages.js';
+import { getMainLoopModel } from './model/model.js';
+import { isTranscriptMessage } from './sessionStorage.js';
+import { getSettings_DEPRECATED } from './settings/settings.js';
+import { jsonStringify } from './slowOperations.js';
+import { asSystemPrompt } from './systemPromptType.js';
 import {
   fetchSession,
   type GitRepositoryOutcome,
@@ -64,42 +47,30 @@ import {
   getBranchFromSession,
   getOAuthHeaders,
   type SessionResource,
-} from './teleport/api.js'
-import { fetchEnvironments } from './teleport/environments.js'
-import { createAndUploadGitBundle } from './teleport/gitBundle.js'
+} from './teleport/api.js';
+import { fetchEnvironments } from './teleport/environments.js';
+import { createAndUploadGitBundle } from './teleport/gitBundle.js';
 
 export type TeleportResult = {
-  messages: Message[]
-  branchName: string
-}
+  messages: Message[];
+  branchName: string;
+};
 
-export type TeleportProgressStep =
-  | 'validating'
-  | 'fetching_logs'
-  | 'fetching_branch'
-  | 'checking_out'
-  | 'done'
+export type TeleportProgressStep = 'validating' | 'fetching_logs' | 'fetching_branch' | 'checking_out' | 'done';
 
-export type TeleportProgressCallback = (step: TeleportProgressStep) => void
+export type TeleportProgressCallback = (step: TeleportProgressStep) => void;
 
 /**
  * Creates a system message to inform about teleport session resume
  * @returns SystemMessage indicating session was resumed from another machine
  */
-function createTeleportResumeSystemMessage(
-  branchError: Error | null,
-): SystemMessage {
+function createTeleportResumeSystemMessage(branchError: Error | null): SystemMessage {
   if (branchError === null) {
-    return createSystemMessage('Session resumed', 'suggestion')
+    return createSystemMessage('Session resumed', 'suggestion');
   }
   const formattedError =
-    branchError instanceof TeleportOperationError
-      ? branchError.formattedMessage
-      : branchError.message
-  return createSystemMessage(
-    `Session resumed without branch: ${formattedError}`,
-    'warning',
-  )
+    branchError instanceof TeleportOperationError ? branchError.formattedMessage : branchError.message;
+  return createSystemMessage(`Session resumed without branch: ${formattedError}`, 'warning');
 }
 
 /**
@@ -110,13 +81,13 @@ function createTeleportResumeUserMessage() {
   return createUserMessage({
     content: `This session is being continued from another machine. Application state may have changed. The updated working directory is ${getOriginalCwd()}`,
     isMeta: true,
-  })
+  });
 }
 
 type TeleportToRemoteResponse = {
-  id: string
-  title: string
-}
+  id: string;
+  title: string;
+};
 
 const SESSION_TITLE_AND_BRANCH_PROMPT = `You are coming up with a succinct title and git branch name for a coding session based on the provided description. The title should be clear, concise, and accurately reflect the content of the coding task.
 You should keep it short and simple, ideally no more than 6 words. Avoid using jargon or overly technical terms unless absolutely necessary. The title should be easy to understand for anyone reading it.
@@ -133,30 +104,24 @@ Example 3: {"title": "Improve performance of data processing script", "branch":
 
 Here is the session description:
 <description>{description}</description>
-Please generate a title and branch name for this session.`
+Please generate a title and branch name for this session.`;
 
 type TitleAndBranch = {
-  title: string
-  branchName: string
-}
+  title: string;
+  branchName: string;
+};
 
 /**
  * Generates a title and branch name for a coding session using Claude Haiku
  * @param description The description/prompt for the session
  * @returns Promise<TitleAndBranch> The generated title and branch name
  */
-async function generateTitleAndBranch(
-  description: string,
-  signal: AbortSignal,
-): Promise<TitleAndBranch> {
-  const fallbackTitle = truncateToWidth(description, 75)
-  const fallbackBranch = 'claude/task'
+async function generateTitleAndBranch(description: string, signal: AbortSignal): Promise<TitleAndBranch> {
+  const fallbackTitle = truncateToWidth(description, 75);
+  const fallbackBranch = 'claude/task';
 
   try {
-    const userPrompt = SESSION_TITLE_AND_BRANCH_PROMPT.replace(
-      '{description}',
-      description,
-    )
+    const userPrompt = SESSION_TITLE_AND_BRANCH_PROMPT.replace('{description}', description);
 
     const response = await queryHaiku({
       systemPrompt: asSystemPrompt([]),
@@ -181,29 +146,27 @@ async function generateTitleAndBranch(
         hasAppendSystemPrompt: false,
         mcpTools: [],
       },
-    })
+    });
 
     // Extract text from the response
-    const firstBlock = response.message!.content?.[0] as { type?: string; text?: string } | undefined
+    const firstBlock = response.message!.content?.[0] as { type?: string; text?: string } | undefined;
     if (firstBlock?.type !== 'text') {
-      return { title: fallbackTitle, branchName: fallbackBranch }
+      return { title: fallbackTitle, branchName: fallbackBranch };
     }
 
-    const parsed = safeParseJSON(firstBlock.text!.trim())
-    const parseResult = z
-      .object({ title: z.string(), branch: z.string() })
-      .safeParse(parsed)
+    const parsed = safeParseJSON(firstBlock.text!.trim());
+    const parseResult = z.object({ title: z.string(), branch: z.string() }).safeParse(parsed);
     if (parseResult.success) {
       return {
         title: parseResult.data.title || fallbackTitle,
         branchName: parseResult.data.branch || fallbackBranch,
-      }
+      };
     }
 
-    return { title: fallbackTitle, branchName: fallbackBranch }
+    return { title: fallbackTitle, branchName: fallbackBranch };
   } catch (error) {
-    logError(new Error(`Error generating title and branch: ${error}`))
-    return { title: fallbackTitle, branchName: fallbackBranch }
+    logError(new Error(`Error generating title and branch: ${error}`));
+    return { title: fallbackTitle, branchName: fallbackBranch };
   }
 }
 
@@ -212,16 +175,16 @@ async function generateTitleAndBranch(
  * Untracked files are ignored because they won't be lost during branch switching
  */
 export async function validateGitState(): Promise<void> {
-  const isClean = await getIsClean({ ignoreUntracked: true })
+  const isClean = await getIsClean({ ignoreUntracked: true });
   if (!isClean) {
-    logEvent('tengu_teleport_error_git_not_clean', {})
+    logEvent('tengu_teleport_error_git_not_clean', {});
     const error = new TeleportOperationError(
       'Git working directory is not clean. Please commit or stash your changes before using --teleport.',
       chalk.red(
         'Error: Git working directory is not clean. Please commit or stash your changes before using --teleport.\n',
       ),
-    )
-    throw error
+    );
+    throw error;
   }
 }
 
@@ -230,30 +193,24 @@ export async function validateGitState(): Promise<void> {
  * @param branch The branch to fetch. If not specified, fetches all branches.
  */
 async function fetchFromOrigin(branch?: string): Promise<void> {
-  const fetchArgs = branch
-    ? ['fetch', 'origin', `${branch}:${branch}`]
-    : ['fetch', 'origin']
+  const fetchArgs = branch ? ['fetch', 'origin', `${branch}:${branch}`] : ['fetch', 'origin'];
 
-  const { code: fetchCode, stderr: fetchStderr } = await execFileNoThrow(
-    gitExe(),
-    fetchArgs,
-  )
+  const { code: fetchCode, stderr: fetchStderr } = await execFileNoThrow(gitExe(), fetchArgs);
   if (fetchCode !== 0) {
     // If fetching a specific branch fails, it might not exist locally yet
     // Try fetching just the ref without mapping to local branch
     if (branch && fetchStderr.includes('refspec')) {
-      logForDebugging(
-        `Specific branch fetch failed, trying to fetch ref: ${branch}`,
-      )
-      const { code: refFetchCode, stderr: refFetchStderr } =
-        await execFileNoThrow(gitExe(), ['fetch', 'origin', branch])
+      logForDebugging(`Specific branch fetch failed, trying to fetch ref: ${branch}`);
+      const { code: refFetchCode, stderr: refFetchStderr } = await execFileNoThrow(gitExe(), [
+        'fetch',
+        'origin',
+        branch,
+      ]);
       if (refFetchCode !== 0) {
-        logError(
-          new Error(`Failed to fetch from remote origin: ${refFetchStderr}`),
-        )
+        logError(new Error(`Failed to fetch from remote origin: ${refFetchStderr}`));
       }
     } else {
-      logError(new Error(`Failed to fetch from remote origin: ${fetchStderr}`))
+      logError(new Error(`Failed to fetch from remote origin: ${fetchStderr}`));
     }
   }
 }
@@ -268,46 +225,35 @@ async function ensureUpstreamIsSet(branchName: string): Promise<void> {
     'rev-parse',
     '--abbrev-ref',
     `${branchName}@{upstream}`,
-  ])
+  ]);
 
   if (upstreamCheckCode === 0) {
     // Upstream is already set
-    logForDebugging(`Branch '${branchName}' already has upstream set`)
-    return
+    logForDebugging(`Branch '${branchName}' already has upstream set`);
+    return;
   }
 
   // Check if origin/<branchName> exists
-  const { code: remoteCheckCode } = await execFileNoThrow(gitExe(), [
-    'rev-parse',
-    '--verify',
-    `origin/${branchName}`,
-  ])
+  const { code: remoteCheckCode } = await execFileNoThrow(gitExe(), ['rev-parse', '--verify', `origin/${branchName}`]);
 
   if (remoteCheckCode === 0) {
     // Remote branch exists, set upstream
-    logForDebugging(
-      `Setting upstream for '${branchName}' to 'origin/${branchName}'`,
-    )
-    const { code: setUpstreamCode, stderr: setUpstreamStderr } =
-      await execFileNoThrow(gitExe(), [
-        'branch',
-        '--set-upstream-to',
-        `origin/${branchName}`,
-        branchName,
-      ])
+    logForDebugging(`Setting upstream for '${branchName}' to 'origin/${branchName}'`);
+    const { code: setUpstreamCode, stderr: setUpstreamStderr } = await execFileNoThrow(gitExe(), [
+      'branch',
+      '--set-upstream-to',
+      `origin/${branchName}`,
+      branchName,
+    ]);
 
     if (setUpstreamCode !== 0) {
-      logForDebugging(
-        `Failed to set upstream for '${branchName}': ${setUpstreamStderr}`,
-      )
+      logForDebugging(`Failed to set upstream for '${branchName}': ${setUpstreamStderr}`);
       // Don't throw, just log - this is not critical
     } else {
-      logForDebugging(`Successfully set upstream for '${branchName}'`)
+      logForDebugging(`Successfully set upstream for '${branchName}'`);
     }
   } else {
-    logForDebugging(
-      `Remote branch 'origin/${branchName}' does not exist, skipping upstream setup`,
-    )
+    logForDebugging(`Remote branch 'origin/${branchName}' does not exist, skipping upstream setup`);
   }
 }
 
@@ -316,65 +262,45 @@ async function ensureUpstreamIsSet(branchName: string): Promise<void> {
  */
 async function checkoutBranch(branchName: string): Promise<void> {
   // First try to checkout the branch as-is (might be local)
-  let { code: checkoutCode, stderr: checkoutStderr } = await execFileNoThrow(
-    gitExe(),
-    ['checkout', branchName],
-  )
+  let { code: checkoutCode, stderr: checkoutStderr } = await execFileNoThrow(gitExe(), ['checkout', branchName]);
 
   // If that fails, try to checkout from origin
   if (checkoutCode !== 0) {
-    logForDebugging(
-      `Local checkout failed, trying to checkout from origin: ${checkoutStderr}`,
-    )
+    logForDebugging(`Local checkout failed, trying to checkout from origin: ${checkoutStderr}`);
 
     // Try to checkout the remote branch and create a local tracking branch
-    const result = await execFileNoThrow(gitExe(), [
-      'checkout',
-      '-b',
-      branchName,
-      '--track',
-      `origin/${branchName}`,
-    ])
+    const result = await execFileNoThrow(gitExe(), ['checkout', '-b', branchName, '--track', `origin/${branchName}`]);
 
-    checkoutCode = result.code
-    checkoutStderr = result.stderr
+    checkoutCode = result.code;
+    checkoutStderr = result.stderr;
 
     // If that also fails, try without -b in case the branch exists but isn't checked out
     if (checkoutCode !== 0) {
-      logForDebugging(
-        `Remote checkout with -b failed, trying without -b: ${checkoutStderr}`,
-      )
-      const finalResult = await execFileNoThrow(gitExe(), [
-        'checkout',
-        '--track',
-        `origin/${branchName}`,
-      ])
-      checkoutCode = finalResult.code
-      checkoutStderr = finalResult.stderr
+      logForDebugging(`Remote checkout with -b failed, trying without -b: ${checkoutStderr}`);
+      const finalResult = await execFileNoThrow(gitExe(), ['checkout', '--track', `origin/${branchName}`]);
+      checkoutCode = finalResult.code;
+      checkoutStderr = finalResult.stderr;
     }
   }
 
   if (checkoutCode !== 0) {
-    logEvent('tengu_teleport_error_branch_checkout_failed', {})
+    logEvent('tengu_teleport_error_branch_checkout_failed', {});
     throw new TeleportOperationError(
       `Failed to checkout branch '${branchName}': ${checkoutStderr}`,
       chalk.red(`Failed to checkout branch '${branchName}'\n`),
-    )
+    );
   }
 
   // After successful checkout, ensure upstream is set
-  await ensureUpstreamIsSet(branchName)
+  await ensureUpstreamIsSet(branchName);
 }
 
 /**
  * Gets the current branch name
  */
 async function getCurrentBranch(): Promise<string> {
-  const { stdout: currentBranch } = await execFileNoThrow(gitExe(), [
-    'branch',
-    '--show-current',
-  ])
-  return currentBranch.trim()
+  const { stdout: currentBranch } = await execFileNoThrow(gitExe(), ['branch', '--show-current']);
+  return currentBranch.trim();
 }
 
 /**
@@ -384,21 +310,18 @@ async function getCurrentBranch(): Promise<string> {
  * @param error Optional error from branch checkout
  * @returns Processed messages ready for resume
  */
-export function processMessagesForTeleportResume(
-  messages: Message[],
-  error: Error | null,
-): Message[] {
+export function processMessagesForTeleportResume(messages: Message[], error: Error | null): Message[] {
   // Shared logic with resume for handling interruped session transcripts
-  const deserializedMessages = deserializeMessages(messages)
+  const deserializedMessages = deserializeMessages(messages);
 
   // Add user message about teleport resume (visible to model)
   const messagesWithTeleportNotice = [
     ...deserializedMessages,
     createTeleportResumeUserMessage(),
     createTeleportResumeSystemMessage(error),
-  ]
+  ];
 
-  return messagesWithTeleportNotice
+  return messagesWithTeleportNotice;
 }
 
 /**
@@ -410,25 +333,25 @@ export async function checkOutTeleportedSessionBranch(
   branch?: string,
 ): Promise<{ branchName: string; branchError: Error | null }> {
   try {
-    const currentBranch = await getCurrentBranch()
-    logForDebugging(`Current branch before teleport: '${currentBranch}'`)
+    const currentBranch = await getCurrentBranch();
+    logForDebugging(`Current branch before teleport: '${currentBranch}'`);
 
     if (branch) {
-      logForDebugging(`Switching to branch '${branch}'...`)
-      await fetchFromOrigin(branch)
-      await checkoutBranch(branch)
-      const newBranch = await getCurrentBranch()
-      logForDebugging(`Branch after checkout: '${newBranch}'`)
+      logForDebugging(`Switching to branch '${branch}'...`);
+      await fetchFromOrigin(branch);
+      await checkoutBranch(branch);
+      const newBranch = await getCurrentBranch();
+      logForDebugging(`Branch after checkout: '${newBranch}'`);
     } else {
-      logForDebugging('No branch specified, staying on current branch')
+      logForDebugging('No branch specified, staying on current branch');
     }
 
-    const branchName = await getCurrentBranch()
-    return { branchName, branchError: null }
+    const branchName = await getCurrentBranch();
+    return { branchName, branchError: null };
   } catch (error) {
-    const branchName = await getCurrentBranch()
-    const branchError = toError(error)
-    return { branchName, branchError }
+    const branchName = await getCurrentBranch();
+    const branchError = toError(error);
+    return { branchName, branchError };
   }
 }
 
@@ -436,15 +359,15 @@ export async function checkOutTeleportedSessionBranch(
  * Result of repository validation for teleport
  */
 export type RepoValidationResult = {
-  status: 'match' | 'mismatch' | 'not_in_repo' | 'no_repo_required' | 'error'
-  sessionRepo?: string
-  currentRepo?: string | null
+  status: 'match' | 'mismatch' | 'not_in_repo' | 'no_repo_required' | 'error';
+  sessionRepo?: string;
+  currentRepo?: string | null;
   /** Host of the session repo (e.g. "github.com" or "ghe.corp.com") — for display only */
-  sessionHost?: string
+  sessionHost?: string;
   /** Host of the current repo (e.g. "github.com" or "ghe.corp.com") — for display only */
-  currentHost?: string
-  errorMessage?: string
-}
+  currentHost?: string;
+  errorMessage?: string;
+};
 
 /**
  * Validates that the current repository matches the session's repository.
@@ -453,17 +376,13 @@ export type RepoValidationResult = {
  * @param sessionData The session resource to validate against
  * @returns Validation result with status and repo information
  */
-export async function validateSessionRepository(
-  sessionData: SessionResource,
-): Promise<RepoValidationResult> {
-  const currentParsed = await detectCurrentRepositoryWithHost()
-  const currentRepo = currentParsed
-    ? `${currentParsed.owner}/${currentParsed.name}`
-    : null
+export async function validateSessionRepository(sessionData: SessionResource): Promise<RepoValidationResult> {
+  const currentParsed = await detectCurrentRepositoryWithHost();
+  const currentRepo = currentParsed ? `${currentParsed.owner}/${currentParsed.name}` : null;
 
   const gitSource = sessionData.session_context.sources.find(
     (source): source is GitSource => source.type === 'git_repository',
-  )
+  );
 
   if (!gitSource?.url) {
     // Session has no repo requirement
@@ -471,21 +390,19 @@ export async function validateSessionRepository(
       currentRepo
         ? 'Session has no associated repository, proceeding without validation'
         : 'Session has no repo requirement and not in git directory, proceeding',
-    )
-    return { status: 'no_repo_required' }
+    );
+    return { status: 'no_repo_required' };
   }
 
-  const sessionParsed = parseGitRemote(gitSource.url)
+  const sessionParsed = parseGitRemote(gitSource.url);
   const sessionRepo = sessionParsed
     ? `${sessionParsed.owner}/${sessionParsed.name}`
-    : parseGitHubRepository(gitSource.url)
+    : parseGitHubRepository(gitSource.url);
   if (!sessionRepo) {
-    return { status: 'no_repo_required' }
+    return { status: 'no_repo_required' };
   }
 
-  logForDebugging(
-    `Session is for repository: ${sessionRepo}, current repo: ${currentRepo ?? 'none'}`,
-  )
+  logForDebugging(`Session is for repository: ${sessionRepo}, current repo: ${currentRepo ?? 'none'}`);
 
   if (!currentRepo) {
     // Not in a git repo, but session requires one
@@ -494,27 +411,26 @@ export async function validateSessionRepository(
       sessionRepo,
       sessionHost: sessionParsed?.host,
       currentRepo: null,
-    }
+    };
   }
 
   // Compare both owner/repo and host to avoid cross-instance mismatches.
   // Strip ports before comparing hosts — SSH remotes omit the port while
   // HTTPS remotes may include a non-standard port (e.g. ghe.corp.com:8443),
   // which would cause a false mismatch.
-  const stripPort = (host: string): string => host.replace(/:\d+$/, '')
-  const repoMatch = currentRepo.toLowerCase() === sessionRepo.toLowerCase()
+  const stripPort = (host: string): string => host.replace(/:\d+$/, '');
+  const repoMatch = currentRepo.toLowerCase() === sessionRepo.toLowerCase();
   const hostMatch =
     !currentParsed ||
     !sessionParsed ||
-    stripPort(currentParsed.host.toLowerCase()) ===
-      stripPort(sessionParsed.host.toLowerCase())
+    stripPort(currentParsed.host.toLowerCase()) === stripPort(sessionParsed.host.toLowerCase());
 
   if (repoMatch && hostMatch) {
     return {
       status: 'match',
       sessionRepo,
       currentRepo,
-    }
+    };
   }
 
   // Repo mismatch — keep sessionRepo/currentRepo as plain "owner/repo" so
@@ -526,7 +442,7 @@ export async function validateSessionRepository(
     currentRepo,
     sessionHost: sessionParsed?.host,
     currentHost: currentParsed?.host,
-  }
+  };
 }
 
 /**
@@ -541,127 +457,105 @@ export async function teleportResumeCodeSession(
   onProgress?: TeleportProgressCallback,
 ): Promise<TeleportRemoteResponse> {
   if (!isPolicyAllowed('allow_remote_sessions')) {
-    throw new Error(
-      "Remote sessions are disabled by your organization's policy.",
-    )
+    throw new Error("Remote sessions are disabled by your organization's policy.");
   }
 
-  logForDebugging(`Resuming code session ID: ${sessionId}`)
+  logForDebugging(`Resuming code session ID: ${sessionId}`);
 
   try {
-    const accessToken = getClaudeAIOAuthTokens()?.accessToken
+    const accessToken = getClaudeAIOAuthTokens()?.accessToken;
     if (!accessToken) {
       logEvent('tengu_teleport_resume_error', {
-        error_type:
-          'no_access_token' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
+        error_type: 'no_access_token' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
       throw new Error(
         'Claude Code web sessions require authentication with a Claude.ai account. API key authentication is not sufficient. Please run /login to authenticate, or check your authentication status with /status.',
-      )
+      );
     }
 
     // Get organization UUID
-    const orgUUID = await getOrganizationUUID()
+    const orgUUID = await getOrganizationUUID();
     if (!orgUUID) {
       logEvent('tengu_teleport_resume_error', {
-        error_type:
-          'no_org_uuid' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
-      throw new Error(
-        'Unable to get organization UUID for constructing session URL',
-      )
+        error_type: 'no_org_uuid' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
+      throw new Error('Unable to get organization UUID for constructing session URL');
     }
 
     // Fetch and validate repository matches before resuming
-    onProgress?.('validating')
-    const sessionData = await fetchSession(sessionId)
-    const repoValidation = await validateSessionRepository(sessionData)
+    onProgress?.('validating');
+    const sessionData = await fetchSession(sessionId);
+    const repoValidation = await validateSessionRepository(sessionData);
 
     switch (repoValidation.status) {
       case 'match':
       case 'no_repo_required':
         // Proceed with teleport
-        break
+        break;
       case 'not_in_repo': {
         logEvent('tengu_teleport_error_repo_not_in_git_dir_sessions_api', {
-          sessionId:
-            sessionId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        })
+          sessionId: sessionId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        });
         // Include host for GHE users so they know which instance the repo is on
         const notInRepoDisplay =
-          repoValidation.sessionHost &&
-          repoValidation.sessionHost.toLowerCase() !== 'github.com'
+          repoValidation.sessionHost && repoValidation.sessionHost.toLowerCase() !== 'github.com'
             ? `${repoValidation.sessionHost}/${repoValidation.sessionRepo}`
-            : repoValidation.sessionRepo
+            : repoValidation.sessionRepo;
         throw new TeleportOperationError(
           `You must run claude --teleport ${sessionId} from a checkout of ${notInRepoDisplay}.`,
           chalk.red(
             `You must run claude --teleport ${sessionId} from a checkout of ${chalk.bold(notInRepoDisplay)}.\n`,
           ),
-        )
+        );
       }
       case 'mismatch': {
         logEvent('tengu_teleport_error_repo_mismatch_sessions_api', {
-          sessionId:
-            sessionId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        })
+          sessionId: sessionId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        });
         // Only include host prefix when hosts actually differ to disambiguate
         // cross-instance mismatches; for same-host mismatches the host is noise.
         const hostsDiffer =
           repoValidation.sessionHost &&
           repoValidation.currentHost &&
           repoValidation.sessionHost.replace(/:\d+$/, '').toLowerCase() !==
-            repoValidation.currentHost.replace(/:\d+$/, '').toLowerCase()
+            repoValidation.currentHost.replace(/:\d+$/, '').toLowerCase();
         const sessionDisplay = hostsDiffer
           ? `${repoValidation.sessionHost}/${repoValidation.sessionRepo}`
-          : repoValidation.sessionRepo
+          : repoValidation.sessionRepo;
         const currentDisplay = hostsDiffer
           ? `${repoValidation.currentHost}/${repoValidation.currentRepo}`
-          : repoValidation.currentRepo
+          : repoValidation.currentRepo;
         throw new TeleportOperationError(
           `You must run claude --teleport ${sessionId} from a checkout of ${sessionDisplay}.\nThis repo is ${currentDisplay}.`,
           chalk.red(
             `You must run claude --teleport ${sessionId} from a checkout of ${chalk.bold(sessionDisplay)}.\nThis repo is ${chalk.bold(currentDisplay)}.\n`,
           ),
-        )
+        );
       }
       case 'error':
         throw new TeleportOperationError(
-          repoValidation.errorMessage ||
-            'Failed to validate session repository',
-          chalk.red(
-            `Error: ${repoValidation.errorMessage || 'Failed to validate session repository'}\n`,
-          ),
-        )
+          repoValidation.errorMessage || 'Failed to validate session repository',
+          chalk.red(`Error: ${repoValidation.errorMessage || 'Failed to validate session repository'}\n`),
+        );
       default: {
-        const _exhaustive: never = repoValidation.status
-        throw new Error(`Unhandled repo validation status: ${_exhaustive}`)
+        const _exhaustive: never = repoValidation.status;
+        throw new Error(`Unhandled repo validation status: ${_exhaustive}`);
       }
     }
 
-    return await teleportFromSessionsAPI(
-      sessionId,
-      orgUUID,
-      accessToken,
-      onProgress,
-      sessionData,
-    )
+    return await teleportFromSessionsAPI(sessionId, orgUUID, accessToken, onProgress, sessionData);
   } catch (error) {
     if (error instanceof TeleportOperationError) {
-      throw error
+      throw error;
     }
 
-    const err = toError(error)
-    logError(err)
+    const err = toError(error);
+    logError(err);
     logEvent('tengu_teleport_resume_error', {
-      error_type:
-        'resume_session_id_catch' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-    })
+      error_type: 'resume_session_id_catch' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+    });
 
-    throw new TeleportOperationError(
-      err.message,
-      chalk.red(`Error: ${err.message}\n`),
-    )
+    throw new TeleportOperationError(err.message, chalk.red(`Error: ${err.message}\n`));
   }
 }
 
@@ -669,21 +563,16 @@ export async function teleportResumeCodeSession(
  * Helper function to handle teleport prerequisites (authentication and git state)
  * Shows TeleportError dialog rendered into the existing root if needed
  */
-async function handleTeleportPrerequisites(
-  root: Root,
-  errorsToIgnore?: Set<TeleportLocalErrorType>,
-): Promise<void> {
-  const errors = await getTeleportErrors()
+async function handleTeleportPrerequisites(root: Root, errorsToIgnore?: Set<TeleportLocalErrorType>): Promise<void> {
+  const errors = await getTeleportErrors();
   if (errors.size > 0) {
     // Log teleport errors detected
     logEvent('tengu_teleport_errors_detected', {
-      error_types: Array.from(errors).join(
-        ',',
-      ) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      error_types: Array.from(errors).join(',') as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
       errors_ignored: Array.from(errorsToIgnore || []).join(
         ',',
       ) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-    })
+    });
 
     // Show TeleportError dialog for user interaction
     await new Promise<void>(resolve => {
@@ -698,14 +587,14 @@ async function handleTeleportPrerequisites(
                   error_types: Array.from(errors).join(
                     ',',
                   ) as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-                })
-                void resolve()
+                });
+                void resolve();
               }}
             />
           </KeybindingSetup>
         </AppStateProvider>,
-      )
-    })
+      );
+    });
   }
 }
 
@@ -724,14 +613,14 @@ export async function teleportToRemoteWithErrorHandling(
   signal: AbortSignal,
   branchName?: string,
 ): Promise<TeleportToRemoteResponse | null> {
-  const errorsToIgnore = new Set<TeleportLocalErrorType>(['needsGitStash'])
-  await handleTeleportPrerequisites(root, errorsToIgnore)
+  const errorsToIgnore = new Set<TeleportLocalErrorType>(['needsGitStash']);
+  await handleTeleportPrerequisites(root, errorsToIgnore);
   return teleportToRemote({
     initialMessage: description,
     signal,
     branchName,
     onBundleFail: msg => process.stderr.write(`\n${msg}\n`),
-  })
+  });
 }
 
 /**
@@ -751,76 +640,67 @@ export async function teleportFromSessionsAPI(
   onProgress?: TeleportProgressCallback,
   sessionData?: SessionResource,
 ): Promise<TeleportRemoteResponse> {
-  const startTime = Date.now()
+  const startTime = Date.now();
 
   try {
     // Fetch session logs via session ingress
-    logForDebugging(`[teleport] Starting fetch for session: ${sessionId}`)
-    onProgress?.('fetching_logs')
+    logForDebugging(`[teleport] Starting fetch for session: ${sessionId}`);
+    onProgress?.('fetching_logs');
 
-    const logsStartTime = Date.now()
+    const logsStartTime = Date.now();
     // Try CCR v2 first (GetTeleportEvents — server dispatches Spanner/
     // threadstore). Fall back to session-ingress if it returns null
     // (endpoint not yet deployed, or transient error). Once session-ingress
     // is gone, the fallback becomes a no-op — getSessionLogsViaOAuth will
     // return null too and we fail with "Failed to fetch session logs".
-    let logs = await getTeleportEvents(sessionId, accessToken, orgUUID)
+    let logs = await getTeleportEvents(sessionId, accessToken, orgUUID);
     if (logs === null) {
-      logForDebugging(
-        '[teleport] v2 endpoint returned null, trying session-ingress',
-      )
-      logs = await getSessionLogsViaOAuth(sessionId, accessToken, orgUUID)
+      logForDebugging('[teleport] v2 endpoint returned null, trying session-ingress');
+      logs = await getSessionLogsViaOAuth(sessionId, accessToken, orgUUID);
     }
-    logForDebugging(
-      `[teleport] Session logs fetched in ${Date.now() - logsStartTime}ms`,
-    )
+    logForDebugging(`[teleport] Session logs fetched in ${Date.now() - logsStartTime}ms`);
 
     if (logs === null) {
-      throw new Error('Failed to fetch session logs')
+      throw new Error('Failed to fetch session logs');
     }
 
     // Filter to get only transcript messages, excluding sidechain messages
-    const filterStartTime = Date.now()
-    const messages = logs.filter(
-      entry => isTranscriptMessage(entry) && !entry.isSidechain,
-    ) as Message[]
+    const filterStartTime = Date.now();
+    const messages = logs.filter(entry => isTranscriptMessage(entry) && !entry.isSidechain) as Message[];
     logForDebugging(
       `[teleport] Filtered ${logs.length} entries to ${messages.length} messages in ${Date.now() - filterStartTime}ms`,
-    )
+    );
 
     // Extract branch info from session data
-    onProgress?.('fetching_branch')
-    const branch = sessionData ? getBranchFromSession(sessionData) : undefined
+    onProgress?.('fetching_branch');
+    const branch = sessionData ? getBranchFromSession(sessionData) : undefined;
     if (branch) {
-      logForDebugging(`[teleport] Found branch: ${branch}`)
+      logForDebugging(`[teleport] Found branch: ${branch}`);
     }
 
-    logForDebugging(
-      `[teleport] Total teleportFromSessionsAPI time: ${Date.now() - startTime}ms`,
-    )
+    logForDebugging(`[teleport] Total teleportFromSessionsAPI time: ${Date.now() - startTime}ms`);
 
     return {
       log: messages,
       branch,
-    }
+    };
   } catch (error) {
-    const err = toError(error)
+    const err = toError(error);
 
     // Handle 404 specifically
     if (axios.isAxiosError(error) && error.response?.status === 404) {
       logEvent('tengu_teleport_error_session_not_found_404', {
-        sessionId:
-          sessionId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
+        sessionId: sessionId as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
       throw new TeleportOperationError(
         `${sessionId} not found.`,
         `${sessionId} not found.\n${chalk.dim('Run /status in Claude Code to check your account.')}`,
-      )
+      );
     }
 
-    logError(err)
+    logError(err);
 
-    throw new Error(`Failed to fetch session from Sessions API: ${err.message}`)
+    throw new Error(`Failed to fetch session from Sessions API: ${err.message}`);
   }
 }
 
@@ -828,11 +708,11 @@ export async function teleportFromSessionsAPI(
  * Response type for polling remote session events (uses SDK events format)
  */
 export type PollRemoteSessionResponse = {
-  newEvents: SDKMessage[]
-  lastEventId: string | null
-  branch?: string
-  sessionStatus?: 'idle' | 'running' | 'requires_action' | 'archived'
-}
+  newEvents: SDKMessage[];
+  lastEventId: string | null;
+  branch?: string;
+  sessionStatus?: 'idle' | 'running' | 'requires_action' | 'archived';
+};
 
 /**
  * Polls remote session events. Pass the previous response's `lastEventId`
@@ -844,91 +724,82 @@ export async function pollRemoteSessionEvents(
   afterId: string | null = null,
   opts?: { skipMetadata?: boolean },
 ): Promise<PollRemoteSessionResponse> {
-  const accessToken = getClaudeAIOAuthTokens()?.accessToken
+  const accessToken = getClaudeAIOAuthTokens()?.accessToken;
   if (!accessToken) {
-    throw new Error('No access token for polling')
+    throw new Error('No access token for polling');
   }
 
-  const orgUUID = await getOrganizationUUID()
+  const orgUUID = await getOrganizationUUID();
   if (!orgUUID) {
-    throw new Error('No org UUID for polling')
+    throw new Error('No org UUID for polling');
   }
 
   const headers = {
     ...getOAuthHeaders(accessToken),
     'anthropic-beta': 'ccr-byoc-2025-07-29',
     'x-organization-uuid': orgUUID,
-  }
-  const eventsUrl = `${getOauthConfig().BASE_API_URL}/v1/sessions/${sessionId}/events`
+  };
+  const eventsUrl = `${getOauthConfig().BASE_API_URL}/v1/sessions/${sessionId}/events`;
 
   type EventsResponse = {
-    data: unknown[]
-    has_more: boolean
-    first_id: string | null
-    last_id: string | null
-  }
+    data: unknown[];
+    has_more: boolean;
+    first_id: string | null;
+    last_id: string | null;
+  };
 
   // Cap is a safety valve against stuck cursors; steady-state is 0–1 pages.
-  const MAX_EVENT_PAGES = 50
-  const sdkMessages: SDKMessage[] = []
-  let cursor = afterId
+  const MAX_EVENT_PAGES = 50;
+  const sdkMessages: SDKMessage[] = [];
+  let cursor = afterId;
   for (let page = 0; page < MAX_EVENT_PAGES; page++) {
     const eventsResponse = await axios.get(eventsUrl, {
       headers,
       params: cursor ? { after_id: cursor } : undefined,
       timeout: 30000,
-    })
+    });
 
     if (eventsResponse.status !== 200) {
-      throw new Error(
-        `Failed to fetch session events: ${eventsResponse.statusText}`,
-      )
+      throw new Error(`Failed to fetch session events: ${eventsResponse.statusText}`);
     }
 
-    const eventsData: EventsResponse = eventsResponse.data
+    const eventsData: EventsResponse = eventsResponse.data;
     if (!eventsData?.data || !Array.isArray(eventsData.data)) {
-      throw new Error('Invalid events response')
+      throw new Error('Invalid events response');
     }
 
     for (const event of eventsData.data) {
       if (event && typeof event === 'object' && 'type' in event) {
-        if (
-          event.type === 'env_manager_log' ||
-          event.type === 'control_response'
-        ) {
-          continue
+        if (event.type === 'env_manager_log' || event.type === 'control_response') {
+          continue;
         }
         if ('session_id' in event) {
-          sdkMessages.push(event as SDKMessage)
+          sdkMessages.push(event as SDKMessage);
         }
       }
     }
 
-    if (!eventsData.last_id) break
-    cursor = eventsData.last_id
-    if (!eventsData.has_more) break
+    if (!eventsData.last_id) break;
+    cursor = eventsData.last_id;
+    if (!eventsData.has_more) break;
   }
 
   if (opts?.skipMetadata) {
-    return { newEvents: sdkMessages, lastEventId: cursor }
+    return { newEvents: sdkMessages, lastEventId: cursor };
   }
 
   // Fetch session metadata (branch, status)
-  let branch: string | undefined
-  let sessionStatus: PollRemoteSessionResponse['sessionStatus']
+  let branch: string | undefined;
+  let sessionStatus: PollRemoteSessionResponse['sessionStatus'];
   try {
-    const sessionData = await fetchSession(sessionId)
-    branch = getBranchFromSession(sessionData)
-    sessionStatus =
-      sessionData.session_status as PollRemoteSessionResponse['sessionStatus']
+    const sessionData = await fetchSession(sessionId);
+    branch = getBranchFromSession(sessionData);
+    sessionStatus = sessionData.session_status as PollRemoteSessionResponse['sessionStatus'];
   } catch (e) {
-    logForDebugging(
-      `teleport: failed to fetch session ${sessionId} metadata: ${e}`,
-      { level: 'debug' },
-    )
+    logForDebugging(`teleport: failed to fetch session ${sessionId} metadata: ${e}`, { level: 'debug' });
   }
 
-  return { newEvents: sdkMessages, lastEventId: cursor, branch, sessionStatus }
+  return { newEvents: sdkMessages, lastEventId: cursor, branch, sessionStatus };
 }
 
 /**
@@ -945,26 +816,26 @@ export async function pollRemoteSessionEvents(
  *   Backend: anthropic#303856.
  */
 export async function teleportToRemote(options: {
-  initialMessage: string | null
-  branchName?: string
-  title?: string
+  initialMessage: string | null;
+  branchName?: string;
+  title?: string;
   /**
    * The description of the session. This is used to generate the title and
    * session branch name (unless they are explicitly provided).
    */
-  description?: string
-  model?: string
-  permissionMode?: PermissionMode
-  ultraplan?: boolean
-  signal: AbortSignal
-  useDefaultEnvironment?: boolean
+  description?: string;
+  model?: string;
+  permissionMode?: PermissionMode;
+  ultraplan?: boolean;
+  signal: AbortSignal;
+  useDefaultEnvironment?: boolean;
   /**
    * Explicit environment_id (e.g. the code_review synthetic env). Bypasses
    * fetchEnvironments; the usual repo-detection → git source still runs so
    * the container gets the repo checked out (orchestrator reads --repo-dir
    * from pwd, it doesn't clone).
    */
-  environmentId?: string
+  environmentId?: string;
   /**
    * Per-session env vars merged into session_context.environment_variables.
    * Write-only at the API layer (stripped from Get/List responses). When
@@ -973,7 +844,7 @@ export async function teleportToRemote(options: {
    * server only passes through what the caller sends; bughunter.go mints
    * its own, user sessions don't get one automatically).
    */
-  environmentVariables?: Record<string, string>
+  environmentVariables?: Record<string, string>;
   /**
    * When set with environmentId, creates and uploads a git bundle of the
    * local working tree (createAndUploadGitBundle handles the stash-create
@@ -981,52 +852,48 @@ export async function teleportToRemote(options: {
    * clones from the bundle instead of GitHub — container gets the caller's
    * exact local state. Needs .git/ only, not a GitHub remote.
    */
-  useBundle?: boolean
+  useBundle?: boolean;
   /**
    * Called with a user-facing message when the bundle path is attempted but
    * fails. The wrapper stderr.writes it (pre-REPL). Remote-agent callers
    * capture it to include in their throw (in-REPL, Ink-rendered).
    */
-  onBundleFail?: (message: string) => void
+  onBundleFail?: (message: string) => void;
 
-  onCreateFail?: (message: string) => void
+  onCreateFail?: (message: string) => void;
   /**
    * When true, disables the git-bundle fallback entirely. Use for flows like
    * autofix where CCR must push to GitHub — a bundle can't do that.
    */
-  skipBundle?: boolean
+  skipBundle?: boolean;
   /**
    * When set, reuses this branch as the outcome branch instead of generating
    * a new claude/ branch. Sets allow_unrestricted_git_push on the source and
    * reuse_outcome_branches on the session context so the remote pushes to the
    * caller's branch directly.
    */
-  reuseOutcomeBranch?: string
+  reuseOutcomeBranch?: string;
   /**
    * GitHub PR to attach to the session context. Backend uses this to
    * identify the PR associated with this session.
    */
-  githubPr?: { owner: string; repo: string; number: number }
+  githubPr?: { owner: string; repo: string; number: number };
 }): Promise<TeleportToRemoteResponse | null> {
-  const { initialMessage, signal } = options
+  const { initialMessage, signal } = options;
   try {
     // Check authentication
-    await checkAndRefreshOAuthTokenIfNeeded()
-    const accessToken = getClaudeAIOAuthTokens()?.accessToken
+    await checkAndRefreshOAuthTokenIfNeeded();
+    const accessToken = getClaudeAIOAuthTokens()?.accessToken;
     if (!accessToken) {
-      logError(new Error('No access token found for remote session creation'))
-      return null
+      logError(new Error('No access token found for remote session creation'));
+      return null;
     }
 
     // Get organization UUID
-    const orgUUID = await getOrganizationUUID()
+    const orgUUID = await getOrganizationUUID();
     if (!orgUUID) {
-      logError(
-        new Error(
-          'Unable to get organization UUID for remote session creation',
-        ),
-      )
-      return null
+      logError(new Error('Unable to get organization UUID for remote session creation'));
+      return null;
     }
 
     // Explicit environmentId short-circuits Haiku title-gen + env selection.
@@ -1035,22 +902,22 @@ export async function teleportToRemote(options: {
     // (bughunter.go:520 sets a git source too; env-manager does the checkout
     // before the SessionStart hook fires).
     if (options.environmentId) {
-      const url = `${getOauthConfig().BASE_API_URL}/v1/sessions`
+      const url = `${getOauthConfig().BASE_API_URL}/v1/sessions`;
       const headers = {
         ...getOAuthHeaders(accessToken),
         'anthropic-beta': 'ccr-byoc-2025-07-29',
         'x-organization-uuid': orgUUID,
-      }
+      };
       const envVars = {
         CLAUDE_CODE_OAUTH_TOKEN: accessToken,
         ...(options.environmentVariables ?? {}),
-      }
+      };
 
       // Bundle mode: upload local working tree (uncommitted changes via
       // refs/seed/stash), container clones from the bundle. No GitHub.
       // Otherwise: github.com source — caller checked eligibility.
-      let gitSource: GitSource | null = null
-      let seedBundleFileId: string | null = null
+      let gitSource: GitSource | null = null;
+      let seedBundleFileId: string | null = null;
       if (options.useBundle) {
         const bundle = await createAndUploadGitBundle(
           {
@@ -1059,29 +926,27 @@ export async function teleportToRemote(options: {
             baseUrl: getOauthConfig().BASE_API_URL,
           },
           { signal },
-        )
+        );
         if (!bundle.success) {
-          const failBundle = bundle as { success: false; error: string; failReason?: string }
-          logError(new Error(`Bundle upload failed: ${failBundle.error}`))
-          return null
+          const failBundle = bundle as { success: false; error: string; failReason?: string };
+          logError(new Error(`Bundle upload failed: ${failBundle.error}`));
+          return null;
         }
-        seedBundleFileId = bundle.fileId
+        seedBundleFileId = bundle.fileId;
         logEvent('tengu_teleport_bundle_mode', {
           size_bytes: bundle.bundleSizeBytes,
-          scope:
-            bundle.scope as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+          scope: bundle.scope as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
           has_wip: bundle.hasWip,
-          reason:
-            'explicit_env_bundle' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-        })
+          reason: 'explicit_env_bundle' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        });
       } else {
-        const repoInfo = await detectCurrentRepositoryWithHost()
+        const repoInfo = await detectCurrentRepositoryWithHost();
         if (repoInfo) {
           gitSource = {
             type: 'git_repository',
             url: `https://${repoInfo.host}/${repoInfo.owner}/${repoInfo.name}`,
             revision: options.branchName,
-          }
+          };
         }
       }
 
@@ -1095,37 +960,29 @@ export async function teleportToRemote(options: {
           environment_variables: envVars,
         },
         environment_id: options.environmentId,
-      }
+      };
       logForDebugging(
         `[teleportToRemote] explicit env ${options.environmentId}, ${Object.keys(envVars).length} env vars, ${seedBundleFileId ? `bundle=${seedBundleFileId}` : `source=${gitSource?.url ?? 'none'}@${options.branchName ?? 'default'}`}`,
-      )
-      const response = await axios.post(url, requestBody, { headers, signal })
+      );
+      const response = await axios.post(url, requestBody, { headers, signal });
       if (response.status !== 200 && response.status !== 201) {
-        logError(
-          new Error(
-            `CreateSession ${response.status}: ${jsonStringify(response.data)}`,
-          ),
-        )
-        return null
+        logError(new Error(`CreateSession ${response.status}: ${jsonStringify(response.data)}`));
+        return null;
       }
-      const sessionData = response.data as SessionResource
+      const sessionData = response.data as SessionResource;
       if (!sessionData || typeof sessionData.id !== 'string') {
-        logError(
-          new Error(
-            `No session id in response: ${jsonStringify(response.data)}`,
-          ),
-        )
-        return null
+        logError(new Error(`No session id in response: ${jsonStringify(response.data)}`));
+        return null;
       }
       return {
         id: sessionData.id,
         title: sessionData.title || requestBody.title,
-      }
+      };
     }
 
-    let gitSource: GitSource | null = null
-    let gitOutcome: GitRepositoryOutcome | null = null
-    let seedBundleFileId: string | null = null
+    let gitSource: GitSource | null = null;
+    let gitOutcome: GitRepositoryOutcome | null = null;
+    let seedBundleFileId: string | null = null;
 
     // Source selection ladder: GitHub clone (if CCR can actually pull it) →
     // bundle fallback (if .git exists) → empty sandbox.
@@ -1140,22 +997,22 @@ export async function teleportToRemote(options: {
     // or when you know your GitHub auth is busted. Read here (not in the
     // caller) so it works for remote-agent too, not just --remote.
 
-    const repoInfo = await detectCurrentRepositoryWithHost()
+    const repoInfo = await detectCurrentRepositoryWithHost();
 
     // Generate title and branch name for the session. Skip the Haiku call
     // when both title and outcome branch are explicitly provided.
-    let sessionTitle: string
-    let sessionBranch: string
+    let sessionTitle: string;
+    let sessionBranch: string;
     if (options.title && options.reuseOutcomeBranch) {
-      sessionTitle = options.title
-      sessionBranch = options.reuseOutcomeBranch
+      sessionTitle = options.title;
+      sessionBranch = options.reuseOutcomeBranch;
     } else {
       const generated = await generateTitleAndBranch(
         options.description || initialMessage || 'Background task',
         signal,
-      )
-      sessionTitle = options.title || generated.title
-      sessionBranch = options.reuseOutcomeBranch || generated.branchName
+      );
+      sessionTitle = options.title || generated.title;
+      sessionBranch = options.reuseOutcomeBranch || generated.branchName;
     }
 
     // Preflight: does CCR have a token that can clone this repo?
@@ -1164,60 +1021,50 @@ export async function teleportToRemote(options: {
     // setup. For them (and for non-GitHub hosts that parseGitRemote
     // somehow accepted), fall through optimistically; if the backend
     // rejects the host, bundle next time.
-    let ghViable = false
+    let ghViable = false;
     let sourceReason:
       | 'github_preflight_ok'
       | 'ghes_optimistic'
       | 'github_preflight_failed'
       | 'no_github_remote'
       | 'forced_bundle'
-      | 'no_git_at_all' = 'no_git_at_all'
+      | 'no_git_at_all' = 'no_git_at_all';
 
     // gitRoot gates both bundle creation and the gate check itself — no
     // point awaiting GrowthBook when there's nothing to bundle.
-    const gitRoot = findGitRoot(getCwd())
-    const forceBundle =
-      !options.skipBundle && isEnvTruthy(process.env.CCR_FORCE_BUNDLE)
+    const gitRoot = findGitRoot(getCwd());
+    const forceBundle = !options.skipBundle && isEnvTruthy(process.env.CCR_FORCE_BUNDLE);
     const bundleSeedGateOn =
       !options.skipBundle &&
       gitRoot !== null &&
       (isEnvTruthy(process.env.CCR_ENABLE_BUNDLE) ||
-        (await checkGate_CACHED_OR_BLOCKING('tengu_ccr_bundle_seed_enabled')))
+        (await checkGate_CACHED_OR_BLOCKING('tengu_ccr_bundle_seed_enabled')));
 
     if (repoInfo && !forceBundle) {
       if (repoInfo.host === 'github.com') {
-        ghViable = await checkGithubAppInstalled(
-          repoInfo.owner,
-          repoInfo.name,
-          signal,
-        )
-        sourceReason = ghViable
-          ? 'github_preflight_ok'
-          : 'github_preflight_failed'
+        ghViable = await checkGithubAppInstalled(repoInfo.owner, repoInfo.name, signal);
+        sourceReason = ghViable ? 'github_preflight_ok' : 'github_preflight_failed';
       } else {
-        ghViable = true
-        sourceReason = 'ghes_optimistic'
+        ghViable = true;
+        sourceReason = 'ghes_optimistic';
       }
     } else if (forceBundle) {
-      sourceReason = 'forced_bundle'
+      sourceReason = 'forced_bundle';
     } else if (gitRoot) {
-      sourceReason = 'no_github_remote'
+      sourceReason = 'no_github_remote';
     }
 
     // Preflight failed but bundle is off — fall through optimistically like
     // pre-preflight behavior. Backend reports the real auth error.
     if (!ghViable && !bundleSeedGateOn && repoInfo) {
-      ghViable = true
+      ghViable = true;
     }
 
     if (ghViable && repoInfo) {
-      const { host, owner, name } = repoInfo
+      const { host, owner, name } = repoInfo;
       // Resolve the base branch: prefer explicit branchName, fall back to default branch
-      const revision =
-        options.branchName ?? (await getDefaultBranch()) ?? undefined
-      logForDebugging(
-        `[teleportToRemote] Git source: ${host}/${owner}/${name}, revision: ${revision ?? 'none'}`,
-      )
+      const revision = options.branchName ?? (await getDefaultBranch()) ?? undefined;
+      logForDebugging(`[teleportToRemote] Git source: ${host}/${owner}/${name}, revision: ${revision ?? 'none'}`);
       gitSource = {
         type: 'git_repository',
         url: `https://${host}/${owner}/${name}`,
@@ -1226,7 +1073,7 @@ export async function teleportToRemote(options: {
         ...(options.reuseOutcomeBranch && {
           allow_unrestricted_git_push: true,
         }),
-      }
+      };
       // type: 'github' is used for all GitHub-compatible hosts (github.com and GHE).
       // The CLI can't distinguish GHE from non-GitHub hosts (GitLab, Bitbucket)
       // client-side — the backend validates the URL against configured GHE instances
@@ -1238,7 +1085,7 @@ export async function teleportToRemote(options: {
           repo: `${owner}/${name}`,
           branches: [sessionBranch],
         },
-      }
+      };
     }
 
     // Bundle fallback. Only try bundle if GitHub wasn't viable, the gate is
@@ -1247,7 +1094,7 @@ export async function teleportToRemote(options: {
     // .git definitely exists (detectCurrentRepositoryWithHost read the
     // remote from it).
     if (!gitSource && bundleSeedGateOn) {
-      logForDebugging(`[teleportToRemote] Bundling (reason: ${sourceReason})`)
+      logForDebugging(`[teleportToRemote] Bundling (reason: ${sourceReason})`);
       const bundle = await createAndUploadGitBundle(
         {
           oauthToken: accessToken,
@@ -1255,140 +1102,124 @@ export async function teleportToRemote(options: {
           baseUrl: getOauthConfig().BASE_API_URL,
         },
         { signal },
-      )
+      );
       if (!bundle.success) {
-        const failBundle = bundle as { success: false; error: string; failReason?: string }
-        logError(new Error(`Bundle upload failed: ${failBundle.error}`))
+        const failBundle = bundle as { success: false; error: string; failReason?: string };
+        logError(new Error(`Bundle upload failed: ${failBundle.error}`));
         // Only steer users to GitHub setup when there's a remote to clone from.
-        const setup = repoInfo
-          ? '. Please setup GitHub on https://claude.ai/code'
-          : ''
-        let msg: string
+        const setup = repoInfo ? '. Please setup GitHub on https://claude.ai/code' : '';
+        let msg: string;
         switch (failBundle.failReason) {
           case 'empty_repo':
-            msg =
-              'Repository has no commits — run `git add . && git commit -m "initial"` then retry'
-            break
+            msg = 'Repository has no commits — run `git add . && git commit -m "initial"` then retry';
+            break;
           case 'too_large':
-            msg = `Repo is too large to teleport${setup}`
-            break
+            msg = `Repo is too large to teleport${setup}`;
+            break;
           case 'git_error':
-            msg = `Failed to create git bundle (${failBundle.error})${setup}`
-            break
+            msg = `Failed to create git bundle (${failBundle.error})${setup}`;
+            break;
           case undefined:
-            msg = `Bundle upload failed: ${failBundle.error}${setup}`
-            break
+            msg = `Bundle upload failed: ${failBundle.error}${setup}`;
+            break;
           default: {
-            msg = `Bundle upload failed: ${failBundle.error}`
+            msg = `Bundle upload failed: ${failBundle.error}`;
           }
         }
-        options.onBundleFail?.(msg)
-        return null
+        options.onBundleFail?.(msg);
+        return null;
       }
-      seedBundleFileId = bundle.fileId
+      seedBundleFileId = bundle.fileId;
       logEvent('tengu_teleport_bundle_mode', {
         size_bytes: bundle.bundleSizeBytes,
-        scope:
-          bundle.scope as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+        scope: bundle.scope as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
         has_wip: bundle.hasWip,
-        reason:
-          sourceReason as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-      })
+        reason: sourceReason as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      });
     }
 
     logEvent('tengu_teleport_source_decision', {
-      reason:
-        sourceReason as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
+      reason: sourceReason as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
       path: (gitSource
         ? 'github'
         : seedBundleFileId
           ? 'bundle'
           : 'empty') as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
-    })
+    });
 
     if (!gitSource && !seedBundleFileId) {
-      logForDebugging(
-        '[teleportToRemote] No repository detected — session will have an empty sandbox',
-      )
+      logForDebugging('[teleportToRemote] No repository detected — session will have an empty sandbox');
     }
 
     // Fetch available environments
-    let environments = await fetchEnvironments()
+    let environments = await fetchEnvironments();
     if (!environments || environments.length === 0) {
-      logError(new Error('No environments available for session creation'))
-      return null
+      logError(new Error('No environments available for session creation'));
+      return null;
     }
 
     logForDebugging(
       `Available environments: ${environments.map(e => `${e.environment_id} (${e.name}, ${e.kind})`).join(', ')}`,
-    )
+    );
 
     // Select environment based on settings, then anthropic_cloud preference, then first available.
     // Prefer anthropic_cloud environments over byoc: anthropic_cloud environments (e.g. "Default")
     // are the standard compute environments with full repo access, whereas byoc environments
     // (e.g. "monorepo") are user-owned compute that may not support the current repository.
-    const settings = getSettings_DEPRECATED()
-    const defaultEnvironmentId = options.useDefaultEnvironment
-      ? undefined
-      : settings?.remote?.defaultEnvironmentId
-    let cloudEnv = environments.find(env => env.kind === 'anthropic_cloud')
+    const settings = getSettings_DEPRECATED();
+    const defaultEnvironmentId = options.useDefaultEnvironment ? undefined : settings?.remote?.defaultEnvironmentId;
+    let cloudEnv = environments.find(env => env.kind === 'anthropic_cloud');
     // When the caller opts out of their configured default, do not fall
     // through to a BYOC env that may not support the current repo or the
     // requested permission mode. Retry once for eventual consistency,
     // then fail loudly.
     if (options.useDefaultEnvironment && !cloudEnv) {
-      logForDebugging(
-        `No anthropic_cloud in env list (${environments.length} envs); retrying fetchEnvironments`,
-      )
-      const retried = await fetchEnvironments()
-      cloudEnv = retried?.find(env => env.kind === 'anthropic_cloud')
+      logForDebugging(`No anthropic_cloud in env list (${environments.length} envs); retrying fetchEnvironments`);
+      const retried = await fetchEnvironments();
+      cloudEnv = retried?.find(env => env.kind === 'anthropic_cloud');
       if (!cloudEnv) {
         logError(
           new Error(
             `No anthropic_cloud environment available after retry (got: ${(retried ?? environments).map(e => `${e.name} (${e.kind})`).join(', ')}). Silent byoc fallthrough would launch into a dead env — fail fast instead.`,
           ),
-        )
-        return null
+        );
+        return null;
       }
-      if (retried) environments = retried
+      if (retried) environments = retried;
     }
     const selectedEnvironment =
-      (defaultEnvironmentId &&
-        environments.find(
-          env => env.environment_id === defaultEnvironmentId,
-        )) ||
+      (defaultEnvironmentId && environments.find(env => env.environment_id === defaultEnvironmentId)) ||
       cloudEnv ||
       environments.find(env => env.kind !== 'bridge') ||
-      environments[0]
+      environments[0];
 
     if (!selectedEnvironment) {
-      logError(new Error('No environments available for session creation'))
-      return null
+      logError(new Error('No environments available for session creation'));
+      return null;
     }
 
     if (defaultEnvironmentId) {
-      const matchedDefault =
-        selectedEnvironment.environment_id === defaultEnvironmentId
+      const matchedDefault = selectedEnvironment.environment_id === defaultEnvironmentId;
       logForDebugging(
         matchedDefault
           ? `Using configured default environment: ${defaultEnvironmentId}`
           : `Configured default environment ${defaultEnvironmentId} not found, using first available`,
-      )
+      );
     }
 
-    const environmentId = selectedEnvironment.environment_id
+    const environmentId = selectedEnvironment.environment_id;
     logForDebugging(
       `Selected environment: ${environmentId} (${selectedEnvironment.name}, ${selectedEnvironment.kind})`,
-    )
+    );
 
     // Prepare API request for Sessions API
-    const url = `${getOauthConfig().BASE_API_URL}/v1/sessions`
+    const url = `${getOauthConfig().BASE_API_URL}/v1/sessions`;
 
     const headers = {
       ...getOAuthHeaders(accessToken),
       'anthropic-beta': 'ccr-byoc-2025-07-29',
       'x-organization-uuid': orgUUID,
-    }
+    };
 
     const sessionContext = {
       sources: gitSource ? [gitSource] : [],
@@ -1397,14 +1228,14 @@ export async function teleportToRemote(options: {
       model: options.model ?? getMainLoopModel(),
       ...(options.reuseOutcomeBranch && { reuse_outcome_branches: true }),
       ...(options.githubPr && { github_pr: options.githubPr }),
-    }
+    };
 
     // CreateCCRSessionPayload has no permission_mode field — a top-level
     // body entry is silently dropped by the proto parser server-side.
     // Instead prepend a set_permission_mode control_request event. Initial
     // events are written to threadstore before the container connects, so
     // the CLI applies the mode before the first user turn — no readiness race.
-    const events: Array<{ type: 'event'; data: Record<string, unknown> }> = []
+    const events: Array<{ type: 'event'; data: Record<string, unknown> }> = [];
     if (options.permissionMode) {
       events.push({
         type: 'event',
@@ -1417,7 +1248,7 @@ export async function teleportToRemote(options: {
             ultraplan: options.ultraplan,
           },
         },
-      })
+      });
     }
     if (initialMessage) {
       events.push({
@@ -1432,7 +1263,7 @@ export async function teleportToRemote(options: {
             content: initialMessage,
           },
         },
-      })
+      });
     }
 
     const requestBody = {
@@ -1440,47 +1271,41 @@ export async function teleportToRemote(options: {
       events,
       session_context: sessionContext,
       environment_id: environmentId,
-    }
+    };
 
-    logForDebugging(
-      `Creating session with payload: ${jsonStringify(requestBody, null, 2)}`,
-    )
+    logForDebugging(`Creating session with payload: ${jsonStringify(requestBody, null, 2)}`);
 
     // Make API call
-    const response = await axios.post(url, requestBody, { headers, signal, validateStatus: (status) => status < 500  })
-    const isSuccess = response.status === 200 || response.status === 201
+    const response = await axios.post(url, requestBody, { headers, signal, validateStatus: status => status < 500 });
+    const isSuccess = response.status === 200 || response.status === 201;
 
     if (!isSuccess) {
       logError(
         new Error(
           `API request failed with status ${response.status}: ${response.statusText}\n\nResponse data: ${jsonStringify(response.data, null, 2)}`,
         ),
-      )
+      );
 
       options.onCreateFail?.(`${response.status} ${response.statusText}: ${jsonStringify(response.data)}`);
-      return null
+      return null;
     }
 
     // Parse response as SessionResource
-    const sessionData = response.data as SessionResource
+    const sessionData = response.data as SessionResource;
     if (!sessionData || typeof sessionData.id !== 'string') {
-      logError(
-        new Error(
-          `Cannot determine session ID from API response: ${jsonStringify(response.data)}`,
-        ),
-      )
-      return null
+      logError(new Error(`Cannot determine session ID from API response: ${jsonStringify(response.data)}`));
+      return null;
     }
 
-    logForDebugging(`Successfully created remote session: ${sessionData.id}`)
+    logForDebugging(`Successfully created remote session: ${sessionData.id}`);
     return {
       id: sessionData.id,
       title: sessionData.title || requestBody.title,
-    }
+    };
   } catch (error) {
-    const err = toError(error)
-    logError(err)
-    return null
+    const err = toError(error);
+    logError(err);
+    return null;
   }
 }
 
@@ -1493,30 +1318,24 @@ export async function teleportToRemote(options: {
  * reaper collects it.
  */
 export async function archiveRemoteSession(sessionId: string, timeout = 10_000): Promise<void> {
-  const accessToken = getClaudeAIOAuthTokens()?.accessToken
-  if (!accessToken) return
-  const orgUUID = await getOrganizationUUID()
-  if (!orgUUID) return
+  const accessToken = getClaudeAIOAuthTokens()?.accessToken;
+  if (!accessToken) return;
+  const orgUUID = await getOrganizationUUID();
+  if (!orgUUID) return;
   const headers = {
     ...getOAuthHeaders(accessToken),
     'anthropic-beta': 'ccr-byoc-2025-07-29',
     'x-organization-uuid': orgUUID,
-  }
-  const url = `${getOauthConfig().BASE_API_URL}/v1/sessions/${sessionId}/archive`
+  };
+  const url = `${getOauthConfig().BASE_API_URL}/v1/sessions/${sessionId}/archive`;
   try {
-    const resp = await axios.post(
-      url,
-      {},
-      { headers, timeout, validateStatus: s => s < 500 },
-    )
+    const resp = await axios.post(url, {}, { headers, timeout, validateStatus: s => s < 500 });
     if (resp.status === 200 || resp.status === 409) {
-      logForDebugging(`[archiveRemoteSession] archived ${sessionId}`)
+      logForDebugging(`[archiveRemoteSession] archived ${sessionId}`);
     } else {
-      logForDebugging(
-        `[archiveRemoteSession] ${sessionId} failed ${resp.status}: ${jsonStringify(resp.data)}`,
-      )
+      logForDebugging(`[archiveRemoteSession] ${sessionId} failed ${resp.status}: ${jsonStringify(resp.data)}`);
     }
   } catch (err) {
-    logError(err)
+    logError(err);
   }
 }
diff --git a/src/utils/teleport/gitBundle.ts b/src/utils/teleport/gitBundle.ts
index fa4f2d8cc..b4de8f838 100644
--- a/src/utils/teleport/gitBundle.ts
+++ b/src/utils/teleport/gitBundle.ts
@@ -231,7 +231,11 @@ export async function createAndUploadGitBundle(
     )
 
     if (!bundle.ok) {
-      const failedBundle = bundle as { ok: false; error: string; failReason: BundleFailReason }
+      const failedBundle = bundle as {
+        ok: false
+        error: string
+        failReason: BundleFailReason
+      }
       logForDebugging(`[gitBundle] ${failedBundle.error}`)
       logEvent('tengu_ccr_bundle_upload', {
         outcome:
@@ -255,7 +259,10 @@ export async function createAndUploadGitBundle(
         outcome:
           'failed' as AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
       })
-      return { success: false, error: (upload as { success: false; error: string }).error }
+      return {
+        success: false,
+        error: (upload as { success: false; error: string }).error,
+      }
     }
 
     logForDebugging(
diff --git a/src/utils/teleport/src/constants/oauth.ts b/src/utils/teleport/src/constants/oauth.ts
index a1b08933a..ae2abf9b1 100644
--- a/src/utils/teleport/src/constants/oauth.ts
+++ b/src/utils/teleport/src/constants/oauth.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getOauthConfig = any;
+export type getOauthConfig = any
diff --git a/src/utils/teleport/src/services/analytics/index.ts b/src/utils/teleport/src/services/analytics/index.ts
index 142e7b6f5..2e0f796da 100644
--- a/src/utils/teleport/src/services/analytics/index.ts
+++ b/src/utils/teleport/src/services/analytics/index.ts
@@ -1,3 +1,3 @@
 // Auto-generated type stub — replace with real implementation
-export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any;
-export type logEvent = any;
+export type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS = any
+export type logEvent = any
diff --git a/src/utils/teleport/src/services/oauth/client.ts b/src/utils/teleport/src/services/oauth/client.ts
index 5a7055fbe..e9033865f 100644
--- a/src/utils/teleport/src/services/oauth/client.ts
+++ b/src/utils/teleport/src/services/oauth/client.ts
@@ -1,2 +1,2 @@
 // Auto-generated type stub — replace with real implementation
-export type getOrganizationUUID = any;
+export type getOrganizationUUID = any
diff --git a/src/utils/tokens.ts b/src/utils/tokens.ts
index e326d350d..3278b4738 100644
--- a/src/utils/tokens.ts
+++ b/src/utils/tokens.ts
@@ -1,6 +1,10 @@
 import type { BetaUsage as Usage } from '@anthropic-ai/sdk/resources/beta/messages/messages.mjs'
 import { roughTokenCountEstimationForMessages } from '../services/tokenEstimation.js'
-import type { AssistantMessage, ContentItem, Message } from '../types/message.js'
+import type {
+  AssistantMessage,
+  ContentItem,
+  Message,
+} from '../types/message.js'
 import { SYNTHETIC_MESSAGES, SYNTHETIC_MODEL } from './messages.js'
 import { jsonStringify } from './slowOperations.js'
 
@@ -12,7 +16,10 @@ export function getTokenUsage(message: Message): Usage | undefined {
     !(
       Array.isArray(message.message.content) &&
       (message.message.content as ContentItem[])[0]?.type === 'text' &&
-      SYNTHETIC_MESSAGES.has((message.message.content as Array<ContentItem & { text: string }>)[0]!.text)
+      SYNTHETIC_MESSAGES.has(
+        (message.message.content as Array<ContentItem & { text: string }>)[0]!
+          .text,
+      )
     ) &&
     message.message.model !== SYNTHETIC_MODEL
   ) {
@@ -192,11 +199,14 @@ export function getAssistantMessageContentLength(
     if (block.type === 'text') {
       contentLength += (block as ContentItem & { text: string }).text.length
     } else if (block.type === 'thinking') {
-      contentLength += (block as ContentItem & { thinking: string }).thinking.length
+      contentLength += (block as ContentItem & { thinking: string }).thinking
+        .length
     } else if (block.type === 'redacted_thinking') {
       contentLength += (block as ContentItem & { data: string }).data.length
     } else if (block.type === 'tool_use') {
-      contentLength += jsonStringify((block as ContentItem & { input: unknown }).input).length
+      contentLength += jsonStringify(
+        (block as ContentItem & { input: unknown }).input,
+      ).length
     }
   }
   return contentLength
@@ -256,10 +266,16 @@ export function tokenCountWithEstimation(messages: readonly Message[]): number {
       }
       return (
         getTokenCountFromUsage(usage) +
-        roughTokenCountEstimationForMessages(messages.slice(i + 1) as Parameters<typeof roughTokenCountEstimationForMessages>[0])
+        roughTokenCountEstimationForMessages(
+          messages.slice(i + 1) as Parameters<
+            typeof roughTokenCountEstimationForMessages
+          >[0],
+        )
       )
     }
     i--
   }
-  return roughTokenCountEstimationForMessages(messages as Parameters<typeof roughTokenCountEstimationForMessages>[0])
+  return roughTokenCountEstimationForMessages(
+    messages as Parameters<typeof roughTokenCountEstimationForMessages>[0],
+  )
 }
diff --git a/src/utils/toolSearch.ts b/src/utils/toolSearch.ts
index 29f3148a1..488b2f76b 100644
--- a/src/utils/toolSearch.ts
+++ b/src/utils/toolSearch.ts
@@ -551,7 +551,9 @@ export function extractDiscoveredToolNames(messages: Message[]): Set<string> {
     // check rather than isCompactBoundaryMessage — utils/messages.ts imports
     // from this file, so importing back would be circular.
     if (msg.type === 'system' && msg.subtype === 'compact_boundary') {
-      const carried = (msg as any).compactMetadata?.preCompactDiscoveredTools as string[] | undefined
+      const carried = (msg as any).compactMetadata?.preCompactDiscoveredTools as
+        | string[]
+        | undefined
       if (carried) {
         for (const name of carried) discoveredTools.add(name)
         carriedFromBoundary += carried.length
diff --git a/src/utils/transcriptSearch.ts b/src/utils/transcriptSearch.ts
index e8219c4a2..9e037b316 100644
--- a/src/utils/transcriptSearch.ts
+++ b/src/utils/transcriptSearch.ts
@@ -38,7 +38,7 @@ function computeSearchText(msg: RenderableMessage): string {
         raw = RENDERED_AS_SENTINEL.has(c) ? '' : c
       } else {
         const parts: string[] = []
-        for (const b of (c ?? [])) {
+        for (const b of c ?? []) {
           if (b.type === 'text') {
             if (!RENDERED_AS_SENTINEL.has(b.text)) parts.push(b.text)
           } else if (b.type === 'tool_result') {
@@ -84,7 +84,9 @@ function computeSearchText(msg: RenderableMessage): string {
       // (AttachmentMessage.tsx <Ansi>{m.content}</Ansi>). Visible but
       // unsearchable without this — [ dump finds it, / doesn't.
       if (msg.attachment!.type === 'relevant_memories') {
-        raw = (msg.attachment!.memories ?? []).map((m: { content: string }) => m.content).join('\n')
+        raw = (msg.attachment!.memories ?? [])
+          .map((m: { content: string }) => m.content)
+          .join('\n')
       } else if (
         // Mid-turn prompts — queued while an agent is running. Render via
         // UserTextMessage (AttachmentMessage.tsx:~348). stickyPromptText
@@ -97,7 +99,9 @@ function computeSearchText(msg: RenderableMessage): string {
         raw =
           typeof p === 'string'
             ? p
-            : (p as any[]).flatMap(b => (b.type === 'text' ? [b.text] : [])).join('\n')
+            : (p as any[])
+                .flatMap(b => (b.type === 'text' ? [b.text] : []))
+                .join('\n')
       }
       break
     }
diff --git a/src/utils/udsClient.ts b/src/utils/udsClient.ts
index 781f3ddd1..f3dcc55f2 100644
--- a/src/utils/udsClient.ts
+++ b/src/utils/udsClient.ts
@@ -104,9 +104,7 @@ export async function listAllLiveSessions(): Promise<PeerSession[]> {
  */
 export async function listPeers(): Promise<PeerSession[]> {
   const all = await listAllLiveSessions()
-  return all.filter(
-    s => s.pid !== process.pid && s.messagingSocketPath != null,
-  )
+  return all.filter(s => s.pid !== process.pid && s.messagingSocketPath != null)
 }
 
 // ---------------------------------------------------------------------------
@@ -117,8 +115,11 @@ export async function listPeers(): Promise<PeerSession[]> {
  * Probe a UDS socket to check if a server is listening (ping/pong).
  * Returns true if the peer responds within the timeout.
  */
-export async function isPeerAlive(socketPath: string, timeoutMs = 3000): Promise<boolean> {
-  return new Promise<boolean>((resolve) => {
+export async function isPeerAlive(
+  socketPath: string,
+  timeoutMs = 3000,
+): Promise<boolean> {
+  return new Promise<boolean>(resolve => {
     const conn = createConnection(socketPath, () => {
       const ping: UdsMessage = { type: 'ping', ts: new Date().toISOString() }
       conn.write(jsonStringify(ping) + '\n')
@@ -135,7 +136,7 @@ export async function isPeerAlive(socketPath: string, timeoutMs = 3000): Promise
     }, timeoutMs)
 
     let buffer = ''
-    conn.on('data', (chunk) => {
+    conn.on('data', chunk => {
       buffer += chunk.toString()
       if (buffer.includes('"pong"')) {
         if (!resolved) {
@@ -178,14 +179,18 @@ export async function sendToUdsSocket(
 
   return new Promise<void>((resolve, reject) => {
     const conn = createConnection(targetSocketPath, () => {
-      conn.write(jsonStringify(udsMsg) + '\n', (err) => {
+      conn.write(jsonStringify(udsMsg) + '\n', err => {
         conn.end()
         if (err) reject(err)
         else resolve()
       })
     })
-    conn.on('error', (err) => {
-      reject(new Error(`Failed to connect to peer at ${targetSocketPath}: ${errorMessage(err)}`))
+    conn.on('error', err => {
+      reject(
+        new Error(
+          `Failed to connect to peer at ${targetSocketPath}: ${errorMessage(err)}`,
+        ),
+      )
     })
     conn.setTimeout(5000, () => {
       conn.destroy(new Error('Connection timed out'))
diff --git a/src/utils/ultraplan/prompt.ts b/src/utils/ultraplan/prompt.ts
index 99eea01e6..2b9b95d3a 100644
--- a/src/utils/ultraplan/prompt.ts
+++ b/src/utils/ultraplan/prompt.ts
@@ -1,9 +1,9 @@
-import { getFeatureValue_CACHED_MAY_BE_STALE } from "src/services/analytics/growthbook"
+import { getFeatureValue_CACHED_MAY_BE_STALE } from 'src/services/analytics/growthbook'
 import simple_plan from './prompts/simple_plan.txt'
 import visual_plan from './prompts/visual_plan.txt'
 import three_subagents_with_critique from './prompts/three_subagents_with_critique.txt'
 
-export type PromptIdentifier = keyof typeof  PROMPTS
+export type PromptIdentifier = keyof typeof PROMPTS
 
 const DEFAULT_PROMPT_IDENTIFIER = 'simple_plan'
 
@@ -18,8 +18,13 @@ export function isValidPromptIdentifier(value: string): boolean {
 }
 
 export function getPromptIdentifier(): PromptIdentifier {
-  const promptIdentifier = getFeatureValue_CACHED_MAY_BE_STALE('tengu_ultraplan_prompt_identifier', DEFAULT_PROMPT_IDENTIFIER)
-  return isValidPromptIdentifier(promptIdentifier) ? promptIdentifier : DEFAULT_PROMPT_IDENTIFIER
+  const promptIdentifier = getFeatureValue_CACHED_MAY_BE_STALE(
+    'tengu_ultraplan_prompt_identifier',
+    DEFAULT_PROMPT_IDENTIFIER,
+  )
+  return isValidPromptIdentifier(promptIdentifier)
+    ? promptIdentifier
+    : DEFAULT_PROMPT_IDENTIFIER
 }
 
 export function getPromptText(id: PromptIdentifier): string {
@@ -28,9 +33,15 @@ export function getPromptText(id: PromptIdentifier): string {
 
 const DEFAULT_DIALOG = {
   timeEstimate: 'a few minutes',
-  dialogBody: 'Interactive planning on the web where you can edit and leave targeted comments on Claude\'s plan.',
+  dialogBody:
+    "Interactive planning on the web where you can edit and leave targeted comments on Claude's plan.",
   dialogPipeline: 'Plan → Edit → Execute',
-  usageBlurb: ['Remote plan mode with rich web editing experience.', 'Runs in Claude Code on the web. When the plan is ready,', 'you can execute it in the web session or send it back here.', 'You can continue to work while the plan is generated remotely.'],
+  usageBlurb: [
+    'Remote plan mode with rich web editing experience.',
+    'Runs in Claude Code on the web. When the plan is ready,',
+    'you can execute it in the web session or send it back here.',
+    'You can continue to work while the plan is generated remotely.',
+  ],
 }
 
 export const DIALOG_CONFIG = {
@@ -38,9 +49,15 @@ export const DIALOG_CONFIG = {
   visual_plan: DEFAULT_DIALOG,
   three_subagents_with_critique: {
     timeEstimate: '~10–30 min',
-    dialogBody: 'Interactive planning on the web where you can edit and leave targeted comments on Claude\'s plan.',
+    dialogBody:
+      "Interactive planning on the web where you can edit and leave targeted comments on Claude's plan.",
     dialogPipeline: 'Scope → Critique → Edit → Execute',
-    usageBlurb: ['Advanced multi-agent plan mode.', 'Runs in Claude Code on the web. When the plan is ready,', 'you can execute it in the web session or send it back here.', 'You can continue to work while the plan is generated remotely.'],
+    usageBlurb: [
+      'Advanced multi-agent plan mode.',
+      'Runs in Claude Code on the web. When the plan is ready,',
+      'you can execute it in the web session or send it back here.',
+      'You can continue to work while the plan is generated remotely.',
+    ],
   },
 }
 
diff --git a/src/utils/windowsPaths.ts b/src/utils/windowsPaths.ts
index c0774ea87..00e628beb 100644
--- a/src/utils/windowsPaths.ts
+++ b/src/utils/windowsPaths.ts
@@ -100,7 +100,6 @@ export const findGitBashPath = memoize((): string => {
     if (checkPathExists(process.env.CLAUDE_CODE_GIT_BASH_PATH)) {
       return process.env.CLAUDE_CODE_GIT_BASH_PATH
     }
-    // biome-ignore lint/suspicious/noConsole:: intentional console output
     console.error(
       `Claude Code was unable to find CLAUDE_CODE_GIT_BASH_PATH path "${process.env.CLAUDE_CODE_GIT_BASH_PATH}"`,
     )
@@ -116,7 +115,6 @@ export const findGitBashPath = memoize((): string => {
     }
   }
 
-  // biome-ignore lint/suspicious/noConsole:: intentional console output
   console.error(
     'Claude Code on Windows requires git-bash (https://git-scm.com/downloads/win). If installed but not in PATH, set environment variable pointing to your bash.exe, similar to: CLAUDE_CODE_GIT_BASH_PATH=C:\\Program Files\\Git\\bin\\bash.exe',
   )
diff --git a/src/utils/worktree.ts b/src/utils/worktree.ts
index dc4b3db3a..8cb20f8e3 100644
--- a/src/utils/worktree.ts
+++ b/src/utils/worktree.ts
@@ -1268,7 +1268,6 @@ export async function execIntoTmuxWorktree(args: string[]): Promise<{
       }
     }
     repoName = basename(findCanonicalGitRoot(getCwd()) ?? getCwd())
-    // biome-ignore lint/suspicious/noConsole: intentional console output
     console.log(`Using worktree via hook: ${worktreeDir}`)
   } else {
     // Get main git repo root (resolves through worktrees)
@@ -1291,7 +1290,6 @@ export async function execIntoTmuxWorktree(args: string[]): Promise<{
         prNumber !== null ? { prNumber } : undefined,
       )
       if (!result.existed) {
-        // biome-ignore lint/suspicious/noConsole: intentional console output
         console.log(
           `Created worktree: ${worktreeDir} (based on ${(result as any).baseBranch})`,
         )
@@ -1383,7 +1381,6 @@ export async function execIntoTmuxWorktree(args: string[]): Promise<{
   // Print hint about iTerm2 preferences when using control mode
   if (useControlMode && !sessionExists) {
     const y = chalk.yellow
-    // biome-ignore lint/suspicious/noConsole: intentional user guidance
     console.log(
       `\n${y('╭─ iTerm2 Tip ────────────────────────────────────────────────────────╮')}\n` +
         `${y('│')} To open as a tab instead of a new window:                           ${y('│')}\n` +