@sunasteriskrnd/takumi 1.0.0-dev.45 → 1.0.0-dev.47

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.45",
+    version: "1.0.0-dev.47",
     description: "CLI tool for bootstrapping and managing Takumi projects",
     type: "module",
     repository: {
@@ -48344,7 +48344,12 @@ async function runPkceFlow(options2) {
       codeChallenge: run.pair.challenge,
       port: run.port
     });
-    await openBrowser(url);
+    options2.onAuthUrl?.(url);
+    try {
+      await openBrowser(url);
+    } catch (err) {
+      options2.onOpenBrowserError?.(err instanceof Error ? err : new Error(String(err)));
+    }
     const callback = await Promise.race([received, timeoutPromise]);
     const code = callback.searchParams.get("code");
     const callbackState = callback.searchParams.get("state");
@@ -48364,7 +48369,9 @@ var init_pkce_flow = __esm(() => {
   PkceTimeoutError = class PkceTimeoutError extends Error {
     constructor() {
       super(`Login timed out after 90s waiting for browser callback.
-` + "  - Re-run `tkm auth login` if the browser opened but you didn't complete sign-in.\n" + "  - On a headless / WSL2 box without a browser, run `tkm auth login` from your\n" + "    laptop and copy the token file to `<home>/.takumi/auth/token.json`.");
+` + "  - Re-run `tkm auth login` if the browser opened but you didn't complete sign-in.\n" + `  - If the browser didn't open, copy the sign-in link printed above and open it
+` + `    manually in a browser on this machine.
+` + "  - On a headless / WSL2 box without a browser, run `tkm auth login` from your\n" + "    laptop and copy the token file to `<home>/.takumi/auth/token.json`.");
       this.name = "PkceTimeoutError";
     }
   };
@@ -48397,7 +48404,7 @@ async function exchangeCodeForSession(webUrl, code, codeVerifier) {
   }
   return await res.json();
 }
-async function runLoginFlow() {
+async function runLoginFlow(hooks = {}) {
   const serverUrl = getServerUrl();
   const pair = generatePkcePair();
   const state = generateState();
@@ -48405,6 +48412,8 @@ async function runLoginFlow() {
   const callback = await runPkceFlow({
     state,
     pair,
+    onAuthUrl: hooks.onAuthUrl,
+    onOpenBrowserError: hooks.onOpenBrowserError,
     authUrl: ({ state: s, codeChallenge, port }) => `${serverUrl}/cli/auth?state=${encodeURIComponent(s)}` + `&code_challenge=${encodeURIComponent(codeChallenge)}` + `&port=${port}&prompt=1` + `&cli_version=${encodeURIComponent(cliVersion)}`
   });
   const tokens = await exchangeCodeForSession(serverUrl, callback.code, pair.verifier);
@@ -48439,15 +48448,29 @@ function reportLoginError(err) {
 async function login() {
   oe("Takumi login");
   const spinner = de();
-  spinner.start("Opening browser for sign-in (90s timeout)…");
+  let spinning = false;
   try {
-    const result = await runLoginFlow();
-    spinner.stop("Signed in.");
+    const result = await runLoginFlow({
+      onAuthUrl: (url) => {
+        f2.step("Open this link to sign in (copy it if the browser doesn't open):");
+        console.log(`
+  ${url}
+`);
+        spinner.start("Waiting for sign-in in browser (90s timeout)…");
+        spinning = true;
+      },
+      onOpenBrowserError: () => {
+        spinner.message("Browser didn't open — copy the link above to sign in (90s timeout)…");
+      }
+    });
+    if (spinning)
+      spinner.stop("Signed in.");
     if (result.email)
       f2.success(`Signed in as ${result.email}`);
     $e("You're ready to go.");
   } catch (err) {
-    spinner.stop("Login failed.", 1);
+    if (spinning)
+      spinner.stop("Login failed.", 1);
     reportLoginError(err);
     process.exitCode = 1;
   }
@@ -48631,7 +48654,18 @@ async function ensureAuthenticated(options2) {
     if (!mod.runLoginFlow) {
       throw new Error("Login command is not available in this build. Run `tkm auth login` manually.");
     }
-    await mod.runLoginFlow();
+    const { log: log2 } = await Promise.resolve().then(() => (init_dist2(), exports_dist));
+    await mod.runLoginFlow({
+      onAuthUrl: (url) => {
+        log2.step("Open this link to sign in (copy it if the browser doesn't open):");
+        console.log(`
+  ${url}
+`);
+      },
+      onOpenBrowserError: () => {
+        log2.warn("Browser didn't open — copy the link above to sign in.");
+      }
+    });
   });
   await runLogin();
   const token = await getToken({ ...options2, forceConfigRefresh: false });
@@ -53557,6 +53591,44 @@ function tryOpenBrowser(target) {
 init_logger();
 import * as http from "node:http";
 
+// src/domains/sessions/analytics-daily-by-model.ts
+function buildDailyByModel(aggregates, oldestAllowedMs) {
+  const byDayModel = new Map;
+  for (const agg of aggregates) {
+    const ms = startedMs(agg?.startedAt);
+    if (ms === null)
+      continue;
+    const perModel = agg?.tokensByModel;
+    if (!perModel || typeof perModel !== "object")
+      continue;
+    const date = dayKey(ms);
+    if (Date.parse(`${date}T00:00:00.000Z`) < oldestAllowedMs)
+      continue;
+    let byModel = byDayModel.get(date);
+    if (!byModel) {
+      byModel = new Map;
+      byDayModel.set(date, byModel);
+    }
+    for (const [model, mtok] of Object.entries(perModel)) {
+      let acc = byModel.get(model);
+      if (!acc) {
+        acc = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
+        byModel.set(model, acc);
+      }
+      accumulateTokens(acc, normalizeTokens(mtok));
+    }
+  }
+  const rows = [];
+  for (const [date, byModel] of byDayModel) {
+    for (const [model, tokens] of byModel) {
+      if (sumTokens(tokens) > 0)
+        rows.push({ date, model, tokens });
+    }
+  }
+  rows.sort((a3, b3) => a3.date.localeCompare(b3.date) || a3.model.localeCompare(b3.model));
+  return rows;
+}
+
 // src/domains/sessions/analytics.ts
 var DAY_MS = 24 * 60 * 60 * 1000;
 var PER_DAY_MAX = 371;
@@ -53670,6 +53742,7 @@ function foldAnalytics(aggregates, now, range) {
   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 }));
+  const dailyByModel = buildDailyByModel(aggregates, oldestAllowedMs);
   const cacheDenom = totals.cacheRead + totals.input;
   const cacheHitRate = cacheDenom > 0 ? totals.cacheRead / cacheDenom : 0;
   return {
@@ -53691,7 +53764,8 @@ function foldAnalytics(aggregates, now, range) {
       byProject,
       daily,
       byModel,
-      byModelDetailed
+      byModelDetailed,
+      dailyByModel
     },
     window: {
       earliest: earliestMs === null ? null : new Date(earliestMs).toISOString(),

package/package.json

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