@ekkos/cli 1.2.16 → 1.2.18

package/dist/commands/run.js

@@ -469,13 +469,12 @@ function getEkkosEnv() {
         env.EKKOS_PROXY_MODE = '1';
         // Enable ultra-minimal mode by default (30%→20% eviction for constant-cost infinite context)
         env.EKKOS_ULTRA_MINIMAL = '1';
-        // Use a unique pending scope until Claude exposes its real session UUID.
-        // run.ts binds this scope to the real session immediately on transcript detect.
+        // Generate a deterministic word-triple session name from a fresh UUID.
+        // This eliminates _pending-* placeholders — proxy sees a real name from request #1.
         if (!cliSessionName) {
-            const pendingToken = crypto.randomBytes(8).toString('hex');
-            cliSessionName = `_pending-${pendingToken}`;
-            cliSessionId = `pending-${pendingToken}`;
-            console.log(chalk_1.default.gray(`  📂 Session: pending (will bind to Claude session)`));
+            cliSessionId = crypto.randomUUID();
+            cliSessionName = (0, state_1.uuidToWords)(cliSessionId);
+            console.log(chalk_1.default.gray(`  📂 Session: ${cliSessionName}`));
         }
         // Get full userId from config (NOT the truncated version from auth token)
         // Config has full UUID like "d4532ba0-0a86-42ce-bab4-22aa62b55ce6"
@@ -499,7 +498,7 @@ function getEkkosEnv() {
         // Project path is base64-encoded to handle special chars safely
         const projectPath = process.cwd();
         const projectPathEncoded = Buffer.from(projectPath).toString('base64url');
-        const proxyUrl = `${EKKOS_PROXY_URL}/proxy/${encodeURIComponent(userId)}/${encodeURIComponent(cliSessionName)}?project=${projectPathEncoded}`;
+        const proxyUrl = `${EKKOS_PROXY_URL}/proxy/${encodeURIComponent(userId)}/${encodeURIComponent(cliSessionName)}?project=${projectPathEncoded}&sid=${encodeURIComponent(cliSessionId)}`;
         env.ANTHROPIC_BASE_URL = proxyUrl;
         // Proxy URL contains userId + project path — don't leak to terminal
     }
@@ -1352,7 +1351,7 @@ async function run(options) {
     }
     // Track state — only use explicit -s option; never inherit stale session from state.json
     // The real session name will be detected from Claude Code's output (line ~2552)
-    let currentSession = options.session || null;
+    let currentSession = options.session || cliSessionName || null;
     // Write initial instance file
     const startedAt = new Date().toISOString();
     writeInstanceFile(instanceId, {
@@ -1419,18 +1418,50 @@ 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 projectDir = path.join(os.homedir(), '.claude', 'projects', encodedCwd);
+    const projectPath = process.cwd();
+    const projectsRoot = path.join(os.homedir(), '.claude', 'projects');
+    const projectDirCandidates = (() => {
+        // Claude's project-dir encoding is platform/version dependent.
+        // Probe a small set of known-safe variants to avoid missing the session file.
+        const encodings = new Set([
+            projectPath.replace(/\//g, '-'),
+            projectPath.replace(/[\\/]/g, '-'),
+            projectPath.replace(/[:\\/]/g, '-'),
+            `-${projectPath.replace(/[:\\/]/g, '-').replace(/^-+/, '')}`,
+            projectPath.replace(/[^a-zA-Z0-9]/g, '-'),
+            `-${projectPath.replace(/^[\\/]+/, '').replace(/[^a-zA-Z0-9]/g, '-')}`,
+        ]);
+        return [...encodings]
+            .filter(Boolean)
+            .map(encoded => path.join(projectsRoot, encoded));
+    })();
     const launchTime = Date.now();
+    function listCandidateJsonlFiles() {
+        const jsonlFiles = [];
+        for (const candidateDir of projectDirCandidates) {
+            if (!fs.existsSync(candidateDir))
+                continue;
+            try {
+                for (const file of fs.readdirSync(candidateDir)) {
+                    if (file.endsWith('.jsonl')) {
+                        jsonlFiles.push(path.join(candidateDir, file));
+                    }
+                }
+            }
+            catch {
+                // Ignore candidate-dir read errors and keep scanning others.
+            }
+        }
+        return jsonlFiles;
+    }
     // Track existing jsonl files at startup
     let existingJsonlFiles = new Set();
     try {
-        const files = fs.readdirSync(projectDir);
-        existingJsonlFiles = new Set(files.filter(f => f.endsWith('.jsonl')));
+        existingJsonlFiles = new Set(listCandidateJsonlFiles());
         dlog(`[TRANSCRIPT] Found ${existingJsonlFiles.size} existing jsonl files at startup`);
     }
     catch {
-        dlog('[TRANSCRIPT] Project dir does not exist yet');
+        dlog('[TRANSCRIPT] No candidate project dir exists yet');
     }
     // Poll for new transcript file every 500ms for up to 30 seconds.
     // Safety rule: do NOT guess using "most recent" files; that can cross-bind sessions.
@@ -1450,13 +1481,11 @@ async function run(options) {
             // In proxy mode this is intentionally disabled to avoid cross-session mixing.
             if (!proxyModeEnabled && !transcriptPath) {
                 try {
-                    const files = fs.readdirSync(projectDir);
-                    const jsonlFiles = files
-                        .filter(f => f.endsWith('.jsonl'))
-                        .map(f => ({
-                        name: f,
-                        path: path.join(projectDir, f),
-                        mtime: fs.statSync(path.join(projectDir, f)).mtimeMs
+                    const jsonlFiles = listCandidateJsonlFiles()
+                        .map(fullPath => ({
+                        name: path.basename(fullPath),
+                        path: fullPath,
+                        mtime: fs.statSync(fullPath).mtimeMs
                     }))
                         .sort((a, b) => b.mtime - a.mtime);
                     if (jsonlFiles.length > 0) {
@@ -1486,14 +1515,13 @@ async function run(options) {
             return;
         }
         try {
-            const currentFiles = fs.readdirSync(projectDir);
-            const jsonlFiles = currentFiles.filter(f => f.endsWith('.jsonl'));
+            const jsonlFiles = listCandidateJsonlFiles();
             // Find NEW files (created after we started)
             for (const file of jsonlFiles) {
                 if (!existingJsonlFiles.has(file)) {
                     // New file! This is our transcript
-                    const fullPath = path.join(projectDir, file);
-                    const sessionId = file.replace('.jsonl', '');
+                    const fullPath = file;
+                    const sessionId = path.basename(file).replace('.jsonl', '');
                     transcriptPath = fullPath;
                     currentSessionId = sessionId;
                     currentSession = (0, state_1.uuidToWords)(sessionId);
@@ -1608,8 +1636,10 @@ async function run(options) {
     function resolveTranscriptFromSessionId(source) {
         if (!currentSessionId || transcriptPath)
             return;
-        const candidate = path.join(projectDir, `${currentSessionId}.jsonl`);
-        if (!fs.existsSync(candidate))
+        const candidate = projectDirCandidates
+            .map(projectDir => path.join(projectDir, `${currentSessionId}.jsonl`))
+            .find(fullPath => fs.existsSync(fullPath));
+        if (!candidate)
             return;
         transcriptPath = candidate;
         evictionDebugLog('TRANSCRIPT_SET', `Set from session ID (${source})`, {
@@ -1626,7 +1656,7 @@ async function run(options) {
             return;
         if (boundProxySession === sessionName || bindingSessionInFlight === sessionName)
             return;
-        const pendingSession = cliSessionName?.startsWith('_pending') ? cliSessionName : undefined;
+        const pendingSession = undefined; // CLI session names are real word-triples from the start
         const bindSessionId = sessionIdHint || currentSessionId || undefined;
         bindingSessionInFlight = sessionName;
         void (async () => {

package/package.json

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