@akiojin/gwt 4.12.1 → 6.0.0

package/src/cli/ui/types.ts

@@ -1,371 +0,0 @@
-import type { LastToolUsage } from "../../types/api.js";
-export type { LastToolUsage } from "../../types/api.js";
-
-export interface WorktreeInfo {
-  path: string;
-  locked: boolean;
-  prunable: boolean;
-  isAccessible?: boolean;
-  hasUncommittedChanges?: boolean;
-}
-
-export type CodingAgentId = string;
-export type InferenceLevel = "low" | "medium" | "high" | "xhigh";
-
-/**
- * Branch view mode for filtering branch list by type
- */
-export type BranchViewMode = "all" | "local" | "remote";
-
-export interface ModelOption {
-  id: string;
-  label: string;
-  description?: string;
-  inferenceLevels?: InferenceLevel[];
-  defaultInference?: InferenceLevel;
-  isDefault?: boolean;
-}
-
-export interface BranchDivergence {
-  ahead: number;
-  behind: number;
-  upToDate: boolean;
-}
-
-export interface BranchInfo {
-  name: string;
-  type: "local" | "remote";
-  branchType:
-    | "feature"
-    | "bugfix"
-    | "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;
-  lastToolUsage?: LastToolUsage | null;
-  upstream?: string | null;
-  divergence?: BranchDivergence | null;
-  hasRemoteCounterpart?: boolean;
-}
-
-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"
-  | "bugfix"
-  | "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;
-  worktreePath?: string | null;
-}
-
-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 = "no-diff-with-base" | "remote-synced";
-
-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 CleanupStatus {
-  branch: string;
-  worktreePath: string | null;
-  hasUncommittedChanges: boolean;
-  hasUnpushedCommits: boolean;
-  hasRemoteBranch: boolean;
-  hasUniqueCommits: boolean;
-  hasUpstream: boolean;
-  upstream?: string | null;
-  cleanupType: "worktree-and-branch" | "branch-only";
-  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;
-}
-
-// ========================================
-// CLI UI Types
-// ========================================
-
-/**
- * Screen types for CLI UI
- */
-export type ScreenType =
-  | "branch-list"
-  | "log-list"
-  | "log-detail"
-  | "log-date-picker"
-  | "branch-creator"
-  | "branch-action-selector"
-  | "branch-quick-start"
-  | "coding-agent-selector"
-  | "model-selector"
-  | "session-selector"
-  | "execution-mode-selector"
-  | "batch-merge-progress"
-  | "batch-merge-result"
-  | "environment-profile";
-
-/**
- * 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 type SyncStatus =
-  | "up-to-date"
-  | "ahead"
-  | "behind"
-  | "diverged"
-  | "no-upstream"
-  | "remote-only";
-
-export interface BranchItem extends BranchInfo {
-  // Display properties
-  icons: string[];
-  worktreeStatus?: WorktreeStatus;
-  hasChanges: boolean;
-  label: string;
-  value: string;
-  lastToolUsageLabel?: string | null;
-  syncStatus?: SyncStatus;
-  syncInfo?: string | undefined;
-  remoteName?: string | undefined;
-  // クリーンアップ候補判定で安全と評価された場合に true
-  safeToCleanup?: boolean;
-  // ベースブランチとの差分があり未マージと判定された場合に true
-  isUnmerged?: boolean;
-}
-
-/**
- * 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/__tests__/branchFormatter.test.ts

@@ -1,227 +0,0 @@
-import { describe, expect, it } from "bun:test";
-import {
-  formatBranchItem,
-  getLatestActivityTimestamp,
-} from "../branchFormatter.js";
-import type { BranchInfo } from "../../types.js";
-
-// TDD: テストを先に書き、実装は後から行う
-
-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("buildLastToolUsageLabel with version", () => {
-    const baseBranch: BranchInfo = {
-      name: "feature/test",
-      type: "local",
-      isCurrent: false,
-      branchType: "feature",
-      hasRemoteCounterpart: false,
-    };
-
-    it("should format as 'ToolName@1.0.3 | 2024-01-08 12:00' with version", () => {
-      const branch: BranchInfo = {
-        ...baseBranch,
-        lastToolUsage: {
-          branch: "feature/test",
-          worktreePath: "/path/to/worktree",
-          toolId: "claude-code",
-          toolLabel: "Claude Code",
-          timestamp: new Date("2024-01-08T12:00:00").getTime(),
-          toolVersion: "1.0.3",
-        },
-      };
-
-      const item = formatBranchItem(branch);
-      expect(item.lastToolUsageLabel).toBe(
-        `Claude@1.0.3 | ${formatLocalDateTime(
-          new Date("2024-01-08T12:00:00").getTime(),
-        )}`,
-      );
-    });
-
-    it("should format as 'ToolName@latest | 2024-01-08 12:00' when version is null", () => {
-      const branch: BranchInfo = {
-        ...baseBranch,
-        lastToolUsage: {
-          branch: "feature/test",
-          worktreePath: "/path/to/worktree",
-          toolId: "claude-code",
-          toolLabel: "Claude Code",
-          timestamp: new Date("2024-01-08T12:00:00").getTime(),
-          toolVersion: null,
-        },
-      };
-
-      const item = formatBranchItem(branch);
-      expect(item.lastToolUsageLabel).toBe(
-        `Claude@latest | ${formatLocalDateTime(
-          new Date("2024-01-08T12:00:00").getTime(),
-        )}`,
-      );
-    });
-
-    it("should format as 'ToolName@latest | 2024-01-08 12:00' when version is undefined", () => {
-      const branch: BranchInfo = {
-        ...baseBranch,
-        lastToolUsage: {
-          branch: "feature/test",
-          worktreePath: "/path/to/worktree",
-          toolId: "claude-code",
-          toolLabel: "Claude Code",
-          timestamp: new Date("2024-01-08T12:00:00").getTime(),
-        },
-      };
-
-      const item = formatBranchItem(branch);
-      expect(item.lastToolUsageLabel).toBe(
-        `Claude@latest | ${formatLocalDateTime(
-          new Date("2024-01-08T12:00:00").getTime(),
-        )}`,
-      );
-    });
-
-    it("should format Codex with version", () => {
-      const branch: BranchInfo = {
-        ...baseBranch,
-        lastToolUsage: {
-          branch: "feature/test",
-          worktreePath: "/path/to/worktree",
-          toolId: "codex-cli",
-          toolLabel: "Codex CLI",
-          timestamp: new Date("2024-01-08T15:30:00").getTime(),
-          toolVersion: "2.1.0-beta.1",
-        },
-      };
-
-      const item = formatBranchItem(branch);
-      expect(item.lastToolUsageLabel).toBe(
-        `Codex@2.1.0-beta.1 | ${formatLocalDateTime(
-          new Date("2024-01-08T15:30:00").getTime(),
-        )}`,
-      );
-    });
-
-    it("should format Gemini with version", () => {
-      const branch: BranchInfo = {
-        ...baseBranch,
-        lastToolUsage: {
-          branch: "feature/test",
-          worktreePath: "/path/to/worktree",
-          toolId: "gemini-cli",
-          toolLabel: "Gemini CLI",
-          timestamp: new Date("2024-01-08T09:15:00").getTime(),
-          toolVersion: "0.5.0",
-        },
-      };
-
-      const item = formatBranchItem(branch);
-      expect(item.lastToolUsageLabel).toBe(
-        `Gemini@0.5.0 | ${formatLocalDateTime(
-          new Date("2024-01-08T09:15:00").getTime(),
-        )}`,
-      );
-    });
-
-    it("should format custom tool with version", () => {
-      const branch: BranchInfo = {
-        ...baseBranch,
-        lastToolUsage: {
-          branch: "feature/test",
-          worktreePath: "/path/to/worktree",
-          toolId: "custom-tool",
-          toolLabel: "MyTool",
-          timestamp: new Date("2024-01-08T10:00:00").getTime(),
-          toolVersion: "1.0.0",
-        },
-      };
-
-      const item = formatBranchItem(branch);
-      expect(item.lastToolUsageLabel).toBe(
-        `MyTool@1.0.0 | ${formatLocalDateTime(
-          new Date("2024-01-08T10:00:00").getTime(),
-        )}`,
-      );
-    });
-
-    it("should return null when lastToolUsage is undefined", () => {
-      const branch: BranchInfo = {
-        ...baseBranch,
-        lastToolUsage: undefined,
-      };
-
-      const item = formatBranchItem(branch);
-      expect(item.lastToolUsageLabel).toBeNull();
-    });
-
-    it("should return null when lastToolUsage is null", () => {
-      const branch: BranchInfo = {
-        ...baseBranch,
-        lastToolUsage: null,
-      };
-
-      const item = formatBranchItem(branch);
-      expect(item.lastToolUsageLabel).toBeNull();
-    });
-  });
-
-  describe("getLatestActivityTimestamp", () => {
-    it("should return git timestamp when tool usage is undefined", () => {
-      const branch: BranchInfo = {
-        name: "feature/test",
-        type: "local",
-        isCurrent: false,
-        branchType: "feature",
-        hasRemoteCounterpart: false,
-        latestCommitTimestamp: 1704700800, // 2024-01-08 12:00:00 UTC in seconds
-      };
-
-      const result = getLatestActivityTimestamp(branch);
-      expect(result).toBe(1704700800);
-    });
-
-    it("should return tool timestamp when it is newer than git timestamp", () => {
-      const branch: BranchInfo = {
-        name: "feature/test",
-        type: "local",
-        isCurrent: false,
-        branchType: "feature",
-        hasRemoteCounterpart: false,
-        latestCommitTimestamp: 1704700800, // 2024-01-08 12:00:00 UTC in seconds
-        lastToolUsage: {
-          branch: "feature/test",
-          worktreePath: "/path/to/worktree",
-          toolId: "claude-code",
-          toolLabel: "Claude Code",
-          timestamp: 1704704400000, // 2024-01-08 13:00:00 UTC in milliseconds
-        },
-      };
-
-      const result = getLatestActivityTimestamp(branch);
-      expect(result).toBe(1704704400); // converted to seconds
-    });
-  });
-});

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

@@ -1,46 +0,0 @@
-import { beforeEach, describe, expect, it } from "bun:test";
-import {
-  clearInstalledVersionCache,
-  getInstalledVersionCache,
-  prefetchInstalledVersions,
-  setInstalledVersionCache,
-} from "../installedVersionCache.js";
-
-describe("installedVersionCache", () => {
-  beforeEach(() => {
-    clearInstalledVersionCache();
-  });
-
-  it("stores and retrieves installed versions", () => {
-    setInstalledVersionCache("claude-code", {
-      version: "1.0.0",
-      path: "/usr/local/bin/claude",
-    });
-
-    const cached = getInstalledVersionCache("claude-code");
-    expect(cached).toEqual({
-      version: "1.0.0",
-      path: "/usr/local/bin/claude",
-    });
-  });
-
-  it("prefetches installed versions with custom fetcher", async () => {
-    await prefetchInstalledVersions(["claude-code", "codex-cli"], async (id) =>
-      id === "claude-code" ? { version: "2.0.0", path: "/opt/claude" } : null,
-    );
-
-    expect(getInstalledVersionCache("claude-code")).toEqual({
-      version: "2.0.0",
-      path: "/opt/claude",
-    });
-    expect(getInstalledVersionCache("codex-cli")).toBeNull();
-  });
-
-  it("stores null when fetcher throws", async () => {
-    await prefetchInstalledVersions(["gemini-cli"], async () => {
-      throw new Error("boom");
-    });
-
-    expect(getInstalledVersionCache("gemini-cli")).toBeNull();
-  });
-});

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

@@ -1,34 +0,0 @@
-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()
-  );
-}