@nexus-aethra/dshell-usage 0.1.14-alpha.3 → 0.1.14-alpha.4

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2026 Nexus Aethra
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2026 Nexus Aethra
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/lib/index-store.js

@@ -69,27 +69,27 @@ export class UsageStore {
             // drop the columns it does not know, so it stops instead.
             throw new Error(`dshell usage: index at ${this.path} has layout ${String(version)}, this build writes ${String(LAYOUT)}`);
         }
-        this.#db.exec(`
-      CREATE TABLE usage_bucket (
-        day TEXT NOT NULL,
-        provider TEXT NOT NULL,
-        model TEXT NOT NULL,
-        uncached_input INTEGER NOT NULL DEFAULT 0,
-        output INTEGER NOT NULL DEFAULT 0,
-        cache_read INTEGER NOT NULL DEFAULT 0,
-        cache_write INTEGER NOT NULL DEFAULT 0,
-        turns INTEGER NOT NULL DEFAULT 0,
-        PRIMARY KEY (day, provider, model)
-      );
-      CREATE TABLE usage_cursor (
-        session_id TEXT NOT NULL PRIMARY KEY,
-        seq INTEGER NOT NULL
-      );
-      CREATE TABLE usage_meta (
-        key TEXT NOT NULL PRIMARY KEY,
-        value TEXT NOT NULL
-      );
-      PRAGMA user_version = ${String(LAYOUT)};
+        this.#db.exec(`
+      CREATE TABLE usage_bucket (
+        day TEXT NOT NULL,
+        provider TEXT NOT NULL,
+        model TEXT NOT NULL,
+        uncached_input INTEGER NOT NULL DEFAULT 0,
+        output INTEGER NOT NULL DEFAULT 0,
+        cache_read INTEGER NOT NULL DEFAULT 0,
+        cache_write INTEGER NOT NULL DEFAULT 0,
+        turns INTEGER NOT NULL DEFAULT 0,
+        PRIMARY KEY (day, provider, model)
+      );
+      CREATE TABLE usage_cursor (
+        session_id TEXT NOT NULL PRIMARY KEY,
+        seq INTEGER NOT NULL
+      );
+      CREATE TABLE usage_meta (
+        key TEXT NOT NULL PRIMARY KEY,
+        value TEXT NOT NULL
+      );
+      PRAGMA user_version = ${String(LAYOUT)};
     `);
     }
     /** The highest seq already counted for one session, or undefined. */
@@ -111,23 +111,23 @@ export class UsageStore {
     applyBatch(batch) {
         if (batch.rows.length === 0 && batch.cursors.length === 0)
             return;
-        const bucket = this.#db.prepare(`
-      INSERT INTO usage_bucket (day, provider, model, uncached_input, output, cache_read, cache_write, turns)
-      VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-      ON CONFLICT (day, provider, model) DO UPDATE SET
-        uncached_input = uncached_input + excluded.uncached_input,
-        output = output + excluded.output,
-        cache_read = cache_read + excluded.cache_read,
-        cache_write = cache_write + excluded.cache_write,
-        turns = turns + excluded.turns
+        const bucket = this.#db.prepare(`
+      INSERT INTO usage_bucket (day, provider, model, uncached_input, output, cache_read, cache_write, turns)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+      ON CONFLICT (day, provider, model) DO UPDATE SET
+        uncached_input = uncached_input + excluded.uncached_input,
+        output = output + excluded.output,
+        cache_read = cache_read + excluded.cache_read,
+        cache_write = cache_write + excluded.cache_write,
+        turns = turns + excluded.turns
     `);
-        const cursor = this.#db.prepare(`
-      INSERT INTO usage_cursor (session_id, seq) VALUES (?, ?)
-      ON CONFLICT (session_id) DO UPDATE SET seq = excluded.seq
+        const cursor = this.#db.prepare(`
+      INSERT INTO usage_cursor (session_id, seq) VALUES (?, ?)
+      ON CONFLICT (session_id) DO UPDATE SET seq = excluded.seq
     `);
-        const meta = this.#db.prepare(`
-      INSERT INTO usage_meta (key, value) VALUES ('scannedAt', ?)
-      ON CONFLICT (key) DO UPDATE SET value = excluded.value
+        const meta = this.#db.prepare(`
+      INSERT INTO usage_meta (key, value) VALUES ('scannedAt', ?)
+      ON CONFLICT (key) DO UPDATE SET value = excluded.value
     `);
         this.#db.exec('BEGIN');
         try {
@@ -155,10 +155,10 @@ export class UsageStore {
         const bound = days === null ? undefined : localDay(new Date(Date.now() - days * 86_400_000));
         const where = bound === undefined ? '' : 'WHERE day >= ?';
         const args = bound === undefined ? [] : [bound];
-        const dayRows = this.#db.prepare(`
-      SELECT day, provider, model, uncached_input, output, cache_read, cache_write, turns
-      FROM usage_bucket ${where}
-      ORDER BY day, provider, model
+        const dayRows = this.#db.prepare(`
+      SELECT day, provider, model, uncached_input, output, cache_read, cache_write, turns
+      FROM usage_bucket ${where}
+      ORDER BY day, provider, model
     `).all(...args);
         const byDay = dayRows.map(row => ({
             day: String(row.day),
@@ -189,9 +189,9 @@ export class UsageStore {
         // rhythm question ("which days do I burn tokens on") is not the same
         // question as "what did this week cost", and re-shaping the calendar every
         // time the reader moves the range would answer neither.
-        const heat = this.#db.prepare(`
-      SELECT day, sum(uncached_input + output + cache_read + cache_write) AS total, sum(turns) AS turns
-      FROM usage_bucket GROUP BY day ORDER BY day
+        const heat = this.#db.prepare(`
+      SELECT day, sum(uncached_input + output + cache_read + cache_write) AS total, sum(turns) AS turns
+      FROM usage_bucket GROUP BY day ORDER BY day
     `).all().map(row => ({
             day: String(row.day),
             total: Number(row.total),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nexus-aethra/dshell-usage",
-  "version": "0.1.14-alpha.3",
+  "version": "0.1.14-alpha.4",
   "description": "dshell usage: a durable per-model token index over every session's reported usage, and the settings page that charts it.",
   "license": "MIT",
   "repository": {
@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "zod": "4.4.3",
-    "@nexus-aethra/dshell-std": "^0.1.14-alpha.3"
+    "@nexus-aethra/dshell-std": "^0.1.14-alpha.4"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.2",