5-phase-workflow 1.8.6 → 1.8.8

package/docs/workflow-guide.md

@@ -74,7 +74,7 @@ The installer copies workflow files to `.claude/` directory. **It does NOT creat
 After completing these steps, you have:
 - `.5/config.json` with your project settings
 - `CLAUDE.md` with comprehensive project documentation
-- `.5/STRUCTURE.md`, `.5/STACK.md`, etc. with modular documentation
+- `.5/ARCHITECTURE.md`, `.5/TESTING.md`, `.5/CONCERNS.md` with focused documentation
 - Project-specific skills in `.claude/skills/`
 
 **Without configuration, workflow commands will fail.**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "5-phase-workflow",
-  "version": "1.8.6",
+  "version": "1.8.8",
   "description": "A 5-phase feature development workflow for Claude Code",
   "bin": {
     "5-phase-workflow": "bin/install.js"

package/src/commands/5/address-review-findings.md

@@ -296,8 +296,8 @@ If `gh api` is unavailable or fails, log the failure and continue. Do NOT abort
 
 After all fixes are applied:
 
-1. **Build:** Use the `/build-project` skill: `Skill tool: skill="build-project", args="target=compile"`
-2. **Test:** Use the `/run-tests` skill: `Skill tool: skill="run-tests", args="target=all"`
+1. **Build:** Use the project's build skill (e.g., `run-build`) generated during configure
+2. **Test:** Use the project's test skill (e.g., `run-tests`) generated during configure
 3. **Lint:** Check for any lint warnings and errors
 
 If build fails:

package/src/commands/5/configure.md

@@ -23,7 +23,7 @@ This command is **Phase 1** of the 5-phase workflow applied to project configura
 After running this command, proceed through the standard phases:
 1. **`/5:configure`** (this command) - Plan the configuration feature
 2. `/5:plan-implementation CONFIGURE` - Create implementation plan
-3. `/5:implement-feature CONFIGURE` - Execute configuration (uses `configure-project` skill)
+3. `/5:implement-feature CONFIGURE` - Execute configuration (uses `configure-docs-index` and `configure-skills`)
 4. `/5:verify-implementation` - Verify configuration
 5. `/5:review-code` - Review generated files
 
@@ -307,26 +307,32 @@ Write `.5/features/CONFIGURE/feature.md` containing all gathered data:
 # Feature: Project Configuration
 
 ## Summary
-Generates CLAUDE.md with codebase analysis and creates project-specific skills. (config.json already written.)
+Generates CLAUDE.md, a rebuildable codebase index, and project-specific skills. (config.json already written.)
 
 ## Requirements
 
 ### Requirement 1: Generate Documentation Files
-Analyze the codebase and generate modular documentation:
-
-**Create separate documentation files in `.5/` folder:**
-- `.5/ARCHITECTURE.md` - Architectural patterns and layers
-- `.5/STACK.md` - Technology stack and dependencies
-- `.5/STRUCTURE.md` - Directory layout and organization
-- `.5/CONVENTIONS.md` - Coding standards and patterns
-- `.5/TESTING.md` - Test framework and patterns
-- `.5/INTEGRATIONS.md` - External services and APIs
-- `.5/CONCERNS.md` - Tech debt, bugs, and risks
-
-**Create CLAUDE.md as navigation hub:**
-- Quick reference section with links to all `.5/*.md` files
+Handled by: `configure-docs-index`
+
+Analyze the codebase and generate focused documentation capturing only non-derivable knowledge (skip version numbers, dependency lists, directory layouts, linter configs — Claude Code can look these up directly):
+
+**Create documentation files in `.5/` folder:**
+- `.5/ARCHITECTURE.md` - Architecture pattern, layers & data flow, key abstractions, non-obvious conventions, where to add new code
+- `.5/TESTING.md` - Test organization, patterns, mocking approach, gotchas
+- `.5/CONCERNS.md` - Tech debt, known issues, security/integration/performance notes (**only if concerns found — skip file entirely if nothing detected**)
+
+**Create a rebuildable codebase index in `.5/index/`:**
+- Generate a repository-local script at `.5/index/rebuild-index.sh`
+- Generate multiple focused Markdown index files in `.5/index/` plus `.5/index/README.md`
+- Keep the index generic and adapted to the actual project
+- Skip empty categories; do not create placeholder index files
+- Re-running the script should fully refresh the index in place
+
+**Create CLAUDE.md:**
 - Project overview and build commands
-- "Getting Started" guide with references to appropriate files
+- Links to whichever `.5/` documentation files were created
+- Links to `.5/index/README.md`, the generated index files, and `.5/index/rebuild-index.sh`
+- An explicit instruction that if the codebase index is older than one day, it should be regenerated by running `.5/index/rebuild-index.sh`
 - Workflow rules section (verbatim):
   ```
   ## Workflow Rules
@@ -346,6 +352,7 @@ Analyze the codebase and generate modular documentation:
 - If CLAUDE.md already exists, preserve user-written custom sections
 
 ### Requirement 2: Generate Project-Specific Skills
+Handled by: `configure-skills`
 
 **Create-* skills** for each user-selected architectural pattern:
 - Skill name: `create-{pattern}` (e.g., `create-controller`, `create-service`)
@@ -360,6 +367,8 @@ Analyze the codebase and generate modular documentation:
 Include only patterns/commands where user selected "Generate".
 
 ### Requirement 3: Generate Scoped Rules (if selected)
+Handled by: `configure-skills`
+
 Generate `.claude/rules/` files with project-specific conventions scoped to relevant file types.
 Rules are concise directives (15-40 lines, NOT documentation) derived from codebase analysis.
 Only generate rules for patterns that were actually detected:
@@ -370,17 +379,19 @@ Only generate rules for patterns that were actually detected:
 
 ## Acceptance Criteria
 - [ ] `.5/` directory created
-- [ ] All 7 documentation files exist and are populated:
-  - [ ] `.5/ARCHITECTURE.md`
-  - [ ] `.5/STACK.md`
-  - [ ] `.5/STRUCTURE.md`
-  - [ ] `.5/CONVENTIONS.md`
-  - [ ] `.5/TESTING.md`
-  - [ ] `.5/INTEGRATIONS.md`
-  - [ ] `.5/CONCERNS.md`
-- [ ] `CLAUDE.md` exists with references to `.5/` files
+- [ ] Documentation files exist and contain only non-derivable knowledge:
+  - [ ] `.5/ARCHITECTURE.md` — architecture, conventions, where to add code
+  - [ ] `.5/TESTING.md` — test patterns and gotchas
+  - [ ] `.5/CONCERNS.md` — only if concerns were found (omit if empty)
+- [ ] `.5/index/` directory exists
+- [ ] `.5/index/rebuild-index.sh` exists and rebuilds the index
+- [ ] `.5/index/README.md` exists and documents the generated index files
+- [ ] Multiple focused `.5/index/*.md` files are generated for applicable codebase concerns
+- [ ] Empty sections omitted (no "Not detected" / "None found" placeholders)
+- [ ] `CLAUDE.md` exists with references to created `.5/` files
+- [ ] `CLAUDE.md` links to the codebase index and rebuild script
+- [ ] `CLAUDE.md` says to regenerate the index if it is older than one day
 - [ ] CLAUDE.md contains 6 coding guidelines
-- [ ] No placeholder text like `{YYYY-MM-DD}` remains unfilled
 - [ ] All specified project-specific skills are generated in `.claude/skills/`
 - [ ] Generated skills reference actual project conventions
 - [ ] If CLAUDE.md existed before, user-written sections are preserved
@@ -404,4 +415,5 @@ Tell the user:
 4. "After that: Continue with `/5:implement-feature CONFIGURE` -> `/5:verify-implementation` -> `/5:review-code` (clearing context between each phase)"
 
 ## Related Documentation
-- [configure-project skill](../../skills/configure-project/SKILL.md)
+- [configure-docs-index skill](../../skills/configure-docs-index/SKILL.md)
+- [configure-skills skill](../../skills/configure-skills/SKILL.md)

package/src/commands/5/eject.md

@@ -0,0 +1,110 @@
+---
+name: 5:eject
+description: Eject from the update mechanism — permanently removes update infrastructure
+allowed-tools: Bash, Read, Edit, AskUserQuestion
+user-invocable: true
+---
+
+<role>
+You are a Workflow Ejector. You permanently remove the update infrastructure from this installation.
+After ejecting, you are DONE.
+</role>
+
+# Eject from Update Mechanism
+
+Determine which runtime is installed before making any changes:
+- Claude Code install: workflow files live in `.claude/`
+- Codex install: workflow files live in `.codex/`
+
+Use runtime-appropriate paths in every step below.
+
+Ejecting permanently removes the update system from this installation. After ejecting:
+- The update infrastructure files are deleted
+- Version tracking (`.5/version.json`) is deleted
+- The update cache (`.5/.update-cache.json`) is deleted
+- Claude Code installs also remove the `check-updates.js` hook entry from `.claude/settings.json`
+
+All other workflow files (commands, skills, hooks, templates) remain untouched.
+
+**This is irreversible.** To restore update functionality, reinstall with `npx 5-phase-workflow`.
+
+## Step 1: Check Current State
+
+Read `.5/version.json`. If it doesn't exist, tell the user: "No 5-Phase Workflow installation found (or already ejected)." and stop.
+
+Note the `packageVersion` for the confirmation message.
+
+## Step 2: Confirm with User
+
+Tell the user what ejecting means:
+
+> **Eject from 5-Phase Workflow updates?**
+>
+> This will permanently delete:
+> - `.5/version.json` (version tracking)
+> - `.5/.update-cache.json` (update cache)
+>
+> For Claude Code installs:
+> - `.claude/hooks/check-updates.js` (update check hook)
+> - `.claude/commands/5/update.md` (update command)
+> - `.claude/commands/5/eject.md` (this command)
+> - The `check-updates.js` hook entry in `.claude/settings.json`
+>
+> For Codex installs:
+> - `.codex/skills/5-update/` (update skill)
+> - `.codex/skills/5-eject/` (this skill)
+> - `.codex/instructions.md` is removed only if it is workflow-managed and no longer needed for remaining installed workflow files
+>
+> All other workflow files remain untouched. To restore updates later, reinstall with `npx 5-phase-workflow`.
+
+Ask: "Proceed with eject?"
+
+If the user declines, stop here.
+
+## Step 3: Delete Update Files
+
+Run this command to delete the update-related files:
+
+```bash
+rm -f .claude/hooks/check-updates.js .claude/commands/5/update.md .claude/commands/5/eject.md .5/version.json .5/.update-cache.json
+```
+
+For Codex installs, remove the runtime-appropriate files instead:
+
+```bash
+rm -rf .codex/skills/5-update .codex/skills/5-eject
+rm -f .5/version.json .5/.update-cache.json
+```
+
+## Step 4: Clean Up settings.json
+
+Claude Code installs only: read `.claude/settings.json`. Remove the hook entry from the `hooks.SessionStart` array where the command is `node .claude/hooks/check-updates.js`.
+
+Codex installs do not use `.claude/settings.json` or Claude hooks for updates, so skip this step for Codex.
+
+Specifically, find and remove the object in the `SessionStart` array that looks like:
+
+```json
+{
+  "matcher": "startup",
+  "hooks": [
+    {
+      "type": "command",
+      "command": "node .claude/hooks/check-updates.js",
+      "timeout": 10
+    }
+  ]
+}
+```
+
+If the `SessionStart` array becomes empty after removal, remove the `SessionStart` key entirely. Write the updated settings back.
+
+## Step 5: Confirm
+
+Tell the user:
+
+> Ejected successfully. Update infrastructure has been removed from this installation (was v{packageVersion}).
+>
+> To restore update functionality, reinstall with: `npx 5-phase-workflow`
+>
+> If this was a Codex install, use: `npx 5-phase-workflow --codex`

package/src/commands/5/plan-feature.md

@@ -4,7 +4,6 @@ description: Plans feature implementation by analyzing requirements, identifying
 allowed-tools: Read, Write, Task, AskUserQuestion
 user-invocable: true
 model: opus
-context: fork
 ---
 
 <role>

package/src/commands/5/plan-implementation.md

@@ -4,7 +4,6 @@ description: Creates an implementation plan from a feature spec. Phase 2 of the
 allowed-tools: Read, Write, Task, AskUserQuestion
 user-invocable: true
 model: opus
-context: fork
 ---
 
 <role>

package/src/commands/5/quick-implement.md

@@ -3,7 +3,6 @@ name: 5:quick-implement
 description: Execute small, focused implementations quickly with state tracking and atomic commits. Skips extensive planning phases and verification agents - use for tasks where you know exactly what to do.
 allowed-tools: Read, Write, Edit, Glob, Grep, Bash, Task, AskUserQuestion, Skill, TaskCreate, TaskUpdate, TaskList, mcp__jetbrains__*
 user-invocable: true
-context: fork
 ---
 
 <role>

package/src/commands/5/reconfigure.md

@@ -1,6 +1,6 @@
 ---
 name: 5:reconfigure
-description: Lightweight refresh of project documentation and skills without full Q&A. Re-detects codebase changes, regenerates .5/*.md docs, updates CLAUDE.md, and refreshes all skills.
+description: Lightweight refresh of project documentation, codebase index, and skills without full Q&A. Re-detects codebase changes, regenerates .5/*.md docs, rebuilds .5/index/, updates CLAUDE.md, and refreshes all skills.
 allowed-tools: Read, Write, Bash, Glob, Grep, Task, AskUserQuestion
 user-invocable: true
 context: fork
@@ -9,7 +9,7 @@ context: fork
 <role>
 You are a Project Reconfigurer. You refresh documentation and skills using existing config.json preferences.
 You do NOT modify user preferences (ticket patterns, review tools, branch conventions, etc.).
-You detect codebase changes, confirm with the user, invoke configure-project skill, then report.
+You detect codebase changes, confirm with the user, invoke the configuration refresh skills, then report.
 After reporting what was updated, you are DONE.
 </role>
 
@@ -37,7 +37,7 @@ Your job:
 ✅ Re-detect codebase patterns and commands (same as configure Steps 1b-1h)
 ✅ Compare detected state with config.json skill selections
 ✅ Show summary and ask for confirmation
-✅ Invoke configure-project skill in refresh mode
+✅ Invoke `configure-docs-index` and `configure-skills` in refresh mode
 ✅ Update version.json with artifacts and timestamps
 ✅ Clean up .reconfig-reminder flag
 ✅ Report what was updated
@@ -117,7 +117,7 @@ Use the existing skills in `.claude/skills/` (from Step 2e) as the source of tru
 
 Use `AskUserQuestion` to show a summary and get confirmation. Present:
 
-1. **Documentation files that will be rewritten** — list all 7 `.5/*.md` files + CLAUDE.md
+1. **Documentation files that will be rewritten** — list `.5/ARCHITECTURE.md`, `.5/TESTING.md`, `.5/CONCERNS.md` (conditional), `.5/index/rebuild-index.sh`, `.5/index/*.md`, and `CLAUDE.md`
 2. **Skills that will be refreshed** — list ALL skills found in `.claude/skills/` (both workflow-generated and user-created)
 3. **Rules that will be refreshed** (if rules enabled) — list workflow-generated rule files in `.claude/rules/`
 4. **New patterns detected** (if any) — "These patterns were found in your codebase but don't have skills yet: [list]. Create skills for them?"
@@ -134,10 +134,14 @@ New skills will be created and stale skills removed based on the user's choices.
 
 ### Step 5: Regenerate
 
-Invoke the `configure-project` skill in **refresh mode** via the Task tool:
+Invoke the refresh skills in **refresh mode** via the Task tool:
 
 ```
-Task prompt: "Run configure-project skill in REFRESH MODE.
+Task prompt 1: "Run configure-docs-index skill in REFRESH MODE.
+
+Refresh the generated documentation, rebuild the codebase index in `.5/index/`, delete legacy docs if they exist, and update `CLAUDE.md` while preserving user-written sections."
+
+Task prompt 2: "Run configure-skills skill in REFRESH MODE.
 
 Refresh ALL existing skills in .claude/skills/:
 - Existing create-* skills: [list from Step 2e]
@@ -150,16 +154,13 @@ Refresh rules in .claude/rules/ (if rules.generate is true):
 - Existing workflow rules: [list from Step 2f]
 - Rules to remove: [list from user confirmation, if any]
 - New rules to create: [if applicable]
-
-Re-analyze the entire codebase (A1 analysis) and:
-1. Rewrite all 7 .5/*.md documentation files
-2. Update CLAUDE.md (preserve user-written sections)
-3. Refresh ALL skills in .claude/skills/ — read current conventions from codebase and update each skill
-4. Create new skills for newly-added patterns
-5. Remove skills the user chose to drop
-6. Refresh all workflow-generated rule files in .claude/rules/ with updated conventions
-7. Create new rule files for newly-detected patterns
-8. Remove rule files the user chose to drop"
+Re-analyze the codebase and:
+1. Refresh ALL skills in .claude/skills/ — read current conventions from codebase and update each skill
+2. Create new skills for newly-added patterns
+3. Remove skills the user chose to drop
+4. Refresh all workflow-generated rule files in .claude/rules/ with updated conventions
+5. Create new rule files for newly-detected patterns
+6. Remove rule files the user chose to drop"
 ```
 
 Use `subagent_type: "general-purpose"` for the Task.
@@ -184,6 +185,7 @@ rm -f .5/.reconfig-reminder
 
 Show the user a summary:
 - List of documentation files updated
+- Mention whether the codebase index script and index files were regenerated
 - List of skills refreshed
 - List of new skills created (if any)
 - List of skills removed (if any)
@@ -195,4 +197,5 @@ Show the user a summary:
 
 ## Related Documentation
 - [configure command](./configure.md) — full Q&A configuration
-- [configure-project skill](../../skills/configure-project/SKILL.md) — the skill that does the heavy lifting
+- [configure-docs-index skill](../../skills/configure-docs-index/SKILL.md)
+- [configure-skills skill](../../skills/configure-skills/SKILL.md)

package/src/commands/5/update.md

@@ -25,6 +25,12 @@ Read `.5/version.json` and note the current `installedVersion`.
 npx 5-phase-workflow@latest --upgrade
 ```
 
+If this installation is running in Codex (workflow files live in `.codex/` or the workflow command was invoked as a `$5-...` skill), run this instead:
+
+```bash
+npx 5-phase-workflow@latest --codex --upgrade
+```
+
 ## Step 3: Confirm Upgrade
 
 Read `.5/version.json` again. Compare the new `installedVersion` to the previous one.
@@ -34,14 +40,16 @@ Read `.5/version.json` again. Compare the new `installedVersion` to the previous
 
 ## Step 4: Show What Changed
 
-Run `git status` to show the files modified by the upgrade. Summarize the changes for the user (e.g., "Updated 12 files in `.claude/commands/5/`, `.claude/skills/`, `.claude/hooks/`").
+Run `git status` to show the files modified by the upgrade. Summarize the changes for the user using the correct runtime paths:
+- Claude Code installs typically update files in `.claude/commands/5/`, `.claude/skills/`, `.claude/hooks/`, `.claude/templates/`, `.claude/settings.json`, and `.5/version.json`
+- Codex installs typically update files in `.codex/skills/`, `.codex/templates/`, `.codex/references/`, `.codex/instructions.md`, and `.5/version.json`
 
 ## Step 5: Ask to Commit
 
 Ask the user: "Would you like to commit the upgraded workflow files?"
 
 Options:
-1. **Yes** - commit the changes, do not mention claude
+1. **Yes** - commit the changes, do not mention Claude Code
 2. **No** - leave changes uncommitted
 
 If the user chooses **No**, stop here.
@@ -56,6 +64,11 @@ Build the commit message by applying the pattern:
 - If the pattern is the conventional format (`feat({ticket-id}): {short-description}`), use: `chore: update 5-Phase Workflow to {new-version}`
 - If no config or no pattern, use: `update 5-Phase Workflow to {new-version}`
 
-Stage **only** the workflow-managed files shown in `git status` (inside `.claude/commands/5/`, `.claude/skills/`, `.claude/hooks/`, `.claude/templates/`, `.claude/settings.json`, and `.5/version.json`). Never use `git add .` or `git add -A`.
+Stage **only** the workflow-managed files shown in `git status`.
+
+- For Claude Code installs, this usually means files inside `.claude/commands/5/`, `.claude/skills/`, `.claude/hooks/`, `.claude/templates/`, `.claude/settings.json`, and `.5/version.json`
+- For Codex installs, this usually means files inside `.codex/skills/`, `.codex/templates/`, `.codex/references/`, `.codex/instructions.md`, and `.5/version.json`
+
+Never use `git add .` or `git add -A`.
 
 Create the commit. Report success to the user.

package/src/hooks/statusline.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 // Claude Code Statusline
-// Shows: model | directory | context usage
+// Shows: model | folder | branch | off-peak | 5hr-usage | cost | context | reset-time
 
 const fs = require('fs');
 const path = require('path');
-const os = require('os');
+const { execSync } = require('child_process');
 
 // Read JSON from stdin
 let input = '';
@@ -13,77 +13,116 @@ process.stdin.on('data', chunk => input += chunk);
 process.stdin.on('end', () => {
   try {
     const data = JSON.parse(input);
+    const parts = [];
+
+    // 🤖 Model
     const model = data.model?.display_name || 'Claude';
+    parts.push(`\x1b[36m🤖 ${model}\x1b[0m`);
+
+    // 📁 Folder (basename only)
     const dir = data.workspace?.current_dir || process.cwd();
-    const session = data.session_id || '';
-    const remaining = data.context_window?.remaining_percentage;
+    const folderName = path.basename(dir);
+    parts.push(`\x1b[90m📁 ${folderName}\x1b[0m`);
 
-    // Context window display (shows USED percentage)
-    let ctx = '';
-    if (remaining != null) {
-      const rem = Math.round(remaining);
-      const used = Math.max(0, Math.min(100, 100 - rem));
+    // 🌿 Branch
+    let branch = data.worktree?.branch || '';
+    if (!branch) {
+      try {
+        branch = execSync('git rev-parse --abbrev-ref HEAD', {
+          encoding: 'utf8', cwd: dir, stdio: ['pipe', 'pipe', 'pipe']
+        }).trim();
+      } catch (e) { branch = ''; }
+    }
+    if (branch && branch !== 'HEAD') {
+      parts.push(`\x1b[32m🌿 ${branch}\x1b[0m`);
+    }
 
-      // Build progress bar (10 segments)
+    // 🚀 Off-peak indicator (weekdays before 5 AM or after 11 AM PT; all weekends)
+    // PT = UTC-8 (PST) or UTC-7 (PDT). Use UTC-7 as approximation (covers PDT/PST conservatively).
+    const nowUtc = new Date();
+    const ptHour = (nowUtc.getUTCHours() - 7 + 24) % 24; // approximate PT
+    const ptDay = new Date(nowUtc.getTime() - 7 * 3600 * 1000).getUTCDay(); // 0=Sun,6=Sat
+    const isWeekend = ptDay === 0 || ptDay === 6;
+    const isPeak = !isWeekend && ptHour >= 5 && ptHour < 11;
+    if (!isPeak) {
+      parts.push('\x1b[32m🚀 off-peak\x1b[0m');
+    }
+
+    // ⚡ 5-hour session usage
+    const fiveHrUsed = data.rate_limits?.five_hour?.used_percentage;
+    if (fiveHrUsed != null) {
+      const pct = Math.round(fiveHrUsed);
+      const color = pct < 50 ? '\x1b[32m' : pct < 75 ? '\x1b[33m' : '\x1b[31m';
+      parts.push(`${color}⚡ ${pct}%\x1b[0m`);
+    }
+
+    // 💰 Cost
+    const costUsd = data.cost?.total_cost_usd;
+    if (costUsd != null) {
+      const fmt = costUsd < 0.01 ? costUsd.toFixed(3) : costUsd.toFixed(2);
+      parts.push(`\x1b[33m💰 $${fmt}\x1b[0m`);
+    }
+
+    // 📊 Context window (progress bar)
+    const ctxUsed = data.context_window?.used_percentage;
+    const ctxRemaining = data.context_window?.remaining_percentage;
+    if (ctxUsed != null || ctxRemaining != null) {
+      const used = ctxUsed != null
+        ? Math.round(ctxUsed)
+        : Math.max(0, Math.min(100, 100 - Math.round(ctxRemaining)));
       const filled = Math.floor(used / 10);
       const bar = '█'.repeat(filled) + '░'.repeat(10 - filled);
+      let color;
+      if (used < 50)      color = '\x1b[32m';
+      else if (used < 65) color = '\x1b[33m';
+      else if (used < 80) color = '\x1b[38;5;208m';
+      else                color = '\x1b[5;31m';
+      parts.push(`${color}🧠 ${bar} ${used}%\x1b[0m`);
+    }
 
-      // Color based on usage
-      if (used < 50) {
-        ctx = ` \x1b[32m${bar} ${used}%\x1b[0m`;
-      } else if (used < 65) {
-        ctx = ` \x1b[33m${bar} ${used}%\x1b[0m`;
-      } else if (used < 80) {
-        ctx = ` \x1b[38;5;208m${bar} ${used}%\x1b[0m`;
-      } else {
-        ctx = ` \x1b[5;31m💀 ${bar} ${used}%\x1b[0m`;
+    // ⏱ Reset time (time until 5hr window resets)
+    const resetAt = data.rate_limits?.five_hour?.resets_at;
+    if (resetAt) {
+      const remaining = resetAt - Math.floor(Date.now() / 1000);
+      if (remaining > 0) {
+        const h = Math.floor(remaining / 3600);
+        const m = Math.floor((remaining % 3600) / 60);
+        const label = h > 0 ? `${h}h${m}m` : `${m}m`;
+        parts.push(`\x1b[90m⏱ ${label}\x1b[0m`);
       }
     }
 
-    // Shorten directory path for display
-    const shortDir = dir.replace(os.homedir(), '~');
-
-    // Check for available update and reconfigure reminder
-    let updateIndicator = '';
-    let reconfigIndicator = '';
+    // Update and reconfigure indicators
     try {
       const versionFile = path.join(dir, '.5', 'version.json');
       const versionData = JSON.parse(fs.readFileSync(versionFile, 'utf8'));
 
-      // Update check — read latestAvailableVersion from cache file (gitignored)
       const cacheFile = path.join(dir, '.5', '.update-cache.json');
       let latest = null;
       if (fs.existsSync(cacheFile)) {
         try {
           const cache = JSON.parse(fs.readFileSync(cacheFile, 'utf8'));
           latest = cache.latestAvailableVersion || null;
-        } catch(e) {}
+        } catch (e) {}
       }
-      const installed = versionData.packageVersion;
-      if (latest && installed && compareVersions(installed, latest) < 0) {
-        updateIndicator = ` | \x1b[33m↑${latest} → /5:update\x1b[0m`;
+      if (latest && versionData.packageVersion && compareVersions(versionData.packageVersion, latest) < 0) {
+        parts.push(`\x1b[33m↑${latest} → /5:update\x1b[0m`);
       }
 
-      // Reconfigure check (reads flag file in .5/, gitignored)
       const flagFile = path.join(dir, '.5', '.reconfig-reminder');
       if (fs.existsSync(flagFile)) {
-        reconfigIndicator = ` | \x1b[35m↻ /5:reconfigure\x1b[0m`;
+        parts.push(`\x1b[35m↻ /5:reconfigure\x1b[0m`);
       }
-    } catch (e) {
-      // No version file or parse error — no indicator
-    }
+    } catch (e) {}
 
-    // Build and output statusline: model | directory | context | update | reconfig
-    const statusline = `\x1b[36m${model}\x1b[0m | \x1b[90m${shortDir}\x1b[0m${ctx}${updateIndicator}${reconfigIndicator}`;
-    process.stdout.write(statusline);
+    process.stdout.write(parts.join(' | '));
 
   } catch (e) {
-    // Silent fail - don't break statusline on parse errors
+    // Silent fail — don't break statusline on parse errors
   }
 });
 
 // Compare semver versions: returns -1 if v1 < v2, 0 if equal, 1 if v1 > v2
-// Uses parseInt to handle pre-release tags (e.g., "2-beta" → 2)
 function compareVersions(v1, v2) {
   const parts1 = v1.split('.').map(p => parseInt(p, 10) || 0);
   const parts2 = v2.split('.').map(p => parseInt(p, 10) || 0);
@@ -92,4 +131,4 @@ function compareVersions(v1, v2) {
     if (parts1[i] < parts2[i]) return -1;
   }
   return 0;
-}
+}