agileflow 2.42.0 → 2.44.0

package/src/core/templates/agileflow-configure.js

@@ -44,6 +44,9 @@ const FEATURES = {
   statusline: { script: 'agileflow-statusline.sh' }
 };
 
+// Statusline component names
+const STATUSLINE_COMPONENTS = ['agileflow', 'model', 'story', 'epic', 'wip', 'context', 'cost', 'git'];
+
 const PROFILES = {
   full: {
     description: 'All features enabled',
@@ -615,6 +618,89 @@ function updateGitignore() {
   }
 }
 
+// ============================================================================
+// STATUSLINE COMPONENTS
+// ============================================================================
+
+function setStatuslineComponents(enableComponents = [], disableComponents = []) {
+  const metaPath = 'docs/00-meta/agileflow-metadata.json';
+
+  if (!fs.existsSync(metaPath)) {
+    warn('No metadata file found - run with --enable=statusline first');
+    return false;
+  }
+
+  const meta = readJSON(metaPath);
+  if (!meta) {
+    error('Cannot parse metadata file');
+    return false;
+  }
+
+  // Ensure statusline.components structure exists
+  meta.features = meta.features || {};
+  meta.features.statusline = meta.features.statusline || {};
+  meta.features.statusline.components = meta.features.statusline.components || {};
+
+  // Set defaults for any missing components
+  STATUSLINE_COMPONENTS.forEach(comp => {
+    if (meta.features.statusline.components[comp] === undefined) {
+      meta.features.statusline.components[comp] = true;
+    }
+  });
+
+  // Enable specified components
+  enableComponents.forEach(comp => {
+    if (STATUSLINE_COMPONENTS.includes(comp)) {
+      meta.features.statusline.components[comp] = true;
+      success(`Statusline component enabled: ${comp}`);
+    } else {
+      warn(`Unknown component: ${comp} (available: ${STATUSLINE_COMPONENTS.join(', ')})`);
+    }
+  });
+
+  // Disable specified components
+  disableComponents.forEach(comp => {
+    if (STATUSLINE_COMPONENTS.includes(comp)) {
+      meta.features.statusline.components[comp] = false;
+      success(`Statusline component disabled: ${comp}`);
+    } else {
+      warn(`Unknown component: ${comp} (available: ${STATUSLINE_COMPONENTS.join(', ')})`);
+    }
+  });
+
+  meta.updated = new Date().toISOString();
+  writeJSON(metaPath, meta);
+
+  return true;
+}
+
+function listStatuslineComponents() {
+  const metaPath = 'docs/00-meta/agileflow-metadata.json';
+
+  header('📊 Statusline Components');
+
+  if (!fs.existsSync(metaPath)) {
+    log('  No configuration found (defaults: all enabled)', c.dim);
+    STATUSLINE_COMPONENTS.forEach(comp => {
+      log(`  ✅ ${comp}: enabled (default)`, c.green);
+    });
+    return;
+  }
+
+  const meta = readJSON(metaPath);
+  const components = meta?.features?.statusline?.components || {};
+
+  STATUSLINE_COMPONENTS.forEach(comp => {
+    const enabled = components[comp] !== false; // default true
+    const icon = enabled ? '✅' : '❌';
+    const color = enabled ? c.green : c.dim;
+    log(`  ${icon} ${comp}: ${enabled ? 'enabled' : 'disabled'}`, color);
+  });
+
+  log('\nTo toggle: --show=<component> or --hide=<component>', c.dim);
+  log(`Components: ${STATUSLINE_COMPONENTS.join(', ')}`, c.dim);
+}
+
 // ============================================================================
 // PROFILES
 // ============================================================================
@@ -683,8 +769,8 @@ ${c.cyan}Usage:${c.reset}
 
 ${c.cyan}Profiles:${c.reset}
   --profile=full      All features (hooks, archival, statusline)
-  --profile=basic     SessionStart + PreCompact hooks only
-  --profile=minimal   Just SessionStart hook
+  --profile=basic     SessionStart + PreCompact + archival
+  --profile=minimal   SessionStart + archival only
   --profile=none      Disable all AgileFlow features
 
 ${c.cyan}Feature Control:${c.reset}
@@ -693,6 +779,13 @@ ${c.cyan}Feature Control:${c.reset}
 
   Features: sessionstart, precompact, stop, archival, statusline
 
+${c.cyan}Statusline Components:${c.reset}
+  --show=<list>       Show statusline components (comma-separated)
+  --hide=<list>       Hide statusline components (comma-separated)
+  --components        List statusline component status
+
+  Components: agileflow, model, story, epic, wip, context, cost, git
+
 ${c.cyan}Settings:${c.reset}
   --archival-days=N   Set archival threshold (default: 7)
 
@@ -711,6 +804,15 @@ ${c.cyan}Examples:${c.reset}
   # Disable a feature
   node scripts/agileflow-configure.js --disable=statusline
 
+  # Show only agileflow branding and context in statusline
+  node scripts/agileflow-configure.js --hide=model,story,epic,wip,cost,git
+
+  # Re-enable git branch in statusline
+  node scripts/agileflow-configure.js --show=git
+
+  # List component status
+  node scripts/agileflow-configure.js --components
+
   # Fix format issues
   node scripts/agileflow-configure.js --migrate
 
@@ -730,18 +832,24 @@ function main() {
   let profile = null;
   let enable = [];
   let disable = [];
+  let show = [];
+  let hide = [];
   let archivalDays = 7;
   let migrate = false;
   let detect = false;
+  let components = false;
   let help = false;
 
   args.forEach(arg => {
     if (arg.startsWith('--profile=')) profile = arg.split('=')[1];
     else if (arg.startsWith('--enable=')) enable = arg.split('=')[1].split(',').map(s => s.trim().toLowerCase());
     else if (arg.startsWith('--disable=')) disable = arg.split('=')[1].split(',').map(s => s.trim().toLowerCase());
+    else if (arg.startsWith('--show=')) show = arg.split('=')[1].split(',').map(s => s.trim().toLowerCase());
+    else if (arg.startsWith('--hide=')) hide = arg.split('=')[1].split(',').map(s => s.trim().toLowerCase());
     else if (arg.startsWith('--archival-days=')) archivalDays = parseInt(arg.split('=')[1]) || 7;
     else if (arg === '--migrate') migrate = true;
     else if (arg === '--detect' || arg === '--validate') detect = true;
+    else if (arg === '--components') components = true;
     else if (arg === '--help' || arg === '-h') help = true;
   });
 
@@ -750,6 +858,19 @@ function main() {
     return;
   }
 
+  // Components list mode
+  if (components && show.length === 0 && hide.length === 0) {
+    listStatuslineComponents();
+    return;
+  }
+
+  // Component toggle mode
+  if (show.length > 0 || hide.length > 0) {
+    setStatuslineComponents(show, hide);
+    listStatuslineComponents();
+    return;
+  }
+
   // Always detect first
   const status = detectConfig();
   const hasIssues = printStatus(status);

package/src/core/templates/agileflow-metadata.json

@@ -9,6 +9,18 @@
       "adr": true,
       "research": true,
       "messagebus": true,
+      "statusline": {
+        "components": {
+          "agileflow": true,
+          "model": true,
+          "story": true,
+          "epic": true,
+          "wip": true,
+          "context": true,
+          "cost": true,
+          "git": true
+        }
+      },
       "mcp": {
         "github": false,
         "notion": false

package/src/core/templates/agileflow-statusline.sh

@@ -12,7 +12,116 @@
 #   .context_window.current_usage.input_tokens - Current input tokens
 #   .workspace.current_dir       - Current working directory
 
-# Read JSON input from stdin (Claude Code provides this)
+# ============================================================================
+# ANSI Color Codes
+# ============================================================================
+RESET="\033[0m"
+BOLD="\033[1m"
+DIM="\033[2m"
+
+# Foreground colors
+BLACK="\033[30m"
+RED="\033[31m"
+GREEN="\033[32m"
+YELLOW="\033[33m"
+BLUE="\033[34m"
+MAGENTA="\033[35m"
+CYAN="\033[36m"
+WHITE="\033[37m"
+
+# Bright foreground colors
+BRIGHT_RED="\033[91m"
+BRIGHT_GREEN="\033[92m"
+BRIGHT_YELLOW="\033[93m"
+BRIGHT_BLUE="\033[94m"
+BRIGHT_MAGENTA="\033[95m"
+BRIGHT_CYAN="\033[96m"
+
+# Brand color (burnt orange #e8683a = RGB 232,104,58)
+BRAND="\033[38;2;232;104;58m"
+
+# ============================================================================
+# Read Component Configuration
+# ============================================================================
+# Default: all components enabled
+SHOW_AGILEFLOW=true
+SHOW_MODEL=true
+SHOW_STORY=true
+SHOW_EPIC=true
+SHOW_WIP=true
+SHOW_CONTEXT=true
+SHOW_COST=true
+SHOW_GIT=true
+
+# Check agileflow-metadata.json for component settings
+if [ -f "docs/00-meta/agileflow-metadata.json" ]; then
+  COMPONENTS=$(jq '.features.statusline.components // null' docs/00-meta/agileflow-metadata.json 2>/dev/null)
+  if [ "$COMPONENTS" != "null" ] && [ -n "$COMPONENTS" ]; then
+    # Use 'if . == null then true else . end' to properly handle false values
+    # (jq's // operator treats false as falsy and applies the fallback)
+    SHOW_AGILEFLOW=$(echo "$COMPONENTS" | jq -r '.agileflow | if . == null then true else . end')
+    SHOW_MODEL=$(echo "$COMPONENTS" | jq -r '.model | if . == null then true else . end')
+    SHOW_STORY=$(echo "$COMPONENTS" | jq -r '.story | if . == null then true else . end')
+    SHOW_EPIC=$(echo "$COMPONENTS" | jq -r '.epic | if . == null then true else . end')
+    SHOW_WIP=$(echo "$COMPONENTS" | jq -r '.wip | if . == null then true else . end')
+    SHOW_CONTEXT=$(echo "$COMPONENTS" | jq -r '.context | if . == null then true else . end')
+    SHOW_COST=$(echo "$COMPONENTS" | jq -r '.cost | if . == null then true else . end')
+    SHOW_GIT=$(echo "$COMPONENTS" | jq -r '.git | if . == null then true else . end')
+  fi
+fi
+
+# ============================================================================
+# AgileFlow Version & Update Check
+# ============================================================================
+AGILEFLOW_DISPLAY=""
+if [ "$SHOW_AGILEFLOW" = "true" ]; then
+  # Get local version from package.json or metadata
+  LOCAL_VERSION=""
+  if [ -f ".agileflow/package.json" ]; then
+    LOCAL_VERSION=$(jq -r '.version // ""' .agileflow/package.json 2>/dev/null)
+  elif [ -f "docs/00-meta/agileflow-metadata.json" ]; then
+    LOCAL_VERSION=$(jq -r '.version // ""' docs/00-meta/agileflow-metadata.json 2>/dev/null)
+  fi
+
+  if [ -n "$LOCAL_VERSION" ] && [ "$LOCAL_VERSION" != "null" ]; then
+    # Check for updates (cached for 1 hour to avoid rate limiting)
+    UPDATE_CACHE="/tmp/agileflow-update-check"
+    UPDATE_AVAILABLE=""
+    LATEST_VERSION=""
+
+    # Only check npm if cache is stale (older than 1 hour)
+    if [ ! -f "$UPDATE_CACHE" ] || [ "$(find "$UPDATE_CACHE" -mmin +60 2>/dev/null)" ]; then
+      # Quick npm check (timeout after 2 seconds)
+      LATEST_VERSION=$(timeout 2 npm view agileflow version 2>/dev/null || echo "")
+      if [ -n "$LATEST_VERSION" ]; then
+        echo "$LATEST_VERSION" > "$UPDATE_CACHE"
+      fi
+    else
+      LATEST_VERSION=$(cat "$UPDATE_CACHE" 2>/dev/null)
+    fi
+
+    # Compare versions
+    if [ -n "$LATEST_VERSION" ] && [ "$LATEST_VERSION" != "$LOCAL_VERSION" ]; then
+      # Simple version comparison (works for semver)
+      if [ "$(printf '%s\n' "$LOCAL_VERSION" "$LATEST_VERSION" | sort -V | tail -n1)" = "$LATEST_VERSION" ] && [ "$LOCAL_VERSION" != "$LATEST_VERSION" ]; then
+        UPDATE_AVAILABLE="$LATEST_VERSION"
+      fi
+    fi
+
+    # Build display
+    if [ -n "$UPDATE_AVAILABLE" ]; then
+      AGILEFLOW_DISPLAY="${BRAND}agileflow${RESET} ${DIM}v${LOCAL_VERSION}${RESET} ${YELLOW}↑${UPDATE_AVAILABLE}${RESET}"
+    else
+      AGILEFLOW_DISPLAY="${BRAND}agileflow${RESET} ${DIM}v${LOCAL_VERSION}${RESET}"
+    fi
+  else
+    AGILEFLOW_DISPLAY="${BRAND}agileflow${RESET}"
+  fi
+fi
+
+# ============================================================================
+# Parse Input JSON
+# ============================================================================
 input=$(cat)
 
 # Parse model info
@@ -23,11 +132,24 @@ CONTEXT_SIZE=$(echo "$input" | jq -r '.context_window.context_window_size // 200
 USAGE=$(echo "$input" | jq '.context_window.current_usage // null')
 
 CTX_DISPLAY=""
+CTX_COLOR="$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))
-    CTX_DISPLAY="${PERCENT_USED}% ctx"
+
+    # Color based on usage level
+    if [ "$PERCENT_USED" -ge 80 ]; then
+      CTX_COLOR="$BRIGHT_RED"
+    elif [ "$PERCENT_USED" -ge 60 ]; then
+      CTX_COLOR="$YELLOW"
+    elif [ "$PERCENT_USED" -ge 40 ]; then
+      CTX_COLOR="$BRIGHT_YELLOW"
+    else
+      CTX_COLOR="$GREEN"
+    fi
+
+    CTX_DISPLAY="${CTX_COLOR}${PERCENT_USED}%${RESET}"
   fi
 fi
 
@@ -35,10 +157,18 @@ fi
 TOTAL_COST=$(echo "$input" | jq -r '.cost.total_cost_usd // 0')
 COST_DISPLAY=""
 if [ "$TOTAL_COST" != "0" ] && [ "$TOTAL_COST" != "null" ]; then
-  COST_DISPLAY=$(printf '$%.2f' "$TOTAL_COST")
+  COST_CENTS=$(echo "$TOTAL_COST * 100" | bc 2>/dev/null | cut -d. -f1)
+  if [ -n "$COST_CENTS" ] && [ "$COST_CENTS" -gt 100 ]; then
+    # Over $1 - show in yellow
+    COST_DISPLAY="${YELLOW}$(printf '$%.2f' "$TOTAL_COST")${RESET}"
+  else
+    COST_DISPLAY="${DIM}$(printf '$%.2f' "$TOTAL_COST")${RESET}"
+  fi
 fi
 
+# ============================================================================
 # AgileFlow Status - Read from status.json
+# ============================================================================
 STORY_DISPLAY=""
 EPIC_DISPLAY=""
 NEXT_STORY=""
@@ -59,7 +189,7 @@ if [ -f "docs/09-agents/status.json" ]; then
       if [ ${#STORY_TITLE} -gt 25 ]; then
         STORY_TITLE="${STORY_TITLE:0:22}..."
       fi
-      STORY_DISPLAY="${STORY_ID}: ${STORY_TITLE}"
+      STORY_DISPLAY="${CYAN}${STORY_ID}${RESET}${DIM}:${RESET} ${STORY_TITLE}"
     fi
 
     # Get epic progress if we have an epic
@@ -71,12 +201,20 @@ if [ -f "docs/09-agents/status.json" ]; then
 
       if [ "$TOTAL_IN_EPIC" -gt 0 ] 2>/dev/null; then
         EPIC_PCT=$((DONE_IN_EPIC * 100 / TOTAL_IN_EPIC))
-        EPIC_DISPLAY="${EPIC_ID}: ${DONE_IN_EPIC}/${TOTAL_IN_EPIC} (${EPIC_PCT}%)"
+
+        # Color epic progress based on completion
+        if [ "$EPIC_PCT" -ge 80 ]; then
+          EPIC_COLOR="$GREEN"
+        elif [ "$EPIC_PCT" -ge 50 ]; then
+          EPIC_COLOR="$YELLOW"
+        else
+          EPIC_COLOR="$DIM"
+        fi
+        EPIC_DISPLAY="${MAGENTA}${EPIC_ID}${RESET} ${EPIC_COLOR}${DONE_IN_EPIC}/${TOTAL_IN_EPIC}${RESET}"
       fi
     fi
   else
     # No story in-progress - find next READY story (priority: high > medium > low)
-    # Look for stories with status "ready" or stories without blockers
     NEXT_ID=$(echo "$STATUS_JSON" | jq -r '
       .stories | to_entries
       | map(select(.value.status == "ready" or .value.status == "backlog" or .value.status == "draft"))
@@ -90,72 +228,128 @@ if [ -f "docs/09-agents/status.json" ]; then
     ')
 
     if [ -n "$NEXT_ID" ] && [ "$NEXT_ID" != "null" ]; then
-      NEXT_TITLE=$(echo "$STATUS_JSON" | jq -r ".stories[\"$NEXT_ID\"].title // \"\"")
       NEXT_PRIORITY=$(echo "$STATUS_JSON" | jq -r ".stories[\"$NEXT_ID\"].priority // \"\"")
-      if [ ${#NEXT_TITLE} -gt 20 ]; then
-        NEXT_TITLE="${NEXT_TITLE:0:17}..."
-      fi
-      # Add priority indicator
-      PRIORITY_ICON=""
+      # Color based on priority
       case "$NEXT_PRIORITY" in
-        high) PRIORITY_ICON="🔴" ;;
-        medium) PRIORITY_ICON="🟡" ;;
-        *) PRIORITY_ICON="🟢" ;;
+        high) PRIORITY_COLOR="$RED" ;;
+        medium) PRIORITY_COLOR="$YELLOW" ;;
+        *) PRIORITY_COLOR="$GREEN" ;;
       esac
-      NEXT_STORY="${PRIORITY_ICON} Next: ${NEXT_ID}"
+      NEXT_STORY="${DIM}Next:${RESET} ${PRIORITY_COLOR}${NEXT_ID}${RESET}"
     fi
   fi
 
   # Calculate WIP count
   WIP_COUNT=$(echo "$STATUS_JSON" | jq '[.stories | to_entries[] | select(.value.status == "in-progress" or .value.status == "in-review")] | length')
   WIP_LIMIT=3  # Default WIP limit
-  if [ -n "$WIP_COUNT" ] && [ "$WIP_COUNT" != "null" ]; then
-    WIP_DISPLAY="WIP: ${WIP_COUNT}/${WIP_LIMIT}"
+  if [ -n "$WIP_COUNT" ] && [ "$WIP_COUNT" != "null" ] && [ "$WIP_COUNT" -gt 0 ] 2>/dev/null; then
+    # Color WIP based on limit
+    if [ "$WIP_COUNT" -gt "$WIP_LIMIT" ]; then
+      WIP_COLOR="$RED"
+    elif [ "$WIP_COUNT" -eq "$WIP_LIMIT" ]; then
+      WIP_COLOR="$YELLOW"
+    else
+      WIP_COLOR="$GREEN"
+    fi
+    WIP_DISPLAY="${DIM}WIP${RESET} ${WIP_COLOR}${WIP_COUNT}${RESET}"
   fi
 fi
 
-# Get git branch
-GIT_BRANCH=""
+# ============================================================================
+# Git Branch with Colors
+# ============================================================================
+GIT_DISPLAY=""
 if git rev-parse --git-dir > /dev/null 2>&1; then
   BRANCH=$(git branch --show-current 2>/dev/null)
   if [ -n "$BRANCH" ]; then
-    GIT_BRANCH="$BRANCH"
+    # Color based on branch type
+    case "$BRANCH" in
+      main|master)
+        GIT_COLOR="$GREEN"
+        ;;
+      develop|dev)
+        GIT_COLOR="$BLUE"
+        ;;
+      feature/*|feat/*)
+        GIT_COLOR="$CYAN"
+        ;;
+      fix/*|bugfix/*|hotfix/*)
+        GIT_COLOR="$RED"
+        ;;
+      release/*)
+        GIT_COLOR="$MAGENTA"
+        ;;
+      *)
+        GIT_COLOR="$DIM"
+        ;;
+    esac
+
+    # Truncate long branch names
+    if [ ${#BRANCH} -gt 20 ]; then
+      BRANCH="${BRANCH:0:17}..."
+    fi
+    GIT_DISPLAY="${GIT_COLOR}${BRANCH}${RESET}"
   fi
 fi
 
-# Build status line
-OUTPUT="[${MODEL_DISPLAY}]"
+# ============================================================================
+# Build Status Line
+# ============================================================================
+OUTPUT=""
 
-# Add current story OR next story suggestion
-if [ -n "$STORY_DISPLAY" ]; then
-  OUTPUT="${OUTPUT} 📋 ${STORY_DISPLAY}"
-elif [ -n "$NEXT_STORY" ]; then
-  OUTPUT="${OUTPUT} ${NEXT_STORY}"
+# Separator
+SEP=" ${DIM}│${RESET} "
+
+# AgileFlow branding (if enabled)
+if [ "$SHOW_AGILEFLOW" = "true" ] && [ -n "$AGILEFLOW_DISPLAY" ]; then
+  OUTPUT="${AGILEFLOW_DISPLAY}"
+fi
+
+# Model with subtle styling (if enabled)
+if [ "$SHOW_MODEL" = "true" ]; then
+  [ -n "$OUTPUT" ] && OUTPUT="${OUTPUT}${SEP}"
+  OUTPUT="${OUTPUT}${DIM}[${RESET}${BOLD}${MODEL_DISPLAY}${RESET}${DIM}]${RESET}"
+fi
+
+# Add current story OR next story suggestion (if enabled)
+if [ "$SHOW_STORY" = "true" ]; then
+  if [ -n "$STORY_DISPLAY" ]; then
+    [ -n "$OUTPUT" ] && OUTPUT="${OUTPUT}${SEP}"
+    OUTPUT="${OUTPUT}${STORY_DISPLAY}"
+  elif [ -n "$NEXT_STORY" ]; then
+    [ -n "$OUTPUT" ] && OUTPUT="${OUTPUT}${SEP}"
+    OUTPUT="${OUTPUT}${NEXT_STORY}"
+  fi
 fi
 
-# Add epic progress (if working on a story in an epic)
-if [ -n "$EPIC_DISPLAY" ]; then
-  OUTPUT="${OUTPUT} | 📦 ${EPIC_DISPLAY}"
+# Add epic progress (if enabled and working on a story in an epic)
+if [ "$SHOW_EPIC" = "true" ] && [ -n "$EPIC_DISPLAY" ]; then
+  [ -n "$OUTPUT" ] && OUTPUT="${OUTPUT}${SEP}"
+  OUTPUT="${OUTPUT}${EPIC_DISPLAY}"
 fi
 
-# Add WIP count
-if [ -n "$WIP_DISPLAY" ]; then
-  OUTPUT="${OUTPUT} | ${WIP_DISPLAY}"
+# Add WIP count (if enabled)
+if [ "$SHOW_WIP" = "true" ] && [ -n "$WIP_DISPLAY" ]; then
+  [ -n "$OUTPUT" ] && OUTPUT="${OUTPUT}${SEP}"
+  OUTPUT="${OUTPUT}${WIP_DISPLAY}"
 fi
 
-# Add context usage
-if [ -n "$CTX_DISPLAY" ]; then
-  OUTPUT="${OUTPUT} | ${CTX_DISPLAY}"
+# Add context usage (if enabled)
+if [ "$SHOW_CONTEXT" = "true" ] && [ -n "$CTX_DISPLAY" ]; then
+  [ -n "$OUTPUT" ] && OUTPUT="${OUTPUT}${SEP}"
+  OUTPUT="${OUTPUT}${CTX_DISPLAY}"
 fi
 
-# Add cost
-if [ -n "$COST_DISPLAY" ]; then
-  OUTPUT="${OUTPUT} | ${COST_DISPLAY}"
+# Add cost (if enabled)
+if [ "$SHOW_COST" = "true" ] && [ -n "$COST_DISPLAY" ]; then
+  [ -n "$OUTPUT" ] && OUTPUT="${OUTPUT}${SEP}"
+  OUTPUT="${OUTPUT}${COST_DISPLAY}"
 fi
 
-# Add git branch
-if [ -n "$GIT_BRANCH" ]; then
-  OUTPUT="${OUTPUT} | ${GIT_BRANCH}"
+# Add git branch (if enabled)
+if [ "$SHOW_GIT" = "true" ] && [ -n "$GIT_DISPLAY" ]; then
+  [ -n "$OUTPUT" ] && OUTPUT="${OUTPUT}${SEP}"
+  OUTPUT="${OUTPUT}${GIT_DISPLAY}"
 fi
 
-echo "$OUTPUT"
+echo -e "$OUTPUT"