@parallel-cli/parallel 0.4.1 → 0.4.4

package/dist/config.js

@@ -13,131 +13,250 @@ export function configFile() {
 }
 export const DEEPSEEK_PROVIDER = {
     name: 'DeepSeek',
-    baseUrl: 'https://api.deepseek.com',
+    baseUrl: 'https://api.deepseek.com/v1',
     apiKey: '',
-    models: ['deepseek-v4-flash', 'deepseek-v4-pro', 'deepseek-chat', 'deepseek-reasoner'],
-    defaultModel: 'deepseek-v4-flash',
+    models: ['deepseek-v4-pro', 'deepseek-v4-flash', 'deepseek-chat', 'deepseek-reasoner'],
+    defaultModel: 'deepseek-v4-pro',
 };
 export const PROVIDER_PRESETS = [
+    // ── 🇺🇸 Western ──
     {
         name: 'OpenAI',
         baseUrl: 'https://api.openai.com/v1',
         apiKey: '',
-        models: ['gpt-4o', 'gpt-4o-mini', 'o4-mini', 'gpt-4.1', 'gpt-4.1-mini'],
-        defaultModel: 'gpt-4o',
+        models: ['gpt-5.5', 'gpt-5.5-pro', 'gpt-5.4', 'gpt-5.3-codex', 'gpt-4o', 'gpt-4o-mini', 'o4-mini', 'o3', 'o3-mini', 'o1', 'o1-mini'],
+        defaultModel: 'gpt-5.5',
+        category: 'western',
     },
-    DEEPSEEK_PROVIDER,
     {
         name: 'Anthropic',
-        baseUrl: 'https://api.anthropic.com/v1/',
+        baseUrl: 'https://api.anthropic.com/v1',
         apiKey: '',
-        models: ['claude-sonnet-4-6', 'claude-opus-4-8'],
+        models: ['claude-opus-4-8', 'claude-opus-4-7', 'claude-sonnet-4-6', 'claude-haiku-4-5'],
         defaultModel: 'claude-sonnet-4-6',
+        category: 'western',
     },
     {
-        name: 'OpenRouter',
-        baseUrl: 'https://openrouter.ai/api/v1',
+        name: 'Google Gemini',
+        baseUrl: 'https://generativelanguage.googleapis.com/v1beta/openai',
         apiKey: '',
-        models: ['openai/gpt-4o', 'anthropic/claude-sonnet-4', 'deepseek/deepseek-chat', 'google/gemini-pro'],
-        defaultModel: 'openai/gpt-4o',
+        models: ['gemini-3.1-pro', 'gemini-3.5-flash', 'gemini-3-flash', 'gemini-3.1-flash-lite'],
+        defaultModel: 'gemini-3.5-flash',
+        category: 'western',
     },
     {
-        name: 'Gemini',
-        baseUrl: 'https://generativelanguage.googleapis.com/v1beta/openai/',
+        name: 'xAI Grok',
+        baseUrl: 'https://api.x.ai/v1',
         apiKey: '',
-        models: ['gemini-3.5-flash', 'gemini-3.5-pro', 'gemini-2.5-pro'],
-        defaultModel: 'gemini-3.5-flash',
+        models: ['grok-4', 'grok-4-fast-reasoning', 'grok-3', 'grok-code-fast-1'],
+        defaultModel: 'grok-4',
+        category: 'western',
     },
     {
         name: 'Mistral',
         baseUrl: 'https://api.mistral.ai/v1',
         apiKey: '',
-        models: ['mistral-large-latest', 'mistral-small-latest', 'codestral-latest'],
-        defaultModel: 'mistral-large-latest',
+        models: ['mistral-large-2', 'magistral-medium', 'codestral-latest', 'mistral-small-latest'],
+        defaultModel: 'mistral-large-2',
+        category: 'western',
     },
     {
-        name: 'Groq',
-        baseUrl: 'https://api.groq.com/openai/v1',
+        name: 'Cohere',
+        baseUrl: 'https://api.cohere.com/v1',
         apiKey: '',
-        models: ['llama-3.3-70b-versatile', 'openai/gpt-oss-120b'],
-        defaultModel: 'llama-3.3-70b-versatile',
+        models: ['command-a', 'command-r-plus'],
+        defaultModel: 'command-a',
+        category: 'western',
     },
     {
-        name: 'Together',
-        baseUrl: 'https://api.together.ai/v1',
+        name: 'Perplexity',
+        baseUrl: 'https://api.perplexity.ai',
         apiKey: '',
-        models: ['openai/gpt-oss-120b', 'openai/gpt-oss-20b'],
-        defaultModel: 'openai/gpt-oss-120b',
+        models: ['sonar-pro', 'sonar-deep-research'],
+        defaultModel: 'sonar-pro',
+        category: 'western',
     },
+    // ── 🇨🇳 Chinese ──
     {
-        name: 'xAI',
-        baseUrl: 'https://api.x.ai/v1',
+        name: 'DeepSeek',
+        baseUrl: 'https://api.deepseek.com/v1',
         apiKey: '',
-        models: ['grok-4', 'grok-3-beta', 'grok-3-mini'],
-        defaultModel: 'grok-3-beta',
+        models: ['deepseek-v4-pro', 'deepseek-v4-flash', 'deepseek-chat', 'deepseek-reasoner'],
+        defaultModel: 'deepseek-v4-pro',
+        category: 'chinese',
     },
     {
-        name: 'Perplexity',
-        baseUrl: 'https://api.perplexity.ai',
+        name: 'MiniMax',
+        baseUrl: 'https://api.minimax.io/v1',
         apiKey: '',
-        models: ['sonar-pro', 'sonar', 'sonar-reasoning'],
-        defaultModel: 'sonar-pro',
+        models: ['MiniMax-M3', 'MiniMax-M2.7', 'MiniMax-M2.7-highspeed'],
+        defaultModel: 'MiniMax-M3',
+        category: 'chinese',
     },
     {
-        name: 'Cohere',
-        baseUrl: 'https://api.cohere.com/v2',
+        name: 'Z.ai / GLM',
+        baseUrl: 'https://open.bigmodel.cn/api/paas/v4',
         apiKey: '',
-        models: ['command-a', 'command-r-plus', 'command-r'],
-        defaultModel: 'command-a',
+        models: ['glm-5.2', 'glm-5.1', 'glm-4.7', 'glm-4.7-flash', 'glm-5v-turbo'],
+        defaultModel: 'glm-5.2',
+        category: 'chinese',
     },
     {
-        name: 'DeepInfra',
-        baseUrl: 'https://api.deepinfra.com/v1/openai',
+        name: 'Alibaba / Qwen',
+        baseUrl: 'https://dashscope.aliyuncs.com/compatible-mode/v1',
         apiKey: '',
-        models: ['meta-llama/llama-4-maverick', 'deepseek-ai/deepseek-chat', 'microsoft/wizardlm-2-8x22b'],
-        defaultModel: 'meta-llama/llama-4-maverick',
+        models: ['qwen3.7-max', 'qwen3.6-max-preview', 'qwen3.6-plus', 'qwen3.5-coder'],
+        defaultModel: 'qwen3.7-max',
+        category: 'chinese',
     },
     {
-        name: 'Fireworks',
-        baseUrl: 'https://api.fireworks.ai/inference/v1',
+        name: 'Moonshot / Kimi',
+        baseUrl: 'https://api.moonshot.cn/v1',
+        apiKey: '',
+        models: ['kimi-k2.6', 'kimi-k2.7-code', 'kimi-k2.5', 'moonshot-v1-128k'],
+        defaultModel: 'kimi-k2.6',
+        category: 'chinese',
+    },
+    {
+        name: 'Xiaomi / MiMo',
+        baseUrl: 'https://api.minimaxi.com/v1',
+        apiKey: '',
+        models: ['mimo-v2-pro', 'mimo-v2-omni'],
+        defaultModel: 'mimo-v2-pro',
+        category: 'chinese',
+    },
+    {
+        name: 'StepFun',
+        baseUrl: 'https://api.stepfun.com/v1',
+        apiKey: '',
+        models: ['step-2-16k'],
+        defaultModel: 'step-2-16k',
+        category: 'chinese',
+    },
+    // ── 🌐 Gateways ──
+    {
+        name: 'OpenRouter',
+        baseUrl: 'https://openrouter.ai/api/v1',
+        apiKey: '',
+        models: ['openai/gpt-5.5', 'anthropic/claude-sonnet-4-6', 'google/gemini-3.5-flash', 'deepseek/deepseek-v4-pro', 'meta-llama/llama-4-maverick', 'mistralai/mistral-large-2'],
+        defaultModel: 'openai/gpt-5.5',
+        category: 'gateways',
+    },
+    {
+        name: 'SiliconFlow',
+        baseUrl: 'https://api.siliconflow.cn/v1',
         apiKey: '',
-        models: ['llama-4-maverick', 'llama-4-scout', 'mixtral-8x22b'],
-        defaultModel: 'llama-4-maverick',
+        models: ['deepseek-ai/DeepSeek-V4-Pro', 'deepseek-ai/DeepSeek-R1', 'Qwen/Qwen3-Coder-480B', 'glm-4/GLM-5.2', 'moonshotai/Kimi-K2.6'],
+        defaultModel: 'deepseek-ai/DeepSeek-V4-Pro',
+        category: 'gateways',
+    },
+    {
+        name: 'Atlas Cloud',
+        baseUrl: 'https://api.atlascloud.ai/v1',
+        apiKey: '',
+        models: ['deepseek-v4-pro', 'deepseek-r1', 'qwen3.7-max', 'glm-5.2', 'kimi-k2.6', 'llama-4-maverick'],
+        defaultModel: 'deepseek-v4-pro',
+        category: 'gateways',
+    },
+    {
+        name: 'Requesty',
+        baseUrl: 'https://api.requesty.ai/api/v1',
+        apiKey: '',
+        models: ['gpt-5.5', 'claude-sonnet-4-6', 'gemini-3.5-flash', 'deepseek-v4-pro', 'llama-4-maverick', 'mistral-large-2'],
+        defaultModel: 'gpt-5.5',
+        category: 'gateways',
+    },
+    {
+        name: 'Vercel AI Gateway',
+        baseUrl: 'https://api.vercel.ai/v1',
+        apiKey: '',
+        models: ['gpt-5.5', 'claude-sonnet-4-6', 'gemini-3.5-flash', 'deepseek-v4-pro', 'llama-4-maverick'],
+        defaultModel: 'gpt-5.5',
+        category: 'gateways',
+    },
+    // ── ⚡ Inference ──
+    {
+        name: 'Groq',
+        baseUrl: 'https://api.groq.com/openai/v1',
+        apiKey: '',
+        models: ['qwen-2.5-coder-32b', 'deepseek-r1-distill-llama-70b', 'kimi-k2.6', 'llama-3.3-70b-versatile'],
+        defaultModel: 'qwen-2.5-coder-32b',
+        category: 'inference',
     },
     {
         name: 'Cerebras',
         baseUrl: 'https://api.cerebras.ai/v1',
         apiKey: '',
-        models: ['llama-3.3-70b', 'llama-3.1-8b'],
-        defaultModel: 'llama-3.3-70b',
+        models: ['llama-4-maverick-17b-128e-instruct', 'qwen3-coder-480b', 'kimi-k2.6', 'llama-3.3-70b'],
+        defaultModel: 'llama-4-maverick-17b-128e-instruct',
+        category: 'inference',
+    },
+    {
+        name: 'Together AI',
+        baseUrl: 'https://api.together.xyz/v1',
+        apiKey: '',
+        models: ['meta-llama/Llama-4-Maverick-17B-128E-Instruct', 'deepseek-ai/DeepSeek-V3', 'Qwen/Qwen3-Coder-480B', 'moonshotai/Kimi-K2.6'],
+        defaultModel: 'meta-llama/Llama-4-Maverick-17B-128E-Instruct',
+        category: 'inference',
+    },
+    {
+        name: 'Fireworks',
+        baseUrl: 'https://api.fireworks.ai/inference/v1',
+        apiKey: '',
+        models: ['accounts/fireworks/models/llama4-maverick-17b', 'accounts/fireworks/models/deepseek-v3', 'accounts/fireworks/models/qwen3-coder-480b', 'accounts/fireworks/models/kimi-k2.6'],
+        defaultModel: 'accounts/fireworks/models/llama4-maverick-17b',
+        category: 'inference',
+    },
+    {
+        name: 'DeepInfra',
+        baseUrl: 'https://api.deepinfra.com/v1/openai',
+        apiKey: '',
+        models: ['meta-llama/Llama-4-Maverick-17B-128E', 'deepseek-ai/DeepSeek-V3', 'Qwen/Qwen3-Coder-480B', 'moonshotai/Kimi-K2.6'],
+        defaultModel: 'meta-llama/Llama-4-Maverick-17B-128E',
+        category: 'inference',
     },
     {
         name: 'Novita',
         baseUrl: 'https://api.novita.ai/v3/openai',
         apiKey: '',
-        models: ['deepseek-r1', 'deepseek-v3', 'llama-3.1-70b'],
-        defaultModel: 'deepseek-v3',
+        models: ['meta-llama/llama-4-maverick-17b-128e', 'deepseek/deepseek-v3', 'qwen/qwen3-coder-480b', 'moonshotai/kimi-k2.6'],
+        defaultModel: 'meta-llama/llama-4-maverick-17b-128e',
+        category: 'inference',
     },
     {
         name: 'Hyperbolic',
-        baseUrl: 'https://api.hyperbolic.xyz/v1',
+        baseUrl: 'https://api.hyperbolic.ai/v1',
         apiKey: '',
-        models: ['deepseek-v3', 'llama-4-maverick', 'qwen3-235b'],
-        defaultModel: 'deepseek-v3',
+        models: ['meta-llama/Llama-4-Maverick-17B-128E', 'deepseek-ai/DeepSeek-V3', 'Qwen/Qwen3-Coder-480B', 'moonshotai/Kimi-K2.6'],
+        defaultModel: 'meta-llama/Llama-4-Maverick-17B-128E',
+        category: 'inference',
     },
     {
         name: 'SambaNova',
         baseUrl: 'https://api.sambanova.ai/v1',
         apiKey: '',
-        models: ['llama-4-maverick', 'llama-4-scout', 'deepseek-r1'],
-        defaultModel: 'llama-4-maverick',
+        models: ['Meta-Llama-4-Maverick-17B-128E-Instruct', 'DeepSeek-V3', 'Llama-3.3-70B-Instruct'],
+        defaultModel: 'Meta-Llama-4-Maverick-17B-128E-Instruct',
+        category: 'inference',
     },
+    // ── 🏠 Local ──
     {
         name: 'Ollama',
         baseUrl: 'http://localhost:11434/v1',
+        apiKey: 'ollama-local',
+        models: ['qwen3-coder:480b', 'glm-4.7', 'deepseek-v3', 'kimi-k2', 'llama3.2', 'mistral', 'codellama', 'gemma3'],
+        defaultModel: 'qwen3-coder:480b',
+        category: 'local',
+        requiresApiKey: false,
+    },
+    {
+        name: 'vLLM / SGLang',
+        baseUrl: 'http://localhost:8000/v1',
         apiKey: '',
-        models: ['llama3', 'codellama', 'mistral'],
-        defaultModel: 'llama3',
+        models: ['your-model-here'],
+        defaultModel: '',
+        category: 'local',
+        requiresApiKey: false,
     },
 ];
 export const DEFAULTS = {
@@ -155,6 +274,45 @@ function normalizeApprovalMode(mode) {
         return 'auto-safe';
     return 'ask';
 }
+export function isLocalProvider(p) {
+    return /localhost|127\.0\.0\.1|0\.0\.0\.0/.test(p.baseUrl);
+}
+export function providerNeedsApiKey(p) {
+    return p.requiresApiKey !== false && !isLocalProvider(p);
+}
+export function isPlaceholderModel(model) {
+    return !model.trim() || /^your-model-here$/i.test(model.trim());
+}
+export function providerHasUsableModel(p) {
+    return !isPlaceholderModel(p.defaultModel || p.models[0] || '');
+}
+export function providerReady(p) {
+    return (!providerNeedsApiKey(p) || p.apiKey.trim().length > 0) && providerHasUsableModel(p);
+}
+export async function detectProviderModels(provider, timeoutMs = 2000) {
+    let timeout;
+    try {
+        const controller = new AbortController();
+        timeout = setTimeout(() => controller.abort(), timeoutMs);
+        const resp = await fetch(provider.baseUrl.replace(/\/+$/, '') + '/models', { signal: controller.signal });
+        if (!resp.ok)
+            return null;
+        const data = (await resp.json());
+        const models = [
+            ...(data.data?.map((m) => m.id || m.name).filter(Boolean) ?? []),
+            ...(data.models?.map((m) => m.name).filter(Boolean) ?? []),
+        ];
+        const unique = [...new Set(models.filter((m) => !isPlaceholderModel(m)))];
+        return unique.length > 0 ? { models: unique, defaultModel: unique[0] } : null;
+    }
+    catch {
+        return null;
+    }
+    finally {
+        if (timeout)
+            clearTimeout(timeout);
+    }
+}
 export function getProvider(cfg, name) {
     const n = (name ?? cfg.defaultProvider).toLowerCase();
     return cfg.providers.find((p) => p.name.toLowerCase() === n) ?? (name ? undefined : cfg.providers[0]);
@@ -185,6 +343,20 @@ function migrate(raw, cfg) {
     cfg.providers = [p];
     cfg.defaultProvider = p.name;
 }
+function normalizeConfig(cfg) {
+    cfg.providers = cfg.providers.filter((p) => p && typeof p.name === 'string' && typeof p.baseUrl === 'string');
+    for (const p of cfg.providers) {
+        if (!Array.isArray(p.models))
+            p.models = [];
+        if (typeof p.defaultModel !== 'string')
+            p.defaultModel = p.models[0] ?? '';
+        if (typeof p.apiKey !== 'string')
+            p.apiKey = '';
+    }
+    const defaultExists = cfg.providers.some((p) => p.name.toLowerCase() === cfg.defaultProvider.toLowerCase());
+    if (!defaultExists)
+        cfg.defaultProvider = cfg.providers[0]?.name ?? '';
+}
 export function loadConfig() {
     let cfg = { ...DEFAULTS, providers: [] };
     try {
@@ -201,17 +373,30 @@ export function loadConfig() {
     catch {
         // ignore corrupted config
     }
-    // Env vars: ensure a DeepSeek provider exists / override the default provider.
-    const envKey = process.env.PARALLEL_API_KEY || process.env.DEEPSEEK_API_KEY;
-    if (envKey && cfg.providers.length === 0) {
-        cfg.providers = [{ ...DEEPSEEK_PROVIDER, apiKey: envKey }];
+    normalizeConfig(cfg);
+    // Env vars: PARALLEL_API_KEY targets the current default provider; DEEPSEEK_API_KEY only targets DeepSeek.
+    const parallelKey = process.env.PARALLEL_API_KEY;
+    const deepseekKey = process.env.DEEPSEEK_API_KEY;
+    if (parallelKey && cfg.providers.length === 0) {
+        cfg.providers = [{ ...DEEPSEEK_PROVIDER, apiKey: parallelKey }];
         cfg.defaultProvider = DEEPSEEK_PROVIDER.name;
     }
-    else if (envKey) {
+    else if (parallelKey) {
         const p = getProvider(cfg);
         if (p)
-            p.apiKey = envKey;
+            p.apiKey = parallelKey;
+    }
+    if (deepseekKey) {
+        const p = getProvider(cfg, DEEPSEEK_PROVIDER.name);
+        if (p)
+            p.apiKey = deepseekKey;
+        else {
+            cfg.providers.push({ ...DEEPSEEK_PROVIDER, apiKey: deepseekKey });
+            if (!cfg.defaultProvider)
+                cfg.defaultProvider = DEEPSEEK_PROVIDER.name;
+        }
     }
+    normalizeConfig(cfg);
     const p = getProvider(cfg);
     if (p) {
         if (process.env.PARALLEL_BASE_URL)

package/dist/controller.js

@@ -72,6 +72,7 @@ export class Controller extends EventEmitter {
     conversationFiles = new Map();
     /** The session restored at startup (source of /restore conversations). */
     loadedSession = null;
+    sessionOnlyProvider = null;
     constructor(config, projectRoot) {
         super();
         this.config = config;
@@ -108,21 +109,30 @@ export class Controller extends EventEmitter {
     // ---------- providers / models ----------
     /** Provider used by the current session (falls back to the global default). */
     sessionProvider() {
+        if (this.sessionOnlyProvider &&
+            this.session.providerName.toLowerCase() === this.sessionOnlyProvider.name.toLowerCase()) {
+            return this.sessionOnlyProvider;
+        }
         return getProvider(this.config, this.session.providerName || undefined);
     }
     /** Resolve "model" or "provider:model" against the configured providers. */
     resolveModel(spec) {
-        const m = spec.match(/^([^:]+):(.+)$/);
-        if (m) {
-            const provider = getProvider(this.config, m[1].trim());
-            return provider ? { provider, model: m[2].trim() } : null;
+        const trimmed = spec.trim();
+        const sep = trimmed.indexOf(':');
+        if (sep > 0) {
+            const left = trimmed.slice(0, sep).trim();
+            const provider = this.sessionOnlyProvider && this.sessionOnlyProvider.name.toLowerCase() === left.toLowerCase()
+                ? this.sessionOnlyProvider
+                : getProvider(this.config, left);
+            if (provider)
+                return { provider, model: trimmed.slice(sep + 1).trim() };
         }
         // bare model name: current session provider first, then any provider listing it
         const cur = this.sessionProvider();
         if (cur)
-            return { provider: cur, model: spec.trim() };
-        const any = this.config.providers.find((p) => p.models.includes(spec.trim()));
-        return any ? { provider: any, model: spec.trim() } : null;
+            return { provider: cur, model: trimmed };
+        const any = this.config.providers.find((p) => p.models.includes(trimmed));
+        return any ? { provider: any, model: trimmed } : null;
     }
     llmFor(provider, model) {
         const key = JSON.stringify([provider.name, provider.baseUrl, provider.apiKey, model]);
@@ -229,7 +239,7 @@ export class Controller extends EventEmitter {
             return;
         const [q] = this.questions.splice(idx, 1);
         this.board.log('', 'system', auto ? t('m.qAuto', { name: q.agentName, answer }) : t('m.qAnswered', { name: q.agentName, answer }));
-        q.resolve(answer);
+        q.resolve({ answer, auto });
         this.emit('update');
     }
     // ---------- agents ----------
@@ -380,7 +390,7 @@ export class Controller extends EventEmitter {
     respawnAgent(name) {
         const sa = this.loadedSession?.agents.find((a) => a.name.toLowerCase() === name.toLowerCase());
         if (!sa)
-            return 'no-conversation';
+            return 'no-agent';
         if (!sa.conversation || !fs.existsSync(sa.conversation))
             return 'no-conversation';
         let history;
@@ -425,7 +435,7 @@ export class Controller extends EventEmitter {
         for (const req of this.approvals.splice(0))
             req.resolve(false);
         for (const q of this.questions.splice(0))
-            q.resolve(q.options[q.recommended] ?? '');
+            q.resolve({ answer: q.options[q.recommended] ?? '', auto: true });
     }
     sendToAgent(name, content) {
         const a = this.findAgent(name);
@@ -436,6 +446,15 @@ export class Controller extends EventEmitter {
     }
     broadcast(content) {
         this.board.addNote('user', 'all', content);
+        let n = 0;
+        for (const [id, agent] of this.agents.entries()) {
+            const info = this.board.agents.get(id);
+            if (!info || ['done', 'error', 'stopped'].includes(info.state))
+                continue;
+            agent.instruct(content);
+            n++;
+        }
+        return n;
     }
     hasRunningAgents() {
         return [...this.board.agents.values()].some((a) => ['working', 'thinking', 'listening', 'waiting', 'paused', 'idle'].includes(a.state));
@@ -462,8 +481,10 @@ export class Controller extends EventEmitter {
                 continue;
             const conflict = this.board.changes.some((c2) => c2.id > c.id && c2.path === c.path && c2.agentId !== info.id);
             try {
-                const abs = path.resolve(this.projectRoot, c.path);
-                if (!abs.startsWith(path.resolve(this.projectRoot)))
+                const root = path.resolve(this.projectRoot);
+                const abs = path.resolve(root, c.path);
+                const rel = path.relative(root, abs);
+                if (rel.startsWith('..') || path.isAbsolute(rel))
                     return 'none';
                 fs.writeFileSync(abs, c.before);
             }
@@ -628,7 +649,7 @@ export class Controller extends EventEmitter {
                 return { file, data: JSON.parse(fs.readFileSync(file, 'utf8')) };
             })
                 .sort((a, b) => (a.data.savedAt < b.data.savedAt ? 1 : -1))
-                .slice(0, 8);
+                .slice(0, 20);
         }
         catch {
             return [];
@@ -669,11 +690,19 @@ export class Controller extends EventEmitter {
         const p = getProvider(this.config, name);
         if (!p)
             return false;
+        this.sessionOnlyProvider = null;
         this.session.providerName = p.name;
-        this.session.model = p.defaultModel;
+        this.session.model = p.defaultModel || p.models[0] || '';
         this.emit('update');
         return true;
     }
+    setSessionProviderConfig(p) {
+        this.sessionOnlyProvider = p;
+        this.session.providerName = p.name;
+        this.session.model = p.defaultModel || p.models[0] || '';
+        this.llmCache.clear();
+        this.emit('update');
+    }
     setSessionApprovalMode(mode) {
         this.session.approvalMode = mode;
         this.emit('update');
@@ -685,16 +714,18 @@ export class Controller extends EventEmitter {
     // ---------- GLOBAL settings (/settings) — persisted ----------
     saveProvider(p) {
         upsertProvider(this.config, p);
+        if (this.sessionOnlyProvider?.name.toLowerCase() === p.name.toLowerCase())
+            this.sessionOnlyProvider = null;
         this.llmCache.clear();
         // if the session points at this provider, refresh its view
         if (this.session.providerName.toLowerCase() === p.name.toLowerCase()) {
             this.session.providerName = p.name;
             if (!p.models.includes(this.session.model))
-                this.session.model = p.defaultModel;
+                this.session.model = p.defaultModel || p.models[0] || '';
         }
         if (!this.session.providerName) {
             this.session.providerName = p.name;
-            this.session.model = p.defaultModel;
+            this.session.model = p.defaultModel || p.models[0] || '';
         }
         this.emit('update');
     }
@@ -731,7 +762,7 @@ export class Controller extends EventEmitter {
         if (this.session.providerName.toLowerCase() === name.toLowerCase()) {
             const fallback = this.config.providers[0];
             this.session.providerName = fallback?.name ?? '';
-            this.session.model = fallback?.defaultModel ?? '';
+            this.session.model = fallback?.defaultModel || fallback?.models[0] || '';
         }
         saveConfig(this.config);
         this.llmCache.clear();