portable-agent-layer 0.48.0 → 0.49.0

package/assets/STATUSLINE.md

@@ -0,0 +1,102 @@
+# PAL Status Line
+
+A customizable status line for Claude Code that displays context usage, active model, session cost, current directory, and git branch.
+
+## What It Shows
+
+**Line 1:** Model name, current directory, git branch, hook health, open ISCs, signal trend  
+**Line 2:** Context usage progress bar, percentage used, session cost, remaining context, rate limits  
+**Line 3:** Update notice (only when a new PAL version is available)
+
+Example output (macOS/Linux):
+```
+[Opus] 📁 portable-agent-layer  🌿 main  📋 21 open ISCs  sig: 3.0/10 ↓
+████████░░░░░░░░░░░░ 45% │ $0.12 │ 55% free
+```
+
+Example output (Windows):
+```
+[Opus] folder: portable-agent-layer  (git: main)  21 open ISCs  sig: 3.0/10 v
+########------------ 45% - $0.12 - 55% free
+```
+
+Colors adapt based on context usage:
+- 🟢 Green: 0-60% used
+- 🟡 Yellow: 60-80% used  
+- 🔴 Red: >80% used
+
+## Setup
+
+### On macOS / Linux
+
+1. Make the script executable:
+```bash
+chmod +x ~/.claude/statusline.sh
+```
+
+2. Add to `~/.claude/settings.json`:
+```json
+{
+  "statusLine": {
+    "type": "command",
+    "command": "~/.claude/statusline.sh",
+    "padding": 2
+  }
+}
+```
+
+The statusline script is at: `portable-agent-layer/assets/statusline.sh`
+
+### On Windows
+
+1. Add to `~/.claude/settings.json`:
+```json
+{
+  "statusLine": {
+    "type": "command",
+    "command": "powershell -NoProfile -Command \"Get-Content -Raw | & 'C:\\path\\to\\statusline.ps1'\"",
+    "padding": 2
+  }
+}
+```
+
+Or copy `statusline.ps1` to `~/.claude/statusline.ps1` and reference it from settings.
+
+The statusline script is at: `portable-agent-layer/assets/statusline.ps1`
+
+## Data Displayed
+
+- **Model:** Active Claude model (Opus, Sonnet, Haiku, etc.)
+- **Directory:** Repository name (if in a git repo) or folder name
+- **Git Branch:** Current branch, fetched from git worktree or `git` command
+- **Hook Health:** Count of ERROR lines in `~/.pal/memory/state/debug.log` from last 24h (hidden when 0)
+- **Open ISCs:** Count of unchecked ISCs for the current project (hidden when 0)
+- **Signal Trend:** Session quality score from `~/.pal/memory/state/signal-cache.json` with trend arrow
+- **Context Bar:** Visual progress bar showing token usage
+- **Context %:** Percentage of context window used
+- **Cost:** Estimated session cost in USD (shows "free" if <$0.01 on macOS/Linux, `$0.00` on Windows)
+- **Remaining %:** Percentage of context window remaining
+- **Rate Limits:** 5h and 7d usage percentages (Pro/Max plans only — hidden on other plans)
+- **Update Notice:** Shown on line 3 when `~/.pal/memory/state/update-available.json` flags a new version
+
+## Dependencies
+
+- **macOS/Linux:** `bash`, `jq`, `git` (for branch detection)
+- **Windows:** PowerShell 7+, `git` (for branch detection)
+
+## Customization
+
+Both scripts use `jq` to parse the JSON data Claude Code sends. You can modify them to:
+- Add or remove fields
+- Change colors (ANSI escape codes)
+- Adjust progress bar width
+- Show additional data like effort level, rate limits, or PR status
+
+Available fields are documented in the Claude Code statusline reference:
+https://code.claude.com/docs/en/statusline#available-data
+
+## Updates
+
+The status line runs after each assistant message, after `/compact`, and when vim mode toggles. It does not consume API tokens.
+
+Changes to the script appear on your next interaction with Claude Code.

package/assets/statusline.ps1

@@ -0,0 +1,142 @@
+# PAL Status Line - Windows PowerShell version
+# Reads JSON from stdin (Claude Code session data) and prints a formatted status line
+
+$data = $input | Out-String | ConvertFrom-Json
+
+# Extract data with fallbacks (PowerShell 5.1 compatible)
+$MODEL = if ($data.model.display_name) { $data.model.display_name } else { "Unknown" }
+$USED_RAW = $data.context_window.used_percentage
+$USED = if ($USED_RAW -ne $null) { [int]$USED_RAW } else { 0 }
+$REM_RAW = $data.context_window.remaining_percentage
+$REM = if ($REM_RAW -ne $null) { [int]$REM_RAW } else { 0 }
+$COST_RAW = $data.cost.total_cost_usd
+$COST = if ($COST_RAW -ne $null) { [double]$COST_RAW } else { 0 }
+$CWD = if ($data.workspace.current_dir) { $data.workspace.current_dir } else { "~" }
+$REPO = if ($data.workspace.repo.name) { $data.workspace.repo.name } else { "" }
+
+# Extract git branch
+$BRANCH = ""
+try { $BRANCH = & git -C $CWD rev-parse --abbrev-ref HEAD 2>$null } catch { $BRANCH = "" }
+
+# Format directory
+$DIR_DISPLAY = if ($REPO) { $REPO } else { Split-Path -Leaf $CWD }
+
+# Format git branch indicator
+$GIT_INDICATOR = if ($BRANCH) { "  (git: $BRANCH)" } else { "" }
+
+# Format cost
+$COST_STR = '$' + ([math]::Round($COST, 2)).ToString("0.00")
+
+# PAL: Hook health - count ERROR lines in debug.log from last 24h
+$HOOK_ERRORS = 0
+$debugLog = Join-Path $env:USERPROFILE ".pal\memory\state\debug.log"
+if (Test-Path $debugLog) {
+  $cutoff = (Get-Date).AddHours(-24)
+  try {
+    $HOOK_ERRORS = (Get-Content $debugLog -ErrorAction SilentlyContinue |
+      Where-Object { $_ -match '\] ERROR ' } |
+      Where-Object {
+        $m = [regex]::Match($_, '^\[(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})\]')
+        if ($m.Success) { [datetime]$m.Groups[1].Value -gt $cutoff } else { $false }
+      }).Count
+  } catch { $HOOK_ERRORS = 0 }
+}
+
+# PAL: Open ISC count - find project matching current directory
+$OPEN_ISCS = 0
+$PROJECT_NAME = ""
+$projectsDir = Join-Path $env:USERPROFILE ".pal\memory\projects"
+if (Test-Path $projectsDir) {
+  try {
+    $CWD_NORM = $CWD.Replace('/', '\').TrimEnd('\')
+    foreach ($slug in Get-ChildItem $projectsDir -Directory | Select-Object -ExpandProperty Name) {
+      $isa = Join-Path $projectsDir "$slug\ISA.md"
+      if (-not (Test-Path $isa)) { continue }
+      $content = Get-Content $isa -Raw -ErrorAction SilentlyContinue
+      $pathMatch = [regex]::Match($content, 'path:\s*"?([^"\n\r]+)"?')
+      if ($pathMatch.Success) {
+        $projPath = $pathMatch.Groups[1].Value.Trim().Replace('/', '\').TrimEnd('\')
+        if ($projPath -eq $CWD_NORM -or $CWD_NORM.StartsWith($projPath)) {
+          $PROJECT_NAME = $slug
+          $OPEN_ISCS = ([regex]::Matches($content, '- \[ \] ISC-')).Count
+          break
+        }
+      }
+    }
+  } catch { $OPEN_ISCS = 0 }
+}
+
+# Rate limits (Pro/Max only - absent for other plans)
+$FIVE_H_RAW = $data.rate_limits.five_hour.used_percentage
+$SEVEN_D_RAW = $data.rate_limits.seven_day.used_percentage
+$RATE_PARTS = @()
+if ($FIVE_H_RAW -ne $null) { $RATE_PARTS += "5h: $([int]$FIVE_H_RAW)%" }
+if ($SEVEN_D_RAW -ne $null) { $RATE_PARTS += "7d: $([int]$SEVEN_D_RAW)%" }
+$RATE_STR = if ($RATE_PARTS.Count -gt 0) { " - " + ($RATE_PARTS -join " | ") } else { "" }
+
+# Create context progress bar - if both are 0, data not yet available (pre-first API call)
+$NO_DATA = ($USED_RAW -eq $null -and $REM_RAW -eq $null)
+if ($NO_DATA) { $USED = 0; $REM = 100 }
+$FILLED = [int]($USED / 5)
+$EMPTY = 20 - $FILLED
+$BAR = ("#" * $FILLED) + ("-" * $EMPTY)
+
+# ANSI color codes (PowerShell 5.1 compatible - use concatenation to avoid array-index expansion)
+$ESC = [char]27
+$CYAN   = $ESC + "[36m"
+$GREEN  = $ESC + "[32m"
+$YELLOW = $ESC + "[33m"
+$RED    = $ESC + "[31m"
+$DIM    = $ESC + "[90m"
+$RESET  = $ESC + "[0m"
+
+# Choose bar color based on context usage
+$BAR_COLOR = if ($USED -gt 80) { $RED } elseif ($USED -gt 60) { $YELLOW } else { $GREEN }
+
+# PAL: Signal trend (reads 10-min cache written by session intelligence)
+$SIGNAL_STR = ""
+$signalCache = Join-Path $env:USERPROFILE ".pal\memory\state\signal-cache.json"
+if (Test-Path $signalCache) {
+  try {
+    $sc = Get-Content $signalCache -Raw -ErrorAction SilentlyContinue | ConvertFrom-Json
+    if ($sc.today -ne $null) {
+      $ARROW = switch ($sc.trend) {
+        "up"     { "^"; break }
+        "down"   { "v"; break }
+        "stable" { "-"; break }
+        default  { "?"; break }
+      }
+      $SIG_TODAY = ([math]::Round([double]$sc.today, 1)).ToString("0.0")
+      $SIG_COLOR = if ($sc.trend -eq "up") { $GREEN } elseif ($sc.trend -eq "down") { $RED } else { $DIM }
+      $SIGNAL_STR = "  " + $SIG_COLOR + "sig: $SIG_TODAY/10 $ARROW" + $RESET
+    }
+  } catch {}
+}
+
+# PAL: Update available check (reads cached result, no network call)
+# Emoji constructed at runtime to avoid PS5.1 UTF-8-without-BOM encoding issues
+$UPDATE_LINE = ""
+$updateCache = Join-Path $env:USERPROFILE ".pal\memory\state\update-available.json"
+if (Test-Path $updateCache) {
+  try {
+    $uc = Get-Content $updateCache -Raw -ErrorAction SilentlyContinue | ConvertFrom-Json
+    if ($uc.available -eq $true) {
+      $versionStr = if ($uc.current -ne $uc.latest) { "$($uc.current) -> $($uc.latest)" } else { $uc.current + " (new commits)" }
+      $UPDATE_LINE = "[update] $versionStr  run: pal cli update"
+    }
+  } catch {}
+}
+
+# Build PAL indicators
+$HOOK_STR = if ($HOOK_ERRORS -gt 0) { "  " + $RED + "! $HOOK_ERRORS hook err" + $RESET } else { "" }
+$ISC_STR  = if ($OPEN_ISCS -gt 0)   { "  " + $DIM + "$OPEN_ISCS open ISCs" + $RESET }  else { "" }
+
+# Line 1: Model, Directory, Git Branch, Hook Health, Open ISCs
+Write-Host ($CYAN + "[$MODEL]" + $RESET + " folder: $DIR_DISPLAY" + $DIM + $GIT_INDICATOR + $RESET + $HOOK_STR + $ISC_STR + $SIGNAL_STR)
+
+# Line 2: Context bar with usage percentage, cost, and rate limits
+$CTX_STR = "$USED% - $COST_STR - ${REM}% free"
+Write-Host ($BAR_COLOR + $BAR + $RESET + " " + $CTX_STR + $DIM + $RATE_STR + $RESET)
+
+# Line 3: Update available (only when cache says available AND versions differ)
+if ($UPDATE_LINE) { Write-Host ($YELLOW + $UPDATE_LINE + $RESET) }

package/assets/statusline.sh

@@ -0,0 +1,167 @@
+#!/bin/bash
+# PAL Status Line — macOS/Linux
+# Reads JSON from stdin (Claude Code session data) and prints a formatted status line
+
+input=$(cat)
+
+# Extract data with fallbacks
+MODEL=$(echo "$input" | jq -r '.model.display_name // "Unknown"')
+USED_RAW=$(echo "$input" | jq -r '.context_window.used_percentage // empty')
+REM_RAW=$(echo "$input" | jq -r '.context_window.remaining_percentage // empty')
+USED=$( [ -n "$USED_RAW" ] && echo "${USED_RAW%.*}" || echo 0 )
+REMAINING=$( [ -n "$REM_RAW" ] && echo "${REM_RAW%.*}" || echo 0 )
+COST=$(echo "$input" | jq -r '.cost.total_cost_usd // 0')
+CWD=$(echo "$input" | jq -r '.workspace.current_dir // "~"')
+REPO=$(echo "$input" | jq -r '.workspace.repo.name // ""')
+
+# No data yet (pre-first API call)
+if [ -z "$USED_RAW" ] && [ -z "$REM_RAW" ]; then
+  USED=0; REMAINING=100
+fi
+
+# Extract git branch — try multiple sources for robustness
+BRANCH=$(echo "$input" | jq -r '.worktree.branch // ""')
+if [ -z "$BRANCH" ]; then
+  BRANCH=$(git -C "$CWD" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "")
+fi
+
+# Format directory — show repo name if available, else just folder name
+if [ -n "$REPO" ]; then
+  DIR_DISPLAY="$REPO"
+else
+  DIR_DISPLAY="${CWD##*/}"
+fi
+
+# Format git branch with emoji indicator
+if [ -n "$BRANCH" ]; then
+  GIT_INDICATOR="  (🌿 ${BRANCH})"
+else
+  GIT_INDICATOR=""
+fi
+
+# Format cost — show as $X.XX or 'free' if < $0.01
+if (( $(echo "$COST < 0.01" | bc -l) )); then
+  COST_STR="free"
+else
+  COST_STR=$(printf '$%.2f' "$COST")
+fi
+
+# PAL: Hook health — count ERROR lines in debug.log from last 24h
+HOOK_ERRORS=0
+DEBUG_LOG="$HOME/.pal/memory/state/debug.log"
+if [ -f "$DEBUG_LOG" ]; then
+  # Cross-platform 24h cutoff: macOS uses date -v, GNU Linux uses date -d
+  CUTOFF=$(date -v-24H "+%Y-%m-%d %H:%M:%S" 2>/dev/null || date -d '24 hours ago' "+%Y-%m-%d %H:%M:%S" 2>/dev/null)
+  if [ -n "$CUTOFF" ]; then
+    # Log format: [YYYY-MM-DD HH:MM:SS] LEVEL ... — split on [ or ] to get $2 = timestamp
+    HOOK_ERRORS=$(grep '\] ERROR ' "$DEBUG_LOG" | awk -F'[][]]' '$2 > "'"$CUTOFF"'"' | wc -l | tr -d ' ')
+  else
+    HOOK_ERRORS=$(grep -c '\] ERROR ' "$DEBUG_LOG" 2>/dev/null || echo 0)
+  fi
+fi
+
+# PAL: Open ISC count — find project matching current directory
+OPEN_ISCS=0
+PROJECTS_DIR="$HOME/.pal/memory/projects"
+if [ -d "$PROJECTS_DIR" ]; then
+  CWD_NORM="${CWD%/}"
+  for ISA in "$PROJECTS_DIR"/*/ISA.md; do
+    [ -f "$ISA" ] || continue
+    PROJ_PATH=$(grep -m1 'path:' "$ISA" | sed 's/.*path:[[:space:]]*//' | tr -d '"' | tr -d "'" | xargs)
+    PROJ_PATH="${PROJ_PATH%/}"
+    if [ "$PROJ_PATH" = "$CWD_NORM" ] || [[ "$CWD_NORM" == "${PROJ_PATH}/"* ]]; then
+      OPEN_ISCS=$(grep -c '- \[ \] ISC-' "$ISA" 2>/dev/null || echo 0)
+      break
+    fi
+  done
+fi
+
+# Rate limits (Pro/Max only — absent for other plans)
+FIVE_H=$(echo "$input" | jq -r '.rate_limits.five_hour.used_percentage // empty')
+SEVEN_D=$(echo "$input" | jq -r '.rate_limits.seven_day.used_percentage // empty')
+RATE_PARTS=()
+[ -n "$FIVE_H" ] && RATE_PARTS+=("5h: ${FIVE_H%.*}%")
+[ -n "$SEVEN_D" ] && RATE_PARTS+=("7d: ${SEVEN_D%.*}%")
+RATE_STR=""
+if [ ${#RATE_PARTS[@]} -gt 0 ]; then
+  RATE_STR=" │ $(IFS=" | "; echo "${RATE_PARTS[*]}")"
+fi
+
+# Create context progress bar (20 chars wide)
+FILLED=$((USED / 5))
+EMPTY=$((20 - FILLED))
+if [ "$FILLED" -le 0 ]; then
+  BAR="░░░░░░░░░░░░░░░░░░░░"
+elif [ "$FILLED" -ge 20 ]; then
+  BAR="████████████████████"
+else
+  BAR=$(printf '█%.0s' $(seq 1 $FILLED))$(printf '░%.0s' $(seq 1 $EMPTY))
+fi
+
+# Color codes (ANSI)
+CYAN='\033[36m'
+GREEN='\033[32m'
+YELLOW='\033[33m'
+RED='\033[31m'
+DIM='\033[90m'
+RESET='\033[0m'
+
+# Choose bar color based on context usage
+if [ "$USED" -gt 80 ]; then
+  CONTEXT_COLOR=$RED
+elif [ "$USED" -gt 60 ]; then
+  CONTEXT_COLOR=$YELLOW
+else
+  CONTEXT_COLOR=$GREEN
+fi
+
+# PAL: Signal trend (reads 10-min cache written by session intelligence)
+SIGNAL_STR=""
+SIGNAL_CACHE="$HOME/.pal/memory/state/signal-cache.json"
+if [ -f "$SIGNAL_CACHE" ]; then
+  SC_TODAY=$(jq -r '.today // empty' "$SIGNAL_CACHE" 2>/dev/null)
+  SC_TREND=$(jq -r '.trend // empty' "$SIGNAL_CACHE" 2>/dev/null)
+  if [ -n "$SC_TODAY" ]; then
+    case "$SC_TREND" in
+      up)     ARROW="↑"; SIG_COLOR=$GREEN ;;
+      down)   ARROW="↓"; SIG_COLOR=$RED ;;
+      stable) ARROW="→"; SIG_COLOR=$DIM ;;
+      *)      ARROW="?"; SIG_COLOR=$DIM ;;
+    esac
+    SIG_TODAY=$(printf "%.1f" "$SC_TODAY")
+    SIGNAL_STR="  ${SIG_COLOR}sig: ${SIG_TODAY}/10 ${ARROW}${RESET}"
+  fi
+fi
+
+# PAL: Update available check (reads cached result, no network call)
+UPDATE_LINE=""
+UPDATE_CACHE="$HOME/.pal/memory/state/update-available.json"
+if [ -f "$UPDATE_CACHE" ]; then
+  UC_AVAIL=$(jq -r '.available // false' "$UPDATE_CACHE" 2>/dev/null)
+  if [ "$UC_AVAIL" = "true" ]; then
+    UC_CURRENT=$(jq -r '.current // ""' "$UPDATE_CACHE" 2>/dev/null)
+    UC_LATEST=$(jq -r '.latest // ""' "$UPDATE_CACHE" 2>/dev/null)
+    if [ "$UC_CURRENT" != "$UC_LATEST" ]; then
+      VERSION_STR="$UC_CURRENT → $UC_LATEST"
+    else
+      VERSION_STR="$UC_CURRENT (new commits)"
+    fi
+    UPDATE_LINE="📦 update: $VERSION_STR  run: pal cli update"
+  fi
+fi
+
+# Build PAL indicators
+HOOK_STR=""
+[ "$HOOK_ERRORS" -gt 0 ] && HOOK_STR="  ${RED}⚠️  ${HOOK_ERRORS} hook err${RESET}"
+ISC_STR=""
+[ "$OPEN_ISCS" -gt 0 ] && ISC_STR="  ${DIM}📋 ${OPEN_ISCS} open ISCs${RESET}"
+
+# Line 1: Model, Directory, Git Branch, Hook Health, Open ISCs, Signal
+echo -e "${CYAN}[${MODEL}]${RESET} 📁 ${DIR_DISPLAY}${DIM}${GIT_INDICATOR}${RESET}${HOOK_STR}${ISC_STR}${SIGNAL_STR}"
+
+# Line 2: Context bar with usage percentage, cost, and rate limits
+echo -e "${CONTEXT_COLOR}${BAR}${RESET} ${USED}% │ ${COST_STR} │ ${REMAINING}% free${DIM}${RATE_STR}${RESET}"
+
+# Line 3: Update available (only when cache says available AND versions differ)
+[ -n "$UPDATE_LINE" ] && echo -e "${YELLOW}${UPDATE_LINE}${RESET}"
+exit 0

package/assets/templates/settings.claude.json

@@ -25,6 +25,27 @@
       "Bash(node --experimental-strip-types ~/.pal/skills/consulting-report/tools/generate-pdf.ts *)"
     ]
   },
+  "skillOverrides": {
+    "claude-api": "off",
+    "update-config": "off",
+    "deep-research": "off",
+    "code-review": "off"
+  },
+  "attribution": {
+    "commit": "",
+    "pr": ""
+  },
+  "showClearContextOnPlanAccept": true,
+  "respectGitignore": true,
+  "spinnerTipsEnabled": true,
+  "spinnerTipsOverride": {
+    "tips": [
+      "Need something reusable? Use the /create-skill command.",
+      "PAL learns from your feedback and improves over time. Don't be shy to give feedback!",
+      "For simple PDFs use the /create-pdf skill. Need a styled one? Use /consulting-report instead.",
+      "Use the /research skill to run comprehensive web research with multiple parallel agents."
+    ]
+  },
   "hooks": {
     "SessionStart": [
       {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "portable-agent-layer",
-  "version": "0.48.0",
+  "version": "0.49.0",
   "description": "PAL — Portable Agent Layer: persistent personal context for AI coding assistants",
   "type": "module",
   "bin": {

package/src/hooks/lib/paths.ts

@@ -85,6 +85,8 @@ export const assets = {
   copilotHooksTemplate: () => pkg("assets", "templates", "hooks.copilot.json"),
   codexHooksTemplate: () => pkg("assets", "templates", "hooks.codex.json"),
   codexRulesTemplate: () => pkg("assets", "templates", "rules.codex.rules"),
+  statuslineScriptBash: () => pkg("assets", "statusline.sh"),
+  statuslineScriptPs1: () => pkg("assets", "statusline.ps1"),
   agentTools: () => pkg("src", "tools", "agent"),
   tools: () => pkg("src", "tools"),
   palDocs: () => pkg("assets", "templates", "PAL"),

package/src/targets/claude/install.ts

@@ -9,9 +9,11 @@ import { resolve } from "node:path";
 import { regenerateIfNeeded } from "../../hooks/lib/claude-md";
 import { assets, palHome, palPkg, platform } from "../../hooks/lib/paths";
 import {
+  addStatuslineConfig,
   copyAgents,
   copyPalDocs,
   copySkills,
+  copyStatusline,
   countAgents,
   countMd,
   countSkills,
@@ -43,7 +45,10 @@ log.info("Backed up settings.json");
 // --- Load template and merge into existing settings ---
 const template = loadSettingsTemplate(assets.claudeSettingsTemplate(), PKG_ROOT);
 const existing = readJson<Record<string, unknown>>(SETTINGS, {});
-const merged = mergeSettings(existing, template);
+let merged = mergeSettings(existing, template);
+
+// Add platform-specific statusLine config
+merged = addStatuslineConfig(merged);
 
 writeJson(SETTINGS, merged);
 log.success("Merged PAL settings into settings.json");
@@ -56,6 +61,9 @@ generateSkillIndex();
 // --- Copy agents ---
 copyAgents();
 
+// --- Copy statusline script ---
+copyStatusline();
+
 // --- Copy PAL system docs ---
 const palDocsCount = copyPalDocs();
 log.success(`Installed ${palDocsCount} PAL docs to ~/.pal/docs/`);

package/src/targets/claude/uninstall.ts

@@ -13,6 +13,8 @@ import {
   removeAgents,
   removePalDocs,
   removeSkills,
+  removeStatusline,
+  removeStatuslineConfig,
   unmergeSettings,
   writeJson,
 } from "../lib";
@@ -33,7 +35,10 @@ log.info("Backed up settings.json");
 // --- Load template and unmerge from existing settings ---
 const template = loadSettingsTemplate(assets.claudeSettingsTemplate(), PKG_ROOT);
 const existing = readJson<Record<string, unknown>>(SETTINGS, {});
-const cleaned = unmergeSettings(existing, template);
+let cleaned = unmergeSettings(existing, template);
+
+// Remove statusLine config
+cleaned = removeStatuslineConfig(cleaned);
 
 writeJson(SETTINGS, cleaned);
 log.success("Removed PAL settings from settings.json");
@@ -54,6 +59,9 @@ if (removedAgents.length > 0) {
   log.info("No PAL agents found");
 }
 
+// --- Remove statusline script ---
+removeStatusline();
+
 // --- Remove PAL system docs ---
 removePalDocs();
 

package/src/targets/lib.ts

@@ -3,6 +3,7 @@
  */
 
 import {
+  chmodSync,
   copyFileSync,
   existsSync,
   lstatSync,
@@ -123,6 +124,65 @@ export function mergeSettings(existing: Settings, template: Settings): Settings
     }
   }
 
+  // Merge skillOverrides (object with skill name keys, add if not present)
+  if (template.skillOverrides && typeof template.skillOverrides === "object") {
+    result.skillOverrides ??= {};
+    const resultOverrides = result.skillOverrides as Record<string, unknown>;
+    for (const [skill, value] of Object.entries(template.skillOverrides)) {
+      if (!(skill in resultOverrides)) {
+        resultOverrides[skill] = value;
+      }
+    }
+  }
+
+  // Merge attribution (object with commit/pr keys, add if not present)
+  if (template.attribution && typeof template.attribution === "object") {
+    if (!("attribution" in result)) {
+      result.attribution = template.attribution;
+    }
+  }
+
+  // Merge showClearContextOnPlanAccept (boolean, add if not present)
+  if ("showClearContextOnPlanAccept" in template) {
+    if (!("showClearContextOnPlanAccept" in result)) {
+      result.showClearContextOnPlanAccept = template.showClearContextOnPlanAccept;
+    }
+  }
+
+  // Merge respectGitignore (boolean, add if not present)
+  if ("respectGitignore" in template) {
+    if (!("respectGitignore" in result)) {
+      result.respectGitignore = template.respectGitignore;
+    }
+  }
+
+  // Merge spinnerTipsEnabled (boolean, add if not present)
+  if ("spinnerTipsEnabled" in template) {
+    if (!("spinnerTipsEnabled" in result)) {
+      result.spinnerTipsEnabled = template.spinnerTipsEnabled;
+    }
+  }
+
+  // Merge spinnerTipsOverride (merge tips array, deduplicate by content)
+  if (
+    template.spinnerTipsOverride &&
+    typeof template.spinnerTipsOverride === "object" &&
+    "tips" in template.spinnerTipsOverride &&
+    Array.isArray((template.spinnerTipsOverride as Record<string, unknown>).tips)
+  ) {
+    result.spinnerTipsOverride ??= { tips: [] };
+    const resultOverride = result.spinnerTipsOverride as Record<string, unknown>;
+    resultOverride.tips ??= [];
+    const tips = resultOverride.tips as string[];
+    const templateTips = (template.spinnerTipsOverride as Record<string, unknown>)
+      .tips as string[];
+    for (const tip of templateTips) {
+      if (typeof tip === "string" && !tips.includes(tip)) {
+        tips.push(tip);
+      }
+    }
+  }
+
   return result;
 }
 
@@ -163,6 +223,68 @@ export function unmergeSettings(existing: Settings, template: Settings): Setting
     if (Object.keys(result.permissions).length === 0) delete result.permissions;
   }
 
+  // Remove PAL skillOverrides (remove keys that appear in template)
+  if (
+    template.skillOverrides &&
+    typeof template.skillOverrides === "object" &&
+    result.skillOverrides &&
+    typeof result.skillOverrides === "object"
+  ) {
+    const palSkills = new Set(Object.keys(template.skillOverrides));
+    for (const skill of palSkills) {
+      delete (result.skillOverrides as Record<string, unknown>)[skill];
+    }
+    if (Object.keys(result.skillOverrides).length === 0) delete result.skillOverrides;
+  }
+
+  // Remove PAL attribution if it matches template structure
+  if (template.attribution && "attribution" in result) {
+    delete result.attribution;
+  }
+
+  // Remove PAL showClearContextOnPlanAccept
+  if (
+    "showClearContextOnPlanAccept" in template &&
+    "showClearContextOnPlanAccept" in result
+  ) {
+    delete result.showClearContextOnPlanAccept;
+  }
+
+  // Remove PAL respectGitignore
+  if ("respectGitignore" in template && "respectGitignore" in result) {
+    delete result.respectGitignore;
+  }
+
+  // Remove PAL spinnerTipsEnabled
+  if ("spinnerTipsEnabled" in template && "spinnerTipsEnabled" in result) {
+    delete result.spinnerTipsEnabled;
+  }
+
+  // Remove PAL spinnerTipsOverride (remove only template tips, preserve user tips)
+  if (
+    template.spinnerTipsOverride &&
+    typeof template.spinnerTipsOverride === "object" &&
+    "tips" in template.spinnerTipsOverride &&
+    Array.isArray((template.spinnerTipsOverride as Record<string, unknown>).tips) &&
+    result.spinnerTipsOverride &&
+    typeof result.spinnerTipsOverride === "object" &&
+    "tips" in result.spinnerTipsOverride &&
+    Array.isArray((result.spinnerTipsOverride as Record<string, unknown>).tips)
+  ) {
+    const templateTipsArray = (template.spinnerTipsOverride as Record<string, unknown>)
+      .tips as string[];
+    const templateTips = new Set(templateTipsArray);
+    const resultOverride = result.spinnerTipsOverride as Record<string, unknown>;
+    const tips = resultOverride.tips as string[];
+    resultOverride.tips = tips.filter((tip) => !templateTips.has(tip));
+    if (
+      (resultOverride.tips as string[]).length === 0 &&
+      Object.keys(resultOverride).length === 1
+    ) {
+      delete result.spinnerTipsOverride;
+    }
+  }
+
   return result;
 }
 
@@ -768,6 +890,100 @@ export function loadCopilotHooksTemplate(templatePath: string, pkgRoot: string):
   }
 }
 
+// --- Statusline ---
+
+/** Copy statusline script to ~/.claude/ for the current platform */
+export function copyStatusline(): boolean {
+  const claudeDir = platform.claudeDir();
+  mkdirSync(claudeDir, { recursive: true });
+
+  const isPlatformWin32 = process.platform === "win32";
+  const sourcePath = isPlatformWin32
+    ? assets.statuslineScriptPs1()
+    : assets.statuslineScriptBash();
+  const scriptName = isPlatformWin32 ? "statusline.ps1" : "statusline.sh";
+  const destPath = resolve(claudeDir, scriptName);
+
+  if (!existsSync(sourcePath)) {
+    log.warn(`Statusline script not found at ${sourcePath}`);
+    return false;
+  }
+
+  try {
+    copyFileSync(sourcePath, destPath);
+
+    // Make executable on Unix
+    if (process.platform !== "win32") {
+      chmodSync(destPath, 0o755);
+    }
+
+    log.success(`Statusline installed to ${destPath}`);
+    return true;
+  } catch (e) {
+    log.warn(`Failed to copy statusline script: ${e}`);
+    return false;
+  }
+}
+
+/** Remove statusline script from ~/.claude/ */
+export function removeStatusline(): boolean {
+  const claudeDir = platform.claudeDir();
+  const isPlatformWin32 = process.platform === "win32";
+  const scriptName = isPlatformWin32 ? "statusline.ps1" : "statusline.sh";
+  const scriptPath = resolve(claudeDir, scriptName);
+
+  if (!existsSync(scriptPath)) {
+    log.info("Statusline script not found, nothing to remove");
+    return true;
+  }
+
+  try {
+    unlinkSync(scriptPath);
+    log.success(`Removed statusline script from ${scriptPath}`);
+    return true;
+  } catch (e) {
+    log.warn(`Failed to remove statusline script: ${e}`);
+    return false;
+  }
+}
+
+/** Add statusLine config to settings if not already present or if using old broken command */
+export function addStatuslineConfig(
+  settings: Record<string, unknown>
+): Record<string, unknown> {
+  const statusLine = settings.statusLine as Record<string, unknown> | undefined;
+
+  // Check if already configured with a valid command (not the old broken one)
+  if (statusLine && typeof statusLine === "object" && statusLine.command) {
+    const cmd = statusLine.command as string;
+    // Keep existing config unless it's the old broken Get-Content pattern
+    if (!cmd.includes("Get-Content -Raw")) {
+      return settings;
+    }
+  }
+
+  const isPlatformWin32 = process.platform === "win32";
+  const command = isPlatformWin32
+    ? "powershell -NoProfile -File ~/.claude/statusline.ps1"
+    : "~/.claude/statusline.sh";
+
+  settings.statusLine = {
+    type: "command",
+    command,
+    padding: 2,
+  };
+
+  return settings;
+}
+
+/** Remove statusLine config from settings */
+export function removeStatuslineConfig(
+  settings: Record<string, unknown>
+): Record<string, unknown> {
+  delete settings.statusLine;
+  return settings;
+}
+
 // --- Skill Index ---
 
 interface SkillIndexEntry {