subconscious-cli 6.0.1 → 6.2.0

package/bin/update-check.js

@@ -1,5 +1,7 @@
 import { spawn } from 'node:child_process';
+import { readFileSync } from 'node:fs';
 import fs from 'node:fs/promises';
+import path from 'node:path';
 import readline from 'node:readline';
 import { fileURLToPath } from 'node:url';
 import { LOGO_ART_SMALL_LINES } from './branding.js';
@@ -8,6 +10,9 @@ import { spawnWindows } from './windows/process.js';
 
 export const PACKAGE_NAME = 'subconscious-cli';
 export const UPDATE_CHECK_TIMEOUT_MS = 1500;
+export const INSTALL_SCRIPT_URL =
+  'https://raw.githubusercontent.com/subconscious-systems/subconscious/main/scripts/install.sh';
+
 const UPDATE_ACTIONS = ['Update now', 'Skip for now'];
 const UPDATE_LOGO = LOGO_ART_SMALL_LINES;
 
@@ -18,10 +23,35 @@ function shellQuote(value) {
     : `'${text.replaceAll("'", `'"'"'`)}'`;
 }
 
+/** The record scripts/install.sh leaves in the package it installed. */
+function readCurlInstall(packageDir) {
+  try {
+    const record = JSON.parse(
+      readFileSync(path.join(packageDir, '.subc-install.json'), 'utf-8'),
+    );
+    return record?.method === 'curl' && typeof record.bin_dir === 'string'
+      ? record
+      : null;
+  } catch {
+    return null;
+  }
+}
+
 export function detectInstallTarget(
   here = fileURLToPath(import.meta.url),
   platform = process.platform,
 ) {
+  const packageDir = path.resolve(path.dirname(here), '..');
+  const curl = platform !== 'win32' && readCurlInstall(packageDir);
+  if (curl) {
+    // Rerun the installer into the same directories it used before.
+    const display = `curl -fsSL ${INSTALL_SCRIPT_URL} | SUBC_INSTALL_DIR=${shellQuote(packageDir)} SUBC_BIN_DIR=${shellQuote(curl.bin_dir)} bash`;
+    return {
+      command: 'bash',
+      args: ['-c', `set -o pipefail; ${display}`],
+      display,
+    };
+  }
   const normalized = here.replace(/\\/g, '/');
   if (normalized.includes('/.pnpm/') || normalized.includes('/pnpm/global/')) {
     return {
@@ -86,6 +116,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;
@@ -102,7 +136,7 @@ function comparePrerelease(a, b) {
       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;
 }

package/bin/upgrade.js

@@ -10,7 +10,11 @@ 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';
@@ -38,23 +42,6 @@ export async function currentCliVersion() {
   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`,
@@ -98,16 +85,16 @@ function askYesNo(question) {
   });
 }
 
-function runInstall(command) {
+function runInstall() {
+  const target = detectInstallTarget();
   if (process.platform === 'win32') {
-    const target = detectInstallTarget();
     return runWindows(target.command, target.args).then(
       (code) => code === 0,
       () => false,
     );
   }
   return new Promise((resolve) => {
-    const child = spawn(command, { shell: true, stdio: 'inherit' });
+    const child = spawn(target.command, target.args, { stdio: 'inherit' });
     child.on('error', () => resolve(false));
     child.on('exit', (code) => resolve(code === 0));
   });
@@ -121,13 +108,17 @@ 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) {
+  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`,
     );
@@ -153,18 +144,12 @@ 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 {
+      installedVersion = await readVersion();
+    } catch {}
+    if (!isVersion(installedVersion)) {
       console.error(
         `\n  ${c.red}Could not verify the updated CLI installation.${c.reset}`,
       );
@@ -172,6 +157,14 @@ export async function installLatest(options = {}) {
       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(

package/bin/usage.js

@@ -9,19 +9,30 @@ 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) {

package/bin/windows/agents.js

@@ -1,8 +1,13 @@
 import os from 'node:os';
 import path from 'node:path';
-import readline from 'node:readline';
+import {
+  agentBinary,
+  agentCommandName,
+  agentInstallDirs,
+  installAdvice,
+} from '../agent-data.js';
+import { separatorIndex } from '../headless-args.js';
 import { parseOptions } from './common.js';
-import { installWindowsAgent, windowsInstallSpec } from './install.js';
 import { executeWindowsLaunch, windowsLaunch } from './launch.js';
 import {
   readWindowsVersion,
@@ -14,21 +19,6 @@ import {
 } from './process.js';
 import { windowsSetup } from './setup.js';
 
-const askInstall = (name) =>
-  new Promise((resolve) => {
-    const rl = readline.createInterface({
-      input: process.stdin,
-      output: process.stdout,
-    });
-    rl.question(
-      `  ${name} isn't installed. Install it now? [Y/n] `,
-      (answer) => {
-        rl.close();
-        resolve(['', 'y', 'yes'].includes(answer.trim().toLowerCase()));
-      },
-    );
-  });
-
 export async function runWindowsAgent(agent, argv, dependencies) {
   const {
     profile,
@@ -41,27 +31,17 @@ export async function runWindowsAgent(agent, argv, dependencies) {
   } = dependencies;
   const parsed = parseAgentAction(agent, argv);
   let args =
-    parsed.action !== 'launch' && parsed.action === argv[0]
+    !['launch', 'headless'].includes(parsed.action) && parsed.action === argv[0]
       ? argv.slice(1)
       : argv;
   const environment = windowsEnv(profile?.values, process.env);
-  const preferredDirs = agent.runbook?.installDir
-    ? [
-        path.resolve(
-          environment[agent.runbook.installDirEnv] ||
-            path.join(os.homedir(), agent.runbook.installDir),
-        ),
-      ]
-    : [];
+  const preferredDirs = agentInstallDirs(agent, environment, os.homedir());
+  const bin = agentBinary(agent);
   environment.PATH = windowsPath([
     ...preferredDirs,
     ...(environment.PATH || '').split(';'),
     ...windowsBinDirs(environment),
   ]);
-  if (agent.id === 'subconscious-code' && parsed.action === 'install') {
-    if (args.length) throw new Error('Usage: subc marathon install');
-    return finish(await installWindowsAgent(agent.id, environment));
-  }
   if (['status', 'uninstall'].includes(parsed.action)) {
     return finish(
       await windowsSetup(agent.id, parsed.action, args, environment),
@@ -69,7 +49,7 @@ export async function runWindowsAgent(agent, argv, dependencies) {
   }
 
   // Honor -- after which all arguments belong to the underlying agent.
-  const boundary = args.indexOf('--');
+  const boundary = separatorIndex(args);
   const tail = boundary < 0 ? [] : args.slice(boundary);
   const extracted = extractModel(
     boundary < 0 ? args : args.slice(0, boundary),
@@ -79,7 +59,7 @@ export async function runWindowsAgent(agent, argv, dependencies) {
   let explicit = {};
   if (parsed.action === 'install' || agent.id === 'claude-code') {
     const handled = parseOptions(
-      boundary < 0 ? args : args.slice(0, args.indexOf('--')),
+      boundary < 0 ? args : args.slice(0, boundary),
       { '--api-key': 1, '--gateway-url': 1 },
     );
     explicit = handled.options;
@@ -106,37 +86,22 @@ export async function runWindowsAgent(agent, argv, dependencies) {
     console.error(
       `Configured model ${extracted.model} is not in the live catalog; using ${model}.`,
     );
+  const headless = dependencies.headless ?? parsed.action === 'headless';
   let executable;
-  if (parsed.action === 'launch') {
-    executable = resolveWindowsExecutable(agent.bin, {
+  if (parsed.action === 'launch' || headless) {
+    executable = resolveWindowsExecutable(bin, {
       env: environment,
       preferredDirs,
     });
     if (!executable) {
-      const installer = windowsInstallSpec(agent.id, environment);
-      if (
-        !installer ||
-        !process.stdin.isTTY ||
-        !process.stdout.isTTY ||
-        !(await askInstall(agent.name))
-      ) {
-        console.error(
-          `${agent.name} isn't installed. ${installer ? `Install it with: ${installer.display}` : 'Install it separately, then rerun subc.'}`,
-        );
-        return finish(127);
-      }
-      const installed = await installWindowsAgent(agent.id, environment);
-      if (installed) return finish(installed);
-      executable = resolveWindowsExecutable(agent.bin, {
-        env: environment,
-        preferredDirs,
-      });
-      if (!executable) {
-        console.error(
-          `Installed ${agent.name}, but ${agent.bin} was not found. Add its installation directory to PATH or restart your terminal.`,
-        );
-        return finish(127);
-      }
+      // subc never installs a third-party agent; it only says how.
+      const { command, url } = installAdvice(agent, 'win32');
+      console.error(
+        `${agent.name} isn't installed. subc doesn't install it. Install it yourself, then rerun subc ${agentCommandName(agent)}.`,
+      );
+      if (command) console.error(`  Install it with: ${command}`);
+      console.error(`  Official install page: ${url}`);
+      return finish(127);
     }
     if (agent.id === 'claude-code') {
       const version = dependencies.parseClaudeVersion(
@@ -179,8 +144,11 @@ export async function runWindowsAgent(agent, argv, dependencies) {
     }
   }
   const spec = await windowsLaunch(agent.id, args, env);
-  if (spec.command === agent.bin) spec.command = executable;
-  console.log(`  Launching ${agent.name} on Subconscious (${model})\n`);
+  if (spec.command === bin) spec.command = executable;
+  // Headless stdout belongs to the agent alone.
+  (headless ? console.error : console.log)(
+    `  Launching ${agent.name} on Subconscious (${model})\n`,
+  );
   return finish(await executeWindowsLaunch(spec, runWindows));
 }
 

package/bin/windows/common.js

@@ -1,40 +1,14 @@
 import { randomUUID } from 'node:crypto';
-import { readFileSync } from 'node:fs';
 import fs from 'node:fs/promises';
 import path from 'node:path';
 
-export const defaults = JSON.parse(
-  readFileSync(new URL('../registry.generated.json', import.meta.url), 'utf8'),
-).defaults;
+export { DEFAULTS as defaults } from '../agent-data.js';
+export { modelIds, positiveInteger } from '../launch-values.js';
 export const value = (env, key, fallback = '') => env[key]?.trim() || fallback;
 export const origin = (url) =>
   url
     .replace(/\/+$/, '')
     .replace(/\/v1(?:\/(?:messages|responses|chat\/completions))?$/, '');
-export function positiveInteger(input, name) {
-  if (
-    !/^[1-9][0-9]*$/.test(String(input)) ||
-    !Number.isSafeInteger(Number(input))
-  )
-    throw new Error(`${name} must be a positive integer`);
-  return Number(input);
-}
-export function modelIds(env) {
-  const models = [
-    ...new Set(
-      [
-        value(env, 'MODEL', defaults.model),
-        ...value(env, 'SUBCONSCIOUS_MODELS', defaults.models.join('\n')).split(
-          /\r?\n/,
-        ),
-      ].filter(Boolean),
-    ),
-  ];
-  for (const model of models)
-    if (!/^[-A-Za-z0-9._:/+]+$/.test(model))
-      throw new Error(`Invalid model id: ${model}`);
-  return models;
-}
 export function parseOptions(argv, schema, { strict = false } = {}) {
   const options = {},
     rest = [];