@akiojin/gwt 2.0.0

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

@@ -0,0 +1,33 @@
+import { useState, useEffect } from "react";
+
+export interface TerminalSize {
+  rows: number;
+  columns: number;
+}
+
+/**
+ * Hook to get current terminal size and listen for resize events
+ */
+export function useTerminalSize(): TerminalSize {
+  const [size, setSize] = useState<TerminalSize>(() => ({
+    rows: process.stdout.rows || 24,
+    columns: process.stdout.columns || 80,
+  }));
+
+  useEffect(() => {
+    const handleResize = () => {
+      setSize({
+        rows: process.stdout.rows || 24,
+        columns: process.stdout.columns || 80,
+      });
+    };
+
+    process.stdout.on("resize", handleResize);
+
+    return () => {
+      process.stdout.removeListener("resize", handleResize);
+    };
+  }, []);
+
+  return size;
+}

package/src/cli/ui/screens/BranchActionSelectorScreen.tsx

@@ -0,0 +1,102 @@
+import React from "react";
+import { Box, Text, useInput } from "ink";
+import { Select, type SelectItem } from "../components/common/Select.js";
+import { Footer } from "../components/parts/Footer.js";
+import type { BranchAction } from "../types.js";
+
+export interface BranchActionSelectorScreenProps {
+  selectedBranch: string;
+  onUseExisting: () => void;
+  onCreateNew: () => void;
+  onBack: () => void;
+  canCreateNew?: boolean;
+  mode?: "default" | "protected";
+  infoMessage?: string | null;
+  primaryLabel?: string;
+  secondaryLabel?: string;
+}
+
+/**
+ * BranchActionSelectorScreen - Screen for selecting action after branch selection
+ *
+ * Allows user to choose between:
+ * - Using existing branch (continue to AI tool selection)
+ * - Creating new branch from selected branch (go to branch creator)
+ */
+export function BranchActionSelectorScreen({
+  selectedBranch,
+  onUseExisting,
+  onCreateNew,
+  onBack,
+  canCreateNew = true,
+  mode = "default",
+  infoMessage,
+  primaryLabel,
+  secondaryLabel,
+}: BranchActionSelectorScreenProps) {
+  // Handle keyboard input for back navigation
+  useInput((input, key) => {
+    if (key.escape) {
+      onBack();
+    }
+  });
+
+  const primaryActionLabel =
+    primaryLabel ??
+    (mode === "protected" ? "Switch to root branch" : "Use existing branch");
+  const secondaryActionLabel =
+    secondaryLabel ??
+    (mode === "protected" ? "Create new branch from this branch" : "Create new branch");
+
+  const items: SelectItem[] = [
+    {
+      label: primaryActionLabel,
+      value: "use-existing",
+    },
+  ];
+
+  if (canCreateNew) {
+    items.push({
+      label: secondaryActionLabel,
+      value: "create-new",
+    });
+  }
+
+  const handleSelect = (item: SelectItem) => {
+    const action = item.value as BranchAction;
+
+    if (action === "use-existing") {
+      onUseExisting();
+    } else if (action === "create-new") {
+      onCreateNew();
+    }
+  };
+
+  // Footer actions
+  const footerActions = [
+    { key: 'enter', description: 'Select' },
+    { key: 'esc', description: 'Back' },
+  ];
+
+  return (
+    <Box flexDirection="column">
+      <Box marginBottom={1}>
+        <Text>
+          Selected branch: <Text bold color="cyan">{selectedBranch}</Text>
+        </Text>
+      </Box>
+      {infoMessage ? (
+        <Box marginBottom={1}>
+          <Text color="yellow">{infoMessage}</Text>
+        </Box>
+      ) : null}
+      <Box marginBottom={1}>
+        <Text color="gray">Choose an action:</Text>
+      </Box>
+      <Select items={items} onSelect={handleSelect} />
+
+      {/* Footer */}
+      <Footer actions={footerActions} />
+    </Box>
+  );
+}

package/src/cli/ui/screens/__tests__/BranchActionSelectorScreen.test.tsx

@@ -0,0 +1,151 @@
+/**
+ * @vitest-environment happy-dom
+ */
+import { describe, it, expect, beforeEach, vi } from "vitest";
+import { render } from "@testing-library/react";
+import React from "react";
+import { BranchActionSelectorScreen } from "../BranchActionSelectorScreen.js";
+import { Window } from "happy-dom";
+
+describe("BranchActionSelectorScreen", () => {
+  beforeEach(() => {
+    // Setup happy-dom
+    const window = new Window();
+    globalThis.window = window as any;
+    globalThis.document = window.document as any;
+  });
+
+  it("should render the screen", () => {
+    const onUseExisting = vi.fn();
+    const onCreateNew = vi.fn();
+    const onBack = vi.fn();
+    const { container } = render(
+      <BranchActionSelectorScreen
+        selectedBranch="feature-test"
+        onUseExisting={onUseExisting}
+        onCreateNew={onCreateNew}
+        onBack={onBack}
+      />,
+    );
+
+    expect(container).toBeDefined();
+  });
+
+  it("should display the message with selected branch name", () => {
+    const onUseExisting = vi.fn();
+    const onCreateNew = vi.fn();
+    const onBack = vi.fn();
+    const { getByText } = render(
+      <BranchActionSelectorScreen
+        selectedBranch="feature-test"
+        onUseExisting={onUseExisting}
+        onCreateNew={onCreateNew}
+        onBack={onBack}
+      />,
+    );
+
+    // Should show message about selecting action for the branch
+    const messageElement = getByText(/feature-test/);
+    expect(messageElement).toBeDefined();
+  });
+
+  it("should display two action options", () => {
+    const onUseExisting = vi.fn();
+    const onCreateNew = vi.fn();
+    const onBack = vi.fn();
+    const { getByText } = render(
+      <BranchActionSelectorScreen
+        selectedBranch="feature-test"
+        onUseExisting={onUseExisting}
+        onCreateNew={onCreateNew}
+        onBack={onBack}
+      />,
+    );
+
+    // Should show "Use existing branch" option
+    expect(getByText(/Use existing branch/)).toBeDefined();
+
+    // Should show "Create new branch" option
+    expect(getByText(/Create new branch/)).toBeDefined();
+  });
+
+  it("should render protected mode labels and info message", () => {
+    const onUseExisting = vi.fn();
+    const onCreateNew = vi.fn();
+    const onBack = vi.fn();
+    const { getByText } = render(
+      <BranchActionSelectorScreen
+        selectedBranch="main"
+        onUseExisting={onUseExisting}
+        onCreateNew={onCreateNew}
+        onBack={onBack}
+        mode="protected"
+        infoMessage="Root branches are handled in the repository root."
+        primaryLabel="Use root branch"
+        secondaryLabel="Create new branch from root"
+      />,
+    );
+
+    expect(getByText(/Use root branch/)).toBeDefined();
+    expect(getByText(/Create new branch from root/)).toBeDefined();
+    expect(
+      getByText(/Root branches are handled in the repository root./),
+    ).toBeDefined();
+  });
+
+  it("should hide create option when canCreateNew is false", () => {
+    const onUseExisting = vi.fn();
+    const onCreateNew = vi.fn();
+    const onBack = vi.fn();
+    const { getByText, queryByText } = render(
+      <BranchActionSelectorScreen
+        selectedBranch="main"
+        onUseExisting={onUseExisting}
+        onCreateNew={onCreateNew}
+        onBack={onBack}
+        canCreateNew={false}
+      />,
+    );
+
+    expect(getByText(/Use existing branch/)).toBeDefined();
+    expect(queryByText(/Create new branch/)).toBeNull();
+  });
+
+  it("should call onUseExisting when existing branch option is selected", () => {
+    const onUseExisting = vi.fn();
+    const onCreateNew = vi.fn();
+    const onBack = vi.fn();
+
+    render(
+      <BranchActionSelectorScreen
+        selectedBranch="feature-test"
+        onUseExisting={onUseExisting}
+        onCreateNew={onCreateNew}
+        onBack={onBack}
+      />,
+    );
+
+    // Note: Simulating selection requires ink-testing-library
+    // For now, we verify the component structure and callbacks are set up
+    expect(onUseExisting).not.toHaveBeenCalled();
+  });
+
+  it("should call onCreateNew when create new branch option is selected", () => {
+    const onUseExisting = vi.fn();
+    const onCreateNew = vi.fn();
+    const onBack = vi.fn();
+
+    render(
+      <BranchActionSelectorScreen
+        selectedBranch="feature-test"
+        onUseExisting={onUseExisting}
+        onCreateNew={onCreateNew}
+        onBack={onBack}
+      />,
+    );
+
+    // Note: Simulating selection requires ink-testing-library
+    // For now, we verify the component structure and callbacks are set up
+    expect(onCreateNew).not.toHaveBeenCalled();
+  });
+});

package/src/cli/ui/types.ts

@@ -0,0 +1,295 @@
+export interface WorktreeInfo {
+  path: string;
+  locked: boolean;
+  prunable: boolean;
+  isAccessible?: boolean;
+}
+
+export interface BranchInfo {
+  name: string;
+  type: "local" | "remote";
+  branchType: "feature" | "hotfix" | "release" | "main" | "develop" | "other";
+  isCurrent: boolean;
+  description?: string;
+  worktree?: WorktreeInfo;
+  hasUnpushedCommits?: boolean;
+  openPR?: { number: number; title: string };
+  mergedPR?: { number: number; mergedAt: string };
+  latestCommitTimestamp?: number;
+}
+
+export interface BranchChoice {
+  name: string;
+  value: string;
+  description?: string;
+  disabled?: boolean | string;
+}
+
+export interface EnhancedBranchChoice extends BranchChoice {
+  hasWorktree: boolean;
+  worktreePath?: string;
+  branchType: BranchInfo["branchType"];
+  branchDataType: "local" | "remote";
+  isCurrent: boolean;
+}
+
+export type BranchType =
+  | "feature"
+  | "hotfix"
+  | "release"
+  | "main"
+  | "develop"
+  | "other";
+
+export interface NewBranchConfig {
+  type: BranchType;
+  taskName: string;
+  branchName: string;
+}
+
+export interface WorktreeConfig {
+  branchName: string;
+  worktreePath: string;
+  repoRoot: string;
+  isNewBranch: boolean;
+  baseBranch: string;
+}
+
+export interface CleanupResult {
+  hasChanges: boolean;
+  committed: boolean;
+  pushed: boolean;
+  worktreeRemoved: boolean;
+}
+
+export interface BranchGroup {
+  title: string;
+  branches: EnhancedBranchChoice[];
+  priority: number;
+}
+
+export interface SelectedBranchState {
+  name: string;
+  displayName: string;
+  branchType: "local" | "remote";
+  branchCategory: BranchInfo["branchType"];
+  remoteBranch?: string;
+}
+
+export interface UIFilter {
+  showWithWorktree: boolean;
+  showWithoutWorktree: boolean;
+  branchTypes: BranchInfo["branchType"][];
+  showLocal: boolean;
+  showRemote: boolean;
+}
+
+export interface PullRequest {
+  number: number;
+  title: string;
+  state: "OPEN" | "CLOSED" | "MERGED";
+  branch: string;
+  mergedAt: string | null;
+  author: string;
+  baseRefName?: string | null;
+}
+
+export interface MergedPullRequest {
+  number: number;
+  title: string;
+  branch: string;
+  mergedAt: string;
+  author: string;
+}
+
+export interface WorktreeWithPR {
+  worktreePath: string;
+  branch: string;
+  pullRequest: PullRequest | null;
+}
+
+export type CleanupReason = "merged-pr" | "no-diff-with-base";
+
+export interface CleanupTarget {
+  worktreePath: string | null; // null for local branch only cleanup
+  branch: string;
+  pullRequest: MergedPullRequest | null;
+  hasUncommittedChanges: boolean;
+  hasUnpushedCommits: boolean;
+  cleanupType: "worktree-and-branch" | "branch-only";
+  hasRemoteBranch?: boolean;
+  isAccessible?: boolean;
+  invalidReason?: string;
+  reasons?: CleanupReason[];
+}
+
+export interface GitHubPRAuthor {
+  id?: string;
+  is_bot?: boolean;
+  login?: string;
+  name?: string;
+}
+
+export interface GitHubPRResponse {
+  number: number;
+  title: string;
+  state: string;
+  headRefName: string;
+  mergedAt: string | null;
+  author: GitHubPRAuthor | null;
+  baseRefName?: string | null;
+}
+
+// ========================================
+// Ink.js UI Types (Phase 2+)
+// ========================================
+
+/**
+ * Screen types for Ink.js UI
+ */
+export type ScreenType =
+  | "branch-list"
+  | "worktree-manager"
+  | "branch-creator"
+  | "branch-action-selector"
+  | "ai-tool-selector"
+  | "session-selector"
+  | "execution-mode-selector"
+  | "batch-merge-progress"
+  | "batch-merge-result";
+
+/**
+ * Branch action types for action selector screen
+ */
+export type BranchAction = "use-existing" | "create-new";
+
+export type ScreenState = "active" | "hidden";
+
+export interface Screen {
+  type: ScreenType;
+  state: ScreenState;
+  data?: unknown;
+}
+
+/**
+ * BranchItem - Extended BranchInfo for display purposes
+ */
+export type WorktreeStatus = "active" | "inaccessible" | undefined;
+
+export interface BranchItem extends BranchInfo {
+  // Display properties
+  icons: string[];
+  worktreeStatus?: WorktreeStatus;
+  hasChanges: boolean;
+  label: string;
+  value: string;
+}
+
+/**
+ * Statistics - Real-time statistics
+ */
+export interface Statistics {
+  localCount: number;
+  remoteCount: number;
+  worktreeCount: number;
+  changesCount: number;
+  lastUpdated: Date;
+}
+
+/**
+ * Layout - Dynamic layout information
+ */
+export interface Layout {
+  terminalHeight: number;
+  terminalWidth: number;
+  headerLines: number;
+  footerLines: number;
+  contentHeight: number;
+}
+
+// ========================================
+// Batch Merge Types (SPEC-ee33ca26)
+// ========================================
+
+/**
+ * BatchMergeConfig - Configuration for batch merge execution
+ * @see specs/SPEC-ee33ca26/data-model.md
+ */
+export interface BatchMergeConfig {
+  sourceBranch: string;
+  targetBranches: string[];
+  dryRun: boolean;
+  autoPush: boolean;
+  remote?: string; // default: "origin"
+}
+
+/**
+ * MergePhase - Current phase of merge operation
+ * @see specs/SPEC-ee33ca26/data-model.md
+ */
+export type MergePhase = "fetch" | "worktree" | "merge" | "push" | "cleanup";
+
+/**
+ * BatchMergeProgress - Real-time progress information
+ * @see specs/SPEC-ee33ca26/data-model.md
+ */
+export interface BatchMergeProgress {
+  currentBranch: string;
+  currentIndex: number;
+  totalBranches: number;
+  percentage: number; // 0-100
+  elapsedSeconds: number;
+  estimatedRemainingSeconds?: number;
+  currentPhase: MergePhase;
+}
+
+/**
+ * MergeStatus - Status of individual branch merge
+ * @see specs/SPEC-ee33ca26/data-model.md
+ */
+export type MergeStatus = "success" | "skipped" | "failed";
+
+/**
+ * PushStatus - Status of push operation
+ * @see specs/SPEC-ee33ca26/data-model.md
+ */
+export type PushStatus = "success" | "failed" | "not_executed";
+
+/**
+ * BranchMergeStatus - Individual branch merge result
+ * @see specs/SPEC-ee33ca26/data-model.md
+ */
+export interface BranchMergeStatus {
+  branchName: string;
+  status: MergeStatus;
+  error?: string;
+  conflictFiles?: string[];
+  pushStatus?: PushStatus;
+  worktreeCreated: boolean;
+  durationSeconds: number;
+}
+
+/**
+ * BatchMergeSummary - Summary statistics
+ * @see specs/SPEC-ee33ca26/data-model.md
+ */
+export interface BatchMergeSummary {
+  totalCount: number;
+  successCount: number;
+  skippedCount: number;
+  failedCount: number;
+  pushedCount: number;
+  pushFailedCount: number;
+}
+
+/**
+ * BatchMergeResult - Final batch merge result
+ * @see specs/SPEC-ee33ca26/data-model.md
+ */
+export interface BatchMergeResult {
+  statuses: BranchMergeStatus[];
+  summary: BatchMergeSummary;
+  totalDurationSeconds: number;
+  cancelled: boolean;
+  config: BatchMergeConfig;
+}

package/src/cli/ui/utils/baseBranch.ts

@@ -0,0 +1,34 @@
+import type { SelectedBranchState } from "../types.js";
+
+function getBranchRef(
+  branch: SelectedBranchState | null | undefined,
+): string | null {
+  if (!branch) {
+    return null;
+  }
+  return branch.remoteBranch ?? branch.name;
+}
+
+export function resolveBaseBranchRef(
+  creationSource: SelectedBranchState | null,
+  selectedBranch: SelectedBranchState | null,
+  resolveDefault: () => string,
+): string {
+  return (
+    getBranchRef(creationSource) ??
+    getBranchRef(selectedBranch) ??
+    resolveDefault()
+  );
+}
+
+export function resolveBaseBranchLabel(
+  creationSource: SelectedBranchState | null,
+  selectedBranch: SelectedBranchState | null,
+  resolveDefault: () => string,
+): string {
+  return (
+    creationSource?.displayName ??
+    selectedBranch?.displayName ??
+    resolveDefault()
+  );
+}