@vybestack/llxprt-code-core 0.1.23-nightly.250828.9dff311e → 0.1.23-nightly.250902.c3d3686d

package/README.md

@@ -47,21 +47,6 @@ You have two options to install LLxprt Code.
    npx https://github.com/acoliver/llxprt-code
    ```
 
-### With Homebrew
-
-1. **Prerequisites:** Ensure you have [Homebrew](https://brew.sh/) installed.
-2. **Install the CLI:** Execute the following command in your terminal:
-
-   ```bash
-   brew install llxprt-code
-   ```
-
-   Then, run the CLI from anywhere:
-
-   ```bash
-   llxprt
-   ```
-
 ### Common Configuration Steps
 
 3. **Run and configure:**

package/dist/src/code_assist/codeAssist.js

@@ -9,14 +9,25 @@ import { setupUser } from './setup.js';
 import { CodeAssistServer } from './server.js';
 export async function createCodeAssistContentGenerator(httpOptions, authType, config, baseURL, // Add baseURL parameter
 _sessionId) {
+    console.log(`createCodeAssistContentGenerator: authType=${authType}, config=${!!config}, baseURL=${baseURL}`);
     if (authType === AuthType.LOGIN_WITH_GOOGLE ||
         authType === AuthType.CLOUD_SHELL) {
-        const authClient = await getOauthClient(authType, config);
-        const userData = await setupUser(authClient);
-        return new CodeAssistServer(authClient, userData.projectId, httpOptions, 
-        // PRIVACY FIX: sessionId removed to prevent transmission to Google servers
-        // sessionId, // removed
-        userData.userTier, baseURL);
+        try {
+            console.log(`createCodeAssistContentGenerator: calling getOauthClient for authType ${authType}`);
+            const authClient = await getOauthClient(authType, config);
+            console.log(`createCodeAssistContentGenerator: OAuth client created, calling setupUser`);
+            const userData = await setupUser(authClient);
+            console.log(`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);
+            throw error;
+        }
     }
     throw new Error(`Unsupported authType: ${authType}`);
 }

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,IACE,QAAQ,KAAK,QAAQ,CAAC,iBAAiB;QACvC,QAAQ,KAAK,QAAQ,CAAC,WAAW,EACjC,CAAC;QACD,MAAM,UAAU,GAAG,MAAM,cAAc,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC1D,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC,CAAC;QAC7C,OAAO,IAAI,gBAAgB,CACzB,UAAU,EACV,QAAQ,CAAC,SAAS,EAClB,WAAW;QACX,2EAA2E;QAC3E,wBAAwB;QACxB,QAAQ,CAAC,QAAQ,EACjB,OAAO,CACR,CAAC;IACJ,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;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"}

package/dist/src/code_assist/server.js

@@ -35,10 +35,21 @@ export class CodeAssistServer {
         })();
     }
     async generateContent(req, userPromptId) {
-        const resp = await this.requestPost('generateContent', 
-        // PRIVACY FIX: sessionId removed from request to prevent transmission to Google servers
-        toGenerateContentRequest(req, userPromptId, this.projectId), req.config?.abortSignal);
-        return fromGenerateContentResponse(resp);
+        console.log(`CodeAssistServer.generateContent: userPromptId=${userPromptId}, model=${req.model}, projectId=${this.projectId}`);
+        console.log(`CodeAssistServer.generateContent: request contents:`, req.contents);
+        console.log(`CodeAssistServer.generateContent: request config:`, req.config);
+        try {
+            const resp = await this.requestPost('generateContent', 
+            // PRIVACY FIX: sessionId removed from request to prevent transmission to Google servers
+            toGenerateContentRequest(req, userPromptId, this.projectId), req.config?.abortSignal);
+            console.log(`CodeAssistServer.generateContent: request successful`);
+            return fromGenerateContentResponse(resp);
+        }
+        catch (error) {
+            console.log(`CodeAssistServer.generateContent: ERROR during request: ${error}`);
+            console.log(`CodeAssistServer.generateContent: Error details:`, error);
+            throw error;
+        }
     }
     async onboardUser(req) {
         return await this.requestPost('onboardUser', req);

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

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

package/dist/src/code_assist/setup.js

@@ -16,6 +16,7 @@ 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 projectId = process.env.GOOGLE_CLOUD_PROJECT || undefined;
     // PRIVACY FIX: sessionId parameter removed from CodeAssistServer constructor
     const caServer = new CodeAssistServer(client, projectId, {}, undefined);
@@ -24,6 +25,7 @@ export async function setupUser(client) {
         platform: 'PLATFORM_UNSPECIFIED',
         pluginType: 'GEMINI',
     };
+    console.log(`setupUser: created CodeAssistServer, calling loadCodeAssist`);
     const loadRes = await caServer.loadCodeAssist({
         cloudaicompanionProject: projectId,
         metadata: {
@@ -31,16 +33,21 @@ export async function setupUser(client) {
             duetProject: projectId,
         },
     });
+    console.log(`setupUser: loadCodeAssist completed, currentTier=${!!loadRes.currentTier}, cloudaicompanionProject=${loadRes.cloudaicompanionProject}`);
     if (loadRes.currentTier) {
+        console.log(`setupUser: user has current tier: ${loadRes.currentTier.id}`);
         if (!loadRes.cloudaicompanionProject) {
             if (projectId) {
+                console.log(`setupUser: returning with project ID from env: ${projectId}`);
                 return {
                     projectId,
                     userTier: loadRes.currentTier.id,
                 };
             }
+            console.log(`setupUser: throwing ProjectIdRequiredError - no project ID available`);
             throw new ProjectIdRequiredError();
         }
+        console.log(`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":"AAAA;;;;GAIG;AAEH,OAAO,EAKL,UAAU,GACX,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAG/C,MAAM,OAAO,sBAAuB,SAAQ,KAAK;IAC/C;QACE,KAAK,CACH,wHAAwH,CACzH,CAAC;IACJ,CAAC;CACF;AAOD;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,MAAoB;IAClD,OAAO,CAAC,GAAG,CACT,mDAAmD,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,WAAW,EAAE,CACrG,CAAC;IACF,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,SAAS,CAAC;IAChE,6EAA6E;IAC7E,MAAM,QAAQ,GAAG,IAAI,gBAAgB,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;IACxE,MAAM,kBAAkB,GAAmB;QACzC,OAAO,EAAE,iBAAiB;QAC1B,QAAQ,EAAE,sBAAsB;QAChC,UAAU,EAAE,QAAQ;KACrB,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,6DAA6D,CAAC,CAAC;IAE3E,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC;QAC5C,uBAAuB,EAAE,SAAS;QAClC,QAAQ,EAAE;YACR,GAAG,kBAAkB;YACrB,WAAW,EAAE,SAAS;SACvB;KACF,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,CACT,oDAAoD,CAAC,CAAC,OAAO,CAAC,WAAW,6BAA6B,OAAO,CAAC,uBAAuB,EAAE,CACxI,CAAC;IAEF,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;QACxB,OAAO,CAAC,GAAG,CAAC,qCAAqC,OAAO,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC;QAC3E,IAAI,CAAC,OAAO,CAAC,uBAAuB,EAAE,CAAC;YACrC,IAAI,SAAS,EAAE,CAAC;gBACd,OAAO,CAAC,GAAG,CACT,kDAAkD,SAAS,EAAE,CAC9D,CAAC;gBACF,OAAO;oBACL,SAAS;oBACT,QAAQ,EAAE,OAAO,CAAC,WAAW,CAAC,EAAE;iBACjC,CAAC;YACJ,CAAC;YACD,OAAO,CAAC,GAAG,CACT,sEAAsE,CACvE,CAAC;YACF,MAAM,IAAI,sBAAsB,EAAE,CAAC;QACrC,CAAC;QACD,OAAO,CAAC,GAAG,CACT,uDAAuD,OAAO,CAAC,uBAAuB,EAAE,CACzF,CAAC;QACF,OAAO;YACL,SAAS,EAAE,OAAO,CAAC,uBAAuB;YAC1C,QAAQ,EAAE,OAAO,CAAC,WAAW,CAAC,EAAE;SACjC,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IACrC,IAAI,IAAI,CAAC,kCAAkC,IAAI,CAAC,SAAS,EAAE,CAAC;QAC1D,MAAM,IAAI,sBAAsB,EAAE,CAAC;IACrC,CAAC;IAED,IAAI,UAA8B,CAAC;IACnC,IAAI,IAAI,CAAC,EAAE,KAAK,UAAU,CAAC,IAAI,EAAE,CAAC;QAChC,0IAA0I;QAC1I,UAAU,GAAG;YACX,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,uBAAuB,EAAE,SAAS;YAClC,QAAQ,EAAE,kBAAkB;SAC7B,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,UAAU,GAAG;YACX,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,uBAAuB,EAAE,SAAS;YAClC,QAAQ,EAAE;gBACR,GAAG,kBAAkB;gBACrB,WAAW,EAAE,SAAS;aACvB;SACF,CAAC;IACJ,CAAC;IAED,6DAA6D;IAC7D,IAAI,MAAM,GAAG,MAAM,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IACpD,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;QAC9C,MAAM,GAAG,MAAM,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAClD,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,uBAAuB,EAAE,EAAE,EAAE,CAAC;QAClD,IAAI,SAAS,EAAE,CAAC;YACd,OAAO;gBACL,SAAS;gBACT,QAAQ,EAAE,IAAI,CAAC,EAAE;aAClB,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,sBAAsB,EAAE,CAAC;IACrC,CAAC;IAED,OAAO;QACL,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,uBAAuB,CAAC,EAAE;QACrD,QAAQ,EAAE,IAAI,CAAC,EAAE;KAClB,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,GAA2B;IACjD,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,YAAY,IAAI,EAAE,EAAE,CAAC;QAC1C,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IACD,OAAO;QACL,IAAI,EAAE,EAAE;QACR,WAAW,EAAE,EAAE;QACf,EAAE,EAAE,UAAU,CAAC,MAAM;QACrB,kCAAkC,EAAE,IAAI;KACzC,CAAC;AACJ,CAAC"}

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

@@ -0,0 +1,37 @@
+/**
+ * Copyright 2025 Vybestack LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { ContentGenerator } from './contentGenerator.js';
+import { GenerateContentResponse, GenerateContentParameters, CountTokensResponse, CountTokensParameters, EmbedContentResponse, EmbedContentParameters } from '@google/genai';
+import { UserTierId } from '../code_assist/types.js';
+import type { IContent } from '../services/history/IContent.js';
+/**
+ * Adapter that wraps ContentGenerator to work with IContent[]
+ * This allows GeminiChat to pass IContent[] which gets converted
+ * to Content[] format for providers
+ */
+export declare class ContentGeneratorAdapter implements ContentGenerator {
+    private contentGenerator;
+    constructor(contentGenerator: ContentGenerator);
+    generateContent(request: GenerateContentParameters, userPromptId: string): Promise<GenerateContentResponse>;
+    generateContentStream(request: GenerateContentParameters, userPromptId: string): Promise<AsyncGenerator<GenerateContentResponse>>;
+    countTokens(request: CountTokensParameters): Promise<CountTokensResponse>;
+    /**
+     * Helper method to convert IContent[] to Content[] and create request
+     */
+    static createRequest(iContents: IContent[], model: string, config?: Record<string, unknown>): GenerateContentParameters;
+    embedContent(request: EmbedContentParameters): Promise<EmbedContentResponse>;
+    get userTier(): UserTierId | undefined;
+}

package/dist/src/core/ContentGeneratorAdapter.js

@@ -0,0 +1,58 @@
+/**
+ * Copyright 2025 Vybestack LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { ContentConverters } from '../services/history/ContentConverters.js';
+/**
+ * Adapter that wraps ContentGenerator to work with IContent[]
+ * This allows GeminiChat to pass IContent[] which gets converted
+ * to Content[] format for providers
+ */
+export class ContentGeneratorAdapter {
+    contentGenerator;
+    constructor(contentGenerator) {
+        this.contentGenerator = contentGenerator;
+    }
+    async generateContent(request, userPromptId) {
+        // Request should already have the contents set by GeminiChat
+        return this.contentGenerator.generateContent(request, userPromptId);
+    }
+    async generateContentStream(request, userPromptId) {
+        // Request should already have the contents set by GeminiChat
+        return this.contentGenerator.generateContentStream(request, userPromptId);
+    }
+    async countTokens(request) {
+        // Request should already have the contents set by GeminiChat
+        return this.contentGenerator.countTokens(request);
+    }
+    /**
+     * Helper method to convert IContent[] to Content[] and create request
+     */
+    static createRequest(iContents, model, config) {
+        const contents = ContentConverters.toGeminiContents(iContents);
+        return {
+            model,
+            contents,
+            config,
+        };
+    }
+    async embedContent(request) {
+        // Embedding doesn't use history, so just pass through
+        return this.contentGenerator.embedContent(request);
+    }
+    get userTier() {
+        return this.contentGenerator.userTier;
+    }
+}
+//# sourceMappingURL=ContentGeneratorAdapter.js.map

package/dist/src/core/ContentGeneratorAdapter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ContentGeneratorAdapter.js","sourceRoot":"","sources":["../../../src/core/ContentGeneratorAdapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAY7E;;;;GAIG;AACH,MAAM,OAAO,uBAAuB;IACd;IAApB,YAAoB,gBAAkC;QAAlC,qBAAgB,GAAhB,gBAAgB,CAAkB;IAAG,CAAC;IAE1D,KAAK,CAAC,eAAe,CACnB,OAAkC,EAClC,YAAoB;QAEpB,6DAA6D;QAC7D,OAAO,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IACtE,CAAC;IAED,KAAK,CAAC,qBAAqB,CACzB,OAAkC,EAClC,YAAoB;QAEpB,6DAA6D;QAC7D,OAAO,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,WAAW,CACf,OAA8B;QAE9B,6DAA6D;QAC7D,OAAO,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,aAAa,CAClB,SAAqB,EACrB,KAAa,EACb,MAAgC;QAEhC,MAAM,QAAQ,GAAG,iBAAiB,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;QAC/D,OAAO;YACL,KAAK;YACL,QAAQ;YACR,MAAM;SACP,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,OAA+B;QAE/B,sDAAsD;QACtD,OAAO,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC;IACxC,CAAC;CACF"}

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

@@ -8,6 +8,7 @@ import { Turn, ServerGeminiStreamEvent, ChatCompressionInfo } from './turn.js';
 import { Config } from '../config/config.js';
 import { UserTierId } from '../code_assist/types.js';
 import { GeminiChat } from './geminiChat.js';
+import { HistoryService } from '../services/history/HistoryService.js';
 import { ContentGenerator, ContentGeneratorConfig } from './contentGenerator.js';
 /**
  * Returns the index of the content after the fraction of the total characters in the history.
@@ -31,8 +32,8 @@ export declare class GeminiClient {
      */
     private COMPRESSION_TOKEN_THRESHOLD;
     /**
-     * The fraction of the latest chat history to keep. A value of 0.3
-     * means that only the last 30% of the chat history will be kept after compression.
+     * 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;
     /**
@@ -47,6 +48,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
@@ -58,6 +60,11 @@ export declare class GeminiClient {
     getUserTier(): UserTierId | undefined;
     addHistory(content: Content): Promise<void>;
     getChat(): GeminiChat;
+    /**
+     * Get the HistoryService from the current chat session
+     * @returns The HistoryService instance, or null if chat is not initialized
+     */
+    getHistoryService(): HistoryService | null;
     hasChatInitialized(): boolean;
     isInitialized(): boolean;
     getHistory(): Promise<Content[]>;

package/dist/src/core/client.js

@@ -9,10 +9,13 @@ import { getCoreSystemPromptAsync, getCompressionPrompt } from './prompts.js';
 import { getResponseText } from '../utils/generateContentResponseUtilities.js';
 import { reportError } from '../utils/errorReporting.js';
 import { GeminiChat } from './geminiChat.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';
@@ -20,6 +23,7 @@ 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,12 +81,12 @@ export class GeminiClient {
      * 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 = 0.7;
+    COMPRESSION_TOKEN_THRESHOLD = COMPRESSION_TOKEN_THRESHOLD;
     /**
-     * The fraction of the latest chat history to keep. A value of 0.3
-     * means that only the last 30% of the chat history will be kept after compression.
+     * 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 = 0.3;
+    COMPRESSION_PRESERVE_THRESHOLD = COMPRESSION_PRESERVE_THRESHOLD;
     /**
      * User-defined context limit override
      */
@@ -95,8 +99,10 @@ 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()));
         }
@@ -148,17 +154,8 @@ export class GeminiClient {
             throw new Error('Content generator config not initialized. Call config.refreshAuth() first.');
         }
         this.contentGenerator = await createContentGenerator(contentGenConfig, this.config, this.config.getSessionId());
-        // If we have previous history, restore it when creating the chat
-        // This preserves conversation context across auth transitions and chat resumes
-        if (this._previousHistory && this._previousHistory.length > 0) {
-            // Extract the conversation history after the initial environment setup
-            // The first two messages are always the environment context and acknowledgment
-            const conversationHistory = this._previousHistory.slice(2);
-            this.chat = await this.startChat(conversationHistory);
-        }
-        else {
-            this.chat = await this.startChat();
-        }
+        // Don't create chat here - that causes infinite recursion with startChat()
+        // The chat will be created when needed
         // Clear pending config after successful initialization
         // Note: We do NOT clear _previousHistory as it may be needed for the chat context
         this._pendingConfig = undefined;
@@ -185,6 +182,16 @@ export class GeminiClient {
         }
         return this.chat;
     }
+    /**
+     * Get the HistoryService from the current chat session
+     * @returns The HistoryService instance, or null if chat is not initialized
+     */
+    getHistoryService() {
+        if (!this.hasChatInitialized()) {
+            return null;
+        }
+        return this.getChat().getHistoryService();
+    }
     hasChatInitialized() {
         return this.chat !== undefined;
     }
@@ -252,7 +259,8 @@ export class GeminiClient {
         this.getChat().setTools(tools);
     }
     async resetChat() {
-        this.chat = await this.startChat();
+        // Pass the stored history to startChat so it's preserved
+        this.chat = await this.startChat(this._previousHistory);
     }
     async addDirectoryContext() {
         if (!this.chat) {
@@ -265,11 +273,21 @@ export class GeminiClient {
     }
     async startChat(extraHistory) {
         this.forceFullIdeContext = true;
+        // Ensure content generator is initialized before creating chat
+        await this.lazyInitialize();
         const envParts = await getEnvironmentContext(this.config);
         const toolRegistry = this.config.getToolRegistry();
         const toolDeclarations = toolRegistry.getFunctionDeclarations();
         const tools = [{ functionDeclarations: toolDeclarations }];
-        const history = [...(extraHistory ?? [])];
+        // Create HistoryService and add initial history
+        const historyService = new HistoryService();
+        // Add extraHistory if provided
+        if (extraHistory && extraHistory.length > 0) {
+            const currentModel = this.config.getModel();
+            for (const content of extraHistory) {
+                historyService.add(ContentConverters.toIContent(content), currentModel);
+            }
+        }
         try {
             const userMemory = this.config.getUserMemory();
             const model = this.config.getModel();
@@ -299,10 +317,11 @@ export class GeminiClient {
                 systemInstruction,
                 ...generateContentConfigWithThinking,
                 tools,
-            }, history);
+            }, [], // Empty initial history since we're using HistoryService
+            historyService);
         }
         catch (error) {
-            await reportError(error, 'Error initializing chat session.', history, 'startChat');
+            await reportError(error, 'Error initializing chat session.', extraHistory ?? [], 'startChat');
             throw new Error(`Failed to initialize chat: ${getErrorMessage(error)}`);
         }
     }
@@ -453,6 +472,18 @@ export class GeminiClient {
             console.log('DEBUG: GeminiClient.sendMessageStream Array.isArray(request):', Array.isArray(request));
         }
         await this.lazyInitialize();
+        // Ensure chat is initialized after lazyInitialize
+        if (!this.chat) {
+            // If we have previous history, restore it when creating the chat
+            if (this._previousHistory && this._previousHistory.length > 0) {
+                // Extract the conversation history after the initial environment setup
+                const conversationHistory = this._previousHistory.slice(2);
+                this.chat = await this.startChat(conversationHistory);
+            }
+            else {
+                this.chat = await this.startChat();
+            }
+        }
         if (this.lastPromptId !== prompt_id) {
             this.loopDetector.reset(prompt_id);
             this.lastPromptId = prompt_id;
@@ -705,12 +736,24 @@ export class GeminiClient {
             return null;
         }
         const model = this.config.getModel();
-        const { totalTokens: originalTokenCount } = await this.getContentGenerator().countTokens({
-            model,
-            contents: curatedHistory,
-        });
-        if (originalTokenCount === undefined) {
-            console.warn(`Could not determine token count for model ${model}.`);
+        // 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;
+        }
+        if (originalTokenCount === 0) {
+            this.logger.log(() => `[Warning] Could not determine token count for model ${model}.`);
             return null;
         }
         const contextPercentageThreshold = this.config.getChatCompression()?.contextPercentageThreshold;
@@ -722,8 +765,14 @@ export class GeminiClient {
                 return null;
             }
         }
-        let compressBeforeIndex = findIndexAfterFraction(curatedHistory, 1 - this.COMPRESSION_PRESERVE_THRESHOLD);
-        // Find the first user message after the index. This is the start of the next turn.
+        // 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]))) {
@@ -731,8 +780,11 @@ export class GeminiClient {
         }
         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 { text: summary } = await this.getChat().sendMessage({
+        const response = await this.getChat().sendMessage({
             message: {
                 text: 'First, reason in your scratchpad. Then, generate the <state_snapshot>.',
             },
@@ -740,6 +792,21 @@ export class GeminiClient {
                 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');
+            }
+        }
+        else {
+            this.logger.log(() => '[Warning] [Compression] No summary generated');
+            return null;
+        }
         this.chat = await this.startChat([
             {
                 role: 'user',
@@ -752,15 +819,23 @@ export class GeminiClient {
             ...historyToKeep,
         ]);
         this.forceFullIdeContext = true;
-        const { totalTokens: newTokenCount } = await this.getContentGenerator().countTokens({
-            // model might change after calling `sendMessage`, so we get the newest value from config
-            model: this.config.getModel(),
-            contents: this.getChat().getHistory(),
-        });
-        if (newTokenCount === undefined) {
-            console.warn('Could not determine compressed history token count.');
-            return null;
+        // 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;
         }
+        this.logger.debug(() => `[Compression] New token count: ${newTokenCount}`);
         return {
             originalTokenCount,
             newTokenCount,