MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-04-19 17:50:37 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(plan): keep approved plan during chat compression (#21284)

Browse Source
This commit is contained in:
ruomeng
2026-03-06 14:36:05 -05:00
committed by GitHub
parent 42d367d72f
commit 06a176e33e
4 changed files with 109 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
packages/core/src/services/chatCompressionService.test.ts
View File

@@ -10,7 +10,7 @@ import {
findCompressSplitPoint,
modelStringToModelConfigAlias,
} from './chatCompressionService.js';
import type { Content, GenerateContentResponse } from '@google/genai';
import type { Content, GenerateContentResponse, Part } from '@google/genai';
import { CompressionStatus } from '../core/turn.js';
import type { BaseLlmClient } from '../core/baseLlmClient.js';
import type { GeminiChat } from '../core/geminiChat.js';
@@ -189,6 +189,7 @@ describe('ChatCompressionService', () => {
storage: {
getProjectTempDir: vi.fn().mockReturnValue(testTempDir),
},
getApprovedPlanPath: vi.fn().mockReturnValue('/path/to/plan.md'),
} as unknown as Config;
vi.mocked(getInitialChatHistory).mockImplementation(
@@ -355,6 +356,63 @@ describe('ChatCompressionService', () => {
);
});
it('should include the approved plan path in the system instruction', async () => {
const planPath = '/custom/plan/path.md';
vi.mocked(mockConfig.getApprovedPlanPath).mockReturnValue(planPath);
vi.mocked(mockConfig.getActiveModel).mockReturnValue(
'gemini-3.1-pro-preview',
);
const history: Content[] = [
{ role: 'user', parts: [{ text: 'msg1' }] },
{ role: 'model', parts: [{ text: 'msg2' }] },
];
vi.mocked(mockChat.getHistory).mockReturnValue(history);
vi.mocked(mockChat.getLastPromptTokenCount).mockReturnValue(600000);
await service.compress(
mockChat,
mockPromptId,
false,
mockModel,
mockConfig,
false,
);
const firstCallText = (
vi.mocked(mockConfig.getBaseLlmClient().generateContent).mock.calls[0][0]
.systemInstruction as Part
).text;
expect(firstCallText).toContain('### APPROVED PLAN PRESERVATION');
expect(firstCallText).toContain(planPath);
});
it('should not include the approved plan section if no approved plan path exists', async () => {
vi.mocked(mockConfig.getApprovedPlanPath).mockReturnValue(undefined);
const history: Content[] = [
{ role: 'user', parts: [{ text: 'msg1' }] },
{ role: 'model', parts: [{ text: 'msg2' }] },
];
vi.mocked(mockChat.getHistory).mockReturnValue(history);
vi.mocked(mockChat.getLastPromptTokenCount).mockReturnValue(600000);
await service.compress(
mockChat,
mockPromptId,
false,
mockModel,
mockConfig,
false,
);
const firstCallText = (
vi.mocked(mockConfig.getBaseLlmClient().generateContent).mock.calls[0][0]
.systemInstruction as Part
).text;
expect(firstCallText).not.toContain('### APPROVED PLAN PRESERVATION');
});
it('should force compress even if under threshold', async () => {
const history: Content[] = [
{ role: 'user', parts: [{ text: 'msg1' }] },