subconscious-cli 6.2.0 → 6.3.0

package/bin/command-output.js

@@ -0,0 +1,75 @@
+import { spawn } from 'node:child_process';
+import { spawnWindows } from './windows/process.js';
+
+export const COMMAND_TIMEOUT_MS = 5_000;
+const MAX_OUTPUT_BYTES = 4 * 1024 * 1024;
+
+/**
+ * Run a command and collect its stdout without blocking the event loop.
+ *
+ * A synchronous spawn with a timeout only sends SIGTERM and then waits for the
+ * child to exit, so a child that ignores SIGTERM blocks the process for as long
+ * as it runs. This sends SIGKILL at the deadline and stops reading at once,
+ * even when a grandchild still holds the pipe open.
+ */
+export function runCommand(command, args, options = {}) {
+  const spawnImpl =
+    options.spawn || (process.platform === 'win32' ? spawnWindows : spawn);
+  const timeoutMs = options.timeout ?? COMMAND_TIMEOUT_MS;
+  const signal = options.signal;
+
+  return new Promise((resolve) => {
+    if (signal?.aborted) {
+      resolve({ status: null, stdout: '', error: new Error('cancelled') });
+      return;
+    }
+
+    let child;
+    try {
+      child = spawnImpl(command, args, {
+        env: options.env || process.env,
+        stdio: ['ignore', 'pipe', 'ignore'],
+        windowsHide: true,
+      });
+    } catch (error) {
+      resolve({ status: null, stdout: '', error });
+      return;
+    }
+
+    let stdout = '';
+    let settled = false;
+    let timer;
+    const finish = (result) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      signal?.removeEventListener('abort', onAbort);
+      resolve(result);
+    };
+    const stop = (message) => {
+      try {
+        child.kill('SIGKILL');
+      } catch {
+        // The child already exited.
+      }
+      child.stdout?.destroy();
+      finish({ status: null, stdout: '', error: new Error(message) });
+    };
+    const onAbort = () => stop('cancelled');
+
+    timer = setTimeout(
+      () => stop(`${command} timed out after ${timeoutMs}ms`),
+      timeoutMs,
+    );
+    signal?.addEventListener('abort', onAbort, { once: true });
+
+    child.stdout?.setEncoding('utf8');
+    child.stdout?.on('data', (chunk) => {
+      stdout += chunk;
+      if (stdout.length > MAX_OUTPUT_BYTES) stop(`${command} output too large`);
+    });
+    child.stdout?.on('error', () => {});
+    child.once('error', (error) => finish({ status: null, stdout: '', error }));
+    child.once('close', (status) => finish({ status, stdout }));
+  });
+}

package/bin/profiles.js

@@ -36,6 +36,10 @@ const PREVIOUS_DEFAULT_GATEWAYS = new Set([
 const CONFIG_OVERRIDE = process.env.SUBC_CONFIG_DIR?.trim();
 const CONFIG_DIR = CONFIG_OVERRIDE || path.join(os.homedir(), '.subconscious');
 export const PROFILES_DIR = path.join(CONFIG_DIR, 'profiles');
+/** Absolute path of the subc config dir (~/.subconscious or $SUBC_CONFIG_DIR). */
+export function configDir() {
+  return CONFIG_DIR;
+}
 const LEGACY_PROFILES_DIR = CONFIG_OVERRIDE
   ? null
   : path.join(os.homedir(), '.subcon', 'profiles');

package/bin/runbook/README.md

@@ -8,12 +8,11 @@ the default gateway, model capabilities, and the settings every agent uses
 
 | Agent | Launch | Setup |
 | --- | --- | --- |
+| `opencode` | binary | `install.sh` (leftover status/uninstall) |
 | `claude-code` | binary | `install.sh` (leftover status/uninstall) |
 | `codex` | `run.sh` | `install.sh` (hooks) |
-| `opencode` | binary | `install.sh` (leftover status/uninstall) |
-| `cursor` | none | `install.sh` (hooks) |
-| `copilot` | none | `install.sh` (provider and hooks) |
 | `pi` | `run.sh` | `install.sh` (provider and extensions) |
+| `copilot` | none | `install.sh` (provider and hooks) |
 | `deepseek-harness` | `run.sh` | none |
 
 ## What `agent.json` holds and who reads it

package/bin/runbook/claude-code/agent.json

@@ -28,7 +28,7 @@
   },
   "help": {
     "usage": "subc [-p NAME] claude [help|status|uninstall] [Claude arguments...]",
-    "behavior": "Launches Claude Code with the active Subconscious profile and model picker. Persistent files are leftover-only: subc claude uninstall.",
+    "behavior": "Launches Claude Code with the active Subconscious profile and model picker. Sessions run with CLAUDE_CONFIG_DIR=~/.subconscious/claude-code, which shares the setup your plain claude uses (~/.claude, or your CLAUDE_CONFIG_DIR): CLAUDE.md, skills, plugins, hooks, MCP servers and session history. Only the model pick is kept apart, so a /model choice in subc does not change plain Claude. Persistent files are leftover-only: subc claude uninstall.",
     "options": [
       ["help", "Show this help"],
       ["status", "Inspect leftover ~/.claude/subconscious-gateway.env"],
@@ -113,6 +113,18 @@
       "type": "integer",
       "min": 1
     },
+    {
+      "name": "CLAUDE_CODE_ISOLATE",
+      "flag": "--no-isolate",
+      "flag_value": "off",
+      "default": "on",
+      "strict": true,
+      "choices": ["on", "off"],
+      "help": "Use ~/.claude directly, so a /model pick in subc also changes plain Claude Code",
+      "label": "Isolated Claude config",
+      "description": "When on, subc claude sessions use ~/.subconscious/claude-code as the Claude config dir. It links back to ~/.claude for CLAUDE.md, skills, hooks and session history, copies the plugin index, rebuilds settings.json from ~/.claude/settings.json on each launch, and keeps only the subc model pick apart.",
+      "comment": "CLAUDE_CODE_ISOLATE=off shares ~/.claude with plain Claude Code."
+    },
     { "name": "MAX_CONCURRENT_SUBAGENTS" },
     {
       "name": "MAX_SUBAGENT_SPAWN_DEPTH",
@@ -147,6 +159,12 @@
       "override": ["ANTHROPIC_SMALL_FAST_MODEL"],
       "description": "Small/fast background model."
     },
+    {
+      "name": "CLAUDE_CONFIG_DIR",
+      "value": "{claudeConfigDir}",
+      "optional": true,
+      "description": "Claude Code config dir for subc sessions, prepared before each launch to share the user's own Claude config (~/.claude, or a CLAUDE_CONFIG_DIR they set, which becomes the source rather than the launch dir). When CLAUDE_CODE_ISOLATE=off, the user's own CLAUDE_CONFIG_DIR is kept, or none is set, so sessions use it directly."
+    },
     {
       "name": "CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY",
       "value": "0",
@@ -233,6 +251,12 @@
       },
       "description": "Replaces the built-in model picker with the live catalog and allowlists only those models."
     },
+    {
+      "kind": "file",
+      "path": "~/.subconscious/claude-code",
+      "lifetime": "persistent",
+      "description": "Claude Code config dir for subc sessions (~/.subconscious/claude-code, honoring $SUBC_CONFIG_DIR), set via CLAUDE_CONFIG_DIR. Each launch links CLAUDE.md, history.jsonl and keybindings.json (when present) and the rules, agents, commands, skills, output-styles, hooks, projects, file-history, todos, plans and ide folders (created in ~/.claude when missing) back to ~/.claude, copies the plugin index files (plugin changes made inside subc stay in subc and reset on the next launch), rebuilds settings.json from ~/.claude/settings.json (keeping the subc model pick, dropping apiKeyHelper and env names subc sets), and copies MCP servers, trust and onboarding state from ~/.claude.json (never login state). Settings or MCP servers changed inside a subc session are replaced on the next launch; that launch names them and saves them in settings.discarded.json or mcp.discarded.json in this dir. subc never deletes it and never writes ~/.claude settings; it refuses to launch when this dir resolves to your own config. To remove it, delete the links first: rm -r with a trailing slash, or PowerShell Remove-Item -Recurse, follows them into ~/.claude. Opt out with CLAUDE_CODE_ISOLATE=off or subc claude --no-isolate."
+    },
     {
       "kind": "file",
       "path": "~/.claude/subconscious-gateway.env",

package/bin/runbook/shared.json

@@ -3,9 +3,8 @@
     "opencode",
     "claude-code",
     "codex",
-    "cursor",
-    "copilot",
     "pi",
+    "copilot",
     "deepseek-harness"
   ],
   "defaults": {

package/bin/sessions.js

@@ -1,12 +1,11 @@
-import { spawnSync } from 'node:child_process';
 import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
 import { AGENTS, agentById, agentCommandName } from './agent-data.js';
 import { resolveAgent, runAgent } from './agents.js';
-
+import { claudeSourceDir } from './claude-config.js';
 import { c } from './colors.js';
-import { spawnWindowsSync } from './windows/process.js';
+import { runCommand } from './command-output.js';
 
 const MAX_CANDIDATE_FILES = 160;
 const MAX_READ_BYTES = 2 * 1024 * 1024;
@@ -399,12 +398,11 @@ async function discoverCodexIndex(root, indexFile, max) {
   );
 }
 
-function commandResult(execute, command, args, options = {}) {
-  const result = execute(command, args, {
-    encoding: 'utf8',
-    timeout: options.timeout ?? 5_000,
+async function commandResult(execute, command, args, options = {}) {
+  const result = await execute(command, args, {
+    timeout: options.timeout,
+    signal: options.signal,
     env: { ...process.env, NO_COLOR: '1' },
-    maxBuffer: 4 * 1024 * 1024,
   });
   if (result.error || result.status !== 0) return '';
   return String(result.stdout || '').trim();
@@ -422,18 +420,18 @@ function sqlString(value) {
   return `'${String(value).replaceAll("'", "''")}'`;
 }
 
-function discoverOpenCodeSessions(execute, max) {
+async function discoverOpenCodeSessions(execute, max, options = {}) {
   const query = [
     'select id, title, directory, time_created, time_updated, model',
     'from session where time_archived is null',
     `order by time_updated desc limit ${Math.max(1, Math.min(500, max))}`,
   ].join(' ');
-  const output = commandResult(execute, 'opencode', [
-    'db',
-    '--format',
-    'json',
-    query,
-  ]);
+  const output = await commandResult(
+    execute,
+    'opencode',
+    ['db', '--format', 'json', query],
+    options,
+  );
   if (!output) return [];
   try {
     return JSON.parse(output).map((record) =>
@@ -452,11 +450,11 @@ function discoverOpenCodeSessions(execute, max) {
 export async function discoverSessions(options = {}) {
   const home = options.home || os.homedir();
   const max = options.max || 500;
-  const execute =
-    options.execute ||
-    (process.platform === 'win32' ? spawnWindowsSync : spawnSync);
+  const execute = options.execute || runCommand;
+  // Plain claude's folder: ~/.claude, or the user's CLAUDE_CONFIG_DIR.
+  const claudeDir = claudeSourceDir({ env: options.env, home });
   const roots = options.roots || {
-    claude: path.join(home, '.claude', 'projects'),
+    claude: path.join(claudeDir, 'projects'),
     codex: path.join(home, '.codex', 'sessions'),
     pi: path.join(home, '.pi', 'agent', 'sessions'),
   };
@@ -468,7 +466,7 @@ export async function discoverSessions(options = {}) {
           codex: path.join(roots.codex, '.session-index.jsonl'),
         }
       : {
-          claude: path.join(home, '.claude', 'history.jsonl'),
+          claude: path.join(claudeDir, 'history.jsonl'),
           codex: path.join(home, '.codex', 'session_index.jsonl'),
         });
   const claude = await discoverClaudeIndex(roots.claude, indexes.claude, max);
@@ -476,7 +474,10 @@ export async function discoverSessions(options = {}) {
   const groups = await Promise.all([
     claude || discoverFileSessions(roots.claude, 'claude', max),
     codex || discoverFileSessions(roots.codex, 'codex', max),
-    Promise.resolve(discoverOpenCodeSessions(execute, max)),
+    discoverOpenCodeSessions(execute, max, {
+      timeout: options.commandTimeoutMs,
+      signal: options.signal,
+    }),
     discoverFileSessions(roots.pi, 'pi', max),
   ]);
   const seen = new Set();
@@ -500,7 +501,7 @@ async function openCodeMessages(session, execute) {
     "and json_extract(part.data, '$.type') = 'text'",
     'order by message.time_created asc, part.time_created asc',
   ].join(' ');
-  const output = commandResult(execute, 'opencode', [
+  const output = await commandResult(execute, 'opencode', [
     'db',
     '--format',
     'json',
@@ -521,11 +522,7 @@ async function openCodeMessages(session, execute) {
 
 export async function readSessionMessages(session, options = {}) {
   if (session.harness === 'opencode') {
-    return openCodeMessages(
-      session,
-      options.execute ||
-        (process.platform === 'win32' ? spawnWindowsSync : spawnSync),
-    );
+    return openCodeMessages(session, options.execute || runCommand);
   }
   if (!session.sourcePath) return [];
   const records = parseLines(await readBounded(session.sourcePath));

package/bin/tui.js

@@ -411,6 +411,7 @@ function spawnAndWait(command, args, options = {}) {
       stdio: options.stdio ?? 'inherit',
     });
     child.once('error', reject);
+    options.onSpawn?.();
     child.once('exit', (code, signal) => {
       if (signal) {
         reject(new Error(`Subconscious TUI exited with signal ${signal}`));
@@ -458,13 +459,17 @@ async function runTuiOnce(options) {
     }
   };
 
-  const remote = providedState
-    ? Promise.resolve()
-    : loadRemoteTuiUpdates(state, {
-        ...options,
-        signal: controller.signal,
-        writePatch,
-      });
+  // Remote work starts only once the TUI process exists, so nothing it does
+  // (a slow gateway, a stuck session probe) can delay the first frame.
+  let remote = Promise.resolve();
+  const startRemote = () => {
+    if (providedState) return;
+    remote = loadRemoteTuiUpdates(state, {
+      ...options,
+      signal: controller.signal,
+      writePatch,
+    });
+  };
 
   try {
     // This state intentionally contains only display data. API keys are used
@@ -483,7 +488,12 @@ async function runTuiOnce(options) {
         '--updates',
         updatesPath,
       ],
-      { cwd: executable.cwd, spawn: options.spawn, stdio: options.stdio },
+      {
+        cwd: executable.cwd,
+        spawn: options.spawn,
+        stdio: options.stdio,
+        onSpawn: startRemote,
+      },
     );
     controller.abort();
     await remote.catch(() => {});

package/bin/windows/hook.cjs

@@ -18,12 +18,10 @@ async function main() {
   });
   try { payload = JSON.parse(input); } catch { /* fail open */ }
   const event = payload?.hook_event_name || '';
-  const response = client === 'cursor'
-    ? (event === 'preCompact' ? {} : { continue: true, permission: 'allow' })
-    : client === 'copilot' ? { continue: true } : {};
+  const response = client === 'copilot' ? { continue: true } : {};
   try {
     const config = JSON.parse(await fs.readFile(configPath, 'utf8'));
-    const cid = payload?.conversation_id || payload?.session_id;
+    const cid = payload?.session_id;
     if (!cid || typeof cid !== 'string' || !config.apiKey || !config.gatewayUrl) return;
     const post = async body => {
       const controller = new AbortController();
@@ -36,19 +34,15 @@ async function main() {
         await res.body?.cancel();
       } catch { /* fail open */ } finally { clearTimeout(timer); }
     };
-    if ((client === 'cursor' && event === 'beforeSubmitPrompt') || (client === 'copilot' && event === 'UserPromptSubmit')) {
+    if (client === 'copilot' && event === 'UserPromptSubmit') {
       if (typeof payload.prompt !== 'string' || !payload.prompt) return;
-      const root = payload.workspace_roots?.[0] || payload.cwd;
+      const root = payload.cwd;
       await post({ event: 'conversation_ensure', prompt: payload.prompt, workspace: typeof root === 'string' ? path.win32.basename(root) : undefined });
     }
     if (client === 'codex' && ['PreCompact', 'PostCompact'].includes(event)) {
       const phase = event === 'PreCompact' ? 'start' : 'end';
       await post({ event: 'conversation_compaction', phase, dedupe_key: `${cid}:${phase}:${payload.turn_id || randomUUID()}`, metadata: { trigger: payload.trigger, turn_id: payload.turn_id } });
     }
-    if (client === 'cursor' && event === 'preCompact') {
-      const metadata = Object.fromEntries(['trigger', 'context_tokens', 'context_window_size', 'context_usage_percent', 'message_count', 'messages_to_compact', 'is_first_compaction'].filter(k => payload[k] != null).map(k => [k, payload[k]]));
-      await post({ event: 'conversation_compaction', phase: 'point', dedupe_key: `${cid}:${payload.generation_id ?? 'gen'}:${payload.is_first_compaction ?? false}`, metadata });
-    }
     if (client === 'copilot' && ['PreCompact', 'UserPromptSubmit'].includes(event)) {
       const pendingDir = path.join(path.dirname(configPath), 'subconscious-compact-pending');
       const pending = path.join(pendingDir, createHash('sha256').update(cid).digest('hex') + '.json');

package/bin/windows/launch.js

@@ -9,6 +9,7 @@ import {
   resolveInputs,
   takeFlags,
 } from '../agent-launch.js';
+import { prepareClaudeLaunch } from '../claude-config.js';
 import { claudePickerSettings } from '../claude-picker.js';
 import { modelIds, positiveInteger } from '../launch-values.js';
 import { modelSupportsVision } from '../model-capabilities.js';
@@ -56,11 +57,18 @@ function claudeLaunch(agent, argv, env) {
 }
 
 function plannedLaunch(agent, argv, env) {
-  const plan =
-    agent.id === 'claude-code'
-      ? claudeLaunch(agent, argv, env)
-      : launchPlan(agent, { env, args: argv });
-  return { command: plan.argv[0], args: plan.argv.slice(1), env: plan.env };
+  if (agent.id !== 'claude-code') {
+    const plan = launchPlan(agent, { env, args: argv });
+    return { command: plan.argv[0], args: plan.argv.slice(1), env: plan.env };
+  }
+  const plan = claudeLaunch(agent, argv, env);
+  return {
+    command: plan.argv[0],
+    args: plan.argv.slice(1),
+    env: plan.env,
+    // Runs only when the launch executes, so planning never touches disk.
+    prepare: (options) => prepareClaudeLaunch(agent, plan.env, env, options),
+  };
 }
 
 function codexCatalog(env, context, maxContext, compact) {
@@ -266,12 +274,17 @@ export async function windowsLaunch(
   throw new Error(`No native Windows launcher is available for ${id}`);
 }
 
-export async function executeWindowsLaunch(spec, run) {
+export async function executeWindowsLaunch(spec, run, prepareOptions) {
   try {
+    const prepared = spec.prepare?.(prepareOptions);
+    for (const warning of prepared?.warnings ?? []) {
+      console.error(`  ${warning}`);
+    }
+    // Claude Code would write into the user's own config there.
+    if (prepared?.refused) return 1;
+    const env = { ...spec.env, ...prepared?.env };
     const options =
-      spec.input === undefined
-        ? { env: spec.env }
-        : { env: spec.env, input: spec.input };
+      spec.input === undefined ? { env } : { env, input: spec.input };
     return await run(spec.command, spec.args, options);
   } finally {
     await spec.cleanup?.();

package/bin/windows/process.js

@@ -1,6 +1,6 @@
 // Windows process handling. Unix callers keep using their existing launch paths.
 
-import { execFileSync, spawn, spawnSync } from 'node:child_process';
+import { execFileSync, spawn } from 'node:child_process';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
@@ -189,23 +189,6 @@ export function spawnWindows(command, args, options = {}) {
   });
 }
 
-export function spawnWindowsSync(command, args, options = {}) {
-  try {
-    const invocation = windowsInvocation(
-      command,
-      args,
-      options.env || process.env,
-    );
-    return spawnSync(invocation.command, invocation.args, {
-      ...options,
-      env: invocation.env,
-      shell: false,
-    });
-  } catch (error) {
-    return { error, status: null, stdout: '', stderr: '' };
-  }
-}
-
 export function runWindows(command, args, options = {}) {
   const { input, ...spawnOptions } = options;
   return new Promise((resolve, reject) => {

package/bin/windows/setup.js

@@ -78,7 +78,6 @@ export function mergeHooks(document, client, command) {
   if (command) {
     const events = {
       codex: ['PreCompact', 'PostCompact'],
-      cursor: ['beforeSubmitPrompt', 'preCompact'],
       copilot: ['UserPromptSubmit', 'PreCompact'],
     }[client];
     for (const event of events) {
@@ -99,7 +98,6 @@ export function mergeHooks(document, client, command) {
     }
   }
   result.hooks = hooks;
-  if (client === 'cursor' && command) result.version ??= 1;
   return result;
 }
 
@@ -136,11 +134,11 @@ export async function windowsSetup(
   const apiKey = options['--api-key'] || value(env, 'API_KEY');
   const installing = action === 'install';
   const removing = action === 'uninstall';
-  const needsKey = ['codex', 'cursor', 'copilot', 'pi'].includes(id);
+  const needsKey = ['codex', 'copilot', 'pi'].includes(id);
   if (installing && needsKey && !apiKey)
     throw new Error('An API key is required for setup. Run subc login first.');
 
-  if (['codex', 'cursor', 'copilot'].includes(id)) {
+  if (['codex', 'copilot'].includes(id)) {
     const dir =
       id === 'codex'
         ? env.CODEX_DIR || env.CODEX_HOME || path.join(home, '.codex')
@@ -243,10 +241,6 @@ export async function windowsSetup(
       await fs.rm(script, { force: true });
       await fs.rm(config, { force: true });
     }
-    if (installing && id === 'cursor')
-      log(
-        `In Cursor Settings, use ${gatewayUrl}/v1, your API key, and model ${value(env, 'MODEL', defaults.model)}. Restart Cursor to load hooks.`,
-      );
     if (installing && id === 'copilot')
       log(
         'Restart VS Code, select a Subconscious model, and enter your API key when prompted.',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "subconscious-cli",
-  "version": "6.2.0",
-  "description": "CLI for Subconscious — run Subconscious Code, Claude Code, Codex, OpenCode, DeepSeek Harness, Cursor, Copilot, and Pi",
+  "version": "6.3.0",
+  "description": "CLI for Subconscious — run Subconscious Code, Claude Code, Codex, OpenCode, DeepSeek Harness, Copilot, and Pi",
   "bin": {
     "subc": "bin/cli.js"
   },
@@ -9,7 +9,7 @@
     "build:tui": "node scripts/build-tui.js",
     "build:tui:host": "node scripts/build-tui.js --host",
     "test": "node --test",
-    "test:windows": "node --test test/windows.test.js test/models.test.js test/model-capabilities.test.js test/auth.test.js test/tui.test.js test/update-check.test.js test/sessions.test.js test/branding.test.js test/claude-version.test.js test/usage.test.js test/feedback.test.js test/release.test.js test/github-govuln-issue.test.js test/harness-manifest.test.js test/agent-files.test.js test/agent-launch.test.js test/agent-install-policy.test.js",
+    "test:windows": "node --test test/windows.test.js test/models.test.js test/model-capabilities.test.js test/auth.test.js test/tui.test.js test/update-check.test.js test/sessions.test.js test/command-output.test.js test/branding.test.js test/claude-version.test.js test/usage.test.js test/feedback.test.js test/release.test.js test/github-govuln-issue.test.js test/harness-manifest.test.js test/agent-files.test.js test/agent-launch.test.js test/agent-install-policy.test.js",
     "test:tui": "go -C tui test ./...",
     "lint": "biome ci .",
     "format": "biome check --write .",
@@ -40,7 +40,6 @@
     "claude-code",
     "opencode",
     "codex",
-    "cursor",
     "copilot",
     "pi",
     "deepseek-harness",