@akiojin/gwt 2.10.0 → 2.11.0

package/src/cli/ui/__tests__/components/common/LoadingIndicator.test.tsx

@@ -24,8 +24,9 @@ beforeEach(() => {
     vi.useFakeTimers();
   }
   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;
 });
 
 afterEach(() => {
@@ -78,18 +79,18 @@ describe("LoadingIndicator", () => {
 
     expect(getMessageText(container)).toContain("Loading data");
 
-      await act(async () => {
-        rerender(
-          <LoadingIndicator
-            isLoading={false}
-            message="Loading data"
-            delay={10}
-          />,
-        );
-        if (typeof vi.advanceTimersByTimeAsync === "function") {
-          await vi.advanceTimersByTimeAsync(0);
-        }
-      });
+    await act(async () => {
+      rerender(
+        <LoadingIndicator
+          isLoading={false}
+          message="Loading data"
+          delay={10}
+        />,
+      );
+      if (typeof vi.advanceTimersByTimeAsync === "function") {
+        await vi.advanceTimersByTimeAsync(0);
+      }
+    });
 
     expect(container.textContent).toBe("");
   });

package/src/cli/ui/__tests__/components/common/Select.memo.test.tsx

@@ -19,14 +19,14 @@ import { Select, type SelectItem } from "../../../components/common/Select.js";
 describe.skip("Select Component React.memo (T082-2)", () => {
   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();
   });
 
   it("should not re-render when items array reference changes but content is the same", () => {
     const onSelect = vi.fn();
-    const renderCount = 0;
 
     // Wrapper component to track renders
     function TestWrapper() {

package/src/cli/ui/__tests__/components/common/Select.test.tsx

@@ -1,15 +1,12 @@
 /**
  * @vitest-environment happy-dom
  */
- 
+
 import { describe, it, expect, vi } from "vitest";
 import { render } from "ink-testing-library";
 import React from "react";
 import { Select } from "../../../components/common/Select.js";
 
-// Helper to wait for async updates
-const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
-
 interface TestItem {
   label: string;
   value: string;

package/src/cli/ui/__tests__/components/parts/Footer.test.tsx

@@ -11,8 +11,9 @@ describe("Footer", () => {
   beforeEach(() => {
     // Setup happy-dom
     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;
   });
 
   const mockActions = [

package/src/cli/ui/__tests__/components/parts/Header.test.tsx

@@ -11,8 +11,9 @@ describe("Header", () => {
   beforeEach(() => {
     // Setup happy-dom
     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;
   });
 
   it("should render title", () => {

package/src/cli/ui/__tests__/components/parts/ScrollableList.test.tsx

@@ -12,8 +12,9 @@ describe("ScrollableList", () => {
   beforeEach(() => {
     // Setup happy-dom
     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;
   });
 
   it("should render children", () => {

package/src/cli/ui/__tests__/components/parts/Stats.test.tsx

@@ -12,8 +12,9 @@ describe("Stats", () => {
   beforeEach(() => {
     // Setup happy-dom
     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;
   });
 
   const mockStats: Statistics = {

package/src/cli/ui/__tests__/components/screens/AIToolSelectorScreen.test.tsx

@@ -27,8 +27,9 @@ describe("AIToolSelectorScreen", () => {
   beforeEach(() => {
     // Setup happy-dom
     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;
   });
 
   it("should render header with title", () => {

package/src/cli/ui/__tests__/components/screens/BranchCreatorScreen.test.tsx

@@ -13,8 +13,9 @@ describe("BranchCreatorScreen", () => {
     vi.useFakeTimers();
     // Setup happy-dom
     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;
   });
 
   afterEach(() => {

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

@@ -27,8 +27,9 @@ describe("BranchListScreen", () => {
     vi.useFakeTimers();
     // Setup happy-dom
     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;
   });
 
   afterEach(() => {
@@ -142,7 +143,7 @@ describe("BranchListScreen", () => {
 
   it("should display loading indicator after the configured delay", async () => {
     const onSelect = vi.fn();
-    const { queryByText, getByText } = render(
+    const { getByText } = render(
       <BranchListScreen
         branches={mockBranches}
         stats={mockStats}
@@ -153,8 +154,8 @@ describe("BranchListScreen", () => {
     );
 
     await act(async () => {
-      if (typeof (vi as any).advanceTimersByTime === "function") {
-        (vi as any).advanceTimersByTime(10);
+      if (typeof vi.advanceTimersByTime === "function") {
+        vi.advanceTimersByTime(10);
       } else {
         await new Promise((resolve) => setTimeout(resolve, 10));
       }
@@ -299,7 +300,7 @@ describe("BranchListScreen", () => {
       );
     });
 
-    const frame = renderResult!.lastFrame() ?? "";
+    const frame = renderResult?.lastFrame() ?? "";
     expect(frame).toContain("\u001b[46m"); // cyan background ANSI code
   });
 
@@ -356,7 +357,7 @@ describe("BranchListScreen", () => {
         );
       });
 
-      const frame = renderResult!.lastFrame() ?? "";
+      const frame = renderResult?.lastFrame() ?? "";
       const timestampLines = frame
         .split("\n")
         .map((line) => stripControlSequences(stripAnsi(line)))
@@ -417,10 +418,9 @@ describe("BranchListScreen", () => {
       expect(container.textContent).toContain("(press f to filter)");
 
       // Press 'f' key
-      const fKeyEvent = new (globalThis.window as any).KeyboardEvent(
-        "keydown",
-        { key: "f" },
-      );
+      const fKeyEvent = new globalThis.window.KeyboardEvent("keydown", {
+        key: "f",
+      });
       document.dispatchEvent(fKeyEvent);
 
       // Filter input should be active (placeholder visible)
@@ -439,17 +439,15 @@ describe("BranchListScreen", () => {
       );
 
       // Enter filter mode first
-      const fKeyEvent = new (globalThis.window as any).KeyboardEvent(
-        "keydown",
-        { key: "f" },
-      );
+      const fKeyEvent = new globalThis.window.KeyboardEvent("keydown", {
+        key: "f",
+      });
       document.dispatchEvent(fKeyEvent);
 
       // Press Escape
-      const escKeyEvent = new (globalThis.window as any).KeyboardEvent(
-        "keydown",
-        { key: "Escape" },
-      );
+      const escKeyEvent = new globalThis.window.KeyboardEvent("keydown", {
+        key: "Escape",
+      });
       document.dispatchEvent(escKeyEvent);
 
       // Should return to branch selection mode
@@ -473,7 +471,7 @@ describe("BranchListScreen", () => {
         );
       });
 
-      const frame = renderResult!.lastFrame() ?? "";
+      const frame = renderResult?.lastFrame() ?? "";
       // Should contain cyan background (cursor highlight) even in filter mode
       expect(frame).toContain("\u001b[46m");
     });
@@ -570,10 +568,9 @@ describe("BranchListScreen", () => {
       );
 
       // Enter filter mode
-      const fKeyEvent = new (globalThis.window as any).KeyboardEvent(
-        "keydown",
-        { key: "f" },
-      );
+      const fKeyEvent = new globalThis.window.KeyboardEvent("keydown", {
+        key: "f",
+      });
       document.dispatchEvent(fKeyEvent);
 
       // Type something in filter
@@ -584,10 +581,9 @@ describe("BranchListScreen", () => {
       }
 
       // Press Escape (should clear query first)
-      const escKeyEvent = new (globalThis.window as any).KeyboardEvent(
-        "keydown",
-        { key: "Escape" },
-      );
+      const escKeyEvent = new globalThis.window.KeyboardEvent("keydown", {
+        key: "Escape",
+      });
       document.dispatchEvent(escKeyEvent);
 
       // Filter input should still be visible, but query cleared
@@ -608,17 +604,15 @@ describe("BranchListScreen", () => {
       );
 
       // Enter filter mode
-      const fKeyEvent = new (globalThis.window as any).KeyboardEvent(
-        "keydown",
-        { key: "f" },
-      );
+      const fKeyEvent = new globalThis.window.KeyboardEvent("keydown", {
+        key: "f",
+      });
       document.dispatchEvent(fKeyEvent);
 
       // Press Escape with empty query (should exit filter mode)
-      const escKeyEvent = new (globalThis.window as any).KeyboardEvent(
-        "keydown",
-        { key: "Escape" },
-      );
+      const escKeyEvent = new globalThis.window.KeyboardEvent("keydown", {
+        key: "Escape",
+      });
       document.dispatchEvent(escKeyEvent);
 
       // Should return to branch selection mode
@@ -641,9 +635,8 @@ describe("BranchListScreen", () => {
       expect(container.textContent).toContain("feature/test");
     });
 
-    it("should disable other key bindings (m, c, r) while typing in filter", () => {
+    it("should disable other key bindings (c, r) while typing in filter", () => {
       const onSelect = vi.fn();
-      const onNavigate = vi.fn();
       const onCleanupCommand = vi.fn();
       const onRefresh = vi.fn();
 
@@ -652,7 +645,6 @@ describe("BranchListScreen", () => {
           branches={mockBranches}
           stats={mockStats}
           onSelect={onSelect}
-          onNavigate={onNavigate}
           onCleanupCommand={onCleanupCommand}
           onRefresh={onRefresh}
         />,
@@ -665,10 +657,8 @@ describe("BranchListScreen", () => {
       act(() => {
         inkApp.stdin.write("c");
         inkApp.stdin.write("r");
-        inkApp.stdin.write("m");
       });
 
-      expect(onNavigate).not.toHaveBeenCalled();
       expect(onCleanupCommand).not.toHaveBeenCalled();
       expect(onRefresh).not.toHaveBeenCalled();
 

package/src/cli/ui/__tests__/components/screens/ExecutionModeSelectorScreen.test.tsx

@@ -11,8 +11,9 @@ describe("ExecutionModeSelectorScreen", () => {
   beforeEach(() => {
     // Setup happy-dom
     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;
   });
 
   it("should render header with title", () => {

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

@@ -12,8 +12,9 @@ describe("PRCleanupScreen", () => {
   beforeEach(() => {
     // Setup happy-dom
     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;
   });
 
   const mockTargets: CleanupTarget[] = [

package/src/cli/ui/__tests__/components/screens/SessionSelectorScreen.test.tsx

@@ -11,8 +11,9 @@ describe("SessionSelectorScreen", () => {
   beforeEach(() => {
     // Setup happy-dom
     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;
   });
 
   const mockSessions = ["session-1", "session-2", "session-3"];

package/src/cli/ui/__tests__/hooks/useScreenState.test.ts

@@ -11,8 +11,9 @@ describe("useScreenState", () => {
   beforeEach(() => {
     // Setup happy-dom
     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;
   });
   it("should initialize with branch-list as active screen", () => {
     const { result } = renderHook(() => useScreenState());
@@ -24,20 +25,20 @@ describe("useScreenState", () => {
     const { result } = renderHook(() => useScreenState());
 
     act(() => {
-      result.current.navigateTo("worktree-manager");
+      result.current.navigateTo("branch-creator");
     });
 
-    expect(result.current.currentScreen).toBe("worktree-manager");
+    expect(result.current.currentScreen).toBe("branch-creator");
   });
 
   it("should navigate back to previous screen", () => {
     const { result } = renderHook(() => useScreenState());
 
     act(() => {
-      result.current.navigateTo("worktree-manager");
+      result.current.navigateTo("branch-creator");
     });
 
-    expect(result.current.currentScreen).toBe("worktree-manager");
+    expect(result.current.currentScreen).toBe("branch-creator");
 
     act(() => {
       result.current.goBack();
@@ -50,20 +51,20 @@ describe("useScreenState", () => {
     const { result } = renderHook(() => useScreenState());
 
     act(() => {
-      result.current.navigateTo("worktree-manager");
+      result.current.navigateTo("branch-creator");
     });
 
     act(() => {
-      result.current.navigateTo("branch-creator");
+      result.current.navigateTo("ai-tool-selector");
     });
 
-    expect(result.current.currentScreen).toBe("branch-creator");
+    expect(result.current.currentScreen).toBe("ai-tool-selector");
 
     act(() => {
       result.current.goBack();
     });
 
-    expect(result.current.currentScreen).toBe("worktree-manager");
+    expect(result.current.currentScreen).toBe("branch-creator");
 
     act(() => {
       result.current.goBack();
@@ -88,9 +89,9 @@ describe("useScreenState", () => {
     const { result } = renderHook(() => useScreenState());
 
     const screens: ScreenType[] = [
-      "worktree-manager",
       "branch-creator",
       "ai-tool-selector",
+      "model-selector",
       "execution-mode-selector",
     ];
 
@@ -106,17 +107,17 @@ describe("useScreenState", () => {
     act(() => {
       result.current.goBack();
     });
-    expect(result.current.currentScreen).toBe("ai-tool-selector");
+    expect(result.current.currentScreen).toBe("model-selector");
 
     act(() => {
       result.current.goBack();
     });
-    expect(result.current.currentScreen).toBe("branch-creator");
+    expect(result.current.currentScreen).toBe("ai-tool-selector");
 
     act(() => {
       result.current.goBack();
     });
-    expect(result.current.currentScreen).toBe("worktree-manager");
+    expect(result.current.currentScreen).toBe("branch-creator");
 
     act(() => {
       result.current.goBack();
@@ -128,14 +129,14 @@ describe("useScreenState", () => {
     const { result } = renderHook(() => useScreenState());
 
     act(() => {
-      result.current.navigateTo("worktree-manager");
+      result.current.navigateTo("branch-creator");
     });
 
     act(() => {
-      result.current.navigateTo("branch-creator");
+      result.current.navigateTo("ai-tool-selector");
     });
 
-    expect(result.current.currentScreen).toBe("branch-creator");
+    expect(result.current.currentScreen).toBe("ai-tool-selector");
 
     act(() => {
       result.current.reset();

package/src/cli/ui/__tests__/hooks/useTerminalSize.test.ts

@@ -13,8 +13,9 @@ describe("useTerminalSize", () => {
   beforeEach(() => {
     // Setup happy-dom
     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;
 
     // デフォルト値を設定
     process.stdout.rows = 24;

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

@@ -2,15 +2,7 @@
  * @vitest-environment happy-dom
  * Edge case tests for UI components
  */
-import {
-  describe,
-  it,
-  expect,
-  beforeEach,
-  afterEach,
-  afterAll,
-  vi,
-} from "vitest";
+import { describe, it, expect, beforeEach, afterEach, vi } from "vitest";
 import { render } from "@testing-library/react";
 import React from "react";
 import * as BranchListScreenModule from "../../components/screens/BranchListScreen.js";
@@ -24,7 +16,7 @@ const useGitDataMock = vi.fn();
 let App: typeof import("../../components/App.js").App;
 
 vi.mock("../../hooks/useGitData.js", () => ({
-  useGitData: (...args: any[]) => useGitDataMock(...args),
+  useGitData: (...args: unknown[]) => useGitDataMock(...args),
 }));
 
 vi.mock("../../components/screens/BranchListScreen.js", () => ({
@@ -53,8 +45,9 @@ describe("Edge Cases Integration Tests", () => {
   beforeEach(async () => {
     // Setup happy-dom
     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;
 
     // Reset mocks
     vi.clearAllMocks();

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

@@ -18,7 +18,9 @@ import { App } from "../../components/App.js";
 import { Window } from "happy-dom";
 import type { BranchInfo, BranchItem } from "../../types.js";
 import * as BranchListScreenModule from "../../components/screens/BranchListScreen.js";
+import type { BranchListScreenProps } from "../../components/screens/BranchListScreen.js";
 import * as BranchActionSelectorScreenModule from "../../screens/BranchActionSelectorScreen.js";
+import type { BranchActionSelectorScreenProps } from "../../screens/BranchActionSelectorScreen.js";
 
 vi.mock("../../../../git.ts", () => ({
   __esModule: true,
@@ -26,6 +28,8 @@ vi.mock("../../../../git.ts", () => ({
   getRepositoryRoot: vi.fn(async () => "/repo"),
   deleteBranch: vi.fn(async () => undefined),
   fetchAllRemotes: vi.fn(async () => undefined),
+  collectUpstreamMap: vi.fn(async () => new Map()),
+  getBranchDivergenceStatuses: vi.fn(async () => []),
 }));
 
 const { mockIsProtectedBranchName, mockSwitchToProtectedBranch } = vi.hoisted(
@@ -90,8 +94,9 @@ describe("Navigation Integration Tests", () => {
   beforeEach(() => {
     // Setup happy-dom
     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;
 
     // Reset mocks
     mockedGetAllBranches.mockReset();
@@ -243,8 +248,8 @@ describe("Navigation Integration Tests", () => {
 });
 
 describe("Protected Branch Navigation (T103)", () => {
-  const branchListProps: any[] = [];
-  const branchActionProps: any[] = [];
+  const branchListProps: BranchListScreenProps[] = [];
+  const branchActionProps: BranchActionSelectorScreenProps[] = [];
   let branchListSpy: ReturnType<typeof vi.spyOn>;
   let branchActionSpy: ReturnType<typeof vi.spyOn>;
 
@@ -265,8 +270,9 @@ describe("Protected Branch Navigation (T103)", () => {
 
   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;
     mockedGetAllBranches.mockReset();
     mockedListAdditionalWorktrees.mockReset();
     mockedGetRepositoryRoot.mockReset();
@@ -284,13 +290,13 @@ describe("Protected Branch Navigation (T103)", () => {
     aiToolScreenProps.length = 0;
     branchListSpy = vi
       .spyOn(BranchListScreenModule, "BranchListScreen")
-      .mockImplementation((props: any) => {
+      .mockImplementation((props: BranchListScreenProps) => {
         branchListProps.push(props);
         return React.createElement(originalBranchListScreen, props);
       });
     branchActionSpy = vi
       .spyOn(BranchActionSelectorScreenModule, "BranchActionSelectorScreen")
-      .mockImplementation((props: any) => {
+      .mockImplementation((props: BranchActionSelectorScreenProps) => {
         branchActionProps.push(props);
         return React.createElement(originalBranchActionSelectorScreen, props);
       });
@@ -337,8 +343,7 @@ describe("Protected Branch Navigation (T103)", () => {
 
     // Simulate selecting the branch from the list
     const listProps =
-      branchListProps.find((p) => p.branches?.length) ??
-      branchListProps.at(-1);
+      branchListProps.find((p) => p.branches?.length) ?? branchListProps.at(-1);
     expect(listProps?.branches?.length).toBeGreaterThan(0);
     listProps.onSelect(listProps.branches[0]);
 

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

@@ -26,8 +26,9 @@ describe("Real-time Update Integration", () => {
   beforeEach(() => {
     // Setup happy-dom
     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;
 
     // Reset mocks
     vi.clearAllMocks();

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={() => {}}
       />,
     );