fix: require an explicit last-used model argument when loading models

Author: elkaix

packages/agent-core-v2/src/kosong/model/model.ts

@@ -78,7 +78,7 @@ export interface IModelService {
   getLastUsedModel(): string | undefined;
   set(id: string, model: ModelRecord): Promise<void>;
   delete(id: string): Promise<void>;
-  loadAll(models: ModelsSection, defaultModel: string | undefined, lastUsedModel?: string): void;
+  loadAll(models: ModelsSection, defaultModel: string | undefined, lastUsedModel: string | undefined): void;
   replaceAll(models: ModelsSection): Promise<void>;
   setDefaultModel(id: string | undefined): Promise<void>;
   setLastUsedModel(id: string | undefined): Promise<void>;

packages/agent-core-v2/src/kosong/model/modelService.ts

@@ -76,7 +76,7 @@ export class ModelService extends Disposable implements IModelService {
     return this.lastUsedModel;
   }
 
-  loadAll(models: ModelsSection, defaultModel: string | undefined, lastUsedModel?: string): void {
+  loadAll(models: ModelsSection, defaultModel: string | undefined, lastUsedModel: string | undefined): void {
     void this.applyRecords(models);
     void this.applyDefaultModel(defaultModel);
     void this.applyLastUsedModel(lastUsedModel);

packages/agent-core-v2/test/harness/agent.ts

@@ -206,6 +206,7 @@ import { IModelService, type ModelsSection } from '#/kosong/model/model';
 import {
   DEFAULT_MODEL_SECTION,
   DEFAULT_PROVIDER_SECTION,
+  LAST_USED_MODEL_SECTION,
   MODELS_SECTION,
   PROVIDERS_SECTION,
 } from '#/app/kosongConfig/configSection';
@@ -1040,6 +1041,7 @@ class ConfigBackedModelCatalog extends ModelCatalog {
     this.modelRegistry.loadAll(
       this.config.get<ModelsSection>(MODELS_SECTION) ?? {},
       this.config.get<string>(DEFAULT_MODEL_SECTION),
+      this.config.get<string>(LAST_USED_MODEL_SECTION),
     );
   }
 
@@ -1221,6 +1223,7 @@ export class AgentTestContext {
       .loadAll(
         initialConfig.get<ModelsSection>(MODELS_SECTION) ?? {},
         initialConfig.get<string>(DEFAULT_MODEL_SECTION),
+        initialConfig.get<string>(LAST_USED_MODEL_SECTION),
       );
 
     const bootstrap = this.root.accessor.get(IBootstrapService);

packages/agent-core-v2/test/kosong/model/catalog.test.ts

@@ -88,6 +88,7 @@ function createHost(
   models.loadAll(
     (sections['models'] ?? {}) as ModelsSection,
     sections['defaultModel'] as string | undefined,
+    undefined,
   );
   return {
     host,

packages/agent-core-v2/test/kosong/model/modelService.test.ts

@@ -86,7 +86,7 @@ describe('ModelService', () => {
 
   function createService(models: Readonly<Record<string, ModelRecord>> = {}): ModelService {
     const service = new ModelService(stubProviders(), stubEvents());
-    service.loadAll({ ...models }, undefined);
+    service.loadAll({ ...models }, undefined, undefined);
     return service;
   }
 
@@ -99,7 +99,7 @@ describe('ModelService', () => {
     await Promise.resolve();
     expect(ready).toBe(false);
 
-    service.loadAll({ k1: { provider: 'pymodel', model: 'kimi-k2', maxContextSize: 262144 } }, 'k1');
+    service.loadAll({ k1: { provider: 'pymodel', model: 'kimi-k2', maxContextSize: 262144 } }, 'k1', undefined);
     await service.ready;
     expect(ready).toBe(true);
     expect(service.getDefaultModel()).toBe('k1');
@@ -172,6 +172,7 @@ describe('ModelService', () => {
         chat: { provider: 'pymodel', model: 'chat', capabilities: ['tool_use'], maxContextSize: 262144 },
       },
       undefined,
+      undefined,
     );
     expect(service.getDefaultModel()).toBe('chat');
   });
@@ -194,6 +195,7 @@ describe('ModelService', () => {
         },
       },
       'small',
+      undefined,
     );
     expect(service.getDefaultModel()).toBe('small');
   });
@@ -211,6 +213,7 @@ describe('ModelService', () => {
         },
       },
       'huge',
+      undefined,
     );
     expect(service.getDefaultModel()).toBe('big');
   });
@@ -242,6 +245,7 @@ describe('ModelService', () => {
         },
       },
       'small',
+      undefined,
     );
     expect(service.getDefaultModel()).toBe('small');
 
@@ -268,13 +272,14 @@ describe('ModelService', () => {
         },
       },
       'lone',
+      undefined,
     );
     expect(service.getDefaultModel()).toBeUndefined();
   });
 
   it('leaves the default unset when no model is eligible', () => {
     const service = new ModelService(stubProviders(), stubEvents());
-    service.loadAll({ embed: { model: 'embed', capabilities: ['image_in'] } }, undefined);
+    service.loadAll({ embed: { model: 'embed', capabilities: ['image_in'] } }, undefined, undefined);
     expect(service.getDefaultModel()).toBeUndefined();
   });
 
@@ -324,7 +329,7 @@ describe('ModelService', () => {
     expect(events).toEqual(['k1', 'k2', undefined]);
   });
 
-  it('replaces a dead default with the ready last-used model and says so in the warning', async () => {
+  it('falls back to the ranking when the default and last-used model are both deleted and warns about both ids', async () => {
     const published: ConfigWarning[] = [];
     const events = {
       _serviceBrand: undefined,