subconscious-cli 0.3.0 → 4.0.0

package/bin/profiles.js

@@ -1,17 +1,16 @@
 /**
- * Runbook-compatible profiles stored independently of the installed package.
+ * Named .env profiles stored independently of the installed package.
  *
  * Profiles use a small .env format so users can inspect or edit them directly:
  *   ~/.subconscious/profiles/default.env
  *   ~/.subconscious/profiles/<name>.env
  */
 
+import { spawn, execFileSync } from 'node:child_process';
 import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 import { readFileSync } from 'node:fs';
-import readline from 'node:readline';
-import { Writable } from 'node:stream';
 import { c } from './colors.js';
 
 const registry = JSON.parse(
@@ -299,7 +298,7 @@ export function resolvedProfileValues(profile) {
 function profileTemplate() {
   const modelComments = SUPPORTED_MODELS.map((model) => `#   ${model}`).join('\n');
   return `# Subconscious coding-agent profile
-# Generated by subc. Values are shared by the packaged ol-runbook integrations.
+# Generated by subc. Extra KEY=value lines are passed through to launches.
 
 GATEWAY_URL={GATEWAY_URL}
 API_KEY={API_KEY}
@@ -308,7 +307,6 @@ ${modelComments}
 MODEL={MODEL}
 
 # Optional per-agent keys. Leave blank to use API_KEY above.
-CLAUDE_GATEWAY_URL={CLAUDE_GATEWAY_URL}
 CLAUDE_CODE_API_KEY={CLAUDE_CODE_API_KEY}
 CODEX_API_KEY={CODEX_API_KEY}
 OPENCODE_API_KEY={OPENCODE_API_KEY}
@@ -317,6 +315,8 @@ COPILOT_API_KEY={COPILOT_API_KEY}
 PI_API_KEY={PI_API_KEY}
 
 # Claude Code
+# Leave CLAUDE_GATEWAY_URL blank to use GATEWAY_URL above.
+CLAUDE_GATEWAY_URL={CLAUDE_GATEWAY_URL}
 CLAUDE_CODE_AUTO_COMPACT_WINDOW={CLAUDE_CODE_AUTO_COMPACT_WINDOW}
 CLAUDE_CODE_MAX_CONTEXT_TOKENS={CLAUDE_CODE_MAX_CONTEXT_TOKENS}
 MAX_CONCURRENT_SUBAGENTS={MAX_CONCURRENT_SUBAGENTS}
@@ -341,6 +341,8 @@ PI_MAX_TOKENS={PI_MAX_TOKENS}
 COPILOT_MAX_INPUT_TOKENS={COPILOT_MAX_INPUT_TOKENS}
 COPILOT_MAX_OUTPUT_TOKENS={COPILOT_MAX_OUTPUT_TOKENS}
 VSCODE_APP={VSCODE_APP}
+
+# Extra KEY=value lines are passed through to launches.
 `;
 }
 
@@ -481,11 +483,31 @@ export async function clearProfileApiKey(name = DEFAULT_PROFILE) {
   return true;
 }
 
+function isSecretKey(key) {
+  const upper = key.toUpperCase();
+  return (
+    upper.endsWith('API_KEY') ||
+    upper.includes('TOKEN') ||
+    upper.includes('SECRET') ||
+    upper.includes('PASSWORD') ||
+    upper.includes('AUTH')
+  );
+}
+
 function redact(key, value) {
-  if (!key.endsWith('API_KEY') || !value) return value;
+  if (!isSecretKey(key) || !value) return value;
   return value.length <= 8 ? '********' : `${value.slice(0, 4)}…${value.slice(-4)}`;
 }
 
+function redactEnvLine(line) {
+  const match = line.match(/^(\s*(?:export\s+)?)([A-Za-z_][A-Za-z0-9_]*)=(.*)$/);
+  if (!match) return line;
+  const [, prefix, key, raw] = match;
+  const value = decodeValue(raw);
+  if (!isSecretKey(key) || !value) return line;
+  return `${prefix}${key}=${redact(key, value)}`;
+}
+
 export async function listProfiles() {
   try {
     const entries = await fs.readdir(PROFILES_DIR, { withFileTypes: true });
@@ -499,62 +521,24 @@ export async function listProfiles() {
   }
 }
 
-function printProfile(profile) {
+async function printProfile(profile) {
   console.log(`\n  ${c.bold}Profile: ${profile.name}${c.reset}`);
-  console.log(`  ${c.dim}Path:    ${profile.path}${c.reset}`);
+  console.log(`  ${c.dim}${profile.path}${c.reset}\n`);
   if (!profile.exists) {
     console.log(`  ${c.yellow}Not configured.${c.reset}\n`);
     return;
   }
-  for (const key of ['GATEWAY_URL', 'API_KEY', 'MODEL']) {
-    console.log(`  ${c.dim}${key.padEnd(12)}${c.reset}${redact(key, profile.values[key] || '')}`);
-  }
+  const text = await fs.readFile(profile.path, 'utf-8');
+  console.log(
+    text
+      .replace(/\n$/, '')
+      .split('\n')
+      .map(redactEnvLine)
+      .join('\n'),
+  );
   console.log();
 }
 
-function createPrompter() {
-  let muted = false;
-  let rejectPending = null;
-  const output = new Writable({
-    write(chunk, _encoding, callback) {
-      if (!muted) process.stdout.write(chunk);
-      callback();
-    },
-  });
-  const rl = readline.createInterface({ input: process.stdin, output, terminal: true });
-
-  rl.on('SIGINT', () => {
-    const error = new Error('Interactive configuration cancelled.');
-    error.code = 'SUBC_CANCELLED';
-    rejectPending?.(error);
-  });
-
-  return {
-    question(prompt, options = {}) {
-      return new Promise((resolve, reject) => {
-        rejectPending = reject;
-        if (options.secret) {
-          process.stdout.write(prompt);
-          muted = true;
-        }
-        rl.question(options.secret ? '' : prompt, (answer) => {
-          if (options.secret) {
-            muted = false;
-            process.stdout.write('\n');
-          }
-          rejectPending = null;
-          resolve(answer);
-        });
-      });
-    },
-    close() {
-      muted = false;
-      rejectPending = null;
-      rl.close();
-    },
-  };
-}
-
 export function validateSettingValue(setting, value) {
   if (!value) {
     if (setting.required) return `${setting.label} cannot be blank`;
@@ -587,146 +571,103 @@ export function validateSettingValue(setting, value) {
   return null;
 }
 
-async function promptSetting(prompter, setting, current) {
-  console.log(`\n  ${c.bold}${setting.label}${c.reset} ${c.dim}(${setting.key})${c.reset}`);
-  console.log(`  ${c.dim}${setting.description}${c.reset}`);
+const ALLOWED_EDITORS = new Set(['vim', 'nano']);
 
-  if (setting.type === 'choice') {
-    setting.choices.forEach((choice, index) => {
-      const label = choice || '(auto-detect)';
-      const selected = choice === current ? ` ${c.green}current${c.reset}` : '';
-      console.log(`    ${index + 1}. ${label}${selected}`);
-    });
-    while (true) {
-      const answer = (await prompter.question('  Select a number (Enter keeps current): ')).trim();
-      if (!answer) return current;
-      const index = Number(answer) - 1;
-      if (Number.isInteger(index) && setting.choices[index] !== undefined) {
-        return setting.choices[index];
-      }
-      if (setting.choices.includes(answer)) return answer;
-      console.log(`  ${c.yellow}Choose one of the listed values.${c.reset}`);
-    }
+function commandExists(bin) {
+  try {
+    execFileSync('which', [bin], { stdio: 'ignore' });
+    return true;
+  } catch {
+    return false;
   }
+}
 
-  const currentLabel = setting.type === 'secret' ? (current ? 'set' : 'not set') : current || 'blank';
-  const suffix = setting.required ? 'Enter keeps current' : 'Enter keeps current; - clears';
-  while (true) {
-    const answer = (
-      await prompter.question(
-        `  Value [${currentLabel}] (${suffix}): `,
-        { secret: setting.type === 'secret' },
-      )
-    ).trim();
-    if (!answer) return current;
-    const value = answer === '-' && !setting.required ? '' : answer;
-    const error = validateSettingValue(setting, value);
-    if (!error) return value;
-    console.log(`  ${c.yellow}${error}.${c.reset}`);
-  }
+function parseEditorCommand(editor) {
+  const parts = String(editor || '')
+    .split(/\s+/)
+    .filter(Boolean);
+  if (!parts.length) throw new Error('Editor is empty');
+  return { cmd: parts[0], args: parts.slice(1) };
 }
 
-function uniqueSettings(groups) {
-  const settings = new Map();
-  for (const group of groups) {
-    for (const setting of group.settings) settings.set(setting.key, setting);
-  }
-  return [...settings.values()];
+function resolveEditor(requested) {
+  if (requested) return { cmd: requested, args: [] };
+  const fromEnv = process.env.VISUAL?.trim() || process.env.EDITOR?.trim();
+  if (fromEnv) return parseEditorCommand(fromEnv);
+  if (commandExists('vim')) return { cmd: 'vim', args: [] };
+  if (commandExists('nano')) return { cmd: 'nano', args: [] };
+  throw new Error('No editor found. Install vim or nano, or set $VISUAL / $EDITOR.');
 }
 
-async function interactiveConfig(profileName) {
+async function editProfile(profileName, requestedEditor) {
   if (!process.stdin.isTTY || !process.stdout.isTTY) {
-    throw new Error('Interactive settings require a terminal. Use subc config flags in scripts.');
+    console.error('Editing a profile requires a terminal.');
+    console.error(profilePath(profileName));
+    process.exitCode = 1;
+    return;
   }
 
-  const prompter = createPrompter();
-  try {
-    const profiles = await listProfiles();
-    console.log(`\n  ${c.bold}Interactive coding-agent settings${c.reset}`);
-    if (profiles.length) {
-      console.log(`  ${c.dim}Existing profiles: ${profiles.join(', ')}${c.reset}`);
-    }
-    const requestedName = (
-      await prompter.question(`  Profile name [${profileName}]: `)
-    ).trim();
-    const targetName = validateProfileName(requestedName || profileName);
-    const profile = await loadProfile(targetName);
-    const baseValues = resolvedProfileValues(profile);
-    const updates = {};
-
-    while (true) {
-      console.log(`\n  ${c.bold}Profile: ${targetName}${c.reset}`);
-      PROFILE_SETTING_GROUPS.forEach((group, index) => {
-        console.log(`    ${index + 1}. ${group.label}`);
-      });
-      const allIndex = PROFILE_SETTING_GROUPS.length + 1;
-      const saveIndex = allIndex + 1;
-      console.log(`    ${allIndex}. All settings`);
-      console.log(`    ${saveIndex}. Save and exit`);
-      console.log('    0. Cancel');
-      if (Object.keys(updates).length) {
-        console.log(`  ${c.dim}${Object.keys(updates).length} pending change(s)${c.reset}`);
-      }
+  const profile = await ensureProfile(profileName);
+  const { cmd, args } = resolveEditor(requestedEditor);
+  await new Promise((resolve, reject) => {
+    const child = spawn(cmd, [...args, profile.path], { stdio: 'inherit' });
+    child.on('error', (error) => {
+      reject(new Error(`Failed to launch editor '${cmd}': ${error.message}`));
+    });
+    child.on('close', (code) => {
+      if (code && code !== 0) process.exitCode = code;
+      resolve();
+    });
+  });
+}
 
-      const answer = (await prompter.question('  Choose a section: ')).trim();
-      if (answer === '0') {
-        console.log(`\n  ${c.dim}No settings were written.${c.reset}\n`);
-        return;
-      }
-      if (answer === String(saveIndex)) {
-        const confirmation = (
-          await prompter.question(`  Save profile '${targetName}'? [Y/n] `)
-        ).trim().toLowerCase();
-        if (confirmation && !['y', 'yes'].includes(confirmation)) continue;
-        const saved = Object.keys(updates).length
-          ? await updateProfile(targetName, updates)
-          : await ensureProfile(targetName);
-        console.log(`\n  ${c.green}${c.bold}✓ Saved profile '${targetName}'.${c.reset}`);
-        console.log(`  ${c.dim}${saved.path}${c.reset}\n`);
-        return;
-      }
+export function printConfigHelp() {
+  console.log(`
+Usage:
+  subc config
+  subc config help
+  subc -p NAME config
+  subc config edit [vim|nano]
+  subc -p NAME config edit [vim|nano]
+  subc config [show|path|list|delete]
+              [--gateway-url URL] [--api-key KEY] [--model MODEL]
 
-      let selectedSettings;
-      if (answer === String(allIndex)) {
-        selectedSettings = uniqueSettings(PROFILE_SETTING_GROUPS);
-      } else {
-        const group = PROFILE_SETTING_GROUPS[Number(answer) - 1];
-        if (!group) {
-          console.log(`  ${c.yellow}Choose a listed section.${c.reset}`);
-          continue;
-        }
-        selectedSettings = group.settings;
-      }
+  subc config                      List every profile and its file path
+  subc -p NAME config              Print that profile's path and env file
+  subc config edit                 Open the selected profile in $VISUAL, $EDITOR, vim, or nano
+  subc config edit vim             Open the selected profile in vim
+  subc config edit nano            Open the selected profile in nano
+  subc config path                 Print the selected profile path
+  subc -p NAME config delete       Delete a non-default profile
+`);
+}
 
-      for (const setting of selectedSettings) {
-        const current = updates[setting.key] ?? baseValues[setting.key] ?? '';
-        const value = await promptSetting(prompter, setting, current);
-        if (value === (baseValues[setting.key] ?? '')) {
-          delete updates[setting.key];
-        } else if (value !== current) {
-          updates[setting.key] = value;
-        }
-      }
-    }
-  } catch (error) {
-    if (error.code === 'SUBC_CANCELLED') {
-      console.log(`\n  ${c.dim}No settings were written.${c.reset}\n`);
-      return;
-    }
-    throw error;
-  } finally {
-    prompter.close();
+async function printProfileList(activeName) {
+  const profiles = await listProfiles();
+  if (!profiles.length) {
+    console.log(`\n  ${c.dim}No profiles yet. Run subc login.${c.reset}\n`);
+    return;
+  }
+  console.log(`\n  ${c.bold}Profiles${c.reset}`);
+  for (const name of profiles) {
+    const active = name === activeName ? ` ${c.green}(active)${c.reset}` : '';
+    console.log(`    ${c.cyan}${name}${c.reset}${active}  ${c.dim}${profilePath(name)}${c.reset}`);
   }
+  console.log();
 }
 
-export async function configCommand(argv, profileName = DEFAULT_PROFILE) {
-  let action = 'show';
+export async function configCommand(argv, profileName = DEFAULT_PROFILE, options = {}) {
+  let action = 'default';
+  let editor;
   const updates = {};
 
   for (let i = 0; i < argv.length; i++) {
     const arg = argv[i];
-    if (['show', 'path', 'list', 'delete', 'interactive'].includes(arg)) {
-      action = arg;
+    if (arg === 'help' || arg === '-h' || arg === '--help') {
+      printConfigHelp();
+      return;
+    } else if (['show', 'path', 'list', 'delete', 'edit', 'interactive'].includes(arg)) {
+      action = arg === 'interactive' ? 'edit' : arg;
     } else if (arg === '--gateway-url' || arg === '--api-key' || arg === '--model') {
       const value = argv[++i];
       if (!value) throw new Error(`${arg} requires a value`);
@@ -736,37 +677,26 @@ export async function configCommand(argv, profileName = DEFAULT_PROFILE) {
         '--model': 'MODEL',
       }[arg];
       updates[key] = value;
-    } else if (arg === '-h' || arg === '--help') {
-      console.log(`
-Usage:
-  subc config [show|path|list|delete|interactive]
-              [--gateway-url URL] [--api-key KEY] [--model MODEL]
-  subc --profile NAME config [...]
-
-Interactive wizard:
-  subc settings
-  subc --profile NAME config interactive
-`);
-      return;
+    } else if (action === 'edit' && ALLOWED_EDITORS.has(arg)) {
+      if (editor) throw new Error('Specify only one editor (vim or nano)');
+      editor = arg;
+    } else if (action === 'edit') {
+      throw new Error(`Unknown editor '${arg}' (use vim or nano)`);
     } else {
       throw new Error(`Unknown config argument: ${arg}`);
     }
   }
 
-  if (action === 'interactive') {
-    await interactiveConfig(profileName);
+  if (action === 'edit') {
+    if (Object.keys(updates).length) {
+      throw new Error('config edit cannot be combined with --gateway-url, --api-key, or --model');
+    }
+    await editProfile(profileName, editor);
     return;
   }
 
-  if (action === 'list') {
-    const profiles = await listProfiles();
-    if (!profiles.length) {
-      console.log(`\n  ${c.dim}No profiles yet. Run subc login.${c.reset}\n`);
-      return;
-    }
-    console.log();
-    for (const name of profiles) console.log(`  ${name}  ${profilePath(name)}`);
-    console.log();
+  if (action === 'list' || (action === 'default' && !options.profileExplicit && !Object.keys(updates).length)) {
+    await printProfileList(profileName);
     return;
   }
 
@@ -792,11 +722,11 @@ Interactive wizard:
   if (Object.keys(updates).length) {
     const profile = await updateProfile(profileName, updates);
     console.log(`Updated profile '${profileName}'.`);
-    printProfile(profile);
+    await printProfile(profile);
     return;
   }
 
-  printProfile(await loadProfile(profileName));
+  await printProfile(await loadProfile(profileName));
 }
 
 export function modelsCommand() {

package/bin/registry.generated.json

@@ -23,7 +23,7 @@
         "claudecode"
       ],
       "displayName": "Claude Code + Subconscious",
-      "description": "Run Claude Code on your hosted Subconscious model using the ol-runbook environment and telemetry setup.",
+      "description": "Run Claude Code on your hosted Subconscious model with gateway env, context limits, and telemetry.",
       "framework": "Claude Code",
       "language": "shell",
       "category": "coding-agent",
@@ -44,7 +44,11 @@
       "runbook": {
         "mode": "launch",
         "script": "claude-code/run.sh",
-        "setupScript": "claude-code/install.sh"
+        "setupScript": "claude-code/install.sh",
+        "setupActions": [
+          "status",
+          "uninstall"
+        ]
       },
       "launch": "claude",
       "env": {
@@ -83,7 +87,7 @@
       "name": "Codex CLI",
       "aliases": [],
       "displayName": "Codex + Subconscious",
-      "description": "Run Codex on your hosted Subconscious model using the ol-runbook provider, model catalog, and compaction hooks.",
+      "description": "Run Codex on your hosted Subconscious model with a temporary provider catalog and compaction hooks.",
       "framework": "Codex",
       "language": "shell",
       "category": "coding-agent",
@@ -103,7 +107,12 @@
       "runbook": {
         "mode": "launch",
         "script": "codex/run.sh",
-        "setupScript": "codex/install.sh"
+        "setupScript": "codex/install.sh",
+        "setupActions": [
+          "install",
+          "status",
+          "uninstall"
+        ]
       },
       "launch": "codex -c model={model} -c model_provider=subconscious -c web_search=disabled -c model_providers.subconscious.name=Subconscious -c model_providers.subconscious.base_url={baseUrlV1} -c model_providers.subconscious.wire_api=responses -c model_providers.subconscious.env_key=SUBCONSCIOUS_API_KEY -c model_providers.subconscious.stream_idle_timeout_ms=300000",
       "env": {
@@ -120,7 +129,7 @@
         "open-code"
       ],
       "displayName": "OpenCode + Subconscious",
-      "description": "Run OpenCode on your hosted Subconscious model using the ol-runbook provider and context settings.",
+      "description": "Run OpenCode on your hosted Subconscious model with the Subconscious provider and context settings.",
       "framework": "OpenCode",
       "language": "shell",
       "category": "coding-agent",
@@ -140,7 +149,11 @@
       "runbook": {
         "mode": "launch",
         "script": "opencode/run.sh",
-        "setupScript": "opencode/install.sh"
+        "setupScript": "opencode/install.sh",
+        "setupActions": [
+          "status",
+          "uninstall"
+        ]
       },
       "launch": "opencode",
       "configEnv": "OPENCODE_CONFIG_CONTENT",
@@ -199,7 +212,7 @@
       "command": "cursor",
       "name": "Cursor",
       "aliases": [],
-      "description": "Install the ol-runbook Cursor conversation and compaction hooks, then finish model setup in Cursor Settings.",
+      "description": "Install Cursor conversation and compaction hooks, then finish model setup in Cursor Settings.",
       "framework": "Cursor",
       "language": "shell",
       "category": "coding-agent",
@@ -213,7 +226,12 @@
       "runbook": {
         "mode": "setup",
         "script": "cursor/install.sh",
-        "setupScript": "cursor/install.sh"
+        "setupScript": "cursor/install.sh",
+        "setupActions": [
+          "install",
+          "status",
+          "uninstall"
+        ]
       }
     },
     {
@@ -224,7 +242,7 @@
         "vscode",
         "vs-code"
       ],
-      "description": "Install the ol-runbook VS Code custom endpoint and Copilot conversation/compaction hooks.",
+      "description": "Install the VS Code custom endpoint and Copilot conversation/compaction hooks.",
       "framework": "GitHub Copilot",
       "language": "shell",
       "category": "coding-agent",
@@ -238,7 +256,12 @@
       "runbook": {
         "mode": "setup",
         "script": "copilot/install.sh",
-        "setupScript": "copilot/install.sh"
+        "setupScript": "copilot/install.sh",
+        "setupActions": [
+          "install",
+          "status",
+          "uninstall"
+        ]
       }
     },
     {
@@ -246,7 +269,7 @@
       "command": "pi",
       "name": "Pi",
       "aliases": [],
-      "description": "Launch Pi with the Subconscious provider and active profile model configured by subc setup.",
+      "description": "Launch Pi with the Subconscious provider and active profile model configured by subc pi install.",
       "framework": "Pi",
       "language": "shell",
       "category": "coding-agent",
@@ -261,7 +284,12 @@
       "runbook": {
         "mode": "launch",
         "script": "pi/run.sh",
-        "setupScript": "pi/install.sh"
+        "setupScript": "pi/install.sh",
+        "setupActions": [
+          "install",
+          "status",
+          "uninstall"
+        ]
       }
     }
   ]

package/bin/runbook/README.md

@@ -1,25 +1,22 @@
-# ol-runbook coding-agent integrations
+# Coding-agent integrations
 
-These runtime files are vendored from `ol-runbook/coding-agents` so the npm
-package can run without a separate runbook checkout. The snapshot was synced
-from `ol-runbook` commit `2236390` (latest `main` on 2026-08-13), with Claude
-Code model-picker aliases and complete Codex, OpenCode, Pi, and Copilot model
-catalogs added for the CLI's full Subconscious catalog. Namespaced
-`subconscious/...` IDs are supported throughout. Codex app/plugin tools are
-also disabled by default to honor the gateway's 128-tool request limit.
+These scripts are part of `subc`. They launch or surgically install Claude Code,
+Codex, OpenCode, Cursor, Copilot, and Pi against the Subconscious gateway.
+
+`subc` reads `~/.subconscious/profiles/<name>.env` and injects those values into
+the scripts, so users do not need a sibling `.env` file. When a script is run
+directly, `SUBC_ENV_FILE` (or `cli/bin/runbook/.env`) can supply the same keys.
 
 Included integrations:
 
 - `claude-code/install.sh` and `run.sh`
-- `codex/install.sh`, `run.sh`, `hook.sh`, and `hooks.json`
+- `codex/install.sh`, `run.sh`, `hook.sh`, `hooks.json`, and `hooks-lib.sh`
 - `opencode/install.sh`, `run.sh`, and `subconscious-compaction.ts`
 - `cursor/install.sh`, `hook.sh`, and `hooks.json`
 - `copilot/install.sh`, `hook.sh`, and `hooks.json`
 - `pi/install.sh`, `run.sh`, and `subconscious-compaction.ts`
 
-When the upstream setup changes, update this snapshot and the corresponding
-entries in `agents/registry.json` together.
-
-At runtime `subc` reads `~/.subconscious/profiles/<name>.env` and injects those values
-into these scripts, so users do not need to create a runbook checkout or source
-an env file manually.
+Each CLI-enabled entry in `agents/registry.json` points here with a `runbook`
+block. Persistent writes are merge/unmerge only: they never replace a user's
+`config.toml`, `opencode.json`, `models.json`, `hooks.json`, or VS Code
+provider list.