@ekkos/cli 1.0.22 → 1.0.24

package/dist/commands/dashboard.js

@@ -332,6 +332,23 @@ function findLatestJsonl(projectPath, createdAfterMs) {
     }
     return null;
 }
+function findJsonlBySessionId(projectPath, sessionId) {
+    if (!sessionId)
+        return null;
+    const candidateEncodings = new Set([
+        projectPath.replace(/[\\/]/g, '-'),
+        projectPath.replace(/[:\\/]/g, '-'),
+        '-' + projectPath.replace(/[:\\/]/g, '-'),
+        projectPath.replace(/\//g, '-'),
+    ]);
+    const projectsRoot = path.join(os.homedir(), '.claude', 'projects');
+    for (const encoded of candidateEncodings) {
+        const exactPath = path.join(projectsRoot, encoded, `${sessionId}.jsonl`);
+        if (fs.existsSync(exactPath))
+            return exactPath;
+    }
+    return null;
+}
 function getLatestSession() {
     const sessions = (0, state_js_1.getActiveSessions)();
     if (sessions.length === 0)
@@ -373,7 +390,8 @@ async function waitForNewSession() {
                 const hint = JSON.parse(fs.readFileSync(hintPath, 'utf-8'));
                 if (hint.ts >= launchTs - 5000 && hint.sessionName && hint.projectPath) {
                     candidateName = hint.sessionName;
-                    const jsonlPath = findLatestJsonl(hint.projectPath, launchTs)
+                    const jsonlPath = findJsonlBySessionId(hint.projectPath, hint.sessionId || '')
+                        || findLatestJsonl(hint.projectPath, launchTs)
                         || resolveJsonlPath(hint.sessionName, launchTs);
                     if (jsonlPath) {
                         console.log(chalk_1.default.green(`  Found session (hook hint): ${hint.sessionName}`));
@@ -568,7 +586,7 @@ async function launchDashboard(initialSessionName, jsonlPath, refreshMs) {
     function calcLayout() {
         const H = screen.height;
         const remaining = Math.max(6, H - FIXED_H);
-        const chartH = Math.max(8, Math.floor(remaining * 0.30));
+        const chartH = Math.max(8, Math.floor(remaining * 0.40));
         const tableH = Math.max(4, remaining - chartH);
         return {
             header: { top: 0, height: HEADER_H },
@@ -580,6 +598,10 @@ async function launchDashboard(initialSessionName, jsonlPath, refreshMs) {
         };
     }
     let layout = calcLayout();
+    let lastFileSize = 0;
+    let lastData = null;
+    let lastChartSeries = null;
+    let lastScrollPerc = 0; // Preserve scroll position across updates
     // Header: session stats (3 lines)
     const headerBox = blessed.box({
         top: layout.header.top, left: 0, width: W, height: layout.header.height,
@@ -609,23 +631,28 @@ async function launchDashboard(initialSessionName, jsonlPath, refreshMs) {
         tags: false,
         style: { fg: 'red', bold: true }, // ansi redBright = official Clawd orange
     });
-    // Token chart (fills 30% of remaining)
-    const tokenChart = contrib.line({
-        top: layout.chart.top, left: 0, width: W, height: layout.chart.height,
-        label: ' Tokens/Turn (K) ',
-        showLegend: true,
-        legend: { width: 8 },
-        style: {
-            line: 'green',
-            text: 'white',
-            baseline: 'white',
-            border: { fg: 'cyan' },
-        },
-        border: { type: 'line', fg: 'cyan' },
-        xLabelPadding: 0,
-        xPadding: 1,
-        wholeNumbersOnly: false,
-    });
+    // Token chart (fills 40% of remaining)
+    function createTokenChart(top, left, width, height) {
+        return contrib.line({
+            top, left, width, height,
+            label: ' Tokens/Turn (K) ',
+            showLegend: true,
+            legend: { width: 8 },
+            style: {
+                line: 'green',
+                text: 'white',
+                baseline: 'white',
+                border: { fg: 'cyan' },
+            },
+            border: { type: 'line', fg: 'cyan' },
+            xLabelPadding: 0,
+            xPadding: 1,
+            wholeNumbersOnly: false,
+        });
+    }
+    let tokenChart = createTokenChart(layout.chart.top, 0, W, layout.chart.height);
+    let chartLayoutW = 0;
+    let chartLayoutH = 0;
     // Turn table — manual rendering for full-width columns + dim dividers
     const turnBox = blessed.box({
         top: layout.table.top, left: 0, width: W, height: layout.table.height,
@@ -682,10 +709,29 @@ async function launchDashboard(initialSessionName, jsonlPath, refreshMs) {
         contextBox.left = H_PAD;
         contextBox.width = contentWidth;
         contextBox.height = layout.context.height;
-        tokenChart.top = layout.chart.top;
-        tokenChart.left = H_PAD;
-        tokenChart.width = contentWidth;
-        tokenChart.height = layout.chart.height;
+        // blessed-contrib line can keep a stale tiny canvas when terminals report
+        // initial dimensions incorrectly (observed in Windows Terminal). Rebuild
+        // the chart widget whenever dimensions change so the plot fills the panel.
+        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;
@@ -706,6 +752,8 @@ async function launchDashboard(initialSessionName, jsonlPath, refreshMs) {
             catch { }
         }
     }
+    // Apply once at startup so chart/table geometry is correct even before any resize event.
+    applyLayout();
     // Track geometry so we can re-anchor widgets even if tmux resize events are flaky
     let lastLayoutW = screen.width || 0;
     let lastLayoutH = screen.height || 0;
@@ -772,10 +820,6 @@ async function launchDashboard(initialSessionName, jsonlPath, refreshMs) {
     }
     scheduleWave();
     // ── Update function ──
-    let lastFileSize = 0;
-    let lastData = null;
-    let lastChartSeries = null;
-    let lastScrollPerc = 0; // Preserve scroll position across updates
     const debugLog = path.join(os.homedir(), '.ekkos', 'dashboard.log');
     function dlog(msg) {
         try {

package/dist/commands/run.js

@@ -252,11 +252,17 @@ 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: · Turn N · groovy-koala-saves · 📅
+// Claude prints session name in footer:
+//   · 🧠 ekkOS_™ · Turn N · groovy-koala-saves · 📅
+//   · 🧠 ekkOS_™ · groovy-koala-saves · 📅
 // ═══════════════════════════════════════════════════════════════════════════
-// 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;
+// 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;
 // 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
@@ -2429,12 +2435,15 @@ async function run(options) {
         }
         // ════════════════════════════════════════════════════════════════════════
         // SESSION NAME DETECTION (PRIMARY METHOD)
-        // Claude footer: "· Turn N · groovy-koala-saves · 📅 2026-01-17"
+        // Claude footer examples:
+        // "· 🧠 ekkOS_™ · Turn N · groovy-koala-saves · 📅 2026-01-17"
+        // "· 🧠 ekkOS_™ · groovy-koala-saves · 📅 2026-01-17"
         // This is MORE reliable than UUID extraction
         // ════════════════════════════════════════════════════════════════════════
         const plain = stripAnsi(data);
-        // Strong signal: session name between dot separators in status/footer line
-        const statusMatch = plain.match(SESSION_NAME_IN_STATUS_REGEX);
+        // 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);
         if (statusMatch) {
             const detectedSession = statusMatch[1].toLowerCase();
             // Validate against word lists (SOURCE OF TRUTH)

package/package.json

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

package/templates/hooks/assistant-response.ps1

@@ -116,12 +116,12 @@ function Convert-UuidToWords {
     if (-not $uuid -or $uuid -eq "unknown") { return "unknown-session" }
 
     $clean = $uuid -replace "-", ""
-    if ($clean.Length -lt 6) { return "unknown-session" }
+    if ($clean.Length -lt 12) { return "unknown-session" }
 
     try {
-        $a = [Convert]::ToInt32($clean.Substring(0,2), 16) % $adjectives.Length
-        $n = [Convert]::ToInt32($clean.Substring(2,2), 16) % $nouns.Length
-        $an = [Convert]::ToInt32($clean.Substring(4,2), 16) % $verbs.Length
+        $a = [Convert]::ToInt32($clean.Substring(0,4), 16) % $adjectives.Length
+        $n = [Convert]::ToInt32($clean.Substring(4,4), 16) % $nouns.Length
+        $an = [Convert]::ToInt32($clean.Substring(8,4), 16) % $verbs.Length
 
         return "$($adjectives[$a])-$($nouns[$n])-$($verbs[$an])"
     } catch {

package/templates/hooks/assistant-response.sh

@@ -45,12 +45,6 @@ if (result !== undefined && result !== null) console.log(result);
 SESSION_ID=$(parse_hook_env "$HOOK_ENV" '.sessionId')
 [ -z "$SESSION_ID" ] && SESSION_ID="unknown"
 
-TURN=$(parse_hook_env "$HOOK_ENV" '.turn')
-[ -z "$TURN" ] && TURN="0"
-
-CONTEXT_PERCENT=$(parse_hook_env "$HOOK_ENV" '.contextUsagePercent')
-[ -z "$CONTEXT_PERCENT" ] && CONTEXT_PERCENT="0"
-
 MODEL=$(parse_hook_env "$HOOK_ENV" '.model')
 [ -z "$MODEL" ] && MODEL="Claude Code (Opus 4.5)"
 
@@ -59,6 +53,7 @@ MODEL=$(parse_hook_env "$HOOK_ENV" '.model')
 # ═══════════════════════════════════════════════════════════════════════════
 declare -a ADJECTIVES
 declare -a NOUNS
+declare -a VERBS
 SESSION_WORDS_LOADED=false
 
 load_session_words() {
@@ -79,6 +74,7 @@ load_session_words() {
         if [ "${BASH_VERSINFO[0]}" -ge 4 ]; then
             readarray -t ADJECTIVES < <(node "$JSON_PARSE_HELPER" "$words_file" '.adjectives' 2>/dev/null)
             readarray -t NOUNS < <(node "$JSON_PARSE_HELPER" "$words_file" '.nouns' 2>/dev/null)
+            readarray -t VERBS < <(node "$JSON_PARSE_HELPER" "$words_file" '.verbs' 2>/dev/null)
         else
             local i=0
             while IFS= read -r line; do
@@ -90,9 +86,14 @@ load_session_words() {
                 NOUNS[i]="$line"
                 ((i++))
             done < <(node "$JSON_PARSE_HELPER" "$words_file" '.nouns' 2>/dev/null)
+            i=0
+            while IFS= read -r line; do
+                VERBS[i]="$line"
+                ((i++))
+            done < <(node "$JSON_PARSE_HELPER" "$words_file" '.verbs' 2>/dev/null)
         fi
 
-        if [ ${#ADJECTIVES[@]} -gt 0 ] && [ ${#NOUNS[@]} -gt 0 ]; then
+        if [ ${#ADJECTIVES[@]} -gt 0 ] && [ ${#NOUNS[@]} -gt 0 ] && [ ${#VERBS[@]} -gt 0 ]; then
             SESSION_WORDS_LOADED=true
             return 0
         fi
@@ -108,36 +109,39 @@ convert_uuid_to_name() {
         return
     }
 
-    local hex="${uuid:0:8}"
-    hex="${hex//-/}"
+    local hex="${uuid//-/}"
+    hex="${hex:0:12}"
 
     if [[ ! "$hex" =~ ^[0-9a-fA-F]+$ ]]; then
         echo "unknown-session"
         return
     fi
 
-    local num=$((16#$hex))
-    local adj_idx=$((num % ${#ADJECTIVES[@]}))
-    local noun_idx=$(((num / ${#ADJECTIVES[@]}) % ${#NOUNS[@]}))
+    local adj_seed=$((16#${hex:0:4}))
+    local noun_seed=$((16#${hex:4:4}))
+    local verb_seed=$((16#${hex:8:4}))
+    local adj_idx=$((adj_seed % ${#ADJECTIVES[@]}))
+    local noun_idx=$((noun_seed % ${#NOUNS[@]}))
+    local verb_idx=$((verb_seed % ${#VERBS[@]}))
 
-    echo "${ADJECTIVES[$adj_idx]}-${NOUNS[$noun_idx]}"
+    echo "${ADJECTIVES[$adj_idx]}-${NOUNS[$noun_idx]}-${VERBS[$verb_idx]}"
 }
 
 SESSION_NAME=$(convert_uuid_to_name "$SESSION_ID")
-TIMESTAMP=$(date "+%Y-%m-%d %I:%M %p %Z")
+TIMESTAMP=$(date "+%Y-%m-%d %I:%M:%S %p %Z")
 
 # Required footer format
 REQUIRED_FOOTER="---
-$MODEL - $SESSION_NAME - Turn $TURN - ${CONTEXT_PERCENT}% - ekkOS - $TIMESTAMP"
+$MODEL · 🧠 ekkOS_™ · $SESSION_NAME · 📅 $TIMESTAMP"
 
 # Check if response has correct footer
 RESPONSE_CONTENT=$(cat "$RESPONSE_FILE")
 LAST_LINE=$(echo "$RESPONSE_CONTENT" | tail -1)
 
 # Check if footer exists and is correct
-if [[ "$LAST_LINE" == *"ekkOS"* ]] && [[ "$LAST_LINE" == *"Turn"* ]]; then
+if [[ "$LAST_LINE" == *"ekkOS"* ]] && [[ "$LAST_LINE" == *"$SESSION_NAME"* ]]; then
     # Footer exists - validate format
-    if [[ "$LAST_LINE" == *"Turn $TURN"* ]] && [[ "$LAST_LINE" == *"${CONTEXT_PERCENT}%"* ]] && [[ "$LAST_LINE" == *"$SESSION_NAME"* ]]; then
+    if [[ "$LAST_LINE" == *"$SESSION_NAME"* ]] && [[ "$LAST_LINE" == *"📅"* ]]; then
         # Footer is correct
         exit 0
     else

package/templates/hooks/session-start.ps1

@@ -69,12 +69,12 @@ function Convert-UuidToWords {
     if (-not $uuid -or $uuid -eq "unknown") { return "unknown-session" }
 
     $clean = $uuid -replace "-", ""
-    if ($clean.Length -lt 6) { return "unknown-session" }
+    if ($clean.Length -lt 12) { return "unknown-session" }
 
     try {
-        $a = [Convert]::ToInt32($clean.Substring(0,2), 16) % $adjectives.Length
-        $n = [Convert]::ToInt32($clean.Substring(2,2), 16) % $nouns.Length
-        $an = [Convert]::ToInt32($clean.Substring(4,2), 16) % $verbs.Length
+        $a = [Convert]::ToInt32($clean.Substring(0,4), 16) % $adjectives.Length
+        $n = [Convert]::ToInt32($clean.Substring(4,4), 16) % $nouns.Length
+        $an = [Convert]::ToInt32($clean.Substring(8,4), 16) % $verbs.Length
 
         return "$($adjectives[$a])-$($nouns[$n])-$($verbs[$an])"
     } catch {

package/templates/hooks/stop.ps1

@@ -69,12 +69,12 @@ function Convert-UuidToWords {
     if (-not $uuid -or $uuid -eq "unknown") { return "unknown-session" }
 
     $clean = $uuid -replace "-", ""
-    if ($clean.Length -lt 6) { return "unknown-session" }
+    if ($clean.Length -lt 12) { return "unknown-session" }
 
     try {
-        $a = [Convert]::ToInt32($clean.Substring(0,2), 16) % $adjectives.Length
-        $n = [Convert]::ToInt32($clean.Substring(2,2), 16) % $nouns.Length
-        $an = [Convert]::ToInt32($clean.Substring(4,2), 16) % $verbs.Length
+        $a = [Convert]::ToInt32($clean.Substring(0,4), 16) % $adjectives.Length
+        $n = [Convert]::ToInt32($clean.Substring(4,4), 16) % $nouns.Length
+        $an = [Convert]::ToInt32($clean.Substring(8,4), 16) % $verbs.Length
 
         return "$($adjectives[$a])-$($nouns[$n])-$($verbs[$an])"
     } catch {

package/templates/hooks/user-prompt-submit.ps1

@@ -127,12 +127,12 @@ function Convert-UuidToWords {
     if (-not $uuid -or $uuid -eq "unknown") { return "unknown-session" }
 
     $clean = $uuid -replace "-", ""
-    if ($clean.Length -lt 6) { return "unknown-session" }
+    if ($clean.Length -lt 12) { return "unknown-session" }
 
     try {
-        $a = [Convert]::ToInt32($clean.Substring(0,2), 16) % $adjectives.Length
-        $n = [Convert]::ToInt32($clean.Substring(2,2), 16) % $nouns.Length
-        $an = [Convert]::ToInt32($clean.Substring(4,2), 16) % $verbs.Length
+        $a = [Convert]::ToInt32($clean.Substring(0,4), 16) % $adjectives.Length
+        $n = [Convert]::ToInt32($clean.Substring(4,4), 16) % $nouns.Length
+        $an = [Convert]::ToInt32($clean.Substring(8,4), 16) % $verbs.Length
         return "$($adjectives[$a])-$($nouns[$n])-$($verbs[$an])"
     } catch {
         return "unknown-session"
@@ -289,7 +289,7 @@ if ($sessionName -ne "unknown-session") {
 # OUTPUT SYSTEM REMINDER
 # ═══════════════════════════════════════════════════════════════════════════
 $esc = [char]27
-$header = "${esc}[0;36m${esc}[1m🧠 ekkOS Memory${esc}[0m ${esc}[2m| Turn $turn | $sessionName | $timestamp${esc}[0m"
+$header = "${esc}[0;36m${esc}[1m🧠 ekkOS Memory${esc}[0m ${esc}[2m| $sessionName | $timestamp${esc}[0m"
 
 $output = @"
 $header
@@ -303,6 +303,7 @@ if ($skillReminders.Count -gt 0) {
 $output += @"
 
 <footer-format>End responses with: Claude Code ({Model}) · 🧠 ekkOS_™ · $sessionName · $timestamp</footer-format>
+<footer-note>Do not include a turn counter in the footer.</footer-note>
 "@
 
 Write-Output $output

package/templates/hooks/user-prompt-submit.sh

@@ -405,7 +405,7 @@ turns.slice(0, -1).forEach(t => {
     echo "═══════════════════════════════════════════════════════════════════════"
     echo "</system-reminder>"
 
-    echo -e "${CYAN}${BOLD}🧠 ekkOS Memory${RESET} ${DIM}| Turn ${TURN_NUMBER} | ${CURRENT_TIME}${RESET}"
+    echo -e "${CYAN}${BOLD}🧠 ekkOS Memory${RESET} ${DIM}| ${CURRENT_TIME}${RESET}"
     exit 0
   fi
 fi
@@ -450,7 +450,7 @@ const d = JSON.parse(require('fs').readFileSync('/dev/stdin', 'utf8') || '{}');
   fi
 
   echo ""
-  echo -e "${CYAN}${BOLD}🧠 ekkOS Memory${RESET} ${DIM}| Turn ${TURN_NUMBER} | ${SESSION_NAME} | ${CURRENT_TIME}${RESET}"
+  echo -e "${CYAN}${BOLD}🧠 ekkOS Memory${RESET} ${DIM}| ${SESSION_NAME} | ${CURRENT_TIME}${RESET}"
 
 elif [ "$POST_CLEAR_DETECTED" = true ] && [ -n "$AUTH_TOKEN" ]; then
   # /clear detected - show visible restoration banner
@@ -495,13 +495,13 @@ const d = JSON.parse(require('fs').readFileSync('/dev/stdin', 'utf8') || '{}');
   echo -e "${DIM}Full history: \"recall\" or \"turns 1-${TURN_NUMBER}\"${RESET}"
   echo -e "${GREEN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${RESET}"
   echo ""
-  echo -e "${CYAN}${BOLD}🧠 ekkOS Memory${RESET} ${DIM}| Turn ${TURN_NUMBER} | ${SESSION_NAME} | ${CURRENT_TIME}${RESET}"
+  echo -e "${CYAN}${BOLD}🧠 ekkOS Memory${RESET} ${DIM}| ${SESSION_NAME} | ${CURRENT_TIME}${RESET}"
 
 elif [ "$TOKEN_PERCENT" -ge 50 ]; then
-  echo -e "${CYAN}${BOLD}🧠 ekkOS Memory${RESET} ${DIM}| Turn ${TURN_NUMBER} | ~${IPC_PERCENT:-0}% IPC | ${SESSION_NAME} | ${CURRENT_TIME}${RESET}"
+  echo -e "${CYAN}${BOLD}🧠 ekkOS Memory${RESET} ${DIM}| ~${IPC_PERCENT:-0}% IPC | ${SESSION_NAME} | ${CURRENT_TIME}${RESET}"
 
 else
-  echo -e "${CYAN}${BOLD}🧠 ekkOS Memory${RESET} ${DIM}| Turn ${TURN_NUMBER} | ${SESSION_NAME} | ${CURRENT_TIME}${RESET}"
+  echo -e "${CYAN}${BOLD}🧠 ekkOS Memory${RESET} ${DIM}| ${SESSION_NAME} | ${CURRENT_TIME}${RESET}"
 fi
 
 # Output skill reminder if detected