pi-fancy-footer 0.3.0 → 0.3.2

package/README.md

@@ -4,11 +4,13 @@ A [pi](https://github.com/badlogic/pi-mono/tree/main/packages/coding-agent)
 extension that replaces the default footer with a compact, two-line fancy status
 footer.
 
-<!-- markdownlint-disable MD033 -->
-<p align="center">
-  <img src="screenshot.png" alt="screenshot" />
-</p>
-<!-- markdownlint-enable MD033 -->
+![screenshot](screenshots/screenshot.png)
+
+## 📦 Install
+
+```bash
+pi install npm:pi-fancy-footer
+```
 
 ## 📊 What it shows
 
@@ -19,13 +21,21 @@ footer.
 - Repo / path, branch, commit, and open PR number
 - Git diff stats and ahead/behind status
 
-## 📦 Install
+## 📸 Screenshots
 
-Install as a pi package:
+<!-- markdownlint-disable MD033 -->
 
-```bash
-pi install npm:pi-fancy-footer
-```
+<img src="screenshots/light-blocks.png" alt="light theme – blocks style" width="600" /><br/>
+<img src="screenshots/light-bars.png" alt="light theme – bars style" width="600" /><br/>
+<img src="screenshots/light-circles.png" alt="light theme – circles style" width="600" /><br/>
+<img src="screenshots/light-stars.png" alt="light theme – stars style" width="600" />
+
+<img src="screenshots/dark-yellow.png" alt="dark theme – yellow accent" width="600" /><br/>
+<img src="screenshots/dark-blue.png" alt="dark theme – blue accent" width="600" /><br/>
+<img src="screenshots/dark-green.png" alt="dark theme – green accent" width="600" /><br/>
+<img src="screenshots/dark-red.png" alt="dark theme – red accent" width="600" />
+
+<!-- markdownlint-enable MD033 -->
 
 ## 🎮 Commands
 
@@ -124,21 +134,21 @@ leading widget icon.
 
 <!-- markdownlint-disable MD013 MD060 -->
 
-| Widget             | nerd    | emoji      | unicode | ascii    |
-| ------------------ | ------- | ---------- | ------- | -------- |
-| `model`            | `󰧑`     | `🤖`       | `◉`     | `%`      |
-| `thinking`         | `󰭻`     | `🧠`       | `✦`     | `?`      |
-| `context-capacity` | ``     | `💾`       | `□`     | `[]`     |
-| `context-bar`      | `󰾆`     | `🔋`       | `◧`     | `\|`     |
-| `context-usage`    | ``     | `📈`       | `■`     | `~`      |
-| `total-cost`       | `$`     | `💲`       | `$`     | `$`      |
-| `location`         | ``     | `📁`       | `⌂`     | `/`      |
-| `branch`           | ``     | `🌿`       | `⎇`     | `*`      |
-| `commit`           | ``     | `🔖`       | `#`     | `#`      |
-| `pull-request`     | ``     | `🔀`       | `⇄`     | `@`      |
-| `diff-added`       | `↗`     | `➕`       | `+`     | `+`      |
-| `diff-removed`     | `↘`     | `➖`       | `−`     | `-`      |
-| `git-status`       | `//` | `🔼/🔽/🔀` | `↑/↓/↕` | `^/_/<>` |
+| Widget             | nerd | emoji      | unicode | ascii    |
+| ------------------ | ---- | ---------- | ------- | -------- |
+| `model`            | `󰧑`  | `🤖`       | `◉`     | `%`      |
+| `thinking`         | `󰭻`  | `🧠`       | `✦`     | `?`      |
+| `context-capacity` | ``   | `💾`       | `□`     | `[]`     |
+| `context-bar`      | `󰾆`  | `🔋`       | `◧`     | `\|`     |
+| `context-usage`    | ``   | `📈`       | `■`     | `~`      |
+| `total-cost`       | `$`  | `💲`       | `$`     | `$`      |
+| `location`         | ``   | `📁`       | `⌂`     | `/`      |
+| `branch`           | ``   | `🌿`       | `⎇`     | `*`      |
+| `commit`           | ``   | `🔖`       | `#`     | `#`      |
+| `pull-request`     | ``   | `🔀`       | `⇄`     | `@`      |
+| `diff-added`       | `↗`  | `➕`       | `+`     | `+`      |
+| `diff-removed`     | `↘`  | `➖`       | `−`     | `-`      |
+| `git-status`       | `//` | `🔼/🔽/🔀` | `↑/↓/↕` | `^/_/<>` |
 
 <!-- markdownlint-enable MD013 MD060 -->
 

package/extensions/fancy-footer/config.ts

@@ -1,7 +1,7 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { homedir } from "node:os";
 import { join } from "node:path";
 import {
+  getAgentDir,
   getSettingsListTheme,
   type Theme,
 } from "@mariozechner/pi-coding-agent";
@@ -67,20 +67,6 @@ function readJsonObject(filePath: string): Record<string, unknown> | undefined {
   }
 }
 
-function expandHome(pathValue: string): string {
-  if (pathValue === "~") return homedir();
-  if (pathValue.startsWith("~/") || pathValue.startsWith("~\\")) {
-    return join(homedir(), pathValue.slice(2));
-  }
-  return pathValue;
-}
-
-function getAgentDir(): string {
-  return process.env.PI_CODING_AGENT_DIR
-    ? expandHome(process.env.PI_CODING_AGENT_DIR)
-    : join(homedir(), ".pi", "agent");
-}
-
 export function coerceCompactionSettings(
   value: unknown,
   fallback: CompactionSettingsSnapshot = DEFAULT_COMPACTION_SETTINGS,
@@ -800,11 +786,13 @@ export function genericFooterSettingsItems(
       label: "context bar style",
       currentValue: formatContextBarStyleValue(draft.contextBarStyle),
       values: CONTEXT_BAR_STYLE_IDS.map(formatContextBarStyleValue),
-      description: "Choose the character style for the context usage bar: " +
+      description:
+        "Choose the character style for the context usage bar: " +
         CONTEXT_BAR_STYLES.map((s, i) => {
           const repr = s.label + " " + s.used + s.free + s.reserved;
           return i === CONTEXT_BAR_STYLES.length - 1 ? "or " + repr : repr;
-        }).join(", ") + ".",
+        }).join(", ") +
+        ".",
     },
     {
       id: "defaultTextColor",

package/extensions/fancy-footer/git.test.ts

@@ -1,6 +1,10 @@
 import assert from "node:assert/strict";
 import test from "node:test";
-import { collectGitInfo, collectPullRequestInfo, shouldRefreshPullRequest } from "./git.ts";
+import {
+  collectGitInfo,
+  collectPullRequestInfo,
+  shouldRefreshPullRequest,
+} from "./git.ts";
 
 interface ExecInvocation {
   command: string;
@@ -15,30 +19,49 @@ interface ExecResult {
   stderr: string;
 }
 
-function createPi(execImpl: (call: ExecInvocation) => ExecResult | Promise<ExecResult>) {
+function gitSubcommand(args: string[]): string {
+  return args[0] === "--no-optional-locks" ? (args[1] ?? "") : (args[0] ?? "");
+}
+
+function createPi(
+  execImpl: (call: ExecInvocation) => ExecResult | Promise<ExecResult>,
+) {
   const calls: ExecInvocation[] = [];
 
   return {
     calls,
     pi: {
-      async exec(command: string, args: string[], options: { cwd: string; timeout?: number }) {
-        const call = { command, args, cwd: options.cwd, timeout: options.timeout };
+      async exec(
+        command: string,
+        args: string[],
+        options: { cwd: string; timeout?: number },
+      ) {
+        const call = {
+          command,
+          args,
+          cwd: options.cwd,
+          timeout: options.timeout,
+        };
         calls.push(call);
         return await execImpl(call);
       },
     } as {
-      exec(command: string, args: string[], options: { cwd: string; timeout?: number }): Promise<ExecResult>;
+      exec(
+        command: string,
+        args: string[],
+        options: { cwd: string; timeout?: number },
+      ): Promise<ExecResult>;
     },
   };
 }
 
 test("collectPullRequestInfo ignores foreign branch-name matches and falls back to gh pr view", async () => {
   const { pi, calls } = createPi(({ command, args }) => {
-    if (command === "git" && args[0] === "rev-parse") {
+    if (command === "git" && gitSubcommand(args) === "rev-parse") {
       return { code: 0, stdout: "origin/fix-ci\n", stderr: "" };
     }
 
-    if (command === "git" && args[0] === "config") {
+    if (command === "git" && gitSubcommand(args) === "config") {
       return {
         code: 0,
         stdout: [
@@ -110,18 +133,29 @@ test("collectPullRequestInfo ignores foreign branch-name matches and falls back
   assert.equal(result.pullRequestLookupEnabled, true);
   assert.notEqual(result.pullRequestLookupAt, 0);
   assert.equal(
-    calls.some((call) => call.command === "gh" && call.args[0] === "pr" && call.args[1] === "view"),
+    calls.some(
+      (call) =>
+        call.command === "gh" &&
+        call.args[0] === "pr" &&
+        call.args[1] === "view",
+    ),
+    true,
+  );
+  assert.equal(
+    calls
+      .filter((call) => call.command === "git")
+      .every((call) => call.args[0] === "--no-optional-locks"),
     true,
   );
 });
 
 test("collectPullRequestInfo skips GitHub CLI lookups when the repository has no GitHub remote", async () => {
   const { pi, calls } = createPi(({ command, args }) => {
-    if (command === "git" && args[0] === "rev-parse") {
+    if (command === "git" && gitSubcommand(args) === "rev-parse") {
       return { code: 0, stdout: "origin/main\n", stderr: "" };
     }
 
-    if (command === "git" && args[0] === "config") {
+    if (command === "git" && gitSubcommand(args) === "config") {
       return {
         code: 0,
         stdout: "remote.origin.url ssh://git.example.com/team/repo.git",
@@ -136,12 +170,19 @@ test("collectPullRequestInfo skips GitHub CLI lookups when the repository has no
 
   assert.equal(result.pullRequest, undefined);
   assert.equal(result.pullRequestLookupEnabled, false);
-  assert.equal(calls.every((call) => call.command === "git"), true);
+  assert.equal(
+    calls.every((call) => call.command === "git"),
+    true,
+  );
+  assert.equal(
+    calls.every((call) => call.args[0] === "--no-optional-locks"),
+    true,
+  );
 });
 
 test("collectGitInfo disables periodic PR refreshes for non-GitHub repositories", async () => {
-  const { pi } = createPi(({ command, args }) => {
-    if (command === "git" && args[0] === "status") {
+  const { pi, calls } = createPi(({ command, args }) => {
+    if (command === "git" && gitSubcommand(args) === "status") {
       return {
         code: 0,
         stdout: [
@@ -154,7 +195,7 @@ test("collectGitInfo disables periodic PR refreshes for non-GitHub repositories"
       };
     }
 
-    if (command === "git" && args[0] === "config") {
+    if (command === "git" && gitSubcommand(args) === "config") {
       return {
         code: 0,
         stdout: "remote.origin.url ssh://git.example.com/team/repo.git",
@@ -162,7 +203,7 @@ test("collectGitInfo disables periodic PR refreshes for non-GitHub repositories"
       };
     }
 
-    if (command === "git" && args[0] === "diff") {
+    if (command === "git" && gitSubcommand(args) === "diff") {
       return { code: 0, stdout: "", stderr: "" };
     }
 
@@ -173,4 +214,8 @@ test("collectGitInfo disables periodic PR refreshes for non-GitHub repositories"
 
   assert.equal(git.pullRequestLookupEnabled, false);
   assert.equal(shouldRefreshPullRequest(git), false);
+  assert.equal(
+    calls.every((call) => call.args[0] === "--no-optional-locks"),
+    true,
+  );
 });

package/extensions/fancy-footer/git.ts

@@ -5,7 +5,12 @@ import {
   selectPullRequestFromGraphQL,
   splitGitHubRepository,
 } from "./pull-request.ts";
-import { EMPTY_GIT_INFO, type GitInfo, parseNumstat, toNumber } from "./shared.ts";
+import {
+  EMPTY_GIT_INFO,
+  type GitInfo,
+  parseNumstat,
+  toNumber,
+} from "./shared.ts";
 
 interface ExecResult {
   code: number;
@@ -16,6 +21,7 @@ interface ExecResult {
 const DEFAULT_COMMAND_TIMEOUT_MS = 2_000;
 const GITHUB_COMMAND_TIMEOUT_MS = 5_000;
 const PULL_REQUEST_REFRESH_MS = 60_000;
+const GIT_NO_OPTIONAL_LOCKS_ARG = "--no-optional-locks";
 const PULL_REQUEST_QUERY = [
   "query($owner: String!, $name: String!, $branch: String!) {",
   "  repository(owner: $owner, name: $name) {",
@@ -61,6 +67,31 @@ async function exec(
   return result.stdout;
 }
 
+async function execGitResult(
+  pi: ExtensionAPI,
+  args: string[],
+  cwd: string,
+  timeout = DEFAULT_COMMAND_TIMEOUT_MS,
+): Promise<ExecResult> {
+  return execResult(
+    pi,
+    "git",
+    [GIT_NO_OPTIONAL_LOCKS_ARG, ...args],
+    cwd,
+    timeout,
+  );
+}
+
+async function execGit(
+  pi: ExtensionAPI,
+  args: string[],
+  cwd: string,
+): Promise<string> {
+  const result = await execGitResult(pi, args, cwd);
+  if (result.code !== 0) return "";
+  return result.stdout;
+}
+
 async function collectPullRequestFromBaseRepository(
   pi: ExtensionAPI,
   cwd: string,
@@ -111,16 +142,28 @@ async function collectCurrentBranchPullRequest(
 }
 
 export function shouldRefreshPullRequest(
-  git: Pick<GitInfo, "branch" | "pullRequestLookupEnabled" | "pullRequestLookupAt">,
+  git: Pick<
+    GitInfo,
+    "branch" | "pullRequestLookupEnabled" | "pullRequestLookupAt"
+  >,
 ): boolean {
-  return git.pullRequestLookupEnabled && !!git.branch && Date.now() - git.pullRequestLookupAt >= PULL_REQUEST_REFRESH_MS;
+  return (
+    git.pullRequestLookupEnabled &&
+    !!git.branch &&
+    Date.now() - git.pullRequestLookupAt >= PULL_REQUEST_REFRESH_MS
+  );
 }
 
 export async function collectPullRequestInfo(
   pi: ExtensionAPI,
   cwd: string,
   branch: string,
-): Promise<Pick<GitInfo, "pullRequest" | "pullRequestLookupEnabled" | "pullRequestLookupAt">> {
+): Promise<
+  Pick<
+    GitInfo,
+    "pullRequest" | "pullRequestLookupEnabled" | "pullRequestLookupAt"
+  >
+> {
   if (!branch) {
     return {
       pullRequest: undefined,
@@ -130,8 +173,12 @@ export async function collectPullRequestInfo(
   }
 
   const [upstream, remoteUrls] = await Promise.all([
-    exec(pi, "git", ["rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{upstream}"], cwd),
-    exec(pi, "git", ["config", "--get-regexp", "^remote\\..*\\.url$"], cwd),
+    execGit(
+      pi,
+      ["rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{upstream}"],
+      cwd,
+    ),
+    execGit(pi, ["config", "--get-regexp", "^remote\\..*\\.url$"], cwd),
   ]);
 
   const repositoryContext = createGitHubRepositoryContext(remoteUrls, upstream);
@@ -146,7 +193,13 @@ export async function collectPullRequestInfo(
   }
 
   for (const baseRepository of plan.baseRepositories) {
-    const pullRequest = await collectPullRequestFromBaseRepository(pi, cwd, baseRepository, branch, plan.headOwners);
+    const pullRequest = await collectPullRequestFromBaseRepository(
+      pi,
+      cwd,
+      baseRepository,
+      branch,
+      plan.headOwners,
+    );
     if (pullRequest) {
       return {
         pullRequest,
@@ -169,11 +222,20 @@ export async function collectPullRequestInfo(
 export async function collectGitInfo(
   pi: ExtensionAPI,
   cwd: string,
-  previousGit: Pick<GitInfo, "repository" | "branch" | "pullRequest" | "pullRequestLookupEnabled" | "pullRequestLookupAt"> | undefined = undefined,
+  previousGit:
+    | Pick<
+        GitInfo,
+        | "repository"
+        | "branch"
+        | "pullRequest"
+        | "pullRequestLookupEnabled"
+        | "pullRequestLookupAt"
+      >
+    | undefined = undefined,
 ): Promise<GitInfo> {
   const [porcelainV2, remoteUrls] = await Promise.all([
-    exec(pi, "git", ["status", "--porcelain=2", "--branch"], cwd),
-    exec(pi, "git", ["config", "--get-regexp", "^remote\\..*\\.url$"], cwd),
+    execGit(pi, ["status", "--porcelain=2", "--branch"], cwd),
+    execGit(pi, ["config", "--get-regexp", "^remote\\..*\\.url$"], cwd),
   ]);
 
   if (!porcelainV2) return { ...EMPTY_GIT_INFO };
@@ -221,7 +283,11 @@ export async function collectGitInfo(
       continue;
     }
 
-    if (line.startsWith("1 ") || line.startsWith("2 ") || line.startsWith("u ")) {
+    if (
+      line.startsWith("1 ") ||
+      line.startsWith("2 ") ||
+      line.startsWith("u ")
+    ) {
       const xy = line.split(" ")[1] || "..";
       const x = xy[0] || ".";
       const y = xy[1] || ".";
@@ -231,22 +297,23 @@ export async function collectGitInfo(
   }
 
   const repositoryContext = createGitHubRepositoryContext(remoteUrls, upstream);
-  const samePullRequestTarget = previousGit !== undefined
-    && previousGit.repository === repositoryContext.repository
-    && previousGit.branch === branch;
+  const samePullRequestTarget =
+    previousGit !== undefined &&
+    previousGit.repository === repositoryContext.repository &&
+    previousGit.branch === branch;
 
   let added = 0;
   let removed = 0;
 
-  const headDiff = await exec(pi, "git", ["diff", "--numstat", "HEAD"], cwd);
+  const headDiff = await execGit(pi, ["diff", "--numstat", "HEAD"], cwd);
   if (headDiff) {
     const stats = parseNumstat(headDiff);
     added = stats.added;
     removed = stats.removed;
   } else {
     const [stagedDiff, unstagedDiff] = await Promise.all([
-      exec(pi, "git", ["diff", "--numstat", "--cached"], cwd),
-      exec(pi, "git", ["diff", "--numstat"], cwd),
+      execGit(pi, ["diff", "--numstat", "--cached"], cwd),
+      execGit(pi, ["diff", "--numstat"], cwd),
     ]);
     const stagedStats = parseNumstat(stagedDiff);
     const unstagedStats = parseNumstat(unstagedDiff);
@@ -260,7 +327,9 @@ export async function collectGitInfo(
     commit,
     pullRequest: samePullRequestTarget ? previousGit?.pullRequest : undefined,
     pullRequestLookupEnabled: repositoryContext.pullRequestLookupEnabled,
-    pullRequestLookupAt: samePullRequestTarget ? previousGit?.pullRequestLookupAt ?? 0 : 0,
+    pullRequestLookupAt: samePullRequestTarget
+      ? (previousGit?.pullRequestLookupAt ?? 0)
+      : 0,
     added,
     removed,
     counts: {

package/extensions/fancy-footer.ts

@@ -4,7 +4,7 @@ import {
 } from "@mariozechner/pi-coding-agent";
 import {
   Key,
-  getEditorKeybindings,
+  getKeybindings,
   matchesKey,
   truncateToWidth,
   visibleWidth,
@@ -543,19 +543,19 @@ export default function (pi: ExtensionAPI) {
               return;
             }
 
-            const kb = getEditorKeybindings();
+            const kb = getKeybindings();
 
-            if (kb.matches(data, "selectUp")) {
+            if (kb.matches(data, "tui.select.up")) {
               if (getActiveSectionItems().length > 0) moveSelection(-1);
-            } else if (kb.matches(data, "selectDown")) {
+            } else if (kb.matches(data, "tui.select.down")) {
               if (getActiveSectionItems().length > 0) moveSelection(1);
             } else if (matchesKey(data, Key.tab)) {
               moveSection(1);
             } else if (matchesKey(data, Key.shift("tab"))) {
               moveSection(-1);
-            } else if (kb.matches(data, "selectConfirm") || data === " ") {
+            } else if (kb.matches(data, "tui.select.confirm") || data === " ") {
               activateCurrentItem();
-            } else if (kb.matches(data, "selectCancel")) {
+            } else if (kb.matches(data, "tui.select.cancel")) {
               done(undefined);
               return;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-fancy-footer",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "A fancy footer extension for pi",
   "type": "module",
   "files": [