aiwcli 0.12.7 → 0.13.0

package/dist/templates/_shared/lib-ts/context/context-formatter.ts

@@ -9,8 +9,9 @@
 
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { parseIsoTimestamp } from "../base/utils.js";
+
 import { getContextDir } from "../base/constants.js";
+import { parseIsoTimestamp } from "../base/utils.js";
 import type { ContextState, Task } from "../types.js";
 
 const MAX_PLAN_INLINE_CHARS = 30_000;
@@ -44,7 +45,7 @@ export function getModeDisplay(mode: string): string {
 export function formatRelativeTime(isoTimestamp: string | null): string {
   if (!isoTimestamp) return "unknown";
 
-  let dt = parseIsoTimestamp(isoTimestamp);
+  const dt = parseIsoTimestamp(isoTimestamp);
   if (!dt) return isoTimestamp.slice(0, 16);
 
   const now = new Date();
@@ -100,7 +101,7 @@ function readPlanContent(planPath: string): [string | null, boolean, number] {
 
 function modeLabel(ctx: ContextState): string {
   const d = getModeDisplay(ctx.mode ?? "idle");
-  return d ? d.replace(/^\[|\]$/g, "") : "Active";
+  return d ? d.replaceAll(/^\[|\]$/g, "") : "Active";
 }
 
 /**
@@ -119,7 +120,7 @@ export function buildRestoreSections(
     const savedAt = lastSession.saved_at ?? "";
     if (savedAt) {
       const reason = lastSession.save_reason ?? "";
-      const reasonDisplay = reason ? reason.replace(/_/g, " ") : "unknown";
+      const reasonDisplay = reason ? reason.replaceAll('_', " ") : "unknown";
       sections.push(`**Last session ended:** ${formatRelativeTime(savedAt)} (${reasonDisplay})`);
     }
   }
@@ -222,8 +223,8 @@ export function formatHandoffContinuation(ctx: ContextState, projectRoot?: strin
     } else {
       lines.push(`*Handoff document not found at \`${handoffPath}\`*`, "");
     }
-  } catch (e: any) {
-    lines.push(`*Handoff document at \`${handoffPath}\` could not be read: ${e}*`, "");
+  } catch (error: any) {
+    lines.push(`*Handoff document at \`${handoffPath}\` could not be read: ${error}*`, "");
   }
 
   const restore = buildRestoreSections(ctx, projectRoot, true);
@@ -266,8 +267,8 @@ export function formatContextList(contexts: ContextState[]): string {
   if (contexts.length === 0) return "No active contexts found.";
 
   const lines = ["## Active Contexts\n"];
-  for (let i = 0; i < contexts.length; i++) {
-    const ctx = contexts[i]!;
+  for (const [i, context_] of contexts.entries()) {
+    const ctx = context_!;
     const timeStr = formatRelativeTime(ctx.last_active);
     const md = getModeDisplay(ctx.mode ?? "idle");
     const si = md ? ` ${md}` : "";
@@ -349,11 +350,11 @@ export function formatContextPickerStderr(contexts: ContextState[]): string {
   ];
 
   let selectableCount = 0;
-  for (let i = 0; i < contexts.length; i++) {
-    const ctx = contexts[i]!;
+  for (const [i, context_] of contexts.entries()) {
+    const ctx = context_!;
     const timeStr = formatRelativeTime(ctx.last_active);
     const mode = ctx.mode ?? "idle";
-    const isSelectable = mode === "active" || !!ctx.handoff_path;
+    const isSelectable = mode === "active" || Boolean(ctx.handoff_path);
     if (isSelectable) selectableCount++;
 
     let status = "";
@@ -451,7 +452,7 @@ const KNOWN_FOLDERS: Record<string, string> = {
   "notes": "Analysis files, reports, and documentation that don't belong in the codebase",
 };
 
-function collectFolderPath(contextId: string, contextDir: string, state: ContextState): string | null {
+function collectFolderPath(contextId: string, contextDir: string, _state: ContextState): string | null {
   if (!fs.existsSync(contextDir)) return null;
   return `**Context folder:** \`${contextDir}\`\n**State file:** \`${path.join(contextDir, "state.json")}\` — contains session history, task records, plan/handoff metadata`;
 }
@@ -485,7 +486,7 @@ function countFilesRecursive(dirPath: string): number {
   return count;
 }
 
-function collectFolderInventory(contextId: string, contextDir: string, state: ContextState): string | null {
+function collectFolderInventory(contextId: string, contextDir: string, _state: ContextState): string | null {
   if (!fs.existsSync(contextDir)) return null;
   let entries: fs.Dirent[];
   try {
@@ -519,7 +520,7 @@ function collectSessionStats(contextId: string, contextDir: string, state: Conte
       transcriptCount = files.length;
       if (files.length > 1) {
         const oldest = files[0]!.slice(0, 10);
-        const newest = files[files.length - 1]!.slice(0, 10);
+        const newest = files.at(-1)!.slice(0, 10);
         if (oldest !== newest) timeRange = ` (${oldest} to ${newest})`;
       }
     } catch { /* ignore */ }
@@ -532,7 +533,7 @@ function collectSessionStats(contextId: string, contextDir: string, state: Conte
   return line;
 }
 
-function collectNotesGuidance(contextId: string, contextDir: string, state: ContextState): string | null {
+function collectNotesGuidance(contextId: string, contextDir: string, _state: ContextState): string | null {
   const notesDir = path.join(contextDir, "notes");
   return `**Notes:** Put notes and files that don't belong in the codebase here. Reference them in other documents as needed: \`${notesDir}\``;
 }

package/dist/templates/_shared/lib-ts/context/context-selector.ts

@@ -14,6 +14,15 @@
  */
 
 import * as crypto from "node:crypto";
+
+import {
+  formatActiveContextReminder,
+  formatContextCreated,
+  formatContextPickerStderr,
+  formatCommandFeedback,
+  formatHandoffContinuation,
+  formatPlanContinuation,
+} from "./context-formatter.js";
 import {
   getContext,
   getAllContexts,
@@ -25,18 +34,9 @@ import {
   updateMode,
   determineArtifactType,
 } from "./context-store.js";
-import {
-  formatActiveContextReminder,
-  formatContextCreated,
-  formatContextPickerStderr,
-  formatCommandFeedback,
-  formatHandoffContinuation,
-  formatPlanContinuation,
-  formatActiveContinuation,
-} from "./context-formatter.js";
 import { normalizePlanContent } from "./plan-manager.js";
+import { logDebug, logInfo, logError } from "../base/logger.js";
 import { isInternalCall } from "../base/subprocess-utils.js";
-import { logDebug, logInfo, logWarn, logError } from "../base/logger.js";
 import type { ContextState, CaretCommand } from "../types.js";
 
 /** Minimum characters required for new context description. */
@@ -277,9 +277,9 @@ function matchPlanContent(prompt: string, hasPlanContexts: ContextState[]): Cont
   }
 
   // Tier 4 (legacy): Signature match
-  const promptHead = prompt.slice(0, 500);
+  const promptHead = new Set(prompt.slice(0, 500));
   for (const ctx of hasPlanContexts) {
-    if (ctx.plan_signature && promptHead.includes(ctx.plan_signature)) {
+    if (ctx.plan_signature && promptHead.has(ctx.plan_signature)) {
       logDebug("context_selector", `Tier 4 legacy signature match: ${ctx.id}`);
       return ctx;
     }
@@ -302,8 +302,8 @@ function createNewContext(
     newCtx.mode = "active";
     logInfo("context_selector", `Auto-created context: ${newCtx.id}`);
     return [newCtx.id, "auto_created", formatContextCreated(newCtx)];
-  } catch (e: any) {
-    logError("context_selector", `Primary context creation failed: ${e}`);
+  } catch (error: any) {
+    logError("context_selector", `Primary context creation failed: ${error}`);
     try {
       const now = new Date();
       const yy = String(now.getFullYear()).slice(2);
@@ -323,8 +323,8 @@ function createNewContext(
       newCtx.mode = "active";
       logInfo("context_selector", `Fallback context created: ${newCtx.id}`);
       return [newCtx.id, "auto_created_fallback", formatContextCreated(newCtx)];
-    } catch (e2: any) {
-      logError("context_selector", `ALL context creation failed: ${e2}`);
+    } catch (error: any) {
+      logError("context_selector", `ALL context creation failed: ${error}`);
       return [null, "creation_failed", null];
     }
   }

package/dist/templates/_shared/lib-ts/context/context-store.ts

@@ -9,7 +9,7 @@
 
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { readStateJson, writeStateJson, toDict, dictToState } from "../base/state-io.js";
+
 import { atomicWrite } from "../base/atomic-write.js";
 import {
   getContextDir,
@@ -20,7 +20,8 @@ import {
   getArchiveIndexPath,
   validateContextId,
 } from "../base/constants.js";
-import { logDebug, logInfo, logWarn, logError, setContextPath } from "../base/logger.js";
+import { logInfo, logWarn, logError, setContextPath } from "../base/logger.js";
+import { readStateJson, writeStateJson } from "../base/state-io.js";
 import { nowIso, generateContextId } from "../base/utils.js";
 import type { ContextState, IndexFile, IndexEntry, Mode } from "../types.js";
 
@@ -77,8 +78,8 @@ function loadIndex(projectRoot?: string): IndexFile {
     try {
       const raw = fs.readFileSync(indexPath, "utf-8");
       return JSON.parse(raw) as IndexFile;
-    } catch (e: any) {
-      logWarn("context_store", `Failed to read index, recreating: ${e}`);
+    } catch (error: any) {
+      logWarn("context_store", `Failed to read index, recreating: ${error}`);
     }
   }
   return { version: INDEX_VERSION, updated_at: nowIso(), sessions: {}, contexts: {} };
@@ -145,8 +146,8 @@ function migrateContextJson(contextId: string, projectRoot?: string): ContextSta
       last_session: null,
       tasks: [],
     };
-  } catch (e: any) {
-    logWarn("context_store", `Failed to migrate context.json for '${contextId}': ${e}`);
+  } catch (error: any) {
+    logWarn("context_store", `Failed to migrate context.json for '${contextId}': ${error}`);
     return null;
   }
 }
@@ -556,8 +557,8 @@ export function archiveContext(contextId: string, projectRoot?: string): Context
 
   try {
     fs.renameSync(sourceDir, archiveDest);
-  } catch (e: any) {
-    logError("context_store", `Failed to move context to archive: ${e}`);
+  } catch (error: any) {
+    logError("context_store", `Failed to move context to archive: ${error}`);
     return null;
   }
 
@@ -647,8 +648,8 @@ function updateArchiveIndex(state: ContextState, projectRoot?: string): boolean
   if (fs.existsSync(archiveIndexPath)) {
     try {
       archiveIndex = JSON.parse(fs.readFileSync(archiveIndexPath, "utf-8"));
-    } catch (e: any) {
-      logWarn("context_store", `Failed to read archive index, recreating: ${e}`);
+    } catch (error_: any) {
+      logWarn("context_store", `Failed to read archive index, recreating: ${error_}`);
     }
   }
 
@@ -675,8 +676,8 @@ function restoreFromArchive(contextId: string, projectRoot?: string): ContextSta
 
   try {
     fs.renameSync(archiveDir, activeDir);
-  } catch (e: any) {
-    logError("context_store", `Failed to restore context from archive: ${e}`);
+  } catch (error: any) {
+    logError("context_store", `Failed to restore context from archive: ${error}`);
     return null;
   }
 
@@ -705,8 +706,8 @@ function removeFromArchiveIndex(contextId: string, projectRoot?: string): boolea
       }
     }
     return true;
-  } catch (e: any) {
-    logWarn("context_store", `Failed to read archive index: ${e}`);
+  } catch (error: any) {
+    logWarn("context_store", `Failed to read archive index: ${error}`);
     return false;
   }
 }

package/dist/templates/_shared/lib-ts/context/plan-manager.ts

@@ -13,10 +13,9 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 
 import { atomicWrite } from "../base/atomic-write.js";
-import { getContextDir, getContextPlansDir, sanitizeTitle } from "../base/constants.js";
+import { getContextPlansDir, sanitizeTitle } from "../base/constants.js";
 import { logDebug, logInfo, logWarn, logError } from "../base/logger.js";
 import { generateSlug } from "../base/utils.js";
-import type { ContextState } from "../types.js";
 
 // ---------------------------------------------------------------------------
 // Plan archival
@@ -144,6 +143,7 @@ export function findLatestPlan(
   // 1. Check state.json plan_path first
   try {
     // Dynamic import to avoid circular dependency at module level
+    // eslint-disable-next-line @typescript-eslint/no-require-imports, no-undef -- dynamic require to avoid circular dependency
     const stateIo = require("../base/state-io.js");
     const state = stateIo.readStateJson(contextId, projectRoot);
     if (state?.plan_path && fs.existsSync(state.plan_path)) {

package/dist/templates/_shared/scripts/resolve-run.ts

@@ -0,0 +1,61 @@
+#!/usr/bin/env bun
+/**
+ * Cross-platform project root resolver for hook and status line commands.
+ *
+ * Finds the project root (via git or .aiwcli/ anchor walk-up), then spawns
+ * the target script with cwd set to the root. stdin/stdout/stderr pass through.
+ *
+ * Install:  ~/.aiwcli/bin/resolve-run.ts  (global, always findable via ~)
+ * Usage:    bun ~/.aiwcli/bin/resolve-run.ts .aiwcli/_shared/scripts/status_line.ts
+ *
+ * Works on: bash, zsh, PowerShell, cmd (anywhere bun + ~ expansion works)
+ */
+import { execSync } from "node:child_process";
+import * as fs from "node:fs";
+import * as path from "node:path";
+
+function findProjectRoot(): string {
+  // 1. git (works from any subdirectory of a repo)
+  try {
+    const root = execSync("git rev-parse --show-toplevel", {
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"],
+      timeout: 2000,
+    }).trim();
+    if (root && fs.existsSync(path.join(root, ".aiwcli"))) return root;
+  } catch { /* not a git repo or git not available */ }
+
+  // 2. Walk up from cwd to find .aiwcli/ anchor
+  let dir = process.cwd();
+  while (true) {
+    if (fs.existsSync(path.join(dir, ".aiwcli"))) return dir;
+    const parent = path.dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+
+  return process.cwd(); // last resort
+}
+
+const target = process.argv[2];
+if (!target) {
+  process.stderr.write("resolve-run: missing script path argument\n");
+  process.exit(1);
+}
+
+const root = findProjectRoot();
+const fullPath = path.resolve(root, target);
+
+if (!fs.existsSync(fullPath)) {
+  process.stderr.write(`resolve-run: script not found: ${fullPath}\n`);
+  process.exit(1);
+}
+
+const result = Bun.spawnSync(["bun", fullPath], {
+  stdin: "inherit",
+  stdout: "inherit",
+  stderr: "inherit",
+  cwd: root,
+});
+
+process.exit(result.exitCode);

package/dist/templates/_shared/scripts/resolve_context.ts

@@ -11,9 +11,9 @@
  *
  * Requires CLAUDE_SESSION_ID environment variable (set by Claude Code).
  */
-import { getContextBySessionId } from "../lib-ts/context/context-store.js";
 import { getProjectRoot } from "../lib-ts/base/constants.js";
 import { eprint } from "../lib-ts/base/utils.js";
+import { getContextBySessionId } from "../lib-ts/context/context-store.js";
 
 const projectRoot = getProjectRoot(process.cwd());
 const sessionId = process.env.CLAUDE_SESSION_ID;

package/dist/templates/_shared/scripts/status_line.ts

@@ -22,7 +22,10 @@ import { findLatestPlan } from "../lib-ts/context/plan-manager.js";
 // Path setup
 // ---------------------------------------------------------------------------
 const SCRIPT_DIR = path.dirname(new URL(import.meta.url).pathname);
-const OUTPUT_DIR = path.join(".", "_output");
+// Resolve project root from script location (.aiwcli/_shared/scripts/) so paths
+// work even when cwd has drifted via `cd` in a Bash tool call.
+const PROJECT_ROOT = path.resolve(SCRIPT_DIR, "..", "..", "..");
+const OUTPUT_DIR = path.join(PROJECT_ROOT, "_output");
 const CACHE_DIR = path.join(OUTPUT_DIR, "cache");
 const STATUSLINE_CACHE = path.join(CACHE_DIR, ".statusline-cache.json");
 
@@ -266,9 +269,10 @@ function runGit(args: string[], cwd: string, timeout = 2000): string | null {
 }
 
 function getGitStatus(cwd: string): GitStatus | null {
-  if (runGit(["rev-parse", "--git-dir"], cwd) === null) {
-    return null;
-  }
+  // One call replaces 6: branch, modified, staged, untracked, ahead/behind, and repo check.
+  // porcelain=v2 -b gives structured header lines + per-file XY status codes.
+  const porcelain = runGit(["status", "--porcelain=v2", "-b"], cwd);
+  if (porcelain === null) return null;
 
   const status: GitStatus = {
     branch: "detached",
@@ -282,36 +286,32 @@ function getGitStatus(cwd: string): GitStatus | null {
     age_color: GIT_AGE_FRESH,
   };
 
-  // Branch
-  const branch = runGit(["branch", "--show-current"], cwd);
-  if (branch) status.branch = branch;
-
-  // Modified files
-  const diff = runGit(["diff", "--name-only"], cwd);
-  if (diff) status.modified = diff.split(/\r?\n/).filter(Boolean).length;
-
-  // Staged files
-  const staged = runGit(["diff", "--cached", "--name-only"], cwd);
-  if (staged) status.staged = staged.split(/\r?\n/).filter(Boolean).length;
-
-  // Untracked files
-  const untracked = runGit(["ls-files", "--others", "--exclude-standard"], cwd);
-  if (untracked) status.untracked = untracked.split(/\r?\n/).filter(Boolean).length;
+  for (const line of porcelain.split(/\r?\n/)) {
+    if (line.startsWith("# branch.head ")) {
+      const b = line.slice(14).trim();
+      status.branch = b === "(detached)" ? "detached" : b;
+    } else if (line.startsWith("# branch.ab ")) {
+      // Format: "+<ahead> -<behind>"
+      const m = line.match(/\+(\d+) -(\d+)/);
+      if (m) {
+        status.ahead = parseInt(m[1]!, 10);
+        status.behind = parseInt(m[2]!, 10);
+      }
+    } else if (line.startsWith("1 ") || line.startsWith("2 ")) {
+      // Changed tracked file: "1 XY ..." where X=staged Y=unstaged, '.'=unchanged
+      const x = line[2]!;
+      const y = line[3]!;
+      if (x !== ".") status.staged++;
+      if (y !== ".") status.modified++;
+    } else if (line.startsWith("? ")) {
+      status.untracked++;
+    }
+  }
 
-  // Stash count
+  // Stash count (no equivalent in status output)
   const stash = runGit(["stash", "list"], cwd);
   if (stash) status.stash_count = stash.split(/\r?\n/).filter(Boolean).length;
 
-  // Ahead/behind
-  const ab = runGit(["rev-list", "--left-right", "--count", "HEAD...@{u}"], cwd);
-  if (ab) {
-    const parts = ab.split(/\s+/);
-    if (parts.length >= 2) {
-      status.ahead = parseInt(parts[0]!, 10) || 0;
-      status.behind = parseInt(parts[1]!, 10) || 0;
-    }
-  }
-
   // Commit age
   const log = runGit(["log", "-1", "--format=%ct"], cwd);
   if (log) {
@@ -345,89 +345,97 @@ function getGitStatus(cwd: string): GitStatus | null {
   return status;
 }
 
-function renderGit(mode: string, git: GitStatus, dirName: string): void {
-  const totalChanged = git.modified + git.staged;
-  const statusIcon = (totalChanged > 0 || git.untracked > 0) ? "*" : "\u2713";
+function renderGit(mode: string, git: GitStatus | null, dirName: string): void {
+  const totalChanged = git ? git.modified + git.staged : 0;
+  const statusIcon = git && (totalChanged > 0 || git.untracked > 0) ? "*" : "\u2713";
 
   switch (mode) {
   case "micro": {
-    let line = `${GIT_PRIMARY}\u25C8${RESET} ${GIT_DIR}${dirName}${RESET} ${GIT_VALUE}${git.branch}${RESET}`;
-    if (git.age_display) {
-      line += ` ${git.age_color}${git.age_display}${RESET}`;
-    }
-    line += " ";
-    if (statusIcon === "\u2713") {
-      line += `${GIT_CLEAN}${statusIcon}${RESET}`;
-    } else {
-      line += `${GIT_MODIFIED}${statusIcon}${totalChanged}${RESET}`;
+    let line = `${GIT_PRIMARY}\u25C8${RESET} ${GIT_DIR}${dirName}${RESET}`;
+    if (git) {
+      line += ` ${GIT_VALUE}${git.branch}${RESET}`;
+      if (git.age_display) {
+        line += ` ${git.age_color}${git.age_display}${RESET}`;
+      }
+      line += " ";
+      if (statusIcon === "\u2713") {
+        line += `${GIT_CLEAN}${statusIcon}${RESET}`;
+      } else {
+        line += `${GIT_MODIFIED}${statusIcon}${totalChanged}${RESET}`;
+      }
     }
     console.log(line);
-  
+
   break;
   }
   case "mini": {
-    let line =
-      `${GIT_PRIMARY}\u25C8${RESET} ${GIT_DIR}${dirName}${RESET} ` +
-      `${SLATE_600}\u2502${RESET} ${GIT_VALUE}${git.branch}${RESET}`;
-    if (git.age_display) {
-      line += ` ${SLATE_600}\u2502${RESET} ${git.age_color}${git.age_display}${RESET}`;
-    }
-    line += ` ${SLATE_600}\u2502${RESET} `;
-    if (statusIcon === "\u2713") {
-      line += `${GIT_CLEAN}${statusIcon}${RESET}`;
-    } else {
-      line += `${GIT_MODIFIED}${statusIcon}${totalChanged}${RESET}`;
-      if (git.untracked > 0) {
-        line += ` ${GIT_ADDED}+${git.untracked}${RESET}`;
+    let line = `${GIT_PRIMARY}\u25C8${RESET} ${GIT_DIR}${dirName}${RESET}`;
+    if (git) {
+      line += ` ${SLATE_600}\u2502${RESET} ${GIT_VALUE}${git.branch}${RESET}`;
+      if (git.age_display) {
+        line += ` ${SLATE_600}\u2502${RESET} ${git.age_color}${git.age_display}${RESET}`;
+      }
+      line += ` ${SLATE_600}\u2502${RESET} `;
+      if (statusIcon === "\u2713") {
+        line += `${GIT_CLEAN}${statusIcon}${RESET}`;
+      } else {
+        line += `${GIT_MODIFIED}${statusIcon}${totalChanged}${RESET}`;
+        if (git.untracked > 0) {
+          line += ` ${GIT_ADDED}+${git.untracked}${RESET}`;
+        }
       }
     }
     console.log(line);
-  
+
   break;
   }
   case "nano": {
-    let line = `${GIT_PRIMARY}\u25C8${RESET} ${GIT_DIR}${dirName}${RESET} ${GIT_VALUE}${git.branch}${RESET} `;
-    if (statusIcon === "\u2713") {
-      line += `${GIT_CLEAN}\u2713${RESET}`;
-    } else {
-      line += `${GIT_MODIFIED}*${totalChanged}${RESET}`;
+    let line = `${GIT_PRIMARY}\u25C8${RESET} ${GIT_DIR}${dirName}${RESET}`;
+    if (git) {
+      line += ` ${GIT_VALUE}${git.branch}${RESET} `;
+      if (statusIcon === "\u2713") {
+        line += `${GIT_CLEAN}\u2713${RESET}`;
+      } else {
+        line += `${GIT_MODIFIED}*${totalChanged}${RESET}`;
+      }
     }
     console.log(line);
-  
+
   break;
   }
   default: {
-    let line =
-      `${GIT_PRIMARY}\u25C8${RESET} ${GIT_PRIMARY}PWD:${RESET} ${GIT_DIR}${dirName}${RESET} ` +
-      `${SLATE_600}\u2502${RESET} ` +
-      `${GIT_PRIMARY}Branch:${RESET} ${GIT_VALUE}${git.branch}${RESET}`;
-    if (git.age_display) {
-      line += ` ${SLATE_600}\u2502${RESET} ${GIT_PRIMARY}Age:${RESET} ${git.age_color}${git.age_display}${RESET}`;
-    }
-    if (git.stash_count > 0) {
-      line += ` ${SLATE_600}\u2502${RESET} ${GIT_PRIMARY}Stash:${RESET} ${GIT_STASH}${git.stash_count}${RESET}`;
-    }
-
-    if (totalChanged > 0 || git.untracked > 0) {
-      line += ` ${SLATE_600}\u2502${RESET} `;
-      if (totalChanged > 0) {
-        line += `${GIT_PRIMARY}Mod:${RESET} ${GIT_MODIFIED}${totalChanged}${RESET}`;
+    let line = `${GIT_PRIMARY}\u25C8${RESET} ${GIT_PRIMARY}PWD:${RESET} ${GIT_DIR}${dirName}${RESET}`;
+    if (git) {
+      line += ` ${SLATE_600}\u2502${RESET} ` +
+        `${GIT_PRIMARY}Branch:${RESET} ${GIT_VALUE}${git.branch}${RESET}`;
+      if (git.age_display) {
+        line += ` ${SLATE_600}\u2502${RESET} ${GIT_PRIMARY}Age:${RESET} ${git.age_color}${git.age_display}${RESET}`;
       }
-      if (git.untracked > 0) {
-        if (totalChanged > 0) line += " ";
-        line += `${GIT_PRIMARY}New:${RESET} ${GIT_ADDED}${git.untracked}${RESET}`;
+      if (git.stash_count > 0) {
+        line += ` ${SLATE_600}\u2502${RESET} ${GIT_PRIMARY}Stash:${RESET} ${GIT_STASH}${git.stash_count}${RESET}`;
       }
-    } else {
-      line += ` ${SLATE_600}\u2502${RESET} ${GIT_CLEAN}\u2713 clean${RESET}`;
-    }
 
-    if (git.ahead > 0 || git.behind > 0) {
-      line += ` ${SLATE_600}\u2502${RESET} ${GIT_PRIMARY}Sync:${RESET} `;
-      if (git.ahead > 0) {
-        line += `${GIT_CLEAN}\u2191${git.ahead}${RESET}`;
+      if (totalChanged > 0 || git.untracked > 0) {
+        line += ` ${SLATE_600}\u2502${RESET} `;
+        if (totalChanged > 0) {
+          line += `${GIT_PRIMARY}Mod:${RESET} ${GIT_MODIFIED}${totalChanged}${RESET}`;
+        }
+        if (git.untracked > 0) {
+          if (totalChanged > 0) line += " ";
+          line += `${GIT_PRIMARY}New:${RESET} ${GIT_ADDED}${git.untracked}${RESET}`;
+        }
+      } else {
+        line += ` ${SLATE_600}\u2502${RESET} ${GIT_CLEAN}\u2713 clean${RESET}`;
       }
-      if (git.behind > 0) {
-        line += `${GIT_STASH}\u2193${git.behind}${RESET}`;
+
+      if (git.ahead > 0 || git.behind > 0) {
+        line += ` ${SLATE_600}\u2502${RESET} ${GIT_PRIMARY}Sync:${RESET} `;
+        if (git.ahead > 0) {
+          line += `${GIT_CLEAN}\u2191${git.ahead}${RESET}`;
+        }
+        if (git.behind > 0) {
+          line += `${GIT_STASH}\u2193${git.behind}${RESET}`;
+        }
       }
     }
     console.log(line);
@@ -687,11 +695,9 @@ function main(): void {
   // Render context section
   renderContext(mode, contextPct, contextK, maxK, timeDisplay, modelName);
 
-  // Render git section
+  // Render PWD + git section (PWD always shown, git stats only when in a repo)
   const git = getGitStatus(currentDir);
-  if (git) {
-    renderGit(mode, git, dirName);
-  }
+  renderGit(mode, git, dirName);
 
   // Render context manager line (line 3) with separator
   console.log(SEPARATOR);