sidekick-shared 0.21.2 → 0.21.4

package/dist/watchers/sqliteWatcher.js

@@ -63,18 +63,30 @@ function normalizeMessage(msg) {
         const model = data.modelID || undefined;
         if (role === 'user') {
             events.push({
-                providerId: 'opencode', type: 'user', timestamp: ts,
-                summary: content || '(user message)', model, raw: data,
+                providerId: 'opencode',
+                type: 'user',
+                timestamp: ts,
+                summary: content || '(user message)',
+                model,
+                raw: data,
             });
         }
         else if (role === 'assistant') {
             events.push({
-                providerId: 'opencode', type: 'assistant', timestamp: ts,
-                summary: content || '(thinking...)', tokens, cost, model, raw: data,
+                providerId: 'opencode',
+                type: 'assistant',
+                timestamp: ts,
+                summary: content || '(thinking...)',
+                tokens,
+                cost,
+                model,
+                raw: data,
             });
         }
     }
-    catch { /* skip malformed */ }
+    catch {
+        /* skip malformed */
+    }
     return events;
 }
 function normalizePart(part) {
@@ -93,13 +105,15 @@ function normalizePart(part) {
             const toolInput = state?.input;
             const input = data.args ? truncate(JSON.stringify(data.args), 80) : '';
             // Include input in raw so PlanExtractor can access raw.input
-            const toolRaw = eventType === 'tool_use'
-                ? { ...data, input: toolInput || {} }
-                : data;
+            const toolRaw = eventType === 'tool_use' ? { ...data, input: toolInput || {} } : data;
             events.push({
-                providerId: 'opencode', type: eventType, timestamp: ts,
+                providerId: 'opencode',
+                type: eventType,
+                timestamp: ts,
                 summary: input ? `${toolName} ${input}` : toolName,
-                toolName, toolInput: input || undefined, raw: toolRaw,
+                toolName,
+                toolInput: input || undefined,
+                raw: toolRaw,
             });
         }
         else if (type === 'text') {
@@ -107,7 +121,9 @@ function normalizePart(part) {
             if (text) {
                 // Wrap raw to include message.content for <proposed_plan> extraction
                 events.push({
-                    providerId: 'opencode', type: 'assistant', timestamp: ts,
+                    providerId: 'opencode',
+                    type: 'assistant',
+                    timestamp: ts,
                     summary: truncate(text, 200),
                     raw: { ...data, message: { content: [{ type: 'text', text }] } },
                 });
@@ -116,7 +132,9 @@ function normalizePart(part) {
                 if (direction) {
                     const syntheticToolName = direction === 'enter' ? 'EnterPlanMode' : 'ExitPlanMode';
                     events.push({
-                        providerId: 'opencode', type: 'tool_use', timestamp: ts,
+                        providerId: 'opencode',
+                        type: 'tool_use',
+                        timestamp: ts,
                         summary: syntheticToolName,
                         toolName: syntheticToolName,
                         raw: { input: { source: 'opencode_text_heuristic' } },
@@ -125,7 +143,9 @@ function normalizePart(part) {
             }
         }
     }
-    catch { /* skip malformed */ }
+    catch {
+        /* skip malformed */
+    }
     return events;
 }
 function extractContent(data) {
@@ -158,7 +178,9 @@ class SqliteSessionWatcher {
         this.callbacks = callbacks;
         this.db = new openCodeDatabase_1.OpenCodeDatabase(path.dirname(dbPath));
     }
-    get isActive() { return this._isActive; }
+    get isActive() {
+        return this._isActive;
+    }
     /** Seek to a timestamp position. Must be called before start(). */
     seekTo(position) {
         this.lastMessageTime = position;
@@ -186,8 +208,12 @@ class SqliteSessionWatcher {
             this.skipToEnd();
         }
         // Watch db and wal files for changes
-        this.watchFile(this.dbPath, (w) => { this.fsWatcher = w; });
-        this.watchFile(this.dbPath + '-wal', (w) => { this.walWatcher = w; });
+        this.watchFile(this.dbPath, (w) => {
+            this.fsWatcher = w;
+        });
+        this.watchFile(this.dbPath + '-wal', (w) => {
+            this.walWatcher = w;
+        });
         // Fallback polling
         this.pollTimer = setInterval(() => {
             if (this._isActive)
@@ -223,10 +249,14 @@ class SqliteSessionWatcher {
             const watcher = fs.watch(filePath, { persistent: false }, () => {
                 this.debouncedPoll();
             });
-            watcher.on('error', () => { });
+            watcher.on('error', () => {
+                /* ignore watch errors */
+            });
             setter(watcher);
         }
-        catch { /* fs.watch not available */ }
+        catch {
+            /* fs.watch not available */
+        }
     }
     debouncedPoll() {
         if (this.debounceTimer)
@@ -239,10 +269,10 @@ class SqliteSessionWatcher {
         const messages = this.db.getMessagesForSession(this.sessionId);
         const parts = this.db.getPartsForSession(this.sessionId);
         if (messages.length > 0) {
-            this.lastMessageTime = Math.max(...messages.map(m => m.time_created));
+            this.lastMessageTime = Math.max(...messages.map((m) => m.time_created));
         }
         if (parts.length > 0) {
-            this.lastPartTime = Math.max(...parts.map(p => p.time_created));
+            this.lastPartTime = Math.max(...parts.map((p) => p.time_created));
         }
     }
     pollNewData() {
@@ -252,7 +282,7 @@ class SqliteSessionWatcher {
             const messages = this.db.getMessagesForSession(this.sessionId);
             const parts = this.db.getPartsForSession(this.sessionId);
             // Emit new messages
-            const newMessages = messages.filter(m => m.time_created > this.lastMessageTime);
+            const newMessages = messages.filter((m) => m.time_created > this.lastMessageTime);
             for (const msg of newMessages) {
                 const events = normalizeMessage(msg);
                 for (const e of events)
@@ -261,7 +291,7 @@ class SqliteSessionWatcher {
                     this.lastMessageTime = msg.time_created;
             }
             // Emit new parts
-            const newParts = parts.filter(p => p.time_created > this.lastPartTime);
+            const newParts = parts.filter((p) => p.time_created > this.lastPartTime);
             for (const part of newParts) {
                 const events = normalizePart(part);
                 for (const e of events)

package/dist/zaiQuota.js

@@ -132,18 +132,14 @@ function resolveZaiTier(configured, accumulated) {
 function inferZaiQuotaState(accumulated, tier, options = {}) {
     const budget = exports.ZAI_TIER_BUDGETS[tier];
     const capturedAt = options.capturedAt ?? new Date().toISOString();
-    const fiveHourUtil = budget.fiveHour > 0
-        ? Math.min((accumulated.fiveHourPrompts / budget.fiveHour) * 100, 200)
-        : 0;
-    const weeklyUtil = budget.weekly > 0
-        ? Math.min((accumulated.weeklyPrompts / budget.weekly) * 100, 200)
-        : 0;
-    const fiveHourResetsAt = options.authoritativeFiveHourResetAt
-        ?? (accumulated.fiveHourStartedAtMs !== null
+    const fiveHourUtil = budget.fiveHour > 0 ? Math.min((accumulated.fiveHourPrompts / budget.fiveHour) * 100, 200) : 0;
+    const weeklyUtil = budget.weekly > 0 ? Math.min((accumulated.weeklyPrompts / budget.weekly) * 100, 200) : 0;
+    const fiveHourResetsAt = options.authoritativeFiveHourResetAt ??
+        (accumulated.fiveHourStartedAtMs !== null
             ? new Date(accumulated.fiveHourStartedAtMs + FIVE_HOUR_MS).toISOString()
             : '');
-    const sevenDayResetsAt = options.authoritativeWeeklyResetAt
-        ?? (accumulated.weeklyStartedAtMs !== null
+    const sevenDayResetsAt = options.authoritativeWeeklyResetAt ??
+        (accumulated.weeklyStartedAtMs !== null
             ? new Date(accumulated.weeklyStartedAtMs + SEVEN_DAY_MS).toISOString()
             : '');
     const fiveHour = {

package/dist/zaiQuotaApi.js

@@ -11,6 +11,7 @@ const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const quotaSnapshots_1 = require("./quotaSnapshots");
+const quota_1 = require("./quota");
 const DEFAULT_ZAI_BASE_URL = 'https://api.z.ai/api/anthropic';
 const QUOTA_PATH = '/api/monitor/usage/quota/limit';
 const DEFAULT_ACCOUNT_ID = 'default';
@@ -39,7 +40,9 @@ function openCodeDataDirCandidates() {
         candidates.push(path_1.default.join(os_1.default.homedir(), 'Library', 'Application Support', 'opencode'));
     }
     else if (process.platform === 'win32') {
-        candidates.push(path_1.default.join(process.env.LOCALAPPDATA || process.env.APPDATA || path_1.default.join(os_1.default.homedir(), 'AppData', 'Local'), 'opencode'));
+        candidates.push(path_1.default.join(process.env.LOCALAPPDATA ||
+            process.env.APPDATA ||
+            path_1.default.join(os_1.default.homedir(), 'AppData', 'Local'), 'opencode'));
     }
     return Array.from(new Set(candidates));
 }
@@ -129,14 +132,14 @@ function quotaStateFromZaiQuotaLimitPayload(payload, capturedAt = new Date().toI
     const data = payload;
     const tokenLimits = tokenLimitEntries(data);
     const fiveHourLimit = tokenLimits.find(isFiveHourLimit) ?? tokenLimits[0];
-    const weeklyLimit = tokenLimits.find(isWeeklyLimit) ?? tokenLimits.find(item => item !== fiveHourLimit);
+    const weeklyLimit = tokenLimits.find(isWeeklyLimit) ?? tokenLimits.find((item) => item !== fiveHourLimit);
     const level = data.data?.level;
     if (!fiveHourLimit || !weeklyLimit) {
         return unavailableZaiQuotaState('z.ai quota API returned no token quota windows.', {
             failureKind: 'unknown',
         }, capturedAt);
     }
-    return {
+    return (0, quota_1.withQuotaProjections)({
         fiveHour: {
             utilization: fiveHourLimit.percentage ?? 0,
             resetsAt: isoFromEpochMs(fiveHourLimit.nextResetTime),
@@ -154,7 +157,11 @@ function quotaStateFromZaiQuotaLimitPayload(payload, capturedAt = new Date().toI
         planType: level,
         limitId: level ? `zai-${level}` : 'zai-coding-plan',
         limitName: displayPlanName(level),
-    };
+    }, {
+        fiveHourWindowMs: quota_1.FIVE_HOUR_WINDOW_MS,
+        sevenDayWindowMs: quota_1.SEVEN_DAY_WINDOW_MS,
+        capturedAt,
+    });
 }
 function parseRetryAfterMs(retryAfter) {
     if (!retryAfter)
@@ -239,8 +246,9 @@ async function fetchZaiQuotaFromApi(options = {}) {
     }
 }
 function enrichZaiQuota(state) {
+    const withProjections = (0, quota_1.withQuotaProjections)(state);
     return {
-        ...state,
+        ...withProjections,
         runtimeProvider: 'zai',
         providerId: 'zai',
         fiveHourLabel: state.fiveHourLabel ?? '5-Hour',

package/dist/zaiQuotaWatcher.js

@@ -251,7 +251,7 @@ class ZaiQuotaWatcher {
         const cutoff = this.now() - SEVEN_DAY_MS;
         if (this.turns.length === 0)
             return;
-        const next = this.turns.filter(turn => turn.timestampMs >= cutoff);
+        const next = this.turns.filter((turn) => turn.timestampMs >= cutoff);
         if (next.length !== this.turns.length) {
             this.turns = next;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sidekick-shared",
-  "version": "0.21.2",
+  "version": "0.21.4",
   "description": "Shared data access layer for Sidekick — readers, types, providers, credentials, quota",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -55,6 +55,8 @@
     "clean": "rm -rf dist",
     "lint": "eslint src/",
     "lint:fix": "eslint src/ --fix",
+    "format": "prettier --config ../prettier.config.cjs --ignore-path ../.prettierignore --write \"src/**/*.{ts,tsx,js,jsx,json,md,css,html,yml,yaml}\" \"*.{js,cjs,mjs,json,md,yml,yaml}\"",
+    "format:check": "prettier --config ../prettier.config.cjs --ignore-path ../.prettierignore --check \"src/**/*.{ts,tsx,js,jsx,json,md,css,html,yml,yaml}\" \"*.{js,cjs,mjs,json,md,yml,yaml}\"",
     "pretest": "npm run build",
     "test": "vitest run",
     "test:watch": "vitest",
@@ -64,9 +66,10 @@
     "@eslint/js": "^9.0.0",
     "@types/node": "^22.0.0",
     "eslint": "^9.0.0",
+    "prettier": "3.8.4",
     "typescript": "^5.7.0",
     "typescript-eslint": "^8.0.0",
-    "vitest": "^3.0.0"
+    "vitest": "^4.1.9"
   },
   "license": "MIT",
   "dependencies": {