subconscious-cli 6.2.0 → 6.2.1

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/sessions.js

@@ -1,4 +1,3 @@
-import { spawnSync } from 'node:child_process';
 import fs from 'node:fs/promises';
 import os from 'node:os';
 import path from 'node:path';
@@ -6,7 +5,7 @@ import { AGENTS, agentById, agentCommandName } from './agent-data.js';
 import { resolveAgent, runAgent } from './agents.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,9 +450,7 @@ 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;
   const roots = options.roots || {
     claude: path.join(home, '.claude', 'projects'),
     codex: path.join(home, '.codex', 'sessions'),
@@ -476,7 +472,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 +499,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 +520,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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "subconscious-cli",
-  "version": "6.2.0",
+  "version": "6.2.1",
   "description": "CLI for Subconscious — run Subconscious Code, Claude Code, Codex, OpenCode, DeepSeek Harness, Cursor, 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 .",