@scrylog/cli 0.3.0 → 0.3.1

package/src/usage/local/opencode-go-local.ts

@@ -1,194 +0,0 @@
-import { Database } from "bun:sqlite";
-import { resolveDbCandidates } from "../../daemon/collectors/opencode-db";
-import type { OpenCodeGoUsageSnapshot } from "../types";
-
-const FIVE_HOURS_SEC = 5 * 60 * 60;
-const WEEK_SEC = 7 * 24 * 60 * 60;
-const SESSION_LIMIT_USD = 12;
-const WEEKLY_LIMIT_USD = 30;
-const MONTHLY_LIMIT_USD = 60;
-
-export interface OpenCodeGoLocalUsageFetcher {
-  fetch(now?: Date): Promise<OpenCodeGoUsageSnapshot | null>;
-}
-
-interface UsageRow {
-  createdMs: number;
-  cost: number;
-}
-
-const MESSAGE_USAGE_SQL = `
-  SELECT
-    CAST(COALESCE(json_extract(data, '$.time.created'), time_created) AS INTEGER) AS createdMs,
-    CAST(json_extract(data, '$.cost') AS REAL) AS cost
-  FROM message
-  WHERE json_valid(data)
-    AND json_extract(data, '$.providerID') = 'opencode-go'
-    AND json_extract(data, '$.role') = 'assistant'
-    AND json_type(data, '$.cost') IN ('integer', 'real')
-`;
-
-const MESSAGE_AND_PART_USAGE_SQL = `
-  WITH provider_messages AS (
-    SELECT
-      id AS messageID,
-      CAST(COALESCE(json_extract(data, '$.time.created'), time_created) AS INTEGER) AS createdMs,
-      CAST(json_extract(data, '$.cost') AS REAL) AS cost,
-      json_type(data, '$.cost') IN ('integer', 'real') AS hasCost
-    FROM message
-    WHERE json_valid(data)
-      AND json_extract(data, '$.providerID') = 'opencode-go'
-      AND json_extract(data, '$.role') = 'assistant'
-  )
-  SELECT
-    CAST(COALESCE(json_extract(p.data, '$.time.created'), p.time_created, m.createdMs) AS INTEGER) AS createdMs,
-    CAST(json_extract(p.data, '$.cost') AS REAL) AS cost
-  FROM part p
-  JOIN provider_messages m ON m.messageID = p.message_id
-  WHERE json_valid(p.data)
-    AND json_extract(p.data, '$.type') = 'step-finish'
-    AND json_type(p.data, '$.cost') IN ('integer', 'real')
-  UNION ALL
-  SELECT createdMs, cost
-  FROM provider_messages m
-  WHERE hasCost
-    AND NOT EXISTS (
-      SELECT 1
-      FROM part p
-      WHERE p.message_id = m.messageID
-        AND json_valid(p.data)
-        AND json_extract(p.data, '$.type') = 'step-finish'
-        AND json_type(p.data, '$.cost') IN ('integer', 'real')
-    )
-`;
-
-export class OpenCodeGoLocalUsageReader implements OpenCodeGoLocalUsageFetcher {
-  async fetch(now: Date = new Date()): Promise<OpenCodeGoUsageSnapshot | null> {
-    for (const dbPath of resolveDbCandidates()) {
-      let db: Database | undefined;
-      try {
-        db = new Database(dbPath, { readonly: true });
-        const rows = readLocalRows(db);
-        if (rows.length > 0) {
-          return buildLocalSnapshot(rows, now);
-        }
-      } catch {
-        // Missing or corrupt databases are not usable local usage sources.
-      } finally {
-        db?.close();
-      }
-    }
-    return null;
-  }
-}
-
-function readLocalRows(db: Database): UsageRow[] {
-  const partMatch = db
-    .query<unknown, [string]>("SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = ? LIMIT 1")
-    .get("part");
-  // bun:sqlite returns null (not undefined) when a row cannot be resolved.
-  const hasPartTable = partMatch !== null && partMatch !== undefined;
-  const statement = db.query<RowShape, []>(hasPartTable ? MESSAGE_AND_PART_USAGE_SQL : MESSAGE_USAGE_SQL);
-  const rows: UsageRow[] = [];
-  for (const row of statement.all()) {
-    const createdMs = Number(row.createdMs);
-    const cost = Number(row.cost);
-    if (Number.isFinite(createdMs) && createdMs > 0 && Number.isFinite(cost) && cost >= 0) {
-      rows.push({ createdMs, cost });
-    }
-  }
-  return rows;
-}
-
-interface RowShape {
-  createdMs: number | null;
-  cost: number | null;
-}
-
-interface MonthBounds {
-  startMs: number;
-  endMs: number;
-}
-
-export function buildLocalSnapshot(rows: UsageRow[], now: Date): OpenCodeGoUsageSnapshot {
-  const nowMs = now.getTime();
-  const sessionStartMs = nowMs - FIVE_HOURS_SEC * 1000;
-  const weekStartMs = startOfUtcWeek(now).getTime();
-  const weekEndMs = weekStartMs + WEEK_SEC * 1000;
-  const { startMs, endMs } = monthBounds(now, rows);
-
-  let sessionCost = 0;
-  let weekCost = 0;
-  let monthCost = 0;
-  let oldestSessionMs: number | undefined;
-  for (const row of rows) {
-    if (row.createdMs >= sessionStartMs && row.createdMs < nowMs) {
-      sessionCost += row.cost;
-      if (oldestSessionMs === undefined || row.createdMs < oldestSessionMs) oldestSessionMs = row.createdMs;
-    }
-    if (row.createdMs >= weekStartMs && row.createdMs < weekEndMs) {
-      weekCost += row.cost;
-    }
-    if (row.createdMs >= startMs && row.createdMs < endMs) {
-      monthCost += row.cost;
-    }
-  }
-
-  const oldestSession = oldestSessionMs ?? nowMs;
-  return {
-    source: "local",
-    hasMonthlyUsage: true,
-    rollingUsagePercent: percentOf(sessionCost, SESSION_LIMIT_USD),
-    weeklyUsagePercent: percentOf(weekCost, WEEKLY_LIMIT_USD),
-    monthlyUsagePercent: percentOf(monthCost, MONTHLY_LIMIT_USD),
-    rollingResetInSec: Math.max(0, Math.round((oldestSession + FIVE_HOURS_SEC * 1000 - nowMs) / 1000)),
-    weeklyResetInSec: Math.max(0, Math.round((weekEndMs - nowMs) / 1000)),
-    monthlyResetInSec: Math.max(0, Math.round((endMs - nowMs) / 1000)),
-    updatedAt: now,
-    workspaceId: null,
-    workspaceName: null,
-  };
-}
-
-function percentOf(used: number, limit: number): number {
-  if (!Number.isFinite(used) || limit <= 0) return 0;
-  return Math.max(0, Math.min(100, Math.round((used / limit) * 1000) / 10));
-}
-
-function startOfUtcWeek(now: Date): Date {
-  const midnight = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate()));
-  const weekdayIndex = (midnight.getUTCDay() + 6) % 7; // Monday = 0
-  return new Date(midnight.getTime() - weekdayIndex * 24 * 60 * 60 * 1000);
-}
-
-function monthBounds(now: Date, rows: UsageRow[]): MonthBounds {
-  const earliestMs = rows.length > 0 ? Math.min(...rows.map((row) => row.createdMs)) : undefined;
-  const anchor = earliestMs !== undefined ? new Date(earliestMs) : now;
-
-  // Month window anchored to the earliest local row (billing-cycle estimate),
-  // mirroring CodexBar's OpenCodeGoLocalUsageReader month heuristic.
-  const start = new Date(Date.UTC(
-    now.getUTCFullYear(),
-    now.getUTCMonth(),
-    anchor.getUTCDate(),
-    anchor.getUTCHours(),
-    anchor.getUTCMinutes(),
-    anchor.getUTCSeconds(),
-  ));
-  const shifted = start.getTime() > now.getTime()
-    ? new Date(start.getTime() - 31 * 24 * 60 * 60 * 1000)
-    : start;
-  const end = new Date(Date.UTC(
-    shifted.getUTCFullYear() + (shifted.getUTCMonth() === 11 ? 1 : 0),
-    shifted.getUTCMonth() === 11 ? 0 : shifted.getUTCMonth() + 1,
-    Math.min(shifted.getUTCDate(), daysInUtcMonth(shifted.getUTCFullYear(), shifted.getUTCMonth() === 11 ? 0 : shifted.getUTCMonth() + 1)),
-    shifted.getUTCHours(),
-    shifted.getUTCMinutes(),
-    shifted.getUTCSeconds(),
-  ));
-  return { startMs: shifted.getTime(), endMs: end.getTime() };
-}
-
-function daysInUtcMonth(year: number, month: number): number {
-  return new Date(Date.UTC(year, month + 1, 0)).getUTCDate();
-}

package/src/usage/mappers.ts

@@ -1,282 +0,0 @@
-import type {
-  UsageProviderEntry,
-  UsageWindow,
-  ProviderCostSnapshot,
-  ClaudeUsageSnapshot,
-  CodexUsageSnapshot,
-  OpenCodeGoUsageSnapshot,
-  RateWindowLegacy,
-  ClaudeOAuthCredentials,
-  CodexOAuthCredentials,
-} from "./types";
-
-
-function toIsoString(d: Date | null): string | null {
-  return d && !Number.isNaN(d.getTime()) ? d.toISOString() : null;
-}
-
-function computeResetInSec(resetsAt: string | null | undefined): number | undefined {
-  if (!resetsAt) return undefined;
-  const d = new Date(resetsAt);
-  if (Number.isNaN(d.getTime())) return undefined;
-  return Math.max(0, Math.round(d.getTime() / 1000 - Date.now() / 1000));
-}
-
-function computeResetsAt(resetInSec: number | undefined): string | undefined {
-  if (resetInSec === undefined || resetInSec < 0) return undefined;
-  return new Date(Date.now() + resetInSec * 1000).toISOString();
-}
-
-function mapRateWindowLegacyToWindow(id: string, title: string, rw: RateWindowLegacy | null): UsageWindow | undefined {
-  if (!rw) return undefined;
-  const resetsAt = toIsoString(rw.resetsAt);
-  return {
-    id,
-    title,
-    usedPercent: rw.usedPercent,
-    windowMinutes: rw.windowMinutes,
-    resetsAt,
-    resetInSec: computeResetInSec(resetsAt),
-  };
-}
-
-function simpleHash(input: string): string {
-  let hash = 0;
-  for (let i = 0; i < input.length; i++) {
-    const char = input.charCodeAt(i);
-    hash = ((hash << 5) - hash + char) | 0;
-  }
-  return Math.abs(hash).toString(16).padStart(8, "0");
-}
-
-export function buildClaudeAccountId(
-  snapshot: ClaudeUsageSnapshot | null,
-  oauthCreds: ClaudeOAuthCredentials | null,
-): string | null {
-  // Best source: email from Web API
-  if (snapshot?.accountEmail) {
-    return snapshot.accountEmail;
-  }
-  // Second best: org UUID from Web API (not in snapshot currently, but we can add if needed)
-  // For now, use Keychain metadata as fallback
-  if (oauthCreds?.subscriptionType || oauthCreds?.rateLimitTier) {
-    const parts = ["claude"];
-    if (oauthCreds.subscriptionType) parts.push(oauthCreds.subscriptionType);
-    if (oauthCreds.rateLimitTier) parts.push(oauthCreds.rateLimitTier);
-    if (oauthCreds.scopes && oauthCreds.scopes.length > 0) {
-      // Add a short hash of scopes to distinguish accounts with same tier
-      const scopesHash = simpleHash(oauthCreds.scopes.join(","));
-      parts.push(scopesHash);
-    }
-    return parts.join("-");
-  }
-  return null;
-}
-
-export function mapClaudeToEntry(
-  snapshot: ClaudeUsageSnapshot | null,
-  errors: string[] = [],
-  available: boolean,
-  oauthCreds: ClaudeOAuthCredentials | null,
-): UsageProviderEntry {
-  const base: UsageProviderEntry = {
-    provider: "claude",
-    accountId: buildClaudeAccountId(snapshot, oauthCreds),
-    available,
-    status: snapshot ? "ok" : available ? "error" : "unavailable",
-  };
-
-  if (!snapshot) {
-    if (errors.length > 0) {
-      base.errors = errors;
-    }
-    return base;
-  }
-
-  const windows: UsageWindow[] = [];
-
-  const primary = mapRateWindowLegacyToWindow("session", "Current Session", snapshot.primary);
-  if (primary) windows.push(primary);
-
-  const secondary = mapRateWindowLegacyToWindow("weekly", "Weekly", snapshot.secondary);
-  if (secondary) windows.push(secondary);
-
-  const opus = mapRateWindowLegacyToWindow("opus", "Opus", snapshot.opus);
-  if (opus) windows.push(opus);
-
-  for (const extra of snapshot.extraRateWindows) {
-    const w = mapRateWindowLegacyToWindow(extra.id, extra.title, extra.window);
-    if (w) windows.push(w);
-  }
-
-  let cost: ProviderCostSnapshot | null = null;
-  if (snapshot.providerCost) {
-    cost = {
-      used: snapshot.providerCost.used,
-      limit: snapshot.providerCost.limit,
-      currency: snapshot.providerCost.currencyCode,
-      period: snapshot.providerCost.period,
-      resetsAt: toIsoString(snapshot.providerCost.resetsAt),
-      updatedAt: toIsoString(snapshot.providerCost.updatedAt) ?? new Date().toISOString(),
-    };
-  }
-
-  base.metadata = {
-    dataSource: snapshot.source,
-    accountEmail: snapshot.accountEmail,
-    accountOrganization: snapshot.accountOrganization,
-    subscriptionType: snapshot.subscriptionType,
-    rateLimitTier: snapshot.rateLimitTier,
-  };
-
-  base.windows = windows;
-  base.cost = cost;
-  base.updatedAt = toIsoString(snapshot.updatedAt) ?? new Date().toISOString();
-
-  return base;
-}
-
-export function buildCodexAccountId(
-  snapshot: CodexUsageSnapshot | null,
-  oauthCreds: CodexOAuthCredentials | null,
-): string | null {
-  if (snapshot?.accountId) {
-    return snapshot.accountId;
-  }
-  if (snapshot?.accountEmail) {
-    return snapshot.accountEmail;
-  }
-  if (oauthCreds?.accountId) {
-    return oauthCreds.accountId;
-  }
-  if (oauthCreds?.accountEmail) {
-    return oauthCreds.accountEmail;
-  }
-  if (snapshot?.planType) {
-    return `codex-${snapshot.planType}`;
-  }
-  return null;
-}
-
-export function mapCodexToEntry(
-  snapshot: CodexUsageSnapshot | null,
-  errors: string[] = [],
-  available: boolean,
-  oauthCreds: CodexOAuthCredentials | null,
-): UsageProviderEntry {
-  const base: UsageProviderEntry = {
-    provider: "codex",
-    accountId: buildCodexAccountId(snapshot, oauthCreds),
-    available,
-    status: snapshot ? "ok" : available ? "error" : "unavailable",
-  };
-
-  if (!snapshot) {
-    if (errors.length > 0) {
-      base.errors = errors;
-    }
-    return base;
-  }
-
-  const windows: UsageWindow[] = [];
-
-  const primary = mapRateWindowLegacyToWindow("session", "Current Session", snapshot.primaryWindow);
-  if (primary) windows.push(primary);
-
-  const secondary = mapRateWindowLegacyToWindow("weekly", "Weekly", snapshot.secondaryWindow);
-  if (secondary) windows.push(secondary);
-
-  const balance = snapshot.credits?.hasCredits && !snapshot.credits.unlimited
-    ? snapshot.credits.balance
-    : null;
-  const individualLimit = snapshot.individualLimit;
-  const cost: ProviderCostSnapshot | null = individualLimit || balance !== null
-    ? {
-        used: individualLimit?.used ?? 0,
-        limit: individualLimit?.limit ?? 0,
-        currency: "Credits",
-        period: "Extra usage",
-        ...(balance !== null ? { balance } : {}),
-        resetsAt: toIsoString(individualLimit?.resetsAt ?? null),
-        updatedAt: toIsoString(snapshot.updatedAt) ?? new Date().toISOString(),
-      }
-    : null;
-
-  base.metadata = {
-    dataSource: snapshot.source,
-    accountEmail: snapshot.accountEmail ?? oauthCreds?.accountEmail,
-    subscriptionType: snapshot.planType,
-  };
-
-  if (errors.length > 0) {
-    base.errors = errors;
-  }
-
-  base.windows = windows;
-  base.cost = cost;
-  base.updatedAt = toIsoString(snapshot.updatedAt) ?? new Date().toISOString();
-
-  return base;
-}
-
-export function mapOpenCodeGoToEntry(
-  snapshot: OpenCodeGoUsageSnapshot | null,
-  errors: string[] = [],
-  available: boolean,
-): UsageProviderEntry {
-  const base: UsageProviderEntry = {
-    provider: "opencode-go",
-    accountId: snapshot?.workspaceId ?? null,
-    available,
-    status: snapshot ? (errors.length > 0 ? "error" : "ok") : available ? "error" : "unavailable",
-  };
-
-  if (!snapshot) {
-    if (errors.length > 0) {
-      base.errors = errors;
-    }
-    return base;
-  }
-
-  const windows: UsageWindow[] = [
-    {
-      id: "session",
-      title: "Rolling",
-      usedPercent: snapshot.rollingUsagePercent,
-      resetInSec: snapshot.rollingResetInSec,
-      resetsAt: computeResetsAt(snapshot.rollingResetInSec),
-    },
-    {
-      id: "weekly",
-      title: "Weekly",
-      usedPercent: snapshot.weeklyUsagePercent,
-      resetInSec: snapshot.weeklyResetInSec,
-      resetsAt: computeResetsAt(snapshot.weeklyResetInSec),
-    },
-  ];
-
-  if (snapshot.hasMonthlyUsage) {
-    windows.push({
-      id: "monthly",
-      title: "Monthly",
-      usedPercent: snapshot.monthlyUsagePercent,
-      resetInSec: snapshot.monthlyResetInSec,
-      resetsAt: computeResetsAt(snapshot.monthlyResetInSec),
-    });
-  }
-
-  base.metadata = {
-    dataSource: snapshot.source,
-    workspaceId: snapshot.workspaceId,
-    workspaceName: snapshot.workspaceName,
-  };
-
-  if (errors.length > 0) {
-    base.errors = errors;
-  }
-
-  base.windows = windows;
-  base.updatedAt = toIsoString(snapshot.updatedAt) ?? new Date().toISOString();
-
-  return base;
-}

package/src/usage/planner.ts

@@ -1,118 +0,0 @@
-import type { TokenResolver } from "./resolver";
-import type { ClaudePlannerDecision, ClaudeDataSource, ClaudeOAuthCredentials, ClaudePlannedRoute, ClaudeWebSession } from "./types";
-
-/**
- * Web session resolver with planning-safe operations. Planning only observes
- * the in-memory session cache and cheap import-source checks; browser cookie
- * import happens exclusively when a Web route executes.
- */
-export interface ClaudeWebSourceResolver extends TokenResolver<ClaudeWebSession> {
-  /** Cache-only session resolution; never reads browser stores. */
-  resolveCached(): Promise<ClaudeWebSession | null>;
-  /** True when an import could yield candidates (cheap existence checks). */
-  hasImportSources(): Promise<boolean>;
-}
-
-export interface ClaudeSourcePlannerConfig {
-  dataSource: ClaudeDataSource;
-  webExtrasEnabled: boolean;
-}
-
-export class ClaudeSourcePlanner {
-  constructor(
-    private readonly config: ClaudeSourcePlannerConfig,
-    private readonly oauthResolver: TokenResolver<ClaudeOAuthCredentials>,
-    private readonly webResolver: ClaudeWebSourceResolver,
-    private readonly cliResolver: TokenResolver<string>,
-  ) {}
-
-  async decide(): Promise<ClaudePlannerDecision> {
-    const selected = this.config.dataSource;
-    const webExtras = this.config.webExtrasEnabled;
-
-    if (selected === "oauth") {
-      const oauth = await this.oauthResolver.resolve();
-      if (!oauth) return this.decision([], webExtras);
-      const cachedWeb = await this.webResolver.resolveCached();
-      const routes: ClaudePlannedRoute[] = [{ type: "oauth", credentials: oauth }];
-      if (oauth.owner !== "environment") {
-        const cli = await this.cliResolver.resolve();
-        if (cli) routes.push({ type: "cli", credentials: cli });
-      }
-      return this.decision(routes, webExtras, cachedWeb ?? undefined);
-    }
-    if (selected === "web") {
-      const cachedWeb = await this.webResolver.resolveCached();
-      if (!cachedWeb && !(await this.webResolver.hasImportSources())) {
-        return this.decision([], webExtras);
-      }
-      const routes: ClaudePlannedRoute[] = [{ type: "web", credentials: cachedWeb ?? this.deferredWebSession() }];
-      return this.decision(routes, webExtras, cachedWeb ?? undefined);
-    }
-    if (selected === "cli") {
-      const cli = await this.cliResolver.resolve();
-      const cachedWeb = webExtras ? await this.webResolver.resolveCached() : null;
-      const routes: ClaudePlannedRoute[] = cli ? [{ type: "cli", credentials: cli }] : [];
-      return this.decision(routes, webExtras, cachedWeb ?? undefined);
-    }
-
-    const [oauth, cli] = await Promise.all([
-      this.oauthResolver.resolve(),
-      this.cliResolver.resolve(),
-    ]);
-    const cachedWeb = await this.webResolver.resolveCached();
-    const routes: ClaudePlannedRoute[] = [];
-    const webMayBeAvailable = Boolean(cachedWeb) || (await this.webResolver.hasImportSources());
-    if (oauth) {
-      routes.push({ type: "oauth", credentials: oauth });
-      if (oauth.owner !== "environment") {
-        if (cli) routes.push({ type: "cli", credentials: cli });
-        if (webMayBeAvailable) routes.push({ type: "web", credentials: cachedWeb ?? this.deferredWebSession() });
-      }
-    } else if (webMayBeAvailable) {
-      routes.push({ type: "web", credentials: cachedWeb ?? this.deferredWebSession() });
-      if (cli) routes.push({ type: "cli", credentials: cli });
-    } else if (cli) {
-      routes.push({ type: "cli", credentials: cli });
-    }
-    return this.decision(routes, webExtras, cachedWeb ?? undefined);
-  }
-
-  /**
-   * A planning-safe Web session without a cookie header. The first cursor
-   * advance resolves the session once and returns its imported header;
-   * later advances continue the same cursor so a rejected source is not
-   * re-imported within the attempt.
-   */
-  private deferredWebSession(): ClaudeWebSession {
-    let sessionPromise: Promise<ClaudeWebSession | null> | null = null;
-    let primed = false;
-    return {
-      cookieHeader: "",
-      importNext: async () => {
-        sessionPromise ??= this.webResolver.resolve();
-        const session = await sessionPromise;
-        if (!session) return null;
-        if (!primed) {
-          primed = true;
-          return session.cookieHeader || null;
-        }
-        return session.importNext ? await session.importNext() : null;
-      },
-    };
-  }
-
-  private decision(
-    routes: ClaudePlannedRoute[],
-    webExtras: boolean,
-    webExtrasCredentials?: ClaudeWebSession,
-  ): ClaudePlannerDecision {
-    return {
-      primary: routes[0]?.type ?? "auto",
-      fallback: routes.slice(1).map((route) => route.type),
-      webExtras,
-      routes,
-      webExtrasCredentials: webExtras ? webExtrasCredentials : undefined,
-    };
-  }
-}