@trazum/cli 1.40.0 → 1.42.0

package/src/index.ts

@@ -11,8 +11,18 @@ import {
   cacheableMinimum,
   analyzeCachePrefix,
   billLevers,
+  bucketedCacheEconomics,
+  bucketedProfile,
   buildHistory,
   buildPlan,
+  connectorFor,
+  CONNECTORS,
+  normalizeAnthropicUsage,
+  normalizeOpenAIUsage,
+  bucketsFromRecords,
+  pruneRecords,
+  recordsFromBuckets,
+  storeInventory,
   storedReportFrom,
   verifyPlan,
   cacheEconomics,
@@ -80,6 +90,7 @@ import {
 import { cacheDir, cacheStats, cachingProvider, clearCache } from './suggest-cache.js';
 import { dayOf, formatGap, median, spanDays } from './time.js';
 import type {
+  BucketedReport,
   FleetSource,
   HistoryRun,
   MeasuredUsage,
@@ -133,6 +144,8 @@ import {
   revisionsFor,
 } from './git.js';
 import type { Revision } from './git.js';
+import { fetchProviderUsage } from './connect.js';
+import { STORE_DIR, appendRecords, readStore, rewriteStore } from './store-fs.js';
 import { detectLocale, getCliMessages } from './i18n/index.js';
 import {
   MAX_SUMMARY_CHARS,
@@ -181,6 +194,8 @@ const VALUE_FLAGS = new Set([
   'against',
   'from-log',
   'min-usd',
+  'payload',
+  'keep',
   // `route` takes a path here, and the flag is deliberately not `--prompt`:
   // everywhere else in this tool `--prompt` names a marked prompt *inside* a
   // source file, and reusing it for a path would be a trap laid for the reader.
@@ -483,7 +498,9 @@ const COMMAND_FLAGS: Record<string, string[]> = {
   profile: ['json', 'pricing', 'pricing-live', 'against', 'what-if', 'markdown-out', 'csv-out', 'csv-shape', 'max-usd', 'max-growth-usd', 'max-cache-loss-usd', 'max-day-usd', 'max-session-usd', 'label', 'since', 'until', 'dry-run', 'markdown-summary', 'by-source'],
   plan: ['json', 'out', 'markdown-out', 'min-usd', 'pricing', 'pricing-live'],
   verify: ['against', 'gate', 'json', 'markdown-out', 'pricing', 'pricing-live'],
-  history: ['json', 'markdown-out'],
+  history: ['store', 'json', 'markdown-out'],
+  connect: ['since', 'until', 'payload', 'store', 'json', 'out', 'markdown-out', 'pricing', 'pricing-live', 'dry-run'],
+  store: ['prune', 'keep', 'json', 'pricing', 'pricing-live', 'dry-run'],
   route: ['prompt-file', 'cases', 'label', 'concurrency', 'json', 'yes', 'pricing', 'pricing-live'],
   eval: ['cases', 'level', 'concurrency', 'export', 'out', 'o', 'model'],
   prune: ['cases', 'concurrency', 'json', 'yes'],
@@ -2223,6 +2240,381 @@ function isoDate(): string {
  * metered API calls somebody was actually billed for — the bill exists wherever
  * Trazum happens to be running, so the host has no bearing on it.
  */
+/**
+ * One end of a time window, from a flag.
+ *
+ * A UTC day (`2026-08-14`), a full ISO 8601 timestamp, a relative window
+ * (`7d`, `24h`) or `now`. A bare day means the whole of it — since its first
+ * instant, until its last — because `--until 2026-08-14` excluding the named
+ * day is a trap sprung on everyone who reads dates the way humans do.
+ *
+ * `relative` comes back so the caller can state the caveat: a relative window
+ * is measured against **the machine's clock, not the data's**, and a log
+ * exported last month answers `--since 7d` with nothing.
+ */
+function parseWhen(
+  args: Args,
+  flag: string,
+  endOfDay: boolean,
+  t: CliMessages,
+  now: number,
+): { ms: number | undefined; relative: boolean } {
+  const value = stringFlag(args, flag);
+  if (value === undefined) return { ms: undefined, relative: false };
+
+  const relative = /^(\d+)([dh])$/.exec(value);
+  if (relative) {
+    const amount = Number(relative[1]);
+    if (amount > 0) {
+      const span = relative[2] === 'd' ? 86_400_000 : 3_600_000;
+      return { ms: now - amount * span, relative: true };
+    }
+  }
+  if (/^\d{4}-\d{2}-\d{2}$/.test(value)) {
+    const midnight = Date.parse(`${value}T00:00:00Z`);
+    if (Number.isFinite(midnight)) {
+      return { ms: endOfDay ? midnight + 86_400_000 : midnight, relative: false };
+    }
+  }
+  if (value === 'now') return { ms: now, relative: false };
+  const exact = Date.parse(value);
+  if (Number.isFinite(exact)) return { ms: exact, relative: false };
+  throw new Error(t.profile.badWhen(flag, value));
+}
+
+/**
+ * `trazum store` — what is kept, and what a prune would take.
+ *
+ * The store is the one thing in this product that *deletes* something, so the
+ * errands around it are written to make that visible: the inventory says what
+ * is there and how far back, and `--prune` names what went with the span it
+ * covered. Retention with no policy written down is refused rather than
+ * defaulted — deleting measurements on a guess is not something anybody
+ * should receive by accident.
+ */
+async function commandStore(
+  args: Args,
+  config: TrazumConfig,
+  pricing: PricingCatalogue,
+  t: CliMessages,
+): Promise<void> {
+  const root = process.cwd();
+  const { resolved, unreadable, files } = await readStore(root);
+  const inventory = storeInventory(resolved);
+  const n = (value: number): string => value.toLocaleString(t.numberLocale);
+  const day = (msValue: number): string => new Date(msValue).toISOString().slice(0, 10);
+
+  const priced = bucketedProfile(
+    {
+      provider: 'store',
+      granularity: 'bucketed',
+      buckets: bucketsFromRecords(resolved.records),
+      window: inventory.span,
+      gaps: [],
+      unavailable: [],
+    },
+    { catalogue: pricing },
+  );
+
+  if (boolFlag(args, 'prune')) {
+    const keepFlag = stringFlag(args, 'keep');
+    const keepDays = keepFlag !== undefined
+      ? Number(/^(\d+)d?$/.exec(keepFlag)?.[1] ?? NaN)
+      : config.store?.keepDays;
+    if (keepDays === undefined || !Number.isFinite(keepDays) || keepDays <= 0) {
+      throw new Error(t.store.pruneNeedsPolicy());
+    }
+    const cutoff = Date.now() - keepDays * 86_400_000;
+    const result = pruneRecords(resolved.records, cutoff);
+    const droppedUsd = bucketedProfile(
+      {
+        provider: 'store',
+        granularity: 'bucketed',
+        buckets: bucketsFromRecords(result.dropped),
+        window: null,
+        gaps: [],
+        unavailable: [],
+      },
+      { catalogue: pricing },
+    ).total.totalUsd;
+
+    if (boolFlag(args, 'dry-run')) {
+      console.log(
+        wrap(
+          t.store.pruneDryRun(
+            n(result.dropped.length),
+            String(keepDays),
+            result.droppedSpan === null
+              ? null
+              : `${day(result.droppedSpan.fromMs)} → ${day(result.droppedSpan.toMs)}`,
+            formatUsd(droppedUsd),
+          ),
+          76,
+          '  ',
+        ),
+      );
+      return;
+    }
+
+    // The prune also collapses the append log to what the store resolves to,
+    // which is the only moment a rewrite is safe: it is what the reader was
+    // already seeing.
+    await rewriteStore(root, result.kept);
+    console.log(
+      wrap(
+        t.store.pruned(
+          n(result.dropped.length),
+          String(keepDays),
+          result.droppedSpan === null
+            ? null
+            : `${day(result.droppedSpan.fromMs)} → ${day(result.droppedSpan.toMs)}`,
+          formatUsd(droppedUsd),
+          n(result.kept.length),
+        ),
+        76,
+        '  ',
+      ),
+    );
+    return;
+  }
+
+  if (boolFlag(args, 'json')) {
+    console.log(JSON.stringify({ ...inventory, totalUsd: priced.total.totalUsd, unreadable }, null, 2));
+    return;
+  }
+
+  /**
+   * Empty means *nothing at all* — not "nothing I could resolve".
+   *
+   * Records the store could not tell apart, lines it could not parse and
+   * records from a newer schema are all real measurements sitting on disk.
+   * Reporting an empty store over them would hide exactly what the reader
+   * needs to see, which is the failure this whole module is written against.
+   */
+  const nothingAtAll =
+    inventory.totalRecords === 0 &&
+    inventory.possiblyDouble === 0 &&
+    inventory.unknownVersion === 0 &&
+    unreadable.length === 0;
+  if (nothingAtAll) {
+    console.log(wrap(t.store.empty(STORE_DIR), 76, '  '));
+    return;
+  }
+
+  console.log(
+    c.bold(
+      t.store.heading(
+        n(inventory.totalRecords),
+        formatUsd(priced.total.totalUsd),
+        inventory.span === null ? '' : day(inventory.span.fromMs),
+        inventory.span === null ? '' : day(inventory.span.toMs),
+      ),
+    ),
+  );
+  for (const provider of inventory.providers) {
+    console.log(
+      `  ${t.store.providerRow(
+        provider.provider,
+        n(provider.records),
+        provider.span === null ? '' : `${day(provider.span.fromMs)} → ${day(provider.span.toMs)}`,
+        n(provider.models.length),
+      )}`,
+    );
+  }
+  console.log();
+  console.log(`  ${c.dim(wrap(t.store.holds(n(files.length)), 74, '    '))}`);
+  if (inventory.possiblyDouble > 0) {
+    console.log(`  ${c.yellow(wrap(t.store.possiblyDouble(n(inventory.possiblyDouble)), 74, '    '))}`);
+  }
+  if (inventory.unknownVersion > 0) {
+    console.log(`  ${c.yellow(wrap(t.store.unknownVersion(n(inventory.unknownVersion)), 74, '    '))}`);
+  }
+  for (const bad of unreadable) {
+    console.log(`  ${c.yellow(wrap(t.store.unreadable(bad.file, String(bad.line)), 74, '    '))}`);
+  }
+  const keepDays = config.store?.keepDays;
+  console.log(
+    `  ${c.dim(wrap(keepDays === undefined ? t.store.noRetention() : t.store.retention(String(keepDays)), 74, '    '))}`,
+  );
+}
+
+/**
+ * `trazum connect <provider>` — the bill, read from the provider.
+ *
+ * The pull and the pricing live elsewhere; this owns the window, the
+ * rendering and the refusals. The report it prints is deliberately a
+ * *restricted* one: a usage API serves sums, so every per-call finding is
+ * listed as unavailable rather than computed from a zero nobody measured.
+ */
+async function commandConnect(
+  args: Args,
+  pricing: PricingCatalogue,
+  t: CliMessages,
+): Promise<void> {
+  const id = args.positional[0];
+  if (id === undefined) {
+    throw new Error(t.connect.noTarget(CONNECTORS.map((c) => c.id).join(', ')));
+  }
+  const descriptor = connectorFor(id);
+  if (descriptor === null) {
+    throw new Error(t.connect.unknownProvider(id, CONNECTORS.map((c) => c.id).join(', ')));
+  }
+
+  const now = Date.now();
+  const since = parseWhen(args, 'since', false, t, now);
+  const until = parseWhen(args, 'until', true, t, now);
+  // A month back by default: long enough to be a bill, short enough that a
+  // first run against a busy organisation does not walk fifty pages.
+  const fromMs = since.ms ?? now - 30 * 86_400_000;
+  const toMs = until.ms ?? now;
+  if (fromMs >= toMs) throw new Error(t.profile.sinceAfterUntil());
+
+  const day = (msValue: number): string => new Date(msValue).toISOString().slice(0, 10);
+
+  if (boolFlag(args, 'dry-run')) {
+    console.log(
+      wrap(
+        t.connect.dryRun(
+          descriptor.displayName,
+          day(fromMs),
+          day(toMs),
+          descriptor.credentialEnv.join(' or '),
+          descriptor.keyKind,
+        ),
+        76,
+        '  ',
+      ),
+    );
+    return;
+  }
+
+  /**
+   * A payload somebody already has is priced without a pull.
+   *
+   * People save API responses — from a support thread, from a curl in a
+   * runbook, from a colleague who has the admin key and they do not. Pricing
+   * one needs no credential and no network, and it is the same arithmetic on
+   * the same shape, so refusing it would be ceremony rather than safety.
+   */
+  const payloadPath = stringFlag(args, 'payload');
+  const pulled =
+    payloadPath === undefined
+      ? await fetchProviderUsage({ descriptor, fromMs, toMs, env: process.env })
+      : {
+          pull: (descriptor.id === 'anthropic' ? normalizeAnthropicUsage : normalizeOpenAIUsage)(
+            JSON.parse(await readFile(payloadPath, 'utf8')),
+          ),
+          source: { variable: payloadPath },
+        };
+  const { pull, source } = pulled;
+  const report = bucketedProfile(pull, { catalogue: pricing });
+  const cache = bucketedCacheEconomics(report);
+  const n = (value: number): string => value.toLocaleString(t.numberLocale);
+
+  /**
+   * `--store` keeps what was pulled, so the next run does not download it
+   * again and `history` has a series without anybody curating a folder. Opt
+   * in rather than automatic: a command that starts writing to a hidden
+   * directory on its own is a command nobody trusts twice.
+   */
+  let stored = 0;
+  if (boolFlag(args, 'store')) {
+    stored = await appendRecords(process.cwd(), recordsFromBuckets(pull.provider, pull.buckets, Date.now()));
+  }
+
+  const outPath = stringFlag(args, 'out');
+  if (outPath !== undefined) {
+    await writeFile(outPath, `${JSON.stringify({ ...report, pulledFrom: source.variable }, null, 2)}\n`);
+  }
+
+  if (boolFlag(args, 'json')) {
+    console.log(JSON.stringify(report, null, 2));
+    return;
+  }
+
+  const lines = (md: boolean): string[] => {
+    const out: string[] = [];
+    const heading = t.connect.heading(
+      descriptor.displayName,
+      report.span === null ? day(fromMs) : day(report.span.fromMs),
+      report.span === null ? day(toMs) : day(report.span.toMs),
+      formatUsd(report.total.totalUsd),
+      report.total.calls === null ? null : n(report.total.calls),
+    );
+    out.push(md ? `## ${heading}` : heading);
+
+    const modelWidth = Math.max(0, ...report.byModel.map((s) => s.model.length));
+    for (const slice of report.byModel) {
+      const share = report.total.totalUsd > 0 ? slice.totalUsd / report.total.totalUsd : 0;
+      const row = t.connect.modelRow(
+        md ? slice.model : slice.model.padEnd(modelWidth),
+        formatUsd(slice.totalUsd).padStart(9),
+        `${(share * 100).toFixed(1)}%`.padStart(6),
+        slice.calls === null ? null : n(slice.calls),
+      );
+      out.push(md ? `- ${row}` : row);
+    }
+
+    if (report.byModel.length === 0) {
+      out.push(md ? `_${t.connect.nothingBilled()}_` : t.connect.nothingBilled());
+    }
+
+    if (cache.verdict !== 'no-cache') {
+      out.push('');
+      const line =
+        cache.verdict === 'paid-off'
+          ? t.connect.cachePaid(formatUsd(-cache.deltaUsd))
+          : t.connect.cacheLost(formatUsd(cache.deltaUsd));
+      out.push(line);
+      if (cache.worstCaseVerdict !== cache.verdict) {
+        const unsettled = t.connect.cacheUnsettled();
+        out.push(md ? `_${unsettled}_` : unsettled);
+      }
+    }
+
+    if (report.total.calls === null) {
+      out.push('');
+      const line = t.connect.noCallCount(descriptor.displayName);
+      out.push(md ? `_${line}_` : line);
+    }
+
+    for (const model of report.unpricedModels) {
+      out.push('');
+      const line = t.connect.unpriced(model.model, n(model.inputTokens + model.outputTokens));
+      out.push(md ? `- ${line}` : `! ${line}`);
+    }
+
+    if (report.gaps.length > 0) out.push('');
+    for (const gap of report.gaps) {
+      const line = t.connect.gap(gap.detail);
+      out.push(md ? `- ${line}` : `! ${line}`);
+    }
+
+    out.push('');
+    const unavailable = t.connect.unavailable(
+      report.unavailable.map((u) => u.finding).join(', '),
+    );
+    out.push(md ? `_${unavailable}_` : unavailable);
+    out.push('');
+    out.push(md ? `_${t.connect.footer()}_` : t.connect.footer());
+    return out;
+  };
+
+  await writeMarkdown(args, () => lines(true).join('\n'));
+
+  const [head, ...rest] = lines(false);
+  console.log(c.bold(head!));
+  for (const row of rest) {
+    // Short rows print as written so the columns stay aligned; `wrap` collapses
+    // runs of spaces, which is right for prose and wrong for a table.
+    if (row === '') console.log('');
+    else if (row.length <= 74) console.log(`  ${row}`);
+    else console.log(`  ${wrap(row, 74, '    ')}`);
+  }
+  if (outPath !== undefined) console.log(c.dim(t.connect.wrote(outPath)));
+  if (stored > 0) console.log(c.dim(t.store.appended(n(stored), STORE_DIR)));
+}
+
 /**
  * `trazum history <dir>` — many reports over many periods, as one series.
  *
@@ -2232,40 +2624,103 @@ function isoDate(): string {
  * same action planned twice — and no series, however long, becomes a
  * forecast.
  */
-async function commandHistory(args: Args, t: CliMessages): Promise<void> {
-  const path = args.positional[0];
-  if (path === undefined) throw new Error(t.history.noTarget());
-  const target = await stat(path).catch(() => null);
-  if (!target?.isDirectory()) throw new Error(t.history.noTarget());
-
-  const entries = await readdir(path, { withFileTypes: true });
-  const files = entries
-    .filter((entry) => entry.isFile() && entry.name.endsWith('.json'))
-    .map((entry) => join(path, entry.name))
-    .sort((a, b) => a.localeCompare(b));
-
+async function commandHistory(args: Args, pricing: PricingCatalogue, t: CliMessages): Promise<void> {
+  /**
+   * `--store` builds the series from measured spend already on disk.
+   *
+   * Bucketed sources carry no label — a usage API groups by model and
+   * workspace, never by workload — so the label series is *absent and named*
+   * rather than empty and misread, the same discipline the connected report
+   * uses for the findings a sum cannot support. The model-share and
+   * cache-share series are exactly what a series exists for, and both work.
+   */
   const reports: StoredReport[] = [];
   const plans: (PlanDocument & { createdAt?: string })[] = [];
   const unrecognized: string[] = [];
-  for (const file of files) {
-    let parsed: unknown;
-    try {
-      parsed = JSON.parse(await readFile(file, 'utf8'));
-    } catch {
-      unrecognized.push(file);
-      continue;
-    }
-    const report = storedReportFrom(file, parsed);
-    if (report !== null) {
-      reports.push(report);
-      continue;
+  const fromStore = boolFlag(args, 'store');
+
+  if (fromStore) {
+    const { resolved } = await readStore(process.cwd());
+    if (resolved.records.length === 0) throw new Error(t.store.empty(STORE_DIR));
+
+    /**
+     * One period per UTC day of stored measurement, priced exactly as a fresh
+     * pull prices it.
+     *
+     * The label series is deliberately absent: a usage API groups by model
+     * and workspace, never by workload, so there is no label to carry.
+     * Rendering an empty label series would read as "no workload moved",
+     * which is a statement about traffic rather than about the source, and
+     * the footer says which it is.
+     */
+    const byDay = new Map<string, typeof resolved.records>();
+    for (const record of resolved.records) {
+      const key = new Date(record.fromMs).toISOString().slice(0, 10);
+      const list = byDay.get(key) ?? [];
+      list.push(record);
+      byDay.set(key, list);
+    }
+    for (const [dayKey, records] of [...byDay.entries()].sort((a, b) => a[0].localeCompare(b[0]))) {
+      const day = bucketedProfile(
+        {
+          provider: 'store',
+          granularity: 'bucketed',
+          buckets: bucketsFromRecords(records),
+          window: {
+            fromMs: Math.min(...records.map((r) => r.fromMs)),
+            toMs: Math.max(...records.map((r) => r.toMs)),
+          },
+          gaps: [],
+          unavailable: [],
+        },
+        { catalogue: pricing },
+      );
+      const cacheTouched = day.total.cacheReadTokens + day.total.cacheWriteTokens;
+      reports.push({
+        name: dayKey,
+        span: day.span,
+        totalUsd: day.total.totalUsd,
+        calls: day.total.calls,
+        byLabel: new Map(),
+        byModel: new Map(day.byModel.map((slice) => [slice.model, slice.totalUsd])),
+        cacheReadShare:
+          day.total.inputTokens + cacheTouched > 0
+            ? day.total.cacheReadTokens / (day.total.inputTokens + cacheTouched)
+            : null,
+      });
     }
-    const maybePlan = parsed as PlanDocument & { createdAt?: string };
-    if (maybePlan?.schemaVersion === 1 && Array.isArray(maybePlan.actions)) {
-      plans.push(maybePlan);
-      continue;
+  } else {
+    const path = args.positional[0];
+    if (path === undefined) throw new Error(t.history.noTarget());
+    const target = await stat(path).catch(() => null);
+    if (!target?.isDirectory()) throw new Error(t.history.noTarget());
+
+    const entries = await readdir(path, { withFileTypes: true });
+    const files = entries
+      .filter((entry) => entry.isFile() && entry.name.endsWith('.json'))
+      .map((entry) => join(path, entry.name))
+      .sort((a, b) => a.localeCompare(b));
+
+    for (const file of files) {
+      let parsed: unknown;
+      try {
+        parsed = JSON.parse(await readFile(file, 'utf8'));
+      } catch {
+        unrecognized.push(file);
+        continue;
+      }
+      const report = storedReportFrom(file, parsed);
+      if (report !== null) {
+        reports.push(report);
+        continue;
+      }
+      const maybePlan = parsed as PlanDocument & { createdAt?: string };
+      if (maybePlan?.schemaVersion === 1 && Array.isArray(maybePlan.actions)) {
+        plans.push(maybePlan);
+        continue;
+      }
+      unrecognized.push(file);
     }
-    unrecognized.push(file);
   }
 
   const history = buildHistory(reports, plans);
@@ -2299,7 +2754,7 @@ async function commandHistory(args: Args, t: CliMessages): Promise<void> {
       const row = t.history.periodRow(
         period.name,
         formatUsd(period.totalUsd),
-        n(period.calls),
+        period.calls === null ? null : n(period.calls),
         ((period.toMs - period.fromMs) / 86_400_000).toFixed(1),
       );
       out.push(md ? `- ${row}` : `  ${row}`);
@@ -2327,6 +2782,11 @@ async function commandHistory(args: Args, t: CliMessages): Promise<void> {
     for (const name of unrecognized) {
       out.push(md ? `- ${t.history.unrecognized(name)}` : `  ${t.history.unrecognized(name)}`);
     }
+    if (fromStore) {
+      out.push('');
+      const note = t.history.storeNoLabels();
+      out.push(md ? `_${note}_` : `  ${note}`);
+    }
     out.push('');
     out.push(md ? `_${t.history.footer()}_` : `  ${t.history.footer()}`);
     return out;
@@ -2699,41 +3159,11 @@ async function commandProfile(args: Args, config: TrazumConfig, pricing: Pricing
    * no record.
    */
   const now = Date.now();
-  let relativeWindow = false;
-  const parseWhen = (flag: string, endOfDay: boolean): number | undefined => {
-    const value = stringFlag(args, flag);
-    if (value === undefined) return undefined;
-    /**
-     * A relative window — `7d`, `24h` — because "the last week" is what a
-     * nightly job actually wants, and computing a date in a shell to say it
-     * is the step that gets skipped.
-     *
-     * Relative to **the machine's clock, not the log's**, which is a real
-     * difference: a log exported last month answers `--since 7d` with
-     * nothing, and the report says so rather than reporting $0. That caveat
-     * is stated beside the window line, because a period the reader did not
-     * name is a period they will misread.
-     */
-    const relative = /^(\d+)([dh])$/.exec(value);
-    if (relative) {
-      const amount = Number(relative[1]);
-      if (amount > 0) {
-        relativeWindow = true;
-        const span = relative[2] === 'd' ? 86_400_000 : 3_600_000;
-        return now - amount * span;
-      }
-    }
-    if (/^\d{4}-\d{2}-\d{2}$/.test(value)) {
-      const midnight = Date.parse(`${value}T00:00:00Z`);
-      if (Number.isFinite(midnight)) return endOfDay ? midnight + 86_400_000 : midnight;
-    }
-    if (value === 'now') return now;
-    const exact = Date.parse(value);
-    if (Number.isFinite(exact)) return exact;
-    throw new Error(t.profile.badWhen(flag, value));
-  };
-  const sinceMs = parseWhen('since', false);
-  const untilMs = parseWhen('until', true);
+  const sinceWhen = parseWhen(args, 'since', false, t, now);
+  const untilWhen = parseWhen(args, 'until', true, t, now);
+  const relativeWindow = sinceWhen.relative || untilWhen.relative;
+  const sinceMs = sinceWhen.ms;
+  const untilMs = untilWhen.ms;
   if (sinceMs !== undefined && untilMs !== undefined && sinceMs >= untilMs) {
     throw new Error(t.profile.sinceAfterUntil());
   }
@@ -6428,7 +6858,13 @@ async function main(): Promise<void> {
       await commandVerify(args, pricing, t);
       break;
     case 'history':
-      await commandHistory(args, t);
+      await commandHistory(args, pricing, t);
+      break;
+    case 'connect':
+      await commandConnect(args, pricing, t);
+      break;
+    case 'store':
+      await commandStore(args, config, pricing, t);
       break;
     case 'route':
       await commandRoute(args, pricing, t);