subconscious-cli 6.3.1 → 8.0.0

package/bin/opencode-provider.js

@@ -1,6 +1,9 @@
 import { fileURLToPath } from 'node:url';
 import { modelIds, positiveInteger } from './launch-values.js';
-import { modelSupportsVision } from './model-capabilities.js';
+import {
+  catalogEntriesFromMetadata,
+  modelSupportsVision,
+} from './model-capabilities.js';
 
 export const OPENCODE_PROVIDER_ID = 'subconscious';
 const OPENCODE_IMAGE_WINDOW_PLUGIN = fileURLToPath(
@@ -40,15 +43,22 @@ export function opencodeModelDisplayName(modelId) {
   return slug.split(/[-_]/).filter(Boolean).map(formatToken).join(' ');
 }
 
-export function buildOpenCodeModels(modelIds, { context, output }) {
+export function buildOpenCodeModels(
+  modelIds,
+  { context, output, entries = [] },
+) {
+  const entryById = new Map(entries.map((entry) => [entry.id, entry]));
   return Object.fromEntries(
     modelIds.map((id) => [
       id,
       {
         name: opencodeModelDisplayName(id),
         tools: true,
-        limit: { context, output },
-        ...(modelSupportsVision(id)
+        limit: {
+          context: entryById.get(id)?.limits?.context_length ?? context,
+          output: entryById.get(id)?.limits?.max_output_tokens ?? output,
+        },
+        ...(modelSupportsVision(id, entries)
           ? {
               attachment: true,
               modalities: { input: ['text', 'image'], output: ['text'] },
@@ -65,6 +75,7 @@ export function buildOpenCodeConfig({
   modelIds,
   context,
   output,
+  entries = [],
 }) {
   return {
     $schema: 'https://opencode.ai/config.json',
@@ -82,7 +93,7 @@ export function buildOpenCodeConfig({
           headers: { 'x-subconscious-client': 'opencode' },
           modelsDiscovery: { enabled: false },
         },
-        models: buildOpenCodeModels(modelIds, { context, output }),
+        models: buildOpenCodeModels(modelIds, { context, output, entries }),
       },
     },
     model: `${OPENCODE_PROVIDER_ID}/${model}`,
@@ -100,5 +111,6 @@ export function openCodeConfigFromEnv(env) {
       'OPENCODE_CONTEXT_LIMIT',
     ),
     output: positiveInteger(env.OPENCODE_OUTPUT_LIMIT, 'OPENCODE_OUTPUT_LIMIT'),
+    entries: catalogEntriesFromMetadata(env.SUBC_MODEL_METADATA),
   });
 }

package/bin/profiles.js

@@ -12,9 +12,11 @@ import os from 'node:os';
 import path from 'node:path';
 import { c } from './colors.js';
 import { PUBLIC_CATALOG_FALLBACK_MESSAGE } from './models.js';
+import { describeFailure } from './network.js';
 import {
   profileTemplate,
   RUNBOOK_DEFAULTS,
+  resolvedProfileValues,
   SUPPORTED_MODELS,
 } from './profile-settings.js';
 
@@ -26,6 +28,10 @@ export {
   SUPPORTED_MODELS,
 } from './profile-settings.js';
 
+export function systemCaEnabledFor(profile) {
+  return String(resolvedProfileValues(profile).SYSTEM_CA ?? '').trim() === 'on';
+}
+
 import { runWindows, windowsEditor } from './windows/process.js';
 
 export const DEFAULT_PROFILE = 'default';
@@ -560,11 +566,49 @@ export async function configCommand(
 export function modelsCommand(models = SUPPORTED_MODELS, options = {}) {
   const selectedModel =
     options.selectedModel || models[0] || RUNBOOK_DEFAULTS.MODEL;
+  const entryById = new Map(
+    (options.entries ?? []).map((entry) => [entry.id, entry]),
+  );
+  const lifecycleNote = (model) => {
+    const lifecycle = entryById.get(model)?.lifecycle;
+    if (!lifecycle) return '';
+    const date = lifecycle.deprecation_date
+      ? ` until ${lifecycle.deprecation_date}`
+      : '';
+    const replacement = lifecycle.replacement
+      ? ` ${c.dim}-> ${lifecycle.replacement}${c.reset}`
+      : '';
+    if (lifecycle.status === 'deprecated') {
+      return `  ${c.yellow}[deprecated${date}]${c.reset}${replacement}`;
+    }
+    if (lifecycle.status === 'retired') {
+      return `  ${c.red}[retired${date}]${c.reset}${replacement}`;
+    }
+    return '';
+  };
   console.log(`\n  ${c.bold}Available models${c.reset}\n`);
   for (const model of models) {
     const suffix =
       model === selectedModel ? ` ${c.dim}(default)${c.reset}` : '';
-    console.log(`  ${c.cyan}${model}${c.reset}${suffix}`);
+    console.log(
+      `  ${c.cyan}${model}${c.reset}${suffix}${lifecycleNote(model)}`,
+    );
+  }
+  const selectedLifecycle = entryById.get(selectedModel)?.lifecycle;
+  if (selectedLifecycle?.status === 'deprecated') {
+    const when = selectedLifecycle.deprecation_date
+      ? ` on ${selectedLifecycle.deprecation_date}`
+      : '';
+    const to = selectedLifecycle.replacement
+      ? ` Migrate to ${selectedLifecycle.replacement}.`
+      : '';
+    console.error(
+      `\n  ${c.yellow}Selected model ${selectedModel} is deprecated${when}.${to}${c.reset}`,
+    );
+  } else if (selectedLifecycle?.status === 'retired') {
+    console.error(
+      `\n  ${c.yellow}Selected model ${selectedModel} is retired and may stop serving without notice.${c.reset}`,
+    );
   }
   if (options.source === 'public' && options.hasApiKey) {
     console.error(`\n  ${c.dim}${PUBLIC_CATALOG_FALLBACK_MESSAGE}${c.reset}`);
@@ -572,7 +616,7 @@ export function modelsCommand(models = SUPPORTED_MODELS, options = {}) {
     console.error(
       `\n  ${c.yellow}Could not fetch the live model catalog; showing packaged defaults.${c.reset}`,
     );
-    console.error(`  ${c.dim}${options.error.message}${c.reset}`);
+    console.error(`  ${c.dim}${describeFailure(options.error)}${c.reset}`);
   }
   console.log();
 }

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

@@ -28,11 +28,14 @@
   },
   "help": {
     "usage": "subc [-p NAME] claude [help|status|uninstall] [Claude arguments...]",
-    "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.",
+    "behavior": "Launches Claude Code with the active Subconscious profile and model picker, using your own Claude config (~/.claude, or your CLAUDE_CONFIG_DIR) unchanged - plans, sessions, memory, skills and settings stay where plain claude keeps them. Subconscious routing, credentials and model pinning ride the launch env and --settings, which persist nothing. A /model pick inside a subc session changes your Claude default, as it does in plain claude. Persistent files are leftover-only: subc claude uninstall.",
     "options": [
       ["help", "Show this help"],
-      ["status", "Inspect leftover ~/.claude/subconscious-gateway.env"],
-      ["uninstall", "Remove leftover ~/.claude/subconscious-gateway.env"],
+      ["status", "Inspect leftovers: ~/.claude/subconscious-gateway.env"],
+      [
+        "uninstall",
+        "Remove leftover ~/.claude/subconscious-gateway.env from older persistent setup"
+      ],
       ["--model MODEL", "Override the profile model for this launch"]
     ],
     "args": ["-- ARGS...", "Pass remaining arguments to Claude Code"]
@@ -113,18 +116,6 @@
       "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",
@@ -159,12 +150,6 @@
       "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",
@@ -251,12 +236,6 @@
       },
       "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/claude-code/install.sh

@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 # ── Subconscious API Gateway — Claude Code leftovers ──────────────────────────
 # Claude Code is launch-only: `subc claude` passes everything as env and flags
-# and writes nothing. Older persistent setups wrote
-# ~/.claude/subconscious-gateway.env; this script reports and removes it.
+# and writes nothing persistent. One leftover remains from older releases:
+# the ~/.claude/subconscious-gateway.env file from the first persistent setup.
+# This script reports and removes it.
 #
 #   subc claude status
 #   subc claude uninstall

package/bin/runbook/shared.json

@@ -51,6 +51,16 @@
       "description": "Maximum concurrent Claude/Codex subagent threads.",
       "type": "integer",
       "min": 1
+    },
+    {
+      "name": "SYSTEM_CA",
+      "label": "Trust the OS certificate store",
+      "description": "Trust certificates from the operating system store, for a TLS-inspecting corporate proxy. Off by default.",
+      "type": "choice",
+      "strict": true,
+      "choices": ["off", "on"],
+      "default": "off",
+      "template": false
     }
   ]
 }

package/bin/tui.js

@@ -330,7 +330,7 @@ export async function loadRemoteTuiUpdates(state, options = {}) {
       });
       if (signal?.aborted) return;
       await enqueuePatch({
-        models: catalog.models,
+        models: catalog.defaultModels,
         modelError: catalog.error?.message || '',
         modelSource: catalog.source,
         modelsLoading: false,

package/bin/update-check.js

@@ -6,6 +6,7 @@ import readline from 'node:readline';
 import { fileURLToPath } from 'node:url';
 import { LOGO_ART_SMALL_LINES } from './branding.js';
 import { c, colorEnabled } from './colors.js';
+import { proxyAwareFetch } from './network.js';
 import { spawnWindows } from './windows/process.js';
 
 export const PACKAGE_NAME = 'subconscious-cli';
@@ -162,7 +163,7 @@ export async function currentVersion() {
 }
 
 export async function fetchLatestVersion(options = {}) {
-  const fetchImpl = options.fetchImpl || globalThis.fetch;
+  const fetchImpl = options.fetchImpl || proxyAwareFetch;
   const timeoutMs = options.timeoutMs ?? UPDATE_CHECK_TIMEOUT_MS;
   const signal = options.signal;
   if (typeof fetchImpl !== 'function') throw new Error('fetch is unavailable');

package/bin/upgrade.js

@@ -10,6 +10,7 @@ import fs from 'node:fs/promises';
 import readline from 'node:readline';
 import { fileURLToPath } from 'node:url';
 import { c } from './colors.js';
+import { proxyAwareFetch } from './network.js';
 import {
   compareVersions,
   detectInstallTarget,
@@ -42,7 +43,7 @@ export async function currentCliVersion() {
   return pkg.version;
 }
 
-export async function fetchLatestVersion(fetchImpl = fetch) {
+export async function fetchLatestVersion(fetchImpl = proxyAwareFetch) {
   const res = await fetchImpl(
     `https://registry.npmjs.org/${PACKAGE_NAME}/latest`,
     {

package/bin/usage.js

@@ -4,6 +4,12 @@
 
 import { getApiKey, getPlatformUrl } from './auth.js';
 import { c } from './colors.js';
+import {
+  describeFetchError,
+  proxyAwareFetch,
+  proxyHint,
+  tlsTrustHint,
+} from './network.js';
 import { DEFAULT_PROFILE } from './profiles.js';
 import { printLoginUpgradeWarning } from './upgrade.js';
 
@@ -49,15 +55,6 @@ export function shortModelSlug(slug) {
     : text;
 }
 
-export function isLegacyUsagePayload(data) {
-  if (!data || typeof data !== 'object') return true;
-  if ('credits' in data && data.plan && typeof data.plan === 'object')
-    return false;
-  return (
-    'dailyTokenCeiling' in data || 'consumedToday' in data || !('plan' in data)
-  );
-}
-
 export function meterColor(percentage) {
   if (percentage >= 100) return c.red;
   if (percentage >= 80) return c.yellow;
@@ -85,27 +82,25 @@ export function formatAllowancePercent(percent) {
   return `${whole}%`;
 }
 
-/** New percent payloads, or the pre-basis token shape (consumed / amount). */
+/** Percent-only allowance payloads from the current platform. */
 export function describeDailyAllowance(allowance) {
   if (!allowance || typeof allowance !== 'object') return null;
   if (allowance.basis === 'unavailable') return { kind: 'unavailable' };
   if (allowance.basis === 'credit' || allowance.basis === 'tokens') {
     return { kind: allowance.basis, percent: Number(allowance.percent) || 0 };
   }
-
-  const consumed = Number(allowance.consumed) || 0;
-  const amount = Number(allowance.amount) || 0;
-  if (amount <= 0) return null;
-  return { kind: 'tokens', percent: (consumed / amount) * 100 };
+  return null;
 }
 
 export function formatUsageDisplay(data) {
   const lines = [];
   lines.push(`\n  ${c.bold}Subconscious Usage${c.reset}\n`);
 
-  const billingMode = data.billingMode ?? null;
+  const billingTerms = data.billingTerms ?? null;
+  const invoiced = billingTerms === 'invoiced';
   const plan = data.plan ?? {};
   const credits = data.credits ?? {};
+  const invoice = invoiced ? (data.invoice ?? {}) : {};
   const models = Array.isArray(data.models) ? data.models : [];
 
   const planLabel = plan.label || 'No plan';
@@ -113,55 +108,81 @@ export function formatUsageDisplay(data) {
   const planLine = planStatus ? `${planLabel} · ${planStatus}` : planLabel;
 
   lines.push(`  ${c.dim}Plan${c.reset}            ${planLine}`);
-  if (billingMode) {
-    lines.push(`  ${c.dim}Billing${c.reset}         ${billingMode}`);
+  if (invoiced) {
+    lines.push(`  ${c.dim}Billing${c.reset}         Invoiced monthly (net 30)`);
   }
 
   const allowance = plan.dailyAllowance;
-  const unlimitedComp = Boolean(plan.isUnlimitedComp);
 
-  if (unlimitedComp) {
+  // Invoiced orgs bill against the spend limit, not a daily grant, so the
+  // daily allowance does not pertain to them and is never shown.
+  const described = invoiced ? null : describeDailyAllowance(allowance);
+  if (described) {
     lines.push('');
     lines.push(`  ${c.dim}Daily allowance${c.reset}`);
-    lines.push(`  ${c.green}Unlimited${c.reset} ${c.dim}(comp)${c.reset}`);
-  } else {
-    const described = describeDailyAllowance(allowance);
-    if (described) {
-      lines.push('');
-      lines.push(`  ${c.dim}Daily allowance${c.reset}`);
-      if (described.kind === 'unavailable') {
-        lines.push(`  ${c.dim}Daily credit unavailable${c.reset}`);
-        lines.push(
-          `  ${c.dim}Today's credit usage could not be read just now. Your plan and access are unaffected, and the figure returns on its own.${c.reset}`,
-        );
-      } else {
-        const label =
-          described.kind === 'credit'
-            ? 'of daily credit used'
-            : 'of daily tokens used';
+    if (described.kind === 'unavailable') {
+      lines.push(`  ${c.dim}Daily credit unavailable${c.reset}`);
+      lines.push(
+        `  ${c.dim}Today's credit usage could not be read just now. Your plan and access are unaffected, and the figure returns on its own.${c.reset}`,
+      );
+    } else {
+      const label =
+        described.kind === 'credit'
+          ? 'of daily credit used'
+          : 'of daily tokens used';
+      lines.push(
+        `  ${renderProgressBar(described.percent)}  ${formatAllowancePercent(described.percent)} ${label}`,
+      );
+      lines.push(`  ${c.dim}Resets midnight UTC${c.reset}`);
+      if (described.kind === 'credit' && described.percent >= 100) {
         lines.push(
-          `  ${renderProgressBar(described.percent)}  ${formatAllowancePercent(described.percent)} ${label}`,
+          `  ${c.yellow}Past today's allowance - further usage bills from your balance.${c.reset}`,
         );
-        lines.push(`  ${c.dim}Resets midnight UTC${c.reset}`);
-        if (described.kind === 'credit' && described.percent >= 100) {
-          lines.push(
-            `  ${c.yellow}Past today's allowance - further usage bills from your balance.${c.reset}`,
-          );
-        }
       }
     }
   }
 
-  lines.push('');
-  lines.push(
-    `  ${c.dim}Credits${c.reset}         ${formatCurrency(credits.balanceDollars ?? 0)}`,
-  );
-  if (billingMode === 'subscription' || billingMode === 'comp' || allowance) {
-    const overage = Number(credits.overageThisPeriodDollars) || 0;
-    const overageColor = overage > 0 ? c.yellow : c.reset;
+  if (invoiced) {
+    const accrued = invoice.accruedThisPeriodDollars;
+    const limit = invoice.limitDollars;
+    const periodEnd = invoice.periodEnd ? new Date(invoice.periodEnd) : null;
+
+    lines.push('');
+    lines.push(`  ${c.dim}Spend this period${c.reset}`);
+    if (accrued == null) {
+      lines.push(`  ${c.dim}Spend could not be read just now.${c.reset}`);
+      lines.push(
+        `  ${c.dim}Your plan and access are unaffected, and the figure returns on its own.${c.reset}`,
+      );
+    } else {
+      const limitText =
+        limit != null ? ` of ${formatCurrency(limit)} limit` : '';
+      const spendColor = limit != null && accrued >= limit ? c.red : c.reset;
+      lines.push(
+        `  ${spendColor}${formatCurrency(accrued)}${c.reset}${c.dim}${limitText}${c.reset}`,
+      );
+      if (periodEnd && !Number.isNaN(periodEnd.getTime())) {
+        const isoDay = periodEnd.toISOString().slice(0, 10);
+        lines.push(`  ${c.dim}Period ends ${isoDay}${c.reset}`);
+      }
+      if (limit != null && accrued >= limit) {
+        lines.push(
+          `  ${c.red}At the spend limit - further requests follow your limit policy.${c.reset}`,
+        );
+      }
+    }
+  } else if (credits.balanceDollars != null || data.credits) {
+    lines.push('');
     lines.push(
-      `  ${c.dim}Overage${c.reset}         ${overageColor}${formatCurrency(overage)} this period${c.reset}`,
+      `  ${c.dim}Credits${c.reset}         ${formatCurrency(credits.balanceDollars ?? 0)}`,
     );
+    const overage = Number(credits.overageThisPeriodDollars) || 0;
+    if (overage > 0 || allowance) {
+      const overageColor = overage > 0 ? c.yellow : c.reset;
+      lines.push(
+        `  ${c.dim}Overage${c.reset}         ${overageColor}${formatCurrency(overage)} this period${c.reset}`,
+      );
+    }
   }
 
   if (models.length > 0) {
@@ -181,7 +202,11 @@ export function formatUsageDisplay(data) {
   return lines.join('\n');
 }
 
-export async function fetchUsage(apiKey, platformUrl, fetchImpl = fetch) {
+export async function fetchUsage(
+  apiKey,
+  platformUrl,
+  fetchImpl = proxyAwareFetch,
+) {
   const res = await fetchImpl(
     `${platformUrl.replace(/\/$/, '')}${USAGE_API_PATH}`,
     {
@@ -241,14 +266,6 @@ export async function usageCommand(argv = [], options = {}) {
       throw new Error(message);
     }
 
-    if (isLegacyUsagePayload(data)) {
-      console.log(`\n  ${c.yellow}Platform upgrade required.${c.reset}`);
-      console.log(
-        `  ${c.dim}This platform host returns a legacy usage shape. Deploy the latest platform or point PLATFORM_URL at a current host.${c.reset}\n`,
-      );
-      return;
-    }
-
     if (jsonOutput) {
       console.log(JSON.stringify(data, null, 2));
       return;
@@ -260,10 +277,16 @@ export async function usageCommand(argv = [], options = {}) {
       console.log(
         `\n  ${c.yellow}Could not reach the platform (timed out).${c.reset}`,
       );
-      console.log(`  ${c.dim}Host: ${platformUrl}${c.reset}\n`);
+      console.log(`  ${c.dim}Host: ${platformUrl}${c.reset}`);
+      const proxy = proxyHint(error, platformUrl);
+      if (proxy) console.log(`  ${c.dim}${proxy}${c.reset}`);
+      console.log();
       return;
     }
-    console.error(`\n  ${c.red}${error.message}${c.reset}\n`);
+    console.error(`\n  ${c.red}${describeFetchError(error)}${c.reset}`);
+    const hint = tlsTrustHint(error) || proxyHint(error, platformUrl);
+    if (hint) console.error(`  ${c.yellow}${hint}${c.reset}`);
+    console.error();
     process.exitCode = 1;
   }
 }

package/bin/windows/launch.js

@@ -9,7 +9,6 @@ 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';
@@ -62,13 +61,7 @@ function plannedLaunch(agent, argv, env) {
     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),
-  };
+  return { command: plan.argv[0], args: plan.argv.slice(1), env: plan.env };
 }
 
 function codexCatalog(env, context, maxContext, compact) {
@@ -274,17 +267,12 @@ export async function windowsLaunch(
   throw new Error(`No native Windows launcher is available for ${id}`);
 }
 
-export async function executeWindowsLaunch(spec, run, prepareOptions) {
+export async function executeWindowsLaunch(spec, run) {
   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 } : { env, input: spec.input };
+      spec.input === undefined
+        ? { env: spec.env }
+        : { env: spec.env, input: spec.input };
     return await run(spec.command, spec.args, options);
   } finally {
     await spec.cleanup?.();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "subconscious-cli",
-  "version": "6.3.1",
+  "version": "8.0.0",
   "description": "CLI for Subconscious — run Subconscious Code, Claude Code, Codex, OpenCode, DeepSeek Harness, Copilot, and Pi",
   "bin": {
     "subc": "bin/cli.js"

package/bin/claude-config-drift.js

@@ -1,58 +0,0 @@
-import { isDeepStrictEqual } from 'node:util';
-
-// Each launch rebuilds the subc copies of settings.json and the MCP servers
-// in .claude.json from the user's own files, so anything a subc session
-// changed in those copies is replaced. These helpers find what a session
-// changed, by comparing the copies with what the last launch wrote, so the
-// launch can save it aside and name it instead of losing it silently.
-
-const isObject = (value) =>
-  value !== null && typeof value === 'object' && !Array.isArray(value);
-
-/**
- * Keys of `current` that a session added or changed since `written`.
- * Removed keys are ignored: Claude Code drops keys on its own.
- *
- * @param {Record<string, unknown>} written what the last launch wrote
- * @param {Record<string, unknown>} current what the copy holds now
- * @param {string[]} [ignored] keys subc keeps across launches
- * @returns {string[]}
- */
-export function changedKeys(written, current, ignored = []) {
-  if (!isObject(written) || !isObject(current)) return [];
-  return Object.keys(current).filter(
-    (key) =>
-      !ignored.includes(key) && !isDeepStrictEqual(current[key], written[key]),
-  );
-}
-
-/** The MCP servers of a .claude.json: user scope and each project. */
-export function mcpServersOf(state) {
-  const projects = isObject(state?.projects) ? state.projects : {};
-  return {
-    mcpServers: isObject(state?.mcpServers) ? state.mcpServers : {},
-    projects: Object.fromEntries(
-      Object.entries(projects)
-        .filter(([, project]) => isObject(project?.mcpServers))
-        .map(([name, project]) => [name, project.mcpServers]),
-    ),
-  };
-}
-
-/**
- * MCP server names a session added or changed since `written`, as
- * `name` for user scope and `name (project)` for a project.
- *
- * @param {ReturnType<typeof mcpServersOf>} written
- * @param {ReturnType<typeof mcpServersOf>} current
- * @returns {string[]}
- */
-export function changedMcpServers(written, current) {
-  const changed = changedKeys(written.mcpServers, current.mcpServers);
-  for (const [project, servers] of Object.entries(current.projects)) {
-    for (const name of changedKeys(written.projects[project] ?? {}, servers)) {
-      changed.push(`${name} (${project})`);
-    }
-  }
-  return changed;
-}