agileflow 2.77.0 → 2.78.0

package/README.md

@@ -3,7 +3,7 @@
 </p>
 
 [![npm version](https://img.shields.io/npm/v/agileflow?color=brightgreen)](https://www.npmjs.com/package/agileflow)
-[![Commands](https://img.shields.io/badge/commands-58-blue)](docs/04-architecture/commands.md)
+[![Commands](https://img.shields.io/badge/commands-68-blue)](docs/04-architecture/commands.md)
 [![Agents/Experts](https://img.shields.io/badge/agents%2Fexperts-27-orange)](docs/04-architecture/subagents.md)
 [![Skills](https://img.shields.io/badge/skills-dynamic-purple)](docs/04-architecture/skills.md)
 
@@ -65,7 +65,7 @@ AgileFlow combines three proven methodologies:
 
 | Component | Count | Description |
 |-----------|-------|-------------|
-| [Commands](docs/04-architecture/commands.md) | 58 | Slash commands for agile workflows |
+| [Commands](docs/04-architecture/commands.md) | 68 | Slash commands for agile workflows |
 | [Agents/Experts](docs/04-architecture/subagents.md) | 27 | Specialized agents with self-improving knowledge bases |
 | [Skills](docs/04-architecture/skills.md) | Dynamic | Generated on-demand with `/agileflow:skill:create` |
 
@@ -76,7 +76,7 @@ AgileFlow combines three proven methodologies:
 Full documentation lives in [`docs/04-architecture/`](docs/04-architecture/):
 
 ### Reference
-- [Commands](docs/04-architecture/commands.md) - All 58 slash commands
+- [Commands](docs/04-architecture/commands.md) - All 68 slash commands
 - [Agents/Experts](docs/04-architecture/subagents.md) - 27 specialized agents with self-improving knowledge
 - [Skills](docs/04-architecture/skills.md) - Dynamic skill generator with MCP integration
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agileflow",
-  "version": "2.77.0",
+  "version": "2.78.0",
   "description": "AI-driven agile development system for Claude Code, Cursor, Windsurf, and more",
   "keywords": [
     "agile",
@@ -51,6 +51,8 @@
     "test:coverage": "jest --coverage"
   },
   "dependencies": {
+    "blessed": "^0.1.81",
+    "blessed-contrib": "^4.10.1",
     "chalk": "^4.1.2",
     "commander": "^12.1.0",
     "fs-extra": "^11.2.0",
@@ -59,6 +61,9 @@
     "ora": "^5.4.1",
     "semver": "^7.6.3"
   },
+  "optionalDependencies": {
+    "node-pty": "^1.0.0"
+  },
   "engines": {
     "node": ">=18.0.0"
   },

package/scripts/agileflow-configure.js

@@ -23,7 +23,7 @@
  *   --detect                            Show current status
  *   --help                              Show help
  *
- * Features: sessionstart, precompact, ralphloop, selfimprove, archival, statusline, autoupdate
+ * Features: sessionstart, precompact, ralphloop, selfimprove, archival, statusline, autoupdate, damagecontrol
  */
 
 const fs = require('fs');
@@ -76,6 +76,11 @@ const FEATURES = {
   archival: { script: 'archive-completed-stories.sh', requiresHook: 'sessionstart' },
   statusline: { script: 'agileflow-statusline.sh' },
   autoupdate: { metadataOnly: true }, // Stored in metadata.updates.autoUpdate
+  damagecontrol: {
+    preToolUseHooks: true,
+    scripts: ['damage-control-bash.js', 'damage-control-edit.js', 'damage-control-write.js'],
+    patternsFile: 'damage-control-patterns.yaml',
+  },
 };
 
 // Complete registry of all scripts that may need repair
@@ -87,6 +92,9 @@ const ALL_SCRIPTS = {
   'auto-self-improve.js': { feature: 'selfimprove', required: true },
   'archive-completed-stories.sh': { feature: 'archival', required: true },
   'agileflow-statusline.sh': { feature: 'statusline', required: true },
+  'damage-control-bash.js': { feature: 'damagecontrol', required: true },
+  'damage-control-edit.js': { feature: 'damagecontrol', required: true },
+  'damage-control-write.js': { feature: 'damagecontrol', required: true },
 
   // Support scripts (used by commands/agents)
   'obtain-context.js': { usedBy: ['/babysit', '/mentor', '/sprint'] },
@@ -215,6 +223,7 @@ function detectConfig() {
       selfimprove: { enabled: false, valid: true, issues: [], version: null, outdated: false },
       archival: { enabled: false, threshold: null, version: null, outdated: false },
       statusline: { enabled: false, valid: true, issues: [], version: null, outdated: false },
+      damagecontrol: { enabled: false, valid: true, issues: [], version: null, outdated: false, level: null, patternCount: 0 },
     },
     metadata: { exists: false, version: null },
     currentVersion: VERSION,
@@ -298,6 +307,32 @@ function detectConfig() {
             }
           }
         }
+
+        // PreToolUse hooks (damage control)
+        if (settings.hooks.PreToolUse) {
+          if (Array.isArray(settings.hooks.PreToolUse) && settings.hooks.PreToolUse.length > 0) {
+            // Check for damage-control hooks by looking for damage-control scripts
+            const hasBashHook = settings.hooks.PreToolUse.some(
+              h => h.matcher === 'Bash' && h.hooks?.some(hk => hk.command?.includes('damage-control'))
+            );
+            const hasEditHook = settings.hooks.PreToolUse.some(
+              h => h.matcher === 'Edit' && h.hooks?.some(hk => hk.command?.includes('damage-control'))
+            );
+            const hasWriteHook = settings.hooks.PreToolUse.some(
+              h => h.matcher === 'Write' && h.hooks?.some(hk => hk.command?.includes('damage-control'))
+            );
+
+            if (hasBashHook || hasEditHook || hasWriteHook) {
+              status.features.damagecontrol.enabled = true;
+              // Count how many of the 3 hooks are present
+              const hookCount = [hasBashHook, hasEditHook, hasWriteHook].filter(Boolean).length;
+              if (hookCount < 3) {
+                status.features.damagecontrol.valid = false;
+                status.features.damagecontrol.issues.push(`Only ${hookCount}/3 hooks configured`);
+              }
+            }
+          }
+        }
       }
 
       // StatusLine
@@ -326,6 +361,11 @@ function detectConfig() {
         status.features.archival.threshold = meta.archival.threshold_days;
       }
 
+      // Damage control metadata
+      if (meta.features?.damagecontrol?.enabled) {
+        status.features.damagecontrol.level = meta.features.damagecontrol.protectionLevel || 'standard';
+      }
+
       // Read feature versions from metadata and check if outdated
       if (meta.features) {
         Object.entries(meta.features).forEach(([feature, data]) => {
@@ -402,6 +442,22 @@ function printStatus(status) {
 
   printFeature('statusline', 'Status Line');
 
+  // Damage Control (special display with level info)
+  const dc = status.features.damagecontrol;
+  if (dc.enabled) {
+    let dcStatusText = 'enabled';
+    if (dc.level) dcStatusText += ` (${dc.level})`;
+    if (!dc.valid) dcStatusText = 'INCOMPLETE';
+    const dcIcon = dc.enabled && dc.valid ? '🛡️' : '⚠️';
+    const dcColor = dc.enabled && dc.valid ? c.green : c.yellow;
+    log(`  ${dcIcon} Damage Control: ${dcStatusText}`, dcColor);
+    if (dc.issues?.length > 0) {
+      dc.issues.forEach(issue => log(`     └─ ${issue}`, c.yellow));
+    }
+  } else {
+    log(`  ❌ Damage Control: disabled`, c.dim);
+  }
+
   // Metadata
   if (status.metadata.exists) {
     log(`\nMetadata: v${status.metadata.version}`, c.dim);
@@ -685,6 +741,79 @@ function enableFeature(feature, options = {}) {
     return true; // Skip settings.json write for this feature
   }
 
+  // Handle damage control (PreToolUse hooks)
+  if (feature === 'damagecontrol') {
+    const level = options.protectionLevel || 'standard';
+
+    // Verify all required scripts exist
+    const requiredScripts = ['damage-control-bash.js', 'damage-control-edit.js', 'damage-control-write.js'];
+    for (const script of requiredScripts) {
+      if (!scriptExists(script)) {
+        error(`Script not found: ${getScriptPath(script)}`);
+        info('Run "npx agileflow update" to reinstall scripts');
+        return false;
+      }
+    }
+
+    // Deploy patterns file if not exists
+    const patternsDir = path.join(process.cwd(), '.agileflow', 'config');
+    const patternsDest = path.join(patternsDir, 'damage-control-patterns.yaml');
+    if (!fs.existsSync(patternsDest)) {
+      ensureDir(patternsDir);
+      // Try to copy from templates
+      const templatePath = path.join(process.cwd(), '.agileflow', 'templates', 'damage-control-patterns.yaml');
+      if (fs.existsSync(templatePath)) {
+        fs.copyFileSync(templatePath, patternsDest);
+        success('Deployed damage control patterns');
+      } else {
+        warn('No patterns template found - hooks will use defaults');
+      }
+    }
+
+    // Initialize PreToolUse array if not exists
+    if (!settings.hooks.PreToolUse) {
+      settings.hooks.PreToolUse = [];
+    }
+
+    // Helper to add or update a PreToolUse hook
+    const addPreToolUseHook = (matcher, scriptName) => {
+      const scriptPath = path.join(process.cwd(), '.agileflow', 'scripts', scriptName);
+
+      // Remove existing hook for this matcher if present
+      settings.hooks.PreToolUse = settings.hooks.PreToolUse.filter(h => h.matcher !== matcher);
+
+      // Add new hook
+      settings.hooks.PreToolUse.push({
+        matcher,
+        hooks: [{ type: 'command', command: `node ${scriptPath}`, timeout: 5 }],
+      });
+    };
+
+    // Add hooks for Bash, Edit, Write tools
+    addPreToolUseHook('Bash', 'damage-control-bash.js');
+    addPreToolUseHook('Edit', 'damage-control-edit.js');
+    addPreToolUseHook('Write', 'damage-control-write.js');
+
+    success('Damage control PreToolUse hooks enabled');
+
+    // Update metadata with protection level
+    updateMetadata({
+      features: {
+        damagecontrol: {
+          enabled: true,
+          protectionLevel: level,
+          version: VERSION,
+          at: new Date().toISOString(),
+        },
+      },
+    });
+
+    writeJSON('.claude/settings.json', settings);
+    updateGitignore();
+
+    return true;
+  }
+
   writeJSON('.claude/settings.json', settings);
   updateMetadata({
     features: { [feature]: { enabled: true, version: VERSION, at: new Date().toISOString() } },
@@ -764,6 +893,45 @@ function disableFeature(feature) {
     return true; // Skip settings.json write for this feature
   }
 
+  // Disable damage control (PreToolUse hooks)
+  if (feature === 'damagecontrol') {
+    if (settings.hooks?.PreToolUse && Array.isArray(settings.hooks.PreToolUse)) {
+      const before = settings.hooks.PreToolUse.length;
+
+      // Remove damage-control hooks (Bash, Edit, Write matchers with damage-control scripts)
+      settings.hooks.PreToolUse = settings.hooks.PreToolUse.filter(h => {
+        const isDamageControlHook = h.hooks?.some(hk => hk.command?.includes('damage-control'));
+        return !isDamageControlHook;
+      });
+
+      const after = settings.hooks.PreToolUse.length;
+
+      if (before > after) {
+        success(`Removed ${before - after} damage control PreToolUse hook(s)`);
+      }
+
+      // If no more PreToolUse hooks, remove the entire array
+      if (settings.hooks.PreToolUse.length === 0) {
+        delete settings.hooks.PreToolUse;
+      }
+    }
+
+    // Update metadata
+    updateMetadata({
+      features: {
+        damagecontrol: {
+          enabled: false,
+          version: VERSION,
+          at: new Date().toISOString(),
+        },
+      },
+    });
+
+    writeJSON('.claude/settings.json', settings);
+    success('Damage control disabled');
+    return true;
+  }
+
   writeJSON('.claude/settings.json', settings);
   updateMetadata({
     features: { [feature]: { enabled: false, version: VERSION, at: new Date().toISOString() } },
@@ -1228,9 +1396,10 @@ ${c.cyan}Feature Control:${c.reset}
   --enable=<list>     Enable features (comma-separated)
   --disable=<list>    Disable features (comma-separated)
 
-  Features: sessionstart, precompact, ralphloop, selfimprove, archival, statusline
+  Features: sessionstart, precompact, ralphloop, selfimprove, archival, statusline, damagecontrol
 
   Stop hooks (ralphloop, selfimprove) run when Claude completes/pauses
+  Damage control (damagecontrol) uses PreToolUse hooks to block dangerous commands
 
 ${c.cyan}Statusline Components:${c.reset}
   --show=<list>       Show statusline components (comma-separated)
@@ -1293,6 +1462,9 @@ ${c.cyan}Examples:${c.reset}
 
   # Repair scripts for a specific feature
   node .agileflow/scripts/agileflow-configure.js --repair=statusline
+
+  # Enable damage control (PreToolUse hooks to block dangerous commands)
+  node .agileflow/scripts/agileflow-configure.js --enable=damagecontrol
 `);
 }
 

package/scripts/agileflow-statusline.sh

@@ -193,40 +193,75 @@ fi
 # ============================================================================
 input=$(cat)
 
-# Parse model info
-MODEL_DISPLAY=$(echo "$input" | jq -r '.model.display_name // "Claude"')
+# Parse model info (fallback to empty if no input)
+MODEL_DISPLAY=$(echo "$input" | jq -r '.model.display_name // empty' 2>/dev/null)
+[ -z "$MODEL_DISPLAY" ] && MODEL_DISPLAY=""
 
-# Parse context usage
-CONTEXT_SIZE=$(echo "$input" | jq -r '.context_window.context_window_size // 200000')
-USAGE=$(echo "$input" | jq '.context_window.current_usage // null')
+# ============================================================================
+# Context Window Usage (reads from session JSONL file like cc-statusline)
+# ============================================================================
+# Claude Code doesn't pass context usage via stdin reliably, so we read it
+# directly from the session's JSONL file (same approach as cc-statusline)
 
 CTX_DISPLAY=""
 CTX_BAR_DISPLAY=""
 CTX_COLOR="$CTX_GREEN"
-if [ "$USAGE" != "null" ]; then
-  CURRENT_TOKENS=$(echo "$USAGE" | jq '.input_tokens + (.cache_creation_input_tokens // 0) + (.cache_read_input_tokens // 0)')
-  if [ "$CURRENT_TOKENS" != "null" ] && [ "$CURRENT_TOKENS" -gt 0 ] 2>/dev/null; then
-    PERCENT_USED=$((CURRENT_TOKENS * 100 / CONTEXT_SIZE))
-
-    # Color based on usage level (using vibrant 256-color palette)
-    if [ "$PERCENT_USED" -ge 80 ]; then
-      CTX_COLOR="$CTX_RED"      # Coral red - critical
-    elif [ "$PERCENT_USED" -ge 60 ]; then
-      CTX_COLOR="$CTX_ORANGE"   # Peach - high usage
-    elif [ "$PERCENT_USED" -ge 40 ]; then
-      CTX_COLOR="$CTX_YELLOW"   # Peach - moderate
-    else
-      CTX_COLOR="$CTX_GREEN"    # Mint green - healthy
-    fi
+PERCENT_USED=0
+
+# Get session_id and current_dir from input
+SESSION_ID=$(echo "$input" | jq -r '.session_id // empty' 2>/dev/null)
+CURRENT_DIR=$(echo "$input" | jq -r '.workspace.current_dir // .cwd // empty' 2>/dev/null)
+
+# Determine max context based on model (all modern models use 200K)
+get_max_context() {
+  local model="$1"
+  case "$model" in
+    *"Claude 3 Haiku"*|*"claude 3 haiku"*)
+      echo "100000"  # 100K for original Claude 3 Haiku
+      ;;
+    *)
+      echo "200000"  # 200K for Opus, Sonnet, modern Haiku
+      ;;
+  esac
+}
+
+MAX_CONTEXT=$(get_max_context "$MODEL_DISPLAY")
+
+if [ -n "$SESSION_ID" ] && [ -n "$CURRENT_DIR" ]; then
+  # Convert current dir to session file path (same as cc-statusline)
+  # e.g., /home/coder/AgileFlow -> home-coder-AgileFlow
+  PROJECT_DIR=$(echo "$CURRENT_DIR" | sed "s|^$HOME|~|g" | sed "s|~|$HOME|g" | sed 's|/|-|g' | sed 's|^-||')
+  SESSION_FILE="$HOME/.claude/projects/-${PROJECT_DIR}/${SESSION_ID}.jsonl"
 
-    CTX_DISPLAY="${CTX_COLOR}${PERCENT_USED}%${RESET}"
+  if [ -f "$SESSION_FILE" ]; then
+    # Get the latest input token count from the session file (last 20 lines)
+    LATEST_TOKENS=$(tail -20 "$SESSION_FILE" | jq -r 'select(.message.usage) | .message.usage | ((.input_tokens // 0) + (.cache_read_input_tokens // 0))' 2>/dev/null | tail -1)
 
-    # Generate progress bar (8 chars wide for compactness)
-    CTX_BAR=$(progress_bar "$PERCENT_USED" 8)
-    CTX_BAR_DISPLAY="${DIM}[${RESET}${CTX_COLOR}${CTX_BAR}${RESET}${DIM}]${RESET}"
+    if [ -n "$LATEST_TOKENS" ] && [ "$LATEST_TOKENS" -gt 0 ] 2>/dev/null; then
+      PERCENT_USED=$((LATEST_TOKENS * 100 / MAX_CONTEXT))
+      # Cap at 100%
+      [ "$PERCENT_USED" -gt 100 ] && PERCENT_USED=100
+    fi
   fi
 fi
 
+# Color based on usage level (using vibrant 256-color palette)
+if [ "$PERCENT_USED" -ge 80 ]; then
+  CTX_COLOR="$CTX_RED"      # Coral red - critical
+elif [ "$PERCENT_USED" -ge 60 ]; then
+  CTX_COLOR="$CTX_ORANGE"   # Peach - high usage
+elif [ "$PERCENT_USED" -ge 40 ]; then
+  CTX_COLOR="$CTX_YELLOW"   # Peach - moderate
+else
+  CTX_COLOR="$CTX_GREEN"    # Mint green - healthy
+fi
+
+CTX_DISPLAY="${CTX_COLOR}${PERCENT_USED}%${RESET}"
+
+# Generate progress bar (8 chars wide for compactness)
+CTX_BAR=$(progress_bar "$PERCENT_USED" 8)
+CTX_BAR_DISPLAY="${DIM}[${RESET}${CTX_COLOR}${CTX_BAR}${RESET}${DIM}]${RESET}"
+
 # Parse cost
 TOTAL_COST=$(echo "$input" | jq -r '.cost.total_cost_usd // 0')
 COST_DISPLAY=""
@@ -241,64 +276,122 @@ if [ "$TOTAL_COST" != "0" ] && [ "$TOTAL_COST" != "null" ]; then
 fi
 
 # ============================================================================
-# Session Time Remaining (via ccusage if available)
+# Session Time Remaining (Native - reads Claude Code's local JSONL files)
 # ============================================================================
+# Claude Code uses 5-hour billing blocks. Block starts with first message activity.
+# We scan ~/.claude/projects/*/*.jsonl to find the earliest message in the current
+# 5-hour window and calculate remaining time.
+#
+# Algorithm (like ccusage):
+# 1. Find all timestamps from JSONL files modified in last 5 hours
+# 2. Sort and find the earliest timestamp >= (now - 5 hours)
+# 3. That's the block start; block end = block start + 5 hours
+# 4. Remaining = block end - now
+#
+# Optimization: Cache result for 60 seconds to avoid repeated scans
 SESSION_DISPLAY=""
 if [ "$SHOW_SESSION_TIME" = "true" ]; then
-  # Try to get session info from ccusage (fast cached check)
-  if command -v npx >/dev/null 2>&1 && command -v jq >/dev/null 2>&1; then
-    # Use timeout to prevent blocking - ccusage should be fast
-    BLOCKS_OUTPUT=$(timeout 3 npx ccusage@latest blocks --json 2>/dev/null || true)
-
-    if [ -n "$BLOCKS_OUTPUT" ]; then
-      ACTIVE_BLOCK=$(echo "$BLOCKS_OUTPUT" | jq -c '.blocks[] | select(.isActive == true)' 2>/dev/null | head -n1)
-
-      if [ -n "$ACTIVE_BLOCK" ]; then
-        # Get reset time
-        RESET_TIME_STR=$(echo "$ACTIVE_BLOCK" | jq -r '.usageLimitResetTime // .endTime // empty')
-        START_TIME_STR=$(echo "$ACTIVE_BLOCK" | jq -r '.startTime // empty')
-
-        if [ -n "$RESET_TIME_STR" ] && [ -n "$START_TIME_STR" ]; then
-          START_SEC=$(to_epoch "$START_TIME_STR")
-          END_SEC=$(to_epoch "$RESET_TIME_STR")
-          NOW_SEC=$(date +%s)
-
-          if [ -n "$START_SEC" ] && [ -n "$END_SEC" ] && [ "$START_SEC" -gt 0 ] && [ "$END_SEC" -gt 0 ]; then
-            TOTAL=$(( END_SEC - START_SEC ))
-            [ "$TOTAL" -lt 1 ] && TOTAL=1
-
-            ELAPSED=$(( NOW_SEC - START_SEC ))
-            [ "$ELAPSED" -lt 0 ] && ELAPSED=0
-            [ "$ELAPSED" -gt "$TOTAL" ] && ELAPSED=$TOTAL
-
-            SESSION_PCT=$(( ELAPSED * 100 / TOTAL ))
-            REMAINING=$(( END_SEC - NOW_SEC ))
-            [ "$REMAINING" -lt 0 ] && REMAINING=0
-
-            # Format remaining time
-            RH=$(( REMAINING / 3600 ))
-            RM=$(( (REMAINING % 3600) / 60 ))
-
-            # Color based on time remaining (using vibrant 256-color palette)
-            if [ "$RH" -eq 0 ] && [ "$RM" -lt 30 ]; then
-              SESSION_COLOR="$SESSION_RED"     # Light pink - critical
-            elif [ "$RH" -eq 0 ]; then
-              SESSION_COLOR="$SESSION_YELLOW"  # Light yellow - getting low
-            else
-              SESSION_COLOR="$SESSION_GREEN"   # Light green - plenty of time
-            fi
-
-            # Build compact display: "⏱2h15m" or "⏱45m"
-            if [ "$RH" -gt 0 ]; then
-              SESSION_DISPLAY="${SESSION_COLOR}⏱${RH}h${RM}m${RESET}"
-            else
-              SESSION_DISPLAY="${SESSION_COLOR}⏱${RM}m${RESET}"
-            fi
-          fi
-        fi
+  SESSION_CACHE="/tmp/agileflow-session-cache"
+  CACHE_MAX_AGE=60  # seconds
+  NOW_SEC=$(date +%s)
+
+  # Check cache first
+  CACHED_BLOCK_START=""
+  if [ -f "$SESSION_CACHE" ]; then
+    CACHE_DATA=$(cat "$SESSION_CACHE" 2>/dev/null)
+    CACHE_TIME=$(echo "$CACHE_DATA" | cut -d: -f1)
+    CACHE_VALUE=$(echo "$CACHE_DATA" | cut -d: -f2)
+    if [ -n "$CACHE_TIME" ] && [ $((NOW_SEC - CACHE_TIME)) -lt "$CACHE_MAX_AGE" ] 2>/dev/null; then
+      CACHED_BLOCK_START="$CACHE_VALUE"
+    fi
+  fi
+
+  BLOCK_START_SEC=""
+
+  if [ -n "$CACHED_BLOCK_START" ] && [ "$CACHED_BLOCK_START" != "none" ]; then
+    BLOCK_START_SEC="$CACHED_BLOCK_START"
+  elif [ "$CACHED_BLOCK_START" != "none" ]; then
+    # Need to scan - use Python for speed (handles ISO timestamps natively)
+    CLAUDE_DATA_DIR="$HOME/.claude/projects"
+    BLOCK_DURATION=$((5 * 60 * 60))  # 5 hours in seconds
+    WINDOW_START=$((NOW_SEC - BLOCK_DURATION))
+
+    if [ -d "$CLAUDE_DATA_DIR" ]; then
+      BLOCK_START_SEC=$(python3 - "$CLAUDE_DATA_DIR" "$WINDOW_START" <<'PYTHON' 2>/dev/null
+import sys, os, json, glob
+from datetime import datetime
+
+data_dir = sys.argv[1]
+window_start = int(sys.argv[2])
+
+earliest = None
+# Only check files modified in last 5 hours (300 minutes)
+for jsonl_path in glob.glob(f"{data_dir}/*/*.jsonl"):
+    try:
+        mtime = os.path.getmtime(jsonl_path)
+        if mtime < window_start:
+            continue  # Skip old files
+        with open(jsonl_path, 'r') as f:
+            for line in f:
+                if '"timestamp"' not in line:
+                    continue
+                try:
+                    data = json.loads(line)
+                    ts_str = data.get('timestamp', '')
+                    if ts_str:
+                        # Parse ISO timestamp
+                        ts_str = ts_str.replace('Z', '+00:00')
+                        dt = datetime.fromisoformat(ts_str)
+                        epoch = int(dt.timestamp())
+                        if epoch >= window_start:
+                            if earliest is None or epoch < earliest:
+                                earliest = epoch
+                except:
+                    pass
+    except:
+        pass
+
+if earliest:
+    print(earliest)
+PYTHON
+)
+
+      # Cache the result
+      if [ -n "$BLOCK_START_SEC" ] && [ "$BLOCK_START_SEC" -gt 0 ] 2>/dev/null; then
+        echo "${NOW_SEC}:${BLOCK_START_SEC}" > "$SESSION_CACHE"
+      else
+        echo "${NOW_SEC}:none" > "$SESSION_CACHE"
       fi
     fi
   fi
+
+  # Calculate remaining time if we found a block start
+  if [ -n "$BLOCK_START_SEC" ] && [ "$BLOCK_START_SEC" -gt 0 ] 2>/dev/null; then
+    BLOCK_DURATION=$((5 * 60 * 60))
+    BLOCK_END_SEC=$((BLOCK_START_SEC + BLOCK_DURATION))
+    REMAINING=$((BLOCK_END_SEC - NOW_SEC))
+    [ "$REMAINING" -lt 0 ] && REMAINING=0
+
+    # Format remaining time
+    RH=$((REMAINING / 3600))
+    RM=$(((REMAINING % 3600) / 60))
+
+    # Color based on time remaining (using vibrant 256-color palette)
+    if [ "$RH" -eq 0 ] && [ "$RM" -lt 30 ]; then
+      SESSION_COLOR="$SESSION_RED"     # Light pink - critical
+    elif [ "$RH" -eq 0 ]; then
+      SESSION_COLOR="$SESSION_YELLOW"  # Light yellow - getting low
+    else
+      SESSION_COLOR="$SESSION_GREEN"   # Light green - plenty of time
+    fi
+
+    # Build compact display: "⏱2h15m" or "⏱45m"
+    if [ "$RH" -gt 0 ]; then
+      SESSION_DISPLAY="${SESSION_COLOR}⏱${RH}h${RM}m${RESET}"
+    else
+      SESSION_DISPLAY="${SESSION_COLOR}⏱${RM}m${RESET}"
+    fi
+  fi
 fi
 
 # ============================================================================
@@ -440,8 +533,8 @@ if [ "$SHOW_AGILEFLOW" = "true" ] && [ -n "$AGILEFLOW_DISPLAY" ]; then
   OUTPUT="${AGILEFLOW_DISPLAY}"
 fi
 
-# Model with subtle styling (if enabled)
-if [ "$SHOW_MODEL" = "true" ]; then
+# Model with subtle styling (if enabled and available)
+if [ "$SHOW_MODEL" = "true" ] && [ -n "$MODEL_DISPLAY" ]; then
   [ -n "$OUTPUT" ] && OUTPUT="${OUTPUT}${SEP}"
   OUTPUT="${OUTPUT}${DIM}[${RESET}${BOLD}${MODEL_DISPLAY}${RESET}${DIM}]${RESET}"
 fi