subconscious-cli 6.0.0 → 6.1.0

package/bin/update-check.js

@@ -1,10 +1,10 @@
-import fs from 'node:fs/promises';
 import { spawn } from 'node:child_process';
-import { spawnWindows } from './windows/process.js';
+import fs from 'node:fs/promises';
 import readline from 'node:readline';
 import { fileURLToPath } from 'node:url';
 import { LOGO_ART_SMALL_LINES } from './branding.js';
 import { c, colorEnabled } from './colors.js';
+import { spawnWindows } from './windows/process.js';
 
 export const PACKAGE_NAME = 'subconscious-cli';
 export const UPDATE_CHECK_TIMEOUT_MS = 1500;
@@ -46,7 +46,9 @@ export function detectInstallTarget(
   }
 
   const marker = `/lib/node_modules/${PACKAGE_NAME}/`;
-  let prefix = normalized.includes(marker) ? normalized.slice(0, normalized.indexOf(marker)) : '';
+  let prefix = normalized.includes(marker)
+    ? normalized.slice(0, normalized.indexOf(marker))
+    : '';
   if (!prefix && platform === 'win32') {
     const windowsMarker = `/node_modules/${PACKAGE_NAME}/`;
     if (normalized.includes(windowsMarker)) {
@@ -59,7 +61,14 @@ export function detectInstallTarget(
   return {
     command: 'npm',
     args,
-    display: ['npm', ...args].map(platform === 'win32' ? value => /^[-/@A-Za-z0-9._:]+$/.test(value) ? value : `"${value}"` : shellQuote).join(' '),
+    display: ['npm', ...args]
+      .map(
+        platform === 'win32'
+          ? (value) =>
+              /^[-/@A-Za-z0-9._:]+$/.test(value) ? value : `"${value}"`
+          : shellQuote,
+      )
+      .join(' '),
     prefix,
   };
 }
@@ -67,7 +76,9 @@ export function detectInstallTarget(
 function parseVersion(version) {
   const match = String(version)
     .trim()
-    .match(/^v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?(?:\+[0-9A-Za-z.-]+)?$/);
+    .match(
+      /^v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?(?:\+[0-9A-Za-z.-]+)?$/,
+    );
   if (!match) return null;
   return {
     core: match.slice(1, 4).map(Number),
@@ -75,6 +86,10 @@ function parseVersion(version) {
   };
 }
 
+export function isVersion(version) {
+  return parseVersion(version) !== null;
+}
+
 function comparePrerelease(a, b) {
   if (!a.length && !b.length) return 0;
   if (!a.length) return 1;
@@ -87,10 +102,11 @@ function comparePrerelease(a, b) {
 
     const aNumber = /^\d+$/.test(a[index]) ? Number(a[index]) : null;
     const bNumber = /^\d+$/.test(b[index]) ? Number(b[index]) : null;
-    if (aNumber !== null && bNumber !== null) return Math.sign(aNumber - bNumber);
+    if (aNumber !== null && bNumber !== null)
+      return Math.sign(aNumber - bNumber);
     if (aNumber !== null) return -1;
     if (bNumber !== null) return 1;
-    return a[index].localeCompare(b[index]);
+    return a[index] < b[index] ? -1 : 1;
   }
   return 0;
 }
@@ -109,7 +125,9 @@ export function compareVersions(a, b) {
 }
 
 export async function currentVersion() {
-  const pkg = JSON.parse(await fs.readFile(new URL('../package.json', import.meta.url), 'utf-8'));
+  const pkg = JSON.parse(
+    await fs.readFile(new URL('../package.json', import.meta.url), 'utf-8'),
+  );
   return pkg.version;
 }
 
@@ -134,7 +152,11 @@ export async function fetchLatestVersion(options = {}) {
   try {
     const aborted = new Promise((_, reject) => {
       const fail = () => {
-        const error = new Error(signal?.aborted ? 'Update check was cancelled' : 'Update check timed out');
+        const error = new Error(
+          signal?.aborted
+            ? 'Update check was cancelled'
+            : 'Update check timed out',
+        );
         error.name = 'AbortError';
         reject(error);
       };
@@ -154,7 +176,8 @@ export async function fetchLatestVersion(options = {}) {
     ]);
     if (!response.ok) throw new Error(`npm returned HTTP ${response.status}`);
     const payload = await response.json();
-    if (!parseVersion(payload?.version)) throw new Error('npm returned an invalid version');
+    if (!parseVersion(payload?.version))
+      throw new Error('npm returned an invalid version');
     return payload.version;
   } finally {
     signal?.removeEventListener('abort', onAbort);
@@ -175,7 +198,10 @@ export function renderUpdateNotice(installedVersion, latestVersion) {
     { raw: '', value: '' },
     { raw: '', value: '' },
     { raw: '', value: '' },
-    { raw: 'Subconscious CLI', value: `${c.orange}${c.bold}Subconscious CLI${c.reset}` },
+    {
+      raw: 'Subconscious CLI',
+      value: `${c.orange}${c.bold}Subconscious CLI${c.reset}`,
+    },
     { raw: 'Update available', value: `${c.bold}Update available${c.reset}` },
     { raw: '', value: '' },
     {
@@ -198,7 +224,8 @@ export function renderUpdateNotice(installedVersion, latestVersion) {
 }
 
 export function renderUpdateOptions(selectedIndex = 0, versions = {}) {
-  const installCommand = versions.installCommand || detectInstallTarget().display;
+  const installCommand =
+    versions.installCommand || detectInstallTarget().display;
   const descriptions = [
     `Runs \`${installCommand}\``,
     versions.installedVersion
@@ -209,9 +236,7 @@ export function renderUpdateOptions(selectedIndex = 0, versions = {}) {
   return UPDATE_ACTIONS.map((label, index) => {
     const active = index === selectedIndex;
     const pointer = active ? `${c.orange}›${c.reset}` : ' ';
-    const activeStyle = colorEnabled
-      ? `${c.bgOrange}${c.black}`
-      : c.inverse;
+    const activeStyle = colorEnabled ? `${c.bgOrange}${c.black}` : c.inverse;
     const option = active
       ? `${activeStyle}${c.bold} ${label} ${c.reset}`
       : ` ${label} `;
@@ -278,7 +303,8 @@ export async function selectUpdateAction(options = {}) {
 }
 
 export async function installLatest(options = {}) {
-  const spawnImpl = options.spawnImpl || (process.platform === 'win32' ? spawnWindows : spawn);
+  const spawnImpl =
+    options.spawnImpl || (process.platform === 'win32' ? spawnWindows : spawn);
   const target = options.target || detectInstallTarget();
   return new Promise((resolve) => {
     const child = spawnImpl(target.command, target.args, {
@@ -325,8 +351,10 @@ export async function showUpdateNotice(options = {}) {
     write(`\n${notice}\n\n`);
 
     const interactive =
-      options.interactive ?? (process.stdin.isTTY === true && process.stderr.isTTY === true);
-    if (!interactive) return { installedVersion, latestVersion, action: 'skip' };
+      options.interactive ??
+      (process.stdin.isTTY === true && process.stderr.isTTY === true);
+    if (!interactive)
+      return { installedVersion, latestVersion, action: 'skip' };
 
     const select = options.select || selectUpdateAction;
     const installTarget = options.installTarget || detectInstallTarget();
@@ -341,10 +369,13 @@ export async function showUpdateNotice(options = {}) {
       return { installedVersion, latestVersion, action };
     }
 
-    write(`\n  ${c.cyan}Updating ${PACKAGE_NAME} to ${latestVersion}...${c.reset}\n\n`);
+    write(
+      `\n  ${c.cyan}Updating ${PACKAGE_NAME} to ${latestVersion}...${c.reset}\n\n`,
+    );
     const install =
       options.install ||
-      ((expectedVersion) => installLatest({ expectedVersion, target: installTarget }));
+      ((expectedVersion) =>
+        installLatest({ expectedVersion, target: installTarget }));
     const installed = await install(latestVersion);
     if (installed) {
       write(
@@ -353,7 +384,9 @@ export async function showUpdateNotice(options = {}) {
       return { installedVersion, latestVersion, action: 'updated' };
     }
 
-    write(`\n  ${c.red}Update failed or the running installation stayed unchanged.${c.reset}\n`);
+    write(
+      `\n  ${c.red}Update failed or the running installation stayed unchanged.${c.reset}\n`,
+    );
     write(`  Try the exact detected install target manually:\n\n`);
     write(`    ${c.cyan}${installTarget.display}${c.reset}\n\n`);
     return { installedVersion, latestVersion, action: 'failed' };

package/bin/upgrade.js

@@ -6,12 +6,16 @@
  */
 
 import { spawn } from 'node:child_process';
-import { runWindows } from './windows/process.js';
 import fs from 'node:fs/promises';
 import readline from 'node:readline';
 import { fileURLToPath } from 'node:url';
 import { c } from './colors.js';
-import { detectInstallTarget } from './update-check.js';
+import {
+  compareVersions,
+  detectInstallTarget,
+  isVersion,
+} from './update-check.js';
+import { runWindows } from './windows/process.js';
 
 export const PACKAGE_NAME = 'subconscious-cli';
 export const MIN_LOGIN_VERSION = '4.0';
@@ -20,7 +24,9 @@ export function parseUpgradeArgs(argv = []) {
   const latest = argv.includes('--latest');
   const unknown = argv.filter((arg) => arg !== '--latest');
   if (unknown.length) {
-    throw new Error(`Unknown argument: ${unknown[0]}\nUsage: subc upgrade [--latest]`);
+    throw new Error(
+      `Unknown argument: ${unknown[0]}\nUsage: subc upgrade [--latest]`,
+    );
   }
   return { latest };
 }
@@ -30,32 +36,27 @@ export function detectInstallCommand(here = fileURLToPath(import.meta.url)) {
 }
 
 export async function currentCliVersion() {
-  const pkg = JSON.parse(await fs.readFile(new URL('../package.json', import.meta.url), 'utf-8'));
+  const pkg = JSON.parse(
+    await fs.readFile(new URL('../package.json', import.meta.url), 'utf-8'),
+  );
   return pkg.version;
 }
 
-export function compareVersions(a, b) {
-  const pa = String(a).split('.').map((part) => Number.parseInt(part, 10) || 0);
-  const pb = String(b).split('.').map((part) => Number.parseInt(part, 10) || 0);
-  const n = Math.max(pa.length, pb.length);
-  for (let i = 0; i < n; i++) {
-    const da = pa[i] || 0;
-    const db = pb[i] || 0;
-    if (da > db) return 1;
-    if (da < db) return -1;
-  }
-  return 0;
-}
-
 export async function fetchLatestVersion(fetchImpl = fetch) {
-  const res = await fetchImpl(`https://registry.npmjs.org/${PACKAGE_NAME}/latest`, {
-    signal: AbortSignal.timeout(10000),
-  });
+  const res = await fetchImpl(
+    `https://registry.npmjs.org/${PACKAGE_NAME}/latest`,
+    {
+      signal: AbortSignal.timeout(10000),
+    },
+  );
   if (!res.ok) {
-    throw new Error(`Could not look up ${PACKAGE_NAME} on npm (${res.status}).`);
+    throw new Error(
+      `Could not look up ${PACKAGE_NAME} on npm (${res.status}).`,
+    );
   }
   const data = await res.json();
-  if (!data?.version) throw new Error(`npm did not return a version for ${PACKAGE_NAME}.`);
+  if (!data?.version)
+    throw new Error(`npm did not return a version for ${PACKAGE_NAME}.`);
   return data.version;
 }
 
@@ -72,7 +73,10 @@ export function printLoginUpgradeWarning() {
 
 function askYesNo(question) {
   return new Promise((resolve) => {
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    const rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout,
+    });
     rl.question(question, (answer) => {
       rl.close();
       const a = answer.trim().toLowerCase();
@@ -84,7 +88,10 @@ function askYesNo(question) {
 function runInstall(command) {
   if (process.platform === 'win32') {
     const target = detectInstallTarget();
-    return runWindows(target.command, target.args).then(code => code === 0, () => false);
+    return runWindows(target.command, target.args).then(
+      (code) => code === 0,
+      () => false,
+    );
   }
   return new Promise((resolve) => {
     const child = spawn(command, { shell: true, stdio: 'inherit' });
@@ -101,14 +108,20 @@ export async function installLatest(options = {}) {
 
   let latest;
   try {
-    latest = await fetchLatest();
+    const version = await fetchLatest();
+    if (!isVersion(version)) {
+      throw new Error(`npm returned an invalid version (${version}).`);
+    }
+    latest = version;
   } catch (error) {
     console.error(`  ${c.yellow}${error.message}${c.reset}`);
     console.error(`  ${c.dim}Installing @latest anyway.${c.reset}\n`);
   }
 
-  if (latest && compareVersions(current, latest) >= 0) {
-    console.log(`\n  ${c.green}Already up to date${c.reset} ${c.dim}(${current}).${c.reset}\n`);
+  if (latest && isVersion(current) && compareVersions(current, latest) >= 0) {
+    console.log(
+      `\n  ${c.green}Already up to date${c.reset} ${c.dim}(${current}).${c.reset}\n`,
+    );
     return true;
   }
 
@@ -117,7 +130,9 @@ export async function installLatest(options = {}) {
       `\n  Upgrading ${c.cyan}${PACKAGE_NAME}${c.reset} ${c.dim}${current}${c.reset} → ${c.cyan}${latest}${c.reset}`,
     );
   } else {
-    console.log(`\n  Upgrading ${c.cyan}${PACKAGE_NAME}${c.reset} ${c.dim}${current}${c.reset} → latest`);
+    console.log(
+      `\n  Upgrading ${c.cyan}${PACKAGE_NAME}${c.reset} ${c.dim}${current}${c.reset} → latest`,
+    );
   }
   console.log(`  ${c.dim}Running${c.reset} ${c.cyan}${command}${c.reset}\n`);
 
@@ -129,32 +144,39 @@ export async function installLatest(options = {}) {
   }
 
   if (latest) {
+    const readVersion = options.readVersion || currentCliVersion;
+    let installedVersion;
     try {
-      const readVersion = options.readVersion || currentCliVersion;
-      const installedVersion = await readVersion();
-      if (compareVersions(installedVersion, latest) < 0) {
-        console.error(
-          `\n  ${c.red}Upgrade command completed, but this installation is still ${installedVersion}.${c.reset}`,
-        );
-        console.error(`  Run the exact detected command manually:\n`);
-        console.error(`    ${c.cyan}${command}${c.reset}\n`);
-        return false;
-      }
-    } catch {
-      console.error(`\n  ${c.red}Could not verify the updated CLI installation.${c.reset}`);
+      installedVersion = await readVersion();
+    } catch {}
+    if (!isVersion(installedVersion)) {
+      console.error(
+        `\n  ${c.red}Could not verify the updated CLI installation.${c.reset}`,
+      );
+      console.error(`  Run the exact detected command manually:\n`);
+      console.error(`    ${c.cyan}${command}${c.reset}\n`);
+      return false;
+    }
+    if (compareVersions(installedVersion, latest) < 0) {
+      console.error(
+        `\n  ${c.red}Upgrade command completed, but this installation is still ${installedVersion}.${c.reset}`,
+      );
       console.error(`  Run the exact detected command manually:\n`);
       console.error(`    ${c.cyan}${command}${c.reset}\n`);
       return false;
     }
   }
 
-  console.log(`\n  ${c.green}${c.bold}✓ Upgraded.${c.reset} Re-run ${c.cyan}subc login${c.reset} if you were signing in.\n`);
+  console.log(
+    `\n  ${c.green}${c.bold}✓ Upgraded.${c.reset} Re-run ${c.cyan}subc login${c.reset} if you were signing in.\n`,
+  );
   return true;
 }
 
 export async function upgradeCommand(argv = [], options = {}) {
   const { latest } = parseUpgradeArgs(argv);
-  const interactive = options.interactive ?? (process.stdin.isTTY && process.stdout.isTTY);
+  const interactive =
+    options.interactive ?? (process.stdin.isTTY && process.stdout.isTTY);
   const ask = options.ask || askYesNo;
   const installLatestFn = options.installLatest || installLatest;
 
@@ -163,7 +185,9 @@ export async function upgradeCommand(argv = [], options = {}) {
       console.error(
         `\n  ${c.yellow}Do you want to upgrade?${c.reset} requires a TTY.`,
       );
-      console.error(`  Run ${c.cyan}subc upgrade --latest${c.reset} instead.\n`);
+      console.error(
+        `  Run ${c.cyan}subc upgrade --latest${c.reset} instead.\n`,
+      );
       process.exitCode = 1;
       return;
     }

package/bin/usage.js

@@ -2,26 +2,37 @@
  * Usage display for `subc usage` — fetches billing/quota from the platform API.
  */
 
-import { c } from './colors.js';
 import { getApiKey, getPlatformUrl } from './auth.js';
+import { c } from './colors.js';
 import { DEFAULT_PROFILE } from './profiles.js';
 import { printLoginUpgradeWarning } from './upgrade.js';
 
 export const USAGE_API_PATH = '/api/v1/usage';
 
-export function formatTokens(value) {
+// Largest first: [size, suffix].
+const TOKEN_UNITS = [
+  [1_000_000_000, 'B'],
+  [1_000_000, 'M'],
+  [1_000, 'K'],
+];
+
+export function formatTokens(value, { sigFigs = 3 } = {}) {
   const n = Number(value);
+
   if (!Number.isFinite(n) || n < 0) return '0';
-  if (n >= 1_000_000_000) {
-    const scaled = n / 1_000_000_000;
-    return `${scaled.toFixed(n % 1_000_000_000 ? 1 : 0)}B`;
-  }
-  if (n >= 1_000_000) {
-    const scaled = n / 1_000_000;
-    return `${scaled.toFixed(n % 1_000_000 ? 1 : 0)}M`;
+
+  let index = TOKEN_UNITS.findIndex(([size]) => n >= size);
+  if (index === -1) return n.toLocaleString('en-US');
+
+  // Number() also turns toPrecision's exponent form ("1.00e+3") back into 1000.
+
+  let scaled = Number((n / TOKEN_UNITS[index][0]).toPrecision(sigFigs));
+  // Rounding can reach the next unit: 999_500 is 1M, not 1000K.
+  if (scaled >= 1_000 && index > 0) {
+    index -= 1;
+    scaled = Number((n / TOKEN_UNITS[index][0]).toPrecision(sigFigs));
   }
-  if (n >= 1_000) return `${Math.round(n / 1_000)}K`;
-  return n.toLocaleString('en-US');
+  return `${scaled}${TOKEN_UNITS[index][1]}`;
 }
 
 export function formatCurrency(value) {
@@ -33,13 +44,18 @@ export function formatCurrency(value) {
 
 export function shortModelSlug(slug) {
   const text = String(slug ?? '').trim();
-  return text.startsWith('subconscious/') ? text.slice('subconscious/'.length) : text;
+  return text.startsWith('subconscious/')
+    ? text.slice('subconscious/'.length)
+    : text;
 }
 
 export function isLegacyUsagePayload(data) {
   if (!data || typeof data !== 'object') return true;
-  if ('credits' in data && data.plan && typeof data.plan === 'object') return false;
-  return 'dailyTokenCeiling' in data || 'consumedToday' in data || !('plan' in data);
+  if ('credits' in data && data.plan && typeof data.plan === 'object')
+    return false;
+  return (
+    'dailyTokenCeiling' in data || 'consumedToday' in data || !('plan' in data)
+  );
 }
 
 export function meterColor(percentage) {
@@ -120,7 +136,9 @@ export function formatUsageDisplay(data) {
         );
       } else {
         const label =
-          described.kind === 'credit' ? 'of daily credit used' : 'of daily tokens used';
+          described.kind === 'credit'
+            ? 'of daily credit used'
+            : 'of daily tokens used';
         lines.push(
           `  ${renderProgressBar(described.percent)}  ${formatAllowancePercent(described.percent)} ${label}`,
         );
@@ -155,9 +173,7 @@ export function formatUsageDisplay(data) {
     );
     for (const model of models) {
       const label = shortModelSlug(model.slug).padEnd(slugWidth);
-      lines.push(
-        `    ${label}  ${formatTokens(model.consumedToday ?? 0)}`,
-      );
+      lines.push(`    ${label}  ${formatTokens(model.consumedToday ?? 0)}`);
     }
   }
 
@@ -166,10 +182,13 @@ export function formatUsageDisplay(data) {
 }
 
 export async function fetchUsage(apiKey, platformUrl, fetchImpl = fetch) {
-  const res = await fetchImpl(`${platformUrl.replace(/\/$/, '')}${USAGE_API_PATH}`, {
-    headers: { Authorization: `Bearer ${apiKey}` },
-    signal: AbortSignal.timeout(5000),
-  });
+  const res = await fetchImpl(
+    `${platformUrl.replace(/\/$/, '')}${USAGE_API_PATH}`,
+    {
+      headers: { Authorization: `Bearer ${apiKey}` },
+      signal: AbortSignal.timeout(5000),
+    },
+  );
   return res;
 }
 
@@ -183,7 +202,9 @@ export async function usageCommand(argv = [], options = {}) {
   const auth = await getApiKey(options.profile);
   if (!auth) {
     console.log(`\n  ${c.dim}Not logged in.${c.reset}`);
-    console.log(`  Run ${c.cyan}subc ${profileFlag}login${c.reset} to get started.\n`);
+    console.log(
+      `  Run ${c.cyan}subc ${profileFlag}login${c.reset} to get started.\n`,
+    );
     return;
   }
 
@@ -236,7 +257,9 @@ export async function usageCommand(argv = [], options = {}) {
     console.log(formatUsageDisplay(data));
   } catch (error) {
     if (error.name === 'TimeoutError' || error.name === 'AbortError') {
-      console.log(`\n  ${c.yellow}Could not reach the platform (timed out).${c.reset}`);
+      console.log(
+        `\n  ${c.yellow}Could not reach the platform (timed out).${c.reset}`,
+      );
       console.log(`  ${c.dim}Host: ${platformUrl}${c.reset}\n`);
       return;
     }