scriptoriumadmin/GitNexus
1
0
Fork 0
mirror of https://github.com/abhigyanpatwari/GitNexus.git synced 2026-10-31 06:52:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

fix: isolate CLI provider credentials

Browse source
This commit is contained in:
kapelame 2026-08-05 20:55:11 +08:00
parent 944ab3bec4
commit 3c530d8a98
No known key found for this signature in database
3 changed files with 56 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gitnexus/src/cli/wiki.ts
View file

@ -224,6 +224,13 @@ const wikiCommandImpl = async (inputPath?: string, options?: WikiCommandOptions)
if (options.apiVersion) updates.apiVersion = options.apiVersion;
if (options.reasoningModel !== undefined) updates.isReasoningModel = options.reasoningModel;
const providerChanged = !!options.provider && options.provider !== existing.provider;
if (providerChanged) {
updates.apiKey = undefined;
updates.baseUrl = undefined;
updates.model = undefined;
updates.apiVersion = undefined;
updates.isReasoningModel = undefined;
}
if (options.provider === 'minimax') {
if (providerChanged && options.reasoningModel === undefined) {
updates.isReasoningModel = undefined;
@ -488,7 +495,15 @@ const wikiCommandImpl = async (inputPath?: string, options?: WikiCommandOptions)
}
// Save
await saveCLIConfig({ apiKey: key, baseUrl, model, provider });
await saveCLIConfig({
...savedConfig,
apiKey: key,
baseUrl,
model,
provider,
apiVersion: undefined,
isReasoningModel: undefined,
});
console.log(' Config saved to ~/.gitnexus/config.json\n');
llmConfig = { ...llmConfig, apiKey: key, baseUrl, model, provider };

10
gitnexus/src/core/wiki/llm-client.ts
View file

@ -122,9 +122,9 @@ export async function resolveLLMConfig(overrides?: Partial<LLMConfig>): Promise<
const apiKey =
overrides?.apiKey ||
(savedProvider === 'minimax' ? process.env.MINIMAX_API_KEY : undefined) ||
process.env.GITNEXUS_API_KEY ||
process.env.OPENAI_API_KEY ||
savedConfig.apiKey ||
(savedProvider !== 'minimax' ? process.env.GITNEXUS_API_KEY : undefined) ||
(savedProvider !== 'minimax' ? process.env.OPENAI_API_KEY : undefined) ||
(reuseSavedHttpConfig ? savedConfig.apiKey : undefined) ||
'';
return {
@ -148,7 +148,9 @@ export async function resolveLLMConfig(overrides?: Partial<LLMConfig>): Promise<
temperature: overrides?.temperature ?? 0,
provider: savedProvider,
apiVersion:
overrides?.apiVersion || process.env.GITNEXUS_AZURE_API_VERSION || savedConfig.apiVersion,
overrides?.apiVersion ||
(savedProvider === 'azure' ? process.env.GITNEXUS_AZURE_API_VERSION : undefined) ||
(reuseSavedHttpConfig ? savedConfig.apiVersion : undefined),
isReasoningModel:
overrides?.isReasoningModel ??
(reuseSavedHttpConfig ? savedConfig.isReasoningModel : undefined),

34
gitnexus/test/unit/wiki-llm-client.test.ts
View file

@ -96,6 +96,40 @@ describe('buildRequestUrl', () => {
});
});
describe('resolveLLMConfig provider isolation', () => {
afterEach(() => {
vi.unstubAllEnvs();
vi.restoreAllMocks();
});
it('does not use OpenAI environment credentials for the default MiniMax provider', async () => {
vi.stubEnv('OPENAI_API_KEY', 'openai-key');
vi.stubEnv('GITNEXUS_API_KEY', 'gitnexus-key');
vi.stubEnv('MINIMAX_API_KEY', '');
const config = await resolveLLMConfig();
expect(config.provider).toBe('minimax');
expect(config.apiKey).toBe('');
});
it('does not reuse saved credentials or API versions after switching providers', async () => {
vi.spyOn(await import('../../src/storage/repo-manager.js'), 'loadCLIConfig').mockResolvedValue({
provider: 'minimax',
apiKey: 'minimax-key',
baseUrl: MINIMAX_OPENAI_BASE_URLS.global_en,
model: MINIMAX_MODEL_IDS[0],
apiVersion: 'minimax-version',
});
const config = await resolveLLMConfig({ provider: 'openai' });
expect(config.apiKey).toBe('');
expect(config.apiVersion).toBeUndefined();
expect(config.baseUrl).toBe('https://openrouter.ai/api/v1');
});
});
describe('callLLM — auth header', () => {
afterEach(() => vi.unstubAllGlobals());