all fixed?

Author: MelbourneDeveloper

src/semantic/summariser.ts

@@ -8,10 +8,10 @@ import * as vscode from 'vscode';
 import type { Result } from '../models/TaskItem';
 import { ok, err } from '../models/TaskItem';
 import { logger } from '../utils/logger';
-import { resolveModel, pickConcreteModel } from './modelSelection';
+import { resolveModel } from './modelSelection';
 import type { ModelSelectionDeps, ModelRef } from './modelSelection';
 export type { ModelRef, ModelSelectionDeps } from './modelSelection';
-export { resolveModel, pickConcreteModel, AUTO_MODEL_ID } from './modelSelection';
+export { resolveModel, AUTO_MODEL_ID } from './modelSelection';
 
 const MAX_CONTENT_LENGTH = 4000;
 const MODEL_RETRY_COUNT = 10;
@@ -121,7 +121,7 @@ function buildVSCodeDeps(): ModelSelectionDeps {
 
 /**
  * Selects the configured model by ID, or prompts the user to pick one.
- * When "auto" is selected, resolves to the first concrete (non-auto) model.
+ * When "auto" is selected, uses the Copilot auto model directly.
  */
 export async function selectCopilotModel(): Promise<Result<vscode.LanguageModelChat, string>> {
     const result = await resolveModel(buildVSCodeDeps());
@@ -130,11 +130,7 @@ export async function selectCopilotModel(): Promise<Result<vscode.LanguageModelC
     const allModels = await fetchModels({ vendor: 'copilot' });
     if (allModels.length === 0) { return err('No Copilot models available'); }
 
-    const refs = allModels.map(m => ({ id: m.id, name: m.name }));
-    const concrete = pickConcreteModel({ models: refs, preferredId: result.value.id });
-    if (!concrete) { return err('Selected model no longer available'); }
-
-    const model = allModels.find(m => m.id === concrete.id);
+    const model = allModels.find(m => m.id === result.value.id);
     if (!model) { return err('Selected model no longer available'); }
 
     logger.info('Resolved model for requests', { selected: result.value.id, resolved: model.id });

src/test/unit/model-selection.unit.test.ts

@@ -139,7 +139,7 @@ suite('Model Selection (resolveModel)', () => {
     });
 });
 
-suite('pickConcreteModel (auto resolution)', () => {
+suite('pickConcreteModel (legacy — no longer used in main flow)', () => {
 
     test('returns specific model when preferredId is not auto', () => {
         const result = pickConcreteModel({ models: ALL_MODELS, preferredId: HAIKU.id });
@@ -176,3 +176,37 @@ suite('pickConcreteModel (auto resolution)', () => {
         assert.strictEqual(result.id, OPUS.id, 'Should pick first model when no auto in list');
     });
 });
+
+suite('Direct model lookup (selectCopilotModel fix)', () => {
+
+    test('auto resolved ID selects auto model — NOT premium', () => {
+        const models = ALL_WITH_AUTO;
+        const resolvedId = AUTO_MODEL_ID;
+
+        const selected = models.find(m => m.id === resolvedId);
+
+        assert.ok(selected, 'Auto model must exist in list');
+        assert.strictEqual(selected.id, AUTO_MODEL_ID, 'Must use auto model directly');
+        assert.notStrictEqual(selected.id, OPUS.id, 'Must NOT resolve to premium opus model');
+    });
+
+    test('specific model ID selects that exact model', () => {
+        const models = ALL_WITH_AUTO;
+        const resolvedId = HAIKU.id;
+
+        const selected = models.find(m => m.id === resolvedId);
+
+        assert.ok(selected, 'Haiku model must be found');
+        assert.strictEqual(selected.id, HAIKU.id);
+        assert.strictEqual(selected.name, HAIKU.name);
+    });
+
+    test('nonexistent model ID returns undefined', () => {
+        const models = ALL_WITH_AUTO;
+        const resolvedId = 'nonexistent';
+
+        const selected = models.find(m => m.id === resolvedId);
+
+        assert.strictEqual(selected, undefined, 'Nonexistent model must not match');
+    });
+});