@polka-codes/cli-shared 0.9.91 → 0.9.93

package/dist/index.js

@@ -50959,12 +50959,12 @@ var toolConfigSchema = exports_external.union([
 var memoryConfigSchema = exports_external.object({
   enabled: exports_external.boolean().optional().default(true),
   type: exports_external.enum(["sqlite", "memory"]).optional().default("sqlite"),
-  path: exports_external.string().optional().default("~/.config/polka-codes/memory.sqlite")
+  path: exports_external.string().optional().default("~/.config/polkacodes/memory/memory.sqlite")
 }).strict().optional();
 var DEFAULT_MEMORY_CONFIG = {
   enabled: true,
   type: "sqlite",
-  path: "~/.config/polka-codes/memory.sqlite"
+  path: "~/.config/polkacodes/memory/memory.sqlite"
 };
 function resolveHomePath(path) {
   if (path.startsWith("~")) {
@@ -52333,6 +52333,7 @@ var writeToFile_default = {
 // ../core/src/UsageMeter.ts
 class UsageMeter {
   #totals = { input: 0, output: 0, cachedRead: 0, cost: 0, messageCount: 0 };
+  #providerMetadataEntries = [];
   #modelInfos;
   #maxMessages;
   #maxCost;
@@ -52414,8 +52415,17 @@ class UsageMeter {
     this.#totals.cachedRead += result.cachedRead || 0;
     this.#totals.cost += result.cost || 0;
     this.#totals.messageCount += 1;
+    if (resp.providerMetadata && Object.keys(resp.providerMetadata).length > 0) {
+      const providerKey = Object.keys(resp.providerMetadata)[0];
+      this.#providerMetadataEntries.push({
+        provider: providerKey || llm.provider,
+        model: llm.modelId,
+        metadata: resp.providerMetadata[providerKey] || resp.providerMetadata,
+        timestamp: Date.now()
+      });
+    }
   }
-  setUsage(newUsage) {
+  setUsage(newUsage, options = {}) {
     if (newUsage.input != null)
       this.#totals.input = newUsage.input;
     if (newUsage.output != null)
@@ -52426,12 +52436,16 @@ class UsageMeter {
       this.#totals.cost = newUsage.cost;
     if (newUsage.messageCount != null)
       this.#totals.messageCount = newUsage.messageCount;
+    if (options.clearMetadata) {
+      this.#providerMetadataEntries = [];
+    }
   }
   incrementMessageCount(n = 1) {
     this.#totals.messageCount += n;
   }
   resetUsage() {
     this.#totals = { input: 0, output: 0, cachedRead: 0, cost: 0, messageCount: 0 };
+    this.#providerMetadataEntries = [];
   }
   isLimitExceeded() {
     const messageCount = this.#maxMessages > 0 && this.#totals.messageCount >= this.#maxMessages;
@@ -52453,6 +52467,37 @@ class UsageMeter {
   get usage() {
     return { ...this.#totals };
   }
+  get providerMetadata() {
+    return [...this.#providerMetadataEntries];
+  }
+  get cacheStats() {
+    const entries = this.#providerMetadataEntries;
+    const totalRequests = entries.length;
+    let totalCachedTokens = 0;
+    let requestsWithCache = 0;
+    for (const entry of entries) {
+      const metadata = entry.metadata;
+      if (typeof metadata !== "object" || metadata === null) {
+        continue;
+      }
+      const cachedTokens = metadata.cachedPromptTokens ?? metadata.cacheReadTokens ?? metadata.prompt_cache_hit_tokens ?? 0;
+      if (cachedTokens > 0) {
+        totalCachedTokens += cachedTokens;
+        requestsWithCache++;
+      }
+    }
+    const cacheHitRate = totalRequests > 0 ? requestsWithCache / totalRequests : 0;
+    return {
+      totalCachedTokens,
+      totalRequests,
+      requestsWithCache,
+      cacheHitRate,
+      entries: [...this.#providerMetadataEntries]
+    };
+  }
+  clearProviderMetadata() {
+    this.#providerMetadataEntries = [];
+  }
   merge(other) {
     const otherUsage = other.usage;
     this.#totals.input += otherUsage.input;
@@ -52460,6 +52505,7 @@ class UsageMeter {
     this.#totals.cachedRead += otherUsage.cachedRead;
     this.#totals.cost += otherUsage.cost;
     this.#totals.messageCount += otherUsage.messageCount;
+    this.#providerMetadataEntries.push(...other.providerMetadata);
   }
   getUsageText() {
     const u = this.usage;
@@ -67431,17 +67477,65 @@ ${content}`;
 import { AsyncLocalStorage as AsyncLocalStorage2 } from "node:async_hooks";
 import { randomUUID } from "node:crypto";
 import { existsSync as existsSync3 } from "node:fs";
-import { mkdir as mkdir2, readFile as readFile3, rename as rename2, writeFile as writeFile2 } from "node:fs/promises";
-import { dirname as dirname3, resolve as resolve5 } from "node:path";
+import { mkdir as mkdir2, readdir, readFile as readFile3, rename as rename2, unlink as unlink2, writeFile as writeFile2 } from "node:fs/promises";
+import { basename as basename2, dirname as dirname3, resolve as resolve5 } from "node:path";
 import { fileURLToPath } from "node:url";
 var import_sql = __toESM(require_sql_wasm(), 1);
 
 class FileLock {
   lockfilePath;
   static LOCK_TIMEOUT = 30000;
+  static CLEANUP_AGE = 600000;
+  static lastCleanupTime = 0;
+  static CLEANUP_THROTTLE = 60000;
   constructor(dbPath) {
     this.lockfilePath = `${dbPath}.lock`;
   }
+  static resetCleanupThrottle() {
+    FileLock.lastCleanupTime = 0;
+  }
+  static async cleanupOldLockFiles(dbPath, maxAge = FileLock.CLEANUP_AGE, force = false) {
+    const now = Date.now();
+    if (!force && now - FileLock.lastCleanupTime < FileLock.CLEANUP_THROTTLE) {
+      return;
+    }
+    FileLock.lastCleanupTime = now;
+    try {
+      const lockDir = dirname3(dbPath);
+      const dbBaseName = basename2(dbPath);
+      const files = await readdir(lockDir);
+      const now2 = Date.now();
+      let cleanedCount = 0;
+      for (const file2 of files) {
+        if (!file2.startsWith(`${dbBaseName}.lock.`)) {
+          continue;
+        }
+        const match = file2.match(/\.lock\.(released|stale|invalid|corrupt)\.(\d+)$/);
+        if (!match) {
+          continue;
+        }
+        const filePath = resolve5(lockDir, file2);
+        const timestamp = Number.parseInt(match[2], 10);
+        const age = now2 - timestamp;
+        if (age > maxAge) {
+          try {
+            await unlink2(filePath);
+            cleanedCount++;
+          } catch (error48) {
+            const errorCode = error48?.code;
+            if (errorCode !== "ENOENT") {
+              console.warn(`[FileLock] Failed to delete old lock file ${file2}: ${error48 instanceof Error ? error48.message : String(error48)}`);
+            }
+          }
+        }
+      }
+      if (cleanedCount > 0) {
+        console.log(`[FileLock] Cleaned up ${cleanedCount} old lock file(s) (older than ${maxAge}ms)`);
+      }
+    } catch (error48) {
+      console.debug(`[FileLock] Cleanup encountered an error: ${error48 instanceof Error ? error48.message : String(error48)}`);
+    }
+  }
   async acquire(retries = 10, delay2 = 100) {
     for (let i2 = 0;i2 < retries; i2++) {
       try {
@@ -67492,6 +67586,8 @@ class FileLock {
   async release() {
     try {
       await rename2(this.lockfilePath, `${this.lockfilePath}.released.${Date.now()}`);
+      const dbPath = this.lockfilePath.slice(0, -5);
+      FileLock.cleanupOldLockFiles(dbPath).catch(() => {});
     } catch (error48) {
       const errorCode = error48.code;
       if (errorCode !== "ENOENT") {
@@ -67574,6 +67670,9 @@ class SQLiteMemoryStore {
   inTransaction = false;
   transactionMutex = new ReentrantMutex;
   fileLock;
+  static resetCleanupThrottle() {
+    FileLock.resetCleanupThrottle();
+  }
   getDbPath() {
     return this.config.path || DEFAULT_MEMORY_CONFIG.path;
   }
@@ -67610,6 +67709,7 @@ class SQLiteMemoryStore {
         if (!existsSync3(dir)) {
           await mkdir2(dir, { recursive: true, mode: 448 });
         }
+        FileLock.cleanupOldLockFiles(dbPath).catch(() => {});
         let dbData;
         if (existsSync3(dbPath)) {
           const lock = this.getFileLock();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polka-codes/cli-shared",
-  "version": "0.9.91",
+  "version": "0.9.93",
   "license": "AGPL-3.0",
   "author": "github@polka.codes",
   "type": "module",
@@ -21,7 +21,7 @@
     "@ai-sdk/provider": "^2.0.1",
     "@ai-sdk/provider-utils": "^3.0.20",
     "@inquirer/prompts": "^8.1.0",
-    "@polka-codes/core": "0.9.89",
+    "@polka-codes/core": "0.9.91",
     "ai": "^5.0.117",
     "chalk": "^5.6.2",
     "ignore": "^7.0.5",
@@ -33,6 +33,7 @@
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.12",
-    "@types/mime-types": "^3.0.1"
+    "@types/mime-types": "^3.0.1",
+    "@types/sql.js": "^1.4.9"
   }
 }