@ekkos/cli 1.0.25 → 1.0.27

package/dist/commands/dashboard.js

@@ -67,6 +67,7 @@ const chalk_1 = __importDefault(require("chalk"));
 const commander_1 = require("commander");
 const usage_parser_js_1 = require("../lib/usage-parser.js");
 const state_js_1 = require("../utils/state.js");
+const UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 // ── Pricing ──
 // Pricing per MTok from https://platform.claude.com/docs/en/about-claude/pricing
 const MODEL_PRICING = {
@@ -272,6 +273,55 @@ function parseJsonlFile(jsonlPath, sessionName) {
         turns,
     };
 }
+function readJsonFile(filePath) {
+    try {
+        if (!fs.existsSync(filePath))
+            return null;
+        return JSON.parse(fs.readFileSync(filePath, 'utf-8'));
+    }
+    catch {
+        return null;
+    }
+}
+function resolveSessionAlias(sessionId) {
+    const normalized = sessionId.toLowerCase();
+    // Project-local hook state (most reliable for the active session)
+    const projectState = readJsonFile(path.join(process.cwd(), '.claude', 'state', 'current-session.json'));
+    if (projectState?.session_id?.toLowerCase() === normalized &&
+        projectState.session_name &&
+        !UUID_REGEX.test(projectState.session_name)) {
+        return projectState.session_name;
+    }
+    // Global Claude hook state
+    const claudeState = readJsonFile(path.join(os.homedir(), '.claude', 'state', 'current-session.json'));
+    if (claudeState?.session_id?.toLowerCase() === normalized &&
+        claudeState.session_name &&
+        !UUID_REGEX.test(claudeState.session_name)) {
+        return claudeState.session_name;
+    }
+    // ekkOS global state
+    const ekkosState = readJsonFile(path.join(os.homedir(), '.ekkos', 'current-session.json'));
+    if (ekkosState?.session_id?.toLowerCase() === normalized &&
+        ekkosState.session_name &&
+        !UUID_REGEX.test(ekkosState.session_name)) {
+        return ekkosState.session_name;
+    }
+    // Multi-session index fallback
+    const activeSessions = readJsonFile(path.join(os.homedir(), '.ekkos', 'active-sessions.json')) || [];
+    const bySessionId = activeSessions
+        .filter(s => s.sessionId?.toLowerCase() === normalized && s.sessionName && !UUID_REGEX.test(s.sessionName))
+        .sort((a, b) => (b.lastHeartbeat || '').localeCompare(a.lastHeartbeat || ''));
+    if (bySessionId.length > 0)
+        return bySessionId[0].sessionName || null;
+    return null;
+}
+function displaySessionName(rawName) {
+    if (!rawName)
+        return 'session';
+    if (!UUID_REGEX.test(rawName))
+        return rawName;
+    return resolveSessionAlias(rawName) || (0, state_js_1.uuidToWords)(rawName);
+}
 // ── Resolve session to JSONL path ──
 function resolveJsonlPath(sessionName, createdAfterMs) {
     // 1) Try standard resolution (works when sessionId is a real UUID)
@@ -499,7 +549,7 @@ function sleep(ms) {
 }
 // ── TUI Dashboard ──
 async function launchDashboard(initialSessionName, jsonlPath, refreshMs) {
-    let sessionName = initialSessionName;
+    let sessionName = displaySessionName(initialSessionName);
     const blessed = require('blessed');
     const contrib = require('blessed-contrib');
     const inTmux = process.env.TMUX !== undefined;
@@ -836,12 +886,20 @@ async function launchDashboard(initialSessionName, jsonlPath, refreshMs) {
                 const basename = path.basename(jsonlPath, '.jsonl');
                 // JSONL filename is the session UUID (e.g., 607bd8e4-0a04-4db2-acf5-3f794be0f956.jsonl)
                 if (/^[0-9a-f]{8}-/.test(basename)) {
-                    sessionName = (0, state_js_1.uuidToWords)(basename);
+                    sessionName = displaySessionName(basename);
                     screen.title = `ekkOS - ${sessionName}`;
                 }
             }
             catch { }
         }
+        // If we started with a UUID fallback, keep trying to resolve to the bound word session.
+        if (UUID_REGEX.test(sessionName)) {
+            const resolvedName = displaySessionName(sessionName);
+            if (resolvedName !== sessionName) {
+                sessionName = resolvedName;
+                screen.title = `ekkOS - ${sessionName}`;
+            }
+        }
         let data;
         try {
             const stat = fs.statSync(jsonlPath);

package/dist/commands/run.js

@@ -400,9 +400,51 @@ function getEkkosEnv() {
     }
     return env;
 }
-// ekkOS-managed Claude installation path
+// ekkOS-managed Claude installation path (npm fallback)
 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;
+    }
+}
 /**
  * Check if a Claude installation exists and get its version
  * Returns version string if found, null otherwise
@@ -504,34 +546,32 @@ function installEkkosClaudeVersion() {
     }
 }
 /**
- * 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.
+ * Resolve full path to claude executable.
  *
  * Priority:
- * 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)
+ * 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)
  */
 function resolveClaudePath() {
-    // PRIORITY 1: ekkOS-managed installation
+    // 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) {
+        return nativeBin;
+    }
+    // PRIORITY 2: ekkOS-managed npm installation (existing users before native installer)
     if (fs.existsSync(EKKOS_CLAUDE_BIN) && checkClaudeVersion(EKKOS_CLAUDE_BIN)) {
         return EKKOS_CLAUDE_BIN;
     }
-    // PRIORITY 2: Auto-install to ekkOS-managed directory (user's Claude stays untouched)
+    // PRIORITY 3: Auto-install to ekkOS-managed directory
     if (installEkkosClaudeVersion()) {
         if (fs.existsSync(EKKOS_CLAUDE_BIN)) {
             return EKKOS_CLAUDE_BIN;
         }
     }
-    // PRIORITY 3: Fall back to npx with pinned version (shows update message)
-    // This is rare - only happens if install failed
+    // PRIORITY 4: Fall back to npx (rare — only if install failed, will show deprecation warning)
     return `npx:${PINNED_CLAUDE_VERSION}`;
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ekkos/cli",
-  "version": "1.0.25",
+  "version": "1.0.27",
   "description": "Setup ekkOS memory for AI coding assistants (Claude Code, Cursor, Windsurf)",
   "main": "dist/index.js",
   "bin": {