berget 2.2.6 → 2.2.7

package/dist/src/utils/opencode-validator.js

@@ -11,12 +11,12 @@ const path_1 = require("path");
 const path_2 = require("path");
 // Load the official OpenCode JSON Schema
 const __dirname = (0, path_2.dirname)(__filename);
-const schemaPath = (0, path_1.join)(__dirname, '..', 'schemas', 'opencode-schema.json');
+const schemaPath = (0, path_1.join)(__dirname, "..", "schemas", "opencode-schema.json");
 let ajv;
 let openCodeSchema;
 let validateFunction;
 try {
-    const schemaContent = (0, fs_1.readFileSync)(schemaPath, 'utf-8');
+    const schemaContent = (0, fs_1.readFileSync)(schemaPath, "utf-8");
     openCodeSchema = JSON.parse(schemaContent);
     // Initialize AJV with formats and options
     ajv = new ajv_1.default({
@@ -32,8 +32,8 @@ try {
     validateFunction = ajv.compile(openCodeSchema);
 }
 catch (error) {
-    console.error('Failed to load OpenCode schema:', error);
-    throw new Error('Could not initialize OpenCode validator');
+    console.error("Failed to load OpenCode schema:", error);
+    throw new Error("Could not initialize OpenCode validator");
 }
 /**
  * Validate OpenCode configuration against the official JSON Schema
@@ -42,7 +42,7 @@ function validateOpenCodeConfig(config) {
     var _a;
     try {
         if (!validateFunction) {
-            return { valid: false, errors: ['Schema validator not initialized'] };
+            return { valid: false, errors: ["Schema validator not initialized"] };
         }
         const isValid = validateFunction(config);
         if (isValid) {
@@ -50,16 +50,16 @@ function validateOpenCodeConfig(config) {
         }
         else {
             const errors = ((_a = validateFunction.errors) === null || _a === void 0 ? void 0 : _a.map((err) => {
-                const path = err.instancePath || err.schemaPath || 'root';
-                const message = err.message || 'Unknown error';
+                const path = err.instancePath || err.schemaPath || "root";
+                const message = err.message || "Unknown error";
                 return `${path}: ${message}`;
-            })) || ['Unknown validation error'];
+            })) || ["Unknown validation error"];
             return { valid: false, errors };
         }
     }
     catch (error) {
-        console.error('Validation error:', error);
-        return { valid: false, errors: ['Validation process failed'] };
+        console.error("Validation error:", error);
+        return { valid: false, errors: ["Validation process failed"] };
     }
 }
 exports.validateOpenCodeConfig = validateOpenCodeConfig;
@@ -69,14 +69,14 @@ exports.validateOpenCodeConfig = validateOpenCodeConfig;
 function fixOpenCodeConfig(config) {
     const fixed = Object.assign({}, config);
     // Fix tools.compact - should be boolean, not object
-    if (fixed.tools && typeof fixed.tools.compact === 'object') {
-        console.warn('⚠️  Converting tools.compact from object to boolean');
+    if (fixed.tools && typeof fixed.tools.compact === "object") {
+        console.warn("⚠️  Converting tools.compact from object to boolean");
         // If it has properties, assume it should be enabled
         fixed.tools.compact = true;
     }
     // Remove invalid properties
-    const invalidProps = ['maxTokens', 'contextWindow'];
-    invalidProps.forEach((prop) => {
+    const invalidProps = ["maxTokens", "contextWindow"];
+    invalidProps.forEach(prop => {
         if (fixed[prop] !== undefined) {
             console.warn(`⚠️  Removing invalid property: ${prop}`);
             delete fixed[prop];
@@ -87,16 +87,13 @@ function fixOpenCodeConfig(config) {
         Object.values(fixed.provider).forEach((provider) => {
             if (provider === null || provider === void 0 ? void 0 : provider.models) {
                 Object.values(provider.models).forEach((model) => {
-                    if (model && typeof model === 'object') {
+                    if (model && typeof model === "object") {
                         // Move maxTokens/contextWindow to proper structure if needed
                         if (model.maxTokens || model.contextWindow) {
                             if (!model.limit)
                                 model.limit = {};
                             // Use the larger of maxTokens/contextWindow for context
-                            const contextValues = [
-                                model.maxTokens,
-                                model.contextWindow,
-                            ].filter(Boolean);
+                            const contextValues = [model.maxTokens, model.contextWindow].filter(Boolean);
                             if (contextValues.length > 0) {
                                 const newContext = Math.max(...contextValues);
                                 if (!model.limit.context || newContext > model.limit.context) {
@@ -110,7 +107,7 @@ function fixOpenCodeConfig(config) {
                             }
                             delete model.maxTokens;
                             delete model.contextWindow;
-                            console.warn('⚠️  Moved maxTokens/contextWindow to limit.context/output');
+                            console.warn("⚠️  Moved maxTokens/contextWindow to limit.context/output");
                         }
                     }
                 });

package/dist/src/utils/token-manager.js

@@ -28,6 +28,27 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const os = __importStar(require("os"));
 const logger_1 = require("./logger");
+/**
+ * Extract the expiration time from a JWT token
+ * @param accessToken The JWT access token
+ * @returns The expiration timestamp in milliseconds, or 0 if invalid
+ */
+function extractJwtExpiresAt(accessToken) {
+    try {
+        const parts = accessToken.split(".");
+        if (parts.length !== 3)
+            return 0;
+        const payload = Buffer.from(parts[1], "base64url").toString("utf8");
+        const decoded = JSON.parse(payload);
+        if (typeof decoded.exp === "number") {
+            return decoded.exp * 1000; // JWT exp is in seconds, convert to milliseconds
+        }
+    }
+    catch (_a) {
+        // If decoding fails, return 0 (treated as expired)
+    }
+    return 0;
+}
 /**
  * Manages authentication tokens including refresh functionality
  */
@@ -35,11 +56,11 @@ class TokenManager {
     constructor() {
         this.tokenData = null;
         // Set up token file path in user's home directory
-        const bergetDir = path.join(os.homedir(), '.berget');
+        const bergetDir = path.join(os.homedir(), ".berget");
         if (!fs.existsSync(bergetDir)) {
             fs.mkdirSync(bergetDir, { recursive: true });
         }
-        this.tokenFilePath = path.join(bergetDir, 'auth.json');
+        this.tokenFilePath = path.join(bergetDir, "auth.json");
         this.loadToken();
     }
     static getInstance() {
@@ -54,12 +75,12 @@ class TokenManager {
     loadToken() {
         try {
             if (fs.existsSync(this.tokenFilePath)) {
-                const data = fs.readFileSync(this.tokenFilePath, 'utf8');
+                const data = fs.readFileSync(this.tokenFilePath, "utf8");
                 this.tokenData = JSON.parse(data);
             }
         }
-        catch (error) {
-            logger_1.logger.error('Failed to load authentication token');
+        catch (_a) {
+            logger_1.logger.error("Failed to load authentication token");
             this.tokenData = null;
         }
     }
@@ -80,8 +101,8 @@ class TokenManager {
                 }
             }
         }
-        catch (error) {
-            logger_1.logger.error('Failed to save authentication token');
+        catch (_a) {
+            logger_1.logger.error("Failed to save authentication token");
         }
     }
     /**
@@ -134,26 +155,32 @@ class TokenManager {
      * Set new token data
      * @param accessToken The new access token
      * @param refreshToken The new refresh token
-     * @param expiresIn Expiration time in seconds
+     * @param expiresIn Expiration time in seconds (fallback if JWT parsing fails)
      */
     setTokens(accessToken, refreshToken, expiresIn) {
+        // Extract the actual expiry time from the JWT token
+        const jwtExpiresAt = extractJwtExpiresAt(accessToken);
+        const expiresAt = jwtExpiresAt > 0 ? jwtExpiresAt : Date.now() + expiresIn * 1000;
         this.tokenData = {
             access_token: accessToken,
             refresh_token: refreshToken,
-            expires_at: Date.now() + expiresIn * 1000,
+            expires_at: expiresAt,
         };
         this.saveToken();
     }
     /**
      * Update just the access token and its expiration
      * @param accessToken The new access token
-     * @param expiresIn Expiration time in seconds
+     * @param expiresIn Expiration time in seconds (fallback if JWT parsing fails)
      */
     updateAccessToken(accessToken, expiresIn) {
         if (!this.tokenData)
             return;
+        // Extract the actual expiry time from the JWT token
+        const jwtExpiresAt = extractJwtExpiresAt(accessToken);
+        const expiresAt = jwtExpiresAt > 0 ? jwtExpiresAt : Date.now() + expiresIn * 1000;
         this.tokenData.access_token = accessToken;
-        this.tokenData.expires_at = Date.now() + expiresIn * 1000;
+        this.tokenData.expires_at = expiresAt;
         this.saveToken();
     }
     /**

package/dist/tests/commands/chat.test.js

@@ -15,15 +15,15 @@ const chat_1 = require("../../src/commands/chat");
 const chat_service_1 = require("../../src/services/chat-service");
 const default_api_key_1 = require("../../src/utils/default-api-key");
 // Mock dependencies
-vitest_1.vi.mock('../../src/services/chat-service');
-vitest_1.vi.mock('../../src/utils/default-api-key');
-vitest_1.vi.mock('readline', () => ({
+vitest_1.vi.mock("../../src/services/chat-service");
+vitest_1.vi.mock("../../src/utils/default-api-key");
+vitest_1.vi.mock("readline", () => ({
     createInterface: vitest_1.vi.fn(() => ({
         question: vitest_1.vi.fn(),
         close: vitest_1.vi.fn(),
     })),
 }));
-(0, vitest_1.describe)('Chat Commands', () => {
+(0, vitest_1.describe)("Chat Commands", () => {
     let program;
     let mockChatService;
     let mockDefaultApiKeyManager;
@@ -46,32 +46,32 @@ vitest_1.vi.mock('readline', () => ({
     (0, vitest_1.afterEach)(() => {
         vitest_1.vi.clearAllMocks();
     });
-    (0, vitest_1.describe)('chat run command', () => {
-        (0, vitest_1.it)('should use berget/glm-4.7 as default model', () => {
-            const chatCommand = program.commands.find((cmd) => cmd.name() === 'chat');
-            const runCommand = chatCommand === null || chatCommand === void 0 ? void 0 : chatCommand.commands.find((cmd) => cmd.name() === 'run');
+    (0, vitest_1.describe)("chat run command", () => {
+        (0, vitest_1.it)("should use berget/glm-4.7 as default model", () => {
+            const chatCommand = program.commands.find(cmd => cmd.name() === "chat");
+            const runCommand = chatCommand === null || chatCommand === void 0 ? void 0 : chatCommand.commands.find(cmd => cmd.name() === "run");
             (0, vitest_1.expect)(runCommand).toBeDefined();
             // Check the help text which contains the default model
             const helpText = runCommand === null || runCommand === void 0 ? void 0 : runCommand.helpInformation();
-            (0, vitest_1.expect)(helpText).toContain('glm-4.7');
+            (0, vitest_1.expect)(helpText).toContain("glm-4.7");
         });
-        (0, vitest_1.it)('should have streaming enabled by default', () => {
-            const chatCommand = program.commands.find((cmd) => cmd.name() === 'chat');
-            const runCommand = chatCommand === null || chatCommand === void 0 ? void 0 : chatCommand.commands.find((cmd) => cmd.name() === 'run');
+        (0, vitest_1.it)("should have streaming enabled by default", () => {
+            const chatCommand = program.commands.find(cmd => cmd.name() === "chat");
+            const runCommand = chatCommand === null || chatCommand === void 0 ? void 0 : chatCommand.commands.find(cmd => cmd.name() === "run");
             (0, vitest_1.expect)(runCommand).toBeDefined();
             // Check that the option is --no-stream (meaning streaming is default)
-            const streamOption = runCommand === null || runCommand === void 0 ? void 0 : runCommand.options.find((opt) => opt.long === '--no-stream');
+            const streamOption = runCommand === null || runCommand === void 0 ? void 0 : runCommand.options.find(opt => opt.long === "--no-stream");
             (0, vitest_1.expect)(streamOption).toBeDefined();
-            (0, vitest_1.expect)(streamOption === null || streamOption === void 0 ? void 0 : streamOption.description).toContain('Disable streaming');
+            (0, vitest_1.expect)(streamOption === null || streamOption === void 0 ? void 0 : streamOption.description).toContain("Disable streaming");
         });
-        (0, vitest_1.it)('should create completion with correct default options', () => __awaiter(void 0, void 0, void 0, function* () {
+        (0, vitest_1.it)("should create completion with correct default options", () => __awaiter(void 0, void 0, void 0, function* () {
             // Mock API key
-            process.env.BERGET_API_KEY = 'test-key';
+            process.env.BERGET_API_KEY = "test-key";
             // Mock successful completion
             mockChatService.createCompletion.mockResolvedValue({
                 choices: [
                     {
-                        message: { content: 'Test response' },
+                        message: { content: "Test response" },
                     },
                 ],
             });
@@ -83,13 +83,13 @@ vitest_1.vi.mock('readline', () => ({
             delete process.env.BERGET_API_KEY;
         }));
     });
-    (0, vitest_1.describe)('chat list command', () => {
-        (0, vitest_1.it)('should list available models', () => __awaiter(void 0, void 0, void 0, function* () {
+    (0, vitest_1.describe)("chat list command", () => {
+        (0, vitest_1.it)("should list available models", () => __awaiter(void 0, void 0, void 0, function* () {
             const mockModels = {
                 data: [
                     {
-                        id: 'gpt-oss',
-                        owned_by: 'openai',
+                        id: "gpt-oss",
+                        owned_by: "openai",
                         active: true,
                         capabilities: {
                             vision: false,
@@ -100,10 +100,10 @@ vitest_1.vi.mock('readline', () => ({
                 ],
             };
             mockChatService.listModels.mockResolvedValue(mockModels);
-            const chatCommand = program.commands.find((cmd) => cmd.name() === 'chat');
-            const listCommand = chatCommand === null || chatCommand === void 0 ? void 0 : chatCommand.commands.find((cmd) => cmd.name() === 'list');
+            const chatCommand = program.commands.find(cmd => cmd.name() === "chat");
+            const listCommand = chatCommand === null || chatCommand === void 0 ? void 0 : chatCommand.commands.find(cmd => cmd.name() === "list");
             (0, vitest_1.expect)(listCommand).toBeDefined();
-            (0, vitest_1.expect)(listCommand === null || listCommand === void 0 ? void 0 : listCommand.description()).toBe('List available chat models');
+            (0, vitest_1.expect)(listCommand === null || listCommand === void 0 ? void 0 : listCommand.description()).toBe("List available chat models");
         }));
     });
 });