free-coding-models 0.1.87 → 0.1.89

package/src/key-handler.js

@@ -104,6 +104,7 @@ export function createKeyHandler(ctx) {
     MODELS,
     sources,
     getApiKey,
+    getProxySettings,
     resolveApiKeys,
     addApiKey,
     removeApiKey,
@@ -125,6 +126,7 @@ export function createKeyHandler(ctx) {
     ENV_VAR_NAMES,
     ensureProxyRunning,
     syncToOpenCode,
+    cleanupOpenCodeProxyConfig,
     restoreOpenCodeBackup,
     checkForUpdateDetailed,
     runUpdate,
@@ -132,7 +134,10 @@ export function createKeyHandler(ctx) {
     startOpenCodeDesktop,
     startOpenCode,
     startProxyAndLaunch,
+    startExternalTool,
     buildProxyTopologyFromConfig,
+    isProxyEnabledForConfig,
+    getToolModeOrder,
     startRecommendAnalysis,
     stopRecommendAnalysis,
     sendFeatureRequest,
@@ -261,6 +266,7 @@ export function createKeyHandler(ctx) {
             sortAsc: state.sortDirection === 'asc',
             pingInterval: state.pingInterval,
             hideUnconfiguredModels: state.hideUnconfiguredModels,
+            proxy: getProxySettings(state.config),
           })
           setActiveProfile(state.config, name)
           state.activeProfile = name
@@ -558,12 +564,17 @@ export function createKeyHandler(ctx) {
 
     // ─── Settings overlay keyboard handling ───────────────────────────────────
     if (state.settingsOpen) {
+      const proxySettings = getProxySettings(state.config)
       const providerKeys = Object.keys(sources)
       const updateRowIdx = providerKeys.length
-      // 📖 Profile rows start after update row — one row per saved profile
+      const proxyEnabledRowIdx = updateRowIdx + 1
+      const proxySyncRowIdx = updateRowIdx + 2
+      const proxyPortRowIdx = updateRowIdx + 3
+      const proxyCleanupRowIdx = updateRowIdx + 4
+      // 📖 Profile rows start after maintenance + proxy rows — one row per saved profile
       const savedProfiles = listProfiles(state.config)
-      const profileStartIdx = updateRowIdx + 1
-      const maxRowIdx = savedProfiles.length > 0 ? profileStartIdx + savedProfiles.length - 1 : updateRowIdx
+      const profileStartIdx = updateRowIdx + 5
+      const maxRowIdx = savedProfiles.length > 0 ? profileStartIdx + savedProfiles.length - 1 : proxyCleanupRowIdx
 
       // 📖 Edit/Add-key mode: capture typed characters for the API key
       if (state.settingsEditMode || state.settingsAddKeyMode) {
@@ -608,12 +619,40 @@ export function createKeyHandler(ctx) {
         return
       }
 
+      // 📖 Dedicated inline editor for the preferred proxy port. 0 = OS auto-port.
+      if (state.settingsProxyPortEditMode) {
+        if (key.name === 'return') {
+          const raw = state.settingsProxyPortBuffer.trim()
+          const parsed = raw === '' ? 0 : Number.parseInt(raw, 10)
+          if (!Number.isInteger(parsed) || parsed < 0 || parsed > 65535) {
+            state.settingsSyncStatus = { type: 'error', msg: '❌ Proxy port must be 0 (auto) or a number between 1 and 65535' }
+            return
+          }
+          if (!state.config.settings) state.config.settings = {}
+          state.config.settings.proxy = { ...proxySettings, preferredPort: parsed }
+          saveConfig(state.config)
+          state.settingsProxyPortEditMode = false
+          state.settingsProxyPortBuffer = ''
+          state.settingsSyncStatus = { type: 'success', msg: `✅ Preferred proxy port saved: ${parsed === 0 ? 'auto' : parsed}` }
+        } else if (key.name === 'escape') {
+          state.settingsProxyPortEditMode = false
+          state.settingsProxyPortBuffer = ''
+        } else if (key.name === 'backspace') {
+          state.settingsProxyPortBuffer = state.settingsProxyPortBuffer.slice(0, -1)
+        } else if (str && /^[0-9]$/.test(str) && state.settingsProxyPortBuffer.length < 5) {
+          state.settingsProxyPortBuffer += str
+        }
+        return
+      }
+
       // 📖 Normal settings navigation
       if (key.name === 'escape' || key.name === 'p') {
         // 📖 Close settings — rebuild results to reflect provider changes
         state.settingsOpen = false
         state.settingsEditMode = false
         state.settingsAddKeyMode = false
+        state.settingsProxyPortEditMode = false
+        state.settingsProxyPortBuffer = ''
         state.settingsEditBuffer = ''
         state.settingsSyncStatus = null  // 📖 Clear sync status on close
         // 📖 Rebuild results: add models from newly enabled providers, remove disabled
@@ -694,6 +733,21 @@ export function createKeyHandler(ctx) {
           return
         }
 
+        if (state.settingsCursor === proxyPortRowIdx) {
+          state.settingsProxyPortEditMode = true
+          state.settingsProxyPortBuffer = String(proxySettings.preferredPort || 0)
+          return
+        }
+
+        if (state.settingsCursor === proxyCleanupRowIdx) {
+          const cleaned = cleanupOpenCodeProxyConfig()
+          state.settingsSyncStatus = {
+            type: 'success',
+            msg: `✅ Proxy cleanup done (${cleaned.removedProvider ? 'provider removed' : 'no provider found'}, ${cleaned.removedModel ? 'default model cleared' : 'default model unchanged'})`,
+          }
+          return
+        }
+
         // 📖 Profile row: Enter → load the selected profile (apply its settings live)
         if (state.settingsCursor >= profileStartIdx && savedProfiles.length > 0) {
           const profileIdx = state.settingsCursor - profileStartIdx
@@ -729,10 +783,27 @@ export function createKeyHandler(ctx) {
       }
 
       if (key.name === 'space') {
-        if (state.settingsCursor === updateRowIdx) return
+        if (state.settingsCursor === updateRowIdx || state.settingsCursor === proxyPortRowIdx || state.settingsCursor === proxyCleanupRowIdx) return
         // 📖 Profile rows don't respond to Space
         if (state.settingsCursor >= profileStartIdx) return
 
+        if (state.settingsCursor === proxyEnabledRowIdx || state.settingsCursor === proxySyncRowIdx) {
+          if (!state.config.settings) state.config.settings = {}
+          state.config.settings.proxy = {
+            ...proxySettings,
+            enabled: state.settingsCursor === proxyEnabledRowIdx ? !proxySettings.enabled : proxySettings.enabled,
+            syncToOpenCode: state.settingsCursor === proxySyncRowIdx ? !proxySettings.syncToOpenCode : proxySettings.syncToOpenCode,
+          }
+          saveConfig(state.config)
+          state.settingsSyncStatus = {
+            type: 'success',
+            msg: state.settingsCursor === proxyEnabledRowIdx
+              ? `✅ Proxy mode ${state.config.settings.proxy.enabled ? 'enabled' : 'disabled'}`
+              : `✅ OpenCode proxy sync ${state.config.settings.proxy.syncToOpenCode ? 'enabled' : 'disabled'}`,
+          }
+          return
+        }
+
         // 📖 Toggle enabled/disabled for selected provider
         const pk = providerKeys[state.settingsCursor]
         if (!state.config.providers) state.config.providers = {}
@@ -785,6 +856,14 @@ export function createKeyHandler(ctx) {
        // 📖 S key: sync FCM provider entries to OpenCode config (merge, don't replace)
         if (key.name === 's' && !key.shift && !key.ctrl) {
           try {
+            if (!proxySettings.enabled) {
+              state.settingsSyncStatus = { type: 'error', msg: '⚠ Enable Proxy mode first if you want to sync fcm-proxy into OpenCode' }
+              return
+            }
+            if (!proxySettings.syncToOpenCode) {
+              state.settingsSyncStatus = { type: 'error', msg: '⚠ Enable "Persist proxy in OpenCode" first, or use the direct OpenCode flow only' }
+              return
+            }
             // 📖 Sync now also ensures proxy is running, so OpenCode can use fcm-proxy immediately.
             const started = await ensureProxyRunning(state.config)
             const result = syncToOpenCode(state.config, sources, mergedModels, {
@@ -847,6 +926,8 @@ export function createKeyHandler(ctx) {
       state.settingsCursor = 0
       state.settingsEditMode = false
       state.settingsAddKeyMode = false
+      state.settingsProxyPortEditMode = false
+      state.settingsProxyPortBuffer = ''
       state.settingsEditBuffer = ''
       state.settingsScrollOffset = 0
       return
@@ -875,6 +956,7 @@ export function createKeyHandler(ctx) {
           sortAsc: state.sortDirection === 'asc',
           pingInterval: state.pingInterval,
           hideUnconfiguredModels: state.hideUnconfiguredModels,
+          proxy: getProxySettings(state.config),
         })
         setActiveProfile(state.config, 'default')
         state.activeProfile = 'default'
@@ -1054,9 +1136,9 @@ export function createKeyHandler(ctx) {
       return
     }
 
-    // 📖 Mode toggle key: Z = cycle through modes (CLI → Desktop → OpenClaw)
+    // 📖 Mode toggle key: Z cycles through the supported tool targets.
     if (key.name === 'z') {
-      const modeOrder = ['opencode', 'opencode-desktop', 'openclaw']
+      const modeOrder = getToolModeOrder()
       const currentIndex = modeOrder.indexOf(state.mode)
       const nextIndex = (currentIndex + 1) % modeOrder.length
       state.mode = modeOrder[nextIndex]
@@ -1094,6 +1176,12 @@ export function createKeyHandler(ctx) {
       return
     }
 
+    // 📖 Esc can dismiss the narrow-terminal warning immediately without quitting the app.
+    if (key.name === 'escape' && state.terminalCols > 0 && state.terminalCols < 166) {
+      state.widthWarningDismissed = true
+      return
+    }
+
     if (key.name === 'return') { // Enter
       // 📖 Use the cached visible+sorted array — guaranteed to match what's on screen
       const selected = state.visibleSorted[state.cursor]
@@ -1121,7 +1209,7 @@ export function createKeyHandler(ctx) {
         const selectedApiKey = getApiKey(state.config, selected.providerKey)
         if (!selectedApiKey) {
           console.log(chalk.yellow(`  Warning: No API key configured for ${selected.providerKey}.`))
-          console.log(chalk.yellow(`  OpenCode may not be able to use ${selected.label}.`))
+          console.log(chalk.yellow(`  The selected tool may not be able to use ${selected.label}.`))
           console.log(chalk.dim(`  Set ${ENV_VAR_NAMES[selected.providerKey] || selected.providerKey.toUpperCase() + '_API_KEY'} or configure via settings (P key).`))
           console.log()
         }
@@ -1132,15 +1220,19 @@ export function createKeyHandler(ctx) {
         await startOpenClaw(userSelected, apiKey)
       } else if (state.mode === 'opencode-desktop') {
         await startOpenCodeDesktop(userSelected, state.config)
-      } else {
+      } else if (state.mode === 'opencode') {
         const topology = buildProxyTopologyFromConfig(state.config)
-        if (topology.accounts.length === 0) {
-          console.log(chalk.yellow('  No API keys found for proxy model catalog. Falling back to direct flow.'))
-          console.log()
-          await startOpenCode(userSelected, state.config)
-        } else {
+        if (isProxyEnabledForConfig(state.config) && topology.accounts.length > 0) {
           await startProxyAndLaunch(userSelected, state.config)
+        } else {
+          if (isProxyEnabledForConfig(state.config) && topology.accounts.length === 0) {
+            console.log(chalk.yellow('  Proxy mode is enabled, but no proxy-capable API keys were found. Falling back to direct flow.'))
+            console.log()
+          }
+          await startOpenCode(userSelected, state.config)
         }
+      } else {
+        await startExternalTool(state.mode, userSelected, state.config)
       }
       process.exit(0)
     }

package/src/opencode-sync.js

@@ -128,6 +128,30 @@ export function mergeOcConfig(ocConfig, mergedModels, proxyInfo = {}) {
   return ocConfig
 }
 
+/**
+ * Pure cleanup: remove only the persisted FCM proxy provider and any default
+ * model that still points at it. Other OpenCode providers stay untouched.
+ *
+ * @param {Object} ocConfig - Existing OpenCode config object (will be mutated in-place)
+ * @returns {{ removedProvider: boolean, removedModel: boolean, config: Object }}
+ */
+export function removeFcmProxyFromConfig(ocConfig) {
+  if (!ocConfig || typeof ocConfig !== 'object') {
+    return { removedProvider: false, removedModel: false, config: {} }
+  }
+
+  const hadProvider = Boolean(ocConfig.provider?.[FCM_PROVIDER_ID])
+  if (hadProvider) {
+    delete ocConfig.provider[FCM_PROVIDER_ID]
+    if (Object.keys(ocConfig.provider).length === 0) delete ocConfig.provider
+  }
+
+  const hadModel = typeof ocConfig.model === 'string' && ocConfig.model.startsWith(`${FCM_PROVIDER_ID}/`)
+  if (hadModel) delete ocConfig.model
+
+  return { removedProvider: hadProvider, removedModel: hadModel, config: ocConfig }
+}
+
 /**
  * MERGE the single FCM proxy provider into OpenCode config.
  *
@@ -157,3 +181,20 @@ export function syncToOpenCode(fcmConfig, _sources, mergedModels, proxyInfo = {}
     path: OC_CONFIG_PATH,
   }
 }
+
+/**
+ * Remove the persisted FCM proxy provider from OpenCode's config on disk.
+ * This is the user-facing cleanup operation for "proxy uninstall".
+ *
+ * @returns {{ removedProvider: boolean, removedModel: boolean, path: string }}
+ */
+export function cleanupOpenCodeProxyConfig() {
+  const oc = loadOpenCodeConfig()
+  const result = removeFcmProxyFromConfig(oc)
+  saveOpenCodeConfig(result.config)
+  return {
+    removedProvider: result.removedProvider,
+    removedModel: result.removedModel,
+    path: OC_CONFIG_PATH,
+  }
+}

package/src/opencode.js

@@ -23,6 +23,7 @@
  *   - `startProxyAndLaunch` — Start fcm-proxy then launch OpenCode
  *   - `autoStartProxyIfSynced` — Auto-start proxy if opencode.json has fcm-proxy
  *   - `ensureProxyRunning` — Ensure proxy is running (start or reuse)
+ *   - `isProxyEnabledForConfig` — Check whether proxy mode is opted in
  *
  *   @see src/opencode-sync.js — syncToOpenCode/load/save utilities
  *   @see src/proxy-server.js  — ProxyServer implementation
@@ -40,7 +41,7 @@ import { sources } from '../sources.js'
 import { resolveCloudflareUrl } from './ping.js'
 import { ProxyServer } from './proxy-server.js'
 import { loadOpenCodeConfig, saveOpenCodeConfig, syncToOpenCode } from './opencode-sync.js'
-import { getApiKey, resolveApiKeys } from './config.js'
+import { getApiKey, getProxySettings, resolveApiKeys } from './config.js'
 import { ENV_VAR_NAMES, OPENCODE_MODEL_MAP, isWindows, isMac, isLinux } from './provider-metadata.js'
 import { setActiveProxy } from './render-table.js'
 
@@ -559,10 +560,25 @@ export function buildProxyTopologyFromConfig(fcmConfig) {
   return { accounts, proxyModels }
 }
 
+/**
+ * 📖 Proxy mode is opt-in. Both launch-time proxying and persistent sync rely on
+ * 📖 this single helper so settings/profile changes behave consistently.
+ *
+ * @param {object} fcmConfig
+ * @returns {boolean}
+ */
+export function isProxyEnabledForConfig(fcmConfig) {
+  return getProxySettings(fcmConfig).enabled === true
+}
+
 export async function ensureProxyRunning(fcmConfig, { forceRestart = false } = {}) {
   registerExitHandlers()
   proxyCleanedUp = false
 
+  if (!isProxyEnabledForConfig(fcmConfig)) {
+    throw new Error('Proxy mode is disabled in Settings')
+  }
+
   if (forceRestart && activeProxy) {
     await cleanupProxy()
   }
@@ -587,7 +603,9 @@ export async function ensureProxyRunning(fcmConfig, { forceRestart = false } = {
   }
 
   const proxyToken = `fcm_${randomUUID().replace(/-/g, '')}`
-  const proxy = new ProxyServer({ accounts, proxyApiKey: proxyToken })
+  const proxySettings = getProxySettings(fcmConfig)
+  const preferredPort = Number.isInteger(proxySettings.preferredPort) ? proxySettings.preferredPort : 0
+  const proxy = new ProxyServer({ port: preferredPort, accounts, proxyApiKey: proxyToken })
   const { port } = await proxy.start()
   activeProxy = proxy
   setActiveProxy(activeProxy)
@@ -598,6 +616,9 @@ export async function ensureProxyRunning(fcmConfig, { forceRestart = false } = {
 
 export async function autoStartProxyIfSynced(fcmConfig, state) {
   try {
+    const proxySettings = getProxySettings(fcmConfig)
+    if (!proxySettings.enabled || !proxySettings.syncToOpenCode) return
+
     const ocConfig = loadOpenCodeConfig()
     if (!ocConfig?.provider?.['fcm-proxy']) return
 

package/src/overlays.js

@@ -23,6 +23,7 @@ export function createOverlayRenderers(state, deps) {
     PROVIDER_METADATA,
     LOCAL_VERSION,
     getApiKey,
+    getProxySettings,
     resolveApiKeys,
     isProviderEnabled,
     listProfiles,
@@ -49,6 +50,16 @@ export function createOverlayRenderers(state, deps) {
     getPingModel,
   } = deps
 
+  // 📖 Keep log token formatting aligned with the main table so the same totals
+  // 📖 read the same everywhere in the TUI.
+  const formatLogTokens = (totalTokens) => {
+    const safeTotal = Number(totalTokens) || 0
+    if (safeTotal <= 0) return '--'
+    if (safeTotal >= 999_500) return `${(safeTotal / 1_000_000).toFixed(2)}M`
+    if (safeTotal >= 1_000) return `${(safeTotal / 1_000).toFixed(2)}k`
+    return String(Math.floor(safeTotal))
+  }
+
   // ─── Settings screen renderer ─────────────────────────────────────────────
   // 📖 renderSettings: Draw the settings overlay in the alt screen buffer.
   // 📖 Shows all providers with their API key (masked) + enabled state.
@@ -57,6 +68,11 @@ export function createOverlayRenderers(state, deps) {
   function renderSettings() {
     const providerKeys = Object.keys(sources)
     const updateRowIdx = providerKeys.length
+    const proxyEnabledRowIdx = updateRowIdx + 1
+    const proxySyncRowIdx = updateRowIdx + 2
+    const proxyPortRowIdx = updateRowIdx + 3
+    const proxyCleanupRowIdx = updateRowIdx + 4
+    const proxySettings = getProxySettings(state.config)
     const EL = '\x1b[K'
     const lines = []
     const cursorLineByRow = {}
@@ -163,9 +179,37 @@ export function createOverlayRenderers(state, deps) {
       lines.push(chalk.red(`      ${state.settingsUpdateError}`))
     }
 
+    lines.push('')
+    lines.push(`  ${chalk.bold('🔀 Proxy')}`)
+    lines.push(`  ${chalk.dim('  ' + '─'.repeat(112))}`)
+    lines.push('')
+
+    const proxyEnabledBullet = state.settingsCursor === proxyEnabledRowIdx ? chalk.bold.cyan('  ❯ ') : chalk.dim('    ')
+    const proxyEnabledRow = `${proxyEnabledBullet}${chalk.bold('Proxy mode (opt-in)').padEnd(44)} ${proxySettings.enabled ? chalk.greenBright('Enabled') : chalk.dim('Disabled by default')}`
+    cursorLineByRow[proxyEnabledRowIdx] = lines.length
+    lines.push(state.settingsCursor === proxyEnabledRowIdx ? chalk.bgRgb(20, 45, 60)(proxyEnabledRow) : proxyEnabledRow)
+
+    const proxySyncBullet = state.settingsCursor === proxySyncRowIdx ? chalk.bold.cyan('  ❯ ') : chalk.dim('    ')
+    const proxySyncRow = `${proxySyncBullet}${chalk.bold('Persist proxy in OpenCode').padEnd(44)} ${proxySettings.syncToOpenCode ? chalk.greenBright('Enabled') : chalk.dim('Disabled')}`
+    cursorLineByRow[proxySyncRowIdx] = lines.length
+    lines.push(state.settingsCursor === proxySyncRowIdx ? chalk.bgRgb(20, 45, 60)(proxySyncRow) : proxySyncRow)
+
+    const proxyPortBullet = state.settingsCursor === proxyPortRowIdx ? chalk.bold.cyan('  ❯ ') : chalk.dim('    ')
+    const proxyPortValue = state.settingsProxyPortEditMode && state.settingsCursor === proxyPortRowIdx
+      ? chalk.cyanBright(`${state.settingsProxyPortBuffer}▏`)
+      : (proxySettings.preferredPort === 0 ? chalk.dim('auto (OS-assigned)') : chalk.green(String(proxySettings.preferredPort)))
+    const proxyPortRow = `${proxyPortBullet}${chalk.bold('Preferred proxy port').padEnd(44)} ${proxyPortValue}`
+    cursorLineByRow[proxyPortRowIdx] = lines.length
+    lines.push(state.settingsCursor === proxyPortRowIdx ? chalk.bgRgb(20, 45, 60)(proxyPortRow) : proxyPortRow)
+
+    const proxyCleanupBullet = state.settingsCursor === proxyCleanupRowIdx ? chalk.bold.cyan('  ❯ ') : chalk.dim('    ')
+    const proxyCleanupRow = `${proxyCleanupBullet}${chalk.bold('Clean OpenCode proxy config').padEnd(44)} ${chalk.dim('Enter removes fcm-proxy from opencode.json')}`
+    cursorLineByRow[proxyCleanupRowIdx] = lines.length
+    lines.push(state.settingsCursor === proxyCleanupRowIdx ? chalk.bgRgb(45, 30, 30)(proxyCleanupRow) : proxyCleanupRow)
+
     // 📖 Profiles section — list saved profiles with active indicator + delete support
     const savedProfiles = listProfiles(state.config)
-    const profileStartIdx = updateRowIdx + 1
+    const profileStartIdx = updateRowIdx + 5
     const maxRowIdx = savedProfiles.length > 0 ? profileStartIdx + savedProfiles.length - 1 : updateRowIdx
 
     lines.push('')
@@ -194,8 +238,10 @@ export function createOverlayRenderers(state, deps) {
     lines.push('')
     if (state.settingsEditMode) {
       lines.push(chalk.dim('  Type API key  •  Enter Save  •  Esc Cancel'))
+    } else if (state.settingsProxyPortEditMode) {
+      lines.push(chalk.dim('  Type proxy port (0 = auto)  •  Enter Save  •  Esc Cancel'))
     } else {
-      lines.push(chalk.dim('  ↑↓ Navigate  •  Enter Edit key  •  + Add key  •  - Remove key  •  Space Toggle  •  T Test key  •  S Sync→OpenCode  •  R Restore backup  •  U Updates  •  ⌫ Delete profile  •  Esc Close'))
+      lines.push(chalk.dim('  ↑↓ Navigate  •  Enter Edit/Run  •  + Add key  •  - Remove key  •  Space Toggle  •  T Test key  •  S Sync→OpenCode  •  R Restore backup  •  U Updates  •  ⌫ Delete profile  •  Esc Close'))
     }
     // 📖 Show sync/restore status message if set
     if (state.settingsSyncStatus) {
@@ -283,12 +329,12 @@ export function createOverlayRenderers(state, deps) {
     lines.push(`  ${chalk.yellow('W')}  Toggle ping mode  ${chalk.dim('(speed 2s → normal 10s → slow 30s → forced 4s)')}`)
     lines.push(`  ${chalk.yellow('E')}  Toggle configured models only  ${chalk.dim('(enabled by default, persisted globally + in profiles)')}`)
     lines.push(`  ${chalk.yellow('X')}  Toggle token log page  ${chalk.dim('(shows recent request usage from request-log.jsonl)')}`)
-    lines.push(`  ${chalk.yellow('Z')}  Cycle tool mode  ${chalk.dim('(OpenCode CLI → OpenCode Desktop → OpenClaw)')}`)
+    lines.push(`  ${chalk.yellow('Z')}  Cycle tool mode  ${chalk.dim('(OpenCode → Desktop → OpenClaw → Crush → Goose)')}`)
     lines.push(`  ${chalk.yellow('F')}  Toggle favorite on selected row  ${chalk.dim('(⭐ pinned at top, persisted)')}`)
     lines.push(`  ${chalk.yellow('Q')}  Smart Recommend  ${chalk.dim('(🎯 find the best model for your task — questionnaire + live analysis)')}`)
     lines.push(`  ${chalk.rgb(57, 255, 20).bold('J')}  Request Feature  ${chalk.dim('(📝 send anonymous feedback to the project team)')}`)
     lines.push(`  ${chalk.rgb(255, 87, 51).bold('I')}  Report Bug  ${chalk.dim('(🐛 send anonymous bug report to the project team)')}`)
-    lines.push(`  ${chalk.yellow('P')}  Open settings  ${chalk.dim('(manage API keys, provider toggles, manual update)')}`)
+    lines.push(`  ${chalk.yellow('P')}  Open settings  ${chalk.dim('(manage API keys, provider toggles, proxy, manual update)')}`)
     lines.push(`  ${chalk.yellow('Shift+P')}  Cycle config profile  ${chalk.dim('(switch between saved profiles live)')}`)
     lines.push(`  ${chalk.yellow('Shift+S')}  Save current config as a named profile  ${chalk.dim('(inline prompt — type name + Enter)')}`)
     lines.push(`             ${chalk.dim('Profiles store: favorites, sort, tier filter, ping interval, configured-only filter, API keys.')}`)
@@ -311,12 +357,24 @@ export function createOverlayRenderers(state, deps) {
     lines.push(`  ${chalk.cyan('free-coding-models --opencode')}           ${chalk.dim('OpenCode CLI mode')}`)
     lines.push(`  ${chalk.cyan('free-coding-models --opencode-desktop')}   ${chalk.dim('OpenCode Desktop mode')}`)
     lines.push(`  ${chalk.cyan('free-coding-models --openclaw')}           ${chalk.dim('OpenClaw mode')}`)
+    lines.push(`  ${chalk.cyan('free-coding-models --crush')}              ${chalk.dim('Crush mode')}`)
+    lines.push(`  ${chalk.cyan('free-coding-models --goose')}              ${chalk.dim('Goose mode')}`)
+    // 📖 Temporarily disabled launchers kept out of the public help until their flows are hardened.
+    // lines.push(`  ${chalk.cyan('free-coding-models --aider')}              ${chalk.dim('Aider mode')}`)
+    // lines.push(`  ${chalk.cyan('free-coding-models --claude-code')}        ${chalk.dim('Claude Code proxy mode')}`)
+    // lines.push(`  ${chalk.cyan('free-coding-models --codex')}              ${chalk.dim('Codex CLI proxy mode')}`)
+    // lines.push(`  ${chalk.cyan('free-coding-models --gemini')}             ${chalk.dim('Gemini CLI proxy mode')}`)
+    // lines.push(`  ${chalk.cyan('free-coding-models --qwen')}               ${chalk.dim('Qwen Code mode')}`)
+    // lines.push(`  ${chalk.cyan('free-coding-models --openhands')}          ${chalk.dim('OpenHands mode')}`)
+    // lines.push(`  ${chalk.cyan('free-coding-models --amp')}                ${chalk.dim('Amp mode')}`)
+    // lines.push(`  ${chalk.cyan('free-coding-models --pi')}                 ${chalk.dim('Pi mode')}`)
     lines.push(`  ${chalk.cyan('free-coding-models --best')}               ${chalk.dim('Only top tiers (A+, S, S+)')}`)
     lines.push(`  ${chalk.cyan('free-coding-models --fiable')}             ${chalk.dim('10s reliability analysis')}`)
     lines.push(`  ${chalk.cyan('free-coding-models --tier S|A|B|C')}       ${chalk.dim('Filter by tier letter')}`)
     lines.push(`  ${chalk.cyan('free-coding-models --no-telemetry')}       ${chalk.dim('Disable telemetry for this run')}`)
     lines.push(`  ${chalk.cyan('free-coding-models --recommend')}          ${chalk.dim('Auto-open Smart Recommend on start')}`)
     lines.push(`  ${chalk.cyan('free-coding-models --profile <name>')}     ${chalk.dim('Load a saved config profile')}`)
+    lines.push(`  ${chalk.cyan('free-coding-models --clean-proxy')}       ${chalk.dim('Remove persisted fcm-proxy config from OpenCode')}`)
     lines.push(`  ${chalk.dim('Flags can be combined: --openclaw --tier S')}`)
     lines.push('')
     // 📖 Help overlay can be longer than viewport, so keep a dedicated scroll offset.
@@ -336,35 +394,39 @@ export function createOverlayRenderers(state, deps) {
     const lines = []
     lines.push('')
     lines.push(`  ${chalk.bold('📋 Request Log')}  ${chalk.dim('— recent requests • ↑↓ scroll • X or Esc close')}`)
+    lines.push(chalk.dim('  Works only when the multi-account proxy is enabled and requests go through it.'))
+    lines.push(chalk.dim('  Direct provider launches do not currently write into this log.'))
     lines.push('')
 
     // 📖 Load recent log entries — bounded read, newest-first, malformed lines skipped.
     const logRows = loadRecentLogs({ limit: 200 })
+    const totalTokens = logRows.reduce((sum, row) => sum + (Number(row.tokens) || 0), 0)
 
     if (logRows.length === 0) {
       lines.push(chalk.dim('  No log entries found.'))
       lines.push(chalk.dim('  Logs are written to ~/.free-coding-models/request-log.jsonl'))
       lines.push(chalk.dim('  when requests are proxied through the multi-account rotation proxy.'))
+      lines.push(chalk.dim('  Direct provider launches do not currently feed this token log.'))
     } else {
+      lines.push(`  ${chalk.bold('Total Consumed:')} ${chalk.greenBright(formatLogTokens(totalTokens))}`)
+      lines.push('')
       // 📖 Column widths for the log table
       const W_TIME    = 19
-      const W_TYPE    = 18
       const W_PROV    = 14
       const W_MODEL   = 36
       const W_STATUS  = 8
-      const W_TOKENS  = 9
+      const W_TOKENS  = 12
       const W_LAT     = 10
 
       // 📖 Header row
       const hTime   = chalk.dim('Time'.padEnd(W_TIME))
-      const hType   = chalk.dim('Type'.padEnd(W_TYPE))
       const hProv   = chalk.dim('Provider'.padEnd(W_PROV))
       const hModel  = chalk.dim('Model'.padEnd(W_MODEL))
       const hStatus = chalk.dim('Status'.padEnd(W_STATUS))
-      const hTok    = chalk.dim('Used'.padEnd(W_TOKENS))
+      const hTok    = chalk.dim('Tokens Used'.padEnd(W_TOKENS))
       const hLat    = chalk.dim('Latency'.padEnd(W_LAT))
-      lines.push(`  ${hTime}  ${hType}  ${hProv}  ${hModel}  ${hStatus}  ${hTok}  ${hLat}`)
-      lines.push(chalk.dim('  ' + '─'.repeat(W_TIME + W_TYPE + W_PROV + W_MODEL + W_STATUS + W_TOKENS + W_LAT + 12)))
+      lines.push(`  ${hTime}  ${hProv}  ${hModel}  ${hStatus}  ${hTok}  ${hLat}`)
+      lines.push(chalk.dim('  ' + '─'.repeat(W_TIME + W_PROV + W_MODEL + W_STATUS + W_TOKENS + W_LAT + 10)))
 
       for (const row of logRows) {
         // 📖 Format time as HH:MM:SS (strip the date part for compactness)
@@ -389,17 +451,16 @@ export function createOverlayRenderers(state, deps) {
           statusCell = chalk.dim(sc.padEnd(W_STATUS))
         }
 
-        const tokStr = row.tokens > 0 ? String(row.tokens) : '--'
+        const tokStr = formatLogTokens(row.tokens)
         const latStr = row.latency > 0 ? `${row.latency}ms` : '--'
 
         const timeCell  = chalk.dim(timeStr.slice(0, W_TIME).padEnd(W_TIME))
-        const typeCell  = chalk.magenta((row.requestType || '--').slice(0, W_TYPE).padEnd(W_TYPE))
         const provCell  = chalk.cyan(row.provider.slice(0, W_PROV).padEnd(W_PROV))
         const modelCell = chalk.white(row.model.slice(0, W_MODEL).padEnd(W_MODEL))
         const tokCell   = chalk.dim(tokStr.padEnd(W_TOKENS))
         const latCell   = chalk.dim(latStr.padEnd(W_LAT))
 
-        lines.push(`  ${timeCell}  ${typeCell}  ${provCell}  ${modelCell}  ${statusCell}  ${tokCell}  ${latCell}`)
+        lines.push(`  ${timeCell}  ${provCell}  ${modelCell}  ${statusCell}  ${tokCell}  ${latCell}`)
       }
     }