@akiojin/gwt 2.12.1 → 2.14.0

package/README.ja.md

@@ -73,6 +73,39 @@ gwt -v
 3. **ワークツリー管理**: 既存ワークツリーの表示、オープン、削除
 4. **ブランチクリーンアップ**: マージ済みPRやベースブランチと差分がないブランチ／ワークツリーをローカルから自動削除
 
+## Web UI とカスタムAIツール
+
+### Web UI の起動
+
+```bash
+# CLI を起動すると Web UI もバックグラウンドで自動起動します
+gwt
+
+# Web UI だけ起動したい場合
+gwt serve
+# または
+bunx @akiojin/gwt serve
+```
+
+- Web UI はデフォルトで <http://localhost:3000> で利用できます
+- ブランチ一覧/検索/Worktree作成など、CLIと同じ体験をブラウザで提供
+- ブランチ一覧カードの「AIツールを起動」ボタンでモーダルが開き、ツール/モード/引数/同期を選んで起動
+- ブランチ詳細ページはセッションの状態確認専用（稼働中セッションのターミナルと履歴を表示）
+
+### カスタムAIツールの管理
+
+- ダッシュボード右上の **Config**（または `/config` URL）で `~/.gwt/tools.json` をGUI編集（旧 `~/.claude-worktree/tools.json` は初回起動時に自動移行）
+- 実行タイプ（path/bunx/command）、defaultArgs、modeArgs、permissionSkipArgs、envをまとめて設定
+- 変更内容はCLIと共有の `tools.json` に保存されるため、CLI/Webのどちらからでも同じツールを利用可能
+- ブランチ一覧モーダルの起動フォームでは以下を指定できます:
+  - 起動するカスタムツール（ビルトインを含む）
+  - `normal / continue / resume` モード
+  - 追加引数（スペース区切り）
+  - CLIと同等の `--dangerously-skip-permissions`（確認ダイアログ付き）
+- モーダルから直接 `git fetch --all` + `git pull --ff-only` を実行でき、CLIと同じ安全ガードで divergence を検出します。
+
+> JSON編集なしでカスタムツールを試せるため、Web UIでパラメータを調整しながらCLIにも即反映できます。
+
 ## 高度なワークフロー
 
 ### ブランチ作成ワークフロー

package/README.md

@@ -75,6 +75,37 @@ The tool presents an interactive interface with the following options:
 3. **Manage Worktrees**: View, open, or remove existing worktrees
 4. **Cleanup Branches**: Remove merged PR branches or branches identical to their base directly from the CLI
 
+## Web UI & Custom AI Tools
+
+### Launching the Web UI
+
+```bash
+# Running the CLI also starts the Web UI in the background.
+gwt
+
+# (Optional) start only the Web UI server:
+gwt serve
+# or without global install
+bunx @akiojin/gwt serve
+```
+
+- The Web UI is available by default at <http://localhost:3000>
+- The branch list mirrors the CLI view, including search and worktree creation
+- Detailed branch pages let you start AI tool sessions directly from the browser
+
+### Managing Custom AI Tools
+
+- Navigate to **Config** (top-right button on the dashboard or `/config`) to view and edit `~/.gwt/tools.json` (legacy `~/.claude-worktree/tools.json` is auto-migrated on first run)
+- Add/edit tools with execution type (`path` / `bunx` / `command`), default arguments, mode-specific arguments, permission skip arguments, and environment variables
+- Changes are written to the same `tools.json` file that the CLI uses, so both channels stay in sync
+- When launching from the branch detail page you can:
+  - Select any custom tool
+  - Choose `normal` / `continue` / `resume` mode
+  - Append extra arguments
+  - Opt into the same `--dangerously-skip-permissions` flow as the CLI (with confirmation)
+
+> Tip: use the Web UI to quickly iterate on custom tool definitions, then run them from either the CLI or browser without editing JSON manually.
+
 ## Advanced Workflows
 
 ### Branch Strategy

package/dist/claude.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude.d.ts","sourceRoot":"","sources":["../src/claude.ts"],"names":[],"mappings":"AAOA,qBAAa,WAAY,SAAQ,KAAK;IAG3B,KAAK,CAAC,EAAE,OAAO;gBADtB,OAAO,EAAE,MAAM,EACR,KAAK,CAAC,EAAE,OAAO,YAAA;CAKzB;AAED,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,MAAM,EACpB,OAAO,GAAE;IACP,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,IAAI,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC;IACxC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB,GACL,OAAO,CAAC;IAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CAqSxC;AAsBD,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,OAAO,CAAC,CAe9D"}
+{"version":3,"file":"claude.d.ts","sourceRoot":"","sources":["../src/claude.ts"],"names":[],"mappings":"AAOA,qBAAa,WAAY,SAAQ,KAAK;IAG3B,KAAK,CAAC,EAAE,OAAO;gBADtB,OAAO,EAAE,MAAM,EACR,KAAK,CAAC,EAAE,OAAO,YAAA;CAKzB;AAED,wBAAsB,gBAAgB,CACpC,YAAY,EAAE,MAAM,EACpB,OAAO,GAAE;IACP,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,IAAI,CAAC,EAAE,QAAQ,GAAG,UAAU,GAAG,QAAQ,CAAC;IACxC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB,GACL,OAAO,CAAC;IAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CA+SxC;AAsBD,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,OAAO,CAAC,CAgB9D"}

package/dist/claude.js

@@ -33,6 +33,8 @@ export async function launchClaudeCode(worktreePath, options = {}) {
         const resumeSessionId = options.sessionId && options.sessionId.trim().length > 0
             ? options.sessionId.trim()
             : null;
+        const usedExplicitSessionId = Boolean(resumeSessionId) &&
+            (options.mode === "continue" || options.mode === "resume");
         // Handle execution mode
         switch (options.mode) {
             case "continue":
@@ -132,13 +134,11 @@ export async function launchClaudeCode(worktreePath, options = {}) {
         }
         console.log(chalk.gray(`   📋 Args: ${args.join(" ")}`));
         terminal.exitRawMode();
-        const baseEnv = {
-            ...process.env,
-            ...(options.envOverrides ?? {}),
-        };
-        const launchEnv = options.skipPermissions && !baseEnv.IS_SANDBOX
+        const baseEnv = { ...process.env, ...(options.envOverrides ?? {}) };
+        const launchEnvSource = options.skipPermissions && !baseEnv.IS_SANDBOX
             ? { ...baseEnv, IS_SANDBOX: "1" }
             : baseEnv;
+        const launchEnv = Object.fromEntries(Object.entries(launchEnvSource).filter((entry) => typeof entry[1] === "string"));
         const childStdio = createChildStdio();
         // Auto-detect locally installed claude command
         const hasLocalClaude = await isClaudeCommandAvailable();
@@ -186,11 +186,14 @@ export async function launchClaudeCode(worktreePath, options = {}) {
                 preferClosestTo: finishedAt,
                 windowMs: 10 * 60 * 1000,
             });
-            // Priority: latest on disk > resumeSessionId
-            capturedSessionId = latest?.id ?? resumeSessionId ?? null;
+            const detectedSessionId = latest?.id ?? null;
+            // When we explicitly resumed a specific session, keep that ID as the source of truth.
+            capturedSessionId = usedExplicitSessionId
+                ? resumeSessionId
+                : detectedSessionId;
         }
         catch {
-            capturedSessionId = resumeSessionId ?? null;
+            capturedSessionId = usedExplicitSessionId ? resumeSessionId : null;
         }
         if (capturedSessionId) {
             console.log(chalk.cyan(`\n   🆔 Session ID: ${capturedSessionId}`));
@@ -204,7 +207,8 @@ export async function launchClaudeCode(worktreePath, options = {}) {
     catch (error) {
         const hasLocalClaude = await isClaudeCommandAvailable();
         let errorMessage;
-        if (error.code === "ENOENT") {
+        const err = error;
+        if (err.code === "ENOENT") {
             if (hasLocalClaude) {
                 errorMessage =
                     "claude command not found. Please ensure Claude Code is properly installed.";
@@ -215,7 +219,8 @@ export async function launchClaudeCode(worktreePath, options = {}) {
             }
         }
         else {
-            errorMessage = `Failed to launch Claude Code: ${error.message || "Unknown error"}`;
+            const details = error instanceof Error ? error.message : String(error);
+            errorMessage = `Failed to launch Claude Code: ${details || "Unknown error"}`;
         }
         if (process.platform === "win32") {
             console.error(chalk.red("\n💡 Windows troubleshooting tips:"));
@@ -261,7 +266,8 @@ export async function isClaudeCodeAvailable() {
         return true;
     }
     catch (error) {
-        if (error.code === "ENOENT") {
+        const err = error;
+        if (err.code === "ENOENT") {
             console.error(chalk.yellow("\n⚠️  bunx command not found"));
             console.error(chalk.gray("   Install Bun and confirm that bunx is available before continuing"));
         }

package/dist/claude.js.map

@@ -1 +1 @@
-{"version":3,"file":"claude.js","sourceRoot":"","sources":["../src/claude.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"claude.js","sourceRoot":"","sources":["../src/claude.ts"],"names":[],"mappings":"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"}

package/dist/cli/ui/components/App.d.ts

@@ -17,12 +17,6 @@ export interface AppProps {
     onExit: (result?: SelectionResult) => void;
     loadingIndicatorDelay?: number;
 }
-export interface SessionOption {
-    sessionId: string;
-    toolLabel: string;
-    branch: string;
-    timestamp: number;
-}
 /**
  * App - Top-level component for Ink.js UI
  * Integrates ErrorBoundary, data fetching, screen navigation, and all screens

package/dist/cli/ui/components/App.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../../../src/cli/ui/components/App.tsx"],"names":[],"mappings":"AAAA,OAAO,KAMN,MAAM,OAAO,CAAC;AASf,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AAW9E,OAAO,KAAK,EACV,MAAM,EAGN,cAAc,EAEf,MAAM,aAAa,CAAC;AA6CrB,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,OAAO,GAAG,QAAQ,CAAC;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,aAAa,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,eAAe,KAAK,IAAI,CAAC;IAC3C,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC;AAED,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;GAGG;AACH,wBAAgB,GAAG,CAAC,EAAE,MAAM,EAAE,qBAA2B,EAAE,EAAE,QAAQ,qBA8qCpE"}
+{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../../../src/cli/ui/components/App.tsx"],"names":[],"mappings":"AAAA,OAAO,KAMN,MAAM,OAAO,CAAC;AAQf,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AAW9E,OAAO,KAAK,EACV,MAAM,EAGN,cAAc,EAEf,MAAM,aAAa,CAAC;AA6CrB,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,OAAO,GAAG,QAAQ,CAAC;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,aAAa,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,eAAe,KAAK,IAAI,CAAC;IAC3C,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC;AAED;;;GAGG;AACH,wBAAgB,GAAG,CAAC,EAAE,MAAM,EAAE,qBAA2B,EAAE,EAAE,QAAQ,qBAwqCpE"}

package/dist/cli/ui/components/App.js

@@ -5,7 +5,6 @@ import { BranchListScreen } from "./screens/BranchListScreen.js";
 import { BranchCreatorScreen } from "./screens/BranchCreatorScreen.js";
 import { BranchActionSelectorScreen } from "../screens/BranchActionSelectorScreen.js";
 import { AIToolSelectorScreen } from "./screens/AIToolSelectorScreen.js";
-import { SessionSelectorScreen } from "./screens/SessionSelectorScreen.js";
 import { ExecutionModeSelectorScreen } from "./screens/ExecutionModeSelectorScreen.js";
 import { BranchQuickStartScreen } from "./screens/BranchQuickStartScreen.js";
 import { ModelSelectorScreen, } from "./screens/ModelSelectorScreen.js";
@@ -46,10 +45,6 @@ export function App({ onExit, loadingIndicatorDelay = 300 }) {
     // Version state
     const [version, setVersion] = useState(null);
     const [repoRoot, setRepoRoot] = useState(null);
-    const [sessionOptions, setSessionOptions] = useState([]);
-    const [sessionLoading, setSessionLoading] = useState(false);
-    const [sessionError, setSessionError] = useState(null);
-    const [pendingExecution, setPendingExecution] = useState(null);
     const [continueSessionId, setContinueSessionId] = useState(null);
     const [branchQuickStart, setBranchQuickStart] = useState([]);
     const [branchQuickStartLoading, setBranchQuickStartLoading] = useState(false);
@@ -66,6 +61,8 @@ export function App({ onExit, loadingIndicatorDelay = 300 }) {
     const [cleanupInputLocked, setCleanupInputLocked] = useState(false);
     const [cleanupFooterMessage, setCleanupFooterMessage] = useState(null);
     const [hiddenBranches, setHiddenBranches] = useState([]);
+    const [selectedBranches, setSelectedBranches] = useState([]);
+    const [safeBranches, setSafeBranches] = useState(new Set());
     const spinnerFrameIndexRef = useRef(0);
     const [spinnerFrameIndex, setSpinnerFrameIndex] = useState(0);
     const completionTimerRef = useRef(null);
@@ -128,47 +125,34 @@ export function App({ onExit, loadingIndicatorDelay = 300 }) {
             setHiddenBranches(filtered);
         }
     }, [branches, hiddenBranches]);
-    // Load available sessions when entering session selector
+    // Remove selections that no longer exist (hidden or disappeared)
     useEffect(() => {
-        if (currentScreen !== "session-selector") {
-            return;
-        }
-        if (!selectedTool || !selectedBranch) {
-            setSessionOptions([]);
-            return;
-        }
-        setSessionLoading(true);
-        setSessionError(null);
+        setSelectedBranches((prev) => prev.filter((name) => branches.some((b) => b.name === name) &&
+            !hiddenBranches.includes(name)));
+    }, [branches, hiddenBranches]);
+    // Precompute safe-to-clean branches using cleanup candidate logic
+    useEffect(() => {
+        let cancelled = false;
         (async () => {
             try {
-                const root = repoRoot ?? (await getRepositoryRoot());
-                if (!repoRoot && root) {
-                    setRepoRoot(root);
-                }
-                const sessionData = root ? await loadSession(root) : null;
-                const history = sessionData?.history ?? [];
-                const filtered = history
-                    .filter((entry) => entry.sessionId &&
-                    entry.toolId === selectedTool &&
-                    entry.branch === selectedBranch.name)
-                    .sort((a, b) => (b.timestamp ?? 0) - (a.timestamp ?? 0))
-                    .map((entry) => ({
-                    sessionId: entry.sessionId,
-                    toolLabel: entry.toolLabel,
-                    branch: entry.branch,
-                    timestamp: entry.timestamp,
-                }));
-                setSessionOptions(filtered);
-            }
-            catch (_err) {
-                setSessionOptions([]);
-                setSessionError("セッション一覧の取得に失敗しました");
+                const targets = await getMergedPRWorktrees();
+                if (cancelled)
+                    return;
+                const safe = new Set(targets
+                    .filter((t) => !t.hasUncommittedChanges && !t.hasUnpushedCommits)
+                    .map((t) => t.branch));
+                setSafeBranches(safe);
             }
-            finally {
-                setSessionLoading(false);
+            catch {
+                if (cancelled)
+                    return;
+                setSafeBranches(new Set());
             }
         })();
-    }, [currentScreen, selectedTool, selectedBranch, repoRoot]);
+        return () => {
+            cancelled = true;
+        };
+    }, [branches, worktrees]);
     // Load quick start options for selected branch (latest per tool)
     useEffect(() => {
         if (!selectedBranch) {
@@ -211,53 +195,54 @@ export function App({ onExit, loadingIndicatorDelay = 300 }) {
                 const latestPerTool = findLatestBranchSessionsByTool(combinedHistory, selectedBranch.name, selectedWorktreePath);
                 const mapped = await Promise.all(latestPerTool.map(async (entry) => {
                     let sessionId = entry.sessionId ?? null;
+                    const worktree = selectedWorktreePath ?? workingDirectory;
                     // For Codex, prefer a newer filesystem session over stale history
-                    if (entry.toolId === "codex-cli") {
+                    if (!sessionId && entry.toolId === "codex-cli") {
                         try {
-                            const latestCodex = await findLatestCodexSession();
-                            const historyTs = entry.timestamp ?? 0;
-                            if (latestCodex &&
-                                (!sessionId || latestCodex.mtime > historyTs)) {
-                                sessionId = latestCodex.id;
-                            }
-                            // Fallback when filesystem unavailable and history missing
-                            if (!sessionId) {
-                                const latestId = await findLatestCodexSessionId();
-                                if (latestId)
-                                    sessionId = latestId;
-                            }
+                            const historyTs = entry.timestamp ?? null;
+                            const latestCodex = await findLatestCodexSession({
+                                ...(historyTs
+                                    ? {
+                                        since: historyTs - 60_000,
+                                        preferClosestTo: historyTs,
+                                        windowMs: 60 * 60 * 1000,
+                                    }
+                                    : {}),
+                                cwd: worktree,
+                            });
+                            sessionId =
+                                latestCodex?.id ??
+                                    (await findLatestCodexSessionId({ cwd: worktree })) ??
+                                    null;
                         }
                         catch {
                             // ignore lookup failure
                         }
                     }
                     // For Claude Code, prefer the newest session file in the worktree even if history is stale.
-                    if (entry.toolId === "claude-code") {
+                    if (!sessionId && entry.toolId === "claude-code") {
                         try {
-                            const worktree = selectedWorktreePath ??
-                                selectedBranch?.displayName ??
-                                workingDirectory;
                             // Always resolve freshest on-disk session for this worktree (no window restriction)
                             const latestAny = await findLatestClaudeSession(worktree);
-                            sessionId = latestAny?.id ?? sessionId ?? null;
+                            sessionId = latestAny?.id ?? null;
                         }
                         catch {
                             // ignore lookup failure
                         }
                     }
                     // For Gemini, prefer newest session file (Gemini keeps per-project chats)
-                    if (entry.toolId === "gemini-cli") {
+                    if (!sessionId && entry.toolId === "gemini-cli") {
                         try {
-                            const gemSession = await findLatestGeminiSession(selectedWorktreePath ??
-                                selectedBranch?.displayName ??
-                                workingDirectory, {
+                            const gemSession = await findLatestGeminiSession(worktree, {
                                 ...(entry.timestamp !== null && entry.timestamp !== undefined
-                                    ? { since: entry.timestamp - 60_000, preferClosestTo: entry.timestamp }
+                                    ? {
+                                        since: entry.timestamp - 60_000,
+                                        preferClosestTo: entry.timestamp,
+                                    }
                                     : {}),
                                 windowMs: 60 * 60 * 1000,
                             });
-                            if (gemSession?.id)
-                                sessionId = gemSession.id;
+                            sessionId = gemSession?.id ?? null;
                         }
                         catch {
                             // ignore
@@ -361,10 +346,18 @@ export function App({ onExit, loadingIndicatorDelay = 300 }) {
                 locked: false,
                 prunable: wt.isAccessible === false,
                 isAccessible: wt.isAccessible ?? true,
+                ...(wt.hasUncommittedChanges !== undefined
+                    ? { hasUncommittedChanges: wt.hasUncommittedChanges }
+                    : {}),
             });
         }
-        return formatBranchItems(visibleBranches, worktreeMap);
-    }, [branchHash, worktreeHash, visibleBranches, worktrees]);
+        const baseItems = formatBranchItems(visibleBranches, worktreeMap);
+        return baseItems.map((item) => ({
+            ...item,
+            safeToCleanup: safeBranches.has(item.name),
+        }));
+    }, [branchHash, worktreeHash, visibleBranches, worktrees, safeBranches]);
+    const selectedBranchSet = useMemo(() => new Set(selectedBranches), [selectedBranches]);
     // Calculate statistics (memoized for performance)
     const stats = useMemo(() => calculateStatistics(visibleBranches), [visibleBranches]);
     const resolveBaseBranch = useCallback(() => {
@@ -423,6 +416,18 @@ export function App({ onExit, loadingIndicatorDelay = 300 }) {
             branch.branchCategory === "main" ||
             branch.branchCategory === "develop");
     }, [isProtectedBranchName]);
+    const toggleBranchSelection = useCallback((branchName) => {
+        setSelectedBranches((prev) => {
+            const set = new Set(prev);
+            if (set.has(branchName)) {
+                set.delete(branchName);
+            }
+            else {
+                set.add(branchName);
+            }
+            return Array.from(set);
+        });
+    }, []);
     const protectedBranchInfo = useMemo(() => {
         if (!selectedBranch) {
             return null;
@@ -618,6 +623,7 @@ export function App({ onExit, loadingIndicatorDelay = 300 }) {
                     succeededBranches.forEach((branch) => merged.add(branch));
                     return Array.from(merged);
                 });
+                setSelectedBranches((prev) => prev.filter((name) => !succeededBranches.includes(name)));
             }
             refresh();
             completionTimerRef.current = null;
@@ -661,6 +667,23 @@ export function App({ onExit, loadingIndicatorDelay = 300 }) {
             }, COMPLETION_HOLD_DURATION_MS);
             return;
         }
+        // Manual selection: restrict targets when選択がある
+        if (selectedBranchSet.size > 0) {
+            targets = targets.filter((t) => selectedBranchSet.has(t.branch));
+            if (targets.length === 0) {
+                setCleanupIndicators({});
+                setCleanupFooterMessage({
+                    text: "⚠️ No cleanup candidates among selected branches.",
+                    color: "yellow",
+                });
+                setCleanupInputLocked(false);
+                completionTimerRef.current = setTimeout(() => {
+                    setCleanupFooterMessage(null);
+                    completionTimerRef.current = null;
+                }, COMPLETION_HOLD_DURATION_MS);
+                return;
+            }
+        }
         // Reset hidden branches that may already be gone
         setHiddenBranches((prev) => prev.filter((name) => targets.find((t) => t.branch === name) === undefined));
         const initialIndicators = targets.reduce((acc, target, index) => {
@@ -749,6 +772,7 @@ export function App({ onExit, loadingIndicatorDelay = 300 }) {
         getMergedPRWorktrees,
         refresh,
         removeWorktree,
+        selectedBranchSet,
     ]);
     // Handle AI tool selection
     const handleToolSelect = useCallback((tool) => {
@@ -798,14 +822,6 @@ export function App({ onExit, loadingIndicatorDelay = 300 }) {
         getDefaultModelOption,
         getDefaultInferenceForModel,
     ]);
-    // Handle session selection
-    const handleSessionSelect = useCallback((session) => {
-        const execution = pendingExecution ?? {
-            mode: "resume",
-            skipPermissions: false,
-        };
-        completeSelection(execution.mode, execution.skipPermissions, session);
-    }, [pendingExecution, completeSelection]);
     const handleQuickStartSelect = useCallback((action, toolId) => {
         if (action === "manual" || !branchQuickStart.length) {
             navigateTo("ai-tool-selector");
@@ -844,13 +860,8 @@ export function App({ onExit, loadingIndicatorDelay = 300 }) {
     ]);
     // Handle execution mode and skipPermissions selection
     const handleModeSelect = useCallback((result) => {
-        if (result.mode === "resume") {
-            setPendingExecution(result);
-            navigateTo("session-selector");
-            return;
-        }
         completeSelection(result.mode, result.skipPermissions, null);
-    }, [completeSelection, navigateTo]);
+    }, [completeSelection]);
     // Render screen based on currentScreen
     const renderScreen = () => {
         switch (currentScreen) {
@@ -859,7 +870,7 @@ export function App({ onExit, loadingIndicatorDelay = 300 }) {
                         indicators: cleanupIndicators,
                         footerMessage: cleanupFooterMessage,
                         inputLocked: cleanupInputLocked,
-                    }, version: version, workingDirectory: workingDirectory }));
+                    }, version: version, workingDirectory: workingDirectory, selectedBranches: selectedBranches, onToggleSelect: toggleBranchSelection }));
             case "branch-creator":
                 return (React.createElement(BranchCreatorScreen, { onBack: goBack, onCreate: handleCreate, baseBranch: baseBranchLabel, version: version }));
             case "branch-action-selector": {
@@ -893,9 +904,6 @@ export function App({ onExit, loadingIndicatorDelay = 300 }) {
                     return null;
                 }
                 return (React.createElement(ModelSelectorScreen, { tool: selectedTool, onBack: goBack, onSelect: handleModelSelect, version: version, initialSelection: selectedModel }));
-            case "session-selector":
-                // TODO: Implement session data fetching
-                return (React.createElement(SessionSelectorScreen, { sessions: sessionOptions, loading: sessionLoading, errorMessage: sessionError, onBack: goBack, onSelect: handleSessionSelect, version: version }));
             case "execution-mode-selector":
                 return (React.createElement(ExecutionModeSelectorScreen, { onBack: goBack, onSelect: handleModeSelect, version: version, continueSessionId: continueSessionId }));
             default: