subconscious-cli 6.0.0 → 6.1.0

package/bin/sessions.js

@@ -1,11 +1,12 @@
 import { spawnSync } from 'node:child_process';
-import { spawnWindowsSync } from './windows/process.js';
 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 { c } from './colors.js';
-import { resolveAgent, runAgent } from './agents.js';
+import { spawnWindowsSync } from './windows/process.js';
 
 const MAX_CANDIDATE_FILES = 160;
 const MAX_READ_BYTES = 2 * 1024 * 1024;
@@ -14,19 +15,29 @@ const MAX_INDEX_BYTES = 4 * 1024 * 1024;
 const MAX_HANDOFF_MESSAGES = 24;
 const MAX_HANDOFF_CHARS = 24_000;
 const MAX_MESSAGE_CHARS = 4_000;
-const SESSION_KEY_PATTERN = /^(claude|codex|opencode|pi|sc):[-A-Za-z0-9._]+$/;
-
-export const SESSION_HARNESSES = Object.freeze({
-  claude: { name: 'Claude Code', command: 'claude', portable: true },
-  codex: { name: 'Codex CLI', command: 'codex', portable: true },
-  opencode: { name: 'OpenCode', command: 'opencode', portable: true },
-  pi: { name: 'Pi', command: 'pi', portable: true },
-  sc: { name: 'Marathon', command: 'marathon', portable: false },
-});
+const SESSION_KEY_PATTERN = new RegExp(
+  `^(${AGENTS.filter((agent) => agent.sessions)
+    .map((agent) => agent.sessions.key)
+    .join('|')}):[-A-Za-z0-9._]+$`,
+);
+
+export const SESSION_HARNESSES = Object.freeze(
+  Object.fromEntries(
+    AGENTS.filter((agent) => agent.sessions).map((agent) => [
+      agent.sessions.key,
+      Object.freeze({
+        name: agent.name,
+        command: agentCommandName(agent),
+        portable: agent.sessions.portable,
+        agentId: agent.id,
+      }),
+    ]),
+  ),
+);
 
 function cleanText(value) {
   return String(value || '')
-    .replace(/\u0000/g, '')
+    .replaceAll('\0', '')
     .replace(/\r\n/g, '\n')
     .trim();
 }
@@ -56,7 +67,10 @@ function parseLines(text) {
   for (const line of text.split('\n')) {
     if (!line.trim()) continue;
     try {
-      records.push(JSON.parse(line));
+      const record = JSON.parse(line);
+      if (record && typeof record === 'object' && !Array.isArray(record)) {
+        records.push(record);
+      }
     } catch {
       // Session writers can leave a partial final line after an interrupted run.
     }
@@ -194,8 +208,15 @@ function codexMessages(records) {
   return records.flatMap((record) => {
     if (record.type !== 'event_msg') return [];
     const eventType = record.payload?.type;
-    const role = eventType === 'user_message' ? 'user' : eventType === 'agent_message' ? 'assistant' : '';
-    const text = cleanText(record.payload?.message || record.payload?.last_agent_message);
+    const role =
+      eventType === 'user_message'
+        ? 'user'
+        : eventType === 'agent_message'
+          ? 'assistant'
+          : '';
+    const text = cleanText(
+      record.payload?.message || record.payload?.last_agent_message,
+    );
     return role && text ? [{ role, text }] : [];
   });
 }
@@ -227,12 +248,22 @@ async function parseFileSession(entry, harness) {
     const messages = claudeMessages(records);
     const metadata = records.find((record) => record.cwd) || {};
     const identity = records.find((record) => record.sessionId) || {};
-    const id = metadata.sessionId || identity.sessionId || filename.split('.orphaned-')[0];
+    const id =
+      metadata.sessionId ||
+      identity.sessionId ||
+      filename.split('.orphaned-')[0];
     const titleRecord = records.find((record) => record.type === 'ai-title');
-    const lastPrompt = [...records].reverse().find((record) => record.type === 'last-prompt');
-    const assistant = records.find((record) => record.message?.role === 'assistant');
+    const lastPrompt = [...records]
+      .reverse()
+      .find((record) => record.type === 'last-prompt');
+    const assistant = records.find(
+      (record) => record.message?.role === 'assistant',
+    );
     return sessionRecord(harness, id, {
-      title: titleRecord?.aiTitle || messages.find((message) => message.role === 'user')?.text || lastPrompt?.lastPrompt,
+      title:
+        titleRecord?.aiTitle ||
+        messages.find((message) => message.role === 'user')?.text ||
+        lastPrompt?.lastPrompt,
       cwd: metadata.cwd,
       model: assistant?.message?.model,
       updated: entry.updated,
@@ -241,10 +272,14 @@ async function parseFileSession(entry, harness) {
   }
 
   if (harness === 'codex') {
-    const meta = records.find((record) => record.type === 'session_meta')?.payload || {};
+    const meta =
+      records.find((record) => record.type === 'session_meta')?.payload || {};
     const messages = codexMessages(records);
-    const id = meta.id || filename.match(/([0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12})$/i)?.[1];
-    const context = records.find((record) => record.type === 'turn_context')?.payload || {};
+    const id =
+      meta.id ||
+      filename.match(/([0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12})$/i)?.[1];
+    const context =
+      records.find((record) => record.type === 'turn_context')?.payload || {};
     return sessionRecord(harness, id, {
       title: messages.find((message) => message.role === 'user')?.text,
       cwd: meta.cwd,
@@ -257,7 +292,9 @@ async function parseFileSession(entry, harness) {
   if (harness === 'pi') {
     const meta = records.find((record) => record.type === 'session') || {};
     const messages = piMessages(records);
-    const assistant = records.find((record) => record.message?.role === 'assistant');
+    const assistant = records.find(
+      (record) => record.message?.role === 'assistant',
+    );
     return sessionRecord(harness, meta.id || filename.split('_').at(-1), {
       title: messages.find((message) => message.role === 'user')?.text,
       cwd: meta.cwd,
@@ -294,11 +331,17 @@ async function discoverFileSessions(root, harness, limit) {
 function sessionIdFromFile(file, harness) {
   const name = path.basename(file, '.jsonl');
   if (harness === 'claude') {
-    if (name.includes('.orphaned-') || file.split(path.sep).includes('subagents')) return '';
+    if (
+      name.includes('.orphaned-') ||
+      file.split(path.sep).includes('subagents')
+    )
+      return '';
     return name;
   }
   if (harness === 'codex') {
-    return name.match(/([0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12})$/i)?.[1] || '';
+    return (
+      name.match(/([0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12})$/i)?.[1] || ''
+    );
   }
   return '';
 }
@@ -359,10 +402,16 @@ async function discoverCodexIndex(root, indexFile, max) {
     const updated = Date.parse(record.updated_at || '') || 0;
     const current = byID.get(record.id);
     if (!current || updated >= current.updated) {
-      byID.set(record.id, { id: record.id, title: record.thread_name, updated });
+      byID.set(record.id, {
+        id: record.id,
+        title: record.thread_name,
+        updated,
+      });
     }
   }
-  const selected = [...byID.values()].sort((a, b) => b.updated - a.updated).slice(0, max);
+  const selected = [...byID.values()]
+    .sort((a, b) => b.updated - a.updated)
+    .slice(0, max);
   return selected.map((record) =>
     sessionRecord('codex', record.id, {
       ...record,
@@ -400,7 +449,12 @@ function discoverOpenCodeSessions(execute, max) {
     '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 = commandResult(execute, 'opencode', [
+    'db',
+    '--format',
+    'json',
+    query,
+  ]);
   if (!output) return [];
   try {
     return JSON.parse(output).map((record) =>
@@ -419,7 +473,9 @@ 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 ||
+    (process.platform === 'win32' ? spawnWindowsSync : spawnSync);
   const roots = options.roots || {
     claude: path.join(home, '.claude', 'projects'),
     codex: path.join(home, '.codex', 'sessions'),
@@ -467,11 +523,19 @@ 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', ['db', '--format', 'json', query]);
+  const output = commandResult(execute, 'opencode', [
+    'db',
+    '--format',
+    'json',
+    query,
+  ]);
   if (!output) return [];
   try {
     return JSON.parse(output)
-      .filter((row) => ['user', 'assistant'].includes(row.role) && cleanText(row.text))
+      .filter(
+        (row) =>
+          ['user', 'assistant'].includes(row.role) && cleanText(row.text),
+      )
       .map((row) => ({ role: row.role, text: cleanText(row.text) }));
   } catch {
     return [];
@@ -480,7 +544,11 @@ 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 ||
+        (process.platform === 'win32' ? spawnWindowsSync : spawnSync),
+    );
   }
   if (!session.sourcePath) return [];
   const records = parseLines(await readBounded(session.sourcePath));
@@ -492,11 +560,14 @@ export async function readSessionMessages(session, options = {}) {
 }
 
 async function hydrateSession(session) {
-  if (session.harness !== 'codex' || !session.sourcePath || session.cwd) return session;
+  if (session.harness !== 'codex' || !session.sourcePath || session.cwd)
+    return session;
   try {
     const head = parseLines(await readHead(session.sourcePath));
-    const meta = head.find((item) => item.type === 'session_meta')?.payload || {};
-    const context = head.find((item) => item.type === 'turn_context')?.payload || {};
+    const meta =
+      head.find((item) => item.type === 'session_meta')?.payload || {};
+    const context =
+      head.find((item) => item.type === 'turn_context')?.payload || {};
     return { ...session, cwd: meta.cwd || '', model: context.model || '' };
   } catch {
     return session;
@@ -518,7 +589,9 @@ export function buildHandoffPrompt(session, messages) {
   }
   selected.reverse();
   if (!selected.length) {
-    throw new Error(`No portable user/assistant messages were found in ${session.harnessName}.`);
+    throw new Error(
+      `No portable user/assistant messages were found in ${session.harnessName}.`,
+    );
   }
 
   return [
@@ -535,23 +608,43 @@ export function buildHandoffPrompt(session, messages) {
     .join('\n\n');
 }
 
+function sessionLaunch(harness) {
+  return agentById(SESSION_HARNESSES[harness]?.agentId)?.launch ?? {};
+}
+
+// One pass, so a prompt that mentions a placeholder is passed unchanged.
+function fillWords(words, values) {
+  return words.map((word) =>
+    word.replace(/\{(sessionId|sessionFile|prompt)\}/g, (_, name) =>
+      String(values[name]),
+    ),
+  );
+}
+
 export function nativeResumeArgs(session) {
-  if (session.harness === 'claude') return ['--resume', session.id];
-  if (session.harness === 'codex') return ['resume', session.id];
-  if (session.harness === 'opencode') return ['--session', session.id];
-  if (session.harness === 'pi') return ['--session', session.sourcePath || session.id];
-  if (session.harness === 'sc') return ['--resume', session.sourcePath];
-  throw new Error(`Native resume is not supported for ${session.harnessName}.`);
+  const { resume } = sessionLaunch(session.harness);
+  if (!resume)
+    throw new Error(
+      `Native resume is not supported for ${session.harnessName}.`,
+    );
+  return fillWords(resume, {
+    sessionId: session.id,
+    sessionFile: session.sourcePath || session.id,
+  });
 }
 
 export function handoffLaunchArgs(targetHarness, prompt) {
-  if (targetHarness === 'opencode') return ['--prompt', prompt];
-  if (['claude', 'codex', 'pi'].includes(targetHarness)) return [prompt];
-  throw new Error(`${SESSION_HARNESSES[targetHarness]?.name || targetHarness} cannot start an interactive handoff yet.`);
+  const { handoff } = sessionLaunch(targetHarness);
+  if (!handoff)
+    throw new Error(
+      `${SESSION_HARNESSES[targetHarness]?.name || targetHarness} cannot start an interactive handoff yet.`,
+    );
+  return fillWords(handoff, { prompt });
 }
 
 function sessionByKey(sessions, key) {
-  if (!SESSION_KEY_PATTERN.test(key || '')) throw new Error('Invalid session key.');
+  if (!SESSION_KEY_PATTERN.test(key || ''))
+    throw new Error('Invalid session key.');
   return sessions.find((session) => session.key === key) || null;
 }
 
@@ -564,11 +657,15 @@ function formatWhen(timestamp) {
 export function printSessions(sessions) {
   console.log(`\n  ${c.bold}Coding sessions${c.reset}\n`);
   if (!sessions.length) {
-    console.log(`  ${c.dim}No supported local coding sessions were found.${c.reset}\n`);
+    console.log(
+      `  ${c.dim}No supported local coding sessions were found.${c.reset}\n`,
+    );
     return;
   }
   for (const session of sessions) {
-    console.log(`  ${c.cyan}${session.key}${c.reset}  ${c.bold}${session.title}${c.reset}`);
+    console.log(
+      `  ${c.cyan}${session.key}${c.reset}  ${c.bold}${session.title}${c.reset}`,
+    );
     console.log(
       `    ${c.dim}${session.harnessName} · ${formatWhen(session.updatedAt)}${session.cwd ? ` · ${session.cwd}` : ''}${c.reset}`,
     );
@@ -585,15 +682,21 @@ export async function sessionsCommand(argv, options = {}) {
     printSessions(sessions);
     return 0;
   }
-  if (action !== 'resume') throw new Error(`Unknown sessions action: ${action}`);
+  if (action !== 'resume')
+    throw new Error(`Unknown sessions action: ${action}`);
 
   const key = argv[1];
   let session = sessionByKey(sessions, key);
-  if (!session) throw new Error(`Session '${key}' was not found. Run subc sessions to refresh the list.`);
+  if (!session)
+    throw new Error(
+      `Session '${key}' was not found. Run subc sessions to refresh the list.`,
+    );
   session = await hydrateSession(session);
   const harnessIndex = argv.indexOf('--harness');
-  const requestedHarness = harnessIndex >= 0 ? argv[harnessIndex + 1] : session.harness;
-  const targetHarness = requestedHarness === 'marathon' ? 'sc' : requestedHarness;
+  const requestedHarness =
+    harnessIndex >= 0 ? argv[harnessIndex + 1] : session.harness;
+  const targetHarness =
+    requestedHarness === 'marathon' ? 'sc' : requestedHarness;
   const target = SESSION_HARNESSES[targetHarness];
   if (!target) throw new Error(`Unknown destination harness: ${targetHarness}`);
 
@@ -602,22 +705,34 @@ export async function sessionsCommand(argv, options = {}) {
       const stat = await fs.stat(session.cwd);
       if (stat.isDirectory()) process.chdir(session.cwd);
     } catch {
-      console.error(`  ${c.yellow}The original directory is unavailable; resuming in ${process.cwd()}.${c.reset}\n`);
+      console.error(
+        `  ${c.yellow}The original directory is unavailable; resuming in ${process.cwd()}.${c.reset}\n`,
+      );
     }
   }
 
   const agent = resolveAgent(target.command);
-  if (!agent) throw new Error(`${target.name} is not registered with this CLI.`);
+  if (!agent)
+    throw new Error(`${target.name} is not registered with this CLI.`);
   if (targetHarness === session.harness) {
-    console.log(`\n  ${c.dim}Resuming in ${c.reset}${c.bold}${session.harnessName}${c.reset}${c.dim}: ${session.title}${c.reset}\n`);
-    return runAgent(agent, nativeResumeArgs(session), { profile: options.profile });
+    console.log(
+      `\n  ${c.dim}Resuming in ${c.reset}${c.bold}${session.harnessName}${c.reset}${c.dim}: ${session.title}${c.reset}\n`,
+    );
+    return runAgent(agent, nativeResumeArgs(session), {
+      profile: options.profile,
+    });
   }
-  if (!target.portable) throw new Error(`${target.name} cannot receive cross-harness sessions yet.`);
+  if (!target.portable)
+    throw new Error(
+      `${target.name} cannot receive cross-harness sessions yet.`,
+    );
 
   const messages = await readSessionMessages(session, options);
   const prompt = buildHandoffPrompt(session, messages);
   console.log(
     `\n  ${c.dim}Handing off ${c.reset}${c.bold}${session.harnessName}${c.reset}${c.dim} → ${c.reset}${c.bold}${target.name}${c.reset}${c.dim}: ${session.title}${c.reset}\n`,
   );
-  return runAgent(agent, handoffLaunchArgs(targetHarness, prompt), { profile: options.profile });
+  return runAgent(agent, handoffLaunchArgs(targetHarness, prompt), {
+    profile: options.profile,
+  });
 }

package/bin/tui.js

@@ -6,22 +6,29 @@ import { fileURLToPath } from 'node:url';
 
 import { agentList } from './agents.js';
 import { DEFAULT_PLATFORM_URL, getApiKey, getPlatformUrl } from './auth.js';
-import { isAbortError, normalizeModelIds, resolveModelCatalog } from './models.js';
-import { discoverSessions, SESSION_HARNESSES } from './sessions.js';
-import { compareVersions, fetchLatestVersion } from './update-check.js';
+import {
+  isAbortError,
+  normalizeModelIds,
+  resolveModelCatalog,
+} from './models.js';
 import {
   DEFAULT_PROFILE,
   listProfiles,
   loadProfile,
-  resolvedModelSetting,
-  RUNBOOK_DEFAULTS,
   SUPPORTED_MODELS as PACKAGED_MODELS,
+  RUNBOOK_DEFAULTS,
+  resolvedModelSetting,
 } from './profiles.js';
+import { discoverSessions, SESSION_HARNESSES } from './sessions.js';
+import { compareVersions, fetchLatestVersion } from './update-check.js';
 
 const BIN_DIR = path.dirname(fileURLToPath(import.meta.url));
 const TUI_SOURCE_DIR = path.resolve(BIN_DIR, '../tui');
 
-export function nativeTargetName(platform = process.platform, arch = process.arch) {
+export function nativeTargetName(
+  platform = process.platform,
+  arch = process.arch,
+) {
   const goArch = { x64: 'amd64', arm64: 'arm64' }[arch];
   if (!goArch || !['darwin', 'linux', 'win32'].includes(platform)) return null;
   const goOS = platform === 'win32' ? 'windows' : platform;
@@ -34,10 +41,13 @@ export function isTuiResult(result) {
     result !== null &&
     typeof result === 'object' &&
     (result.updatePrompt === true ||
-      (Array.isArray(result.args) && result.args.every((arg) => typeof arg === 'string'))) &&
+      (Array.isArray(result.args) &&
+        result.args.every((arg) => typeof arg === 'string'))) &&
     (result.baseUrl === undefined || typeof result.baseUrl === 'string') &&
-    (result.installedVersion === undefined || typeof result.installedVersion === 'string') &&
-    (result.latestVersion === undefined || typeof result.latestVersion === 'string')
+    (result.installedVersion === undefined ||
+      typeof result.installedVersion === 'string') &&
+    (result.latestVersion === undefined ||
+      typeof result.latestVersion === 'string')
   );
 }
 
@@ -50,9 +60,15 @@ async function pathExists(file) {
   }
 }
 
-export async function tuiSourceIsNewerThan(binary, sourceFile = path.join(TUI_SOURCE_DIR, 'cmd/subc-tui/main.go')) {
+export async function tuiSourceIsNewerThan(
+  binary,
+  sourceFile = path.join(TUI_SOURCE_DIR, 'cmd/subc-tui/main.go'),
+) {
   try {
-    const [binaryStat, sourceStat] = await Promise.all([fs.stat(binary), fs.stat(sourceFile)]);
+    const [binaryStat, sourceStat] = await Promise.all([
+      fs.stat(binary),
+      fs.stat(sourceFile),
+    ]);
     return sourceStat.mtimeMs > binaryStat.mtimeMs;
   } catch {
     return false;
@@ -70,7 +86,11 @@ function sourceTuiCommand() {
 export async function resolveTuiExecutable(options = {}) {
   const override = options.binary || process.env.SUBC_TUI_BIN?.trim();
   if (override) {
-    return { command: override, args: options.binaryArgs || [], cwd: undefined };
+    return {
+      command: override,
+      args: options.binaryArgs || [],
+      cwd: undefined,
+    };
   }
 
   const hasSource = await pathExists(path.join(TUI_SOURCE_DIR, 'go.mod'));
@@ -79,7 +99,10 @@ export async function resolveTuiExecutable(options = {}) {
     const packaged = path.join(BIN_DIR, 'native', target);
     // Source checkouts keep a cached host binary for speed. If TUI source is
     // newer, that cache is stale (for example it will reject --updates).
-    if (await pathExists(packaged) && !(hasSource && (await tuiSourceIsNewerThan(packaged)))) {
+    if (
+      (await pathExists(packaged)) &&
+      !(hasSource && (await tuiSourceIsNewerThan(packaged)))
+    ) {
       return { command: packaged, args: [], cwd: undefined };
     }
   }
@@ -91,7 +114,9 @@ export async function resolveTuiExecutable(options = {}) {
 }
 
 function selectedModelFor(profile) {
-  return resolvedModelSetting(process.env.SUBCONSCIOUS_MODEL || profile.values.MODEL);
+  return resolvedModelSetting(
+    process.env.SUBCONSCIOUS_MODEL || profile.values.MODEL,
+  );
 }
 
 function subagentModelFor(profile) {
@@ -181,16 +206,22 @@ export async function writeAtomicJson(file, value) {
   }
 }
 
-export async function createLocalTuiState(profileName = DEFAULT_PROFILE, options = {}) {
+export async function createLocalTuiState(
+  profileName = DEFAULT_PROFILE,
+  options = {},
+) {
   const activeProfile = options.profile || (await loadProfile(profileName));
-  const names = [...new Set([profileName, ...(await listProfiles())])].sort((a, b) => {
-    if (a === profileName) return -1;
-    if (b === profileName) return 1;
-    return a.localeCompare(b);
-  });
+  const names = [...new Set([profileName, ...(await listProfiles())])].sort(
+    (a, b) => {
+      if (a === profileName) return -1;
+      if (b === profileName) return 1;
+      return a.localeCompare(b);
+    },
+  );
   const profiles = await Promise.all(
     names.map(async (name) => {
-      const profile = name === profileName ? activeProfile : await loadProfile(name);
+      const profile =
+        name === profileName ? activeProfile : await loadProfile(name);
       const auth = await getApiKey(profile);
       return {
         name,
@@ -210,7 +241,10 @@ export async function createLocalTuiState(profileName = DEFAULT_PROFILE, options
     activeProfile: profileName,
     profilePath: activeProfile.path,
     profiles,
-    models: normalizeModelIds([requestedModel, ...PACKAGED_MODELS], requestedModel),
+    models: normalizeModelIds(
+      [requestedModel, ...PACKAGED_MODELS],
+      requestedModel,
+    ),
     selectedModel: requestedModel,
     subagentModel: subagentModelFor(activeProfile),
     gatewayUrl,
@@ -220,7 +254,8 @@ export async function createLocalTuiState(profileName = DEFAULT_PROFILE, options
     gatewayOverridden: Boolean(process.env.SUBCONSCIOUS_BASE_URL?.trim()),
     platformUrl,
     savedPlatformUrl:
-      activeProfile.values.PLATFORM_URL?.trim().replace(/\/+$/, '') || DEFAULT_PLATFORM_URL,
+      activeProfile.values.PLATFORM_URL?.trim().replace(/\/+$/, '') ||
+      DEFAULT_PLATFORM_URL,
     platformOverridden: Boolean(process.env.SUBCONSCIOUS_URL?.trim()),
     modelError: '',
     modelSource: 'packaged',
@@ -274,11 +309,13 @@ export async function loadRemoteTuiUpdates(state, options = {}) {
   const fetchLatest = options.fetchLatestVersion || fetchLatestVersion;
   const readApiKey = options.getApiKey || getApiKey;
   const updateDisabled =
-    options.disableUpdateCheck ?? process.env.SUBC_DISABLE_UPDATE_CHECK?.trim() === '1';
+    options.disableUpdateCheck ??
+    process.env.SUBC_DISABLE_UPDATE_CHECK?.trim() === '1';
 
   const tasks = [
     (async () => {
-      const profile = options.profile || (await loadProfile(state.activeProfile));
+      const profile =
+        options.profile || (await loadProfile(state.activeProfile));
       if (signal?.aborted) return;
       const auth = await readApiKey(profile);
       if (signal?.aborted) return;
@@ -330,7 +367,10 @@ export async function loadRemoteTuiUpdates(state, options = {}) {
           });
           if (signal?.aborted || !latest) return;
           if (compareVersions(latest, state.version) > 0) {
-            await enqueuePatch({ updateAvailable: true, latestVersion: latest });
+            await enqueuePatch({
+              updateAvailable: true,
+              latestVersion: latest,
+            });
           }
         } catch (error) {
           if (isAbortError(error) || signal?.aborted) return;
@@ -347,7 +387,10 @@ export async function loadRemoteTuiUpdates(state, options = {}) {
   }
 }
 
-export async function createTuiState(profileName = DEFAULT_PROFILE, options = {}) {
+export async function createTuiState(
+  profileName = DEFAULT_PROFILE,
+  options = {},
+) {
   const state = await createLocalTuiState(profileName, options);
   let next = { ...state };
   await loadRemoteTuiUpdates(state, {
@@ -379,11 +422,25 @@ function spawnAndWait(command, args, options = {}) {
 }
 
 export async function runTui(options = {}) {
+  for (;;) {
+    const result = await runTuiOnce(options);
+    if (result?.args?.length !== 2 || result.args[0] !== '-p') return result;
+    options = {
+      ...options,
+      profileName: result.args[1],
+      profile: undefined,
+      state: undefined,
+    };
+  }
+}
+
+async function runTuiOnce(options) {
   const executable = await resolveTuiExecutable(options);
   if (!executable) return null;
 
   const providedState = options.state;
-  const state = providedState || (await createLocalTuiState(options.profileName, options));
+  const state =
+    providedState || (await createLocalTuiState(options.profileName, options));
   const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'subc-tui-'));
   const statePath = path.join(tempDir, 'state.json');
   const resultPath = path.join(tempDir, 'result.json');
@@ -403,20 +460,35 @@ export async function runTui(options = {}) {
 
   const remote = providedState
     ? Promise.resolve()
-    : loadRemoteTuiUpdates(state, { ...options, signal: controller.signal, writePatch });
+    : loadRemoteTuiUpdates(state, {
+        ...options,
+        signal: controller.signal,
+        writePatch,
+      });
 
   try {
     // This state intentionally contains only display data. API keys are used
     // by the Node command engine and are never passed into the TUI process.
-    await fs.writeFile(statePath, `${JSON.stringify(state)}\n`, { mode: 0o600 });
+    await fs.writeFile(statePath, `${JSON.stringify(state)}\n`, {
+      mode: 0o600,
+    });
     const code = await spawnAndWait(
       executable.command,
-      [...executable.args, '--state', statePath, '--result', resultPath, '--updates', updatesPath],
+      [
+        ...executable.args,
+        '--state',
+        statePath,
+        '--result',
+        resultPath,
+        '--updates',
+        updatesPath,
+      ],
       { cwd: executable.cwd, spawn: options.spawn, stdio: options.stdio },
     );
     controller.abort();
     await remote.catch(() => {});
-    if (code !== 0) throw new Error(`Subconscious TUI exited with status ${code}`);
+    if (code !== 0)
+      throw new Error(`Subconscious TUI exited with status ${code}`);
 
     try {
       const result = JSON.parse(await fs.readFile(resultPath, 'utf-8'));