@ekkos/cli 0.2.8 → 0.2.10

package/templates/hooks/assistant-response.sh

@@ -1,6 +1,14 @@
 #!/bin/bash
-# Post-response hook: Validates and enforces ekkOS footer format
+# ═══════════════════════════════════════════════════════════════════════════
+# ekkOS_ Hook: AssistantResponse - Validates and enforces footer format
+# MANAGED BY ekkos-connect - DO NOT EDIT DIRECTLY
+# EKKOS_MANAGED=1
+# ═══════════════════════════════════════════════════════════════════════════
 # Runs AFTER assistant response, checks footer compliance
+# Per spec v1.2 Addendum: NO jq, NO hardcoded arrays
+# ═══════════════════════════════════════════════════════════════════════════
+
+set +e
 
 RESPONSE_FILE="$1"
 HOOK_ENV="$2"
@@ -10,57 +18,109 @@ if [[ ! -f "$RESPONSE_FILE" ]]; then
   exit 0
 fi
 
-# Parse metadata from hook environment
-SESSION_ID=$(echo "$HOOK_ENV" | jq -r '.sessionId // "unknown"')
-TURN=$(echo "$HOOK_ENV" | jq -r '.turn // 0')
-CONTEXT_PERCENT=$(echo "$HOOK_ENV" | jq -r '.contextUsagePercent // 0')
-MODEL=$(echo "$HOOK_ENV" | jq -r '.model // "Claude Code (Opus 4.5)"')
+# ═══════════════════════════════════════════════════════════════════════════
+# CONFIG PATHS - No hardcoded word arrays per spec v1.2 Addendum
+# ═══════════════════════════════════════════════════════════════════════════
+EKKOS_CONFIG_DIR="${EKKOS_CONFIG_DIR:-$HOME/.ekkos}"
+SESSION_WORDS_JSON="$EKKOS_CONFIG_DIR/session-words.json"
+SESSION_WORDS_DEFAULT="$EKKOS_CONFIG_DIR/.defaults/session-words.json"
+JSON_PARSE_HELPER="$EKKOS_CONFIG_DIR/.helpers/json-parse.cjs"
+
+# Parse metadata from hook environment using Node (no jq)
+parse_hook_env() {
+    local json="$1"
+    local path="$2"
+    echo "$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>/dev/null || echo ""
+}
+
+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)"
+
+# ═══════════════════════════════════════════════════════════════════════════
+# Session name conversion - Uses external session-words.json (NO hardcoded arrays)
+# ═══════════════════════════════════════════════════════════════════════════
+declare -a ADJECTIVES
+declare -a NOUNS
+SESSION_WORDS_LOADED=false
+
+load_session_words() {
+    if [ "$SESSION_WORDS_LOADED" = "true" ]; then
+        return 0
+    fi
+
+    local words_file="$SESSION_WORDS_JSON"
+    if [ ! -f "$words_file" ]; then
+        words_file="$SESSION_WORDS_DEFAULT"
+    fi
+
+    if [ ! -f "$words_file" ] || [ ! -f "$JSON_PARSE_HELPER" ]; then
+        return 1
+    fi
+
+    if command -v node &>/dev/null; then
+        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)
+        else
+            local i=0
+            while IFS= read -r line; do
+                ADJECTIVES[i]="$line"
+                ((i++))
+            done < <(node "$JSON_PARSE_HELPER" "$words_file" '.adjectives' 2>/dev/null)
+            i=0
+            while IFS= read -r line; do
+                NOUNS[i]="$line"
+                ((i++))
+            done < <(node "$JSON_PARSE_HELPER" "$words_file" '.nouns' 2>/dev/null)
+        fi
+
+        if [ ${#ADJECTIVES[@]} -gt 0 ] && [ ${#NOUNS[@]} -gt 0 ]; then
+            SESSION_WORDS_LOADED=true
+            return 0
+        fi
+    fi
+    return 1
+}
 
-# Convert session UUID to word-based name
 convert_uuid_to_name() {
-  local uuid="$1"
-
-  # Word lists (same as MCP)
-  local ADJECTIVES=("cosmic" "turbo" "mega" "hyper" "quantum" "atomic" "stellar" "epic"
-    "mighty" "groovy" "zippy" "snappy" "jazzy" "funky" "zesty" "peppy"
-    "spicy" "crispy" "fluffy" "sparkly" "chunky" "bouncy" "bubbly" "sassy"
-    "slick" "sleek" "bold" "nifty" "perky" "plucky" "witty" "nimble"
-    "dapper" "fancy" "quirky" "punchy" "swift" "brave" "clever" "dandy"
-    "eager" "fiery" "golden" "hasty" "icy" "jolly" "keen" "lively"
-    "merry" "noble" "odd" "plush" "quick" "royal" "silly" "tidy"
-    "ultra" "vivid" "wacky" "zany" "alpha" "beta" "cyber" "delta"
-    "electric" "foggy" "giga" "hazy" "ionic" "jumpy" "kinky" "lunar"
-    "magic" "nerdy" "omega" "pixel" "quaint" "retro" "solar" "techno"
-    "unified" "viral" "wonky" "xerox" "yappy" "zen" "agile" "binary"
-    "chrome" "disco" "elastic" "fizzy" "glossy" "humble" "itchy" "jiffy"
-    "kooky" "loopy" "moody" "noisy")
-
-  local NOUNS=("penguin" "panda" "otter" "narwhal" "alpaca" "llama" "badger" "walrus"
-    "waffle" "pickle" "noodle" "pretzel" "muffin" "taco" "nugget" "biscuit"
-    "rocket" "comet" "nebula" "quasar" "meteor" "photon" "pulsar" "nova"
-    "ninja" "pirate" "wizard" "robot" "yeti" "phoenix" "sphinx" "kraken"
-    "thunder" "blizzard" "tornado" "avalanche" "mango" "kiwi" "banana" "coconut"
-    "donut" "espresso" "falafel" "gyro" "hummus" "icecream" "jambon" "kebab"
-    "latte" "mocha" "nachos" "olive" "pasta" "quinoa" "ramen" "sushi"
-    "tamale" "udon" "velvet" "wasabi" "xmas" "yogurt" "ziti" "anchor"
-    "beacon" "canyon" "drifter" "echo" "falcon" "glacier" "harbor" "island"
-    "jetpack" "kayak" "lagoon" "meadow" "orbit" "parrot" "quest"
-    "rapids" "summit" "tunnel" "umbrella" "volcano" "whisper" "xylophone" "yacht"
-    "zephyr" "acorn" "bobcat" "cactus" "dolphin" "eagle" "ferret" "gopher"
-    "hedgehog" "iguana" "jackal" "koala")
-
-  # Extract first 8 hex chars
-  local hex="${uuid:0:8}"
-  hex="${hex//-/}"
-
-  # Convert to number
-  local num=$((16#$hex))
-
-  # Calculate indices
-  local adj_idx=$((num % 100))
-  local noun_idx=$(((num / 100) % 100))
-
-  echo "${ADJECTIVES[$adj_idx]}-${NOUNS[$noun_idx]}"
+    local uuid="$1"
+
+    load_session_words || {
+        echo "unknown-session"
+        return
+    }
+
+    local hex="${uuid:0:8}"
+    hex="${hex//-/}"
+
+    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[@]}))
+
+    echo "${ADJECTIVES[$adj_idx]}-${NOUNS[$noun_idx]}"
 }
 
 SESSION_NAME=$(convert_uuid_to_name "$SESSION_ID")
@@ -68,7 +128,7 @@ TIMESTAMP=$(date "+%Y-%m-%d %I:%M %p %Z")
 
 # Required footer format
 REQUIRED_FOOTER="---
-$MODEL · $SESSION_NAME · Turn $TURN · ${CONTEXT_PERCENT}% · 🧠 **ekkOS_™** · 📅 $TIMESTAMP"
+$MODEL - $SESSION_NAME - Turn $TURN - ${CONTEXT_PERCENT}% - ekkOS - $TIMESTAMP"
 
 # Check if response has correct footer
 RESPONSE_CONTENT=$(cat "$RESPONSE_FILE")
@@ -76,21 +136,21 @@ LAST_LINE=$(echo "$RESPONSE_CONTENT" | tail -1)
 
 # Check if footer exists and is correct
 if [[ "$LAST_LINE" == *"ekkOS"* ]] && [[ "$LAST_LINE" == *"Turn"* ]]; then
-  # Footer exists - validate format
-  if [[ "$LAST_LINE" == *"Turn $TURN"* ]] && [[ "$LAST_LINE" == *"${CONTEXT_PERCENT}%"* ]] && [[ "$LAST_LINE" == *"$SESSION_NAME"* ]]; then
-    # Footer is correct
-    exit 0
-  else
-    # Footer exists but is malformed - replace it
-    RESPONSE_WITHOUT_FOOTER=$(echo "$RESPONSE_CONTENT" | head -n -2)  # Remove last 2 lines (--- and footer)
-    echo "$RESPONSE_WITHOUT_FOOTER" > "$RESPONSE_FILE"
+    # Footer exists - validate format
+    if [[ "$LAST_LINE" == *"Turn $TURN"* ]] && [[ "$LAST_LINE" == *"${CONTEXT_PERCENT}%"* ]] && [[ "$LAST_LINE" == *"$SESSION_NAME"* ]]; then
+        # Footer is correct
+        exit 0
+    else
+        # Footer exists but is malformed - replace it
+        RESPONSE_WITHOUT_FOOTER=$(echo "$RESPONSE_CONTENT" | head -n -2)
+        echo "$RESPONSE_WITHOUT_FOOTER" > "$RESPONSE_FILE"
+        echo "" >> "$RESPONSE_FILE"
+        echo "$REQUIRED_FOOTER" >> "$RESPONSE_FILE"
+    fi
+else
+    # Footer missing - append it
     echo "" >> "$RESPONSE_FILE"
     echo "$REQUIRED_FOOTER" >> "$RESPONSE_FILE"
-  fi
-else
-  # Footer missing - append it
-  echo "" >> "$RESPONSE_FILE"
-  echo "$REQUIRED_FOOTER" >> "$RESPONSE_FILE"
 fi
 
 exit 0

package/templates/hooks/session-start.ps1

@@ -1,10 +1,90 @@
 # ═══════════════════════════════════════════════════════════════════════════
 # ekkOS_ Hook: SessionStart - Initialize session (Windows)
+# MANAGED BY ekkos-connect - DO NOT EDIT DIRECTLY
+# EKKOS_MANAGED=1
+# EKKOS_MANIFEST_SHA256=<computed-at-build>
+# EKKOS_TEMPLATE_VERSION=1.0.0
+#
+# 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"
 
-# Read input
+# ═══════════════════════════════════════════════════════════════════════════
+# CONFIG PATHS - No hardcoded word arrays per spec v1.2 Addendum
+# ═══════════════════════════════════════════════════════════════════════════
+$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"
+
+# ═══════════════════════════════════════════════════════════════════════════
+# INSTANCE ID - Multi-session isolation per v1.2 ADDENDUM
+# ═══════════════════════════════════════════════════════════════════════════
+$EkkosInstanceId = if ($env:EKKOS_INSTANCE_ID) { $env:EKKOS_INSTANCE_ID } else { "default" }
+
+# ═══════════════════════════════════════════════════════════════════════════
+# Load session words from JSON file - NO HARDCODED ARRAYS
+# ═══════════════════════════════════════════════════════════════════════════
+$script:SessionWords = $null
+
+function Load-SessionWords {
+    $wordsFile = $SessionWordsJson
+
+    if (-not (Test-Path $wordsFile)) {
+        $wordsFile = $SessionWordsDefault
+    }
+
+    if (-not (Test-Path $wordsFile)) {
+        return $null
+    }
+
+    try {
+        $script:SessionWords = Get-Content $wordsFile -Raw | ConvertFrom-Json
+    } catch {
+        return $null
+    }
+}
+
+function Convert-UuidToWords {
+    param([string]$uuid)
+
+    if (-not $script:SessionWords) {
+        Load-SessionWords
+    }
+
+    if (-not $script:SessionWords) {
+        return "unknown-session"
+    }
+
+    $adjectives = $script:SessionWords.adjectives
+    $nouns = $script:SessionWords.nouns
+    $verbs = $script:SessionWords.verbs
+
+    if (-not $adjectives -or -not $nouns -or -not $verbs) {
+        return "unknown-session"
+    }
+
+    if (-not $uuid -or $uuid -eq "unknown") { return "unknown-session" }
+
+    $clean = $uuid -replace "-", ""
+    if ($clean.Length -lt 6) { 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
+
+        return "$($adjectives[$a])-$($nouns[$n])-$($verbs[$an])"
+    } catch {
+        return "unknown-session"
+    }
+}
+
+# ═══════════════════════════════════════════════════════════════════════════
+# READ INPUT
+# ═══════════════════════════════════════════════════════════════════════════
 $inputJson = [Console]::In.ReadToEnd()
 
 try {
@@ -14,7 +94,11 @@ try {
     $sessionId = "unknown"
 }
 
-# Initialize state directory
+$sessionName = Convert-UuidToWords $sessionId
+
+# ═══════════════════════════════════════════════════════════════════════════
+# INITIALIZE STATE DIRECTORY
+# ═══════════════════════════════════════════════════════════════════════════
 $stateDir = Join-Path $env:USERPROFILE ".claude\state"
 if (-not (Test-Path $stateDir)) {
     New-Item -ItemType Directory -Path $stateDir -Force | Out-Null
@@ -25,6 +109,8 @@ $stateFile = Join-Path $stateDir "hook-state.json"
 $state = @{
     turn = 0
     session_id = $sessionId
+    session_name = $sessionName
+    instance_id = $EkkosInstanceId
     started_at = (Get-Date).ToString("o")
 } | ConvertTo-Json
 
@@ -34,8 +120,27 @@ Set-Content -Path $stateFile -Value $state -Force
 $sessionFile = Join-Path $stateDir "current-session.json"
 $sessionData = @{
     session_id = $sessionId
+    session_name = $sessionName
+    instance_id = $EkkosInstanceId
 } | ConvertTo-Json
 
 Set-Content -Path $sessionFile -Value $sessionData -Force
 
+# ═══════════════════════════════════════════════════════════════════════════
+# LOCAL CACHE: Initialize session in Tier 0 cache
+# Per v1.2 ADDENDUM: Pass instanceId for namespacing
+# ═══════════════════════════════════════════════════════════════════════════
+$captureCmd = Get-Command "ekkos-capture" -ErrorAction SilentlyContinue
+if ($captureCmd -and $sessionId -ne "unknown") {
+    try {
+        # NEW format: ekkos-capture init <instance_id> <session_id> <session_name>
+        Start-Job -ScriptBlock {
+            param($instanceId, $sessId, $sessName)
+            try {
+                & ekkos-capture init $instanceId $sessId $sessName 2>&1 | Out-Null
+            } catch {}
+        } -ArgumentList $EkkosInstanceId, $sessionId, $sessionName | Out-Null
+    } catch {}
+}
+
 Write-Output "ekkOS session initialized"