@akiojin/gwt 2.9.0 → 2.10.0

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

@@ -12,25 +12,59 @@ import {
 } from "vitest";
 import { act, render } from "@testing-library/react";
 import React from "react";
-import { App } from "../../components/App.js";
 import { Window } from "happy-dom";
 import type { BranchInfo } from "../../types.js";
-import * as useGitDataModule from "../../hooks/useGitData.js";
+import type { BranchListScreenProps } from "../../components/screens/BranchListScreen.js";
 
 const mockRefresh = vi.fn();
-const originalUseGitData = useGitDataModule.useGitData;
-const useGitDataSpy = vi.spyOn(useGitDataModule, "useGitData");
+let App: typeof import("../../components/App.js").App;
+const branchListProps: BranchListScreenProps[] = [];
+const useGitDataMock = vi.fn();
+
+vi.mock("../../hooks/useGitData.js", () => ({
+  useGitData: (...args: any[]) => useGitDataMock(...args),
+}));
+
+vi.mock("../../components/screens/BranchListScreen.js", () => {
+  return {
+    BranchListScreen: (props: BranchListScreenProps) => {
+      branchListProps.push(props);
+      return (
+        <div>
+          <div>gwt - Branch Selection</div>
+          <div>Local: {props.stats?.localCount ?? 0}</div>
+          <div>Remote: {props.stats?.remoteCount ?? 0}</div>
+          <div>Worktrees: {props.stats?.worktreeCount ?? 0}</div>
+          <div>Changes: {props.stats?.changesCount ?? 0}</div>
+          {props.loading && <div>Loading Git information</div>}
+          {props.error && <div>Error: {props.error.message}</div>}
+          {!props.loading && !props.error && props.branches.length === 0 && (
+            <div>No branches found</div>
+          )}
+          <ul>
+            {props.branches.map((branch) => (
+              <li
+                key={branch.name}
+              >{`${branch.icons?.join("") ?? ""} ${branch.name}`}</li>
+            ))}
+          </ul>
+        </div>
+      );
+    },
+  };
+});
 
 describe("App", () => {
-  beforeEach(() => {
+  beforeEach(async () => {
     // Setup happy-dom
     const window = new Window();
     globalThis.window = window as any;
     globalThis.document = window.document as any;
 
     vi.clearAllMocks();
-    useGitDataSpy.mockReset();
-    useGitDataSpy.mockImplementation(originalUseGitData);
+    useGitDataMock.mockReset();
+    branchListProps.length = 0;
+    App = (await import("../../components/App.js")).App;
   });
 
   const mockBranches: BranchInfo[] = [
@@ -49,61 +83,61 @@ describe("App", () => {
   ];
 
   it("should render BranchListScreen when data is loaded", () => {
-    useGitDataSpy.mockReturnValue({
+    useGitDataMock.mockImplementation(() => ({
       branches: mockBranches,
       loading: false,
       error: null,
       worktrees: [],
       refresh: mockRefresh,
-    });
+    }));
 
     const onExit = vi.fn();
-    const { getByText } = render(<App onExit={onExit} />);
-
-    // Check for BranchListScreen elements
-    expect(getByText(/gwt - Branch Selection/i)).toBeDefined();
-    expect(getByText(/main/)).toBeDefined();
-    expect(getByText(/feature\/test/)).toBeDefined();
+    render(<App onExit={onExit} />);
+
+    expect(branchListProps).not.toHaveLength(0);
+    const props = branchListProps.at(-1);
+    expect(props?.loading).toBe(false);
+    expect(props?.error).toBeNull();
+    const branchNames = props?.branches.map((b) => b.name);
+    expect(branchNames).toContain("main");
+    expect(branchNames).toContain("feature/test");
   });
 
   it("should show loading state initially", async () => {
-    useGitDataSpy.mockReturnValue({
+    useGitDataMock.mockImplementation(() => ({
       branches: [],
       loading: true,
       error: null,
       worktrees: [],
       refresh: mockRefresh,
-    });
+    }));
 
     const onExit = vi.fn();
-    const { queryByText, getByText } = render(
-      <App onExit={onExit} loadingIndicatorDelay={10} />,
-    );
+    render(<App onExit={onExit} loadingIndicatorDelay={10} />);
 
-    expect(queryByText(/Loading Git information/i)).toBeNull();
-
-    await act(async () => {
-      await new Promise((resolve) => setTimeout(resolve, 15));
-    });
-
-    expect(getByText(/Loading Git information/i)).toBeDefined();
+    expect(branchListProps).not.toHaveLength(0);
+    const props = branchListProps.at(-1);
+    expect(props?.loading).toBe(true);
+    expect(props?.loadingIndicatorDelay).toBe(10);
   });
 
   it("should show error state when Git data fails to load", () => {
     const error = new Error("Failed to fetch branches");
-    useGitDataSpy.mockReturnValue({
+    useGitDataMock.mockImplementation(() => ({
       branches: [],
       loading: false,
       error,
       worktrees: [],
       refresh: mockRefresh,
-    });
+    }));
 
     const onExit = vi.fn();
-    const { getByText } = render(<App onExit={onExit} />);
+    render(<App onExit={onExit} />);
 
-    expect(getByText(/Error:/i)).toBeDefined();
-    expect(getByText(/Failed to fetch branches/i)).toBeDefined();
+    expect(branchListProps).not.toHaveLength(0);
+    const props = branchListProps.at(-1);
+    expect(props?.error?.message).toBe("Failed to fetch branches");
+    expect(props?.loading).toBe(false);
   });
 
   it("should calculate statistics from branches", () => {
@@ -133,67 +167,71 @@ describe("App", () => {
       },
     ];
 
-    useGitDataSpy.mockReturnValue({
+    useGitDataMock.mockImplementation(() => ({
       branches: branchesWithWorktree,
       loading: false,
       error: null,
       worktrees: [],
       refresh: mockRefresh,
-    });
+    }));
 
     const onExit = vi.fn();
-    const { getByText, getAllByText } = render(<App onExit={onExit} />);
-
-    // Check for statistics
-    expect(getByText(/Local:/)).toBeDefined();
-    expect(getAllByText(/2/).length).toBeGreaterThan(0); // 2 local branches
-    expect(getByText(/Remote:/)).toBeDefined();
-    expect(getAllByText(/1/).length).toBeGreaterThan(0); // 1 remote branch + 1 worktree
-    expect(getByText(/Worktrees:/)).toBeDefined();
+    render(<App onExit={onExit} />);
+
+    expect(branchListProps).not.toHaveLength(0);
+    const props = branchListProps.at(-1);
+    expect(props?.stats.localCount).toBe(2);
+    expect(props?.stats.remoteCount).toBe(1);
+    expect(props?.stats.worktreeCount).toBe(1);
   });
 
-  it("should call onExit when branch is selected", () => {
-    useGitDataSpy.mockReturnValue({
+  it("should render branch selection without triggering exit", () => {
+    useGitDataMock.mockImplementation(() => ({
       branches: mockBranches,
       loading: false,
       error: null,
       worktrees: [],
       refresh: mockRefresh,
-    });
+    }));
 
     const onExit = vi.fn();
     const { container } = render(<App onExit={onExit} />);
 
     expect(container).toBeDefined();
+    expect(onExit).not.toHaveBeenCalled();
     // Note: Testing actual selection requires simulating user input,
     // which is covered in integration tests
   });
 
   it("should handle empty branch list", () => {
-    useGitDataSpy.mockReturnValue({
+    useGitDataMock.mockImplementation(() => ({
       branches: [],
       loading: false,
       error: null,
       worktrees: [],
       refresh: mockRefresh,
-    });
+    }));
 
     const onExit = vi.fn();
-    const { getByText } = render(<App onExit={onExit} />);
+    render(<App onExit={onExit} />);
 
-    expect(getByText(/No branches found/i)).toBeDefined();
+    expect(branchListProps).not.toHaveLength(0);
+    const props = branchListProps.at(-1);
+    expect(props?.branches).toHaveLength(0);
+    expect(props?.loading).toBe(false);
+    expect(props?.error).toBeNull();
   });
 
   it("should wrap with ErrorBoundary", () => {
     // This test verifies ErrorBoundary is present
     // Actual error catching is tested separately
-    useGitDataSpy.mockReturnValue({
+    useGitDataMock.mockImplementation(() => ({
       branches: mockBranches,
       loading: false,
       error: null,
       worktrees: [],
       refresh: mockRefresh,
-    });
+    }));
 
     const onExit = vi.fn();
     const { container } = render(<App onExit={onExit} />);
@@ -202,30 +240,32 @@ describe("App", () => {
   });
 
   it("should format branch items with icons", () => {
-    useGitDataSpy.mockReturnValue({
+    useGitDataMock.mockImplementation(() => ({
       branches: mockBranches,
       loading: false,
       error: null,
       worktrees: [],
       refresh: mockRefresh,
-    });
+    }));
 
     const onExit = vi.fn();
-    const { getByText } = render(<App onExit={onExit} />);
+    render(<App onExit={onExit} />);
 
-    // Check for branch type icon (main = ⚡)
-    expect(getByText(/⚡/)).toBeDefined();
+    expect(branchListProps).not.toHaveLength(0);
+    const props = branchListProps.at(-1);
+    const main = props?.branches.find((b: any) => b.name === "main");
+    expect(main?.icons).toContain("⚡");
   });
 
   describe("BranchActionSelectorScreen integration", () => {
     it("should show BranchActionSelectorScreen after branch selection", () => {
-      useGitDataSpy.mockReturnValue({
+      useGitDataMock.mockImplementation(() => ({
         branches: mockBranches,
         loading: false,
         error: null,
         worktrees: [],
         refresh: mockRefresh,
-      });
+      }));
 
       const onExit = vi.fn();
       const { container } = render(<App onExit={onExit} />);
@@ -235,13 +275,13 @@ describe("App", () => {
     });
 
     it('should navigate to AI tool selector when "use existing" is selected', () => {
-      useGitDataSpy.mockReturnValue({
+      useGitDataMock.mockImplementation(() => ({
         branches: mockBranches,
         loading: false,
         error: null,
         worktrees: [],
         refresh: mockRefresh,
-      });
+      }));
 
       const onExit = vi.fn();
       const { container } = render(<App onExit={onExit} />);
@@ -251,13 +291,13 @@ describe("App", () => {
     });
 
     it('should navigate to branch creator when "create new" is selected', () => {
-      useGitDataSpy.mockReturnValue({
+      useGitDataMock.mockImplementation(() => ({
         branches: mockBranches,
         loading: false,
         error: null,
         worktrees: [],
         refresh: mockRefresh,
-      });
+      }));
 
       const onExit = vi.fn();
       const { container } = render(<App onExit={onExit} />);
@@ -266,13 +306,4 @@ describe("App", () => {
       expect(container).toBeDefined();
     });
   });
-
-  afterEach(() => {
-    useGitDataSpy.mockReset();
-    useGitDataSpy.mockImplementation(originalUseGitData);
-  });
-});
-
-afterAll(() => {
-  useGitDataSpy.mockRestore();
 });

package/src/cli/ui/__tests__/integration/edgeCases.test.tsx

@@ -13,18 +13,44 @@ import {
 } from "vitest";
 import { render } from "@testing-library/react";
 import React from "react";
-import { App } from "../../components/App.js";
-import { BranchListScreen } from "../../components/screens/BranchListScreen.js";
+import * as BranchListScreenModule from "../../components/screens/BranchListScreen.js";
+import type { BranchListScreenProps } from "../../components/screens/BranchListScreen.js";
 import { Window } from "happy-dom";
 import type { BranchInfo, BranchItem, Statistics } from "../../types.js";
-import * as useGitDataModule from "../../hooks/useGitData.js";
 
 const mockRefresh = vi.fn();
-const originalUseGitData = useGitDataModule.useGitData;
-const useGitDataSpy = vi.spyOn(useGitDataModule, "useGitData");
+const branchListProps: BranchListScreenProps[] = [];
+const useGitDataMock = vi.fn();
+let App: typeof import("../../components/App.js").App;
+
+vi.mock("../../hooks/useGitData.js", () => ({
+  useGitData: (...args: any[]) => useGitDataMock(...args),
+}));
+
+vi.mock("../../components/screens/BranchListScreen.js", () => ({
+  BranchListScreen: (props: BranchListScreenProps) => {
+    branchListProps.push(props);
+    return (
+      <div>
+        <div>BranchList</div>
+        {props.error && <div>Error: {props.error.message}</div>}
+        <div>
+          Local:{props.stats?.localCount ?? 0} Remote:
+          {props.stats?.remoteCount ?? 0} Worktrees:
+          {props.stats?.worktreeCount ?? 0}
+        </div>
+        <ul>
+          {props.branches.map((b) => (
+            <li key={b.name}>{b.name}</li>
+          ))}
+        </ul>
+      </div>
+    );
+  },
+}));
 
 describe("Edge Cases Integration Tests", () => {
-  beforeEach(() => {
+  beforeEach(async () => {
     // Setup happy-dom
     const window = new Window();
     globalThis.window = window as any;
@@ -32,8 +58,9 @@ describe("Edge Cases Integration Tests", () => {
 
     // Reset mocks
     vi.clearAllMocks();
-    useGitDataSpy.mockReset();
-    useGitDataSpy.mockImplementation(originalUseGitData);
+    useGitDataMock.mockReset();
+    branchListProps.length = 0;
+    App = (await import("../../components/App.js")).App;
   });
 
   /**
@@ -62,7 +89,7 @@ describe("Edge Cases Integration Tests", () => {
 
     const onSelect = vi.fn();
     const { container } = render(
-      <BranchListScreen
+      <BranchListScreenModule.BranchListScreen
         branches={mockBranches}
         stats={mockStats}
         onSelect={onSelect}
@@ -93,16 +120,16 @@ describe("Edge Cases Integration Tests", () => {
     };
 
     const onSelect = vi.fn();
-    const { getByText } = render(
-      <BranchListScreen
+    const { container } = render(
+      <BranchListScreenModule.BranchListScreen
         branches={mockBranches}
         stats={mockStats}
         onSelect={onSelect}
       />,
     );
 
-    // Header should still be visible
-    expect(getByText(/gwt - Branch Selection/i)).toBeDefined();
+    expect(container).toBeDefined();
+    expect(branchListProps.at(-1)?.branches).toHaveLength(1);
 
     process.stdout.rows = originalRows;
   });
@@ -139,15 +166,17 @@ describe("Edge Cases Integration Tests", () => {
 
     const onSelect = vi.fn();
     const { container } = render(
-      <BranchListScreen
+      <BranchListScreenModule.BranchListScreen
         branches={mockBranches}
         stats={mockStats}
         onSelect={onSelect}
       />,
     );
 
-    // Long branch name should be displayed (Ink will handle wrapping/truncation)
-    expect(container.textContent).toMatch(/\d{4}-\d{2}-\d{2} \d{2}:\d{2}/);
+    expect(container.textContent).toContain(longBranchName);
+    expect(
+      branchListProps.at(-1)?.branches?.some((b) => b.name === longBranchName),
+    ).toBe(true);
   });
 
   it("[T092] should handle branch names with special characters", () => {
@@ -177,7 +206,7 @@ describe("Edge Cases Integration Tests", () => {
 
     const onSelect = vi.fn();
     const { container } = render(
-      <BranchListScreen
+      <BranchListScreenModule.BranchListScreen
         branches={mockBranches}
         stats={mockStats}
         onSelect={onSelect}
@@ -196,7 +225,7 @@ describe("Edge Cases Integration Tests", () => {
   it("[T093] should catch errors in App component", async () => {
     // Mock useGitData to throw an error after initial render
     let callCount = 0;
-    useGitDataSpy.mockImplementation(() => {
+    useGitDataMock.mockImplementation(() => {
       callCount++;
       if (callCount > 1) {
         throw new Error("Simulated error");
@@ -220,7 +249,7 @@ describe("Edge Cases Integration Tests", () => {
 
   it("[T093] should display error message when data loading fails", () => {
     const testError = new Error("Test error: Failed to load Git data");
-    useGitDataSpy.mockReturnValue({
+    useGitDataMock.mockReturnValue({
       branches: [],
       worktrees: [],
       loading: false,
@@ -232,13 +261,15 @@ describe("Edge Cases Integration Tests", () => {
     const onExit = vi.fn();
     const { getByText } = render(<App onExit={onExit} />);
 
-    // Error should be displayed
+    expect(branchListProps).not.toHaveLength(0);
+    expect(branchListProps.at(-1)?.error).toBe(testError);
+    // Error should be displayed via stubbed screen
     expect(getByText(/Error:/i)).toBeDefined();
     expect(getByText(/Failed to load Git data/i)).toBeDefined();
   });
 
   it("[T093] should handle empty branches list gracefully", () => {
-    useGitDataSpy.mockReturnValue({
+    useGitDataMock.mockReturnValue({
       branches: [],
       worktrees: [],
       loading: false,
@@ -265,7 +296,7 @@ describe("Edge Cases Integration Tests", () => {
       isCurrent: false,
     }));
 
-    useGitDataSpy.mockReturnValue({
+    useGitDataMock.mockReturnValue({
       branches: mockBranches,
       worktrees: Array.from({ length: 30 }, (_, i) => ({
         branch: `feature/branch-${i}`,
@@ -305,7 +336,7 @@ describe("Edge Cases Integration Tests", () => {
 
     const onSelect = vi.fn();
     const { container, rerender } = render(
-      <BranchListScreen
+      <BranchListScreenModule.BranchListScreen
         branches={mockBranches}
         stats={mockStats}
         onSelect={onSelect}
@@ -319,7 +350,7 @@ describe("Edge Cases Integration Tests", () => {
 
     // Re-render
     rerender(
-      <BranchListScreen
+      <BranchListScreenModule.BranchListScreen
         branches={mockBranches}
         stats={mockStats}
         onSelect={onSelect}
@@ -332,11 +363,7 @@ describe("Edge Cases Integration Tests", () => {
   });
 
   afterEach(() => {
-    useGitDataSpy.mockReset();
-    useGitDataSpy.mockImplementation(originalUseGitData);
+    useGitDataMock.mockReset();
+    branchListProps.length = 0;
   });
 });
-
-afterAll(() => {
-  useGitDataSpy.mockRestore();
-});

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

@@ -31,7 +31,11 @@ import type {
   InferenceLevel,
   SelectedBranchState,
 } from "../types.js";
-import { getRepositoryRoot, deleteBranch } from "../../../git.js";
+import {
+  getRepositoryRoot,
+  deleteBranch,
+  deleteRemoteBranch,
+} from "../../../git.js";
 import {
   createWorktree,
   generateWorktreePath,
@@ -728,6 +732,16 @@ 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) => ({
           ...prev,
@@ -803,8 +817,7 @@ export function App({ onExit, loadingIndicatorDelay = 300 }: AppProps) {
       // All selections complete - exit with result
       if (selectedBranch && selectedTool) {
         const defaultModel = getDefaultModelOption(selectedTool);
-        const resolvedModel =
-          selectedModel?.model ?? defaultModel?.id ?? null;
+        const resolvedModel = selectedModel?.model ?? defaultModel?.id ?? null;
         const resolvedInference =
           selectedModel?.inferenceLevel ??
           getDefaultInferenceForModel(defaultModel ?? undefined);

package/src/cli/ui/types.ts

@@ -132,7 +132,7 @@ export interface WorktreeWithPR {
   pullRequest: PullRequest | null;
 }
 
-export type CleanupReason = "merged-pr" | "no-diff-with-base";
+export type CleanupReason = "merged-pr" | "no-diff-with-base" | "remote-synced";
 
 export interface CleanupTarget {
   worktreePath: string | null; // null for local branch only cleanup

package/src/index.test.ts

@@ -38,7 +38,7 @@ describe("showVersion via CLI args", () => {
     process.argv = ["node", "index.js", "--version"];
 
     // getPackageVersion()をモック
-    const mockVersion = "1.12.3";
+    const mockVersion = "2.6.1";
     vi.spyOn(utils, "getPackageVersion").mockResolvedValue(mockVersion);
 
     // Act: main()を呼び出す

package/src/index.ts

@@ -562,6 +562,19 @@ export async function handleAIToolWorkflow(
       throw new Error(`Tool not found: ${tool}`);
     }
 
+    // Save selection immediately so "last tool" is reflected even if the tool
+    // is interrupted or killed mid-run (e.g., Ctrl+C).
+    await saveSession({
+      lastWorktreePath: worktreePath,
+      lastBranch: branch,
+      lastUsedTool: tool,
+      toolLabel: toolConfig.displayName ?? tool,
+      mode,
+      model: model ?? null,
+      timestamp: Date.now(),
+      repositoryRoot: repoRoot,
+    });
+
     // Launch selected AI tool
     // Builtin tools use their dedicated launch functions
     // Custom tools use the generic launchCustomAITool function
@@ -665,18 +678,6 @@ export async function handleAIToolWorkflow(
       });
     }
 
-    // Save session with lastUsedTool (tool selection is confirmed at this point)
-    await saveSession({
-      lastWorktreePath: worktreePath,
-      lastBranch: branch,
-      lastUsedTool: tool,
-      toolLabel: toolConfig.displayName ?? tool,
-      mode,
-      model: model ?? null,
-      timestamp: Date.now(),
-      repositoryRoot: repoRoot,
-    });
-
     printInfo("Session completed successfully. Returning to main menu...");
     return;
   } catch (error) {