fix: stabilize opencode model selection (#132)

Author: gricha

.github/workflows/docs.yml

@@ -1,53 +0,0 @@
-name: Deploy Docs
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - 'docs/**'
-      - '.github/workflows/docs.yml'
-  workflow_dispatch:
-
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-
-concurrency:
-  group: pages
-  cancel-in-progress: true
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: oven-sh/setup-bun@v2
-        with:
-          bun-version: latest
-
-      - name: Install dependencies
-        working-directory: docs
-        run: bun install --frozen-lockfile
-
-      - name: Build
-        working-directory: docs
-        run: bun run build
-
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: docs/build
-
-  deploy:
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
-    needs: build
-    steps:
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4

mobile/src/lib/api.ts

@@ -83,6 +83,7 @@ export interface ModelInfo {
   id: string;
   name: string;
   description?: string;
+  provider?: string;
 }
 
 export type AgentType = 'claude-code' | 'opencode' | 'codex';

mobile/src/screens/HomeScreen.tsx

@@ -26,7 +26,7 @@ import { RepoSelector } from '../components/RepoSelector'
 
 const DELETE_ACTION_WIDTH = 80
 
-function DeleteAction({
+function HomeDeleteAction({
   drag,
   onPress,
   color,
@@ -285,7 +285,7 @@ export function HomeScreen() {
             friction={2}
             rightThreshold={40}
             renderRightActions={(_prog, drag, swipeable) => (
-              <DeleteAction
+              <HomeDeleteAction
                 drag={drag}
                 onPress={() => confirmDeleteWorkspace(item, swipeable.close)}
                 color={colors.error}

mobile/src/screens/SessionChatScreen.tsx

@@ -825,7 +825,7 @@ export function SessionChatScreen({ route, navigation }: any) {
     if (availableModels.length === 0) return
     if (isStreaming) return
 
-    const options = [...availableModels.map(m => m.name), 'Cancel']
+    const options = [...availableModels.map(m => (m.provider ? `${m.provider}/${m.name}` : m.name)), 'Cancel']
     ActionSheetIOS.showActionSheetWithOptions(
       {
         options,
@@ -840,9 +840,11 @@ export function SessionChatScreen({ route, navigation }: any) {
             if (wsRef.current?.readyState === WebSocket.OPEN) {
               wsRef.current.send(JSON.stringify({ type: 'set_model', model: newModel }))
             }
+            const selectedInfo = availableModels[buttonIndex]
+            const label = selectedInfo.provider ? `${selectedInfo.provider}/${selectedInfo.name}` : selectedInfo.name
             setMessages(prev => [...prev, {
               role: 'system',
-              content: `Switching to model: ${availableModels[buttonIndex].name}`,
+              content: `Switching to model: ${label}`,
               id: `msg-model-${Date.now()}`,
             }])
           }
@@ -851,7 +853,11 @@ export function SessionChatScreen({ route, navigation }: any) {
     )
   }
 
-  const selectedModelName = availableModels.find(m => m.id === selectedModel)?.name || 'Model'
+  const selectedModelName = (() => {
+    const info = availableModels.find(m => m.id === selectedModel)
+    if (!info) return 'Model'
+    return info.provider ? `${info.provider}/${info.name}` : info.name
+  })()
   const canChangeModel = !isStreaming
 
   const agentLabels: Record<AgentType, string> = {

mobile/src/screens/SettingsScreen.tsx

@@ -103,9 +103,12 @@ function ModelPicker({
 }) {
   const { colors } = useTheme();
   const selectedModelInfo = models.find((m) => m.id === selectedModel);
+  const selectedModelLabel = selectedModelInfo
+    ? (selectedModelInfo.provider ? `${selectedModelInfo.provider}/${selectedModelInfo.name}` : selectedModelInfo.name)
+    : undefined;
 
   const showPicker = () => {
-    const options = [...models.map((m) => m.name), 'Cancel'];
+    const options = [...models.map((m) => (m.provider ? `${m.provider}/${m.name}` : m.name)), 'Cancel'];
     ActionSheetIOS.showActionSheetWithOptions(
       {
         options,
@@ -124,7 +127,7 @@ function ModelPicker({
     <View style={styles.row}>
       <Text style={[styles.label, { color: colors.textMuted }]}>{label}</Text>
       <TouchableOpacity style={[styles.modelPicker, { backgroundColor: colors.surfaceSecondary }]} onPress={showPicker}>
-        <Text style={[styles.modelPickerText, { color: colors.text }]}>{selectedModelInfo?.name || 'Select Model'}</Text>
+        <Text style={[styles.modelPickerText, { color: colors.text }]}>{selectedModelLabel || 'Select Model'}</Text>
         <Text style={[styles.modelPickerChevron, { color: colors.textMuted }]}>›</Text>
       </TouchableOpacity>
     </View>

mobile/src/screens/WorkspaceDetailScreen.tsx

@@ -24,7 +24,7 @@ type DateGroup = 'Today' | 'Yesterday' | 'This Week' | 'Older'
 
 const DELETE_ACTION_WIDTH = 80
 
-function DeleteAction({
+function WorkspaceDetailDeleteAction({
   drag,
   onPress,
   color,
@@ -416,7 +416,7 @@ export function WorkspaceDetailScreen({ route, navigation }: any) {
                  friction={2}
                  rightThreshold={40}
                  renderRightActions={(_prog, drag, swipeable) => (
-                   <DeleteAction
+                   <WorkspaceDetailDeleteAction
                      drag={drag}
                      onPress={() => confirmDeleteSession(item.session, swipeable.close)}
                      color={colors.error}

src/agent/router.ts

@@ -6,6 +6,7 @@ import path from 'path';
 import type { AgentConfig } from '../shared/types';
 import { HOST_WORKSPACE_NAME } from '../shared/client-types';
 import { AnyWorkspaceNameSchema, UserWorkspaceNameSchema } from '../shared/workspace-name';
+import type { ModelInfo } from '../models/cache';
 import { getDockerVersion, execInContainer, getContainerName, type ExecResult } from '../docker';
 import { createWorkerClient } from '../worker/client';
 import type { WorkspaceManager } from '../workspace/manager';
@@ -37,6 +38,7 @@ import {
   discoverClaudeCodeModels,
   discoverHostOpencodeModels,
   discoverContainerOpencodeModels,
+  shouldUseCachedOpencodeModels,
 } from '../models/discovery';
 import { deleteOpencodeSession } from '../sessions/agents/opencode-storage';
 import { SessionIndex } from '../worker/session-index';
@@ -540,6 +542,7 @@ export function createRouter(ctx: RouterContext) {
       const newConfig = { ...currentConfig, agents: input };
       ctx.config.set(newConfig);
       await saveAgentConfig(newConfig, ctx.configDir);
+      await ctx.modelCache.clearCache();
       ctx.triggerAutoSync();
       return input;
     });
@@ -1435,12 +1438,13 @@ export function createRouter(ctx: RouterContext) {
         return { models };
       }
 
+      const prefersWorkspaceModels = !!config.agents?.opencode?.zen_token;
       const cached = await ctx.modelCache.getOpencodeModels();
-      if (cached) {
+      if (shouldUseCachedOpencodeModels(cached, prefersWorkspaceModels, input.workspaceName)) {
         return { models: cached };
       }
 
-      let models;
+      let models: ModelInfo[] = [];
       if (input.workspaceName === HOST_WORKSPACE_NAME) {
         if (!config.allowHostAccess) {
           throw new ORPCError('PRECONDITION_FAILED', { message: 'Host access is disabled' });
@@ -1457,14 +1461,27 @@ export function createRouter(ctx: RouterContext) {
         const containerName = `workspace-${input.workspaceName}`;
         models = await discoverContainerOpencodeModels(containerName, execInContainer);
       } else {
-        models = await discoverHostOpencodeModels();
-        if (models.length === 0) {
+        const prefersWorkspaceModels = !!config.agents?.opencode?.zen_token;
+        if (prefersWorkspaceModels) {
           const allWorkspaces = await ctx.workspaces.list();
           const runningWorkspace = allWorkspaces.find((w) => w.status === 'running');
           if (runningWorkspace) {
             const containerName = `workspace-${runningWorkspace.name}`;
             models = await discoverContainerOpencodeModels(containerName, execInContainer);
           }
+          if (models.length === 0) {
+            models = await discoverHostOpencodeModels();
+          }
+        } else {
+          models = await discoverHostOpencodeModels();
+          if (models.length === 0) {
+            const allWorkspaces = await ctx.workspaces.list();
+            const runningWorkspace = allWorkspaces.find((w) => w.status === 'running');
+            if (runningWorkspace) {
+              const containerName = `workspace-${runningWorkspace.name}`;
+              models = await discoverContainerOpencodeModels(containerName, execInContainer);
+            }
+          }
         }
       }
 

src/index.ts

@@ -204,7 +204,7 @@ async function promptForAgent(): Promise<string> {
   return agentHost;
 }
 
-async function getClient(timeoutMs?: number) {
+async function createClient(timeoutMs?: number) {
   const agent = await getAgentWithFallback();
   return createApiClient(agent, undefined, timeoutMs);
 }
@@ -237,7 +237,7 @@ program
   .description('List all workspaces')
   .action(async () => {
     try {
-      const client = await getClient();
+      const client = await createClient();
       const workspaces = await client.listWorkspaces();
 
       if (workspaces.length === 0) {
@@ -273,7 +273,7 @@ program
   .option('--clone <url>', 'Git repository URL to clone (when creating)')
   .action(async (name, options) => {
     try {
-      const client = await getClient();
+      const client = await createClient();
       console.log(`Starting workspace '${name}'...`);
 
       let workspace;
@@ -316,7 +316,7 @@ program
   .description('Stop a running workspace')
   .action(async (name) => {
     try {
-      const client = await getClient();
+      const client = await createClient();
       console.log(`Stopping workspace '${name}'...`);
 
       const workspace = await client.stopWorkspace(name);
@@ -333,7 +333,7 @@ program
   .description('Delete a workspace')
   .action(async (name) => {
     try {
-      const client = await getClient();
+      const client = await createClient();
       console.log(`Deleting workspace '${name}'...`);
 
       await client.deleteWorkspace(name);
@@ -349,7 +349,7 @@ program
   .description('Clone an existing workspace')
   .action(async (source, cloneName) => {
     try {
-      const client = await getClient();
+      const client = await createClient();
       console.log(`Cloning workspace '${source}' to '${cloneName}'...`);
       console.log('This may take a while for large workspaces.');
 
@@ -368,7 +368,7 @@ program
   .description('Show workspace or agent info')
   .action(async (name) => {
     try {
-      const client = await getClient();
+      const client = await createClient();
 
       if (name) {
         const workspace = await client.getWorkspace(name);
@@ -405,7 +405,7 @@ program
   .option('-n, --tail <lines>', 'Number of lines to show', '100')
   .action(async (name, options) => {
     try {
-      const client = await getClient();
+      const client = await createClient();
       const logs = await client.getLogs(name, parseInt(options.tail, 10));
       console.log(logs);
     } catch (err) {
@@ -419,7 +419,7 @@ program
   .option('-a, --all', 'Sync all running workspaces')
   .action(async (name, options) => {
     try {
-      const client = await getClient(5 * 60 * 1000);
+      const client = await createClient(5 * 60 * 1000);
 
       if (options.all) {
         console.log('Syncing all running workspaces...');
@@ -462,7 +462,7 @@ program
   .action(async (name) => {
     try {
       const agentHost = await getAgentWithFallback();
-      const client = await getClient();
+      const client = await createClient();
 
       const workspace = await client.getWorkspace(name);
       if (workspace.status !== 'running') {
@@ -508,7 +508,7 @@ program
   .action(async (name, ports: string[]) => {
     try {
       const agentHost = await getAgentWithFallback();
-      const client = await getClient();
+      const client = await createClient();
 
       const workspace = await client.getWorkspace(name);
       if (workspace.status !== 'running') {
@@ -602,7 +602,7 @@ program
   .description('Configure port mappings for a workspace (e.g. 3000, 8080:3000)')
   .action(async (name, ports: string[]) => {
     try {
-      const client = await getClient();
+      const client = await createClient();
 
       const workspace = await client.getWorkspace(name);
       if (!workspace) {
@@ -793,7 +793,7 @@ sshCmd
   .description('Show current SSH configuration')
   .action(async () => {
     try {
-      const client = await getClient();
+      const client = await createClient();
       const ssh = await client.getSSHSettings();
 
       console.log('');
@@ -844,7 +844,7 @@ sshCmd
   .description('Toggle auto-authorization of host keys (on/off)')
   .action(async (toggle?: string) => {
     try {
-      const client = await getClient();
+      const client = await createClient();
       const settings = await client.getSSHSettings();
 
       if (!toggle) {
@@ -871,7 +871,7 @@ sshCmd
   .option('-w, --workspace <name>', 'Apply to specific workspace only')
   .action(async (keyPath: string, options: { workspace?: string }) => {
     try {
-      const client = await getClient();
+      const client = await createClient();
       const settings = await client.getSSHSettings();
 
       const normalizedPath = keyPath.replace(/\.pub$/, '');
@@ -907,7 +907,7 @@ sshCmd
   .option('-w, --workspace <name>', 'Apply to specific workspace only')
   .action(async (keyPath: string, options: { workspace?: string }) => {
     try {
-      const client = await getClient();
+      const client = await createClient();
       const settings = await client.getSSHSettings();
 
       if (options.workspace) {
@@ -947,7 +947,7 @@ sshCmd
       options: { workspace?: string; copy?: boolean; authorize?: boolean }
     ) => {
       try {
-        const client = await getClient();
+        const client = await createClient();
         const settings = await client.getSSHSettings();
 
         const normalizedPath = keyPath.replace(/\.pub$/, '');
@@ -1254,7 +1254,7 @@ function handleError(err: unknown): never {
       console.error(`Error: ${JSON.stringify(err)}`);
     }
   } else if (err !== undefined && err !== null) {
-    console.error(`Error: ${String(err)}`);
+    console.error('Error:', err);
   } else {
     console.error('An unknown error occurred');
   }