@akiojin/gwt 4.10.0 → 4.12.0

package/src/cli/ui/__tests__/utils/branchFormatter.test.ts

@@ -1,14 +1,39 @@
-import { describe, it, expect } from "vitest";
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+import { describe, it, expect } from "bun:test";
 import {
   formatBranchItem,
   formatBranchItems,
 } from "../../utils/branchFormatter.js";
 import type { BranchInfo } from "../../types.js";
-import stringWidth from "string-width";
+
+const LOCAL_DATE_TIME_FORMATTER = new Intl.DateTimeFormat(undefined, {
+  year: "numeric",
+  month: "2-digit",
+  day: "2-digit",
+  hour: "2-digit",
+  minute: "2-digit",
+  hour12: false,
+});
+
+const formatLocalDateTime = (timestampMs: number): string => {
+  const date = new Date(timestampMs);
+  const parts = LOCAL_DATE_TIME_FORMATTER.formatToParts(date);
+  const get = (type: Intl.DateTimeFormatPartTypes) =>
+    parts.find((part) => part.type === type)?.value;
+  const year = get("year");
+  const month = get("month");
+  const day = get("day");
+  const hour = get("hour");
+  const minute = get("minute");
+  if (!year || !month || !day || !hour || !minute) {
+    return LOCAL_DATE_TIME_FORMATTER.format(date);
+  }
+  return `${year}-${month}-${day} ${hour}:${minute}`;
+};
 
 describe("branchFormatter", () => {
   describe("formatBranchItem", () => {
-    it("should format a main branch", () => {
+    it("should format a branch without icons", () => {
       const branchInfo: BranchInfo = {
         name: "main",
         type: "local",
@@ -22,29 +47,12 @@ describe("branchFormatter", () => {
       expect(result.type).toBe("local");
       expect(result.branchType).toBe("main");
       expect(result.isCurrent).toBe(true);
-      expect(result.icons).toContain("⚡"); // main icon
-      expect(result.icons).toContain("👉"); // current icon
-      expect(result.label).toContain("main");
+      expect(result.icons).toHaveLength(0);
+      expect(result.label).toBe("main");
       expect(result.value).toBe("main");
       expect(result.hasChanges).toBe(false);
     });
 
-    it("should format a feature branch", () => {
-      const branchInfo: BranchInfo = {
-        name: "feature/new-ui",
-        type: "local",
-        branchType: "feature",
-        isCurrent: false,
-      };
-
-      const result = formatBranchItem(branchInfo);
-
-      expect(result.icons).toContain("✨"); // feature icon
-      expect(result.icons).not.toContain("👉"); // not current
-      expect(result.label).toContain("feature/new-ui");
-      expect(result.value).toBe("feature/new-ui");
-    });
-
     it("should include last tool usage label when present", () => {
       const branchInfo: BranchInfo = {
         name: "feature/tool",
@@ -64,22 +72,9 @@ describe("branchFormatter", () => {
 
       const result = formatBranchItem(branchInfo);
 
-      expect(result.lastToolUsageLabel).toContain("Codex");
-      expect(result.lastToolUsageLabel).toContain("2025-11-26");
-    });
-
-    it("should format a bugfix branch", () => {
-      const branchInfo: BranchInfo = {
-        name: "bugfix/security-issue",
-        type: "local",
-        branchType: "bugfix",
-        isCurrent: false,
-      };
-
-      const result = formatBranchItem(branchInfo);
-
-      expect(result.icons).toContain("🐛"); // bugfix icon
-      expect(result.label).toContain("bugfix/security-issue");
+      expect(result.lastToolUsageLabel).toBe(
+        `Codex@latest | ${formatLocalDateTime(branchInfo.lastToolUsage.timestamp)}`,
+      );
     });
 
     it("should set lastToolUsageLabel to null when no usage exists", () => {
@@ -95,34 +90,6 @@ describe("branchFormatter", () => {
       expect(result.lastToolUsageLabel).toBeNull();
     });
 
-    it("should format a hotfix branch", () => {
-      const branchInfo: BranchInfo = {
-        name: "hotfix/critical-bug",
-        type: "local",
-        branchType: "hotfix",
-        isCurrent: false,
-      };
-
-      const result = formatBranchItem(branchInfo);
-
-      expect(result.icons).toContain("🔥"); // hotfix icon
-      expect(result.label).toContain("hotfix/critical-bug");
-    });
-
-    it("should format a release branch", () => {
-      const branchInfo: BranchInfo = {
-        name: "release/v1.0.0",
-        type: "local",
-        branchType: "release",
-        isCurrent: false,
-      };
-
-      const result = formatBranchItem(branchInfo);
-
-      expect(result.icons).toContain("🚀"); // release icon
-      expect(result.label).toContain("release/v1.0.0");
-    });
-
     it("should format a remote branch", () => {
       const branchInfo: BranchInfo = {
         name: "origin/main",
@@ -133,64 +100,12 @@ describe("branchFormatter", () => {
 
       const result = formatBranchItem(branchInfo);
 
-      expect(result.icons).toContain("⚡"); // main icon
-      expect(result.icons).toContain("☁"); // remote icon
       expect(result.type).toBe("remote");
-      expect(result.label).toContain("origin/main");
+      expect(result.label).toBe("origin/main");
+      expect(result.remoteName).toBe("origin/main");
     });
 
-    it("should align branch names regardless of remote icon presence", () => {
-      const localBranch: BranchInfo = {
-        name: "feature/foo",
-        type: "local",
-        branchType: "feature",
-        isCurrent: false,
-      };
-      const remoteBranch: BranchInfo = {
-        name: "origin/feature/foo",
-        type: "remote",
-        branchType: "feature",
-        isCurrent: false,
-      };
-
-      const localResult = formatBranchItem(localBranch);
-      const remoteResult = formatBranchItem(remoteBranch);
-
-      // Both should have the branch name in the label
-      expect(localResult.label).toContain("feature/foo");
-      expect(remoteResult.label).toContain("origin/feature/foo");
-
-      // Remote branch should have ☁️ marker for remote-only status
-      expect(remoteResult.label).toMatch(/☁️/);
-    });
-
-    it("should keep icon columns fixed-width when using wide emoji icons", () => {
-      const branchInfo: BranchInfo = {
-        name: "feature/wide-icons",
-        type: "remote",
-        branchType: "feature",
-        isCurrent: false,
-        hasUnpushedCommits: true,
-        worktree: {
-          path: "/path/to/worktree",
-          locked: false,
-          prunable: false,
-          isAccessible: true,
-        },
-      };
-
-      const result = formatBranchItem(branchInfo, { hasChanges: true });
-
-      // Icon columns: [Type][Worktree][Changes][Remote] = 4 * 2 = 8
-      // Sync column: 6 (fixed width for icon + up to 4 digits + space)
-      // Total: 14
-      const iconBlockWidth =
-        stringWidth(result.label) - stringWidth(branchInfo.name);
-
-      expect(iconBlockWidth).toBe(14);
-    });
-
-    it("should include worktree status icon when provided", () => {
+    it("should set worktree status when provided", () => {
       const branchInfo: BranchInfo = {
         name: "feature/test",
         type: "local",
@@ -205,7 +120,6 @@ describe("branchFormatter", () => {
 
       const result = formatBranchItem(branchInfo);
 
-      expect(result.icons).toContain("🟢"); // active worktree icon
       expect(result.worktreeStatus).toBe("active");
     });
 
@@ -219,55 +133,9 @@ describe("branchFormatter", () => {
 
       const result = formatBranchItem(branchInfo, { hasChanges: true });
 
-      expect(result.icons).toContain("💾"); // changes icon
       expect(result.hasChanges).toBe(true);
     });
 
-    it("should show unpushed commits icon", () => {
-      const branchInfo: BranchInfo = {
-        name: "feature/unpushed",
-        type: "local",
-        branchType: "feature",
-        isCurrent: false,
-        hasUnpushedCommits: true,
-      };
-
-      const result = formatBranchItem(branchInfo);
-
-      expect(result.icons).toContain("📤"); // unpushed icon
-      expect(result.label).toContain("📤");
-    });
-
-    it("should show open PR icon", () => {
-      const branchInfo: BranchInfo = {
-        name: "feature/pr-open",
-        type: "local",
-        branchType: "feature",
-        isCurrent: false,
-        openPR: { number: 123, title: "Test PR" },
-      };
-
-      const result = formatBranchItem(branchInfo);
-
-      expect(result.icons).toContain("🔃"); // open PR icon
-      expect(result.label).toContain("🔃");
-    });
-
-    it("should show merged PR icon", () => {
-      const branchInfo: BranchInfo = {
-        name: "feature/pr-merged",
-        type: "local",
-        branchType: "feature",
-        isCurrent: false,
-        mergedPR: { number: 456, mergedAt: "2025-10-31T00:00:00Z" },
-      };
-
-      const result = formatBranchItem(branchInfo);
-
-      expect(result.icons).toContain("✅"); // merged PR icon
-      expect(result.label).toContain("✅");
-    });
-
     it("should show warning icon for inaccessible worktree", () => {
       const branchInfo: BranchInfo = {
         name: "feature/broken-worktree",
@@ -284,131 +152,8 @@ describe("branchFormatter", () => {
 
       const result = formatBranchItem(branchInfo);
 
-      expect(result.icons).toContain("🔴"); // inaccessible worktree icon
-      expect(result.icons).toContain("⚠️"); // warning icon
       expect(result.worktreeStatus).toBe("inaccessible");
     });
-
-    it("should prioritize hasChanges over unpushed commits", () => {
-      const branchInfo: BranchInfo = {
-        name: "feature/both",
-        type: "local",
-        branchType: "feature",
-        isCurrent: false,
-        hasUnpushedCommits: true,
-      };
-
-      const resultWithChanges = formatBranchItem(branchInfo, {
-        hasChanges: true,
-      });
-      expect(resultWithChanges.icons).toContain("💾");
-      expect(resultWithChanges.icons).not.toContain("📤");
-
-      const resultWithoutChanges = formatBranchItem(branchInfo);
-      expect(resultWithoutChanges.icons).toContain("📤");
-      expect(resultWithoutChanges.icons).not.toContain("💾");
-    });
-
-    it("should prioritize unpushed over open PR", () => {
-      const branchInfo: BranchInfo = {
-        name: "feature/unpushed-pr",
-        type: "local",
-        branchType: "feature",
-        isCurrent: false,
-        hasUnpushedCommits: true,
-        openPR: { number: 123, title: "Test PR" },
-      };
-
-      const result = formatBranchItem(branchInfo);
-
-      expect(result.icons).toContain("📤");
-      expect(result.icons).not.toContain("🔃");
-    });
-
-    it("should prioritize open PR over merged PR", () => {
-      const branchInfo: BranchInfo = {
-        name: "feature/both-pr",
-        type: "local",
-        branchType: "feature",
-        isCurrent: false,
-        openPR: { number: 123, title: "Test PR" },
-        mergedPR: { number: 456, mergedAt: "2025-10-31T00:00:00Z" },
-      };
-
-      const result = formatBranchItem(branchInfo);
-
-      expect(result.icons).toContain("🔃");
-      expect(result.icons).not.toContain("✅");
-    });
-
-    it("should prioritize merged PR over warning", () => {
-      const branchInfo: BranchInfo = {
-        name: "feature/merged-broken",
-        type: "local",
-        branchType: "feature",
-        isCurrent: false,
-        mergedPR: { number: 456, mergedAt: "2025-10-31T00:00:00Z" },
-        worktree: {
-          path: "/path/to/worktree",
-          locked: false,
-          prunable: false,
-          isAccessible: false,
-        },
-      };
-
-      const result = formatBranchItem(branchInfo);
-
-      expect(result.icons).toContain("✅");
-      expect(result.icons).not.toContain("⚠️");
-    });
-
-    it("should prioritize warning over current branch icon", () => {
-      const branchInfo: BranchInfo = {
-        name: "feature/current-broken",
-        type: "local",
-        branchType: "feature",
-        isCurrent: true,
-        worktree: {
-          path: "/path/to/worktree",
-          locked: false,
-          prunable: false,
-          isAccessible: false,
-        },
-      };
-
-      const result = formatBranchItem(branchInfo);
-
-      expect(result.icons).toContain("⚠️");
-      expect(result.icons).not.toContain("👉");
-    });
-
-    it("should handle develop branch", () => {
-      const branchInfo: BranchInfo = {
-        name: "develop",
-        type: "local",
-        branchType: "develop",
-        isCurrent: false,
-      };
-
-      const result = formatBranchItem(branchInfo);
-
-      expect(result.icons).toContain("⚡"); // develop icon (same as main)
-      expect(result.label).toContain("develop");
-    });
-
-    it("should handle other branch type", () => {
-      const branchInfo: BranchInfo = {
-        name: "custom-branch",
-        type: "local",
-        branchType: "other",
-        isCurrent: false,
-      };
-
-      const result = formatBranchItem(branchInfo);
-
-      expect(result.icons).toContain("📌"); // other icon
-      expect(result.label).toContain("custom-branch");
-    });
   });
 
   describe("formatBranchItems", () => {
@@ -438,13 +183,13 @@ describe("branchFormatter", () => {
 
       expect(results).toHaveLength(3);
       // Current branch (main) should be first
-      expect(results[0].name).toBe("main");
-      expect(results[0].isCurrent).toBe(true);
+      expect(results[0]!.name).toBe("main");
+      expect(results[0]!.isCurrent).toBe(true);
       // origin/main is also main branch, so it comes second
-      expect(results[1].name).toBe("origin/main");
-      expect(results[1].type).toBe("remote");
+      expect(results[1]!.name).toBe("origin/main");
+      expect(results[1]!.type).toBe("remote");
       // feature/test comes last
-      expect(results[2].name).toBe("feature/test");
+      expect(results[2]!.name).toBe("feature/test");
     });
 
     it("should handle empty array", () => {
@@ -471,8 +216,8 @@ describe("branchFormatter", () => {
 
       const results = formatBranchItems(branches);
 
-      expect(results[0].name).toBe("a-branch");
-      expect(results[1].name).toBe("z-branch");
+      expect(results[0]!.name).toBe("a-branch");
+      expect(results[1]!.name).toBe("z-branch");
     });
   });
 
@@ -501,8 +246,8 @@ describe("branchFormatter", () => {
 
       const results = formatBranchItems(branches);
 
-      expect(results[0].name).toBe("feature/current");
-      expect(results[0].isCurrent).toBe(true);
+      expect(results[0]!.name).toBe("feature/current");
+      expect(results[0]!.isCurrent).toBe(true);
     });
 
     it("should prioritize main branch as second (after current)", () => {
@@ -529,8 +274,8 @@ describe("branchFormatter", () => {
 
       const results = formatBranchItems(branches);
 
-      expect(results[0].name).toBe("main");
-      expect(results[1].name).toBe("develop");
+      expect(results[0]!.name).toBe("main");
+      expect(results[1]!.name).toBe("develop");
     });
 
     it("should prioritize develop branch after main (when main exists)", () => {
@@ -557,9 +302,9 @@ describe("branchFormatter", () => {
 
       const results = formatBranchItems(branches);
 
-      expect(results[0].name).toBe("main");
-      expect(results[1].name).toBe("develop");
-      expect(results[2].name).toBe("feature/test");
+      expect(results[0]!.name).toBe("main");
+      expect(results[1]!.name).toBe("develop");
+      expect(results[2]!.name).toBe("feature/test");
     });
 
     it("should NOT prioritize develop branch when main does not exist", () => {
@@ -587,9 +332,9 @@ describe("branchFormatter", () => {
       const results = formatBranchItems(branches);
 
       // develop should be sorted alphabetically, not prioritized
-      expect(results[0].name).toBe("develop");
-      expect(results[1].name).toBe("feature/a");
-      expect(results[2].name).toBe("feature/z");
+      expect(results[0]!.name).toBe("develop");
+      expect(results[1]!.name).toBe("feature/a");
+      expect(results[2]!.name).toBe("feature/z");
     });
 
     it("should prioritize branches with worktree", () => {
@@ -628,8 +373,8 @@ describe("branchFormatter", () => {
 
       const results = formatBranchItems(branches, worktreeMap);
 
-      expect(results[0].name).toBe("feature/with-worktree");
-      expect(results[1].name).toBe("feature/no-worktree");
+      expect(results[0]!.name).toBe("feature/with-worktree");
+      expect(results[1]!.name).toBe("feature/no-worktree");
     });
 
     it("should sort branches with worktree by latest commit timestamp", () => {
@@ -685,8 +430,8 @@ describe("branchFormatter", () => {
 
       const results = formatBranchItems(branches, worktreeMap);
 
-      expect(results[0].name).toBe("feature/recent");
-      expect(results[1].name).toBe("feature/older");
+      expect(results[0]!.name).toBe("feature/recent");
+      expect(results[1]!.name).toBe("feature/older");
     });
 
     it("should prioritize local branches over remote branches", () => {
@@ -707,10 +452,10 @@ describe("branchFormatter", () => {
 
       const results = formatBranchItems(branches);
 
-      expect(results[0].name).toBe("feature/local");
-      expect(results[0].type).toBe("local");
-      expect(results[1].name).toBe("origin/feature/remote");
-      expect(results[1].type).toBe("remote");
+      expect(results[0]!.name).toBe("feature/local");
+      expect(results[0]!.type).toBe("local");
+      expect(results[1]!.name).toBe("origin/feature/remote");
+      expect(results[1]!.type).toBe("remote");
     });
 
     it("should sort by latest commit timestamp when worktree status matches", () => {
@@ -733,8 +478,8 @@ describe("branchFormatter", () => {
 
       const results = formatBranchItems(branches);
 
-      expect(results[0].name).toBe("origin/feature/newer");
-      expect(results[1].name).toBe("feature/local-older");
+      expect(results[0]!.name).toBe("origin/feature/newer");
+      expect(results[1]!.name).toBe("feature/local-older");
     });
 
     it("should apply all sorting rules in correct priority order", () => {
@@ -810,13 +555,13 @@ describe("branchFormatter", () => {
       // 4. Branches with worktree
       // 5. Local branches (alphabetically)
       // 6. Remote branches
-      expect(results[0].name).toBe("feature/current");
-      expect(results[1].name).toBe("main");
-      expect(results[2].name).toBe("develop");
-      expect(results[3].name).toBe("feature/with-worktree");
-      expect(results[4].name).toBe("feature/a-local-no-worktree");
-      expect(results[5].name).toBe("feature/z-local-no-worktree");
-      expect(results[6].name).toBe("origin/feature/z-remote");
+      expect(results[0]!.name).toBe("feature/current");
+      expect(results[1]!.name).toBe("main");
+      expect(results[2]!.name).toBe("develop");
+      expect(results[3]!.name).toBe("feature/with-worktree");
+      expect(results[4]!.name).toBe("feature/a-local-no-worktree");
+      expect(results[5]!.name).toBe("feature/z-local-no-worktree");
+      expect(results[6]!.name).toBe("origin/feature/z-remote");
     });
 
     it("should handle release and hotfix branches without special priority", () => {
@@ -844,9 +589,9 @@ describe("branchFormatter", () => {
       const results = formatBranchItems(branches);
 
       // Should be sorted alphabetically (no special priority)
-      expect(results[0].name).toBe("feature/test");
-      expect(results[1].name).toBe("hotfix/urgent");
-      expect(results[2].name).toBe("release/v1.0");
+      expect(results[0]!.name).toBe("feature/test");
+      expect(results[1]!.name).toBe("hotfix/urgent");
+      expect(results[2]!.name).toBe("release/v1.0");
     });
 
     it("should sort by latest activity time (max of git commit and tool usage)", () => {
@@ -886,8 +631,8 @@ describe("branchFormatter", () => {
       // Both have same latest activity time (1_800_000_000), so alphabetical
       // feature/git-newer: max(1_800_000_000, 1_700_000_000) = 1_800_000_000
       // feature/tool-newer: max(1_700_000_000, 1_800_000_000) = 1_800_000_000
-      expect(results[0].name).toBe("feature/git-newer");
-      expect(results[1].name).toBe("feature/tool-newer");
+      expect(results[0]!.name).toBe("feature/git-newer");
+      expect(results[1]!.name).toBe("feature/tool-newer");
     });
 
     it("should prioritize branch with tool usage over branch with only git commit when tool is newer", () => {
@@ -918,8 +663,8 @@ describe("branchFormatter", () => {
       const results = formatBranchItems(branches);
 
       // feature/with-tool has newer activity (tool usage at 1_800_000_000)
-      expect(results[0].name).toBe("feature/with-tool");
-      expect(results[1].name).toBe("feature/git-only");
+      expect(results[0]!.name).toBe("feature/with-tool");
+      expect(results[1]!.name).toBe("feature/git-only");
     });
 
     it("should prioritize branch with newer git commit over branch with older tool usage", () => {
@@ -950,8 +695,8 @@ describe("branchFormatter", () => {
       const results = formatBranchItems(branches);
 
       // feature/new-git has newer activity (git commit at 1_800_000_000)
-      expect(results[0].name).toBe("feature/new-git");
-      expect(results[1].name).toBe("feature/old-tool");
+      expect(results[0]!.name).toBe("feature/new-git");
+      expect(results[1]!.name).toBe("feature/old-tool");
     });
   });
 });

package/src/cli/ui/__tests__/utils/clipboard.test.ts

@@ -1,9 +1,9 @@
-import { describe, it, expect, vi } from "vitest";
+import { describe, it, expect, mock } from "bun:test";
 import { copyToClipboard } from "../../utils/clipboard.js";
 
-const execaMock = vi.fn();
+const execaMock = mock();
 
-vi.mock("execa", () => ({
+mock.module("execa", () => ({
   execa: (...args: unknown[]) => execaMock(...args),
 }));
 

package/src/cli/ui/__tests__/utils/statisticsCalculator.test.ts

@@ -1,4 +1,4 @@
-import { describe, it, expect } from "vitest";
+import { describe, it, expect } from "bun:test";
 import { calculateStatistics } from "../../utils/statisticsCalculator.js";
 import type { BranchInfo } from "../../types.js";
 

package/src/cli/ui/components/solid/Footer.tsx

@@ -0,0 +1,36 @@
+/** @jsxImportSource @opentui/solid */
+import { TextAttributes } from "@opentui/core";
+
+export interface FooterAction {
+  key: string;
+  description: string;
+}
+
+export interface FooterProps {
+  actions: FooterAction[];
+  separator?: string;
+}
+
+export function Footer({ actions, separator = "  " }: FooterProps) {
+  if (actions.length === 0) {
+    return null;
+  }
+
+  return (
+    <box flexDirection="row">
+      {actions.map((action, index) => (
+        <>
+          <text attributes={TextAttributes.DIM}>[</text>
+          <text fg="cyan" attributes={TextAttributes.BOLD}>
+            {action.key}
+          </text>
+          <text attributes={TextAttributes.DIM}>]</text>
+          <text>{` ${action.description}`}</text>
+          {index < actions.length - 1 ? (
+            <text attributes={TextAttributes.DIM}>{separator}</text>
+          ) : null}
+        </>
+      ))}
+    </box>
+  );
+}