@ekkos/cli 1.0.35 → 1.0.36

package/templates/hooks/lib/contract.sh

@@ -78,7 +78,7 @@ write_turn_contract() {
   "retrieved_directive_ids": $directive_array,
   "timestamp": "$timestamp",
   "query_hash": "$query_hash",
-  "ekkos_strict": ${EKKOS_STRICT:-0}
+  "ekkos_strict": ${EKKOS_STRICT:-1}
 }
 EOF
 
@@ -134,7 +134,7 @@ cleanup_turn_contract() {
 
 # Check if strict mode is enabled
 is_strict_mode() {
-  [ "${EKKOS_STRICT:-0}" = "1" ]
+  [ "${EKKOS_STRICT:-1}" = "1" ]  # DEFAULT: ON
 }
 
 # Generate strict mode blocker message for Claude Code
@@ -157,50 +157,57 @@ EOF
 }
 
 # Validate PatternGuard coverage (returns 0-100)
+# PORTABLE: Works on macOS without Perl regex (grep -P)
 calculate_pattern_guard_coverage() {
   local assistant_response="$1"
   local pattern_ids="$2"  # Comma-separated
 
-  # Count total patterns
-  local total_count
-  total_count=$(echo "$pattern_ids" | tr ',' '\n' | grep -c '.' || echo 0)
+  # Count total patterns - more robust counting
+  local total_count=0
+  if [ -n "$pattern_ids" ]; then
+    total_count=$(echo "$pattern_ids" | tr ',' '\n' | grep -v '^$' | wc -l | tr -d ' ')
+  fi
 
   if [ "$total_count" -eq 0 ]; then
     echo "100"  # No patterns = 100% coverage by definition
     return 0
   fi
 
-  # Extract acknowledged IDs from [ekkOS_SELECT] and [ekkOS_SKIP] blocks
+  # Extract acknowledged IDs using portable awk (works on macOS and Linux)
   local acknowledged_count=0
 
-  # Check SELECT block
-  local select_block
-  select_block=$(echo "$assistant_response" | grep -ozP '\[ekkOS_SELECT\][\s\S]*?\[/ekkOS_SELECT\]' 2>/dev/null | tr '\0' '\n' || true)
-  if [ -n "$select_block" ]; then
-    local select_count
-    select_count=$(echo "$select_block" | grep -oE 'id:\s*[a-f0-9-]+' | wc -l | tr -d ' ')
-    acknowledged_count=$((acknowledged_count + select_count))
-  fi
-
-  # Check SKIP block
-  local skip_block
-  skip_block=$(echo "$assistant_response" | grep -ozP '\[ekkOS_SKIP\][\s\S]*?\[/ekkOS_SKIP\]' 2>/dev/null | tr '\0' '\n' || true)
-  if [ -n "$skip_block" ]; then
-    local skip_count
-    skip_count=$(echo "$skip_block" | grep -oE 'id:\s*[a-f0-9-]+' | wc -l | tr -d ' ')
-    acknowledged_count=$((acknowledged_count + skip_count))
-  fi
+  # Use awk to extract SELECT block and count IDs - PORTABLE approach
+  local select_count=0
+  select_count=$(echo "$assistant_response" | awk '
+    /\[ekkOS_SELECT\]/{in_block=1; next}
+    /\[\/ekkOS_SELECT\]/{in_block=0}
+    in_block && /id:/{count++}
+    END{print count+0}
+  ')
+  acknowledged_count=$((acknowledged_count + select_count))
+
+  # Use awk to extract SKIP block and count IDs
+  local skip_count=0
+  skip_count=$(echo "$assistant_response" | awk '
+    /\[ekkOS_SKIP\]/{in_block=1; next}
+    /\[\/ekkOS_SKIP\]/{in_block=0}
+    in_block && /id:/{count++}
+    END{print count+0}
+  ')
+  acknowledged_count=$((acknowledged_count + skip_count))
 
   # Legacy: Check for [ekkOS_APPLY] markers (fallback)
   if [ "$acknowledged_count" -eq 0 ]; then
     local apply_count
-    apply_count=$(echo "$assistant_response" | grep -c '\[ekkOS_APPLY\]' || echo 0)
-    acknowledged_count=$apply_count
+    apply_count=$(echo "$assistant_response" | grep -c '\[ekkOS_APPLY\]' 2>/dev/null || echo 0)
+    acknowledged_count=$((acknowledged_count + apply_count))
   fi
 
   # Calculate coverage percentage
-  local coverage
-  coverage=$((acknowledged_count * 100 / total_count))
+  local coverage=0
+  if [ "$total_count" -gt 0 ]; then
+    coverage=$((acknowledged_count * 100 / total_count))
+  fi
 
   # Cap at 100%
   if [ "$coverage" -gt 100 ]; then
@@ -255,11 +262,16 @@ EOF
 }
 
 # Determine if turn is compliant
+# ROBUST: Handles edge cases with non-numeric or empty values
 is_turn_compliant() {
-  local retrieval_ok="$1"
-  local pattern_guard_coverage="$2"
-  local footer_present="$3"
-  local pattern_count="$4"
+  local retrieval_ok="${1:-true}"
+  local pattern_guard_coverage="${2:-100}"
+  local footer_present="${3:-true}"
+  local pattern_count="${4:-0}"
+
+  # Sanitize numeric values (default to safe values)
+  pattern_guard_coverage=$(echo "$pattern_guard_coverage" | grep -oE '^[0-9]+$' || echo "100")
+  pattern_count=$(echo "$pattern_count" | grep -oE '^[0-9]+$' || echo "0")
 
   # Retrieval must have succeeded
   if [ "$retrieval_ok" != "true" ]; then

package/templates/hooks/lib/state.sh

@@ -20,25 +20,40 @@ mkdir -p "$STATE_DIR"
 # State File Management
 # ═══════════════════════════════════════════════════════════════════════════
 
-# Save patterns for session
+# Save patterns for session (with retrieval_token for verified tracking)
 save_patterns() {
   local session_id="$1"
   local patterns="$2"
   local model_used="$3"
+  local retrieval_token="${4:-}"  # Optional retrieval_token for verified applications
 
   local state_file="$STATE_DIR/patterns-${session_id}.json"
 
   jq -n \
     --argjson patterns "$patterns" \
     --arg model "$model_used" \
+    --arg token "$retrieval_token" \
     --arg timestamp "$(date -u +%Y-%m-%dT%H:%M:%SZ)" \
     '{
       patterns: $patterns,
       model_used: $model,
+      retrieval_token: $token,
       saved_at: $timestamp
     }' > "$state_file"
 }
 
+# Get retrieval token from saved patterns
+get_retrieval_token() {
+  local session_id="$1"
+  local state_file="$STATE_DIR/patterns-${session_id}.json"
+
+  if [ -f "$state_file" ]; then
+    jq -r '.retrieval_token // ""' "$state_file" 2>/dev/null
+  else
+    echo ""
+  fi
+}
+
 # Load patterns for session
 load_patterns() {
   local session_id="$1"
@@ -57,6 +72,43 @@ clear_patterns() {
   rm -f "$STATE_DIR/patterns-${session_id}.json"
 }
 
+# ═══════════════════════════════════════════════════════════════════════════
+# Conversation Context (for Golden Loop MEASURE phase)
+# ═══════════════════════════════════════════════════════════════════════════
+
+# Save current conversation context for pattern tracking
+# Called by user-prompt-submit.sh when new query is submitted
+save_conversation_context() {
+  local session_id="$1"
+  local user_query="$2"
+  local prev_response="$3"
+
+  local context_file="$STATE_DIR/conversation-${session_id}.json"
+
+  jq -n \
+    --arg query "$user_query" \
+    --arg response "$prev_response" \
+    --arg timestamp "$(date -u +%Y-%m-%dT%H:%M:%SZ)" \
+    '{
+      query: $query,
+      response: $response,
+      saved_at: $timestamp
+    }' > "$context_file" 2>/dev/null || true
+}
+
+# Load current conversation context
+# Called by post-tool-use.sh when tracking pattern applications
+load_conversation_context() {
+  local session_id="$1"
+  local context_file="$STATE_DIR/conversation-${session_id}.json"
+
+  if [ -f "$context_file" ]; then
+    cat "$context_file"
+  else
+    echo '{"query":"","response":""}'
+  fi
+}
+
 # ═══════════════════════════════════════════════════════════════════════════
 # Capture Deduplication
 # ═══════════════════════════════════════════════════════════════════════════