@firstpick/pi-extension-git-footer-status 0.1.1 → 0.1.3

package/index.ts

@@ -1,6 +1,6 @@
 import { access } from "node:fs/promises";
 import { homedir } from "node:os";
-import { isAbsolute, resolve } from "node:path";
+import { isAbsolute, resolve, sep } from "node:path";
 import type { AssistantMessage } from "@mariozechner/pi-ai";
 import type { ExtensionAPI, ExtensionContext } from "@mariozechner/pi-coding-agent";
 import { truncateToWidth, visibleWidth } from "@mariozechner/pi-tui";
@@ -49,7 +49,7 @@ const FOOTER_FLAGS = {
 function formatCwd(cwd: string): string {
   const home = homedir();
   if (cwd === home) return "~";
-  if (cwd.startsWith(`${home}/`)) return `~/${cwd.slice(home.length + 1)}`;
+  if (cwd.startsWith(`${home}${sep}`)) return `~/${cwd.slice(home.length + 1).split(sep).join("/")}`;
   return cwd;
 }
 
@@ -495,8 +495,17 @@ export default function gitFooterStatus(pi: ExtensionAPI) {
           const branch = footerData.getGitBranch();
           const cwdWithBranch = `${formatCwd(ctx.cwd)}${branch ? ` (${branch})` : ""}`;
           const cwdText = theme.fg("muted", cwdWithBranch);
-          const status = footerData.getExtensionStatuses().get("git-footer");
-          const pathGitLine = status ? `${cwdText}${theme.fg("dim", " │ ")}${status}` : cwdText;
+
+          const statuses = footerData.getExtensionStatuses();
+          const gitStatus = statuses.get("git-footer");
+          const otherStatuses = Array.from(statuses.entries())
+            .filter(([key, value]) => key !== "git-footer" && Boolean(value))
+            .sort(([a], [b]) => a.localeCompare(b))
+            .map(([, value]) => value as string);
+
+          const combinedStatusParts = [gitStatus, ...otherStatuses].filter(Boolean) as string[];
+          const combinedStatus = combinedStatusParts.join(` ${theme.fg("dim", "·")} `);
+          const pathGitLine = combinedStatus ? `${cwdText}${theme.fg("dim", " │ ")}${combinedStatus}` : cwdText;
 
           // Keep default subtle-grey look even when parts contain their own ANSI colors.
           // Wrapping the whole line once is not enough because inner color resets cancel outer dim.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firstpick/pi-extension-git-footer-status",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Enhanced Pi footer with git status, token usage, context usage, and model telemetry.",
   "license": "MIT",
   "keywords": [