@ekkos/cli 1.0.35 → 1.1.0

package/templates/hooks/stop.ps1

@@ -1,267 +1,205 @@
 # ═══════════════════════════════════════════════════════════════════════════
-# ekkOS_ Hook: Stop - Captures turns to BOTH Working (Redis) and Episodic (Supabase)
-# NO jq dependency - uses Node.js for all JSON parsing
-# ═══════════════════════════════════════════════════════════════════════════
-# This hook captures every turn to:
-# 1. Working Sessions (Redis) - Fast hot cache for /continue
-# 2. Episodic Memory (Supabase) - Permanent cold storage
+# ekkOS_ Hook: Stop - Session cleanup and capture finalization (Windows)
+# MANAGED BY ekkos-connect - DO NOT EDIT DIRECTLY
+# EKKOS_MANAGED=1
+# EKKOS_MANIFEST_SHA256=<computed-at-build>
+# EKKOS_TEMPLATE_VERSION=1.0.0
 #
-# NO compliance checking - skills handle that
-# NO PatternGuard validation - skills handle that
-# NO verbose output - just capture silently
+# Per ekkOS Onboarding Spec v1.2 FINAL + ADDENDUM:
+# - All persisted records MUST include: instanceId, sessionId, sessionName
+# - Uses EKKOS_INSTANCE_ID env var for multi-session isolation
 # ═══════════════════════════════════════════════════════════════════════════
 
 $ErrorActionPreference = "SilentlyContinue"
 
-$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
-}
-
-# ═══════════════════════════════════════════════════════════════════════════
-# CONFIG PATHS - No jq dependency (v1.2 spec)
-# Session words live in ~/.ekkos/ so they work in ANY project
-# ═══════════════════════════════════════════════════════════════════════════
-$EkkosConfigDir = if ($env:EKKOS_CONFIG_DIR) { $env:EKKOS_CONFIG_DIR } else { Join-Path $env:USERPROFILE ".ekkos" }
-$SessionWordsJson = Join-Path $EkkosConfigDir "session-words.json"
-$SessionWordsDefault = Join-Path $EkkosConfigDir ".defaults\session-words.json"
-$JsonParseHelper = Join-Path $EkkosConfigDir ".helpers\json-parse.cjs"
-
-$INPUT = [Console]::In.ReadToEnd()
-
 # ═══════════════════════════════════════════════════════════════════════════
-# JSON parsing helper (no jq) - pipes JSON to node, extracts dot-path value
+# CONFIG PATHS
 # ═══════════════════════════════════════════════════════════════════════════
-function Parse-JsonValue {
-    param(
-        [string]$Json,
-        [string]$Path
-    )
-    if (-not $Json) { return "" }
-    try {
-        $result = $Json | node -e "
-const data = JSON.parse(require('fs').readFileSync('/dev/stdin', 'utf8') || '{}');
-const path = '$Path'.replace(/^\./,'').split('.').filter(Boolean);
-let result = data;
-for (const p of path) {
-    if (result === undefined || result === null) { result = undefined; break; }
-    result = result[p];
-}
-if (result !== undefined && result !== null) console.log(result);
-" 2>$null
-        if ($result) { return $result.Trim() } else { return "" }
-    } catch {
-        return ""
-    }
-}
-
-$RAW_SESSION_ID = Parse-JsonValue $INPUT ".session_id"
-if (-not $RAW_SESSION_ID) { $RAW_SESSION_ID = "unknown" }
-$TRANSCRIPT_PATH = Parse-JsonValue $INPUT ".transcript_path"
-$MODEL_USED = Parse-JsonValue $INPUT ".model"
-if (-not $MODEL_USED) { $MODEL_USED = "claude-sonnet-4-5" }
+$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"
 
 # ═══════════════════════════════════════════════════════════════════════════
-# Session ID
+# INSTANCE ID - Multi-session isolation per v1.2 ADDENDUM
 # ═══════════════════════════════════════════════════════════════════════════
-$SESSION_ID = $RAW_SESSION_ID
-
-if (-not $SESSION_ID -or $SESSION_ID -eq "unknown" -or $SESSION_ID -eq "null") {
-    exit 0
-}
-
-# Check if SESSION_ID is a UUID (8-4-4-4-12 format)
-$IS_UUID = $false
-if ($SESSION_ID -match '^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$') {
-    $IS_UUID = $true
-}
+$EkkosInstanceId = if ($env:EKKOS_INSTANCE_ID) { $env:EKKOS_INSTANCE_ID } else { "default" }
 
 # ═══════════════════════════════════════════════════════════════════════════
-# WORD-BASED SESSION NAMES - No jq, uses ~/.ekkos/ config (works in ANY project)
+# Load session words from JSON file - NO HARDCODED ARRAYS
 # ═══════════════════════════════════════════════════════════════════════════
-$script:ADJECTIVES = @()
-$script:NOUNS = @()
-$script:VERBS = @()
-$script:SESSION_WORDS_LOADED = $false
+$script:SessionWords = $null
 
 function Load-SessionWords {
-    if ($script:SESSION_WORDS_LOADED) { return }
-
     $wordsFile = $SessionWordsJson
+
     if (-not (Test-Path $wordsFile)) {
         $wordsFile = $SessionWordsDefault
     }
 
-    if ((-not (Test-Path $wordsFile)) -or (-not (Test-Path $JsonParseHelper))) {
-        $script:ADJECTIVES = @("unknown")
-        $script:NOUNS = @("session")
-        $script:VERBS = @("starts")
-        return
+    if (-not (Test-Path $wordsFile)) {
+        return $null
     }
 
     try {
-        $adjRaw = & node $JsonParseHelper $wordsFile ".adjectives" 2>$null
-        $nounRaw = & node $JsonParseHelper $wordsFile ".nouns" 2>$null
-        $verbRaw = & node $JsonParseHelper $wordsFile ".verbs" 2>$null
-
-        $script:ADJECTIVES = @()
-        $script:NOUNS = @()
-        $script:VERBS = @()
-
-        if ($adjRaw) { $script:ADJECTIVES = @($adjRaw -split "`n" | Where-Object { $_ }) }
-        if ($nounRaw) { $script:NOUNS = @($nounRaw -split "`n" | Where-Object { $_ }) }
-        if ($verbRaw) { $script:VERBS = @($verbRaw -split "`n" | Where-Object { $_ }) }
-
-        if ($script:ADJECTIVES.Count -eq 0) { $script:ADJECTIVES = @("unknown") }
-        if ($script:NOUNS.Count -eq 0) { $script:NOUNS = @("session") }
-        if ($script:VERBS.Count -eq 0) { $script:VERBS = @("starts") }
-
-        $script:SESSION_WORDS_LOADED = $true
+        $script:SessionWords = Get-Content $wordsFile -Raw | ConvertFrom-Json
     } catch {
-        $script:ADJECTIVES = @("unknown")
-        $script:NOUNS = @("session")
-        $script:VERBS = @("starts")
+        return $null
     }
 }
 
 function Convert-UuidToWords {
     param([string]$uuid)
 
-    Load-SessionWords
-
-    $hex = $uuid -replace "-", ""
-    $hex = $hex.Substring(0, [Math]::Min(12, $hex.Length))
-    if ($hex -notmatch '^[0-9a-fA-F]+$') { return "unknown-session-starts" }
+    if (-not $script:SessionWords) {
+        Load-SessionWords
+    }
 
-    try {
-        $adjSeed = [Convert]::ToInt32($hex.Substring(0, 4), 16)
-        $nounSeed = [Convert]::ToInt32($hex.Substring(4, 4), 16)
-        $verbSeed = [Convert]::ToInt32($hex.Substring(8, 4), 16)
+    if (-not $script:SessionWords) {
+        return "unknown-session"
+    }
 
-        $adjIdx = $adjSeed % $script:ADJECTIVES.Count
-        $nounIdx = $nounSeed % $script:NOUNS.Count
-        $verbIdx = $verbSeed % $script:VERBS.Count
+    $adjectives = $script:SessionWords.adjectives
+    $nouns = $script:SessionWords.nouns
+    $verbs = $script:SessionWords.verbs
 
-        return "$($script:ADJECTIVES[$adjIdx])-$($script:NOUNS[$nounIdx])-$($script:VERBS[$verbIdx])"
-    } catch {
-        return "unknown-session-starts"
+    if (-not $adjectives -or -not $nouns -or -not $verbs) {
+        return "unknown-session"
     }
-}
 
-if ($IS_UUID) {
-    $SESSION_NAME = Convert-UuidToWords $SESSION_ID
-} else {
-    $SESSION_NAME = $SESSION_ID
-}
+    if (-not $uuid -or $uuid -eq "unknown") { return "unknown-session" }
+
+    $clean = $uuid -replace "-", ""
+    if ($clean.Length -lt 12) { return "unknown-session" }
 
-# ═══════════════════════════════════════════════════════════════════════════
-# 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
-}
-$TURN_FILE = Join-Path $SessionsDir "$SESSION_ID.turn"
-$TURN_NUMBER = 1
-if (Test-Path $TURN_FILE) {
     try {
-        $TURN_NUMBER = [int](Get-Content $TURN_FILE -Raw).Trim()
+        $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 {
-        $TURN_NUMBER = 1
+        return "unknown-session"
     }
 }
 
 # ═══════════════════════════════════════════════════════════════════════════
-# Load auth - No jq
+# READ INPUT
 # ═══════════════════════════════════════════════════════════════════════════
-$EKKOS_CONFIG = Join-Path $env:USERPROFILE ".ekkos\config.json"
-$AUTH_TOKEN = ""
-$USER_ID = ""
-
-if ((Test-Path $EKKOS_CONFIG) -and (Test-Path $JsonParseHelper)) {
-    $AUTH_TOKEN = & node $JsonParseHelper $EKKOS_CONFIG ".hookApiKey" 2>$null
-    if (-not $AUTH_TOKEN) {
-        $AUTH_TOKEN = & node $JsonParseHelper $EKKOS_CONFIG ".apiKey" 2>$null
-    }
-    $USER_ID = & node $JsonParseHelper $EKKOS_CONFIG ".userId" 2>$null
-}
+$inputJson = [Console]::In.ReadToEnd()
 
-if (-not $AUTH_TOKEN) {
-    $envLocalFile = Join-Path $ProjectRoot ".env.local"
-    if (Test-Path $envLocalFile) {
-        $envLines = Get-Content $envLocalFile
-        foreach ($line in $envLines) {
-            if ($line -match '^SUPABASE_SECRET_KEY=(.+)$') {
-                $AUTH_TOKEN = $Matches[1].Trim('"', "'", ' ', "`r")
-                break
-            }
-        }
-    }
+# 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"
+$rawSessionId = "unknown"
+$turn = 0
+
+if (Test-Path $stateFile) {
+    try {
+        $hookState = Get-Content $stateFile -Raw | ConvertFrom-Json
+        $rawSessionId = $hookState.session_id
+        $turn = [int]$hookState.turn
+    } catch {}
 }
 
-if (-not $AUTH_TOKEN) { exit 0 }
+if ($rawSessionId -eq "unknown" -and (Test-Path $sessionFile)) {
+    try {
+        $sessionData = Get-Content $sessionFile -Raw | ConvertFrom-Json
+        $rawSessionId = $sessionData.session_id
+    } catch {}
+}
 
-$MEMORY_API_URL = "https://mcp.ekkos.dev"
+$sessionName = Convert-UuidToWords $rawSessionId
 
 # ═══════════════════════════════════════════════════════════════════════════
-# SESSION BINDING: Bridge _pending -> real session name for proxy eviction
-# The CLI may be in spawn pass-through mode (no PTY = blind to TUI output),
-# so the stop hook (which IS sighted) must bind the session.
+# 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.
 # ═══════════════════════════════════════════════════════════════════════════
-if ($SESSION_NAME -and $SESSION_NAME -ne "unknown-session-starts" -and $USER_ID) {
-    $PROJECT_PATH_FOR_BIND = ((Get-Location).Path) -replace '\\', '/'
-    $PENDING_SESSION_FOR_BIND = if ($env:EKKOS_PENDING_SESSION) { $env:EKKOS_PENDING_SESSION } else { "_pending" }
-
-    $bindBody = @{
-        userId         = $USER_ID
-        realSession    = $SESSION_NAME
-        projectPath    = $PROJECT_PATH_FOR_BIND
-        pendingSession = $PENDING_SESSION_FOR_BIND
-    } | ConvertTo-Json -Depth 10 -Compress
-
-    Start-Job -ScriptBlock {
-        param($url, $body)
-        try {
-            Invoke-RestMethod -Uri "$url/proxy/session/bind" `
-                -Method POST `
-                -ContentType "application/json" `
-                -Body ([System.Text.Encoding]::UTF8.GetBytes($body)) `
-                -TimeoutSec 2 `
-                -ErrorAction SilentlyContinue | Out-Null
-        } catch {}
-    } -ArgumentList $MEMORY_API_URL, $bindBody | Out-Null
+$configFile = Join-Path $EkkosConfigDir "config.json"
+if ((Test-Path $configFile) -and $sessionName -ne "unknown-session") {
+    try {
+        $config = Get-Content $configFile -Raw | ConvertFrom-Json
+        $userId = $config.userId
+        $authToken = if ($config.hookApiKey) { $config.hookApiKey } else { $config.apiKey }
+
+        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" `
+                    -Method POST `
+                    -Headers @{ "Content-Type" = "application/json" } `
+                    -Body ([System.Text.Encoding]::UTF8.GetBytes($body)) -ErrorAction SilentlyContinue | Out-Null
+            } -ArgumentList $bindBody, $authToken | 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
 # ═══════════════════════════════════════════════════════════════════════════
+$captureCmd = Get-Command "ekkos-capture" -ErrorAction SilentlyContinue
+if ($captureCmd -and $rawSessionId -ne "unknown") {
+    try {
+        Start-Job -ScriptBlock {
+            param($instanceId, $sessionId, $turnNum)
+            try {
+                & ekkos-capture ack $sessionId $turnNum "--instance=$instanceId" 2>&1 | Out-Null
+            } catch {}
+        } -ArgumentList $EkkosInstanceId, $rawSessionId, $turn | Out-Null
+    } catch {}
+}
 
 # ═══════════════════════════════════════════════════════════════════════════
-# Check for interruption - No jq
+# CHECK INTERRUPTION - Skip capture if user cancelled
 # ═══════════════════════════════════════════════════════════════════════════
-$IS_INTERRUPTED = Parse-JsonValue $INPUT ".interrupted"
-if (-not $IS_INTERRUPTED) { $IS_INTERRUPTED = "false" }
-$STOP_REASON = Parse-JsonValue $INPUT ".stop_reason"
+$isInterrupted = $false
+$stopReason = ""
+if ($inputJson) {
+    try {
+        $stopInput = $inputJson | ConvertFrom-Json
+        $isInterrupted = $stopInput.interrupted -eq $true
+        $stopReason = $stopInput.stop_reason
+    } catch {}
+}
 
-if ($IS_INTERRUPTED -eq "true" -or $STOP_REASON -eq "user_cancelled" -or $STOP_REASON -eq "interrupted") {
+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
 }
 
 # ═══════════════════════════════════════════════════════════════════════════
-# Extract conversation from transcript using Node (no jq)
+# EXTRACT CONVERSATION FROM TRANSCRIPT
+# Mirrors stop.sh: Extract last user query, assistant response, file changes
 # ═══════════════════════════════════════════════════════════════════════════
-$LAST_USER = ""
-$LAST_ASSISTANT = ""
-$FILE_CHANGES = "[]"
+$transcriptPath = ""
+if ($inputJson) {
+    try {
+        $stopInput2 = $inputJson | ConvertFrom-Json
+        $transcriptPath = $stopInput2.transcript_path
+    } catch {}
+}
+
+$lastUser = ""
+$lastAssistant = ""
+$fileChangesJson = "[]"
 
-if ($TRANSCRIPT_PATH -and (Test-Path $TRANSCRIPT_PATH)) {
+if ($transcriptPath -and (Test-Path $transcriptPath)) {
     try {
-        $tpNorm = $TRANSCRIPT_PATH -replace '\\', '/'
-        $EXTRACTION = & node -e @"
+        $extraction = node -e @"
 const fs = require('fs');
 const lines = fs.readFileSync(process.argv[1], 'utf8').split('\n').filter(Boolean);
 const entries = lines.map(l => { try { return JSON.parse(l); } catch { return null; } }).filter(Boolean);
@@ -290,7 +228,6 @@ 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;
@@ -303,7 +240,7 @@ entries.filter(e => e.type === 'assistant').forEach(e => {
     const content = e.message?.content;
     if (Array.isArray(content)) {
         content.filter(c => c.type === 'tool_use' && ['Edit', 'Write', 'Read'].includes(c.name)).forEach(c => {
-            fileChanges.push({tool: c.name, path: c.input?.file_path || c.input?.path, action: c.name.toLowerCase()});
+            fileChanges.push({tool: c.name, path: (c.input?.file_path || c.input?.path || '').replace(/\\\\/g, '/'), action: c.name.toLowerCase()});
         });
     }
 });
@@ -313,162 +250,86 @@ console.log(JSON.stringify({
     assistant: lastAssistant.substring(0, 50000),
     fileChanges: fileChanges.slice(0, 20)
 }));
-"@ -- $tpNorm 2>$null
-
-        if (-not $EXTRACTION) {
-            $EXTRACTION = '{"user":"","assistant":"","fileChanges":[]}'
+"@ $transcriptPath 2>$null
+
+        if ($extraction) {
+            $parsed = $extraction | ConvertFrom-Json
+            $lastUser = $parsed.user
+            $lastAssistant = $parsed.assistant
+            $fileChangesJson = ($parsed.fileChanges | ConvertTo-Json -Depth 10 -Compress)
+            if (-not $fileChangesJson) { $fileChangesJson = "[]" }
         }
-
-        $LAST_USER = $EXTRACTION | node -e "const d=JSON.parse(require('fs').readFileSync('/dev/stdin','utf8'));console.log(d.user||'')" 2>$null
-        $LAST_ASSISTANT = $EXTRACTION | node -e "const d=JSON.parse(require('fs').readFileSync('/dev/stdin','utf8'));console.log(d.assistant||'')" 2>$null
-        $FILE_CHANGES = $EXTRACTION | node -e "const d=JSON.parse(require('fs').readFileSync('/dev/stdin','utf8'));console.log(JSON.stringify(d.fileChanges||[]))" 2>$null
-        if (-not $FILE_CHANGES) { $FILE_CHANGES = "[]" }
     } catch {}
 }
 
-if (-not $LAST_USER -or $LAST_USER -match '\[Request interrupted') {
-    exit 0
-}
-
 # ═══════════════════════════════════════════════════════════════════════════
-# Capture to BOTH Working Sessions (Redis) AND Episodic (Supabase) - No jq
+# CAPTURE TO BOTH Working Sessions (Redis) AND Episodic Memory (Supabase)
+# Mirrors stop.sh dual-write at lines 271-356
 # ═══════════════════════════════════════════════════════════════════════════
-if ($LAST_USER -and $LAST_ASSISTANT) {
-    $TIMESTAMP = (Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
-
-    $TOOLS_USED = $FILE_CHANGES | node -e "
-const d = JSON.parse(require('fs').readFileSync('/dev/stdin','utf8') || '[]');
-console.log(JSON.stringify([...new Set(d.map(f => f.tool).filter(Boolean))]));
-" 2>$null
-    if (-not $TOOLS_USED) { $TOOLS_USED = "[]" }
-
-    $FILES_REF = $FILE_CHANGES | node -e "
-const d = JSON.parse(require('fs').readFileSync('/dev/stdin','utf8') || '[]');
-console.log(JSON.stringify([...new Set(d.map(f => f.path).filter(Boolean))]));
-" 2>$null
-    if (-not $FILES_REF) { $FILES_REF = "[]" }
-
-    # Token breakdown from tokenizer script
-    $TOTAL_TOKENS = 0
-    $INPUT_TOKENS = 0
-    $CACHE_READ_TOKENS = 0
-    $CACHE_CREATION_TOKENS = 0
-    $TOKENIZER_SCRIPT = Join-Path $ScriptDir "lib\count-tokens.cjs"
-
-    if ($TRANSCRIPT_PATH -and (Test-Path $TRANSCRIPT_PATH) -and (Test-Path $TOKENIZER_SCRIPT)) {
+if ($lastUser -and $lastAssistant -and $authToken) {
+    $modelUsed = "claude-sonnet-4-5"
+    if ($inputJson) {
         try {
-            $TOKEN_JSON = & node $TOKENIZER_SCRIPT $TRANSCRIPT_PATH --json 2>$null
-            if ($TOKEN_JSON) {
-                $TOTAL_TOKENS = $TOKEN_JSON | node -e "const d=JSON.parse(require('fs').readFileSync('/dev/stdin','utf8')||'{}');console.log(d.total_tokens||0)" 2>$null
-                $INPUT_TOKENS = $TOKEN_JSON | node -e "const d=JSON.parse(require('fs').readFileSync('/dev/stdin','utf8')||'{}');console.log(d.input_tokens||0)" 2>$null
-                $CACHE_READ_TOKENS = $TOKEN_JSON | node -e "const d=JSON.parse(require('fs').readFileSync('/dev/stdin','utf8')||'{}');console.log(d.cache_read_tokens||0)" 2>$null
-                $CACHE_CREATION_TOKENS = $TOKEN_JSON | node -e "const d=JSON.parse(require('fs').readFileSync('/dev/stdin','utf8')||'{}');console.log(d.cache_creation_tokens||0)" 2>$null
-            }
+            $stopInput3 = $inputJson | ConvertFrom-Json
+            if ($stopInput3.model) { $modelUsed = $stopInput3.model }
         } catch {}
-        if ($TOTAL_TOKENS -notmatch '^\d+$') { $TOTAL_TOKENS = 0 }
-        if ($INPUT_TOKENS -notmatch '^\d+$') { $INPUT_TOKENS = 0 }
-        if ($CACHE_READ_TOKENS -notmatch '^\d+$') { $CACHE_READ_TOKENS = 0 }
-        if ($CACHE_CREATION_TOKENS -notmatch '^\d+$') { $CACHE_CREATION_TOKENS = 0 }
     }
 
-    # 1. WORKING SESSIONS (Redis) - No jq payload building
-    # 2. EPISODIC MEMORY (Supabase) - No jq payload building
-    # Both fire in a single background job (mirrors the bash subshell)
-    Start-Job -ScriptBlock {
-        param(
-            $apiUrl, $authToken,
-            $sessionName, $turnNumber, $lastUser, $lastAssistant, $modelUsed,
-            $toolsUsed, $filesRef, $totalTokens, $inputTokens, $cacheReadTokens, $cacheCreationTokens,
-            $sessionId, $userId, $fileChanges, $timestamp
-        )
-
-        # --- 1. WORKING SESSIONS (Redis) ---
-        try {
-            $workingPayload = & node -e "
-console.log(JSON.stringify({
-    session_name: process.argv[1],
-    turn_number: parseInt(process.argv[2]),
-    user_query: process.argv[3],
-    agent_response: process.argv[4].substring(0, 50000),
-    model: process.argv[5],
-    tools_used: JSON.parse(process.argv[6] || '[]'),
-    files_referenced: JSON.parse(process.argv[7] || '[]'),
-    total_context_tokens: parseInt(process.argv[8]) || 0,
-    token_breakdown: {
-        input_tokens: parseInt(process.argv[9]) || 0,
-        cache_read_tokens: parseInt(process.argv[10]) || 0,
-        cache_creation_tokens: parseInt(process.argv[11]) || 0
-    }
-}));
-" -- $sessionName $turnNumber $lastUser $lastAssistant $modelUsed $toolsUsed $filesRef $totalTokens $inputTokens $cacheReadTokens $cacheCreationTokens 2>$null
+    $timestamp = (Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
+    $projectPath = ((Get-Location).Path) -replace '\\', '/'
 
-            if ($workingPayload) {
-                Invoke-RestMethod -Uri "$apiUrl/api/v1/working/turn" `
-                    -Method POST `
-                    -Headers @{ Authorization = "Bearer $authToken"; "Content-Type" = "application/json" } `
-                    -Body ([System.Text.Encoding]::UTF8.GetBytes($workingPayload)) `
-                    -TimeoutSec 5 `
-                    -ErrorAction SilentlyContinue | Out-Null
-            }
-        } catch {}
-
-        # --- 2. EPISODIC MEMORY (Supabase) ---
-        try {
-            $episodicPayload = & node -e "
-console.log(JSON.stringify({
-    user_query: process.argv[1],
-    assistant_response: process.argv[2],
-    session_id: process.argv[3],
-    user_id: process.argv[4] || 'system',
-    file_changes: JSON.parse(process.argv[5] || '[]'),
-    metadata: {
-        source: 'claude-code',
-        model_used: process.argv[6],
-        captured_at: process.argv[7],
-        turn_number: parseInt(process.argv[8]) || 1,
-        session_name: process.argv[9],
-        minimal_hook: true
-    }
-}));
-" -- $lastUser $lastAssistant $sessionId $userId $fileChanges $modelUsed $timestamp $turnNumber $sessionName 2>$null
-
-            if ($episodicPayload) {
-                Invoke-RestMethod -Uri "$apiUrl/api/v1/memory/capture" `
-                    -Method POST `
-                    -Headers @{ Authorization = "Bearer $authToken"; "Content-Type" = "application/json" } `
-                    -Body ([System.Text.Encoding]::UTF8.GetBytes($episodicPayload)) `
-                    -TimeoutSec 5 `
-                    -ErrorAction SilentlyContinue | Out-Null
+    # 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
+
+    # 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
             }
-        } catch {}
-    } -ArgumentList $MEMORY_API_URL, $AUTH_TOKEN, `
-        $SESSION_NAME, $TURN_NUMBER, $LAST_USER, $LAST_ASSISTANT, $MODEL_USED, `
-        $TOOLS_USED, $FILES_REF, $TOTAL_TOKENS, $INPUT_TOKENS, $CACHE_READ_TOKENS, $CACHE_CREATION_TOKENS, `
-        $SESSION_ID, $USER_ID, $FILE_CHANGES, $TIMESTAMP | Out-Null
+        } | 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
 }
 
 # ═══════════════════════════════════════════════════════════════════════════
-# Update local .ekkos/current-focus.md (if exists) - SILENT
+# CLEAN UP STATE FILES
 # ═══════════════════════════════════════════════════════════════════════════
-$EKKOS_LOCAL_DIR = Join-Path $ProjectRoot ".ekkos"
-if ((Test-Path $EKKOS_LOCAL_DIR) -and $LAST_USER) {
-    $FOCUS_FILE = Join-Path $EKKOS_LOCAL_DIR "current-focus.md"
-    $TASK_SUMMARY = $LAST_USER
-    if ($LAST_USER.Length -gt 100) {
-        $TASK_SUMMARY = $LAST_USER.Substring(0, 100) + "..."
-    }
-    $focusTimestamp = (Get-Date).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ")
-
-    $focusContent = @"
----
-last_updated: $focusTimestamp
-session_id: $SESSION_ID
----
-
-# Current Focus
-$TASK_SUMMARY
-"@
-    Set-Content -Path $FOCUS_FILE -Value $focusContent -Force
+if (Test-Path $stateFile) {
+    Remove-Item $stateFile -Force
 }
 
-exit 0
+Write-Output "ekkOS session ended"