@sunasteriskrnd/takumi 1.0.0-dev.42 → 1.0.0-dev.44

package/dist/index.js

@@ -19815,7 +19815,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@sunasteriskrnd/takumi",
-    version: "1.0.0-dev.42",
+    version: "1.0.0-dev.44",
     description: "CLI tool for bootstrapping and managing Takumi projects",
     type: "module",
     repository: {
@@ -37591,6 +37591,13 @@ var init_install_error_handler = __esm(() => {
 
 // src/services/package-installer/skills-installer.ts
 import { join as join38 } from "node:path";
+function buildSkillsScriptEnv() {
+  return {
+    ...process.env,
+    NON_INTERACTIVE: "1",
+    TAKUMI_CLI_VERSION: getPackageVersion2()
+  };
+}
 async function installSkillsDependencies(skillsDir, options2 = {}) {
   const { skipConfirm = false, withSudo = false } = options2;
   const displayName = "Skills Dependencies";
@@ -37687,7 +37694,7 @@ async function installSkillsDependencies(skillsDir, options2 = {}) {
       logger.info("Installation cancelled by user");
       logger.info("");
       logger.info("\uD83D\uDCD6 Manual Installation Instructions:");
-      logger.info(`  ${platform3 === "win32" ? `powershell -File "${scriptPath}"` : `bash ${scriptPath}`}`);
+      logger.info(`  ${platform3 === "win32" ? `$env:TKM_SKIP_CLI_VERSION_CHECK=1; powershell -File "${scriptPath}"` : `TKM_SKIP_CLI_VERSION_CHECK=1 bash ${scriptPath}`}`);
       logger.info("");
       logger.info("Or see complete guide:");
       logger.info(`  ${join38(skillsDir, "INSTALLATION.md")}`);
@@ -37760,10 +37767,7 @@ async function installSkillsDependencies(skillsDir, options2 = {}) {
         }
       }
     }
-    const scriptEnv = {
-      ...process.env,
-      NON_INTERACTIVE: "1"
-    };
+    const scriptEnv = buildSkillsScriptEnv();
     if (platform3 === "win32") {
       await executeInteractiveScript("powershell.exe", ["-NoLogo", "-ExecutionPolicy", "Bypass", "-File", scriptPath, "-Y"], {
         timeout: 600000,
@@ -37847,6 +37851,7 @@ async function handleSkillsInstallation(skillsDir, options2 = {}) {
   }
 }
 var init_skills_installer = __esm(() => {
+  init_version_display();
   init_environment();
   init_logger();
   init_install_error_handler();
@@ -53480,6 +53485,7 @@ function tryOpenBrowser(target) {
 }
 
 // src/domains/sessions/server.ts
+init_logger();
 import * as http from "node:http";
 
 // src/domains/sessions/analytics.ts
@@ -53516,16 +53522,26 @@ function accumulateTokens(a3, b3) {
   a3.cacheRead += b3.cacheRead;
   a3.cacheWrite += b3.cacheWrite;
 }
-function buildLast30(byDay, now) {
+function buildDenseWindow(byDay, startDayMs, endDayMs) {
   const out = [];
-  const todayMs = Date.parse(`${dayKey(now)}T00:00:00.000Z`);
-  for (let i = LAST_N_DAYS - 1;i >= 0; i -= 1) {
-    const date = dayKey(todayMs - i * DAY_MS);
+  for (let ms = startDayMs;ms <= endDayMs; ms += DAY_MS) {
+    const date = dayKey(ms);
     out.push({ date, count: byDay.get(date) ?? 0 });
   }
   return out;
 }
-function foldAnalytics(aggregates, now) {
+function windowBounds(now, range) {
+  if (!range) {
+    const todayMs = Date.parse(`${dayKey(now)}T00:00:00.000Z`);
+    return { start: todayMs - (LAST_N_DAYS - 1) * DAY_MS, end: todayMs };
+  }
+  const lo = Math.min(range.from, range.to);
+  const hi = Math.max(range.from, range.to);
+  const end = Date.parse(`${dayKey(hi)}T00:00:00.000Z`);
+  const start = Math.max(Date.parse(`${dayKey(lo)}T00:00:00.000Z`), end - (PER_DAY_MAX - 1) * DAY_MS);
+  return { start, end };
+}
+function foldAnalytics(aggregates, now, range) {
   const totals = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
   const eventsByDay = new Map;
   const tokensByDow = new Map;
@@ -53580,7 +53596,8 @@ function foldAnalytics(aggregates, now) {
   const perDay = [...eventsByDay.entries()].filter(([date]) => Date.parse(`${date}T00:00:00.000Z`) >= oldestAllowedMs).map(([date, count]) => ({ date, count })).sort((a3, b3) => a3.date.localeCompare(b3.date));
   const byProjectAll = [...tokensByProject.entries()].map(([label, tokens]) => ({ label, tokens })).sort((a3, b3) => b3.tokens - a3.tokens || a3.label.localeCompare(b3.label));
   const byProject = byProjectAll.slice(0, TOP_PROJECTS);
-  const daily = buildLast30(tokensByDay, now);
+  const { start: windowStart, end: windowEnd } = windowBounds(now, range);
+  const daily = buildDenseWindow(tokensByDay, windowStart, windowEnd);
   const rankedModels = [...tokensByModel.entries()].map(([label, tokens]) => ({ label, tokens, total: sumTokens(tokens) })).filter((m2) => m2.total > 0).sort((a3, b3) => b3.total - a3.total || a3.label.localeCompare(b3.label)).slice(0, TOP_PROJECTS);
   const byModel = rankedModels.map(({ label, total }) => ({ label, tokens: total }));
   const byModelDetailed = rankedModels.map(({ label, tokens }) => ({ label, tokens }));
@@ -53597,7 +53614,7 @@ function foldAnalytics(aggregates, now) {
     events: {
       total: eventTotal,
       perDay,
-      last30: buildLast30(eventsByDay, now)
+      last30: buildDenseWindow(eventsByDay, windowStart, windowEnd)
     },
     tokens: {
       byType: { ...totals },
@@ -54907,6 +54924,24 @@ function invalidate() {
   }
 }
 
+// src/domains/sessions/session-meta-filter.ts
+function filterSessionMetas(metas, filter) {
+  return metas.filter((m2) => {
+    if (filter.project !== undefined && m2.project !== filter.project)
+      return false;
+    if (filter.from === undefined && filter.to === undefined)
+      return true;
+    const ms = m2.startedAt === null ? Number.NaN : Date.parse(m2.startedAt);
+    if (Number.isNaN(ms))
+      return false;
+    if (filter.from !== undefined && ms < filter.from)
+      return false;
+    if (filter.to !== undefined && ms > filter.to)
+      return false;
+    return true;
+  });
+}
+
 // src/domains/sessions/store/ingest.ts
 import { createHash as createHash9 } from "node:crypto";
 import { closeSync as closeSync4, openSync as openSync4, readSync as readSync4, readdirSync as readdirSync6, statSync as statSync5 } from "node:fs";
@@ -64671,6 +64706,32 @@ async function readStoreAggregates(db) {
     get2(r2.session_id).agentCount += Number(r2.n ?? 0);
   return map;
 }
+async function attachSessionTokenTotals(db, list2) {
+  const totals = await readSessionTokenTotals(db);
+  return list2.map((s) => {
+    const tokens = totals.get(s.id);
+    return tokens ? { ...s, tokens } : s;
+  });
+}
+async function readSessionTokenTotals(db) {
+  const rows = await db.selectFrom("event").where("type", "=", "tokens").select((eb) => [
+    "session_id",
+    eb.fn.sum("input").as("input"),
+    eb.fn.sum("output").as("output"),
+    eb.fn.sum("cache_read").as("cache_read"),
+    eb.fn.sum("cache_write").as("cache_write")
+  ]).groupBy("session_id").execute();
+  const map = new Map;
+  for (const r2 of rows) {
+    map.set(r2.session_id, {
+      input: Number(r2.input ?? 0),
+      output: Number(r2.output ?? 0),
+      cacheCreate: Number(r2.cache_write ?? 0),
+      cacheRead: Number(r2.cache_read ?? 0)
+    });
+  }
+  return map;
+}
 function buildAggregatesFromStore(sessions, store) {
   return sessions.map((s) => {
     const a3 = store.get(s.id) ?? emptyStoreAggregate();
@@ -64687,30 +64748,52 @@ function buildAggregatesFromStore(sessions, store) {
 }
 
 // src/domains/sessions/analytics-source.ts
-var cache2 = null;
+var DAY_MS2 = 24 * 60 * 60 * 1000;
+var DEFAULT_WINDOW_DAYS = 30;
+var cache2 = new Map;
 var storeHandle = null;
 function setStore(handle) {
   storeHandle = handle;
 }
 function invalidate2() {
-  cache2 = null;
+  cache2 = new Map;
+}
+var cacheKey = (o2) => `${o2.from ?? ""}|${o2.to ?? ""}|${o2.project === undefined ? "" : `p:${o2.project}`}`;
+function rangeOf(o2, now) {
+  if (o2.from === undefined && o2.to === undefined)
+    return;
+  const to = o2.to ?? now;
+  const from = o2.from ?? to - (DEFAULT_WINDOW_DAYS - 1) * DAY_MS2;
+  return { from, to };
 }
-async function computeFromStore(handle, refresh2, now) {
+async function computeFromStore(handle, opts, now) {
+  const refresh2 = opts.refresh ?? false;
   if (refresh2)
     await ingestAll(handle, { refresh: true });
   const sessions = await list({ refresh: refresh2 });
+  const metas = filterSessionMetas(sessions.map((s) => ({ id: s.id, startedAt: s.startedAt, project: s.project })), { from: opts.from, to: opts.to, project: opts.project });
   const storeAggs = await readStoreAggregates(handle.db);
-  const metas = sessions.map((s) => ({ id: s.id, startedAt: s.startedAt, project: s.project }));
-  return foldAnalytics(buildAggregatesFromStore(metas, storeAggs), now);
+  const payload = foldAnalytics(buildAggregatesFromStore(metas, storeAggs), now, rangeOf(opts, now));
+  return {
+    ...payload,
+    filters: {
+      from: opts.from ?? null,
+      to: opts.to ?? null,
+      project: opts.project ?? null
+    }
+  };
 }
 async function getAnalytics(opts = {}) {
-  if (cache2 && !opts.refresh)
-    return cache2;
+  const key = cacheKey(opts);
+  const hit = cache2.get(key);
+  if (hit && !opts.refresh)
+    return hit;
   if (!storeHandle)
     throw new StoreUnavailableError;
   const now = Date.now();
-  cache2 = await computeFromStore(storeHandle, opts.refresh ?? false, now);
-  return cache2;
+  const payload = await computeFromStore(storeHandle, opts, now);
+  cache2.set(key, payload);
+  return payload;
 }
 
 // src/domains/sessions/origin-allowlist.ts
@@ -64738,13 +64821,33 @@ function isAllowedOrigin(origin) {
   return LOOPBACK_HOST_PATTERN.test(origin);
 }
 
+// src/domains/sessions/range-params.ts
+function intParam(search, key) {
+  const raw = search.get(key);
+  if (raw === null || raw === "")
+    return;
+  const n = Number(raw);
+  if (!Number.isInteger(n) || n < 0)
+    return { error: `invalid ${key}: ${raw}` };
+  return n;
+}
+function parseRangeProjectParams(search) {
+  const from = intParam(search, "from");
+  if (typeof from === "object")
+    return from;
+  const to = intParam(search, "to");
+  if (typeof to === "object")
+    return to;
+  return { from, to, project: search.get("project") || undefined };
+}
+
 // src/domains/sessions/store/bridge-store.ts
 init_logger();
 
 // src/domains/sessions/store/prune.ts
 import { existsSync as existsSync34, statSync as statSync6 } from "node:fs";
 init_logger();
-var DAY_MS2 = 24 * 60 * 60 * 1000;
+var DAY_MS3 = 24 * 60 * 60 * 1000;
 var DEFAULT_RETENTION_DAYS = 180;
 var SIZE_DELETE_BATCH = 500;
 var SIZE_PRUNE_MAX_ITERS = 200;
@@ -64770,7 +64873,7 @@ async function runPrune(handle, opts = {}) {
   const now = opts.now ?? Date.now();
   const retentionDays = opts.retentionDays ?? DEFAULT_RETENTION_DAYS;
   const dbPath = opts.dbPath ?? getConsoleStorePath();
-  const cutoff = now - retentionDays * DAY_MS2;
+  const cutoff = now - retentionDays * DAY_MS3;
   await db.deleteFrom("event").where("ts", "<", cutoff).execute();
   if (opts.maxSizeMb && opts.maxSizeMb > 0) {
     const cap = opts.maxSizeMb * 1024 * 1024;
@@ -64948,6 +65051,17 @@ async function attachStore(deps = {}) {
 }
 
 // src/domains/sessions/server.ts
+var tokenStore = null;
+async function withTokenTotals(list2) {
+  if (!tokenStore)
+    return list2;
+  try {
+    return await attachSessionTokenTotals(tokenStore.db, list2);
+  } catch (err) {
+    logger.verbose(`console bridge: token totals enrichment failed (${String(err)})`);
+    return list2;
+  }
+}
 var PORT_BUMP_MAX = 9;
 function applyCorsHeaders(req, res) {
   const origin = req.headers.origin;
@@ -65005,15 +65119,20 @@ async function route(req, res, version3) {
     if (refresh2)
       invalidate();
     const list2 = await list({ refresh: refresh2 });
-    sendJSON(res, 200, list2);
+    sendJSON(res, 200, await withTokenTotals(list2));
     return;
   }
   if (pathname === "/api/analytics") {
     const refresh2 = url.searchParams.get("refresh") === "1";
+    const rp = parseRangeProjectParams(url.searchParams);
+    if ("error" in rp) {
+      sendJSON(res, 400, { error: rp.error });
+      return;
+    }
     if (refresh2)
       invalidate2();
     try {
-      const payload = await getAnalytics({ refresh: refresh2 });
+      const payload = await getAnalytics({ refresh: refresh2, ...rp });
       sendJSON(res, 200, payload);
     } catch (err) {
       if (err instanceof StoreUnavailableError) {
@@ -65086,6 +65205,7 @@ function start(options2 = {}) {
             close: async () => {
               if (attached) {
                 setStore(null);
+                tokenStore = null;
                 await attached.stop().catch(() => {});
               }
               await closeServer();
@@ -65096,8 +65216,10 @@ function start(options2 = {}) {
         };
         const doAttach = options2.attachStore ?? attachStore;
         doAttach({ onInvalidate: () => invalidate2() }).then((attached) => {
-          if (attached)
+          if (attached) {
             setStore(attached.handle);
+            tokenStore = attached.handle;
+          }
           finish(attached);
         }).catch(() => finish(null));
       });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sunasteriskrnd/takumi",
-	"version": "1.0.0-dev.42",
+	"version": "1.0.0-dev.44",
 	"description": "CLI tool for bootstrapping and managing Takumi projects",
 	"type": "module",
 	"repository": {