@akiojin/gwt 2.10.0 → 2.11.1

package/src/cli/ui/__tests__/performance/branchList.performance.test.tsx

@@ -84,7 +84,6 @@ describe("BranchListScreen Performance", () => {
         branches={branches}
         stats={stats}
         onSelect={() => {}}
-        onNavigate={() => {}}
         onQuit={() => {}}
       />,
     );
@@ -123,7 +122,6 @@ describe("BranchListScreen Performance", () => {
         branches={branches}
         stats={stats}
         onSelect={() => {}}
-        onNavigate={() => {}}
         onQuit={() => {}}
         lastUpdated={new Date()}
       />,
@@ -137,7 +135,6 @@ describe("BranchListScreen Performance", () => {
         branches={branches}
         stats={{ ...stats, total: stats.total + 1 }}
         onSelect={() => {}}
-        onNavigate={() => {}}
         onQuit={() => {}}
         lastUpdated={new Date()}
       />,
@@ -174,7 +171,6 @@ describe("BranchListScreen Performance", () => {
         branches={branches}
         stats={stats}
         onSelect={() => {}}
-        onNavigate={() => {}}
         onQuit={() => {}}
       />,
     );

package/src/cli/ui/__tests__/performance/useMemoOptimization.test.tsx

@@ -18,9 +18,6 @@ vi.mock("../../hooks/useGitData.js", () => ({
   useGitData: vi.fn(),
 }));
 
-import { useGitData } from "../../hooks/useGitData.js";
-// const mockUseGitData = useGitData as ReturnType<typeof vi.fn>;
-
 // Helper function to create a stable hash of branch data
 function createBranchHash(branches: BranchInfo[]): string {
   return branches.map((b) => `${b.name}-${b.type}-${b.isCurrent}`).join(",");
@@ -63,8 +60,9 @@ function TestComponent({
 describe("useMemo Optimization (T082-1)", () => {
   beforeEach(() => {
     const window = new Window();
-    globalThis.window = window as any;
-    globalThis.document = window.document as any;
+    globalThis.window = window as unknown as typeof globalThis.window;
+    globalThis.document =
+      window.document as unknown as typeof globalThis.document;
     vi.clearAllMocks();
   });
 

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

@@ -23,7 +23,7 @@ describe("branchFormatter", () => {
       expect(result.branchType).toBe("main");
       expect(result.isCurrent).toBe(true);
       expect(result.icons).toContain("⚡"); // main icon
-      expect(result.icons).toContain("⭐"); // current icon
+      expect(result.icons).toContain("👉"); // current icon
       expect(result.label).toContain("main");
       expect(result.value).toBe("main");
       expect(result.hasChanges).toBe(false);
@@ -40,7 +40,7 @@ describe("branchFormatter", () => {
       const result = formatBranchItem(branchInfo);
 
       expect(result.icons).toContain("✨"); // feature icon
-      expect(result.icons).not.toContain("⭐"); // not current
+      expect(result.icons).not.toContain("👉"); // not current
       expect(result.label).toContain("feature/new-ui");
       expect(result.value).toBe("feature/new-ui");
     });
@@ -65,7 +65,6 @@ describe("branchFormatter", () => {
       const result = formatBranchItem(branchInfo);
 
       expect(result.lastToolUsageLabel).toContain("Codex");
-      expect(result.lastToolUsageLabel).toContain("New");
       expect(result.lastToolUsageLabel).toContain("2025-11-26");
     });
 
@@ -157,12 +156,12 @@ describe("branchFormatter", () => {
       const localResult = formatBranchItem(localBranch);
       const remoteResult = formatBranchItem(remoteBranch);
 
-      const localNameIndex = localResult.label.indexOf(localResult.name);
-      const remoteNameIndex = remoteResult.label.indexOf(remoteResult.name);
+      // Both should have the branch name in the label
+      expect(localResult.label).toContain("feature/foo");
+      expect(remoteResult.label).toContain("origin/feature/foo");
 
-      expect(localNameIndex).toBeGreaterThan(0);
-      expect(localNameIndex).toBe(remoteNameIndex);
-      expect(remoteResult.label).toMatch(/☁(?:️|︎)?\s+origin/);
+      // 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", () => {
@@ -182,11 +181,13 @@ describe("branchFormatter", () => {
 
       const result = formatBranchItem(branchInfo, { hasChanges: true });
 
-      // Four icon columns should occupy exactly 8 columns (4 * COLUMN_WIDTH)
+      // 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(8);
+      expect(iconBlockWidth).toBe(14);
     });
 
     it("should include worktree status icon when provided", () => {
@@ -218,7 +219,7 @@ describe("branchFormatter", () => {
 
       const result = formatBranchItem(branchInfo, { hasChanges: true });
 
-      expect(result.icons).toContain("✏️"); // changes icon
+      expect(result.icons).toContain("💾"); // changes icon
       expect(result.hasChanges).toBe(true);
     });
 
@@ -233,8 +234,8 @@ describe("branchFormatter", () => {
 
       const result = formatBranchItem(branchInfo);
 
-      expect(result.icons).toContain("⬆️"); // unpushed icon
-      expect(result.label).toContain("⬆️");
+      expect(result.icons).toContain("📤"); // unpushed icon
+      expect(result.label).toContain("📤");
     });
 
     it("should show open PR icon", () => {
@@ -248,8 +249,8 @@ describe("branchFormatter", () => {
 
       const result = formatBranchItem(branchInfo);
 
-      expect(result.icons).toContain("🔀"); // open PR icon
-      expect(result.label).toContain("🔀");
+      expect(result.icons).toContain("🔃"); // open PR icon
+      expect(result.label).toContain("🔃");
     });
 
     it("should show merged PR icon", () => {
@@ -300,12 +301,12 @@ describe("branchFormatter", () => {
       const resultWithChanges = formatBranchItem(branchInfo, {
         hasChanges: true,
       });
-      expect(resultWithChanges.icons).toContain("✏️");
-      expect(resultWithChanges.icons).not.toContain("⬆️");
+      expect(resultWithChanges.icons).toContain("💾");
+      expect(resultWithChanges.icons).not.toContain("📤");
 
       const resultWithoutChanges = formatBranchItem(branchInfo);
-      expect(resultWithoutChanges.icons).toContain("⬆️");
-      expect(resultWithoutChanges.icons).not.toContain("✏️");
+      expect(resultWithoutChanges.icons).toContain("📤");
+      expect(resultWithoutChanges.icons).not.toContain("💾");
     });
 
     it("should prioritize unpushed over open PR", () => {
@@ -320,8 +321,8 @@ describe("branchFormatter", () => {
 
       const result = formatBranchItem(branchInfo);
 
-      expect(result.icons).toContain("⬆️");
-      expect(result.icons).not.toContain("🔀");
+      expect(result.icons).toContain("📤");
+      expect(result.icons).not.toContain("🔃");
     });
 
     it("should prioritize open PR over merged PR", () => {
@@ -336,7 +337,7 @@ describe("branchFormatter", () => {
 
       const result = formatBranchItem(branchInfo);
 
-      expect(result.icons).toContain("🔀");
+      expect(result.icons).toContain("🔃");
       expect(result.icons).not.toContain("✅");
     });
 
@@ -378,7 +379,7 @@ describe("branchFormatter", () => {
       const result = formatBranchItem(branchInfo);
 
       expect(result.icons).toContain("⚠️");
-      expect(result.icons).not.toContain("⭐");
+      expect(result.icons).not.toContain("👉");
     });
 
     it("should handle develop branch", () => {

package/src/cli/ui/components/App.tsx

@@ -8,7 +8,6 @@ import React, {
 import { useApp } from "ink";
 import { ErrorBoundary } from "./common/ErrorBoundary.js";
 import { BranchListScreen } from "./screens/BranchListScreen.js";
-import { WorktreeManagerScreen } from "./screens/WorktreeManagerScreen.js";
 import { BranchCreatorScreen } from "./screens/BranchCreatorScreen.js";
 import { BranchActionSelectorScreen } from "../screens/BranchActionSelectorScreen.js";
 import { AIToolSelectorScreen } from "./screens/AIToolSelectorScreen.js";
@@ -19,7 +18,6 @@ import {
   ModelSelectorScreen,
   type ModelSelectionResult,
 } from "./screens/ModelSelectorScreen.js";
-import type { WorktreeItem } from "./screens/WorktreeManagerScreen.js";
 import { useGitData } from "../hooks/useGitData.js";
 import { useScreenState } from "../hooks/useScreenState.js";
 import { formatBranchItems } from "../utils/branchFormatter.js";
@@ -31,11 +29,7 @@ import type {
   InferenceLevel,
   SelectedBranchState,
 } from "../types.js";
-import {
-  getRepositoryRoot,
-  deleteBranch,
-  deleteRemoteBranch,
-} from "../../../git.js";
+import { getRepositoryRoot, deleteBranch } from "../../../git.js";
 import {
   createWorktree,
   generateWorktreePath,
@@ -269,19 +263,6 @@ export function App({ onExit, loadingIndicatorDelay = 300 }: AppProps) {
     [visibleBranches],
   );
 
-  // Format worktrees to WorktreeItems
-  const worktreeItems: WorktreeItem[] = useMemo(
-    () =>
-      worktrees.map(
-        (wt): WorktreeItem => ({
-          branch: wt.branch,
-          path: wt.path,
-          isAccessible: wt.isAccessible ?? true,
-        }),
-      ),
-    [worktrees],
-  );
-
   const resolveBaseBranch = useCallback(() => {
     const localMain = branches.find(
       (branch) =>
@@ -428,40 +409,6 @@ export function App({ onExit, loadingIndicatorDelay = 300 }: AppProps) {
     ],
   );
 
-  // Handle navigation
-  const handleNavigate = useCallback(
-    (screen: string) => {
-      navigateTo(screen as any);
-    },
-    [navigateTo],
-  );
-
-  const handleWorktreeSelect = useCallback(
-    (worktree: WorktreeItem) => {
-      const lastTool = branches.find((b) => b.name === worktree.branch)
-        ?.lastToolUsage?.toolId;
-      setSelectedBranch({
-        name: worktree.branch,
-        displayName: worktree.branch,
-        branchType: "local",
-        branchCategory: inferBranchCategory(worktree.branch),
-      });
-      setSelectedTool(null);
-      setSelectedModel(null);
-      setCreationSourceBranch(null);
-      setPreferredToolId(lastTool ?? null);
-      setCleanupFooterMessage(null);
-      navigateTo("ai-tool-selector");
-    },
-    [
-      inferBranchCategory,
-      navigateTo,
-      setCleanupFooterMessage,
-      setCreationSourceBranch,
-      branches,
-    ],
-  );
-
   // Handle branch action selection
   const handleProtectedBranchSwitch = useCallback(async () => {
     if (!selectedBranch) {
@@ -733,14 +680,8 @@ export function App({ onExit, loadingIndicatorDelay = 300 }: AppProps) {
 
         await deleteBranch(target.branch, true);
 
-        // マージ済みの場合のみリモートブランチも削除
-        if (target.hasRemoteBranch && target.reasons?.includes("merged-pr")) {
-          try {
-            await deleteRemoteBranch(target.branch);
-          } catch {
-            // リモート削除失敗はログのみ、処理は続行
-          }
-        }
+        // 自動クリーンアップではリモートブランチは削除しない
+        // リモートブランチはユーザーが明示的に削除する必要がある
 
         succeededBranches.push(target.branch);
         setCleanupIndicators((prev) => ({
@@ -864,7 +805,6 @@ export function App({ onExit, loadingIndicatorDelay = 300 }: AppProps) {
             branches={branchItems}
             stats={stats}
             onSelect={handleSelect}
-            onNavigate={handleNavigate}
             onQuit={handleQuit}
             onCleanupCommand={handleCleanupCommand}
             onRefresh={refresh}
@@ -882,16 +822,6 @@ export function App({ onExit, loadingIndicatorDelay = 300 }: AppProps) {
           />
         );
 
-      case "worktree-manager":
-        return (
-          <WorktreeManagerScreen
-            worktrees={worktreeItems}
-            onBack={goBack}
-            onSelect={handleWorktreeSelect}
-            version={version}
-          />
-        );
-
       case "branch-creator":
         return (
           <BranchCreatorScreen
@@ -978,7 +908,6 @@ export function App({ onExit, loadingIndicatorDelay = 300 }: AppProps) {
             branches={branchItems}
             stats={stats}
             onSelect={handleSelect}
-            onNavigate={handleNavigate}
             onQuit={handleQuit}
             onRefresh={refresh}
             loading={loading}

package/src/cli/ui/components/common/Input.tsx

@@ -11,7 +11,7 @@ export interface InputProps {
   mask?: string;
   /**
    * Block specific key bindings to prevent parent handlers from processing them
-   * Useful for blocking shortcuts like 'c', 'r', 'm' while typing
+   * Useful for blocking shortcuts like 'c', 'r' while typing
    */
   blockKeys?: string[];
 }

package/src/cli/ui/components/screens/BranchListScreen.tsx

@@ -14,8 +14,6 @@ import chalk from "chalk";
 const WIDTH_OVERRIDES: Record<string, number> = {
   // Remote icon
   "☁": 1,
-  // Unpushed icon
-  "⬆": 1,
   // Branch type icons
   "⚡": 1,
   "✨": 1,
@@ -27,11 +25,16 @@ const WIDTH_OVERRIDES: Record<string, number> = {
   "🟢": 1,
   "🟠": 1,
   // Change status icons
-  "⭐": 1,
-  "✏️": 1,
-  "🔀": 1,
+  "👉": 1,
+  "💾": 1,
+  "📤": 1,
+  "🔃": 1,
   "✅": 1,
   "⚠️": 1,
+  // Remote markers
+  "🔗": 1,
+  "💻": 1,
+  "☁️": 1,
 };
 
 const getCharWidth = (char: string): number => {
@@ -70,7 +73,6 @@ export interface BranchListScreenProps {
   branches: BranchItem[];
   stats: Statistics;
   onSelect: (branch: BranchItem) => void;
-  onNavigate?: (screen: string) => void;
   onQuit?: () => void;
   onCleanupCommand?: () => void;
   onRefresh?: () => void;
@@ -96,7 +98,6 @@ export function BranchListScreen({
   branches,
   stats,
   onSelect,
-  onNavigate,
   onCleanupCommand,
   onRefresh,
   loading = false,
@@ -112,6 +113,9 @@ export function BranchListScreen({
   testOnFilterQueryChange,
 }: BranchListScreenProps) {
   const { rows } = useTerminalSize();
+  const COLUMN_WIDTH = 2;
+  const SYNC_COLUMN_WIDTH = 6;
+  const headerText = `  ${"Ty".padEnd(COLUMN_WIDTH)}${"Wt".padEnd(COLUMN_WIDTH)}${"St".padEnd(COLUMN_WIDTH)}${"Rm".padEnd(COLUMN_WIDTH)}${"Sync".padEnd(SYNC_COLUMN_WIDTH)}Branch`;
 
   // Filter state - allow test control via props
   const [internalFilterQuery, setInternalFilterQuery] = useState("");
@@ -139,7 +143,7 @@ export function BranchListScreen({
   );
 
   // Handle keyboard input
-  // Note: Input component blocks specific keys (c/r/m/f) using blockKeys prop
+  // Note: Input component blocks specific keys (c/r/f) using blockKeys prop
   // This prevents shortcuts from triggering while typing in the filter
   useInput((input, key) => {
     if (cleanupUI?.inputLocked) {
@@ -172,9 +176,7 @@ export function BranchListScreen({
     }
 
     // Global shortcuts (blocked by Input component when typing in filter mode)
-    if (input === "m" && onNavigate) {
-      onNavigate("worktree-manager");
-    } else if (input === "c") {
+    if (input === "c") {
       onCleanupCommand?.();
     } else if (input === "r" && onRefresh) {
       onRefresh();
@@ -225,7 +227,6 @@ export function BranchListScreen({
     { key: "enter", description: "Select" },
     { key: "f", description: "Filter" },
     { key: "r", description: "Refresh" },
-    { key: "m", description: "Manage worktrees" },
     { key: "c", description: "Cleanup branches" },
   ];
 
@@ -311,7 +312,10 @@ export function BranchListScreen({
       const staticPrefix = `${arrow} ${indicatorPrefix}`;
       const staticPrefixWidth = measureDisplayWidth(staticPrefix);
       const maxLeftDisplayWidth = Math.max(0, columns - timestampWidth - 1);
-      const maxLabelWidth = Math.max(0, maxLeftDisplayWidth - staticPrefixWidth);
+      const maxLabelWidth = Math.max(
+        0,
+        maxLeftDisplayWidth - staticPrefixWidth,
+      );
       const truncatedLabel = truncateToWidth(item.label, maxLabelWidth);
       const leftText = `${staticPrefix}${truncatedLabel}`;
 
@@ -350,7 +354,7 @@ export function BranchListScreen({
             onChange={setFilterQuery}
             onSubmit={() => {}} // No-op: filter is applied in real-time
             placeholder="Type to search..."
-            blockKeys={["c", "r", "m", "f"]} // Block shortcuts while typing
+            blockKeys={["c", "r", "f"]} // Block shortcuts while typing
           />
         ) : (
           <Text dimColor>{filterQuery || "(press f to filter)"}</Text>
@@ -409,14 +413,20 @@ export function BranchListScreen({
           !error &&
           branches.length > 0 &&
           filteredBranches.length > 0 && (
-            <Select
-              items={filteredBranches}
-              onSelect={onSelect}
-              limit={limit}
-              disabled={Boolean(cleanupUI?.inputLocked)}
-              renderIndicator={() => null}
-              renderItem={renderBranchRow}
-            />
+            <>
+              {/* Column labels */}
+              <Box>
+                <Text dimColor>{headerText}</Text>
+              </Box>
+              <Select
+                items={filteredBranches}
+                onSelect={onSelect}
+                limit={limit}
+                disabled={Boolean(cleanupUI?.inputLocked)}
+                renderIndicator={() => null}
+                renderItem={renderBranchRow}
+              />
+            </>
           )}
       </Box>
 

package/src/cli/ui/components/screens/ModelSelectorScreen.tsx

@@ -106,56 +106,54 @@ export function ModelSelectorScreen({
     [selectedModel],
   );
 
-  const inferenceItems: InferenceSelectItem[] = useMemo(
-    () => {
-      return inferenceOptions.map((level) => {
-        if (selectedModel?.id === "gpt-5.1-codex-max") {
-          if (level === "low") {
-            return {
-              label: "Low",
-              value: level,
-              hint: "Fast responses with lighter reasoning",
-            };
-          }
-          if (level === "medium") {
-            return {
-              label: "Medium (default)",
-              value: level,
-              hint: "Balances speed and reasoning depth for everyday tasks",
-            };
-          }
-          if (level === "high") {
-            return {
-              label: "High",
-              value: level,
-              hint: "Maximizes reasoning depth for complex problems",
-            };
-          }
-          if (level === "xhigh") {
-            return {
-              label: "Extra high",
-              value: level,
-              hint:
-                "Extra high reasoning depth; may quickly consume Plus plan rate limits.",
-            };
-          }
+  const inferenceItems: InferenceSelectItem[] = useMemo(() => {
+    return inferenceOptions.map((level) => {
+      if (selectedModel?.id === "gpt-5.1-codex-max") {
+        if (level === "low") {
+          return {
+            label: "Low",
+            value: level,
+            hint: "Fast responses with lighter reasoning",
+          };
         }
+        if (level === "medium") {
+          return {
+            label: "Medium (default)",
+            value: level,
+            hint: "Balances speed and reasoning depth for everyday tasks",
+          };
+        }
+        if (level === "high") {
+          return {
+            label: "High",
+            value: level,
+            hint: "Maximizes reasoning depth for complex problems",
+          };
+        }
+        if (level === "xhigh") {
+          return {
+            label: "Extra high",
+            value: level,
+            hint: "Extra high reasoning depth; may quickly consume Plus plan rate limits.",
+          };
+        }
+      }
 
-        return {
-          label: INFERENCE_LABELS[level],
-          value: level,
-        };
-      });
-    },
-    [inferenceOptions, selectedModel?.id],
-  );
+      return {
+        label: INFERENCE_LABELS[level],
+        value: level,
+      };
+    });
+  }, [inferenceOptions, selectedModel?.id]);
 
   const defaultInferenceIndex = useMemo(() => {
     const initialLevel = initialSelection?.inferenceLevel;
     if (initialLevel && inferenceOptions.includes(initialLevel)) {
       return inferenceOptions.findIndex((lvl) => lvl === initialLevel);
     }
-    const defaultLevel = getDefaultInferenceForModel(selectedModel ?? undefined);
+    const defaultLevel = getDefaultInferenceForModel(
+      selectedModel ?? undefined,
+    );
     if (!defaultLevel) return 0;
     const index = inferenceOptions.findIndex((lvl) => lvl === defaultLevel);
     return index >= 0 ? index : 0;
@@ -223,11 +221,9 @@ export function ModelSelectorScreen({
       {isSelected ? (
         <Text color="cyan">➤ {item.label}</Text>
       ) : (
-        <Text>  {item.label}</Text>
+        <Text> {item.label}</Text>
       )}
-      {item.description ? (
-        <Text color="gray">    {item.description}</Text>
-      ) : null}
+      {item.description ? <Text color="gray"> {item.description}</Text> : null}
     </Box>
   );
 
@@ -271,7 +267,8 @@ export function ModelSelectorScreen({
               <Select
                 items={[
                   {
-                    label: "No model selection required. Press Enter to continue.",
+                    label:
+                      "No model selection required. Press Enter to continue.",
                     value: "__continue__",
                   },
                 ]}
@@ -302,10 +299,10 @@ export function ModelSelectorScreen({
                   {isSelected ? (
                     <Text color="cyan">➤ {item.label}</Text>
                   ) : (
-                    <Text>  {item.label}</Text>
+                    <Text> {item.label}</Text>
                   )}
                   {"hint" in item && item.hint ? (
-                    <Text color="gray">    {item.hint}</Text>
+                    <Text color="gray"> {item.hint}</Text>
                   ) : null}
                 </Box>
               )}

package/src/cli/ui/components/screens/PRCleanupScreen.tsx

@@ -58,9 +58,6 @@ export function PRCleanupScreen({
     } else {
       flags.push("branch");
     }
-    if (target.reasons?.includes("merged-pr")) {
-      flags.push("merged");
-    }
     if (target.reasons?.includes("no-diff-with-base")) {
       flags.push("base");
     }