feat: add opencode support (#762)

* feat: add opencode support

* fix: stabilize opencode session startup

* fix: /models

* fix: improveUI for commands

* fix: format commands.js

* feat: load models through provider adapters

Provider model selection had outgrown a single hardcoded service.

The old service mixed shared caching with provider catalogs and CLI lookup details.

That made stale model lists more likely as providers changed on separate schedules.

Move model discovery behind each provider so lookup lives next to the integration.

The shared service now focuses on provider resolution, caching, persistence, and dedupe.

Return cache metadata and add bypassCache because model availability changes outside the app.

The UI and /models command can show freshness and let users force a provider refresh.

Surface model descriptions while keeping fallback catalogs for unavailable CLIs or SDKs.

* feat(models): resolve active session models through provider adapters

The model inventory command was showing a mix of catalog defaults and
composer-local state instead of the model that is actually active for a
real provider session. That made /models, /cost, and /status
misleading once a session had already started, especially for providers
whose effective runtime model can differ from the optimistic model value
held in the UI.

Introduce an explicit getCurrentActiveModel() contract on
IProviderModels so model resolution lives next to each provider's
catalog logic and uses the provider-native source of truth:

- Claude reads the init event from a resumed stream-json run
- Codex reads model from ~/.codex/config.toml
- Cursor reads lastUsedModel from the chat store.db
- OpenCode reads the persisted session model from opencode.db
- Gemini intentionally returns its default because the CLI does not
  provide a reliable active-session lookup

Keep the returned shape intentionally minimal ({ model }). The goal is
to expose only what downstream command consumers need and avoid leaking
provider-specific metadata into a shared transport shape that would
create extra UI coupling and future cleanup cost.

Also make command behavior session-aware: when there is no concrete
session id, do not spawn provider processes or inspect provider session
storage just to answer /models, /cost, or /status. In a new-session
view the correct answer is simply the provider default, and doing more
work there adds latency and unnecessary side effects for no user value.

As part of this, centralize two supporting concerns:

- add a shared helper for building the default current-model result from
  a provider catalog so fallbacks stay aligned with DEFAULT
- move leaf-directory validation into shared utils so Cursor session
  readers and model lookup code enforce the same path-safety rule

Tests were expanded to cover both the new service delegation path and
the sessionless command behavior, while keeping cache-sensitive tests
isolated from persisted host cache state.

Why this change:
- command output should reflect the model actually driving a session
- new-session views should stay fast and side-effect free
- provider-specific active-model lookup should not be scattered across
  routes or UI code
- fallback behavior should be explicit, consistent, and limited to the
  provider default when no true active model can be resolved

* feat: support session-scoped model overrides

Model selection was acting like a provider-level preference.

That made resumed sessions drift back to a default or request-time model.

Users expect /models changes made inside a conversation to affect that session.

Store explicit session choices in app-owned ~/.cloudcli state.

This avoids editing provider transcripts or native provider config.

Resolve the effective model before launching each provider runtime.

Claude, Cursor, Codex, Gemini, and OpenCode now honor stored resume choices.

Expose a backend active-model change endpoint for existing sessions.

The models modal can now distinguish default changes from session overrides.

It also shows when a selected model will apply on the next response.

For Claude, stop probing active model state by resuming with a dummy prompt.

Read the indexed JSONL transcript from the end instead.

This preserves provider history while honoring /model stdout or model fields.

Add service tests for adapter delegation and resume-model precedence.

The tests keep cache state, override state, and requested fallback separate.

* feat: make command modal more compact

* fix: preserve opencode session creation events

OpenCode emits the real session id asynchronously on its first JSON output. The runner
registered that id from a helper that could not see the spawned process because
the process reference was scoped inside the model-resolution callback. That
ReferenceError was swallowed by the generic JSON parse fallback, so the client
never received session_created. Without that event, a new OpenCode chat stayed
on / and the assistant stream was not attached to the new session view.

Keep the process reference in the outer spawn scope so registration can update
the active-process map and websocket writer as soon as OpenCode announces the
session id. Split JSON parsing from event processing so malformed non-JSON
output can still stream as raw text, while registration or adapter failures are
surfaced as real errors instead of being hidden as assistant content.

Add a fake opencode executable regression test to lock in the expected lifecycle
ordering: session_created must be sent before live assistant messages, and the
same session id must carry through stream_end and complete.

* fix: clarify model refresh and onboarding providers

OpenCode is now a supported chat provider, but first-run onboarding still only offered
Claude, Cursor, Codex, and Gemini. That made OpenCode harder to discover and
forced users to finish setup before finding the provider in settings or chat.
Adding it to onboarding keeps first-run setup aligned with the providers the
application already supports elsewhere.

The model refresh control was also doing too much visual work. In the new chat
model picker, the previous Hard Refresh label looked like the dialog heading,
which made the primary task unclear. Users open that dialog to choose a model;
refreshing catalogs is only a secondary maintenance action for stale cached
provider model lists.

Rename and reposition the refresh affordance so the model picker reads as a
model picker first. The copy now explains why catalogs are cached, when a refresh
is useful, and that the refresh checks every provider. The /models modal gets the
same clarification so both model-selection surfaces describe the cache behavior
consistently.

* fix: format opencode model catalog labels

OpenCode returns provider-prefixed ids directly from the CLI. Passing those ids through as
labels made the model picker hard to scan: users saw values like
anthropic/claude-3-5-sonnet-20241022 or lowercased, hyphen-split text instead
of readable model names.

Keep the exact OpenCode id as the option value because that is what the CLI
expects, but derive a presentation label for the frontend. The formatter is
intentionally generic rather than a catalog of known providers. It handles common
identifier structure such as provider/model, hyphen-delimited words, v-prefixed
versions, adjacent numeric version tokens, and 8-digit date suffixes.

This keeps OpenCode usable as its model list expands across many upstream
providers without requiring code changes for every new provider or model family.
The description keeps the raw provider-prefixed id visible so users can still
confirm the precise model being selected.

* feat: add more fallback models for cursor

* docs: move model catalog out of shared

The model catalog is no longer a frontend/backend runtime contract.

Keeping it under shared made ownership misleading. It implied the catalog was
application code shared by runtime consumers, even though it now only supports
README links and public API documentation.

Move the catalog into public so it lives beside the docs surfaces that need it.
This gives the API docs a stable, served module and gives README readers a
linkable source without suggesting frontend or backend runtime dependency.

Render the API docs model list from the exported provider registry instead of a
hardcoded Claude/Cursor/Codex subset. That keeps Gemini and OpenCode visible and
makes future provider documentation changes flow through one docs-specific file.

Update README links, provider maintenance notes, and package files so published
artifacts include the standalone docs page and model catalog without relying on
the old shared path.

* fix: simplify empty-state model selector

Keep the provider empty state focused on the setup action users need there:

choosing a model.

The refresh control, cache timestamp, and refresh explanation made the dialog feel

like a cache-management surface.

That extra action is out of place in the empty state, where the goal is to start

a chat with the selected provider and model.

Remove the refresh-specific UI from ProviderSelectionEmptyState and drop the

now-unused refresh/cache props from the ChatMessagesPane pass-through.

Refresh behavior remains available in the dedicated command result flow.

src/components/chat/view/ChatInterface.tsx

@@ -14,10 +14,10 @@ import { useSessionStore } from '../../../stores/useSessionStore';
 
 import ChatMessagesPane from './subcomponents/ChatMessagesPane';
 import ChatComposer from './subcomponents/ChatComposer';
+import CommandResultModal from './subcomponents/CommandResultModal';
 
 
 type PendingViewSession = {
-  sessionId: string | null;
   startedAt: number;
 };
 
@@ -72,19 +72,26 @@ function ChatInterface({
     setCodexModel,
     geminiModel,
     setGeminiModel,
+    opencodeModel,
+    setOpenCodeModel,
     permissionMode,
     pendingPermissionRequests,
     setPendingPermissionRequests,
     cyclePermissionMode,
+    providerModelCatalog,
+    providerModelCacheCatalog,
+    providerModelsLoading,
+    providerModelsRefreshing,
+    hardRefreshProviderModels,
+    selectProviderModel,
   } = useChatProviderState({
     selectedSession,
+    selectedProject,
   });
 
   const {
     chatMessages,
     addMessage,
-    clearMessages,
-    rewindMessages,
     isLoading,
     setIsLoading,
     currentSessionId,
@@ -170,7 +177,9 @@ function ChatInterface({
     handlePermissionDecision,
     handleGrantToolPermission,
     handleInputFocusChange,
-    isInputFocused,
+    isInputFocused: _isInputFocused,
+    commandModalPayload,
+    closeCommandModal,
   } = useChatComposerState({
     selectedProject,
     selectedSession,
@@ -182,6 +191,7 @@ function ChatInterface({
     claudeModel,
     codexModel,
     geminiModel,
+    opencodeModel,
     isLoading,
     canAbortSession,
     tokenBudget,
@@ -195,8 +205,6 @@ function ChatInterface({
     pendingViewSessionRef,
     scrollToBottom,
     addMessage,
-    clearMessages,
-    rewindMessages,
     setIsLoading,
     setCanAbortSession,
     setClaudeStatus,
@@ -234,6 +242,7 @@ function ChatInterface({
     streamTimerRef,
     accumulatedStreamRef,
     onSessionInactive,
+    onSessionActive,
     onSessionProcessing,
     onSessionNotProcessing,
     onNavigateToSession,
@@ -280,6 +289,8 @@ function ChatInterface({
           ? t('messageTypes.codex')
           : provider === 'gemini'
             ? t('messageTypes.gemini')
+            : provider === 'opencode'
+              ? t('messageTypes.opencode', { defaultValue: 'OpenCode' })
             : t('messageTypes.claude');
 
     return (
@@ -318,6 +329,10 @@ function ChatInterface({
           setCodexModel={setCodexModel}
           geminiModel={geminiModel}
           setGeminiModel={setGeminiModel}
+          opencodeModel={opencodeModel}
+          setOpenCodeModel={setOpenCodeModel}
+          providerModelCatalog={providerModelCatalog}
+          providerModelsLoading={providerModelsLoading}
           tasksEnabled={tasksEnabled}
           isTaskMasterInstalled={isTaskMasterInstalled}
           onShowAllTasks={onShowAllTasks}
@@ -406,6 +421,8 @@ function ChatInterface({
                   ? t('messageTypes.codex')
                   : provider === 'gemini'
                     ? t('messageTypes.gemini')
+                    : provider === 'opencode'
+                      ? t('messageTypes.opencode', { defaultValue: 'OpenCode' })
                     : t('messageTypes.claude'),
           })}
           isTextareaExpanded={isTextareaExpanded}
@@ -414,6 +431,17 @@ function ChatInterface({
       </div>
 
       <QuickSettingsPanel />
+
+      <CommandResultModal
+        payload={commandModalPayload}
+        onClose={closeCommandModal}
+        providerModelCatalog={providerModelCatalog}
+        providerModelCacheCatalog={providerModelCacheCatalog}
+        providerModelsRefreshing={providerModelsRefreshing}
+        onHardRefreshProviderModels={hardRefreshProviderModels}
+        currentSessionId={currentSessionId || selectedSession?.id || null}
+        onSelectProviderModel={selectProviderModel}
+      />
     </PermissionContext.Provider>
   );
 }

src/components/chat/view/subcomponents/ChatMessagesPane.tsx

@@ -1,9 +1,16 @@
 import { useTranslation } from 'react-i18next';
 import { useCallback, useRef } from 'react';
 import type { Dispatch, RefObject, SetStateAction } from 'react';
+
 import type { ChatMessage } from '../../types/types';
-import type { Project, ProjectSession, LLMProvider } from '../../../../types/app';
+import type {
+  Project,
+  ProjectSession,
+  LLMProvider,
+  ProviderModelsDefinition,
+} from '../../../../types/app';
 import { getIntrinsicMessageKey } from '../../utils/messageKeys';
+
 import MessageComponent from './MessageComponent';
 import ProviderSelectionEmptyState from './ProviderSelectionEmptyState';
 
@@ -26,6 +33,10 @@ interface ChatMessagesPaneProps {
   setCodexModel: (model: string) => void;
   geminiModel: string;
   setGeminiModel: (model: string) => void;
+  opencodeModel: string;
+  setOpenCodeModel: (model: string) => void;
+  providerModelCatalog: Partial<Record<LLMProvider, ProviderModelsDefinition>>;
+  providerModelsLoading: boolean;
   tasksEnabled: boolean;
   isTaskMasterInstalled: boolean | null;
   onShowAllTasks?: (() => void) | null;
@@ -71,6 +82,10 @@ export default function ChatMessagesPane({
   setCodexModel,
   geminiModel,
   setGeminiModel,
+  opencodeModel,
+  setOpenCodeModel,
+  providerModelCatalog,
+  providerModelsLoading,
   tasksEnabled,
   isTaskMasterInstalled,
   onShowAllTasks,
@@ -154,6 +169,10 @@ export default function ChatMessagesPane({
           setCodexModel={setCodexModel}
           geminiModel={geminiModel}
           setGeminiModel={setGeminiModel}
+          opencodeModel={opencodeModel}
+          setOpenCodeModel={setOpenCodeModel}
+          providerModelCatalog={providerModelCatalog}
+          providerModelsLoading={providerModelsLoading}
           tasksEnabled={tasksEnabled}
           isTaskMasterInstalled={isTaskMasterInstalled}
           onShowAllTasks={onShowAllTasks}

src/components/chat/view/subcomponents/ClaudeStatus.tsx

@@ -29,6 +29,7 @@ const PROVIDER_LABEL_KEYS: Record<string, string> = {
   codex: 'messageTypes.codex',
   cursor: 'messageTypes.cursor',
   gemini: 'messageTypes.gemini',
+  opencode: 'messageTypes.opencode',
 };
 
 function formatElapsedTime(totalSeconds: number) {
@@ -126,4 +127,4 @@ export default function ClaudeStatus({
       </div>
     </div>
   );
-}
+}

src/components/chat/view/subcomponents/CommandResultModal.tsx

@@ -0,0 +1,731 @@
+import { useMemo, useState } from 'react';
+import {
+  Activity,
+  BadgeCheck,
+  Check,
+  CircleHelp,
+  Clipboard,
+  Coins,
+  Command as CommandIcon,
+  Cpu,
+  Gauge,
+  Package,
+  Search,
+  Server,
+  Sparkles,
+  TerminalSquare,
+  Timer,
+  RefreshCw,
+  X,
+  Zap,
+} from 'lucide-react';
+
+import { Badge, Button, Dialog, DialogContent, DialogTitle, Input } from '../../../../shared/view/ui';
+import type { LLMProvider, ProviderModelsCacheInfo, ProviderModelsDefinition } from '../../../../types/app';
+import type {
+  CommandModalPayload,
+  CostCommandData,
+  HelpCommandData,
+  ModelCommandData,
+  StatusCommandData,
+} from '../../hooks/useChatComposerState';
+
+type CommandResultModalProps = {
+  payload: CommandModalPayload | null;
+  onClose: () => void;
+  providerModelCatalog: Partial<Record<LLMProvider, ProviderModelsDefinition>>;
+  providerModelCacheCatalog: Partial<Record<LLMProvider, ProviderModelsCacheInfo>>;
+  providerModelsRefreshing: boolean;
+  onHardRefreshProviderModels: () => void;
+  currentSessionId: string | null;
+  onSelectProviderModel: (
+    provider: LLMProvider,
+    model: string,
+    sessionId?: string | null,
+  ) => Promise<{
+    scope: 'default' | 'session';
+    changed: boolean;
+    model: string;
+  }>;
+};
+
+type CommandEntry = {
+  name: string;
+  description?: string;
+  namespace?: string;
+};
+
+type ModelOption = {
+  value: string;
+  label?: string;
+  description?: string;
+};
+
+const formatUpdatedAt = (value?: string) => {
+  if (!value) {
+    return 'Not cached yet';
+  }
+
+  const parsed = new Date(value);
+  if (Number.isNaN(parsed.getTime())) {
+    return 'Not cached yet';
+  }
+
+  return parsed.toLocaleString();
+};
+
+const PROVIDER_LABELS: Record<string, string> = {
+  claude: 'Claude',
+  cursor: 'Cursor',
+  codex: 'Codex',
+  gemini: 'Gemini',
+  opencode: 'OpenCode',
+};
+
+const FALLBACK_COMMANDS: CommandEntry[] = [
+  { name: '/models', description: 'Browse available models for the active provider.' },
+  { name: '/cost', description: 'Review context usage and estimated token spend.' },
+  { name: '/status', description: 'Inspect runtime, version, provider, and environment status.' },
+  { name: '/memory', description: 'Open the project CLAUDE.md memory file.' },
+  { name: '/config', description: 'Open settings and configuration.' },
+  { name: '/help', description: 'Show command documentation and syntax.' },
+];
+
+const getProviderLabel = (provider: string | undefined, fallback = 'Unknown') => {
+  if (!provider) {
+    return fallback;
+  }
+
+  return PROVIDER_LABELS[provider] || provider;
+};
+
+const clampPercentage = (value: number) => {
+  if (!Number.isFinite(value)) {
+    return 0;
+  }
+  return Math.max(0, Math.min(100, value));
+};
+
+const formatNumber = (value: number) => {
+  if (!Number.isFinite(value)) {
+    return '0';
+  }
+  return value.toLocaleString();
+};
+
+const formatCurrency = (value: number | string | undefined) => {
+  const numeric = Number(value ?? 0);
+  return `$${Number.isFinite(numeric) ? numeric.toFixed(4) : '0.0000'}`;
+};
+
+function MetricCard({
+  label,
+  value,
+  icon: Icon,
+  tone = 'neutral',
+  compact = false,
+}: {
+  label: string;
+  value: string;
+  icon: typeof Activity;
+  tone?: 'neutral' | 'primary' | 'success';
+  compact?: boolean;
+}) {
+  const toneClass =
+    tone === 'primary'
+      ? 'border-primary/35 bg-primary/10 text-primary'
+      : tone === 'success'
+        ? 'border-emerald-500/30 bg-emerald-500/10 text-emerald-600 dark:text-emerald-300'
+        : 'border-border/70 bg-background/75 text-muted-foreground';
+
+  return (
+    <div
+      className={`group rounded-2xl border border-border/70 bg-background/75 shadow-sm transition-all duration-200 hover:-translate-y-0.5 hover:border-primary/25 hover:shadow-md ${
+        compact ? 'p-3' : 'p-4'
+      }`}
+    >
+      <div className={`inline-flex rounded-xl border ${compact ? 'mb-2 p-1.5' : 'mb-3 p-2'} ${toneClass}`}>
+        <Icon className={compact ? 'h-3.5 w-3.5' : 'h-4 w-4'} />
+      </div>
+      <p className="text-[11px] font-semibold uppercase tracking-[0.18em] text-muted-foreground">{label}</p>
+      <p className={`${compact ? 'mt-0.5 text-[13px]' : 'mt-1 text-sm'} break-all font-semibold text-foreground`}>{value}</p>
+    </div>
+  );
+}
+
+function SearchField({
+  value,
+  onChange,
+  placeholder,
+}: {
+  value: string;
+  onChange: (value: string) => void;
+  placeholder: string;
+}) {
+  return (
+    <div className="relative">
+      <Search className="pointer-events-none absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
+      <Input
+        value={value}
+        onChange={(event) => onChange(event.target.value)}
+        placeholder={placeholder}
+        className="h-10 rounded-xl border-border/70 bg-background/75 pl-9 pr-3 shadow-none focus-visible:ring-primary/40"
+      />
+    </div>
+  );
+}
+
+function HelpContent({ data }: { data: HelpCommandData }) {
+  const [query, setQuery] = useState('');
+  const commands = (Array.isArray(data.commands) && data.commands.length > 0
+    ? data.commands
+    : FALLBACK_COMMANDS) as CommandEntry[];
+
+  const filteredCommands = useMemo(() => {
+    const normalized = query.trim().toLowerCase();
+    if (!normalized) {
+      return commands;
+    }
+
+    return commands.filter((command) => {
+      const haystack = `${command.name} ${command.description || ''} ${command.namespace || ''}`.toLowerCase();
+      return haystack.includes(normalized);
+    });
+  }, [commands, query]);
+
+  return (
+    <div className="grid h-full min-h-0 gap-4 lg:grid-cols-[minmax(0,1fr)_18rem]">
+      <div className="flex min-h-0 flex-col gap-3">
+        <SearchField value={query} onChange={setQuery} placeholder="Filter commands..." />
+
+        <div className="scrollbar-thin min-h-0 flex-1 overflow-y-auto pr-1">
+          <div className="grid gap-2 sm:grid-cols-2">
+            {filteredCommands.map((command, index) => (
+              <div
+                key={`${command.namespace || 'builtin'}-${command.name}`}
+                className="settings-content-enter rounded-2xl border border-border/70 bg-background/75 p-3 shadow-sm transition-all duration-200 hover:-translate-y-0.5 hover:border-primary/30 hover:bg-muted/25"
+                style={{ animationDelay: `${Math.min(index * 18, 160)}ms` }}
+              >
+                <div className="flex items-start justify-between gap-3">
+                  <code className="rounded-lg border border-primary/20 bg-primary/10 px-2 py-1 text-xs font-semibold text-primary">
+                    {command.name}
+                  </code>
+                  <Badge variant="secondary" className="shrink-0 text-[10px] capitalize">
+                    {command.namespace || 'builtin'}
+                  </Badge>
+                </div>
+                <p className="mt-3 text-sm leading-5 text-muted-foreground">
+                  {command.description || 'No description available.'}
+                </p>
+              </div>
+            ))}
+          </div>
+
+          {filteredCommands.length === 0 && (
+            <div className="rounded-2xl border border-dashed border-border bg-muted/20 px-4 py-10 text-center text-sm text-muted-foreground">
+              No commands match that filter.
+            </div>
+          )}
+        </div>
+      </div>
+
+      <aside className="space-y-3">
+        <div className="rounded-2xl border border-border/70 bg-muted/20 p-4">
+          <div className="mb-3 flex items-center gap-2 text-sm font-semibold text-foreground">
+            <TerminalSquare className="h-4 w-4 text-primary" />
+            Syntax
+          </div>
+          <div className="space-y-2 text-sm text-muted-foreground">
+            <p><code className="text-foreground">/command arg1 arg2</code></p>
+            <p><code className="text-foreground">$ARGUMENTS</code> passes all args.</p>
+            <p><code className="text-foreground">$1</code>, <code className="text-foreground">$2</code> pass positional args.</p>
+            <p><code className="text-foreground">@file</code> includes file contents.</p>
+          </div>
+        </div>
+
+        <div className="rounded-2xl border border-primary/25 bg-primary/10 p-4">
+          <div className="mb-2 flex items-center gap-2 text-sm font-semibold text-foreground">
+            <Sparkles className="h-4 w-4 text-primary" />
+            Quick tip
+          </div>
+          <p className="text-sm leading-5 text-muted-foreground">
+            Type <code className="text-foreground">/</code> in the composer to open the command palette, then use arrows and Enter to run a command.
+          </p>
+        </div>
+      </aside>
+    </div>
+  );
+}
+
+function ModelsContent({
+  data,
+  providerModelCatalog,
+  providerModelCacheCatalog,
+  providerModelsRefreshing,
+  onHardRefreshProviderModels,
+  currentSessionId,
+  onSelectProviderModel,
+}: {
+  data: ModelCommandData;
+  providerModelCatalog: Partial<Record<LLMProvider, ProviderModelsDefinition>>;
+  providerModelCacheCatalog: Partial<Record<LLMProvider, ProviderModelsCacheInfo>>;
+  providerModelsRefreshing: boolean;
+  onHardRefreshProviderModels: () => void;
+  currentSessionId: string | null;
+  onSelectProviderModel: CommandResultModalProps['onSelectProviderModel'];
+}) {
+  const [query, setQuery] = useState('');
+  const [copiedModel, setCopiedModel] = useState<string | null>(null);
+  const [changingModel, setChangingModel] = useState<string | null>(null);
+  const [pendingSessionModel, setPendingSessionModel] = useState<string | null>(null);
+  const [selectionNotice, setSelectionNotice] = useState<string | null>(null);
+  const currentProvider = (data?.current?.provider || 'claude') as LLMProvider;
+  const currentModel = data?.current?.model || 'Unknown';
+  const providerLabel = data?.current?.providerLabel || getProviderLabel(currentProvider);
+  const liveDefinition = providerModelCatalog[currentProvider];
+  const currentCache = providerModelCacheCatalog[currentProvider] ?? data?.cache;
+  const availableOptions = useMemo<ModelOption[]>(() => {
+    if (liveDefinition?.OPTIONS && liveDefinition.OPTIONS.length > 0) {
+      return liveDefinition.OPTIONS;
+    }
+
+    if (Array.isArray(data?.availableOptions) && data.availableOptions.length > 0) {
+      return data.availableOptions;
+    }
+
+    const availableModels = Array.isArray(data?.availableModels) ? data.availableModels : [];
+    return availableModels.map((model) => ({ value: model, label: model }));
+  }, [data, liveDefinition]);
+  const defaultModel = liveDefinition?.DEFAULT || data?.defaultModel || currentModel;
+
+  const filteredOptions = useMemo(() => {
+    const normalized = query.trim().toLowerCase();
+    if (!normalized) {
+      return availableOptions;
+    }
+
+    return availableOptions.filter((option) => {
+      const haystack = `${option.value} ${option.label || ''} ${option.description || ''}`.toLowerCase();
+      return haystack.includes(normalized);
+    });
+  }, [availableOptions, query]);
+
+  const activeOption = availableOptions.find((option) => option.value === currentModel);
+  const hasConcreteSessionId = typeof currentSessionId === 'string' && currentSessionId.trim().length > 0;
+
+  const copyModel = (model: string) => {
+    if (typeof navigator !== 'undefined' && navigator.clipboard) {
+      void navigator.clipboard.writeText(model).catch(() => undefined);
+    }
+    setCopiedModel(model);
+    window.setTimeout(() => {
+      setCopiedModel((current) => (current === model ? null : current));
+    }, 1300);
+  };
+
+  const handleSelectModel = async (model: string) => {
+    setChangingModel(model);
+    try {
+      const result = await onSelectProviderModel(currentProvider, model, currentSessionId);
+      if (result.scope === 'session') {
+        setPendingSessionModel(result.model);
+        setSelectionNotice(`Next response will resume with ${result.model}.`);
+        return;
+      }
+
+      setPendingSessionModel(null);
+      setSelectionNotice(`Default ${providerLabel} model set to ${result.model}.`);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : 'Unable to change the model right now.';
+      setSelectionNotice(message);
+    } finally {
+      setChangingModel(null);
+    }
+  };
+
+  return (
+    <div className="flex h-full min-h-0 flex-col gap-2.5">
+      <div className="rounded-2xl border border-border/70 bg-muted/20 p-2.5">
+        <div className="grid gap-2.5 lg:grid-cols-[minmax(0,1.55fr)_minmax(12rem,0.7fr)_minmax(15rem,0.9fr)] lg:items-start">
+          <div className="min-w-0">
+            <div className="flex flex-wrap items-center gap-2">
+              <Badge variant="secondary" className="rounded-lg border border-primary/20 bg-primary/10 px-2.5 py-1 text-[10px] font-semibold uppercase tracking-[0.18em] text-primary">
+                {providerLabel}
+              </Badge>
+              <Badge variant="secondary" className="rounded-lg px-2.5 py-1 text-[10px] font-semibold uppercase tracking-[0.18em] text-foreground">
+                {availableOptions.length} models
+              </Badge>
+            </div>
+
+            <div className="mt-2 rounded-xl border border-primary/15 bg-primary/[0.06] px-3 py-2">
+              <p className="text-[11px] font-bold uppercase tracking-[0.2em] text-primary">Active Model</p>
+              <p className="mt-1 break-all font-mono text-[0.98rem] font-semibold leading-5 text-foreground sm:text-[1.05rem]">
+                {currentModel}
+              </p>
+              {activeOption?.label && activeOption.label !== currentModel && (
+                <p className="mt-1 text-[11px] font-medium text-foreground/85">{activeOption.label}</p>
+              )}
+              {activeOption?.description && (
+                <p className="mt-0.5 line-clamp-1 text-[11px] text-muted-foreground">{activeOption.description}</p>
+              )}
+              {pendingSessionModel && pendingSessionModel !== currentModel && (
+                <p className="mt-1 text-[10px] font-semibold uppercase tracking-[0.16em] text-primary">
+                  Next response: {pendingSessionModel}
+                </p>
+              )}
+            </div>
+          </div>
+
+          <div className="grid gap-2 sm:grid-cols-2 lg:grid-cols-1">
+            <div className="rounded-xl border border-border/60 bg-background/55 px-2.5 py-1.5">
+              <p className="text-[10px] font-bold uppercase tracking-[0.18em] text-foreground/80">Default</p>
+              <p className="mt-1 break-all font-mono text-[11px] font-medium text-foreground">{defaultModel}</p>
+            </div>
+            <div className="rounded-xl border border-border/60 bg-background/55 px-2.5 py-1.5">
+              <p className="text-[10px] font-bold uppercase tracking-[0.18em] text-foreground/80">Updated</p>
+              <p className="mt-1 text-[11px] font-medium text-foreground">{formatUpdatedAt(currentCache?.updatedAt)}</p>
+            </div>
+          </div>
+
+          <div className="rounded-xl border border-border/60 bg-background/55 p-2.5">
+            <div className="flex flex-wrap items-center gap-1.5">
+              <p className="text-[10px] font-bold uppercase tracking-[0.18em] text-foreground/80">
+                Catalog Refresh
+              </p>
+              <Badge variant="secondary" className="rounded-md px-1.5 py-0 text-[9px] uppercase tracking-[0.14em]">
+                All providers
+              </Badge>
+            </div>
+            <p className="mt-1.5 text-[11px] leading-4 text-muted-foreground">
+              Model lists are cached for 3 days. Refresh after CLI, auth, or config changes,
+              or when a new model is missing.
+            </p>
+            <Button
+              type="button"
+              variant="outline"
+              size="sm"
+              onClick={onHardRefreshProviderModels}
+              disabled={providerModelsRefreshing}
+              className="mt-2 h-8 w-full rounded-xl px-3"
+            >
+              <RefreshCw className={providerModelsRefreshing ? 'animate-spin' : ''} />
+              {providerModelsRefreshing ? 'Refreshing catalogs...' : 'Refresh from providers'}
+            </Button>
+          </div>
+        </div>
+
+        <div className="mt-2 border-t border-border/50 pt-1.5 text-[11px] text-muted-foreground">
+          {hasConcreteSessionId
+            ? 'Selecting a model stores a session override and applies it on the next response for this session.'
+            : 'Selecting a model updates the default model used for new turns in this provider.'}
+          {selectionNotice && <span className="ml-2 text-foreground">{selectionNotice}</span>}
+        </div>
+      </div>
+
+      <div className="flex min-h-0 flex-1 flex-col rounded-3xl border border-border/70 bg-muted/15 p-3 sm:p-4">
+        <div className="mb-2.5 grid gap-2 sm:grid-cols-[1fr_auto] sm:items-center">
+          <div className="min-w-0">
+            <SearchField value={query} onChange={setQuery} placeholder={`Search ${providerLabel} models...`} />
+          </div>
+          <Badge variant="secondary" className="h-9 justify-center rounded-xl px-3 font-mono text-xs">
+            {filteredOptions.length} shown
+          </Badge>
+        </div>
+
+        {filteredOptions.length > 0 ? (
+          <div className="scrollbar-thin min-h-0 flex-1 overflow-y-auto pr-1">
+            <div className="grid gap-2 md:grid-cols-2">
+              {filteredOptions.map((option, index) => {
+                const isCurrent = option.value === currentModel;
+                const wasCopied = copiedModel === option.value;
+                const isPendingSelection = option.value === pendingSessionModel;
+                const isChanging = option.value === changingModel;
+                return (
+                  <div
+                    key={option.value}
+                    className={`settings-content-enter group flex min-h-[4.5rem] items-start gap-3 rounded-2xl border p-3 shadow-sm transition-all duration-200 hover:-translate-y-0.5 hover:shadow-md ${
+                      isCurrent
+                        ? 'border-primary/45 bg-primary/10'
+                        : isPendingSelection
+                          ? 'border-emerald-500/35 bg-emerald-500/10'
+                          : 'border-border/70 bg-background/80 hover:border-primary/30 hover:bg-background'
+                    }`}
+                    style={{ animationDelay: `${Math.min(index * 14, 180)}ms` }}
+                  >
+                    <button
+                      type="button"
+                      onClick={() => handleSelectModel(option.value)}
+                      disabled={Boolean(changingModel)}
+                      className="min-w-0 flex-1 text-left focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+                      aria-label={`Use model ${option.value}`}
+                    >
+                      <span className="flex items-center gap-2">
+                        <span className="break-all font-mono text-sm font-semibold text-foreground">{option.value}</span>
+                        {isCurrent && <BadgeCheck className="h-4 w-4 shrink-0 text-primary" />}
+                      </span>
+                      {option.label && option.label !== option.value && (
+                        <span className="mt-1 block text-xs text-muted-foreground">{option.label}</span>
+                      )}
+                      {option.description && (
+                        <span className="mt-1 block text-xs leading-5 text-muted-foreground">{option.description}</span>
+                      )}
+                      {isCurrent && <span className="mt-2 block text-[11px] font-semibold uppercase tracking-[0.16em] text-primary">Current selection</span>}
+                      {isPendingSelection && !isCurrent && (
+                        <span className="mt-2 block text-[11px] font-semibold uppercase tracking-[0.16em] text-emerald-400">
+                          Next response selection
+                        </span>
+                      )}
+                      {isChanging && (
+                        <span className="mt-2 block text-[11px] font-semibold uppercase tracking-[0.16em] text-primary">
+                          Applying...
+                        </span>
+                      )}
+                    </button>
+                    <button
+                      type="button"
+                      onClick={() => copyModel(option.value)}
+                      className="rounded-lg border border-border/70 bg-muted/30 p-2 text-muted-foreground transition-colors group-hover:text-primary"
+                      aria-label={`Copy model id ${option.value}`}
+                    >
+                      {wasCopied ? <Check className="h-4 w-4" /> : <Clipboard className="h-4 w-4" />}
+                    </button>
+                  </div>
+                );
+              })}
+            </div>
+          </div>
+        ) : (
+          <div className="rounded-2xl border border-dashed border-border bg-background/60 px-4 py-10 text-center text-sm text-muted-foreground">
+            No models match that search.
+          </div>
+        )}
+      </div>
+    </div>
+  );
+}
+
+function CostContent({ data }: { data: CostCommandData }) {
+  const used = Number(data.tokenUsage?.used ?? 0);
+  const total = Number(data.tokenUsage?.total ?? 0);
+  const percentage = clampPercentage(Number(data.tokenUsage?.percentage ?? 0));
+  const model = data.model || 'Unknown';
+  const provider = getProviderLabel(data.provider, data.provider || 'Unknown');
+  const inputTokens = Number(data.tokenBreakdown?.input ?? 0);
+  const outputTokens = Number(data.tokenBreakdown?.output ?? 0);
+  const cacheTokens = Number(data.tokenBreakdown?.cache ?? 0);
+  const totalCost = Number(data.cost?.total ?? 0);
+
+  return (
+    <div className="grid gap-4 lg:grid-cols-[18rem_1fr]">
+      <div className="rounded-3xl border border-primary/25 bg-primary/10 p-5 text-center">
+        <div
+          className="mx-auto grid h-40 w-40 place-items-center rounded-full p-2 shadow-inner"
+          style={{
+            background: `conic-gradient(hsl(var(--primary)) ${percentage * 3.6}deg, hsl(var(--muted)) 0deg)`,
+          }}
+        >
+          <div className="grid h-full w-full place-items-center rounded-full border border-border/70 bg-popover">
+            <div>
+              <p className="font-mono text-3xl font-semibold text-foreground">{percentage.toFixed(1)}%</p>
+              <p className="mt-1 text-xs uppercase tracking-[0.18em] text-muted-foreground">context</p>
+            </div>
+          </div>
+        </div>
+        <p className="mt-4 text-sm text-muted-foreground">
+          {formatNumber(used)} of {formatNumber(total)} tokens used
+        </p>
+      </div>
+
+      <div className="space-y-3">
+        <div className="grid gap-3 sm:grid-cols-3">
+          <MetricCard label="Input" value={formatCurrency(data.cost?.input)} icon={Zap} />
+          <MetricCard label="Output" value={formatCurrency(data.cost?.output)} icon={Activity} />
+          <MetricCard label="Total" value={formatCurrency(totalCost)} icon={Coins} tone="primary" />
+        </div>
+
+        <div className="grid gap-3 sm:grid-cols-3">
+          <MetricCard label="Input tokens" value={formatNumber(inputTokens)} icon={CommandIcon} />
+          <MetricCard label="Output tokens" value={formatNumber(outputTokens)} icon={TerminalSquare} />
+          <MetricCard label="Cache tokens" value={formatNumber(cacheTokens)} icon={Package} />
+        </div>
+
+        <div className="rounded-2xl border border-border/70 bg-muted/20 p-4">
+          <div className="grid gap-3 sm:grid-cols-2">
+            <div>
+              <p className="text-[11px] font-semibold uppercase tracking-[0.18em] text-muted-foreground">Provider</p>
+              <p className="mt-1 text-sm font-semibold text-foreground">{provider}</p>
+            </div>
+            <div>
+              <p className="text-[11px] font-semibold uppercase tracking-[0.18em] text-muted-foreground">Model</p>
+              <p className="mt-1 break-all font-mono text-sm text-foreground">{model}</p>
+            </div>
+          </div>
+          <p className="mt-3 text-xs leading-5 text-muted-foreground">
+            Cost is an estimate based on the available token counters and default provider rates.
+          </p>
+        </div>
+      </div>
+    </div>
+  );
+}
+
+function StatusContent({ data }: { data: StatusCommandData }) {
+  const memoryRssMb = data.memoryUsage?.rssMb;
+  const rows = [
+    { label: 'Package', value: data.packageName || 'claude-code-ui', icon: Package },
+    { label: 'Version', value: data.version || 'Unknown', icon: BadgeCheck, tone: 'success' as const },
+    { label: 'Uptime', value: data.uptime || 'Unknown', icon: Timer },
+    { label: 'Provider', value: getProviderLabel(data.provider, data.provider || 'Unknown'), icon: Server, tone: 'primary' as const },
+    { label: 'Model', value: data.model || 'Unknown', icon: Cpu },
+    { label: 'Node.js', value: data.nodeVersion || 'Unknown', icon: TerminalSquare },
+    { label: 'Platform', value: data.platform || 'Unknown', icon: Activity },
+    { label: 'Memory', value: typeof memoryRssMb === 'number' ? `${memoryRssMb} MB RSS` : 'Unknown', icon: Gauge },
+  ];
+
+  return (
+    <div className="space-y-4">
+      <div className="flex items-center justify-between rounded-3xl border border-emerald-500/25 bg-emerald-500/10 p-4">
+        <div className="flex items-center gap-3">
+          <span className="relative flex h-3 w-3">
+            <span className="absolute inline-flex h-full w-full animate-ping rounded-full bg-emerald-400 opacity-75" />
+            <span className="relative inline-flex h-3 w-3 rounded-full bg-emerald-500" />
+          </span>
+          <div>
+            <p className="text-sm font-semibold text-foreground">Runtime online</p>
+            <p className="text-xs text-muted-foreground">Process {data.pid ? `#${data.pid}` : 'status'} is responding.</p>
+          </div>
+        </div>
+        <Badge className="rounded-full bg-emerald-500 text-white hover:bg-emerald-500">Healthy</Badge>
+      </div>
+
+      <div className="grid gap-3 sm:grid-cols-2 lg:grid-cols-4">
+        {rows.map((row) => (
+          <MetricCard key={row.label} label={row.label} value={String(row.value)} icon={row.icon} tone={row.tone} />
+        ))}
+      </div>
+    </div>
+  );
+}
+
+export default function CommandResultModal({
+  payload,
+  onClose,
+  providerModelCatalog,
+  providerModelCacheCatalog,
+  providerModelsRefreshing,
+  onHardRefreshProviderModels,
+  currentSessionId,
+  onSelectProviderModel,
+}: CommandResultModalProps) {
+  const isOpen = Boolean(payload);
+  const kind = payload?.kind;
+  const isModelsModal = kind === 'models';
+
+  const modalMeta = {
+    help: {
+      eyebrow: 'Command center',
+      title: 'Help & Shortcuts',
+      subtitle: 'Search built-ins, syntax patterns, and command usage without leaving the chat.',
+      icon: CircleHelp,
+    },
+    models: {
+      eyebrow: 'Model inventory',
+      title: 'Available Models',
+      subtitle: 'Browse, search, and copy model IDs for the active provider.',
+      icon: Cpu,
+    },
+    cost: {
+      eyebrow: 'Session telemetry',
+      title: 'Usage & Cost',
+      subtitle: 'Token budget, context pressure, and estimated spend for this session.',
+      icon: Coins,
+    },
+    status: {
+      eyebrow: 'Runtime health',
+      title: 'System Status',
+      subtitle: 'Version, provider, runtime, and environment details in one place.',
+      icon: Activity,
+    },
+  } as const;
+
+  const activeMeta = kind ? modalMeta[kind] : null;
+  const HeaderIcon = activeMeta?.icon || Sparkles;
+
+  return (
+    <Dialog open={isOpen} onOpenChange={(open) => !open && onClose()}>
+      <DialogContent className="flex h-[min(92dvh,48rem)] w-[calc(100vw-1rem)] max-w-5xl flex-col overflow-hidden rounded-3xl border-border/80 bg-popover/95 p-0 shadow-2xl backdrop-blur-xl sm:w-[min(94vw,64rem)]">
+        <DialogTitle>{activeMeta?.title || 'Command Result'}</DialogTitle>
+
+        <div
+          className={`relative shrink-0 overflow-hidden border-b border-border/70 bg-gradient-to-br from-primary/15 via-background to-muted/40 ${
+            isModelsModal ? 'px-4 pb-3 pt-3 sm:px-5 sm:pb-4 sm:pt-4' : 'px-4 pb-4 pt-4 sm:px-6 sm:pb-5 sm:pt-5'
+          }`}
+        >
+          <div className="pointer-events-none absolute -left-20 -top-24 h-56 w-56 rounded-full bg-primary/20 blur-3xl" />
+          <div className="pointer-events-none absolute right-0 top-0 h-full w-1/2 bg-[radial-gradient(circle_at_top_right,hsl(var(--primary)/0.16),transparent_58%)]" />
+
+          <div className="relative flex items-start justify-between gap-3">
+            <div className="flex min-w-0 items-start gap-3 sm:items-center">
+              <div
+                className={`rounded-2xl border border-primary/30 bg-primary/10 text-primary shadow-sm ${
+                  isModelsModal ? 'p-2.5' : 'p-3'
+                }`}
+              >
+                <HeaderIcon className={isModelsModal ? 'h-4 w-4' : 'h-5 w-5'} />
+              </div>
+              <div className="min-w-0">
+                <p className="text-[12px] font-bold uppercase tracking-[0.22em] text-primary">
+                  {activeMeta?.eyebrow}
+                </p>
+                <p className={`mt-1 font-semibold tracking-tight text-foreground ${isModelsModal ? 'text-xl sm:text-2xl' : 'text-xl sm:text-2xl'}`}>
+                  {activeMeta?.title}
+                </p>
+                <p className={`mt-1 max-w-2xl ${isModelsModal ? 'text-sm leading-5 text-foreground/75' : 'text-sm leading-5 text-muted-foreground'}`}>
+                  {activeMeta?.subtitle}
+                </p>
+              </div>
+            </div>
+
+            <Button
+              type="button"
+              variant="ghost"
+              size="icon"
+              onClick={onClose}
+              className="h-9 w-9 shrink-0 rounded-xl text-muted-foreground hover:bg-background/70 hover:text-foreground"
+              aria-label="Close command result modal"
+            >
+              <X className="h-4 w-4" />
+            </Button>
+          </div>
+        </div>
+
+        <div className="settings-content-enter min-h-0 flex-1 overflow-hidden px-4 py-4 sm:px-6 sm:py-5">
+          {payload?.kind === 'help' && <HelpContent data={payload.data as HelpCommandData} />}
+          {payload?.kind === 'models' && (
+            <ModelsContent
+              data={payload.data as ModelCommandData}
+              providerModelCatalog={providerModelCatalog}
+              providerModelCacheCatalog={providerModelCacheCatalog}
+              providerModelsRefreshing={providerModelsRefreshing}
+              onHardRefreshProviderModels={onHardRefreshProviderModels}
+              currentSessionId={currentSessionId}
+              onSelectProviderModel={onSelectProviderModel}
+            />
+          )}
+          {payload?.kind === 'cost' && <CostContent data={payload.data as CostCommandData} />}
+          {payload?.kind === 'status' && <StatusContent data={payload.data as StatusCommandData} />}
+        </div>
+
+        <div className="flex shrink-0 flex-col gap-3 border-t border-border/70 bg-muted/20 px-4 py-3 text-xs text-muted-foreground sm:flex-row sm:items-center sm:justify-between sm:px-6">
+          <div className="flex items-center gap-2">
+            <Gauge className="h-3.5 w-3.5" />
+            <span>Esc closes the modal.</span>
+          </div>
+          <Button type="button" variant="outline" size="sm" onClick={onClose} className="rounded-xl">
+            Close
+          </Button>
+        </div>
+      </DialogContent>
+    </Dialog>
+  );
+}

src/components/chat/view/subcomponents/MessageComponent.tsx

@@ -176,7 +176,19 @@ const MessageComponent = memo(({ message, prevMessage, createDiff, onFileOpen, o
                 </div>
               )}
               <div className="text-sm font-medium text-gray-900 dark:text-white">
-                {message.type === 'error' ? t('messageTypes.error') : message.type === 'tool' ? t('messageTypes.tool') : (provider === 'cursor' ? t('messageTypes.cursor') : provider === 'codex' ? t('messageTypes.codex') : provider === 'gemini' ? t('messageTypes.gemini') : t('messageTypes.claude'))}
+                {message.type === 'error'
+                  ? t('messageTypes.error')
+                  : message.type === 'tool'
+                    ? t('messageTypes.tool')
+                    : (provider === 'cursor'
+                        ? t('messageTypes.cursor')
+                        : provider === 'codex'
+                          ? t('messageTypes.codex')
+                          : provider === 'gemini'
+                            ? t('messageTypes.gemini')
+                            : provider === 'opencode'
+                              ? t('messageTypes.opencode', { defaultValue: 'OpenCode' })
+                              : t('messageTypes.claude'))}
               </div>
             </div>
           )}

src/components/chat/view/subcomponents/ProviderSelectionEmptyState.tsx

@@ -3,15 +3,12 @@ import { Check, ChevronDown } from "lucide-react";
 import { Trans, useTranslation } from "react-i18next";
 
 import { useServerPlatform } from "../../../../hooks/useServerPlatform";
+import type {
+  ProjectSession,
+  LLMProvider,
+  ProviderModelsDefinition,
+} from "../../../../types/app";
 import SessionProviderLogo from "../../../llm-logo-provider/SessionProviderLogo";
-import {
-  CLAUDE_MODELS,
-  CURSOR_MODELS,
-  CODEX_MODELS,
-  GEMINI_MODELS,
-  PROVIDERS,
-} from "../../../../../shared/modelConstants";
-import type { ProjectSession, LLMProvider } from "../../../../types/app";
 import { NextTaskBanner } from "../../../task-master";
 import {
   Dialog,
@@ -27,6 +24,14 @@ import {
   Card,
 } from "../../../../shared/view/ui";
 
+const PROVIDER_META: { id: LLMProvider; name: string }[] = [
+  { id: "claude", name: "Anthropic" },
+  { id: "codex", name: "OpenAI" },
+  { id: "gemini", name: "Google" },
+  { id: "cursor", name: "Cursor" },
+  { id: "opencode", name: "OpenCode" },
+];
+
 const MOD_KEY =
   typeof navigator !== "undefined" && /Mac|iPhone|iPad/.test(navigator.platform) ? "⌘" : "Ctrl";
 
@@ -44,6 +49,10 @@ type ProviderSelectionEmptyStateProps = {
   setCodexModel: (model: string) => void;
   geminiModel: string;
   setGeminiModel: (model: string) => void;
+  opencodeModel: string;
+  setOpenCodeModel: (model: string) => void;
+  providerModelCatalog: Partial<Record<LLMProvider, ProviderModelsDefinition>>;
+  providerModelsLoading: boolean;
   tasksEnabled: boolean;
   isTaskMasterInstalled: boolean | null;
   onShowAllTasks?: (() => void) | null;
@@ -53,20 +62,15 @@ type ProviderSelectionEmptyStateProps = {
 type ProviderGroup = {
   id: LLMProvider;
   name: string;
-  models: { value: string; label: string }[];
+  models: { value: string; label: string; description?: string }[];
 };
 
-const PROVIDER_GROUPS: ProviderGroup[] = PROVIDERS.map((p) => ({
-  id: p.id as LLMProvider,
-  name: p.name,
-  models: p.models.OPTIONS,
-}));
-
-function getModelConfig(p: LLMProvider) {
-  if (p === "claude") return CLAUDE_MODELS;
-  if (p === "codex") return CODEX_MODELS;
-  if (p === "gemini") return GEMINI_MODELS;
-  return CURSOR_MODELS;
+function getModelConfig(
+  p: LLMProvider,
+  catalog: Partial<Record<LLMProvider, ProviderModelsDefinition>>,
+): ProviderModelsDefinition {
+  const entry = catalog[p];
+  return entry ?? { OPTIONS: [], DEFAULT: "" };
 }
 
 function getCurrentModel(
@@ -75,10 +79,12 @@ function getCurrentModel(
   cu: string,
   co: string,
   g: string,
+  o: string,
 ) {
   if (p === "claude") return c;
   if (p === "codex") return co;
   if (p === "gemini") return g;
+  if (p === "opencode") return o;
   return cu;
 }
 
@@ -86,6 +92,7 @@ function getProviderDisplayName(p: LLMProvider) {
   if (p === "claude") return "Claude";
   if (p === "cursor") return "Cursor";
   if (p === "codex") return "Codex";
+  if (p === "opencode") return "OpenCode";
   return "Gemini";
 }
 
@@ -103,6 +110,10 @@ export default function ProviderSelectionEmptyState({
   setCodexModel,
   geminiModel,
   setGeminiModel,
+  opencodeModel,
+  setOpenCodeModel,
+  providerModelCatalog,
+  providerModelsLoading,
   tasksEnabled,
   isTaskMasterInstalled,
   onShowAllTasks,
@@ -112,10 +123,14 @@ export default function ProviderSelectionEmptyState({
   const { isWindowsServer } = useServerPlatform();
   const [dialogOpen, setDialogOpen] = useState(false);
 
-  const visibleProviderGroups = useMemo(
-    () => (isWindowsServer ? PROVIDER_GROUPS.filter((p) => p.id !== "cursor") : PROVIDER_GROUPS),
-    [isWindowsServer],
-  );
+  const visibleProviderGroups = useMemo(() => {
+    const groups: ProviderGroup[] = PROVIDER_META.map((p) => ({
+      id: p.id,
+      name: p.name,
+      models: providerModelCatalog[p.id]?.OPTIONS ?? [],
+    }));
+    return isWindowsServer ? groups.filter((p) => p.id !== "cursor") : groups;
+  }, [isWindowsServer, providerModelCatalog]);
 
   useEffect(() => {
     if (isWindowsServer && provider === "cursor") {
@@ -134,15 +149,16 @@ export default function ProviderSelectionEmptyState({
     cursorModel,
     codexModel,
     geminiModel,
+    opencodeModel,
   );
 
   const currentModelLabel = useMemo(() => {
-    const config = getModelConfig(provider);
+    const config = getModelConfig(provider, providerModelCatalog);
     const found = config.OPTIONS.find(
       (o: { value: string; label: string }) => o.value === currentModel,
     );
     return found?.label || currentModel;
-  }, [provider, currentModel]);
+  }, [provider, currentModel, providerModelCatalog]);
 
   const setModelForProvider = useCallback(
     (providerId: LLMProvider, modelValue: string) => {
@@ -155,12 +171,15 @@ export default function ProviderSelectionEmptyState({
       } else if (providerId === "gemini") {
         setGeminiModel(modelValue);
         localStorage.setItem("gemini-model", modelValue);
+      } else if (providerId === "opencode") {
+        setOpenCodeModel(modelValue);
+        localStorage.setItem("opencode-model", modelValue);
       } else {
         setCursorModel(modelValue);
         localStorage.setItem("cursor-model", modelValue);
       }
     },
-    [setClaudeModel, setCursorModel, setCodexModel, setGeminiModel],
+    [setClaudeModel, setCursorModel, setCodexModel, setGeminiModel, setOpenCodeModel],
   );
 
   const handleModelSelect = useCallback(
@@ -222,6 +241,9 @@ export default function ProviderSelectionEmptyState({
 
             <DialogContent className="max-w-md overflow-hidden p-0">
               <DialogTitle>Model Selector</DialogTitle>
+              <div className="border-b border-border/60 bg-muted/20 px-4 py-3">
+                <p className="text-sm font-semibold text-foreground">Choose a model</p>
+              </div>
               <Command>
                 <CommandInput
                   placeholder={t("providerSelection.searchModels", {
@@ -249,16 +271,28 @@ export default function ProviderSelectionEmptyState({
                         </span>
                       }
                     >
+                      {group.models.length === 0 && providerModelsLoading ? (
+                        <CommandItem disabled className="ml-4 border-l border-border/40 pl-4 text-muted-foreground">
+                          {t("providerSelection.loadingModels", { defaultValue: "Loading models…" })}
+                        </CommandItem>
+                      ) : null}
                       {group.models.map((model) => {
                         const isSelected = provider === group.id && currentModel === model.value;
                         return (
                           <CommandItem
                             key={`${group.id}-${model.value}`}
-                            value={`${group.name} ${model.label}`}
+                            value={`${group.name} ${model.label} ${model.description || ''}`}
                             onSelect={() => handleModelSelect(group.id, model.value)}
                             className="ml-4 border-l border-border/40 pl-4"
                           >
-                            <span className="flex-1 truncate">{model.label}</span>
+                            <div className="min-w-0 flex-1">
+                              <div className="truncate">{model.label}</div>
+                              {model.description && (
+                                <div className="truncate text-xs text-muted-foreground">
+                                  {model.description}
+                                </div>
+                              )}
+                            </div>
                             {isSelected && (
                               <Check className="ml-auto h-4 w-4 shrink-0 text-primary" />
                             )}
@@ -287,6 +321,10 @@ export default function ProviderSelectionEmptyState({
                 gemini: t("providerSelection.readyPrompt.gemini", {
                   model: geminiModel,
                 }),
+                opencode: t("providerSelection.readyPrompt.opencode", {
+                  model: opencodeModel,
+                  defaultValue: "Ready with OpenCode {{model}}",
+                }),
               }[provider]
             }
           </p>