@yagni-app/code-staging 0.2.1-staging.1030.1 → 0.2.1-staging.1032.1

package/dist/extension/footer.d.ts

@@ -1,11 +1,10 @@
 /**
- * Custom footer for the YAGNI CLI — replaces pi's built-in footer to hide the
- * model name from the status bar. The model is locked to `advanced` (see
- * index.ts's catalog filter) and is not a user-facing concern.
+ * Custom footer for the YAGNI CLI — replaces pi's built-in footer.
  *
- * Replicates the useful parts of pi's built-in footer (cwd + git branch,
- * token usage stats, context usage, extension statuses) without the model
- * name on the right side.
+ * Renders three lines:
+ *   1. folder  ·  [worktree]  ·  branch        (git context; ~-path fallback off-repo)
+ *   2. model  ·  ↑in ↓out $cost  ·  ctx%        (session stats; context % is an integer)
+ *   3. extension statuses                       (branding, todo counter, mode) joined by " · "
  *
  * --- How to customize the status bar (for future tickets) ---
  *
@@ -40,6 +39,7 @@
  * — useful reference for what data to replicate and how to format it.
  */
 import type { ExtensionContext, ReadonlyFooterDataProvider, Theme } from "@earendil-works/pi-coding-agent";
+export declare const BRANCH_MAX_WIDTH = 60;
 /** Format token counts for compact footer display (mirrors pi's formatTokens). */
 export declare function formatTokens(count: number): string;
 /** Shorten cwd relative to home, like pi's built-in footer. */
@@ -53,6 +53,39 @@ interface UsageTotals {
 }
 /** Accumulate usage from all session entries (mirrors pi's built-in footer). */
 export declare function collectUsage(sessionManager: ExtensionContext["sessionManager"]): UsageTotals;
+export interface GitInfo {
+    /** Repo-root folder basename (the MAIN repo, stable across worktrees), or ~-path off-repo. */
+    folder: string;
+    inRepo: boolean;
+    /** Current branch, null off-repo. "detached" on detached HEAD. */
+    branch: string | null;
+    /** Linked-worktree label for [brackets], or null to hide. */
+    worktree: string | null;
+}
+/** Git probes `resolveWorktreeLabel` needs, injectable so the rules can be unit-tested. */
+export interface WorktreeProbes {
+    isLinkedWorktree(repoRoot: string): boolean;
+    worktrees(repoRoot: string): string[];
+}
+/**
+ * Show [worktree] only on a LINKED worktree (never the main checkout), when the repo has
+ * >1 worktree, AND the dir differs from the branch slug. The main checkout is the default
+ * context and earns no label; a [bracket] only disambiguates a secondary working tree.
+ */
+export declare function resolveWorktreeLabel(repoRoot: string, branch: string | null, probes?: WorktreeProbes): string | null;
+/**
+ * Detect git info for a cwd, gracefully. Never throws: non-git folders, missing git
+ * binary, and corrupt repos all degrade to a safe partial/empty result.
+ */
+export declare function detectGitInfo(cwd: string, home: string | undefined): GitInfo;
+/** Pure line-builder, exported for tests. All data injected; colors via theme. */
+export declare function renderFooterLines(input: {
+    git: GitInfo;
+    model: string;
+    usage: UsageTotals;
+    contextPercent: number | null;
+    statuses: string[];
+}, theme: Pick<Theme, "fg">, width: number): string[];
 /**
  * Create a footer factory that captures the session `ctx` (for session data)
  * and returns the component `setFooter` expects. Called from the
@@ -61,7 +94,7 @@ export declare function collectUsage(sessionManager: ExtensionContext["sessionMa
 export declare function createYagniFooterFactory(ctx: ExtensionContext): (_tui: unknown, theme: Theme, footerData: ReadonlyFooterDataProvider) => {
     render(width: number): string[];
     invalidate(): void;
-    dispose?(): void;
+    dispose(): void;
 };
 export {};
 //# sourceMappingURL=footer.d.ts.map

package/dist/extension/footer.js

@@ -1,11 +1,10 @@
 /**
- * Custom footer for the YAGNI CLI — replaces pi's built-in footer to hide the
- * model name from the status bar. The model is locked to `advanced` (see
- * index.ts's catalog filter) and is not a user-facing concern.
+ * Custom footer for the YAGNI CLI — replaces pi's built-in footer.
  *
- * Replicates the useful parts of pi's built-in footer (cwd + git branch,
- * token usage stats, context usage, extension statuses) without the model
- * name on the right side.
+ * Renders three lines:
+ *   1. folder  ·  [worktree]  ·  branch        (git context; ~-path fallback off-repo)
+ *   2. model  ·  ↑in ↓out $cost  ·  ctx%        (session stats; context % is an integer)
+ *   3. extension statuses                       (branding, todo counter, mode) joined by " · "
  *
  * --- How to customize the status bar (for future tickets) ---
  *
@@ -39,7 +38,14 @@
  * `node_modules/@earendil-works/pi-coding-agent/dist/modes/interactive/components/footer.js`
  * — useful reference for what data to replicate and how to format it.
  */
-import { isAbsolute, relative, resolve, sep } from "node:path";
+import { spawnSync } from "node:child_process";
+import { statSync } from "node:fs";
+import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
+import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+export const BRANCH_MAX_WIDTH = 60;
+const WORKTREE_MAX_WIDTH = 30;
+/** Section separator: single space + middle dot + single space. */
+const SEP = " · ";
 /** Format token counts for compact footer display (mirrors pi's formatTokens). */
 export function formatTokens(count) {
     if (count < 1000)
@@ -87,6 +93,139 @@ export function collectUsage(sessionManager) {
     }
     return totals;
 }
+/** End-cut ellipsis truncation (ANSI-aware) so the branch prefix stays readable. */
+function truncateEnd(text, maxWidth) {
+    if (visibleWidth(text) <= maxWidth)
+        return text;
+    return truncateToWidth(text, maxWidth, "…");
+}
+function runGit(args, cwd) {
+    try {
+        const r = spawnSync("git", ["--no-optional-locks", ...args], {
+            cwd,
+            encoding: "utf8",
+            stdio: ["ignore", "pipe", "ignore"],
+        });
+        if (r.error || r.status !== 0)
+            return null;
+        return r.stdout.trim();
+    }
+    catch {
+        return null;
+    }
+}
+function gitRepoRoot(cwd) {
+    return runGit(["rev-parse", "--show-toplevel"], cwd) || null;
+}
+function gitBranch(repoRoot) {
+    const out = runGit(["symbolic-ref", "--quiet", "--short", "HEAD"], repoRoot);
+    if (out)
+        return out;
+    // Detached HEAD, or repo with no commits yet.
+    return runGit(["rev-parse", "--verify", "HEAD"], repoRoot) ? "detached" : null;
+}
+function gitWorktrees(repoRoot) {
+    const out = runGit(["worktree", "list", "--porcelain"], repoRoot);
+    if (!out)
+        return [];
+    return out
+        .split("\n")
+        .filter((l) => l.startsWith("worktree "))
+        .map((l) => l.slice("worktree ".length).trim())
+        .filter(Boolean);
+}
+/** The MAIN repository root (stable across worktrees) — used for the folder name. */
+function gitMainRepoRoot(repoRoot) {
+    const common = runGit(["rev-parse", "--git-common-dir"], repoRoot);
+    if (!common)
+        return repoRoot;
+    const abs = isAbsolute(common) ? common : join(repoRoot, common);
+    return basename(abs) === ".git" ? dirname(abs) : repoRoot;
+}
+/** Main checkout: .git is a directory. Linked worktree: .git is a "gitdir:" file. */
+function isLinkedWorktree(repoRoot) {
+    try {
+        return statSync(join(repoRoot, ".git")).isFile();
+    }
+    catch {
+        return false;
+    }
+}
+const liveWorktreeProbes = { isLinkedWorktree, worktrees: gitWorktrees };
+/**
+ * Show [worktree] only on a LINKED worktree (never the main checkout), when the repo has
+ * >1 worktree, AND the dir differs from the branch slug. The main checkout is the default
+ * context and earns no label; a [bracket] only disambiguates a secondary working tree.
+ */
+export function resolveWorktreeLabel(repoRoot, branch, probes = liveWorktreeProbes) {
+    if (!probes.isLinkedWorktree(repoRoot))
+        return null;
+    if (probes.worktrees(repoRoot).length < 2)
+        return null;
+    const currentDir = basename(repoRoot);
+    if (branch && currentDir === branch)
+        return null;
+    return truncateEnd(currentDir, WORKTREE_MAX_WIDTH);
+}
+/**
+ * Detect git info for a cwd, gracefully. Never throws: non-git folders, missing git
+ * binary, and corrupt repos all degrade to a safe partial/empty result.
+ */
+export function detectGitInfo(cwd, home) {
+    const root = gitRepoRoot(cwd);
+    if (!root) {
+        return { folder: formatCwd(cwd, home), inRepo: false, branch: null, worktree: null };
+    }
+    const branch = gitBranch(root);
+    const worktree = resolveWorktreeLabel(root, branch);
+    return { folder: basename(gitMainRepoRoot(root)), inRepo: true, branch, worktree };
+}
+/** Context color: dim below 70, warning 70-90, error above 90. */
+function contextColor(percent) {
+    if (percent === null)
+        return "dim";
+    if (percent > 90)
+        return "error";
+    if (percent > 70)
+        return "warning";
+    return "dim";
+}
+/** Pure line-builder, exported for tests. All data injected; colors via theme. */
+export function renderFooterLines(input, theme, width) {
+    const dim = (s) => theme.fg("dim", s);
+    const sep = dim(SEP);
+    // Line 1: folder · [worktree] · branch
+    const line1Parts = [theme.fg("accent", input.git.folder)];
+    if (input.git.inRepo) {
+        if (input.git.worktree)
+            line1Parts.push(theme.fg("warning", `[${input.git.worktree}]`));
+        if (input.git.branch)
+            line1Parts.push(theme.fg("border", truncateEnd(input.git.branch, BRANCH_MAX_WIDTH)));
+    }
+    const line1 = truncateToWidth(line1Parts.join(sep), width, dim("…"));
+    // Line 2: model · ↑in ↓out $cost · ctx%
+    const statParts = [];
+    if (input.usage.input)
+        statParts.push(`↑${formatTokens(input.usage.input)}`);
+    if (input.usage.output)
+        statParts.push(`↓${formatTokens(input.usage.output)}`);
+    if (input.usage.cost)
+        statParts.push(`$${input.usage.cost.toFixed(3)}`);
+    const stats = statParts.join(" ");
+    const percentText = input.contextPercent === null ? "?" : `${Math.round(input.contextPercent)}%`;
+    const line2Parts = [dim(input.model)];
+    if (stats)
+        line2Parts.push(dim(stats));
+    line2Parts.push(theme.fg(contextColor(input.contextPercent), percentText));
+    const line2 = truncateToWidth(line2Parts.join(sep), width, dim("…"));
+    // Line 3: extension statuses (branding, todo counter, mode), joined by " · ".
+    const statuses = input.statuses.map((s) => s.replace(/[\r\n\t]/g, " ").trim()).filter(Boolean);
+    const lines = [line1, line2];
+    if (statuses.length > 0) {
+        lines.push(truncateToWidth(dim(statuses.join(SEP)), width, dim("…")));
+    }
+    return lines;
+}
 /**
  * Create a footer factory that captures the session `ctx` (for session data)
  * and returns the component `setFooter` expects. Called from the
@@ -94,58 +233,39 @@ export function collectUsage(sessionManager) {
  */
 export function createYagniFooterFactory(ctx) {
     return (_tui, theme, footerData) => {
+        // Recompute git/worktree info only when the branch actually changes. Optional-
+        // chained: onBranchChange is typed on ReadonlyFooterDataProvider, but the runtime
+        // provider is whatever pi version is installed — guard so a mismatch can't break
+        // footer construction (worst case, git info just doesn't auto-invalidate).
+        let gitCache;
+        const unsubscribeBranch = footerData.onBranchChange?.(() => {
+            gitCache = undefined;
+        });
+        const gitInfo = () => {
+            if (!gitCache) {
+                gitCache = detectGitInfo(ctx.sessionManager.getCwd(), process.env.HOME || process.env.USERPROFILE);
+            }
+            return gitCache;
+        };
         return {
             render(width) {
-                const sessionManager = ctx.sessionManager;
-                // --- Line 1: cwd + git branch + session name ---
-                let pwd = formatCwd(sessionManager.getCwd(), process.env.HOME || process.env.USERPROFILE);
-                const branch = footerData.getGitBranch();
-                if (branch)
-                    pwd += ` (${branch})`;
-                const sessionName = sessionManager.getSessionName();
-                if (sessionName)
-                    pwd += ` • ${sessionName}`;
-                // --- Line 2: token stats + context usage (no model name) ---
-                const usage = collectUsage(sessionManager);
-                const statsParts = [];
-                if (usage.input)
-                    statsParts.push(`↑${formatTokens(usage.input)}`);
-                if (usage.output)
-                    statsParts.push(`↓${formatTokens(usage.output)}`);
-                if (usage.cacheRead)
-                    statsParts.push(`R${formatTokens(usage.cacheRead)}`);
-                if (usage.cacheWrite)
-                    statsParts.push(`W${formatTokens(usage.cacheWrite)}`);
-                if (usage.cost)
-                    statsParts.push(`$${usage.cost.toFixed(3)}`);
-                // Context usage (tokens used / window).
-                const contextUsage = ctx.getContextUsage();
-                if (contextUsage) {
-                    const pct = contextUsage.percent !== null ? `${contextUsage.percent.toFixed(1)}%` : "?";
-                    statsParts.push(`${pct}/${formatTokens(contextUsage.contextWindow)} (auto)`);
-                }
-                const statsLine = statsParts.join(" ");
-                // --- Line 3: extension statuses ---
-                const statuses = footerData.getExtensionStatuses();
-                const statusParts = [];
-                const sorted = [...statuses.entries()].sort(([a], [b]) => a.localeCompare(b));
-                for (const [, text] of sorted) {
-                    if (text)
-                        statusParts.push(text.replace(/[\r\n\t]/g, " ").trim());
-                }
-                // Assemble lines, truncating each to width.
-                const lines = [];
-                lines.push(theme.fg("dim", pwd.length > width ? pwd.slice(0, width) : pwd));
-                if (statsLine) {
-                    lines.push(theme.fg("dim", statsLine.length > width ? statsLine.slice(0, width) : statsLine));
-                }
-                if (statusParts.length > 0) {
-                    const statusLine = statusParts.join(" ");
-                    lines.push(theme.fg("dim", statusLine.length > width ? statusLine.slice(0, width) : statusLine));
-                }
-                return lines;
+                const statuses = [...footerData.getExtensionStatuses().entries()]
+                    .sort(([a], [b]) => a.localeCompare(b))
+                    .map(([, text]) => text);
+                return renderFooterLines({
+                    git: gitInfo(),
+                    model: ctx.model?.id ?? "no-model",
+                    usage: collectUsage(ctx.sessionManager),
+                    contextPercent: ctx.getContextUsage()?.percent ?? null,
+                    statuses,
+                }, theme, width);
+            },
+            invalidate() {
+                gitCache = undefined;
+            },
+            dispose() {
+                unsubscribeBranch?.();
             },
-            invalidate() { },
         };
     };
 }

package/dist/extension/index.js

@@ -482,9 +482,10 @@ export async function registerYagni(pi, deps = {}) {
             // setHeader replaces the built-in header in place (verified against pi
             // 0.80.2 setExtensionHeader); the factory returns a simple Text component.
             ctx.ui?.setHeader?.((_tui, theme) => new Text(buildMastheadString(theme)));
-            // Replace the built-in footer with a custom one that hides the model
-            // name. The model is locked to `advanced` and is not user-facing.
-            // The factory captures ctx so the footer can read session data
+            // Replace the built-in footer with the YAGNI status bar: folder +
+            // [worktree] + branch on line 1, model + token/cost stats + integer
+            // context % on line 2, and extension statuses (brand, todos, mode) on
+            // line 3. The factory captures ctx so the footer can read session data
             // (token stats, context usage) that isn't on the footerData provider.
             ctx.ui?.setFooter?.((tui, theme, footerData) => createYagniFooterFactory(ctx)(tui, theme, footerData));
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yagni-app/code-staging",
-  "version": "0.2.1-staging.1030.1",
+  "version": "0.2.1-staging.1032.1",
   "description": "YAGNI Code: a terminal coding agent that already knows your company. One YAGNI login routes the model and grounds the agent in your team's context.",
   "license": "SEE LICENSE IN LICENSE.md",
   "author": "YAGNI, Inc. <jack@yagni.app> (https://yagni.app)",
@@ -38,5 +38,5 @@
     "@earendil-works/pi-tui": "0.83.0",
     "typebox": "^1.1.38"
   },
-  "yagniSourceSha": "fa0e9589a46769d609647b69946b9366ceaf88ca"
+  "yagniSourceSha": "7629e1f12b3d8e06e68101daadd2d8258dd271e9"
 }