fix(core,vscode): keep provider update versions in sync

packages/cli/src/ui/hooks/useProviderUpdates.test.ts

@@ -10,6 +10,7 @@ import {
   AuthType,
   CODING_PLAN_CHINA_BASE_URL,
   CODING_PLAN_ENV_KEY,
+  CODING_PLAN_GLOBAL_BASE_URL,
   codingPlanProvider,
   TOKEN_PLAN_BASE_URL,
   TOKEN_PLAN_ENV_KEY,
@@ -126,6 +127,32 @@ describe('useProviderUpdates', () => {
     expect(result.current.providerUpdateRequest).toBeUndefined();
   });
 
+  it('uses the stored non-default base URL when versions match', () => {
+    const globalTemplate = buildProviderTemplate(
+      codingPlanProvider,
+      CODING_PLAN_GLOBAL_BASE_URL,
+    );
+    (mockSettings.merged[PROVIDER_METADATA_NS] as Record<string, unknown>)[
+      METADATA_KEY
+    ] = {
+      baseUrl: CODING_PLAN_GLOBAL_BASE_URL,
+      version: computeModelListVersion(globalTemplate),
+    };
+    mockSettings.merged['modelProviders'] = {
+      [AuthType.USE_OPENAI]: globalTemplate,
+    };
+
+    const { result } = renderHook(() =>
+      useProviderUpdates(
+        mockSettings as never,
+        mockConfig as never,
+        mockAddItem,
+      ),
+    );
+
+    expect(result.current.providerUpdateRequest).toBeUndefined();
+  });
+
   it('shows update prompt with structured diff when versions differ', async () => {
     (mockSettings.merged[PROVIDER_METADATA_NS] as Record<string, unknown>)[
       METADATA_KEY
@@ -222,7 +249,7 @@ describe('useProviderUpdates', () => {
     expect(entry?.diff.added).toContain(addedModelId);
   });
 
-  it('preserves user-added custom models when executing an update', async () => {
+  it('persists the template version and preserves custom models', async () => {
     const customModel = {
       id: 'my-custom-model',
       baseUrl: CODING_PLAN_CHINA_BASE_URL,
@@ -264,6 +291,11 @@ describe('useProviderUpdates', () => {
         expect.objectContaining({ id: 'my-custom-model' }),
       ]),
     );
+    expect(mockSettings.setValue).toHaveBeenCalledWith(
+      expect.anything(),
+      `${PROVIDER_METADATA_NS}.${METADATA_KEY}.version`,
+      chinaVersion,
+    );
   });
 
   it('executes update when user confirms with "update"', async () => {
@@ -303,11 +335,6 @@ describe('useProviderUpdates', () => {
       expect(mockSettings.setValue).toHaveBeenCalled();
     });
 
-    expect(mockSettings.setValue).toHaveBeenCalledWith(
-      expect.anything(),
-      `${PROVIDER_METADATA_NS}.${METADATA_KEY}.version`,
-      chinaVersion,
-    );
     expect(mockSettings.setValue).toHaveBeenCalledWith(
       expect.anything(),
       `${PROVIDER_METADATA_NS}.${METADATA_KEY}.baseUrl`,
@@ -323,6 +350,89 @@ describe('useProviderUpdates', () => {
     );
   });
 
+  it('preserves the stored global base URL when updating', async () => {
+    const globalTemplate = buildProviderTemplate(
+      codingPlanProvider,
+      CODING_PLAN_GLOBAL_BASE_URL,
+    );
+    const globalVersion = computeModelListVersion(globalTemplate);
+    (mockSettings.merged[PROVIDER_METADATA_NS] as Record<string, unknown>)[
+      METADATA_KEY
+    ] = {
+      baseUrl: CODING_PLAN_GLOBAL_BASE_URL,
+      version: 'old-version-hash',
+    };
+    mockSettings.merged['modelProviders'] = {
+      [AuthType.USE_OPENAI]: globalTemplate,
+    };
+
+    const { result } = renderHook(() =>
+      useProviderUpdates(
+        mockSettings as never,
+        mockConfig as never,
+        mockAddItem,
+      ),
+    );
+
+    await waitFor(() => {
+      expect(result.current.providerUpdateRequest).toBeDefined();
+    });
+    await result.current.providerUpdateRequest!.onConfirm('update');
+
+    expect(mockSettings.setValue).toHaveBeenCalledWith(
+      expect.anything(),
+      `${PROVIDER_METADATA_NS}.${METADATA_KEY}.baseUrl`,
+      CODING_PLAN_GLOBAL_BASE_URL,
+    );
+    expect(mockSettings.setValue).toHaveBeenCalledWith(
+      expect.anything(),
+      `${PROVIDER_METADATA_NS}.${METADATA_KEY}.version`,
+      globalVersion,
+    );
+  });
+
+  it('updates both provider metadata keys from a batched prompt', async () => {
+    const metadataNs = mockSettings.merged[PROVIDER_METADATA_NS] as Record<
+      string,
+      unknown
+    >;
+    metadataNs[METADATA_KEY] = {
+      baseUrl: CODING_PLAN_CHINA_BASE_URL,
+      version: 'old-version-hash',
+    };
+    metadataNs[TOKEN_METADATA_KEY] = {
+      baseUrl: TOKEN_PLAN_BASE_URL,
+      version: 'old-version-hash',
+    };
+    mockSettings.merged['modelProviders'] = {
+      [AuthType.USE_OPENAI]: [...chinaTemplate, ...tokenTemplate],
+    };
+
+    const { result } = renderHook(() =>
+      useProviderUpdates(
+        mockSettings as never,
+        mockConfig as never,
+        mockAddItem,
+      ),
+    );
+
+    await waitFor(() => {
+      expect(result.current.providerUpdateRequest?.entries).toHaveLength(2);
+    });
+    await result.current.providerUpdateRequest!.onConfirm('update');
+
+    expect(mockSettings.setValue).toHaveBeenCalledWith(
+      expect.anything(),
+      `${PROVIDER_METADATA_NS}.${METADATA_KEY}.version`,
+      chinaVersion,
+    );
+    expect(mockSettings.setValue).toHaveBeenCalledWith(
+      expect.anything(),
+      `${PROVIDER_METADATA_NS}.${TOKEN_METADATA_KEY}.version`,
+      tokenVersion,
+    );
+  });
+
   it.each([
     {
       name: 'on the same protocol',
@@ -444,14 +554,11 @@ describe('useProviderUpdates', () => {
     expect(process.env[CODING_PLAN_ENV_KEY]).toBe('sk-sp-existing-key');
   });
 
-  it('switches model when previous model is no longer available', async () => {
-    let activeModel = 'removed-model';
-    mockConfig.getModel.mockImplementation(() => activeModel);
-    mockModelsConfig.syncAfterAuthRefresh.mockImplementation(
-      (_authType, modelId) => {
-        activeModel = modelId;
-      },
-    );
+  it('leaves the model selection alone when the previous model is gone', async () => {
+    // Template updates do not carry a model-selection intent; even when the
+    // current model is absent from the refreshed list the update must not
+    // adopt the provider's default or touch model.name / model.baseUrl.
+    mockConfig.getModel.mockReturnValue('removed-model');
     (mockSettings.merged[PROVIDER_METADATA_NS] as Record<string, unknown>)[
       METADATA_KEY
     ] = {
@@ -478,18 +585,24 @@ describe('useProviderUpdates', () => {
     await result.current.providerUpdateRequest!.onConfirm('update');
 
     await waitFor(() => {
-      expect(mockSettings.setValue).toHaveBeenCalled();
+      expect(mockConfig.reloadModelProvidersConfig).toHaveBeenCalled();
     });
 
-    expect(mockModelsConfig.syncAfterAuthRefresh).toHaveBeenCalledWith(
-      AuthType.USE_OPENAI,
-      'qwen3.5-plus',
-      undefined,
+    expect(mockModelsConfig.syncAfterAuthRefresh).not.toHaveBeenCalled();
+    expect(mockSettings.setValue).not.toHaveBeenCalledWith(
+      expect.anything(),
+      'model.name',
+      expect.anything(),
+    );
+    expect(mockSettings.setValue).not.toHaveBeenCalledWith(
+      expect.anything(),
+      'model.baseUrl',
+      expect.anything(),
     );
     expect(mockAddItem).toHaveBeenCalledWith(
       {
         type: 'info',
-        text: 'Coding Plan configuration updated successfully. Model switched to "qwen3.5-plus".',
+        text: 'Coding Plan configuration updated successfully.',
       },
       expect.any(Number),
     );

packages/cli/src/ui/hooks/useProviderUpdates.ts

@@ -205,8 +205,9 @@ function findAllPendingUpdates(
     if (!metadata.version) continue;
 
     const baseUrl = metadata.baseUrl || resolveBaseUrl(provider);
-    const currentTemplate = buildProviderTemplate(provider, baseUrl);
-    const currentVersion = computeModelListVersion(currentTemplate);
+    const currentVersion = computeModelListVersion(
+      buildProviderTemplate(provider, baseUrl),
+    );
 
     if (metadata.version === currentVersion) continue;
     if (metadata.ignoredVersion === currentVersion) continue;
@@ -255,9 +256,10 @@ export function useProviderUpdates(
   const migrated = useRef(false);
 
   const executeUpdate = useCallback(
-    async (providerCfg: ProviderConfig, baseUrl?: string) => {
+    async (pending: PendingUpdate) => {
       try {
-        const resolved = resolveBaseUrl(providerCfg, baseUrl);
+        const providerCfg = pending.provider;
+        const resolved = resolveBaseUrl(providerCfg, pending.baseUrl);
         // An update only refreshes built-in models — user-added custom IDs
         // must be carried through so they are not deleted by the
         // prepend-and-remove-owned merge.
@@ -270,7 +272,12 @@ export function useProviderUpdates(
           apiKey: '',
           modelIds: [...defaultIds, ...customIds],
         });
+        installPlan.providerState![
+          `${PROVIDER_METADATA_NS}.${pending.metadataKey}`
+        ]!['version'] = pending.currentVersion;
         delete installPlan.env;
+        // Template updates never change the selected model.
+        delete installPlan.modelSelection;
         const previousModel = config.getModel();
         const activeConfig = config.getContentGeneratorConfig();
         const updatesActiveProvider =
@@ -280,14 +287,6 @@ export function useProviderUpdates(
             activeConfig.baseUrl,
             activeConfig.apiKeyEnvKey,
           );
-        const newConfigs = installPlan.modelProviders?.[0]?.models ?? [];
-        const previousModelStillAvailable = newConfigs.some(
-          (cfg) => cfg.id === previousModel,
-        );
-        // Only the active provider may migrate model selection.
-        if (!updatesActiveProvider || previousModelStillAvailable) {
-          delete installPlan.modelSelection;
-        }
         const settingsAdapter = createLoadedSettingsAdapter(settings);
 
         await applyProviderInstallPlan(installPlan, {
@@ -386,7 +385,7 @@ export function useProviderUpdates(
         setUpdateRequest(undefined);
         if (choice === 'update') {
           for (const p of pendingList) {
-            await executeUpdate(p.provider, p.baseUrl);
+            await executeUpdate(p);
           }
         } else if (choice === 'skip') {
           const persistScope = getPersistScopeForModelSelection(settings);

packages/core/src/providers/__tests__/provider-config.test.ts

@@ -62,8 +62,14 @@ describe('buildInstallPlan', () => {
   });
 
   it('builds a plan with editable models and unknown IDs', () => {
-    const config = makeConfig({ modelsEditable: true });
-    const plan = buildInstallPlan(config, {
+    const config = makeConfig({
+      modelsEditable: true,
+      models: [
+        { id: 'model-a', contextWindowSize: 8192, enableThinking: true },
+        { id: 'model-b' },
+      ],
+    });
+    const plan = buildInstallPlanSrc(config, {
       baseUrl: 'https://api.test.com/v1',
       apiKey: 'sk-test',
       modelIds: ['model-a', 'unknown-model'],
@@ -77,6 +83,9 @@ describe('buildInstallPlan', () => {
       name: '[Test] unknown-model',
     });
     expect(models?.[1]?.generationConfig).toBeUndefined();
+    expect(plan.providerState?.['providerMetadata.test']?.['version']).toBe(
+      computeModelListVersion(models ?? []),
+    );
   });
 
   it('applies advancedConfig to editable unknown model IDs only', () => {
@@ -674,7 +683,9 @@ import {
   getAllProviderBaseUrls as getAllProviderBaseUrlsSrc,
 } from '../all-providers.js';
 import {
+  buildInstallPlan as buildInstallPlanSrc,
   resolveBaseUrl as resolveBaseUrlSrc,
+  resolveMetadataKey as resolveMetadataKeySrc,
   providerMatchesCredentials as providerMatchesCredentialsSrc,
 } from '../provider-config.js';
 
@@ -795,8 +806,6 @@ describe('providerMatchesCredentials with function envKey (custom provider)', ()
   });
 });
 
-import { resolveMetadataKey as resolveMetadataKeySrc } from '../provider-config.js';
-
 describe('customHeaders in ProviderConfig', () => {
   it('merges customHeaders into generationConfig for fixed models', () => {
     const config = makeConfig({

packages/core/src/providers/presets/alibaba-coding-plan.ts

@@ -17,7 +17,6 @@ export const CODING_PLAN_CHINA_BASE_URL =
 export const CODING_PLAN_GLOBAL_BASE_URL =
   'https://coding-intl.dashscope.aliyuncs.com/v1';
 
-// keep in sync with packages/vscode-ide-companion/src/services/subscriptionPlanDefinitions.ts ALIBABA_SUBSCRIPTION_MODELS
 const MODELSTUDIO_MODELS: ModelSpec[] = [
   {
     id: 'qwen3.5-plus',

packages/vscode-ide-companion/src/services/settingsWriter.test.ts

@@ -25,7 +25,11 @@ vi.mock('@qwen-code/qwen-code-core', async (importOriginal) => {
   };
 });
 
-import { AuthType, type ProviderInstallPlan } from '@qwen-code/qwen-code-core';
+import {
+  AuthType,
+  CODING_PLAN_GLOBAL_BASE_URL,
+  type ProviderInstallPlan,
+} from '@qwen-code/qwen-code-core';
 import { CODING_PLAN_ENV_KEY } from './subscriptionPlanDefinitions.js';
 import {
   applyProviderInstallPlanToFile,
@@ -52,6 +56,19 @@ describe('settingsWriter', () => {
     fs.rmSync(tempDir, { recursive: true, force: true });
   });
 
+  it('persists the selected Coding Plan region metadata', () => {
+    writeCodingPlanConfig('global', 'coding-plan-key');
+
+    const settings = JSON.parse(
+      fs.readFileSync(settingsPath, 'utf-8'),
+    ) as Record<string, Record<string, Record<string, unknown>>>;
+
+    expect(settings.providerMetadata?.['coding-plan']).toMatchObject({
+      region: 'global',
+      baseUrl: CODING_PLAN_GLOBAL_BASE_URL,
+    });
+  });
+
   it('clears stale coding plan metadata when writing api-key providers', () => {
     writeCodingPlanConfig('china', 'coding-plan-key');
 

packages/vscode-ide-companion/src/services/settingsWriter.ts

@@ -346,6 +346,7 @@ export function writeCodingPlanConfig(
   const providerMetadata = ensureNestedObject(settings, 'providerMetadata');
   providerMetadata['coding-plan'] = {
     region: codingRegion,
+    baseUrl: planConfig.baseUrl,
     version: planConfig.version,
   };
   delete settings.codingPlan;