abbyswag/qwen-code
1
0
Fork 0
mirror of https://github.com/QwenLM/qwen-code.git synced 2025-12-20 08:47:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix default extension context filename and update docs (#1024)

Browse Source
This commit is contained in:
Tommaso Sciortino
2025-06-13 13:57:00 -07:00
committed by GitHub
parent 1fa41af918
commit 54f0d9d0e5
7 changed files with 125 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
packages/cli/src/config/config.ts
View File

@@ -20,7 +20,7 @@ import {
} from '@gemini-cli/core';
import { Settings } from './settings.js';
import { getEffectiveModel } from '../utils/modelCheck.js';
import { ExtensionConfig } from './extension.js';
import { Extension } from './extension.js';
import * as dotenv from 'dotenv';
import * as fs from 'node:fs';
import * as path from 'node:path';
@@ -132,7 +132,7 @@ export async function loadHierarchicalGeminiMemory(
export async function loadCliConfig(
settings: Settings,
extensions: ExtensionConfig[],
extensions: Extension[],
geminiIgnorePatterns: string[],
sessionId: string,
): Promise<Config> {
@@ -152,9 +152,7 @@ export async function loadCliConfig(
setServerGeminiMdFilename(getCurrentGeminiMdFilename());
}
const extensionContextFilePaths = extensions
.map((e) => e.contextFileName)
.filter((p): p is string => !!p);
const extensionContextFilePaths = extensions.flatMap((e) => e.contextFiles);
// Call the (now wrapper) loadHierarchicalGeminiMemory which calls the server's version
const { memoryContent, fileCount } = await loadHierarchicalGeminiMemory(
@@ -206,18 +204,20 @@ export async function loadCliConfig(
});
}
function mergeMcpServers(settings: Settings, extensions: ExtensionConfig[]) {
function mergeMcpServers(settings: Settings, extensions: Extension[]) {
const mcpServers = settings.mcpServers || {};
for (const extension of extensions) {
Object.entries(extension.mcpServers || {}).forEach(([key, server]) => {
if (mcpServers[key]) {
logger.warn(
`Skipping extension MCP config for server with key "${key}" as it already exists.`,
);
return;
}
mcpServers[key] = server;
});
Object.entries(extension.config.mcpServers || {}).forEach(
([key, server]) => {
if (mcpServers[key]) {
logger.warn(
`Skipping extension MCP config for server with key "${key}" as it already exists.`,
);
return;
}
mcpServers[key] = server;
},
);
}
return mcpServers;
}