@ekkos/cli 1.0.34 → 1.0.36

package/dist/commands/run.js

@@ -43,6 +43,139 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const os = __importStar(require("os"));
 const child_process_1 = require("child_process");
+// ═══════════════════════════════════════════════════════════════════════════
+// ccDNA AUTO-LOAD: Apply Claude Code patches before spawning
+// ═══════════════════════════════════════════════════════════════════════════
+const CCDNA_PATHS = [
+    // Development path (DEV sibling directory)
+    // From: EKKOS/packages/ekkos-cli/dist/commands/ → DEV/ekkos-ccdna/
+    path.join(__dirname, '..', '..', '..', '..', '..', 'ekkos-ccdna', 'dist', 'index.mjs'),
+    // User install path
+    path.join(os.homedir(), '.ekkos', 'ccdna', 'dist', 'index.mjs'),
+    // npm global (homebrew)
+    '/opt/homebrew/lib/node_modules/ekkos-ccdna/dist/index.mjs',
+    // npm global (standard)
+    path.join(os.homedir(), '.npm-global', 'lib', 'node_modules', 'ekkos-ccdna', 'dist', 'index.mjs'),
+];
+/**
+ * Find ccDNA installation path
+ */
+function findCcdnaPath() {
+    for (const p of CCDNA_PATHS) {
+        if (fs.existsSync(p)) {
+            return p;
+        }
+    }
+    return null;
+}
+/**
+ * Apply ccDNA patches silently before Claude spawns
+ * Returns version string if patches were applied, null otherwise
+ *
+ * @param verbose - Show detailed output
+ * @param claudePath - Path to Claude Code to patch (if different from default)
+ */
+function applyCcdnaPatches(verbose, claudePath) {
+    // DISABLED: ccDNA patching is currently corrupting cli.js (JSON parse error at position 7945)
+    // See: https://github.com/anthropics/ekkos/issues/2856
+    // The patching process is injecting code that breaks the minified cli.js
+    // Temporarily disabled until ccDNA is fixed upstream
+    if (verbose) {
+        console.log(chalk_1.default.gray('  ccDNA patching disabled (see issue #2856)'));
+    }
+    return null;
+    // Original implementation (disabled):
+    /*
+    const ccdnaPath = findCcdnaPath();
+    if (!ccdnaPath) {
+      if (verbose) {
+        console.log(chalk.gray('  ccDNA not found - skipping patches'));
+      }
+      return null;
+    }
+  
+    // Read ccDNA version from package.json FIRST
+    let ccdnaVersion = 'unknown';
+    try {
+      const pkgPath = path.join(path.dirname(ccdnaPath), '..', 'package.json');
+      if (fs.existsSync(pkgPath)) {
+        const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+        ccdnaVersion = pkg.version || 'unknown';
+      }
+    } catch {
+      // Ignore version detection errors
+    }
+  
+    try {
+      // Set env var to tell ccDNA which Claude to patch
+      // eslint-disable-next-line no-restricted-syntax
+      const env = { ...process.env };
+      if (claudePath) {
+        // ccDNA checks CCDNA_CC_INSTALLATION_PATH to override default detection
+        env.CCDNA_CC_INSTALLATION_PATH = claudePath;
+      }
+  
+      // Run ccDNA in apply mode (non-interactive)
+      execSync(`node "${ccdnaPath}" -a`, {
+        stdio: verbose ? 'inherit' : 'pipe',
+        timeout: 30000, // 30 second timeout
+        env,
+      });
+  
+      if (verbose) {
+        console.log(chalk.green(`  ✓ ccDNA v${ccdnaVersion} patches applied`));
+      }
+      return ccdnaVersion;
+    } catch (err) {
+      if (verbose) {
+        console.log(chalk.yellow(`  ⚠ ccDNA patch failed: ${(err as Error).message}`));
+      }
+      return null;
+    }
+    */
+}
+/**
+ * Restore original Claude Code (remove ccDNA patches) on exit
+ * This restores the ekkOS-managed installation (~/.ekkos/claude-code/) to its base state
+ *
+ * NOTE: We intentionally DON'T restore on exit anymore because:
+ * 1. ekkOS uses a SEPARATE installation (~/.ekkos/claude-code/) from homebrew
+ * 2. The homebrew `claude` command should always be vanilla (untouched)
+ * 3. The ekkOS installation can stay patched - it's only used by `ekkos run`
+ *
+ * This function is kept for manual/explicit restore scenarios.
+ */
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+function restoreCcdnaPatches(verbose, claudePath) {
+    const ccdnaPath = findCcdnaPath();
+    if (!ccdnaPath) {
+        return false;
+    }
+    try {
+        // Set env var to tell ccDNA which Claude to restore
+        // eslint-disable-next-line no-restricted-syntax
+        const env = { ...process.env };
+        if (claudePath) {
+            env.CCDNA_CC_INSTALLATION_PATH = claudePath;
+        }
+        // Run ccDNA in restore mode (non-interactive)
+        (0, child_process_1.execSync)(`node "${ccdnaPath}" -r`, {
+            stdio: verbose ? 'inherit' : 'pipe',
+            timeout: 30000, // 30 second timeout
+            env,
+        });
+        if (verbose) {
+            console.log(chalk_1.default.green('  ✓ ccDNA patches removed (vanilla restored)'));
+        }
+        return true;
+    }
+    catch (err) {
+        if (verbose) {
+            console.log(chalk_1.default.yellow(`  ⚠ ccDNA restore failed: ${err.message}`));
+        }
+        return false;
+    }
+}
 const state_1 = require("../utils/state");
 const session_binding_1 = require("../utils/session-binding");
 const doctor_1 = require("./doctor");
@@ -115,17 +248,11 @@ const INTERRUPTED_REGEX = /interrupted.*what should claude do instead/i;
 const PALETTE_INDICATOR_REGEX = /\/(clear|continue|compact|help|bug|config)/i;
 // ═══════════════════════════════════════════════════════════════════════════
 // SESSION NAME DETECTION (3-word slug: word-word-word)
-// Claude prints session name in footer:
-//   · 🧠 ekkOS_™ · Turn N · groovy-koala-saves · 📅
-//   · 🧠 ekkOS_™ · groovy-koala-saves · 📅
+// Claude prints session name in footer: · Turn N · groovy-koala-saves · 📅
 // ═══════════════════════════════════════════════════════════════════════════
-// Strong signal: ekkOS-branded footer with optional turn segment.
-// Supports both:
-//   "· ekkOS_™ · Turn N · <session> · 📅"
-//   "· ekkOS_™ · <session> · 📅"
-const SESSION_NAME_IN_EKKOS_FOOTER_REGEX = /ekkos[^\n·]*·\s*(?:turn\s+\d+\s*·\s*)?([a-z]+-[a-z]+-[a-z]+)\s*·/i;
-// Legacy fallback: plain Claude status line with explicit turn marker.
-const SESSION_NAME_IN_TURN_FOOTER_REGEX = /turn\s+\d+\s*·\s*([a-z]+-[a-z]+-[a-z]+)\s*·/i;
+// Strong signal: explicit turn footer emitted by Claude/ekkOS status line.
+// Requires "Turn <n> · <session> ·" to avoid matching arbitrary slug text.
+const SESSION_NAME_IN_STATUS_REGEX = /turn\s+\d+\s*·\s*([a-z]+-[a-z]+-[a-z]+)\s*·/i;
 // Weaker signal: any 3-word slug (word-word-word pattern)
 const SESSION_NAME_REGEX = /\b([a-z]+-[a-z]+-[a-z]+)\b/i;
 // Orphan tool_result marker emitted by ccDNA validate mode
@@ -306,8 +433,7 @@ const isWindows = os.platform() === 'win32';
 // 'latest' = use latest version, or specify like '2.1.33' for specific version
 // Core ekkOS patches (eviction, context management) work with all recent versions
 // Cosmetic patches may fail on newer versions but don't affect functionality
-const PINNED_CLAUDE_VERSION = 'latest';
-const MIN_CLAUDE_VERSION_FOR_LATEST = process.env.EKKOS_MIN_CLAUDE_VERSION || '2.1.49';
+const PINNED_CLAUDE_VERSION = '2.1.37';
 // Max output tokens for Claude responses
 // Default: 16384 (safe for Sonnet 4.5)
 // Opus 4.5 supports up to 64k - set EKKOS_MAX_OUTPUT_TOKENS=32768 or =65536 to use higher limits
@@ -347,8 +473,9 @@ function getEkkosEnv() {
         // Let Claude Code use its own default max_tokens (don't override)
     };
     /* eslint-enable no-restricted-syntax */
-    // Check if proxy is disabled (proxyModeEnabled already includes CLI + env decisions)
-    const proxyDisabled = !proxyModeEnabled;
+    // Check if proxy is disabled via env var or options
+    // eslint-disable-next-line no-restricted-syntax -- Feature flag, not API key
+    const proxyDisabled = process.env.EKKOS_DISABLE_PROXY === '1' || !proxyModeEnabled;
     if (!proxyDisabled) {
         env.EKKOS_PROXY_MODE = '1';
         // Enable ultra-minimal mode by default (30%→20% eviction for constant-cost infinite context)
@@ -357,14 +484,10 @@ function getEkkosEnv() {
         // This fixes the mismatch where CLI generated one name but Claude Code used another
         // The hook calls POST /proxy/session/bind with Claude's actual session name
         if (!cliSessionName) {
-            const pendingSeed = `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
-            cliSessionName = `_pending-${pendingSeed}`; // Unique placeholder per CLI run
-            cliSessionId = `pending-${pendingSeed}`;
-            console.log(chalk_1.default.gray(`  📂 Session: ${cliSessionName} (will bind to Claude session)`));
-        }
-        env.EKKOS_PENDING_SESSION = cliSessionName;
-        if (cliSessionId)
-            env.EKKOS_PENDING_SESSION_ID = cliSessionId;
+            cliSessionName = '_pending'; // Placeholder - hook will bind real name
+            cliSessionId = `pending-${Date.now()}`;
+            console.log(chalk_1.default.gray(`  📂 Session: pending (will bind to Claude session)`));
+        }
         // Get full userId from config (NOT the truncated version from auth token)
         // Config has full UUID like "d4532ba0-0a86-42ce-bab4-22aa62b55ce6"
         // This matches the turns/ R2 structure: turns/{fullUserId}/{sessionName}/
@@ -385,8 +508,8 @@ function getEkkosEnv() {
         // Format: https://mcp.ekkos.dev/proxy/{userId}/{sessionName}?project={base64(cwd)}
         // Gateway extracts from URL: /proxy/{userId}/{sessionName}/v1/messages
         // Project path is base64-encoded to handle special chars safely
-        const projectPath = process.cwd().replace(/\\/g, '/');
-        const projectPathEncoded = encodeURIComponent(Buffer.from(projectPath, 'utf-8').toString('base64'));
+        const projectPath = process.cwd();
+        const projectPathEncoded = Buffer.from(projectPath).toString('base64url');
         const proxyUrl = `${EKKOS_PROXY_URL}/proxy/${encodeURIComponent(userId)}/${encodeURIComponent(cliSessionName)}?project=${projectPathEncoded}`;
         env.ANTHROPIC_BASE_URL = proxyUrl;
         // Proxy URL contains userId + project path — don't leak to terminal
@@ -396,59 +519,16 @@ function getEkkosEnv() {
     }
     return env;
 }
-// ekkOS-managed Claude installation path (npm fallback)
+// ekkOS-managed Claude installation path
 const EKKOS_CLAUDE_DIR = path.join(os.homedir(), '.ekkos', 'claude-code');
-const EKKOS_CLAUDE_BIN = path.join(EKKOS_CLAUDE_DIR, 'node_modules', '.bin', isWindows ? 'claude.cmd' : 'claude');
-// Native installer versions directory (Anthropic's official distribution — no npm warning)
-// Claude Code uses XDG_DATA_HOME/.local/share on all platforms (no Windows-specific AppData branch).
-// On Windows this resolves to %USERPROFILE%\.local\share\claude\versions\<version>
-const NATIVE_CLAUDE_VERSIONS_DIR = path.join(process.env.XDG_DATA_HOME || path.join(os.homedir(), '.local', 'share'), 'claude', 'versions');
-/**
- * Find the latest native-installed Claude binary.
- * Anthropic's native installer puts versioned binaries under ~/.local/share/claude/versions/<version>
- * These do NOT print the npm-to-native migration warning.
- * Returns the path to the latest binary, or null if none found.
- */
-function resolveNativeClaudeBin() {
-    try {
-        if (!fs.existsSync(NATIVE_CLAUDE_VERSIONS_DIR))
-            return null;
-        const entries = fs.readdirSync(NATIVE_CLAUDE_VERSIONS_DIR)
-            .filter(v => !v.endsWith('.tmp') && !v.endsWith('.lock'));
-        // Strip .exe suffix for sorting, then pick latest semver
-        const versions = entries
-            .map(v => v.replace(/\.exe$/i, ''))
-            .filter(v => /^\d+\.\d+\.\d+$/.test(v))
-            .sort((a, b) => {
-            const pa = a.split('.').map(Number);
-            const pb = b.split('.').map(Number);
-            for (let i = 0; i < 3; i++) {
-                if ((pa[i] || 0) !== (pb[i] || 0))
-                    return (pb[i] || 0) - (pa[i] || 0);
-            }
-            return 0;
-        });
-        if (versions.length === 0)
-            return null;
-        // On Windows the binary is named "<version>.exe", on Unix just "<version>"
-        const binName = isWindows ? `${versions[0]}.exe` : versions[0];
-        const bin = path.join(NATIVE_CLAUDE_VERSIONS_DIR, binName);
-        if (fs.existsSync(bin) && fs.statSync(bin).isFile())
-            return bin;
-        return null;
-    }
-    catch {
-        return null;
-    }
-}
+const EKKOS_CLAUDE_BIN = path.join(EKKOS_CLAUDE_DIR, 'node_modules', '.bin', 'claude');
 /**
  * Check if a Claude installation exists and get its version
  * Returns version string if found, null otherwise
  */
 function getClaudeVersion(claudePath) {
     try {
-        const suppressStderr = isWindows ? '2>NUL' : '2>/dev/null';
-        const version = (0, child_process_1.execSync)(`"${claudePath}" --version ${suppressStderr}`, { encoding: 'utf-8' }).trim();
+        const version = (0, child_process_1.execSync)(`"${claudePath}" --version 2>/dev/null`, { encoding: 'utf-8' }).trim();
         // Look for pattern like "2.1.6 (Claude Code)" or just "2.1.6" anywhere in output
         const match = version.match(/(\d+\.\d+\.\d+)\s*\(Claude Code\)/);
         if (match)
@@ -462,24 +542,6 @@ function getClaudeVersion(claudePath) {
         return null;
     }
 }
-function compareSemver(a, b) {
-    const parse = (v) => {
-        const m = v.match(/(\d+)\.(\d+)\.(\d+)/);
-        if (!m)
-            return [0, 0, 0];
-        return [Number(m[1]), Number(m[2]), Number(m[3])];
-    };
-    const pa = parse(a);
-    const pb = parse(b);
-    for (let i = 0; i < 3; i++) {
-        if (pa[i] !== pb[i])
-            return pa[i] - pb[i];
-    }
-    return 0;
-}
-function isVersionAtLeast(version, minVersion) {
-    return compareSemver(version, minVersion) >= 0;
-}
 /**
  * Check if a Claude installation matches our required version
  * When PINNED_CLAUDE_VERSION is 'latest', any version is acceptable
@@ -489,9 +551,8 @@ function checkClaudeVersion(claudePath) {
     if (!version)
         return false;
     // 'latest' means any version is acceptable
-    if (PINNED_CLAUDE_VERSION === 'latest') {
-        return isVersionAtLeast(version, MIN_CLAUDE_VERSION_FOR_LATEST);
-    }
+    if (PINNED_CLAUDE_VERSION === 'latest')
+        return true;
     return version === PINNED_CLAUDE_VERSION;
 }
 /**
@@ -562,37 +623,34 @@ function installEkkosClaudeVersion() {
     }
 }
 /**
- * Resolve full path to claude executable.
+ * Resolve full path to claude executable
+ * Returns direct path if found with correct version, otherwise 'npx:VERSION'
+ *
+ * IMPORTANT: We pin to a specific Claude Code version (currently 2.1.33) to ensure
+ * consistent behavior with ekkOS context management and eviction patches.
+ *
+ * CRITICAL: ekkos run ONLY uses the ekkOS-managed installation at ~/.ekkos/claude-code/
+ * This ensures complete separation from the user's existing Claude installation (Homebrew/npm).
+ * The user's `claude` command remains untouched and can be any version.
  *
  * Priority:
- * 1. Native installer binary (~/.local/share/claude/versions/<latest>) — no npm warning
- * 2. ekkOS-managed npm installation (~/.ekkos/claude-code) — existing installs
- * 3. Auto-install via npm to ekkOS-managed directory
- * 4. npx fallback (rare, shows npm deprecation warning)
+ * 1. ekkOS-managed installation (~/.ekkos/claude-code) - ONLY option for ekkos run
+ * 2. Auto-install if doesn't exist
+ * 3. npx with pinned version (fallback if install fails)
  */
 function resolveClaudePath() {
-    // PRIORITY 1: Native installer binary (Anthropic's official distribution)
-    // These binaries do not print the npm-to-native migration warning.
-    const nativeBin = resolveNativeClaudeBin();
-    if (nativeBin) {
-        const nativeVersion = getClaudeVersion(nativeBin);
-        if (PINNED_CLAUDE_VERSION !== 'latest' ||
-            (nativeVersion && isVersionAtLeast(nativeVersion, MIN_CLAUDE_VERSION_FOR_LATEST))) {
-            return nativeBin;
-        }
-        console.log(chalk_1.default.yellow(`  Native Claude ${nativeVersion || 'unknown'} is below minimum ${MIN_CLAUDE_VERSION_FOR_LATEST}; using managed latest.`));
-    }
-    // PRIORITY 2: ekkOS-managed npm installation (existing users before native installer)
+    // PRIORITY 1: ekkOS-managed installation
     if (fs.existsSync(EKKOS_CLAUDE_BIN) && checkClaudeVersion(EKKOS_CLAUDE_BIN)) {
         return EKKOS_CLAUDE_BIN;
     }
-    // PRIORITY 3: Auto-install to ekkOS-managed directory
+    // PRIORITY 2: Auto-install to ekkOS-managed directory (user's Claude stays untouched)
     if (installEkkosClaudeVersion()) {
         if (fs.existsSync(EKKOS_CLAUDE_BIN)) {
             return EKKOS_CLAUDE_BIN;
         }
     }
-    // PRIORITY 4: Fall back to npx (rare — only if install failed, will show deprecation warning)
+    // PRIORITY 3: Fall back to npx with pinned version (shows update message)
+    // This is rare - only happens if install failed
     return `npx:${PINNED_CLAUDE_VERSION}`;
 }
 /**
@@ -639,8 +697,7 @@ function resolveGlobalClaudePath() {
         }
     }
     try {
-        const whichCmd = isWindows ? 'where' : 'which';
-        const result = (0, child_process_1.execSync)(`${whichCmd} claude`, { encoding: 'utf-8' }).trim().split('\n')[0];
+        const result = (0, child_process_1.execSync)('which claude', { encoding: 'utf-8' }).trim();
         if (result && fs.existsSync(result)) {
             return result;
         }
@@ -648,7 +705,7 @@ function resolveGlobalClaudePath() {
     catch {
         // Ignore errors
     }
-    return isWindows ? 'claude.cmd' : 'claude';
+    return 'claude';
 }
 /**
  * Sleep helper
@@ -746,72 +803,6 @@ function cleanupInstanceFile(instanceId) {
         // Ignore cleanup errors
     }
 }
-/**
- * Launch ekkos run + dashboard using Windows Terminal split panes (Windows equivalent of tmux)
- */
-function launchWithDashboardWindows(options) {
-    const launchTime = Date.now();
-    // Build the ekkos run command WITHOUT --dashboard (prevent recursion)
-    const runArgs = ['run'];
-    if (options.session)
-        runArgs.push('-s', options.session);
-    if (options.bypass)
-        runArgs.push('-b');
-    if (options.verbose)
-        runArgs.push('-v');
-    if (options.doctor)
-        runArgs.push('-d');
-    if (options.research)
-        runArgs.push('-r');
-    if (options.noInject)
-        runArgs.push('--skip-inject');
-    if (options.noDna)
-        runArgs.push('--skip-dna');
-    if (options.noProxy)
-        runArgs.push('--skip-proxy');
-    const ekkosCmd = process.argv[1];
-    const cwd = process.cwd();
-    // Write dashboard launch marker
-    const markerPath = path.join(state_1.EKKOS_DIR, '.dashboard-launch-ts');
-    try {
-        fs.writeFileSync(markerPath, `${launchTime}\n${cwd}`);
-    }
-    catch { }
-    // Use -EncodedCommand (UTF-16LE Base64) to pass PowerShell scripts to wt panes.
-    // This completely avoids nested quote hell: cmd.exe sees no " inside the wt command string,
-    // and PowerShell decodes the base64 itself, preserving backslashes and special chars exactly.
-    const ekkosCmdEscaped = ekkosCmd.replace(/'/g, "''");
-    const cwdEscaped = cwd.replace(/'/g, "''");
-    function toPsEncoded(script) {
-        // PowerShell -EncodedCommand expects UTF-16LE Base64
-        return Buffer.from(script, 'utf16le').toString('base64');
-    }
-    // cd to original CWD first so ekkos run registers the correct projectPath
-    const runScript = `Set-Location '${cwdEscaped}'; & node '${ekkosCmdEscaped}' ${runArgs.join(' ')}`;
-    const dashScript = `& node '${ekkosCmdEscaped}' dashboard --wait-for-new --refresh 2000`;
-    const runEncoded = toPsEncoded(runScript);
-    const dashEncoded = toPsEncoded(dashScript);
-    // Windows Terminal split pane command.
-    // No nested double-quotes in the PowerShell portion — only the WT --title/--startingDirectory
-    // values need quoting, which cmd.exe handles cleanly.
-    const wtCmd = [
-        'wt',
-        `new-tab --startingDirectory "${cwd}" --title ekkOS powershell -NoExit -EncodedCommand ${runEncoded}`,
-        `; split-pane -V --size 0.4 --title Dashboard powershell -NoExit -EncodedCommand ${dashEncoded}`
-    ].join(' ');
-    try {
-        (0, child_process_1.execSync)(wtCmd, { stdio: 'inherit', shell: true });
-        console.log(chalk_1.default.cyan('\n  Dashboard launched in right pane (40%)'));
-        console.log(chalk_1.default.gray('  Switch panes: Alt+Left / Alt+Right in Windows Terminal'));
-        // Exit current process — the new WT window takes over
-        process.exit(0);
-    }
-    catch (err) {
-        console.log(chalk_1.default.red(`Windows Terminal error: ${err.message}`));
-        console.log(chalk_1.default.gray('Tip: Install Windows Terminal from the Microsoft Store for split-pane support.'));
-        console.log(chalk_1.default.gray('Falling back to normal mode. Run "ekkos dashboard --latest" in another terminal.'));
-    }
-}
 /**
  * Launch ekkos run + dashboard in isolated tmux panes (60/40 split)
  */
@@ -836,6 +827,7 @@ function launchWithDashboard(options) {
         runArgs.push('--skip-dna');
     if (options.noProxy)
         runArgs.push('--skip-proxy');
+    runArgs.push('--kickstart'); // Auto-send "test" to create session immediately for dashboard
     const ekkosCmd = process.argv[1]; // Path to ekkos CLI
     const cwd = process.cwd();
     const termCols = process.stdout.columns ?? 160;
@@ -891,65 +883,32 @@ function launchWithDashboard(options) {
     }
 }
 async function run(options) {
-    // ══════════════════════════════════════════════════════════════════════════
-    // AUTO-SETUP: Run setup inline if this is a fresh install
-    // New users can just type `ekkos run` and get the full onboarding flow
-    // ══════════════════════════════════════════════════════════════════════════
-    const configFile = path.join(os.homedir(), '.ekkos', 'config.json');
-    if (!fs.existsSync(configFile)) {
-        console.log(chalk_1.default.cyan('\n👋 Welcome to ekkOS! Setting up your environment...\n'));
-        const { setup } = await Promise.resolve().then(() => __importStar(require('./setup.js')));
-        await setup({ ide: 'all' });
-        console.log('');
-    }
     const verbose = options.verbose || false;
     const bypass = options.bypass || false;
     const noInject = options.noInject || false;
-    // Set proxy mode based on options + env gate (used by getEkkosEnv)
-    const proxyDisabledByEnv = process.env.EKKOS_DISABLE_PROXY === '1';
-    proxyModeEnabled = !(options.noProxy || false || proxyDisabledByEnv);
+    // Set proxy mode based on options (used by getEkkosEnv)
+    proxyModeEnabled = !(options.noProxy || false);
     if (proxyModeEnabled) {
         console.log(chalk_1.default.cyan('  🧠 ekkOS_Continuum Loaded!'));
     }
-    else if (proxyDisabledByEnv) {
-        console.log(chalk_1.default.yellow('  ⏭️  API proxy disabled by EKKOS_DISABLE_PROXY=1'));
-        console.log(chalk_1.default.gray('     Unset EKKOS_DISABLE_PROXY to re-enable proxy routing.'));
-    }
     else if (verbose) {
-        console.log(chalk_1.default.yellow('  ⏭️  API proxy disabled (--skip-proxy)'));
+        console.log(chalk_1.default.yellow('  ⏭️  API proxy disabled (--no-proxy)'));
     }
     // ══════════════════════════════════════════════════════════════════════════
-    // DASHBOARD MODE: tmux (Mac/Linux) or Windows Terminal (Windows)
+    // DASHBOARD MODE: Launch via tmux with isolated dashboard pane (60/40)
     // ══════════════════════════════════════════════════════════════════════════
     if (options.dashboard) {
-        if (isWindows) {
-            // Windows: use Windows Terminal split panes
-            try {
-                (0, child_process_1.execSync)('where wt', { stdio: 'pipe' });
-                launchWithDashboardWindows(options);
+        try {
+            const tmuxPath = (0, child_process_1.execSync)('which tmux', { encoding: 'utf-8' }).trim();
+            if (tmuxPath) {
+                launchWithDashboard(options);
                 return;
             }
-            catch {
-                console.log(chalk_1.default.yellow('  Windows Terminal not found.'));
-                console.log(chalk_1.default.gray('  Install from Microsoft Store: https://aka.ms/terminal'));
-                console.log(chalk_1.default.gray('  Alternative: run "ekkos dashboard --latest" in a separate terminal'));
-                console.log(chalk_1.default.gray('  Continuing without dashboard...\n'));
-            }
         }
-        else {
-            // Mac/Linux: use tmux
-            try {
-                const tmuxPath = (0, child_process_1.execSync)('which tmux', { encoding: 'utf-8' }).trim();
-                if (tmuxPath) {
-                    launchWithDashboard(options);
-                    return;
-                }
-            }
-            catch {
-                console.log(chalk_1.default.yellow('  tmux not found. Install: brew install tmux'));
-                console.log(chalk_1.default.gray('  Alternative: run "ekkos dashboard --latest" in a separate terminal'));
-                console.log(chalk_1.default.gray('  Continuing without dashboard...\n'));
-            }
+        catch {
+            console.log(chalk_1.default.yellow('  tmux not found. Install: brew install tmux'));
+            console.log(chalk_1.default.gray('  Alternative: run "ekkos dashboard --latest" in a separate terminal'));
+            console.log(chalk_1.default.gray('  Continuing without dashboard...\n'));
         }
     }
     // Generate instance ID for this run
@@ -1005,15 +964,22 @@ async function run(options) {
         }
     }
     // ══════════════════════════════════════════════════════════════════════════
-    // Legacy ccDNA flags are now no-ops.
-    // Context eviction and replay are owned by the proxy.
+    // ccDNA AUTO-PATCH: Apply Claude Code customizations before spawn
+    // This patches the context warning, themes, and other ccDNA features
+    // Skip if --no-dna flag is set
     // ══════════════════════════════════════════════════════════════════════════
     const noDna = options.noDna || false;
-    if (verbose && noDna) {
-        console.log(chalk_1.default.gray('  --skip-dna is deprecated (ccDNA patching is removed)'));
+    let ccdnaVersion = null;
+    if (noDna) {
+        if (verbose) {
+            console.log(chalk_1.default.yellow('  ⏭️  Skipping ccDNA injection (--no-dna)'));
+        }
     }
-    if (verbose && claudeCliPath) {
-        console.log(chalk_1.default.gray(`  🤖 Claude CLI: ${claudeCliPath}`));
+    else {
+        if (verbose && claudeCliPath) {
+            console.log(chalk_1.default.gray(`  🔧 Patching: ${claudeCliPath}`));
+        }
+        ccdnaVersion = applyCcdnaPatches(verbose, claudeCliPath);
     }
     const pinnedVersion = isNpxMode ? rawClaudePath.split(':')[1] : null;
     const claudePath = isNpxMode ? 'npx' : rawClaudePath;
@@ -1045,7 +1011,7 @@ async function run(options) {
     // Handler reference for early spawn (allows replacing buffer handler with real handler)
     let earlyDataHandler = null;
     // Start spawning Claude NOW (before animation) if PTY available
-    if (usePty && pty) {
+    if (usePty && pty && !isWindows) {
         try {
             earlySpawnedShell = pty.spawn(claudePath, earlyArgs, {
                 name: 'xterm-256color',
@@ -1174,10 +1140,10 @@ async function run(options) {
         logoLines.forEach(line => console.log(chalk_1.default.magenta(line)));
         console.log('');
         // ══════════════════════════════════════════════════════════════════════════
-        // ANIMATED TITLE: "ekkOS_Pulse" with orange/white shine
+        // ANIMATED TITLE: "Cognitive Continuity Engine" with orange/white shine
         // ══════════════════════════════════════════════════════════════════════════
-        const titleText = 'ekkOS_Pulse';
-        const taglineText = 'Infinite context. Native model quality.';
+        const titleText = 'Cognitive Continuity Engine';
+        const taglineText = 'Context is finite. Intelligence isn\'t.';
         // Color palette for shine effect
         const whiteShine = chalk_1.default.whiteBright;
         // Phase 1: Typewriter effect for title
@@ -1257,6 +1223,9 @@ async function run(options) {
         if (bypass) {
             console.log(chalk_1.default.yellow('  ⚡ Bypass permissions mode enabled'));
         }
+        if (noDna) {
+            console.log(chalk_1.default.yellow('  ⏭️  ccDNA injection skipped (--no-dna)'));
+        }
         if (verbose) {
             console.log(chalk_1.default.gray(`  📁 Debug log: ${config.debugLogPath}`));
             console.log(chalk_1.default.gray(`  ⏱  Timing: clear=${config.clearWaitMs}ms, idleMax=${config.maxIdleWaitMs}ms (~${Math.round((config.clearWaitMs + config.maxIdleWaitMs * 2 + 1700) / 1000)}s total)`));
@@ -1269,6 +1238,9 @@ async function run(options) {
         if (bypass) {
             console.log(chalk_1.default.yellow('  ⚡ Bypass permissions mode enabled'));
         }
+        if (noDna) {
+            console.log(chalk_1.default.yellow('  ⏭️  ccDNA injection skipped (--no-dna)'));
+        }
         if (verbose) {
             console.log(chalk_1.default.gray(`  📁 Debug log: ${config.debugLogPath}`));
         }
@@ -1355,7 +1327,7 @@ async function run(options) {
     // Claude creates the transcript file BEFORE outputting the session name
     // So we watch for new files rather than parsing TUI output (which is slower)
     // ════════════════════════════════════════════════════════════════════════════
-    const encodedCwd = process.cwd().replace(/[\\/]/g, '-');
+    const encodedCwd = process.cwd().replace(/\//g, '-');
     const projectDir = path.join(os.homedir(), '.claude', 'projects', encodedCwd);
     const launchTime = Date.now();
     // Track existing jsonl files at startup
@@ -1526,10 +1498,8 @@ async function run(options) {
             });
             return false;
         }
-        // Check it's an absolute path (Unix: / or ~, Windows: C:\ or \\)
-        const isAbsolutePath = pathToCheck.startsWith('/') || pathToCheck.startsWith('~') ||
-            /^[A-Za-z]:[\\/]/.test(pathToCheck) || pathToCheck.startsWith('\\\\');
-        if (!isAbsolutePath) {
+        // Check it starts with / or ~ (absolute path)
+        if (!pathToCheck.startsWith('/') && !pathToCheck.startsWith('~')) {
             evictionDebugLog('PATH_INVALID', 'Transcript path is not absolute - clearing', {
                 path: pathToCheck.slice(0, 100),
             });
@@ -1561,7 +1531,7 @@ async function run(options) {
     function bindRealSessionToProxy(sessionName, source) {
         if (!proxyModeEnabled)
             return;
-        if (!sessionName || sessionName === '_pending' || sessionName === 'pending' || sessionName.startsWith('_pending-'))
+        if (!sessionName || sessionName === '_pending')
             return;
         if (boundProxySession === sessionName || bindingSessionInFlight === sessionName)
             return;
@@ -1569,8 +1539,7 @@ async function run(options) {
         void (async () => {
             const maxAttempts = 3;
             for (let attempt = 1; attempt <= maxAttempts; attempt++) {
-                const pendingSession = cliSessionName && cliSessionName.startsWith('_pending') ? cliSessionName : undefined;
-                const success = await (0, session_binding_1.bindSession)(sessionName, process.cwd(), pendingSession);
+                const success = await (0, session_binding_1.bindSession)(sessionName, process.cwd());
                 if (success) {
                     boundProxySession = sessionName;
                     bindingSessionInFlight = null;
@@ -1711,8 +1680,12 @@ async function run(options) {
         console.log(chalk_1.default.yellow('  Monitor-only mode (--no-inject)'));
     }
     if (verbose) {
+        // Show Claude version with ccDNA version if patched
         const ccVersion = pinnedVersion || PINNED_CLAUDE_VERSION;
-        console.log(chalk_1.default.gray(`  🤖 Claude Code v${ccVersion}`));
+        const versionStr = ccdnaVersion
+            ? `Claude Code v${ccVersion} + ekkOS_Continuum v${ccdnaVersion}`
+            : `Claude Code v${ccVersion}`;
+        console.log(chalk_1.default.gray(`  🤖 ${versionStr}`));
         if (currentSession) {
             console.log(chalk_1.default.green(`  📍 Session: ${currentSession}`));
         }
@@ -1774,8 +1747,7 @@ async function run(options) {
                 const spawnedProcess = (0, child_process_1.spawn)(claudePath, args, {
                     stdio: 'inherit',
                     cwd: process.cwd(),
-                    env: getEkkosEnv(),
-                    shell: isWindows // Required on Windows to execute .cmd files
+                    env: getEkkosEnv()
                 });
                 spawnedProcess.on('exit', (code) => process.exit(code ?? 0));
                 spawnedProcess.on('error', (e) => {
@@ -1799,8 +1771,7 @@ async function run(options) {
         const spawnedProcess = (0, child_process_1.spawn)(claudePath, args, {
             stdio: 'inherit',
             cwd: process.cwd(),
-            env: getEkkosEnv(),
-            shell: isWindows // Required on Windows to execute .cmd files
+            env: getEkkosEnv()
         });
         spawnedProcess.on('exit', (code) => {
             process.exit(code ?? 0);
@@ -2304,9 +2275,7 @@ async function run(options) {
         if (transcriptMatch) {
             const candidatePath = transcriptMatch[1];
             // Validate it's an actual path (not garbage from terminal output)
-            const isAbsCandidate = candidatePath.startsWith('/') || candidatePath.startsWith('~') ||
-                /^[A-Za-z]:[\\/]/.test(candidatePath);
-            if (isAbsCandidate) {
+            if (candidatePath.startsWith('/') || candidatePath.startsWith('~')) {
                 const resolvedPath = candidatePath.startsWith('~')
                     ? path.join(os.homedir(), candidatePath.slice(1))
                     : candidatePath;
@@ -2353,15 +2322,12 @@ async function run(options) {
         }
         // ════════════════════════════════════════════════════════════════════════
         // SESSION NAME DETECTION (PRIMARY METHOD)
-        // Claude footer examples:
-        // "· 🧠 ekkOS_™ · Turn N · groovy-koala-saves · 📅 2026-01-17"
-        // "· 🧠 ekkOS_™ · groovy-koala-saves · 📅 2026-01-17"
+        // Claude footer: "· Turn N · groovy-koala-saves · 📅 2026-01-17"
         // This is MORE reliable than UUID extraction
         // ════════════════════════════════════════════════════════════════════════
         const plain = stripAnsi(data);
-        // Strong signal: session name in branded footer (with/without turn marker)
-        const statusMatch = plain.match(SESSION_NAME_IN_EKKOS_FOOTER_REGEX) ||
-            plain.match(SESSION_NAME_IN_TURN_FOOTER_REGEX);
+        // Strong signal: session name between dot separators in status/footer line
+        const statusMatch = plain.match(SESSION_NAME_IN_STATUS_REGEX);
         if (statusMatch) {
             const detectedSession = statusMatch[1].toLowerCase();
             // Validate against word lists (SOURCE OF TRUTH)