@akiojin/gwt 2.9.1 → 2.11.0

package/src/worktree.ts

@@ -6,10 +6,9 @@ import {
   WorktreeConfig,
   WorktreeWithPR,
   CleanupTarget,
-  MergedPullRequest,
   CleanupReason,
 } from "./cli/ui/types.js";
-import { getPullRequestByBranch, getMergedPullRequests } from "./github.js";
+import { getPullRequestByBranch } from "./github.js";
 import {
   hasUncommittedChanges,
   hasUnpushedCommits,
@@ -27,6 +26,23 @@ import { getConfig } from "./config/index.js";
 import { GIT_CONFIG } from "./config/constants.js";
 import { startSpinner } from "./utils/spinner.js";
 
+async function getUpstreamBranch(branch: string): Promise<string | null> {
+  try {
+    const result = await execa("git", [
+      "rev-parse",
+      "--abbrev-ref",
+      `${branch}@{upstream}`,
+    ]);
+    const stdout =
+      typeof (result as { stdout?: unknown })?.stdout === "string"
+        ? (result as { stdout: string }).stdout.trim()
+        : "";
+    return stdout.length ? stdout : null;
+  } catch {
+    return null;
+  }
+}
+
 // Re-export WorktreeConfig for external use
 export type { WorktreeConfig };
 
@@ -100,11 +116,9 @@ async function listWorktrees(): Promise<WorktreeInfo[]> {
   try {
     const { getRepositoryRoot } = await import("./git.js");
     const repoRoot = await getRepositoryRoot();
-    const { stdout } = await execa(
-      "git",
-      ["worktree", "list", "--porcelain"],
-      { cwd: repoRoot },
-    );
+    const { stdout } = await execa("git", ["worktree", "list", "--porcelain"], {
+      cwd: repoRoot,
+    });
     const worktrees: WorktreeInfo[] = [];
     const lines = stdout.split("\n");
 
@@ -416,15 +430,13 @@ async function getWorktreesWithPRStatus(): Promise<WorktreeWithPR[]> {
 }
 
 /**
- * worktreeに存在しないローカルブランチの中でマージ済みPRに関連するクリーンアップ候補を取得
+ * worktreeに存在しないローカルブランチのクリーンアップ候補を取得
  * @returns {Promise<CleanupTarget[]>} クリーンアップ候補の配列
  */
 async function getOrphanedLocalBranches({
-  mergedPRs,
   baseBranch,
   repoRoot,
 }: {
-  mergedPRs: MergedPullRequest[];
   baseBranch: string;
   repoRoot: string;
 }): Promise<CleanupTarget[]> {
@@ -469,7 +481,6 @@ async function getOrphanedLocalBranches({
 
       // worktreeに存在しないローカルブランチのみ対象
       if (!worktreeBranches.has(localBranch.name)) {
-        const mergedPR = findMatchingPR(localBranch.name, mergedPRs);
         let hasUnpushed = false;
         try {
           hasUnpushed = await hasUnpushedCommitsInRepo(
@@ -482,42 +493,43 @@ async function getOrphanedLocalBranches({
 
         const reasons: CleanupReason[] = [];
 
-        if (mergedPR) {
-          reasons.push("merged-pr");
-        }
+        const upstreamBranch = await getUpstreamBranch(localBranch.name);
+        const comparisonBase = upstreamBranch ?? baseBranch;
 
-        if (!hasUnpushed) {
-          const hasUniqueCommits = await branchHasUniqueCommitsComparedToBase(
-            localBranch.name,
-            baseBranch,
-            repoRoot,
-          );
+        const hasUniqueCommits = await branchHasUniqueCommitsComparedToBase(
+          localBranch.name,
+          comparisonBase,
+          repoRoot,
+        );
 
-          if (!hasUniqueCommits) {
-            reasons.push("no-diff-with-base");
-          }
+        if (!hasUniqueCommits) {
+          reasons.push("no-diff-with-base");
         }
 
         if (process.env.DEBUG_CLEANUP) {
           console.log(
             chalk.gray(
-              `Debug: Checking orphaned branch ${localBranch.name} -> PR: ${mergedPR ? "MATCH" : "NO MATCH"}, reasons: ${reasons.join(", ")}`,
+              `Debug: Checking orphaned branch ${localBranch.name} -> reasons: ${reasons.join(", ")}`,
             ),
           );
         }
 
-        if (reasons.length > 0) {
-          let hasRemoteBranch = false;
-          try {
-            hasRemoteBranch = await checkRemoteBranchExists(localBranch.name);
-          } catch {
-            hasRemoteBranch = false;
-          }
+        let hasRemoteBranch = false;
+        try {
+          hasRemoteBranch = await checkRemoteBranchExists(localBranch.name);
+        } catch {
+          hasRemoteBranch = false;
+        }
 
+        if (!hasUnpushed && hasRemoteBranch && hasUniqueCommits) {
+          reasons.push("remote-synced");
+        }
+
+        if (reasons.length > 0) {
           cleanupTargets.push({
             worktreePath: null, // worktreeは存在しない
             branch: localBranch.name,
-            pullRequest: mergedPR ?? null,
+            pullRequest: null,
             hasUncommittedChanges: false, // worktreeが存在しないため常にfalse
             hasUnpushedCommits: hasUnpushed,
             cleanupType: "branch-only",
@@ -546,49 +558,19 @@ async function getOrphanedLocalBranches({
   }
 }
 
-function normalizeBranchName(branchName: string): string {
-  return branchName
-    .replace(/^origin\//, "")
-    .replace(/^refs\/heads\//, "")
-    .replace(/^refs\/remotes\/origin\//, "")
-    .trim();
-}
-
-function findMatchingPR(
-  worktreeBranch: string,
-  mergedPRs: MergedPullRequest[],
-): MergedPullRequest | null {
-  const normalizedWorktreeBranch = normalizeBranchName(worktreeBranch);
-
-  for (const pr of mergedPRs) {
-    const normalizedPRBranch = normalizeBranchName(pr.branch);
-
-    if (normalizedWorktreeBranch === normalizedPRBranch) {
-      return pr;
-    }
-  }
-
-  return null;
-}
-
 /**
  * マージ済みPRに関連するworktreeおよびローカルブランチのクリーンアップ候補を取得
  * @returns {Promise<CleanupTarget[]>} クリーンアップ候補の配列
  */
 export async function getMergedPRWorktrees(): Promise<CleanupTarget[]> {
-  const [config, repoRoot] = await Promise.all([
+  const [config, repoRoot, worktreesWithPR] = await Promise.all([
     getConfig(),
     getRepositoryRoot(),
+    getWorktreesWithPRStatus(),
   ]);
   const baseBranch = config.defaultBaseBranch || GIT_CONFIG.DEFAULT_BASE_BRANCH;
 
-  // 並列実行で高速化 - worktreeとマージ済みPRの両方を取得
-  const [mergedPRs, worktreesWithPR] = await Promise.all([
-    getMergedPullRequests(),
-    getWorktreesWithPRStatus(),
-  ]);
   const orphanedBranches = await getOrphanedLocalBranches({
-    mergedPRs,
     baseBranch,
     repoRoot,
   });
@@ -599,8 +581,6 @@ export async function getMergedPRWorktrees(): Promise<CleanupTarget[]> {
     worktreesWithPR.forEach((w) =>
       console.log(`  ${w.branch} -> ${w.worktreePath}`),
     );
-    console.log(chalk.cyan("Debug: Merged PRs:"));
-    mergedPRs.forEach((pr) => console.log(`  ${pr.branch} (PR #${pr.number})`));
   }
 
   for (const worktree of worktreesWithPR) {
@@ -614,26 +594,25 @@ export async function getMergedPRWorktrees(): Promise<CleanupTarget[]> {
       continue;
     }
 
-    const mergedPR = findMatchingPR(worktree.branch, mergedPRs);
-
     if (process.env.DEBUG_CLEANUP) {
-      const normalizedWorktree = normalizeBranchName(worktree.branch);
-      console.log(
-        chalk.gray(
-          `Debug: Checking worktree ${worktree.branch} (normalized: ${normalizedWorktree}) -> ${mergedPR ? "MATCH" : "NO MATCH"}`,
-        ),
-      );
+      console.log(chalk.gray(`Debug: Checking worktree ${worktree.branch}`));
     }
 
     const cleanupReasons: CleanupReason[] = [];
 
-    if (mergedPR) {
-      cleanupReasons.push("merged-pr");
-    }
-
     // worktreeパスの存在を確認
     const fs = await import("node:fs");
-    const isAccessible = fs.existsSync(worktree.worktreePath);
+    // Some test environments mock node:fs without existsSync on the module root.
+    const existsSync =
+      typeof fs.existsSync === "function"
+        ? fs.existsSync
+        : typeof (fs as { default?: { existsSync?: unknown } }).default
+              ?.existsSync === "function"
+          ? (fs as { default: { existsSync: (p: string) => boolean } }).default
+              .existsSync
+          : null;
+
+    const isAccessible = existsSync ? existsSync(worktree.worktreePath) : false;
 
     let hasUncommitted = false;
     let hasUnpushed = false;
@@ -657,16 +636,28 @@ export async function getMergedPRWorktrees(): Promise<CleanupTarget[]> {
       }
     }
 
-    if (!hasUnpushed) {
-      const hasUniqueCommits = await branchHasUniqueCommitsComparedToBase(
-        worktree.branch,
-        baseBranch,
-        repoRoot,
-      );
+    let hasRemoteBranch = false;
+    try {
+      hasRemoteBranch = await checkRemoteBranchExists(worktree.branch);
+    } catch {
+      hasRemoteBranch = false;
+    }
 
-      if (!hasUniqueCommits) {
-        cleanupReasons.push("no-diff-with-base");
-      }
+    const upstreamBranch = await getUpstreamBranch(worktree.branch);
+    const comparisonBase = upstreamBranch ?? baseBranch;
+
+    const hasUniqueCommits = await branchHasUniqueCommitsComparedToBase(
+      worktree.branch,
+      comparisonBase,
+      repoRoot,
+    );
+
+    // 差分がない場合はベース同等としてクリーンアップ候補
+    if (!hasUniqueCommits) {
+      cleanupReasons.push("no-diff-with-base");
+    } else if (!hasUncommitted && !hasUnpushed && hasRemoteBranch) {
+      // 未マージでも、ローカルに未コミット/未プッシュがなくリモートが最新ならローカルのみクリーンアップ許可
+      cleanupReasons.push("remote-synced");
     }
 
     if (process.env.DEBUG_CLEANUP) {
@@ -681,12 +672,10 @@ export async function getMergedPRWorktrees(): Promise<CleanupTarget[]> {
       continue;
     }
 
-    const hasRemoteBranch = await checkRemoteBranchExists(worktree.branch);
-
     const target: CleanupTarget = {
       worktreePath: worktree.worktreePath,
       branch: worktree.branch,
-      pullRequest: mergedPR ?? null,
+      pullRequest: null,
       hasUncommittedChanges: hasUncommitted,
       hasUnpushedCommits: hasUnpushed,
       cleanupType: "worktree-and-branch",

package/dist/cli/ui/components/screens/WorktreeManagerScreen.d.ts

@@ -1,20 +0,0 @@
-import React from "react";
-export interface WorktreeItem {
-    branch: string;
-    path: string;
-    isAccessible: boolean;
-    label?: string;
-    value?: string;
-}
-export interface WorktreeManagerScreenProps {
-    worktrees: WorktreeItem[];
-    onBack: () => void;
-    onSelect: (worktree: WorktreeItem) => void;
-    version?: string | null;
-}
-/**
- * WorktreeManagerScreen - Screen for managing worktrees
- * Layout: Header + Stats + Worktree List + Footer
- */
-export declare function WorktreeManagerScreen({ worktrees, onBack, onSelect, version, }: WorktreeManagerScreenProps): React.JSX.Element;
-//# sourceMappingURL=WorktreeManagerScreen.d.ts.map

package/dist/cli/ui/components/screens/WorktreeManagerScreen.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"WorktreeManagerScreen.d.ts","sourceRoot":"","sources":["../../../../../src/cli/ui/components/screens/WorktreeManagerScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,0BAA0B;IACzC,SAAS,EAAE,YAAY,EAAE,CAAC;IAC1B,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,QAAQ,EAAE,CAAC,QAAQ,EAAE,YAAY,KAAK,IAAI,CAAC;IAC3C,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,EACpC,SAAS,EACT,MAAM,EACN,QAAQ,EACR,OAAO,GACR,EAAE,0BAA0B,qBAqF5B"}

package/dist/cli/ui/components/screens/WorktreeManagerScreen.js

@@ -1,65 +0,0 @@
-import React from "react";
-import { Box, Text, useInput } from "ink";
-import { Header } from "../parts/Header.js";
-import { Footer } from "../parts/Footer.js";
-import { Select } from "../common/Select.js";
-import { useTerminalSize } from "../../hooks/useTerminalSize.js";
-/**
- * WorktreeManagerScreen - Screen for managing worktrees
- * Layout: Header + Stats + Worktree List + Footer
- */
-export function WorktreeManagerScreen({ worktrees, onBack, onSelect, version, }) {
-    const { rows } = useTerminalSize();
-    // Handle keyboard input
-    // Note: Select component handles Enter and arrow keys
-    useInput((input, key) => {
-        if (key.escape) {
-            onBack();
-        }
-    });
-    // Calculate accessible and inaccessible counts
-    const accessibleCount = worktrees.filter((w) => w.isAccessible).length;
-    const inaccessibleCount = worktrees.filter((w) => !w.isAccessible).length;
-    // Format worktrees for Select component
-    const worktreeItems = worktrees.map((wt) => ({
-        ...wt,
-        label: wt.isAccessible
-            ? `${wt.branch} (${wt.path})`
-            : `${wt.branch} (${wt.path}) [Inaccessible]`,
-        value: wt.branch,
-    }));
-    // Calculate available space for worktree list
-    const headerLines = 2;
-    const statsLines = 1;
-    const emptyLine = 1;
-    const footerLines = 1;
-    const fixedLines = headerLines + statsLines + emptyLine + footerLines;
-    const contentHeight = rows - fixedLines;
-    const limit = Math.max(5, contentHeight);
-    // Footer actions
-    const footerActions = [
-        { key: "enter", description: "Select" },
-        { key: "esc", description: "Back" },
-    ];
-    return (React.createElement(Box, { flexDirection: "column", height: rows },
-        React.createElement(Header, { title: "Worktree Manager", titleColor: "magenta", version: version }),
-        React.createElement(Box, { marginTop: 1 },
-            React.createElement(Box, { flexDirection: "row" },
-                React.createElement(Box, { marginRight: 2 },
-                    React.createElement(Text, null,
-                        "Total: ",
-                        React.createElement(Text, { bold: true }, worktrees.length))),
-                React.createElement(Box, { marginRight: 2 },
-                    React.createElement(Text, { color: "green" },
-                        "Accessible: ",
-                        React.createElement(Text, { bold: true }, accessibleCount))),
-                inaccessibleCount > 0 && (React.createElement(Box, null,
-                    React.createElement(Text, { color: "red" },
-                        "Inaccessible: ",
-                        React.createElement(Text, { bold: true }, inaccessibleCount)))))),
-        React.createElement(Box, { height: 1 }),
-        React.createElement(Box, { flexDirection: "column", flexGrow: 1 }, worktrees.length === 0 ? (React.createElement(Box, null,
-            React.createElement(Text, { dimColor: true }, "No worktrees found"))) : (React.createElement(Select, { items: worktreeItems, onSelect: onSelect, limit: limit }))),
-        React.createElement(Footer, { actions: footerActions })));
-}
-//# sourceMappingURL=WorktreeManagerScreen.js.map

package/dist/cli/ui/components/screens/WorktreeManagerScreen.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"WorktreeManagerScreen.js","sourceRoot":"","sources":["../../../../../src/cli/ui/components/screens/WorktreeManagerScreen.tsx"],"names":[],"mappings":"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"}

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

@@ -1,151 +0,0 @@
-/**
- * @vitest-environment happy-dom
- */
-import { describe, it, expect, beforeEach, vi } from "vitest";
-import { render } from "@testing-library/react";
-import React from "react";
-import { WorktreeManagerScreen } from "../../../components/screens/WorktreeManagerScreen.js";
-import { Window } from "happy-dom";
-
-describe("WorktreeManagerScreen", () => {
-  beforeEach(() => {
-    // Setup happy-dom
-    const window = new Window();
-    globalThis.window = window as any;
-    globalThis.document = window.document as any;
-  });
-
-  const mockWorktrees = [
-    {
-      branch: "feature/test-1",
-      path: "/path/to/worktree-1",
-      isAccessible: true,
-    },
-    {
-      branch: "feature/test-2",
-      path: "/path/to/worktree-2",
-      isAccessible: true,
-    },
-  ];
-
-  it("should render header with title", () => {
-    const onBack = vi.fn();
-    const onSelect = vi.fn();
-    const { getByText } = render(
-      <WorktreeManagerScreen
-        worktrees={mockWorktrees}
-        onBack={onBack}
-        onSelect={onSelect}
-      />,
-    );
-
-    expect(getByText(/Worktree Manager/i)).toBeDefined();
-  });
-
-  it("should render worktree list", () => {
-    const onBack = vi.fn();
-    const onSelect = vi.fn();
-    const { getByText } = render(
-      <WorktreeManagerScreen
-        worktrees={mockWorktrees}
-        onBack={onBack}
-        onSelect={onSelect}
-      />,
-    );
-
-    expect(getByText(/feature\/test-1/)).toBeDefined();
-    expect(getByText(/feature\/test-2/)).toBeDefined();
-  });
-
-  it("should render footer with actions", () => {
-    const onBack = vi.fn();
-    const onSelect = vi.fn();
-    const { getAllByText } = render(
-      <WorktreeManagerScreen
-        worktrees={mockWorktrees}
-        onBack={onBack}
-        onSelect={onSelect}
-      />,
-    );
-
-    expect(getAllByText(/enter/i).length).toBeGreaterThan(0);
-    expect(getAllByText(/esc/i).length).toBeGreaterThan(0);
-  });
-
-  it("should handle empty worktree list", () => {
-    const onBack = vi.fn();
-    const onSelect = vi.fn();
-    const { getByText } = render(
-      <WorktreeManagerScreen
-        worktrees={[]}
-        onBack={onBack}
-        onSelect={onSelect}
-      />,
-    );
-
-    expect(getByText(/No worktrees found/i)).toBeDefined();
-  });
-
-  it("should display inaccessible worktrees differently", () => {
-    const worktreesWithInaccessible = [
-      {
-        branch: "feature/accessible",
-        path: "/path/accessible",
-        isAccessible: true,
-      },
-      {
-        branch: "feature/inaccessible",
-        path: "/path/inaccessible",
-        isAccessible: false,
-      },
-    ];
-
-    const onBack = vi.fn();
-    const onSelect = vi.fn();
-    const { getByText } = render(
-      <WorktreeManagerScreen
-        worktrees={worktreesWithInaccessible}
-        onBack={onBack}
-        onSelect={onSelect}
-      />,
-    );
-
-    expect(getByText(/feature\/accessible/)).toBeDefined();
-    expect(getByText(/feature\/inaccessible/)).toBeDefined();
-  });
-
-  it("should use terminal height for layout calculation", () => {
-    const originalRows = process.stdout.rows;
-    process.stdout.rows = 30;
-
-    const onBack = vi.fn();
-    const onSelect = vi.fn();
-    const { container } = render(
-      <WorktreeManagerScreen
-        worktrees={mockWorktrees}
-        onBack={onBack}
-        onSelect={onSelect}
-      />,
-    );
-
-    expect(container).toBeDefined();
-
-    process.stdout.rows = originalRows;
-  });
-
-  it("should display worktree count in stats", () => {
-    const onBack = vi.fn();
-    const onSelect = vi.fn();
-    const { getByText, getAllByText } = render(
-      <WorktreeManagerScreen
-        worktrees={mockWorktrees}
-        onBack={onBack}
-        onSelect={onSelect}
-      />,
-    );
-
-    // Check for worktree count
-    expect(getByText(/Total:/i)).toBeDefined();
-    expect(getAllByText(/2/).length).toBeGreaterThan(0);
-  });
-});

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

@@ -1,117 +0,0 @@
-import React from "react";
-import { Box, Text, useInput } from "ink";
-import { Header } from "../parts/Header.js";
-import { Footer } from "../parts/Footer.js";
-import { Select } from "../common/Select.js";
-import { useTerminalSize } from "../../hooks/useTerminalSize.js";
-
-export interface WorktreeItem {
-  branch: string;
-  path: string;
-  isAccessible: boolean;
-  label?: string;
-  value?: string;
-}
-
-export interface WorktreeManagerScreenProps {
-  worktrees: WorktreeItem[];
-  onBack: () => void;
-  onSelect: (worktree: WorktreeItem) => void;
-  version?: string | null;
-}
-
-/**
- * WorktreeManagerScreen - Screen for managing worktrees
- * Layout: Header + Stats + Worktree List + Footer
- */
-export function WorktreeManagerScreen({
-  worktrees,
-  onBack,
-  onSelect,
-  version,
-}: WorktreeManagerScreenProps) {
-  const { rows } = useTerminalSize();
-
-  // Handle keyboard input
-  // Note: Select component handles Enter and arrow keys
-  useInput((input, key) => {
-    if (key.escape) {
-      onBack();
-    }
-  });
-
-  // Calculate accessible and inaccessible counts
-  const accessibleCount = worktrees.filter((w) => w.isAccessible).length;
-  const inaccessibleCount = worktrees.filter((w) => !w.isAccessible).length;
-
-  // Format worktrees for Select component
-  const worktreeItems = worktrees.map((wt) => ({
-    ...wt,
-    label: wt.isAccessible
-      ? `${wt.branch} (${wt.path})`
-      : `${wt.branch} (${wt.path}) [Inaccessible]`,
-    value: wt.branch,
-  }));
-
-  // Calculate available space for worktree list
-  const headerLines = 2;
-  const statsLines = 1;
-  const emptyLine = 1;
-  const footerLines = 1;
-  const fixedLines = headerLines + statsLines + emptyLine + footerLines;
-  const contentHeight = rows - fixedLines;
-  const limit = Math.max(5, contentHeight);
-
-  // Footer actions
-  const footerActions = [
-    { key: "enter", description: "Select" },
-    { key: "esc", description: "Back" },
-  ];
-
-  return (
-    <Box flexDirection="column" height={rows}>
-      {/* Header */}
-      <Header title="Worktree Manager" titleColor="magenta" version={version} />
-
-      {/* Stats */}
-      <Box marginTop={1}>
-        <Box flexDirection="row">
-          <Box marginRight={2}>
-            <Text>
-              Total: <Text bold>{worktrees.length}</Text>
-            </Text>
-          </Box>
-          <Box marginRight={2}>
-            <Text color="green">
-              Accessible: <Text bold>{accessibleCount}</Text>
-            </Text>
-          </Box>
-          {inaccessibleCount > 0 && (
-            <Box>
-              <Text color="red">
-                Inaccessible: <Text bold>{inaccessibleCount}</Text>
-              </Text>
-            </Box>
-          )}
-        </Box>
-      </Box>
-
-      {/* Empty line */}
-      <Box height={1} />
-
-      {/* Content */}
-      <Box flexDirection="column" flexGrow={1}>
-        {worktrees.length === 0 ? (
-          <Box>
-            <Text dimColor>No worktrees found</Text>
-          </Box>
-        ) : (
-          <Select items={worktreeItems} onSelect={onSelect} limit={limit} />
-        )}
-      </Box>
-
-      {/* Footer */}
-      <Footer actions={footerActions} />
-    </Box>
-  );
-}