5-phase-workflow 1.8.5 → 1.8.7

package/README.md

@@ -130,6 +130,7 @@ All commands are available under the `/5:` namespace:
 | `/5:review-code` | 5 | AI-powered code review (Claude or CodeRabbit) |
 | `/5:address-review-findings` | 5 | Apply annotated findings and address PR comments |
 | `/5:quick-implement` | Fast | Streamlined workflow for small tasks |
+| `/5:eject` | Utility | Permanently remove update infrastructure |
 | `/5:unlock` | Utility | Remove planning guard lock |
 
 ## Configuration
@@ -264,6 +265,7 @@ After installation, your `.claude/` directory will contain:
 │   ├── discuss-feature.md
 │   ├── quick-implement.md
 │   ├── configure.md
+│   ├── eject.md
 │   └── unlock.md
 ├── skills/                   # Atomic operations
 │   ├── build-project/
@@ -364,6 +366,21 @@ npx 5-phase-workflow
 - User-created commands, agents, skills, hooks, and templates are preserved
 - Only workflow-managed files are updated
 
+### Ejecting
+
+If you want to permanently opt out of the update system (e.g., to customize workflow files without future updates overwriting them), run:
+
+```bash
+/5:eject
+```
+
+This permanently removes the update infrastructure:
+- Deletes `check-updates.js` hook, `update.md` and `eject.md` commands
+- Deletes `.5/version.json` and `.5/.update-cache.json`
+- Removes the update check hook entry from `.claude/settings.json`
+
+All other workflow files remain untouched. **This is irreversible.** To restore update functionality, reinstall with `npx 5-phase-workflow`.
+
 ## Development
 
 ### Running Tests

package/bin/install.js

@@ -258,7 +258,11 @@ const LEGACY_REMOVED_FILES = [
   'agents/integration-agent.md',
   'agents/step-fixer.md',
   'agents/step-verifier.md',
-  'agents/verification-agent.md'
+  'agents/verification-agent.md',
+  'templates/STACK.md',
+  'templates/STRUCTURE.md',
+  'templates/CONVENTIONS.md',
+  'templates/INTEGRATIONS.md'
 ];
 
 // Get list of workflow-owned files/directories (not user-created)
@@ -274,8 +278,6 @@ function getWorkflowManagedFiles() {
 
     // Skills: specific skill directories
     skills: [
-      'build-project',
-      'run-tests',
       'configure-project',
       'generate-readme'
     ],
@@ -299,10 +301,6 @@ function getWorkflowManagedFiles() {
       // Project documentation templates
       'ARCHITECTURE.md',
       'CONCERNS.md',
-      'CONVENTIONS.md',
-      'INTEGRATIONS.md',
-      'STACK.md',
-      'STRUCTURE.md',
       'TESTING.md',
       // Workflow output templates
       'workflow/FEATURE-SPEC.md',
@@ -626,6 +624,7 @@ function showCommandsHelp(isGlobal) {
   log.info('  /5:address-review-findings   - Apply review findings & PR comments');
   log.info('  /5:configure                 - Interactive project setup');
   log.info('  /5:reconfigure               - Refresh docs/skills (no Q&A)');
+  log.info('  /5:eject                     - Eject from update mechanism');
   log.info('  /5:unlock                    - Remove planning guard lock');
   log.info('');
   log.info(`Config file: ${path.join(getDataPath(isGlobal), 'config.json')}`);

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.5",
+  "version": "1.8.7",
   "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

@@ -312,21 +312,23 @@ Generates CLAUDE.md with codebase analysis and creates project-specific skills.
 ## 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
+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 CLAUDE.md:**
 - Project overview and build commands
-- "Getting Started" guide with references to appropriate files
+- Links to whichever `.5/` documentation files were created
+- Workflow rules section (verbatim):
+  ```
+  ## Workflow Rules
+  When running `/5:` workflow commands, follow the command instructions exactly as written.
+  Do not skip steps, combine phases, or proceed to actions not specified in the current command.
+  Each phase produces a specific artifact — do not create artifacts belonging to other phases.
+  ```
 - Mandatory coding guidelines:
   1. Types should be clear and types should be available when possible
   2. Use doc (jsdoc, javadoc, pydoc, etc) concisely. No doc is better than meaningless doc
@@ -363,17 +365,13 @@ 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)
+- [ ] Empty sections omitted (no "Not detected" / "None found" placeholders)
+- [ ] `CLAUDE.md` exists with references to created `.5/` files
 - [ ] 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

package/src/commands/5/eject.md

@@ -0,0 +1,91 @@
+---
+name: 5:eject
+description: Eject from the update mechanism — permanently removes update infrastructure
+allowed-tools: Bash, Read, Edit, AskUserQuestion
+user-invocable: true
+model: haiku
+context: fork
+---
+
+<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
+
+Ejecting permanently removes the update system from this installation. After ejecting:
+- The update check hook (`check-updates.js`) is deleted
+- The update command (`/5:update`) is deleted
+- The eject command (`/5:eject`) is deleted
+- Version tracking (`.5/version.json`) is deleted
+- The update cache (`.5/.update-cache.json`) is deleted
+- The `check-updates.js` hook entry is removed 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:
+> - `.claude/hooks/check-updates.js` (update check hook)
+> - `.claude/commands/5/update.md` (update command)
+> - `.claude/commands/5/eject.md` (this command)
+> - `.5/version.json` (version tracking)
+> - `.5/.update-cache.json` (update cache)
+>
+> The `check-updates.js` hook entry will also be removed from `.claude/settings.json`.
+>
+> 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
+```
+
+## Step 4: Clean Up settings.json
+
+Read `.claude/settings.json`. Remove the hook entry from the `hooks.SessionStart` array where the command is `node .claude/hooks/check-updates.js`.
+
+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`

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

@@ -8,24 +8,27 @@ context: fork
 ---
 
 <role>
-You are a Feature Planner. Your only output is a feature specification file.
-You do NOT implement code. You write NO code. You spawn ONLY Explore agents (subagent_type=Explore).
-You write ONLY to .5/.planning-active and .5/features/{name}/feature.md.
-After creating the spec, you are DONE. Do not continue into implementation planning or coding.
+You are a Feature Planner. Your ONLY deliverable is a feature specification file (feature.md).
+You do NOT implement code. You do NOT create implementation plans. You spawn ONLY Explore agents (subagent_type=Explore).
+You write ONLY to .5/.planning-active, .5/features/{name}/codebase-scan.md, and .5/features/{name}/feature.md.
+After creating the spec, you are FINISHED. You do not continue. You do not offer to continue.
 </role>
 
 <constraints>
 HARD CONSTRAINTS — violations waste tokens and get blocked by plan-guard:
 - NEVER write code, pseudo-code, or implementation snippets in any output
 - NEVER describe HOW something will be implemented (file contents, signatures, class structures)
+- NEVER create an implementation plan, file list, component breakdown, or step-by-step build guide — that is Phase 2's job
+- NEVER suggest "shall I continue with implementation planning?" or "let me create the plan" — you are DONE after feature.md
+- NEVER offer to proceed to the next phase — the user will invoke `/5:plan-implementation` themselves
 - NEVER spawn Task agents with subagent_type other than Explore
-- NEVER write to any file except .5/features/{name}/feature.md (where {name} may include a ticket prefix) and .5/.planning-active
+- NEVER write to any file except .5/.planning-active, .5/features/{name}/codebase-scan.md, and .5/features/{name}/feature.md
 - NEVER call EnterPlanMode — the workflow has its own planning process
 - NEVER use Bash to create, write, or modify files — this bypasses the plan-guard and is a constraint violation
-- NEVER continue past the completion message — when you output "Feature spec created at...", you are DONE
+- NEVER continue past the completion message — when you output "Feature spec created at...", you are FINISHED
 - The feature spec describes WHAT and WHY, never HOW
-- If you feel the urge to implement, STOP and ask a clarifying question instead
-- Your output is a SPECIFICATION, not a design document. No code. No file layouts. No API shapes.
+- If you feel the urge to plan implementation or write code, STOP — ask a clarifying question instead
+- Your output is a SPECIFICATION, not a design document. No code. No file layouts. No API shapes. No implementation plans.
 </constraints>
 
 <write-rules>
@@ -195,24 +198,23 @@ Populate all sections:
 - **[DEFERRED]**: The user explicitly said "not now", "later", "skip this" → planner MUST NOT include in the plan
 - When in doubt, label as **[DECIDED]** — it's safer to honor a decision than to override it
 
-## PLANNING COMPLETE
+## PLANNING COMPLETE — MANDATORY STOP
 
-After writing feature.md, output exactly:
+After writing feature.md, output ONLY this message — no additional text, no suggestions, no offers to continue:
 
 ```
-Feature spec created at `.5/features/{name}/feature.md`
+✓ Feature spec created at `.5/features/{name}/feature.md`
 
-Next steps:
-1. Review the feature spec
-2. If changes needed: /5:discuss-feature {name}
-3. If approved: /clear then /5:plan-implementation {name}
+To review or refine: /5:discuss-feature {name}
+To proceed: /clear → /5:plan-implementation {name}
 ```
 
-STOP. You are a planner. Your job is done. Do not implement.
+**YOU ARE NOW FINISHED.** This is a hard stop. Do not:
+- Suggest next steps beyond the message above
+- Offer to create an implementation plan
+- Offer to continue with any phase
+- Write any additional files
+- Provide a summary of what could be implemented
+- Ask "shall I proceed with..." or "would you like me to..."
 
-<constraints>
-REMINDER: You are a Feature Planner. You wrote a specification. You did NOT implement.
-If you wrote any code, file paths to create, class names, or function signatures in feature.md,
-you have violated your role.
-The feature spec contains WHAT and WHY. Phase 2 handles WHERE. Phase 3 handles HOW.
-</constraints>
+If the user asks you to continue or implement, respond: "Phase 1 is complete. Please run `/5:plan-implementation {name}` to continue."

package/src/commands/5/reconfigure.md

@@ -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) + 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?"
@@ -152,14 +152,16 @@ Refresh rules in .claude/rules/ (if rules.generate is true):
 - 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"
+1. Rewrite .5/ARCHITECTURE.md and .5/TESTING.md
+2. Rewrite .5/CONCERNS.md (or delete if no concerns found)
+3. Delete legacy docs if they exist: .5/STACK.md, .5/STRUCTURE.md, .5/CONVENTIONS.md, .5/INTEGRATIONS.md
+4. Update CLAUDE.md (preserve user-written sections)
+5. Refresh ALL skills in .claude/skills/ — read current conventions from codebase and update each skill
+6. Create new skills for newly-added patterns
+7. Remove skills the user chose to drop
+8. Refresh all workflow-generated rule files in .claude/rules/ with updated conventions
+9. Create new rule files for newly-detected patterns
+10. Remove rule files the user chose to drop"
 ```
 
 Use `subagent_type: "general-purpose"` for the Task.

package/src/hooks/plan-guard.js

@@ -99,9 +99,15 @@ process.stdin.on('end', () => {
 
     if (toolName === 'Write' || toolName === 'Edit') {
       const filePath = toolInput.file_path || '';
-      if (filePath && !isInsideDotFive(filePath, workspaceDir)) {
+      if (!filePath) {
+        process.exit(0);
+      }
+
+      const phase = getPlanningPhase(workspaceDir);
+
+      // First check: block anything outside .5/
+      if (!isInsideDotFive(filePath, workspaceDir)) {
         const blockCount = incrementBlockCount(workspaceDir);
-        const phase = getPlanningPhase(workspaceDir);
         const isSourceFile = !filePath.includes('.5/') && !filePath.includes('.claude/');
         const escalation = blockCount >= 3
           ? ` CRITICAL: Block #${blockCount}. You have attempted to write source files ${blockCount} times. You are a PLANNER, not an implementer. Writing source code is Phase 3's job. Return to your Progress Checklist, finish your planning artifact, and STOP.`
@@ -118,6 +124,22 @@ process.stdin.on('end', () => {
         );
         process.exit(2);
       }
+
+      // Second check: during plan-feature, only allow specific files
+      if (phase === 'plan-feature' && !isAllowedPlanFeatureFile(filePath, workspaceDir)) {
+        const blockCount = incrementBlockCount(workspaceDir);
+        const escalation = blockCount >= 3
+          ? ` CRITICAL: Block #${blockCount}. You are attempting to create implementation artifacts during Phase 1. Phase 1 ONLY produces feature.md. STOP and output your completion message.`
+          : '';
+        process.stderr.write(
+          `BLOCKED: During plan-feature (Phase 1), you may only write to .planning-active, codebase-scan.md, and feature.md. ` +
+          `Attempted: "${filePath}". ` +
+          `You are creating implementation artifacts (e.g., plan.md) which belongs to Phase 2. ` +
+          `REDIRECT: If you have already written feature.md, output the completion message and STOP. ` +
+          `Do NOT create implementation plans, file lists, or any other artifacts.${escalation}`
+        );
+        process.exit(2);
+      }
     }
 
     process.exit(0);
@@ -127,6 +149,23 @@ process.stdin.on('end', () => {
   }
 });
 
+function isAllowedPlanFeatureFile(filePath, workspaceDir) {
+  const resolved = path.resolve(workspaceDir, filePath);
+  const dotFiveDir = path.join(workspaceDir, '.5');
+
+  // Allow .5/.planning-active
+  if (resolved === path.join(dotFiveDir, '.planning-active')) return true;
+
+  // Allow .5/features/{name}/feature.md and .5/features/{name}/codebase-scan.md
+  const featuresDir = path.join(dotFiveDir, 'features');
+  if (resolved.startsWith(featuresDir + path.sep)) {
+    const basename = path.basename(resolved);
+    if (basename === 'feature.md' || basename === 'codebase-scan.md') return true;
+  }
+
+  return false;
+}
+
 function isInsideDotFive(filePath, workspaceDir) {
   const resolved = path.resolve(workspaceDir, filePath);
   const dotFiveDir = path.join(workspaceDir, '.5');

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;
-}
+}