Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
123 changes: 123 additions & 0 deletions packages/cli/src/ui/auth/ProviderSetupSteps.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,28 @@ import { renderWithProviders } from '../../test-utils/render.js';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { act } from 'react';
import { AuthType } from '@qwen-code/qwen-code-core';
import type { ModelSpec } from '@qwen-code/qwen-code-core';
import type { KeypressHandler, Key } from '../contexts/KeypressContext.js';
import { useKeypress } from '../hooks/useKeypress.js';
import { ProviderSetupSteps } from './ProviderSetupSteps.js';
import type { ProviderSetupFlow } from './useProviderSetupFlow.js';

type UseKeypressMockOptions = { isActive: boolean };

const discoverProviderModelsMock = vi.hoisted(() => vi.fn());

vi.mock('@qwen-code/qwen-code-core', async (importOriginal) => ({
...(await importOriginal<typeof import('@qwen-code/qwen-code-core')>()),
discoverProviderModels: discoverProviderModelsMock,
}));
vi.mock('../hooks/useKeypress.js');

let activeKeypressHandlers: KeypressHandler[] = [];

describe('ProviderSetupSteps', () => {
beforeEach(() => {
activeKeypressHandlers = [];
discoverProviderModelsMock.mockReset();
vi.mocked(useKeypress).mockImplementation(
(handler: KeypressHandler, options?: UseKeypressMockOptions) => {
if (options?.isActive) {
Expand Down Expand Up @@ -259,6 +267,18 @@ describe('ProviderSetupSteps', () => {
} as unknown as ProviderSetupFlow;
};

const enableDiscovery = (flow: ProviderSetupFlow) => {
if (!flow.state.provider) {
throw new Error('Expected a provider');
}
flow.state.provider = {
...flow.state.provider,
supportsModelDiscovery: true,
};
flow.state.baseUrl = 'https://example.com/v1';
flow.state.apiKey = 'secret-key';
};

it('maps Ctrl+P/N to advanced-config focus navigation', () => {
const flow = createAdvancedConfigFlow();

Expand Down Expand Up @@ -387,4 +407,107 @@ describe('ProviderSetupSteps', () => {
expect(submitModelIds).toHaveBeenCalledTimes(1);
unmount();
});

it('does not mount the model editor before discovery settles', () => {
discoverProviderModelsMock.mockReturnValue(new Promise(() => {}));
const flow = createModelIdsFlow();
enableDiscovery(flow);

const { lastFrame, unmount } = renderWithProviders(
<ProviderSetupSteps flow={flow} />,
);

const frame = lastFrame() ?? '';
expect(frame).toContain('Loading models from provider…');
expect(frame).toContain('Esc to go back');
expect(frame).not.toContain('Enter model IDs directly');
expect(discoverProviderModelsMock).toHaveBeenCalledWith({
baseUrl: 'https://example.com/v1',
apiKey: 'secret-key',
staticModels: flow.state.provider?.models,
signal: expect.any(AbortSignal),
});
unmount();
});

it('mounts one provider snapshot without promoting new models', async () => {
let resolveDiscovery!: (models: ModelSpec[]) => void;
discoverProviderModelsMock.mockReturnValue(
new Promise<ModelSpec[]>((resolve) => {
resolveDiscovery = resolve;
}),
);
const submitModelIds = vi.fn();
const flow = createModelIdsFlow({
modelIds: 'custom-model, MiniMax-M3, MiniMax-M2.7',
submitModelIds,
});
enableDiscovery(flow);
const { lastFrame, unmount } = renderWithProviders(
<ProviderSetupSteps flow={flow} />,
);

await act(async () => {
resolveDiscovery([
{
id: 'MiniMax-M3',
contextWindowSize: 1000000,
modalities: { image: true, video: true },
},
{ id: 'MiniMax-M4' },
{ id: 'custom-model' },
]);
});

const frame = lastFrame() ?? '';
expect(frame).toContain('Recommended models · from the provider');
expect(frame).toContain('custom-model');
expect(frame).toContain('MiniMax-M3');
expect(frame).toContain('MiniMax-M4');
expect(frame).not.toContain('MiniMax-M2.7');
expect(frame).toMatch(/◉\uFE0E\s+MiniMax-M3/);
expect(frame).toMatch(/○\uFE0E\s+MiniMax-M4/);
expect(frame).toMatch(/○\uFE0E\s+custom-model/);
await act(async () => {
pressLatestKey('x', 'x');
});
expect(lastFrame()).toContain('xcustom-model');
expect(flow.changeModelIds).not.toHaveBeenCalled();
pressKey('return', '\r');
expect(submitModelIds).toHaveBeenCalledWith({
modelIds: ['xcustom-model', 'MiniMax-M3'],
});
unmount();
});

it('falls back to built-ins after an unavailable catalog', async () => {
discoverProviderModelsMock.mockResolvedValue(null);
const flow = createModelIdsFlow();
enableDiscovery(flow);

const { lastFrame, unmount } = renderWithProviders(
<ProviderSetupSteps flow={flow} />,
);
await act(async () => {});

const frame = lastFrame() ?? '';
expect(frame).toContain(
'Recommended models · provider list unavailable, showing built-ins',
);
expect(frame).toContain('MiniMax-M2.7');
unmount();
});

it('cancels a pending discovery when the step unmounts', () => {
discoverProviderModelsMock.mockReturnValue(new Promise(() => {}));
const flow = createModelIdsFlow();
enableDiscovery(flow);
const { unmount } = renderWithProviders(<ProviderSetupSteps flow={flow} />);
const signal = discoverProviderModelsMock.mock.calls[0]?.[0]
.signal as AbortSignal;

unmount();

expect(signal.aborted).toBe(true);
});
});
119 changes: 102 additions & 17 deletions packages/cli/src/ui/auth/ProviderSetupSteps.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import type React from 'react';
import { useCallback, useMemo, useState } from 'react';
import { useCallback, useEffect, useMemo, useState } from 'react';
import { Box, Text } from 'ink';
import Link from 'ink-link';
import { DescriptiveRadioButtonSelect } from '../components/shared/DescriptiveRadioButtonSelect.js';
Expand All @@ -14,7 +14,7 @@ import { theme } from '../semantic-colors.js';
import { ICON } from '../constants.js';
import { useKeypress } from '../hooks/useKeypress.js';
import { t } from '../../i18n/index.js';
import { AuthType } from '@qwen-code/qwen-code-core';
import { AuthType, discoverProviderModels } from '@qwen-code/qwen-code-core';
import type {
ProviderConfig,
BaseUrlOption,
Expand Down Expand Up @@ -194,6 +194,8 @@ interface ModelOption {
label: string;
}

type ModelRecommendationSource = 'provider' | 'fallback';

function formatModelOptionLabel(model: ModelSpec): string {
const details: string[] = [];
if (model.contextWindowSize) {
Expand Down Expand Up @@ -240,10 +242,13 @@ function mergeModelIds(
function getRecommendedSelections(
selectedModelIds: string[],
modelOptions: ModelOption[],
builtInModelIds: Set<string>,
): string[] {
const selectedSet = new Set(selectedModelIds);
return modelOptions
.filter((item) => selectedSet.has(item.key))
.filter(
(item) => selectedSet.has(item.key) && builtInModelIds.has(item.key),
)
.map((item) => item.key);
}

Expand All @@ -259,37 +264,44 @@ function getCustomModelIdsText(
function ModelIdsStep({
config,
flow,
models = config.models ?? [],
recommendationSource,
syncChangesToFlow = true,
}: {
config: ProviderConfig;
flow: ProviderSetupFlow;
models?: ModelSpec[];
recommendationSource?: ModelRecommendationSource;
syncChangesToFlow?: boolean;
}): React.JSX.Element {
const defaultIds = config.models?.map((m) => m.id).join(', ') ?? '';
const hasSelectableModels = (config.models?.length ?? 0) > 0;
const hasSelectableModels = models.length > 0;
const selectedModelIds = useMemo(
() => normalizeModelIds(flow.state.modelIds),
[flow.state.modelIds],
);
const modelOptions = useMemo<ModelOption[]>(
() =>
config.models?.map((model) => ({
models.map((model) => ({
key: model.id,
value: model.id,
label: formatModelOptionLabel(model),
})) ?? [],
[config.models],
})),
[models],
);
const recommendedModelIds = useMemo(
() => new Set(modelOptions.map((item) => item.key)),
[modelOptions],
const builtInModelIds = useMemo(
() => new Set(config.models?.map((model) => model.id) ?? []),
[config.models],
);
const [focusedModelIndex, setFocusedModelIndex] = useState(
MODEL_CUSTOM_INPUT_FOCUS_INDEX,
);
const [customModelIdsText, setCustomModelIdsText] = useState(() =>
getCustomModelIdsText(selectedModelIds, recommendedModelIds),
getCustomModelIdsText(selectedModelIds, builtInModelIds),
);
const [selectedRecommendationKeys, setSelectedRecommendationKeys] = useState(
() => getRecommendedSelections(selectedModelIds, modelOptions),
() =>
getRecommendedSelections(selectedModelIds, modelOptions, builtInModelIds),
);
const [modelSearchQuery, setModelSearchQuery] = useState('');
const filteredModelOptions = useMemo(() => {
Expand Down Expand Up @@ -318,11 +330,13 @@ function ModelIdsStep({

const syncModelIds = useCallback(
(customText: string, recommendationKeys: string[]) => {
flow.changeModelIds(
mergeModelIds(customText, recommendationKeys).join(', '),
);
if (syncChangesToFlow) {
flow.changeModelIds(
mergeModelIds(customText, recommendationKeys).join(', '),
);
}
},
[flow],
[flow, syncChangesToFlow],
);

const handleSubmitModelIds = useCallback(() => {
Expand Down Expand Up @@ -440,7 +454,12 @@ function ModelIdsStep({
</Text>
</Box>
<Box marginTop={1}>
<Text color={theme.text.secondary}>{t('Recommended models')}</Text>
<Text color={theme.text.secondary}>
{t('Recommended models')}
{recommendationSource === 'provider' && t(' · from the provider')}
{recommendationSource === 'fallback' &&
t(' · provider list unavailable, showing built-ins')}
</Text>
</Box>
<Box marginTop={0} flexDirection="column">
<Text color={theme.text.secondary}>{t('Search')}</Text>
Expand Down Expand Up @@ -540,6 +559,69 @@ function ModelIdsStep({
);
}

function DiscoveringModelIdsStep({
config,
flow,
}: {
config: ProviderConfig;
flow: ProviderSetupFlow;
}): React.JSX.Element {
const [snapshot, setSnapshot] = useState<{
models: ModelSpec[];
source: ModelRecommendationSource;
} | null>(null);
const baseUrl = flow.state.baseUrl;
const apiKey = flow.state.apiKey;

useEffect(() => {
const controller = new AbortController();
let active = true;
const builtInModels = config.models ?? [];

void discoverProviderModels({
baseUrl,
apiKey,
staticModels: builtInModels,
signal: controller.signal,
}).then((models) => {
if (active) {
setSnapshot({
models: models ?? builtInModels,
source: models ? 'provider' : 'fallback',
});
}
});

return () => {
active = false;
controller.abort();
};
}, [apiKey, baseUrl, config.models]);

if (!snapshot) {
return (
<Box marginTop={1} flexDirection="column">
<Text color={theme.text.secondary}>
{t('Loading models from provider…')}
</Text>
<Box marginTop={1}>
<Text color={theme.text.secondary}>{t('Esc to go back')}</Text>
</Box>
</Box>
);
}

return (
<ModelIdsStep
config={config}
flow={flow}
models={snapshot.models}
recommendationSource={snapshot.source}
syncChangesToFlow={false}
/>
);
}

// ---------------------------------------------------------------------------
// Step: Advanced config
// ---------------------------------------------------------------------------
Expand Down Expand Up @@ -794,6 +876,9 @@ export function ProviderSetupSteps({
return <ApiKeyStep config={provider} flow={flow} />;

case 'models':
if (provider.supportsModelDiscovery) {
return <DiscoveringModelIdsStep config={provider} flow={flow} />;
}
return <ModelIdsStep config={provider} flow={flow} />;

case 'advancedConfig':
Expand Down
Loading
Loading