@ekkos/cli 1.3.1 → 1.3.5

package/dist/commands/swarm-dashboard.js

@@ -63,11 +63,12 @@ const commander_1 = require("commander");
 const state_js_1 = require("../utils/state.js");
 // ── Pricing (per MTok) ──
 const MODEL_PRICING = {
-    'claude-opus-4-6': { input: 15, output: 75, cacheWrite: 18.75, cacheRead: 1.50 },
-    'claude-opus-4-5-20250620': { input: 15, output: 75, cacheWrite: 18.75, cacheRead: 1.50 },
+    'claude-opus-4-6': { input: 5, output: 25, cacheWrite: 6.25, cacheRead: 0.50 },
+    'claude-opus-4-5-20250620': { input: 5, output: 25, cacheWrite: 6.25, cacheRead: 0.50 },
+    'claude-sonnet-4-6': { input: 3, output: 15, cacheWrite: 3.75, cacheRead: 0.30 },
     'claude-sonnet-4-5-20250929': { input: 3, output: 15, cacheWrite: 3.75, cacheRead: 0.30 },
     'claude-sonnet-4-5-20250514': { input: 3, output: 15, cacheWrite: 3.75, cacheRead: 0.30 },
-    'claude-haiku-4-5-20251001': { input: 0.80, output: 4, cacheWrite: 1.00, cacheRead: 0.08 },
+    'claude-haiku-4-5-20251001': { input: 1, output: 5, cacheWrite: 1.25, cacheRead: 0.10 },
 };
 function getModelPricing(modelId) {
     if (MODEL_PRICING[modelId])
@@ -332,11 +333,20 @@ async function launchSwarmDashboard(launchTs, refreshMs) {
     const USAGE_H = 4;
     const FOOTER_H = 3;
     const FIXED_H = HEADER_H + WORKERS_H + USAGE_H + FOOTER_H;
+    function resolveChartRatio(height) {
+        if (height >= 62)
+            return 0.22;
+        if (height >= 48)
+            return 0.25;
+        if (height >= 36)
+            return 0.28;
+        return 0.32;
+    }
     function calcLayout() {
-        const H = Math.max(30, screen.height);
+        const H = Math.max(30, screen.height || 30);
         const remaining = Math.max(10, H - FIXED_H);
-        const chartH = Math.max(CHART_H_MIN, Math.floor(remaining * 0.30));
-        const tableH = Math.max(4, remaining - chartH);
+        const chartH = Math.max(CHART_H_MIN, Math.floor(remaining * resolveChartRatio(H)));
+        const tableH = Math.max(5, remaining - chartH);
         return {
             header: { top: 0, height: HEADER_H },
             workers: { top: HEADER_H, height: WORKERS_H },
@@ -368,15 +378,20 @@ async function launchSwarmDashboard(launchTs, refreshMs) {
         border: { type: 'line' },
         label: ' Workers ',
     });
-    const tokenChart = contrib.line({
-        top: layout.chart.top, left: 0, width: W, height: layout.chart.height,
-        label: ' Tokens/Turn (K) ',
-        showLegend: true,
-        legend: { width: 12 },
-        style: { line: 'green', text: 'white', baseline: 'white', border: { fg: 'yellow' } },
-        border: { type: 'line', fg: 'yellow' },
-        xLabelPadding: 0, xPadding: 1, wholeNumbersOnly: false,
-    });
+    function createTokenChart(top, left, width, height) {
+        return contrib.line({
+            top, left, width, height,
+            label: ' Tokens/Turn (K) ',
+            showLegend: true,
+            legend: { width: 12 },
+            style: { line: 'green', text: 'white', baseline: 'white', border: { fg: 'yellow' } },
+            border: { type: 'line', fg: 'yellow' },
+            xLabelPadding: 0, xPadding: 1, wholeNumbersOnly: false,
+        });
+    }
+    let tokenChart = createTokenChart(layout.chart.top, 0, W, layout.chart.height);
+    let chartLayoutW = 0;
+    let chartLayoutH = 0;
     const turnBox = blessed.box({
         top: layout.table.top, left: 0, width: W, height: layout.table.height,
         content: '',
@@ -413,22 +428,77 @@ async function launchSwarmDashboard(launchTs, refreshMs) {
     screen.append(footerBox);
     function applyLayout() {
         layout = calcLayout();
+        const fullWidth = Math.max(24, screen.width || 80);
+        const H_PAD = 1;
+        const contentWidth = Math.max(20, fullWidth - (H_PAD * 2));
         headerBox.top = layout.header.top;
+        headerBox.left = H_PAD;
+        headerBox.width = contentWidth;
         headerBox.height = layout.header.height;
         workersBox.top = layout.workers.top;
+        workersBox.left = H_PAD;
+        workersBox.width = contentWidth;
         workersBox.height = layout.workers.height;
-        tokenChart.top = layout.chart.top;
-        tokenChart.height = layout.chart.height;
+        if (chartLayoutW !== contentWidth || chartLayoutH !== layout.chart.height) {
+            try {
+                screen.remove(tokenChart);
+            }
+            catch { }
+            try {
+                tokenChart.destroy?.();
+            }
+            catch { }
+            tokenChart = createTokenChart(layout.chart.top, H_PAD, contentWidth, layout.chart.height);
+            chartLayoutW = contentWidth;
+            chartLayoutH = layout.chart.height;
+            screen.append(tokenChart);
+        }
+        else {
+            tokenChart.top = layout.chart.top;
+            tokenChart.left = H_PAD;
+            tokenChart.width = contentWidth;
+            tokenChart.height = layout.chart.height;
+        }
         turnBox.top = layout.table.top;
+        turnBox.left = H_PAD;
+        turnBox.width = contentWidth;
         turnBox.height = layout.table.height;
         windowBox.top = layout.usage.top;
+        windowBox.left = H_PAD;
+        windowBox.width = contentWidth;
         windowBox.height = layout.usage.height;
         footerBox.top = layout.footer.top;
+        footerBox.left = H_PAD;
+        footerBox.width = contentWidth;
         footerBox.height = layout.footer.height;
+        if (lastChartSeries) {
+            try {
+                tokenChart.setData(lastChartSeries);
+            }
+            catch { }
+        }
     }
     // ── State ──
     let lastWorkers = [];
+    let lastChartSeries = null;
     let sparkleTimer;
+    let lastLayoutW = screen.width || 0;
+    let lastLayoutH = screen.height || 0;
+    function ensureLayoutSynced() {
+        const w = screen.width || 0;
+        const h = screen.height || 0;
+        if (w === lastLayoutW && h === lastLayoutH)
+            return;
+        lastLayoutW = w;
+        lastLayoutH = h;
+        try {
+            screen.realloc?.();
+        }
+        catch { }
+        applyLayout();
+    }
+    // Apply once so initial render uses the final, padded geometry.
+    applyLayout();
     // ── Logo animation ──
     function renderLogoWave() {
         try {
@@ -446,11 +516,11 @@ async function launchSwarmDashboard(launchTs, refreshMs) {
             const rawLogoLen = 14; // " ekkOS_ Swarm " roughly
             const infoStr = ` ${lastWorkers.length}W ${totalTurns}t $${totalCost.toFixed(2)} ${durStr} `;
             const rawInfoLen = infoStr.length + 1;
-            const boxW = screen.width - 2;
+            const boxW = Math.max(10, headerBox.width - 2);
             const pad = Math.max(1, boxW - rawLogoLen - rawInfoLen);
             headerBox.setLabel(logoStr + '\u2500'.repeat(pad) + infoStr);
             // Header content: task description
-            const maxW = screen.width - 6;
+            const maxW = Math.max(8, headerBox.width - 6);
             const truncTask = taskStr.length > maxW ? taskStr.slice(0, maxW - 3) + '...' : taskStr;
             headerBox.setContent(` {gray-fg}Task:{/gray-fg} ${truncTask}`);
             waveOffset = (waveOffset + 1) % WAVE_COLORS.length;
@@ -471,7 +541,7 @@ async function launchSwarmDashboard(launchTs, refreshMs) {
             workersBox.setContent(' {gray-fg}No workers detected yet...{/gray-fg}');
             return;
         }
-        const boxW = Math.max(20, screen.width - 4);
+        const boxW = Math.max(20, workersBox.width - 2);
         const WORKER_COLORS = ['magenta', 'blue', 'green', 'yellow', 'cyan', 'red', 'white', 'gray'];
         const lines = [];
         // Row 1: Worker names + context bars
@@ -510,8 +580,9 @@ async function launchSwarmDashboard(launchTs, refreshMs) {
     // ── Combined turn table ──
     function renderTurnTable(workers) {
         const WORKER_COLORS = ['magenta', 'blue', 'green', 'yellow', 'cyan', 'red', 'white', 'gray'];
-        const w = Math.max(20, screen.width - 4);
+        const w = Math.max(18, turnBox.width - 4);
         const div = '{gray-fg}|{/gray-fg}';
+        const lastScrollPerc = turnBox.getScrollPerc();
         // Columns: W(2) Turn(4) Model(7) Context(7) CacheRd(flex) CacheWr(flex) Out(flex) Cost(7)
         const colW = 2;
         const colNum = 4;
@@ -540,8 +611,7 @@ async function launchSwarmDashboard(launchTs, refreshMs) {
         }
         // Sort by timestamp descending (newest first)
         allTurns.sort((a, b) => new Date(b.timestamp).getTime() - new Date(a.timestamp).getTime());
-        const visibleRows = Math.max(1, layout.table.height - 4);
-        const rows = allTurns.slice(0, visibleRows).map(t => {
+        const rows = allTurns.map(t => {
             const wColor = WORKER_COLORS[(t.workerIndex - 1) % WORKER_COLORS.length];
             const mTag = modelTag(t.routedModel);
             const mColor = t.routedModel.includes('haiku') ? 'green' : t.routedModel.includes('sonnet') ? 'blue' : 'magenta';
@@ -557,6 +627,9 @@ async function launchSwarmDashboard(launchTs, refreshMs) {
                 costFlag + rpad(`$${t.cost.toFixed(2)}`, colCost) + costEnd);
         });
         turnBox.setContent([header, separator, ...rows].join('\n'));
+        if (lastScrollPerc > 0) {
+            turnBox.setScrollPerc(lastScrollPerc);
+        }
     }
     // ── Combined chart ──
     function renderChart(workers) {
@@ -576,16 +649,68 @@ async function launchSwarmDashboard(launchTs, refreshMs) {
             });
         }
         if (series.length > 0) {
+            lastChartSeries = series;
             tokenChart.setData(series);
         }
     }
     // ── Usage window (Anthropic OAuth) ──
+    function extractClaudeOauthAccessToken(rawBlob) {
+        const raw = (rawBlob || '').trim();
+        if (!raw)
+            return null;
+        const candidates = new Set([raw]);
+        if (/^[0-9a-fA-F]+$/.test(raw) && raw.length % 2 === 0) {
+            const decoded = Buffer.from(raw, 'hex').toString('utf8');
+            candidates.add(decoded);
+            candidates.add(decoded.replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]/g, '').trim());
+        }
+        for (const candidate of candidates) {
+            if (!candidate)
+                continue;
+            try {
+                const parsed = JSON.parse(candidate);
+                const token = parsed?.claudeAiOauth?.accessToken;
+                if (typeof token === 'string' && token.length > 0)
+                    return token;
+            }
+            catch { }
+            try {
+                const parsed = JSON.parse(`{${candidate}}`);
+                const token = parsed?.claudeAiOauth?.accessToken;
+                if (typeof token === 'string' && token.length > 0)
+                    return token;
+            }
+            catch { }
+            const oauthMatch = candidate.match(/"claudeAiOauth"\s*:\s*(\{[\s\S]*?\})/);
+            if (oauthMatch) {
+                try {
+                    const oauth = JSON.parse(oauthMatch[1]);
+                    const token = oauth?.accessToken;
+                    if (typeof token === 'string' && token.length > 0)
+                        return token;
+                }
+                catch { }
+                const tokenMatch = oauthMatch[1].match(/"accessToken"\s*:\s*"([^"]+)"/);
+                if (tokenMatch?.[1])
+                    return tokenMatch[1];
+            }
+        }
+        return null;
+    }
     async function fetchAnthropicUsage() {
         try {
-            const { execSync } = require('child_process');
-            const credsJson = execSync('security find-generic-password -s "Claude Code-credentials" -w', { encoding: 'utf-8', timeout: 5000 }).trim();
-            const creds = JSON.parse(credsJson);
-            const token = creds?.claudeAiOauth?.accessToken;
+            let token = null;
+            if (process.platform === 'darwin') {
+                const { execSync } = require('child_process');
+                const credsBlob = execSync('security find-generic-password -s "Claude Code-credentials" -w', { encoding: 'utf-8', timeout: 5000 }).trim();
+                token = extractClaudeOauthAccessToken(credsBlob);
+            }
+            if (!token) {
+                const credsPath = path.join(os.homedir(), '.claude', '.credentials.json');
+                if (fs.existsSync(credsPath)) {
+                    token = extractClaudeOauthAccessToken(fs.readFileSync(credsPath, 'utf-8'));
+                }
+            }
             if (!token)
                 return null;
             const resp = await fetch('https://api.anthropic.com/api/oauth/usage', {
@@ -664,6 +789,7 @@ async function launchSwarmDashboard(launchTs, refreshMs) {
     // ── Main update loop ──
     function updateDashboard() {
         try {
+            ensureLayoutSynced();
             const workers = discoverWorkers(launchTs);
             lastWorkers = workers;
             renderWorkerCards(workers);
@@ -691,7 +817,9 @@ async function launchSwarmDashboard(launchTs, refreshMs) {
     screen.on('resize', () => {
         try {
             screen.realloc?.();
-            applyLayout();
+            lastLayoutW = 0;
+            lastLayoutH = 0;
+            ensureLayoutSynced();
             updateDashboard();
         }
         catch { }

package/dist/commands/swarm.d.ts

@@ -32,7 +32,7 @@ export interface SwarmLaunchOptions {
  * - Uses tmux WINDOWS (not panes) — compatible with Python Queen discovery
  * - Window 0: Swarm Dashboard (blessed TUI showing all workers)
  * - Windows 1-N: Workers running `ekkos run -b` (proxy + infinite context)
- * - Each worker gets full ekkOS stack: proxy, hooks, ccDNA, context eviction
+ * - Each worker gets full ekkOS stack: proxy, hooks, context eviction
  *
  * Flow:
  * 1. Decompose task via Gemini Flash (free, fast)

package/dist/commands/swarm.js

@@ -194,7 +194,7 @@ function findPythonPath(swarmDir) {
  * - Uses tmux WINDOWS (not panes) — compatible with Python Queen discovery
  * - Window 0: Swarm Dashboard (blessed TUI showing all workers)
  * - Windows 1-N: Workers running `ekkos run -b` (proxy + infinite context)
- * - Each worker gets full ekkOS stack: proxy, hooks, ccDNA, context eviction
+ * - Each worker gets full ekkOS stack: proxy, hooks, context eviction
  *
  * Flow:
  * 1. Decompose task via Gemini Flash (free, fast)

package/dist/commands/test-claude.d.ts

@@ -2,11 +2,11 @@
  * ekkos test-claude — Bare proxy test (no CLI wrapper)
  *
  * Launches vanilla Claude Code with ONLY the proxy URL set.
- * No ccDNA, no PTY wrapper, no injection, no context management.
+ * No PTY wrapper, no injection, no context management.
  *
  * Purpose: Isolate whether fast context growth is caused by:
  *   A) The proxy (IPC, injections, tool compression)
- *   B) The ekkos CLI wrapper (ccDNA, PTY, run.ts logic)
+ *   B) The ekkos CLI wrapper (PTY, run.ts logic)
  */
 export interface TestClaudeOptions {
     noProxy?: boolean;

package/dist/commands/test-claude.js

@@ -3,11 +3,11 @@
  * ekkos test-claude — Bare proxy test (no CLI wrapper)
  *
  * Launches vanilla Claude Code with ONLY the proxy URL set.
- * No ccDNA, no PTY wrapper, no injection, no context management.
+ * No PTY wrapper, no injection, no context management.
  *
  * Purpose: Isolate whether fast context growth is caused by:
  *   A) The proxy (IPC, injections, tool compression)
- *   B) The ekkos CLI wrapper (ccDNA, PTY, run.ts logic)
+ *   B) The ekkos CLI wrapper (PTY, run.ts logic)
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -59,7 +59,7 @@ async function testClaude(options) {
     console.log(chalk_1.default.cyan('\n  ekkOS test-claude — Bare Proxy Test'));
     console.log(chalk_1.default.gray('  ══════════════════════════════════'));
     console.log(chalk_1.default.green('  Proxy:    ') + (options.noProxy ? chalk_1.default.yellow('NO') : chalk_1.default.green('YES')));
-    console.log(chalk_1.default.green('  CLI:      ') + chalk_1.default.yellow('NO  (no ccDNA, no PTY, no inject)'));
+    console.log(chalk_1.default.green('  CLI:      ') + chalk_1.default.yellow('NO  (no PTY, no inject)'));
     console.log(chalk_1.default.green('  Hooks:    ') + (options.noHooks ? chalk_1.default.yellow('NO  (disabled)') : chalk_1.default.gray('YES (same .claude/hooks/)')));
     console.log('');
     // Resolve Claude path

package/dist/deploy/index.d.ts

@@ -2,6 +2,4 @@ export * from './mcp';
 export * from './settings';
 export * from './hooks';
 export * from './skills';
-export * from './agents';
-export * from './plugins';
 export * from './instructions';

package/dist/deploy/index.js

@@ -19,6 +19,4 @@ __exportStar(require("./mcp"), exports);
 __exportStar(require("./settings"), exports);
 __exportStar(require("./hooks"), exports);
 __exportStar(require("./skills"), exports);
-__exportStar(require("./agents"), exports);
-__exportStar(require("./plugins"), exports);
 __exportStar(require("./instructions"), exports);

package/dist/deploy/settings.d.ts

@@ -1,11 +1,12 @@
 /**
- * DEPRECATED: Hook configuration removed in hookless architecture migration.
- * Claude Code settings.json will NOT have any hooks entries written by ekkOS.
- * The CLI + proxy handle everything — hooks are no longer needed.
+ * Claude Code settings.json management for ekkOS.
+ * - Disables Claude's built-in auto-memory (ekkOS replaces it with 11-layer memory)
+ * - Registers ekkOS hooks in correct Claude Code format (PascalCase events, { type, command } objects)
  */
 /**
- * Deploy Claude Code settings.json — no-op for hooks.
- * Preserves any existing settings but does NOT write any hooks configuration.
+ * Deploy Claude Code settings.json — disables auto-memory and configures hooks.
+ * ekkOS provides its own memory system via MCP, so Claude's built-in auto-memory
+ * is redundant and wastes ~1K tokens/turn on duplicate context.
  */
 export declare function deployClaudeSettings(): void;
 /**

package/dist/deploy/settings.js

@@ -1,37 +1,85 @@
 "use strict";
 /**
- * DEPRECATED: Hook configuration removed in hookless architecture migration.
- * Claude Code settings.json will NOT have any hooks entries written by ekkOS.
- * The CLI + proxy handle everything — hooks are no longer needed.
+ * Claude Code settings.json management for ekkOS.
+ * - Disables Claude's built-in auto-memory (ekkOS replaces it with 11-layer memory)
+ * - Registers ekkOS hooks in correct Claude Code format (PascalCase events, { type, command } objects)
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployClaudeSettings = deployClaudeSettings;
 exports.areHooksConfigured = areHooksConfigured;
 const fs_1 = require("fs");
+const path_1 = require("path");
+const os_1 = require("os");
 const platform_1 = require("../utils/platform");
 /**
- * Deploy Claude Code settings.json — no-op for hooks.
- * Preserves any existing settings but does NOT write any hooks configuration.
+ * Deploy Claude Code settings.json — disables auto-memory and configures hooks.
+ * ekkOS provides its own memory system via MCP, so Claude's built-in auto-memory
+ * is redundant and wastes ~1K tokens/turn on duplicate context.
  */
 function deployClaudeSettings() {
     // Ensure .claude directory exists
     if (!(0, fs_1.existsSync)(platform_1.CLAUDE_DIR)) {
         (0, fs_1.mkdirSync)(platform_1.CLAUDE_DIR, { recursive: true });
     }
-    // Read existing settings (if any) but do NOT add or modify hooks
-    if (!(0, fs_1.existsSync)(platform_1.CLAUDE_SETTINGS)) {
-        return; // Nothing to do — don't create an empty file
+    let settings = {};
+    if ((0, fs_1.existsSync)(platform_1.CLAUDE_SETTINGS)) {
+        try {
+            settings = JSON.parse((0, fs_1.readFileSync)(platform_1.CLAUDE_SETTINGS, 'utf-8'));
+        }
+        catch {
+            // Invalid JSON — start fresh
+            settings = {};
+        }
+    }
+    let changed = false;
+    // Disable Claude's built-in auto-memory — ekkOS replaces it
+    if (settings.autoMemoryEnabled !== false) {
+        settings.autoMemoryEnabled = false;
+        changed = true;
     }
-    try {
-        const settings = JSON.parse((0, fs_1.readFileSync)(platform_1.CLAUDE_SETTINGS, 'utf-8'));
-        // Remove any previously-installed ekkOS hooks entries
-        if ('hooks' in settings) {
-            delete settings.hooks;
-            (0, fs_1.writeFileSync)(platform_1.CLAUDE_SETTINGS, JSON.stringify(settings, null, 2));
+    // Build correct hooks config pointing to ~/.claude/hooks/ scripts.
+    // Claude Code requires PascalCase event names and { type, command } objects.
+    const hooksDir = (0, path_1.join)((0, os_1.homedir)(), '.claude', 'hooks');
+    const isWindows = process.platform === 'win32';
+    const ext = isWindows ? '.ps1' : '.sh';
+    const hookMapping = [
+        { event: 'SessionStart', script: `session-start${ext}` },
+        { event: 'UserPromptSubmit', script: `user-prompt-submit${ext}` },
+        { event: 'Stop', script: `stop${ext}` },
+    ];
+    // Only register hooks for scripts that actually exist on disk
+    const newHooks = {};
+    for (const { event, script } of hookMapping) {
+        const scriptPath = (0, path_1.join)(hooksDir, script);
+        if ((0, fs_1.existsSync)(scriptPath)) {
+            newHooks[event] = [
+                {
+                    matcher: '',
+                    hooks: [
+                        {
+                            type: 'command',
+                            command: scriptPath,
+                        },
+                    ],
+                },
+            ];
         }
     }
-    catch {
-        // Invalid JSON or read error — leave the file alone
+    // Replace hooks if they differ from expected (fixes wrong format + adds missing)
+    const existingHooks = settings.hooks;
+    if (Object.keys(newHooks).length > 0) {
+        if (JSON.stringify(existingHooks) !== JSON.stringify(newHooks)) {
+            settings.hooks = newHooks;
+            changed = true;
+        }
+    }
+    else if (existingHooks) {
+        // No hook scripts on disk — remove stale hooks entry
+        delete settings.hooks;
+        changed = true;
+    }
+    if (changed) {
+        (0, fs_1.writeFileSync)(platform_1.CLAUDE_SETTINGS, JSON.stringify(settings, null, 2));
     }
 }
 /**

package/dist/deploy/skills.js

@@ -39,8 +39,7 @@ function areSkillsDeployed() {
     if (!(0, fs_1.existsSync)(platform_1.CLAUDE_SKILLS_DIR))
         return false;
     const deployed = (0, fs_1.readdirSync)(platform_1.CLAUDE_SKILLS_DIR);
-    // Check for at least some core skills
-    return deployed.length >= 5;
+    return deployed.length >= 1;
 }
 /**
  * Count deployed skills