@vybestack/llxprt-code-core 0.1.23-nightly.250905.97906524 → 0.2.2

package/dist/src/adapters/IStreamAdapter.d.ts

@@ -3,7 +3,7 @@
  * Copyright 2025 Vybestack LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { IMessage } from '../providers/IMessage.js';
+import { IContent } from '../services/history/IContent.js';
 import { ServerGeminiStreamEvent } from '../core/turn.js';
 /**
  * Interface for adapting provider-specific streams to Gemini event format
@@ -11,8 +11,8 @@ import { ServerGeminiStreamEvent } from '../core/turn.js';
 export interface IStreamAdapter {
     /**
      * Adapts a provider's stream format to Gemini's event stream format
-     * @param providerStream The provider-specific stream of messages
+     * @param providerStream The provider-specific stream of content
      * @returns An async iterator of Gemini events
      */
-    adaptStream(providerStream: AsyncIterableIterator<IMessage>): AsyncIterableIterator<ServerGeminiStreamEvent>;
+    adaptStream(providerStream: AsyncIterableIterator<IContent>): AsyncIterableIterator<ServerGeminiStreamEvent>;
 }

package/dist/src/auth/precedence.d.ts

@@ -37,7 +37,7 @@ export declare class AuthPrecedenceResolver {
      */
     getAuthMethodName(): Promise<string | null>;
     /**
-     * Reads API key from a file path, handling both absolute and relative paths
+     * Reads API key from a file path, handling tilde expansion, absolute and relative paths
      */
     private readKeyFile;
     /**

package/dist/src/auth/precedence.js

@@ -16,6 +16,7 @@
  */
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
+import * as os from 'node:os';
 import { getSettingsService } from '../settings/settingsServiceInstance.js';
 export class AuthPrecedenceResolver {
     config;
@@ -145,14 +146,18 @@ export class AuthPrecedenceResolver {
         return null;
     }
     /**
-     * Reads API key from a file path, handling both absolute and relative paths
+     * Reads API key from a file path, handling tilde expansion, absolute and relative paths
      */
     async readKeyFile(filePath) {
         try {
+            // Handle tilde expansion for home directory
+            const expandedPath = filePath.startsWith('~')
+                ? path.join(os.homedir(), filePath.slice(1))
+                : filePath;
             // Handle relative paths from current working directory
-            const resolvedPath = path.isAbsolute(filePath)
-                ? filePath
-                : path.resolve(process.cwd(), filePath);
+            const resolvedPath = path.isAbsolute(expandedPath)
+                ? expandedPath
+                : path.resolve(process.cwd(), expandedPath);
             const content = await fs.readFile(resolvedPath, 'utf-8');
             const key = content.trim();
             if (key === '') {

package/dist/src/auth/precedence.js.map

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

package/dist/src/auth/types.d.ts

@@ -40,13 +40,13 @@ export declare const ProviderOAuthConfigSchema: z.ZodObject<{
     scopes: z.ZodArray<z.ZodString, "many">;
 }, "strip", z.ZodTypeAny, {
     clientId: string;
-    provider: "gemini" | "qwen";
+    provider: "qwen" | "gemini";
     scopes: string[];
     authorizationEndpoint: string;
     tokenEndpoint: string;
 }, {
     clientId: string;
-    provider: "gemini" | "qwen";
+    provider: "qwen" | "gemini";
     scopes: string[];
     authorizationEndpoint: string;
     tokenEndpoint: string;
@@ -111,14 +111,14 @@ export declare const AuthStatusSchema: z.ZodObject<{
     expiresIn: z.ZodOptional<z.ZodNumber>;
     oauthEnabled: z.ZodOptional<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
-    authType: "none" | "oauth" | "api-key";
     provider: string;
+    authType: "none" | "oauth" | "api-key";
     authenticated: boolean;
     expiresIn?: number | undefined;
     oauthEnabled?: boolean | undefined;
 }, {
-    authType: "none" | "oauth" | "api-key";
     provider: string;
+    authType: "none" | "oauth" | "api-key";
     authenticated: boolean;
     expiresIn?: number | undefined;
     oauthEnabled?: boolean | undefined;

package/dist/src/code_assist/codeAssist.js

@@ -7,25 +7,27 @@ import { AuthType } from '../core/contentGenerator.js';
 import { getOauthClient } from './oauth2.js';
 import { setupUser } from './setup.js';
 import { CodeAssistServer } from './server.js';
+import { DebugLogger } from '../debug/index.js';
 export async function createCodeAssistContentGenerator(httpOptions, authType, config, baseURL, // Add baseURL parameter
 _sessionId) {
-    console.log(`createCodeAssistContentGenerator: authType=${authType}, config=${!!config}, baseURL=${baseURL}`);
+    const logger = new DebugLogger('llxprt:code:assist');
+    logger.debug(() => `createCodeAssistContentGenerator: authType=${authType}, config=${!!config}, baseURL=${baseURL}`);
     if (authType === AuthType.LOGIN_WITH_GOOGLE ||
         authType === AuthType.CLOUD_SHELL) {
         try {
-            console.log(`createCodeAssistContentGenerator: calling getOauthClient for authType ${authType}`);
+            logger.debug(() => `createCodeAssistContentGenerator: calling getOauthClient for authType ${authType}`);
             const authClient = await getOauthClient(authType, config);
-            console.log(`createCodeAssistContentGenerator: OAuth client created, calling setupUser`);
+            logger.debug(() => `createCodeAssistContentGenerator: OAuth client created, calling setupUser`);
             const userData = await setupUser(authClient);
-            console.log(`createCodeAssistContentGenerator: setupUser completed, projectId=${userData.projectId}, userTier=${userData.userTier}`);
+            logger.debug(() => `createCodeAssistContentGenerator: setupUser completed, projectId=${userData.projectId}, userTier=${userData.userTier}`);
             return new CodeAssistServer(authClient, userData.projectId, httpOptions, 
             // PRIVACY FIX: sessionId removed to prevent transmission to Google servers
             // sessionId, // removed
             userData.userTier, baseURL);
         }
         catch (error) {
-            console.log(`createCodeAssistContentGenerator: ERROR during OAuth setup: ${error}`);
-            console.log(`createCodeAssistContentGenerator: Error details:`, error);
+            logger.debug(() => `createCodeAssistContentGenerator: ERROR during OAuth setup: ${error}`);
+            logger.debug(() => `createCodeAssistContentGenerator: Error details: ${error}`);
             throw error;
         }
     }

package/dist/src/code_assist/codeAssist.js.map

@@ -1 +1 @@
-{"version":3,"file":"codeAssist.js","sourceRoot":"","sources":["../../../src/code_assist/codeAssist.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAoB,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAe,MAAM,aAAa,CAAC;AAG5D,MAAM,CAAC,KAAK,UAAU,gCAAgC,CACpD,WAAwB,EACxB,QAAkB,EAClB,MAAc,EACd,OAAgB,EAAE,wBAAwB;AAC1C,UAAmB;IAEnB,OAAO,CAAC,GAAG,CACT,8CAA8C,QAAQ,YAAY,CAAC,CAAC,MAAM,aAAa,OAAO,EAAE,CACjG,CAAC;IAEF,IACE,QAAQ,KAAK,QAAQ,CAAC,iBAAiB;QACvC,QAAQ,KAAK,QAAQ,CAAC,WAAW,EACjC,CAAC;QACD,IAAI,CAAC;YACH,OAAO,CAAC,GAAG,CACT,yEAAyE,QAAQ,EAAE,CACpF,CAAC;YACF,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YAC1D,OAAO,CAAC,GAAG,CACT,2EAA2E,CAC5E,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC,CAAC;YAC7C,OAAO,CAAC,GAAG,CACT,oEAAoE,QAAQ,CAAC,SAAS,cAAc,QAAQ,CAAC,QAAQ,EAAE,CACxH,CAAC;YACF,OAAO,IAAI,gBAAgB,CACzB,UAAU,EACV,QAAQ,CAAC,SAAS,EAClB,WAAW;YACX,2EAA2E;YAC3E,wBAAwB;YACxB,QAAQ,CAAC,QAAQ,EACjB,OAAO,CACR,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,GAAG,CACT,+DAA+D,KAAK,EAAE,CACvE,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,kDAAkD,EAAE,KAAK,CAAC,CAAC;YACvE,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,yBAAyB,QAAQ,EAAE,CAAC,CAAC;AACvD,CAAC"}
+{"version":3,"file":"codeAssist.js","sourceRoot":"","sources":["../../../src/code_assist/codeAssist.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAoB,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAe,MAAM,aAAa,CAAC;AAE5D,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,CAAC,KAAK,UAAU,gCAAgC,CACpD,WAAwB,EACxB,QAAkB,EAClB,MAAc,EACd,OAAgB,EAAE,wBAAwB;AAC1C,UAAmB;IAEnB,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,oBAAoB,CAAC,CAAC;IAErD,MAAM,CAAC,KAAK,CACV,GAAG,EAAE,CACH,8CAA8C,QAAQ,YAAY,CAAC,CAAC,MAAM,aAAa,OAAO,EAAE,CACnG,CAAC;IAEF,IACE,QAAQ,KAAK,QAAQ,CAAC,iBAAiB;QACvC,QAAQ,KAAK,QAAQ,CAAC,WAAW,EACjC,CAAC;QACD,IAAI,CAAC;YACH,MAAM,CAAC,KAAK,CACV,GAAG,EAAE,CACH,yEAAyE,QAAQ,EAAE,CACtF,CAAC;YACF,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YAC1D,MAAM,CAAC,KAAK,CACV,GAAG,EAAE,CACH,2EAA2E,CAC9E,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC,CAAC;YAC7C,MAAM,CAAC,KAAK,CACV,GAAG,EAAE,CACH,oEAAoE,QAAQ,CAAC,SAAS,cAAc,QAAQ,CAAC,QAAQ,EAAE,CAC1H,CAAC;YACF,OAAO,IAAI,gBAAgB,CACzB,UAAU,EACV,QAAQ,CAAC,SAAS,EAClB,WAAW;YACX,2EAA2E;YAC3E,wBAAwB;YACxB,QAAQ,CAAC,QAAQ,EACjB,OAAO,CACR,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CACV,GAAG,EAAE,CACH,+DAA+D,KAAK,EAAE,CACzE,CAAC;YACF,MAAM,CAAC,KAAK,CACV,GAAG,EAAE,CAAC,oDAAoD,KAAK,EAAE,CAClE,CAAC;YACF,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,yBAAyB,QAAQ,EAAE,CAAC,CAAC;AACvD,CAAC"}

package/dist/src/code_assist/setup.js

@@ -5,6 +5,7 @@
  */
 import { UserTierId, } from './types.js';
 import { CodeAssistServer } from './server.js';
+import { DebugLogger } from '../debug/index.js';
 export class ProjectIdRequiredError extends Error {
     constructor() {
         super('This account requires setting the GOOGLE_CLOUD_PROJECT env var. See https://goo.gle/gemini-cli-auth-docs#workspace-gca');
@@ -16,7 +17,8 @@ export class ProjectIdRequiredError extends Error {
  * @returns the user's actual project id
  */
 export async function setupUser(client) {
-    console.log(`setupUser: starting setup, GOOGLE_CLOUD_PROJECT=${process.env.GOOGLE_CLOUD_PROJECT || 'undefined'}`);
+    const logger = new DebugLogger('llxprt:code:setup');
+    logger.debug(() => `setupUser: starting setup, GOOGLE_CLOUD_PROJECT=${process.env.GOOGLE_CLOUD_PROJECT || 'undefined'}`);
     const projectId = process.env.GOOGLE_CLOUD_PROJECT || undefined;
     // PRIVACY FIX: sessionId parameter removed from CodeAssistServer constructor
     const caServer = new CodeAssistServer(client, projectId, {}, undefined);
@@ -25,7 +27,7 @@ export async function setupUser(client) {
         platform: 'PLATFORM_UNSPECIFIED',
         pluginType: 'GEMINI',
     };
-    console.log(`setupUser: created CodeAssistServer, calling loadCodeAssist`);
+    logger.debug(() => `setupUser: created CodeAssistServer, calling loadCodeAssist`);
     const loadRes = await caServer.loadCodeAssist({
         cloudaicompanionProject: projectId,
         metadata: {
@@ -33,21 +35,21 @@ export async function setupUser(client) {
             duetProject: projectId,
         },
     });
-    console.log(`setupUser: loadCodeAssist completed, currentTier=${!!loadRes.currentTier}, cloudaicompanionProject=${loadRes.cloudaicompanionProject}`);
+    logger.debug(() => `setupUser: loadCodeAssist completed, currentTier=${!!loadRes.currentTier}, cloudaicompanionProject=${loadRes.cloudaicompanionProject}`);
     if (loadRes.currentTier) {
-        console.log(`setupUser: user has current tier: ${loadRes.currentTier.id}`);
+        logger.debug(() => `setupUser: user has current tier: ${loadRes.currentTier.id}`);
         if (!loadRes.cloudaicompanionProject) {
             if (projectId) {
-                console.log(`setupUser: returning with project ID from env: ${projectId}`);
+                logger.debug(() => `setupUser: returning with project ID from env: ${projectId}`);
                 return {
                     projectId,
                     userTier: loadRes.currentTier.id,
                 };
             }
-            console.log(`setupUser: throwing ProjectIdRequiredError - no project ID available`);
+            logger.debug(() => `setupUser: throwing ProjectIdRequiredError - no project ID available`);
             throw new ProjectIdRequiredError();
         }
-        console.log(`setupUser: returning with project ID from response: ${loadRes.cloudaicompanionProject}`);
+        logger.debug(() => `setupUser: returning with project ID from response: ${loadRes.cloudaicompanionProject}`);
         return {
             projectId: loadRes.cloudaicompanionProject,
             userTier: loadRes.currentTier.id,

package/dist/src/code_assist/setup.js.map

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

package/dist/src/config/index.d.ts

@@ -0,0 +1,7 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export { Config, type ConfigParameters, type RedactionConfig, ApprovalMode, type AccessibilitySettings, type BugCommandSettings, type ChatCompressionSettings, type SummarizeToolOutputSettings, type ComplexityAnalyzerSettings, type TelemetrySettings, MCPServerConfig, AuthProviderType, type SandboxConfig, type FlashFallbackHandler, type ActiveExtension, type GeminiCLIExtension, type FileFilteringOptions, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, DEFAULT_FILE_FILTERING_OPTIONS, type MCPOAuthConfig, DEFAULT_GEMINI_FLASH_MODEL, } from './config.js';
+export { DEFAULT_GEMINI_FLASH_MODEL as DEFAULT_FLASH_MODEL } from './models.js';

package/dist/src/config/index.js

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export { Config, ApprovalMode, MCPServerConfig, AuthProviderType, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, DEFAULT_FILE_FILTERING_OPTIONS, DEFAULT_GEMINI_FLASH_MODEL, } from './config.js';
+export { DEFAULT_GEMINI_FLASH_MODEL as DEFAULT_FLASH_MODEL } from './models.js';
+//# sourceMappingURL=index.js.map

package/dist/src/config/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/config/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,MAAM,EAGN,YAAY,EAOZ,eAAe,EACf,gBAAgB,EAMhB,qCAAqC,EACrC,8BAA8B,EAE9B,0BAA0B,GAC3B,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,0BAA0B,IAAI,mBAAmB,EAAE,MAAM,aAAa,CAAC"}

package/dist/src/core/client.d.ts

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { GenerateContentConfig, PartListUnion, Content, GenerateContentResponse } from '@google/genai';
-import { Turn, ServerGeminiStreamEvent, ChatCompressionInfo } from './turn.js';
+import { Turn, ServerGeminiStreamEvent } from './turn.js';
 import { Config } from '../config/config.js';
 import { UserTierId } from '../code_assist/types.js';
 import { GeminiChat } from './geminiChat.js';
@@ -26,20 +26,6 @@ export declare class GeminiClient {
     private readonly MAX_TURNS;
     private _pendingConfig?;
     private _previousHistory?;
-    /**
-     * 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.
-     */
-    private COMPRESSION_TOKEN_THRESHOLD;
-    /**
-     * The fraction of the latest chat history to keep. A value of 0.5
-     * means that only the last 50% of the chat history will be kept after compression.
-     */
-    private readonly COMPRESSION_PRESERVE_THRESHOLD;
-    /**
-     * User-defined context limit override
-     */
-    private userContextLimit?;
     private readonly loopDetector;
     private lastPromptId?;
     private readonly complexityAnalyzer;
@@ -48,12 +34,7 @@ export declare class GeminiClient {
     private readonly complexitySuggestionCooldown;
     private lastSentIdeContext;
     private forceFullIdeContext;
-    private logger;
     constructor(config: Config);
-    /**
-     * Set the compression threshold and context limit overrides
-     */
-    setCompressionSettings(compressionThreshold?: number, contextLimit?: number): void;
     initialize(contentGeneratorConfig: ContentGeneratorConfig): Promise<void>;
     private lazyInitialize;
     getContentGenerator(): ContentGenerator;
@@ -86,7 +67,14 @@ export declare class GeminiClient {
     generateJson(contents: Content[], schema: Record<string, unknown>, abortSignal: AbortSignal, model?: string, config?: GenerateContentConfig): Promise<Record<string, unknown>>;
     generateContent(contents: Content[], generationConfig: GenerateContentConfig, abortSignal: AbortSignal, model?: string): Promise<GenerateContentResponse>;
     generateEmbedding(texts: string[]): Promise<number[][]>;
-    tryCompressChat(prompt_id: string, force?: boolean): Promise<ChatCompressionInfo | null>;
+    /**
+     * Manually trigger chat compression
+     * Returns compression info if successful, null if not needed
+     */
+    tryCompressChat(prompt_id: string, _force?: boolean): Promise<{
+        originalTokenCount: number;
+        newTokenCount: number;
+    } | null>;
     /**
      * Handles falling back to Flash model when persistent 429 errors occur for OAuth users.
      * Uses a fallback handler if provided by the config; otherwise, returns null.

package/dist/src/core/client.js

@@ -4,18 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { getDirectoryContextString, getEnvironmentContext, } from '../utils/environmentContext.js';
-import { Turn, GeminiEventType, } from './turn.js';
-import { getCoreSystemPromptAsync, getCompressionPrompt } from './prompts.js';
+import { Turn, GeminiEventType } from './turn.js';
+import { getCoreSystemPromptAsync } from './prompts.js';
 import { getResponseText } from '../utils/generateContentResponseUtilities.js';
 import { reportError } from '../utils/errorReporting.js';
 import { GeminiChat } from './geminiChat.js';
+import { DebugLogger } from '../debug/index.js';
 import { HistoryService } from '../services/history/HistoryService.js';
 import { ContentConverters } from '../services/history/ContentConverters.js';
 import { retryWithBackoff } from '../utils/retry.js';
 import { getErrorMessage } from '../utils/errors.js';
-import { isFunctionResponse } from '../utils/messageInspectors.js';
-import { tokenLimit } from './tokenLimits.js';
-import { COMPRESSION_TOKEN_THRESHOLD, COMPRESSION_PRESERVE_THRESHOLD, } from './compression-config.js';
 import { AuthType, createContentGenerator, } from './contentGenerator.js';
 import { ProxyAgent, setGlobalDispatcher } from 'undici';
 import { DEFAULT_GEMINI_FLASH_MODEL } from '../config/models.js';
@@ -23,7 +21,6 @@ import { LoopDetectionService } from '../services/loopDetectionService.js';
 import { ideContext } from '../ide/ideContext.js';
 import { ComplexityAnalyzer } from '../services/complexity-analyzer.js';
 import { TodoReminderService } from '../services/todo-reminder-service.js';
-import { DebugLogger } from '../debug/index.js';
 function isThinkingSupported(model) {
     if (model.startsWith('gemini-2.5'))
         return true;
@@ -77,20 +74,6 @@ export class GeminiClient {
     MAX_TURNS = 100;
     _pendingConfig;
     _previousHistory;
-    /**
-     * 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.
-     */
-    COMPRESSION_TOKEN_THRESHOLD = COMPRESSION_TOKEN_THRESHOLD;
-    /**
-     * The fraction of the latest chat history to keep. A value of 0.5
-     * means that only the last 50% of the chat history will be kept after compression.
-     */
-    COMPRESSION_PRESERVE_THRESHOLD = COMPRESSION_PRESERVE_THRESHOLD;
-    /**
-     * User-defined context limit override
-     */
-    userContextLimit;
     loopDetector;
     lastPromptId;
     complexityAnalyzer;
@@ -99,10 +82,8 @@ export class GeminiClient {
     complexitySuggestionCooldown;
     lastSentIdeContext;
     forceFullIdeContext = true;
-    logger;
     constructor(config) {
         this.config = config;
-        this.logger = new DebugLogger('llxprt:core:client');
         if (config.getProxy()) {
             setGlobalDispatcher(new ProxyAgent(config.getProxy()));
         }
@@ -119,19 +100,6 @@ export class GeminiClient {
             complexitySettings.suggestionCooldownMs ?? 300000;
         this.todoReminderService = new TodoReminderService();
     }
-    /**
-     * Set the compression threshold and context limit overrides
-     */
-    setCompressionSettings(compressionThreshold, contextLimit) {
-        if (compressionThreshold !== undefined &&
-            compressionThreshold > 0 &&
-            compressionThreshold <= 1) {
-            this.COMPRESSION_TOKEN_THRESHOLD = compressionThreshold;
-        }
-        if (contextLimit !== undefined && contextLimit > 0) {
-            this.userContextLimit = contextLimit;
-        }
-    }
     async initialize(contentGeneratorConfig) {
         // Preserve chat history before resetting
         const previousHistory = this.chat?.getHistory();
@@ -259,8 +227,26 @@ export class GeminiClient {
         this.getChat().setTools(tools);
     }
     async resetChat() {
-        // Pass the stored history to startChat so it's preserved
-        this.chat = await this.startChat(this._previousHistory);
+        // If chat exists, clear its history service
+        if (this.chat) {
+            const historyService = this.chat.getHistoryService();
+            if (historyService) {
+                // Clear the history service directly
+                historyService.clear();
+            }
+            else {
+                // Fallback to chat's clearHistory if no history service
+                this.chat.clearHistory();
+            }
+            // Reset the chat's internal state
+            this.forceFullIdeContext = true;
+        }
+        else {
+            // No chat exists yet, create one with empty history
+            this.chat = await this.startChat([]);
+        }
+        // Clear the stored history as well
+        this._previousHistory = [];
     }
     async addDirectoryContext() {
         if (!this.chat) {
@@ -291,9 +277,8 @@ export class GeminiClient {
         try {
             const userMemory = this.config.getUserMemory();
             const model = this.config.getModel();
-            if (process.env.DEBUG) {
-                console.log('DEBUG [client.startChat]: Model from config:', model);
-            }
+            const logger = new DebugLogger('llxprt:client:start');
+            logger.debug(() => `DEBUG [client.startChat]: Model from config: ${model}`);
             let systemInstruction = await getCoreSystemPromptAsync(userMemory, model);
             // Add environment context to system instruction
             const envContextText = envParts
@@ -302,9 +287,7 @@ export class GeminiClient {
             if (envContextText) {
                 systemInstruction = `${envContextText}\n\n${systemInstruction}`;
             }
-            if (process.env.DEBUG) {
-                console.log('DEBUG [client.startChat]: System instruction includes Flash instructions:', systemInstruction.includes('IMPORTANT: You MUST use the provided tools'));
-            }
+            logger.debug(() => `DEBUG [client.startChat]: System instruction includes Flash instructions: ${systemInstruction.includes('IMPORTANT: You MUST use the provided tools')}`);
             const generateContentConfigWithThinking = isThinkingSupported(this.config.getModel())
                 ? {
                     ...this.generateContentConfig,
@@ -465,12 +448,11 @@ export class GeminiClient {
         }
     }
     async *sendMessageStream(request, signal, prompt_id, turns = this.MAX_TURNS, originalModel) {
-        if (process.env.DEBUG) {
-            console.log('DEBUG: GeminiClient.sendMessageStream called');
-            console.log('DEBUG: GeminiClient.sendMessageStream request:', JSON.stringify(request, null, 2));
-            console.log('DEBUG: GeminiClient.sendMessageStream typeof request:', typeof request);
-            console.log('DEBUG: GeminiClient.sendMessageStream Array.isArray(request):', Array.isArray(request));
-        }
+        const logger = new DebugLogger('llxprt:client:stream');
+        logger.debug(() => 'DEBUG: GeminiClient.sendMessageStream called');
+        logger.debug(() => `DEBUG: GeminiClient.sendMessageStream request: ${JSON.stringify(request, null, 2)}`);
+        logger.debug(() => `DEBUG: GeminiClient.sendMessageStream typeof request: ${typeof request}`);
+        logger.debug(() => `DEBUG: GeminiClient.sendMessageStream Array.isArray(request): ${Array.isArray(request)}`);
         await this.lazyInitialize();
         // Ensure chat is initialized after lazyInitialize
         if (!this.chat) {
@@ -507,10 +489,6 @@ export class GeminiClient {
         }
         // Track the original model from the first call to detect model switching
         const initialModel = originalModel || this.config.getModel();
-        const compressed = await this.tryCompressChat(prompt_id);
-        if (compressed) {
-            yield { type: GeminiEventType.ChatCompressed, value: compressed };
-        }
         // Prevent context updates from being sent while a tool call is
         // waiting for a response. The Gemini API requires that a functionResponse
         // part from the user immediately follows a functionCall part from the model
@@ -728,118 +706,39 @@ export class GeminiClient {
             return values;
         });
     }
-    async tryCompressChat(prompt_id, force = false) {
+    /**
+     * Manually trigger chat compression
+     * Returns compression info if successful, null if not needed
+     */
+    async tryCompressChat(prompt_id, _force = false) {
         await this.lazyInitialize();
-        const curatedHistory = this.getChat().getHistory(true);
-        // Regardless of `force`, don't do anything if the history is empty.
-        if (curatedHistory.length === 0) {
+        if (!this.hasChatInitialized()) {
             return null;
         }
-        const model = this.config.getModel();
-        // Use HistoryService's token count for consistency
-        const historyService = this.getHistoryService();
-        let originalTokenCount = 0;
-        if (historyService) {
-            // Wait for any pending token calculations to complete
-            await historyService.recalculateTokens(model);
-            originalTokenCount = historyService.getTotalTokens();
-        }
-        else {
-            // Fallback to content generator if history service not available
-            const countResult = await this.getContentGenerator().countTokens({
-                model,
-                contents: curatedHistory,
-            });
-            originalTokenCount = countResult.totalTokens || 0;
-        }
+        const chat = this.getChat();
+        const historyService = chat.getHistoryService();
+        // Get current token count
+        const originalTokenCount = historyService.getTotalTokens();
         if (originalTokenCount === 0) {
-            this.logger.log(() => `[Warning] Could not determine token count for model ${model}.`);
             return null;
         }
-        const contextPercentageThreshold = this.config.getChatCompression()?.contextPercentageThreshold;
-        // Don't compress if not forced and we are under the limit.
-        if (!force) {
-            const threshold = contextPercentageThreshold ?? this.COMPRESSION_TOKEN_THRESHOLD;
-            const contextLimit = tokenLimit(model, this.userContextLimit);
-            if (originalTokenCount < threshold * contextLimit) {
-                return null;
-            }
-        }
-        // Find the split point based on keeping the most recent 50% of messages
-        // Use a simpler approach: keep the last half of the messages
-        let compressBeforeIndex = Math.floor(curatedHistory.length * (1 - this.COMPRESSION_PRESERVE_THRESHOLD));
-        // Ensure we don't compress everything - keep at least the last 2 turns
-        if (compressBeforeIndex >= curatedHistory.length - 4) {
-            compressBeforeIndex = Math.max(0, curatedHistory.length - 4);
-        }
-        // Find the first user message after the index to ensure we don't split mid-turn
-        while (compressBeforeIndex < curatedHistory.length &&
-            (curatedHistory[compressBeforeIndex]?.role === 'model' ||
-                isFunctionResponse(curatedHistory[compressBeforeIndex]))) {
-            compressBeforeIndex++;
-        }
-        const historyToCompress = curatedHistory.slice(0, compressBeforeIndex);
-        const historyToKeep = curatedHistory.slice(compressBeforeIndex);
-        // Debug logging
-        this.logger.debug(() => `[Compression] Compressing ${historyToCompress.length} messages, keeping ${historyToKeep.length} messages`);
-        this.logger.debug(() => `[Compression] Original token count: ${originalTokenCount}`);
-        this.getChat().setHistory(historyToCompress);
-        const response = await this.getChat().sendMessage({
-            message: {
-                text: 'First, reason in your scratchpad. Then, generate the <state_snapshot>.',
-            },
-            config: {
-                systemInstruction: { text: getCompressionPrompt() },
-            },
-        }, prompt_id);
-        // Extract text from the response using the utility function
-        const summary = getResponseText(response);
-        // Debug: log the summary length
-        if (summary) {
-            this.logger.debug(() => `[Compression] Summary length: ${summary.length} characters`);
-            this.logger.debug(() => `[Compression] Summary preview: ${summary.substring(0, 200)}...`);
-            // Ensure the summary is meaningful (not just empty XML tags)
-            if (summary.length < 100) {
-                this.logger.log(() => '[Warning] [Compression] Summary appears too short, may be incomplete');
+        // Perform compression
+        try {
+            await chat.performCompression(prompt_id);
+            // Get new token count after compression
+            const newTokenCount = historyService.getTotalTokens();
+            // Check if compression actually happened
+            if (newTokenCount < originalTokenCount) {
+                return {
+                    originalTokenCount,
+                    newTokenCount,
+                };
             }
         }
-        else {
-            this.logger.log(() => '[Warning] [Compression] No summary generated');
-            return null;
-        }
-        this.chat = await this.startChat([
-            {
-                role: 'user',
-                parts: [{ text: summary }],
-            },
-            {
-                role: 'model',
-                parts: [{ text: 'Got it. Thanks for the additional context!' }],
-            },
-            ...historyToKeep,
-        ]);
-        this.forceFullIdeContext = true;
-        // Get new token count from the new HistoryService
-        const newHistoryService = this.getHistoryService();
-        let newTokenCount = 0;
-        if (newHistoryService) {
-            // Wait for recalculation to complete
-            await newHistoryService.recalculateTokens(model);
-            newTokenCount = newHistoryService.getTotalTokens();
-        }
-        else {
-            // Fallback
-            const countResult = await this.getContentGenerator().countTokens({
-                model: this.config.getModel(),
-                contents: this.getChat().getHistory(),
-            });
-            newTokenCount = countResult.totalTokens || 0;
+        catch (error) {
+            console.error('Compression failed:', error);
         }
-        this.logger.debug(() => `[Compression] New token count: ${newTokenCount}`);
-        return {
-            originalTokenCount,
-            newTokenCount,
-        };
+        return null;
     }
     /**
      * Handles falling back to Flash model when persistent 429 errors occur for OAuth users.