@ekkos/cli 1.0.34 → 1.0.36

package/templates/hooks/stop.ps1

@@ -1,5 +1,6 @@
 # ═══════════════════════════════════════════════════════════════════════════
-# ekkOS_ Hook: Stop - Session cleanup and capture finalization (Windows)
+# ekkOS_ Hook: Stop - Captures turns to BOTH Working (Redis) and Episodic (Supabase)
+# NO jq dependency - uses Node.js for all JSON parsing
 # MANAGED BY ekkos-connect - DO NOT EDIT DIRECTLY
 # EKKOS_MANAGED=1
 # EKKOS_MANIFEST_SHA256=<computed-at-build>
@@ -9,15 +10,32 @@
 # - All persisted records MUST include: instanceId, sessionId, sessionName
 # - Uses EKKOS_INSTANCE_ID env var for multi-session isolation
 # ═══════════════════════════════════════════════════════════════════════════
+# This hook captures every turn to:
+# 1. Working Sessions (Redis) - Fast hot cache for /continue
+# 2. Episodic Memory (Supabase) - Permanent cold storage
+#
+# NO compliance checking - skills handle that
+# NO PatternGuard validation - skills handle that
+# NO verbose output - just capture silently
+# ═══════════════════════════════════════════════════════════════════════════
 
 $ErrorActionPreference = "SilentlyContinue"
 
 # ═══════════════════════════════════════════════════════════════════════════
 # CONFIG PATHS
 # ═══════════════════════════════════════════════════════════════════════════
+$ScriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
+$ProjectRoot = Split-Path -Parent (Split-Path -Parent $ScriptDir)
+$StateDir = Join-Path $ProjectRoot ".claude\state"
+
+if (-not (Test-Path $StateDir)) {
+    New-Item -ItemType Directory -Path $StateDir -Force | Out-Null
+}
+
 $EkkosConfigDir = if ($env:EKKOS_CONFIG_DIR) { $env:EKKOS_CONFIG_DIR } else { "$env:USERPROFILE\.ekkos" }
 $SessionWordsJson = "$EkkosConfigDir\session-words.json"
 $SessionWordsDefault = "$EkkosConfigDir\.defaults\session-words.json"
+$JsonParseHelper = "$EkkosConfigDir\.helpers\json-parse.cjs"
 
 # ═══════════════════════════════════════════════════════════════════════════
 # INSTANCE ID - Multi-session isolation per v1.2 ADDENDUM
@@ -87,65 +105,131 @@ function Convert-UuidToWords {
 # ═══════════════════════════════════════════════════════════════════════════
 $inputJson = [Console]::In.ReadToEnd()
 
-# Get session ID from state
-$stateFile = Join-Path $env:USERPROFILE ".claude\state\hook-state.json"
-$sessionFile = Join-Path $env:USERPROFILE ".claude\state\current-session.json"
+# ═══════════════════════════════════════════════════════════════════════════
+# Parse input JSON for session_id, transcript_path, model
+# ═══════════════════════════════════════════════════════════════════════════
 $rawSessionId = "unknown"
-$turn = 0
+$transcriptPath = ""
+$modelUsed = "claude-sonnet-4-5"
 
-if (Test-Path $stateFile) {
+if ($inputJson) {
     try {
-        $hookState = Get-Content $stateFile -Raw | ConvertFrom-Json
-        $rawSessionId = $hookState.session_id
-        $turn = [int]$hookState.turn
+        $stopInput = $inputJson | ConvertFrom-Json
+        if ($stopInput.session_id) { $rawSessionId = $stopInput.session_id }
+        if ($stopInput.transcript_path) { $transcriptPath = $stopInput.transcript_path }
+        if ($stopInput.model) { $modelUsed = $stopInput.model }
     } catch {}
 }
 
-if ($rawSessionId -eq "unknown" -and (Test-Path $sessionFile)) {
+# ═══════════════════════════════════════════════════════════════════════════
+# Session ID validation
+# ═══════════════════════════════════════════════════════════════════════════
+if (-not $rawSessionId -or $rawSessionId -eq "unknown" -or $rawSessionId -eq "null") {
+    exit 0
+}
+
+$isUuid = $rawSessionId -match '^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$'
+
+if ($isUuid) {
+    $sessionName = Convert-UuidToWords $rawSessionId
+} else {
+    $sessionName = $rawSessionId
+}
+
+# ═══════════════════════════════════════════════════════════════════════════
+# Turn Number - read from turn file written by user-prompt-submit.ps1
+# ═══════════════════════════════════════════════════════════════════════════
+$sessionsDir = Join-Path $StateDir "sessions"
+if (-not (Test-Path $sessionsDir)) {
+    New-Item -ItemType Directory -Path $sessionsDir -Force | Out-Null
+}
+
+$turnFile = Join-Path $sessionsDir "$rawSessionId.turn"
+$turn = 1
+if (Test-Path $turnFile) {
+    try {
+        $turnContent = Get-Content $turnFile -Raw
+        $turn = [int]$turnContent.Trim()
+    } catch {
+        $turn = 1
+    }
+}
+
+# ═══════════════════════════════════════════════════════════════════════════
+# Load auth - No jq
+# ═══════════════════════════════════════════════════════════════════════════
+$configFile = Join-Path $EkkosConfigDir "config.json"
+$authToken = ""
+$userId = ""
+
+if ((Test-Path $configFile) -and (Test-Path $JsonParseHelper)) {
+    try {
+        $authToken = & node $JsonParseHelper $configFile '.hookApiKey' 2>$null
+        if (-not $authToken) {
+            $authToken = & node $JsonParseHelper $configFile '.apiKey' 2>$null
+        }
+        $userId = & node $JsonParseHelper $configFile '.userId' 2>$null
+    } catch {}
+} elseif (Test-Path $configFile) {
     try {
-        $sessionData = Get-Content $sessionFile -Raw | ConvertFrom-Json
-        $rawSessionId = $sessionData.session_id
+        $config = Get-Content $configFile -Raw | ConvertFrom-Json
+        $authToken = if ($config.hookApiKey) { $config.hookApiKey } else { $config.apiKey }
+        $userId = $config.userId
     } catch {}
 }
 
-$sessionName = Convert-UuidToWords $rawSessionId
+if (-not $authToken) {
+    $envLocal = Join-Path $ProjectRoot ".env.local"
+    if (Test-Path $envLocal) {
+        try {
+            $envContent = Get-Content $envLocal -Raw
+            if ($envContent -match 'SUPABASE_SECRET_KEY=["'']?([^"''\r\n]+)') {
+                $authToken = $Matches[1]
+            }
+        } catch {}
+    }
+}
+
+if (-not $authToken) { exit 0 }
+
+$memoryApiUrl = "https://api.ekkos.dev"
 
 # ═══════════════════════════════════════════════════════════════════════════
 # SESSION BINDING: Bridge _pending → real session name for proxy eviction
 # Windows has no PTY so run.ts can't detect the session name. The stop hook
 # is the first place we have a confirmed session name, so we bind here.
-# Mac does this in stop.sh (lines 171-179). Logic is identical.
 # ═══════════════════════════════════════════════════════════════════════════
-$configFile = Join-Path $EkkosConfigDir "config.json"
-if ((Test-Path $configFile) -and $sessionName -ne "unknown-session") {
+if ($sessionName -and $sessionName -ne "unknown-session" -and $userId) {
     try {
-        $config = Get-Content $configFile -Raw | ConvertFrom-Json
-        $userId = $config.userId
-        $authToken = if ($config.hookApiKey) { $config.hookApiKey } else { $config.apiKey }
+        $projectPath = ((Get-Location).Path) -replace '\\', '/'
+        $pendingSession = if ($env:EKKOS_PENDING_SESSION) { $env:EKKOS_PENDING_SESSION } else { "_pending" }
 
-        if ($userId -and $authToken) {
-            $projectPath = (Get-Location).Path
-            $pendingSession = if ($env:EKKOS_PENDING_SESSION) { $env:EKKOS_PENDING_SESSION } else { "_pending" }
-
-            $projectPath = $projectPath -replace '\\', '/'
-            $bindBody = @{
-                userId        = $userId
-                realSession   = $sessionName
-                projectPath   = $projectPath
-                pendingSession = $pendingSession
-            } | ConvertTo-Json -Depth 10
-
-            Start-Job -ScriptBlock {
-                param($body, $token)
-                Invoke-RestMethod -Uri "https://mcp.ekkos.dev/proxy/session/bind" `
+        $bindBody = @{
+            userId         = $userId
+            realSession    = $sessionName
+            projectPath    = $projectPath
+            pendingSession = $pendingSession
+        } | ConvertTo-Json -Depth 10 -Compress
+
+        Start-Job -ScriptBlock {
+            param($body, $apiUrl)
+            try {
+                Invoke-RestMethod -Uri "$apiUrl/proxy/session/bind" `
                     -Method POST `
                     -Headers @{ "Content-Type" = "application/json" } `
-                    -Body ([System.Text.Encoding]::UTF8.GetBytes($body)) -ErrorAction SilentlyContinue | Out-Null
-            } -ArgumentList $bindBody, $authToken | Out-Null
-        }
+                    -Body ([System.Text.Encoding]::UTF8.GetBytes($body)) `
+                    -TimeoutSec 2 `
+                    -ErrorAction SilentlyContinue | Out-Null
+            } catch {}
+        } -ArgumentList $bindBody, $memoryApiUrl | Out-Null
     } catch {}
 }
 
+# ═══════════════════════════════════════════════════════════════════════════
+# EVICTION: Handled by IPC (In-Place Progressive Compression) in the proxy.
+# No hook-side eviction needed - passthrough is default for cache stability.
+# ═══════════════════════════════════════════════════════════════════════════
+
 # ═══════════════════════════════════════════════════════════════════════════
 # LOCAL CACHE: ACK turn to mark as synced
 # Per v1.2 ADDENDUM: Pass instanceId for namespacing
@@ -169,15 +253,13 @@ $isInterrupted = $false
 $stopReason = ""
 if ($inputJson) {
     try {
-        $stopInput = $inputJson | ConvertFrom-Json
-        $isInterrupted = $stopInput.interrupted -eq $true
-        $stopReason = $stopInput.stop_reason
+        $stopParsed = $inputJson | ConvertFrom-Json
+        $isInterrupted = $stopParsed.interrupted -eq $true
+        $stopReason = $stopParsed.stop_reason
     } catch {}
 }
 
 if ($isInterrupted -or $stopReason -eq "user_cancelled" -or $stopReason -eq "interrupted") {
-    if (Test-Path $stateFile) { Remove-Item $stateFile -Force }
-    Write-Output "ekkOS session ended (interrupted)"
     exit 0
 }
 
@@ -185,14 +267,6 @@ if ($isInterrupted -or $stopReason -eq "user_cancelled" -or $stopReason -eq "int
 # EXTRACT CONVERSATION FROM TRANSCRIPT
 # Mirrors stop.sh: Extract last user query, assistant response, file changes
 # ═══════════════════════════════════════════════════════════════════════════
-$transcriptPath = ""
-if ($inputJson) {
-    try {
-        $stopInput2 = $inputJson | ConvertFrom-Json
-        $transcriptPath = $stopInput2.transcript_path
-    } catch {}
-}
-
 $lastUser = ""
 $lastAssistant = ""
 $fileChangesJson = "[]"
@@ -228,6 +302,7 @@ for (let i = entries.length - 1; i >= 0; i--) {
             const parts = content.map(c => {
                 if (c.type === 'text') return c.text;
                 if (c.type === 'tool_use') return '[TOOL: ' + c.name + ']';
+                if (c.type === 'thinking') return '[THINKING]' + (c.thinking || c.text || '') + '[/THINKING]';
                 return '';
             }).filter(Boolean);
             lastAssistant = parts.join('\n'); break;
@@ -257,7 +332,49 @@ console.log(JSON.stringify({
             $lastUser = $parsed.user
             $lastAssistant = $parsed.assistant
             $fileChangesJson = ($parsed.fileChanges | ConvertTo-Json -Depth 10 -Compress)
-            if (-not $fileChangesJson) { $fileChangesJson = "[]" }
+            if (-not $fileChangesJson -or $fileChangesJson -eq "null") { $fileChangesJson = "[]" }
+        }
+    } catch {}
+}
+
+if (-not $lastUser -or $lastUser -match '\[Request interrupted') {
+    exit 0
+}
+
+# ═══════════════════════════════════════════════════════════════════════════
+# Extract tools_used and files_referenced from file changes
+# ═══════════════════════════════════════════════════════════════════════════
+$toolsUsed = @()
+$filesReferenced = @()
+
+if ($parsed -and $parsed.fileChanges) {
+    try {
+        $toolsUsed = @($parsed.fileChanges | ForEach-Object { $_.tool } | Where-Object { $_ } | Select-Object -Unique)
+        $filesReferenced = @($parsed.fileChanges | ForEach-Object { $_.path } | Where-Object { $_ } | Select-Object -Unique)
+    } catch {
+        $toolsUsed = @()
+        $filesReferenced = @()
+    }
+}
+
+# ═══════════════════════════════════════════════════════════════════════════
+# Token breakdown from tokenizer script
+# ═══════════════════════════════════════════════════════════════════════════
+$totalTokens = 0
+$inputTokens = 0
+$cacheReadTokens = 0
+$cacheCreationTokens = 0
+
+$tokenizerScript = Join-Path $ScriptDir "lib\count-tokens.cjs"
+if ($transcriptPath -and (Test-Path $transcriptPath) -and (Test-Path $tokenizerScript)) {
+    try {
+        $tokenJson = & node $tokenizerScript $transcriptPath --json 2>$null
+        if ($tokenJson) {
+            $tokenData = $tokenJson | ConvertFrom-Json
+            if ($tokenData.total_tokens) { $totalTokens = [int]$tokenData.total_tokens }
+            if ($tokenData.input_tokens) { $inputTokens = [int]$tokenData.input_tokens }
+            if ($tokenData.cache_read_tokens) { $cacheReadTokens = [int]$tokenData.cache_read_tokens }
+            if ($tokenData.cache_creation_tokens) { $cacheCreationTokens = [int]$tokenData.cache_creation_tokens }
         }
     } catch {}
 }
@@ -267,69 +384,98 @@ console.log(JSON.stringify({
 # Mirrors stop.sh dual-write at lines 271-356
 # ═══════════════════════════════════════════════════════════════════════════
 if ($lastUser -and $lastAssistant -and $authToken) {
-    $modelUsed = "claude-sonnet-4-5"
-    if ($inputJson) {
-        try {
-            $stopInput3 = $inputJson | ConvertFrom-Json
-            if ($stopInput3.model) { $modelUsed = $stopInput3.model }
-        } catch {}
-    }
-
     $timestamp = (Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
     $projectPath = ((Get-Location).Path) -replace '\\', '/'
 
+    # Prepare tools_used and files_referenced as JSON strings for passing into jobs
+    $toolsUsedJson = ($toolsUsed | ConvertTo-Json -Depth 5 -Compress)
+    if (-not $toolsUsedJson -or $toolsUsedJson -eq "null") { $toolsUsedJson = "[]" }
+    # Single-element arrays lose their array wrapper in PowerShell ConvertTo-Json
+    if ($toolsUsed.Count -eq 1) { $toolsUsedJson = "[$toolsUsedJson]" }
+
+    $filesRefJson = ($filesReferenced | ConvertTo-Json -Depth 5 -Compress)
+    if (-not $filesRefJson -or $filesRefJson -eq "null") { $filesRefJson = "[]" }
+    if ($filesReferenced.Count -eq 1) { $filesRefJson = "[$filesRefJson]" }
+
     # 1. WORKING SESSIONS (Redis)
     Start-Job -ScriptBlock {
-        param($token, $sessionName, $turnNum, $userQuery, $agentResponse, $model)
-        $body = @{
-            session_name = $sessionName
-            turn_number = $turnNum
-            user_query = $userQuery
-            agent_response = $agentResponse.Substring(0, [Math]::Min(50000, $agentResponse.Length))
-            model = $model
-            tools_used = @()
-            files_referenced = @()
-        } | ConvertTo-Json -Depth 10
-
-        Invoke-RestMethod -Uri "https://mcp.ekkos.dev/api/v1/working/turn" `
-            -Method POST `
-            -Headers @{ Authorization = "Bearer $token"; "Content-Type" = "application/json" } `
-            -Body ([System.Text.Encoding]::UTF8.GetBytes($body)) `
-            -ErrorAction SilentlyContinue | Out-Null
-    } -ArgumentList $authToken, $sessionName, $turn, $lastUser, $lastAssistant, $modelUsed | Out-Null
+        param($token, $apiUrl, $sessionName, $turnNum, $userQuery, $agentResponse, $model, $toolsJson, $filesJson, $totalTok, $inputTok, $cacheReadTok, $cacheCreateTok)
+        try {
+            $truncated = $agentResponse
+            if ($agentResponse.Length -gt 50000) {
+                $truncated = $agentResponse.Substring(0, 50000)
+            }
+            $body = @{
+                session_name        = $sessionName
+                turn_number         = [int]$turnNum
+                user_query          = $userQuery
+                agent_response      = $truncated
+                model               = $model
+                tools_used          = @(($toolsJson | ConvertFrom-Json))
+                files_referenced    = @(($filesJson | ConvertFrom-Json))
+                total_context_tokens = [int]$totalTok
+                token_breakdown     = @{
+                    input_tokens          = [int]$inputTok
+                    cache_read_tokens     = [int]$cacheReadTok
+                    cache_creation_tokens = [int]$cacheCreateTok
+                }
+            } | ConvertTo-Json -Depth 10 -Compress
+
+            Invoke-RestMethod -Uri "$apiUrl/api/v1/working/turn" `
+                -Method POST `
+                -Headers @{ Authorization = "Bearer $token"; "Content-Type" = "application/json" } `
+                -Body ([System.Text.Encoding]::UTF8.GetBytes($body)) `
+                -TimeoutSec 5 `
+                -ErrorAction SilentlyContinue | Out-Null
+        } catch {}
+    } -ArgumentList $authToken, $memoryApiUrl, $sessionName, $turn, $lastUser, $lastAssistant, $modelUsed, $toolsUsedJson, $filesRefJson, $totalTokens, $inputTokens, $cacheReadTokens, $cacheCreationTokens | Out-Null
 
     # 2. EPISODIC MEMORY (Supabase)
     Start-Job -ScriptBlock {
-        param($token, $userQuery, $agentResponse, $sessionId, $userId, $fileChanges, $model, $ts, $turnNum, $sessionName)
-        $body = @{
-            user_query = $userQuery
-            assistant_response = $agentResponse
-            session_id = $sessionId
-            user_id = if ($userId) { $userId } else { "system" }
-            file_changes = @()
-            metadata = @{
-                source = "claude-code"
-                model_used = $model
-                captured_at = $ts
-                turn_number = $turnNum
-                session_name = $sessionName
-                minimal_hook = $true
-            }
-        } | ConvertTo-Json -Depth 10
-
-        Invoke-RestMethod -Uri "https://mcp.ekkos.dev/api/v1/memory/capture" `
-            -Method POST `
-            -Headers @{ Authorization = "Bearer $token"; "Content-Type" = "application/json" } `
-            -Body ([System.Text.Encoding]::UTF8.GetBytes($body)) `
-            -ErrorAction SilentlyContinue | Out-Null
-    } -ArgumentList $authToken, $lastUser, $lastAssistant, $rawSessionId, $userId, $fileChangesJson, $modelUsed, $timestamp, $turn, $sessionName | Out-Null
+        param($token, $apiUrl, $userQuery, $agentResponse, $sessionId, $uid, $fileChanges, $model, $ts, $turnNum, $sessionName)
+        try {
+            $fcArray = @()
+            try { $fcArray = @(($fileChanges | ConvertFrom-Json)) } catch { $fcArray = @() }
+
+            $body = @{
+                user_query          = $userQuery
+                assistant_response  = $agentResponse
+                session_id          = $sessionId
+                user_id             = if ($uid) { $uid } else { "system" }
+                file_changes        = $fcArray
+                metadata            = @{
+                    source       = "claude-code"
+                    model_used   = $model
+                    captured_at  = $ts
+                    turn_number  = [int]$turnNum
+                    session_name = $sessionName
+                    minimal_hook = $true
+                }
+            } | ConvertTo-Json -Depth 10 -Compress
+
+            Invoke-RestMethod -Uri "$apiUrl/api/v1/memory/capture" `
+                -Method POST `
+                -Headers @{ Authorization = "Bearer $token"; "Content-Type" = "application/json" } `
+                -Body ([System.Text.Encoding]::UTF8.GetBytes($body)) `
+                -TimeoutSec 5 `
+                -ErrorAction SilentlyContinue | Out-Null
+        } catch {}
+    } -ArgumentList $authToken, $memoryApiUrl, $lastUser, $lastAssistant, $rawSessionId, $userId, $fileChangesJson, $modelUsed, $timestamp, $turn, $sessionName | Out-Null
 }
 
 # ═══════════════════════════════════════════════════════════════════════════
-# CLEAN UP STATE FILES
+# Update local .ekkos/current-focus.md (if exists) - SILENT
 # ═══════════════════════════════════════════════════════════════════════════
-if (Test-Path $stateFile) {
-    Remove-Item $stateFile -Force
+$ekkosDir = Join-Path $ProjectRoot ".ekkos"
+if ((Test-Path $ekkosDir) -and $lastUser) {
+    try {
+        $focusFile = Join-Path $ekkosDir "current-focus.md"
+        $taskSummary = $lastUser.Substring(0, [Math]::Min(100, $lastUser.Length))
+        if ($lastUser.Length -gt 100) { $taskSummary += "..." }
+        $focusTimestamp = (Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
+        $focusContent = "---`nlast_updated: $focusTimestamp`nsession_id: $rawSessionId`n---`n`n# Current Focus`n$taskSummary"
+        Set-Content -Path $focusFile -Value $focusContent -Force
+    } catch {}
 }
 
-Write-Output "ekkOS session ended"
+exit 0

package/templates/hooks/stop.sh

@@ -161,7 +161,7 @@ fi
 
 [ -z "$AUTH_TOKEN" ] && exit 0
 
-MEMORY_API_URL="https://mcp.ekkos.dev"
+MEMORY_API_URL="https://api.ekkos.dev"
 
 # ═══════════════════════════════════════════════════════════════════════════
 # SESSION BINDING: Bridge _pending → real session name for proxy eviction