@office-ai/aioncli-core 0.26.0 → 0.30.1

package/dist/src/services/FolderTrustDiscoveryService.d.ts

@@ -0,0 +1,32 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export interface FolderDiscoveryResults {
+    commands: string[];
+    mcps: string[];
+    hooks: string[];
+    skills: string[];
+    settings: string[];
+    securityWarnings: string[];
+    discoveryErrors: string[];
+}
+/**
+ * A safe, read-only service to discover local configurations in a folder
+ * before it is trusted.
+ */
+export declare class FolderTrustDiscoveryService {
+    /**
+     * Discovers configurations in the given workspace directory.
+     * @param workspaceDir The directory to scan.
+     * @returns A summary of discovered configurations.
+     */
+    static discover(workspaceDir: string): Promise<FolderDiscoveryResults>;
+    private static discoverCommands;
+    private static discoverSkills;
+    private static discoverSettings;
+    private static collectSecurityWarnings;
+    private static isRecord;
+    private static exists;
+}

package/dist/src/services/FolderTrustDiscoveryService.js

@@ -0,0 +1,169 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
+import stripJsonComments from 'strip-json-comments';
+import { GEMINI_DIR } from '../utils/paths.js';
+import { debugLogger } from '../utils/debugLogger.js';
+import { isNodeError } from '../utils/errors.js';
+/**
+ * A safe, read-only service to discover local configurations in a folder
+ * before it is trusted.
+ */
+export class FolderTrustDiscoveryService {
+    /**
+     * Discovers configurations in the given workspace directory.
+     * @param workspaceDir The directory to scan.
+     * @returns A summary of discovered configurations.
+     */
+    static async discover(workspaceDir) {
+        const results = {
+            commands: [],
+            mcps: [],
+            hooks: [],
+            skills: [],
+            settings: [],
+            securityWarnings: [],
+            discoveryErrors: [],
+        };
+        const geminiDir = path.join(workspaceDir, GEMINI_DIR);
+        if (!(await this.exists(geminiDir))) {
+            return results;
+        }
+        await Promise.all([
+            this.discoverCommands(geminiDir, results),
+            this.discoverSkills(geminiDir, results),
+            this.discoverSettings(geminiDir, results),
+        ]);
+        return results;
+    }
+    static async discoverCommands(geminiDir, results) {
+        const commandsDir = path.join(geminiDir, 'commands');
+        if (await this.exists(commandsDir)) {
+            try {
+                const files = await fs.readdir(commandsDir, { recursive: true });
+                results.commands = files
+                    .filter((f) => f.endsWith('.toml'))
+                    .map((f) => path.basename(f, '.toml'));
+            }
+            catch (e) {
+                results.discoveryErrors.push(`Failed to discover commands: ${e instanceof Error ? e.message : String(e)}`);
+            }
+        }
+    }
+    static async discoverSkills(geminiDir, results) {
+        const skillsDir = path.join(geminiDir, 'skills');
+        if (await this.exists(skillsDir)) {
+            try {
+                const entries = await fs.readdir(skillsDir, { withFileTypes: true });
+                for (const entry of entries) {
+                    if (entry.isDirectory()) {
+                        const skillMdPath = path.join(skillsDir, entry.name, 'SKILL.md');
+                        if (await this.exists(skillMdPath)) {
+                            results.skills.push(entry.name);
+                        }
+                    }
+                }
+            }
+            catch (e) {
+                results.discoveryErrors.push(`Failed to discover skills: ${e instanceof Error ? e.message : String(e)}`);
+            }
+        }
+    }
+    static async discoverSettings(geminiDir, results) {
+        const settingsPath = path.join(geminiDir, 'settings.json');
+        if (!(await this.exists(settingsPath)))
+            return;
+        try {
+            const content = await fs.readFile(settingsPath, 'utf-8');
+            const settings = JSON.parse(stripJsonComments(content));
+            if (!this.isRecord(settings)) {
+                debugLogger.debug('Settings must be a JSON object');
+                return;
+            }
+            results.settings = Object.keys(settings).filter((key) => !['mcpServers', 'hooks', '$schema'].includes(key));
+            results.securityWarnings = this.collectSecurityWarnings(settings);
+            const mcpServers = settings['mcpServers'];
+            if (this.isRecord(mcpServers)) {
+                results.mcps = Object.keys(mcpServers);
+            }
+            const hooksConfig = settings['hooks'];
+            if (this.isRecord(hooksConfig)) {
+                const hooks = new Set();
+                for (const event of Object.values(hooksConfig)) {
+                    if (!Array.isArray(event))
+                        continue;
+                    for (const hook of event) {
+                        if (this.isRecord(hook) &&
+                            // eslint-disable-next-line no-restricted-syntax
+                            typeof hook['command'] === 'string') {
+                            hooks.add(hook['command']);
+                        }
+                    }
+                }
+                results.hooks = Array.from(hooks);
+            }
+        }
+        catch (e) {
+            results.discoveryErrors.push(`Failed to discover settings: ${e instanceof Error ? e.message : String(e)}`);
+        }
+    }
+    static collectSecurityWarnings(settings) {
+        const warnings = [];
+        const tools = this.isRecord(settings['tools'])
+            ? settings['tools']
+            : undefined;
+        const experimental = this.isRecord(settings['experimental'])
+            ? settings['experimental']
+            : undefined;
+        const security = this.isRecord(settings['security'])
+            ? settings['security']
+            : undefined;
+        const folderTrust = security && this.isRecord(security['folderTrust'])
+            ? security['folderTrust']
+            : undefined;
+        const allowedTools = tools?.['allowed'];
+        const checks = [
+            {
+                condition: Array.isArray(allowedTools) && allowedTools.length > 0,
+                message: 'This project auto-approves certain tools (tools.allowed).',
+            },
+            {
+                condition: experimental?.['enableAgents'] === true,
+                message: 'This project enables autonomous agents (enableAgents).',
+            },
+            {
+                condition: folderTrust?.['enabled'] === false,
+                message: 'This project attempts to disable folder trust (security.folderTrust.enabled).',
+            },
+            {
+                condition: tools?.['sandbox'] === false,
+                message: 'This project disables the security sandbox (tools.sandbox).',
+            },
+        ];
+        for (const check of checks) {
+            if (check.condition)
+                warnings.push(check.message);
+        }
+        return warnings;
+    }
+    static isRecord(val) {
+        return !!val && typeof val === 'object' && !Array.isArray(val);
+    }
+    static async exists(filePath) {
+        try {
+            await fs.stat(filePath);
+            return true;
+        }
+        catch (e) {
+            if (isNodeError(e) && e.code === 'ENOENT') {
+                return false;
+            }
+            throw e;
+        }
+    }
+}
+//# sourceMappingURL=FolderTrustDiscoveryService.js.map

package/dist/src/services/FolderTrustDiscoveryService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FolderTrustDiscoveryService.js","sourceRoot":"","sources":["../../../src/services/FolderTrustDiscoveryService.ts"],"names":[],"mappings":"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"}

package/dist/src/services/FolderTrustDiscoveryService.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/services/FolderTrustDiscoveryService.test.js

@@ -0,0 +1,118 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
+import * as os from 'node:os';
+import { FolderTrustDiscoveryService } from './FolderTrustDiscoveryService.js';
+import { GEMINI_DIR } from '../utils/paths.js';
+describe('FolderTrustDiscoveryService', () => {
+    let tempDir;
+    beforeEach(async () => {
+        tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'gemini-discovery-test-'));
+    });
+    afterEach(async () => {
+        vi.restoreAllMocks();
+        await fs.rm(tempDir, { recursive: true, force: true });
+    });
+    it('should discover commands, skills, mcps, and hooks', async () => {
+        const geminiDir = path.join(tempDir, GEMINI_DIR);
+        await fs.mkdir(geminiDir, { recursive: true });
+        // Mock commands
+        const commandsDir = path.join(geminiDir, 'commands');
+        await fs.mkdir(commandsDir);
+        await fs.writeFile(path.join(commandsDir, 'test-cmd.toml'), 'prompt = "test"');
+        // Mock skills
+        const skillsDir = path.join(geminiDir, 'skills');
+        await fs.mkdir(path.join(skillsDir, 'test-skill'), { recursive: true });
+        await fs.writeFile(path.join(skillsDir, 'test-skill', 'SKILL.md'), 'body');
+        // Mock settings (MCPs, Hooks, and general settings)
+        const settings = {
+            mcpServers: {
+                'test-mcp': { command: 'node', args: ['test.js'] },
+            },
+            hooks: {
+                BeforeTool: [{ command: 'test-hook' }],
+            },
+            general: { vimMode: true },
+            ui: { theme: 'Dark' },
+        };
+        await fs.writeFile(path.join(geminiDir, 'settings.json'), JSON.stringify(settings));
+        const results = await FolderTrustDiscoveryService.discover(tempDir);
+        expect(results.commands).toContain('test-cmd');
+        expect(results.skills).toContain('test-skill');
+        expect(results.mcps).toContain('test-mcp');
+        expect(results.hooks).toContain('test-hook');
+        expect(results.settings).toContain('general');
+        expect(results.settings).toContain('ui');
+        expect(results.settings).not.toContain('mcpServers');
+        expect(results.settings).not.toContain('hooks');
+    });
+    it('should flag security warnings for sensitive settings', async () => {
+        const geminiDir = path.join(tempDir, GEMINI_DIR);
+        await fs.mkdir(geminiDir, { recursive: true });
+        const settings = {
+            tools: {
+                allowed: ['git'],
+                sandbox: false,
+            },
+            experimental: {
+                enableAgents: true,
+            },
+            security: {
+                folderTrust: {
+                    enabled: false,
+                },
+            },
+        };
+        await fs.writeFile(path.join(geminiDir, 'settings.json'), JSON.stringify(settings));
+        const results = await FolderTrustDiscoveryService.discover(tempDir);
+        expect(results.securityWarnings).toContain('This project auto-approves certain tools (tools.allowed).');
+        expect(results.securityWarnings).toContain('This project enables autonomous agents (enableAgents).');
+        expect(results.securityWarnings).toContain('This project attempts to disable folder trust (security.folderTrust.enabled).');
+        expect(results.securityWarnings).toContain('This project disables the security sandbox (tools.sandbox).');
+    });
+    it('should handle missing .gemini directory', async () => {
+        const results = await FolderTrustDiscoveryService.discover(tempDir);
+        expect(results.commands).toHaveLength(0);
+        expect(results.skills).toHaveLength(0);
+        expect(results.mcps).toHaveLength(0);
+        expect(results.hooks).toHaveLength(0);
+        expect(results.settings).toHaveLength(0);
+    });
+    it('should handle malformed settings.json', async () => {
+        const geminiDir = path.join(tempDir, GEMINI_DIR);
+        await fs.mkdir(geminiDir, { recursive: true });
+        await fs.writeFile(path.join(geminiDir, 'settings.json'), 'invalid json');
+        const results = await FolderTrustDiscoveryService.discover(tempDir);
+        expect(results.discoveryErrors[0]).toContain('Failed to discover settings: Unexpected token');
+    });
+    it('should handle null settings.json', async () => {
+        const geminiDir = path.join(tempDir, GEMINI_DIR);
+        await fs.mkdir(geminiDir, { recursive: true });
+        await fs.writeFile(path.join(geminiDir, 'settings.json'), 'null');
+        const results = await FolderTrustDiscoveryService.discover(tempDir);
+        expect(results.discoveryErrors).toHaveLength(0);
+        expect(results.settings).toHaveLength(0);
+    });
+    it('should handle array settings.json', async () => {
+        const geminiDir = path.join(tempDir, GEMINI_DIR);
+        await fs.mkdir(geminiDir, { recursive: true });
+        await fs.writeFile(path.join(geminiDir, 'settings.json'), '[]');
+        const results = await FolderTrustDiscoveryService.discover(tempDir);
+        expect(results.discoveryErrors).toHaveLength(0);
+        expect(results.settings).toHaveLength(0);
+    });
+    it('should handle string settings.json', async () => {
+        const geminiDir = path.join(tempDir, GEMINI_DIR);
+        await fs.mkdir(geminiDir, { recursive: true });
+        await fs.writeFile(path.join(geminiDir, 'settings.json'), '"string"');
+        const results = await FolderTrustDiscoveryService.discover(tempDir);
+        expect(results.discoveryErrors).toHaveLength(0);
+        expect(results.settings).toHaveLength(0);
+    });
+});
+//# sourceMappingURL=FolderTrustDiscoveryService.test.js.map

package/dist/src/services/FolderTrustDiscoveryService.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FolderTrustDiscoveryService.test.js","sourceRoot":"","sources":["../../../src/services/FolderTrustDiscoveryService.test.ts"],"names":[],"mappings":"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"}

package/dist/src/services/chatCompressionService.d.ts

@@ -17,6 +17,10 @@ export declare const DEFAULT_COMPRESSION_TOKEN_THRESHOLD = 0.5;
  * means that only the last 30% of the chat history will be kept after compression.
  */
 export declare const COMPRESSION_PRESERVE_THRESHOLD = 0.3;
+/**
+ * The budget for function response tokens in the preserved history.
+ */
+export declare const COMPRESSION_FUNCTION_RESPONSE_TOKEN_BUDGET = 50000;
 /**
  * Returns the index of the oldest item to keep when compressing. May return
  * contents.length which indicates that everything should be compressed.
@@ -26,7 +30,7 @@ export declare const COMPRESSION_PRESERVE_THRESHOLD = 0.3;
 export declare function findCompressSplitPoint(contents: Content[], fraction: number): number;
 export declare function modelStringToModelConfigAlias(model: string): string;
 export declare class ChatCompressionService {
-    compress(chat: GeminiChat, promptId: string, force: boolean, model: string, config: Config, hasFailedCompressionAttempt: boolean): Promise<{
+    compress(chat: GeminiChat, promptId: string, force: boolean, model: string, config: Config, hasFailedCompressionAttempt: boolean, abortSignal?: AbortSignal): Promise<{
         newHistory: Content[] | null;
         info: ChatCompressionInfo;
     }>;

package/dist/src/services/chatCompressionService.js

@@ -9,11 +9,13 @@ import { getCompressionPrompt } from '../core/prompts.js';
 import { getResponseText } from '../utils/partUtils.js';
 import { logChatCompression } from '../telemetry/loggers.js';
 import { makeChatCompressionEvent } from '../telemetry/types.js';
+import { saveTruncatedToolOutput, formatTruncatedToolOutput, } from '../utils/fileUtils.js';
+import { debugLogger } from '../utils/debugLogger.js';
 import { getInitialChatHistory } from '../utils/environmentContext.js';
-import { calculateRequestTokenCount } from '../utils/tokenCalculation.js';
-import { DEFAULT_GEMINI_FLASH_LITE_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL, PREVIEW_GEMINI_MODEL, PREVIEW_GEMINI_FLASH_MODEL, } from '../config/models.js';
-import { firePreCompressHook } from '../core/sessionHookTriggers.js';
+import { calculateRequestTokenCount, estimateTokenCountSync, } from '../utils/tokenCalculation.js';
+import { DEFAULT_GEMINI_FLASH_LITE_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL, PREVIEW_GEMINI_MODEL, PREVIEW_GEMINI_FLASH_MODEL, PREVIEW_GEMINI_3_1_MODEL, } from '../config/models.js';
 import { PreCompressTrigger } from '../hooks/types.js';
+import { LlmRole } from '../telemetry/types.js';
 /**
  * Default threshold for compression token count as a fraction of the model's
  * token limit. If the chat history exceeds this threshold, it will be compressed.
@@ -24,6 +26,10 @@ export const DEFAULT_COMPRESSION_TOKEN_THRESHOLD = 0.5;
  * means that only the last 30% of the chat history will be kept after compression.
  */
 export const COMPRESSION_PRESERVE_THRESHOLD = 0.3;
+/**
+ * The budget for function response tokens in the preserved history.
+ */
+export const COMPRESSION_FUNCTION_RESPONSE_TOKEN_BUDGET = 50_000;
 /**
  * Returns the index of the oldest item to keep when compressing. May return
  * contents.length which indicates that everything should be compressed.
@@ -63,6 +69,7 @@ export function findCompressSplitPoint(contents, fraction) {
 export function modelStringToModelConfigAlias(model) {
     switch (model) {
         case PREVIEW_GEMINI_MODEL:
+        case PREVIEW_GEMINI_3_1_MODEL:
             return 'chat-compression-3-pro';
         case PREVIEW_GEMINI_FLASH_MODEL:
             return 'chat-compression-3-flash';
@@ -76,8 +83,98 @@ export function modelStringToModelConfigAlias(model) {
             return 'chat-compression-default';
     }
 }
+/**
+ * Processes the chat history to ensure function responses don't exceed a specific token budget.
+ *
+ * This function implements a "Reverse Token Budget" strategy:
+ * 1. It iterates through the history from the most recent turn to the oldest.
+ * 2. It keeps a running tally of tokens used by function responses.
+ * 3. Recent tool outputs are preserved in full to maintain high-fidelity context for the current turn.
+ * 4. Once the budget (COMPRESSION_FUNCTION_RESPONSE_TOKEN_BUDGET) is exceeded, any older large
+ *    tool responses are truncated to their last 30 lines and saved to a temporary file.
+ *
+ * This ensures that compression effectively reduces context size even when recent turns
+ * contain massive tool outputs (like large grep results or logs).
+ */
+async function truncateHistoryToBudget(history, config) {
+    let functionResponseTokenCounter = 0;
+    const truncatedHistory = [];
+    // Iterate backwards: newest messages first to prioritize their context.
+    for (let i = history.length - 1; i >= 0; i--) {
+        const content = history[i];
+        const newParts = [];
+        if (content.parts) {
+            // Process parts of the message backwards as well.
+            for (let j = content.parts.length - 1; j >= 0; j--) {
+                const part = content.parts[j];
+                if (part.functionResponse) {
+                    const responseObj = part.functionResponse.response;
+                    // Ensure we have a string representation to truncate.
+                    // If the response is an object, we try to extract a primary string field (output or content).
+                    let contentStr;
+                    if (typeof responseObj === 'string') {
+                        contentStr = responseObj;
+                    }
+                    else if (responseObj && typeof responseObj === 'object') {
+                        if ('output' in responseObj &&
+                            typeof responseObj['output'] === 'string') {
+                            contentStr = responseObj['output'];
+                        }
+                        else if ('content' in responseObj &&
+                            typeof responseObj['content'] === 'string') {
+                            contentStr = responseObj['content'];
+                        }
+                        else {
+                            contentStr = JSON.stringify(responseObj, null, 2);
+                        }
+                    }
+                    else {
+                        contentStr = JSON.stringify(responseObj, null, 2);
+                    }
+                    const tokens = estimateTokenCountSync([{ text: contentStr }]);
+                    if (functionResponseTokenCounter + tokens >
+                        COMPRESSION_FUNCTION_RESPONSE_TOKEN_BUDGET) {
+                        try {
+                            // Budget exceeded: Truncate this response.
+                            const { outputFile } = await saveTruncatedToolOutput(contentStr, part.functionResponse.name ?? 'unknown_tool', config.getNextCompressionTruncationId(), config.storage.getProjectTempDir());
+                            const truncatedMessage = formatTruncatedToolOutput(contentStr, outputFile, config.getTruncateToolOutputThreshold());
+                            newParts.unshift({
+                                functionResponse: {
+                                    ...part.functionResponse,
+                                    response: { output: truncatedMessage },
+                                },
+                            });
+                            // Count the small truncated placeholder towards the budget.
+                            functionResponseTokenCounter += estimateTokenCountSync([
+                                { text: truncatedMessage },
+                            ]);
+                        }
+                        catch (error) {
+                            // Fallback: if truncation fails, keep the original part to avoid data loss in the chat.
+                            debugLogger.debug('Failed to truncate history to budget:', error);
+                            newParts.unshift(part);
+                            functionResponseTokenCounter += tokens;
+                        }
+                    }
+                    else {
+                        // Within budget: keep the full response.
+                        functionResponseTokenCounter += tokens;
+                        newParts.unshift(part);
+                    }
+                }
+                else {
+                    // Non-tool response part: always keep.
+                    newParts.unshift(part);
+                }
+            }
+        }
+        // Reconstruct the message with processed (potentially truncated) parts.
+        truncatedHistory.unshift({ ...content, parts: newParts });
+    }
+    return truncatedHistory;
+}
 export class ChatCompressionService {
-    async compress(chat, promptId, force, model, config, hasFailedCompressionAttempt) {
+    async compress(chat, promptId, force, model, config, hasFailedCompressionAttempt, abortSignal) {
         const curatedHistory = chat.getHistory(true);
         // Regardless of `force`, don't do anything if the history is empty.
         if (curatedHistory.length === 0 ||
@@ -91,16 +188,10 @@ export class ChatCompressionService {
                 },
             };
         }
-        // Fire PreCompress hook before compression (only if hooks are enabled)
+        // Fire PreCompress hook before compression
         // This fires for both manual and auto compression attempts
-        const hooksEnabled = config.getEnableHooks();
-        const messageBus = config.getMessageBus();
-        if (hooksEnabled && messageBus) {
-            const trigger = force
-                ? PreCompressTrigger.Manual
-                : PreCompressTrigger.Auto;
-            await firePreCompressHook(messageBus, trigger);
-        }
+        const trigger = force ? PreCompressTrigger.Manual : PreCompressTrigger.Auto;
+        await config.getHookSystem()?.firePreCompressEvent(trigger);
         const originalTokenCount = chat.getLastPromptTokenCount();
         // Don't compress if not forced and we are under the limit.
         if (!force) {
@@ -117,10 +208,13 @@ export class ChatCompressionService {
                 };
             }
         }
-        const splitPoint = findCompressSplitPoint(curatedHistory, 1 - COMPRESSION_PRESERVE_THRESHOLD);
-        const historyToCompress = curatedHistory.slice(0, splitPoint);
-        const historyToKeep = curatedHistory.slice(splitPoint);
-        if (historyToCompress.length === 0) {
+        // Apply token-based truncation to the entire history before splitting.
+        // This ensures that even the "to compress" portion is within safe limits for the summarization model.
+        const truncatedHistory = await truncateHistoryToBudget(curatedHistory, config);
+        const splitPoint = findCompressSplitPoint(truncatedHistory, 1 - COMPRESSION_PRESERVE_THRESHOLD);
+        const historyToCompressTruncated = truncatedHistory.slice(0, splitPoint);
+        const historyToKeepTruncated = truncatedHistory.slice(splitPoint);
+        if (historyToCompressTruncated.length === 0) {
             return {
                 newHistory: null,
                 info: {
@@ -130,35 +224,87 @@ export class ChatCompressionService {
                 },
             };
         }
+        // High Fidelity Decision: Should we send the original or truncated history to the summarizer?
+        const originalHistoryToCompress = curatedHistory.slice(0, splitPoint);
+        const originalToCompressTokenCount = estimateTokenCountSync(originalHistoryToCompress.flatMap((c) => c.parts || []));
+        const historyForSummarizer = originalToCompressTokenCount < tokenLimit(model)
+            ? originalHistoryToCompress
+            : historyToCompressTruncated;
+        const hasPreviousSnapshot = historyForSummarizer.some((c) => c.parts?.some((p) => p.text?.includes('<state_snapshot>')));
+        const anchorInstruction = hasPreviousSnapshot
+            ? 'A previous <state_snapshot> exists in the history. You MUST integrate all still-relevant information from that snapshot into the new one, updating it with the more recent events. Do not lose established constraints or critical knowledge.'
+            : 'Generate a new <state_snapshot> based on the provided history.';
         const summaryResponse = await config.getBaseLlmClient().generateContent({
             modelConfigKey: { model: modelStringToModelConfigAlias(model) },
             contents: [
-                ...historyToCompress,
+                ...historyForSummarizer,
                 {
                     role: 'user',
                     parts: [
                         {
-                            text: 'First, reason in your scratchpad. Then, generate the <state_snapshot>.',
+                            text: `${anchorInstruction}\n\nFirst, reason in your scratchpad. Then, generate the updated <state_snapshot>.`,
                         },
                     ],
                 },
             ],
-            systemInstruction: { text: getCompressionPrompt() },
+            systemInstruction: { text: getCompressionPrompt(config) },
             promptId,
             // TODO(joshualitt): wire up a sensible abort signal,
-            abortSignal: new AbortController().signal,
+            abortSignal: abortSignal ?? new AbortController().signal,
+            role: LlmRole.UTILITY_COMPRESSOR,
         });
         const summary = getResponseText(summaryResponse) ?? '';
+        // Phase 3: The "Probe" Verification (Self-Correction)
+        // We perform a second lightweight turn to ensure no critical information was lost.
+        const verificationResponse = await config
+            .getBaseLlmClient()
+            .generateContent({
+            modelConfigKey: { model: modelStringToModelConfigAlias(model) },
+            contents: [
+                ...historyForSummarizer,
+                {
+                    role: 'model',
+                    parts: [{ text: summary }],
+                },
+                {
+                    role: 'user',
+                    parts: [
+                        {
+                            text: 'Critically evaluate the <state_snapshot> you just generated. Did you omit any specific technical details, file paths, tool results, or user constraints mentioned in the history? If anything is missing or could be more precise, generate a FINAL, improved <state_snapshot>. Otherwise, repeat the exact same <state_snapshot> again.',
+                        },
+                    ],
+                },
+            ],
+            systemInstruction: { text: getCompressionPrompt(config) },
+            promptId: `${promptId}-verify`,
+            role: LlmRole.UTILITY_COMPRESSOR,
+            abortSignal: abortSignal ?? new AbortController().signal,
+        });
+        const finalSummary = (getResponseText(verificationResponse)?.trim() || summary).trim();
+        if (!finalSummary) {
+            logChatCompression(config, makeChatCompressionEvent({
+                tokens_before: originalTokenCount,
+                tokens_after: originalTokenCount, // No change since it failed
+            }));
+            return {
+                newHistory: null,
+                info: {
+                    originalTokenCount,
+                    newTokenCount: originalTokenCount,
+                    compressionStatus: CompressionStatus.COMPRESSION_FAILED_EMPTY_SUMMARY,
+                },
+            };
+        }
         const extraHistory = [
             {
                 role: 'user',
-                parts: [{ text: summary }],
+                parts: [{ text: finalSummary }],
             },
             {
                 role: 'model',
                 parts: [{ text: 'Got it. Thanks for the additional context!' }],
             },
-            ...historyToKeep,
+            ...historyToKeepTruncated,
         ];
         // Use a shared utility to construct the initial history for an accurate token count.
         const fullNewHistory = await getInitialChatHistory(config, extraHistory);