@google/gemini-cli-core 0.1.0-development.2 → 0.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/google-gemini-cli-core-0.1.0.tgz +0 -0
- package/dist/google-gemini-cli-core-0.1.1.tgz +0 -0
- package/dist/google-gemini-cli-core-0.1.2.tgz +0 -0
- package/dist/src/code_assist/codeAssist.d.ts +1 -1
- package/dist/src/code_assist/codeAssist.js +5 -5
- package/dist/src/code_assist/codeAssist.js.map +1 -1
- package/dist/src/code_assist/converter.d.ts +1 -2
- package/dist/src/code_assist/converter.js +3 -4
- package/dist/src/code_assist/converter.js.map +1 -1
- package/dist/src/code_assist/converter.test.js +0 -24
- package/dist/src/code_assist/converter.test.js.map +1 -1
- package/dist/src/code_assist/oauth2.d.ts +1 -9
- package/dist/src/code_assist/oauth2.js +5 -115
- package/dist/src/code_assist/oauth2.js.map +1 -1
- package/dist/src/code_assist/oauth2.test.js +10 -102
- package/dist/src/code_assist/oauth2.test.js.map +1 -1
- package/dist/src/code_assist/server.d.ts +8 -13
- package/dist/src/code_assist/server.js +17 -41
- package/dist/src/code_assist/server.js.map +1 -1
- package/dist/src/code_assist/server.test.js +21 -21
- package/dist/src/code_assist/server.test.js.map +1 -1
- package/dist/src/code_assist/setup.d.ts +1 -4
- package/dist/src/code_assist/setup.js +20 -39
- package/dist/src/code_assist/setup.js.map +1 -1
- package/dist/src/code_assist/types.d.ts +1 -9
- package/dist/src/code_assist/types.js +1 -1
- package/dist/src/config/config.d.ts +2 -10
- package/dist/src/config/config.js +58 -72
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +0 -25
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/core/client.d.ts +3 -3
- package/dist/src/core/client.js +62 -56
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.js +5 -304
- package/dist/src/core/client.test.js.map +1 -1
- package/dist/src/core/contentGenerator.d.ts +7 -5
- package/dist/src/core/contentGenerator.js +16 -11
- package/dist/src/core/contentGenerator.js.map +1 -1
- package/dist/src/core/contentGenerator.test.js +1 -1
- package/dist/src/core/contentGenerator.test.js.map +1 -1
- package/dist/src/core/coreToolScheduler.d.ts +2 -9
- package/dist/src/core/coreToolScheduler.js +2 -28
- package/dist/src/core/coreToolScheduler.js.map +1 -1
- package/dist/src/core/coreToolScheduler.test.js +2 -79
- package/dist/src/core/coreToolScheduler.test.js.map +1 -1
- package/dist/src/core/geminiChat.d.ts +2 -1
- package/dist/src/core/geminiChat.js +19 -24
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/geminiChat.test.js +16 -18
- package/dist/src/core/geminiChat.test.js.map +1 -1
- package/dist/src/core/logger.d.ts +4 -3
- package/dist/src/core/logger.js +12 -8
- package/dist/src/core/logger.js.map +1 -1
- package/dist/src/core/logger.test.js +15 -6
- package/dist/src/core/logger.test.js.map +1 -1
- package/dist/src/core/prompts.d.ts +0 -6
- package/dist/src/core/prompts.js +9 -73
- package/dist/src/core/prompts.js.map +1 -1
- package/dist/src/core/turn.d.ts +11 -2
- package/dist/src/core/turn.js +19 -1
- package/dist/src/core/turn.js.map +1 -1
- package/dist/src/core/turn.test.js +45 -0
- package/dist/src/core/turn.test.js.map +1 -1
- package/dist/src/index.d.ts +0 -2
- package/dist/src/index.js +0 -2
- package/dist/src/index.js.map +1 -1
- package/dist/src/services/fileDiscoveryService.d.ts +0 -4
- package/dist/src/services/fileDiscoveryService.js +0 -13
- package/dist/src/services/fileDiscoveryService.js.map +1 -1
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js +16 -45
- package/dist/src/telemetry/clearcut-logger/clearcut-logger.js.map +1 -1
- package/dist/src/telemetry/index.d.ts +0 -1
- package/dist/src/telemetry/index.js +0 -1
- package/dist/src/telemetry/index.js.map +1 -1
- package/dist/src/telemetry/loggers.js +0 -19
- package/dist/src/telemetry/loggers.js.map +1 -1
- package/dist/src/telemetry/loggers.test.js +0 -41
- package/dist/src/telemetry/loggers.test.js.map +1 -1
- package/dist/src/telemetry/types.d.ts +0 -1
- package/dist/src/telemetry/types.js +0 -2
- package/dist/src/telemetry/types.js.map +1 -1
- package/dist/src/tools/edit.d.ts +2 -5
- package/dist/src/tools/edit.js +10 -17
- package/dist/src/tools/edit.js.map +1 -1
- package/dist/src/tools/edit.test.js +12 -48
- package/dist/src/tools/edit.test.js.map +1 -1
- package/dist/src/tools/glob.d.ts +1 -5
- package/dist/src/tools/glob.js +1 -5
- package/dist/src/tools/glob.js.map +1 -1
- package/dist/src/tools/grep.js +2 -4
- package/dist/src/tools/grep.js.map +1 -1
- package/dist/src/tools/grep.test.js +10 -10
- package/dist/src/tools/grep.test.js.map +1 -1
- package/dist/src/tools/mcp-client.d.ts +2 -0
- package/dist/src/tools/mcp-client.js +25 -38
- package/dist/src/tools/mcp-client.js.map +1 -1
- package/dist/src/tools/mcp-client.test.js +14 -170
- package/dist/src/tools/mcp-client.test.js.map +1 -1
- package/dist/src/tools/modifiable-tool.js +4 -5
- package/dist/src/tools/modifiable-tool.js.map +1 -1
- package/dist/src/tools/modifiable-tool.test.js +3 -16
- package/dist/src/tools/modifiable-tool.test.js.map +1 -1
- package/dist/src/tools/read-file.js +2 -1
- package/dist/src/tools/read-file.js.map +1 -1
- package/dist/src/tools/read-many-files.js +1 -1
- package/dist/src/tools/read-many-files.test.js +2 -27
- package/dist/src/tools/read-many-files.test.js.map +1 -1
- package/dist/src/tools/shell.d.ts +0 -20
- package/dist/src/tools/shell.js +22 -128
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/shell.json +18 -0
- package/dist/src/tools/shell.md +16 -0
- package/dist/src/tools/tool-registry.d.ts +2 -16
- package/dist/src/tools/tool-registry.js +19 -150
- package/dist/src/tools/tool-registry.js.map +1 -1
- package/dist/src/tools/tool-registry.test.js +73 -184
- package/dist/src/tools/tool-registry.test.js.map +1 -1
- package/dist/src/tools/tools.d.ts +1 -4
- package/dist/src/tools/tools.js.map +1 -1
- package/dist/src/tools/web-fetch.js.map +1 -1
- package/dist/src/tools/web-search.d.ts +1 -6
- package/dist/src/tools/web-search.js +2 -7
- package/dist/src/tools/web-search.js.map +1 -1
- package/dist/src/tools/write-file.d.ts +1 -11
- package/dist/src/tools/write-file.js +10 -23
- package/dist/src/tools/write-file.js.map +1 -1
- package/dist/src/tools/write-file.test.js +4 -39
- package/dist/src/tools/write-file.test.js.map +1 -1
- package/dist/src/utils/editCorrector.d.ts +1 -1
- package/dist/src/utils/editCorrector.js +2 -106
- package/dist/src/utils/editCorrector.js.map +1 -1
- package/dist/src/utils/editCorrector.test.js +19 -65
- package/dist/src/utils/editCorrector.test.js.map +1 -1
- package/dist/src/utils/editor.d.ts +2 -2
- package/dist/src/utils/editor.js +7 -20
- package/dist/src/utils/editor.js.map +1 -1
- package/dist/src/utils/editor.test.js +27 -60
- package/dist/src/utils/editor.test.js.map +1 -1
- package/dist/src/utils/fileUtils.d.ts +2 -2
- package/dist/src/utils/fileUtils.js +8 -47
- package/dist/src/utils/fileUtils.js.map +1 -1
- package/dist/src/utils/fileUtils.test.js +0 -39
- package/dist/src/utils/fileUtils.test.js.map +1 -1
- package/dist/src/utils/flashFallback.integration.test.js +9 -8
- package/dist/src/utils/flashFallback.integration.test.js.map +1 -1
- package/dist/src/utils/memoryDiscovery.js +2 -5
- package/dist/src/utils/memoryDiscovery.js.map +1 -1
- package/dist/src/utils/messageInspectors.d.ts +0 -1
- package/dist/src/utils/messageInspectors.js +0 -5
- package/dist/src/utils/messageInspectors.js.map +1 -1
- package/dist/src/utils/nextSpeakerChecker.js +1 -1
- package/dist/src/utils/nextSpeakerChecker.js.map +1 -1
- package/dist/src/utils/nextSpeakerChecker.test.js +1 -0
- package/dist/src/utils/nextSpeakerChecker.test.js.map +1 -1
- package/dist/src/utils/retry.js +21 -21
- package/dist/src/utils/retry.js.map +1 -1
- package/dist/src/utils/retry.test.js +26 -2
- package/dist/src/utils/retry.test.js.map +1 -1
- package/dist/src/utils/user_id.d.ts +3 -9
- package/dist/src/utils/user_id.js +16 -37
- package/dist/src/utils/user_id.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +13 -12
- package/LICENSE +0 -202
- package/README.md +0 -156
- package/dist/src/telemetry/uiTelemetry.d.ts +0 -67
- package/dist/src/telemetry/uiTelemetry.js +0 -131
- package/dist/src/telemetry/uiTelemetry.js.map +0 -1
- package/dist/src/telemetry/uiTelemetry.test.d.ts +0 -6
- package/dist/src/telemetry/uiTelemetry.test.js +0 -411
- package/dist/src/telemetry/uiTelemetry.test.js.map +0 -1
- package/dist/src/tools/shell.test.d.ts +0 -6
- package/dist/src/tools/shell.test.js +0 -321
- package/dist/src/tools/shell.test.js.map +0 -1
- package/dist/src/utils/memoryImportProcessor.d.ts +0 -35
- package/dist/src/utils/memoryImportProcessor.js +0 -141
- package/dist/src/utils/memoryImportProcessor.js.map +0 -1
- package/dist/src/utils/memoryImportProcessor.test.d.ts +0 -6
- package/dist/src/utils/memoryImportProcessor.test.js +0 -170
- package/dist/src/utils/memoryImportProcessor.test.js.map +0 -1
- package/dist/src/utils/user_id.test.d.ts +0 -6
- package/dist/src/utils/user_id.test.js +0 -42
- package/dist/src/utils/user_id.test.js.map +0 -1
|
@@ -16,12 +16,12 @@ import { ShellTool } from '../tools/shell.js';
|
|
|
16
16
|
import { WriteFileTool } from '../tools/write-file.js';
|
|
17
17
|
import { WebFetchTool } from '../tools/web-fetch.js';
|
|
18
18
|
import { ReadManyFilesTool } from '../tools/read-many-files.js';
|
|
19
|
-
import { MemoryTool, setGeminiMdFilename
|
|
19
|
+
import { MemoryTool, setGeminiMdFilename } from '../tools/memoryTool.js';
|
|
20
20
|
import { WebSearchTool } from '../tools/web-search.js';
|
|
21
21
|
import { GeminiClient } from '../core/client.js';
|
|
22
|
+
import { GEMINI_CONFIG_DIR as GEMINI_DIR } from '../tools/memoryTool.js';
|
|
22
23
|
import { FileDiscoveryService } from '../services/fileDiscoveryService.js';
|
|
23
24
|
import { GitService } from '../services/gitService.js';
|
|
24
|
-
import { loadServerHierarchicalMemory } from '../utils/memoryDiscovery.js';
|
|
25
25
|
import { getProjectTempDir } from '../utils/paths.js';
|
|
26
26
|
import { initializeTelemetry, DEFAULT_TELEMETRY_TARGET, DEFAULT_OTLP_ENDPOINT, StartSessionEvent, } from '../telemetry/index.js';
|
|
27
27
|
import { DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_GEMINI_FLASH_MODEL, } from './models.js';
|
|
@@ -39,39 +39,33 @@ export class MCPServerConfig {
|
|
|
39
39
|
cwd;
|
|
40
40
|
url;
|
|
41
41
|
httpUrl;
|
|
42
|
-
headers;
|
|
43
42
|
tcp;
|
|
44
43
|
timeout;
|
|
45
44
|
trust;
|
|
46
45
|
description;
|
|
47
|
-
includeTools;
|
|
48
|
-
excludeTools;
|
|
49
46
|
constructor(
|
|
50
47
|
// For stdio transport
|
|
51
48
|
command, args, env, cwd,
|
|
52
49
|
// For sse transport
|
|
53
50
|
url,
|
|
54
51
|
// For streamable http transport
|
|
55
|
-
httpUrl,
|
|
52
|
+
httpUrl,
|
|
56
53
|
// For websocket transport
|
|
57
54
|
tcp,
|
|
58
55
|
// Common
|
|
59
56
|
timeout, trust,
|
|
60
57
|
// Metadata
|
|
61
|
-
description
|
|
58
|
+
description) {
|
|
62
59
|
this.command = command;
|
|
63
60
|
this.args = args;
|
|
64
61
|
this.env = env;
|
|
65
62
|
this.cwd = cwd;
|
|
66
63
|
this.url = url;
|
|
67
64
|
this.httpUrl = httpUrl;
|
|
68
|
-
this.headers = headers;
|
|
69
65
|
this.tcp = tcp;
|
|
70
66
|
this.timeout = timeout;
|
|
71
67
|
this.trust = trust;
|
|
72
68
|
this.description = description;
|
|
73
|
-
this.includeTools = includeTools;
|
|
74
|
-
this.excludeTools = excludeTools;
|
|
75
69
|
}
|
|
76
70
|
}
|
|
77
71
|
export class Config {
|
|
@@ -160,25 +154,26 @@ export class Config {
|
|
|
160
154
|
console.log('Data collection is disabled.');
|
|
161
155
|
}
|
|
162
156
|
}
|
|
163
|
-
async initialize() {
|
|
164
|
-
// Initialize centralized FileDiscoveryService
|
|
165
|
-
this.getFileService();
|
|
166
|
-
if (this.getCheckpointingEnabled()) {
|
|
167
|
-
try {
|
|
168
|
-
await this.getGitService();
|
|
169
|
-
}
|
|
170
|
-
catch {
|
|
171
|
-
// For now swallow the error, later log it.
|
|
172
|
-
}
|
|
173
|
-
}
|
|
174
|
-
this.toolRegistry = await this.createToolRegistry();
|
|
175
|
-
}
|
|
176
157
|
async refreshAuth(authMethod) {
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
158
|
+
// Check if this is actually a switch to a different auth method
|
|
159
|
+
const previousAuthType = this.contentGeneratorConfig?.authType;
|
|
160
|
+
const _isAuthMethodSwitch = previousAuthType && previousAuthType !== authMethod;
|
|
161
|
+
// Always use the original default model when switching auth methods
|
|
162
|
+
// This ensures users don't stay on Flash after switching between auth types
|
|
163
|
+
// and allows API key users to get proper fallback behavior from getEffectiveModel
|
|
164
|
+
const modelToUse = this.model; // Use the original default model
|
|
165
|
+
// Temporarily clear contentGeneratorConfig to prevent getModel() from returning
|
|
166
|
+
// the previous session's model (which might be Flash)
|
|
167
|
+
this.contentGeneratorConfig = undefined;
|
|
168
|
+
const contentConfig = await createContentGeneratorConfig(modelToUse, authMethod, this);
|
|
169
|
+
const gc = new GeminiClient(this);
|
|
170
|
+
this.geminiClient = gc;
|
|
171
|
+
this.toolRegistry = await createToolRegistry(this);
|
|
172
|
+
await gc.initialize(contentConfig);
|
|
173
|
+
this.contentGeneratorConfig = contentConfig;
|
|
180
174
|
// Reset the session flag since we're explicitly changing auth and using default model
|
|
181
175
|
this.modelSwitchedDuringSession = false;
|
|
176
|
+
// Note: In the future, we may want to reset any cached state when switching auth methods
|
|
182
177
|
}
|
|
183
178
|
getSessionId() {
|
|
184
179
|
return this.sessionId;
|
|
@@ -331,54 +326,45 @@ export class Config {
|
|
|
331
326
|
}
|
|
332
327
|
return this.gitService;
|
|
333
328
|
}
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
registerCoreTool(GrepTool, targetDir);
|
|
371
|
-
registerCoreTool(GlobTool, targetDir, this);
|
|
372
|
-
registerCoreTool(EditTool, this);
|
|
373
|
-
registerCoreTool(WriteFileTool, this);
|
|
374
|
-
registerCoreTool(WebFetchTool, this);
|
|
375
|
-
registerCoreTool(ReadManyFilesTool, targetDir, this);
|
|
376
|
-
registerCoreTool(ShellTool, this);
|
|
377
|
-
registerCoreTool(MemoryTool);
|
|
378
|
-
registerCoreTool(WebSearchTool, this);
|
|
329
|
+
}
|
|
330
|
+
export function createToolRegistry(config) {
|
|
331
|
+
const registry = new ToolRegistry(config);
|
|
332
|
+
const targetDir = config.getTargetDir();
|
|
333
|
+
const tools = config.getCoreTools()
|
|
334
|
+
? new Set(config.getCoreTools())
|
|
335
|
+
: undefined;
|
|
336
|
+
const excludeTools = config.getExcludeTools()
|
|
337
|
+
? new Set(config.getExcludeTools())
|
|
338
|
+
: undefined;
|
|
339
|
+
// helper to create & register core tools that are enabled
|
|
340
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
341
|
+
const registerCoreTool = (ToolClass, ...args) => {
|
|
342
|
+
// check both the tool name (.Name) and the class name (.name)
|
|
343
|
+
if (
|
|
344
|
+
// coreTools contain tool name
|
|
345
|
+
(!tools || tools.has(ToolClass.Name) || tools.has(ToolClass.name)) &&
|
|
346
|
+
// excludeTools don't contain tool name
|
|
347
|
+
(!excludeTools ||
|
|
348
|
+
(!excludeTools.has(ToolClass.Name) &&
|
|
349
|
+
!excludeTools.has(ToolClass.name)))) {
|
|
350
|
+
registry.registerTool(new ToolClass(...args));
|
|
351
|
+
}
|
|
352
|
+
};
|
|
353
|
+
registerCoreTool(LSTool, targetDir, config);
|
|
354
|
+
registerCoreTool(ReadFileTool, targetDir, config);
|
|
355
|
+
registerCoreTool(GrepTool, targetDir);
|
|
356
|
+
registerCoreTool(GlobTool, targetDir, config);
|
|
357
|
+
registerCoreTool(EditTool, config);
|
|
358
|
+
registerCoreTool(WriteFileTool, config);
|
|
359
|
+
registerCoreTool(WebFetchTool, config);
|
|
360
|
+
registerCoreTool(ReadManyFilesTool, targetDir, config);
|
|
361
|
+
registerCoreTool(ShellTool, config);
|
|
362
|
+
registerCoreTool(MemoryTool);
|
|
363
|
+
registerCoreTool(WebSearchTool, config);
|
|
364
|
+
return (async () => {
|
|
379
365
|
await registry.discoverTools();
|
|
380
366
|
return registry;
|
|
381
|
-
}
|
|
367
|
+
})();
|
|
382
368
|
}
|
|
383
369
|
// Export model constants for use in CLI
|
|
384
370
|
export { DEFAULT_GEMINI_FLASH_MODEL };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/config/config.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/config/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,6 @@ import { Config } from './config.js';
|
|
|
8
8
|
import * as path from 'path';
|
|
9
9
|
import { setGeminiMdFilename as mockSetGeminiMdFilename } from '../tools/memoryTool.js';
|
|
10
10
|
import { DEFAULT_TELEMETRY_TARGET, DEFAULT_OTLP_ENDPOINT, } from '../telemetry/index.js';
|
|
11
|
-
import { loadServerHierarchicalMemory } from '../utils/memoryDiscovery.js';
|
|
12
11
|
// Mock dependencies that might be called during Config construction or createServerConfig
|
|
13
12
|
vi.mock('../tools/tool-registry', () => {
|
|
14
13
|
const ToolRegistryMock = vi.fn();
|
|
@@ -19,9 +18,6 @@ vi.mock('../tools/tool-registry', () => {
|
|
|
19
18
|
ToolRegistryMock.prototype.getFunctionDeclarations = vi.fn(() => []);
|
|
20
19
|
return { ToolRegistry: ToolRegistryMock };
|
|
21
20
|
});
|
|
22
|
-
vi.mock('../utils/memoryDiscovery.js', () => ({
|
|
23
|
-
loadServerHierarchicalMemory: vi.fn(),
|
|
24
|
-
}));
|
|
25
21
|
// Mock individual tools if their constructors are complex or have side effects
|
|
26
22
|
vi.mock('../tools/ls');
|
|
27
23
|
vi.mock('../tools/read-file');
|
|
@@ -238,26 +234,5 @@ describe('Server Config (config.ts)', () => {
|
|
|
238
234
|
expect(config.getTelemetryOtlpEndpoint()).toBe(DEFAULT_OTLP_ENDPOINT);
|
|
239
235
|
});
|
|
240
236
|
});
|
|
241
|
-
describe('refreshMemory', () => {
|
|
242
|
-
it('should update memory and file count on successful refresh', async () => {
|
|
243
|
-
const config = new Config(baseParams);
|
|
244
|
-
const mockMemoryData = {
|
|
245
|
-
memoryContent: 'new memory content',
|
|
246
|
-
fileCount: 5,
|
|
247
|
-
};
|
|
248
|
-
loadServerHierarchicalMemory.mockResolvedValue(mockMemoryData);
|
|
249
|
-
const result = await config.refreshMemory();
|
|
250
|
-
expect(loadServerHierarchicalMemory).toHaveBeenCalledWith(config.getWorkingDir(), config.getDebugMode(), config.getFileService(), config.getExtensionContextFilePaths());
|
|
251
|
-
expect(config.getUserMemory()).toBe(mockMemoryData.memoryContent);
|
|
252
|
-
expect(config.getGeminiMdFileCount()).toBe(mockMemoryData.fileCount);
|
|
253
|
-
expect(result).toEqual(mockMemoryData);
|
|
254
|
-
});
|
|
255
|
-
it('should propagate errors from loadServerHierarchicalMemory', async () => {
|
|
256
|
-
const config = new Config(baseParams);
|
|
257
|
-
const testError = new Error('Failed to load memory');
|
|
258
|
-
loadServerHierarchicalMemory.mockRejectedValue(testError);
|
|
259
|
-
await expect(config.refreshMemory()).rejects.toThrow(testError);
|
|
260
|
-
});
|
|
261
|
-
});
|
|
262
237
|
});
|
|
263
238
|
//# sourceMappingURL=config.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.test.js","sourceRoot":"","sources":["../../../src/config/config.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"config.test.js","sourceRoot":"","sources":["../../../src/config/config.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,18 +7,18 @@ import { GenerateContentConfig, SchemaUnion, PartListUnion, Content, GenerateCon
|
|
|
7
7
|
import { Turn, ServerGeminiStreamEvent, ChatCompressionInfo } from './turn.js';
|
|
8
8
|
import { Config } from '../config/config.js';
|
|
9
9
|
import { GeminiChat } from './geminiChat.js';
|
|
10
|
-
import {
|
|
10
|
+
import { ContentGeneratorConfig } from './contentGenerator.js';
|
|
11
11
|
export declare class GeminiClient {
|
|
12
12
|
private config;
|
|
13
13
|
private chat?;
|
|
14
14
|
private contentGenerator?;
|
|
15
|
+
private model;
|
|
15
16
|
private embeddingModel;
|
|
16
17
|
private generateContentConfig;
|
|
17
18
|
private readonly MAX_TURNS;
|
|
18
|
-
private readonly TOKEN_THRESHOLD_FOR_SUMMARIZATION;
|
|
19
19
|
constructor(config: Config);
|
|
20
20
|
initialize(contentGeneratorConfig: ContentGeneratorConfig): Promise<void>;
|
|
21
|
-
getContentGenerator
|
|
21
|
+
private getContentGenerator;
|
|
22
22
|
addHistory(content: Content): Promise<void>;
|
|
23
23
|
getChat(): GeminiChat;
|
|
24
24
|
getHistory(): Promise<Content[]>;
|
package/dist/src/core/client.js
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { getFolderStructure } from '../utils/getFolderStructure.js';
|
|
7
7
|
import { Turn, GeminiEventType, } from './turn.js';
|
|
8
|
-
import { getCoreSystemPrompt
|
|
8
|
+
import { getCoreSystemPrompt } from './prompts.js';
|
|
9
9
|
import { getResponseText } from '../utils/generateContentResponseUtilities.js';
|
|
10
10
|
import { checkNextSpeaker } from '../utils/nextSpeakerChecker.js';
|
|
11
11
|
import { reportError } from '../utils/errorReporting.js';
|
|
@@ -13,9 +13,10 @@ import { GeminiChat } from './geminiChat.js';
|
|
|
13
13
|
import { retryWithBackoff } from '../utils/retry.js';
|
|
14
14
|
import { getErrorMessage } from '../utils/errors.js';
|
|
15
15
|
import { tokenLimit } from './tokenLimits.js';
|
|
16
|
-
import {
|
|
16
|
+
import { createContentGenerator, } from './contentGenerator.js';
|
|
17
17
|
import { ProxyAgent, setGlobalDispatcher } from 'undici';
|
|
18
18
|
import { DEFAULT_GEMINI_FLASH_MODEL } from '../config/models.js';
|
|
19
|
+
import { AuthType } from './contentGenerator.js';
|
|
19
20
|
function isThinkingSupported(model) {
|
|
20
21
|
if (model.startsWith('gemini-2.5'))
|
|
21
22
|
return true;
|
|
@@ -25,22 +26,23 @@ export class GeminiClient {
|
|
|
25
26
|
config;
|
|
26
27
|
chat;
|
|
27
28
|
contentGenerator;
|
|
29
|
+
model;
|
|
28
30
|
embeddingModel;
|
|
29
31
|
generateContentConfig = {
|
|
30
32
|
temperature: 0,
|
|
31
33
|
topP: 1,
|
|
32
34
|
};
|
|
33
35
|
MAX_TURNS = 100;
|
|
34
|
-
TOKEN_THRESHOLD_FOR_SUMMARIZATION = 0.7;
|
|
35
36
|
constructor(config) {
|
|
36
37
|
this.config = config;
|
|
37
38
|
if (config.getProxy()) {
|
|
38
39
|
setGlobalDispatcher(new ProxyAgent(config.getProxy()));
|
|
39
40
|
}
|
|
41
|
+
this.model = config.getModel();
|
|
40
42
|
this.embeddingModel = config.getEmbeddingModel();
|
|
41
43
|
}
|
|
42
44
|
async initialize(contentGeneratorConfig) {
|
|
43
|
-
this.contentGenerator = await createContentGenerator(contentGeneratorConfig
|
|
45
|
+
this.contentGenerator = await createContentGenerator(contentGeneratorConfig);
|
|
44
46
|
this.chat = await this.startChat();
|
|
45
47
|
}
|
|
46
48
|
getContentGenerator() {
|
|
@@ -66,6 +68,7 @@ export class GeminiClient {
|
|
|
66
68
|
}
|
|
67
69
|
async resetChat() {
|
|
68
70
|
this.chat = await this.startChat();
|
|
71
|
+
await this.chat;
|
|
69
72
|
}
|
|
70
73
|
async getEnvironment() {
|
|
71
74
|
const cwd = this.config.getWorkingDir();
|
|
@@ -80,8 +83,8 @@ export class GeminiClient {
|
|
|
80
83
|
fileService: this.config.getFileService(),
|
|
81
84
|
});
|
|
82
85
|
const context = `
|
|
83
|
-
|
|
84
|
-
Today
|
|
86
|
+
Okay, just setting up the context for our chat.
|
|
87
|
+
Today is ${today}.
|
|
85
88
|
My operating system is: ${platform}
|
|
86
89
|
I'm currently working in the directory: ${cwd}
|
|
87
90
|
${folderStructure}
|
|
@@ -126,7 +129,7 @@ export class GeminiClient {
|
|
|
126
129
|
const toolRegistry = await this.config.getToolRegistry();
|
|
127
130
|
const toolDeclarations = toolRegistry.getFunctionDeclarations();
|
|
128
131
|
const tools = [{ functionDeclarations: toolDeclarations }];
|
|
129
|
-
const
|
|
132
|
+
const initialHistory = [
|
|
130
133
|
{
|
|
131
134
|
role: 'user',
|
|
132
135
|
parts: envParts,
|
|
@@ -135,12 +138,12 @@ export class GeminiClient {
|
|
|
135
138
|
role: 'model',
|
|
136
139
|
parts: [{ text: 'Got it. Thanks for the context!' }],
|
|
137
140
|
},
|
|
138
|
-
...(extraHistory ?? []),
|
|
139
141
|
];
|
|
142
|
+
const history = initialHistory.concat(extraHistory ?? []);
|
|
140
143
|
try {
|
|
141
144
|
const userMemory = this.config.getUserMemory();
|
|
142
145
|
const systemInstruction = getCoreSystemPrompt(userMemory);
|
|
143
|
-
const generateContentConfigWithThinking = isThinkingSupported(this.
|
|
146
|
+
const generateContentConfigWithThinking = isThinkingSupported(this.model)
|
|
144
147
|
? {
|
|
145
148
|
...this.generateContentConfig,
|
|
146
149
|
thinkingConfig: {
|
|
@@ -148,7 +151,7 @@ export class GeminiClient {
|
|
|
148
151
|
},
|
|
149
152
|
}
|
|
150
153
|
: this.generateContentConfig;
|
|
151
|
-
return new GeminiChat(this.config, this.getContentGenerator(), {
|
|
154
|
+
return new GeminiChat(this.config, this.getContentGenerator(), this.model, {
|
|
152
155
|
systemInstruction,
|
|
153
156
|
...generateContentConfigWithThinking,
|
|
154
157
|
tools,
|
|
@@ -160,9 +163,7 @@ export class GeminiClient {
|
|
|
160
163
|
}
|
|
161
164
|
}
|
|
162
165
|
async *sendMessageStream(request, signal, turns = this.MAX_TURNS) {
|
|
163
|
-
|
|
164
|
-
const boundedTurns = Math.min(turns, this.MAX_TURNS);
|
|
165
|
-
if (!boundedTurns) {
|
|
166
|
+
if (!turns) {
|
|
166
167
|
return new Turn(this.getChat());
|
|
167
168
|
}
|
|
168
169
|
const compressed = await this.tryCompressChat();
|
|
@@ -180,7 +181,7 @@ export class GeminiClient {
|
|
|
180
181
|
const nextRequest = [{ text: 'Please continue.' }];
|
|
181
182
|
// This recursive call's events will be yielded out, but the final
|
|
182
183
|
// turn object will be from the top-level call.
|
|
183
|
-
yield* this.sendMessageStream(nextRequest, signal,
|
|
184
|
+
yield* this.sendMessageStream(nextRequest, signal, turns - 1);
|
|
184
185
|
}
|
|
185
186
|
}
|
|
186
187
|
return turn;
|
|
@@ -239,7 +240,7 @@ export class GeminiClient {
|
|
|
239
240
|
}
|
|
240
241
|
}
|
|
241
242
|
async generateContent(contents, generationConfig, abortSignal) {
|
|
242
|
-
const modelToUse = this.
|
|
243
|
+
const modelToUse = this.model;
|
|
243
244
|
const configToUse = {
|
|
244
245
|
...this.generateContentConfig,
|
|
245
246
|
...generationConfig,
|
|
@@ -299,57 +300,60 @@ export class GeminiClient {
|
|
|
299
300
|
});
|
|
300
301
|
}
|
|
301
302
|
async tryCompressChat(force = false) {
|
|
302
|
-
const
|
|
303
|
+
const history = this.getChat().getHistory(true); // Get curated history
|
|
303
304
|
// Regardless of `force`, don't do anything if the history is empty.
|
|
304
|
-
if (
|
|
305
|
+
if (history.length === 0) {
|
|
305
306
|
return null;
|
|
306
307
|
}
|
|
307
|
-
const
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
contents: curatedHistory,
|
|
308
|
+
const { totalTokens: originalTokenCount } = await this.getContentGenerator().countTokens({
|
|
309
|
+
model: this.model,
|
|
310
|
+
contents: history,
|
|
311
311
|
});
|
|
312
|
-
if
|
|
313
|
-
|
|
314
|
-
originalTokenCount
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
312
|
+
// If not forced, check if we should compress based on context size.
|
|
313
|
+
if (!force) {
|
|
314
|
+
if (originalTokenCount === undefined) {
|
|
315
|
+
// If token count is undefined, we can't determine if we need to compress.
|
|
316
|
+
console.warn(`Could not determine token count for model ${this.model}. Skipping compression check.`);
|
|
317
|
+
return null;
|
|
318
|
+
}
|
|
319
|
+
const tokenCount = originalTokenCount; // Now guaranteed to be a number
|
|
320
|
+
const limit = tokenLimit(this.model);
|
|
321
|
+
if (!limit) {
|
|
322
|
+
// If no limit is defined for the model, we can't compress.
|
|
323
|
+
console.warn(`No token limit defined for model ${this.model}. Skipping compression check.`);
|
|
324
|
+
return null;
|
|
325
|
+
}
|
|
326
|
+
if (tokenCount < 0.95 * limit) {
|
|
327
|
+
return null;
|
|
328
|
+
}
|
|
321
329
|
}
|
|
322
|
-
const
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
systemInstruction: { text: getCompressionPrompt() },
|
|
328
|
-
},
|
|
330
|
+
const summarizationRequestMessage = {
|
|
331
|
+
text: 'Summarize our conversation up to this point. The summary should be a concise yet comprehensive overview of all key topics, questions, answers, and important details discussed. This summary will replace the current chat history to conserve tokens, so it must capture everything essential to understand the context and continue our conversation effectively as if no information was lost.',
|
|
332
|
+
};
|
|
333
|
+
const response = await this.getChat().sendMessage({
|
|
334
|
+
message: summarizationRequestMessage,
|
|
329
335
|
});
|
|
330
|
-
|
|
336
|
+
const newHistory = [
|
|
331
337
|
{
|
|
332
338
|
role: 'user',
|
|
333
|
-
parts: [
|
|
339
|
+
parts: [summarizationRequestMessage],
|
|
334
340
|
},
|
|
335
341
|
{
|
|
336
342
|
role: 'model',
|
|
337
|
-
parts: [{ text:
|
|
343
|
+
parts: [{ text: response.text }],
|
|
338
344
|
},
|
|
339
|
-
]
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
model: this.
|
|
343
|
-
contents:
|
|
344
|
-
});
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
newTokenCount,
|
|
352
|
-
};
|
|
345
|
+
];
|
|
346
|
+
this.chat = await this.startChat(newHistory);
|
|
347
|
+
const newTokenCount = (await this.getContentGenerator().countTokens({
|
|
348
|
+
model: this.model,
|
|
349
|
+
contents: newHistory,
|
|
350
|
+
})).totalTokens;
|
|
351
|
+
return originalTokenCount && newTokenCount
|
|
352
|
+
? {
|
|
353
|
+
originalTokenCount,
|
|
354
|
+
newTokenCount,
|
|
355
|
+
}
|
|
356
|
+
: null;
|
|
353
357
|
}
|
|
354
358
|
/**
|
|
355
359
|
* Handles fallback to Flash model when persistent 429 errors occur for OAuth users.
|
|
@@ -357,10 +361,11 @@ export class GeminiClient {
|
|
|
357
361
|
*/
|
|
358
362
|
async handleFlashFallback(authType) {
|
|
359
363
|
// Only handle fallback for OAuth users
|
|
360
|
-
if (authType !== AuthType.
|
|
364
|
+
if (authType !== AuthType.LOGIN_WITH_GOOGLE_PERSONAL &&
|
|
365
|
+
authType !== AuthType.LOGIN_WITH_GOOGLE_ENTERPRISE) {
|
|
361
366
|
return null;
|
|
362
367
|
}
|
|
363
|
-
const currentModel = this.
|
|
368
|
+
const currentModel = this.model;
|
|
364
369
|
const fallbackModel = DEFAULT_GEMINI_FLASH_MODEL;
|
|
365
370
|
// Don't fallback if already using Flash model
|
|
366
371
|
if (currentModel === fallbackModel) {
|
|
@@ -373,6 +378,7 @@ export class GeminiClient {
|
|
|
373
378
|
const accepted = await fallbackHandler(currentModel, fallbackModel);
|
|
374
379
|
if (accepted) {
|
|
375
380
|
this.config.setModel(fallbackModel);
|
|
381
|
+
this.model = fallbackModel;
|
|
376
382
|
return fallbackModel;
|
|
377
383
|
}
|
|
378
384
|
}
|